two-stroke 6.5.3 → 7.1.0

package/src/index.ts

@@ -132,10 +132,10 @@ export function twoStroke<T extends Env>(
               const body = route.input
                 ? route.input.safeParse(rawBody)
                 : {
-                    success: true,
-                    data: undefined,
-                    error: undefined,
-                  };
+                  success: true,
+                  data: undefined,
+                  error: undefined,
+                };
               if (body.success)
                 response = await route.handler({
                   req,
@@ -211,7 +211,7 @@ export function twoStroke<T extends Env>(
             return new Response(
               // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
               responseWithHeaders.headers.get("Content-Type") ===
-              "application/json"
+                "application/json"
                 ? JSON.stringify(response.body)
                 : response.body,
               responseWithHeaders,
@@ -254,7 +254,7 @@ export function twoStroke<T extends Env>(
       }
     },
     async scheduled(
-      event: ScheduledEvent,
+      event: ScheduledController,
       env: T & {
         readonly SENTRY_DSN: string;
         readonly SENTRY_ENVIRONMENT: string;
@@ -317,36 +317,36 @@ export function twoStroke<T extends Env>(
     noAuth,
     pbkdf:
       (k: keyof T, customHeaderName: string = "Authorization") =>
-      async ({ req, env }: { req: Request; env: T }) => {
-        const [scheme, token] = (
-          req.headers.get(customHeaderName) ?? " "
-        ).split(" ");
-        if (
-          (scheme === "token" || scheme === "Bearer") &&
-          (await pbkdfVerify(env[k] as string, token ?? ""))
-        )
-          return;
-        throw Error("Invalid");
-      },
+        async ({ req, env }: { req: Request; env: T }) => {
+          const [scheme, token] = (
+            req.headers.get(customHeaderName) ?? " "
+          ).split(" ");
+          if (
+            (scheme === "token" || scheme === "Bearer") &&
+            (await pbkdfVerify(env[k] as string, token ?? ""))
+          )
+            return;
+          throw Error("Invalid");
+        },
     jwt:
       <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,
+        async ({ req, env }: { req: Request; env: T }) => {
+          const [scheme, token] = (req.headers.get("Authorization") ?? " ").split(
+            " ",
           );
-          if (!claims) {
-            throw Error("Invalid");
+          if (scheme === "Bearer") {
+            const claims = await jwkVerify<J>(
+              token ?? "",
+              env[k] as string,
+              env[ak] as string,
+            );
+            if (!claims) {
+              throw Error("Invalid");
+            }
+            return claims;
           }
-          return claims;
-        }
-        throw Error("Invalid");
-      },
+          throw Error("Invalid");
+        },
     queueHandler<I extends ZodType>(
       input: I,
       handler: (c: {

package/src/test.ts

@@ -1,25 +1,25 @@
+import { env, exports } from "cloudflare:workers";
 import { type JWTPayload, SignJWT, exportJWK, generateKeyPair } from "jose";
-import { fetchMock, SELF, env, type Buffer } from "cloudflare:test";
 import createClient from "openapi-fetch";
+import { http, HttpResponse } from 'msw'
+import { setupServer } from 'msw/node'
+
+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 {}>() => {
-  beforeAll(() => {
-    fetchMock.activate();
-    fetchMock.disableNetConnect();
-  });
-
   const url = new URL("https://example.com/");
 
   const client = createClient<Paths>({
     baseUrl: url.toString(),
-    fetch: (...r) => SELF.fetch(...r),
+    fetch: (...r) => exports.default.fetch(...r),
   });
 
   return {
     url,
-    fetchMock,
     client,
+    msw,
     async waitForQueue(trigger: () => Promise<void>) {
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       const log: any[] = [];
@@ -49,40 +49,16 @@ export const setupTests = async <Paths extends {}>() => {
       jwk.kid = "test";
       jwk.alg = "RS256";
       beforeAll(() => {
-        fetchMock
-          .get(env[issuer] as string)
-          .intercept({
-            method: "GET",
-            path: "/.well-known/openid-configuration",
-          })
-          .reply(
-            200,
-            {
-              // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        msw.use(...[
+          http.get(`${env[issuer]}/.well-known/openid-configuration`, () =>
+            HttpResponse.json({
               jwks_uri: `${env[issuer]}/.well-known/jwks`,
-            },
-            {
-              headers: {
-                "Content-Type": "application/json",
-              },
-            },
-          )
-          .persist();
-        fetchMock
-          .get(env[issuer] as string)
-          .intercept({ method: "GET", path: "/.well-known/jwks" })
-          .reply(
-            200,
-            {
+            })),
+          http.get(`${env[issuer]}/.well-known/jwks`, () =>
+            HttpResponse.json({
               keys: [jwk],
-            },
-            {
-              headers: {
-                "Content-Type": "application/json",
-              },
-            },
-          )
-          .persist();
+            }))
+        ])
       });
       return await new SignJWT(claims)
         .setProtectedHeader({ typ: "JWT", alg: "RS256", kid: jwk.kid })
@@ -110,7 +86,7 @@ export function recordRequest(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   cb: (data: any) => void,
   statusCode: number,
-  data: string | object | Buffer | undefined,
+  data: string | object | undefined,
   responseOptions?: {
     headers: Record<string, string | string[] | undefined>;
   },
@@ -125,7 +101,7 @@ export function recordFormRequest(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   cb: (data: any) => void,
   statusCode: number,
-  data: string | object | Buffer | undefined,
+  data: string | object | undefined,
   responseOptions?: {
     headers: Record<string, string | string[] | undefined>;
   },
@@ -144,7 +120,7 @@ export function recordFirehoseRequest(
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   cb: (data: any) => void,
   statusCode: number,
-  data: string | object | Buffer | undefined,
+  data: string | object | undefined,
   responseOptions?: {
     headers: Record<string, string | string[] | undefined>;
   },

package/tsconfig.json

@@ -15,8 +15,7 @@
     "target": "ESNext",
     "types": [
       "./worker-configuration.d.ts",
-      "vitest/globals",
-      "@cloudflare/vitest-pool-workers"
+      "vitest/globals"
     ],
     "verbatimModuleSyntax": true
   },