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

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

@@ -0,0 +1,67 @@
+import { Supervisor } from "@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 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 {
+          }
+        }));
+      }
+    };
+  }
+}
+export {
+  LazyDispatchWorker
+};
+//# sourceMappingURL=LazyDispatchWorker.js.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"LazyDispatchWorker.js","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":[],"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,IAAI;AAAA,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;"}

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Database = require("@contember/database");
-const TriggerPayloadPersister = require("../triggers/TriggerPayloadPersister.cjs");
+const notifyChannel = require("../utils/notifyChannel.cjs");
 class ProjectDispatcherFactory {
   constructor(dispatcher) {
     this.dispatcher = dispatcher;
@@ -26,7 +26,7 @@ class ProjectDispatcher {
       const resolvePendingRef = () => {
         resolvePending();
       };
-      let pendingError = void 0;
+      let pendingError;
       const rejectPendingRef = (e) => {
         pendingError = e;
         rejectPending(e);
@@ -36,7 +36,7 @@ class ProjectDispatcher {
       let aborted = false;
       try {
         await this.db.scope(async (db) => {
-          const listener = await new Database.Listener(db.client, TriggerPayloadPersister.NOTIFY_CHANNEL_NAME, (project) => {
+          const listener = await new Database.Listener(db.client, notifyChannel.NOTIFY_CHANNEL_NAME, (project) => {
             if (project === this.projectSlug) {
               resolvePendingRef();
             }

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectDispatcher.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/ProjectDispatcher.ts"],"sourcesContent":["import { DatabaseContext } from '@contember/engine-system-api'\nimport { EventDispatcher } from './EventDispatcher'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { Runnable, RunnableArgs, Running } from '@contember/engine-common'\nimport { Listener } from '@contember/database'\nimport { NOTIFY_CHANNEL_NAME } from '../triggers/TriggerPayloadPersister'\n\n\nexport class ProjectDispatcherFactory {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t) {\n\t}\n\n\tpublic create({ db, contentSchemaResolver, projectSlug }: { db: DatabaseContext; contentSchemaResolver: ContentSchemaResolver; projectSlug: string}): ProjectDispatcher {\n\t\treturn new ProjectDispatcher(this.dispatcher, db, contentSchemaResolver, projectSlug)\n\t}\n}\n\n\n\nexport class ProjectDispatcher implements Runnable {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t\tprivate readonly db: DatabaseContext,\n\t\tprivate readonly contentSchemaResolver: ContentSchemaResolver,\n\t\tprivate readonly projectSlug: string,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError, onClose }: RunnableArgs): Promise<Running> {\n\n\t\treturn await new Promise<Running>(async (resolve, reject) => {\n\n\t\t\tlet resolvePending = () => {}\n\t\t\tlet rejectPending = (e: any) => {}\n\n\t\t\tconst resolvePendingRef = () => {\n\t\t\t\tresolvePending()\n\t\t\t}\n\t\t\tlet pendingError: any = undefined\n\t\t\tconst rejectPendingRef = (e: any) => {\n\t\t\t\tpendingError = e\n\t\t\t\trejectPending(e)\n\t\t\t}\n\n\t\t\tlet succeedTotal = 0\n\t\t\tlet failedTotal = 0\n\t\t\tlet aborted = false\n\n\t\t\ttry {\n\t\t\t\tawait this.db.scope(async db => {\n\t\t\t\t\tconst listener = await new Listener<string>(db.client, NOTIFY_CHANNEL_NAME, project => {\n\t\t\t\t\t\tif (project === this.projectSlug) {\n\t\t\t\t\t\t\tresolvePendingRef()\n\t\t\t\t\t\t}\n\t\t\t\t\t})\n\t\t\t\t\t\t.run({ onError: rejectPendingRef, onClose: resolvePendingRef })\n\n\t\t\t\t\tresolve({\n\t\t\t\t\t\tend: async () => {\n\t\t\t\t\t\t\taborted = true\n\t\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\t\tlogger.info('Worker terminated', {\n\t\t\t\t\t\t\t\tsucceed: succeedTotal,\n\t\t\t\t\t\t\t\tfailed: failedTotal,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\n\t\t\t\t\ttry {\n\t\t\t\t\t\twhile (!aborted) {\n\t\t\t\t\t\t\tconst { succeed, failed, backoffMs } = await this.dispatcher.processBatch({\n\t\t\t\t\t\t\t\tdb,\n\t\t\t\t\t\t\t\tcontentSchemaResolver: this.contentSchemaResolver,\n\t\t\t\t\t\t\t\tlogger,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\tsucceedTotal += succeed\n\t\t\t\t\t\t\tfailedTotal += failed\n\n\t\t\t\t\t\t\t// listener error occurred during batch processing, rethrow\n\t\t\t\t\t\t\tif (pendingError) {\n\t\t\t\t\t\t\t\tthrow pendingError\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t// queue is empty, wait\n\t\t\t\t\t\t\tif (backoffMs !== 0) {\n\t\t\t\t\t\t\t\tawait new Promise<void>((resolve, reject) => {\n\t\t\t\t\t\t\t\t\tlet cleanup = () => {\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (backoffMs !== undefined) {\n\t\t\t\t\t\t\t\t\t\tconst timeoutHandle = setTimeout(resolve, backoffMs)\n\t\t\t\t\t\t\t\t\t\tcleanup = () => clearTimeout(timeoutHandle)\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tresolvePending = () => {\n\t\t\t\t\t\t\t\t\t\tresolve()\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\trejectPending = e => {\n\t\t\t\t\t\t\t\t\t\treject(e)\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tonClose?.()\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\tonError(e)\n\t\t\t\t\t}\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\treject(e)\n\t\t\t}\n \t\t})\n\n\n\t}\n}\n"],"names":["Listener","NOTIFY_CHANNEL_NAME","resolve","reject"],"mappings":";;;;AAQO,MAAM,yBAAyB;AAAA,EACrC,YACkB,YAChB;AADgB,SAAA,aAAA;AAAA,EAAA;AAAA,EAIX,OAAO,EAAE,IAAI,uBAAuB,eAA6H;AACvK,WAAO,IAAI,kBAAkB,KAAK,YAAY,IAAI,uBAAuB,WAAW;AAAA,EAAA;AAEtF;AAIO,MAAM,kBAAsC;AAAA,EAClD,YACkB,YACA,IACA,uBACA,aAChB;AAJgB,SAAA,aAAA;AACA,SAAA,KAAA;AACA,SAAA,wBAAA;AACA,SAAA,cAAA;AAAA,EAAA;AAAA,EAIlB,MAAa,IAAI,EAAE,QAAQ,SAAS,WAA2C;AAE9E,WAAO,MAAM,IAAI,QAAiB,OAAO,SAAS,WAAW;AAE5D,UAAI,iBAAiB,MAAM;AAAA,MAAC;AACxB,UAAA,gBAAgB,CAAC,MAAW;AAAA,MAAC;AAEjC,YAAM,oBAAoB,MAAM;AAChB,uBAAA;AAAA,MAChB;AACA,UAAI,eAAoB;AAClB,YAAA,mBAAmB,CAAC,MAAW;AACrB,uBAAA;AACf,sBAAc,CAAC;AAAA,MAChB;AAEA,UAAI,eAAe;AACnB,UAAI,cAAc;AAClB,UAAI,UAAU;AAEV,UAAA;AACH,cAAM,KAAK,GAAG,MAAM,OAAM,OAAM;AAC/B,gBAAM,WAAW,MAAM,IAAIA,kBAAiB,GAAG,QAAQC,wBAAAA,qBAAqB,CAAW,YAAA;AAClF,gBAAA,YAAY,KAAK,aAAa;AACf,gCAAA;AAAA,YAAA;AAAA,UACnB,CACA,EACC,IAAI,EAAE,SAAS,kBAAkB,SAAS,mBAAmB;AAEvD,kBAAA;AAAA,YACP,KAAK,YAAY;AACN,wBAAA;AACV,oBAAM,SAAS,IAAI;AACnB,qBAAO,KAAK,qBAAqB;AAAA,gBAChC,SAAS;AAAA,gBACT,QAAQ;AAAA,cAAA,CACR;AAAA,YAAA;AAAA,UACF,CACA;AAEG,cAAA;AACH,mBAAO,CAAC,SAAS;AACV,oBAAA,EAAE,SAAS,QAAQ,cAAc,MAAM,KAAK,WAAW,aAAa;AAAA,gBACzE;AAAA,gBACA,uBAAuB,KAAK;AAAA,gBAC5B;AAAA,cAAA,CACA;AACe,8BAAA;AACD,6BAAA;AAGf,kBAAI,cAAc;AACX,sBAAA;AAAA,cAAA;AAIP,kBAAI,cAAc,GAAG;AACpB,sBAAM,IAAI,QAAc,CAACC,UAASC,YAAW;AAC5C,sBAAI,UAAU,MAAM;AAAA,kBACpB;AACA,sBAAI,cAAc,QAAW;AACtB,0BAAA,gBAAgB,WAAWD,UAAS,SAAS;AACzC,8BAAA,MAAM,aAAa,aAAa;AAAA,kBAAA;AAE3C,mCAAiB,MAAM;AACtBA,6BAAQ;AACA,4BAAA;AAAA,kBACT;AACA,kCAAgB,CAAK,MAAA;AACpBC,4BAAO,CAAC;AACA,4BAAA;AAAA,kBACT;AAAA,gBAAA,CACA;AAAA,cAAA;AAAA,YACF;AAES,sBAAA;AAAA,mBACF,GAAG;AACX,kBAAM,SAAS,IAAI;AACnB,oBAAQ,CAAC;AAAA,UAAA;AAAA,QACV,CACA;AAAA,eACO,GAAG;AACX,eAAO,CAAC;AAAA,MAAA;AAAA,IACT,CACC;AAAA,EAAA;AAIJ;;;"}
+{"version":3,"file":"ProjectDispatcher.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/ProjectDispatcher.ts"],"sourcesContent":["import { DatabaseContext } from '@contember/engine-system-api'\nimport { EventDispatcher } from './EventDispatcher'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { Runnable, RunnableArgs, Running } from '@contember/engine-common'\nimport { Listener } from '@contember/database'\nimport { NOTIFY_CHANNEL_NAME } from '../utils/notifyChannel'\n\nexport class ProjectDispatcherFactory {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t) {\n\t}\n\n\tpublic create(\n\t\t{ db, contentSchemaResolver, projectSlug }: { db: DatabaseContext; contentSchemaResolver: ContentSchemaResolver; projectSlug: string },\n\t): ProjectDispatcher {\n\t\treturn new ProjectDispatcher(this.dispatcher, db, contentSchemaResolver, projectSlug)\n\t}\n}\n\nexport class ProjectDispatcher implements Runnable {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t\tprivate readonly db: DatabaseContext,\n\t\tprivate readonly contentSchemaResolver: ContentSchemaResolver,\n\t\tprivate readonly projectSlug: string,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError, onClose }: RunnableArgs): Promise<Running> {\n\t\treturn await new Promise<Running>(async (resolve, reject) => {\n\t\t\tlet resolvePending = () => {}\n\t\t\tlet rejectPending = (e: any) => {}\n\n\t\t\tconst resolvePendingRef = () => {\n\t\t\t\tresolvePending()\n\t\t\t}\n\t\t\tlet pendingError: any\n\t\t\tconst rejectPendingRef = (e: any) => {\n\t\t\t\tpendingError = e\n\t\t\t\trejectPending(e)\n\t\t\t}\n\n\t\t\tlet succeedTotal = 0\n\t\t\tlet failedTotal = 0\n\t\t\tlet aborted = false\n\n\t\t\ttry {\n\t\t\t\tawait this.db.scope(async db => {\n\t\t\t\t\tconst listener = await new Listener<string>(db.client, NOTIFY_CHANNEL_NAME, project => {\n\t\t\t\t\t\tif (project === this.projectSlug) {\n\t\t\t\t\t\t\tresolvePendingRef()\n\t\t\t\t\t\t}\n\t\t\t\t\t})\n\t\t\t\t\t\t.run({ onError: rejectPendingRef, onClose: resolvePendingRef })\n\n\t\t\t\t\tresolve({\n\t\t\t\t\t\tend: async () => {\n\t\t\t\t\t\t\taborted = true\n\t\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\t\tlogger.info('Worker terminated', {\n\t\t\t\t\t\t\t\tsucceed: succeedTotal,\n\t\t\t\t\t\t\t\tfailed: failedTotal,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\n\t\t\t\t\ttry {\n\t\t\t\t\t\twhile (!aborted) {\n\t\t\t\t\t\t\tconst { succeed, failed, backoffMs } = await this.dispatcher.processBatch({\n\t\t\t\t\t\t\t\tdb,\n\t\t\t\t\t\t\t\tcontentSchemaResolver: this.contentSchemaResolver,\n\t\t\t\t\t\t\t\tlogger,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\tsucceedTotal += succeed\n\t\t\t\t\t\t\tfailedTotal += failed\n\n\t\t\t\t\t\t\t// listener error occurred during batch processing, rethrow\n\t\t\t\t\t\t\tif (pendingError) {\n\t\t\t\t\t\t\t\tthrow pendingError\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t// queue is empty, wait\n\t\t\t\t\t\t\tif (backoffMs !== 0) {\n\t\t\t\t\t\t\t\tawait new Promise<void>((resolve, reject) => {\n\t\t\t\t\t\t\t\t\tlet cleanup = () => {\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (backoffMs !== undefined) {\n\t\t\t\t\t\t\t\t\t\tconst timeoutHandle = setTimeout(resolve, backoffMs)\n\t\t\t\t\t\t\t\t\t\tcleanup = () => clearTimeout(timeoutHandle)\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tresolvePending = () => {\n\t\t\t\t\t\t\t\t\t\tresolve()\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\trejectPending = e => {\n\t\t\t\t\t\t\t\t\t\treject(e)\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tonClose?.()\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\tonError(e)\n\t\t\t\t\t}\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\treject(e)\n\t\t\t}\n\t\t})\n\t}\n}\n"],"names":["Listener","NOTIFY_CHANNEL_NAME","resolve","reject"],"mappings":";;;;AAOO,MAAM,yBAAyB;AAAA,EACrC,YACkB,YAChB;AADgB,SAAA,aAAA;AAAA,EAElB;AAAA,EAEO,OACN,EAAE,IAAI,uBAAuB,eACT;AACpB,WAAO,IAAI,kBAAkB,KAAK,YAAY,IAAI,uBAAuB,WAAW;AAAA,EACrF;AACD;AAEO,MAAM,kBAAsC;AAAA,EAClD,YACkB,YACA,IACA,uBACA,aAChB;AAJgB,SAAA,aAAA;AACA,SAAA,KAAA;AACA,SAAA,wBAAA;AACA,SAAA,cAAA;AAAA,EAElB;AAAA,EAEA,MAAa,IAAI,EAAE,QAAQ,SAAS,WAA2C;AAC9E,WAAO,MAAM,IAAI,QAAiB,OAAO,SAAS,WAAW;AAC5D,UAAI,iBAAiB,MAAM;AAAA,MAAC;AAC5B,UAAI,gBAAgB,CAAC,MAAW;AAAA,MAAC;AAEjC,YAAM,oBAAoB,MAAM;AAC/B,uBAAA;AAAA,MACD;AACA,UAAI;AACJ,YAAM,mBAAmB,CAAC,MAAW;AACpC,uBAAe;AACf,sBAAc,CAAC;AAAA,MAChB;AAEA,UAAI,eAAe;AACnB,UAAI,cAAc;AAClB,UAAI,UAAU;AAEd,UAAI;AACH,cAAM,KAAK,GAAG,MAAM,OAAM,OAAM;AAC/B,gBAAM,WAAW,MAAM,IAAIA,SAAAA,SAAiB,GAAG,QAAQC,cAAAA,qBAAqB,CAAA,YAAW;AACtF,gBAAI,YAAY,KAAK,aAAa;AACjC,gCAAA;AAAA,YACD;AAAA,UACD,CAAC,EACC,IAAI,EAAE,SAAS,kBAAkB,SAAS,mBAAmB;AAE/D,kBAAQ;AAAA,YACP,KAAK,YAAY;AAChB,wBAAU;AACV,oBAAM,SAAS,IAAA;AACf,qBAAO,KAAK,qBAAqB;AAAA,gBAChC,SAAS;AAAA,gBACT,QAAQ;AAAA,cAAA,CACR;AAAA,YACF;AAAA,UAAA,CACA;AAED,cAAI;AACH,mBAAO,CAAC,SAAS;AAChB,oBAAM,EAAE,SAAS,QAAQ,UAAA,IAAc,MAAM,KAAK,WAAW,aAAa;AAAA,gBACzE;AAAA,gBACA,uBAAuB,KAAK;AAAA,gBAC5B;AAAA,cAAA,CACA;AACD,8BAAgB;AAChB,6BAAe;AAGf,kBAAI,cAAc;AACjB,sBAAM;AAAA,cACP;AAGA,kBAAI,cAAc,GAAG;AACpB,sBAAM,IAAI,QAAc,CAACC,UAASC,YAAW;AAC5C,sBAAI,UAAU,MAAM;AAAA,kBACpB;AACA,sBAAI,cAAc,QAAW;AAC5B,0BAAM,gBAAgB,WAAWD,UAAS,SAAS;AACnD,8BAAU,MAAM,aAAa,aAAa;AAAA,kBAC3C;AACA,mCAAiB,MAAM;AACtBA,6BAAAA;AACA,4BAAA;AAAA,kBACD;AACA,kCAAgB,CAAA,MAAK;AACpBC,4BAAO,CAAC;AACR,4BAAA;AAAA,kBACD;AAAA,gBACD,CAAC;AAAA,cACF;AAAA,YACD;AACA,sBAAA;AAAA,UACD,SAAS,GAAG;AACX,kBAAM,SAAS,IAAA;AACf,oBAAQ,CAAC;AAAA,UACV;AAAA,QACD,CAAC;AAAA,MACF,SAAS,GAAG;AACX,eAAO,CAAC;AAAA,MACT;AAAA,IACD,CAAC;AAAA,EACF;AACD;;;"}

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

@@ -1,5 +1,5 @@
 import { Listener } from "@contember/database";
-import { NOTIFY_CHANNEL_NAME } from "../triggers/TriggerPayloadPersister.js";
+import { NOTIFY_CHANNEL_NAME } from "../utils/notifyChannel.js";
 class ProjectDispatcherFactory {
   constructor(dispatcher) {
     this.dispatcher = dispatcher;
@@ -24,7 +24,7 @@ class ProjectDispatcher {
       const resolvePendingRef = () => {
         resolvePending();
       };
-      let pendingError = void 0;
+      let pendingError;
       const rejectPendingRef = (e) => {
         pendingError = e;
         rejectPending(e);

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

@@ -1 +1 @@
-{"version":3,"file":"ProjectDispatcher.js","sources":["../../../../../packages/engine-actions/src/dispatch/ProjectDispatcher.ts"],"sourcesContent":["import { DatabaseContext } from '@contember/engine-system-api'\nimport { EventDispatcher } from './EventDispatcher'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { Runnable, RunnableArgs, Running } from '@contember/engine-common'\nimport { Listener } from '@contember/database'\nimport { NOTIFY_CHANNEL_NAME } from '../triggers/TriggerPayloadPersister'\n\n\nexport class ProjectDispatcherFactory {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t) {\n\t}\n\n\tpublic create({ db, contentSchemaResolver, projectSlug }: { db: DatabaseContext; contentSchemaResolver: ContentSchemaResolver; projectSlug: string}): ProjectDispatcher {\n\t\treturn new ProjectDispatcher(this.dispatcher, db, contentSchemaResolver, projectSlug)\n\t}\n}\n\n\n\nexport class ProjectDispatcher implements Runnable {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t\tprivate readonly db: DatabaseContext,\n\t\tprivate readonly contentSchemaResolver: ContentSchemaResolver,\n\t\tprivate readonly projectSlug: string,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError, onClose }: RunnableArgs): Promise<Running> {\n\n\t\treturn await new Promise<Running>(async (resolve, reject) => {\n\n\t\t\tlet resolvePending = () => {}\n\t\t\tlet rejectPending = (e: any) => {}\n\n\t\t\tconst resolvePendingRef = () => {\n\t\t\t\tresolvePending()\n\t\t\t}\n\t\t\tlet pendingError: any = undefined\n\t\t\tconst rejectPendingRef = (e: any) => {\n\t\t\t\tpendingError = e\n\t\t\t\trejectPending(e)\n\t\t\t}\n\n\t\t\tlet succeedTotal = 0\n\t\t\tlet failedTotal = 0\n\t\t\tlet aborted = false\n\n\t\t\ttry {\n\t\t\t\tawait this.db.scope(async db => {\n\t\t\t\t\tconst listener = await new Listener<string>(db.client, NOTIFY_CHANNEL_NAME, project => {\n\t\t\t\t\t\tif (project === this.projectSlug) {\n\t\t\t\t\t\t\tresolvePendingRef()\n\t\t\t\t\t\t}\n\t\t\t\t\t})\n\t\t\t\t\t\t.run({ onError: rejectPendingRef, onClose: resolvePendingRef })\n\n\t\t\t\t\tresolve({\n\t\t\t\t\t\tend: async () => {\n\t\t\t\t\t\t\taborted = true\n\t\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\t\tlogger.info('Worker terminated', {\n\t\t\t\t\t\t\t\tsucceed: succeedTotal,\n\t\t\t\t\t\t\t\tfailed: failedTotal,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\n\t\t\t\t\ttry {\n\t\t\t\t\t\twhile (!aborted) {\n\t\t\t\t\t\t\tconst { succeed, failed, backoffMs } = await this.dispatcher.processBatch({\n\t\t\t\t\t\t\t\tdb,\n\t\t\t\t\t\t\t\tcontentSchemaResolver: this.contentSchemaResolver,\n\t\t\t\t\t\t\t\tlogger,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\tsucceedTotal += succeed\n\t\t\t\t\t\t\tfailedTotal += failed\n\n\t\t\t\t\t\t\t// listener error occurred during batch processing, rethrow\n\t\t\t\t\t\t\tif (pendingError) {\n\t\t\t\t\t\t\t\tthrow pendingError\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t// queue is empty, wait\n\t\t\t\t\t\t\tif (backoffMs !== 0) {\n\t\t\t\t\t\t\t\tawait new Promise<void>((resolve, reject) => {\n\t\t\t\t\t\t\t\t\tlet cleanup = () => {\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (backoffMs !== undefined) {\n\t\t\t\t\t\t\t\t\t\tconst timeoutHandle = setTimeout(resolve, backoffMs)\n\t\t\t\t\t\t\t\t\t\tcleanup = () => clearTimeout(timeoutHandle)\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tresolvePending = () => {\n\t\t\t\t\t\t\t\t\t\tresolve()\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\trejectPending = e => {\n\t\t\t\t\t\t\t\t\t\treject(e)\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tonClose?.()\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\tonError(e)\n\t\t\t\t\t}\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\treject(e)\n\t\t\t}\n \t\t})\n\n\n\t}\n}\n"],"names":["resolve","reject"],"mappings":";;AAQO,MAAM,yBAAyB;AAAA,EACrC,YACkB,YAChB;AADgB,SAAA,aAAA;AAAA,EAAA;AAAA,EAIX,OAAO,EAAE,IAAI,uBAAuB,eAA6H;AACvK,WAAO,IAAI,kBAAkB,KAAK,YAAY,IAAI,uBAAuB,WAAW;AAAA,EAAA;AAEtF;AAIO,MAAM,kBAAsC;AAAA,EAClD,YACkB,YACA,IACA,uBACA,aAChB;AAJgB,SAAA,aAAA;AACA,SAAA,KAAA;AACA,SAAA,wBAAA;AACA,SAAA,cAAA;AAAA,EAAA;AAAA,EAIlB,MAAa,IAAI,EAAE,QAAQ,SAAS,WAA2C;AAE9E,WAAO,MAAM,IAAI,QAAiB,OAAO,SAAS,WAAW;AAE5D,UAAI,iBAAiB,MAAM;AAAA,MAAC;AACxB,UAAA,gBAAgB,CAAC,MAAW;AAAA,MAAC;AAEjC,YAAM,oBAAoB,MAAM;AAChB,uBAAA;AAAA,MAChB;AACA,UAAI,eAAoB;AAClB,YAAA,mBAAmB,CAAC,MAAW;AACrB,uBAAA;AACf,sBAAc,CAAC;AAAA,MAChB;AAEA,UAAI,eAAe;AACnB,UAAI,cAAc;AAClB,UAAI,UAAU;AAEV,UAAA;AACH,cAAM,KAAK,GAAG,MAAM,OAAM,OAAM;AAC/B,gBAAM,WAAW,MAAM,IAAI,SAAiB,GAAG,QAAQ,qBAAqB,CAAW,YAAA;AAClF,gBAAA,YAAY,KAAK,aAAa;AACf,gCAAA;AAAA,YAAA;AAAA,UACnB,CACA,EACC,IAAI,EAAE,SAAS,kBAAkB,SAAS,mBAAmB;AAEvD,kBAAA;AAAA,YACP,KAAK,YAAY;AACN,wBAAA;AACV,oBAAM,SAAS,IAAI;AACnB,qBAAO,KAAK,qBAAqB;AAAA,gBAChC,SAAS;AAAA,gBACT,QAAQ;AAAA,cAAA,CACR;AAAA,YAAA;AAAA,UACF,CACA;AAEG,cAAA;AACH,mBAAO,CAAC,SAAS;AACV,oBAAA,EAAE,SAAS,QAAQ,cAAc,MAAM,KAAK,WAAW,aAAa;AAAA,gBACzE;AAAA,gBACA,uBAAuB,KAAK;AAAA,gBAC5B;AAAA,cAAA,CACA;AACe,8BAAA;AACD,6BAAA;AAGf,kBAAI,cAAc;AACX,sBAAA;AAAA,cAAA;AAIP,kBAAI,cAAc,GAAG;AACpB,sBAAM,IAAI,QAAc,CAACA,UAASC,YAAW;AAC5C,sBAAI,UAAU,MAAM;AAAA,kBACpB;AACA,sBAAI,cAAc,QAAW;AACtB,0BAAA,gBAAgB,WAAWD,UAAS,SAAS;AACzC,8BAAA,MAAM,aAAa,aAAa;AAAA,kBAAA;AAE3C,mCAAiB,MAAM;AACtBA,6BAAQ;AACA,4BAAA;AAAA,kBACT;AACA,kCAAgB,CAAK,MAAA;AACpBC,4BAAO,CAAC;AACA,4BAAA;AAAA,kBACT;AAAA,gBAAA,CACA;AAAA,cAAA;AAAA,YACF;AAES,sBAAA;AAAA,mBACF,GAAG;AACX,kBAAM,SAAS,IAAI;AACnB,oBAAQ,CAAC;AAAA,UAAA;AAAA,QACV,CACA;AAAA,eACO,GAAG;AACX,eAAO,CAAC;AAAA,MAAA;AAAA,IACT,CACC;AAAA,EAAA;AAIJ;"}
+{"version":3,"file":"ProjectDispatcher.js","sources":["../../../../../packages/engine-actions/src/dispatch/ProjectDispatcher.ts"],"sourcesContent":["import { DatabaseContext } from '@contember/engine-system-api'\nimport { EventDispatcher } from './EventDispatcher'\nimport { ContentSchemaResolver } from '@contember/engine-http'\nimport { Runnable, RunnableArgs, Running } from '@contember/engine-common'\nimport { Listener } from '@contember/database'\nimport { NOTIFY_CHANNEL_NAME } from '../utils/notifyChannel'\n\nexport class ProjectDispatcherFactory {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t) {\n\t}\n\n\tpublic create(\n\t\t{ db, contentSchemaResolver, projectSlug }: { db: DatabaseContext; contentSchemaResolver: ContentSchemaResolver; projectSlug: string },\n\t): ProjectDispatcher {\n\t\treturn new ProjectDispatcher(this.dispatcher, db, contentSchemaResolver, projectSlug)\n\t}\n}\n\nexport class ProjectDispatcher implements Runnable {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t\tprivate readonly db: DatabaseContext,\n\t\tprivate readonly contentSchemaResolver: ContentSchemaResolver,\n\t\tprivate readonly projectSlug: string,\n\t) {\n\t}\n\n\tpublic async run({ logger, onError, onClose }: RunnableArgs): Promise<Running> {\n\t\treturn await new Promise<Running>(async (resolve, reject) => {\n\t\t\tlet resolvePending = () => {}\n\t\t\tlet rejectPending = (e: any) => {}\n\n\t\t\tconst resolvePendingRef = () => {\n\t\t\t\tresolvePending()\n\t\t\t}\n\t\t\tlet pendingError: any\n\t\t\tconst rejectPendingRef = (e: any) => {\n\t\t\t\tpendingError = e\n\t\t\t\trejectPending(e)\n\t\t\t}\n\n\t\t\tlet succeedTotal = 0\n\t\t\tlet failedTotal = 0\n\t\t\tlet aborted = false\n\n\t\t\ttry {\n\t\t\t\tawait this.db.scope(async db => {\n\t\t\t\t\tconst listener = await new Listener<string>(db.client, NOTIFY_CHANNEL_NAME, project => {\n\t\t\t\t\t\tif (project === this.projectSlug) {\n\t\t\t\t\t\t\tresolvePendingRef()\n\t\t\t\t\t\t}\n\t\t\t\t\t})\n\t\t\t\t\t\t.run({ onError: rejectPendingRef, onClose: resolvePendingRef })\n\n\t\t\t\t\tresolve({\n\t\t\t\t\t\tend: async () => {\n\t\t\t\t\t\t\taborted = true\n\t\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\t\tlogger.info('Worker terminated', {\n\t\t\t\t\t\t\t\tsucceed: succeedTotal,\n\t\t\t\t\t\t\t\tfailed: failedTotal,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t},\n\t\t\t\t\t})\n\n\t\t\t\t\ttry {\n\t\t\t\t\t\twhile (!aborted) {\n\t\t\t\t\t\t\tconst { succeed, failed, backoffMs } = await this.dispatcher.processBatch({\n\t\t\t\t\t\t\t\tdb,\n\t\t\t\t\t\t\t\tcontentSchemaResolver: this.contentSchemaResolver,\n\t\t\t\t\t\t\t\tlogger,\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\tsucceedTotal += succeed\n\t\t\t\t\t\t\tfailedTotal += failed\n\n\t\t\t\t\t\t\t// listener error occurred during batch processing, rethrow\n\t\t\t\t\t\t\tif (pendingError) {\n\t\t\t\t\t\t\t\tthrow pendingError\n\t\t\t\t\t\t\t}\n\n\t\t\t\t\t\t\t// queue is empty, wait\n\t\t\t\t\t\t\tif (backoffMs !== 0) {\n\t\t\t\t\t\t\t\tawait new Promise<void>((resolve, reject) => {\n\t\t\t\t\t\t\t\t\tlet cleanup = () => {\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tif (backoffMs !== undefined) {\n\t\t\t\t\t\t\t\t\t\tconst timeoutHandle = setTimeout(resolve, backoffMs)\n\t\t\t\t\t\t\t\t\t\tcleanup = () => clearTimeout(timeoutHandle)\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\tresolvePending = () => {\n\t\t\t\t\t\t\t\t\t\tresolve()\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t\trejectPending = e => {\n\t\t\t\t\t\t\t\t\t\treject(e)\n\t\t\t\t\t\t\t\t\t\tcleanup()\n\t\t\t\t\t\t\t\t\t}\n\t\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\t}\n\t\t\t\t\t\t}\n\t\t\t\t\t\tonClose?.()\n\t\t\t\t\t} catch (e) {\n\t\t\t\t\t\tawait listener.end()\n\t\t\t\t\t\tonError(e)\n\t\t\t\t\t}\n\t\t\t\t})\n\t\t\t} catch (e) {\n\t\t\t\treject(e)\n\t\t\t}\n\t\t})\n\t}\n}\n"],"names":["resolve","reject"],"mappings":";;AAOO,MAAM,yBAAyB;AAAA,EACrC,YACkB,YAChB;AADgB,SAAA,aAAA;AAAA,EAElB;AAAA,EAEO,OACN,EAAE,IAAI,uBAAuB,eACT;AACpB,WAAO,IAAI,kBAAkB,KAAK,YAAY,IAAI,uBAAuB,WAAW;AAAA,EACrF;AACD;AAEO,MAAM,kBAAsC;AAAA,EAClD,YACkB,YACA,IACA,uBACA,aAChB;AAJgB,SAAA,aAAA;AACA,SAAA,KAAA;AACA,SAAA,wBAAA;AACA,SAAA,cAAA;AAAA,EAElB;AAAA,EAEA,MAAa,IAAI,EAAE,QAAQ,SAAS,WAA2C;AAC9E,WAAO,MAAM,IAAI,QAAiB,OAAO,SAAS,WAAW;AAC5D,UAAI,iBAAiB,MAAM;AAAA,MAAC;AAC5B,UAAI,gBAAgB,CAAC,MAAW;AAAA,MAAC;AAEjC,YAAM,oBAAoB,MAAM;AAC/B,uBAAA;AAAA,MACD;AACA,UAAI;AACJ,YAAM,mBAAmB,CAAC,MAAW;AACpC,uBAAe;AACf,sBAAc,CAAC;AAAA,MAChB;AAEA,UAAI,eAAe;AACnB,UAAI,cAAc;AAClB,UAAI,UAAU;AAEd,UAAI;AACH,cAAM,KAAK,GAAG,MAAM,OAAM,OAAM;AAC/B,gBAAM,WAAW,MAAM,IAAI,SAAiB,GAAG,QAAQ,qBAAqB,CAAA,YAAW;AACtF,gBAAI,YAAY,KAAK,aAAa;AACjC,gCAAA;AAAA,YACD;AAAA,UACD,CAAC,EACC,IAAI,EAAE,SAAS,kBAAkB,SAAS,mBAAmB;AAE/D,kBAAQ;AAAA,YACP,KAAK,YAAY;AAChB,wBAAU;AACV,oBAAM,SAAS,IAAA;AACf,qBAAO,KAAK,qBAAqB;AAAA,gBAChC,SAAS;AAAA,gBACT,QAAQ;AAAA,cAAA,CACR;AAAA,YACF;AAAA,UAAA,CACA;AAED,cAAI;AACH,mBAAO,CAAC,SAAS;AAChB,oBAAM,EAAE,SAAS,QAAQ,UAAA,IAAc,MAAM,KAAK,WAAW,aAAa;AAAA,gBACzE;AAAA,gBACA,uBAAuB,KAAK;AAAA,gBAC5B;AAAA,cAAA,CACA;AACD,8BAAgB;AAChB,6BAAe;AAGf,kBAAI,cAAc;AACjB,sBAAM;AAAA,cACP;AAGA,kBAAI,cAAc,GAAG;AACpB,sBAAM,IAAI,QAAc,CAACA,UAASC,YAAW;AAC5C,sBAAI,UAAU,MAAM;AAAA,kBACpB;AACA,sBAAI,cAAc,QAAW;AAC5B,0BAAM,gBAAgB,WAAWD,UAAS,SAAS;AACnD,8BAAU,MAAM,aAAa,aAAa;AAAA,kBAC3C;AACA,mCAAiB,MAAM;AACtBA,6BAAAA;AACA,4BAAA;AAAA,kBACD;AACA,kCAAgB,CAAA,MAAK;AACpBC,4BAAO,CAAC;AACR,4BAAA;AAAA,kBACD;AAAA,gBACD,CAAC;AAAA,cACF;AAAA,YACD;AACA,sBAAA;AAAA,UACD,SAAS,GAAG;AACX,kBAAM,SAAS,IAAA;AACf,oBAAQ,CAAC;AAAA,UACV;AAAA,QACD,CAAC;AAAA,MACF,SAAS,GAAG;AACX,eAAO,CAAC;AAAA,MACT;AAAA,IACD,CAAC;AAAA,EACF;AACD;"}

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

@@ -1 +1 @@
-{"version":3,"file":"TargetHandlerResolver.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/TargetHandlerResolver.ts"],"sourcesContent":["import { Actions } from '@contember/schema'\nimport { WebhookTargetHandler } from './WebhookTargetHandler'\nimport { ImplementationException } from '../ImplementationException'\nimport { InvokeHandler } from './types'\n\nexport class TargetHandlerResolver {\n\tconstructor(\n\t\tprivate readonly webhookHandler: WebhookTargetHandler,\n\t) {\n\t}\n\n\tpublic resolveHandler<T extends Actions.AnyTarget>(target: T): InvokeHandler<T> {\n\t\tif (target.type !== 'webhook') {\n\t\t\tthrow new ImplementationException('Invalid trigger invocation type')\n\t\t}\n\t\treturn this.webhookHandler\n\t}\n}\n"],"names":["ImplementationException"],"mappings":";;;AAKO,MAAM,sBAAsB;AAAA,EAClC,YACkB,gBAChB;AADgB,SAAA,iBAAA;AAAA,EAAA;AAAA,EAIX,eAA4C,QAA6B;AAC3E,QAAA,OAAO,SAAS,WAAW;AACxB,YAAA,IAAIA,gDAAwB,iCAAiC;AAAA,IAAA;AAEpE,WAAO,KAAK;AAAA,EAAA;AAEd;;"}
+{"version":3,"file":"TargetHandlerResolver.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/TargetHandlerResolver.ts"],"sourcesContent":["import { Actions } from '@contember/schema'\nimport { WebhookTargetHandler } from './WebhookTargetHandler'\nimport { ImplementationException } from '../ImplementationException'\nimport { InvokeHandler } from './types'\n\nexport class TargetHandlerResolver {\n\tconstructor(\n\t\tprivate readonly webhookHandler: WebhookTargetHandler,\n\t) {\n\t}\n\n\tpublic resolveHandler<T extends Actions.AnyTarget>(target: T): InvokeHandler<T> {\n\t\tif (target.type !== 'webhook') {\n\t\t\tthrow new ImplementationException('Invalid trigger invocation type')\n\t\t}\n\t\treturn this.webhookHandler\n\t}\n}\n"],"names":["ImplementationException"],"mappings":";;;AAKO,MAAM,sBAAsB;AAAA,EAClC,YACkB,gBAChB;AADgB,SAAA,iBAAA;AAAA,EAElB;AAAA,EAEO,eAA4C,QAA6B;AAC/E,QAAI,OAAO,SAAS,WAAW;AAC9B,YAAM,IAAIA,wBAAAA,wBAAwB,iCAAiC;AAAA,IACpE;AACA,WAAO,KAAK;AAAA,EACb;AACD;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"TargetHandlerResolver.js","sources":["../../../../../packages/engine-actions/src/dispatch/TargetHandlerResolver.ts"],"sourcesContent":["import { Actions } from '@contember/schema'\nimport { WebhookTargetHandler } from './WebhookTargetHandler'\nimport { ImplementationException } from '../ImplementationException'\nimport { InvokeHandler } from './types'\n\nexport class TargetHandlerResolver {\n\tconstructor(\n\t\tprivate readonly webhookHandler: WebhookTargetHandler,\n\t) {\n\t}\n\n\tpublic resolveHandler<T extends Actions.AnyTarget>(target: T): InvokeHandler<T> {\n\t\tif (target.type !== 'webhook') {\n\t\t\tthrow new ImplementationException('Invalid trigger invocation type')\n\t\t}\n\t\treturn this.webhookHandler\n\t}\n}\n"],"names":[],"mappings":";AAKO,MAAM,sBAAsB;AAAA,EAClC,YACkB,gBAChB;AADgB,SAAA,iBAAA;AAAA,EAAA;AAAA,EAIX,eAA4C,QAA6B;AAC3E,QAAA,OAAO,SAAS,WAAW;AACxB,YAAA,IAAI,wBAAwB,iCAAiC;AAAA,IAAA;AAEpE,WAAO,KAAK;AAAA,EAAA;AAEd;"}
+{"version":3,"file":"TargetHandlerResolver.js","sources":["../../../../../packages/engine-actions/src/dispatch/TargetHandlerResolver.ts"],"sourcesContent":["import { Actions } from '@contember/schema'\nimport { WebhookTargetHandler } from './WebhookTargetHandler'\nimport { ImplementationException } from '../ImplementationException'\nimport { InvokeHandler } from './types'\n\nexport class TargetHandlerResolver {\n\tconstructor(\n\t\tprivate readonly webhookHandler: WebhookTargetHandler,\n\t) {\n\t}\n\n\tpublic resolveHandler<T extends Actions.AnyTarget>(target: T): InvokeHandler<T> {\n\t\tif (target.type !== 'webhook') {\n\t\t\tthrow new ImplementationException('Invalid trigger invocation type')\n\t\t}\n\t\treturn this.webhookHandler\n\t}\n}\n"],"names":[],"mappings":";AAKO,MAAM,sBAAsB;AAAA,EAClC,YACkB,gBAChB;AADgB,SAAA,iBAAA;AAAA,EAElB;AAAA,EAEO,eAA4C,QAA6B;AAC/E,QAAI,OAAO,SAAS,WAAW;AAC9B,YAAM,IAAI,wBAAwB,iCAAiC;AAAA,IACpE;AACA,WAAO,KAAK;AAAA,EACb;AACD;"}

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

@@ -1 +1 @@
-{"version":3,"file":"WebhookFetcher.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookFetcher.ts"],"sourcesContent":["export type FetcherResponse = {\n\treadonly headers: Headers\n\treadonly ok: boolean\n\treadonly status: number\n\treadonly statusText: string\n\treadonly responseText: string\n}\n\nexport interface WebhookFetcher {\n\tfetch(url: string, init: RequestInit): Promise<FetcherResponse>\n}\n\nexport class WebhookFetcherNative implements WebhookFetcher {\n\tasync fetch(url: string, init: RequestInit): Promise<FetcherResponse> {\n\t\tconst response = await fetch(url, init)\n\t\treturn {\n\t\t\tok: response.ok,\n\t\t\theaders: response.headers,\n\t\t\tstatus: response.status,\n\t\t\tstatusText: response.statusText,\n\t\t\tresponseText: await response.text(),\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAYO,MAAM,qBAA+C;AAAA,EAC3D,MAAM,MAAM,KAAa,MAA6C;AACrE,UAAM,WAAW,MAAM,MAAM,KAAK,IAAI;AAC/B,WAAA;AAAA,MACN,IAAI,SAAS;AAAA,MACb,SAAS,SAAS;AAAA,MAClB,QAAQ,SAAS;AAAA,MACjB,YAAY,SAAS;AAAA,MACrB,cAAc,MAAM,SAAS,KAAK;AAAA,IACnC;AAAA,EAAA;AAEF;;"}
+{"version":3,"file":"WebhookFetcher.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookFetcher.ts"],"sourcesContent":["export type FetcherResponse = {\n\treadonly headers: Headers\n\treadonly ok: boolean\n\treadonly status: number\n\treadonly statusText: string\n\treadonly responseText: string\n}\n\nexport interface WebhookFetcher {\n\tfetch(url: string, init: RequestInit): Promise<FetcherResponse>\n}\n\nexport class WebhookFetcherNative implements WebhookFetcher {\n\tasync fetch(url: string, init: RequestInit): Promise<FetcherResponse> {\n\t\tconst response = await fetch(url, init)\n\t\treturn {\n\t\t\tok: response.ok,\n\t\t\theaders: response.headers,\n\t\t\tstatus: response.status,\n\t\t\tstatusText: response.statusText,\n\t\t\tresponseText: await response.text(),\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAYO,MAAM,qBAA+C;AAAA,EAC3D,MAAM,MAAM,KAAa,MAA6C;AACrE,UAAM,WAAW,MAAM,MAAM,KAAK,IAAI;AACtC,WAAO;AAAA,MACN,IAAI,SAAS;AAAA,MACb,SAAS,SAAS;AAAA,MAClB,QAAQ,SAAS;AAAA,MACjB,YAAY,SAAS;AAAA,MACrB,cAAc,MAAM,SAAS,KAAA;AAAA,IAAK;AAAA,EAEpC;AACD;;"}

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

@@ -1 +1 @@
-{"version":3,"file":"WebhookFetcher.js","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookFetcher.ts"],"sourcesContent":["export type FetcherResponse = {\n\treadonly headers: Headers\n\treadonly ok: boolean\n\treadonly status: number\n\treadonly statusText: string\n\treadonly responseText: string\n}\n\nexport interface WebhookFetcher {\n\tfetch(url: string, init: RequestInit): Promise<FetcherResponse>\n}\n\nexport class WebhookFetcherNative implements WebhookFetcher {\n\tasync fetch(url: string, init: RequestInit): Promise<FetcherResponse> {\n\t\tconst response = await fetch(url, init)\n\t\treturn {\n\t\t\tok: response.ok,\n\t\t\theaders: response.headers,\n\t\t\tstatus: response.status,\n\t\t\tstatusText: response.statusText,\n\t\t\tresponseText: await response.text(),\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"AAYO,MAAM,qBAA+C;AAAA,EAC3D,MAAM,MAAM,KAAa,MAA6C;AACrE,UAAM,WAAW,MAAM,MAAM,KAAK,IAAI;AAC/B,WAAA;AAAA,MACN,IAAI,SAAS;AAAA,MACb,SAAS,SAAS;AAAA,MAClB,QAAQ,SAAS;AAAA,MACjB,YAAY,SAAS;AAAA,MACrB,cAAc,MAAM,SAAS,KAAK;AAAA,IACnC;AAAA,EAAA;AAEF;"}
+{"version":3,"file":"WebhookFetcher.js","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookFetcher.ts"],"sourcesContent":["export type FetcherResponse = {\n\treadonly headers: Headers\n\treadonly ok: boolean\n\treadonly status: number\n\treadonly statusText: string\n\treadonly responseText: string\n}\n\nexport interface WebhookFetcher {\n\tfetch(url: string, init: RequestInit): Promise<FetcherResponse>\n}\n\nexport class WebhookFetcherNative implements WebhookFetcher {\n\tasync fetch(url: string, init: RequestInit): Promise<FetcherResponse> {\n\t\tconst response = await fetch(url, init)\n\t\treturn {\n\t\t\tok: response.ok,\n\t\t\theaders: response.headers,\n\t\t\tstatus: response.status,\n\t\t\tstatusText: response.statusText,\n\t\t\tresponseText: await response.text(),\n\t\t}\n\t}\n}\n"],"names":[],"mappings":"AAYO,MAAM,qBAA+C;AAAA,EAC3D,MAAM,MAAM,KAAa,MAA6C;AACrE,UAAM,WAAW,MAAM,MAAM,KAAK,IAAI;AACtC,WAAO;AAAA,MACN,IAAI,SAAS;AAAA,MACb,SAAS,SAAS;AAAA,MAClB,QAAQ,SAAS;AAAA,MACjB,YAAY,SAAS;AAAA,MACrB,cAAc,MAAM,SAAS,KAAA;AAAA,IAAK;AAAA,EAEpC;AACD;"}

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

@@ -130,7 +130,9 @@ class WebhookTargetHandler {
   }
   async doFetch(target, variables, abortController, events) {
     const resolvedUrl = this.resolveVariables(target.url, variables);
-    const resolvedHeaders = Object.fromEntries(Object.entries(target.headers ?? {}).map(([key, value]) => [key, this.resolveVariables(value, variables)]));
+    const resolvedHeaders = Object.fromEntries(
+      Object.entries(target.headers ?? {}).map(([key, value]) => [key, this.resolveVariables(value, variables)])
+    );
     return await this.fetcher.fetch(resolvedUrl, {
       method: "POST",
       headers: {
@@ -159,6 +161,9 @@ class WebhookTargetHandler {
       meta: {
         eventId: it.id,
         transactionId: it.transaction_id,
+        identityId: it.identity_id ?? null,
+        ipAddress: it.ip_address ?? null,
+        userAgent: it.user_agent ?? null,
         createdAt: it.created_at.toISOString(),
         lastStateChange: it.last_state_change.toISOString(),
         numRetries: it.num_retries,

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

@@ -1 +1 @@
-{"version":3,"file":"WebhookTargetHandler.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookTargetHandler.ts"],"sourcesContent":["import { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow, HandledEvent, InvokeHandler, InvokeHandlerArgs  } from './types'\nimport { VariablesMap } from '../model/VariablesManager'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher'\n\nconst DEFAULT_TIMEOUT_MS = 30_000 // 30 seconds\n\nconst ResponseType = Typesafe.noExtraProps(Typesafe.object({\n\tfailures: Typesafe.array(\n\t\tTypesafe.intersection(\n\t\t\tTypesafe.object({\n\t\t\t\teventId: Typesafe.string,\n\t\t\t}),\n\t\t\tTypesafe.partial({\n\t\t\t\terror: Typesafe.string,\n\t\t\t}),\n\t\t),\n\t),\n}))\n\ntype EventResponseFactory = (eventRow: EventRow) => ({ ok: boolean; code?: number; response?: string; errorMessage?: string; durationMs?: number })\n\nexport class WebhookTargetHandler implements InvokeHandler<Actions.WebhookTarget> {\n\tconstructor(\n\t\tprivate readonly fetcher: WebhookFetcher,\n\t) {\n\t}\n\n\tpublic async handle({ target, events, logger, variables }: InvokeHandlerArgs<Actions.WebhookTarget>): Promise<HandledEvent[]> {\n\t\tconst timeoutMs = target.timeoutMs\n\n\t\tconst start = process.hrtime.bigint()\n\t\tconst getDuration = () => Math.floor(Number((process.hrtime.bigint() - start) / BigInt(1_000_000)))\n\n\t\tlet eventResponseFactory: EventResponseFactory\n\t\ttry {\n\n\t\t\tconst response = await this.fetch(timeoutMs ?? DEFAULT_TIMEOUT_MS, target, variables, events)\n\n\t\t\teventResponseFactory = this.createResponseFactory({\n\t\t\t\tresponse: response,\n\t\t\t\tevents,\n\t\t\t})\n\n\t\t} catch (e) {\n\t\t\tlogger.warn(e)\n\t\t\tconst errorMessages = this.extractErrorMessages(e)\n\t\t\tconst result = {\n\t\t\t\tok: false,\n\t\t\t\terrorMessage: errorMessages.length ? errorMessages.join('; ') : undefined,\n\t\t\t\tdurationMs: getDuration(),\n\t\t\t}\n\t\t\teventResponseFactory = () => ({ ok: false, errorMessage: errorMessages.length ? errorMessages.join('; ') : undefined })\n\n\t\t\treturn events.map(it => ({ target, row: it, result }))\n\t\t}\n\t\tconst durationMs = getDuration()\n\n\t\treturn events.map(it => ({ target, row: it, result: { durationMs, ...eventResponseFactory(it) } }))\n\t}\n\n\tprivate createResponseFactory({ response, events }: {\n\t\tresponse: FetcherResponse\n\t\tevents: EventRow[]\n\t}): EventResponseFactory {\n\t\tif (!response.ok) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: response.statusText,\n\t\t\t})\n\t\t}\n\n\t\tif (response.responseText.trim() === ''\n\t\t\t|| !response.headers.get('content-type')?.toLowerCase().includes('json')\n\t\t) {\n\t\t\treturn () => ({\n\t\t\t\tok: true,\n\t\t\t\tcode: response.status,\n\t\t\t})\n\t\t}\n\n\t\ttry {\n\t\t\tconst parsedJson = JSON.parse(response.responseText)\n\t\t\tif (parsedJson === null || typeof parsedJson !== 'object' || !('failures' in parsedJson)) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: true,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t})\n\t\t\t}\n\t\t\tconst responseData = ResponseType(parsedJson)\n\t\t\tconst eventsInBatch = new Set(events.map(it => it.id))\n\t\t\tconst failedEvents = Object.fromEntries(responseData.failures?.map(it => [it.eventId, it]) ?? [])\n\t\t\tconst missingEvents =  Object.keys(failedEvents).filter(it => !eventsInBatch.has(it))\n\n\t\t\tif (missingEvents.length) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\tresponse: response.responseText,\n\t\t\t\t\terrorMessage: 'Invalid response: undefined events IDs: ' + missingEvents.join('; '),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn it => {\n\t\t\t\tif (!failedEvents[it.id]) {\n\t\t\t\t\treturn { ok: true, code: response.status }\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\terrorMessage: failedEvents[it.id].error,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (e: any) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: 'Invalid response: ' + e.message,\n\t\t\t})\n\t\t}\n\t}\n\n\tprivate extractErrorMessages(e: unknown): string[] {\n\t\tconst errorMessages = []\n\t\tlet err = e\n\t\twhile (typeof err === 'object' && err !== null && 'message' in err && typeof (err as any).message === 'string') {\n\t\t\terrorMessages.push((err as any).message)\n\t\t\terr = (err as any).cause\n\t\t}\n\t\treturn errorMessages\n\t}\n\n\tprivate async fetch(timeoutMs: number, target: Actions.WebhookTarget, variables: VariablesMap, events: EventRow[]): Promise<FetcherResponse> {\n\t\treturn await withTimeout(timeoutMs, async abortController => {\n\t\t\treturn await this.doFetch(target, variables, abortController, events)\n\t\t})\n\t}\n\n\tprivate async doFetch(target: Actions.WebhookTarget, variables: VariablesMap, abortController: AbortController, events: EventRow[]): Promise<FetcherResponse> {\n\t\tconst resolvedUrl = this.resolveVariables(target.url, variables)\n\t\tconst resolvedHeaders = Object.fromEntries(Object.entries(target.headers ?? {})\n\t\t\t.map(([key, value]) => [key, this.resolveVariables(value, variables)]))\n\n\t\treturn await this.fetcher.fetch(resolvedUrl, {\n\t\t\tmethod: 'POST',\n\t\t\theaders: {\n\t\t\t\t['User-Agent']: 'Contember Actions',\n\t\t\t\t...resolvedHeaders,\n\t\t\t\t['Content-type']: 'application/json',\n\t\t\t},\n\t\t\tsignal: abortController.signal,\n\t\t\tbody: this.formatBody(events, target),\n\t\t})\n\t}\n\n\tprivate formatBody(events: EventRow[], target: Actions.WebhookTarget): string {\n\t\tconst body = target.body ?? {}\n\t\tconst path = target.payloadPath ?? []\n\t\tlet current: any = body\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tcurrent[path[i]] ??= {}\n\t\t\tcurrent = current[path[i]]\n\t\t}\n\t\tcurrent['events'] = events.map(this.formatEventPayload)\n\t\treturn JSON.stringify(body)\n\t}\n\n\tprivate formatEventPayload(it: EventRow): ActionsPayload.WebhookEvent {\n\t\treturn {\n\t\t\tmeta: {\n\t\t\t\teventId: it.id,\n\t\t\t\ttransactionId: it.transaction_id,\n\t\t\t\tcreatedAt: it.created_at.toISOString(),\n\t\t\t\tlastStateChange: it.last_state_change.toISOString(),\n\t\t\t\tnumRetries: it.num_retries,\n\t\t\t\ttrigger: it.trigger,\n\t\t\t\ttarget: it.target,\n\t\t\t\t// todo: add stage and schema version\n\t\t\t},\n\t\t\t...it.payload,\n\t\t}\n\t}\n\n\tprivate resolveVariables(subject: string, variables: VariablesMap) {\n\t\treturn subject.replace(/\\{\\{([\\w_]+)}}/gm, (_, name) => {\n\t\t\tif (!variables[name]) {\n\t\t\t\tthrow new Error(`Undefined variable ${name}`)\n\t\t\t}\n\t\t\treturn variables[name]\n\t\t})\n\t}\n}\n\nconst withTimeout = async <T>(timeoutMs: number, cb: (abortController: AbortController) => Promise<T>): Promise<T> => {\n\tconst abortController = new AbortController()\n\tconst timeoutId = setTimeout(() => {\n\t\tabortController.abort()\n\t}, timeoutMs)\n\ttry {\n\t\treturn await cb(abortController)\n\t} finally {\n\t\tclearTimeout(timeoutId)\n\t}\n}\n"],"names":["Typesafe"],"mappings":"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"}
+{"version":3,"file":"WebhookTargetHandler.cjs","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookTargetHandler.ts"],"sourcesContent":["import { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow, HandledEvent, InvokeHandler, InvokeHandlerArgs } from './types'\nimport { VariablesMap } from '../model/VariablesManager'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher'\n\nconst DEFAULT_TIMEOUT_MS = 30_000 // 30 seconds\n\nconst ResponseType = Typesafe.noExtraProps(Typesafe.object({\n\tfailures: Typesafe.array(\n\t\tTypesafe.intersection(\n\t\t\tTypesafe.object({\n\t\t\t\teventId: Typesafe.string,\n\t\t\t}),\n\t\t\tTypesafe.partial({\n\t\t\t\terror: Typesafe.string,\n\t\t\t}),\n\t\t),\n\t),\n}))\n\ntype EventResponseFactory = (eventRow: EventRow) => { ok: boolean; code?: number; response?: string; errorMessage?: string; durationMs?: number }\n\nexport class WebhookTargetHandler implements InvokeHandler<Actions.WebhookTarget> {\n\tconstructor(\n\t\tprivate readonly fetcher: WebhookFetcher,\n\t) {\n\t}\n\n\tpublic async handle({ target, events, logger, variables }: InvokeHandlerArgs<Actions.WebhookTarget>): Promise<HandledEvent[]> {\n\t\tconst timeoutMs = target.timeoutMs\n\n\t\tconst start = process.hrtime.bigint()\n\t\tconst getDuration = () => Math.floor(Number((process.hrtime.bigint() - start) / BigInt(1_000_000)))\n\n\t\tlet eventResponseFactory: EventResponseFactory\n\t\ttry {\n\t\t\tconst response = await this.fetch(timeoutMs ?? DEFAULT_TIMEOUT_MS, target, variables, events)\n\n\t\t\teventResponseFactory = this.createResponseFactory({\n\t\t\t\tresponse: response,\n\t\t\t\tevents,\n\t\t\t})\n\t\t} catch (e) {\n\t\t\tlogger.warn(e)\n\t\t\tconst errorMessages = this.extractErrorMessages(e)\n\t\t\tconst result = {\n\t\t\t\tok: false,\n\t\t\t\terrorMessage: errorMessages.length ? errorMessages.join('; ') : undefined,\n\t\t\t\tdurationMs: getDuration(),\n\t\t\t}\n\t\t\teventResponseFactory = () => ({ ok: false, errorMessage: errorMessages.length ? errorMessages.join('; ') : undefined })\n\n\t\t\treturn events.map(it => ({ target, row: it, result }))\n\t\t}\n\t\tconst durationMs = getDuration()\n\n\t\treturn events.map(it => ({ target, row: it, result: { durationMs, ...eventResponseFactory(it) } }))\n\t}\n\n\tprivate createResponseFactory({ response, events }: {\n\t\tresponse: FetcherResponse\n\t\tevents: EventRow[]\n\t}): EventResponseFactory {\n\t\tif (!response.ok) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: response.statusText,\n\t\t\t})\n\t\t}\n\n\t\tif (\n\t\t\tresponse.responseText.trim() === ''\n\t\t\t|| !response.headers.get('content-type')?.toLowerCase().includes('json')\n\t\t) {\n\t\t\treturn () => ({\n\t\t\t\tok: true,\n\t\t\t\tcode: response.status,\n\t\t\t})\n\t\t}\n\n\t\ttry {\n\t\t\tconst parsedJson = JSON.parse(response.responseText)\n\t\t\tif (parsedJson === null || typeof parsedJson !== 'object' || !('failures' in parsedJson)) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: true,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t})\n\t\t\t}\n\t\t\tconst responseData = ResponseType(parsedJson)\n\t\t\tconst eventsInBatch = new Set(events.map(it => it.id))\n\t\t\tconst failedEvents = Object.fromEntries(responseData.failures?.map(it => [it.eventId, it]) ?? [])\n\t\t\tconst missingEvents = Object.keys(failedEvents).filter(it => !eventsInBatch.has(it))\n\n\t\t\tif (missingEvents.length) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\tresponse: response.responseText,\n\t\t\t\t\terrorMessage: 'Invalid response: undefined events IDs: ' + missingEvents.join('; '),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn it => {\n\t\t\t\tif (!failedEvents[it.id]) {\n\t\t\t\t\treturn { ok: true, code: response.status }\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\terrorMessage: failedEvents[it.id].error,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (e: any) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: 'Invalid response: ' + e.message,\n\t\t\t})\n\t\t}\n\t}\n\n\tprivate extractErrorMessages(e: unknown): string[] {\n\t\tconst errorMessages = []\n\t\tlet err = e\n\t\twhile (typeof err === 'object' && err !== null && 'message' in err && typeof (err as any).message === 'string') {\n\t\t\terrorMessages.push((err as any).message)\n\t\t\terr = (err as any).cause\n\t\t}\n\t\treturn errorMessages\n\t}\n\n\tprivate async fetch(timeoutMs: number, target: Actions.WebhookTarget, variables: VariablesMap, events: EventRow[]): Promise<FetcherResponse> {\n\t\treturn await withTimeout(timeoutMs, async abortController => {\n\t\t\treturn await this.doFetch(target, variables, abortController, events)\n\t\t})\n\t}\n\n\tprivate async doFetch(\n\t\ttarget: Actions.WebhookTarget,\n\t\tvariables: VariablesMap,\n\t\tabortController: AbortController,\n\t\tevents: EventRow[],\n\t): Promise<FetcherResponse> {\n\t\tconst resolvedUrl = this.resolveVariables(target.url, variables)\n\t\tconst resolvedHeaders = Object.fromEntries(\n\t\t\tObject.entries(target.headers ?? {})\n\t\t\t\t.map(([key, value]) => [key, this.resolveVariables(value, variables)]),\n\t\t)\n\n\t\treturn await this.fetcher.fetch(resolvedUrl, {\n\t\t\tmethod: 'POST',\n\t\t\theaders: {\n\t\t\t\t['User-Agent']: 'Contember Actions',\n\t\t\t\t...resolvedHeaders,\n\t\t\t\t['Content-type']: 'application/json',\n\t\t\t},\n\t\t\tsignal: abortController.signal,\n\t\t\tbody: this.formatBody(events, target),\n\t\t})\n\t}\n\n\tprivate formatBody(events: EventRow[], target: Actions.WebhookTarget): string {\n\t\tconst body = target.body ?? {}\n\t\tconst path = target.payloadPath ?? []\n\t\tlet current: any = body\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tcurrent[path[i]] ??= {}\n\t\t\tcurrent = current[path[i]]\n\t\t}\n\t\tcurrent['events'] = events.map(this.formatEventPayload)\n\t\treturn JSON.stringify(body)\n\t}\n\n\tprivate formatEventPayload(it: EventRow): ActionsPayload.WebhookEvent {\n\t\treturn {\n\t\t\tmeta: {\n\t\t\t\teventId: it.id,\n\t\t\t\ttransactionId: it.transaction_id,\n\t\t\t\tidentityId: it.identity_id ?? null,\n\t\t\t\tipAddress: it.ip_address ?? null,\n\t\t\t\tuserAgent: it.user_agent ?? null,\n\t\t\t\tcreatedAt: it.created_at.toISOString(),\n\t\t\t\tlastStateChange: it.last_state_change.toISOString(),\n\t\t\t\tnumRetries: it.num_retries,\n\t\t\t\ttrigger: it.trigger,\n\t\t\t\ttarget: it.target,\n\t\t\t\t// todo: add stage and schema version\n\t\t\t},\n\t\t\t...it.payload,\n\t\t}\n\t}\n\n\tprivate resolveVariables(subject: string, variables: VariablesMap) {\n\t\treturn subject.replace(/\\{\\{([\\w_]+)}}/gm, (_, name) => {\n\t\t\tif (!variables[name]) {\n\t\t\t\tthrow new Error(`Undefined variable ${name}`)\n\t\t\t}\n\t\t\treturn variables[name]\n\t\t})\n\t}\n}\n\nconst withTimeout = async <T>(timeoutMs: number, cb: (abortController: AbortController) => Promise<T>): Promise<T> => {\n\tconst abortController = new AbortController()\n\tconst timeoutId = setTimeout(() => {\n\t\tabortController.abort()\n\t}, timeoutMs)\n\ttry {\n\t\treturn await cb(abortController)\n\t} finally {\n\t\tclearTimeout(timeoutId)\n\t}\n}\n"],"names":["Typesafe"],"mappings":"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"}

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

@@ -111,7 +111,9 @@ class WebhookTargetHandler {
   }
   async doFetch(target, variables, abortController, events) {
     const resolvedUrl = this.resolveVariables(target.url, variables);
-    const resolvedHeaders = Object.fromEntries(Object.entries(target.headers ?? {}).map(([key, value]) => [key, this.resolveVariables(value, variables)]));
+    const resolvedHeaders = Object.fromEntries(
+      Object.entries(target.headers ?? {}).map(([key, value]) => [key, this.resolveVariables(value, variables)])
+    );
     return await this.fetcher.fetch(resolvedUrl, {
       method: "POST",
       headers: {
@@ -140,6 +142,9 @@ class WebhookTargetHandler {
       meta: {
         eventId: it.id,
         transactionId: it.transaction_id,
+        identityId: it.identity_id ?? null,
+        ipAddress: it.ip_address ?? null,
+        userAgent: it.user_agent ?? null,
         createdAt: it.created_at.toISOString(),
         lastStateChange: it.last_state_change.toISOString(),
         numRetries: it.num_retries,

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

@@ -1 +1 @@
-{"version":3,"file":"WebhookTargetHandler.js","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookTargetHandler.ts"],"sourcesContent":["import { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow, HandledEvent, InvokeHandler, InvokeHandlerArgs  } from './types'\nimport { VariablesMap } from '../model/VariablesManager'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher'\n\nconst DEFAULT_TIMEOUT_MS = 30_000 // 30 seconds\n\nconst ResponseType = Typesafe.noExtraProps(Typesafe.object({\n\tfailures: Typesafe.array(\n\t\tTypesafe.intersection(\n\t\t\tTypesafe.object({\n\t\t\t\teventId: Typesafe.string,\n\t\t\t}),\n\t\t\tTypesafe.partial({\n\t\t\t\terror: Typesafe.string,\n\t\t\t}),\n\t\t),\n\t),\n}))\n\ntype EventResponseFactory = (eventRow: EventRow) => ({ ok: boolean; code?: number; response?: string; errorMessage?: string; durationMs?: number })\n\nexport class WebhookTargetHandler implements InvokeHandler<Actions.WebhookTarget> {\n\tconstructor(\n\t\tprivate readonly fetcher: WebhookFetcher,\n\t) {\n\t}\n\n\tpublic async handle({ target, events, logger, variables }: InvokeHandlerArgs<Actions.WebhookTarget>): Promise<HandledEvent[]> {\n\t\tconst timeoutMs = target.timeoutMs\n\n\t\tconst start = process.hrtime.bigint()\n\t\tconst getDuration = () => Math.floor(Number((process.hrtime.bigint() - start) / BigInt(1_000_000)))\n\n\t\tlet eventResponseFactory: EventResponseFactory\n\t\ttry {\n\n\t\t\tconst response = await this.fetch(timeoutMs ?? DEFAULT_TIMEOUT_MS, target, variables, events)\n\n\t\t\teventResponseFactory = this.createResponseFactory({\n\t\t\t\tresponse: response,\n\t\t\t\tevents,\n\t\t\t})\n\n\t\t} catch (e) {\n\t\t\tlogger.warn(e)\n\t\t\tconst errorMessages = this.extractErrorMessages(e)\n\t\t\tconst result = {\n\t\t\t\tok: false,\n\t\t\t\terrorMessage: errorMessages.length ? errorMessages.join('; ') : undefined,\n\t\t\t\tdurationMs: getDuration(),\n\t\t\t}\n\t\t\teventResponseFactory = () => ({ ok: false, errorMessage: errorMessages.length ? errorMessages.join('; ') : undefined })\n\n\t\t\treturn events.map(it => ({ target, row: it, result }))\n\t\t}\n\t\tconst durationMs = getDuration()\n\n\t\treturn events.map(it => ({ target, row: it, result: { durationMs, ...eventResponseFactory(it) } }))\n\t}\n\n\tprivate createResponseFactory({ response, events }: {\n\t\tresponse: FetcherResponse\n\t\tevents: EventRow[]\n\t}): EventResponseFactory {\n\t\tif (!response.ok) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: response.statusText,\n\t\t\t})\n\t\t}\n\n\t\tif (response.responseText.trim() === ''\n\t\t\t|| !response.headers.get('content-type')?.toLowerCase().includes('json')\n\t\t) {\n\t\t\treturn () => ({\n\t\t\t\tok: true,\n\t\t\t\tcode: response.status,\n\t\t\t})\n\t\t}\n\n\t\ttry {\n\t\t\tconst parsedJson = JSON.parse(response.responseText)\n\t\t\tif (parsedJson === null || typeof parsedJson !== 'object' || !('failures' in parsedJson)) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: true,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t})\n\t\t\t}\n\t\t\tconst responseData = ResponseType(parsedJson)\n\t\t\tconst eventsInBatch = new Set(events.map(it => it.id))\n\t\t\tconst failedEvents = Object.fromEntries(responseData.failures?.map(it => [it.eventId, it]) ?? [])\n\t\t\tconst missingEvents =  Object.keys(failedEvents).filter(it => !eventsInBatch.has(it))\n\n\t\t\tif (missingEvents.length) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\tresponse: response.responseText,\n\t\t\t\t\terrorMessage: 'Invalid response: undefined events IDs: ' + missingEvents.join('; '),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn it => {\n\t\t\t\tif (!failedEvents[it.id]) {\n\t\t\t\t\treturn { ok: true, code: response.status }\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\terrorMessage: failedEvents[it.id].error,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (e: any) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: 'Invalid response: ' + e.message,\n\t\t\t})\n\t\t}\n\t}\n\n\tprivate extractErrorMessages(e: unknown): string[] {\n\t\tconst errorMessages = []\n\t\tlet err = e\n\t\twhile (typeof err === 'object' && err !== null && 'message' in err && typeof (err as any).message === 'string') {\n\t\t\terrorMessages.push((err as any).message)\n\t\t\terr = (err as any).cause\n\t\t}\n\t\treturn errorMessages\n\t}\n\n\tprivate async fetch(timeoutMs: number, target: Actions.WebhookTarget, variables: VariablesMap, events: EventRow[]): Promise<FetcherResponse> {\n\t\treturn await withTimeout(timeoutMs, async abortController => {\n\t\t\treturn await this.doFetch(target, variables, abortController, events)\n\t\t})\n\t}\n\n\tprivate async doFetch(target: Actions.WebhookTarget, variables: VariablesMap, abortController: AbortController, events: EventRow[]): Promise<FetcherResponse> {\n\t\tconst resolvedUrl = this.resolveVariables(target.url, variables)\n\t\tconst resolvedHeaders = Object.fromEntries(Object.entries(target.headers ?? {})\n\t\t\t.map(([key, value]) => [key, this.resolveVariables(value, variables)]))\n\n\t\treturn await this.fetcher.fetch(resolvedUrl, {\n\t\t\tmethod: 'POST',\n\t\t\theaders: {\n\t\t\t\t['User-Agent']: 'Contember Actions',\n\t\t\t\t...resolvedHeaders,\n\t\t\t\t['Content-type']: 'application/json',\n\t\t\t},\n\t\t\tsignal: abortController.signal,\n\t\t\tbody: this.formatBody(events, target),\n\t\t})\n\t}\n\n\tprivate formatBody(events: EventRow[], target: Actions.WebhookTarget): string {\n\t\tconst body = target.body ?? {}\n\t\tconst path = target.payloadPath ?? []\n\t\tlet current: any = body\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tcurrent[path[i]] ??= {}\n\t\t\tcurrent = current[path[i]]\n\t\t}\n\t\tcurrent['events'] = events.map(this.formatEventPayload)\n\t\treturn JSON.stringify(body)\n\t}\n\n\tprivate formatEventPayload(it: EventRow): ActionsPayload.WebhookEvent {\n\t\treturn {\n\t\t\tmeta: {\n\t\t\t\teventId: it.id,\n\t\t\t\ttransactionId: it.transaction_id,\n\t\t\t\tcreatedAt: it.created_at.toISOString(),\n\t\t\t\tlastStateChange: it.last_state_change.toISOString(),\n\t\t\t\tnumRetries: it.num_retries,\n\t\t\t\ttrigger: it.trigger,\n\t\t\t\ttarget: it.target,\n\t\t\t\t// todo: add stage and schema version\n\t\t\t},\n\t\t\t...it.payload,\n\t\t}\n\t}\n\n\tprivate resolveVariables(subject: string, variables: VariablesMap) {\n\t\treturn subject.replace(/\\{\\{([\\w_]+)}}/gm, (_, name) => {\n\t\t\tif (!variables[name]) {\n\t\t\t\tthrow new Error(`Undefined variable ${name}`)\n\t\t\t}\n\t\t\treturn variables[name]\n\t\t})\n\t}\n}\n\nconst withTimeout = async <T>(timeoutMs: number, cb: (abortController: AbortController) => Promise<T>): Promise<T> => {\n\tconst abortController = new AbortController()\n\tconst timeoutId = setTimeout(() => {\n\t\tabortController.abort()\n\t}, timeoutMs)\n\ttry {\n\t\treturn await cb(abortController)\n\t} finally {\n\t\tclearTimeout(timeoutId)\n\t}\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"WebhookTargetHandler.js","sources":["../../../../../packages/engine-actions/src/dispatch/WebhookTargetHandler.ts"],"sourcesContent":["import { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow, HandledEvent, InvokeHandler, InvokeHandlerArgs } from './types'\nimport { VariablesMap } from '../model/VariablesManager'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher'\n\nconst DEFAULT_TIMEOUT_MS = 30_000 // 30 seconds\n\nconst ResponseType = Typesafe.noExtraProps(Typesafe.object({\n\tfailures: Typesafe.array(\n\t\tTypesafe.intersection(\n\t\t\tTypesafe.object({\n\t\t\t\teventId: Typesafe.string,\n\t\t\t}),\n\t\t\tTypesafe.partial({\n\t\t\t\terror: Typesafe.string,\n\t\t\t}),\n\t\t),\n\t),\n}))\n\ntype EventResponseFactory = (eventRow: EventRow) => { ok: boolean; code?: number; response?: string; errorMessage?: string; durationMs?: number }\n\nexport class WebhookTargetHandler implements InvokeHandler<Actions.WebhookTarget> {\n\tconstructor(\n\t\tprivate readonly fetcher: WebhookFetcher,\n\t) {\n\t}\n\n\tpublic async handle({ target, events, logger, variables }: InvokeHandlerArgs<Actions.WebhookTarget>): Promise<HandledEvent[]> {\n\t\tconst timeoutMs = target.timeoutMs\n\n\t\tconst start = process.hrtime.bigint()\n\t\tconst getDuration = () => Math.floor(Number((process.hrtime.bigint() - start) / BigInt(1_000_000)))\n\n\t\tlet eventResponseFactory: EventResponseFactory\n\t\ttry {\n\t\t\tconst response = await this.fetch(timeoutMs ?? DEFAULT_TIMEOUT_MS, target, variables, events)\n\n\t\t\teventResponseFactory = this.createResponseFactory({\n\t\t\t\tresponse: response,\n\t\t\t\tevents,\n\t\t\t})\n\t\t} catch (e) {\n\t\t\tlogger.warn(e)\n\t\t\tconst errorMessages = this.extractErrorMessages(e)\n\t\t\tconst result = {\n\t\t\t\tok: false,\n\t\t\t\terrorMessage: errorMessages.length ? errorMessages.join('; ') : undefined,\n\t\t\t\tdurationMs: getDuration(),\n\t\t\t}\n\t\t\teventResponseFactory = () => ({ ok: false, errorMessage: errorMessages.length ? errorMessages.join('; ') : undefined })\n\n\t\t\treturn events.map(it => ({ target, row: it, result }))\n\t\t}\n\t\tconst durationMs = getDuration()\n\n\t\treturn events.map(it => ({ target, row: it, result: { durationMs, ...eventResponseFactory(it) } }))\n\t}\n\n\tprivate createResponseFactory({ response, events }: {\n\t\tresponse: FetcherResponse\n\t\tevents: EventRow[]\n\t}): EventResponseFactory {\n\t\tif (!response.ok) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: response.statusText,\n\t\t\t})\n\t\t}\n\n\t\tif (\n\t\t\tresponse.responseText.trim() === ''\n\t\t\t|| !response.headers.get('content-type')?.toLowerCase().includes('json')\n\t\t) {\n\t\t\treturn () => ({\n\t\t\t\tok: true,\n\t\t\t\tcode: response.status,\n\t\t\t})\n\t\t}\n\n\t\ttry {\n\t\t\tconst parsedJson = JSON.parse(response.responseText)\n\t\t\tif (parsedJson === null || typeof parsedJson !== 'object' || !('failures' in parsedJson)) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: true,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t})\n\t\t\t}\n\t\t\tconst responseData = ResponseType(parsedJson)\n\t\t\tconst eventsInBatch = new Set(events.map(it => it.id))\n\t\t\tconst failedEvents = Object.fromEntries(responseData.failures?.map(it => [it.eventId, it]) ?? [])\n\t\t\tconst missingEvents = Object.keys(failedEvents).filter(it => !eventsInBatch.has(it))\n\n\t\t\tif (missingEvents.length) {\n\t\t\t\treturn () => ({\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\tresponse: response.responseText,\n\t\t\t\t\terrorMessage: 'Invalid response: undefined events IDs: ' + missingEvents.join('; '),\n\t\t\t\t})\n\t\t\t}\n\n\t\t\treturn it => {\n\t\t\t\tif (!failedEvents[it.id]) {\n\t\t\t\t\treturn { ok: true, code: response.status }\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\tok: false,\n\t\t\t\t\tcode: response.status,\n\t\t\t\t\terrorMessage: failedEvents[it.id].error,\n\t\t\t\t}\n\t\t\t}\n\t\t} catch (e: any) {\n\t\t\treturn () => ({\n\t\t\t\tok: false,\n\t\t\t\tcode: response.status,\n\t\t\t\tresponse: response.responseText,\n\t\t\t\terrorMessage: 'Invalid response: ' + e.message,\n\t\t\t})\n\t\t}\n\t}\n\n\tprivate extractErrorMessages(e: unknown): string[] {\n\t\tconst errorMessages = []\n\t\tlet err = e\n\t\twhile (typeof err === 'object' && err !== null && 'message' in err && typeof (err as any).message === 'string') {\n\t\t\terrorMessages.push((err as any).message)\n\t\t\terr = (err as any).cause\n\t\t}\n\t\treturn errorMessages\n\t}\n\n\tprivate async fetch(timeoutMs: number, target: Actions.WebhookTarget, variables: VariablesMap, events: EventRow[]): Promise<FetcherResponse> {\n\t\treturn await withTimeout(timeoutMs, async abortController => {\n\t\t\treturn await this.doFetch(target, variables, abortController, events)\n\t\t})\n\t}\n\n\tprivate async doFetch(\n\t\ttarget: Actions.WebhookTarget,\n\t\tvariables: VariablesMap,\n\t\tabortController: AbortController,\n\t\tevents: EventRow[],\n\t): Promise<FetcherResponse> {\n\t\tconst resolvedUrl = this.resolveVariables(target.url, variables)\n\t\tconst resolvedHeaders = Object.fromEntries(\n\t\t\tObject.entries(target.headers ?? {})\n\t\t\t\t.map(([key, value]) => [key, this.resolveVariables(value, variables)]),\n\t\t)\n\n\t\treturn await this.fetcher.fetch(resolvedUrl, {\n\t\t\tmethod: 'POST',\n\t\t\theaders: {\n\t\t\t\t['User-Agent']: 'Contember Actions',\n\t\t\t\t...resolvedHeaders,\n\t\t\t\t['Content-type']: 'application/json',\n\t\t\t},\n\t\t\tsignal: abortController.signal,\n\t\t\tbody: this.formatBody(events, target),\n\t\t})\n\t}\n\n\tprivate formatBody(events: EventRow[], target: Actions.WebhookTarget): string {\n\t\tconst body = target.body ?? {}\n\t\tconst path = target.payloadPath ?? []\n\t\tlet current: any = body\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tcurrent[path[i]] ??= {}\n\t\t\tcurrent = current[path[i]]\n\t\t}\n\t\tcurrent['events'] = events.map(this.formatEventPayload)\n\t\treturn JSON.stringify(body)\n\t}\n\n\tprivate formatEventPayload(it: EventRow): ActionsPayload.WebhookEvent {\n\t\treturn {\n\t\t\tmeta: {\n\t\t\t\teventId: it.id,\n\t\t\t\ttransactionId: it.transaction_id,\n\t\t\t\tidentityId: it.identity_id ?? null,\n\t\t\t\tipAddress: it.ip_address ?? null,\n\t\t\t\tuserAgent: it.user_agent ?? null,\n\t\t\t\tcreatedAt: it.created_at.toISOString(),\n\t\t\t\tlastStateChange: it.last_state_change.toISOString(),\n\t\t\t\tnumRetries: it.num_retries,\n\t\t\t\ttrigger: it.trigger,\n\t\t\t\ttarget: it.target,\n\t\t\t\t// todo: add stage and schema version\n\t\t\t},\n\t\t\t...it.payload,\n\t\t}\n\t}\n\n\tprivate resolveVariables(subject: string, variables: VariablesMap) {\n\t\treturn subject.replace(/\\{\\{([\\w_]+)}}/gm, (_, name) => {\n\t\t\tif (!variables[name]) {\n\t\t\t\tthrow new Error(`Undefined variable ${name}`)\n\t\t\t}\n\t\t\treturn variables[name]\n\t\t})\n\t}\n}\n\nconst withTimeout = async <T>(timeoutMs: number, cb: (abortController: AbortController) => Promise<T>): Promise<T> => {\n\tconst abortController = new AbortController()\n\tconst timeoutId = setTimeout(() => {\n\t\tabortController.abort()\n\t}, timeoutMs)\n\ttry {\n\t\treturn await cb(abortController)\n\t} finally {\n\t\tclearTimeout(timeoutId)\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/development/src/graphql/http/ActionsApiMiddlewareFactory.cjs

@@ -17,6 +17,7 @@ class ActionsApiMiddlewareFactory {
       const graphqlContext = {
         db: systemDatabase,
         logger,
+        project: projectContainer.project,
         contentSchemaResolver: projectContainer.contentSchemaResolver,
         requireAccess: async (action, message) => {
           if (!await this.authorizator.isAllowed(identity, new authorization.AuthorizationScope.Global(), action)) {

package/dist/development/src/graphql/http/ActionsApiMiddlewareFactory.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsApiMiddlewareFactory.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsApiMiddlewareFactory.ts"],"sourcesContent":["import { HttpController } from '@contember/engine-http'\nimport { ActionsGraphQLHandler } from './ActionsGraphQLHandlerFactory'\nimport { ActionsContext } from '../resolvers/ActionsContext'\nimport { ActionsContextResolver } from './ActionsContextResolver'\nimport { AuthorizationScope, Authorizator } from '@contember/authorization'\nimport { Identity } from '../../authorization'\nimport { ForbiddenError } from '@contember/graphql-utils'\n\nexport class ActionsApiMiddlewareFactory {\n\tconstructor(\n\t\tprivate readonly actionsContextResolver: ActionsContextResolver,\n\t\tprivate readonly actionsGraphQLHandler: ActionsGraphQLHandler,\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {\n\t}\n\n\tcreate(): HttpController {\n\t\treturn async ctx => {\n\t\t\tconst { timer, logger, koa } = ctx\n\t\t\tconst { projectContainer, identity } = await this.actionsContextResolver.resolve(ctx)\n\n\t\t\tconst systemDatabase = projectContainer.systemDatabaseContext\n\n\t\t\tlogger.debug('Actions query processing started')\n\t\t\tconst graphqlContext: ActionsContext = {\n\t\t\t\tdb: systemDatabase,\n\t\t\t\tlogger,\n\t\t\t\tcontentSchemaResolver: projectContainer.contentSchemaResolver,\n\t\t\t\trequireAccess: async (action, message) => {\n\t\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new AuthorizationScope.Global(), action))) {\n\t\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t}\n\t\t\tconst handler = this.actionsGraphQLHandler\n\n\t\t\tawait timer('GraphQL', () => handler({\n\t\t\t\trequest: koa.request,\n\t\t\t\tresponse: koa.response,\n\t\t\t\tcreateContext: () => graphqlContext,\n\t\t\t}))\n\t\t\tlogger.debug('Actions query finished')\n\t\t}\n\t}\n}\n"],"names":["AuthorizationScope","ForbiddenError"],"mappings":";;;;AAQO,MAAM,4BAA4B;AAAA,EACxC,YACkB,wBACA,uBACA,cAChB;AAHgB,SAAA,yBAAA;AACA,SAAA,wBAAA;AACA,SAAA,eAAA;AAAA,EAAA;AAAA,EAIlB,SAAyB;AACxB,WAAO,OAAM,QAAO;AACnB,YAAM,EAAE,OAAO,QAAQ,IAAQ,IAAA;AACzB,YAAA,EAAE,kBAAkB,SAAS,IAAI,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AAEpF,YAAM,iBAAiB,iBAAiB;AAExC,aAAO,MAAM,kCAAkC;AAC/C,YAAM,iBAAiC;AAAA,QACtC,IAAI;AAAA,QACJ;AAAA,QACA,uBAAuB,iBAAiB;AAAA,QACxC,eAAe,OAAO,QAAQ,YAAY;AACrC,cAAA,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAIA,iCAAmB,UAAU,MAAM,GAAI;AACtF,kBAAA,IAAIC,aAAAA,eAAe,WAAW,WAAW;AAAA,UAAA;AAAA,QAChD;AAAA,MAEF;AACA,YAAM,UAAU,KAAK;AAEf,YAAA,MAAM,WAAW,MAAM,QAAQ;AAAA,QACpC,SAAS,IAAI;AAAA,QACb,UAAU,IAAI;AAAA,QACd,eAAe,MAAM;AAAA,MAAA,CACrB,CAAC;AACF,aAAO,MAAM,wBAAwB;AAAA,IACtC;AAAA,EAAA;AAEF;;"}
+{"version":3,"file":"ActionsApiMiddlewareFactory.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsApiMiddlewareFactory.ts"],"sourcesContent":["import { HttpController } from '@contember/engine-http'\nimport { ActionsGraphQLHandler } from './ActionsGraphQLHandlerFactory'\nimport { ActionsContext } from '../resolvers/ActionsContext'\nimport { ActionsContextResolver } from './ActionsContextResolver'\nimport { AuthorizationScope, Authorizator } from '@contember/authorization'\nimport { Identity } from '../../authorization'\nimport { ForbiddenError } from '@contember/graphql-utils'\n\nexport class ActionsApiMiddlewareFactory {\n\tconstructor(\n\t\tprivate readonly actionsContextResolver: ActionsContextResolver,\n\t\tprivate readonly actionsGraphQLHandler: ActionsGraphQLHandler,\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {\n\t}\n\n\tcreate(): HttpController {\n\t\treturn async ctx => {\n\t\t\tconst { timer, logger, koa } = ctx\n\t\t\tconst { projectContainer, identity } = await this.actionsContextResolver.resolve(ctx)\n\n\t\t\tconst systemDatabase = projectContainer.systemDatabaseContext\n\n\t\t\tlogger.debug('Actions query processing started')\n\t\t\tconst graphqlContext: ActionsContext = {\n\t\t\t\tdb: systemDatabase,\n\t\t\t\tlogger,\n\t\t\t\tproject: projectContainer.project,\n\t\t\t\tcontentSchemaResolver: projectContainer.contentSchemaResolver,\n\t\t\t\trequireAccess: async (action, message) => {\n\t\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new AuthorizationScope.Global(), action))) {\n\t\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t}\n\t\t\tconst handler = this.actionsGraphQLHandler\n\n\t\t\tawait timer('GraphQL', () =>\n\t\t\t\thandler({\n\t\t\t\t\trequest: koa.request,\n\t\t\t\t\tresponse: koa.response,\n\t\t\t\t\tcreateContext: () => graphqlContext,\n\t\t\t\t}))\n\t\t\tlogger.debug('Actions query finished')\n\t\t}\n\t}\n}\n"],"names":["AuthorizationScope","ForbiddenError"],"mappings":";;;;AAQO,MAAM,4BAA4B;AAAA,EACxC,YACkB,wBACA,uBACA,cAChB;AAHgB,SAAA,yBAAA;AACA,SAAA,wBAAA;AACA,SAAA,eAAA;AAAA,EAElB;AAAA,EAEA,SAAyB;AACxB,WAAO,OAAM,QAAO;AACnB,YAAM,EAAE,OAAO,QAAQ,IAAA,IAAQ;AAC/B,YAAM,EAAE,kBAAkB,SAAA,IAAa,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AAEpF,YAAM,iBAAiB,iBAAiB;AAExC,aAAO,MAAM,kCAAkC;AAC/C,YAAM,iBAAiC;AAAA,QACtC,IAAI;AAAA,QACJ;AAAA,QACA,SAAS,iBAAiB;AAAA,QAC1B,uBAAuB,iBAAiB;AAAA,QACxC,eAAe,OAAO,QAAQ,YAAY;AACzC,cAAI,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAIA,iCAAmB,UAAU,MAAM,GAAI;AAC5F,kBAAM,IAAIC,aAAAA,eAAe,WAAW,WAAW;AAAA,UAChD;AAAA,QACD;AAAA,MAAA;AAED,YAAM,UAAU,KAAK;AAErB,YAAM,MAAM,WAAW,MACtB,QAAQ;AAAA,QACP,SAAS,IAAI;AAAA,QACb,UAAU,IAAI;AAAA,QACd,eAAe,MAAM;AAAA,MAAA,CACrB,CAAC;AACH,aAAO,MAAM,wBAAwB;AAAA,IACtC;AAAA,EACD;AACD;;"}

package/dist/development/src/graphql/http/ActionsApiMiddlewareFactory.js

@@ -15,6 +15,7 @@ class ActionsApiMiddlewareFactory {
       const graphqlContext = {
         db: systemDatabase,
         logger,
+        project: projectContainer.project,
         contentSchemaResolver: projectContainer.contentSchemaResolver,
         requireAccess: async (action, message) => {
           if (!await this.authorizator.isAllowed(identity, new AuthorizationScope.Global(), action)) {

package/dist/development/src/graphql/http/ActionsApiMiddlewareFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsApiMiddlewareFactory.js","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsApiMiddlewareFactory.ts"],"sourcesContent":["import { HttpController } from '@contember/engine-http'\nimport { ActionsGraphQLHandler } from './ActionsGraphQLHandlerFactory'\nimport { ActionsContext } from '../resolvers/ActionsContext'\nimport { ActionsContextResolver } from './ActionsContextResolver'\nimport { AuthorizationScope, Authorizator } from '@contember/authorization'\nimport { Identity } from '../../authorization'\nimport { ForbiddenError } from '@contember/graphql-utils'\n\nexport class ActionsApiMiddlewareFactory {\n\tconstructor(\n\t\tprivate readonly actionsContextResolver: ActionsContextResolver,\n\t\tprivate readonly actionsGraphQLHandler: ActionsGraphQLHandler,\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {\n\t}\n\n\tcreate(): HttpController {\n\t\treturn async ctx => {\n\t\t\tconst { timer, logger, koa } = ctx\n\t\t\tconst { projectContainer, identity } = await this.actionsContextResolver.resolve(ctx)\n\n\t\t\tconst systemDatabase = projectContainer.systemDatabaseContext\n\n\t\t\tlogger.debug('Actions query processing started')\n\t\t\tconst graphqlContext: ActionsContext = {\n\t\t\t\tdb: systemDatabase,\n\t\t\t\tlogger,\n\t\t\t\tcontentSchemaResolver: projectContainer.contentSchemaResolver,\n\t\t\t\trequireAccess: async (action, message) => {\n\t\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new AuthorizationScope.Global(), action))) {\n\t\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t}\n\t\t\tconst handler = this.actionsGraphQLHandler\n\n\t\t\tawait timer('GraphQL', () => handler({\n\t\t\t\trequest: koa.request,\n\t\t\t\tresponse: koa.response,\n\t\t\t\tcreateContext: () => graphqlContext,\n\t\t\t}))\n\t\t\tlogger.debug('Actions query finished')\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAQO,MAAM,4BAA4B;AAAA,EACxC,YACkB,wBACA,uBACA,cAChB;AAHgB,SAAA,yBAAA;AACA,SAAA,wBAAA;AACA,SAAA,eAAA;AAAA,EAAA;AAAA,EAIlB,SAAyB;AACxB,WAAO,OAAM,QAAO;AACnB,YAAM,EAAE,OAAO,QAAQ,IAAQ,IAAA;AACzB,YAAA,EAAE,kBAAkB,SAAS,IAAI,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AAEpF,YAAM,iBAAiB,iBAAiB;AAExC,aAAO,MAAM,kCAAkC;AAC/C,YAAM,iBAAiC;AAAA,QACtC,IAAI;AAAA,QACJ;AAAA,QACA,uBAAuB,iBAAiB;AAAA,QACxC,eAAe,OAAO,QAAQ,YAAY;AACrC,cAAA,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAI,mBAAmB,UAAU,MAAM,GAAI;AACtF,kBAAA,IAAI,eAAe,WAAW,WAAW;AAAA,UAAA;AAAA,QAChD;AAAA,MAEF;AACA,YAAM,UAAU,KAAK;AAEf,YAAA,MAAM,WAAW,MAAM,QAAQ;AAAA,QACpC,SAAS,IAAI;AAAA,QACb,UAAU,IAAI;AAAA,QACd,eAAe,MAAM;AAAA,MAAA,CACrB,CAAC;AACF,aAAO,MAAM,wBAAwB;AAAA,IACtC;AAAA,EAAA;AAEF;"}
+{"version":3,"file":"ActionsApiMiddlewareFactory.js","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsApiMiddlewareFactory.ts"],"sourcesContent":["import { HttpController } from '@contember/engine-http'\nimport { ActionsGraphQLHandler } from './ActionsGraphQLHandlerFactory'\nimport { ActionsContext } from '../resolvers/ActionsContext'\nimport { ActionsContextResolver } from './ActionsContextResolver'\nimport { AuthorizationScope, Authorizator } from '@contember/authorization'\nimport { Identity } from '../../authorization'\nimport { ForbiddenError } from '@contember/graphql-utils'\n\nexport class ActionsApiMiddlewareFactory {\n\tconstructor(\n\t\tprivate readonly actionsContextResolver: ActionsContextResolver,\n\t\tprivate readonly actionsGraphQLHandler: ActionsGraphQLHandler,\n\t\tprivate readonly authorizator: Authorizator<Identity>,\n\t) {\n\t}\n\n\tcreate(): HttpController {\n\t\treturn async ctx => {\n\t\t\tconst { timer, logger, koa } = ctx\n\t\t\tconst { projectContainer, identity } = await this.actionsContextResolver.resolve(ctx)\n\n\t\t\tconst systemDatabase = projectContainer.systemDatabaseContext\n\n\t\t\tlogger.debug('Actions query processing started')\n\t\t\tconst graphqlContext: ActionsContext = {\n\t\t\t\tdb: systemDatabase,\n\t\t\t\tlogger,\n\t\t\t\tproject: projectContainer.project,\n\t\t\t\tcontentSchemaResolver: projectContainer.contentSchemaResolver,\n\t\t\t\trequireAccess: async (action, message) => {\n\t\t\t\t\tif (!(await this.authorizator.isAllowed(identity, new AuthorizationScope.Global(), action))) {\n\t\t\t\t\t\tthrow new ForbiddenError(message || 'Forbidden')\n\t\t\t\t\t}\n\t\t\t\t},\n\t\t\t}\n\t\t\tconst handler = this.actionsGraphQLHandler\n\n\t\t\tawait timer('GraphQL', () =>\n\t\t\t\thandler({\n\t\t\t\t\trequest: koa.request,\n\t\t\t\t\tresponse: koa.response,\n\t\t\t\t\tcreateContext: () => graphqlContext,\n\t\t\t\t}))\n\t\t\tlogger.debug('Actions query finished')\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;AAQO,MAAM,4BAA4B;AAAA,EACxC,YACkB,wBACA,uBACA,cAChB;AAHgB,SAAA,yBAAA;AACA,SAAA,wBAAA;AACA,SAAA,eAAA;AAAA,EAElB;AAAA,EAEA,SAAyB;AACxB,WAAO,OAAM,QAAO;AACnB,YAAM,EAAE,OAAO,QAAQ,IAAA,IAAQ;AAC/B,YAAM,EAAE,kBAAkB,SAAA,IAAa,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AAEpF,YAAM,iBAAiB,iBAAiB;AAExC,aAAO,MAAM,kCAAkC;AAC/C,YAAM,iBAAiC;AAAA,QACtC,IAAI;AAAA,QACJ;AAAA,QACA,SAAS,iBAAiB;AAAA,QAC1B,uBAAuB,iBAAiB;AAAA,QACxC,eAAe,OAAO,QAAQ,YAAY;AACzC,cAAI,CAAE,MAAM,KAAK,aAAa,UAAU,UAAU,IAAI,mBAAmB,UAAU,MAAM,GAAI;AAC5F,kBAAM,IAAI,eAAe,WAAW,WAAW;AAAA,UAChD;AAAA,QACD;AAAA,MAAA;AAED,YAAM,UAAU,KAAK;AAErB,YAAM,MAAM,WAAW,MACtB,QAAQ;AAAA,QACP,SAAS,IAAI;AAAA,QACb,UAAU,IAAI;AAAA,QACd,eAAe,MAAM;AAAA,MAAA,CACrB,CAAC;AACH,aAAO,MAAM,wBAAwB;AAAA,IACtC;AAAA,EACD;AACD;"}

package/dist/development/src/graphql/http/ActionsContextResolver.cjs

@@ -13,17 +13,14 @@ class ActionsContextResolver {
     if (!authResult) {
       throw new engineHttp.HttpErrorResponse(401, "Authentication required");
     }
-    const memberships = await timer(
-      "MembershipFetch",
-      () => tenantContainer.projectMemberManager.getEffectiveProjectMemberships(
-        tenantContainer.databaseContext,
-        { slug: project.slug },
-        {
-          id: authResult.identityId,
-          roles: authResult.roles
-        }
-      )
-    );
+    const memberships = await timer("MembershipFetch", () => tenantContainer.projectMemberManager.getEffectiveProjectMemberships(
+      tenantContainer.databaseContext,
+      { slug: project.slug },
+      {
+        id: authResult.identityId,
+        roles: authResult.roles
+      }
+    ));
     logger.debug("Memberships fetched", { memberships });
     if (memberships.length === 0) {
       throw this.debug ? new engineHttp.HttpErrorResponse(404, `You are not allowed to access project ${project.slug}`) : new engineHttp.HttpErrorResponse(404, `Project ${project.slug} NOT found`);

package/dist/development/src/graphql/http/ActionsContextResolver.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsContextResolver.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsContextResolver.ts"],"sourcesContent":["import { ApplicationContext, HttpErrorResponse, ProjectConfig, ProjectContainer, ProjectContextResolver } from '@contember/engine-http'\nimport { Identity } from '../../authorization'\n\nexport interface ActionsContext {\n\tprojectContainer: ProjectContainer\n\tproject: ProjectConfig\n\tidentity: Identity\n}\n\nexport class ActionsContextResolver {\n\tconstructor(\n\t\tprivate readonly debug: boolean,\n\t\tprivate readonly projectContextResolver: ProjectContextResolver,\n\t) {\n\t}\n\n\tasync resolve(ctx: ApplicationContext): Promise<ActionsContext> {\n\t\tconst { timer, projectGroup: { tenantContainer }, logger, authResult } = ctx\n\t\tconst projectContext = await this.projectContextResolver.resolve(ctx)\n\t\tconst { project } = projectContext\n\t\tif (!authResult) {\n\t\t\tthrow new HttpErrorResponse(401, 'Authentication required')\n\t\t}\n\t\tconst memberships = await timer('MembershipFetch', () =>\n\t\t\ttenantContainer.projectMemberManager.getEffectiveProjectMemberships(\n\t\t\t\ttenantContainer.databaseContext,\n\t\t\t\t{ slug: project.slug },\n\t\t\t\t{\n\t\t\t\t\tid: authResult.identityId,\n\t\t\t\t\troles: authResult.roles,\n\t\t\t\t},\n\t\t\t),\n\t\t)\n\t\tlogger.debug('Memberships fetched', { memberships })\n\n\t\tif (memberships.length === 0) {\n\t\t\tthrow this.debug\n\t\t\t\t? new HttpErrorResponse(404, `You are not allowed to access project ${project.slug}`)\n\t\t\t\t: new HttpErrorResponse(404, `Project ${project.slug} NOT found`)\n\t\t}\n\t\tconst roles = memberships.map(it => it.role)\n\t\treturn {\n\t\t\t...projectContext,\n\t\t\tidentity: { id: authResult.identityId, roles },\n\t\t}\n\t}\n}\n"],"names":["HttpErrorResponse"],"mappings":";;;AASO,MAAM,uBAAuB;AAAA,EACnC,YACkB,OACA,wBAChB;AAFgB,SAAA,QAAA;AACA,SAAA,yBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,QAAQ,KAAkD;AACzD,UAAA,EAAE,OAAO,cAAc,EAAE,mBAAmB,QAAQ,eAAe;AACzE,UAAM,iBAAiB,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AAC9D,UAAA,EAAE,YAAY;AACpB,QAAI,CAAC,YAAY;AACV,YAAA,IAAIA,WAAAA,kBAAkB,KAAK,yBAAyB;AAAA,IAAA;AAE3D,UAAM,cAAc,MAAM;AAAA,MAAM;AAAA,MAAmB,MAClD,gBAAgB,qBAAqB;AAAA,QACpC,gBAAgB;AAAA,QAChB,EAAE,MAAM,QAAQ,KAAK;AAAA,QACrB;AAAA,UACC,IAAI,WAAW;AAAA,UACf,OAAO,WAAW;AAAA,QAAA;AAAA,MACnB;AAAA,IAEF;AACA,WAAO,MAAM,uBAAuB,EAAE,YAAA,CAAa;AAE/C,QAAA,YAAY,WAAW,GAAG;AAC7B,YAAM,KAAK,QACR,IAAIA,WAAAA,kBAAkB,KAAK,yCAAyC,QAAQ,IAAI,EAAE,IAClF,IAAIA,WAAkB,kBAAA,KAAK,WAAW,QAAQ,IAAI,YAAY;AAAA,IAAA;AAElE,UAAM,QAAQ,YAAY,IAAI,CAAA,OAAM,GAAG,IAAI;AACpC,WAAA;AAAA,MACN,GAAG;AAAA,MACH,UAAU,EAAE,IAAI,WAAW,YAAY,MAAM;AAAA,IAC9C;AAAA,EAAA;AAEF;;"}
+{"version":3,"file":"ActionsContextResolver.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsContextResolver.ts"],"sourcesContent":["import { ApplicationContext, HttpErrorResponse, ProjectConfig, ProjectContainer, ProjectContextResolver } from '@contember/engine-http'\nimport { Identity } from '../../authorization'\n\nexport interface ActionsContext {\n\tprojectContainer: ProjectContainer\n\tproject: ProjectConfig\n\tidentity: Identity\n}\n\nexport class ActionsContextResolver {\n\tconstructor(\n\t\tprivate readonly debug: boolean,\n\t\tprivate readonly projectContextResolver: ProjectContextResolver,\n\t) {\n\t}\n\n\tasync resolve(ctx: ApplicationContext): Promise<ActionsContext> {\n\t\tconst { timer, projectGroup: { tenantContainer }, logger, authResult } = ctx\n\t\tconst projectContext = await this.projectContextResolver.resolve(ctx)\n\t\tconst { project } = projectContext\n\t\tif (!authResult) {\n\t\t\tthrow new HttpErrorResponse(401, 'Authentication required')\n\t\t}\n\t\tconst memberships = await timer('MembershipFetch', () =>\n\t\t\ttenantContainer.projectMemberManager.getEffectiveProjectMemberships(\n\t\t\t\ttenantContainer.databaseContext,\n\t\t\t\t{ slug: project.slug },\n\t\t\t\t{\n\t\t\t\t\tid: authResult.identityId,\n\t\t\t\t\troles: authResult.roles,\n\t\t\t\t},\n\t\t\t))\n\t\tlogger.debug('Memberships fetched', { memberships })\n\n\t\tif (memberships.length === 0) {\n\t\t\tthrow this.debug\n\t\t\t\t? new HttpErrorResponse(404, `You are not allowed to access project ${project.slug}`)\n\t\t\t\t: new HttpErrorResponse(404, `Project ${project.slug} NOT found`)\n\t\t}\n\t\tconst roles = memberships.map(it => it.role)\n\t\treturn {\n\t\t\t...projectContext,\n\t\t\tidentity: { id: authResult.identityId, roles },\n\t\t}\n\t}\n}\n"],"names":["HttpErrorResponse"],"mappings":";;;AASO,MAAM,uBAAuB;AAAA,EACnC,YACkB,OACA,wBAChB;AAFgB,SAAA,QAAA;AACA,SAAA,yBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,QAAQ,KAAkD;AAC/D,UAAM,EAAE,OAAO,cAAc,EAAE,mBAAmB,QAAQ,eAAe;AACzE,UAAM,iBAAiB,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AACpE,UAAM,EAAE,YAAY;AACpB,QAAI,CAAC,YAAY;AAChB,YAAM,IAAIA,WAAAA,kBAAkB,KAAK,yBAAyB;AAAA,IAC3D;AACA,UAAM,cAAc,MAAM,MAAM,mBAAmB,MAClD,gBAAgB,qBAAqB;AAAA,MACpC,gBAAgB;AAAA,MAChB,EAAE,MAAM,QAAQ,KAAA;AAAA,MAChB;AAAA,QACC,IAAI,WAAW;AAAA,QACf,OAAO,WAAW;AAAA,MAAA;AAAA,IACnB,CACA;AACF,WAAO,MAAM,uBAAuB,EAAE,YAAA,CAAa;AAEnD,QAAI,YAAY,WAAW,GAAG;AAC7B,YAAM,KAAK,QACR,IAAIA,WAAAA,kBAAkB,KAAK,yCAAyC,QAAQ,IAAI,EAAE,IAClF,IAAIA,WAAAA,kBAAkB,KAAK,WAAW,QAAQ,IAAI,YAAY;AAAA,IAClE;AACA,UAAM,QAAQ,YAAY,IAAI,CAAA,OAAM,GAAG,IAAI;AAC3C,WAAO;AAAA,MACN,GAAG;AAAA,MACH,UAAU,EAAE,IAAI,WAAW,YAAY,MAAA;AAAA,IAAM;AAAA,EAE/C;AACD;;"}

package/dist/development/src/graphql/http/ActionsContextResolver.js

@@ -11,17 +11,14 @@ class ActionsContextResolver {
     if (!authResult) {
       throw new HttpErrorResponse(401, "Authentication required");
     }
-    const memberships = await timer(
-      "MembershipFetch",
-      () => tenantContainer.projectMemberManager.getEffectiveProjectMemberships(
-        tenantContainer.databaseContext,
-        { slug: project.slug },
-        {
-          id: authResult.identityId,
-          roles: authResult.roles
-        }
-      )
-    );
+    const memberships = await timer("MembershipFetch", () => tenantContainer.projectMemberManager.getEffectiveProjectMemberships(
+      tenantContainer.databaseContext,
+      { slug: project.slug },
+      {
+        id: authResult.identityId,
+        roles: authResult.roles
+      }
+    ));
     logger.debug("Memberships fetched", { memberships });
     if (memberships.length === 0) {
       throw this.debug ? new HttpErrorResponse(404, `You are not allowed to access project ${project.slug}`) : new HttpErrorResponse(404, `Project ${project.slug} NOT found`);

package/dist/development/src/graphql/http/ActionsContextResolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsContextResolver.js","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsContextResolver.ts"],"sourcesContent":["import { ApplicationContext, HttpErrorResponse, ProjectConfig, ProjectContainer, ProjectContextResolver } from '@contember/engine-http'\nimport { Identity } from '../../authorization'\n\nexport interface ActionsContext {\n\tprojectContainer: ProjectContainer\n\tproject: ProjectConfig\n\tidentity: Identity\n}\n\nexport class ActionsContextResolver {\n\tconstructor(\n\t\tprivate readonly debug: boolean,\n\t\tprivate readonly projectContextResolver: ProjectContextResolver,\n\t) {\n\t}\n\n\tasync resolve(ctx: ApplicationContext): Promise<ActionsContext> {\n\t\tconst { timer, projectGroup: { tenantContainer }, logger, authResult } = ctx\n\t\tconst projectContext = await this.projectContextResolver.resolve(ctx)\n\t\tconst { project } = projectContext\n\t\tif (!authResult) {\n\t\t\tthrow new HttpErrorResponse(401, 'Authentication required')\n\t\t}\n\t\tconst memberships = await timer('MembershipFetch', () =>\n\t\t\ttenantContainer.projectMemberManager.getEffectiveProjectMemberships(\n\t\t\t\ttenantContainer.databaseContext,\n\t\t\t\t{ slug: project.slug },\n\t\t\t\t{\n\t\t\t\t\tid: authResult.identityId,\n\t\t\t\t\troles: authResult.roles,\n\t\t\t\t},\n\t\t\t),\n\t\t)\n\t\tlogger.debug('Memberships fetched', { memberships })\n\n\t\tif (memberships.length === 0) {\n\t\t\tthrow this.debug\n\t\t\t\t? new HttpErrorResponse(404, `You are not allowed to access project ${project.slug}`)\n\t\t\t\t: new HttpErrorResponse(404, `Project ${project.slug} NOT found`)\n\t\t}\n\t\tconst roles = memberships.map(it => it.role)\n\t\treturn {\n\t\t\t...projectContext,\n\t\t\tidentity: { id: authResult.identityId, roles },\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";AASO,MAAM,uBAAuB;AAAA,EACnC,YACkB,OACA,wBAChB;AAFgB,SAAA,QAAA;AACA,SAAA,yBAAA;AAAA,EAAA;AAAA,EAIlB,MAAM,QAAQ,KAAkD;AACzD,UAAA,EAAE,OAAO,cAAc,EAAE,mBAAmB,QAAQ,eAAe;AACzE,UAAM,iBAAiB,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AAC9D,UAAA,EAAE,YAAY;AACpB,QAAI,CAAC,YAAY;AACV,YAAA,IAAI,kBAAkB,KAAK,yBAAyB;AAAA,IAAA;AAE3D,UAAM,cAAc,MAAM;AAAA,MAAM;AAAA,MAAmB,MAClD,gBAAgB,qBAAqB;AAAA,QACpC,gBAAgB;AAAA,QAChB,EAAE,MAAM,QAAQ,KAAK;AAAA,QACrB;AAAA,UACC,IAAI,WAAW;AAAA,UACf,OAAO,WAAW;AAAA,QAAA;AAAA,MACnB;AAAA,IAEF;AACA,WAAO,MAAM,uBAAuB,EAAE,YAAA,CAAa;AAE/C,QAAA,YAAY,WAAW,GAAG;AAC7B,YAAM,KAAK,QACR,IAAI,kBAAkB,KAAK,yCAAyC,QAAQ,IAAI,EAAE,IAClF,IAAI,kBAAkB,KAAK,WAAW,QAAQ,IAAI,YAAY;AAAA,IAAA;AAElE,UAAM,QAAQ,YAAY,IAAI,CAAA,OAAM,GAAG,IAAI;AACpC,WAAA;AAAA,MACN,GAAG;AAAA,MACH,UAAU,EAAE,IAAI,WAAW,YAAY,MAAM;AAAA,IAC9C;AAAA,EAAA;AAEF;"}
+{"version":3,"file":"ActionsContextResolver.js","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsContextResolver.ts"],"sourcesContent":["import { ApplicationContext, HttpErrorResponse, ProjectConfig, ProjectContainer, ProjectContextResolver } from '@contember/engine-http'\nimport { Identity } from '../../authorization'\n\nexport interface ActionsContext {\n\tprojectContainer: ProjectContainer\n\tproject: ProjectConfig\n\tidentity: Identity\n}\n\nexport class ActionsContextResolver {\n\tconstructor(\n\t\tprivate readonly debug: boolean,\n\t\tprivate readonly projectContextResolver: ProjectContextResolver,\n\t) {\n\t}\n\n\tasync resolve(ctx: ApplicationContext): Promise<ActionsContext> {\n\t\tconst { timer, projectGroup: { tenantContainer }, logger, authResult } = ctx\n\t\tconst projectContext = await this.projectContextResolver.resolve(ctx)\n\t\tconst { project } = projectContext\n\t\tif (!authResult) {\n\t\t\tthrow new HttpErrorResponse(401, 'Authentication required')\n\t\t}\n\t\tconst memberships = await timer('MembershipFetch', () =>\n\t\t\ttenantContainer.projectMemberManager.getEffectiveProjectMemberships(\n\t\t\t\ttenantContainer.databaseContext,\n\t\t\t\t{ slug: project.slug },\n\t\t\t\t{\n\t\t\t\t\tid: authResult.identityId,\n\t\t\t\t\troles: authResult.roles,\n\t\t\t\t},\n\t\t\t))\n\t\tlogger.debug('Memberships fetched', { memberships })\n\n\t\tif (memberships.length === 0) {\n\t\t\tthrow this.debug\n\t\t\t\t? new HttpErrorResponse(404, `You are not allowed to access project ${project.slug}`)\n\t\t\t\t: new HttpErrorResponse(404, `Project ${project.slug} NOT found`)\n\t\t}\n\t\tconst roles = memberships.map(it => it.role)\n\t\treturn {\n\t\t\t...projectContext,\n\t\t\tidentity: { id: authResult.identityId, roles },\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";AASO,MAAM,uBAAuB;AAAA,EACnC,YACkB,OACA,wBAChB;AAFgB,SAAA,QAAA;AACA,SAAA,yBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,QAAQ,KAAkD;AAC/D,UAAM,EAAE,OAAO,cAAc,EAAE,mBAAmB,QAAQ,eAAe;AACzE,UAAM,iBAAiB,MAAM,KAAK,uBAAuB,QAAQ,GAAG;AACpE,UAAM,EAAE,YAAY;AACpB,QAAI,CAAC,YAAY;AAChB,YAAM,IAAI,kBAAkB,KAAK,yBAAyB;AAAA,IAC3D;AACA,UAAM,cAAc,MAAM,MAAM,mBAAmB,MAClD,gBAAgB,qBAAqB;AAAA,MACpC,gBAAgB;AAAA,MAChB,EAAE,MAAM,QAAQ,KAAA;AAAA,MAChB;AAAA,QACC,IAAI,WAAW;AAAA,QACf,OAAO,WAAW;AAAA,MAAA;AAAA,IACnB,CACA;AACF,WAAO,MAAM,uBAAuB,EAAE,YAAA,CAAa;AAEnD,QAAI,YAAY,WAAW,GAAG;AAC7B,YAAM,KAAK,QACR,IAAI,kBAAkB,KAAK,yCAAyC,QAAQ,IAAI,EAAE,IAClF,IAAI,kBAAkB,KAAK,WAAW,QAAQ,IAAI,YAAY;AAAA,IAClE;AACA,UAAM,QAAQ,YAAY,IAAI,CAAA,OAAM,GAAG,IAAI;AAC3C,WAAO;AAAA,MACN,GAAG;AAAA,MACH,UAAU,EAAE,IAAI,WAAW,YAAY,MAAA;AAAA,IAAM;AAAA,EAE/C;AACD;"}

package/dist/development/src/graphql/http/ActionsGraphQLHandlerFactory.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsGraphQLHandlerFactory.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsGraphQLHandlerFactory.ts"],"sourcesContent":["import { makeExecutableSchema } from '@graphql-tools/schema'\nimport { createGraphQLQueryHandler, GraphQLQueryHandler } from '@contember/engine-http'\nimport { ResolversFactory } from '../resolvers/ResolversFactory'\nimport { schema as graphqlDocument } from '../schema/actions.graphql'\nimport { ActionsContext } from '../resolvers/ActionsContext'\n\n\nexport type ActionsGraphQLHandler = GraphQLQueryHandler<ActionsContext>\n\nexport class ActionsGraphQLHandlerFactory {\n\tcreate(resolversFactory: ResolversFactory): ActionsGraphQLHandler {\n\t\tconst resolvers = resolversFactory.create()\n\t\tconst schema = makeExecutableSchema({\n\t\t\ttypeDefs: graphqlDocument,\n\t\t\tresolvers,\n\t\t})\n\n\t\treturn createGraphQLQueryHandler<ActionsContext>({\n\t\t\tschema,\n\t\t\tlisteners: [],\n\t\t})\n\t}\n}\n"],"names":["schema","makeExecutableSchema","graphqlDocument","createGraphQLQueryHandler"],"mappings":";;;;;AASO,MAAM,6BAA6B;AAAA,EACzC,OAAO,kBAA2D;AAC3D,UAAA,YAAY,iBAAiB,OAAO;AAC1C,UAAMA,WAASC,OAAAA,qBAAqB;AAAA,MACnC,UAAUC,gBAAA;AAAA,MACV;AAAA,IAAA,CACA;AAED,WAAOC,qCAA0C;AAAA,MAAA,QAChDH;AAAAA,MACA,WAAW,CAAA;AAAA,IAAC,CACZ;AAAA,EAAA;AAEH;;"}
+{"version":3,"file":"ActionsGraphQLHandlerFactory.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsGraphQLHandlerFactory.ts"],"sourcesContent":["import { makeExecutableSchema } from '@graphql-tools/schema'\nimport { createGraphQLQueryHandler, GraphQLQueryHandler } from '@contember/engine-http'\nimport { ResolversFactory } from '../resolvers/ResolversFactory'\nimport { schema as graphqlDocument } from '../schema/actions.graphql'\nimport { ActionsContext } from '../resolvers/ActionsContext'\n\nexport type ActionsGraphQLHandler = GraphQLQueryHandler<ActionsContext>\n\nexport class ActionsGraphQLHandlerFactory {\n\tcreate(resolversFactory: ResolversFactory): ActionsGraphQLHandler {\n\t\tconst resolvers = resolversFactory.create()\n\t\tconst schema = makeExecutableSchema({\n\t\t\ttypeDefs: graphqlDocument,\n\t\t\tresolvers,\n\t\t})\n\n\t\treturn createGraphQLQueryHandler<ActionsContext>({\n\t\t\tschema,\n\t\t\tlisteners: [],\n\t\t})\n\t}\n}\n"],"names":["schema","makeExecutableSchema","graphqlDocument","createGraphQLQueryHandler"],"mappings":";;;;;AAQO,MAAM,6BAA6B;AAAA,EACzC,OAAO,kBAA2D;AACjE,UAAM,YAAY,iBAAiB,OAAA;AACnC,UAAMA,WAASC,OAAAA,qBAAqB;AAAA,MACnC,UAAUC,gBAAAA;AAAAA,MACV;AAAA,IAAA,CACA;AAED,WAAOC,qCAA0C;AAAA,MAAA,QAChDH;AAAAA,MACA,WAAW,CAAA;AAAA,IAAC,CACZ;AAAA,EACF;AACD;;"}

package/dist/development/src/graphql/http/ActionsGraphQLHandlerFactory.js.map

@@ -1 +1 @@
-{"version":3,"file":"ActionsGraphQLHandlerFactory.js","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsGraphQLHandlerFactory.ts"],"sourcesContent":["import { makeExecutableSchema } from '@graphql-tools/schema'\nimport { createGraphQLQueryHandler, GraphQLQueryHandler } from '@contember/engine-http'\nimport { ResolversFactory } from '../resolvers/ResolversFactory'\nimport { schema as graphqlDocument } from '../schema/actions.graphql'\nimport { ActionsContext } from '../resolvers/ActionsContext'\n\n\nexport type ActionsGraphQLHandler = GraphQLQueryHandler<ActionsContext>\n\nexport class ActionsGraphQLHandlerFactory {\n\tcreate(resolversFactory: ResolversFactory): ActionsGraphQLHandler {\n\t\tconst resolvers = resolversFactory.create()\n\t\tconst schema = makeExecutableSchema({\n\t\t\ttypeDefs: graphqlDocument,\n\t\t\tresolvers,\n\t\t})\n\n\t\treturn createGraphQLQueryHandler<ActionsContext>({\n\t\t\tschema,\n\t\t\tlisteners: [],\n\t\t})\n\t}\n}\n"],"names":["schema","graphqlDocument"],"mappings":";;;AASO,MAAM,6BAA6B;AAAA,EACzC,OAAO,kBAA2D;AAC3D,UAAA,YAAY,iBAAiB,OAAO;AAC1C,UAAMA,WAAS,qBAAqB;AAAA,MACnC,UAAUC;AAAAA,MACV;AAAA,IAAA,CACA;AAED,WAAO,0BAA0C;AAAA,MAAA,QAChDD;AAAAA,MACA,WAAW,CAAA;AAAA,IAAC,CACZ;AAAA,EAAA;AAEH;"}
+{"version":3,"file":"ActionsGraphQLHandlerFactory.js","sources":["../../../../../../packages/engine-actions/src/graphql/http/ActionsGraphQLHandlerFactory.ts"],"sourcesContent":["import { makeExecutableSchema } from '@graphql-tools/schema'\nimport { createGraphQLQueryHandler, GraphQLQueryHandler } from '@contember/engine-http'\nimport { ResolversFactory } from '../resolvers/ResolversFactory'\nimport { schema as graphqlDocument } from '../schema/actions.graphql'\nimport { ActionsContext } from '../resolvers/ActionsContext'\n\nexport type ActionsGraphQLHandler = GraphQLQueryHandler<ActionsContext>\n\nexport class ActionsGraphQLHandlerFactory {\n\tcreate(resolversFactory: ResolversFactory): ActionsGraphQLHandler {\n\t\tconst resolvers = resolversFactory.create()\n\t\tconst schema = makeExecutableSchema({\n\t\t\ttypeDefs: graphqlDocument,\n\t\t\tresolvers,\n\t\t})\n\n\t\treturn createGraphQLQueryHandler<ActionsContext>({\n\t\t\tschema,\n\t\t\tlisteners: [],\n\t\t})\n\t}\n}\n"],"names":["schema","graphqlDocument"],"mappings":";;;AAQO,MAAM,6BAA6B;AAAA,EACzC,OAAO,kBAA2D;AACjE,UAAM,YAAY,iBAAiB,OAAA;AACnC,UAAMA,WAAS,qBAAqB;AAAA,MACnC,UAAUC;AAAAA,MACV;AAAA,IAAA,CACA;AAED,WAAO,0BAA0C;AAAA,MAAA,QAChDD;AAAAA,MACA,WAAW,CAAA;AAAA,IAAC,CACZ;AAAA,EACF;AACD;"}

package/dist/development/src/graphql/http/ActionsWebsocketControllerFactory.cjs

@@ -116,9 +116,12 @@ class ActionsWebsocketControllerFactory {
             const workerId = Math.random().toString().substring(2);
             const dispatchSupervisor = this.dispatchWorkerSupervisorFactory.create(projectGroup);
             try {
-              const running = dispatchSupervisor.run({ logger, onError: () => {
-                send({ type: "workerCrashed", workerId });
-              } });
+              const running = dispatchSupervisor.run({
+                logger,
+                onError: () => {
+                  send({ type: "workerCrashed", workerId });
+                }
+              });
               workers.push({ id: workerId, running });
               await running;
               send({ type: "workerStarted", workerId });