@open-mercato/webhooks 0.8.1-develop.7228.1.b7ea09d2d3 → 0.8.1-develop.7237.1.635faf2c7a

package/dist/modules/webhooks/lib/subscription-cache.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../../../src/modules/webhooks/lib/subscription-cache.ts"],
+  "sourcesContent": ["import type { CacheStrategy } from '@open-mercato/cache'\nimport { runWithCacheTenant } from '@open-mercato/cache'\nimport { createLogger } from '@open-mercato/shared/lib/logger'\n\nconst logger = createLogger('webhooks').child({ component: 'subscription-cache' })\n\nconst DEFAULT_TTL_MS = 60_000\nconst GLOBAL_SCOPE_SEGMENT = 'global'\n\nexport type CachedActiveWebhook = {\n  id: string\n  tenantId: string\n  organizationId: string | null\n  subscribedEvents: string[]\n}\n\nexport type WebhookSubscriptionCache = Pick<CacheStrategy, 'get' | 'set' | 'deleteByTags'>\n\nexport function isWebhookSubscriptionCache(value: unknown): value is WebhookSubscriptionCache {\n  if (!value || typeof value !== 'object') return false\n  const candidate = value as Partial<WebhookSubscriptionCache>\n  return (\n    typeof candidate.get === 'function'\n    && typeof candidate.set === 'function'\n    && typeof candidate.deleteByTags === 'function'\n  )\n}\n\nexport type WebhookCacheDependencyResolver =\n  | ((token: string) => unknown)\n  | { resolve: (token: string) => unknown }\n\nexport function resolveWebhookSubscriptionCache(resolve: (token: string) => unknown): WebhookSubscriptionCache | null {\n  try {\n    const cache = resolve('cache')\n    return isWebhookSubscriptionCache(cache) ? cache : null\n  } catch {\n    return null\n  }\n}\n\nfunction toResolveFunction(source: WebhookCacheDependencyResolver | null | undefined): ((token: string) => unknown) | null {\n  if (typeof source === 'function') return source\n  if (source && typeof source.resolve === 'function') return source.resolve.bind(source)\n  return null\n}\n\nexport function getWebhookSubscriptionCacheTtlMs(): number {\n  const raw = process.env.OM_WEBHOOKS_SUBSCRIPTION_CACHE_TTL_MS\n  if (raw === undefined || raw.trim() === '') return DEFAULT_TTL_MS\n  const parsed = Number.parseInt(raw, 10)\n  if (!Number.isFinite(parsed) || parsed < 0) return DEFAULT_TTL_MS\n  return parsed\n}\n\nfunction normalizeScopeSegment(organizationId: string | null | undefined): string {\n  return organizationId ?? GLOBAL_SCOPE_SEGMENT\n}\n\nexport function getWebhookSubscriptionCacheKey(tenantId: string, organizationId: string | null | undefined): string {\n  return `webhooks:subscriptions:${tenantId}:${normalizeScopeSegment(organizationId)}`\n}\n\nexport function getWebhookSubscriptionCacheTag(tenantId: string): string {\n  return `webhooks:subscriptions:tenant:${tenantId}`\n}\n\nfunction isCachedActiveWebhookList(value: unknown): value is CachedActiveWebhook[] {\n  return Array.isArray(value) && value.every((entry) => (\n    entry !== null\n    && typeof entry === 'object'\n    && typeof (entry as CachedActiveWebhook).id === 'string'\n    && typeof (entry as CachedActiveWebhook).tenantId === 'string'\n    && Array.isArray((entry as CachedActiveWebhook).subscribedEvents)\n  ))\n}\n\nexport async function getCachedActiveWebhooks(\n  cache: WebhookSubscriptionCache | null,\n  tenantId: string,\n  organizationId: string | null | undefined,\n): Promise<CachedActiveWebhook[] | null> {\n  if (!cache) return null\n  try {\n    const value = await runWithCacheTenant(tenantId, () => cache.get(getWebhookSubscriptionCacheKey(tenantId, organizationId)))\n    return isCachedActiveWebhookList(value) ? value : null\n  } catch (error) {\n    logger.warn('Failed to read webhook subscription cache', { err: error })\n    return null\n  }\n}\n\nexport async function setCachedActiveWebhooks(\n  cache: WebhookSubscriptionCache | null,\n  tenantId: string,\n  organizationId: string | null | undefined,\n  webhooks: CachedActiveWebhook[],\n  ttlMs: number,\n): Promise<void> {\n  if (!cache || ttlMs <= 0) return\n  try {\n    await runWithCacheTenant(tenantId, () => cache.set(\n      getWebhookSubscriptionCacheKey(tenantId, organizationId),\n      webhooks,\n      { ttl: ttlMs, tags: [getWebhookSubscriptionCacheTag(tenantId)] },\n    ))\n  } catch (error) {\n    logger.warn('Failed to write webhook subscription cache', { err: error })\n  }\n}\n\nexport async function invalidateWebhookSubscriptionCache(\n  cache: WebhookSubscriptionCache | null,\n  tenantId: string | null | undefined,\n): Promise<void> {\n  if (!cache) return\n  const normalizedTenantId = tenantId?.trim()\n  if (!normalizedTenantId) return\n  try {\n    await runWithCacheTenant(normalizedTenantId, () => cache.deleteByTags([getWebhookSubscriptionCacheTag(normalizedTenantId)]))\n  } catch (error) {\n    logger.warn('Failed to invalidate webhook subscription cache', { err: error })\n  }\n}\n\nexport async function invalidateWebhookSubscriptionCacheFor(\n  source: WebhookCacheDependencyResolver | null | undefined,\n  tenantId: string | null | undefined,\n): Promise<void> {\n  const normalizedTenantId = tenantId?.trim()\n  if (!normalizedTenantId) return\n  const resolve = toResolveFunction(source)\n  if (!resolve) return\n  await invalidateWebhookSubscriptionCache(resolveWebhookSubscriptionCache(resolve), normalizedTenantId)\n}\n"],
+  "mappings": "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",
+  "names": []
+}

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

