@contember/engine-actions 2.1.0-alpha.9 → 2.1.0-beta.2

package/dist/development/src/dispatch/DispatchWorkerSupervisor.cjs

@@ -63,21 +63,23 @@ class DispatchWorkerSupervisor {
         throw e;
       }
     };
-    const projectTracker = new engineCommon.Supervisor(new Database.AcquiringListener(
-      tenantContainer.databaseContext.client,
-      "project_updated",
-      async () => {
-        logger.debug("Project config change detected, reloading dispatch workers");
-        await endProjectWorkers();
-        try {
-          await startWorkers(true);
-        } catch (e) {
-          logger.error(e, { message: "Dispatch workers reload failed, terminating" });
-          await endAll();
-          onError(e);
+    const projectTracker = new engineCommon.Supervisor(
+      new Database.AcquiringListener(
+        tenantContainer.databaseContext.client,
+        "project_updated",
+        async () => {
+          logger.debug("Project config change detected, reloading dispatch workers");
+          await endProjectWorkers();
+          try {
+            await startWorkers(true);
+          } catch (e) {
+            logger.error(e, { message: "Dispatch workers reload failed, terminating" });
+            await endAll();
+            onError(e);
+          }
         }
-      }
-    ));
+      )
+    );
     const runningProjectTracker = await projectTracker.run({
       logger,
       onError: () => {

package/dist/development/src/dispatch/DispatchWorkerSupervisor.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"DispatchWorkerSupervisor.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/DispatchWorkerSupervisor.ts"],"sourcesContent":["import { ProjectContainer, ProjectGroupContainer } from '@contember/engine-http'\nimport { AcquiringListener } from '@contember/database'\nimport { Runnable, RunnableArgs, Running, Supervisor } from '@contember/engine-common'\nimport { ProjectDispatcherFactory } from './ProjectDispatcher'\nimport { Logger } from '@contember/logger'\nimport { ImplementationException } from '../ImplementationException'\n\nexport class DispatchWorkerSupervisorFactory {\n\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t) {\n\t}\n\n\tpublic create(projectGroup: ProjectGroupContainer): DispatchWorkerSupervisor {\n\t\treturn new DispatchWorkerSupervisor(this.projectDispatcherFactory, projectGroup)\n\t}\n}\n\nexport class DispatchWorkerSupervisor implements Runnable {\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t\tprivate projectGroup: ProjectGroupContainer,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError }: RunnableArgs) {\n\t\tconst projectGroup = this.projectGroup\n\t\tconst tenantContainer = projectGroup.tenantContainer\n\t\tconst projectContainerResolver = projectGroup.projectContainerResolver\n\n\t\tconst running = new Map<string, { worker: Promise<Running>; container: ProjectContainer }>()\n\n\t\tconst cleanupListener = projectContainerResolver.on('destroy', async ({ container }) => {\n\t\t\tconst runningForProject = running.get(container.project.slug)\n\t\t\tif (!runningForProject) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\trunning.delete(container.project.slug)\n\t\t\tawait (await runningForProject.worker).end()\n\t\t})\n\n\t\tconst refreshProjectWorker = async (container: ProjectContainer, isReloading: boolean) => {\n\t\t\tconst db = container.systemDatabaseContext\n\t\t\tconst current = running.get(container.project.slug)\n\t\t\tif (current && current.container === container) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\tconst dispatcher = this.projectDispatcherFactory.create({\n\t\t\t\tdb,\n\t\t\t\tcontentSchemaResolver: container.contentSchemaResolver,\n\t\t\t\tprojectSlug: container.project.slug,\n\t\t\t})\n\t\t\tconst supervisedDispatcher = new Supervisor(\n\t\t\t\tdispatcher,\n\t\t\t\t{ startupMax: isReloading ? Number.MAX_VALUE : 10 },\n\t\t\t)\n\t\t\tconst worker = supervisedDispatcher.run({\n\t\t\t\tlogger,\n\t\t\t\tonError: () => {\n\t\t\t\t\tthrow new ImplementationException('supervised project dispatcher crashed')\n\t\t\t\t},\n\t\t\t})\n\t\t\trunning.set(container.project.slug, { worker, container })\n\t\t\ttry {\n\t\t\t\tif (current) {\n\t\t\t\t\tawait (await current.worker).end()\n\t\t\t\t}\n\t\t\t\tawait worker\n\t\t\t\tlogger.debug('Project dispatch worker started', { project: container.project.slug })\n\t\t\t} catch (e) {\n\t\t\t\tlogger.error(e, { message: 'Project dispatch worker start failed', project: container.project.slug })\n\t\t\t\trunning.delete(container.project.slug)\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst projectTracker = new Supervisor(new AcquiringListener(\n\t\t\ttenantContainer.databaseContext.client,\n\t\t\t'project_updated',\n\t\t\tasync () => {\n\t\t\t\tlogger.debug('Project config change detected, reloading dispatch workers')\n\t\t\t\tawait endProjectWorkers()\n\t\t\t\ttry {\n\t\t\t\t\tawait startWorkers(true)\n\t\t\t\t} catch (e) {\n\t\t\t\t\tlogger.error(e, { message: 'Dispatch workers reload failed, terminating' })\n\t\t\t\t\tawait endAll()\n\t\t\t\t\tonError(e)\n\t\t\t\t}\n\t\t\t},\n\t\t))\n\n\t\tconst runningProjectTracker = await projectTracker.run({\n\t\t\tlogger,\n\t\t\tonError: () => {\n\t\t\t\tthrow new ImplementationException('supervised project tracker crashed')\n\t\t\t},\n\t\t})\n\t\tconst fetchProjects = async () => await tenantContainer.projectManager.getProjects(tenantContainer.databaseContext)\n\n\t\tconst startWorkers = async (isReloading: boolean) => {\n\t\t\ttry {\n\t\t\t\tconst projects = await fetchProjects()\n\t\t\t\tfor (const project of projects) {\n\t\t\t\t\tconst container = await projectGroup.projectContainerResolver.getProjectContainer(project.slug)\n\t\t\t\t\tif (container) {\n\t\t\t\t\t\tawait refreshProjectWorker(container, isReloading)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\tawait endAll()\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst endProjectWorkers = async () => {\n\t\t\tconst workers = [...running.values()]\n\t\t\trunning.clear()\n\t\t\tawait Promise.allSettled(workers.map(async ({ worker }) => await (await worker).end()))\n\t\t}\n\t\tconst endAll = async () => {\n\t\t\tlogger.debug('Terminating project dispatch workers...')\n\t\t\tcleanupListener()\n\t\t\ttry {\n\t\t\t\tawait runningProjectTracker.end()\n\t\t\t} catch {\n\t\t\t}\n\t\t\tawait endProjectWorkers()\n\t\t\tlogger.debug('Project dispatch workers terminated')\n\t\t}\n\n\t\tawait startWorkers(false)\n\n\t\treturn {\n\t\t\tend: endAll,\n\t\t}\n\t}\n}\n"],"names":["Supervisor","ImplementationException","AcquiringListener"],"mappings":"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"}
+{"version":3,"file":"DispatchWorkerSupervisor.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/DispatchWorkerSupervisor.ts"],"sourcesContent":["import { ProjectContainer, ProjectGroupContainer } from '@contember/engine-http'\nimport { AcquiringListener } from '@contember/database'\nimport { Runnable, RunnableArgs, Running, Supervisor } from '@contember/engine-common'\nimport { ProjectDispatcherFactory } from './ProjectDispatcher'\nimport { Logger } from '@contember/logger'\nimport { ImplementationException } from '../ImplementationException'\n\nexport class DispatchWorkerSupervisorFactory {\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t) {\n\t}\n\n\tpublic create(projectGroup: ProjectGroupContainer): DispatchWorkerSupervisor {\n\t\treturn new DispatchWorkerSupervisor(this.projectDispatcherFactory, projectGroup)\n\t}\n}\n\nexport class DispatchWorkerSupervisor implements Runnable {\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t\tprivate projectGroup: ProjectGroupContainer,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError }: RunnableArgs) {\n\t\tconst projectGroup = this.projectGroup\n\t\tconst tenantContainer = projectGroup.tenantContainer\n\t\tconst projectContainerResolver = projectGroup.projectContainerResolver\n\n\t\tconst running = new Map<string, { worker: Promise<Running>; container: ProjectContainer }>()\n\n\t\tconst cleanupListener = projectContainerResolver.on('destroy', async ({ container }) => {\n\t\t\tconst runningForProject = running.get(container.project.slug)\n\t\t\tif (!runningForProject) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\trunning.delete(container.project.slug)\n\t\t\tawait (await runningForProject.worker).end()\n\t\t})\n\n\t\tconst refreshProjectWorker = async (container: ProjectContainer, isReloading: boolean) => {\n\t\t\tconst db = container.systemDatabaseContext\n\t\t\tconst current = running.get(container.project.slug)\n\t\t\tif (current && current.container === container) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\tconst dispatcher = this.projectDispatcherFactory.create({\n\t\t\t\tdb,\n\t\t\t\tcontentSchemaResolver: container.contentSchemaResolver,\n\t\t\t\tprojectSlug: container.project.slug,\n\t\t\t})\n\t\t\tconst supervisedDispatcher = new Supervisor(\n\t\t\t\tdispatcher,\n\t\t\t\t{ startupMax: isReloading ? Number.MAX_VALUE : 10 },\n\t\t\t)\n\t\t\tconst worker = supervisedDispatcher.run({\n\t\t\t\tlogger,\n\t\t\t\tonError: () => {\n\t\t\t\t\tthrow new ImplementationException('supervised project dispatcher crashed')\n\t\t\t\t},\n\t\t\t})\n\t\t\trunning.set(container.project.slug, { worker, container })\n\t\t\ttry {\n\t\t\t\tif (current) {\n\t\t\t\t\tawait (await current.worker).end()\n\t\t\t\t}\n\t\t\t\tawait worker\n\t\t\t\tlogger.debug('Project dispatch worker started', { project: container.project.slug })\n\t\t\t} catch (e) {\n\t\t\t\tlogger.error(e, { message: 'Project dispatch worker start failed', project: container.project.slug })\n\t\t\t\trunning.delete(container.project.slug)\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst projectTracker = new Supervisor(\n\t\t\tnew AcquiringListener(\n\t\t\t\ttenantContainer.databaseContext.client,\n\t\t\t\t'project_updated',\n\t\t\t\tasync () => {\n\t\t\t\t\tlogger.debug('Project config change detected, reloading dispatch workers')\n\t\t\t\t\tawait endProjectWorkers()\n\t\t\t\t\ttry {\n\t\t\t\t\t\tawait startWorkers(true)\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tlogger.error(e, { message: 'Dispatch workers reload failed, terminating' })\n\t\t\t\t\t\tawait endAll()\n\t\t\t\t\t\tonError(e)\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t),\n\t\t)\n\n\t\tconst runningProjectTracker = await projectTracker.run({\n\t\t\tlogger,\n\t\t\tonError: () => {\n\t\t\t\tthrow new ImplementationException('supervised project tracker crashed')\n\t\t\t},\n\t\t})\n\t\tconst fetchProjects = async () => await tenantContainer.projectManager.getProjects(tenantContainer.databaseContext)\n\n\t\tconst startWorkers = async (isReloading: boolean) => {\n\t\t\ttry {\n\t\t\t\tconst projects = await fetchProjects()\n\t\t\t\tfor (const project of projects) {\n\t\t\t\t\tconst container = await projectGroup.projectContainerResolver.getProjectContainer(project.slug)\n\t\t\t\t\tif (container) {\n\t\t\t\t\t\tawait refreshProjectWorker(container, isReloading)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\tawait endAll()\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst endProjectWorkers = async () => {\n\t\t\tconst workers = [...running.values()]\n\t\t\trunning.clear()\n\t\t\tawait Promise.allSettled(workers.map(async ({ worker }) => await (await worker).end()))\n\t\t}\n\t\tconst endAll = async () => {\n\t\t\tlogger.debug('Terminating project dispatch workers...')\n\t\t\tcleanupListener()\n\t\t\ttry {\n\t\t\t\tawait runningProjectTracker.end()\n\t\t\t} catch {\n\t\t\t}\n\t\t\tawait endProjectWorkers()\n\t\t\tlogger.debug('Project dispatch workers terminated')\n\t\t}\n\n\t\tawait startWorkers(false)\n\n\t\treturn {\n\t\t\tend: endAll,\n\t\t}\n\t}\n}\n"],"names":["Supervisor","ImplementationException","AcquiringListener"],"mappings":"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"}

package/dist/development/src/dispatch/DispatchWorkerSupervisor.js

@@ -61,21 +61,23 @@ class DispatchWorkerSupervisor {
         throw e;
       }
     };
