@open-mercato/webhooks 0.6.6-develop.6465.1.019f0fb26f → 0.6.6-develop.6472.1.1673e7e66b

package/dist/modules/webhooks/lib/queue.js

@@ -1,4 +1,6 @@
 import { createModuleQueue } from "@open-mercato/queue";
+import { createLogger } from "@open-mercato/shared/lib/logger";
+const logger = createLogger("webhooks");
 const queues = /* @__PURE__ */ new Map();
 const LOCAL_WORKER_PROMISE_KEY = "__openMercatoWebhookLocalWorkerPromise__";
 const WEBHOOK_DELIVERIES_QUEUE = "webhook-deliveries";
@@ -30,7 +32,7 @@ async function ensureLocalWebhookQueueWorkerStarted() {
     });
   })().catch((error) => {
     delete globalStore[LOCAL_WORKER_PROMISE_KEY];
-    console.error("[webhooks] Failed to start local delivery worker:", error);
+    logger.error("Failed to start local delivery worker", { err: error });
     throw error;
   });
   await globalStore[LOCAL_WORKER_PROMISE_KEY];

package/dist/modules/webhooks/lib/queue.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/webhooks/lib/queue.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { createModuleQueue, type Queue } from '@open-mercato/queue'\nimport type { WebhookDeliveryJob } from './delivery'\n\nconst queues = new Map<string, Queue<WebhookDeliveryJob>>()\nconst LOCAL_WORKER_PROMISE_KEY = '__openMercatoWebhookLocalWorkerPromise__'\n\nexport const WEBHOOK_DELIVERIES_QUEUE = 'webhook-deliveries'\n\nexport function getWebhookQueue(queueName: string = WEBHOOK_DELIVERIES_QUEUE): Queue<WebhookDeliveryJob> {\n  const existing = queues.get(queueName)\n  if (existing) return existing\n\n  const concurrency = Math.max(1, Number.parseInt(process.env.WEBHOOK_QUEUE_CONCURRENCY ?? '10', 10) || 10)\n  const created = createModuleQueue<WebhookDeliveryJob>(queueName, { concurrency })\n\n  queues.set(queueName, created)\n  return created\n}\n\nasync function ensureLocalWebhookQueueWorkerStarted(): Promise<void> {\n  if (process.env.QUEUE_STRATEGY === 'async') return\n\n  const globalStore = globalThis as typeof globalThis & {\n    [LOCAL_WORKER_PROMISE_KEY]?: Promise<void>\n  }\n\n  if (globalStore[LOCAL_WORKER_PROMISE_KEY]) {\n    await globalStore[LOCAL_WORKER_PROMISE_KEY]\n    return\n  }\n\n  globalStore[LOCAL_WORKER_PROMISE_KEY] = (async () => {\n    const queue = getWebhookQueue()\n\n    await queue.process(async (job) => {\n      const [{ createRequestContainer }, { processWebhookDeliveryJob }] = await Promise.all([\n        import('@open-mercato/shared/lib/di/container'),\n        import('./delivery'),\n      ])\n\n      const container = await createRequestContainer()\n      const em = (container.resolve('em') as EntityManager).fork()\n      await processWebhookDeliveryJob(em, job.payload)\n    })\n  })().catch((error) => {\n    delete globalStore[LOCAL_WORKER_PROMISE_KEY]\n    console.error('[webhooks] Failed to start local delivery worker:', error)\n    throw error\n  })\n\n  await globalStore[LOCAL_WORKER_PROMISE_KEY]\n}\n\nexport async function enqueueWebhookDelivery(job: WebhookDeliveryJob, delayMs?: number): Promise<string> {\n  const queue = getWebhookQueue()\n  const jobId = await queue.enqueue(job, delayMs && delayMs > 0 ? { delayMs } : undefined)\n  await ensureLocalWebhookQueueWorkerStarted()\n  return jobId\n}\n"],
-  "mappings": "AACA,SAAS,yBAAqC;AAG9C,MAAM,SAAS,oBAAI,IAAuC;AAC1D,MAAM,2BAA2B;AAE1B,MAAM,2BAA2B;AAEjC,SAAS,gBAAgB,YAAoB,0BAAqD;AACvG,QAAM,WAAW,OAAO,IAAI,SAAS;AACrC,MAAI,SAAU,QAAO;AAErB,QAAM,cAAc,KAAK,IAAI,GAAG,OAAO,SAAS,QAAQ,IAAI,6BAA6B,MAAM,EAAE,KAAK,EAAE;AACxG,QAAM,UAAU,kBAAsC,WAAW,EAAE,YAAY,CAAC;AAEhF,SAAO,IAAI,WAAW,OAAO;AAC7B,SAAO;AACT;AAEA,eAAe,uCAAsD;AACnE,MAAI,QAAQ,IAAI,mBAAmB,QAAS;AAE5C,QAAM,cAAc;AAIpB,MAAI,YAAY,wBAAwB,GAAG;AACzC,UAAM,YAAY,wBAAwB;AAC1C;AAAA,EACF;AAEA,cAAY,wBAAwB,KAAK,YAAY;AACnD,UAAM,QAAQ,gBAAgB;AAE9B,UAAM,MAAM,QAAQ,OAAO,QAAQ;AACjC,YAAM,CAAC,EAAE,uBAAuB,GAAG,EAAE,0BAA0B,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,QACpF,OAAO,uCAAuC;AAAA,QAC9C,OAAO,YAAY;AAAA,MACrB,CAAC;AAED,YAAM,YAAY,MAAM,uBAAuB;AAC/C,YAAM,KAAM,UAAU,QAAQ,IAAI,EAAoB,KAAK;AAC3D,YAAM,0BAA0B,IAAI,IAAI,OAAO;AAAA,IACjD,CAAC;AAAA,EACH,GAAG,EAAE,MAAM,CAAC,UAAU;AACpB,WAAO,YAAY,wBAAwB;AAC3C,YAAQ,MAAM,qDAAqD,KAAK;AACxE,UAAM;AAAA,EACR,CAAC;AAED,QAAM,YAAY,wBAAwB;AAC5C;AAEA,eAAsB,uBAAuB,KAAyB,SAAmC;AACvG,QAAM,QAAQ,gBAAgB;AAC9B,QAAM,QAAQ,MAAM,MAAM,QAAQ,KAAK,WAAW,UAAU,IAAI,EAAE,QAAQ,IAAI,MAAS;AACvF,QAAM,qCAAqC;AAC3C,SAAO;AACT;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { createModuleQueue, type Queue } from '@open-mercato/queue'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport type { WebhookDeliveryJob } from './delivery'\n\nconst logger = createLogger('webhooks')\n\nconst queues = new Map<string, Queue<WebhookDeliveryJob>>()\nconst LOCAL_WORKER_PROMISE_KEY = '__openMercatoWebhookLocalWorkerPromise__'\n\nexport const WEBHOOK_DELIVERIES_QUEUE = 'webhook-deliveries'\n\nexport function getWebhookQueue(queueName: string = WEBHOOK_DELIVERIES_QUEUE): Queue<WebhookDeliveryJob> {\n  const existing = queues.get(queueName)\n  if (existing) return existing\n\n  const concurrency = Math.max(1, Number.parseInt(process.env.WEBHOOK_QUEUE_CONCURRENCY ?? '10', 10) || 10)\n  const created = createModuleQueue<WebhookDeliveryJob>(queueName, { concurrency })\n\n  queues.set(queueName, created)\n  return created\n}\n\nasync function ensureLocalWebhookQueueWorkerStarted(): Promise<void> {\n  if (process.env.QUEUE_STRATEGY === 'async') return\n\n  const globalStore = globalThis as typeof globalThis & {\n    [LOCAL_WORKER_PROMISE_KEY]?: Promise<void>\n  }\n\n  if (globalStore[LOCAL_WORKER_PROMISE_KEY]) {\n    await globalStore[LOCAL_WORKER_PROMISE_KEY]\n    return\n  }\n\n  globalStore[LOCAL_WORKER_PROMISE_KEY] = (async () => {\n    const queue = getWebhookQueue()\n\n    await queue.process(async (job) => {\n      const [{ createRequestContainer }, { processWebhookDeliveryJob }] = await Promise.all([\n        import('@open-mercato/shared/lib/di/container'),\n        import('./delivery'),\n      ])\n\n      const container = await createRequestContainer()\n      const em = (container.resolve('em') as EntityManager).fork()\n      await processWebhookDeliveryJob(em, job.payload)\n    })\n  })().catch((error) => {\n    delete globalStore[LOCAL_WORKER_PROMISE_KEY]\n    logger.error('Failed to start local delivery worker', { err: error })\n    throw error\n  })\n\n  await globalStore[LOCAL_WORKER_PROMISE_KEY]\n}\n\nexport async function enqueueWebhookDelivery(job: WebhookDeliveryJob, delayMs?: number): Promise<string> {\n  const queue = getWebhookQueue()\n  const jobId = await queue.enqueue(job, delayMs && delayMs > 0 ? { delayMs } : undefined)\n  await ensureLocalWebhookQueueWorkerStarted()\n  return jobId\n}\n"],
+  "mappings": "AACA,SAAS,yBAAqC;AAC9C,SAAS,oBAAoB;AAG7B,MAAM,SAAS,aAAa,UAAU;AAEtC,MAAM,SAAS,oBAAI,IAAuC;AAC1D,MAAM,2BAA2B;AAE1B,MAAM,2BAA2B;AAEjC,SAAS,gBAAgB,YAAoB,0BAAqD;AACvG,QAAM,WAAW,OAAO,IAAI,SAAS;AACrC,MAAI,SAAU,QAAO;AAErB,QAAM,cAAc,KAAK,IAAI,GAAG,OAAO,SAAS,QAAQ,IAAI,6BAA6B,MAAM,EAAE,KAAK,EAAE;AACxG,QAAM,UAAU,kBAAsC,WAAW,EAAE,YAAY,CAAC;AAEhF,SAAO,IAAI,WAAW,OAAO;AAC7B,SAAO;AACT;AAEA,eAAe,uCAAsD;AACnE,MAAI,QAAQ,IAAI,mBAAmB,QAAS;AAE5C,QAAM,cAAc;AAIpB,MAAI,YAAY,wBAAwB,GAAG;AACzC,UAAM,YAAY,wBAAwB;AAC1C;AAAA,EACF;AAEA,cAAY,wBAAwB,KAAK,YAAY;AACnD,UAAM,QAAQ,gBAAgB;AAE9B,UAAM,MAAM,QAAQ,OAAO,QAAQ;AACjC,YAAM,CAAC,EAAE,uBAAuB,GAAG,EAAE,0BAA0B,CAAC,IAAI,MAAM,QAAQ,IAAI;AAAA,QACpF,OAAO,uCAAuC;AAAA,QAC9C,OAAO,YAAY;AAAA,MACrB,CAAC;AAED,YAAM,YAAY,MAAM,uBAAuB;AAC/C,YAAM,KAAM,UAAU,QAAQ,IAAI,EAAoB,KAAK;AAC3D,YAAM,0BAA0B,IAAI,IAAI,OAAO;AAAA,IACjD,CAAC;AAAA,EACH,GAAG,EAAE,MAAM,CAAC,UAAU;AACpB,WAAO,YAAY,wBAAwB;AAC3C,WAAO,MAAM,yCAAyC,EAAE,KAAK,MAAM,CAAC;AACpE,UAAM;AAAA,EACR,CAAC;AAED,QAAM,YAAY,wBAAwB;AAC5C;AAEA,eAAsB,uBAAuB,KAAyB,SAAmC;AACvG,QAAM,QAAQ,gBAAgB;AAC9B,QAAM,QAAQ,MAAM,MAAM,QAAQ,KAAK,WAAW,UAAU,IAAI,EAAE,QAAQ,IAAI,MAAS;AACvF,QAAM,qCAAqC;AAC3C,SAAO;AACT;",
   "names": []
 }

