@open-mercato/cli 0.6.5-develop.5337.1.534b781eac → 0.6.5

package/dist/lib/worker-job-handler.js

@@ -0,0 +1,20 @@
+function createPerJobWorkerHandler(workers, createContainer) {
+  return async (job, ctx) => {
+    const container = await createContainer();
+    try {
+      for (const worker of workers) {
+        await worker.handler(job, { ...ctx, resolve: container.resolve.bind(container) });
+      }
+    } finally {
+      try {
+        const em = container.resolve("em");
+        em?.clear?.();
+      } catch {
+      }
+    }
+  };
+}
+export {
+  createPerJobWorkerHandler
+};
+//# sourceMappingURL=worker-job-handler.js.map

package/dist/lib/worker-job-handler.js.map

@@ -0,0 +1,7 @@
+{
+  "version": 3,
+  "sources": ["../../src/lib/worker-job-handler.ts"],
+  "sourcesContent": ["import type { JobContext, JobHandler } from '@open-mercato/queue'\nimport type { ModuleWorker } from '@open-mercato/shared/modules/registry'\n\nexport type WorkerJobContainer = {\n  resolve: <T = unknown>(name: string) => T\n}\n\nexport type WorkerJobContainerFactory = () => Promise<WorkerJobContainer>\n\ntype ClearableEntityManager = {\n  clear?: () => void\n}\n\n/**\n * Builds a queue job handler that isolates every job in its own request\n * container, instead of sharing a single process-wide `EntityManager` fork\n * across all concurrent jobs.\n *\n * Under the async (BullMQ) strategy jobs run with real concurrency, so a\n * shared EM would interleave unit-of-work flushes between unrelated jobs and\n * never release its identity map. Creating one container per job removes both\n * the cross-job flush race and the unbounded identity-map growth, while\n * keeping the `ctx.resolve` contract and DI keys unchanged. See issue #2970.\n */\nexport function createPerJobWorkerHandler(\n  workers: ModuleWorker[],\n  createContainer: WorkerJobContainerFactory,\n): JobHandler {\n  return async (job, ctx: JobContext) => {\n    const container = await createContainer()\n    try {\n      for (const worker of workers) {\n        await worker.handler(job, { ...ctx, resolve: container.resolve.bind(container) })\n      }\n    } finally {\n      try {\n        const em = container.resolve('em') as ClearableEntityManager | null\n        em?.clear?.()\n      } catch {\n        // Best-effort: clearing the identity map is a memory optimization and\n        // must never mask a job's own outcome.\n      }\n    }\n  }\n}\n"],
+  "mappings": "AAwBO,SAAS,0BACd,SACA,iBACY;AACZ,SAAO,OAAO,KAAK,QAAoB;AACrC,UAAM,YAAY,MAAM,gBAAgB;AACxC,QAAI;AACF,iBAAW,UAAU,SAAS;AAC5B,cAAM,OAAO,QAAQ,KAAK,EAAE,GAAG,KAAK,SAAS,UAAU,QAAQ,KAAK,SAAS,EAAE,CAAC;AAAA,MAClF;AAAA,IACF,UAAE;AACA,UAAI;AACF,cAAM,KAAK,UAAU,QAAQ,IAAI;AACjC,YAAI,QAAQ;AAAA,MACd,QAAQ;AAAA,MAGR;AAAA,IACF;AAAA,EACF;AACF;",
+  "names": []
+}

package/dist/mercato.js

@@ -10,6 +10,7 @@ import {
   resolveLazyRestart
 } from "./lib/auto-spawn-workers.js";
 import { startLazyWorkerSupervisor } from "./lib/queue-worker-supervisor.js";
+import { createPerJobWorkerHandler } from "./lib/worker-job-handler.js";
 import {
   resolveAutoSpawnSchedulerMode,
   resolveLazySchedulerPollMs,
@@ -25,6 +26,7 @@ import {
 import { parseModuleInstallArgs } from "./lib/module-install-args.js";
 import { resolveNextBuildIdCandidate } from "./lib/next-build-id.js";
 import { acquireServerStartLock } from "./lib/server-start-lock.js";
+import { assertSingleInstanceStrategies } from "./lib/single-instance-strategy-guard.js";
 import { createDevEnvReloader, watchDevEnvFiles } from "./lib/dev-env-reload.js";
 const lazyIntegration = () => import("./lib/testing/integration.js");
 import path from "node:path";
@@ -1224,7 +1226,6 @@ async function run(argv = process.argv) {
               return;
             }
             const { createRequestContainer } = await import("@open-mercato/shared/lib/di/container");
-            const container = await createRequestContainer();
             console.log(`[worker] Starting workers for all queues: ${discoveredQueues.join(", ")}`);
             const workerPromises = discoveredQueues.map(async (queue) => {
               const queueWorkers = allWorkers.filter((w) => w.queue === queue);
@@ -1236,11 +1237,7 @@ async function run(argv = process.argv) {
                 connection: queueRedisUrl ? { url: queueRedisUrl } : void 0,
                 concurrency,
                 background: true,
-                handler: async (job, ctx) => {
-                  for (const worker of queueWorkers) {
-                    await worker.handler(job, { ...ctx, resolve: container.resolve.bind(container) });
-                  }
-                }
+                handler: createPerJobWorkerHandler(queueWorkers, createRequestContainer)
               });
             });
             await Promise.all(workerPromises);
@@ -1251,7 +1248,6 @@ async function run(argv = process.argv) {
             const queueWorkers = allWorkers.filter((w) => w.queue === queueName);
             if (queueWorkers.length > 0) {
               const { createRequestContainer } = await import("@open-mercato/shared/lib/di/container");
-              const container = await createRequestContainer();
               const concurrency = concurrencyOverride ?? Math.max(...queueWorkers.map((w) => w.concurrency), 1);
               console.log(`[worker] Found ${queueWorkers.length} worker(s) for queue "${queueName}"`);
               const queueRedisUrl = getRedisUrl("QUEUE");
@@ -1259,11 +1255,7 @@ async function run(argv = process.argv) {
                 queueName,
                 connection: queueRedisUrl ? { url: queueRedisUrl } : void 0,
                 concurrency,
-                handler: async (job, ctx) => {
-                  for (const worker of queueWorkers) {
-                    await worker.handler(job, { ...ctx, resolve: container.resolve.bind(container) });
-                  }
-                }
+                handler: createPerJobWorkerHandler(queueWorkers, createRequestContainer)
               });
             } else {
               console.error(`No workers found for queue "${queueName}"`);
@@ -1781,6 +1773,7 @@ async function run(argv = process.argv) {
           const autoSpawnSchedulerMode = resolveAutoSpawnSchedulerMode(process.env);
           const queueStrategy = process.env.QUEUE_STRATEGY || "local";
           const runtimeEnv = buildServerProcessEnvironment(process.env);
+          assertSingleInstanceStrategies(runtimeEnv);
           const schedulerCommand = lookupModuleCommand(getCliModules(), "scheduler", "start");
           const serverStartLock = acquireServerStartLock(appDir, {
             port: runtimeEnv.PORT ?? process.env.PORT ?? null