two-stroke 6.0.1 → 6.1.0

package/package.json

@@ -10,25 +10,25 @@
     "type-check": "./bin/type-check.mjs"
   },
   "dependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.8.70",
-    "@cloudflare/workers-types": "^4.20250906.0",
-    "@sentry/cli": "^2.53.0",
-    "@types/node": "^24.3.1",
-    "@typescript-eslint/eslint-plugin": "^8.43.0",
-    "@typescript-eslint/parser": "^8.43.0",
+    "@cloudflare/vitest-pool-workers": "^0.9.8",
+    "@cloudflare/workers-types": "^4.20250927.0",
+    "@sentry/cli": "^2.56.0",
+    "@types/node": "^24.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.45.0",
+    "@typescript-eslint/parser": "^8.45.0",
     "@vitest/coverage-istanbul": "^3.2.4",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-config-two-stroke": "^1.2.8",
+    "eslint-config-two-stroke": "^1.2.11",
     "eslint-config-typescript": "^3.0.0",
     "jose": "^6.1.0",
     "jwk-subtle": "^1.0.7",
-    "mime": "^4.0.7",
-    "miniflare": "^4.20250902.0",
+    "mime": "^4.1.0",
+    "miniflare": "^4.20250927.0",
     "openapi-fetch": "^0.14.0",
     "openapi-typescript": "^7.9.1",
     "pbkdf-subtle": "^1.0.0",
     "toucan-js": "^4.1.1",
