two-stroke 1.0.16 → 1.0.18

package/package.json

@@ -10,24 +10,24 @@
   "dependencies": {
     "@anatine/zod-openapi": "^2.2.5",
     "@asteasolutions/zod-to-openapi": "^7.0.0",
-    "@cloudflare/workers-types": "^4.20240405.0",
+    "@cloudflare/workers-types": "^4.20240423.0",
     "@sentry/cli": "^2.31.0",
-    "@typescript-eslint/eslint-plugin": "^7.7.0",
-    "@typescript-eslint/parser": "^7.7.0",
-    "@vitest/coverage-v8": "^1.5.0",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
+    "@vitest/coverage-v8": "^1.5.3",
     "eslint-config-prettier": "^9.1.0",
-    "eslint-config-two-stroke": "^1.0.1",
+    "eslint-config-two-stroke": "^1.0.2",
     "eslint-config-typescript": "^3.0.0",
     "jose": "^5.2.4",
     "jwk-subtle": "^1.0.7",
-    "miniflare": "^3.20240405.1",
-    "openapi-fetch": "^0.9.3",
+    "miniflare": "^3.20240419.0",
+    "openapi-fetch": "^0.9.5",
     "openapi-typescript": "^6.7.5",
     "openapi3-ts": "^4.3.1",
     "pbkdf-subtle": "^1.0.0",
     "toml": "^3.0.0",
-    "toucan-js": "^3.3.1",
-    "zod": "^3.22.4"
+    "toucan-js": "^3.4.0",
+    "zod": "^3.23.5"
   },
   "peerDependencies": {
     "@sentry/cli": ">=2",
@@ -51,13 +51,13 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.1.0",
   "type": "module",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "devDependencies": {
-    "@types/eslint": "^8.56.9",
+    "@types/eslint": "^8.56.10",
     "@types/node": "^20.12.7",
     "eslint": "^8.57.0",
     "prettier": "^3.2.5",
     "typescript": "^5.4.5",
-    "vitest": "^1.5.0"
+    "vitest": "^1.5.3"
   }
 }

package/src/cmd.mjs

@@ -1,13 +1,16 @@
 import { spawnSync } from "child_process";
 