package/dist/modules/webhooks/subscribers/failed-delivery-notification.js

@@ -1,9 +1,11 @@
 import { findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { resolveNotificationService } from "@open-mercato/core/modules/notifications/lib/notificationService";
 import { buildFeatureNotificationFromType } from "@open-mercato/core/modules/notifications/lib/notificationBuilder";
+import { createLogger } from "@open-mercato/shared/lib/logger";
 import { WebhookEntity } from "../data/entities.js";
 import { resolveWebhookIntegrationSettings } from "../lib/integration-settings.js";
 import { notificationTypes } from "../notifications.js";
+const logger = createLogger("webhooks").child({ component: "failed-delivery-notification" });
 const metadata = {
   event: "webhooks.delivery.exhausted",
   persistent: true,
@@ -55,7 +57,7 @@ async function handle(payload, ctx) {
       organizationId
     });
   } catch (err) {
-    console.error("[webhooks:failed-delivery-notification] Failed to create notification:", err);
+    logger.error("Failed to create notification", { err });
   }
 }
 export {

package/dist/modules/webhooks/subscribers/failed-delivery-notification.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/webhooks/subscribers/failed-delivery-notification.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { resolveNotificationService } from '@open-mercato/core/modules/notifications/lib/notificationService'\nimport { buildFeatureNotificationFromType } from '@open-mercato/core/modules/notifications/lib/notificationBuilder'\nimport { WebhookEntity } from '../data/entities'\nimport { resolveWebhookIntegrationSettings } from '../lib/integration-settings'\nimport { notificationTypes } from '../notifications'\n\nexport const metadata = {\n  event: 'webhooks.delivery.exhausted',\n  persistent: true,\n  id: 'webhooks:failed-delivery-notification',\n}\n\ntype WebhookDeliveryExhaustedPayload = {\n  deliveryId: string\n  webhookId: string\n  eventType: string\n  errorMessage?: string | null\n  tenantId: string\n  organizationId?: string | null\n}\n\ntype ResolverContext = {\n  resolve: <T = unknown>(name: string) => T\n}\n\nexport default async function handle(payload: WebhookDeliveryExhaustedPayload, ctx: ResolverContext) {\n  try {\n    const organizationId = payload.organizationId ?? null\n    const settings = await resolveWebhookIntegrationSettings(ctx, {\n      tenantId: payload.tenantId,\n      organizationId: organizationId ?? '',\n    })\n    if (!settings.notifyOnFailedDelivery) return\n\n    const notificationService = resolveNotificationService(ctx)\n    const typeDef = notificationTypes.find((type) => type.type === 'webhooks.delivery.failed')\n    if (!typeDef) return\n\n    const em = ctx.resolve<EntityManager>('em').fork()\n    const webhook = await findOneWithDecryption(\n      em,\n      WebhookEntity,\n      {\n        id: payload.webhookId,\n        tenantId: payload.tenantId,\n        organizationId: organizationId ?? undefined,\n        deletedAt: null,\n      },\n      {},\n      { tenantId: payload.tenantId, organizationId: organizationId ?? '' },\n    )\n\n    const webhookName = webhook?.name?.trim() || payload.webhookId\n    const errorMessage = payload.errorMessage?.trim() || 'Delivery retries exhausted'\n\n    const notificationInput = buildFeatureNotificationFromType(typeDef, {\n      requiredFeature: 'webhooks.manage',\n      titleVariables: {\n        webhookName,\n      },\n      bodyVariables: {\n        webhookName,\n        eventType: payload.eventType,\n        errorMessage,\n      },\n      sourceEntityType: 'webhooks:webhook',\n      sourceEntityId: payload.webhookId,\n      linkHref: `/backend/webhooks/${payload.webhookId}`,\n      groupKey: `delivery-failed:${payload.deliveryId}`,\n    })\n\n    await notificationService.createForFeature(notificationInput, {\n      tenantId: payload.tenantId,\n      organizationId,\n    })\n  } catch (err) {\n    console.error('[webhooks:failed-delivery-notification] Failed to create notification:', err)\n  }\n}\n"],
-  "mappings": "AACA,SAAS,6BAA6B;AACtC,SAAS,kCAAkC;AAC3C,SAAS,wCAAwC;AACjD,SAAS,qBAAqB;AAC9B,SAAS,yCAAyC;AAClD,SAAS,yBAAyB;AAE3B,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAeA,eAAO,OAA8B,SAA0C,KAAsB;AACnG,MAAI;AACF,UAAM,iBAAiB,QAAQ,kBAAkB;AACjD,UAAM,WAAW,MAAM,kCAAkC,KAAK;AAAA,MAC5D,UAAU,QAAQ;AAAA,MAClB,gBAAgB,kBAAkB;AAAA,IACpC,CAAC;AACD,QAAI,CAAC,SAAS,uBAAwB;AAEtC,UAAM,sBAAsB,2BAA2B,GAAG;AAC1D,UAAM,UAAU,kBAAkB,KAAK,CAAC,SAAS,KAAK,SAAS,0BAA0B;AACzF,QAAI,CAAC,QAAS;AAEd,UAAM,KAAK,IAAI,QAAuB,IAAI,EAAE,KAAK;AACjD,UAAM,UAAU,MAAM;AAAA,MACpB;AAAA,MACA;AAAA,MACA;AAAA,QACE,IAAI,QAAQ;AAAA,QACZ,UAAU,QAAQ;AAAA,QAClB,gBAAgB,kBAAkB;AAAA,QAClC,WAAW;AAAA,MACb;AAAA,MACA,CAAC;AAAA,MACD,EAAE,UAAU,QAAQ,UAAU,gBAAgB,kBAAkB,GAAG;AAAA,IACrE;AAEA,UAAM,cAAc,SAAS,MAAM,KAAK,KAAK,QAAQ;AACrD,UAAM,eAAe,QAAQ,cAAc,KAAK,KAAK;AAErD,UAAM,oBAAoB,iCAAiC,SAAS;AAAA,MAClE,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,QACd;AAAA,MACF;AAAA,MACA,eAAe;AAAA,QACb;AAAA,QACA,WAAW,QAAQ;AAAA,QACnB;AAAA,MACF;AAAA,MACA,kBAAkB;AAAA,MAClB,gBAAgB,QAAQ;AAAA,MACxB,UAAU,qBAAqB,QAAQ,SAAS;AAAA,MAChD,UAAU,mBAAmB,QAAQ,UAAU;AAAA,IACjD,CAAC;AAED,UAAM,oBAAoB,iBAAiB,mBAAmB;AAAA,MAC5D,UAAU,QAAQ;AAAA,MAClB;AAAA,IACF,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,YAAQ,MAAM,0EAA0E,GAAG;AAAA,EAC7F;AACF;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { resolveNotificationService } from '@open-mercato/core/modules/notifications/lib/notificationService'\nimport { buildFeatureNotificationFromType } from '@open-mercato/core/modules/notifications/lib/notificationBuilder'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { WebhookEntity } from '../data/entities'\nimport { resolveWebhookIntegrationSettings } from '../lib/integration-settings'\nimport { notificationTypes } from '../notifications'\n\nconst logger = createLogger('webhooks').child({ component: 'failed-delivery-notification' })\n\nexport const metadata = {\n  event: 'webhooks.delivery.exhausted',\n  persistent: true,\n  id: 'webhooks:failed-delivery-notification',\n}\n\ntype WebhookDeliveryExhaustedPayload = {\n  deliveryId: string\n  webhookId: string\n  eventType: string\n  errorMessage?: string | null\n  tenantId: string\n  organizationId?: string | null\n}\n\ntype ResolverContext = {\n  resolve: <T = unknown>(name: string) => T\n}\n\nexport default async function handle(payload: WebhookDeliveryExhaustedPayload, ctx: ResolverContext) {\n  try {\n    const organizationId = payload.organizationId ?? null\n    const settings = await resolveWebhookIntegrationSettings(ctx, {\n      tenantId: payload.tenantId,\n      organizationId: organizationId ?? '',\n    })\n    if (!settings.notifyOnFailedDelivery) return\n\n    const notificationService = resolveNotificationService(ctx)\n    const typeDef = notificationTypes.find((type) => type.type === 'webhooks.delivery.failed')\n    if (!typeDef) return\n\n    const em = ctx.resolve<EntityManager>('em').fork()\n    const webhook = await findOneWithDecryption(\n      em,\n      WebhookEntity,\n      {\n        id: payload.webhookId,\n        tenantId: payload.tenantId,\n        organizationId: organizationId ?? undefined,\n        deletedAt: null,\n      },\n      {},\n      { tenantId: payload.tenantId, organizationId: organizationId ?? '' },\n    )\n\n    const webhookName = webhook?.name?.trim() || payload.webhookId\n    const errorMessage = payload.errorMessage?.trim() || 'Delivery retries exhausted'\n\n    const notificationInput = buildFeatureNotificationFromType(typeDef, {\n      requiredFeature: 'webhooks.manage',\n      titleVariables: {\n        webhookName,\n      },\n      bodyVariables: {\n        webhookName,\n        eventType: payload.eventType,\n        errorMessage,\n      },\n      sourceEntityType: 'webhooks:webhook',\n      sourceEntityId: payload.webhookId,\n      linkHref: `/backend/webhooks/${payload.webhookId}`,\n      groupKey: `delivery-failed:${payload.deliveryId}`,\n    })\n\n    await notificationService.createForFeature(notificationInput, {\n      tenantId: payload.tenantId,\n      organizationId,\n    })\n  } catch (err) {\n    logger.error('Failed to create notification', { err })\n  }\n}\n"],
+  "mappings": "AACA,SAAS,6BAA6B;AACtC,SAAS,kCAAkC;AAC3C,SAAS,wCAAwC;AACjD,SAAS,oBAAoB;AAC7B,SAAS,qBAAqB;AAC9B,SAAS,yCAAyC;AAClD,SAAS,yBAAyB;AAElC,MAAM,SAAS,aAAa,UAAU,EAAE,MAAM,EAAE,WAAW,+BAA+B,CAAC;AAEpF,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAeA,eAAO,OAA8B,SAA0C,KAAsB;AACnG,MAAI;AACF,UAAM,iBAAiB,QAAQ,kBAAkB;AACjD,UAAM,WAAW,MAAM,kCAAkC,KAAK;AAAA,MAC5D,UAAU,QAAQ;AAAA,MAClB,gBAAgB,kBAAkB;AAAA,IACpC,CAAC;AACD,QAAI,CAAC,SAAS,uBAAwB;AAEtC,UAAM,sBAAsB,2BAA2B,GAAG;AAC1D,UAAM,UAAU,kBAAkB,KAAK,CAAC,SAAS,KAAK,SAAS,0BAA0B;AACzF,QAAI,CAAC,QAAS;AAEd,UAAM,KAAK,IAAI,QAAuB,IAAI,EAAE,KAAK;AACjD,UAAM,UAAU,MAAM;AAAA,MACpB;AAAA,MACA;AAAA,MACA;AAAA,QACE,IAAI,QAAQ;AAAA,QACZ,UAAU,QAAQ;AAAA,QAClB,gBAAgB,kBAAkB;AAAA,QAClC,WAAW;AAAA,MACb;AAAA,MACA,CAAC;AAAA,MACD,EAAE,UAAU,QAAQ,UAAU,gBAAgB,kBAAkB,GAAG;AAAA,IACrE;AAEA,UAAM,cAAc,SAAS,MAAM,KAAK,KAAK,QAAQ;AACrD,UAAM,eAAe,QAAQ,cAAc,KAAK,KAAK;AAErD,UAAM,oBAAoB,iCAAiC,SAAS;AAAA,MAClE,iBAAiB;AAAA,MACjB,gBAAgB;AAAA,QACd;AAAA,MACF;AAAA,MACA,eAAe;AAAA,QACb;AAAA,QACA,WAAW,QAAQ;AAAA,QACnB;AAAA,MACF;AAAA,MACA,kBAAkB;AAAA,MAClB,gBAAgB,QAAQ;AAAA,MACxB,UAAU,qBAAqB,QAAQ,SAAS;AAAA,MAChD,UAAU,mBAAmB,QAAQ,UAAU;AAAA,IACjD,CAAC;AAED,UAAM,oBAAoB,iBAAiB,mBAAmB;AAAA,MAC5D,UAAU,QAAQ;AAAA,MAClB;AAAA,IACF,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,WAAO,MAAM,iCAAiC,EAAE,IAAI,CAAC;AAAA,EACvD;AACF;",
   "names": []
 }

