Adding environments

Author: RobFaustLZ

package.json

@@ -1,6 +1,6 @@
 {
   "name": "labelzoom-cf-api-proxy",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "private": true,
   "scripts": {
     "deploy": "wrangler deploy",

src/index.ts

@@ -13,8 +13,6 @@
 
 import { handleOptions, responseWithAllowOrigin } from "./cors";
 
-const IS_TRUE = /true/i;
-
 /**
  * Log conversion request and response data to Cloudflare R2
  * @param request 
@@ -25,7 +23,7 @@ const IS_TRUE = /true/i;
  */
 async function handleConversionLog(request: Request<unknown, IncomingRequestCfProperties<unknown>>, env: Env, ctx: ExecutionContext, url: URL) {
 	const requestID = new Date().toISOString().substring(0, 19).replaceAll('-', '/').replaceAll('T', '/').replaceAll(':', '') + '--' + crypto.randomUUID();
-	const loggingEnabled = IS_TRUE.test(env.LZ_LOG_CONVERSION_DATA);
+	const loggingEnabled = Math.random() < env.LZ_LOG_SAMPLE_RATE;
 
 	// Clone and log request asynchronously
 	if (loggingEnabled) ctx.waitUntil(env.LZ_R2_BUCKET.put(requestID + '/in', request.clone().body));
@@ -49,7 +47,7 @@ async function handleConversionLog(request: Request<unknown, IncomingRequestCfPr
  */
 async function proxyRequestToBackend(request: Request, url: URL, env: Env, requestID = ''): Promise<Response> {
 	const backendUrl = env.LZ_PROD_API_BASE_URL + url.pathname + url.search;
-	const newRequest = new Request(backendUrl ?? request.url, request);
+	const newRequest = new Request(backendUrl, request);
 	let ip = request.headers.get("X-Forwarded-For") ?? '';
 	if (!ip) {
 		ip = request.headers.get("Cf-Connecting-Ip") ?? '';

worker-configuration.d.ts

@@ -1,7 +1,7 @@
 // Generated by Wrangler
 // After adding bindings to `wrangler.toml`, regenerate this interface via `npm run cf-typegen`
 interface Env {
-    LZ_LOG_CONVERSION_DATA: string;
+    LZ_LOG_SAMPLE_RATE: number;
     LZ_PROD_API_BASE_URL: string;
     LZ_PROD_API_SECRET_KEY: string;
     LZ_R2_BUCKET: R2Bucket;

wrangler.toml

@@ -6,7 +6,7 @@ compatibility_flags = ["nodejs_compat"]
 tail_consumers = [{service = "labelzoom-cf-api-proxy-tail"}]
 
 [limits]
-cpu_ms = 1000
+cpu_ms = 100
 
 # Automatically place your workloads in an optimal location to minimize latency.
 # If you are running back-end logic in a Worker, running it closer to your back-end infrastructure
@@ -21,10 +21,30 @@ cpu_ms = 1000
 # Note: Use secrets to store sensitive data.
 # - https://developers.cloudflare.com/workers/configuration/secrets/
 [vars]
-LZ_LOG_CONVERSION_DATA = "false"
+LZ_LOG_SAMPLE_RATE = 0.0
 LZ_PROD_API_BASE_URL = "https://api-backend.labelzoom.net"
 # LZ_PROD_API_SECRET_KEY = <SECRET>
 
+[env.beta.vars]
+LZ_LOG_SAMPLE_RATE = 1.0
+LZ_PROD_API_BASE_URL = "https://api-backend.labelzoom.net"
+
+[env.public.vars]
+LZ_LOG_SAMPLE_RATE = 0.0
+LZ_PROD_API_BASE_URL = "https://api-backend.labelzoom.net"
+
+[env.eus1.vars]
+LZ_LOG_SAMPLE_RATE = 0.0
+LZ_PROD_API_BASE_URL = "https://prod-api-eus1.labelzoom.net"
+# [env.eus1.placement]
+# mode = "smart"
+
+[env.eus2.vars]
+LZ_LOG_SAMPLE_RATE = 0.0
+LZ_PROD_API_BASE_URL = "https://prod-api-eus2.labelzoom.net"
+# [env.eus2.placement]
+# mode = "smart"
+
 # Bind the Workers AI model catalog. Run machine learning models, powered by serverless GPUs, on Cloudflare’s global network
 # Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#workers-ai
 # [ai]
@@ -99,6 +119,18 @@ LZ_PROD_API_BASE_URL = "https://api-backend.labelzoom.net"
 # Docs: https://developers.cloudflare.com/workers/wrangler/configuration/#r2-buckets
 [[r2_buckets]]
 binding = "LZ_R2_BUCKET"
+bucket_name = "labelzoom-conversions-dev"
+
+[[env.public.r2_buckets]]
+binding = "LZ_R2_BUCKET"
+bucket_name = "labelzoom-conversions-prod"
+
+[[env.eus1.r2_buckets]]
+binding = "LZ_R2_BUCKET"
+bucket_name = "labelzoom-conversions-prod"
+
+[[env.eus2.r2_buckets]]
+binding = "LZ_R2_BUCKET"
 bucket_name = "labelzoom-conversions-prod"
 
 # Bind another Worker service. Use this binding to call another Worker without network overhead.