chore: cleanup (#7)

flake.nix

@@ -58,7 +58,7 @@
 
                 # for development only
                 # this is the default location when you run d1 with `--local`
-                env.D1_DATABASE_FILEPATH =
+                env.D1_DATABASE_FILEPATH = # TODO: there has to be a simpler and better way to do this
                   let
                     dbDir = ".wrangler/state/v3/d1/miniflare-D1DatabaseObject";
                   in

src/lib.rs

@@ -1,30 +1,12 @@
-use serde::{Deserialize, Serialize};
 use serde_json::Value;
 use url::Url;
 use worker::*;
 
-#[derive(Debug, Deserialize, Serialize)]
-struct GenericResponse {
-    status: u16,
-    message: String,
-}
+mod utils;
+use utils::*;
 
 const DEV_ROUTES: [&str; 2] = ["/list", "/env"];
 
-pub fn get_secret(name: &str, env: &Env) -> Option<String> {
-    match env.secret(name) {
-        Ok(value) => Some(value.to_string()),
-        Err(_) => None,
-    }
-}
-
-pub fn get_var(name: &str, env: &Env) -> Option<String> {
-    match env.var(name) {
-        Ok(value) => Some(value.to_string()),
-        Err(_) => None,
-    }
-}
-
 #[event(fetch)]
 async fn fetch(request: Request, env: Env, _context: Context) -> Result<Response> {
     let environment = get_var("ENVIRONMENT", &env).unwrap_or_default();
@@ -43,8 +25,6 @@ async fn fetch(request: Request, env: Env, _context: Context) -> Result<Response
         return router.run(request, env).await;
     }
 
-    console_log!("{}", url.query().unwrap_or_default());
-
     let url_key = url.query().and_then(|q| q.split("key=").nth(1));
     if url_key.is_none() {
         return router.run(request, env).await;

src/utils.rs

@@ -0,0 +1,15 @@
+use worker::*;
+
+pub fn get_secret(name: &str, env: &Env) -> Option<String> {
+    match env.secret(name) {
+        Ok(value) => Some(value.to_string()),
+        Err(_) => None,
+    }
+}
+
+pub fn get_var(name: &str, env: &Env) -> Option<String> {
+    match env.var(name) {
+        Ok(value) => Some(value.to_string()),
+        Err(_) => None,
+    }
+}

tasks.nix

@@ -1,7 +1,4 @@
 {
-  echo-env.exec = ''
-    echo $D1_DATABASE_FILEPATH
-  '';
   wrangler.exec = ''
     bunx wrangler@latest --config='wrangler.toml' "$@"
   '';