package/dist/modules/webhooks/subscribers/inbound-process.js

@@ -1,4 +1,6 @@
+import { createLogger } from "@open-mercato/shared/lib/logger";
 import { getWebhookEndpointAdapter } from "../lib/adapter-registry.js";
+const logger = createLogger("webhooks").child({ component: "inbound" });
 const metadata = {
   event: "webhooks.inbound.received",
   persistent: true,
@@ -24,11 +26,7 @@ async function handler(payload) {
       organizationId: typeof payload.organizationId === "string" ? payload.organizationId : void 0
     });
   } catch (err) {
-    console.error("[webhooks:inbound] Processing failed:", {
-      providerKey,
-      eventType,
-      error: err instanceof Error ? err.message : String(err)
-    });
+    logger.error("Processing failed", { providerKey, eventType, err });
     throw err;
   }
 }

package/dist/modules/webhooks/subscribers/inbound-process.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/webhooks/subscribers/inbound-process.ts"],
-  "sourcesContent": ["import { getWebhookEndpointAdapter } from '../lib/adapter-registry'\n\nexport const metadata = {\n  event: 'webhooks.inbound.received',\n  persistent: true,\n  id: 'webhooks:inbound-process',\n}\n\nexport default async function handler(payload: Record<string, unknown>) {\n  const providerKey = typeof payload.providerKey === 'string' ? payload.providerKey : null\n  const eventType = typeof payload.eventType === 'string' ? payload.eventType : null\n  const verifiedPayload = isRecord(payload.payload) ? payload.payload : null\n\n  if (!providerKey || !eventType || !verifiedPayload) {\n    return\n  }\n\n  const adapter = getWebhookEndpointAdapter(providerKey)\n  if (!adapter) {\n    throw new Error(`Webhook endpoint adapter \"${providerKey}\" is not registered`)\n  }\n\n  try {\n    await adapter.processInbound({\n      providerKey,\n      eventType,\n      payload: verifiedPayload,\n      tenantId: typeof payload.tenantId === 'string' ? payload.tenantId : undefined,\n      organizationId: typeof payload.organizationId === 'string' ? payload.organizationId : undefined,\n    })\n  } catch (err) {\n    console.error('[webhooks:inbound] Processing failed:', {\n      providerKey,\n      eventType,\n      error: err instanceof Error ? err.message : String(err),\n    })\n    throw err\n  }\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null && !Array.isArray(value)\n}\n"],
-  "mappings": "AAAA,SAAS,iCAAiC;AAEnC,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAEA,eAAO,QAA+B,SAAkC;AACtE,QAAM,cAAc,OAAO,QAAQ,gBAAgB,WAAW,QAAQ,cAAc;AACpF,QAAM,YAAY,OAAO,QAAQ,cAAc,WAAW,QAAQ,YAAY;AAC9E,QAAM,kBAAkB,SAAS,QAAQ,OAAO,IAAI,QAAQ,UAAU;AAEtE,MAAI,CAAC,eAAe,CAAC,aAAa,CAAC,iBAAiB;AAClD;AAAA,EACF;AAEA,QAAM,UAAU,0BAA0B,WAAW;AACrD,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,6BAA6B,WAAW,qBAAqB;AAAA,EAC/E;AAEA,MAAI;AACF,UAAM,QAAQ,eAAe;AAAA,MAC3B;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,UAAU,OAAO,QAAQ,aAAa,WAAW,QAAQ,WAAW;AAAA,MACpE,gBAAgB,OAAO,QAAQ,mBAAmB,WAAW,QAAQ,iBAAiB;AAAA,IACxF,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,YAAQ,MAAM,yCAAyC;AAAA,MACrD;AAAA,MACA;AAAA,MACA,OAAO,eAAe,QAAQ,IAAI,UAAU,OAAO,GAAG;AAAA,IACxD,CAAC;AACD,UAAM;AAAA,EACR;AACF;AAEA,SAAS,SAAS,OAAkD;AAClE,SAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,KAAK;AAC5E;",
+  "sourcesContent": ["import { createLogger } from '@open-mercato/shared/lib/logger'\nimport { getWebhookEndpointAdapter } from '../lib/adapter-registry'\n\nconst logger = createLogger('webhooks').child({ component: 'inbound' })\n\nexport const metadata = {\n  event: 'webhooks.inbound.received',\n  persistent: true,\n  id: 'webhooks:inbound-process',\n}\n\nexport default async function handler(payload: Record<string, unknown>) {\n  const providerKey = typeof payload.providerKey === 'string' ? payload.providerKey : null\n  const eventType = typeof payload.eventType === 'string' ? payload.eventType : null\n  const verifiedPayload = isRecord(payload.payload) ? payload.payload : null\n\n  if (!providerKey || !eventType || !verifiedPayload) {\n    return\n  }\n\n  const adapter = getWebhookEndpointAdapter(providerKey)\n  if (!adapter) {\n    throw new Error(`Webhook endpoint adapter \"${providerKey}\" is not registered`)\n  }\n\n  try {\n    await adapter.processInbound({\n      providerKey,\n      eventType,\n      payload: verifiedPayload,\n      tenantId: typeof payload.tenantId === 'string' ? payload.tenantId : undefined,\n      organizationId: typeof payload.organizationId === 'string' ? payload.organizationId : undefined,\n    })\n  } catch (err) {\n    logger.error('Processing failed', { providerKey, eventType, err })\n    throw err\n  }\n}\n\nfunction isRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null && !Array.isArray(value)\n}\n"],
+  "mappings": "AAAA,SAAS,oBAAoB;AAC7B,SAAS,iCAAiC;AAE1C,MAAM,SAAS,aAAa,UAAU,EAAE,MAAM,EAAE,WAAW,UAAU,CAAC;AAE/D,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAEA,eAAO,QAA+B,SAAkC;AACtE,QAAM,cAAc,OAAO,QAAQ,gBAAgB,WAAW,QAAQ,cAAc;AACpF,QAAM,YAAY,OAAO,QAAQ,cAAc,WAAW,QAAQ,YAAY;AAC9E,QAAM,kBAAkB,SAAS,QAAQ,OAAO,IAAI,QAAQ,UAAU;AAEtE,MAAI,CAAC,eAAe,CAAC,aAAa,CAAC,iBAAiB;AAClD;AAAA,EACF;AAEA,QAAM,UAAU,0BAA0B,WAAW;AACrD,MAAI,CAAC,SAAS;AACZ,UAAM,IAAI,MAAM,6BAA6B,WAAW,qBAAqB;AAAA,EAC/E;AAEA,MAAI;AACF,UAAM,QAAQ,eAAe;AAAA,MAC3B;AAAA,MACA;AAAA,MACA,SAAS;AAAA,MACT,UAAU,OAAO,QAAQ,aAAa,WAAW,QAAQ,WAAW;AAAA,MACpE,gBAAgB,OAAO,QAAQ,mBAAmB,WAAW,QAAQ,iBAAiB;AAAA,IACxF,CAAC;AAAA,EACH,SAAS,KAAK;AACZ,WAAO,MAAM,qBAAqB,EAAE,aAAa,WAAW,IAAI,CAAC;AACjE,UAAM;AAAA,EACR;AACF;AAEA,SAAS,SAAS,OAAkD;AAClE,SAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,KAAK;AAC5E;",
   "names": []
 }

