Minor fixes

mise.toml

@@ -1,2 +1,2 @@
 [settings]
-idiomatic_version_file_enable_tools = ["node"]
+idiomatic_version_file_enable_tools = ["node", "pnpm"]

package.json

@@ -22,5 +22,16 @@
     "typescript": "7.0.2",
     "wrangler": "4.146.0"
   },
-  "packageManager": "pnpm@12.8.2+sha512.a5941679663d952c5f0ecc38ba98af98b4dc01b95780354f6894f2f873973cef2f7e2989d7db3ee5393938ae21f62fe06bcdf685d475ddad829a62095d2b8b11"
+  "devEngines": {
+    "packageManager": {
+      "name": "pnpm",
+      "version": "12.8.2",
+      "onFail": "download"
+    },
+    "runtime": {
+      "name": "node",
+      "version": "^24.21.0",
+      "onFail": "download"
+    }
+  }
 }

workers/discord/src/index.ts

@@ -11,28 +11,29 @@ export default {
     const webhookTokenMap = new Map<string, string>();
     const drizzle = getDrizzle(env.DB);
 
-    for (const { body } of batch.messages) {
-      switch (body.format) {
+    for (const message of batch.messages) {
+      switch (message.body.format) {
         case "message": {
-          let rest = restMap.get(body.applicationId);
+          let rest = restMap.get(message.body.applicationId);
           if (typeof rest === "undefined") {
             // oxlint-disable-next-line no-await-in-loop -- Must be in order
             const app = await drizzle.query.apps.findFirst({
               where: {
                 id: {
-                  eq: body.applicationId,
+                  eq: message.body.applicationId,
                 },
               },
             });
             if (typeof app === "undefined") {
-              throw new TypeError(`Unexpected application ID ${body.applicationId}`);
+              throw new TypeError(`Unexpected application ID ${message.body.applicationId}`);
             }
             rest = new REST({ version: APIVersion });
             rest.setToken(app.token);
-            restMap.set(body.applicationId, rest);
+            restMap.set(message.body.applicationId, rest);
           }
           // oxlint-disable-next-line no-await-in-loop -- Must be in order
-          await sendMessage(rest, body);
+          await sendMessage(rest, message.body);
+          message.ack();
           break;
         }
         case "webhook": {
@@ -41,24 +42,25 @@ export default {
             rest = new REST({ version: APIVersion });
             restMap.set("webhook", rest);
           }
-          let webhookToken = webhookTokenMap.get(body.webhookId);
+          let webhookToken = webhookTokenMap.get(message.body.webhookId);
           if (typeof webhookToken === "undefined") {
             // oxlint-disable-next-line no-await-in-loop -- Must be in order
             const webhook = await drizzle.query.webhooks.findFirst({
               where: {
                 id: {
-                  eq: body.webhookId,
+                  eq: message.body.webhookId,
                 },
               },
             });
             if (typeof webhook === "undefined") {
-              throw new TypeError(`Unexpected Webhook ID ${body.webhookId}`);
+              throw new TypeError(`Unexpected Webhook ID ${message.body.webhookId}`);
             }
             webhookToken = webhook.token;
-            webhookTokenMap.set(body.webhookId, webhook.token);
+            webhookTokenMap.set(message.body.webhookId, webhook.token);
           }
           // oxlint-disable-next-line no-await-in-loop -- Must be in order
-          await executeWebhook(rest, body, webhookToken);
+          await executeWebhook(rest, message.body, webhookToken);
+          message.ack();
         }
       }
     }

workers/webhooks/src/queue/handlers/github.ts

@@ -13,7 +13,6 @@ import { type GithubWebhookEvent, GithubWebhookEventName } from "../../types/git
 const handleGithubWebhooks: MappedQueueMessageBatchHandler<"github-webhook-queue", QueueBodyMap, Env> = async (
   messages,
   env,
-  _executionContext,
 ) => {
   const components: APIMessageTopLevelComponent[] = [];
   const promises = await Promise.allSettled(
@@ -84,7 +83,7 @@ const handleGithubWebhooks: MappedQueueMessageBatchHandler<"github-webhook-queue
         return {
           body: {
             format: "webhook",
-            webhookId: "",
+            webhookId: env.GITHUB_WEBHOOK_ID,
             body,
           },
         };

workers/webhooks/wrangler.jsonc

@@ -42,4 +42,36 @@
       },
     ],
   },
+  "previews": {
+    "r2_buckets": [
+      {
+        "binding": "GITHUB_BUCKET",
+        "bucket_name": "github-webhook-deliveries-preview",
+      },
+    ],
+    "queues": {
+      "consumers": [
+        {
+          "queue": "preview-github-webhook-queue",
+          "max_batch_size": 10,
+          "max_batch_timeout": 60,
+          "dead_letter_queue": "preview-dead-letters",
+        },
+      ],
+      "producers": [
+        {
+          "binding": "DISCORD_QUEUE",
+          "queue": "preview-discord-message-queue",
+        },
+        {
+          "binding": "GITHUB_QUEUE",
+          "queue": "preview-github-webhook-queue",
+        },
+        {
+          "binding": "DEAD_LETTER_QUEUE",
+          "queue": "preview-dead-letters",
+        },
+      ],
+    },
+  },
 }

workers/workers-bachman-dev/wrangler.jsonc

@@ -11,4 +11,5 @@
   "assets": {
     "directory": "./public",
   },
+  "previews": {},
 }