@open-mercato/cache 0.6.6-develop.6494.1.8479db6c38 → 0.6.6-develop.6506.1.699ffb5533

package/dist/tenantContext.js

@@ -1,5 +1,13 @@
 import { AsyncLocalStorage } from "node:async_hooks";
-const tenantStorage = new AsyncLocalStorage();
+const TENANT_STORAGE_KEY = /* @__PURE__ */ Symbol.for("@open-mercato/cache/tenant-context");
+function resolveTenantStorage() {
+  const scope = globalThis;
+  if (!scope[TENANT_STORAGE_KEY]) {
+    scope[TENANT_STORAGE_KEY] = new AsyncLocalStorage();
+  }
+  return scope[TENANT_STORAGE_KEY];
+}
+const tenantStorage = resolveTenantStorage();
 function runWithCacheTenant(tenantId, fn) {
   return tenantStorage.run(tenantId ?? null, fn);
 }

package/dist/tenantContext.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/tenantContext.ts"],
-  "sourcesContent": ["import { AsyncLocalStorage } from 'node:async_hooks'\n\nconst tenantStorage = new AsyncLocalStorage<string | null>()\n\nexport function runWithCacheTenant<T>(tenantId: string | null, fn: () => T): T\nexport function runWithCacheTenant<T>(tenantId: string | null, fn: () => Promise<T>): Promise<T>\nexport function runWithCacheTenant<T>(tenantId: string | null, fn: () => T | Promise<T>): T | Promise<T> {\n  return tenantStorage.run(tenantId ?? null, fn)\n}\n\nexport function getCurrentCacheTenant(): string | null {\n  return tenantStorage.getStore() ?? null\n}\n"],
-  "mappings": "AAAA,SAAS,yBAAyB;AAElC,MAAM,gBAAgB,IAAI,kBAAiC;AAIpD,SAAS,mBAAsB,UAAyB,IAA0C;AACvG,SAAO,cAAc,IAAI,YAAY,MAAM,EAAE;AAC/C;AAEO,SAAS,wBAAuC;AACrD,SAAO,cAAc,SAAS,KAAK;AACrC;",
+  "sourcesContent": ["import { AsyncLocalStorage } from 'node:async_hooks'\n\n// Bundlers (Turbopack/esbuild/tsx) can emit this module into multiple chunks,\n// each with its own module-local AsyncLocalStorage. A tenant context entered\n// through one copy (e.g. an API route's `runWithCacheTenant`) is then invisible\n// to the copy the cache service's tenant-aware wrapper reads, so entries get\n// stored under the `tenant:global:` prefix while invalidations that DO carry\n// the tenant (queue workers, cross-process drains) target `tenant:<id>:` \u2014\n// tag-based eviction silently misses and reads stay stale until TTL.\n// Key the storage off globalThis via Symbol.for so every duplicated copy\n// resolves the same instance. Mirrors the data_sync adapter-registry fix.\nconst TENANT_STORAGE_KEY = Symbol.for('@open-mercato/cache/tenant-context')\n\ntype GlobalWithTenantStorage = typeof globalThis & {\n  [TENANT_STORAGE_KEY]?: AsyncLocalStorage<string | null>\n}\n\nfunction resolveTenantStorage(): AsyncLocalStorage<string | null> {\n  const scope = globalThis as GlobalWithTenantStorage\n  if (!scope[TENANT_STORAGE_KEY]) {\n    scope[TENANT_STORAGE_KEY] = new AsyncLocalStorage<string | null>()\n  }\n  return scope[TENANT_STORAGE_KEY]\n}\n\nconst tenantStorage = resolveTenantStorage()\n\nexport function runWithCacheTenant<T>(tenantId: string | null, fn: () => T): T\nexport function runWithCacheTenant<T>(tenantId: string | null, fn: () => Promise<T>): Promise<T>\nexport function runWithCacheTenant<T>(tenantId: string | null, fn: () => T | Promise<T>): T | Promise<T> {\n  return tenantStorage.run(tenantId ?? null, fn)\n}\n\nexport function getCurrentCacheTenant(): string | null {\n  return tenantStorage.getStore() ?? null\n}\n"],
+  "mappings": "AAAA,SAAS,yBAAyB;AAWlC,MAAM,qBAAqB,uBAAO,IAAI,oCAAoC;AAM1E,SAAS,uBAAyD;AAChE,QAAM,QAAQ;AACd,MAAI,CAAC,MAAM,kBAAkB,GAAG;AAC9B,UAAM,kBAAkB,IAAI,IAAI,kBAAiC;AAAA,EACnE;AACA,SAAO,MAAM,kBAAkB;AACjC;AAEA,MAAM,gBAAgB,qBAAqB;AAIpC,SAAS,mBAAsB,UAAyB,IAA0C;AACvG,SAAO,cAAc,IAAI,YAAY,MAAM,EAAE;AAC/C;AAEO,SAAS,wBAAuC;AACrD,SAAO,cAAc,SAAS,KAAK;AACrC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/cache",
-  "version": "0.6.6-develop.6494.1.8479db6c38",
+  "version": "0.6.6-develop.6506.1.699ffb5533",
   "license": "MIT",
   "description": "Multi-strategy cache service with tag-based invalidation support",
   "type": "module",