@@ -6,6 +6,13 @@ 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";
+import {
+  getCachedActiveWebhooks,
+  getWebhookSubscriptionCacheTtlMs,
+  invalidateWebhookSubscriptionCacheFor,
+  resolveWebhookSubscriptionCache,
+  setCachedActiveWebhooks
+} from "../lib/subscription-cache.js";
 const logger = createLogger("webhooks");
 const metadata = {
   event: "*",
@@ -28,14 +35,29 @@ function integrationScopeKey(tenantId, organizationId) {
 async function handler(payload, ctx) {
   const eventId = ctx.eventId ?? ctx.eventName ?? payload.eventId ?? payload.type;
   if (!eventId) return;
+  const resolve = "resolve" in ctx && typeof ctx.resolve === "function" ? ctx.resolve : "container" in ctx && ctx.container && typeof ctx.container.resolve === "function" ? ctx.container.resolve.bind(ctx.container) : null;
+  if (eventId.startsWith("webhooks.webhook.")) {
+    const changedTenantId = payload.tenantId;
+    if (resolve && changedTenantId) {
+      await invalidateWebhookSubscriptionCacheFor(resolve, changedTenantId);
+    }
+    return;
+  }
   if (shouldSkipOutboundDispatch(eventId)) return;
   const tenantId = payload.tenantId;
   const organizationId = payload.organizationId;
   if (!tenantId) return;
   if (eventId.startsWith("webhooks.")) return;
   if (eventId.startsWith("query_index.")) return;
-  const resolve = "resolve" in ctx && typeof ctx.resolve === "function" ? ctx.resolve : "container" in ctx && ctx.container && typeof ctx.container.resolve === "function" ? ctx.container.resolve.bind(ctx.container) : null;
   if (!resolve) return;
+  const cacheTtlMs = getWebhookSubscriptionCacheTtlMs();
+  const subscriptionCache = cacheTtlMs > 0 ? resolveWebhookSubscriptionCache(resolve) : null;
+  const cachedActiveWebhooks = subscriptionCache ? await getCachedActiveWebhooks(subscriptionCache, tenantId, organizationId ?? null) : null;
+  let matchingIds = null;
+  if (cachedActiveWebhooks) {
+    matchingIds = cachedActiveWebhooks.filter((entry) => matchAnyWebhookEventPattern(eventId, entry.subscribedEvents)).map((entry) => entry.id);
+    if (!matchingIds.length) return;
+  }
   const em = resolve("em").fork();
   const webhooks = await findWithDecryption(
     em,
@@ -44,11 +66,21 @@ async function handler(payload, ctx) {
       isActive: true,
       deletedAt: null,
       tenantId,
-      ...organizationId ? { organizationId } : {}
+      ...organizationId ? { organizationId } : {},
+      ...matchingIds ? { id: { $in: matchingIds } } : {}
     },
     {},
     { tenantId, organizationId: organizationId ?? null }
   );
+  if (!matchingIds && subscriptionCache) {
+    const cacheable = webhooks.map((webhook) => ({
+      id: webhook.id,
+      tenantId: webhook.tenantId,
+      organizationId: webhook.organizationId ?? null,
+      subscribedEvents: webhook.subscribedEvents
+    }));
+    await setCachedActiveWebhooks(subscriptionCache, tenantId, organizationId ?? null, cacheable, cacheTtlMs);
+  }
   if (!webhooks.length) return;
   const matchingWebhooks = webhooks.filter(
     (webhook) => matchAnyWebhookEventPattern(eventId, webhook.subscribedEvents)

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 { 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": "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",
+  "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'\nimport {\n  getCachedActiveWebhooks,\n  getWebhookSubscriptionCacheTtlMs,\n  invalidateWebhookSubscriptionCacheFor,\n  resolveWebhookSubscriptionCache,\n  setCachedActiveWebhooks,\n  type CachedActiveWebhook,\n} from '../lib/subscription-cache'\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\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 (eventId.startsWith('webhooks.webhook.')) {\n    const changedTenantId = payload.tenantId as string | undefined\n    if (resolve && changedTenantId) {\n      await invalidateWebhookSubscriptionCacheFor(resolve, changedTenantId)\n    }\n    return\n  }\n\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  if (!resolve) return\n\n  const cacheTtlMs = getWebhookSubscriptionCacheTtlMs()\n  const subscriptionCache = cacheTtlMs > 0 ? resolveWebhookSubscriptionCache(resolve) : null\n  const cachedActiveWebhooks = subscriptionCache\n    ? await getCachedActiveWebhooks(subscriptionCache, tenantId, organizationId ?? null)\n    : null\n\n  let matchingIds: string[] | null = null\n\n  if (cachedActiveWebhooks) {\n    matchingIds = cachedActiveWebhooks\n      .filter((entry) => matchAnyWebhookEventPattern(eventId, entry.subscribedEvents))\n      .map((entry) => entry.id)\n\n    if (!matchingIds.length) return\n  }\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      ...(matchingIds ? { id: { $in: matchingIds } } : {}),\n    },\n    {},\n    { tenantId, organizationId: organizationId ?? null },\n  )\n\n  if (!matchingIds && subscriptionCache) {\n    const cacheable: CachedActiveWebhook[] = webhooks.map((webhook) => ({\n      id: webhook.id,\n      tenantId: webhook.tenantId,\n      organizationId: webhook.organizationId ?? null,\n      subscribedEvents: webhook.subscribedEvents,\n    }))\n    await setCachedActiveWebhooks(subscriptionCache, tenantId, organizationId ?? null, cacheable, cacheTtlMs)\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": "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",
   "names": []
 }

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

@@ -9,7 +9,7 @@ const metadata = {
 async function handler(job, ctx) {
   const em = ctx.resolve("em").fork();
   try {
-    await processWebhookDeliveryJob(em, job.payload);
+    await processWebhookDeliveryJob(em, job.payload, { resolver: ctx.resolve });
   } catch (error) {
     logger.error("Job processing failed", {
       deliveryId: job.payload?.deliveryId,

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 { 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: { payload: 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.payload)\n  } catch (error) {\n    logger.error('Job processing failed', {\n      deliveryId: job.payload?.deliveryId,\n      tenantId: job.payload?.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,OAAO;AAAA,EACjD,SAAS,OAAO;AACd,WAAO,MAAM,yBAAyB;AAAA,MACpC,YAAY,IAAI,SAAS;AAAA,MACzB,UAAU,IAAI,SAAS;AAAA,MACvB,KAAK;AAAA,IACP,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: { payload: 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.payload, { resolver: ctx.resolve })\n  } catch (error) {\n    logger.error('Job processing failed', {\n      deliveryId: job.payload?.deliveryId,\n      tenantId: job.payload?.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,SAAS,EAAE,UAAU,IAAI,QAAQ,CAAC;AAAA,EAC5E,SAAS,OAAO;AACd,WAAO,MAAM,yBAAyB;AAAA,MACpC,YAAY,IAAI,SAAS;AAAA,MACzB,UAAU,IAAI,SAAS;AAAA,MACvB,KAAK;AAAA,IACP,CAAC;AACD,UAAM;AAAA,EACR;AACF;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/webhooks",
-  "version": "0.8.1-develop.7228.1.b7ea09d2d3",
+  "version": "0.8.1-develop.7237.1.635faf2c7a",
   "license": "MIT",
   "description": "Webhooks module for Open Mercato — Standard Webhooks compliant outbound/inbound delivery",
   "type": "module",
@@ -70,19 +70,20 @@
     }
   },
   "dependencies": {
-    "@open-mercato/core": "0.8.1-develop.7228.1.b7ea09d2d3",
-    "@open-mercato/queue": "0.8.1-develop.7228.1.b7ea09d2d3",
-    "@open-mercato/ui": "0.8.1-develop.7228.1.b7ea09d2d3",
+    "@open-mercato/cache": "0.8.1-develop.7237.1.635faf2c7a",
+    "@open-mercato/core": "0.8.1-develop.7237.1.635faf2c7a",
+    "@open-mercato/queue": "0.8.1-develop.7237.1.635faf2c7a",
+    "@open-mercato/ui": "0.8.1-develop.7237.1.635faf2c7a",
     "svix": "^1.99.1"
   },
   "peerDependencies": {
     "@mikro-orm/postgresql": "^7.0.14",
-    "@open-mercato/shared": "0.8.1-develop.7228.1.b7ea09d2d3",
+    "@open-mercato/shared": "0.8.1-develop.7237.1.635faf2c7a",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.8.1-develop.7228.1.b7ea09d2d3",
+    "@open-mercato/shared": "0.8.1-develop.7237.1.635faf2c7a",
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.18",
     "@types/react-dom": "^19.2.5",

package/src/modules/webhooks/api/webhooks/[id]/__tests__/subscription-cache-invalidation.test.ts

@@ -0,0 +1,107 @@
+/** @jest-environment node */
+
+import { createCacheService, type CacheStrategy } from '@open-mercato/cache'
+import {
+  getCachedActiveWebhooks,
+  setCachedActiveWebhooks,
+} from '../../../../lib/subscription-cache'
+
+const WEBHOOK_ID = '123e4567-e89b-12d3-a456-426614174071'
+
+const webhookRecord = {
+  id: WEBHOOK_ID,
+  name: 'Hook',
+  description: null,
+  url: 'https://example.com/hook',
+  subscribedEvents: ['catalog.product.created'],
+  httpMethod: 'POST',
+  isActive: true,
+  organizationId: 'org-1',
+  tenantId: 'tenant-1',
+  updatedAt: new Date('2026-06-01T10:00:00.000Z'),
+  deletedAt: null as Date | null,
+}
+
+const mockEm = {
+  fork: jest.fn(() => mockEm),
+  flush: jest.fn(async () => undefined),
+}
+
+let cache: CacheStrategy
+
+const mockContainer = {
+  resolve: (token: string) => {
+    if (token === 'em') return mockEm
+    if (token === 'cache') return cache
+    if (token === 'commandOptimisticLockGuardService') throw new Error('not registered')
+    return null
+  },
+}
+
+jest.mock('../../../../events', () => ({
+  emitWebhooksEvent: jest.fn(async () => undefined),
+}))
+
+jest.mock('../../../helpers', () => ({
+  json: (payload: unknown, init: ResponseInit = { status: 200 }) =>
+    new Response(JSON.stringify(payload), {
+      ...init,
+      headers: { 'content-type': 'application/json' },
+    }),
+  resolveWebhookRequestScope: jest.fn(async () => ({
+    container: mockContainer,
+    em: mockEm,
+    tenantId: 'tenant-1',
+    organizationId: 'org-1',
+  })),
+  findScopedWebhook: jest.fn(async () => webhookRecord),
+  serializeWebhookDetail: (item: { id: string }) => ({ id: item.id }),
+}))
+
+jest.mock('@open-mercato/shared/lib/i18n/server', () => ({
+  resolveTranslations: jest.fn(async () => ({ translate: (_key: string, fallback?: string) => fallback ?? '' })),
+}))
+
+import { PUT, DELETE } from '../route'
+
+function request(method: string, body?: unknown) {
+  return new Request(`http://localhost/api/webhooks/${WEBHOOK_ID}`, {
+    method,
+    headers: { 'content-type': 'application/json' },
+    body: body !== undefined ? JSON.stringify(body) : undefined,
+  })
+}
+
+const context = { params: Promise.resolve({ id: WEBHOOK_ID }) }
+
+async function seedCache(): Promise<void> {
+  await setCachedActiveWebhooks(
+    cache,
+    'tenant-1',
+    'org-1',
+    [{ id: WEBHOOK_ID, tenantId: 'tenant-1', organizationId: 'org-1', subscribedEvents: ['catalog.product.created'] }],
+    60_000,
+  )
+}
+
+describe('webhook endpoint PUT/DELETE inline subscription-cache invalidation', () => {
+  beforeEach(async () => {
+    jest.clearAllMocks()
+    webhookRecord.deletedAt = null
+    cache = createCacheService({ strategy: 'memory' })
+    await seedCache()
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).not.toBeNull()
+  })
+
+  it('PUT drops the tenant subscription cache synchronously with the write', async () => {
+    const res = await PUT(request('PUT', { isActive: false }), context)
+    expect(res.status).toBe(200)
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).toBeNull()
+  })
+
+  it('DELETE drops the tenant subscription cache synchronously with the soft delete', async () => {
+    const res = await DELETE(request('DELETE'), context)
+    expect(res.status).toBe(200)
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).toBeNull()
+  })
+})

package/src/modules/webhooks/api/webhooks/[id]/route.ts

@@ -6,6 +6,7 @@ import { findScopedWebhook, json, resolveWebhookRequestScope, serializeWebhookDe
 import { webhookUpdateSchema } from '../../../data/validators'
 import { enforceCommandOptimisticLockWithGuards } from '@open-mercato/shared/lib/crud/optimistic-lock-command'
 import { isCrudHttpError } from '@open-mercato/shared/lib/crud/errors'
+import { invalidateWebhookSubscriptionCacheFor } from '../../../lib/subscription-cache'
 
 export const metadata = {
   GET: { requireAuth: true, requireFeatures: ['webhooks.view'] },
@@ -106,6 +107,8 @@ export async function PUT(request: Request, context: RouteContext): Promise<Resp
 
   await em.flush()
 
+  await invalidateWebhookSubscriptionCacheFor(scope.container, webhook.tenantId)
+
   await emitWebhooksEvent('webhooks.webhook.updated', {
     webhookId: webhook.id,
     organizationId: webhook.organizationId,
@@ -143,6 +146,8 @@ export async function DELETE(request: Request, context: RouteContext): Promise<R
   webhook.deletedAt = new Date()
   await em.flush()
 
+  await invalidateWebhookSubscriptionCacheFor(scope.container, webhook.tenantId)
+
   await emitWebhooksEvent('webhooks.webhook.deleted', {
     webhookId: webhook.id,
     organizationId: webhook.organizationId,

package/src/modules/webhooks/api/webhooks/[id]/test/route.ts

@@ -85,7 +85,7 @@ export async function POST(request: Request, context: RouteContext): Promise<Res
     deliveryId: delivery.id,
     tenantId: delivery.tenantId,
     organizationId: delivery.organizationId,
-  }, { scheduleRetries: false })
+  }, { scheduleRetries: false, resolver: scope.container })
 
   await em.refresh(delivery)
 

package/src/modules/webhooks/api/webhooks/__tests__/subscription-cache-invalidation.test.ts

@@ -0,0 +1,93 @@
+/** @jest-environment node */
+
+import { createCacheService, type CacheStrategy } from '@open-mercato/cache'
+import {
+  getCachedActiveWebhooks,
+  setCachedActiveWebhooks,
+} from '../../../lib/subscription-cache'
+
+type CapturedHooks = {
+  afterCreate?: (entity: unknown, ctx: unknown) => Promise<void> | void
+  afterUpdate?: (entity: unknown, ctx: unknown) => Promise<void> | void
+  afterDelete?: (id: string, ctx: unknown) => Promise<void> | void
+}
+
+const captured: { hooks: CapturedHooks | null } = { hooks: null }
+
+jest.mock('@open-mercato/shared/lib/crud/factory', () => ({
+  makeCrudRoute: jest.fn((options: { hooks?: CapturedHooks }) => {
+    captured.hooks = options.hooks ?? null
+    return {
+      metadata: {},
+      GET: jest.fn(),
+      POST: jest.fn(),
+      PUT: jest.fn(),
+      DELETE: jest.fn(),
+    }
+  }),
+}))
+
+jest.mock('@open-mercato/shared/lib/i18n/server', () => ({
+  resolveTranslations: jest.fn(async () => ({ translate: (_key: string, fallback?: string) => fallback ?? '' })),
+}))
+
+import '../route'
+
+const WEBHOOK_ID = '123e4567-e89b-12d3-a456-426614174072'
+
+describe('webhooks CRUD route inline subscription-cache invalidation', () => {
+  let cache: CacheStrategy
+  let container: { resolve: (token: string) => unknown }
+
+  beforeEach(async () => {
+    cache = createCacheService({ strategy: 'memory' })
+    container = { resolve: (token: string) => (token === 'cache' ? cache : null) }
+    await setCachedActiveWebhooks(
+      cache,
+      'tenant-1',
+      'org-1',
+      [{ id: WEBHOOK_ID, tenantId: 'tenant-1', organizationId: 'org-1', subscribedEvents: ['catalog.product.created'] }],
+      60_000,
+    )
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).not.toBeNull()
+  })
+
+  it('registers afterCreate, afterUpdate and afterDelete hooks', () => {
+    expect(typeof captured.hooks?.afterCreate).toBe('function')
+    expect(typeof captured.hooks?.afterUpdate).toBe('function')
+    expect(typeof captured.hooks?.afterDelete).toBe('function')
+  })
+
+  it('afterCreate invalidates the tenant subscription cache', async () => {
+    await captured.hooks?.afterCreate?.(
+      { id: WEBHOOK_ID, tenantId: 'tenant-1' },
+      { container, auth: { tenantId: 'tenant-1', orgId: 'org-1' } },
+    )
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).toBeNull()
+  })
+
+  it('afterUpdate invalidates the tenant subscription cache', async () => {
+    await captured.hooks?.afterUpdate?.(
+      { id: WEBHOOK_ID, tenantId: 'tenant-1' },
+      { container, auth: { tenantId: 'tenant-1', orgId: 'org-1' } },
+    )
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).toBeNull()
+  })
+
+  it('afterDelete invalidates the tenant subscription cache from the auth scope', async () => {
+    await captured.hooks?.afterDelete?.(
+      WEBHOOK_ID,
+      { container, auth: { tenantId: 'tenant-1', orgId: 'org-1' } },
+    )
+    expect(await getCachedActiveWebhooks(cache, 'tenant-1', 'org-1')).toBeNull()
+  })
+
+  it('leaves another tenant cache entry intact', async () => {
+    await setCachedActiveWebhooks(cache, 'tenant-2', 'org-1', [], 60_000)
+    await captured.hooks?.afterUpdate?.(
+      { id: WEBHOOK_ID, tenantId: 'tenant-1' },
+      { container, auth: { tenantId: 'tenant-1', orgId: 'org-1' } },
+    )
+    expect(await getCachedActiveWebhooks(cache, 'tenant-2', 'org-1')).not.toBeNull()
+  })
+})

package/src/modules/webhooks/api/webhooks/route.ts

@@ -10,6 +10,7 @@ import { resolveTranslations } from '@open-mercato/shared/lib/i18n/server'
 import { escapeLikePattern } from '@open-mercato/shared/lib/db/escapeLikePattern'
 import { parseBooleanToken } from '@open-mercato/shared/lib/boolean'
 import type { WebhookCreateInput, WebhookUpdateInput } from '../../data/validators'
+import { invalidateWebhookSubscriptionCacheFor } from '../../lib/subscription-cache'
 
 type WebhookCrudCtx = CrudCtx & {
   __webhookSecret?: string
@@ -68,6 +69,12 @@ const webhookDetailResponseSchema = webhookListItemSchema.extend({
 const deleteResponseSchema = z.object({ success: z.literal(true) })
 const errorSchema = z.object({ error: z.string() })
 
+function resolveTenantIdForInvalidation(entity: unknown, ctx: CrudCtx): string | null {
+  const entityTenantId = (entity as { tenantId?: unknown } | null)?.tenantId
+  if (typeof entityTenantId === 'string' && entityTenantId.length > 0) return entityTenantId
+  return ctx.auth?.tenantId ?? null
+}
+
 const crud = makeCrudRoute<WebhookCreateInput, WebhookUpdateInput, z.infer<typeof webhookListQuerySchema>>({
   metadata: {
     GET: { requireAuth: true, requireFeatures: ['webhooks.view'] },
@@ -220,6 +227,13 @@ const crud = makeCrudRoute<WebhookCreateInput, WebhookUpdateInput, z.infer<typeo
       if (scopedCtx.__webhookSecret) {
         ;(entity as WebhookEntity & { __revealSecret?: string }).__revealSecret = scopedCtx.__webhookSecret
       }
+      await invalidateWebhookSubscriptionCacheFor(ctx.container, resolveTenantIdForInvalidation(entity, ctx))
+    },
+    afterUpdate: async (entity, ctx) => {
+      await invalidateWebhookSubscriptionCacheFor(ctx.container, resolveTenantIdForInvalidation(entity, ctx))
+    },
+    afterDelete: async (_id, ctx) => {
+      await invalidateWebhookSubscriptionCacheFor(ctx.container, ctx.auth?.tenantId ?? null)
     },
     beforeDelete: async (id, ctx) => {
       const auth = ctx.auth