nitro-queue 0.0.3 → 0.0.5

package/README.ko.md

@@ -29,30 +29,29 @@ nitro-queue는 wrangler로 생성한 type을 프로젝트 queue 타입에 맞게
   "scripts": {
     "prepare": "pnpm types:cloudflare && pnpm types:cloudflare",
     "types:cloudflare": "wrangler types cloudflare.d.ts --config ./.output/server/wrangler.json",
-    "types:queue": "npx nitro-queue types cloudflare.d.ts",
-  },
+    "types:queue": "npx nitro-queue types cloudflare.d.ts"
+  }
 }
-
 ```
 # How to use
 ```ts
 // queues/user/remove.ts
 export default defineQueue<{
-    userId: string,
+  userId: string
 }>({
-    run(payload) {
-        console.log(payload.userId)
-    }
+  run(payload) {
+    console.log(payload.userId)
+  }
 })
 
 // routes/publish.ts
 export default defineHandler(async (e) => {
-    e.runtime.cloudflare.env.MY_QUEUE.send({
-        type: 'user:remove',
-        payload: { userId }
-    })
+  e.runtime.cloudflare.env.MY_QUEUE.send({
+    type: 'user:remove',
+    payload: { userId }
+  })
 })
 ```
 
 # 주의점
-- 테스트를 면밀히 거치지 않았습니다. 버그가 발생한다면 이슈를 통해 알려주시면 감사드리겠습니다.
+- 테스트를 면밀히 거치지 않았습니다. 버그가 발생한다면 이슈를 통해 알려주시면 감사드리겠습니다.

package/README.md

@@ -46,22 +46,22 @@ nitro-queue then modifies the types generated by wrangler to match your project'
 ```ts
 // queues/user/remove.ts
 export default defineQueue<{
-    userId: string,
+  userId: string
 }>({
-    run(payload) {
-        console.log(payload.userId)
-    }
+  run(payload) {
+    console.log(payload.userId)
+  }
 })
 
 // routes/publish.ts
 export default defineHandler(async (e) => {
-    e.runtime.cloudflare.env.MY_QUEUE.send({
-        type: 'user:remove',
-        payload: { userId }
-    })
+  e.runtime.cloudflare.env.MY_QUEUE.send({
+    type: 'user:remove',
+    payload: { userId }
+  })
 })
 ```
 
 # Note
 
-This module has not been thoroughly tested. If you encounter any bugs, please feel free to open an issue. Your feedback is greatly appreciated.
+This module has not been thoroughly tested. If you encounter any bugs, please feel free to open an issue. Your feedback is greatly appreciated.

package/dist/cli.mjs

@@ -19,7 +19,7 @@ if (command === "types") {
   replaceInFileSync({
     files: targetFile,
     from: /^/,
-    to: `import type { QueueMessageBody } from './node_modules/.nitro/server/nitro-queue'
+    to: `import type { QueueMessageBody } from './node_modules/.nitro/types/nitro-queue'
 `
   });
   replaceInFileSync({

package/dist/index.mjs

@@ -1,6 +1,6 @@
+import { stat, readdir, mkdir, writeFile } from 'node:fs/promises';
 import { fileURLToPath } from 'node:url';
 import { join, relative, dirname } from 'pathe';
-import { stat, readdir, mkdir, writeFile } from 'node:fs/promises';
 
 function defineQueue(endpoint) {
   return {
@@ -58,12 +58,12 @@ function initQueue() {
     async setup(nitro) {
       const serverDir = nitro.options.serverDir || nitro.options.rootDir;
       const queuesDir = join(serverDir, "queues");
-      const outputPath = join(nitro.options.rootDir, "node_modules/.nitro/server/nitro-queue.d.ts");
+      const outputPath = join(nitro.options.rootDir, "node_modules/.nitro/types/nitro-queue.d.ts");
       async function generateTypes() {
         const queues = await scanQueues(queuesDir);
         await generateQueueTypes(queues, outputPath);
       }
-      async function generateVirtualHandlers() {
+      async function generateHandlersFile() {
         const queues = await scanQueues(queuesDir);
         const imports = [];
         const handlerEntries = [];
@@ -72,16 +72,21 @@ function initQueue() {
           imports.push(`import ${varName} from '${queue.filePath}'`);
           handlerEntries.push(`  '${queue.name}': ${varName}`);
         });
-        return `${imports.join("\n")}
+        const content = `${imports.join("\n")}
 
 export const handlers = {
 ${handlerEntries.join(",\n")}
 }`;
+        const handlersPath2 = join(nitro.options.rootDir, "node_modules/.nitro/server/nitro-queue-handlers.js");
+        await mkdir(dirname(handlersPath2), { recursive: true });
+        await writeFile(handlersPath2, content);
+        return handlersPath2;
       }
       nitro.hooks.hook("build:before", generateTypes);
-      const virtualContent = await generateVirtualHandlers();
-      nitro.options.virtual["#queue-handlers"] = virtualContent;
-      nitro.options.plugins.push(fileURLToPath(new URL("./runtime/plugin", import.meta.url)));
+      const handlersPath = await generateHandlersFile();
+      nitro.options.alias["#nitro-queue-handlers"] = handlersPath;
+      const packageRoot = fileURLToPath(new URL("..", import.meta.url));
+      nitro.options.plugins.push(join(packageRoot, "src/runtime/plugin.ts"));
     }
   };
 }

package/package.json

@@ -1,13 +1,10 @@
 {
   "name": "nitro-queue",
   "type": "module",
+  "version": "0.0.5",
   "private": false,
-  "version": "0.0.3",
   "description": "Queue module for Nitro",
   "license": "MIT",
-  "bin": {
-    "nitro-queue": "./dist/cli.mjs"
-  },
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -17,8 +14,12 @@
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "types": "./dist/index.d.ts",
+  "bin": {
+    "nitro-queue": "./dist/cli.mjs"
+  },
   "files": [
-    "dist"
+    "dist",
+    "src/runtime"
   ],
   "peerDependencies": {
     "nitro": "^3.0.1-alpha.2"

package/src/runtime/plugin.ts

@@ -0,0 +1,23 @@
+import type { Message } from '@cloudflare/workers-types'
+import { handlers } from '#nitro-queue-handlers'
+
+import { definePlugin } from 'nitro'
+
+export default definePlugin((nitroApp) => {
+  nitroApp.hooks.hook('cloudflare:queue', async (queue) => {
+    for (const message of queue.batch.messages as unknown as Message[]) {
+      if (typeof message.body !== 'object' || message.body === null)
+        continue
+      if ('type' in message.body && typeof message.body.type === 'string') {
+        const body = message.body as { type: string, payload: unknown }
+        const handler = handlers[body.type as keyof typeof handlers]
+
+        if (!handler) {
+          throw new Error(`Unknown queue type: ${body.type}`)
+        }
+
+        await handler.endpoint.run(body.payload as Message<typeof handler.$payload>, { queue, message })
+      }
+    }
+  })
+})

package/dist/runtime/plugin.d.mts

@@ -1,3 +0,0 @@
-declare const _default: any;
-
-export { _default as default };

package/dist/runtime/plugin.d.ts

@@ -1,3 +0,0 @@
-declare const _default: any;
-
-export { _default as default };

package/dist/runtime/plugin.mjs

@@ -1,21 +0,0 @@
-import { handlers } from '#queue-handlers';
-import { definePlugin } from 'nitro';
-
-const plugin = definePlugin((nitroApp) => {
-  nitroApp.hooks.hook("cloudflare:queue", async (queue) => {
-    for (const message of queue.batch.messages) {
-      if (typeof message.body !== "object" || message.body === null)
-        continue;
-      if ("type" in message.body && typeof message.body.type === "string") {
-        const body = message.body;
-        const handler = handlers[body.type];
-        if (!handler) {
-          throw new Error(`Unknown queue type: ${body.type}`);
-        }
-        await handler.endpoint.run(body.payload, { queue, message });
-      }
-    }
-  });
-});
-
-export { plugin as default };