Worker upgrades

.github/workflows/release.yml

@@ -93,7 +93,9 @@ jobs:
           curl -s https://ident.me > idm.ip
           if ! cmp -s prod.ip idm.ip; then
             echo "::error title=Deploy Test Failure::IP addresses from id.a1ecbr0wn.com and ident.me do not match"
+            echo "Prod Response:"
             cat prod.ip
+            echo "Control Response:"
             cat idm.ip
             exit 1
           fi

.wrangler/state/v3/kv/79d9e5086960445abc089e9d753e0fb5/blobs/41e50e9448c0231e4e24f37a64334b806b462942863785af9fb23ca37f535af10000018f541c4964

@@ -0,0 +1 @@
+[1715103091]

Cargo.toml

@@ -32,3 +32,6 @@ console_error_panic_hook = { version = "0.1.7", optional = true }
 [profile.release]
 # Tell `rustc` to optimize for small code size.
 opt-level = "s"
+lto = true
+strip = true
+codegen-units = 1

package.json

@@ -1,14 +1,13 @@
 {
+	"name": "id",
 	"private": true,
 	"version": "0.0.0",
 	"scripts": {
-		"deploy": "wrangler publish",
+		"deploy": "wrangler deploy",
 		"dev": "wrangler dev --local"
 	},
-	"devDependencies": {
-		"wrangler": "^2.16.0"
-	},
 	"dependencies": {
+		"wrangler": "^3.53.1",
 		"wrangler2": "^1.0.0"
 	}
 }

src/lib.rs

@@ -13,7 +13,7 @@ fn log_request(req: &Request) {
         req.cf()
             .unwrap()
             .region()
-            .unwrap_or_else(|| "unknown region".into())
+            .unwrap_or("unknown region".into())
     );
 }
 
@@ -27,6 +27,7 @@ pub async fn main(req: Request, env: Env, _ctx: worker::Context) -> Result<Respo
     let router = Router::new();
 
     router
+        // .get("/", |_, _| Response::ok("Hello, World!"))
         .get_async("/", |req, ctx| checked(req, ctx, |ip| Response::ok(ip)))
         .get_async("/json", |req, ctx| {
             checked(req, ctx, |ip| Response::from_json(&json!({ "ip": ip })))
@@ -37,8 +38,10 @@ pub async fn main(req: Request, env: Env, _ctx: worker::Context) -> Result<Respo
                 Response::ok(version)
             })
         })
+        .get("/hello", |_, _| Response::ok("Hello, World!"))
         .run(req, env)
         .await
+    // Response::ok("Hello, World!")
 }
 
 // Check we have the ip header and check that the rate does not exceed the threshold
@@ -57,6 +60,8 @@ where
             Response::error("Service unavailable :(", 503)
         }
     } else {
-        Response::error("Missing header", 424)
+        console_log!("Missing 'CF-Connecting-IP' header");
+        console_log!("{:?}", req.headers());
+        Response::error("Missing 'CF-Connecting-IP' header", 424)
     }
 }

wrangler.toml

@@ -1,24 +1,25 @@
 name = "dev-id"
 main = "build/worker/shim.mjs"
-compatibility_date = "2022-01-20"
+compatibility_date = "2023-12-01"
 assets = "assets"
 kv_namespaces = [
     { binding = "id", id = "444fcce1202948d59b0d2a326933c413", preview_id = "79d9e5086960445abc089e9d753e0fb5" }
 ]
 vars = [
     {ENVIRONMENT = "development"},
-    {WORKERS_RS_VERSION = "0.2.0"}
 ]
 send_metrics = false
 
+[build]
+command = "cargo install worker-build && worker-build --release"
+
 [env.test]
 name = "test-id"
 kv_namespaces = [
     { binding = "id", id = "fc0265ceaccd4f52883b236f1fdaf489" }
 ]
 vars = [
     {ENVIRONMENT = "test"},
-    {WORKERS_RS_VERSION = "0.2.0"}
 ]
 
 [env.prod]
@@ -31,8 +32,7 @@ kv_namespaces = [
 ]
 vars = [
     {ENVIRONMENT = "production"},
-    {WORKERS_RS_VERSION = "0.2.0"}
 ]
 
-[build]
-command = "cargo install worker-build && worker-build --release"
+[placement]
+mode = "smart"