package/dist/modules/webhooks/subscribers/outbound-dispatch.js

@@ -2,9 +2,11 @@ import { WebhookDeliveryEntity, WebhookEntity } from "../data/entities.js";
 import { findWithDecryption, findOneWithDecryption } from "@open-mercato/shared/lib/encryption/find";
 import { matchAnyWebhookEventPattern } from "@open-mercato/shared/lib/events/patterns";
 import { getDeclaredEvents } from "@open-mercato/shared/modules/events";
+import { createLogger } from "@open-mercato/shared/lib/logger";
 import { createWebhookDelivery } from "../lib/delivery.js";
 import { enqueueWebhookDelivery } from "../lib/queue.js";
 import { isWebhookIntegrationEnabled } from "../lib/integration-state.js";
+const logger = createLogger("webhooks");
 const metadata = {
   event: "*",
   persistent: true,
@@ -99,12 +101,12 @@ async function handler(payload, ctx) {
             await webhookEm.flush();
           }
         }
-        console.error("[webhooks] Failed to enqueue outbound delivery", {
+        logger.error("Failed to enqueue outbound delivery", {
           webhookId: webhook.id,
           eventId,
           tenantId,
           organizationId: organizationId ?? webhook.organizationId,
-          error: error instanceof Error ? error.message : String(error)
+          err: error
         });
       }
     })

