two-stroke 7.10.1 → 8.0.0

package/.github/workflows/ci.yml

@@ -17,4 +17,10 @@ jobs:
 
       - uses: ./.github/actions/install
 
-      - run: pnpm eslint
+      - run: pnpm oxlint
+
+      - run: pnpm oxfmt --check
+
+      - run: pnpm tsc --noEmit
+
+      - run: pnpm knip

package/.knip.json

@@ -0,0 +1,4 @@
+{
+  "entry": ["src/*.ts"],
+  "ignoreDependencies": ["cloudflare"]
+}

package/bin/api-types.mjs

@@ -2,7 +2,7 @@
 
 import fs from "node:fs";
 import openapiTS from "openapi-typescript";
-import prettier from "prettier";
+import { format } from "oxfmt";
 import ts from "typescript";
 
 const services = process.argv[2].split(",");
@@ -17,6 +17,7 @@ await Promise.all(
         if ("format" in schemaObject && schemaObject.format === "uuid") {
           return schemaObject.nullable ? ts.factory.createUnionTypeNode([UUID, NULL]) : UUID;
         }
+        return null;
       },
     });
     const printer = ts.createPrinter({});
@@ -28,14 +29,17 @@ await Promise.all(
     const result = printer.printNode(ts.EmitHint.Unspecified, output[0], resultFile);
     fs.writeFileSync(
       `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
-      await prettier.format(
-        `// Autogenerated by two-stroke
+      (
+        await format(
+          `src/__definitions__/${service.replace("https://", "")}-definitions.ts`,
+          `// Autogenerated by two-stroke
 
-${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf-8")}
+${fs.readFileSync("src/__definitions__/type-definitions.ts", "utf8")}
 
 ${result}`,
-        { parser: "typescript", printWidth: 100 },
-      ),
+          { parser: "typescript", printWidth: 100 },
+        )
+      ).code,
     );
   }),
 );

package/bin/bulk.mjs

@@ -2,11 +2,11 @@
 "use strict";
 
 import fs from "fs";
-import { cmd } from "../src/cmd.mjs";
 import mime from "mime";
+import { cmd } from "../src/cmd.mjs";
 
 const entryOrRest = process.argv[2];