package/src/__tests__/tenantContext.test.ts

@@ -0,0 +1,52 @@
+const TENANT_STORAGE_KEY = Symbol.for('@open-mercato/cache/tenant-context')
+
+function clearGlobalStorage(): void {
+  delete (globalThis as Record<symbol, unknown>)[TENANT_STORAGE_KEY]
+}
+
+describe('cache tenant context', () => {
+  beforeEach(() => {
+    clearGlobalStorage()
+    jest.resetModules()
+  })
+
+  afterEach(() => {
+    clearGlobalStorage()
+  })
+
+  it('exposes the tenant inside runWithCacheTenant and null outside', () => {
+    const { runWithCacheTenant, getCurrentCacheTenant } = require('../tenantContext')
+    expect(getCurrentCacheTenant()).toBeNull()
+    runWithCacheTenant('tenant-a', () => {
+      expect(getCurrentCacheTenant()).toBe('tenant-a')
+    })
+    expect(getCurrentCacheTenant()).toBeNull()
+  })
+
+  it('shares the storage across duplicated module copies via globalThis', () => {
+    // Simulate a bundler emitting the module into two chunks: two separate
+    // module instances must still observe one shared AsyncLocalStorage,
+    // otherwise a tenant entered through one copy (an API route) is invisible
+    // to the other (the cache service wrapper) and entries get stored under
+    // the tenant:global prefix that tenant-scoped invalidations never target.
+    const copyA = require('../tenantContext')
+    jest.resetModules()
+    const copyB = require('../tenantContext')
+    expect(copyB).not.toBe(copyA)
+
+    copyA.runWithCacheTenant('tenant-shared', () => {
+      expect(copyB.getCurrentCacheTenant()).toBe('tenant-shared')
+    })
+    expect(copyB.getCurrentCacheTenant()).toBeNull()
+  })
+
+  it('nested contexts restore the outer tenant', () => {
+    const { runWithCacheTenant, getCurrentCacheTenant } = require('../tenantContext')
+    runWithCacheTenant('outer', () => {
+      runWithCacheTenant('inner', () => {
+        expect(getCurrentCacheTenant()).toBe('inner')
+      })
+      expect(getCurrentCacheTenant()).toBe('outer')
+    })
+  })
+})

package/src/tenantContext.ts

@@ -1,6 +1,29 @@
 import { AsyncLocalStorage } from 'node:async_hooks'
 
-const tenantStorage = new AsyncLocalStorage<string | null>()
+// Bundlers (Turbopack/esbuild/tsx) can emit this module into multiple chunks,
+// each with its own module-local AsyncLocalStorage. A tenant context entered
+// through one copy (e.g. an API route's `runWithCacheTenant`) is then invisible
+// to the copy the cache service's tenant-aware wrapper reads, so entries get
+// stored under the `tenant:global:` prefix while invalidations that DO carry
+// the tenant (queue workers, cross-process drains) target `tenant:<id>:` —
+// tag-based eviction silently misses and reads stay stale until TTL.
+// Key the storage off globalThis via Symbol.for so every duplicated copy
+// resolves the same instance. Mirrors the data_sync adapter-registry fix.
+const TENANT_STORAGE_KEY = Symbol.for('@open-mercato/cache/tenant-context')
+
+type GlobalWithTenantStorage = typeof globalThis & {
+  [TENANT_STORAGE_KEY]?: AsyncLocalStorage<string | null>
+}
+
+function resolveTenantStorage(): AsyncLocalStorage<string | null> {
+  const scope = globalThis as GlobalWithTenantStorage
+  if (!scope[TENANT_STORAGE_KEY]) {
+    scope[TENANT_STORAGE_KEY] = new AsyncLocalStorage<string | null>()
+  }
+  return scope[TENANT_STORAGE_KEY]
+}
+
+const tenantStorage = resolveTenantStorage()
 
 export function runWithCacheTenant<T>(tenantId: string | null, fn: () => T): T
 export function runWithCacheTenant<T>(tenantId: string | null, fn: () => Promise<T>): Promise<T>