package/dist/modules/webhooks/subscribers/outbound-dispatch.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/webhooks/subscribers/outbound-dispatch.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { SubscriberContext } from '@open-mercato/events/types'\nimport { WebhookDeliveryEntity, WebhookEntity } from '../data/entities'\nimport { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { matchAnyWebhookEventPattern } from '@open-mercato/shared/lib/events/patterns'\nimport { getDeclaredEvents } from '@open-mercato/shared/modules/events'\nimport { createWebhookDelivery } from '../lib/delivery'\nimport { enqueueWebhookDelivery } from '../lib/queue'\nimport { isWebhookIntegrationEnabled } from '../lib/integration-state'\n\nexport const metadata = {\n  event: '*',\n  persistent: true,\n  id: 'webhooks:outbound-dispatch',\n}\n\nfunction shouldSkipOutboundDispatch(eventId: string): boolean {\n  if (eventId.startsWith('webhooks.') || eventId.startsWith('application.')) return true\n\n  const declaredEvent = getDeclaredEvents().find((event) => event.id === eventId)\n  return declaredEvent?.excludeFromTriggers === true\n}\n\nfunction forkOutboundEntityManager(em: EntityManager): EntityManager {\n  const fork = (em as unknown as { fork?: (options?: Record<string, unknown>) => EntityManager }).fork\n  if (typeof fork !== 'function') return em\n  return fork.call(em, { clear: true, useContext: false })\n}\n\nfunction integrationScopeKey(tenantId: string, organizationId: string): string {\n  return `${tenantId}:${organizationId}`\n}\n\nexport default async function handler(\n  payload: Record<string, unknown>,\n  ctx: (SubscriberContext & { eventId?: string }) | { container?: { resolve: <T = unknown>(name: string) => T }; eventId?: string; eventName?: string; resolve?: <T = unknown>(name: string) => T },\n) {\n  const eventId = ctx.eventId ?? ctx.eventName ?? (payload.eventId as string) ?? (payload.type as string)\n  if (!eventId) return\n  if (shouldSkipOutboundDispatch(eventId)) return\n\n  const tenantId = payload.tenantId as string | undefined\n  const organizationId = payload.organizationId as string | undefined\n  if (!tenantId) return\n\n  if (eventId.startsWith('webhooks.')) return\n  if (eventId.startsWith('query_index.')) return\n\n\n  const resolve = ('resolve' in ctx && typeof ctx.resolve === 'function')\n    ? ctx.resolve\n    : ('container' in ctx && ctx.container && typeof ctx.container.resolve === 'function')\n      ? ctx.container.resolve.bind(ctx.container)\n      : null\n\n  if (!resolve) return\n\n  const em = (resolve('em') as EntityManager).fork()\n\n  const webhooks = await findWithDecryption(\n    em,\n    WebhookEntity,\n    {\n      isActive: true,\n      deletedAt: null,\n      tenantId,\n      ...(organizationId ? { organizationId } : {}),\n    },\n    {},\n    { tenantId, organizationId: organizationId ?? null },\n  )\n\n  if (!webhooks.length) return\n\n  const matchingWebhooks = webhooks.filter((webhook) =>\n    matchAnyWebhookEventPattern(eventId, webhook.subscribedEvents),\n  )\n\n  if (!matchingWebhooks.length) return\n\n  const integrationEnabledByScope = new Map<string, Promise<boolean>>()\n\n  const resolveIntegrationEnabled = (webhook: WebhookEntity): Promise<boolean> => {\n    const key = integrationScopeKey(webhook.tenantId, webhook.organizationId)\n    let pending = integrationEnabledByScope.get(key)\n    if (!pending) {\n      pending = isWebhookIntegrationEnabled(em, {\n        tenantId: webhook.tenantId,\n        organizationId: webhook.organizationId,\n      })\n      integrationEnabledByScope.set(key, pending)\n    }\n    return pending\n  }\n\n  await Promise.all(\n    matchingWebhooks.map(async (webhook) => {\n      if (!(await resolveIntegrationEnabled(webhook))) return\n\n      const webhookEm = forkOutboundEntityManager(em)\n      let createdDeliveryId: string | null = null\n      try {\n        const delivery = await createWebhookDelivery({\n          em: webhookEm,\n          webhook,\n          eventId,\n          payload,\n        })\n        createdDeliveryId = delivery.id\n\n        await enqueueWebhookDelivery({\n          deliveryId: delivery.id,\n          tenantId: delivery.tenantId,\n          organizationId: delivery.organizationId,\n        })\n      } catch (error) {\n        if (createdDeliveryId) {\n          const failedDelivery = await findOneWithDecryption(\n            webhookEm,\n            WebhookDeliveryEntity,\n            { id: createdDeliveryId, tenantId: webhook.tenantId, organizationId: webhook.organizationId },\n            undefined,\n            { tenantId: webhook.tenantId, organizationId: webhook.organizationId },\n          )\n          if (failedDelivery) {\n            failedDelivery.status = 'failed'\n            failedDelivery.errorMessage = error instanceof Error ? `Queue enqueue failed: ${error.message}` : 'Queue enqueue failed'\n            failedDelivery.nextRetryAt = null\n            await webhookEm.flush()\n          }\n        }\n        console.error('[webhooks] Failed to enqueue outbound delivery', {\n          webhookId: webhook.id,\n          eventId,\n          tenantId,\n          organizationId: organizationId ?? webhook.organizationId,\n          error: error instanceof Error ? error.message : String(error),\n        })\n      }\n    }),\n  )\n}\n"],
-  "mappings": "AAEA,SAAS,uBAAuB,qBAAqB;AACrD,SAAS,oBAAoB,6BAA6B;AAC1D,SAAS,mCAAmC;AAC5C,SAAS,yBAAyB;AAClC,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,mCAAmC;AAErC,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAEA,SAAS,2BAA2B,SAA0B;AAC5D,MAAI,QAAQ,WAAW,WAAW,KAAK,QAAQ,WAAW,cAAc,EAAG,QAAO;AAElF,QAAM,gBAAgB,kBAAkB,EAAE,KAAK,CAAC,UAAU,MAAM,OAAO,OAAO;AAC9E,SAAO,eAAe,wBAAwB;AAChD;AAEA,SAAS,0BAA0B,IAAkC;AACnE,QAAM,OAAQ,GAAkF;AAChG,MAAI,OAAO,SAAS,WAAY,QAAO;AACvC,SAAO,KAAK,KAAK,IAAI,EAAE,OAAO,MAAM,YAAY,MAAM,CAAC;AACzD;AAEA,SAAS,oBAAoB,UAAkB,gBAAgC;AAC7E,SAAO,GAAG,QAAQ,IAAI,cAAc;AACtC;AAEA,eAAO,QACL,SACA,KACA;AACA,QAAM,UAAU,IAAI,WAAW,IAAI,aAAc,QAAQ,WAAuB,QAAQ;AACxF,MAAI,CAAC,QAAS;AACd,MAAI,2BAA2B,OAAO,EAAG;AAEzC,QAAM,WAAW,QAAQ;AACzB,QAAM,iBAAiB,QAAQ;AAC/B,MAAI,CAAC,SAAU;AAEf,MAAI,QAAQ,WAAW,WAAW,EAAG;AACrC,MAAI,QAAQ,WAAW,cAAc,EAAG;AAGxC,QAAM,UAAW,aAAa,OAAO,OAAO,IAAI,YAAY,aACxD,IAAI,UACH,eAAe,OAAO,IAAI,aAAa,OAAO,IAAI,UAAU,YAAY,aACvE,IAAI,UAAU,QAAQ,KAAK,IAAI,SAAS,IACxC;AAEN,MAAI,CAAC,QAAS;AAEd,QAAM,KAAM,QAAQ,IAAI,EAAoB,KAAK;AAEjD,QAAM,WAAW,MAAM;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,MACE,UAAU;AAAA,MACV,WAAW;AAAA,MACX;AAAA,MACA,GAAI,iBAAiB,EAAE,eAAe,IAAI,CAAC;AAAA,IAC7C;AAAA,IACA,CAAC;AAAA,IACD,EAAE,UAAU,gBAAgB,kBAAkB,KAAK;AAAA,EACrD;AAEA,MAAI,CAAC,SAAS,OAAQ;AAEtB,QAAM,mBAAmB,SAAS;AAAA,IAAO,CAAC,YACxC,4BAA4B,SAAS,QAAQ,gBAAgB;AAAA,EAC/D;AAEA,MAAI,CAAC,iBAAiB,OAAQ;AAE9B,QAAM,4BAA4B,oBAAI,IAA8B;AAEpE,QAAM,4BAA4B,CAAC,YAA6C;AAC9E,UAAM,MAAM,oBAAoB,QAAQ,UAAU,QAAQ,cAAc;AACxE,QAAI,UAAU,0BAA0B,IAAI,GAAG;AAC/C,QAAI,CAAC,SAAS;AACZ,gBAAU,4BAA4B,IAAI;AAAA,QACxC,UAAU,QAAQ;AAAA,QAClB,gBAAgB,QAAQ;AAAA,MAC1B,CAAC;AACD,gCAA0B,IAAI,KAAK,OAAO;AAAA,IAC5C;AACA,WAAO;AAAA,EACT;AAEA,QAAM,QAAQ;AAAA,IACZ,iBAAiB,IAAI,OAAO,YAAY;AACtC,UAAI,CAAE,MAAM,0BAA0B,OAAO,EAAI;AAEjD,YAAM,YAAY,0BAA0B,EAAE;AAC9C,UAAI,oBAAmC;AACvC,UAAI;AACF,cAAM,WAAW,MAAM,sBAAsB;AAAA,UAC3C,IAAI;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,QACF,CAAC;AACD,4BAAoB,SAAS;AAE7B,cAAM,uBAAuB;AAAA,UAC3B,YAAY,SAAS;AAAA,UACrB,UAAU,SAAS;AAAA,UACnB,gBAAgB,SAAS;AAAA,QAC3B,CAAC;AAAA,MACH,SAAS,OAAO;AACd,YAAI,mBAAmB;AACrB,gBAAM,iBAAiB,MAAM;AAAA,YAC3B;AAAA,YACA;AAAA,YACA,EAAE,IAAI,mBAAmB,UAAU,QAAQ,UAAU,gBAAgB,QAAQ,eAAe;AAAA,YAC5F;AAAA,YACA,EAAE,UAAU,QAAQ,UAAU,gBAAgB,QAAQ,eAAe;AAAA,UACvE;AACA,cAAI,gBAAgB;AAClB,2BAAe,SAAS;AACxB,2BAAe,eAAe,iBAAiB,QAAQ,yBAAyB,MAAM,OAAO,KAAK;AAClG,2BAAe,cAAc;AAC7B,kBAAM,UAAU,MAAM;AAAA,UACxB;AAAA,QACF;AACA,gBAAQ,MAAM,kDAAkD;AAAA,UAC9D,WAAW,QAAQ;AAAA,UACnB;AAAA,UACA;AAAA,UACA,gBAAgB,kBAAkB,QAAQ;AAAA,UAC1C,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAAA,QAC9D,CAAC;AAAA,MACH;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport type { SubscriberContext } from '@open-mercato/events/types'\nimport { WebhookDeliveryEntity, WebhookEntity } from '../data/entities'\nimport { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'\nimport { matchAnyWebhookEventPattern } from '@open-mercato/shared/lib/events/patterns'\nimport { getDeclaredEvents } from '@open-mercato/shared/modules/events'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { createWebhookDelivery } from '../lib/delivery'\nimport { enqueueWebhookDelivery } from '../lib/queue'\nimport { isWebhookIntegrationEnabled } from '../lib/integration-state'\n\nconst logger = createLogger('webhooks')\n\nexport const metadata = {\n  event: '*',\n  persistent: true,\n  id: 'webhooks:outbound-dispatch',\n}\n\nfunction shouldSkipOutboundDispatch(eventId: string): boolean {\n  if (eventId.startsWith('webhooks.') || eventId.startsWith('application.')) return true\n\n  const declaredEvent = getDeclaredEvents().find((event) => event.id === eventId)\n  return declaredEvent?.excludeFromTriggers === true\n}\n\nfunction forkOutboundEntityManager(em: EntityManager): EntityManager {\n  const fork = (em as unknown as { fork?: (options?: Record<string, unknown>) => EntityManager }).fork\n  if (typeof fork !== 'function') return em\n  return fork.call(em, { clear: true, useContext: false })\n}\n\nfunction integrationScopeKey(tenantId: string, organizationId: string): string {\n  return `${tenantId}:${organizationId}`\n}\n\nexport default async function handler(\n  payload: Record<string, unknown>,\n  ctx: (SubscriberContext & { eventId?: string }) | { container?: { resolve: <T = unknown>(name: string) => T }; eventId?: string; eventName?: string; resolve?: <T = unknown>(name: string) => T },\n) {\n  const eventId = ctx.eventId ?? ctx.eventName ?? (payload.eventId as string) ?? (payload.type as string)\n  if (!eventId) return\n  if (shouldSkipOutboundDispatch(eventId)) return\n\n  const tenantId = payload.tenantId as string | undefined\n  const organizationId = payload.organizationId as string | undefined\n  if (!tenantId) return\n\n  if (eventId.startsWith('webhooks.')) return\n  if (eventId.startsWith('query_index.')) return\n\n\n  const resolve = ('resolve' in ctx && typeof ctx.resolve === 'function')\n    ? ctx.resolve\n    : ('container' in ctx && ctx.container && typeof ctx.container.resolve === 'function')\n      ? ctx.container.resolve.bind(ctx.container)\n      : null\n\n  if (!resolve) return\n\n  const em = (resolve('em') as EntityManager).fork()\n\n  const webhooks = await findWithDecryption(\n    em,\n    WebhookEntity,\n    {\n      isActive: true,\n      deletedAt: null,\n      tenantId,\n      ...(organizationId ? { organizationId } : {}),\n    },\n    {},\n    { tenantId, organizationId: organizationId ?? null },\n  )\n\n  if (!webhooks.length) return\n\n  const matchingWebhooks = webhooks.filter((webhook) =>\n    matchAnyWebhookEventPattern(eventId, webhook.subscribedEvents),\n  )\n\n  if (!matchingWebhooks.length) return\n\n  const integrationEnabledByScope = new Map<string, Promise<boolean>>()\n\n  const resolveIntegrationEnabled = (webhook: WebhookEntity): Promise<boolean> => {\n    const key = integrationScopeKey(webhook.tenantId, webhook.organizationId)\n    let pending = integrationEnabledByScope.get(key)\n    if (!pending) {\n      pending = isWebhookIntegrationEnabled(em, {\n        tenantId: webhook.tenantId,\n        organizationId: webhook.organizationId,\n      })\n      integrationEnabledByScope.set(key, pending)\n    }\n    return pending\n  }\n\n  await Promise.all(\n    matchingWebhooks.map(async (webhook) => {\n      if (!(await resolveIntegrationEnabled(webhook))) return\n\n      const webhookEm = forkOutboundEntityManager(em)\n      let createdDeliveryId: string | null = null\n      try {\n        const delivery = await createWebhookDelivery({\n          em: webhookEm,\n          webhook,\n          eventId,\n          payload,\n        })\n        createdDeliveryId = delivery.id\n\n        await enqueueWebhookDelivery({\n          deliveryId: delivery.id,\n          tenantId: delivery.tenantId,\n          organizationId: delivery.organizationId,\n        })\n      } catch (error) {\n        if (createdDeliveryId) {\n          const failedDelivery = await findOneWithDecryption(\n            webhookEm,\n            WebhookDeliveryEntity,\n            { id: createdDeliveryId, tenantId: webhook.tenantId, organizationId: webhook.organizationId },\n            undefined,\n            { tenantId: webhook.tenantId, organizationId: webhook.organizationId },\n          )\n          if (failedDelivery) {\n            failedDelivery.status = 'failed'\n            failedDelivery.errorMessage = error instanceof Error ? `Queue enqueue failed: ${error.message}` : 'Queue enqueue failed'\n            failedDelivery.nextRetryAt = null\n            await webhookEm.flush()\n          }\n        }\n        logger.error('Failed to enqueue outbound delivery', {\n          webhookId: webhook.id,\n          eventId,\n          tenantId,\n          organizationId: organizationId ?? webhook.organizationId,\n          err: error,\n        })\n      }\n    }),\n  )\n}\n"],
+  "mappings": "AAEA,SAAS,uBAAuB,qBAAqB;AACrD,SAAS,oBAAoB,6BAA6B;AAC1D,SAAS,mCAAmC;AAC5C,SAAS,yBAAyB;AAClC,SAAS,oBAAoB;AAC7B,SAAS,6BAA6B;AACtC,SAAS,8BAA8B;AACvC,SAAS,mCAAmC;AAE5C,MAAM,SAAS,aAAa,UAAU;AAE/B,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,YAAY;AAAA,EACZ,IAAI;AACN;AAEA,SAAS,2BAA2B,SAA0B;AAC5D,MAAI,QAAQ,WAAW,WAAW,KAAK,QAAQ,WAAW,cAAc,EAAG,QAAO;AAElF,QAAM,gBAAgB,kBAAkB,EAAE,KAAK,CAAC,UAAU,MAAM,OAAO,OAAO;AAC9E,SAAO,eAAe,wBAAwB;AAChD;AAEA,SAAS,0BAA0B,IAAkC;AACnE,QAAM,OAAQ,GAAkF;AAChG,MAAI,OAAO,SAAS,WAAY,QAAO;AACvC,SAAO,KAAK,KAAK,IAAI,EAAE,OAAO,MAAM,YAAY,MAAM,CAAC;AACzD;AAEA,SAAS,oBAAoB,UAAkB,gBAAgC;AAC7E,SAAO,GAAG,QAAQ,IAAI,cAAc;AACtC;AAEA,eAAO,QACL,SACA,KACA;AACA,QAAM,UAAU,IAAI,WAAW,IAAI,aAAc,QAAQ,WAAuB,QAAQ;AACxF,MAAI,CAAC,QAAS;AACd,MAAI,2BAA2B,OAAO,EAAG;AAEzC,QAAM,WAAW,QAAQ;AACzB,QAAM,iBAAiB,QAAQ;AAC/B,MAAI,CAAC,SAAU;AAEf,MAAI,QAAQ,WAAW,WAAW,EAAG;AACrC,MAAI,QAAQ,WAAW,cAAc,EAAG;AAGxC,QAAM,UAAW,aAAa,OAAO,OAAO,IAAI,YAAY,aACxD,IAAI,UACH,eAAe,OAAO,IAAI,aAAa,OAAO,IAAI,UAAU,YAAY,aACvE,IAAI,UAAU,QAAQ,KAAK,IAAI,SAAS,IACxC;AAEN,MAAI,CAAC,QAAS;AAEd,QAAM,KAAM,QAAQ,IAAI,EAAoB,KAAK;AAEjD,QAAM,WAAW,MAAM;AAAA,IACrB;AAAA,IACA;AAAA,IACA;AAAA,MACE,UAAU;AAAA,MACV,WAAW;AAAA,MACX;AAAA,MACA,GAAI,iBAAiB,EAAE,eAAe,IAAI,CAAC;AAAA,IAC7C;AAAA,IACA,CAAC;AAAA,IACD,EAAE,UAAU,gBAAgB,kBAAkB,KAAK;AAAA,EACrD;AAEA,MAAI,CAAC,SAAS,OAAQ;AAEtB,QAAM,mBAAmB,SAAS;AAAA,IAAO,CAAC,YACxC,4BAA4B,SAAS,QAAQ,gBAAgB;AAAA,EAC/D;AAEA,MAAI,CAAC,iBAAiB,OAAQ;AAE9B,QAAM,4BAA4B,oBAAI,IAA8B;AAEpE,QAAM,4BAA4B,CAAC,YAA6C;AAC9E,UAAM,MAAM,oBAAoB,QAAQ,UAAU,QAAQ,cAAc;AACxE,QAAI,UAAU,0BAA0B,IAAI,GAAG;AAC/C,QAAI,CAAC,SAAS;AACZ,gBAAU,4BAA4B,IAAI;AAAA,QACxC,UAAU,QAAQ;AAAA,QAClB,gBAAgB,QAAQ;AAAA,MAC1B,CAAC;AACD,gCAA0B,IAAI,KAAK,OAAO;AAAA,IAC5C;AACA,WAAO;AAAA,EACT;AAEA,QAAM,QAAQ;AAAA,IACZ,iBAAiB,IAAI,OAAO,YAAY;AACtC,UAAI,CAAE,MAAM,0BAA0B,OAAO,EAAI;AAEjD,YAAM,YAAY,0BAA0B,EAAE;AAC9C,UAAI,oBAAmC;AACvC,UAAI;AACF,cAAM,WAAW,MAAM,sBAAsB;AAAA,UAC3C,IAAI;AAAA,UACJ;AAAA,UACA;AAAA,UACA;AAAA,QACF,CAAC;AACD,4BAAoB,SAAS;AAE7B,cAAM,uBAAuB;AAAA,UAC3B,YAAY,SAAS;AAAA,UACrB,UAAU,SAAS;AAAA,UACnB,gBAAgB,SAAS;AAAA,QAC3B,CAAC;AAAA,MACH,SAAS,OAAO;AACd,YAAI,mBAAmB;AACrB,gBAAM,iBAAiB,MAAM;AAAA,YAC3B;AAAA,YACA;AAAA,YACA,EAAE,IAAI,mBAAmB,UAAU,QAAQ,UAAU,gBAAgB,QAAQ,eAAe;AAAA,YAC5F;AAAA,YACA,EAAE,UAAU,QAAQ,UAAU,gBAAgB,QAAQ,eAAe;AAAA,UACvE;AACA,cAAI,gBAAgB;AAClB,2BAAe,SAAS;AACxB,2BAAe,eAAe,iBAAiB,QAAQ,yBAAyB,MAAM,OAAO,KAAK;AAClG,2BAAe,cAAc;AAC7B,kBAAM,UAAU,MAAM;AAAA,UACxB;AAAA,QACF;AACA,eAAO,MAAM,uCAAuC;AAAA,UAClD,WAAW,QAAQ;AAAA,UACnB;AAAA,UACA;AAAA,UACA,gBAAgB,kBAAkB,QAAQ;AAAA,UAC1C,KAAK;AAAA,QACP,CAAC;AAAA,MACH;AAAA,IACF,CAAC;AAAA,EACH;AACF;",
   "names": []
 }

