@pikku/kysely 0.13.23 → 0.13.24

package/CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.13.24
+
+### Patch Changes
+
+- f10162a: `send()` now reports the delivery id it wrote, not only the broker's job id.
+
+  `KyselyWebhookService.send()` returned `{ jobId }` straight from `queueService.add()`, and callers handed that to `getDelivery()`. That only worked because every queue in the test suite echoed the requested `jobId` back. A broker is free to assign its own identity — the JetStream queue returns a stream sequence — so on those the read-back looked up an id that was never written and 404'd.
+
+  `SendWebhookResult` gains an optional `deliveryId`, which store-backed implementations always populate.
+
+- Updated dependencies [f10162a]
+  - @pikku/core@0.12.104
+
 ## 0.13.23
 
 ### Patch Changes

package/dist/src/kysely-webhook-service.d.ts

@@ -15,7 +15,7 @@ export declare class KyselyWebhookService extends QueueWebhookService {
     private initialized;
     constructor(queueService: QueueService, db: Kysely<KyselyPikkuDB>);
     init(): Promise<void>;
-    send(input: SendWebhookInput): Promise<SendWebhookResult>;
+    send(input: SendWebhookInput): Promise<Required<SendWebhookResult>>;
     recordAttempt(deliveryId: string, { statusCode, responseBody, error, delivered }: WebhookAttemptResult): Promise<void>;
     /** List deliveries, most recent first — for the console webhooks view. */
     listDeliveries(opts?: {

package/dist/src/kysely-webhook-service.js

@@ -37,7 +37,7 @@ export class KyselyWebhookService extends QueueWebhookService {
         // deliveryId doubles as the queue jobId (idempotency) and rides in the
         // payload so the worker can record attempts against this row.
         const jobId = await this.queueService.add(PIKKU_OUTGOING_WEBHOOK_QUEUE_NAME, { ...jobData, deliveryId }, { ...options, jobId: deliveryId });
-        return { jobId };
+        return { jobId, deliveryId };
     }
     async recordAttempt(deliveryId, { statusCode, responseBody, error, delivered }) {
         const now = new Date();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/kysely",
-  "version": "0.13.23",
+  "version": "0.13.24",
   "description": "Kysely-backed Pikku services — workflow state, secrets, sessions, scopes and audit",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
@@ -21,7 +21,7 @@
     "prepublishOnly": "yarn build"
   },
   "peerDependencies": {
-    "@pikku/core": "^0.12.98"
+    "@pikku/core": "^0.12.104"
   },
   "dependencies": {
     "kysely": "^0.29.5"

package/src/kysely-webhook-service.test.ts

@@ -75,6 +75,35 @@ describe('KyselyWebhookService', () => {
     assert.equal(delivery!.attempts.length, 0)
   })
 
+  test('send() reports the delivery id even when the broker assigns its own', async () => {
+    const db = createDb()
+    const added: { data: any; options: any }[] = []
+    const queue = {
+      supportsResults: false,
+      add: async (_name: string, data: any, options: any) => {
+        added.push({ data, options })
+        return '42'
+      },
+      getJob: async () => null,
+    }
+    await applyPikkuSchemas(db, [webhookSchema])
+    const service = new KyselyWebhookService(queue as any, db)
+    await service.init()
+
+    const { jobId, deliveryId } = await service.send({
+      url: 'https://example.com/hook',
+      event: 'user.created',
+      data: { id: 'u1' },
+      organizationId: 'org-1',
+    })
+
+    assert.equal(jobId, '42')
+    assert.notEqual(deliveryId, jobId)
+    assert.equal(deliveryId, added[0]!.options.jobId)
+    assert.ok(await service.getDelivery(deliveryId!))
+    assert.equal(await service.getDelivery(jobId), null)
+  })
+
   test('recordAttempt() appends attempts and rolls status forward', async () => {
     const db = createDb()
     const { queue } = createQueue()

package/src/kysely-webhook-service.ts

@@ -36,7 +36,9 @@ export class KyselyWebhookService extends QueueWebhookService {
     this.initialized = true
   }
 
-  public async send(input: SendWebhookInput): Promise<SendWebhookResult> {
+  public async send(
+    input: SendWebhookInput
+  ): Promise<Required<SendWebhookResult>> {
     const deliveryId = globalThis.crypto.randomUUID()
     const { jobData, options } = await this.prepareDelivery(input)
 
@@ -57,7 +59,7 @@ export class KyselyWebhookService extends QueueWebhookService {
       { ...jobData, deliveryId },
       { ...options, jobId: deliveryId }
     )
-    return { jobId }
+    return { jobId, deliveryId }
   }
 
   public async recordAttempt(