-    const projectTracker = new Supervisor(new AcquiringListener(
-      tenantContainer.databaseContext.client,
-      "project_updated",
-      async () => {
-        logger.debug("Project config change detected, reloading dispatch workers");
-        await endProjectWorkers();
-        try {
-          await startWorkers(true);
-        } catch (e) {
-          logger.error(e, { message: "Dispatch workers reload failed, terminating" });
-          await endAll();
-          onError(e);
+    const projectTracker = new Supervisor(
+      new AcquiringListener(
+        tenantContainer.databaseContext.client,
+        "project_updated",
+        async () => {
+          logger.debug("Project config change detected, reloading dispatch workers");
+          await endProjectWorkers();
+          try {
+            await startWorkers(true);
+          } catch (e) {
+            logger.error(e, { message: "Dispatch workers reload failed, terminating" });
+            await endAll();
+            onError(e);
+          }
         }
-      }
-    ));
+      )
+    );
     const runningProjectTracker = await projectTracker.run({
       logger,
       onError: () => {

package/dist/development/src/dispatch/DispatchWorkerSupervisor.js.map

@@ -1 +1 @@
-{"version":3,"file":"DispatchWorkerSupervisor.js","sources":["../../../../../packages/engine-actions/src/dispatch/DispatchWorkerSupervisor.ts"],"sourcesContent":["import { ProjectContainer, ProjectGroupContainer } from '@contember/engine-http'\nimport { AcquiringListener } from '@contember/database'\nimport { Runnable, RunnableArgs, Running, Supervisor } from '@contember/engine-common'\nimport { ProjectDispatcherFactory } from './ProjectDispatcher'\nimport { Logger } from '@contember/logger'\nimport { ImplementationException } from '../ImplementationException'\n\nexport class DispatchWorkerSupervisorFactory {\n\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t) {\n\t}\n\n\tpublic create(projectGroup: ProjectGroupContainer): DispatchWorkerSupervisor {\n\t\treturn new DispatchWorkerSupervisor(this.projectDispatcherFactory, projectGroup)\n\t}\n}\n\nexport class DispatchWorkerSupervisor implements Runnable {\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t\tprivate projectGroup: ProjectGroupContainer,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError }: RunnableArgs) {\n\t\tconst projectGroup = this.projectGroup\n\t\tconst tenantContainer = projectGroup.tenantContainer\n\t\tconst projectContainerResolver = projectGroup.projectContainerResolver\n\n\t\tconst running = new Map<string, { worker: Promise<Running>; container: ProjectContainer }>()\n\n\t\tconst cleanupListener = projectContainerResolver.on('destroy', async ({ container }) => {\n\t\t\tconst runningForProject = running.get(container.project.slug)\n\t\t\tif (!runningForProject) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\trunning.delete(container.project.slug)\n\t\t\tawait (await runningForProject.worker).end()\n\t\t})\n\n\t\tconst refreshProjectWorker = async (container: ProjectContainer, isReloading: boolean) => {\n\t\t\tconst db = container.systemDatabaseContext\n\t\t\tconst current = running.get(container.project.slug)\n\t\t\tif (current && current.container === container) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\tconst dispatcher = this.projectDispatcherFactory.create({\n\t\t\t\tdb,\n\t\t\t\tcontentSchemaResolver: container.contentSchemaResolver,\n\t\t\t\tprojectSlug: container.project.slug,\n\t\t\t})\n\t\t\tconst supervisedDispatcher = new Supervisor(\n\t\t\t\tdispatcher,\n\t\t\t\t{ startupMax: isReloading ? Number.MAX_VALUE : 10 },\n\t\t\t)\n\t\t\tconst worker = supervisedDispatcher.run({\n\t\t\t\tlogger,\n\t\t\t\tonError: () => {\n\t\t\t\t\tthrow new ImplementationException('supervised project dispatcher crashed')\n\t\t\t\t},\n\t\t\t})\n\t\t\trunning.set(container.project.slug, { worker, container })\n\t\t\ttry {\n\t\t\t\tif (current) {\n\t\t\t\t\tawait (await current.worker).end()\n\t\t\t\t}\n\t\t\t\tawait worker\n\t\t\t\tlogger.debug('Project dispatch worker started', { project: container.project.slug })\n\t\t\t} catch (e) {\n\t\t\t\tlogger.error(e, { message: 'Project dispatch worker start failed', project: container.project.slug })\n\t\t\t\trunning.delete(container.project.slug)\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst projectTracker = new Supervisor(new AcquiringListener(\n\t\t\ttenantContainer.databaseContext.client,\n\t\t\t'project_updated',\n\t\t\tasync () => {\n\t\t\t\tlogger.debug('Project config change detected, reloading dispatch workers')\n\t\t\t\tawait endProjectWorkers()\n\t\t\t\ttry {\n\t\t\t\t\tawait startWorkers(true)\n\t\t\t\t} catch (e) {\n\t\t\t\t\tlogger.error(e, { message: 'Dispatch workers reload failed, terminating' })\n\t\t\t\t\tawait endAll()\n\t\t\t\t\tonError(e)\n\t\t\t\t}\n\t\t\t},\n\t\t))\n\n\t\tconst runningProjectTracker = await projectTracker.run({\n\t\t\tlogger,\n\t\t\tonError: () => {\n\t\t\t\tthrow new ImplementationException('supervised project tracker crashed')\n\t\t\t},\n\t\t})\n\t\tconst fetchProjects = async () => await tenantContainer.projectManager.getProjects(tenantContainer.databaseContext)\n\n\t\tconst startWorkers = async (isReloading: boolean) => {\n\t\t\ttry {\n\t\t\t\tconst projects = await fetchProjects()\n\t\t\t\tfor (const project of projects) {\n\t\t\t\t\tconst container = await projectGroup.projectContainerResolver.getProjectContainer(project.slug)\n\t\t\t\t\tif (container) {\n\t\t\t\t\t\tawait refreshProjectWorker(container, isReloading)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\tawait endAll()\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst endProjectWorkers = async () => {\n\t\t\tconst workers = [...running.values()]\n\t\t\trunning.clear()\n\t\t\tawait Promise.allSettled(workers.map(async ({ worker }) => await (await worker).end()))\n\t\t}\n\t\tconst endAll = async () => {\n\t\t\tlogger.debug('Terminating project dispatch workers...')\n\t\t\tcleanupListener()\n\t\t\ttry {\n\t\t\t\tawait runningProjectTracker.end()\n\t\t\t} catch {\n\t\t\t}\n\t\t\tawait endProjectWorkers()\n\t\t\tlogger.debug('Project dispatch workers terminated')\n\t\t}\n\n\t\tawait startWorkers(false)\n\n\t\treturn {\n\t\t\tend: endAll,\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"DispatchWorkerSupervisor.js","sources":["../../../../../packages/engine-actions/src/dispatch/DispatchWorkerSupervisor.ts"],"sourcesContent":["import { ProjectContainer, ProjectGroupContainer } from '@contember/engine-http'\nimport { AcquiringListener } from '@contember/database'\nimport { Runnable, RunnableArgs, Running, Supervisor } from '@contember/engine-common'\nimport { ProjectDispatcherFactory } from './ProjectDispatcher'\nimport { Logger } from '@contember/logger'\nimport { ImplementationException } from '../ImplementationException'\n\nexport class DispatchWorkerSupervisorFactory {\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t) {\n\t}\n\n\tpublic create(projectGroup: ProjectGroupContainer): DispatchWorkerSupervisor {\n\t\treturn new DispatchWorkerSupervisor(this.projectDispatcherFactory, projectGroup)\n\t}\n}\n\nexport class DispatchWorkerSupervisor implements Runnable {\n\tconstructor(\n\t\tprivate projectDispatcherFactory: ProjectDispatcherFactory,\n\t\tprivate projectGroup: ProjectGroupContainer,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError }: RunnableArgs) {\n\t\tconst projectGroup = this.projectGroup\n\t\tconst tenantContainer = projectGroup.tenantContainer\n\t\tconst projectContainerResolver = projectGroup.projectContainerResolver\n\n\t\tconst running = new Map<string, { worker: Promise<Running>; container: ProjectContainer }>()\n\n\t\tconst cleanupListener = projectContainerResolver.on('destroy', async ({ container }) => {\n\t\t\tconst runningForProject = running.get(container.project.slug)\n\t\t\tif (!runningForProject) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\trunning.delete(container.project.slug)\n\t\t\tawait (await runningForProject.worker).end()\n\t\t})\n\n\t\tconst refreshProjectWorker = async (container: ProjectContainer, isReloading: boolean) => {\n\t\t\tconst db = container.systemDatabaseContext\n\t\t\tconst current = running.get(container.project.slug)\n\t\t\tif (current && current.container === container) {\n\t\t\t\treturn\n\t\t\t}\n\t\t\tconst dispatcher = this.projectDispatcherFactory.create({\n\t\t\t\tdb,\n\t\t\t\tcontentSchemaResolver: container.contentSchemaResolver,\n\t\t\t\tprojectSlug: container.project.slug,\n\t\t\t})\n\t\t\tconst supervisedDispatcher = new Supervisor(\n\t\t\t\tdispatcher,\n\t\t\t\t{ startupMax: isReloading ? Number.MAX_VALUE : 10 },\n\t\t\t)\n\t\t\tconst worker = supervisedDispatcher.run({\n\t\t\t\tlogger,\n\t\t\t\tonError: () => {\n\t\t\t\t\tthrow new ImplementationException('supervised project dispatcher crashed')\n\t\t\t\t},\n\t\t\t})\n\t\t\trunning.set(container.project.slug, { worker, container })\n\t\t\ttry {\n\t\t\t\tif (current) {\n\t\t\t\t\tawait (await current.worker).end()\n\t\t\t\t}\n\t\t\t\tawait worker\n\t\t\t\tlogger.debug('Project dispatch worker started', { project: container.project.slug })\n\t\t\t} catch (e) {\n\t\t\t\tlogger.error(e, { message: 'Project dispatch worker start failed', project: container.project.slug })\n\t\t\t\trunning.delete(container.project.slug)\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst projectTracker = new Supervisor(\n\t\t\tnew AcquiringListener(\n\t\t\t\ttenantContainer.databaseContext.client,\n\t\t\t\t'project_updated',\n\t\t\t\tasync () => {\n\t\t\t\t\tlogger.debug('Project config change detected, reloading dispatch workers')\n\t\t\t\t\tawait endProjectWorkers()\n\t\t\t\t\ttry {\n\t\t\t\t\t\tawait startWorkers(true)\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tlogger.error(e, { message: 'Dispatch workers reload failed, terminating' })\n\t\t\t\t\t\tawait endAll()\n\t\t\t\t\t\tonError(e)\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t),\n\t\t)\n\n\t\tconst runningProjectTracker = await projectTracker.run({\n\t\t\tlogger,\n\t\t\tonError: () => {\n\t\t\t\tthrow new ImplementationException('supervised project tracker crashed')\n\t\t\t},\n\t\t})\n\t\tconst fetchProjects = async () => await tenantContainer.projectManager.getProjects(tenantContainer.databaseContext)\n\n\t\tconst startWorkers = async (isReloading: boolean) => {\n\t\t\ttry {\n\t\t\t\tconst projects = await fetchProjects()\n\t\t\t\tfor (const project of projects) {\n\t\t\t\t\tconst container = await projectGroup.projectContainerResolver.getProjectContainer(project.slug)\n\t\t\t\t\tif (container) {\n\t\t\t\t\t\tawait refreshProjectWorker(container, isReloading)\n\t\t\t\t\t}\n\t\t\t\t}\n\t\t\t} catch (e) {\n\t\t\t\tawait endAll()\n\t\t\t\tthrow e\n\t\t\t}\n\t\t}\n\t\tconst endProjectWorkers = async () => {\n\t\t\tconst workers = [...running.values()]\n\t\t\trunning.clear()\n\t\t\tawait Promise.allSettled(workers.map(async ({ worker }) => await (await worker).end()))\n\t\t}\n\t\tconst endAll = async () => {\n\t\t\tlogger.debug('Terminating project dispatch workers...')\n\t\t\tcleanupListener()\n\t\t\ttry {\n\t\t\t\tawait runningProjectTracker.end()\n\t\t\t} catch {\n\t\t\t}\n\t\t\tawait endProjectWorkers()\n\t\t\tlogger.debug('Project dispatch workers terminated')\n\t\t}\n\n\t\tawait startWorkers(false)\n\n\t\treturn {\n\t\t\tend: endAll,\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/development/src/dispatch/EventDispatcher.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"EventDispatcher.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/EventDispatcher.ts"],"sourcesContent":["import { EventsRepository } from './EventsRepository'\nimport { TargetHandlerResolver } from './TargetHandlerResolver'\nimport { HandledEvent } from './types'\nimport { Logger } from '@contember/logger'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { DatabaseContext } from '@contember/engine-system-api'\nimport { VariablesManager } from '../model/VariablesManager'\n\n\ntype ProcessBatchArgs = {\n\tdb: DatabaseContext\n\tcontentSchemaResolver: ContentSchemaResolver\n\tlogger: Logger\n}\n\ntype ProcessBatchResult = {\n\tsucceed: number\n\tfailed: number\n\tbackoffMs: number | undefined\n}\n\nexport class EventDispatcher {\n\n\tconstructor(\n\t\tprivate readonly eventsRepository: EventsRepository,\n\t\tprivate readonly variablesManager: VariablesManager,\n\t\tprivate readonly invokeResolver: TargetHandlerResolver,\n\t) {\n\t}\n\n\tasync processBatch({ db, contentSchemaResolver, logger }: ProcessBatchArgs): Promise<ProcessBatchResult> {\n\t\tconst schema = (await contentSchemaResolver.getSchema({ db, normalize: true })).schema\n\t\tconst batch = await this.eventsRepository.fetchBatch(schema.actions, db.client)\n\t\tconst batchId = Math.random().toString().substring(2)\n\t\tconst batchLogger = logger.child({ loc: 'Actions.EventDispatcher', batchId })\n\t\tif (!batch.ok) {\n\t\t\tbatchLogger.debug('Nothing to process', {\n\t\t\t\tbackoffMs: batch.backoffMs ?? 'undefined',\n\t\t\t})\n\t\t\treturn { failed: 0, succeed: 0, backoffMs: batch.backoffMs }\n\t\t}\n\t\tconst { target, events } = batch\n\t\ttry {\n\t\t\tconst handler = this.invokeResolver.resolveHandler(target)\n\t\t\tbatchLogger.debug('Processing started', {\n\t\t\t\tevents: batch.events.map(it => it.id),\n\t\t\t})\n\t\t\tconst variables = await this.variablesManager.fetchVariables(db)\n\t\t\tconst handledEvents = await handler.handle({ target, events, logger: batchLogger, variables })\n\t\t\tconst [succeed, failed] = await this.eventsRepository.persistProcessed(db.client, handledEvents)\n\t\t\tbatchLogger.debug('Processing done', { succeed, failed })\n\t\t\treturn { succeed, failed, backoffMs: 0 }\n\t\t} catch (e) {\n\t\t\tlogger.error(e, { loc: 'EventDispatcher', batchId })\n\t\t\tconst failedEvents = events.map((it): HandledEvent => ({\n\t\t\t\trow: it,\n\t\t\t\tresult: { ok: false, errorMessage: `Internal error` },\n\t\t\t}))\n\t\t\tawait this.eventsRepository.persistProcessed(db.client, failedEvents)\n\n\t\t\treturn { succeed: 0, failed: batch.events.length, backoffMs: 0 }\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAqBO,MAAM,gBAAgB;AAAA,EAE5B,YACkB,kBACA,kBACA,gBAChB;AAHgB,SAAA,mBAAA;AACA,SAAA,mBAAA;AACA,SAAA,iBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,aAAa,EAAE,IAAI,uBAAuB,UAAyD;AAClG,UAAA,UAAU,MAAM,sBAAsB,UAAU,EAAE,IAAI,WAAW,KAAM,CAAA,GAAG;AAC1E,UAAA,QAAQ,MAAM,KAAK,iBAAiB,WAAW,OAAO,SAAS,GAAG,MAAM;AAC9E,UAAM,UAAU,KAAK,OAAA,EAAS,SAAS,EAAE,UAAU,CAAC;AACpD,UAAM,cAAc,OAAO,MAAM,EAAE,KAAK,2BAA2B,SAAS;AACxE,QAAA,CAAC,MAAM,IAAI;AACd,kBAAY,MAAM,sBAAsB;AAAA,QACvC,WAAW,MAAM,aAAa;AAAA,MAAA,CAC9B;AACD,aAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,MAAM,UAAU;AAAA,IAAA;AAEtD,UAAA,EAAE,QAAQ,OAAA,IAAW;AACvB,QAAA;AACH,YAAM,UAAU,KAAK,eAAe,eAAe,MAAM;AACzD,kBAAY,MAAM,sBAAsB;AAAA,QACvC,QAAQ,MAAM,OAAO,IAAI,CAAA,OAAM,GAAG,EAAE;AAAA,MAAA,CACpC;AACD,YAAM,YAAY,MAAM,KAAK,iBAAiB,eAAe,EAAE;AACzD,YAAA,gBAAgB,MAAM,QAAQ,OAAO,EAAE,QAAQ,QAAQ,QAAQ,aAAa,WAAW;AACvF,YAAA,CAAC,SAAS,MAAM,IAAI,MAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,aAAa;AAC/F,kBAAY,MAAM,mBAAmB,EAAE,SAAS,QAAQ;AACxD,aAAO,EAAE,SAAS,QAAQ,WAAW,EAAE;AAAA,aAC/B,GAAG;AACX,aAAO,MAAM,GAAG,EAAE,KAAK,mBAAmB,SAAS;AACnD,YAAM,eAAe,OAAO,IAAI,CAAC,QAAsB;AAAA,QACtD,KAAK;AAAA,QACL,QAAQ,EAAE,IAAI,OAAO,cAAc,iBAAiB;AAAA,MAAA,EACnD;AACF,YAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,YAAY;AAE7D,aAAA,EAAE,SAAS,GAAG,QAAQ,MAAM,OAAO,QAAQ,WAAW,EAAE;AAAA,IAAA;AAAA,EAChE;AAEF;;"}
+{"version":3,"file":"EventDispatcher.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/EventDispatcher.ts"],"sourcesContent":["import { EventsRepository } from './EventsRepository'\nimport { TargetHandlerResolver } from './TargetHandlerResolver'\nimport { HandledEvent } from './types'\nimport { Logger } from '@contember/logger'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { DatabaseContext } from '@contember/engine-system-api'\nimport { VariablesManager } from '../model/VariablesManager'\n\ntype ProcessBatchArgs = {\n\tdb: DatabaseContext\n\tcontentSchemaResolver: ContentSchemaResolver\n\tlogger: Logger\n}\n\ntype ProcessBatchResult = {\n\tsucceed: number\n\tfailed: number\n\tbackoffMs: number | undefined\n}\n\nexport class EventDispatcher {\n\tconstructor(\n\t\tprivate readonly eventsRepository: EventsRepository,\n\t\tprivate readonly variablesManager: VariablesManager,\n\t\tprivate readonly invokeResolver: TargetHandlerResolver,\n\t) {\n\t}\n\n\tasync processBatch({ db, contentSchemaResolver, logger }: ProcessBatchArgs): Promise<ProcessBatchResult> {\n\t\tconst schema = (await contentSchemaResolver.getSchema({ db, normalize: true })).schema\n\t\tconst batch = await this.eventsRepository.fetchBatch(schema.actions, db.client)\n\t\tconst batchId = Math.random().toString().substring(2)\n\t\tconst batchLogger = logger.child({ loc: 'Actions.EventDispatcher', batchId })\n\t\tif (!batch.ok) {\n\t\t\tbatchLogger.debug('Nothing to process', {\n\t\t\t\tbackoffMs: batch.backoffMs ?? 'undefined',\n\t\t\t})\n\t\t\treturn { failed: 0, succeed: 0, backoffMs: batch.backoffMs }\n\t\t}\n\t\tconst { target, events } = batch\n\t\ttry {\n\t\t\tconst handler = this.invokeResolver.resolveHandler(target)\n\t\t\tbatchLogger.debug('Processing started', {\n\t\t\t\tevents: batch.events.map(it => it.id),\n\t\t\t})\n\t\t\tconst variables = await this.variablesManager.fetchVariables(db)\n\t\t\tconst handledEvents = await handler.handle({ target, events, logger: batchLogger, variables })\n\t\t\tconst [succeed, failed] = await this.eventsRepository.persistProcessed(db.client, handledEvents)\n\t\t\tbatchLogger.debug('Processing done', { succeed, failed })\n\t\t\treturn { succeed, failed, backoffMs: 0 }\n\t\t} catch (e) {\n\t\t\tlogger.error(e, { loc: 'EventDispatcher', batchId })\n\t\t\tconst failedEvents = events.map((it): HandledEvent => ({\n\t\t\t\trow: it,\n\t\t\t\tresult: { ok: false, errorMessage: `Internal error` },\n\t\t\t}))\n\t\t\tawait this.eventsRepository.persistProcessed(db.client, failedEvents)\n\n\t\t\treturn { succeed: 0, failed: batch.events.length, backoffMs: 0 }\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAoBO,MAAM,gBAAgB;AAAA,EAC5B,YACkB,kBACA,kBACA,gBAChB;AAHgB,SAAA,mBAAA;AACA,SAAA,mBAAA;AACA,SAAA,iBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,aAAa,EAAE,IAAI,uBAAuB,UAAyD;AACxG,UAAM,UAAU,MAAM,sBAAsB,UAAU,EAAE,IAAI,WAAW,KAAA,CAAM,GAAG;AAChF,UAAM,QAAQ,MAAM,KAAK,iBAAiB,WAAW,OAAO,SAAS,GAAG,MAAM;AAC9E,UAAM,UAAU,KAAK,OAAA,EAAS,SAAA,EAAW,UAAU,CAAC;AACpD,UAAM,cAAc,OAAO,MAAM,EAAE,KAAK,2BAA2B,SAAS;AAC5E,QAAI,CAAC,MAAM,IAAI;AACd,kBAAY,MAAM,sBAAsB;AAAA,QACvC,WAAW,MAAM,aAAa;AAAA,MAAA,CAC9B;AACD,aAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,MAAM,UAAA;AAAA,IAClD;AACA,UAAM,EAAE,QAAQ,OAAA,IAAW;AAC3B,QAAI;AACH,YAAM,UAAU,KAAK,eAAe,eAAe,MAAM;AACzD,kBAAY,MAAM,sBAAsB;AAAA,QACvC,QAAQ,MAAM,OAAO,IAAI,CAAA,OAAM,GAAG,EAAE;AAAA,MAAA,CACpC;AACD,YAAM,YAAY,MAAM,KAAK,iBAAiB,eAAe,EAAE;AAC/D,YAAM,gBAAgB,MAAM,QAAQ,OAAO,EAAE,QAAQ,QAAQ,QAAQ,aAAa,WAAW;AAC7F,YAAM,CAAC,SAAS,MAAM,IAAI,MAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,aAAa;AAC/F,kBAAY,MAAM,mBAAmB,EAAE,SAAS,QAAQ;AACxD,aAAO,EAAE,SAAS,QAAQ,WAAW,EAAA;AAAA,IACtC,SAAS,GAAG;AACX,aAAO,MAAM,GAAG,EAAE,KAAK,mBAAmB,SAAS;AACnD,YAAM,eAAe,OAAO,IAAI,CAAC,QAAsB;AAAA,QACtD,KAAK;AAAA,QACL,QAAQ,EAAE,IAAI,OAAO,cAAc,iBAAA;AAAA,MAAiB,EACnD;AACF,YAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,YAAY;AAEpE,aAAO,EAAE,SAAS,GAAG,QAAQ,MAAM,OAAO,QAAQ,WAAW,EAAA;AAAA,IAC9D;AAAA,EACD;AACD;;"}

package/dist/development/src/dispatch/EventDispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventDispatcher.js","sources":["../../../../../packages/engine-actions/src/dispatch/EventDispatcher.ts"],"sourcesContent":["import { EventsRepository } from './EventsRepository'\nimport { TargetHandlerResolver } from './TargetHandlerResolver'\nimport { HandledEvent } from './types'\nimport { Logger } from '@contember/logger'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { DatabaseContext } from '@contember/engine-system-api'\nimport { VariablesManager } from '../model/VariablesManager'\n\n\ntype ProcessBatchArgs = {\n\tdb: DatabaseContext\n\tcontentSchemaResolver: ContentSchemaResolver\n\tlogger: Logger\n}\n\ntype ProcessBatchResult = {\n\tsucceed: number\n\tfailed: number\n\tbackoffMs: number | undefined\n}\n\nexport class EventDispatcher {\n\n\tconstructor(\n\t\tprivate readonly eventsRepository: EventsRepository,\n\t\tprivate readonly variablesManager: VariablesManager,\n\t\tprivate readonly invokeResolver: TargetHandlerResolver,\n\t) {\n\t}\n\n\tasync processBatch({ db, contentSchemaResolver, logger }: ProcessBatchArgs): Promise<ProcessBatchResult> {\n\t\tconst schema = (await contentSchemaResolver.getSchema({ db, normalize: true })).schema\n\t\tconst batch = await this.eventsRepository.fetchBatch(schema.actions, db.client)\n\t\tconst batchId = Math.random().toString().substring(2)\n\t\tconst batchLogger = logger.child({ loc: 'Actions.EventDispatcher', batchId })\n\t\tif (!batch.ok) {\n\t\t\tbatchLogger.debug('Nothing to process', {\n\t\t\t\tbackoffMs: batch.backoffMs ?? 'undefined',\n\t\t\t})\n\t\t\treturn { failed: 0, succeed: 0, backoffMs: batch.backoffMs }\n\t\t}\n\t\tconst { target, events } = batch\n\t\ttry {\n\t\t\tconst handler = this.invokeResolver.resolveHandler(target)\n\t\t\tbatchLogger.debug('Processing started', {\n\t\t\t\tevents: batch.events.map(it => it.id),\n\t\t\t})\n\t\t\tconst variables = await this.variablesManager.fetchVariables(db)\n\t\t\tconst handledEvents = await handler.handle({ target, events, logger: batchLogger, variables })\n\t\t\tconst [succeed, failed] = await this.eventsRepository.persistProcessed(db.client, handledEvents)\n\t\t\tbatchLogger.debug('Processing done', { succeed, failed })\n\t\t\treturn { succeed, failed, backoffMs: 0 }\n\t\t} catch (e) {\n\t\t\tlogger.error(e, { loc: 'EventDispatcher', batchId })\n\t\t\tconst failedEvents = events.map((it): HandledEvent => ({\n\t\t\t\trow: it,\n\t\t\t\tresult: { ok: false, errorMessage: `Internal error` },\n\t\t\t}))\n\t\t\tawait this.eventsRepository.persistProcessed(db.client, failedEvents)\n\n\t\t\treturn { succeed: 0, failed: batch.events.length, backoffMs: 0 }\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"AAqBO,MAAM,gBAAgB;AAAA,EAE5B,YACkB,kBACA,kBACA,gBAChB;AAHgB,SAAA,mBAAA;AACA,SAAA,mBAAA;AACA,SAAA,iBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,aAAa,EAAE,IAAI,uBAAuB,UAAyD;AAClG,UAAA,UAAU,MAAM,sBAAsB,UAAU,EAAE,IAAI,WAAW,KAAM,CAAA,GAAG;AAC1E,UAAA,QAAQ,MAAM,KAAK,iBAAiB,WAAW,OAAO,SAAS,GAAG,MAAM;AAC9E,UAAM,UAAU,KAAK,OAAA,EAAS,SAAS,EAAE,UAAU,CAAC;AACpD,UAAM,cAAc,OAAO,MAAM,EAAE,KAAK,2BAA2B,SAAS;AACxE,QAAA,CAAC,MAAM,IAAI;AACd,kBAAY,MAAM,sBAAsB;AAAA,QACvC,WAAW,MAAM,aAAa;AAAA,MAAA,CAC9B;AACD,aAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,MAAM,UAAU;AAAA,IAAA;AAEtD,UAAA,EAAE,QAAQ,OAAA,IAAW;AACvB,QAAA;AACH,YAAM,UAAU,KAAK,eAAe,eAAe,MAAM;AACzD,kBAAY,MAAM,sBAAsB;AAAA,QACvC,QAAQ,MAAM,OAAO,IAAI,CAAA,OAAM,GAAG,EAAE;AAAA,MAAA,CACpC;AACD,YAAM,YAAY,MAAM,KAAK,iBAAiB,eAAe,EAAE;AACzD,YAAA,gBAAgB,MAAM,QAAQ,OAAO,EAAE,QAAQ,QAAQ,QAAQ,aAAa,WAAW;AACvF,YAAA,CAAC,SAAS,MAAM,IAAI,MAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,aAAa;AAC/F,kBAAY,MAAM,mBAAmB,EAAE,SAAS,QAAQ;AACxD,aAAO,EAAE,SAAS,QAAQ,WAAW,EAAE;AAAA,aAC/B,GAAG;AACX,aAAO,MAAM,GAAG,EAAE,KAAK,mBAAmB,SAAS;AACnD,YAAM,eAAe,OAAO,IAAI,CAAC,QAAsB;AAAA,QACtD,KAAK;AAAA,QACL,QAAQ,EAAE,IAAI,OAAO,cAAc,iBAAiB;AAAA,MAAA,EACnD;AACF,YAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,YAAY;AAE7D,aAAA,EAAE,SAAS,GAAG,QAAQ,MAAM,OAAO,QAAQ,WAAW,EAAE;AAAA,IAAA;AAAA,EAChE;AAEF;"}
+{"version":3,"file":"EventDispatcher.js","sources":["../../../../../packages/engine-actions/src/dispatch/EventDispatcher.ts"],"sourcesContent":["import { EventsRepository } from './EventsRepository'\nimport { TargetHandlerResolver } from './TargetHandlerResolver'\nimport { HandledEvent } from './types'\nimport { Logger } from '@contember/logger'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { DatabaseContext } from '@contember/engine-system-api'\nimport { VariablesManager } from '../model/VariablesManager'\n\ntype ProcessBatchArgs = {\n\tdb: DatabaseContext\n\tcontentSchemaResolver: ContentSchemaResolver\n\tlogger: Logger\n}\n\ntype ProcessBatchResult = {\n\tsucceed: number\n\tfailed: number\n\tbackoffMs: number | undefined\n}\n\nexport class EventDispatcher {\n\tconstructor(\n\t\tprivate readonly eventsRepository: EventsRepository,\n\t\tprivate readonly variablesManager: VariablesManager,\n\t\tprivate readonly invokeResolver: TargetHandlerResolver,\n\t) {\n\t}\n\n\tasync processBatch({ db, contentSchemaResolver, logger }: ProcessBatchArgs): Promise<ProcessBatchResult> {\n\t\tconst schema = (await contentSchemaResolver.getSchema({ db, normalize: true })).schema\n\t\tconst batch = await this.eventsRepository.fetchBatch(schema.actions, db.client)\n\t\tconst batchId = Math.random().toString().substring(2)\n\t\tconst batchLogger = logger.child({ loc: 'Actions.EventDispatcher', batchId })\n\t\tif (!batch.ok) {\n\t\t\tbatchLogger.debug('Nothing to process', {\n\t\t\t\tbackoffMs: batch.backoffMs ?? 'undefined',\n\t\t\t})\n\t\t\treturn { failed: 0, succeed: 0, backoffMs: batch.backoffMs }\n\t\t}\n\t\tconst { target, events } = batch\n\t\ttry {\n\t\t\tconst handler = this.invokeResolver.resolveHandler(target)\n\t\t\tbatchLogger.debug('Processing started', {\n\t\t\t\tevents: batch.events.map(it => it.id),\n\t\t\t})\n\t\t\tconst variables = await this.variablesManager.fetchVariables(db)\n\t\t\tconst handledEvents = await handler.handle({ target, events, logger: batchLogger, variables })\n\t\t\tconst [succeed, failed] = await this.eventsRepository.persistProcessed(db.client, handledEvents)\n\t\t\tbatchLogger.debug('Processing done', { succeed, failed })\n\t\t\treturn { succeed, failed, backoffMs: 0 }\n\t\t} catch (e) {\n\t\t\tlogger.error(e, { loc: 'EventDispatcher', batchId })\n\t\t\tconst failedEvents = events.map((it): HandledEvent => ({\n\t\t\t\trow: it,\n\t\t\t\tresult: { ok: false, errorMessage: `Internal error` },\n\t\t\t}))\n\t\t\tawait this.eventsRepository.persistProcessed(db.client, failedEvents)\n\n\t\t\treturn { succeed: 0, failed: batch.events.length, backoffMs: 0 }\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"AAoBO,MAAM,gBAAgB;AAAA,EAC5B,YACkB,kBACA,kBACA,gBAChB;AAHgB,SAAA,mBAAA;AACA,SAAA,mBAAA;AACA,SAAA,iBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,aAAa,EAAE,IAAI,uBAAuB,UAAyD;AACxG,UAAM,UAAU,MAAM,sBAAsB,UAAU,EAAE,IAAI,WAAW,KAAA,CAAM,GAAG;AAChF,UAAM,QAAQ,MAAM,KAAK,iBAAiB,WAAW,OAAO,SAAS,GAAG,MAAM;AAC9E,UAAM,UAAU,KAAK,OAAA,EAAS,SAAA,EAAW,UAAU,CAAC;AACpD,UAAM,cAAc,OAAO,MAAM,EAAE,KAAK,2BAA2B,SAAS;AAC5E,QAAI,CAAC,MAAM,IAAI;AACd,kBAAY,MAAM,sBAAsB;AAAA,QACvC,WAAW,MAAM,aAAa;AAAA,MAAA,CAC9B;AACD,aAAO,EAAE,QAAQ,GAAG,SAAS,GAAG,WAAW,MAAM,UAAA;AAAA,IAClD;AACA,UAAM,EAAE,QAAQ,OAAA,IAAW;AAC3B,QAAI;AACH,YAAM,UAAU,KAAK,eAAe,eAAe,MAAM;AACzD,kBAAY,MAAM,sBAAsB;AAAA,QACvC,QAAQ,MAAM,OAAO,IAAI,CAAA,OAAM,GAAG,EAAE;AAAA,MAAA,CACpC;AACD,YAAM,YAAY,MAAM,KAAK,iBAAiB,eAAe,EAAE;AAC/D,YAAM,gBAAgB,MAAM,QAAQ,OAAO,EAAE,QAAQ,QAAQ,QAAQ,aAAa,WAAW;AAC7F,YAAM,CAAC,SAAS,MAAM,IAAI,MAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,aAAa;AAC/F,kBAAY,MAAM,mBAAmB,EAAE,SAAS,QAAQ;AACxD,aAAO,EAAE,SAAS,QAAQ,WAAW,EAAA;AAAA,IACtC,SAAS,GAAG;AACX,aAAO,MAAM,GAAG,EAAE,KAAK,mBAAmB,SAAS;AACnD,YAAM,eAAe,OAAO,IAAI,CAAC,QAAsB;AAAA,QACtD,KAAK;AAAA,QACL,QAAQ,EAAE,IAAI,OAAO,cAAc,iBAAA;AAAA,MAAiB,EACnD;AACF,YAAM,KAAK,iBAAiB,iBAAiB,GAAG,QAAQ,YAAY;AAEpE,aAAO,EAAE,SAAS,GAAG,QAAQ,MAAM,OAAO,QAAQ,WAAW,EAAA;AAAA,IAC9D;AAAA,EACD;AACD;"}

package/dist/development/src/dispatch/EventsRepository.cjs

@@ -28,10 +28,7 @@ class EventsRepository {
   async fetchInternal(db, limit, targetName) {
     const visibleAt = /* @__PURE__ */ new Date();
     visibleAt.setTime(visibleAt.getTime() + ACK_TIMEOUT_MS);
-    return await Database.UpdateBuilder.create().table("actions_event").with(
-      "events",
-      (qb) => qb.select((it) => it.raw("*")).from("actions_event").match(EventsToProcessSpecification.eventsToProcessSpecification).where(targetName ? { target: targetName } : {}).limit(limit).lock(Database.LockType.forNoKeyUpdate, Database.LockModifier.skipLocked)
-    ).values({
+    return await Database.UpdateBuilder.create().table("actions_event").with("events", (qb) => qb.select((it) => it.raw("*")).from("actions_event").match(EventsToProcessSpecification.eventsToProcessSpecification).where(targetName ? { target: targetName } : {}).limit(limit).lock(Database.LockType.forNoKeyUpdate, Database.LockModifier.skipLocked)).values({
       state: "processing",
       last_state_change: /* @__PURE__ */ new Date(),
       visible_at: visibleAt
@@ -52,10 +49,27 @@ class EventsRepository {
   }
   async requeue(db, events) {
     await Database.UpdateBuilder.create().table("actions_event").values({
-      state: (it) => it.raw("CASE WHEN num_retries = 0 THEN ? ELSE ? END", "created", "retrying"),
+      state: (it) => it.raw(
+        `
+					CASE 
+					WHEN num_retries = 0 THEN 
+						?::__SCHEMA__.actions_trigger_state 
+					ELSE 
+					?::__SCHEMA__.actions_trigger_state END
+				`,
+        "created",
+        "retrying"
+      ),
       last_state_change: /* @__PURE__ */ new Date(),
       visible_at: /* @__PURE__ */ new Date()
-    }).where((it) => it.in("id", events.map((it2) => it2.id))).execute(db);
+    }).where((it) => it.in("id", events)).execute(db);
+  }
+  async markStopped(db, events) {
+    await Database.UpdateBuilder.create().table("actions_event").values({
+      state: "stopped",
+      last_state_change: /* @__PURE__ */ new Date(),
+      resolved_at: /* @__PURE__ */ new Date()
+    }).where((it) => it.in("id", events)).execute(db);
   }
   async markSucceed(db, rows) {
     const now = /* @__PURE__ */ new Date();
@@ -67,13 +81,15 @@ class EventsRepository {
     }).where((it) => it.in("id", rows.map((it2) => it2.id))).execute(db);
   }
   async markFailed(db, event) {
-    const numRetries = event.row.num_retries;
+    const numRetries = event.row.num_retries + 1;
     const now = /* @__PURE__ */ new Date();
     const nextAttempt = /* @__PURE__ */ new Date();
-    nextAttempt.setTime(nextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries));
+    nextAttempt.setTime(
+      nextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries)
+    );
     await Database.UpdateBuilder.create().table("actions_event").values({
       last_state_change: now,
-      num_retries: event.row.num_retries + 1,
+      num_retries: numRetries,
       log: JSON.stringify([...event.row.log, event.result]),
       ...numRetries < (event.target?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS) ? {
         state: "retrying",
@@ -84,13 +100,15 @@ class EventsRepository {
     }).where({ id: event.row.id }).execute(db);
   }
   async markFailedOnUnknownTarget(db, targetName, primaryEventId) {
-    await Database.UpdateBuilder.create().table("actions_event").where((it) => it.or(
-      (it2) => it2.and(
-        (it3) => it3.in("state", ["retrying", "created", "processing"]).compare("visible_at", Database.Operator.lte, "now").compare("target", Database.Operator.eq, targetName)
-      ).and(
-        (it3) => it3.compare("id", Database.Operator.eq, primaryEventId)
+    await Database.UpdateBuilder.create().table("actions_event").where(
+      (it) => it.or(
+        (it2) => it2.and(
+          (it3) => it3.in("state", ["retrying", "created", "processing"]).compare("visible_at", Database.Operator.lte, "now").compare("target", Database.Operator.eq, targetName)
+        ).and(
+          (it3) => it3.compare("id", Database.Operator.eq, primaryEventId)
+        )
       )
-    )).values({
+    ).values({
       // intentionally not retrying
       last_state_change: /* @__PURE__ */ new Date(),
       num_retries: (it) => it.raw("num_retries + 1"),

package/dist/development/src/dispatch/EventsRepository.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"EventsRepository.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/EventsRepository.ts"],"sourcesContent":["import {\n\tClient,\n\tConnection,\n\tLiteral,\n\tLockModifier,\n\tLockType,\n\tOperator,\n\tSelectBuilder,\n\tUpdateBuilder,\n} from '@contember/database'\nimport { EventRow, HandledEvent } from './types'\nimport { Actions } from '@contember/schema'\nimport { eventsToProcessSpecification, eventsToProcessStateSpecification } from '../model/EventsToProcessSpecification'\n\n\nconst ACK_TIMEOUT_MS = 1_000 * 60 * 10 // 10 minutes\nconst DEFAULT_REPEAT_INTERVAL_MS = 5_000 // 5 seconds\nconst DEFAULT_MAX_ATTEMPTS = 10\nconst DEFAULT_BATCH_SIZE = 1\n\nexport class EventsRepository {\n\n\tpublic async fetchBatch(actions: Actions.Schema, db: Client): Promise<FetchBatchResult> {\n\t\tconst primaryEvent = (await this.fetchInternal(db, 1))[0]\n\t\tif (!primaryEvent) {\n\t\t\treturn { ok: false, backoffMs: await this.fetchBackOff(db) }\n\t\t}\n\t\tconst target = actions.targets[primaryEvent.target]\n\t\tif (!target) {\n\t\t\tawait this.markFailedOnUnknownTarget(db, primaryEvent.target, primaryEvent.id)\n\t\t\treturn await this.fetchBatch(actions, db)\n\t\t}\n\t\tconst batchSize = (target.batchSize ?? DEFAULT_BATCH_SIZE) - 1\n\t\tconst batch = batchSize > 0 ? await this.fetchInternal(db, batchSize) : []\n\t\treturn { ok: true, events: [primaryEvent, ...batch], target }\n\t}\n\n\n\tprivate async fetchBackOff(db: Client): Promise<number | undefined> {\n\t\tconst result = await SelectBuilder.create<{ ms: number }>()\n\t\t\t.from('actions_event')\n\t\t\t.match(eventsToProcessStateSpecification)\n\t\t\t.select(it => it.raw('ceil(extract(epoch from visible_at - now()) * 1000)'), 'ms')\n\t\t\t.orderBy('visible_at', 'asc')\n\t\t\t.limit(1)\n\t\t\t.getResult(db)\n\n\t\treturn result.length ? Math.max(0, result[0].ms) : undefined\n\t}\n\n\n\tprivate async fetchInternal(db: Client, limit: number, targetName?: string): Promise<EventRow[]> {\n\t\tconst visibleAt = new Date()\n\t\tvisibleAt.setTime(visibleAt.getTime() + ACK_TIMEOUT_MS)\n\t\treturn await UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.with('events', qb => qb\n\t\t\t\t.select(it => it.raw('*'))\n\t\t\t\t.from('actions_event')\n\t\t\t\t.match(eventsToProcessSpecification)\n\t\t\t\t.where(targetName ? { target: targetName } : {})\n\t\t\t\t.limit(limit)\n\t\t\t\t.lock(LockType.forNoKeyUpdate, LockModifier.skipLocked),\n\t\t\t)\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'processing',\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: visibleAt,\n\t\t\t})\n\t\t\t.from(it => it.from('events').where(it => it.columnsEq(['events', 'id'], ['actions_event', 'id'])))\n\t\t\t.returning<EventRow>(new Literal('*'))\n\t\t\t.execute(db)\n\t}\n\n\tpublic async persistProcessed(db: Client, events: HandledEvent[]): Promise<[number, number]> {\n\t\treturn await db.transaction(async trx => {\n\t\t\tawait trx.query(Connection.REPEATABLE_READ)\n\t\t\tconst succeed = events.filter(it => it.result.ok)\n\t\t\tawait this.markSucceed(trx, succeed.map(it => it.row))\n\n\t\t\tfor (const event of events) {\n\t\t\t\tif (!event.result.ok) {\n\t\t\t\t\tawait this.markFailed(trx, event)\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn [succeed.length, events.length - succeed.length]\n\t\t})\n\t}\n\n\tpublic async requeue(db: Client, events: EventRow[]): Promise<void> {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: it => it.raw('CASE WHEN num_retries = 0 THEN ? ELSE ? END', 'created', 'retrying'),\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: new Date(),\n\t\t\t})\n\t\t\t.where(it => it.in('id', events.map(it => it.id)))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markSucceed(db: Client, rows: EventRow[]): Promise<void> {\n\t\tconst now = new Date()\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'succeed',\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tresolved_at: now,\n\t\t\t\tlast_state_change: now,\n\t\t\t})\n\t\t\t.where(it => it.in('id', rows.map(it => it.id)))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailed(db: Client, event: HandledEvent): Promise<void> {\n\t\tconst numRetries = event.row.num_retries\n\t\tconst now = new Date()\n\t\tconst nextAttempt = new Date()\n\t\tnextAttempt.setTime(nextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries))\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tlast_state_change: now,\n\t\t\t\tnum_retries: event.row.num_retries + 1,\n\t\t\t\tlog: JSON.stringify([...event.row.log, event.result]) as any,\n\t\t\t\t...(numRetries < (event.target?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS) ? {\n\t\t\t\t\tstate: 'retrying',\n\t\t\t\t\tvisible_at: nextAttempt,\n\t\t\t\t} : {\n\t\t\t\t\tstate: 'failed',\n\t\t\t\t}),\n\t\t\t})\n\t\t\t.where({ id: event.row.id })\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailedOnUnknownTarget(db: Client, targetName: string, primaryEventId: string) {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.where(it => it.or(it => it\n\t\t\t\t.and(it => it\n\t\t\t\t\t.in('state', ['retrying', 'created', 'processing'])\n\t\t\t\t\t.compare('visible_at', Operator.lte, 'now')\n\t\t\t\t\t.compare('target', Operator.eq, targetName),\n\t\t\t\t)\n\t\t\t\t.and(it => it\n\t\t\t\t\t.compare('id', Operator.eq, primaryEventId),\n\t\t\t\t),\n\t\t\t))\n\t\t\t.values<EventRow>({\n\t\t\t\t// intentionally not retrying\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tlog: it => it.raw('log || ?::jsonb', { ok: false, errorMessage: `Event target ${targetName} not found, stopping.` }),\n\t\t\t\tstate: 'failed',\n\t\t\t\tresolved_at: new Date(),\n\t\t\t})\n\t\t\t.execute(db)\n\t}\n}\n\nexport type FetchBatchResult =\n\t| { ok: true; events: EventRow[]; target: Actions.AnyTarget }\n\t| { ok: false; backoffMs?: number }\n"],"names":["SelectBuilder","eventsToProcessStateSpecification","UpdateBuilder","eventsToProcessSpecification","LockType","LockModifier","it","Literal","Connection","Operator"],"mappings":"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"}
+{"version":3,"file":"EventsRepository.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/EventsRepository.ts"],"sourcesContent":["import { Client, Connection, Literal, LockModifier, LockType, Operator, SelectBuilder, UpdateBuilder } from '@contember/database'\nimport { EventRow, HandledEvent } from './types'\nimport { Actions } from '@contember/schema'\nimport { eventsToProcessSpecification, eventsToProcessStateSpecification } from '../model/EventsToProcessSpecification'\nimport { notify } from '../utils/notifyChannel'\n\nconst ACK_TIMEOUT_MS = 1_000 * 60 * 10 // 10 minutes\nconst DEFAULT_REPEAT_INTERVAL_MS = 5_000 // 5 seconds\nconst DEFAULT_MAX_ATTEMPTS = 10\nconst DEFAULT_BATCH_SIZE = 1\n\nexport class EventsRepository {\n\tpublic async fetchBatch(actions: Actions.Schema, db: Client): Promise<FetchBatchResult> {\n\t\tconst primaryEvent = (await this.fetchInternal(db, 1))[0]\n\t\tif (!primaryEvent) {\n\t\t\treturn { ok: false, backoffMs: await this.fetchBackOff(db) }\n\t\t}\n\t\tconst target = actions.targets[primaryEvent.target]\n\t\tif (!target) {\n\t\t\tawait this.markFailedOnUnknownTarget(db, primaryEvent.target, primaryEvent.id)\n\t\t\treturn await this.fetchBatch(actions, db)\n\t\t}\n\t\tconst batchSize = (target.batchSize ?? DEFAULT_BATCH_SIZE) - 1\n\t\tconst batch = batchSize > 0 ? await this.fetchInternal(db, batchSize) : []\n\t\treturn { ok: true, events: [primaryEvent, ...batch], target }\n\t}\n\n\tprivate async fetchBackOff(db: Client): Promise<number | undefined> {\n\t\tconst result = await SelectBuilder.create<{ ms: number }>()\n\t\t\t.from('actions_event')\n\t\t\t.match(eventsToProcessStateSpecification)\n\t\t\t.select(it => it.raw('ceil(extract(epoch from visible_at - now()) * 1000)'), 'ms')\n\t\t\t.orderBy('visible_at', 'asc')\n\t\t\t.limit(1)\n\t\t\t.getResult(db)\n\n\t\treturn result.length ? Math.max(0, result[0].ms) : undefined\n\t}\n\n\tprivate async fetchInternal(db: Client, limit: number, targetName?: string): Promise<EventRow[]> {\n\t\tconst visibleAt = new Date()\n\t\tvisibleAt.setTime(visibleAt.getTime() + ACK_TIMEOUT_MS)\n\t\treturn await UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.with('events', qb =>\n\t\t\t\tqb\n\t\t\t\t\t.select(it => it.raw('*'))\n\t\t\t\t\t.from('actions_event')\n\t\t\t\t\t.match(eventsToProcessSpecification)\n\t\t\t\t\t.where(targetName ? { target: targetName } : {})\n\t\t\t\t\t.limit(limit)\n\t\t\t\t\t.lock(LockType.forNoKeyUpdate, LockModifier.skipLocked))\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'processing',\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: visibleAt,\n\t\t\t})\n\t\t\t.from(it => it.from('events').where(it => it.columnsEq(['events', 'id'], ['actions_event', 'id'])))\n\t\t\t.returning<EventRow>(new Literal('*'))\n\t\t\t.execute(db)\n\t}\n\n\tpublic async persistProcessed(db: Client, events: HandledEvent[]): Promise<[number, number]> {\n\t\treturn await db.transaction(async trx => {\n\t\t\tawait trx.query(Connection.REPEATABLE_READ)\n\t\t\tconst succeed = events.filter(it => it.result.ok)\n\t\t\tawait this.markSucceed(trx, succeed.map(it => it.row))\n\n\t\t\tfor (const event of events) {\n\t\t\t\tif (!event.result.ok) {\n\t\t\t\t\tawait this.markFailed(trx, event)\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn [succeed.length, events.length - succeed.length]\n\t\t})\n\t}\n\n\tpublic async requeue(db: Client, events: string[]): Promise<void> {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: it =>\n\t\t\t\t\tit.raw(\n\t\t\t\t\t\t`\n\t\t\t\t\tCASE \n\t\t\t\t\tWHEN num_retries = 0 THEN \n\t\t\t\t\t\t?::__SCHEMA__.actions_trigger_state \n\t\t\t\t\tELSE \n\t\t\t\t\t?::__SCHEMA__.actions_trigger_state END\n\t\t\t\t`,\n\t\t\t\t\t\t'created',\n\t\t\t\t\t\t'retrying',\n\t\t\t\t\t),\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: new Date(),\n\t\t\t})\n\t\t\t.where(it => it.in('id', events))\n\t\t\t.execute(db)\n\t}\n\n\tpublic async markStopped(db: Client, events: string[]): Promise<void> {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'stopped',\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tresolved_at: new Date(),\n\t\t\t})\n\t\t\t.where(it => it.in('id', events))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markSucceed(db: Client, rows: EventRow[]): Promise<void> {\n\t\tconst now = new Date()\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'succeed',\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tresolved_at: now,\n\t\t\t\tlast_state_change: now,\n\t\t\t})\n\t\t\t.where(it => it.in('id', rows.map(it => it.id)))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailed(db: Client, event: HandledEvent): Promise<void> {\n\t\tconst numRetries = event.row.num_retries + 1\n\t\tconst now = new Date()\n\t\tconst nextAttempt = new Date()\n\t\tnextAttempt.setTime(\n\t\t\tnextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries),\n\t\t)\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tlast_state_change: now,\n\t\t\t\tnum_retries: numRetries,\n\t\t\t\tlog: JSON.stringify([...event.row.log, event.result]) as any,\n\t\t\t\t...(numRetries < (event.target?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS)\n\t\t\t\t\t? {\n\t\t\t\t\t\tstate: 'retrying',\n\t\t\t\t\t\tvisible_at: nextAttempt,\n\t\t\t\t\t}\n\t\t\t\t\t: {\n\t\t\t\t\t\tstate: 'failed',\n\t\t\t\t\t}),\n\t\t\t})\n\t\t\t.where({ id: event.row.id })\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailedOnUnknownTarget(db: Client, targetName: string, primaryEventId: string) {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.where(it =>\n\t\t\t\tit.or(it =>\n\t\t\t\t\tit\n\t\t\t\t\t\t.and(it =>\n\t\t\t\t\t\t\tit\n\t\t\t\t\t\t\t\t.in('state', ['retrying', 'created', 'processing'])\n\t\t\t\t\t\t\t\t.compare('visible_at', Operator.lte, 'now')\n\t\t\t\t\t\t\t\t.compare('target', Operator.eq, targetName)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t.and(it =>\n\t\t\t\t\t\t\tit\n\t\t\t\t\t\t\t\t.compare('id', Operator.eq, primaryEventId)\n\t\t\t\t\t\t)\n\t\t\t\t)\n\t\t\t)\n\t\t\t.values<EventRow>({\n\t\t\t\t// intentionally not retrying\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tlog: it => it.raw('log || ?::jsonb', { ok: false, errorMessage: `Event target ${targetName} not found, stopping.` }),\n\t\t\t\tstate: 'failed',\n\t\t\t\tresolved_at: new Date(),\n\t\t\t})\n\t\t\t.execute(db)\n\t}\n}\n\nexport type FetchBatchResult =\n\t| { ok: true; events: EventRow[]; target: Actions.AnyTarget }\n\t| { ok: false; backoffMs?: number }\n"],"names":["SelectBuilder","eventsToProcessStateSpecification","UpdateBuilder","eventsToProcessSpecification","LockType","LockModifier","it","Literal","Connection","Operator"],"mappings":"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"}

package/dist/development/src/dispatch/EventsRepository.js

@@ -26,10 +26,7 @@ class EventsRepository {
   async fetchInternal(db, limit, targetName) {
     const visibleAt = /* @__PURE__ */ new Date();
     visibleAt.setTime(visibleAt.getTime() + ACK_TIMEOUT_MS);
-    return await UpdateBuilder$1.create().table("actions_event").with(
-      "events",
-      (qb) => qb.select((it) => it.raw("*")).from("actions_event").match(eventsToProcessSpecification).where(targetName ? { target: targetName } : {}).limit(limit).lock(LockType.forNoKeyUpdate, LockModifier.skipLocked)
-    ).values({
+    return await UpdateBuilder$1.create().table("actions_event").with("events", (qb) => qb.select((it) => it.raw("*")).from("actions_event").match(eventsToProcessSpecification).where(targetName ? { target: targetName } : {}).limit(limit).lock(LockType.forNoKeyUpdate, LockModifier.skipLocked)).values({
       state: "processing",
       last_state_change: /* @__PURE__ */ new Date(),
       visible_at: visibleAt
@@ -50,10 +47,27 @@ class EventsRepository {
   }
   async requeue(db, events) {
     await UpdateBuilder$1.create().table("actions_event").values({
-      state: (it) => it.raw("CASE WHEN num_retries = 0 THEN ? ELSE ? END", "created", "retrying"),
+      state: (it) => it.raw(
+        `
+					CASE 
+					WHEN num_retries = 0 THEN 
+						?::__SCHEMA__.actions_trigger_state 
+					ELSE 
+					?::__SCHEMA__.actions_trigger_state END
+				`,
+        "created",
+        "retrying"
+      ),
       last_state_change: /* @__PURE__ */ new Date(),
       visible_at: /* @__PURE__ */ new Date()
-    }).where((it) => it.in("id", events.map((it2) => it2.id))).execute(db);
+    }).where((it) => it.in("id", events)).execute(db);
+  }
+  async markStopped(db, events) {
+    await UpdateBuilder$1.create().table("actions_event").values({
+      state: "stopped",
+      last_state_change: /* @__PURE__ */ new Date(),
+      resolved_at: /* @__PURE__ */ new Date()
+    }).where((it) => it.in("id", events)).execute(db);
   }
   async markSucceed(db, rows) {
     const now = /* @__PURE__ */ new Date();
@@ -65,13 +79,15 @@ class EventsRepository {
     }).where((it) => it.in("id", rows.map((it2) => it2.id))).execute(db);
   }
   async markFailed(db, event) {
-    const numRetries = event.row.num_retries;
+    const numRetries = event.row.num_retries + 1;
     const now = /* @__PURE__ */ new Date();
     const nextAttempt = /* @__PURE__ */ new Date();
-    nextAttempt.setTime(nextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries));
+    nextAttempt.setTime(
+      nextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries)
+    );
     await UpdateBuilder$1.create().table("actions_event").values({
       last_state_change: now,
-      num_retries: event.row.num_retries + 1,
+      num_retries: numRetries,
       log: JSON.stringify([...event.row.log, event.result]),
       ...numRetries < (event.target?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS) ? {
         state: "retrying",
@@ -82,13 +98,15 @@ class EventsRepository {
     }).where({ id: event.row.id }).execute(db);
   }
   async markFailedOnUnknownTarget(db, targetName, primaryEventId) {
-    await UpdateBuilder$1.create().table("actions_event").where((it) => it.or(
-      (it2) => it2.and(
-        (it3) => it3.in("state", ["retrying", "created", "processing"]).compare("visible_at", Operator.lte, "now").compare("target", Operator.eq, targetName)
-      ).and(
-        (it3) => it3.compare("id", Operator.eq, primaryEventId)
+    await UpdateBuilder$1.create().table("actions_event").where(
+      (it) => it.or(
+        (it2) => it2.and(
+          (it3) => it3.in("state", ["retrying", "created", "processing"]).compare("visible_at", Operator.lte, "now").compare("target", Operator.eq, targetName)
+        ).and(
+          (it3) => it3.compare("id", Operator.eq, primaryEventId)
+        )
       )
-    )).values({
+    ).values({
       // intentionally not retrying
       last_state_change: /* @__PURE__ */ new Date(),
       num_retries: (it) => it.raw("num_retries + 1"),

package/dist/development/src/dispatch/EventsRepository.js.map

@@ -1 +1 @@
-{"version":3,"file":"EventsRepository.js","sources":["../../../../../packages/engine-actions/src/dispatch/EventsRepository.ts"],"sourcesContent":["import {\n\tClient,\n\tConnection,\n\tLiteral,\n\tLockModifier,\n\tLockType,\n\tOperator,\n\tSelectBuilder,\n\tUpdateBuilder,\n} from '@contember/database'\nimport { EventRow, HandledEvent } from './types'\nimport { Actions } from '@contember/schema'\nimport { eventsToProcessSpecification, eventsToProcessStateSpecification } from '../model/EventsToProcessSpecification'\n\n\nconst ACK_TIMEOUT_MS = 1_000 * 60 * 10 // 10 minutes\nconst DEFAULT_REPEAT_INTERVAL_MS = 5_000 // 5 seconds\nconst DEFAULT_MAX_ATTEMPTS = 10\nconst DEFAULT_BATCH_SIZE = 1\n\nexport class EventsRepository {\n\n\tpublic async fetchBatch(actions: Actions.Schema, db: Client): Promise<FetchBatchResult> {\n\t\tconst primaryEvent = (await this.fetchInternal(db, 1))[0]\n\t\tif (!primaryEvent) {\n\t\t\treturn { ok: false, backoffMs: await this.fetchBackOff(db) }\n\t\t}\n\t\tconst target = actions.targets[primaryEvent.target]\n\t\tif (!target) {\n\t\t\tawait this.markFailedOnUnknownTarget(db, primaryEvent.target, primaryEvent.id)\n\t\t\treturn await this.fetchBatch(actions, db)\n\t\t}\n\t\tconst batchSize = (target.batchSize ?? DEFAULT_BATCH_SIZE) - 1\n\t\tconst batch = batchSize > 0 ? await this.fetchInternal(db, batchSize) : []\n\t\treturn { ok: true, events: [primaryEvent, ...batch], target }\n\t}\n\n\n\tprivate async fetchBackOff(db: Client): Promise<number | undefined> {\n\t\tconst result = await SelectBuilder.create<{ ms: number }>()\n\t\t\t.from('actions_event')\n\t\t\t.match(eventsToProcessStateSpecification)\n\t\t\t.select(it => it.raw('ceil(extract(epoch from visible_at - now()) * 1000)'), 'ms')\n\t\t\t.orderBy('visible_at', 'asc')\n\t\t\t.limit(1)\n\t\t\t.getResult(db)\n\n\t\treturn result.length ? Math.max(0, result[0].ms) : undefined\n\t}\n\n\n\tprivate async fetchInternal(db: Client, limit: number, targetName?: string): Promise<EventRow[]> {\n\t\tconst visibleAt = new Date()\n\t\tvisibleAt.setTime(visibleAt.getTime() + ACK_TIMEOUT_MS)\n\t\treturn await UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.with('events', qb => qb\n\t\t\t\t.select(it => it.raw('*'))\n\t\t\t\t.from('actions_event')\n\t\t\t\t.match(eventsToProcessSpecification)\n\t\t\t\t.where(targetName ? { target: targetName } : {})\n\t\t\t\t.limit(limit)\n\t\t\t\t.lock(LockType.forNoKeyUpdate, LockModifier.skipLocked),\n\t\t\t)\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'processing',\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: visibleAt,\n\t\t\t})\n\t\t\t.from(it => it.from('events').where(it => it.columnsEq(['events', 'id'], ['actions_event', 'id'])))\n\t\t\t.returning<EventRow>(new Literal('*'))\n\t\t\t.execute(db)\n\t}\n\n\tpublic async persistProcessed(db: Client, events: HandledEvent[]): Promise<[number, number]> {\n\t\treturn await db.transaction(async trx => {\n\t\t\tawait trx.query(Connection.REPEATABLE_READ)\n\t\t\tconst succeed = events.filter(it => it.result.ok)\n\t\t\tawait this.markSucceed(trx, succeed.map(it => it.row))\n\n\t\t\tfor (const event of events) {\n\t\t\t\tif (!event.result.ok) {\n\t\t\t\t\tawait this.markFailed(trx, event)\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn [succeed.length, events.length - succeed.length]\n\t\t})\n\t}\n\n\tpublic async requeue(db: Client, events: EventRow[]): Promise<void> {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: it => it.raw('CASE WHEN num_retries = 0 THEN ? ELSE ? END', 'created', 'retrying'),\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: new Date(),\n\t\t\t})\n\t\t\t.where(it => it.in('id', events.map(it => it.id)))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markSucceed(db: Client, rows: EventRow[]): Promise<void> {\n\t\tconst now = new Date()\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'succeed',\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tresolved_at: now,\n\t\t\t\tlast_state_change: now,\n\t\t\t})\n\t\t\t.where(it => it.in('id', rows.map(it => it.id)))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailed(db: Client, event: HandledEvent): Promise<void> {\n\t\tconst numRetries = event.row.num_retries\n\t\tconst now = new Date()\n\t\tconst nextAttempt = new Date()\n\t\tnextAttempt.setTime(nextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries))\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tlast_state_change: now,\n\t\t\t\tnum_retries: event.row.num_retries + 1,\n\t\t\t\tlog: JSON.stringify([...event.row.log, event.result]) as any,\n\t\t\t\t...(numRetries < (event.target?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS) ? {\n\t\t\t\t\tstate: 'retrying',\n\t\t\t\t\tvisible_at: nextAttempt,\n\t\t\t\t} : {\n\t\t\t\t\tstate: 'failed',\n\t\t\t\t}),\n\t\t\t})\n\t\t\t.where({ id: event.row.id })\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailedOnUnknownTarget(db: Client, targetName: string, primaryEventId: string) {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.where(it => it.or(it => it\n\t\t\t\t.and(it => it\n\t\t\t\t\t.in('state', ['retrying', 'created', 'processing'])\n\t\t\t\t\t.compare('visible_at', Operator.lte, 'now')\n\t\t\t\t\t.compare('target', Operator.eq, targetName),\n\t\t\t\t)\n\t\t\t\t.and(it => it\n\t\t\t\t\t.compare('id', Operator.eq, primaryEventId),\n\t\t\t\t),\n\t\t\t))\n\t\t\t.values<EventRow>({\n\t\t\t\t// intentionally not retrying\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tlog: it => it.raw('log || ?::jsonb', { ok: false, errorMessage: `Event target ${targetName} not found, stopping.` }),\n\t\t\t\tstate: 'failed',\n\t\t\t\tresolved_at: new Date(),\n\t\t\t})\n\t\t\t.execute(db)\n\t}\n}\n\nexport type FetchBatchResult =\n\t| { ok: true; events: EventRow[]; target: Actions.AnyTarget }\n\t| { ok: false; backoffMs?: number }\n"],"names":["UpdateBuilder","it"],"mappings":"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"}
+{"version":3,"file":"EventsRepository.js","sources":["../../../../../packages/engine-actions/src/dispatch/EventsRepository.ts"],"sourcesContent":["import { Client, Connection, Literal, LockModifier, LockType, Operator, SelectBuilder, UpdateBuilder } from '@contember/database'\nimport { EventRow, HandledEvent } from './types'\nimport { Actions } from '@contember/schema'\nimport { eventsToProcessSpecification, eventsToProcessStateSpecification } from '../model/EventsToProcessSpecification'\nimport { notify } from '../utils/notifyChannel'\n\nconst ACK_TIMEOUT_MS = 1_000 * 60 * 10 // 10 minutes\nconst DEFAULT_REPEAT_INTERVAL_MS = 5_000 // 5 seconds\nconst DEFAULT_MAX_ATTEMPTS = 10\nconst DEFAULT_BATCH_SIZE = 1\n\nexport class EventsRepository {\n\tpublic async fetchBatch(actions: Actions.Schema, db: Client): Promise<FetchBatchResult> {\n\t\tconst primaryEvent = (await this.fetchInternal(db, 1))[0]\n\t\tif (!primaryEvent) {\n\t\t\treturn { ok: false, backoffMs: await this.fetchBackOff(db) }\n\t\t}\n\t\tconst target = actions.targets[primaryEvent.target]\n\t\tif (!target) {\n\t\t\tawait this.markFailedOnUnknownTarget(db, primaryEvent.target, primaryEvent.id)\n\t\t\treturn await this.fetchBatch(actions, db)\n\t\t}\n\t\tconst batchSize = (target.batchSize ?? DEFAULT_BATCH_SIZE) - 1\n\t\tconst batch = batchSize > 0 ? await this.fetchInternal(db, batchSize) : []\n\t\treturn { ok: true, events: [primaryEvent, ...batch], target }\n\t}\n\n\tprivate async fetchBackOff(db: Client): Promise<number | undefined> {\n\t\tconst result = await SelectBuilder.create<{ ms: number }>()\n\t\t\t.from('actions_event')\n\t\t\t.match(eventsToProcessStateSpecification)\n\t\t\t.select(it => it.raw('ceil(extract(epoch from visible_at - now()) * 1000)'), 'ms')\n\t\t\t.orderBy('visible_at', 'asc')\n\t\t\t.limit(1)\n\t\t\t.getResult(db)\n\n\t\treturn result.length ? Math.max(0, result[0].ms) : undefined\n\t}\n\n\tprivate async fetchInternal(db: Client, limit: number, targetName?: string): Promise<EventRow[]> {\n\t\tconst visibleAt = new Date()\n\t\tvisibleAt.setTime(visibleAt.getTime() + ACK_TIMEOUT_MS)\n\t\treturn await UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.with('events', qb =>\n\t\t\t\tqb\n\t\t\t\t\t.select(it => it.raw('*'))\n\t\t\t\t\t.from('actions_event')\n\t\t\t\t\t.match(eventsToProcessSpecification)\n\t\t\t\t\t.where(targetName ? { target: targetName } : {})\n\t\t\t\t\t.limit(limit)\n\t\t\t\t\t.lock(LockType.forNoKeyUpdate, LockModifier.skipLocked))\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'processing',\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: visibleAt,\n\t\t\t})\n\t\t\t.from(it => it.from('events').where(it => it.columnsEq(['events', 'id'], ['actions_event', 'id'])))\n\t\t\t.returning<EventRow>(new Literal('*'))\n\t\t\t.execute(db)\n\t}\n\n\tpublic async persistProcessed(db: Client, events: HandledEvent[]): Promise<[number, number]> {\n\t\treturn await db.transaction(async trx => {\n\t\t\tawait trx.query(Connection.REPEATABLE_READ)\n\t\t\tconst succeed = events.filter(it => it.result.ok)\n\t\t\tawait this.markSucceed(trx, succeed.map(it => it.row))\n\n\t\t\tfor (const event of events) {\n\t\t\t\tif (!event.result.ok) {\n\t\t\t\t\tawait this.markFailed(trx, event)\n\t\t\t\t}\n\t\t\t}\n\t\t\treturn [succeed.length, events.length - succeed.length]\n\t\t})\n\t}\n\n\tpublic async requeue(db: Client, events: string[]): Promise<void> {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: it =>\n\t\t\t\t\tit.raw(\n\t\t\t\t\t\t`\n\t\t\t\t\tCASE \n\t\t\t\t\tWHEN num_retries = 0 THEN \n\t\t\t\t\t\t?::__SCHEMA__.actions_trigger_state \n\t\t\t\t\tELSE \n\t\t\t\t\t?::__SCHEMA__.actions_trigger_state END\n\t\t\t\t`,\n\t\t\t\t\t\t'created',\n\t\t\t\t\t\t'retrying',\n\t\t\t\t\t),\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tvisible_at: new Date(),\n\t\t\t})\n\t\t\t.where(it => it.in('id', events))\n\t\t\t.execute(db)\n\t}\n\n\tpublic async markStopped(db: Client, events: string[]): Promise<void> {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'stopped',\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tresolved_at: new Date(),\n\t\t\t})\n\t\t\t.where(it => it.in('id', events))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markSucceed(db: Client, rows: EventRow[]): Promise<void> {\n\t\tconst now = new Date()\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tstate: 'succeed',\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tresolved_at: now,\n\t\t\t\tlast_state_change: now,\n\t\t\t})\n\t\t\t.where(it => it.in('id', rows.map(it => it.id)))\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailed(db: Client, event: HandledEvent): Promise<void> {\n\t\tconst numRetries = event.row.num_retries + 1\n\t\tconst now = new Date()\n\t\tconst nextAttempt = new Date()\n\t\tnextAttempt.setTime(\n\t\t\tnextAttempt.getTime() + (event.target?.initialRepeatIntervalMs ?? DEFAULT_REPEAT_INTERVAL_MS) * Math.pow(2, event.row.num_retries),\n\t\t)\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.values<EventRow>({\n\t\t\t\tlast_state_change: now,\n\t\t\t\tnum_retries: numRetries,\n\t\t\t\tlog: JSON.stringify([...event.row.log, event.result]) as any,\n\t\t\t\t...(numRetries < (event.target?.maxAttempts ?? DEFAULT_MAX_ATTEMPTS)\n\t\t\t\t\t? {\n\t\t\t\t\t\tstate: 'retrying',\n\t\t\t\t\t\tvisible_at: nextAttempt,\n\t\t\t\t\t}\n\t\t\t\t\t: {\n\t\t\t\t\t\tstate: 'failed',\n\t\t\t\t\t}),\n\t\t\t})\n\t\t\t.where({ id: event.row.id })\n\t\t\t.execute(db)\n\t}\n\n\tprivate async markFailedOnUnknownTarget(db: Client, targetName: string, primaryEventId: string) {\n\t\tawait UpdateBuilder.create()\n\t\t\t.table('actions_event')\n\t\t\t.where(it =>\n\t\t\t\tit.or(it =>\n\t\t\t\t\tit\n\t\t\t\t\t\t.and(it =>\n\t\t\t\t\t\t\tit\n\t\t\t\t\t\t\t\t.in('state', ['retrying', 'created', 'processing'])\n\t\t\t\t\t\t\t\t.compare('visible_at', Operator.lte, 'now')\n\t\t\t\t\t\t\t\t.compare('target', Operator.eq, targetName)\n\t\t\t\t\t\t)\n\t\t\t\t\t\t.and(it =>\n\t\t\t\t\t\t\tit\n\t\t\t\t\t\t\t\t.compare('id', Operator.eq, primaryEventId)\n\t\t\t\t\t\t)\n\t\t\t\t)\n\t\t\t)\n\t\t\t.values<EventRow>({\n\t\t\t\t// intentionally not retrying\n\t\t\t\tlast_state_change: new Date(),\n\t\t\t\tnum_retries: it => it.raw('num_retries + 1'),\n\t\t\t\tlog: it => it.raw('log || ?::jsonb', { ok: false, errorMessage: `Event target ${targetName} not found, stopping.` }),\n\t\t\t\tstate: 'failed',\n\t\t\t\tresolved_at: new Date(),\n\t\t\t})\n\t\t\t.execute(db)\n\t}\n}\n\nexport type FetchBatchResult =\n\t| { ok: true; events: EventRow[]; target: Actions.AnyTarget }\n\t| { ok: false; backoffMs?: number }\n"],"names":["UpdateBuilder","it"],"mappings":";;AAMA,MAAM,iBAAiB,MAAQ,KAAK;AACpC,MAAM,6BAA6B;AACnC,MAAM,uBAAuB;AAC7B,MAAM,qBAAqB;AAEpB,MAAM,iBAAiB;AAAA,EAC7B,MAAa,WAAW,SAAyB,IAAuC;AACvF,UAAM,gBAAgB,MAAM,KAAK,cAAc,IAAI,CAAC,GAAG,CAAC;AACxD,QAAI,CAAC,cAAc;AAClB,aAAO,EAAE,IAAI,OAAO,WAAW,MAAM,KAAK,aAAa,EAAE,EAAA;AAAA,IAC1D;AACA,UAAM,SAAS,QAAQ,QAAQ,aAAa,MAAM;AAClD,QAAI,CAAC,QAAQ;AACZ,YAAM,KAAK,0BAA0B,IAAI,aAAa,QAAQ,aAAa,EAAE;AAC7E,aAAO,MAAM,KAAK,WAAW,SAAS,EAAE;AAAA,IACzC;AACA,UAAM,aAAa,OAAO,aAAa,sBAAsB;AAC7D,UAAM,QAAQ,YAAY,IAAI,MAAM,KAAK,cAAc,IAAI,SAAS,IAAI,CAAA;AACxE,WAAO,EAAE,IAAI,MAAM,QAAQ,CAAC,cAAc,GAAG,KAAK,GAAG,OAAA;AAAA,EACtD;AAAA,EAEA,MAAc,aAAa,IAAyC;AACnE,UAAM,SAAS,MAAM,cAAc,OAAA,EACjC,KAAK,eAAe,EACpB,MAAM,iCAAiC,EACvC,OAAO,CAAA,OAAM,GAAG,IAAI,qDAAqD,GAAG,IAAI,EAChF,QAAQ,cAAc,KAAK,EAC3B,MAAM,CAAC,EACP,UAAU,EAAE;AAEd,WAAO,OAAO,SAAS,KAAK,IAAI,GAAG,OAAO,CAAC,EAAE,EAAE,IAAI;AAAA,EACpD;AAAA,EAEA,MAAc,cAAc,IAAY,OAAe,YAA0C;AAChG,UAAM,gCAAgB,KAAA;AACtB,cAAU,QAAQ,UAAU,QAAA,IAAY,cAAc;AACtD,WAAO,MAAMA,gBAAc,OAAA,EACzB,MAAM,eAAe,EACrB,KAAK,UAAU,QACf,GACE,OAAO,QAAM,GAAG,IAAI,GAAG,CAAC,EACxB,KAAK,eAAe,EACpB,MAAM,4BAA4B,EAClC,MAAM,aAAa,EAAE,QAAQ,WAAA,IAAe,EAAE,EAC9C,MAAM,KAAK,EACX,KAAK,SAAS,gBAAgB,aAAa,UAAU,CAAC,EACxD,OAAiB;AAAA,MACjB,OAAO;AAAA,MACP,uCAAuB,KAAA;AAAA,MACvB,YAAY;AAAA,IAAA,CACZ,EACA,KAAK,CAAA,OAAM,GAAG,KAAK,QAAQ,EAAE,MAAM,CAAAC,QAAMA,IAAG,UAAU,CAAC,UAAU,IAAI,GAAG,CAAC,iBAAiB,IAAI,CAAC,CAAC,CAAC,EACjG,UAAoB,IAAI,QAAQ,GAAG,CAAC,EACpC,QAAQ,EAAE;AAAA,EACb;AAAA,EAEA,MAAa,iBAAiB,IAAY,QAAmD;AAC5F,WAAO,MAAM,GAAG,YAAY,OAAM,QAAO;AACxC,YAAM,IAAI,MAAM,WAAW,eAAe;AAC1C,YAAM,UAAU,OAAO,OAAO,CAAA,OAAM,GAAG,OAAO,EAAE;AAChD,YAAM,KAAK,YAAY,KAAK,QAAQ,IAAI,CAAA,OAAM,GAAG,GAAG,CAAC;AAErD,iBAAW,SAAS,QAAQ;AAC3B,YAAI,CAAC,MAAM,OAAO,IAAI;AACrB,gBAAM,KAAK,WAAW,KAAK,KAAK;AAAA,QACjC;AAAA,MACD;AACA,aAAO,CAAC,QAAQ,QAAQ,OAAO,SAAS,QAAQ,MAAM;AAAA,IACvD,CAAC;AAAA,EACF;AAAA,EAEA,MAAa,QAAQ,IAAY,QAAiC;AACjE,UAAMD,gBAAc,OAAA,EAClB,MAAM,eAAe,EACrB,OAAiB;AAAA,MACjB,OAAO,QACN,GAAG;AAAA,QACF;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,QAOA;AAAA,QACA;AAAA,MAAA;AAAA,MAEF,uCAAuB,KAAA;AAAA,MACvB,gCAAgB,KAAA;AAAA,IAAK,CACrB,EACA,MAAM,CAAA,OAAM,GAAG,GAAG,MAAM,MAAM,CAAC,EAC/B,QAAQ,EAAE;AAAA,EACb;AAAA,EAEA,MAAa,YAAY,IAAY,QAAiC;AACrE,UAAMA,gBAAc,OAAA,EAClB,MAAM,eAAe,EACrB,OAAiB;AAAA,MACjB,OAAO;AAAA,MACP,uCAAuB,KAAA;AAAA,MACvB,iCAAiB,KAAA;AAAA,IAAK,CACtB,EACA,MAAM,CAAA,OAAM,GAAG,GAAG,MAAM,MAAM,CAAC,EAC/B,QAAQ,EAAE;AAAA,EACb;AAAA,EAEA,MAAc,YAAY,IAAY,MAAiC;AACtE,UAAM,0BAAU,KAAA;AAChB,UAAMA,gBAAc,OAAA,EAClB,MAAM,eAAe,EACrB,OAAiB;AAAA,MACjB,OAAO;AAAA,MACP,aAAa,CAAA,OAAM,GAAG,IAAI,iBAAiB;AAAA,MAC3C,aAAa;AAAA,MACb,mBAAmB;AAAA,IAAA,CACnB,EACA,MAAM,CAAA,OAAM,GAAG,GAAG,MAAM,KAAK,IAAI,CAAAC,QAAMA,IAAG,EAAE,CAAC,CAAC,EAC9C,QAAQ,EAAE;AAAA,EACb;AAAA,EAEA,MAAc,WAAW,IAAY,OAAoC;AACxE,UAAM,aAAa,MAAM,IAAI,cAAc;AAC3C,UAAM,0BAAU,KAAA;AAChB,UAAM,kCAAkB,KAAA;AACxB,gBAAY;AAAA,MACX,YAAY,QAAA,KAAa,MAAM,QAAQ,2BAA2B,8BAA8B,KAAK,IAAI,GAAG,MAAM,IAAI,WAAW;AAAA,IAAA;AAElI,UAAMD,gBAAc,OAAA,EAClB,MAAM,eAAe,EACrB,OAAiB;AAAA,MACjB,mBAAmB;AAAA,MACnB,aAAa;AAAA,MACb,KAAK,KAAK,UAAU,CAAC,GAAG,MAAM,IAAI,KAAK,MAAM,MAAM,CAAC;AAAA,MACpD,GAAI,cAAc,MAAM,QAAQ,eAAe,wBAC5C;AAAA,QACD,OAAO;AAAA,QACP,YAAY;AAAA,MAAA,IAEX;AAAA,QACD,OAAO;AAAA,MAAA;AAAA,IACR,CACD,EACA,MAAM,EAAE,IAAI,MAAM,IAAI,GAAA,CAAI,EAC1B,QAAQ,EAAE;AAAA,EACb;AAAA,EAEA,MAAc,0BAA0B,IAAY,YAAoB,gBAAwB;AAC/F,UAAMA,gBAAc,OAAA,EAClB,MAAM,eAAe,EACrB;AAAA,MAAM,QACN,GAAG;AAAA,QAAG,CAAAC,QACLA,IACE;AAAA,UAAI,CAAAA,QACJA,IACE,GAAG,SAAS,CAAC,YAAY,WAAW,YAAY,CAAC,EACjD,QAAQ,cAAc,SAAS,KAAK,KAAK,EACzC,QAAQ,UAAU,SAAS,IAAI,UAAU;AAAA,QAAA,EAE3C;AAAA,UAAI,CAAAA,QACJA,IACE,QAAQ,MAAM,SAAS,IAAI,cAAc;AAAA,QAAA;AAAA,MAC5C;AAAA,IACF,EAEA,OAAiB;AAAA;AAAA,MAEjB,uCAAuB,KAAA;AAAA,MACvB,aAAa,CAAA,OAAM,GAAG,IAAI,iBAAiB;AAAA,MAC3C,KAAK,CAAA,OAAM,GAAG,IAAI,mBAAmB,EAAE,IAAI,OAAO,cAAc,gBAAgB,UAAU,wBAAA,CAAyB;AAAA,MACnH,OAAO;AAAA,MACP,iCAAiB,KAAA;AAAA,IAAK,CACtB,EACA,QAAQ,EAAE;AAAA,EACb;AACD;"}

package/dist/development/src/dispatch/LazyDispatchWorker.cjs

@@ -0,0 +1,67 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const engineCommon = require("@contember/engine-common");
+class LazyDispatchWorker {
+  constructor(projectGroupContainerResolver, supervisorFactory, supervisorOptions = { startupMax: 10 }) {
+    this.projectGroupContainerResolver = projectGroupContainerResolver;
+    this.supervisorFactory = supervisorFactory;
+    this.supervisorOptions = supervisorOptions;
+  }
+  async run({ logger, onError }) {
+    const running = /* @__PURE__ */ new Map();
+    let aborted = false;
+    const unlisten = this.projectGroupContainerResolver.on("create", ({ container, slug }) => {
+      const groupLabel = slug ?? "<default>";
+      const childLogger = logger.child({ projectGroup: groupLabel });
+      childLogger.debug(`Starting dispatch worker for project group ${groupLabel}`);
+      const supervised = new engineCommon.Supervisor(
+        this.supervisorFactory.create(container),
+        this.supervisorOptions
+      );
+      const runningPromise = supervised.run({
+        logger: childLogger,
+        onError: (e) => {
+          if (aborted) {
+            return;
+          }
+          childLogger.error(e, { message: `Dispatch worker for project group ${groupLabel} crashed` });
+          onError(e);
+        }
+      }).catch((e) => {
+        if (!aborted) {
+          childLogger.error(e, { message: `Failed to start dispatch worker for project group ${groupLabel}` });
+          onError(e);
+        }
+        return void 0;
+      });
+      running.set(slug, runningPromise);
+      return () => {
+        running.delete(slug);
+        (async () => {
+          try {
+            const r = await runningPromise;
+            await r?.end();
+          } catch {
+          }
+        })();
+      };
+    });
+    return {
+      end: async () => {
+        aborted = true;
+        unlisten();
+        const all = [...running.values()];
+        running.clear();
+        await Promise.allSettled(all.map(async (p) => {
+          try {
+            const r = await p;
+            await r?.end();
+          } catch {
+          }
+        }));
+      }
+    };
+  }
+}
+exports.LazyDispatchWorker = LazyDispatchWorker;
+//# sourceMappingURL=LazyDispatchWorker.cjs.map

package/dist/development/src/dispatch/LazyDispatchWorker.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"LazyDispatchWorker.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/LazyDispatchWorker.ts"],"sourcesContent":["import { Runnable, RunnableArgs, Running, Supervisor, SupervisorOptions } from '@contember/engine-common'\nimport { ProjectGroupContainerResolver } from '@contember/engine-http'\nimport { DispatchWorkerSupervisorFactory } from './DispatchWorkerSupervisor'\n\nexport class LazyDispatchWorker implements Runnable {\n\tconstructor(\n\t\tprivate readonly projectGroupContainerResolver: ProjectGroupContainerResolver,\n\t\tprivate readonly supervisorFactory: DispatchWorkerSupervisorFactory,\n\t\tprivate readonly supervisorOptions: SupervisorOptions = { startupMax: 10 },\n\t) {\n\t}\n\n\tpublic async run({ logger, onError }: RunnableArgs): Promise<Running> {\n\t\tconst running = new Map<string | undefined, Promise<Running | undefined>>()\n\t\tlet aborted = false\n\n\t\tconst unlisten = this.projectGroupContainerResolver.on('create', ({ container, slug }) => {\n\t\t\tconst groupLabel = slug ?? '<default>'\n\t\t\tconst childLogger = logger.child({ projectGroup: groupLabel })\n\t\t\tchildLogger.debug(`Starting dispatch worker for project group ${groupLabel}`)\n\n\t\t\tconst supervised = new Supervisor(\n\t\t\t\tthis.supervisorFactory.create(container),\n\t\t\t\tthis.supervisorOptions,\n\t\t\t)\n\t\t\tconst runningPromise: Promise<Running | undefined> = supervised.run({\n\t\t\t\tlogger: childLogger,\n\t\t\t\tonError: e => {\n\t\t\t\t\tif (aborted) {\n\t\t\t\t\t\treturn\n\t\t\t\t\t}\n\t\t\t\t\tchildLogger.error(e, { message: `Dispatch worker for project group ${groupLabel} crashed` })\n\t\t\t\t\tonError(e)\n\t\t\t\t},\n\t\t\t}).catch(e => {\n\t\t\t\tif (!aborted) {\n\t\t\t\t\tchildLogger.error(e, { message: `Failed to start dispatch worker for project group ${groupLabel}` })\n\t\t\t\t\tonError(e)\n\t\t\t\t}\n\t\t\t\treturn undefined\n\t\t\t})\n\t\t\trunning.set(slug, runningPromise)\n\n\t\t\treturn () => {\n\t\t\t\trunning.delete(slug)\n\t\t\t\t;(async () => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tconst r = await runningPromise\n\t\t\t\t\t\tawait r?.end()\n\t\t\t\t\t} catch {\n\t\t\t\t\t}\n\t\t\t\t})()\n\t\t\t}\n\t\t})\n\n\t\treturn {\n\t\t\tend: async () => {\n\t\t\t\taborted = true\n\t\t\t\tunlisten()\n\t\t\t\tconst all = [...running.values()]\n\t\t\t\trunning.clear()\n\t\t\t\tawait Promise.allSettled(all.map(async p => {\n\t\t\t\t\ttry {\n\t\t\t\t\t\tconst r = await p\n\t\t\t\t\t\tawait r?.end()\n\t\t\t\t\t} catch {\n\t\t\t\t\t}\n\t\t\t\t}))\n\t\t\t},\n\t\t}\n\t}\n}\n"],"names":["Supervisor"],"mappings":";;;AAIO,MAAM,mBAAuC;AAAA,EACnD,YACkB,+BACA,mBACA,oBAAuC,EAAE,YAAY,MACrE;AAHgB,SAAA,gCAAA;AACA,SAAA,oBAAA;AACA,SAAA,oBAAA;AAAA,EAElB;AAAA,EAEA,MAAa,IAAI,EAAE,QAAQ,WAA2C;AACrE,UAAM,8BAAc,IAAA;AACpB,QAAI,UAAU;AAEd,UAAM,WAAW,KAAK,8BAA8B,GAAG,UAAU,CAAC,EAAE,WAAW,WAAW;AACzF,YAAM,aAAa,QAAQ;AAC3B,YAAM,cAAc,OAAO,MAAM,EAAE,cAAc,YAAY;AAC7D,kBAAY,MAAM,8CAA8C,UAAU,EAAE;AAE5E,YAAM,aAAa,IAAIA,aAAAA;AAAAA,QACtB,KAAK,kBAAkB,OAAO,SAAS;AAAA,QACvC,KAAK;AAAA,MAAA;AAEN,YAAM,iBAA+C,WAAW,IAAI;AAAA,QACnE,QAAQ;AAAA,QACR,SAAS,CAAA,MAAK;AACb,cAAI,SAAS;AACZ;AAAA,UACD;AACA,sBAAY,MAAM,GAAG,EAAE,SAAS,qCAAqC,UAAU,YAAY;AAC3F,kBAAQ,CAAC;AAAA,QACV;AAAA,MAAA,CACA,EAAE,MAAM,CAAA,MAAK;AACb,YAAI,CAAC,SAAS;AACb,sBAAY,MAAM,GAAG,EAAE,SAAS,qDAAqD,UAAU,IAAI;AACnG,kBAAQ,CAAC;AAAA,QACV;AACA,eAAO;AAAA,MACR,CAAC;AACD,cAAQ,IAAI,MAAM,cAAc;AAEhC,aAAO,MAAM;AACZ,gBAAQ,OAAO,IAAI;AAClB,SAAC,YAAY;AACb,cAAI;AACH,kBAAM,IAAI,MAAM;AAChB,kBAAM,GAAG,IAAA;AAAA,UACV,QAAQ;AAAA,UACR;AAAA,QACD,GAAA;AAAA,MACD;AAAA,IACD,CAAC;AAED,WAAO;AAAA,MACN,KAAK,YAAY;AAChB,kBAAU;AACV,iBAAA;AACA,cAAM,MAAM,CAAC,GAAG,QAAQ,QAAQ;AAChC,gBAAQ,MAAA;AACR,cAAM,QAAQ,WAAW,IAAI,IAAI,OAAM,MAAK;AAC3C,cAAI;AACH,kBAAM,IAAI,MAAM;AAChB,kBAAM,GAAG,IAAA;AAAA,UACV,QAAQ;AAAA,UACR;AAAA,QACD,CAAC,CAAC;AAAA,MACH;AAAA,IAAA;AAAA,EAEF;AACD;;"}