npm - @contember/engine-actions - Versions diffs - 2.2.0-alpha.3 → 2.2.0-alpha.4 - Mend

@contember/engine-actions 2.2.0-alpha.3 → 2.2.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (200) hide show

package/dist/production/src/dispatch/ProjectDispatcher.cjs.map CHANGED Viewed

	@@ -1 +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.js'\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.js'\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;;;"}
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.js'\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.js'\nimport { ActionsMetrics, ProjectActionsMetrics } from '../ActionsMetrics.js'\n\n/*\n Upper bound on how long the loop parks while idle. Even when the queue is empty (and we'd\n * otherwise wait indefinitely on a `pg_notify`), we re-check at least this often, so a lost\n * notification self-heals and the heartbeat keeps refreshing while the worker is genuinely idle.\n */\nconst MAX_IDLE_SLEEP_MS = 30_000\n\nexport class ProjectDispatcherFactory {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t\tprivate readonly metrics: ActionsMetrics,\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, this.metrics.forProject(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\tprivate readonly metrics: ProjectActionsMetrics,\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\tthis.metrics.dispose()\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\tthis.metrics.heartbeat()\n\t\t\t\t\t\t\tconst { succeeded, retried, failedAfterAttempt, failedUnknownTarget, 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\tproject: { slug: this.projectSlug },\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\tconst terminalFailed = failedAfterAttempt + failedUnknownTarget\n\t\t\t\t\t\t\tthis.metrics.succeeded(succeeded)\n\t\t\t\t\t\t\tthis.metrics.deliveryAttemptFailed(retried + failedAfterAttempt)\n\t\t\t\t\t\t\tthis.metrics.failed(terminalFailed)\n\t\t\t\t\t\t\tsucceedTotal += succeeded\n\t\t\t\t\t\t\tfailedTotal += terminalFailed\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 (or next retry is in the future), wait — but never longer than\n\t\t\t\t\t\t\t// MAX_IDLE_SLEEP_MS, so a lost notification self-heals and the heartbeat stays fresh.\n\t\t\t\t\t\t\tif (backoffMs !== 0) {\n\t\t\t\t\t\t\t\tconst waitMs = Math.min(backoffMs ?? MAX_IDLE_SLEEP_MS, MAX_IDLE_SLEEP_MS)\n\t\t\t\t\t\t\t\tawait new Promise<void>((resolve, reject) => {\n\t\t\t\t\t\t\t\t\tconst timeoutHandle = setTimeout(resolve, waitMs)\n\t\t\t\t\t\t\t\t\tconst cleanup = () => clearTimeout(timeoutHandle)\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\tthis.metrics.crashed()\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":"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"}

package/dist/production/src/dispatch/ProjectDispatcher.js CHANGED Viewed

@@ -1,19 +1,22 @@
 import { Listener } from "@contember/database";
 import { NOTIFY_CHANNEL_NAME } from "../utils/notifyChannel.js";
+const MAX_IDLE_SLEEP_MS = 3e4;
 class ProjectDispatcherFactory {
-  constructor(dispatcher) {
+  constructor(dispatcher, metrics) {
     this.dispatcher = dispatcher;
+    this.metrics = metrics;
   }
   create({ db, contentSchemaResolver, projectSlug }) {
-    return new ProjectDispatcher(this.dispatcher, db, contentSchemaResolver, projectSlug);
+    return new ProjectDispatcher(this.dispatcher, db, contentSchemaResolver, projectSlug, this.metrics.forProject(projectSlug));
   }
 }
 class ProjectDispatcher {
-  constructor(dispatcher, db, contentSchemaResolver, projectSlug) {
+  constructor(dispatcher, db, contentSchemaResolver, projectSlug, metrics) {
     this.dispatcher = dispatcher;
     this.db = db;
     this.contentSchemaResolver = contentSchemaResolver;
     this.projectSlug = projectSlug;
+    this.metrics = metrics;
   }
   async run({ logger, onError, onClose }) {
     return await new Promise(async (resolve, reject) => {
@@ -43,6 +46,7 @@ class ProjectDispatcher {
             end: async () => {
               aborted = true;
               await listener.end();
+              this.metrics.dispose();
               logger.info("Worker terminated", {
                 succeed: succeedTotal,
                 failed: failedTotal
@@ -51,24 +55,27 @@ class ProjectDispatcher {
           });
           try {
             while (!aborted) {
-              const { succeed, failed, backoffMs } = await this.dispatcher.processBatch({
+              this.metrics.heartbeat();
+              const { succeeded, retried, failedAfterAttempt, failedUnknownTarget, backoffMs } = await this.dispatcher.processBatch({
                 db,
                 contentSchemaResolver: this.contentSchemaResolver,
-                logger
+                logger,
+                project: { slug: this.projectSlug }
               });
-              succeedTotal += succeed;
-              failedTotal += failed;
+              const terminalFailed = failedAfterAttempt + failedUnknownTarget;
+              this.metrics.succeeded(succeeded);
+              this.metrics.deliveryAttemptFailed(retried + failedAfterAttempt);
+              this.metrics.failed(terminalFailed);
+              succeedTotal += succeeded;
+              failedTotal += terminalFailed;
               if (pendingError) {
                 throw pendingError;
               }
               if (backoffMs !== 0) {
+                const waitMs = Math.min(backoffMs ?? MAX_IDLE_SLEEP_MS, MAX_IDLE_SLEEP_MS);
                 await new Promise((resolve2, reject2) => {
-                  let cleanup = () => {
-                  };
-                  if (backoffMs !== void 0) {
-                    const timeoutHandle = setTimeout(resolve2, backoffMs);
-                    cleanup = () => clearTimeout(timeoutHandle);
-                  }
+                  const timeoutHandle = setTimeout(resolve2, waitMs);
+                  const cleanup = () => clearTimeout(timeoutHandle);
                   resolvePending = () => {
                     resolve2();
                     cleanup();
@@ -83,6 +90,7 @@ class ProjectDispatcher {
             onClose?.();
           } catch (e) {
             await listener.end();
+            this.metrics.crashed();
             onError(e);
           }
         });

package/dist/production/src/dispatch/ProjectDispatcher.js.map CHANGED Viewed

	@@ -1 +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.js'\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.js'\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;"}
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.js'\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.js'\nimport { ActionsMetrics, ProjectActionsMetrics } from '../ActionsMetrics.js'\n\n/*\n Upper bound on how long the loop parks while idle. Even when the queue is empty (and we'd\n * otherwise wait indefinitely on a `pg_notify`), we re-check at least this often, so a lost\n * notification self-heals and the heartbeat keeps refreshing while the worker is genuinely idle.\n */\nconst MAX_IDLE_SLEEP_MS = 30_000\n\nexport class ProjectDispatcherFactory {\n\tconstructor(\n\t\tprivate readonly dispatcher: EventDispatcher,\n\t\tprivate readonly metrics: ActionsMetrics,\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, this.metrics.forProject(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\tprivate readonly metrics: ProjectActionsMetrics,\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\tthis.metrics.dispose()\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\tthis.metrics.heartbeat()\n\t\t\t\t\t\t\tconst { succeeded, retried, failedAfterAttempt, failedUnknownTarget, 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\tproject: { slug: this.projectSlug },\n\t\t\t\t\t\t\t})\n\t\t\t\t\t\t\tconst terminalFailed = failedAfterAttempt + failedUnknownTarget\n\t\t\t\t\t\t\tthis.metrics.succeeded(succeeded)\n\t\t\t\t\t\t\tthis.metrics.deliveryAttemptFailed(retried + failedAfterAttempt)\n\t\t\t\t\t\t\tthis.metrics.failed(terminalFailed)\n\t\t\t\t\t\t\tsucceedTotal += succeeded\n\t\t\t\t\t\t\tfailedTotal += terminalFailed\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 (or next retry is in the future), wait — but never longer than\n\t\t\t\t\t\t\t// MAX_IDLE_SLEEP_MS, so a lost notification self-heals and the heartbeat stays fresh.\n\t\t\t\t\t\t\tif (backoffMs !== 0) {\n\t\t\t\t\t\t\t\tconst waitMs = Math.min(backoffMs ?? MAX_IDLE_SLEEP_MS, MAX_IDLE_SLEEP_MS)\n\t\t\t\t\t\t\t\tawait new Promise<void>((resolve, reject) => {\n\t\t\t\t\t\t\t\t\tconst timeoutHandle = setTimeout(resolve, waitMs)\n\t\t\t\t\t\t\t\t\tconst cleanup = () => clearTimeout(timeoutHandle)\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\tthis.metrics.crashed()\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":"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"}

package/dist/production/src/dispatch/WebhookTargetHandler.cjs CHANGED Viewed

@@ -44,7 +44,9 @@ class WebhookTargetHandler {
       const response = await this.fetch(timeoutMs ?? DEFAULT_TIMEOUT_MS, target, variables, events);
       eventResponseFactory = this.createResponseFactory({
         response,
-        events
+        events,
+        target,
+        logger
       });
     } catch (e) {
       logger.warn(e);
@@ -60,8 +62,14 @@ class WebhookTargetHandler {
     const durationMs = getDuration();
     return events.map((it) => ({ target, row: it, result: { durationMs, ...eventResponseFactory(it) } }));
   }
-  createResponseFactory({ response, events }) {
+  createResponseFactory({ response, events, target, logger }) {
     if (!response.ok) {
+      logger.warn("Webhook target responded with an error status", {
+        target: target.name,
+        status: response.status,
+        statusText: response.statusText,
+        events: events.map((it) => it.id)
+      });
       return () => ({
         ok: false,
         code: response.status,
@@ -88,6 +96,12 @@ class WebhookTargetHandler {
       const failedEvents = Object.fromEntries(responseData.failures?.map((it) => [it.eventId, it]) ?? []);
       const missingEvents = Object.keys(failedEvents).filter((it) => !eventsInBatch.has(it));
       if (missingEvents.length) {
+        logger.warn("Webhook target reported failures for event ids outside the batch", {
+          target: target.name,
+          status: response.status,
+          unknownEventIds: missingEvents.length,
+          events: events.map((it) => it.id)
+        });
         return () => ({
           ok: false,
           code: response.status,
@@ -95,6 +109,14 @@ class WebhookTargetHandler {
           errorMessage: "Invalid response: undefined events IDs: " + missingEvents.join("; ")
         });
       }
+      const failedIds = events.filter((it) => failedEvents[it.id]).map((it) => it.id);
+      if (failedIds.length) {
+        logger.warn("Webhook target reported failed events", {
+          target: target.name,
+          status: response.status,
+          events: failedIds
+        });
+      }
       return (it) => {
         if (!failedEvents[it.id]) {
           return { ok: true, code: response.status };
@@ -106,6 +128,11 @@ class WebhookTargetHandler {
         };
       };
     } catch (e) {
+      logger.warn("Webhook target returned a malformed response", {
+        target: target.name,
+        status: response.status,
+        events: events.map((it) => it.id)
+      });
       return () => ({
         ok: false,
         code: response.status,

package/dist/production/src/dispatch/WebhookTargetHandler.cjs.map CHANGED Viewed

	@@ -1 +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.js'\nimport { VariablesMap } from '../model/VariablesManager.js'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher.js'\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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"}
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.js'\nimport { VariablesMap } from '../model/VariablesManager.js'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher.js'\nimport { Logger } from '@contember/logger'\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\ttarget,\n\t\t\t\tlogger,\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, target, logger }: {\n\t\tresponse: FetcherResponse\n\t\tevents: EventRow[]\n\t\ttarget: Actions.WebhookTarget\n\t\tlogger: Logger\n\t}): EventResponseFactory {\n\t\tif (!response.ok) {\n\t\t\t// The target is identified by name only: its URL and headers may carry credentials.\n\t\t\tlogger.warn('Webhook target responded with an error status', {\n\t\t\t\ttarget: target.name,\n\t\t\t\tstatus: response.status,\n\t\t\t\tstatusText: response.statusText,\n\t\t\t\tevents: events.map(it => it.id),\n\t\t\t})\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\t// Only the count of unknown ids: they are strings the target chose, not ours.\n\t\t\t\tlogger.warn('Webhook target reported failures for event ids outside the batch', {\n\t\t\t\t\ttarget: target.name,\n\t\t\t\t\tstatus: response.status,\n\t\t\t\t\tunknownEventIds: missingEvents.length,\n\t\t\t\t\tevents: events.map(it => it.id),\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\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\tconst failedIds = events.filter(it => failedEvents[it.id]).map(it => it.id)\n\t\t\tif (failedIds.length) {\n\t\t\t\t// Per-event errors come from the target's payload and stay in the event log, not here.\n\t\t\t\tlogger.warn('Webhook target reported failed events', {\n\t\t\t\t\ttarget: target.name,\n\t\t\t\t\tstatus: response.status,\n\t\t\t\t\tevents: failedIds,\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\t// The parser message quotes the offending payload, so it stays in the event log only.\n\t\t\tlogger.warn('Webhook target returned a malformed response', {\n\t\t\t\ttarget: target.name,\n\t\t\t\tstatus: response.status,\n\t\t\t\tevents: events.map(it => it.id),\n\t\t\t})\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/production/src/dispatch/WebhookTargetHandler.js CHANGED Viewed

@@ -25,7 +25,9 @@ class WebhookTargetHandler {
       const response = await this.fetch(timeoutMs ?? DEFAULT_TIMEOUT_MS, target, variables, events);
       eventResponseFactory = this.createResponseFactory({
         response,
-        events
+        events,
+        target,
+        logger
       });
     } catch (e) {
       logger.warn(e);
@@ -41,8 +43,14 @@ class WebhookTargetHandler {
     const durationMs = getDuration();
     return events.map((it) => ({ target, row: it, result: { durationMs, ...eventResponseFactory(it) } }));
   }
-  createResponseFactory({ response, events }) {
+  createResponseFactory({ response, events, target, logger }) {
     if (!response.ok) {
+      logger.warn("Webhook target responded with an error status", {
+        target: target.name,
+        status: response.status,
+        statusText: response.statusText,
+        events: events.map((it) => it.id)
+      });
       return () => ({
         ok: false,
         code: response.status,
@@ -69,6 +77,12 @@ class WebhookTargetHandler {
       const failedEvents = Object.fromEntries(responseData.failures?.map((it) => [it.eventId, it]) ?? []);
       const missingEvents = Object.keys(failedEvents).filter((it) => !eventsInBatch.has(it));
       if (missingEvents.length) {
+        logger.warn("Webhook target reported failures for event ids outside the batch", {
+          target: target.name,
+          status: response.status,
+          unknownEventIds: missingEvents.length,
+          events: events.map((it) => it.id)
+        });
         return () => ({
           ok: false,
           code: response.status,
@@ -76,6 +90,14 @@ class WebhookTargetHandler {
           errorMessage: "Invalid response: undefined events IDs: " + missingEvents.join("; ")
         });
       }
+      const failedIds = events.filter((it) => failedEvents[it.id]).map((it) => it.id);
+      if (failedIds.length) {
+        logger.warn("Webhook target reported failed events", {
+          target: target.name,
+          status: response.status,
+          events: failedIds
+        });
+      }
       return (it) => {
         if (!failedEvents[it.id]) {
           return { ok: true, code: response.status };
@@ -87,6 +109,11 @@ class WebhookTargetHandler {
         };
       };
     } catch (e) {
+      logger.warn("Webhook target returned a malformed response", {
+        target: target.name,
+        status: response.status,
+        events: events.map((it) => it.id)
+      });
       return () => ({
         ok: false,
         code: response.status,

package/dist/production/src/dispatch/WebhookTargetHandler.js.map CHANGED Viewed

	@@ -1 +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.js'\nimport { VariablesMap } from '../model/VariablesManager.js'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher.js'\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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"}
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.js'\nimport { VariablesMap } from '../model/VariablesManager.js'\nimport * as Typesafe from '@contember/typesafe'\nimport { FetcherResponse, WebhookFetcher } from './WebhookFetcher.js'\nimport { Logger } from '@contember/logger'\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\ttarget,\n\t\t\t\tlogger,\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, target, logger }: {\n\t\tresponse: FetcherResponse\n\t\tevents: EventRow[]\n\t\ttarget: Actions.WebhookTarget\n\t\tlogger: Logger\n\t}): EventResponseFactory {\n\t\tif (!response.ok) {\n\t\t\t// The target is identified by name only: its URL and headers may carry credentials.\n\t\t\tlogger.warn('Webhook target responded with an error status', {\n\t\t\t\ttarget: target.name,\n\t\t\t\tstatus: response.status,\n\t\t\t\tstatusText: response.statusText,\n\t\t\t\tevents: events.map(it => it.id),\n\t\t\t})\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\t// Only the count of unknown ids: they are strings the target chose, not ours.\n\t\t\t\tlogger.warn('Webhook target reported failures for event ids outside the batch', {\n\t\t\t\t\ttarget: target.name,\n\t\t\t\t\tstatus: response.status,\n\t\t\t\t\tunknownEventIds: missingEvents.length,\n\t\t\t\t\tevents: events.map(it => it.id),\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\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\tconst failedIds = events.filter(it => failedEvents[it.id]).map(it => it.id)\n\t\t\tif (failedIds.length) {\n\t\t\t\t// Per-event errors come from the target's payload and stay in the event log, not here.\n\t\t\t\tlogger.warn('Webhook target reported failed events', {\n\t\t\t\t\ttarget: target.name,\n\t\t\t\t\tstatus: response.status,\n\t\t\t\t\tevents: failedIds,\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\t// The parser message quotes the offending payload, so it stays in the event log only.\n\t\t\tlogger.warn('Webhook target returned a malformed response', {\n\t\t\t\ttarget: target.name,\n\t\t\t\tstatus: response.status,\n\t\t\t\tevents: events.map(it => it.id),\n\t\t\t})\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/production/src/graphql/resolvers/ResolversFactory.cjs CHANGED Viewed

@@ -14,7 +14,7 @@ class ResolversFactory {
     const resolvers = {
       Json: graphqlUtils.JSONType,
       DateTime: graphqlUtils.DateTimeType,
-      Uuid: graphqlUtils.UuidType,
+      UUID: graphqlUtils.UuidType,
       Mutation: {
         processBatch: this.processBatchMutationResolver.processBatch.bind(this.processBatchMutationResolver),
         setVariables: this.setVariablesMutationResolver.setVariables.bind(this.setVariablesMutationResolver),

package/dist/production/src/graphql/resolvers/ResolversFactory.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ResolversFactory.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/resolvers/ResolversFactory.ts"],"sourcesContent":["import { DateTimeType, JSONType, UuidType } from '@contember/graphql-utils'\nimport { Resolvers } from '../schema/index.js'\nimport { EventsQueryResolver } from './query/index.js'\nimport {\n\tProcessBatchMutationResolver,\n\tRetryEventMutationResolver,\n\tSetVariablesMutationResolver,\n\tStopEventMutationResolver,\n} from './mutation/index.js'\nimport { ActionsContext } from './ActionsContext.js'\nimport { VariablesQueryResolver } from './query/VariablesQueryResolver.js'\n\nexport class ResolversFactory {\n\tconstructor(\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly processBatchMutationResolver: ProcessBatchMutationResolver,\n\t\tprivate readonly variablesQueryResolver: VariablesQueryResolver,\n\t\tprivate readonly setVariablesMutationResolver: SetVariablesMutationResolver,\n\t\tprivate readonly retryEventMutationResolver: RetryEventMutationResolver,\n\t\tprivate readonly stopEventMutationResolver: StopEventMutationResolver,\n\t) {\n\t}\n\n\tcreate(): Resolvers {\n\t\tconst resolvers: Resolvers<ActionsContext> & { Mutation: Required<Resolvers<ActionsContext>['Mutation']> } & {\n\t\t\tQuery: Required<Resolvers<ActionsContext>['Query']>\n\t\t} = {\n\t\t\tJson: JSONType,\n\t\t\tDateTime: DateTimeType,\n\t\t\~~tUuid~~: UuidType,\n\t\t\tMutation: {\n\t\t\t\tprocessBatch: this.processBatchMutationResolver.processBatch.bind(this.processBatchMutationResolver),\n\t\t\t\tsetVariables: this.setVariablesMutationResolver.setVariables.bind(this.setVariablesMutationResolver),\n\t\t\t\tretryEvent: this.retryEventMutationResolver.retryEvent.bind(this.retryEventMutationResolver),\n\t\t\t\tstopEvent: this.stopEventMutationResolver.stopEvent.bind(this.stopEventMutationResolver),\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\teventsInProcessing: this.eventsQueryResolver.eventsInProcessing.bind(this.eventsQueryResolver),\n\t\t\t\teventsToProcess: this.eventsQueryResolver.eventsToProcess.bind(this.eventsQueryResolver),\n\t\t\t\tfailedEvents: this.eventsQueryResolver.failedEvents.bind(this.eventsQueryResolver),\n\t\t\t\tevent: this.eventsQueryResolver.event.bind(this.eventsQueryResolver),\n\t\t\t\tvariables: this.variablesQueryResolver.variables.bind(this.variablesQueryResolver),\n\t\t\t},\n\t\t}\n\t\treturn resolvers\n\t}\n}\n"],"names":["JSONType","DateTimeType","UuidType"],"mappings":";;;AAYO,MAAM,iBAAiB;AAAA,EAC7B,YACkB,qBACA,8BACA,wBACA,8BACA,4BACA,2BAChB;AANgB,SAAA,sBAAA;AACA,SAAA,+BAAA;AACA,SAAA,yBAAA;AACA,SAAA,+BAAA;AACA,SAAA,6BAAA;AACA,SAAA,4BAAA;AAAA,EAElB;AAAA,EAEA,SAAoB;AACnB,UAAM,YAEF;AAAA,MACH,MAAMA,aAAAA;AAAAA,MACN,UAAUC,aAAAA;AAAAA,MACV,MAAMC,aAAAA;AAAAA,MACN,UAAU;AAAA,QACT,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,YAAY,KAAK,2BAA2B,WAAW,KAAK,KAAK,0BAA0B;AAAA,QAC3F,WAAW,KAAK,0BAA0B,UAAU,KAAK,KAAK,yBAAyB;AAAA,MAAA;AAAA,MAExF,OAAO;AAAA,QACN,oBAAoB,KAAK,oBAAoB,mBAAmB,KAAK,KAAK,mBAAmB;AAAA,QAC7F,iBAAiB,KAAK,oBAAoB,gBAAgB,KAAK,KAAK,mBAAmB;AAAA,QACvF,cAAc,KAAK,oBAAoB,aAAa,KAAK,KAAK,mBAAmB;AAAA,QACjF,OAAO,KAAK,oBAAoB,MAAM,KAAK,KAAK,mBAAmB;AAAA,QACnE,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAAA;AAAA,IAClF;AAED,WAAO;AAAA,EACR;AACD;;"}
1	+ {"version":3,"file":"ResolversFactory.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/resolvers/ResolversFactory.ts"],"sourcesContent":["import { DateTimeType, JSONType, UuidType } from '@contember/graphql-utils'\nimport { Resolvers } from '../schema/index.js'\nimport { EventsQueryResolver } from './query/index.js'\nimport {\n\tProcessBatchMutationResolver,\n\tRetryEventMutationResolver,\n\tSetVariablesMutationResolver,\n\tStopEventMutationResolver,\n} from './mutation/index.js'\nimport { ActionsContext } from './ActionsContext.js'\nimport { VariablesQueryResolver } from './query/VariablesQueryResolver.js'\n\nexport class ResolversFactory {\n\tconstructor(\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly processBatchMutationResolver: ProcessBatchMutationResolver,\n\t\tprivate readonly variablesQueryResolver: VariablesQueryResolver,\n\t\tprivate readonly setVariablesMutationResolver: SetVariablesMutationResolver,\n\t\tprivate readonly retryEventMutationResolver: RetryEventMutationResolver,\n\t\tprivate readonly stopEventMutationResolver: StopEventMutationResolver,\n\t) {\n\t}\n\n\tcreate(): Resolvers {\n\t\tconst resolvers: Resolvers<ActionsContext> & { Mutation: Required<Resolvers<ActionsContext>['Mutation']> } & {\n\t\t\tQuery: Required<Resolvers<ActionsContext>['Query']>\n\t\t} = {\n\t\t\tJson: JSONType,\n\t\t\tDateTime: DateTimeType,\n\t\t\tUUID: UuidType,\n\t\t\tMutation: {\n\t\t\t\tprocessBatch: this.processBatchMutationResolver.processBatch.bind(this.processBatchMutationResolver),\n\t\t\t\tsetVariables: this.setVariablesMutationResolver.setVariables.bind(this.setVariablesMutationResolver),\n\t\t\t\tretryEvent: this.retryEventMutationResolver.retryEvent.bind(this.retryEventMutationResolver),\n\t\t\t\tstopEvent: this.stopEventMutationResolver.stopEvent.bind(this.stopEventMutationResolver),\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\teventsInProcessing: this.eventsQueryResolver.eventsInProcessing.bind(this.eventsQueryResolver),\n\t\t\t\teventsToProcess: this.eventsQueryResolver.eventsToProcess.bind(this.eventsQueryResolver),\n\t\t\t\tfailedEvents: this.eventsQueryResolver.failedEvents.bind(this.eventsQueryResolver),\n\t\t\t\tevent: this.eventsQueryResolver.event.bind(this.eventsQueryResolver),\n\t\t\t\tvariables: this.variablesQueryResolver.variables.bind(this.variablesQueryResolver),\n\t\t\t},\n\t\t}\n\t\treturn resolvers\n\t}\n}\n"],"names":["JSONType","DateTimeType","UuidType"],"mappings":";;;AAYO,MAAM,iBAAiB;AAAA,EAC7B,YACkB,qBACA,8BACA,wBACA,8BACA,4BACA,2BAChB;AANgB,SAAA,sBAAA;AACA,SAAA,+BAAA;AACA,SAAA,yBAAA;AACA,SAAA,+BAAA;AACA,SAAA,6BAAA;AACA,SAAA,4BAAA;AAAA,EAElB;AAAA,EAEA,SAAoB;AACnB,UAAM,YAEF;AAAA,MACH,MAAMA,aAAAA;AAAAA,MACN,UAAUC,aAAAA;AAAAA,MACV,MAAMC,aAAAA;AAAAA,MACN,UAAU;AAAA,QACT,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,YAAY,KAAK,2BAA2B,WAAW,KAAK,KAAK,0BAA0B;AAAA,QAC3F,WAAW,KAAK,0BAA0B,UAAU,KAAK,KAAK,yBAAyB;AAAA,MAAA;AAAA,MAExF,OAAO;AAAA,QACN,oBAAoB,KAAK,oBAAoB,mBAAmB,KAAK,KAAK,mBAAmB;AAAA,QAC7F,iBAAiB,KAAK,oBAAoB,gBAAgB,KAAK,KAAK,mBAAmB;AAAA,QACvF,cAAc,KAAK,oBAAoB,aAAa,KAAK,KAAK,mBAAmB;AAAA,QACjF,OAAO,KAAK,oBAAoB,MAAM,KAAK,KAAK,mBAAmB;AAAA,QACnE,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAAA;AAAA,IAClF;AAED,WAAO;AAAA,EACR;AACD;;"}

package/dist/production/src/graphql/resolvers/ResolversFactory.js CHANGED Viewed

@@ -12,7 +12,7 @@ class ResolversFactory {
     const resolvers = {
       Json: JSONType,
       DateTime: DateTimeType,
-      Uuid: UuidType,
+      UUID: UuidType,
       Mutation: {
         processBatch: this.processBatchMutationResolver.processBatch.bind(this.processBatchMutationResolver),
         setVariables: this.setVariablesMutationResolver.setVariables.bind(this.setVariablesMutationResolver),

package/dist/production/src/graphql/resolvers/ResolversFactory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ResolversFactory.js","sources":["../../../../../../packages/engine-actions/src/graphql/resolvers/ResolversFactory.ts"],"sourcesContent":["import { DateTimeType, JSONType, UuidType } from '@contember/graphql-utils'\nimport { Resolvers } from '../schema/index.js'\nimport { EventsQueryResolver } from './query/index.js'\nimport {\n\tProcessBatchMutationResolver,\n\tRetryEventMutationResolver,\n\tSetVariablesMutationResolver,\n\tStopEventMutationResolver,\n} from './mutation/index.js'\nimport { ActionsContext } from './ActionsContext.js'\nimport { VariablesQueryResolver } from './query/VariablesQueryResolver.js'\n\nexport class ResolversFactory {\n\tconstructor(\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly processBatchMutationResolver: ProcessBatchMutationResolver,\n\t\tprivate readonly variablesQueryResolver: VariablesQueryResolver,\n\t\tprivate readonly setVariablesMutationResolver: SetVariablesMutationResolver,\n\t\tprivate readonly retryEventMutationResolver: RetryEventMutationResolver,\n\t\tprivate readonly stopEventMutationResolver: StopEventMutationResolver,\n\t) {\n\t}\n\n\tcreate(): Resolvers {\n\t\tconst resolvers: Resolvers<ActionsContext> & { Mutation: Required<Resolvers<ActionsContext>['Mutation']> } & {\n\t\t\tQuery: Required<Resolvers<ActionsContext>['Query']>\n\t\t} = {\n\t\t\tJson: JSONType,\n\t\t\tDateTime: DateTimeType,\n\t\t\~~tUuid~~: UuidType,\n\t\t\tMutation: {\n\t\t\t\tprocessBatch: this.processBatchMutationResolver.processBatch.bind(this.processBatchMutationResolver),\n\t\t\t\tsetVariables: this.setVariablesMutationResolver.setVariables.bind(this.setVariablesMutationResolver),\n\t\t\t\tretryEvent: this.retryEventMutationResolver.retryEvent.bind(this.retryEventMutationResolver),\n\t\t\t\tstopEvent: this.stopEventMutationResolver.stopEvent.bind(this.stopEventMutationResolver),\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\teventsInProcessing: this.eventsQueryResolver.eventsInProcessing.bind(this.eventsQueryResolver),\n\t\t\t\teventsToProcess: this.eventsQueryResolver.eventsToProcess.bind(this.eventsQueryResolver),\n\t\t\t\tfailedEvents: this.eventsQueryResolver.failedEvents.bind(this.eventsQueryResolver),\n\t\t\t\tevent: this.eventsQueryResolver.event.bind(this.eventsQueryResolver),\n\t\t\t\tvariables: this.variablesQueryResolver.variables.bind(this.variablesQueryResolver),\n\t\t\t},\n\t\t}\n\t\treturn resolvers\n\t}\n}\n"],"names":[],"mappings":";AAYO,MAAM,iBAAiB;AAAA,EAC7B,YACkB,qBACA,8BACA,wBACA,8BACA,4BACA,2BAChB;AANgB,SAAA,sBAAA;AACA,SAAA,+BAAA;AACA,SAAA,yBAAA;AACA,SAAA,+BAAA;AACA,SAAA,6BAAA;AACA,SAAA,4BAAA;AAAA,EAElB;AAAA,EAEA,SAAoB;AACnB,UAAM,YAEF;AAAA,MACH,MAAM;AAAA,MACN,UAAU;AAAA,MACV,MAAM;AAAA,MACN,UAAU;AAAA,QACT,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,YAAY,KAAK,2BAA2B,WAAW,KAAK,KAAK,0BAA0B;AAAA,QAC3F,WAAW,KAAK,0BAA0B,UAAU,KAAK,KAAK,yBAAyB;AAAA,MAAA;AAAA,MAExF,OAAO;AAAA,QACN,oBAAoB,KAAK,oBAAoB,mBAAmB,KAAK,KAAK,mBAAmB;AAAA,QAC7F,iBAAiB,KAAK,oBAAoB,gBAAgB,KAAK,KAAK,mBAAmB;AAAA,QACvF,cAAc,KAAK,oBAAoB,aAAa,KAAK,KAAK,mBAAmB;AAAA,QACjF,OAAO,KAAK,oBAAoB,MAAM,KAAK,KAAK,mBAAmB;AAAA,QACnE,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAAA;AAAA,IAClF;AAED,WAAO;AAAA,EACR;AACD;"}
1	+ {"version":3,"file":"ResolversFactory.js","sources":["../../../../../../packages/engine-actions/src/graphql/resolvers/ResolversFactory.ts"],"sourcesContent":["import { DateTimeType, JSONType, UuidType } from '@contember/graphql-utils'\nimport { Resolvers } from '../schema/index.js'\nimport { EventsQueryResolver } from './query/index.js'\nimport {\n\tProcessBatchMutationResolver,\n\tRetryEventMutationResolver,\n\tSetVariablesMutationResolver,\n\tStopEventMutationResolver,\n} from './mutation/index.js'\nimport { ActionsContext } from './ActionsContext.js'\nimport { VariablesQueryResolver } from './query/VariablesQueryResolver.js'\n\nexport class ResolversFactory {\n\tconstructor(\n\t\tprivate readonly eventsQueryResolver: EventsQueryResolver,\n\t\tprivate readonly processBatchMutationResolver: ProcessBatchMutationResolver,\n\t\tprivate readonly variablesQueryResolver: VariablesQueryResolver,\n\t\tprivate readonly setVariablesMutationResolver: SetVariablesMutationResolver,\n\t\tprivate readonly retryEventMutationResolver: RetryEventMutationResolver,\n\t\tprivate readonly stopEventMutationResolver: StopEventMutationResolver,\n\t) {\n\t}\n\n\tcreate(): Resolvers {\n\t\tconst resolvers: Resolvers<ActionsContext> & { Mutation: Required<Resolvers<ActionsContext>['Mutation']> } & {\n\t\t\tQuery: Required<Resolvers<ActionsContext>['Query']>\n\t\t} = {\n\t\t\tJson: JSONType,\n\t\t\tDateTime: DateTimeType,\n\t\t\tUUID: UuidType,\n\t\t\tMutation: {\n\t\t\t\tprocessBatch: this.processBatchMutationResolver.processBatch.bind(this.processBatchMutationResolver),\n\t\t\t\tsetVariables: this.setVariablesMutationResolver.setVariables.bind(this.setVariablesMutationResolver),\n\t\t\t\tretryEvent: this.retryEventMutationResolver.retryEvent.bind(this.retryEventMutationResolver),\n\t\t\t\tstopEvent: this.stopEventMutationResolver.stopEvent.bind(this.stopEventMutationResolver),\n\t\t\t},\n\t\t\tQuery: {\n\t\t\t\teventsInProcessing: this.eventsQueryResolver.eventsInProcessing.bind(this.eventsQueryResolver),\n\t\t\t\teventsToProcess: this.eventsQueryResolver.eventsToProcess.bind(this.eventsQueryResolver),\n\t\t\t\tfailedEvents: this.eventsQueryResolver.failedEvents.bind(this.eventsQueryResolver),\n\t\t\t\tevent: this.eventsQueryResolver.event.bind(this.eventsQueryResolver),\n\t\t\t\tvariables: this.variablesQueryResolver.variables.bind(this.variablesQueryResolver),\n\t\t\t},\n\t\t}\n\t\treturn resolvers\n\t}\n}\n"],"names":[],"mappings":";AAYO,MAAM,iBAAiB;AAAA,EAC7B,YACkB,qBACA,8BACA,wBACA,8BACA,4BACA,2BAChB;AANgB,SAAA,sBAAA;AACA,SAAA,+BAAA;AACA,SAAA,yBAAA;AACA,SAAA,+BAAA;AACA,SAAA,6BAAA;AACA,SAAA,4BAAA;AAAA,EAElB;AAAA,EAEA,SAAoB;AACnB,UAAM,YAEF;AAAA,MACH,MAAM;AAAA,MACN,UAAU;AAAA,MACV,MAAM;AAAA,MACN,UAAU;AAAA,QACT,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,cAAc,KAAK,6BAA6B,aAAa,KAAK,KAAK,4BAA4B;AAAA,QACnG,YAAY,KAAK,2BAA2B,WAAW,KAAK,KAAK,0BAA0B;AAAA,QAC3F,WAAW,KAAK,0BAA0B,UAAU,KAAK,KAAK,yBAAyB;AAAA,MAAA;AAAA,MAExF,OAAO;AAAA,QACN,oBAAoB,KAAK,oBAAoB,mBAAmB,KAAK,KAAK,mBAAmB;AAAA,QAC7F,iBAAiB,KAAK,oBAAoB,gBAAgB,KAAK,KAAK,mBAAmB;AAAA,QACvF,cAAc,KAAK,oBAAoB,aAAa,KAAK,KAAK,mBAAmB;AAAA,QACjF,OAAO,KAAK,oBAAoB,MAAM,KAAK,KAAK,mBAAmB;AAAA,QACnE,WAAW,KAAK,uBAAuB,UAAU,KAAK,KAAK,sBAAsB;AAAA,MAAA;AAAA,IAClF;AAED,WAAO;AAAA,EACR;AACD;"}

package/dist/production/src/graphql/resolvers/mutation/SetVariablesMutationResolver.cjs CHANGED Viewed

@@ -9,7 +9,7 @@ class SetVariablesMutationResolver {
   }
   async setVariables(parent, { args }, ctx) {
     await ctx.requireAccess(ActionsAuthorizationActions.ActionsAuthorizationActions.VARIABLES_SET);
-    await this.variablesManager.setVariables(ctx.db, args);
+    await this.variablesManager.setVariables(ctx.db, args, ctx.project.slug);
     return {
       ok: true
     };

package/dist/production/src/graphql/resolvers/mutation/SetVariablesMutationResolver.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SetVariablesMutationResolver.cjs","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/mutation/SetVariablesMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationSetVariablesArgs } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { VariablesManager } from '../../../model/VariablesManager.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\n\nexport class SetVariablesMutationResolver implements MutationResolvers<ActionsContext> {\n\tconstructor(\n\t\tprivate readonly variablesManager: VariablesManager,\n\t) {\n\t}\n\n\tasync setVariables(parent: unknown, { args }: MutationSetVariablesArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.VARIABLES_SET)\n\n\t\tawait this.variablesManager.setVariables(ctx.db, args)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t}\n\t}\n}\n"],"names":["ActionsAuthorizationActions"],"mappings":";;;;;AAKO,MAAM,6BAA0E;AAAA,EACtF,YACkB,kBAChB;AADgB,SAAA,mBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC5F,UAAM,IAAI,cAAcA,4BAAAA,4BAA4B,aAAa;AAEjE,UAAM,KAAK,iBAAiB,aAAa,IAAI,IAAI,IAAI;~~AAErD~~,WAAO;AAAA,MACN,IAAI;AAAA,IAAA;AAAA,EAEN;AACD;;"}
1	+ {"version":3,"file":"SetVariablesMutationResolver.cjs","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/mutation/SetVariablesMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationSetVariablesArgs } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { VariablesManager } from '../../../model/VariablesManager.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\n\nexport class SetVariablesMutationResolver implements MutationResolvers<ActionsContext> {\n\tconstructor(\n\t\tprivate readonly variablesManager: VariablesManager,\n\t) {\n\t}\n\n\tasync setVariables(parent: unknown, { args }: MutationSetVariablesArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.VARIABLES_SET)\n\n\t\tawait this.variablesManager.setVariables(ctx.db, args, ctx.project.slug)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t}\n\t}\n}\n"],"names":["ActionsAuthorizationActions"],"mappings":";;;;;AAKO,MAAM,6BAA0E;AAAA,EACtF,YACkB,kBAChB;AADgB,SAAA,mBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC5F,UAAM,IAAI,cAAcA,4BAAAA,4BAA4B,aAAa;AAEjE,UAAM,KAAK,iBAAiB,aAAa,IAAI,IAAI,MAAM,IAAI,QAAQ,IAAI;AAEvE,WAAO;AAAA,MACN,IAAI;AAAA,IAAA;AAAA,EAEN;AACD;;"}

package/dist/production/src/graphql/resolvers/mutation/SetVariablesMutationResolver.js CHANGED Viewed

@@ -7,7 +7,7 @@ class SetVariablesMutationResolver {
   }
   async setVariables(parent, { args }, ctx) {
     await ctx.requireAccess(ActionsAuthorizationActions.VARIABLES_SET);
-    await this.variablesManager.setVariables(ctx.db, args);
+    await this.variablesManager.setVariables(ctx.db, args, ctx.project.slug);
     return {
       ok: true
     };

package/dist/production/src/graphql/resolvers/mutation/SetVariablesMutationResolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"SetVariablesMutationResolver.js","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/mutation/SetVariablesMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationSetVariablesArgs } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { VariablesManager } from '../../../model/VariablesManager.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\n\nexport class SetVariablesMutationResolver implements MutationResolvers<ActionsContext> {\n\tconstructor(\n\t\tprivate readonly variablesManager: VariablesManager,\n\t) {\n\t}\n\n\tasync setVariables(parent: unknown, { args }: MutationSetVariablesArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.VARIABLES_SET)\n\n\t\tawait this.variablesManager.setVariables(ctx.db, args)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;AAKO,MAAM,6BAA0E;AAAA,EACtF,YACkB,kBAChB;AADgB,SAAA,mBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC5F,UAAM,IAAI,cAAc,4BAA4B,aAAa;AAEjE,UAAM,KAAK,iBAAiB,aAAa,IAAI,IAAI,IAAI;~~AAErD~~,WAAO;AAAA,MACN,IAAI;AAAA,IAAA;AAAA,EAEN;AACD;"}
1	+ {"version":3,"file":"SetVariablesMutationResolver.js","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/mutation/SetVariablesMutationResolver.ts"],"sourcesContent":["import { MutationResolvers, MutationSetVariablesArgs } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { VariablesManager } from '../../../model/VariablesManager.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\n\nexport class SetVariablesMutationResolver implements MutationResolvers<ActionsContext> {\n\tconstructor(\n\t\tprivate readonly variablesManager: VariablesManager,\n\t) {\n\t}\n\n\tasync setVariables(parent: unknown, { args }: MutationSetVariablesArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.VARIABLES_SET)\n\n\t\tawait this.variablesManager.setVariables(ctx.db, args, ctx.project.slug)\n\n\t\treturn {\n\t\t\tok: true,\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;AAKO,MAAM,6BAA0E;AAAA,EACtF,YACkB,kBAChB;AADgB,SAAA,mBAAA;AAAA,EAElB;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC5F,UAAM,IAAI,cAAc,4BAA4B,aAAa;AAEjE,UAAM,KAAK,iBAAiB,aAAa,IAAI,IAAI,MAAM,IAAI,QAAQ,IAAI;AAEvE,WAAO;AAAA,MACN,IAAI;AAAA,IAAA;AAAA,EAEN;AACD;"}

package/dist/production/src/graphql/resolvers/query/EventsQueryResolver.cjs CHANGED Viewed

@@ -41,7 +41,7 @@ class EventsQueryResolver {
     return rows.map((row) => ({
       id: row.id,
       createdAt: row.created_at,
-      resolvedAt: row.created_at,
+      resolvedAt: row.resolved_at ?? void 0,
       lastStateChange: row.last_state_change,
       visibleAt: row.visible_at,
       log: row.log,

package/dist/production/src/graphql/resolvers/query/EventsQueryResolver.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EventsQueryResolver.cjs","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/query/EventsQueryResolver.ts"],"sourcesContent":["import { Event, QueryEventsInProcessingArgs, QueryEventsToProcessArgs, QueryFailedEventsArgs, QueryResolvers } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery.js'\nimport { EventRow } from '../../../model/types.js'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery.js'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery.js'\n\nexport class EventsQueryResolver implements QueryResolvers<ActionsContext> {\n\tasync eventsInProcessing(parent: unknown, { args }: QueryEventsInProcessingArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsInProcessingQuery(args ?? {}))\n\t}\n\n\tasync eventsToProcess(parent: unknown, { args }: QueryEventsToProcessArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsToProcessQuery(args ?? {}))\n\t}\n\n\tasync failedEvents(parent: unknown, { args }: QueryFailedEventsArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new FailedEventsQuery(args ?? {}))\n\t}\n\n\tasync event(parent: unknown, { id }: { id: string }, ctx: ActionsContext): Promise<Event \| null> {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\t\tconst stages = await this.fetchStagesMap(ctx.db)\n\t\tconst result = await ctx.db.queryHandler.fetch(new EventByIdQuery(id))\n\t\tif (!result) {\n\t\t\treturn null\n\t\t}\n\t\treturn this.mapEventRows([result], stages)[0]\n\t}\n\n\tprivate async fetchEvents(db: DatabaseContext, query: DatabaseQuery<EventRow[]>) {\n\t\tconst stages = await this.fetchStagesMap(db)\n\t\treturn this.mapEventRows(await db.queryHandler.fetch(query), stages)\n\t}\n\n\tprivate async fetchStagesMap(db: DatabaseContext): Promise<Record<string, string>> {\n\t\treturn Object.fromEntries((await db.queryHandler.fetch(new StagesQuery())).map(it => [it.id, it.slug]))\n\t}\n\n\tprivate mapEventRows(rows: EventRow[], stagesMap: Record<string, string>): Event[] {\n\t\treturn rows.map(row => ({\n\t\t\tid: row.id,\n\t\t\tcreatedAt: row.created_at,\n\t\t\tresolvedAt: row.~~created_at~~,\n\t\t\tlastStateChange: row.last_state_change,\n\t\t\tvisibleAt: row.visible_at,\n\t\t\tlog: row.log,\n\t\t\tnumRetries: row.num_retries,\n\t\t\tpayload: row.payload,\n\t\t\tstage: stagesMap[row.stage_id],\n\t\t\tstate: row.state,\n\t\t\ttarget: row.target,\n\t\t\ttransactionId: row.transaction_id,\n\t\t\tidentityId: row.identity_id ?? undefined,\n\t\t\tipAddress: row.ip_address ?? undefined,\n\t\t\tuserAgent: row.user_agent ?? undefined,\n\t\t}))\n\t}\n}\n"],"names":["ActionsAuthorizationActions","EventsInProcessingQuery","EventsToProcessQuery","FailedEventsQuery","EventByIdQuery","StagesQuery"],"mappings":";;;;;;;;;;AAWO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AACrG,UAAM,IAAI,cAAcA,4BAAAA,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIC,wBAAAA,wBAAwB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC9E;AAAA,EAEA,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC/F,UAAM,IAAI,cAAcD,4BAAAA,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIE,qBAAAA,qBAAqB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC3E;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACzF,UAAM,IAAI,cAAcF,4BAAAA,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIG,kBAAAA,kBAAkB,QAAQ,CAAA,CAAE,CAAC;AAAA,EACxE;AAAA,EAEA,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAChG,UAAM,IAAI,cAAcH,4BAAAA,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AAC/C,UAAM,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAII,8BAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACZ,aAAO;AAAA,IACR;AACA,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAC7C;AAAA,EAEA,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AAC3C,WAAO,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EACpE;AAAA,EAEA,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAIC,gBAAAA,YAAA,CAAa,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EACvG;AAAA,EAEQ,aAAa,MAAkB,WAA4C;AAClF,WAAO,KAAK,IAAI,CAAA,SAAQ;AAAA,MACvB,IAAI,IAAI;AAAA,MACR,WAAW,IAAI;AAAA,MACf,YAAY,IAAI;AAAA,~~MAChB~~,iBAAiB,IAAI;AAAA,MACrB,WAAW,IAAI;AAAA,MACf,KAAK,IAAI;AAAA,MACT,YAAY,IAAI;AAAA,MAChB,SAAS,IAAI;AAAA,MACb,OAAO,UAAU,IAAI,QAAQ;AAAA,MAC7B,OAAO,IAAI;AAAA,MACX,QAAQ,IAAI;AAAA,MACZ,eAAe,IAAI;AAAA,MACnB,YAAY,IAAI,eAAe;AAAA,MAC/B,WAAW,IAAI,cAAc;AAAA,MAC7B,WAAW,IAAI,cAAc;AAAA,IAAA,EAC5B;AAAA,EACH;AACD;;"}
1	+ {"version":3,"file":"EventsQueryResolver.cjs","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/query/EventsQueryResolver.ts"],"sourcesContent":["import { Event, QueryEventsInProcessingArgs, QueryEventsToProcessArgs, QueryFailedEventsArgs, QueryResolvers } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery.js'\nimport { EventRow } from '../../../model/types.js'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery.js'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery.js'\n\nexport class EventsQueryResolver implements QueryResolvers<ActionsContext> {\n\tasync eventsInProcessing(parent: unknown, { args }: QueryEventsInProcessingArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsInProcessingQuery(args ?? {}))\n\t}\n\n\tasync eventsToProcess(parent: unknown, { args }: QueryEventsToProcessArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsToProcessQuery(args ?? {}))\n\t}\n\n\tasync failedEvents(parent: unknown, { args }: QueryFailedEventsArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new FailedEventsQuery(args ?? {}))\n\t}\n\n\tasync event(parent: unknown, { id }: { id: string }, ctx: ActionsContext): Promise<Event \| null> {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\t\tconst stages = await this.fetchStagesMap(ctx.db)\n\t\tconst result = await ctx.db.queryHandler.fetch(new EventByIdQuery(id))\n\t\tif (!result) {\n\t\t\treturn null\n\t\t}\n\t\treturn this.mapEventRows([result], stages)[0]\n\t}\n\n\tprivate async fetchEvents(db: DatabaseContext, query: DatabaseQuery<EventRow[]>) {\n\t\tconst stages = await this.fetchStagesMap(db)\n\t\treturn this.mapEventRows(await db.queryHandler.fetch(query), stages)\n\t}\n\n\tprivate async fetchStagesMap(db: DatabaseContext): Promise<Record<string, string>> {\n\t\treturn Object.fromEntries((await db.queryHandler.fetch(new StagesQuery())).map(it => [it.id, it.slug]))\n\t}\n\n\tprivate mapEventRows(rows: EventRow[], stagesMap: Record<string, string>): Event[] {\n\t\treturn rows.map(row => ({\n\t\t\tid: row.id,\n\t\t\tcreatedAt: row.created_at,\n\t\t\tresolvedAt: row.resolved_at ?? undefined,\n\t\t\tlastStateChange: row.last_state_change,\n\t\t\tvisibleAt: row.visible_at,\n\t\t\tlog: row.log,\n\t\t\tnumRetries: row.num_retries,\n\t\t\tpayload: row.payload,\n\t\t\tstage: stagesMap[row.stage_id],\n\t\t\tstate: row.state,\n\t\t\ttarget: row.target,\n\t\t\ttransactionId: row.transaction_id,\n\t\t\tidentityId: row.identity_id ?? undefined,\n\t\t\tipAddress: row.ip_address ?? undefined,\n\t\t\tuserAgent: row.user_agent ?? undefined,\n\t\t}))\n\t}\n}\n"],"names":["ActionsAuthorizationActions","EventsInProcessingQuery","EventsToProcessQuery","FailedEventsQuery","EventByIdQuery","StagesQuery"],"mappings":";;;;;;;;;;AAWO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AACrG,UAAM,IAAI,cAAcA,4BAAAA,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIC,wBAAAA,wBAAwB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC9E;AAAA,EAEA,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC/F,UAAM,IAAI,cAAcD,4BAAAA,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIE,qBAAAA,qBAAqB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC3E;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACzF,UAAM,IAAI,cAAcF,4BAAAA,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIG,kBAAAA,kBAAkB,QAAQ,CAAA,CAAE,CAAC;AAAA,EACxE;AAAA,EAEA,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAChG,UAAM,IAAI,cAAcH,4BAAAA,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AAC/C,UAAM,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAII,8BAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACZ,aAAO;AAAA,IACR;AACA,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAC7C;AAAA,EAEA,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AAC3C,WAAO,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EACpE;AAAA,EAEA,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAIC,gBAAAA,YAAA,CAAa,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EACvG;AAAA,EAEQ,aAAa,MAAkB,WAA4C;AAClF,WAAO,KAAK,IAAI,CAAA,SAAQ;AAAA,MACvB,IAAI,IAAI;AAAA,MACR,WAAW,IAAI;AAAA,MACf,YAAY,IAAI,eAAe;AAAA,MAC/B,iBAAiB,IAAI;AAAA,MACrB,WAAW,IAAI;AAAA,MACf,KAAK,IAAI;AAAA,MACT,YAAY,IAAI;AAAA,MAChB,SAAS,IAAI;AAAA,MACb,OAAO,UAAU,IAAI,QAAQ;AAAA,MAC7B,OAAO,IAAI;AAAA,MACX,QAAQ,IAAI;AAAA,MACZ,eAAe,IAAI;AAAA,MACnB,YAAY,IAAI,eAAe;AAAA,MAC/B,WAAW,IAAI,cAAc;AAAA,MAC7B,WAAW,IAAI,cAAc;AAAA,IAAA,EAC5B;AAAA,EACH;AACD;;"}

package/dist/production/src/graphql/resolvers/query/EventsQueryResolver.js CHANGED Viewed

@@ -39,7 +39,7 @@ class EventsQueryResolver {
     return rows.map((row) => ({
       id: row.id,
       createdAt: row.created_at,
-      resolvedAt: row.created_at,
+      resolvedAt: row.resolved_at ?? void 0,
       lastStateChange: row.last_state_change,
       visibleAt: row.visible_at,
       log: row.log,

package/dist/production/src/graphql/resolvers/query/EventsQueryResolver.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"EventsQueryResolver.js","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/query/EventsQueryResolver.ts"],"sourcesContent":["import { Event, QueryEventsInProcessingArgs, QueryEventsToProcessArgs, QueryFailedEventsArgs, QueryResolvers } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery.js'\nimport { EventRow } from '../../../model/types.js'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery.js'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery.js'\n\nexport class EventsQueryResolver implements QueryResolvers<ActionsContext> {\n\tasync eventsInProcessing(parent: unknown, { args }: QueryEventsInProcessingArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsInProcessingQuery(args ?? {}))\n\t}\n\n\tasync eventsToProcess(parent: unknown, { args }: QueryEventsToProcessArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsToProcessQuery(args ?? {}))\n\t}\n\n\tasync failedEvents(parent: unknown, { args }: QueryFailedEventsArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new FailedEventsQuery(args ?? {}))\n\t}\n\n\tasync event(parent: unknown, { id }: { id: string }, ctx: ActionsContext): Promise<Event \| null> {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\t\tconst stages = await this.fetchStagesMap(ctx.db)\n\t\tconst result = await ctx.db.queryHandler.fetch(new EventByIdQuery(id))\n\t\tif (!result) {\n\t\t\treturn null\n\t\t}\n\t\treturn this.mapEventRows([result], stages)[0]\n\t}\n\n\tprivate async fetchEvents(db: DatabaseContext, query: DatabaseQuery<EventRow[]>) {\n\t\tconst stages = await this.fetchStagesMap(db)\n\t\treturn this.mapEventRows(await db.queryHandler.fetch(query), stages)\n\t}\n\n\tprivate async fetchStagesMap(db: DatabaseContext): Promise<Record<string, string>> {\n\t\treturn Object.fromEntries((await db.queryHandler.fetch(new StagesQuery())).map(it => [it.id, it.slug]))\n\t}\n\n\tprivate mapEventRows(rows: EventRow[], stagesMap: Record<string, string>): Event[] {\n\t\treturn rows.map(row => ({\n\t\t\tid: row.id,\n\t\t\tcreatedAt: row.created_at,\n\t\t\tresolvedAt: row.~~created_at~~,\n\t\t\tlastStateChange: row.last_state_change,\n\t\t\tvisibleAt: row.visible_at,\n\t\t\tlog: row.log,\n\t\t\tnumRetries: row.num_retries,\n\t\t\tpayload: row.payload,\n\t\t\tstage: stagesMap[row.stage_id],\n\t\t\tstate: row.state,\n\t\t\ttarget: row.target,\n\t\t\ttransactionId: row.transaction_id,\n\t\t\tidentityId: row.identity_id ?? undefined,\n\t\t\tipAddress: row.ip_address ?? undefined,\n\t\t\tuserAgent: row.user_agent ?? undefined,\n\t\t}))\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;AAWO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AACrG,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,wBAAwB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC9E;AAAA,EAEA,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC/F,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,qBAAqB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC3E;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACzF,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,kBAAkB,QAAQ,CAAA,CAAE,CAAC;AAAA,EACxE;AAAA,EAEA,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAChG,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AAC/C,UAAM,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAI,eAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACZ,aAAO;AAAA,IACR;AACA,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAC7C;AAAA,EAEA,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AAC3C,WAAO,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EACpE;AAAA,EAEA,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAI,YAAA,CAAa,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EACvG;AAAA,EAEQ,aAAa,MAAkB,WAA4C;AAClF,WAAO,KAAK,IAAI,CAAA,SAAQ;AAAA,MACvB,IAAI,IAAI;AAAA,MACR,WAAW,IAAI;AAAA,MACf,YAAY,IAAI;AAAA,~~MAChB~~,iBAAiB,IAAI;AAAA,MACrB,WAAW,IAAI;AAAA,MACf,KAAK,IAAI;AAAA,MACT,YAAY,IAAI;AAAA,MAChB,SAAS,IAAI;AAAA,MACb,OAAO,UAAU,IAAI,QAAQ;AAAA,MAC7B,OAAO,IAAI;AAAA,MACX,QAAQ,IAAI;AAAA,MACZ,eAAe,IAAI;AAAA,MACnB,YAAY,IAAI,eAAe;AAAA,MAC/B,WAAW,IAAI,cAAc;AAAA,MAC7B,WAAW,IAAI,cAAc;AAAA,IAAA,EAC5B;AAAA,EACH;AACD;"}
1	+ {"version":3,"file":"EventsQueryResolver.js","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/query/EventsQueryResolver.ts"],"sourcesContent":["import { Event, QueryEventsInProcessingArgs, QueryEventsToProcessArgs, QueryFailedEventsArgs, QueryResolvers } from '../../schema/index.js'\nimport { ActionsContext } from '../ActionsContext.js'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery.js'\nimport { EventRow } from '../../../model/types.js'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery.js'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery.js'\nimport { ActionsAuthorizationActions } from '../../../authorization/index.js'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery.js'\n\nexport class EventsQueryResolver implements QueryResolvers<ActionsContext> {\n\tasync eventsInProcessing(parent: unknown, { args }: QueryEventsInProcessingArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsInProcessingQuery(args ?? {}))\n\t}\n\n\tasync eventsToProcess(parent: unknown, { args }: QueryEventsToProcessArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new EventsToProcessQuery(args ?? {}))\n\t}\n\n\tasync failedEvents(parent: unknown, { args }: QueryFailedEventsArgs, ctx: ActionsContext) {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\n\t\treturn await this.fetchEvents(ctx.db, new FailedEventsQuery(args ?? {}))\n\t}\n\n\tasync event(parent: unknown, { id }: { id: string }, ctx: ActionsContext): Promise<Event \| null> {\n\t\tawait ctx.requireAccess(ActionsAuthorizationActions.EVENTS_VIEW)\n\t\tconst stages = await this.fetchStagesMap(ctx.db)\n\t\tconst result = await ctx.db.queryHandler.fetch(new EventByIdQuery(id))\n\t\tif (!result) {\n\t\t\treturn null\n\t\t}\n\t\treturn this.mapEventRows([result], stages)[0]\n\t}\n\n\tprivate async fetchEvents(db: DatabaseContext, query: DatabaseQuery<EventRow[]>) {\n\t\tconst stages = await this.fetchStagesMap(db)\n\t\treturn this.mapEventRows(await db.queryHandler.fetch(query), stages)\n\t}\n\n\tprivate async fetchStagesMap(db: DatabaseContext): Promise<Record<string, string>> {\n\t\treturn Object.fromEntries((await db.queryHandler.fetch(new StagesQuery())).map(it => [it.id, it.slug]))\n\t}\n\n\tprivate mapEventRows(rows: EventRow[], stagesMap: Record<string, string>): Event[] {\n\t\treturn rows.map(row => ({\n\t\t\tid: row.id,\n\t\t\tcreatedAt: row.created_at,\n\t\t\tresolvedAt: row.resolved_at ?? undefined,\n\t\t\tlastStateChange: row.last_state_change,\n\t\t\tvisibleAt: row.visible_at,\n\t\t\tlog: row.log,\n\t\t\tnumRetries: row.num_retries,\n\t\t\tpayload: row.payload,\n\t\t\tstage: stagesMap[row.stage_id],\n\t\t\tstate: row.state,\n\t\t\ttarget: row.target,\n\t\t\ttransactionId: row.transaction_id,\n\t\t\tidentityId: row.identity_id ?? undefined,\n\t\t\tipAddress: row.ip_address ?? undefined,\n\t\t\tuserAgent: row.user_agent ?? undefined,\n\t\t}))\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;AAWO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AACrG,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,wBAAwB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC9E;AAAA,EAEA,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AAC/F,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,qBAAqB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAC3E;AAAA,EAEA,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACzF,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAE/D,WAAO,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,kBAAkB,QAAQ,CAAA,CAAE,CAAC;AAAA,EACxE;AAAA,EAEA,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAChG,UAAM,IAAI,cAAc,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AAC/C,UAAM,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAI,eAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACZ,aAAO;AAAA,IACR;AACA,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAC7C;AAAA,EAEA,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AAC3C,WAAO,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EACpE;AAAA,EAEA,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAI,YAAA,CAAa,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EACvG;AAAA,EAEQ,aAAa,MAAkB,WAA4C;AAClF,WAAO,KAAK,IAAI,CAAA,SAAQ;AAAA,MACvB,IAAI,IAAI;AAAA,MACR,WAAW,IAAI;AAAA,MACf,YAAY,IAAI,eAAe;AAAA,MAC/B,iBAAiB,IAAI;AAAA,MACrB,WAAW,IAAI;AAAA,MACf,KAAK,IAAI;AAAA,MACT,YAAY,IAAI;AAAA,MAChB,SAAS,IAAI;AAAA,MACb,OAAO,UAAU,IAAI,QAAQ;AAAA,MAC7B,OAAO,IAAI;AAAA,MACX,QAAQ,IAAI;AAAA,MACZ,eAAe,IAAI;AAAA,MACnB,YAAY,IAAI,eAAe;AAAA,MAC/B,WAAW,IAAI,cAAc;AAAA,MAC7B,WAAW,IAAI,cAAc;AAAA,IAAA,EAC5B;AAAA,EACH;AACD;"}

package/dist/production/src/graphql/resolvers/query/VariablesQueryResolver.cjs CHANGED Viewed

@@ -9,10 +9,7 @@ class VariablesQueryResolver {
   }
   async variables(parent, args, ctx) {
     await ctx.requireAccess(ActionsAuthorizationActions.ActionsAuthorizationActions.VARIABLES_VIEW);
-    return Object.entries(await this.variablesManager.fetchVariables(ctx.db)).map(([name, value]) => ({
-      name,
-      value
-    }));
+    return await this.variablesManager.listVariables(ctx.db, ctx.project.slug);
   }
 }
 exports.VariablesQueryResolver = VariablesQueryResolver;