-export function cmd(cmd, args = []) {
+export function cmd(program, args = []) {
   const { error, status } = spawnSync(
-    cmd.split(" ")[0],
-    [...cmd.split(" ").slice(1), ...args],
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    program.split(" ")[0],
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+    [...program.split(" ").slice(1), ...args],
     {
       stdio: "inherit",
     },
   );
+  // eslint-disable-next-line no-process-exit
   if (status) process.exit(status);
   if (error) throw error;
 }

package/src/index.ts

@@ -3,8 +3,9 @@ import { ZodObject, ZodSchema, z } from "zod";
 import { verify as pbkdfVerify } from "pbkdf-subtle";
 import { verify as jwkVerify } from "jwk-subtle";
 import { Env, Handler, Route } from "./types";
-import { openAPI } from "./openAPI";
+import { openAPI } from "./open-api";
 
+// eslint-disable-next-line @typescript-eslint/require-await
 const noAuth = async () => null;
 
 const escapeRegex = (str: string) =>
@@ -54,7 +55,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
         release,
       });
       try {
-        if (req.method == "OPTIONS") {
+        if (req.method === "OPTIONS") {
           return new Response("", {
             status: 204,
             headers: {
@@ -72,6 +73,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
             const params = pathname.match(route.matcher)?.groups ?? {};
             let claims;
             try {
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
               claims = await route.auth({ req, env });
             } catch (err) {
               console.warn(err);
@@ -95,7 +97,9 @@ export function twoStroke<T extends Env>(title: string, release: string) {
                 response = await route.handler({
                   req,
                   env,
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                   body: body.data,
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                   claims,
                   params,
                   searchParams: new URL(req.url).searchParams,
@@ -124,6 +128,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
               response = await route.handler({
                 req,
                 env,
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 claims,
                 body: undefined,
                 params,
@@ -131,12 +136,13 @@ export function twoStroke<T extends Env>(title: string, release: string) {
                 sentry,
               });
             }
-            if (response.status === undefined || response.status == 200) {
+            if (response.status === undefined || response.status === 200) {
               const output = route.output.safeParse(response.body);
               if (!output.success) {
                 console.error({
                   message: "Response body schema invalid",
                   error: output.error,
+                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                   body: response.body,
                 });
               }
@@ -147,7 +153,8 @@ export function twoStroke<T extends Env>(title: string, release: string) {
             response.headers["Access-Control-Allow-Origin"] =
               response.headers["Access-Control-Allow-Origin"] ?? "*";
             return new Response(
-              response.headers["Content-Type"] == "application/json"
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+              response.headers["Content-Type"] === "application/json"
                 ? JSON.stringify(response.body)
                 : response.body,
               response,
@@ -160,6 +167,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
         });
       } catch (err) {
         console.warn(err);
+        // eslint-disable-next-line deprecation/deprecation
         sentry.captureException(err);
         return new Response("", {
           status: 500,
@@ -255,7 +263,7 @@ export function twoStroke<T extends Env>(title: string, release: string) {
         const [scheme, token] = (req.headers.get("Authorization") ?? " ").split(
           " ",
         );
-        if (scheme == "Bearer") {
+        if (scheme === "Bearer") {
           const claims = await jwkVerify<J>(
             token ?? "",
             env[k] as string,
@@ -380,3 +388,30 @@ export function twoStroke<T extends Env>(title: string, release: string) {
     },
   };
 }
+
+type AddToQueueConfig = QueueSendOptions & {
+  retries?: number;
+  backoffFactor?: number;
+};
+
+export async function addToQueue<T>(
+  queue: Queue<T>,
+  message: T,
+  config: AddToQueueConfig = {},
+) {
+  const { retries, backoffFactor, ...options } = config;
+
+  for (let i = 0; i < (retries ?? 5); i++) {
+    try {
+      await queue.send(message, options);
+      return;
+    } catch (err) {
+      const backoff = (backoffFactor ?? 2) ** i;
+      // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+      console.log(`Error adding to queue: ${err}`);
+      console.log(`Retrying in ${backoff} seconds`);
+      await new Promise((resolve) => setTimeout(resolve, backoff * 1000));
+    }
+  }
+  throw new Error("Failed to add to queue");
+}

package/src/{openAPI.ts → open-api.ts}

@@ -38,6 +38,7 @@ export const openAPI =
     noAuth: () => A,
     routes: Route<T, A>[],
   ) =>
+  // eslint-disable-next-line @typescript-eslint/require-await
   async () => {
     const openAPIRegistry = new OpenAPIRegistry();
     openAPIRegistry.registerComponent("securitySchemes", "auth", {

package/src/test.ts

@@ -14,6 +14,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
   const fetchMock = createFetchMock();
   fetchMock.disableNetConnect();
 
+  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
   const config = toml.parse(fs.readFileSync("wrangler.toml", "utf8"));
 
   const miniflare = new Miniflare({
@@ -24,10 +25,12 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
         "djAxlhzT1IU9QIP3UKdipECQPAGGoPQK86/GnTBcbHLtPC3ni6JkTQ/iIeF0KG0y1CZ+J+9W",
       ...bindings,
     },
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     queueConsumers: (config.queues?.consumers ?? []).map(
       ({ queue }: { queue: string }) => queue,
     ),
     queueProducers: Object.fromEntries(
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
       (config.queues?.producers ?? []).map(
         ({ binding, queue }: { queue: string; binding: string }) => [
           binding,
@@ -35,16 +38,20 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
         ],
       ),
     ),
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     r2Buckets: (config.r2_buckets ?? []).map(
       ({ binding }: { binding: string }) => binding,
     ),
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     kvNamespaces: (config.kv_namespaces ?? []).map(
       ({ binding }: { binding: string }) => binding,
     ),
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     d1Databases: (config.d1_databases ?? []).map(
       ({ binding }: { binding: string }) => binding,
     ),
     serviceBindings: Object.fromEntries(
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
       (config.services ?? []).map(
         ({ binding, service }: { binding: string; service: string }) => [
           binding,
@@ -60,6 +67,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
   // Hack until miniflare supports auto running D1 migrations.
   // Note: Each migration file can contain only a single statement.
   await Promise.all(
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
     (config.d1_databases ?? []).map(
       async ({ binding }: { binding: string }) => {
         const d1 = await miniflare.getD1Database(binding);
@@ -111,6 +119,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
       const orig = console.log;
       console.log = function (message) {
         orig(message);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         log.push(message);
       };
       await trigger();
@@ -128,6 +137,7 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
         .reply(
           200,
           {
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             jwks_uri: `${bindings[issuer]}/.well-known/jwks`,
           },
           {
@@ -185,7 +195,8 @@ export function recordRequest(
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ body }: any) => {
-    consumers.json(body).then(cb);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+    void consumers.json(body).then(cb);
     return { statusCode, data, responseOptions };
   };
 }
@@ -201,10 +212,12 @@ export function recordFormRequest(
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ body }: any) => {
-    consumers
+    void consumers
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       .text(body)
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-shadow
       .then((data: any) =>
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         cb(Object.fromEntries(new URLSearchParams(data).entries())),
       );
     return { statusCode, data, responseOptions };
@@ -222,9 +235,10 @@ export function recordFirehoseRequest(
 ) {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   return ({ body }: any) => {
-    consumers
+    void consumers
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
       .json(body)
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-shadow, @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
       .then((data: any) => cb(JSON.parse(atob(data["Record"]["Data"]))));
     return { statusCode, data, responseOptions };
   };