two-stroke 5.6.3 → 5.8.0

package/package.json

@@ -10,25 +10,25 @@
     "type-check": "./bin/type-check.mjs"
   },
   "dependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.8.60",
-    "@cloudflare/workers-types": "^4.20250805.0",
-    "@sentry/cli": "^2.50.2",
-    "@types/node": "^24.2.0",
-    "@typescript-eslint/eslint-plugin": "^8.39.0",
-    "@typescript-eslint/parser": "^8.39.0",
+    "@cloudflare/vitest-pool-workers": "^0.8.65",
+    "@cloudflare/workers-types": "^4.20250819.0",
+    "@sentry/cli": "^2.52.0",
+    "@types/node": "^24.3.0",
+    "@typescript-eslint/eslint-plugin": "^8.40.0",
+    "@typescript-eslint/parser": "^8.40.0",
     "@vitest/coverage-istanbul": "^3.2.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-config-two-stroke": "^1.2.4",
+    "eslint-config-two-stroke": "^1.2.7",
     "eslint-config-typescript": "^3.0.0",
     "jose": "^6.0.12",
     "jwk-subtle": "^1.0.7",
     "mime": "^4.0.7",
-    "miniflare": "^4.20250803.0",
+    "miniflare": "^4.20250816.0",
     "openapi-fetch": "^0.14.0",
-    "openapi-typescript": "^7.8.0",
+    "openapi-typescript": "^7.9.1",
     "pbkdf-subtle": "^1.0.0",
     "toucan-js": "^4.1.1",
-    "zod": "^4.0.14"
+    "zod": "^4.0.17"
   },
   "peerDependencies": {
     "@sentry/cli": ">=2",
@@ -52,10 +52,10 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.6.0",
   "type": "module",
-  "version": "5.6.3",
+  "version": "5.8.0",
   "devDependencies": {
     "@types/eslint": "^9.6.1",
-    "eslint": "^9.32.0",
+    "eslint": "^9.33.0",
     "prettier": "^3.6.2",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"

package/src/index.ts

@@ -11,7 +11,11 @@ const noAuth = async () => null;
 const escapeRegex = (str: string) =>
   str.replace(/([.*+?^=!:$()|[\]\\])/g, "\\$&");
 
-export function twoStroke<T extends Env>(title: string, release: string) {
+export function twoStroke<T extends Env>(
+  title: string,
+  release: string,
+  origin?: (o: string | null) => string,
+) {
   let _queue: (c: {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     batch: MessageBatch<any>;
@@ -45,6 +49,14 @@ export function twoStroke<T extends Env>(title: string, release: string) {
       },
       context: ExecutionContext,
     ): Promise<Response> {
+      const defaultHeaders = {
+        "Access-Control-Allow-Origin": origin
+          ? env.SENTRY_ENVIRONMENT === "staging" &&
+            req.headers.get("Origin")?.split(":")[1]?.endsWith("localhost")
+            ? (req.headers.get("Origin") ?? "")
+            : origin(req.headers.get("Origin"))
+          : "*",
+      };
       const sentry = new Toucan({
         dsn: env.SENTRY_DSN,
         context,
@@ -60,9 +72,9 @@ export function twoStroke<T extends Env>(title: string, release: string) {
           return new Response(null, {
             status: 204,
             headers: {
-              "Access-Control-Allow-Origin": "*",
+              ...defaultHeaders,
               "Access-Control-Max-Age": "86400",
-              "Access-Control-Allow-Methods": "GET,PUT,POST,DELETE",
+              "Access-Control-Allow-Methods": "GET,HEAD,PUT,POST,DELETE",
               "Access-Control-Allow-Headers": "Authorization,Content-Type",
             },
           });
@@ -86,8 +98,8 @@ export function twoStroke<T extends Env>(title: string, release: string) {
                 status: 401,
                 statusText: "Invalid Authorization",
                 headers: {
+                  ...defaultHeaders,
                   "WWW-Authenticate": "Bearer",
-                  "Access-Control-Allow-Origin": "*",
                 },
               });
             }
@@ -112,9 +124,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
                   }),
                   {
                     status: 400,
-                    headers: {
-                      "Access-Control-Allow-Origin": "*",
-                    },
+                    headers: defaultHeaders,
                   },
                 );
               }
@@ -150,9 +160,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
                   }),
                   {
                     status: 400,
-                    headers: {
-                      "Access-Control-Allow-Origin": "*",
-                    },
+                    headers: defaultHeaders,
                   },
                 );
               }
@@ -185,16 +193,13 @@ export function twoStroke<T extends Env>(title: string, release: string) {
               ...response,
               headers: new Headers(response.headers ?? {}),
             };
-            if (!responseWithHeaders.headers.has("Content-Type"))
-              responseWithHeaders.headers.set(
-                "Content-Type",
-                "application/json",
-              );
-            if (!responseWithHeaders.headers.has("Access-Control-Allow-Origin"))
-              responseWithHeaders.headers.set(
-                "Access-Control-Allow-Origin",
-                "*",
-              );
+            Object.entries({
+              ...defaultHeaders,
+              "Content-Type": "application/json",
+            }).forEach(([k, v]) => {
+              if (!responseWithHeaders.headers.has(k))
+                responseWithHeaders.headers.set(k, v);
+            });
 
             return new Response(
               // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -208,7 +213,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
         }
         return new Response("", {
           status: 404,
-          headers: { "Access-Control-Allow-Origin": "*" },
+          headers: defaultHeaders,
         });
       } catch (err) {
         console.warn(err);
@@ -216,7 +221,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
         return new Response("", {
           status: 500,
           statusText: "Internal Server Error",
-          headers: { "Access-Control-Allow-Origin": "*" },
+          headers: defaultHeaders,
         });
       }
     },

package/src/types.ts

@@ -64,6 +64,16 @@ export type Handler<
       status?: 200;
       headers?: Record<string, string>;
     }
+  | {
+      body: z.infer<O>;
+      status: 301;
+      headers?: Record<string, string>;
+    }
+  | {
+      body: z.infer<O>;
+      status: 302;
+      headers?: Record<string, string>;
+    }
   | {
       body?: { error: string };
       status: number;

package/tsconfig.json

@@ -1,5 +1,6 @@
 {
   "compilerOptions": {
+    "erasableSyntaxOnly": true,
     "esModuleInterop": true,
     "isolatedModules": true,
     "lib": ["ESNext"],
@@ -14,7 +15,8 @@
       "@cloudflare/workers-types",
       "vitest/globals",
       "@cloudflare/vitest-pool-workers"
-    ]
+    ],
+    "verbatimModuleSyntax": true
   },
   "exclude": ["../../dist"]
 }