-    "zod": "^4.1.5"
+    "zod": "^4.1.11"
   },
   "peerDependencies": {
     "@sentry/cli": ">=2",
@@ -52,10 +52,10 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.6.0",
   "type": "module",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "devDependencies": {
     "@types/eslint": "^9.6.1",
-    "eslint": "^9.35.0",
+    "eslint": "^9.36.0",
     "prettier": "^3.6.2",
     "typescript": "^5.9.2",
     "vitest": "^3.2.4"

package/src/index.ts

@@ -14,7 +14,7 @@ const escapeRegex = (str: string) =>
 export function twoStroke<T extends Env>(
   title: string,
   release: string,
-  origin?: (o: string | null) => string,
+  origin?: (o: string | null) => string
 ) {
   let _queue: (c: {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -47,7 +47,7 @@ export function twoStroke<T extends Env>(
         readonly SENTRY_DSN: string;
         readonly SENTRY_ENVIRONMENT: string;
       },
-      context: ExecutionContext,
+      context: ExecutionContext
     ): Promise<Response> {
       const defaultHeaders = {
         "Access-Control-Allow-Origin": origin
@@ -85,8 +85,8 @@ export function twoStroke<T extends Env>(
           if (req.method === route.method && route.matcher.test(pathname)) {
             const params = Object.fromEntries(
               Object.entries(pathname.match(route.matcher)?.groups ?? {}).map(
-                ([k, v]) => [k, decodeURIComponent(v)],
-              ),
+                ([k, v]) => [k, decodeURIComponent(v)]
+              )
             );
             let claims;
             try {
@@ -125,7 +125,7 @@ export function twoStroke<T extends Env>(
                   {
                     status: 400,
                     headers: defaultHeaders,
-                  },
+                  }
                 );
               }
               const body = route.input
@@ -145,6 +145,7 @@ export function twoStroke<T extends Env>(
                   params,
                   searchParams: new URL(req.url).searchParams,
                   sentry,
+                  waitUntil: (p: Promise<void>) => context.waitUntil(p),
                 });
               else {
                 console.error({
@@ -161,7 +162,7 @@ export function twoStroke<T extends Env>(
                   {
                     status: 400,
                     headers: defaultHeaders,
-                  },
+                  }
                 );
               }
             } else {
@@ -174,6 +175,7 @@ export function twoStroke<T extends Env>(
                 params,
                 searchParams: new URL(req.url).searchParams,
                 sentry,
+                waitUntil: (p: Promise<void>) => context.waitUntil(p),
               });
             }
             if (response.status === undefined || response.status === 200) {
@@ -211,7 +213,7 @@ export function twoStroke<T extends Env>(
               "application/json"
                 ? JSON.stringify(response.body)
                 : response.body,
-              responseWithHeaders,
+              responseWithHeaders
             );
           }
         }
@@ -235,7 +237,7 @@ export function twoStroke<T extends Env>(
         readonly SENTRY_DSN: string;
         readonly SENTRY_ENVIRONMENT: string;
       },
-      context: ExecutionContext,
+      context: ExecutionContext
     ) {
       const sentry = new Toucan({
         dsn: env.SENTRY_DSN,
@@ -256,7 +258,7 @@ export function twoStroke<T extends Env>(
         readonly SENTRY_DSN: string;
         readonly SENTRY_ENVIRONMENT: string;
       },
-      context: ExecutionContext,
+      context: ExecutionContext
     ) {
       const sentry = new Toucan({
         dsn: env.SENTRY_DSN,
@@ -281,7 +283,7 @@ export function twoStroke<T extends Env>(
         readonly SENTRY_DSN: string;
         readonly SENTRY_ENVIRONMENT: string;
       },
-      context: ExecutionContext,
+      context: ExecutionContext
     ) {
       const sentry = new Toucan({
         dsn: env.SENTRY_DSN,
@@ -301,13 +303,13 @@ export function twoStroke<T extends Env>(
         env: T;
         message: ForwardableEmailMessage;
         sentry: Toucan;
-      }) => Promise<void>,
+      }) => Promise<void>
     ) {
       _email = handler;
     },
     schedule(
       cron: string,
-      handler: (c: { env: T; sentry: Toucan }) => Promise<void>,
+      handler: (c: { env: T; sentry: Toucan }) => Promise<void>
     ) {
       crons[cron] = handler;
     },
@@ -329,13 +331,13 @@ export function twoStroke<T extends Env>(
       <J>(k: keyof T, ak: keyof T) =>
       async ({ req, env }: { req: Request; env: T }) => {
         const [scheme, token] = (req.headers.get("Authorization") ?? " ").split(
-          " ",
+          " "
         );
         if (scheme === "Bearer") {
           const claims = await jwkVerify<J>(
             token ?? "",
             env[k] as string,
-            env[ak] as string,
+            env[ak] as string
           );
           if (!claims) {
             throw Error("Invalid");
@@ -351,7 +353,7 @@ export function twoStroke<T extends Env>(
         batch: MessageBatch<z.input<I>>;
         sentry: Toucan;
         parsedBatch: ZodSafeParseResult<z.output<I>>[];
-      }) => Promise<void>,
+      }) => Promise<void>
     ) {
       _queue = async ({
         batch,
@@ -378,14 +380,14 @@ export function twoStroke<T extends Env>(
       path: P,
       input: I,
       output: O,
-      handler: Handler<T, I, O, A, P>,
+      handler: Handler<T, I, O, A, P>
     ) {
       routes.push({
         auth,
         method: "PUT",
         path,
         matcher: new RegExp(
-          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`,
+          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`
         ),
         input,
         output,
@@ -406,14 +408,14 @@ export function twoStroke<T extends Env>(
       input: I,
       output: O,
       handler: Handler<T, I, O, A, P>,
-      params?: PP,
+      params?: PP
     ) {
       routes.push({
         auth,
         method: "POST",
         path,
         matcher: new RegExp(
-          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`,
+          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`
         ),
         input,
         output,
@@ -433,14 +435,14 @@ export function twoStroke<T extends Env>(
       path: P,
       output: O,
       handler: Handler<T, undefined, O, A, P>,
-      params?: PP,
+      params?: PP
     ) {
       routes.push({
         auth,
         method: "GET",
         path,
         matcher: new RegExp(
-          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`,
+          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`
         ),
         output,
         handler,
@@ -458,14 +460,14 @@ export function twoStroke<T extends Env>(
       path: P,
       output: O,
       handler: Handler<T, undefined, O, A, P>,
-      params?: PP,
+      params?: PP
     ) {
       routes.push({
         auth,
         method: "DELETE",
         path,
         matcher: new RegExp(
-          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`,
+          `^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`
         ),
         output,
         handler,
@@ -483,7 +485,7 @@ type AddToQueueConfig = QueueSendOptions & {
 export async function addToQueue<T>(
   queue: Queue<T>,
   message: T,
-  config: AddToQueueConfig = {},
+  config: AddToQueueConfig = {}
 ) {
   const { retries, backoffFactor, ...options } = config;
 

package/src/types.ts

@@ -58,6 +58,7 @@ export type Handler<
   searchParams: URLSearchParams;
   claims: A;
   sentry: Toucan;
+  waitUntil: (p: Promise<void>) => void;
 }) => Promise<
   | {
       body: z.infer<O>;