two-stroke 1.1.6 → 2.0.0

package/package.json

@@ -51,7 +51,7 @@
   "name": "two-stroke",
   "packageManager": "yarn@4.3.0",
   "type": "module",
-  "version": "1.1.6",
+  "version": "2.0.0",
   "devDependencies": {
     "@types/eslint": "^9.6.1",
     "@types/node": "^22.7.5",

package/src/index.ts

@@ -1,9 +1,9 @@
-import { Toucan } from "toucan-js";
-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 { verify as pbkdfVerify } from "pbkdf-subtle";
+import { Toucan } from "toucan-js";
+import { SafeParseError, ZodObject, ZodSchema, z } from "zod";
 import { openAPI } from "./open-api";
+import { Env, Handler, Route } from "./types";
 
 // eslint-disable-next-line @typescript-eslint/require-await
 const noAuth = async () => null;
@@ -288,22 +288,56 @@ export function twoStroke<T extends Env>(title: string, release: string) {
         }
         throw Error("Invalid");
       },
-    queueHandler<I extends ZodSchema>(
+    queueHandler<I extends ZodSchema, Parsed = z.infer<I>>(
       input: I,
       handler: (c: {
         env: T;
-        batch: MessageBatch<z.infer<I>>;
+        batch: MessageBatch<Parsed>;
+        sentry: Toucan;
+      }) => Promise<void>,
+      parseFailedHandler?: (c: {
+        env: T;
+        batch: MessageBatch & {
+          messages: (Message<unknown> & {
+            error: SafeParseError<z.input<I>>;
+          })[];
+        };
         sentry: Toucan;
       }) => Promise<void>,
     ) {
       _queue = async ({ batch, env, sentry }) => {
-        batch.messages.map((message): void => {
-          const body = input.safeParse(message.body);
-          if (!body.success) {
-            console.error(body.error, message);
-          }
-        });
-        await handler({ batch, env, sentry });
+        const { messages, failed } = batch.messages.reduce<{
+          messages: Message<Parsed>[];
+          failed: (Message<unknown> & { error: SafeParseError<z.input<I>> })[];
+        }>(
+          (acc, message) => {
+            const body: z.SafeParseReturnType<
+              z.input<I>,
+              Parsed
+            > = input.safeParse(message.body);
+            if (!body.success) {
+              console.error(body.error, message);
+              return {
+                messages: acc.messages,
+                failed: [...acc.failed, { ...message, error: body }],
+              };
+            }
+
+            return {
+              messages: [...acc.messages, { ...message, body: body.data }],
+              failed: acc.failed,
+            };
+          },
+          { messages: [], failed: [] },
+        );
+
+        await handler({ batch: { ...batch, messages }, env, sentry });
+        if (failed.length > 0)
+          await parseFailedHandler?.({
+            batch: { ...batch, messages: failed },
+            env,
+            sentry,
+          });
         console.log("Queue batch finished");
       };
     },

package/src/test.ts

@@ -15,6 +15,8 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
   fetchMock.disableNetConnect();
 
   const config = toml.parse(fs.readFileSync("wrangler.toml", "utf8")) as {
+    compatibility_date: string;
+    compatibility_flags: string[];
     queues?: {
       consumers?: { queue: string }[];
       producers?: { queue: string; binding: string }[];
@@ -23,11 +25,14 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
     kv_namespaces?: { binding: string }[];
     d1_databases?: { binding: string }[];
     services?: { binding: string; service: string }[];
+    durable_objects?: { bindings?: { name: string; class_name: string }[] };
   };
 
   const miniflare = new Miniflare({
     modules: true,
     scriptPath: "dist/index.js",
+    compatibilityDate: config.compatibility_date,
+    compatibilityFlags: config.compatibility_flags,
     bindings: {
       TOKEN_HASH:
         "djAxlhzT1IU9QIP3UKdipECQPAGGoPQK86/GnTBcbHLtPC3ni6JkTQ/iIeF0KG0y1CZ+J+9W",
@@ -47,6 +52,12 @@ export const setupTests = async <Paths extends {}>(bindings: Env) => {
       (config.services ?? []).map(({ binding, service }) => [binding, service]),
     ),
     fetchMock,
+    durableObjects: Object.fromEntries(
+      (config.durable_objects?.bindings ?? []).map(({ name, class_name }) => [
+        name,
+        class_name,
+      ]),
+    ),
   });
 
   const url = await miniflare.ready;

package/src/types.ts

@@ -8,7 +8,8 @@ export type Env = {
     | R2Bucket
     | D1Database
     | Fetcher
-    | Hyperdrive;
+    | Hyperdrive
+    | DurableObjectNamespace;
 };
 export type Route<T extends Env, A> =
   | {