-const entry = process.argv.slice(3);
+const entry = new Set(process.argv.slice(3));
 
 const ents = await fs.promises.readdir("dist", {
   withFileTypes: true,
@@ -15,14 +15,12 @@ const ents = await fs.promises.readdir("dist", {
 const files = await Promise.all(
   ents
     .filter((ent) => ent.isFile())
-    .filter((ent) =>
-      entryOrRest == "entry" ? entry.includes(ent.name) : !entry.includes(ent.name),
-    )
+    .filter((ent) => (entryOrRest == "entry" ? entry.has(ent.name) : !entry.has(ent.name)))
     .map((ent) => {
       const type = mime.getType(`${ent.parentPath}/${ent.name}`);
       const key = `${ent.parentPath.substring(4)}/${ent.name}`;
       return (async () => ({
-        key: entry.includes(ent.name) ? `${process.env.DOMAIN}${key}` : key,
+        key: entry.has(ent.name) ? `${process.env.DOMAIN}${key}` : key,
         value: (await fs.promises.readFile(`${ent.parentPath}/${ent.name}`)).toString("base64"),
         base64: true,
         metadata: {
@@ -32,7 +30,7 @@ const files = await Promise.all(
               : type === "text/javascript"
                 ? "text/javascript;charset=utf-8"
                 : type,
-          "Cache-Control": entry.includes(ent.name) ? "nocache" : "max-age=31536000, immutable",
+          "Cache-Control": entry.has(ent.name) ? "nocache" : "max-age=31536000, immutable",
         },
       }))();
     }),

package/bin/deploy.mjs

@@ -1,8 +1,8 @@
 #!/usr/bin/env node
 "use strict";
 import fs from "fs";
-import { cmd } from "../src/cmd.mjs";
 import { basename } from "path";
+import { cmd } from "../src/cmd.mjs";
 
 const env = process.argv[2];
 const release = process.argv[3];

package/bin/format.mjs

@@ -2,5 +2,5 @@
 "use strict";
 import { cmd } from "../src/cmd.mjs";
 
-cmd("eslint --cache --fix");
-cmd("prettier --cache --write .");
+cmd("oxfmt");
+cmd("oxlint --fix");

package/bin/lint.mjs

@@ -6,5 +6,5 @@ import { cmd } from "../src/cmd.mjs";
 if (fs.existsSync("wrangler.jsonc")) {
   cmd("wrangler types --env-file /dev/null --strict-vars false --check");
 }
-cmd("eslint --cache --max-warnings=0");
-cmd("prettier --cache --check .");
+cmd("oxfmt --check");
+cmd("oxlint");

package/bin/test.mjs

@@ -1,12 +1,12 @@
 #!/usr/bin/env node
 "use strict";
 import fs from "fs";
-import { cmd } from "../src/cmd.mjs";
-import consumers from "stream/consumers";
+import { Miniflare } from "miniflare";
 import openapiTS from "openapi-typescript";
-import prettier from "prettier";
+import { format } from "oxfmt";
+import consumers from "stream/consumers";
 import ts from "typescript";
-import { Miniflare } from "miniflare";
+import { cmd } from "../src/cmd.mjs";
 
 if (fs.existsSync("wrangler.jsonc")) {
   cmd("wrangler deploy --env=  --dry-run --outdir=dist");
@@ -32,7 +32,7 @@ if (fs.existsSync("wrangler.jsonc")) {
       .join("\n\n");
     fs.writeFileSync(
       "test/api.d.ts",
-      await prettier.format(result, { parser: "typescript", printWidth: 100 }),
+      (await format("test/api.d.ts", result, { parser: "typescript", printWidth: 100 })).code,
     );
   }
 }

package/oxfmt.config.ts

@@ -0,0 +1,15 @@
+import { defineConfig } from "oxfmt";
+
+export default defineConfig({
+  sortImports: {
+    newlinesBetween: false,
+    groups: [
+      ["value-builtin", "value-external"],
+      ["value-internal", "value-parent", "value-sibling", "value-index"],
+      { newlinesBetween: true },
+      "type-import",
+      "unknown",
+    ],
+  },
+  ignorePatterns: ["worker-configuration.d.ts", "wrangler.jsonc"],
+});

package/oxlint.config.ts

@@ -0,0 +1,90 @@
+import { defineConfig } from "oxlint";
+
+export default defineConfig({
+  plugins: ["eslint", "typescript", "unicorn", "oxc", "import", "promise", "vitest"],
+  options: {
+    typeAware: true,
+  },
+  categories: {
+    correctness: "error",
+    suspicious: "warn",
+    perf: "error",
+    style: "warn",
+  },
+  rules: {
+    "no-map-spread": "off",
+    "no-named-export": "off",
+    "no-magic-numbers": "off",
+    "consistent-indexed-object-style": "off",
+    "id-length": "off",
+    "no-await-expression-member": "off",
+    "max-nested-calls": "off",
+    "sort-keys": "off",
+    curly: "off",
+    "switch-case-braces": "off",
+    "vitest/require-hook": "off",
+    "no-ternary": "off",
+    "group-exports": "off",
+    "exports-last": "off",
+    "prefer-default-export": "off",
+    "no-null": "off",
+    "consistent-type-specifier-style": "off",
+    "max-statements": "off",
+    "consistent-type-imports": "error",
+    "relative-url-style": ["error", "always"],
+    "no-namespace": "off",
+    "no-duplicate-imports": ["error", { allowSeparateTypeImports: true }],
+    "func-style": "off",
+    "sort-imports": [
+      "error",
+      {
+        ignoreDeclarationSort: true,
+        ignoreMemberSort: false,
+      },
+    ],
+    "new-cap": "off",
+    "promise/prefer-await-to-callbacks": "off",
+    "promise/avoid-new": "off",
+    "prefer-await-to-then": "off",
+    "max-params": "off",
+    "no-underscore-dangle": "off",
+    "no-nested-ternary": "off",
+    "unicorn/no-nested-ternary": "off",
+    "no-anonymous-default-export": "off",
+    "no-continue": "off",
+    "init-declarations": "off",
+    "prefer-to-be-truthy": "off",
+    "vitest/prefer-expect-assertions": "off",
+    "vitest/prefer-importing-vitest-globals": "off",
+    "vitest/no-importing-vitest-globals": "error",
+    "vitest/require-top-level-describe": "off",
+    "vitest/max-expects": "off",
+    "vitest/no-hooks": "off",
+  },
+  overrides: [
+    {
+      files: ["*.test.ts", "*.spec.ts"],
+      rules: {
+        "@typescript-eslint/no-explicit-any": "off",
+      },
+    },
+    {
+      files: ["*-definitions.ts"],
+      rules: {
+        "no-unused-vars": "off",
+        "@typescript-eslint/no-redundant-type-constituents": "off",
+        "@typescript-eslint/no-duplicate-type-constituents": "off",
+        "group-exports": "off",
+        "exports-last": "off",
+        "consistent-indexed-object-style": "off",
+      },
+    },
+    {
+      files: ["bin/*.mjs", "src/cmd.mjs"],
+      rules: {
+        "import/no-nodejs-modules": "off",
+        "prefer-destructuring": "off",
+      },
+    },
+  ],
+});

package/package.json

@@ -1,4 +1,12 @@
 {
+  "name": "two-stroke",
+  "version": "8.0.0",
+  "description": "Simple Cloudflare Worker framework.",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/change-engine/two-stroke"
+  },
   "bin": {
     "api-types": "./bin/api-types.mjs",
     "bulk": "./bin/bulk.mjs",
@@ -9,59 +17,44 @@
     "test": "./bin/test.mjs",
     "type-check": "./bin/type-check.mjs"
   },
+  "type": "module",
+  "main": "src/index.ts",
   "dependencies": {
-    "@cloudflare/vitest-pool-workers": "^0.18.0",
-    "@sentry/cli": "^3.6.0",
-    "@typescript-eslint/eslint-plugin": "^8.63.0",
-    "@typescript-eslint/parser": "^8.62.1",
-    "@vitest/runner": "^4.1.8",
-    "@vitest/snapshot": "^4.1.8",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-config-two-stroke": "^1.5.7",
-    "eslint-config-typescript": "^3.0.0",
     "jose": "^6.2.3",
     "mime": "^4.1.0",
-    "miniflare": "^4.20260701.0",
-    "msw": "^2.14.6",
+    "msw": "^2.15.0",
     "openapi-fetch": "^0.17.0",
     "openapi-typescript": "^7.13.0",
     "toucan-js": "^4.1.1",
     "zod": "^4.4.3"
   },
+  "devDependencies": {
+    "@cloudflare/vitest-pool-workers": "^0.18.4",
+    "knip": "^6.26.0",
+    "oxfmt": "^0.58.0",
+    "oxlint": "^1.74.0",
+    "oxlint-tsgolint": "^0.24.0",
+    "typescript": "^6.0.3",
+    "vitest": "^4.1.10"
+  },
   "peerDependencies": {
-    "@sentry/cli": ">=2",
-    "eslint": ">=10",
-    "prettier": ">=3",
+    "miniflare": "^4.20260708.1",
+    "oxfmt": "^0.58.0",
+    "oxlint": "^1.73.0",
+    "oxlint-tsgolint": "^0.24.0",
     "typescript": ">=5",
     "vitest": ">=4",
     "wrangler": ">=3"
   },
-  "description": "Simple Cloudflare Worker framework.",
-  "engines": {
-    "node": "^24.9.0"
+  "prettier": {
+    "printWidth": 100
   },
   "eslintConfig": {
     "extends": [
       "two-stroke"
     ]
   },
-  "license": "MIT",
-  "main": "src/index.ts",
-  "name": "two-stroke",
-  "prettier": {
-    "printWidth": 100
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/change-engine/two-stroke"
-  },
-  "type": "module",
-  "version": "7.10.1",
-  "devDependencies": {
-    "@types/eslint": "^9.6.1",
-    "eslint": "^10.6.0",
-    "prettier": "^3.9.4",
-    "typescript": "^6.0.3",
-    "vitest": "^4.1.10"
+  "engines": {
+    "node": "^24.9.0"
   }
 }

package/src/cmd.mjs

@@ -8,7 +8,6 @@ export function cmd(program, args = []) {
       stdio: "inherit",
     },
   );
-  // eslint-disable-next-line n/no-process-exit
   if (status) process.exit(status);
   if (error) throw error;
 }

package/src/index.ts

@@ -1,27 +1,22 @@
 import { Toucan } from "toucan-js";
-import { type ZodSafeParseResult, z, ZodObject, ZodType } from "zod/v4";
+import { z } from "zod/v4";
 import { openAPI } from "./open-api";
 import { type Handler, type Route } from "./types";
+import { jwkVerifyMulti, pbkdfVerify } from "./util";
+
 import type { JSONWebKeySet } from "jose";
-import { pbkdfVerify, jwkVerifyMulti } from "./util";
+import type { ZodObject, ZodSafeParseResult, ZodType } from "zod/v4";
 
-// eslint-disable-next-line @typescript-eslint/require-await
 const noAuth = async () => null;
 
-const escapeRegex = (str: string) => str.replace(/([.*+?^=!:$()|[\]\\])/g, "\\$&");
+const escapeRegex = (str: string) => str.replace(/(?<seg>[.*+?^=!:$()|[\]\\])/g, String.raw`\$&`);
 
 export function twoStroke<T>(
   title: string,
   release: string,
   origin?: (o: string | null) => string,
 ) {
-  let _queue: (c: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    batch: MessageBatch<any>;
-    env: T;
-    sentry: Toucan;
-  }) => Promise<void>;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  let _queue: (c: { batch: MessageBatch<any>; env: T; sentry: Toucan }) => Promise<void>;
   const routes: Route<T, any>[] = [];
   routes.push({
     auth: noAuth,
@@ -46,7 +41,7 @@ export function twoStroke<T>(
     ): Promise<Response> {
       const defaultHeaders = {
         "Access-Control-Allow-Origin": origin
-          ? env.SENTRY_ENVIRONMENT === "staging" &&
+          ? (env.SENTRY_ENVIRONMENT === "staging" || env.SENTRY_ENVIRONMENT === "dev") &&
             req.headers.get("Origin")?.split(":")[1]?.endsWith("localhost")
             ? (req.headers.get("Origin") ?? "")
             : origin(req.headers.get("Origin"))
@@ -87,10 +82,10 @@ export function twoStroke<T>(
             );
             let claims;
             try {
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+              // oxlint-disable-next-line no-await-in-loop
               claims = await route.auth({ req, env });
-            } catch (err) {
-              console.warn(err);
+            } catch (error) {
+              console.warn(error);
               return new Response("", {
                 status: 401,
                 statusText: "Invalid Authorization",
@@ -105,19 +100,21 @@ export function twoStroke<T>(
               try {
                 rawBody = route.input
                   ? req.headers.get("Content-Type") === "application/x-www-form-urlencoded"
-                    ? Object.fromEntries(new URLSearchParams(await req.text()))
-                    : await req.json()
+                    ? // oxlint-disable-next-line no-await-in-loop
+                      Object.fromEntries(new URLSearchParams(await req.text()))
+                    : // oxlint-disable-next-line no-await-in-loop
+                      await req.json()
                   : undefined;
-              } catch (e) {
+              } catch (error) {
                 console.error({
                   message: "Request body is required'",
-                  error: e instanceof Error ? e.message : "Error",
+                  error: error instanceof Error ? error.message : "Error",
                 });
-                return new Response(
-                  JSON.stringify({
+                return Response.json(
+                  {
                     error: "Request body is required",
                     issues: [],
-                  }),
+                  },
                   {
                     status: 400,
                     headers: defaultHeaders,
@@ -132,11 +129,11 @@ export function twoStroke<T>(
                     error: undefined,
                   };
               if (body.success)
+                // oxlint-disable-next-line no-await-in-loop
                 response = await route.handler({
                   req,
                   env,
                   body: body.data,
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                   claims,
                   params,
                   searchParams: new URL(req.url).searchParams,
@@ -149,12 +146,12 @@ export function twoStroke<T>(
                   error: body.error,
                   body: rawBody,
                 });
-                return new Response(
-                  JSON.stringify({
+                return Response.json(
+                  {
                     error: "Request body schema invalid",
                     issues: JSON.parse(body.error?.message ?? "{}") as unknown,
                     name: body.error?.name,
-                  }),
+                  },
                   {
                     status: 400,
                     headers: defaultHeaders,
@@ -162,10 +159,10 @@ export function twoStroke<T>(
                 );
               }
             } else {
+              // oxlint-disable-next-line no-await-in-loop
               response = await route.handler({
                 req,
                 env,
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 claims,
                 body: undefined,
                 params,
@@ -180,7 +177,6 @@ export function twoStroke<T>(
                 console.error({
                   message: "Response body schema invalid",
                   error: output.error,
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                   body: response.body,
                 });
               }
@@ -202,7 +198,6 @@ export function twoStroke<T>(
             });
 
             return new Response(
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
               responseWithHeaders.headers.get("Content-Type") === "application/json"
                 ? JSON.stringify(response.body)
                 : response.body,
@@ -214,9 +209,9 @@ export function twoStroke<T>(
           status: 404,
           headers: defaultHeaders,
         });
-      } catch (err) {
-        console.warn(err);
-        sentry.captureException(err);
+      } catch (error) {
+        console.warn(error);
+        sentry.captureException(error);
         return new Response("", {
           status: 500,
           statusText: "Internal Server Error",
@@ -240,9 +235,9 @@ export function twoStroke<T>(
       });
       try {
         return await _queue({ batch, env, sentry });
-      } catch (err) {
-        console.warn(err);
-        sentry.captureException(err);
+      } catch (error) {
+        console.warn(error);
+        sentry.captureException(error);
       }
     },
     async scheduled(
@@ -265,9 +260,9 @@ export function twoStroke<T>(
           throw new Error("CRON Handler not found");
         }
         await handler({ env, sentry });
-      } catch (err) {
-        console.warn(err);
-        sentry.captureException(err);
+      } catch (error) {
+        console.warn(error);
+        sentry.captureException(error);
       }
     },
     async email(
@@ -286,9 +281,9 @@ export function twoStroke<T>(
       });
       try {
         await _email({ message, env, sentry });
-      } catch (err) {
-        console.warn(err);
-        sentry.captureException(err);
+      } catch (error) {
+        console.warn(error);
+        sentry.captureException(error);
       }
     },
     emailHandler(
@@ -306,6 +301,7 @@ export function twoStroke<T>(
         const [scheme, token] = (req.headers.get(customHeaderName) ?? " ").split(" ");
         if (
           (scheme === "token" || scheme === "Bearer") &&
+          // oxlint-disable-next-line typescript/no-unsafe-type-assertion
           (await pbkdfVerify(env[k] as string, token ?? ""))
         )
           return;
@@ -316,13 +312,17 @@ export function twoStroke<T>(
       async ({ req, env }: { req: Request; env: T }) => {
         const [scheme, token] = (req.headers.get("Authorization") ?? " ").split(" ");
         if (scheme === "Bearer") {
+          // oxlint-disable-next-line typescript/no-unsafe-type-assertion
           const rawIssuer = env[k] as string;
+          // oxlint-disable-next-line typescript/no-unsafe-type-assertion
           const rawAudience = env[ak] as string;
           const issuer = rawIssuer.startsWith("{")
-            ? (JSON.parse(rawIssuer) as Record<string, JSONWebKeySet | true>)
+            ? // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+              (JSON.parse(rawIssuer) as Record<string, JSONWebKeySet | true>)
             : { [rawIssuer]: true as const };
           const audience = rawAudience.startsWith("[")
-            ? (JSON.parse(rawAudience) as string[])
+            ? // oxlint-disable-next-line typescript/no-unsafe-type-assertion
+              (JSON.parse(rawAudience) as string[])
             : [rawAudience];
           const claims = await jwkVerifyMulti<J>(token ?? "", issuer, audience);
           if (!claims) {
@@ -361,26 +361,21 @@ export function twoStroke<T>(
         console.log("Queue batch finished");
       };
     },
-    put<
-      I extends ZodType | undefined,
-      O extends ZodType,
-      A,
-      P extends string,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      PP extends ZodObject<any> | undefined,
-    >(
+    put<I extends ZodType | undefined, O extends ZodType, A, P extends string>(
       auth: Route<T, A>["auth"],
       path: P,
       input: I,
       output: O,
       handler: Handler<T, I, O, A, P>,
-      params?: PP,
+      params?: ZodObject<any>,
     ) {
       routes.push({
         auth,
         method: "PUT",
         path,
-        matcher: new RegExp(`^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`),
+        matcher: new RegExp(
+          `^${escapeRegex(path).replaceAll(/\/{(?<seg>[^}]*)}/g, String.raw`/(?<$seg>[^\/]*)`)}$`,
+        ),
         input,
         output,
         handler,
@@ -388,26 +383,21 @@ export function twoStroke<T>(
       });
     },
 
-    post<
-      I extends ZodType | undefined,
-      O extends ZodType,
-      A,
-      P extends string,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      PP extends ZodObject<any> | undefined,
-    >(
+    post<I extends ZodType | undefined, O extends ZodType, A, P extends string>(
       auth: Route<T, A>["auth"],
       path: P,
       input: I,
       output: O,
       handler: Handler<T, I, O, A, P>,
-      params?: PP,
+      params?: ZodObject<any>,
     ) {
       routes.push({
         auth,
         method: "POST",
         path,
-        matcher: new RegExp(`^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`),
+        matcher: new RegExp(
+          `^${escapeRegex(path).replaceAll(/\/{(?<seg>[^}]*)}/g, String.raw`/(?<$seg>[^\/]*)`)}$`,
+        ),
         input,
         output,
         handler,
@@ -415,47 +405,39 @@ export function twoStroke<T>(
       });
     },
 
-    get<
-      O extends ZodType,
-      A,
-      P extends string,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      PP extends ZodObject<any> | undefined,
-    >(
+    get<O extends ZodType, A, P extends string>(
       auth: Route<T, A>["auth"],
       path: P,
       output: O,
       handler: Handler<T, undefined, O, A, P>,
-      params?: PP,
+      params?: ZodObject<any>,
     ) {
       routes.push({
         auth,
         method: "GET",
         path,
-        matcher: new RegExp(`^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`),
+        matcher: new RegExp(
+          `^${escapeRegex(path).replaceAll(/\/{(?<seg>[^}]*)}/g, String.raw`/(?<$seg>[^\/]*)`)}$`,
+        ),
         output,
         handler,
         params,
       });
     },
-    delete<
-      O extends ZodType,
-      A,
-      P extends string,
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
-      PP extends ZodObject<any> | undefined,
-    >(
+    delete<O extends ZodType, A, P extends string>(
       auth: Route<T, A>["auth"],
       path: P,
       output: O,
       handler: Handler<T, undefined, O, A, P>,
-      params?: PP,
+      params?: ZodObject<any>,
     ) {
       routes.push({
         auth,
         method: "DELETE",
         path,
-        matcher: new RegExp(`^${escapeRegex(path).replaceAll(/\/{([^}]*)}/g, "/(?<$1>[^\\/]*)")}$`),
+        matcher: new RegExp(
+          `^${escapeRegex(path).replaceAll(/\/{(?<seg>[^}]*)}/g, String.raw`/(?<$seg>[^\/]*)`)}$`,
+        ),
         output,
         handler,
         params,
@@ -474,13 +456,15 @@ export async function addToQueue<T>(queue: Queue<T>, message: T, config: AddToQu
 
   for (let i = 0; i < (retries ?? 5); i++) {
     try {
+      // oxlint-disable-next-line no-await-in-loop
       await queue.send(message, options);
       return;
-    } catch (err) {
+    } catch (error) {
       const backoff = (backoffFactor ?? 2) ** i;
-      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-      console.log(`Error adding to queue: ${err}`);
+      // oxlint-disable-next-line typescript/restrict-template-expressions
+      console.log(`Error adding to queue: ${error}`);
       console.log(`Retrying in ${backoff} seconds`);
+      // oxlint-disable-next-line no-await-in-loop
       await new Promise((resolve) => setTimeout(resolve, backoff * 1000));
     }
   }

package/src/once.ts

@@ -1,4 +1,4 @@
-import type { z, ZodSafeParseResult, ZodType } from "zod/v4";
+import type { ZodSafeParseResult, ZodType, z } from "zod/v4";
 
 export const once = async <T extends { retry_count: number }>(
   key: string,
@@ -17,7 +17,7 @@ export const once = async <T extends { retry_count: number }>(
       {
         delaySeconds: Math.min(
           Math.round(
-            (0.5 + Math.random() / 2) * Math.pow(retry_count, backoffExponent) + Math.random() * 4,
+            (0.5 + Math.random() / 2) * retry_count ** backoffExponent + Math.random() * 4,
           ),
           900,
         ),
@@ -50,15 +50,9 @@ export const retryHandler =
     env: T;
   }) => {
     const isFinalAttempt = body.retry >= maxRetries;
-    await handler(
-      body,
-      env,
-      isFinalAttempt,
-      // eslint-disable-next-line @typescript-eslint/require-await
-      async (cb) => {
-        waitUntil(cb());
-      },
-    );
+    await handler(body, env, isFinalAttempt, async (cb) => {
+      waitUntil(cb());
+    });
 
     return { body: { ok: true } };
   };
@@ -82,7 +76,7 @@ export const retryQueue =
     parsedBatch: ZodSafeParseResult<z.output<M>>[];
     env: T;
   }) => {
-    const message = batch.messages[0];
+    const [message] = batch.messages;
     if (!message || batch.messages.length !== 1) {
       console.warn({ batch });
       throw new Error(
@@ -101,31 +95,33 @@ export const retryQueue =
         message.ack();
         await cb();
       });
-    } catch (err) {
+    } catch (error) {
       if (!isFinalAttempt) message.retry();
-      throw err;
+      throw error;
     }
   };
 
 const isDuplicateMessage = async (key: string, bucket: R2Bucket) => {
   // Work around for CloudFlare R2 error:
-  // put: We encountered an internal error. Please try again. (10001)
+  // Put: We encountered an internal error. Please try again. (10001)
   for (let i = 0; i < 5; i++) {
     try {
       // Will throw if that error occurs
+      // oxlint-disable-next-line no-await-in-loop
       const putResult = await bucket.put(`lock-${key}`, "", {
         onlyIf: new Headers({
           "If-Unmodified-Since": "Wed, 21 Oct 2015 07:28:00 GMT",
         }),
       });
-      // if the returned result is null then the object already existed
+      // If the returned result is null then the object already existed
       const isDupe = putResult === null;
       if (isDupe) console.log("Duplicate message", { key });
       return isDupe;
-    } catch (err) {
-      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-      console.warn(`Error putting ${key} to R2: ${err}`);
+    } catch (error) {
+      // oxlint-disable-next-line typescript/restrict-template-expressions
+      console.warn(`Error putting ${key} to R2: ${error}`);
       console.warn(`Retrying in ${i} seconds`);
+      // oxlint-disable-next-line no-await-in-loop
       await new Promise((resolve) => setTimeout(resolve, i * 1000));
     }
   }

package/src/open-api.ts

@@ -1,9 +1,10 @@
-import { z, ZodType } from "zod/v4";
+import { z } from "zod/v4";
 import { type Route } from "./types";
 
+import type { ZodType } from "zod/v4";
+
 export const openAPI =
   <T, A>(title: string, release: string, noAuth: () => A, routes: Route<T, A>[]) =>
-  // eslint-disable-next-line @typescript-eslint/require-await
   async () => ({
     body: {
       openapi: "3.1.0",
@@ -27,6 +28,7 @@ export const openAPI =
               r.method.toLocaleLowerCase(),
               {
                 parameters: [
+                  // oxlint-disable-next-line typescript/no-unsafe-type-assertion
                   ...Object.entries((r.params?.shape ?? {}) as Record<string, ZodType>).map(
                     ([k, v]) => ({
                       name: k,

package/src/test.ts

@@ -1,14 +1,12 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
 import { env, exports } from "cloudflare:workers";
 import { type JWTPayload, SignJWT, exportJWK, generateKeyPair } from "jose";
-import createClient from "openapi-fetch";
-import { http, HttpResponse } from "msw";
+import { HttpResponse, http } from "msw";
 import { setupServer } from "msw/node";
+import createClient from "openapi-fetch";
 
 const msw = setupServer();
 msw.listen();
 
-// eslint-disable-next-line @typescript-eslint/no-empty-object-type, @typescript-eslint/require-await
 export const setupTests = async <Paths extends {}>() => {
   const url = new URL("https://example.com/");
 
@@ -21,11 +19,10 @@ export const setupTests = async <Paths extends {}>() => {
     url,
     client,
     msw,
-    async waitForQueue(trigger: () => Promise<void>) {
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    waitForQueue: async (trigger: () => Promise<void>) => {
       const log: any[] = [];
       const orig = console.log;
-      console.log = function (message) {
+      console.log = (message) => {
         orig(message);
         log.push(message);
       };
@@ -33,13 +30,11 @@ export const setupTests = async <Paths extends {}>() => {
       await waitUntil(() => expect(log).contains("Queue batch finished"));
       console.log = orig;
     },
-    async fakeJWK(issuer: keyof typeof env, audience: keyof typeof env, claims: JWTPayload) {
+    fakeJWK: async (issuer: keyof typeof env, audience: keyof typeof env, claims: JWTPayload) => {
       const { publicKey, privateKey } = await generateKeyPair("RS256");
       // Hack around Cloudflare not setting
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       publicKey[Symbol.toStringTag] = "CryptoKey";
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
       // @ts-expect-error
       privateKey[Symbol.toStringTag] = "CryptoKey";
       const jwk = await exportJWK(publicKey);
@@ -47,25 +42,25 @@ export const setupTests = async <Paths extends {}>() => {
       jwk.alg = "RS256";
       beforeAll(() => {
         msw.use(
-          ...[
-            http.get(`${env[issuer]}/.well-known/openid-configuration`, () =>
-              HttpResponse.json({
-                jwks_uri: `${env[issuer]}/.well-known/jwks`,
-              }),
-            ),
-            http.get(`${env[issuer]}/.well-known/jwks`, () =>
-              HttpResponse.json({
-                keys: [jwk],
-              }),
-            ),
-          ],
+          http.get(`${env[issuer]}/.well-known/openid-configuration`, () =>
+            HttpResponse.json({
+              jwks_uri: `${env[issuer]}/.well-known/jwks`,
+            }),
+          ),
+          http.get(`${env[issuer]}/.well-known/jwks`, () =>
+            HttpResponse.json({
+              keys: [jwk],
+            }),
+          ),
         );
       });
       return await new SignJWT(claims)
         .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: jwk.kid })
         .setIssuedAt()
         .setNotBefore("5 minutes ago")
+        // oxlint-disable-next-line typescript/no-unnecessary-type-assertion
         .setIssuer(env[issuer] as string)
+        // oxlint-disable-next-line typescript/no-unnecessary-type-assertion
         .setAudience([env[audience] as string])
         .setExpirationTime("1h")
         .sign(privateKey);
@@ -82,54 +77,3 @@ async function waitUntil(condition: () => void, time = 100) {
     await waitUntil(condition, time);
   }
 }
-
-export function recordRequest(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  cb: (data: any) => void,
-  statusCode: number,
-  data: string | object | undefined,
-  responseOptions?: {
-    headers: Record<string, string | string[] | undefined>;
-  },
-) {
-  return ({ body }: { body?: BodyInit }) => {
-    cb(JSON.parse((body?.valueOf() as string) ?? ""));
-    return { statusCode, data, responseOptions: responseOptions ?? {} };
-  };
-}
-
-export function recordFormRequest(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  cb: (data: any) => void,
-  statusCode: number,
-  data: string | object | undefined,
-  responseOptions?: {
-    headers: Record<string, string | string[] | undefined>;
-  },
-) {
-  return ({ body }: { body?: BodyInit }) => {
-    cb(Object.fromEntries(new URLSearchParams((body?.valueOf() as string) ?? "").entries()));
-    return { statusCode, data, responseOptions: responseOptions ?? {} };
-  };
-}
-
-export function recordFirehoseRequest(
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  cb: (data: any) => void,
-  statusCode: number,
-  data: string | object | undefined,
-  responseOptions?: {
-    headers: Record<string, string | string[] | undefined>;
-  },
-) {
-  return ({ body }: { body?: BodyInit }) => {
-    cb(JSON.parse((body?.valueOf() as string) ?? ""));
-    cb(
-      JSON.parse(
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-        atob(JSON.parse((body?.valueOf() as string) ?? "")["Record"]["Data"]),
-      ),
-    );
-    return { statusCode, data, responseOptions: responseOptions ?? {} };
-  };
-}

package/src/types.ts

@@ -1,5 +1,5 @@
-import { Toucan } from "toucan-js";
-import { ZodType, ZodObject, z } from "zod/v4";
+import type { Toucan } from "toucan-js";
+import type { ZodObject, ZodType, z } from "zod/v4";
 
 export type Route<T, A> =
   | {
@@ -8,9 +8,7 @@ export type Route<T, A> =
       path: string;
       matcher: RegExp;
       output: ZodType;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       handler: Handler<T, undefined, any, A, string>;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       params?: ZodObject<any>;
     }
   | {
@@ -20,16 +18,13 @@ export type Route<T, A> =
       matcher: RegExp;
       input: ZodType | undefined;
       output: ZodType;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       handler: Handler<T, any, any, A, string>;
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       params?: ZodObject<any>;
     };
 
-export type ExtractParameterNames<S extends string> =
-  S extends `${string}{${infer Name}}${infer Rest}`
-    ? Record<Name, string> & ExtractParameterNames<Rest>
-    : Record<string, string>;
+type ExtractParameterNames<S extends string> = S extends `${string}{${infer Name}}${infer Rest}`
+  ? Record<Name, string> & ExtractParameterNames<Rest>
+  : Record<string, string>;
 
 export type Handler<
   T,

package/src/util.ts

@@ -16,8 +16,10 @@ export async function pbkdfVerify(key: string, password: string) {
           {
             name: "PBKDF2",
             hash: "SHA-256",
+            // oxlint-disable-next-line typescript/no-misused-spread unicorn/no-useless-spread
             salt: new Uint8Array([...atob(key).slice(3, 19)].map((ch) => ch.charCodeAt(0))),
             iterations: parseInt(
+              // oxlint-disable-next-line typescript/no-misused-spread unicorn/no-useless-spread
               [...atob(key).slice(19, 22)].map((ch) => ch.charCodeAt(0).toString(16)).join(""),
               16,
             ),

package/eslint.config.js

@@ -1,3 +0,0 @@
-import config from "eslint-config-two-stroke";
-
-export default config;