package/dist/modules/webhooks/workers/webhook-delivery.js

@@ -1,4 +1,6 @@
+import { createLogger } from "@open-mercato/shared/lib/logger";
 import { processWebhookDeliveryJob } from "../lib/delivery.js";
+const logger = createLogger("webhooks").child({ component: "delivery" });
 const metadata = {
   queue: "webhook-deliveries",
   id: "webhooks:delivery-worker",
@@ -9,10 +11,10 @@ async function handler(job, ctx) {
   try {
     await processWebhookDeliveryJob(em, job.data);
   } catch (error) {
-    console.error("[webhooks:delivery] Job processing failed", {
+    logger.error("Job processing failed", {
       deliveryId: job.data.deliveryId,
       tenantId: job.data.tenantId,
-      error: error instanceof Error ? error.message : String(error)
+      err: error
     });
     throw error;
   }

package/dist/modules/webhooks/workers/webhook-delivery.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/webhooks/workers/webhook-delivery.ts"],
-  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { processWebhookDeliveryJob, type WebhookDeliveryJob } from '../lib/delivery'\n\nexport const metadata = {\n  queue: 'webhook-deliveries',\n  id: 'webhooks:delivery-worker',\n  concurrency: 10,\n}\n\nexport default async function handler(\n  job: { data: WebhookDeliveryJob },\n  ctx: { resolve: <T = unknown>(name: string) => T },\n) {\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  try {\n    await processWebhookDeliveryJob(em, job.data)\n  } catch (error) {\n    console.error('[webhooks:delivery] Job processing failed', {\n      deliveryId: job.data.deliveryId,\n      tenantId: job.data.tenantId,\n      error: error instanceof Error ? error.message : String(error),\n    })\n    throw error\n  }\n}\n"],
-  "mappings": "AACA,SAAS,iCAA0D;AAE5D,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,IAAI;AAAA,EACJ,aAAa;AACf;AAEA,eAAO,QACL,KACA,KACA;AACA,QAAM,KAAM,IAAI,QAAQ,IAAI,EAAoB,KAAK;AACrD,MAAI;AACF,UAAM,0BAA0B,IAAI,IAAI,IAAI;AAAA,EAC9C,SAAS,OAAO;AACd,YAAQ,MAAM,6CAA6C;AAAA,MACzD,YAAY,IAAI,KAAK;AAAA,MACrB,UAAU,IAAI,KAAK;AAAA,MACnB,OAAO,iBAAiB,QAAQ,MAAM,UAAU,OAAO,KAAK;AAAA,IAC9D,CAAC;AACD,UAAM;AAAA,EACR;AACF;",
+  "sourcesContent": ["import type { EntityManager } from '@mikro-orm/postgresql'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\nimport { processWebhookDeliveryJob, type WebhookDeliveryJob } from '../lib/delivery'\n\nconst logger = createLogger('webhooks').child({ component: 'delivery' })\n\nexport const metadata = {\n  queue: 'webhook-deliveries',\n  id: 'webhooks:delivery-worker',\n  concurrency: 10,\n}\n\nexport default async function handler(\n  job: { data: WebhookDeliveryJob },\n  ctx: { resolve: <T = unknown>(name: string) => T },\n) {\n  const em = (ctx.resolve('em') as EntityManager).fork()\n  try {\n    await processWebhookDeliveryJob(em, job.data)\n  } catch (error) {\n    logger.error('Job processing failed', {\n      deliveryId: job.data.deliveryId,\n      tenantId: job.data.tenantId,\n      err: error,\n    })\n    throw error\n  }\n}\n"],
+  "mappings": "AACA,SAAS,oBAAoB;AAC7B,SAAS,iCAA0D;AAEnE,MAAM,SAAS,aAAa,UAAU,EAAE,MAAM,EAAE,WAAW,WAAW,CAAC;AAEhE,MAAM,WAAW;AAAA,EACtB,OAAO;AAAA,EACP,IAAI;AAAA,EACJ,aAAa;AACf;AAEA,eAAO,QACL,KACA,KACA;AACA,QAAM,KAAM,IAAI,QAAQ,IAAI,EAAoB,KAAK;AACrD,MAAI;AACF,UAAM,0BAA0B,IAAI,IAAI,IAAI;AAAA,EAC9C,SAAS,OAAO;AACd,WAAO,MAAM,yBAAyB;AAAA,MACpC,YAAY,IAAI,KAAK;AAAA,MACrB,UAAU,IAAI,KAAK;AAAA,MACnB,KAAK;AAAA,IACP,CAAC;AACD,UAAM;AAAA,EACR;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/webhooks",
-  "version": "0.6.6-develop.6465.1.019f0fb26f",
+  "version": "0.6.6-develop.6472.1.1673e7e66b",
   "license": "MIT",
   "description": "Webhooks module for Open Mercato — Standard Webhooks compliant outbound/inbound delivery",
   "type": "module",
@@ -70,19 +70,19 @@
     }
   },
   "dependencies": {
-    "@open-mercato/core": "0.6.6-develop.6465.1.019f0fb26f",
-    "@open-mercato/queue": "0.6.6-develop.6465.1.019f0fb26f",
-    "@open-mercato/ui": "0.6.6-develop.6465.1.019f0fb26f",
+    "@open-mercato/core": "0.6.6-develop.6472.1.1673e7e66b",
+    "@open-mercato/queue": "0.6.6-develop.6472.1.1673e7e66b",
+    "@open-mercato/ui": "0.6.6-develop.6472.1.1673e7e66b",
     "svix": "^1.96.1"
   },
   "peerDependencies": {
     "@mikro-orm/postgresql": "^7.0.14",
-    "@open-mercato/shared": "0.6.6-develop.6465.1.019f0fb26f",
+    "@open-mercato/shared": "0.6.6-develop.6472.1.1673e7e66b",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.6-develop.6465.1.019f0fb26f",
+    "@open-mercato/shared": "0.6.6-develop.6472.1.1673e7e66b",
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",

package/src/modules/webhooks/lib/queue.ts

@@ -1,7 +1,10 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import { createModuleQueue, type Queue } from '@open-mercato/queue'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import type { WebhookDeliveryJob } from './delivery'
 
+const logger = createLogger('webhooks')
+
 const queues = new Map<string, Queue<WebhookDeliveryJob>>()
 const LOCAL_WORKER_PROMISE_KEY = '__openMercatoWebhookLocalWorkerPromise__'
 
@@ -45,7 +48,7 @@ async function ensureLocalWebhookQueueWorkerStarted(): Promise<void> {
     })
   })().catch((error) => {
     delete globalStore[LOCAL_WORKER_PROMISE_KEY]
-    console.error('[webhooks] Failed to start local delivery worker:', error)
+    logger.error('Failed to start local delivery worker', { err: error })
     throw error
   })
 

package/src/modules/webhooks/subscribers/__tests__/outbound-dispatch.test.ts

@@ -1,6 +1,18 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
 import handler from '../outbound-dispatch'
 
+jest.mock('@open-mercato/shared/lib/logger', () => {
+  const mocked = {
+    debug: jest.fn(),
+    info: jest.fn(),
+    warn: jest.fn(),
+    error: jest.fn(),
+    child: jest.fn(),
+  }
+  mocked.child.mockImplementation(() => mocked)
+  return { createLogger: jest.fn(() => mocked) }
+})
+
 jest.mock('@open-mercato/shared/lib/encryption/find', () => ({
   findWithDecryption: jest.fn(),
   findOneWithDecryption: jest.fn(),
@@ -22,6 +34,9 @@ jest.mock('../../lib/integration-state', () => ({
 
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { getDeclaredEvents } from '@open-mercato/shared/modules/events'
+import { createLogger } from '@open-mercato/shared/lib/logger'
+
+const dispatchLoggerError = createLogger('webhooks').error as jest.Mock
 import { createWebhookDelivery } from '../../lib/delivery'
 import { enqueueWebhookDelivery } from '../../lib/queue'
 import { isWebhookIntegrationEnabled } from '../../lib/integration-state'
@@ -189,7 +204,7 @@ describe('webhooks outbound dispatch subscriber', () => {
   })
 
   it('scopes the failed-delivery lookup to webhook tenantId and organizationId when enqueue throws', async () => {
-    const consoleErrorSpy = jest.spyOn(console, 'error').mockImplementation(() => undefined)
+    dispatchLoggerError.mockClear()
 
     try {
       const { rootEm, webhookEm } = createDispatchEntityManagers()
@@ -234,18 +249,18 @@ describe('webhooks outbound dispatch subscriber', () => {
         expect.objectContaining({ tenantId: 'tenant-1', organizationId: 'org-1' }),
       )
       expect(webhookEm.flush).toHaveBeenCalled()
-      expect(consoleErrorSpy).toHaveBeenCalledWith(
-        '[webhooks] Failed to enqueue outbound delivery',
+      expect(dispatchLoggerError).toHaveBeenCalledWith(
+        'Failed to enqueue outbound delivery',
         expect.objectContaining({
           webhookId: 'webhook-1',
           eventId: 'catalog.product.created',
           tenantId: 'tenant-1',
           organizationId: 'org-1',
-          error: 'Queue unavailable',
+          err: expect.objectContaining({ message: 'Queue unavailable' }),
         }),
       )
     } finally {
-      consoleErrorSpy.mockRestore()
+      dispatchLoggerError.mockClear()
     }
   })
 

package/src/modules/webhooks/subscribers/failed-delivery-notification.ts

@@ -2,10 +2,13 @@ import type { EntityManager } from '@mikro-orm/postgresql'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { resolveNotificationService } from '@open-mercato/core/modules/notifications/lib/notificationService'
 import { buildFeatureNotificationFromType } from '@open-mercato/core/modules/notifications/lib/notificationBuilder'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { WebhookEntity } from '../data/entities'
 import { resolveWebhookIntegrationSettings } from '../lib/integration-settings'
 import { notificationTypes } from '../notifications'
 
+const logger = createLogger('webhooks').child({ component: 'failed-delivery-notification' })
+
 export const metadata = {
   event: 'webhooks.delivery.exhausted',
   persistent: true,
@@ -76,6 +79,6 @@ export default async function handle(payload: WebhookDeliveryExhaustedPayload, c
       organizationId,
     })
   } catch (err) {
-    console.error('[webhooks:failed-delivery-notification] Failed to create notification:', err)
+    logger.error('Failed to create notification', { err })
   }
 }

package/src/modules/webhooks/subscribers/inbound-process.ts

@@ -1,5 +1,8 @@
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { getWebhookEndpointAdapter } from '../lib/adapter-registry'
 
+const logger = createLogger('webhooks').child({ component: 'inbound' })
+
 export const metadata = {
   event: 'webhooks.inbound.received',
   persistent: true,
@@ -29,11 +32,7 @@ export default async function handler(payload: Record<string, unknown>) {
       organizationId: typeof payload.organizationId === 'string' ? payload.organizationId : undefined,
     })
   } catch (err) {
-    console.error('[webhooks:inbound] Processing failed:', {
-      providerKey,
-      eventType,
-      error: err instanceof Error ? err.message : String(err),
-    })
+    logger.error('Processing failed', { providerKey, eventType, err })
     throw err
   }
 }

package/src/modules/webhooks/subscribers/outbound-dispatch.ts

@@ -4,10 +4,13 @@ import { WebhookDeliveryEntity, WebhookEntity } from '../data/entities'
 import { findWithDecryption, findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import { matchAnyWebhookEventPattern } from '@open-mercato/shared/lib/events/patterns'
 import { getDeclaredEvents } from '@open-mercato/shared/modules/events'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { createWebhookDelivery } from '../lib/delivery'
 import { enqueueWebhookDelivery } from '../lib/queue'
 import { isWebhookIntegrationEnabled } from '../lib/integration-state'
 
+const logger = createLogger('webhooks')
+
 export const metadata = {
   event: '*',
   persistent: true,
@@ -129,12 +132,12 @@ export default async function handler(
             await webhookEm.flush()
           }
         }
-        console.error('[webhooks] Failed to enqueue outbound delivery', {
+        logger.error('Failed to enqueue outbound delivery', {
           webhookId: webhook.id,
           eventId,
           tenantId,
           organizationId: organizationId ?? webhook.organizationId,
-          error: error instanceof Error ? error.message : String(error),
+          err: error,
         })
       }
     }),

package/src/modules/webhooks/workers/webhook-delivery.ts

@@ -1,6 +1,9 @@
 import type { EntityManager } from '@mikro-orm/postgresql'
+import { createLogger } from '@open-mercato/shared/lib/logger'
 import { processWebhookDeliveryJob, type WebhookDeliveryJob } from '../lib/delivery'
 
+const logger = createLogger('webhooks').child({ component: 'delivery' })
+
 export const metadata = {
   queue: 'webhook-deliveries',
   id: 'webhooks:delivery-worker',
@@ -15,10 +18,10 @@ export default async function handler(
   try {
     await processWebhookDeliveryJob(em, job.data)
   } catch (error) {
-    console.error('[webhooks:delivery] Job processing failed', {
+    logger.error('Job processing failed', {
       deliveryId: job.data.deliveryId,
       tenantId: job.data.tenantId,
-      error: error instanceof Error ? error.message : String(error),
+      err: error,
     })
     throw error
   }