npm - @contember/engine-actions - Versions diffs - 2.1.0-alpha.24 → 2.1.0-alpha.26 - Mend

@contember/engine-actions 2.1.0-alpha.24 → 2.1.0-alpha.26

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 (137) hide show

package/dist/development/src/triggers/TriggerPayloadBuilder.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TriggerPayloadBuilder.js","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadBuilder.ts"],"sourcesContent":["import { ImplementationException } from '../ImplementationException'\nimport { assertNever } from '../utils/assertNever'\nimport { FiredEvent } from './TriggerPayloadManager'\nimport { Actions, ActionsPayload, Input } from '@contember/schema'\nimport { FieldNode, Mapper, ObjectNode } from '@contember/engine-content-api'\n\ntype Selections = Record<Input.PrimaryValue, any>\n\nexport class TriggerPayloadBuilder {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t) {\n\t}\n\n\tpublic async build(events: FiredEvent[]): Promise<ActionsPayload.AnyEventPayload[]> {\n\t\tconst filteredEvents = events.filter(it => {\n\t\t\treturn it.cause.type !== 'BeforeUpdateEvent'\n\t\t\t\t\|\| it.cause.afterEvent?.hasChanges === true\n\t\t})\n\t\tif (filteredEvents.length === 0) {\n\t\t\treturn []\n\t\t}\n\t\tconst selections = await this.fetchSelection(filteredEvents)\n\t\tconst triggerType = filteredEvents[0].listener.trigger.type\n\t\tif (triggerType === 'basic') {\n\t\t\treturn filteredEvents.map(it => ({ trigger: it.listener.trigger.name, ...this.buildBaseEventPayloads(it, it.selection ?? selections[it.primary]) }))\n\t\t}\n\t\tif (triggerType === 'watch') {\n\t\t\treturn this.buildWatchEventPayloads(filteredEvents, selections)\n\t\t}\n\t\treturn assertNever(triggerType)\n\t}\n\n\tpublic async preprocessEvent(event: FiredEvent): Promise<FiredEvent> {\n\t\tif (event.listener.type === 'delete' && event.listener.trigger.selection) {\n\t\t\tconst input = this.convertSelectionNode(event.listener.trigger.selection)\n\n\t\t\tconst selection = await this.mapper.selectUnique(event.entity, input.withArg('by', {\n\t\t\t\t[event.entity.primary]: event.primary,\n\t\t\t}), [])\n\t\t\treturn { ...event, selection }\n\t\t}\n\t\treturn event\n\t}\n\n\tprivate buildWatchEventPayloads(events: FiredEvent[], selections: Selections): ActionsPayload.WatchEventPayload[] {\n\t\tconst byPrimary: Record<Input.PrimaryValue, { primary: Input.PrimaryValue; events: FiredEvent[] }> = {}\n\t\tfor (const event of events) {\n\t\t\tbyPrimary[event.primary] ??= { primary: event.primary, events: [] }\n\t\t\tbyPrimary[event.primary].events.push(event)\n\t\t}\n\t\tconst payloads: ActionsPayload.WatchEventPayload[] = []\n\t\tfor (const eventsByPrimary of Object.values(byPrimary)) {\n\t\t\tpayloads.push({\n\t\t\t\toperation: 'watch',\n\t\t\t\ttrigger: events[0].listener.trigger.name,\n\t\t\t\tentity: events[0].entity.name,\n\t\t\t\tid: eventsByPrimary.primary,\n\t\t\t\tselection: eventsByPrimary.events.find(it => it.selection)?.selection\n\t\t\t\t\t?? selections[eventsByPrimary.primary],\n\t\t\t\tevents: eventsByPrimary.events.map(it => this.buildBaseEventPayloads(it)),\n\t\t\t})\n\t\t}\n\t\treturn payloads\n\t}\n\n\tprivate buildBaseEventPayloads(event: FiredEvent, selection?: any): ActionsPayload.BaseEventPayload {\n\t\tswitch (event.cause.type) {\n\t\t\tcase 'AfterInsertEvent':\n\t\t\t\treturn {\n\t\t\t\t\toperation: 'create',\n\t\t\t\t\tentity: event.cause.entity.name,\n\t\t\t\t\tid: event.cause.id,\n\t\t\t\t\tselection,\n\t\t\t\t\tvalues: Object.fromEntries(event.cause.data.map(it => [it.fieldName, it.value])),\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t}\n\t\t\tcase 'AfterUpdateEvent':\n\t\t\tcase 'BeforeUpdateEvent':\n\t\t\t\tconst afterEvent = event.cause.type === 'AfterUpdateEvent' ? event.cause : event.cause.afterEvent\n\t\t\t\tif (!afterEvent) {\n\t\t\t\t\tthrow new ImplementationException()\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\toperation: 'update',\n\t\t\t\t\tentity: event.cause.entity.name,\n\t\t\t\t\tid: event.cause.id,\n\t\t\t\t\tselection,\n\t\t\t\t\tvalues: Object.fromEntries(event.cause.data.map(it => [it.fieldName, it.value])),\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t\told: Object.fromEntries(afterEvent.data.map(it => [it.fieldName, it.old])),\n\t\t\t\t}\n\t\t\tcase 'BeforeDeleteEvent':\n\t\t\t\treturn {\n\t\t\t\t\toperation: 'delete',\n\t\t\t\t\tentity: event.cause.entity.name,\n\t\t\t\t\tid: event.cause.id,\n\t\t\t\t\tselection,\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t}\n\t\t\tcase 'AfterJunctionUpdateEvent':\n\t\t\t\tif (event.listener.type !== 'junction') {\n\t\t\t\t\tthrow new ImplementationException()\n\t\t\t\t}\n\t\t\t\tconst [id, inverseId] = event.listener.context.type === 'owning'\n\t\t\t\t\t? [event.cause.owningId, event.cause.inverseId]\n\t\t\t\t\t: [event.cause.inverseId, event.cause.owningId]\n\t\t\t\treturn {\n\t\t\t\t\toperation: event.cause.operation === 'connect' ? 'junction_connect' : 'junction_disconnect',\n\t\t\t\t\tentity: event.listener.context.entity.name,\n\t\t\t\t\trelation: event.listener.context.relation.name,\n\t\t\t\t\tid,\n\t\t\t\t\tinverseId,\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t}\n\t\t\tdefault:\n\t\t\t\tassertNever(event.cause, it => it.type)\n\t\t}\n\t}\n\n\tprivate async fetchSelection(events: FiredEvent[]): Promise<Selections> {\n\t\tconst trigger = events[0].listener.trigger\n\t\tif (!trigger.selection) {\n\t\t\treturn {}\n\t\t}\n\n\t\tconst ids = Array.from(new Set(events.filter(it => it.listener.type !== 'delete').map(it => it.primary)))\n\t\tif (ids.length === 0) {\n\t\t\treturn {}\n\t\t}\n\t\tconst entity = events[0].entity\n\t\tconst input = this.convertSelectionNode(trigger.selection).withArg('filter', {\n\t\t\t[entity.primary]: { in: ids },\n\t\t})\n\t\treturn await this.mapper.selectAssoc(entity, input, [], entity.primary)\n\t}\n\n\n\tprivate convertSelectionNode(node: Actions.SelectionNode, nodeName = 'root', path: string[] = []): ObjectNode<Input.ListQueryInput> {\n\t\treturn new ObjectNode(nodeName, nodeName, node.map(it => {\n\t\t\tconst [field, args, selection] = Array.isArray(it) ? it : [it, undefined, undefined]\n\t\t\tif (selection === undefined \|\| selection.length === 0) {\n\t\t\t\treturn new FieldNode(field, field, {})\n\t\t\t}\n\t\t\treturn this.convertSelectionNode(selection, field, [...path, nodeName]).withArgs(args)\n\t\t}), {}, {}, path)\n\t}\n}\n"],"names":[],"mappings":"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"}
1	+ {"version":3,"file":"TriggerPayloadBuilder.js","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadBuilder.ts"],"sourcesContent":["import { ImplementationException } from '../ImplementationException'\nimport { assertNever } from '../utils/assertNever'\nimport { FiredEvent } from './TriggerPayloadManager'\nimport { Actions, ActionsPayload, Input } from '@contember/schema'\nimport { FieldNode, Mapper, ObjectNode } from '@contember/engine-content-api'\n\ntype Selections = Record<Input.PrimaryValue, any>\n\nexport class TriggerPayloadBuilder {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t) {\n\t}\n\n\tpublic async build(events: FiredEvent[]): Promise<ActionsPayload.AnyEventPayload[]> {\n\t\tconst filteredEvents = events.filter(it => {\n\t\t\treturn it.cause.type !== 'BeforeUpdateEvent'\n\t\t\t\t\|\| it.cause.afterEvent?.hasChanges === true\n\t\t})\n\t\tif (filteredEvents.length === 0) {\n\t\t\treturn []\n\t\t}\n\t\tconst selections = await this.fetchSelection(filteredEvents)\n\t\tconst triggerType = filteredEvents[0].listener.trigger.type\n\t\tif (triggerType === 'basic') {\n\t\t\treturn filteredEvents.map(it => ({ trigger: it.listener.trigger.name, ...this.buildBaseEventPayloads(it, it.selection ?? selections[it.primary]) }))\n\t\t}\n\t\tif (triggerType === 'watch') {\n\t\t\treturn this.buildWatchEventPayloads(filteredEvents, selections)\n\t\t}\n\t\treturn assertNever(triggerType)\n\t}\n\n\tpublic async preprocessEvent(event: FiredEvent): Promise<FiredEvent> {\n\t\tif (event.listener.type === 'delete' && event.listener.trigger.selection) {\n\t\t\tconst input = this.convertSelectionNode(event.listener.trigger.selection)\n\n\t\t\tconst selection = await this.mapper.selectUnique(event.entity, input.withArg('by', {\n\t\t\t\t[event.entity.primary]: event.primary,\n\t\t\t}), [])\n\t\t\treturn { ...event, selection }\n\t\t}\n\t\treturn event\n\t}\n\n\tprivate buildWatchEventPayloads(events: FiredEvent[], selections: Selections): ActionsPayload.WatchEventPayload[] {\n\t\tconst byPrimary: Record<Input.PrimaryValue, { primary: Input.PrimaryValue; events: FiredEvent[] }> = {}\n\t\tfor (const event of events) {\n\t\t\tbyPrimary[event.primary] ??= { primary: event.primary, events: [] }\n\t\t\tbyPrimary[event.primary].events.push(event)\n\t\t}\n\t\tconst payloads: ActionsPayload.WatchEventPayload[] = []\n\t\tfor (const eventsByPrimary of Object.values(byPrimary)) {\n\t\t\tconst baseEvents: ActionsPayload.BaseEventPayload[] = []\n\n\t\t\tconst existingEvents = new Set<string>()\n\t\t\tfor (const event of eventsByPrimary.events) {\n\t\t\t\tconst baseEvent = this.buildBaseEventPayloads(event)\n\t\t\t\tconst stringRepresentation = JSON.stringify(baseEvent)\n\t\t\t\tif (existingEvents.has(stringRepresentation)) {\n\t\t\t\t\tcontinue\n\t\t\t\t}\n\t\t\t\texistingEvents.add(stringRepresentation)\n\t\t\t\tbaseEvents.push(baseEvent)\n\t\t\t}\n\n\t\t\tpayloads.push({\n\t\t\t\toperation: 'watch',\n\t\t\t\ttrigger: events[0].listener.trigger.name,\n\t\t\t\tentity: events[0].entity.name,\n\t\t\t\tid: eventsByPrimary.primary,\n\t\t\t\tselection: eventsByPrimary.events.find(it => it.selection)?.selection\n\t\t\t\t\t?? selections[eventsByPrimary.primary],\n\t\t\t\tevents: baseEvents,\n\t\t\t})\n\t\t}\n\t\treturn payloads\n\t}\n\n\tprivate buildBaseEventPayloads(event: FiredEvent, selection?: any): ActionsPayload.BaseEventPayload {\n\t\tswitch (event.cause.type) {\n\t\t\tcase 'AfterInsertEvent':\n\t\t\t\treturn {\n\t\t\t\t\toperation: 'create',\n\t\t\t\t\tentity: event.cause.entity.name,\n\t\t\t\t\tid: event.cause.id,\n\t\t\t\t\tselection,\n\t\t\t\t\tvalues: Object.fromEntries(event.cause.data.map(it => [it.fieldName, it.value])),\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t\tnodes: event.nodes,\n\t\t\t\t}\n\t\t\tcase 'AfterUpdateEvent':\n\t\t\tcase 'BeforeUpdateEvent':\n\t\t\t\tconst afterEvent = event.cause.type === 'AfterUpdateEvent' ? event.cause : event.cause.afterEvent\n\t\t\t\tif (!afterEvent) {\n\t\t\t\t\tthrow new ImplementationException()\n\t\t\t\t}\n\t\t\t\treturn {\n\t\t\t\t\toperation: 'update',\n\t\t\t\t\tentity: event.cause.entity.name,\n\t\t\t\t\tid: event.cause.id,\n\t\t\t\t\tselection,\n\t\t\t\t\tvalues: Object.fromEntries(event.cause.data.map(it => [it.fieldName, it.value])),\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t\told: Object.fromEntries(afterEvent.data.map(it => [it.fieldName, it.old])),\n\t\t\t\t\tnodes: event.nodes,\n\t\t\t\t}\n\t\t\tcase 'BeforeDeleteEvent':\n\t\t\t\treturn {\n\t\t\t\t\toperation: 'delete',\n\t\t\t\t\tentity: event.cause.entity.name,\n\t\t\t\t\tid: event.cause.id,\n\t\t\t\t\tselection,\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t\tnodes: event.nodes,\n\t\t\t\t}\n\t\t\tcase 'AfterJunctionUpdateEvent':\n\t\t\t\tif (event.listener.type !== 'junction') {\n\t\t\t\t\tthrow new ImplementationException()\n\t\t\t\t}\n\t\t\t\tconst [id, inverseId] = event.listener.context.type === 'owning'\n\t\t\t\t\t? [event.cause.owningId, event.cause.inverseId]\n\t\t\t\t\t: [event.cause.inverseId, event.cause.owningId]\n\t\t\t\treturn {\n\t\t\t\t\toperation: event.cause.operation === 'connect' ? 'junction_connect' : 'junction_disconnect',\n\t\t\t\t\tentity: event.listener.context.entity.name,\n\t\t\t\t\trelation: event.listener.context.relation.name,\n\t\t\t\t\tid,\n\t\t\t\t\tinverseId,\n\t\t\t\t\tpath: 'path' in event.listener ? event.listener.path : undefined,\n\t\t\t\t\tnodes: event.nodes,\n\t\t\t\t}\n\t\t\tdefault:\n\t\t\t\tassertNever(event.cause, it => it.type)\n\t\t}\n\t}\n\n\tprivate async fetchSelection(events: FiredEvent[]): Promise<Selections> {\n\t\tconst trigger = events[0].listener.trigger\n\t\tif (!trigger.selection) {\n\t\t\treturn {}\n\t\t}\n\n\t\tconst ids = Array.from(new Set(events.filter(it => it.listener.type !== 'delete').map(it => it.primary)))\n\t\tif (ids.length === 0) {\n\t\t\treturn {}\n\t\t}\n\t\tconst entity = events[0].entity\n\t\tconst input = this.convertSelectionNode(trigger.selection).withArg('filter', {\n\t\t\t[entity.primary]: { in: ids },\n\t\t})\n\t\treturn await this.mapper.selectAssoc(entity, input, [], entity.primary)\n\t}\n\n\n\tprivate convertSelectionNode(node: Actions.SelectionNode, nodeName = 'root', path: string[] = []): ObjectNode<Input.ListQueryInput> {\n\t\treturn new ObjectNode(nodeName, nodeName, node.map(it => {\n\t\t\tconst [field, args, selection] = Array.isArray(it) ? it : [it, undefined, undefined]\n\t\t\tif (selection === undefined \|\| selection.length === 0) {\n\t\t\t\treturn new FieldNode(field, field, {})\n\t\t\t}\n\t\t\treturn this.convertSelectionNode(selection, field, [...path, nodeName]).withArgs(args)\n\t\t}), {}, {}, path)\n\t}\n}\n"],"names":[],"mappings":"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"}

package/dist/development/src/triggers/TriggerPayloadManager.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TriggerPayloadManager.cjs","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadManager.ts"],"sourcesContent":["import { Actions, Input, Model } from '@contember/schema'\nimport { AnyListener } from './TriggerListenersStore'\nimport { EventCause } from './TriggerHandler'\nimport { TriggerPayloadBuilder } from './TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './TriggerPayloadPersister'\n\n\nexport interface FiredEvent {\n\tlistener: AnyListener\n\tcause: EventCause\n\tentity: Model.Entity\n\tprimary: Input.PrimaryValue\n\tselection?: any\n}\n\nexport class TriggerPayloadManager {\n\tprivate eventsByTrigger: Record<string, FiredEvent[]> = {}\n\n\tconstructor(\n\t\tprivate readonly triggerPayloadBuilder: TriggerPayloadBuilder,\n\t\tprivate readonly triggerPayloadPersister: TriggerPayloadPersister,\n\t) {\n\t}\n\n\tpublic async add(firedEvent: FiredEvent) {\n\t\tconst event = await this.triggerPayloadBuilder.preprocessEvent(firedEvent)\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name] ??= []\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name].push(event)\n\t}\n\n\n\tpublic async persist(): Promise<void> {\n\t\tfor (const events of Object.values(this.eventsByTrigger)) {\n\t\t\tconst payloads = await this.triggerPayloadBuilder.build(events)\n\t\t\tconst trigger = events[0].listener.trigger\n\t\t\tawait this.triggerPayloadPersister.persist(trigger, payloads)\n\t\t}\n\t}\n}\n\n"],"names":[],"mappings":";;;;;~~AAeO~~,MAAM,sBAAsB;AAAA,EAGlC,YACkB,uBACA,yBAChB;AAFgB,SAAA,wBAAA;AACA,SAAA,0BAAA;AAJlB,kBAAA,MAAQ,mBAAgD,EAAC;AAAA,EAAA;AAAA,EAQzD,MAAa,IAAI,YAAwB;~~AAxB1C~~,QAAA,IAAA;~~AAyBE~~,UAAM,QAAQ,MAAM,KAAK,sBAAsB,gBAAgB,UAAU;AACzE,KAAA,KAAA,KAAK,iBAAL,KAAqB,WAAW,SAAS,QAAQ,IAAA,MAAjD,SAA2D,CAAA;AAC3D,SAAK,gBAAgB,WAAW,SAAS,QAAQ,IAAI,EAAE,KAAK,KAAK;AAAA,EAAA;AAAA,EAIlE,MAAa,UAAyB;AACrC,eAAW,UAAU,OAAO,OAAO,KAAK,eAAe,GAAG;AACzD,YAAM,WAAW,MAAM,KAAK,sBAAsB,MAAM,MAAM;AAC9D,YAAM,UAAU,OAAO,CAAC,EAAE,SAAS;AACnC,YAAM,KAAK,wBAAwB,QAAQ,SAAS,QAAQ;AAAA,IAAA;AAAA,EAC7D;AAEF;;"}
1	+ {"version":3,"file":"TriggerPayloadManager.cjs","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadManager.ts"],"sourcesContent":["import { Actions, ActionsPayload, Input, Model } from '@contember/schema'\nimport { AnyListener } from './TriggerListenersStore'\nimport { EventCause } from './TriggerHandler'\nimport { TriggerPayloadBuilder } from './TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './TriggerPayloadPersister'\n\n\nexport interface FiredEvent {\n\tlistener: AnyListener\n\tcause: EventCause\n\tentity: Model.Entity\n\tprimary: Input.PrimaryValue\n\tselection?: any\n\tnodes?: ActionsPayload.EntityEventPathNode[]\n}\n\nexport class TriggerPayloadManager {\n\tprivate eventsByTrigger: Record<string, FiredEvent[]> = {}\n\n\tconstructor(\n\t\tprivate readonly triggerPayloadBuilder: TriggerPayloadBuilder,\n\t\tprivate readonly triggerPayloadPersister: TriggerPayloadPersister,\n\t) {\n\t}\n\n\tpublic async add(firedEvent: FiredEvent) {\n\t\tconst event = await this.triggerPayloadBuilder.preprocessEvent(firedEvent)\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name] ??= []\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name].push(event)\n\t}\n\n\n\tpublic async persist(): Promise<void> {\n\t\tfor (const events of Object.values(this.eventsByTrigger)) {\n\t\t\tconst payloads = await this.triggerPayloadBuilder.build(events)\n\t\t\tconst trigger = events[0].listener.trigger\n\t\t\tawait this.triggerPayloadPersister.persist(trigger, payloads)\n\t\t}\n\t}\n}\n\n"],"names":[],"mappings":";;;;;AAgBO,MAAM,sBAAsB;AAAA,EAGlC,YACkB,uBACA,yBAChB;AAFgB,SAAA,wBAAA;AACA,SAAA,0BAAA;AAJlB,kBAAA,MAAQ,mBAAgD,EAAC;AAAA,EAAA;AAAA,EAQzD,MAAa,IAAI,YAAwB;AAzB1C,QAAA,IAAA;AA0BE,UAAM,QAAQ,MAAM,KAAK,sBAAsB,gBAAgB,UAAU;AACzE,KAAA,KAAA,KAAK,iBAAL,KAAqB,WAAW,SAAS,QAAQ,IAAA,MAAjD,SAA2D,CAAA;AAC3D,SAAK,gBAAgB,WAAW,SAAS,QAAQ,IAAI,EAAE,KAAK,KAAK;AAAA,EAAA;AAAA,EAIlE,MAAa,UAAyB;AACrC,eAAW,UAAU,OAAO,OAAO,KAAK,eAAe,GAAG;AACzD,YAAM,WAAW,MAAM,KAAK,sBAAsB,MAAM,MAAM;AAC9D,YAAM,UAAU,OAAO,CAAC,EAAE,SAAS;AACnC,YAAM,KAAK,wBAAwB,QAAQ,SAAS,QAAQ;AAAA,IAAA;AAAA,EAC7D;AAEF;;"}

package/dist/development/src/triggers/TriggerPayloadManager.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TriggerPayloadManager.js","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadManager.ts"],"sourcesContent":["import { Actions, Input, Model } from '@contember/schema'\nimport { AnyListener } from './TriggerListenersStore'\nimport { EventCause } from './TriggerHandler'\nimport { TriggerPayloadBuilder } from './TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './TriggerPayloadPersister'\n\n\nexport interface FiredEvent {\n\tlistener: AnyListener\n\tcause: EventCause\n\tentity: Model.Entity\n\tprimary: Input.PrimaryValue\n\tselection?: any\n}\n\nexport class TriggerPayloadManager {\n\tprivate eventsByTrigger: Record<string, FiredEvent[]> = {}\n\n\tconstructor(\n\t\tprivate readonly triggerPayloadBuilder: TriggerPayloadBuilder,\n\t\tprivate readonly triggerPayloadPersister: TriggerPayloadPersister,\n\t) {\n\t}\n\n\tpublic async add(firedEvent: FiredEvent) {\n\t\tconst event = await this.triggerPayloadBuilder.preprocessEvent(firedEvent)\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name] ??= []\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name].push(event)\n\t}\n\n\n\tpublic async persist(): Promise<void> {\n\t\tfor (const events of Object.values(this.eventsByTrigger)) {\n\t\t\tconst payloads = await this.triggerPayloadBuilder.build(events)\n\t\t\tconst trigger = events[0].listener.trigger\n\t\t\tawait this.triggerPayloadPersister.persist(trigger, payloads)\n\t\t}\n\t}\n}\n\n"],"names":[],"mappings":";;;~~AAeO~~,MAAM,sBAAsB;AAAA,EAGlC,YACkB,uBACA,yBAChB;AAFgB,SAAA,wBAAA;AACA,SAAA,0BAAA;AAJlB,kBAAA,MAAQ,mBAAgD,EAAC;AAAA,EAAA;AAAA,EAQzD,MAAa,IAAI,YAAwB;~~AAxB1C~~,QAAA,IAAA;~~AAyBE~~,UAAM,QAAQ,MAAM,KAAK,sBAAsB,gBAAgB,UAAU;AACzE,KAAA,KAAA,KAAK,iBAAL,KAAqB,WAAW,SAAS,QAAQ,IAAA,MAAjD,SAA2D,CAAA;AAC3D,SAAK,gBAAgB,WAAW,SAAS,QAAQ,IAAI,EAAE,KAAK,KAAK;AAAA,EAAA;AAAA,EAIlE,MAAa,UAAyB;AACrC,eAAW,UAAU,OAAO,OAAO,KAAK,eAAe,GAAG;AACzD,YAAM,WAAW,MAAM,KAAK,sBAAsB,MAAM,MAAM;AAC9D,YAAM,UAAU,OAAO,CAAC,EAAE,SAAS;AACnC,YAAM,KAAK,wBAAwB,QAAQ,SAAS,QAAQ;AAAA,IAAA;AAAA,EAC7D;AAEF;"}
1	+ {"version":3,"file":"TriggerPayloadManager.js","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadManager.ts"],"sourcesContent":["import { Actions, ActionsPayload, Input, Model } from '@contember/schema'\nimport { AnyListener } from './TriggerListenersStore'\nimport { EventCause } from './TriggerHandler'\nimport { TriggerPayloadBuilder } from './TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './TriggerPayloadPersister'\n\n\nexport interface FiredEvent {\n\tlistener: AnyListener\n\tcause: EventCause\n\tentity: Model.Entity\n\tprimary: Input.PrimaryValue\n\tselection?: any\n\tnodes?: ActionsPayload.EntityEventPathNode[]\n}\n\nexport class TriggerPayloadManager {\n\tprivate eventsByTrigger: Record<string, FiredEvent[]> = {}\n\n\tconstructor(\n\t\tprivate readonly triggerPayloadBuilder: TriggerPayloadBuilder,\n\t\tprivate readonly triggerPayloadPersister: TriggerPayloadPersister,\n\t) {\n\t}\n\n\tpublic async add(firedEvent: FiredEvent) {\n\t\tconst event = await this.triggerPayloadBuilder.preprocessEvent(firedEvent)\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name] ??= []\n\t\tthis.eventsByTrigger[firedEvent.listener.trigger.name].push(event)\n\t}\n\n\n\tpublic async persist(): Promise<void> {\n\t\tfor (const events of Object.values(this.eventsByTrigger)) {\n\t\t\tconst payloads = await this.triggerPayloadBuilder.build(events)\n\t\t\tconst trigger = events[0].listener.trigger\n\t\t\tawait this.triggerPayloadPersister.persist(trigger, payloads)\n\t\t}\n\t}\n}\n\n"],"names":[],"mappings":";;;AAgBO,MAAM,sBAAsB;AAAA,EAGlC,YACkB,uBACA,yBAChB;AAFgB,SAAA,wBAAA;AACA,SAAA,0BAAA;AAJlB,kBAAA,MAAQ,mBAAgD,EAAC;AAAA,EAAA;AAAA,EAQzD,MAAa,IAAI,YAAwB;AAzB1C,QAAA,IAAA;AA0BE,UAAM,QAAQ,MAAM,KAAK,sBAAsB,gBAAgB,UAAU;AACzE,KAAA,KAAA,KAAK,iBAAL,KAAqB,WAAW,SAAS,QAAQ,IAAA,MAAjD,SAA2D,CAAA;AAC3D,SAAK,gBAAgB,WAAW,SAAS,QAAQ,IAAI,EAAE,KAAK,KAAK;AAAA,EAAA;AAAA,EAIlE,MAAa,UAAyB;AACrC,eAAW,UAAU,OAAO,OAAO,KAAK,eAAe,GAAG;AACzD,YAAM,WAAW,MAAM,KAAK,sBAAsB,MAAM,MAAM;AAC9D,YAAM,UAAU,OAAO,CAAC,EAAE,SAAS;AACnC,YAAM,KAAK,wBAAwB,QAAQ,SAAS,QAAQ;AAAA,IAAA;AAAA,EAC7D;AAEF;"}

package/dist/development/src/triggers/TriggerPayloadPersister.cjs CHANGED Viewed

@@ -3,13 +3,15 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Database = require("@contember/database");
 const notifyChannel = require("../utils/notifyChannel.cjs");
 class TriggerPayloadPersister {
-  constructor(mapper, client, providers, projectSlug, stageId, schemaId) {
+  constructor(mapper, client, providers, projectSlug, stageId, schemaId, identityId, userInfo) {
     this.mapper = mapper;
     this.client = client;
     this.providers = providers;
     this.projectSlug = projectSlug;
     this.stageId = stageId;
     this.schemaId = schemaId;
+    this.identityId = identityId;
+    this.userInfo = userInfo;
   }
   async persist(trigger, payloads) {
     const chunkSize = 100;
@@ -32,7 +34,10 @@ class TriggerPayloadPersister {
         priority: trigger.priority ?? 0,
         payload: it,
         resolved_at: null,
-        last_state_change: "now"
+        last_state_change: "now",
+        identity_id: this.identityId,
+        ip_address: this.userInfo.ipAddress,
+        user_agent: this.userInfo.userAgent
       }))).execute(this.client);
     }
     await notifyChannel.notify(this.client, this.projectSlug);

package/dist/development/src/triggers/TriggerPayloadPersister.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TriggerPayloadPersister.cjs","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadPersister.ts"],"sourcesContent":["import { Client, InsertBuilder } from '@contember/database'\nimport { Mapper } from '@contember/engine-content-api'\nimport { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow } from '../model/types'\nimport { notify } from '../utils/notifyChannel'\n\n\ntype EventRowToInsert = Omit<EventRow, 'created_at' \| 'visible_at' \| 'last_state_change' \| 'log'> & {\n\tcreated_at: string \| Date\n\tvisible_at: string \| Date\n\tlast_state_change: string \| Date\n}\n\nexport class TriggerPayloadPersister {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t\tprivate readonly client: Client,\n\t\tprivate readonly providers: { uuid: () => string },\n\t\tprivate readonly projectSlug: string,\n\t\tprivate readonly stageId: string,\n\t\tprivate readonly schemaId?: number,\n\t) {\n\t}\n\n\tpublic async persist(trigger: Actions.AnyTrigger, payloads: ActionsPayload.AnyEventPayload[]): Promise<void> {\n\t\tconst chunkSize = 100\n\t\tif (!this.schemaId) {\n\t\t\tthrow new Error('Schema id is not set')\n\t\t}\n\t\tfor (let i = 0; i < payloads.length; i += chunkSize) {\n\t\t\tconst chunk = payloads.slice(i, i + chunkSize)\n\t\t\tawait InsertBuilder.create()\n\t\t\t\t.into('actions_event')\n\t\t\t\t.values(chunk.map((it): EventRowToInsert => ({\n\t\t\t\t\tid: this.providers.uuid(),\n\t\t\t\t\ttransaction_id: this.mapper.transactionId,\n\t\t\t\t\tcreated_at: 'now',\n\t\t\t\t\tvisible_at: 'now',\n\t\t\t\t\tnum_retries: 0,\n\t\t\t\t\tstate: 'created',\n\t\t\t\t\tstage_id: this.stageId,\n\t\t\t\t\tschema_id: this.schemaId!,\n\t\t\t\t\ttarget: trigger.target,\n\t\t\t\t\ttrigger: trigger.name,\n\t\t\t\t\tpriority: trigger.priority ?? 0,\n\t\t\t\t\tpayload: it,\n\t\t\t\t\tresolved_at: null,\n\t\t\t\t\tlast_state_change: 'now',\n\t\t\t\t})))\n\t\t\t\t.execute(this.client)\n\t\t}\n\n\t\tawait notify(this.client, this.projectSlug)\n\t}\n}\n"],"names":["InsertBuilder","notify"],"mappings":";;;;AAaO,MAAM,wBAAwB;AAAA,EACpC,YACkB,QACA,QACA,WACA,aACA,SACA,UAChB;~~AANgB~~,SAAA,SAAA;AACA,SAAA,SAAA;AACA,SAAA,YAAA;AACA,SAAA,cAAA;AACA,SAAA,UAAA;AACA,SAAA,WAAA;AAAA,EAAA;AAAA,EAIlB,MAAa,QAAQ,SAA6B,UAA2D;AAC5G,UAAM,YAAY;AACd,QAAA,CAAC,KAAK,UAAU;AACb,YAAA,IAAI,MAAM,sBAAsB;AAAA,IAAA;AAEvC,aAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK,WAAW;AACpD,YAAM,QAAQ,SAAS,MAAM,GAAG,IAAI,SAAS;AACvC,YAAAA,SAAA,cAAc,OAAO,EACzB,KAAK,eAAe,EACpB,OAAO,MAAM,IAAI,CAAC,QAA0B;AAAA,QAC5C,IAAI,KAAK,UAAU,KAAK;AAAA,QACxB,gBAAgB,KAAK,OAAO;AAAA,QAC5B,YAAY;AAAA,QACZ,YAAY;AAAA,QACZ,aAAa;AAAA,QACb,OAAO;AAAA,QACP,UAAU,KAAK;AAAA,QACf,WAAW,KAAK;AAAA,QAChB,QAAQ,QAAQ;AAAA,QAChB,SAAS,QAAQ;AAAA,QACjB,UAAU,QAAQ,YAAY;AAAA,QAC9B,SAAS;AAAA,QACT,aAAa;AAAA,QACb,mBAAmB;AAAA,~~MAClB~~,EAAA,CAAC,EACF,QAAQ,KAAK,MAAM;AAAA,IAAA;AAGtB,UAAMC,cAAO,OAAA,KAAK,QAAQ,KAAK,WAAW;AAAA,EAAA;AAE5C;;"}
1	+ {"version":3,"file":"TriggerPayloadPersister.cjs","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadPersister.ts"],"sourcesContent":["import { Client, InsertBuilder } from '@contember/database'\nimport { Mapper } from '@contember/engine-content-api'\nimport { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow } from '../model/types'\nimport { notify } from '../utils/notifyChannel'\n\n\ntype EventRowToInsert = Omit<EventRow, 'created_at' \| 'visible_at' \| 'last_state_change' \| 'log'> & {\n\tcreated_at: string \| Date\n\tvisible_at: string \| Date\n\tlast_state_change: string \| Date\n}\n\nexport class TriggerPayloadPersister {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t\tprivate readonly client: Client,\n\t\tprivate readonly providers: { uuid: () => string },\n\t\tprivate readonly projectSlug: string,\n\t\tprivate readonly stageId: string,\n\t\tprivate readonly schemaId: number \| undefined,\n\t\tprivate readonly identityId: string,\n\t\tprivate readonly userInfo: { ipAddress: string \| null; userAgent: string \| null },\n\t) {\n\t}\n\n\tpublic async persist(trigger: Actions.AnyTrigger, payloads: ActionsPayload.AnyEventPayload[]): Promise<void> {\n\t\tconst chunkSize = 100\n\t\tif (!this.schemaId) {\n\t\t\tthrow new Error('Schema id is not set')\n\t\t}\n\t\tfor (let i = 0; i < payloads.length; i += chunkSize) {\n\t\t\tconst chunk = payloads.slice(i, i + chunkSize)\n\t\t\tawait InsertBuilder.create()\n\t\t\t\t.into('actions_event')\n\t\t\t\t.values(chunk.map((it): EventRowToInsert => ({\n\t\t\t\t\tid: this.providers.uuid(),\n\t\t\t\t\ttransaction_id: this.mapper.transactionId,\n\t\t\t\t\tcreated_at: 'now',\n\t\t\t\t\tvisible_at: 'now',\n\t\t\t\t\tnum_retries: 0,\n\t\t\t\t\tstate: 'created',\n\t\t\t\t\tstage_id: this.stageId,\n\t\t\t\t\tschema_id: this.schemaId!,\n\t\t\t\t\ttarget: trigger.target,\n\t\t\t\t\ttrigger: trigger.name,\n\t\t\t\t\tpriority: trigger.priority ?? 0,\n\t\t\t\t\tpayload: it,\n\t\t\t\t\tresolved_at: null,\n\t\t\t\t\tlast_state_change: 'now',\n\t\t\t\t\tidentity_id: this.identityId,\n\t\t\t\t\tip_address: this.userInfo.ipAddress,\n\t\t\t\t\tuser_agent: this.userInfo.userAgent,\n\t\t\t\t})))\n\t\t\t\t.execute(this.client)\n\t\t}\n\n\t\tawait notify(this.client, this.projectSlug)\n\t}\n}\n"],"names":["InsertBuilder","notify"],"mappings":";;;;AAaO,MAAM,wBAAwB;AAAA,EACpC,YACkB,QACA,QACA,WACA,aACA,SACA,UACA,YACA,UAChB;AARgB,SAAA,SAAA;AACA,SAAA,SAAA;AACA,SAAA,YAAA;AACA,SAAA,cAAA;AACA,SAAA,UAAA;AACA,SAAA,WAAA;AACA,SAAA,aAAA;AACA,SAAA,WAAA;AAAA,EAAA;AAAA,EAIlB,MAAa,QAAQ,SAA6B,UAA2D;AAC5G,UAAM,YAAY;AACd,QAAA,CAAC,KAAK,UAAU;AACb,YAAA,IAAI,MAAM,sBAAsB;AAAA,IAAA;AAEvC,aAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK,WAAW;AACpD,YAAM,QAAQ,SAAS,MAAM,GAAG,IAAI,SAAS;AACvC,YAAAA,SAAA,cAAc,OAAO,EACzB,KAAK,eAAe,EACpB,OAAO,MAAM,IAAI,CAAC,QAA0B;AAAA,QAC5C,IAAI,KAAK,UAAU,KAAK;AAAA,QACxB,gBAAgB,KAAK,OAAO;AAAA,QAC5B,YAAY;AAAA,QACZ,YAAY;AAAA,QACZ,aAAa;AAAA,QACb,OAAO;AAAA,QACP,UAAU,KAAK;AAAA,QACf,WAAW,KAAK;AAAA,QAChB,QAAQ,QAAQ;AAAA,QAChB,SAAS,QAAQ;AAAA,QACjB,UAAU,QAAQ,YAAY;AAAA,QAC9B,SAAS;AAAA,QACT,aAAa;AAAA,QACb,mBAAmB;AAAA,QACnB,aAAa,KAAK;AAAA,QAClB,YAAY,KAAK,SAAS;AAAA,QAC1B,YAAY,KAAK,SAAS;AAAA,MACzB,EAAA,CAAC,EACF,QAAQ,KAAK,MAAM;AAAA,IAAA;AAGtB,UAAMC,cAAO,OAAA,KAAK,QAAQ,KAAK,WAAW;AAAA,EAAA;AAE5C;;"}

package/dist/development/src/triggers/TriggerPayloadPersister.js CHANGED Viewed

@@ -1,13 +1,15 @@
 import { InsertBuilder as InsertBuilder$1 } from "@contember/database";
 import { notify } from "../utils/notifyChannel.js";
 class TriggerPayloadPersister {
-  constructor(mapper, client, providers, projectSlug, stageId, schemaId) {
+  constructor(mapper, client, providers, projectSlug, stageId, schemaId, identityId, userInfo) {
     this.mapper = mapper;
     this.client = client;
     this.providers = providers;
     this.projectSlug = projectSlug;
     this.stageId = stageId;
     this.schemaId = schemaId;
+    this.identityId = identityId;
+    this.userInfo = userInfo;
   }
   async persist(trigger, payloads) {
     const chunkSize = 100;
@@ -30,7 +32,10 @@ class TriggerPayloadPersister {
         priority: trigger.priority ?? 0,
         payload: it,
         resolved_at: null,
-        last_state_change: "now"
+        last_state_change: "now",
+        identity_id: this.identityId,
+        ip_address: this.userInfo.ipAddress,
+        user_agent: this.userInfo.userAgent
       }))).execute(this.client);
     }
     await notify(this.client, this.projectSlug);

package/dist/development/src/triggers/TriggerPayloadPersister.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"TriggerPayloadPersister.js","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadPersister.ts"],"sourcesContent":["import { Client, InsertBuilder } from '@contember/database'\nimport { Mapper } from '@contember/engine-content-api'\nimport { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow } from '../model/types'\nimport { notify } from '../utils/notifyChannel'\n\n\ntype EventRowToInsert = Omit<EventRow, 'created_at' \| 'visible_at' \| 'last_state_change' \| 'log'> & {\n\tcreated_at: string \| Date\n\tvisible_at: string \| Date\n\tlast_state_change: string \| Date\n}\n\nexport class TriggerPayloadPersister {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t\tprivate readonly client: Client,\n\t\tprivate readonly providers: { uuid: () => string },\n\t\tprivate readonly projectSlug: string,\n\t\tprivate readonly stageId: string,\n\t\tprivate readonly schemaId?: number,\n\t) {\n\t}\n\n\tpublic async persist(trigger: Actions.AnyTrigger, payloads: ActionsPayload.AnyEventPayload[]): Promise<void> {\n\t\tconst chunkSize = 100\n\t\tif (!this.schemaId) {\n\t\t\tthrow new Error('Schema id is not set')\n\t\t}\n\t\tfor (let i = 0; i < payloads.length; i += chunkSize) {\n\t\t\tconst chunk = payloads.slice(i, i + chunkSize)\n\t\t\tawait InsertBuilder.create()\n\t\t\t\t.into('actions_event')\n\t\t\t\t.values(chunk.map((it): EventRowToInsert => ({\n\t\t\t\t\tid: this.providers.uuid(),\n\t\t\t\t\ttransaction_id: this.mapper.transactionId,\n\t\t\t\t\tcreated_at: 'now',\n\t\t\t\t\tvisible_at: 'now',\n\t\t\t\t\tnum_retries: 0,\n\t\t\t\t\tstate: 'created',\n\t\t\t\t\tstage_id: this.stageId,\n\t\t\t\t\tschema_id: this.schemaId!,\n\t\t\t\t\ttarget: trigger.target,\n\t\t\t\t\ttrigger: trigger.name,\n\t\t\t\t\tpriority: trigger.priority ?? 0,\n\t\t\t\t\tpayload: it,\n\t\t\t\t\tresolved_at: null,\n\t\t\t\t\tlast_state_change: 'now',\n\t\t\t\t})))\n\t\t\t\t.execute(this.client)\n\t\t}\n\n\t\tawait notify(this.client, this.projectSlug)\n\t}\n}\n"],"names":["InsertBuilder"],"mappings":";;AAaO,MAAM,wBAAwB;AAAA,EACpC,YACkB,QACA,QACA,WACA,aACA,SACA,UAChB;~~AANgB~~,SAAA,SAAA;AACA,SAAA,SAAA;AACA,SAAA,YAAA;AACA,SAAA,cAAA;AACA,SAAA,UAAA;AACA,SAAA,WAAA;AAAA,EAAA;AAAA,EAIlB,MAAa,QAAQ,SAA6B,UAA2D;AAC5G,UAAM,YAAY;AACd,QAAA,CAAC,KAAK,UAAU;AACb,YAAA,IAAI,MAAM,sBAAsB;AAAA,IAAA;AAEvC,aAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK,WAAW;AACpD,YAAM,QAAQ,SAAS,MAAM,GAAG,IAAI,SAAS;AACvC,YAAAA,gBAAc,OAAO,EACzB,KAAK,eAAe,EACpB,OAAO,MAAM,IAAI,CAAC,QAA0B;AAAA,QAC5C,IAAI,KAAK,UAAU,KAAK;AAAA,QACxB,gBAAgB,KAAK,OAAO;AAAA,QAC5B,YAAY;AAAA,QACZ,YAAY;AAAA,QACZ,aAAa;AAAA,QACb,OAAO;AAAA,QACP,UAAU,KAAK;AAAA,QACf,WAAW,KAAK;AAAA,QAChB,QAAQ,QAAQ;AAAA,QAChB,SAAS,QAAQ;AAAA,QACjB,UAAU,QAAQ,YAAY;AAAA,QAC9B,SAAS;AAAA,QACT,aAAa;AAAA,QACb,mBAAmB;AAAA,~~MAClB~~,EAAA,CAAC,EACF,QAAQ,KAAK,MAAM;AAAA,IAAA;AAGtB,UAAM,OAAO,KAAK,QAAQ,KAAK,WAAW;AAAA,EAAA;AAE5C;"}
1	+ {"version":3,"file":"TriggerPayloadPersister.js","sources":["../../../../../packages/engine-actions/src/triggers/TriggerPayloadPersister.ts"],"sourcesContent":["import { Client, InsertBuilder } from '@contember/database'\nimport { Mapper } from '@contember/engine-content-api'\nimport { Actions, ActionsPayload } from '@contember/schema'\nimport { EventRow } from '../model/types'\nimport { notify } from '../utils/notifyChannel'\n\n\ntype EventRowToInsert = Omit<EventRow, 'created_at' \| 'visible_at' \| 'last_state_change' \| 'log'> & {\n\tcreated_at: string \| Date\n\tvisible_at: string \| Date\n\tlast_state_change: string \| Date\n}\n\nexport class TriggerPayloadPersister {\n\tconstructor(\n\t\tprivate readonly mapper: Mapper,\n\t\tprivate readonly client: Client,\n\t\tprivate readonly providers: { uuid: () => string },\n\t\tprivate readonly projectSlug: string,\n\t\tprivate readonly stageId: string,\n\t\tprivate readonly schemaId: number \| undefined,\n\t\tprivate readonly identityId: string,\n\t\tprivate readonly userInfo: { ipAddress: string \| null; userAgent: string \| null },\n\t) {\n\t}\n\n\tpublic async persist(trigger: Actions.AnyTrigger, payloads: ActionsPayload.AnyEventPayload[]): Promise<void> {\n\t\tconst chunkSize = 100\n\t\tif (!this.schemaId) {\n\t\t\tthrow new Error('Schema id is not set')\n\t\t}\n\t\tfor (let i = 0; i < payloads.length; i += chunkSize) {\n\t\t\tconst chunk = payloads.slice(i, i + chunkSize)\n\t\t\tawait InsertBuilder.create()\n\t\t\t\t.into('actions_event')\n\t\t\t\t.values(chunk.map((it): EventRowToInsert => ({\n\t\t\t\t\tid: this.providers.uuid(),\n\t\t\t\t\ttransaction_id: this.mapper.transactionId,\n\t\t\t\t\tcreated_at: 'now',\n\t\t\t\t\tvisible_at: 'now',\n\t\t\t\t\tnum_retries: 0,\n\t\t\t\t\tstate: 'created',\n\t\t\t\t\tstage_id: this.stageId,\n\t\t\t\t\tschema_id: this.schemaId!,\n\t\t\t\t\ttarget: trigger.target,\n\t\t\t\t\ttrigger: trigger.name,\n\t\t\t\t\tpriority: trigger.priority ?? 0,\n\t\t\t\t\tpayload: it,\n\t\t\t\t\tresolved_at: null,\n\t\t\t\t\tlast_state_change: 'now',\n\t\t\t\t\tidentity_id: this.identityId,\n\t\t\t\t\tip_address: this.userInfo.ipAddress,\n\t\t\t\t\tuser_agent: this.userInfo.userAgent,\n\t\t\t\t})))\n\t\t\t\t.execute(this.client)\n\t\t}\n\n\t\tawait notify(this.client, this.projectSlug)\n\t}\n}\n"],"names":["InsertBuilder"],"mappings":";;AAaO,MAAM,wBAAwB;AAAA,EACpC,YACkB,QACA,QACA,WACA,aACA,SACA,UACA,YACA,UAChB;AARgB,SAAA,SAAA;AACA,SAAA,SAAA;AACA,SAAA,YAAA;AACA,SAAA,cAAA;AACA,SAAA,UAAA;AACA,SAAA,WAAA;AACA,SAAA,aAAA;AACA,SAAA,WAAA;AAAA,EAAA;AAAA,EAIlB,MAAa,QAAQ,SAA6B,UAA2D;AAC5G,UAAM,YAAY;AACd,QAAA,CAAC,KAAK,UAAU;AACb,YAAA,IAAI,MAAM,sBAAsB;AAAA,IAAA;AAEvC,aAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,KAAK,WAAW;AACpD,YAAM,QAAQ,SAAS,MAAM,GAAG,IAAI,SAAS;AACvC,YAAAA,gBAAc,OAAO,EACzB,KAAK,eAAe,EACpB,OAAO,MAAM,IAAI,CAAC,QAA0B;AAAA,QAC5C,IAAI,KAAK,UAAU,KAAK;AAAA,QACxB,gBAAgB,KAAK,OAAO;AAAA,QAC5B,YAAY;AAAA,QACZ,YAAY;AAAA,QACZ,aAAa;AAAA,QACb,OAAO;AAAA,QACP,UAAU,KAAK;AAAA,QACf,WAAW,KAAK;AAAA,QAChB,QAAQ,QAAQ;AAAA,QAChB,SAAS,QAAQ;AAAA,QACjB,UAAU,QAAQ,YAAY;AAAA,QAC9B,SAAS;AAAA,QACT,aAAa;AAAA,QACb,mBAAmB;AAAA,QACnB,aAAa,KAAK;AAAA,QAClB,YAAY,KAAK,SAAS;AAAA,QAC1B,YAAY,KAAK,SAAS;AAAA,MACzB,EAAA,CAAC,EACF,QAAQ,KAAK,MAAM;AAAA,IAAA;AAGtB,UAAM,OAAO,KAAK,QAAQ,KAAK,WAAW;AAAA,EAAA;AAE5C;"}

package/dist/production/src/ActionsExecutionContainerHookFactory.cjs CHANGED Viewed

@@ -12,12 +12,12 @@ class ActionsExecutionContainerHookFactory {
   }
   create() {
     return (builder) => {
-      return builder.setupService("mapperFactory", (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta }) => {
+      return builder.setupService("mapperFactory", (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta, joinBuilder, userInfo }) => {
         mapperFactory.hooks.push((mapper) => {
-          const triggerPayloadPersister = new TriggerPayloadPersister.TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id);
+          const triggerPayloadPersister = new TriggerPayloadPersister.TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id, mapper.identityId, userInfo);
           const triggerPayloadBuilder = new TriggerPayloadBuilder.TriggerPayloadBuilder(mapper);
           const payloadManager = new TriggerPayloadManager.TriggerPayloadManager(triggerPayloadBuilder, triggerPayloadPersister);
-          const changesFetcher = new TriggerIndirectChangesFetcher.TriggerIndirectChangesFetcher(mapper, whereBuilder, pathFactory);
+          const changesFetcher = new TriggerIndirectChangesFetcher.TriggerIndirectChangesFetcher(schema.model, mapper, whereBuilder, joinBuilder, pathFactory);
           const listenersStore = this.listenerStoreProvider.getListenerStore(schema);
           const triggerHandler = new TriggerHandler.TriggerHandler(payloadManager, listenersStore, changesFetcher);
           triggerHandler.attach(mapper.eventManager);

package/dist/production/src/ActionsExecutionContainerHookFactory.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ActionsExecutionContainerHookFactory.cjs","sources":["../../../../packages/engine-actions/src/ActionsExecutionContainerHookFactory.ts"],"sourcesContent":["import { TriggerHandler, TriggerIndirectChangesFetcher, TriggerPayloadManager } from './triggers'\nimport { ListenerStoreProvider } from './ListenerStoreProvider'\nimport { TriggerPayloadBuilder } from './triggers/TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './triggers/TriggerPayloadPersister'\nimport { ExecutionContainerHook } from '@contember/engine-content-api'\n\nexport class ActionsExecutionContainerHookFactory {\n\tconstructor(\n\t\tprivate readonly listenerStoreProvider: ListenerStoreProvider,\n\t) {\n\t}\n\n\tcreate(): ExecutionContainerHook {\n\t\treturn builder => {\n\t\t\treturn builder.setupService('mapperFactory', (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta }) => {\n\t\t\t\tmapperFactory.hooks.push(mapper => {\n\t\t\t\t\tconst triggerPayloadPersister = new TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id)\n\t\t\t\t\tconst triggerPayloadBuilder = new TriggerPayloadBuilder(mapper)\n\t\t\t\t\tconst payloadManager = new TriggerPayloadManager(triggerPayloadBuilder, triggerPayloadPersister)\n\t\t\t\t\tconst changesFetcher = new TriggerIndirectChangesFetcher(mapper, whereBuilder, pathFactory)\n\t\t\t\t\tconst listenersStore = this.listenerStoreProvider.getListenerStore(schema)\n\t\t\t\t\tconst triggerHandler = new TriggerHandler(payloadManager, listenersStore, changesFetcher)\n\t\t\t\t\ttriggerHandler.attach(mapper.eventManager)\n\t\t\t\t})\n\t\t\t})\n\t\t}\n\t}\n}\n"],"names":["TriggerPayloadPersister","TriggerPayloadBuilder","TriggerPayloadManager","TriggerIndirectChangesFetcher","TriggerHandler"],"mappings":";;;;;;;;AAMO,MAAM,qCAAqC;AAAA,EACjD,YACkB,uBAChB;AADgB,SAAA,wBAAA;AAAA,EAAA;AAAA,EAIlB,SAAiC;AAChC,WAAO,CAAW,YAAA;AACjB,aAAO,QAAQ,aAAa,iBAAiB,CAAC,eAAe,EAAE,cAAc,QAAQ,aAAa,cAAc,WAAW,OAAO,SAAS,~~iBAAiB~~;~~AAC7I~~,sBAAA,MAAM,KAAK,CAAU,WAAA;AAClC,gBAAM,0BAA0B,IAAIA,wBAAwB,~~wBAAA,~~QAAQ,OAAO,GAAG,UAAU,YAAY,GAAG,WAAW,QAAQ,MAAM,MAAM,IAAI,WAAW,~~EAAE~~;~~AACjJ~~,gBAAA,wBAAwB,IAAIC,sBAAA,sBAAsB,MAAM;AAC9D,gBAAM,iBAAiB,IAAIC,4CAAsB,uBAAuB,uBAAuB;~~AAC/F~~,~~gBAAM~~,iBAAiB,IAAIC,8BAAAA,8BAA8B,QAAQ,cAAc,WAAW;~~AAC1F~~,gBAAM,iBAAiB,KAAK,sBAAsB,iBAAiB,MAAM;AACzE,gBAAM,iBAAiB,IAAIC,eAAAA,eAAe,gBAAgB,gBAAgB,cAAc;AACzE,yBAAA,OAAO,OAAO,YAAY;AAAA,QAAA,CACzC;AAAA,MAAA,CACD;AAAA,IACF;AAAA,EAAA;AAEF;;"}
1	+ {"version":3,"file":"ActionsExecutionContainerHookFactory.cjs","sources":["../../../../packages/engine-actions/src/ActionsExecutionContainerHookFactory.ts"],"sourcesContent":["import { TriggerHandler, TriggerIndirectChangesFetcher, TriggerPayloadManager } from './triggers'\nimport { ListenerStoreProvider } from './ListenerStoreProvider'\nimport { TriggerPayloadBuilder } from './triggers/TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './triggers/TriggerPayloadPersister'\nimport { ExecutionContainerHook } from '@contember/engine-content-api'\n\nexport class ActionsExecutionContainerHookFactory {\n\tconstructor(\n\t\tprivate readonly listenerStoreProvider: ListenerStoreProvider,\n\t) {\n\t}\n\n\tcreate(): ExecutionContainerHook {\n\t\treturn builder => {\n\t\t\treturn builder.setupService('mapperFactory', (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta, joinBuilder, userInfo }) => {\n\t\t\t\tmapperFactory.hooks.push(mapper => {\n\t\t\t\t\tconst triggerPayloadPersister = new TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id, mapper.identityId, userInfo)\n\t\t\t\t\tconst triggerPayloadBuilder = new TriggerPayloadBuilder(mapper)\n\t\t\t\t\tconst payloadManager = new TriggerPayloadManager(triggerPayloadBuilder, triggerPayloadPersister)\n\t\t\t\t\tconst changesFetcher = new TriggerIndirectChangesFetcher(schema.model, mapper, whereBuilder, joinBuilder, pathFactory)\n\t\t\t\t\tconst listenersStore = this.listenerStoreProvider.getListenerStore(schema)\n\t\t\t\t\tconst triggerHandler = new TriggerHandler(payloadManager, listenersStore, changesFetcher)\n\t\t\t\t\ttriggerHandler.attach(mapper.eventManager)\n\t\t\t\t})\n\t\t\t})\n\t\t}\n\t}\n}\n"],"names":["TriggerPayloadPersister","TriggerPayloadBuilder","TriggerPayloadManager","TriggerIndirectChangesFetcher","TriggerHandler"],"mappings":";;;;;;;;AAMO,MAAM,qCAAqC;AAAA,EACjD,YACkB,uBAChB;AADgB,SAAA,wBAAA;AAAA,EAAA;AAAA,EAIlB,SAAiC;AAChC,WAAO,CAAW,YAAA;AACjB,aAAO,QAAQ,aAAa,iBAAiB,CAAC,eAAe,EAAE,cAAc,QAAQ,aAAa,cAAc,WAAW,OAAO,SAAS,YAAY,aAAa,eAAe;AACpK,sBAAA,MAAM,KAAK,CAAU,WAAA;AAClC,gBAAM,0BAA0B,IAAIA,wBAAAA,wBAAwB,QAAQ,OAAO,GAAG,UAAU,YAAY,GAAG,WAAW,QAAQ,MAAM,MAAM,IAAI,WAAW,IAAI,OAAO,YAAY,QAAQ;AAC9K,gBAAA,wBAAwB,IAAIC,sBAAA,sBAAsB,MAAM;AAC9D,gBAAM,iBAAiB,IAAIC,4CAAsB,uBAAuB,uBAAuB;AACzF,gBAAA,iBAAiB,IAAIC,8BAAAA,8BAA8B,OAAO,OAAO,QAAQ,cAAc,aAAa,WAAW;AACrH,gBAAM,iBAAiB,KAAK,sBAAsB,iBAAiB,MAAM;AACzE,gBAAM,iBAAiB,IAAIC,eAAAA,eAAe,gBAAgB,gBAAgB,cAAc;AACzE,yBAAA,OAAO,OAAO,YAAY;AAAA,QAAA,CACzC;AAAA,MAAA,CACD;AAAA,IACF;AAAA,EAAA;AAEF;;"}

package/dist/production/src/ActionsExecutionContainerHookFactory.js CHANGED Viewed

@@ -10,12 +10,12 @@ class ActionsExecutionContainerHookFactory {
   }
   create() {
     return (builder) => {
-      return builder.setupService("mapperFactory", (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta }) => {
+      return builder.setupService("mapperFactory", (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta, joinBuilder, userInfo }) => {
         mapperFactory.hooks.push((mapper) => {
-          const triggerPayloadPersister = new TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id);
+          const triggerPayloadPersister = new TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id, mapper.identityId, userInfo);
           const triggerPayloadBuilder = new TriggerPayloadBuilder(mapper);
           const payloadManager = new TriggerPayloadManager(triggerPayloadBuilder, triggerPayloadPersister);
-          const changesFetcher = new TriggerIndirectChangesFetcher(mapper, whereBuilder, pathFactory);
+          const changesFetcher = new TriggerIndirectChangesFetcher(schema.model, mapper, whereBuilder, joinBuilder, pathFactory);
           const listenersStore = this.listenerStoreProvider.getListenerStore(schema);
           const triggerHandler = new TriggerHandler(payloadManager, listenersStore, changesFetcher);
           triggerHandler.attach(mapper.eventManager);

package/dist/production/src/ActionsExecutionContainerHookFactory.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ActionsExecutionContainerHookFactory.js","sources":["../../../../packages/engine-actions/src/ActionsExecutionContainerHookFactory.ts"],"sourcesContent":["import { TriggerHandler, TriggerIndirectChangesFetcher, TriggerPayloadManager } from './triggers'\nimport { ListenerStoreProvider } from './ListenerStoreProvider'\nimport { TriggerPayloadBuilder } from './triggers/TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './triggers/TriggerPayloadPersister'\nimport { ExecutionContainerHook } from '@contember/engine-content-api'\n\nexport class ActionsExecutionContainerHookFactory {\n\tconstructor(\n\t\tprivate readonly listenerStoreProvider: ListenerStoreProvider,\n\t) {\n\t}\n\n\tcreate(): ExecutionContainerHook {\n\t\treturn builder => {\n\t\t\treturn builder.setupService('mapperFactory', (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta }) => {\n\t\t\t\tmapperFactory.hooks.push(mapper => {\n\t\t\t\t\tconst triggerPayloadPersister = new TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id)\n\t\t\t\t\tconst triggerPayloadBuilder = new TriggerPayloadBuilder(mapper)\n\t\t\t\t\tconst payloadManager = new TriggerPayloadManager(triggerPayloadBuilder, triggerPayloadPersister)\n\t\t\t\t\tconst changesFetcher = new TriggerIndirectChangesFetcher(mapper, whereBuilder, pathFactory)\n\t\t\t\t\tconst listenersStore = this.listenerStoreProvider.getListenerStore(schema)\n\t\t\t\t\tconst triggerHandler = new TriggerHandler(payloadManager, listenersStore, changesFetcher)\n\t\t\t\t\ttriggerHandler.attach(mapper.eventManager)\n\t\t\t\t})\n\t\t\t})\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;AAMO,MAAM,qCAAqC;AAAA,EACjD,YACkB,uBAChB;AADgB,SAAA,wBAAA;AAAA,EAAA;AAAA,EAIlB,SAAiC;AAChC,WAAO,CAAW,YAAA;AACjB,aAAO,QAAQ,aAAa,iBAAiB,CAAC,eAAe,EAAE,cAAc,QAAQ,aAAa,cAAc,WAAW,OAAO,SAAS,~~iBAAiB~~;~~AAC7I~~,sBAAA,MAAM,KAAK,CAAU,WAAA;AAClC,gBAAM,0BAA0B,IAAI,wBAAwB,QAAQ,OAAO,GAAG,UAAU,YAAY,GAAG,WAAW,QAAQ,MAAM,MAAM,IAAI,WAAW,~~EAAE~~;~~AACjJ~~,gBAAA,wBAAwB,IAAI,sBAAsB,MAAM;AAC9D,gBAAM,iBAAiB,IAAI,sBAAsB,uBAAuB,uBAAuB;~~AAC/F~~,~~gBAAM~~,iBAAiB,IAAI,8BAA8B,QAAQ,cAAc,WAAW;~~AAC1F~~,gBAAM,iBAAiB,KAAK,sBAAsB,iBAAiB,MAAM;AACzE,gBAAM,iBAAiB,IAAI,eAAe,gBAAgB,gBAAgB,cAAc;AACzE,yBAAA,OAAO,OAAO,YAAY;AAAA,QAAA,CACzC;AAAA,MAAA,CACD;AAAA,IACF;AAAA,EAAA;AAEF;"}
1	+ {"version":3,"file":"ActionsExecutionContainerHookFactory.js","sources":["../../../../packages/engine-actions/src/ActionsExecutionContainerHookFactory.ts"],"sourcesContent":["import { TriggerHandler, TriggerIndirectChangesFetcher, TriggerPayloadManager } from './triggers'\nimport { ListenerStoreProvider } from './ListenerStoreProvider'\nimport { TriggerPayloadBuilder } from './triggers/TriggerPayloadBuilder'\nimport { TriggerPayloadPersister } from './triggers/TriggerPayloadPersister'\nimport { ExecutionContainerHook } from '@contember/engine-content-api'\n\nexport class ActionsExecutionContainerHookFactory {\n\tconstructor(\n\t\tprivate readonly listenerStoreProvider: ListenerStoreProvider,\n\t) {\n\t}\n\n\tcreate(): ExecutionContainerHook {\n\t\treturn builder => {\n\t\t\treturn builder.setupService('mapperFactory', (mapperFactory, { whereBuilder, schema, pathFactory, systemSchema, providers, stage, project, schemaMeta, joinBuilder, userInfo }) => {\n\t\t\t\tmapperFactory.hooks.push(mapper => {\n\t\t\t\t\tconst triggerPayloadPersister = new TriggerPayloadPersister(mapper, mapper.db.forSchema(systemSchema), providers, project.slug, stage.id, schemaMeta.id, mapper.identityId, userInfo)\n\t\t\t\t\tconst triggerPayloadBuilder = new TriggerPayloadBuilder(mapper)\n\t\t\t\t\tconst payloadManager = new TriggerPayloadManager(triggerPayloadBuilder, triggerPayloadPersister)\n\t\t\t\t\tconst changesFetcher = new TriggerIndirectChangesFetcher(schema.model, mapper, whereBuilder, joinBuilder, pathFactory)\n\t\t\t\t\tconst listenersStore = this.listenerStoreProvider.getListenerStore(schema)\n\t\t\t\t\tconst triggerHandler = new TriggerHandler(payloadManager, listenersStore, changesFetcher)\n\t\t\t\t\ttriggerHandler.attach(mapper.eventManager)\n\t\t\t\t})\n\t\t\t})\n\t\t}\n\t}\n}\n"],"names":[],"mappings":";;;;;;AAMO,MAAM,qCAAqC;AAAA,EACjD,YACkB,uBAChB;AADgB,SAAA,wBAAA;AAAA,EAAA;AAAA,EAIlB,SAAiC;AAChC,WAAO,CAAW,YAAA;AACjB,aAAO,QAAQ,aAAa,iBAAiB,CAAC,eAAe,EAAE,cAAc,QAAQ,aAAa,cAAc,WAAW,OAAO,SAAS,YAAY,aAAa,eAAe;AACpK,sBAAA,MAAM,KAAK,CAAU,WAAA;AAClC,gBAAM,0BAA0B,IAAI,wBAAwB,QAAQ,OAAO,GAAG,UAAU,YAAY,GAAG,WAAW,QAAQ,MAAM,MAAM,IAAI,WAAW,IAAI,OAAO,YAAY,QAAQ;AAC9K,gBAAA,wBAAwB,IAAI,sBAAsB,MAAM;AAC9D,gBAAM,iBAAiB,IAAI,sBAAsB,uBAAuB,uBAAuB;AACzF,gBAAA,iBAAiB,IAAI,8BAA8B,OAAO,OAAO,QAAQ,cAAc,aAAa,WAAW;AACrH,gBAAM,iBAAiB,KAAK,sBAAsB,iBAAiB,MAAM;AACzE,gBAAM,iBAAiB,IAAI,eAAe,gBAAgB,gBAAgB,cAAc;AACzE,yBAAA,OAAO,OAAO,YAAY;AAAA,QAAA,CACzC;AAAA,MAAA,CACD;AAAA,IACF;AAAA,EAAA;AAEF;"}

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

@@ -159,6 +159,9 @@ class WebhookTargetHandler {
       meta: {
         eventId: it.id,
         transactionId: it.transaction_id,
+        identityId: it.identity_id ?? null,
+        ipAddress: it.ip_address ?? null,
+        userAgent: it.user_agent ?? null,
         createdAt: it.created_at.toISOString(),
         lastStateChange: it.last_state_change.toISOString(),
         numRetries: it.num_retries,

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

@@ -140,6 +140,9 @@ class WebhookTargetHandler {
       meta: {
         eventId: it.id,
         transactionId: it.transaction_id,
+        identityId: it.identity_id ?? null,
+        ipAddress: it.ip_address ?? null,
+        userAgent: it.user_agent ?? null,
         createdAt: it.created_at.toISOString(),
         lastStateChange: it.last_state_change.toISOString(),
         numRetries: it.num_retries,

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

@@ -50,7 +50,10 @@ class EventsQueryResolver {
       stage: stagesMap[row.stage_id],
       state: row.state,
       target: row.target,
-      transactionId: row.transaction_id
+      transactionId: row.transaction_id,
+      identityId: row.identity_id ?? void 0,
+      ipAddress: row.ip_address ?? void 0,
+      userAgent: row.user_agent ?? void 0
     }));
   }
 }

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 {\n\tEvent,\n\tQueryEventsInProcessingArgs,\n\tQueryEventsToProcessArgs,\n\tQueryFailedEventsArgs,\n\tQueryResolvers,\n} from '../../schema'\nimport { ActionsContext } from '../ActionsContext'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery'\nimport { EventRow } from '../../../model/types'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery'\nimport { ActionsAuthorizationActions } from '../../../authorization'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery'\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\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}))\n\t}\n}\n"],"names":["ActionsAuthorizationActions","EventsInProcessingQuery","EventsToProcessQuery","FailedEventsQuery","EventByIdQuery","StagesQuery"],"mappings":";;;;;;;;;;AAiBO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AAC/F,UAAA,IAAI,cAAcA,4BAAA,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIC,wBAAwB,wBAAA,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG9E,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AACzF,UAAA,IAAI,cAAcD,4BAAA,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIE,qBAAqB,qBAAA,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG3E,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACnF,UAAA,IAAI,cAAcF,4BAAA,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIG,kBAAkB,kBAAA,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAGxE,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAC1F,UAAA,IAAI,cAAcH,4BAAA,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AACzC,UAAA,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAII,8BAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACL,aAAA;AAAA,IAAA;AAER,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAAA;AAAA,EAG7C,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AACpC,WAAA,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EAAA;AAAA,EAGpE,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAIC,gBAAY,YAAA,CAAC,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EAAA;AAAA,EAG/F,aAAa,MAAkB,WAA4C;AAE3E,WAAA,KAAK,IAAI,CAAQ,SAAA;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,IAAA,~~EAClB~~;AAAA,EAAA;AAEJ;;"}
1	+ {"version":3,"file":"EventsQueryResolver.cjs","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/query/EventsQueryResolver.ts"],"sourcesContent":["import {\n\tEvent,\n\tQueryEventsInProcessingArgs,\n\tQueryEventsToProcessArgs,\n\tQueryFailedEventsArgs,\n\tQueryResolvers,\n} from '../../schema'\nimport { ActionsContext } from '../ActionsContext'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery'\nimport { EventRow } from '../../../model/types'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery'\nimport { ActionsAuthorizationActions } from '../../../authorization'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery'\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\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":";;;;;;;;;;AAiBO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AAC/F,UAAA,IAAI,cAAcA,4BAAA,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIC,wBAAwB,wBAAA,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG9E,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AACzF,UAAA,IAAI,cAAcD,4BAAA,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIE,qBAAqB,qBAAA,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG3E,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACnF,UAAA,IAAI,cAAcF,4BAAA,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAIG,kBAAkB,kBAAA,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAGxE,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAC1F,UAAA,IAAI,cAAcH,4BAAA,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AACzC,UAAA,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAII,8BAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACL,aAAA;AAAA,IAAA;AAER,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAAA;AAAA,EAG7C,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AACpC,WAAA,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EAAA;AAAA,EAGpE,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAIC,gBAAY,YAAA,CAAC,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EAAA;AAAA,EAG/F,aAAa,MAAkB,WAA4C;AAE3E,WAAA,KAAK,IAAI,CAAQ,SAAA;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,EAAA;AAEJ;;"}

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

@@ -48,7 +48,10 @@ class EventsQueryResolver {
       stage: stagesMap[row.stage_id],
       state: row.state,
       target: row.target,
-      transactionId: row.transaction_id
+      transactionId: row.transaction_id,
+      identityId: row.identity_id ?? void 0,
+      ipAddress: row.ip_address ?? void 0,
+      userAgent: row.user_agent ?? void 0
     }));
   }
 }

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 {\n\tEvent,\n\tQueryEventsInProcessingArgs,\n\tQueryEventsToProcessArgs,\n\tQueryFailedEventsArgs,\n\tQueryResolvers,\n} from '../../schema'\nimport { ActionsContext } from '../ActionsContext'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery'\nimport { EventRow } from '../../../model/types'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery'\nimport { ActionsAuthorizationActions } from '../../../authorization'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery'\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\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}))\n\t}\n}\n"],"names":[],"mappings":";;;;;;;;AAiBO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AAC/F,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,wBAAwB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG9E,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AACzF,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,qBAAqB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG3E,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACnF,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,kBAAkB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAGxE,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAC1F,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AACzC,UAAA,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAI,eAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACL,aAAA;AAAA,IAAA;AAER,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAAA;AAAA,EAG7C,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AACpC,WAAA,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EAAA;AAAA,EAGpE,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EAAA;AAAA,EAG/F,aAAa,MAAkB,WAA4C;AAE3E,WAAA,KAAK,IAAI,CAAQ,SAAA;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,IAAA,~~EAClB~~;AAAA,EAAA;AAEJ;"}
1	+ {"version":3,"file":"EventsQueryResolver.js","sources":["../../../../../../../packages/engine-actions/src/graphql/resolvers/query/EventsQueryResolver.ts"],"sourcesContent":["import {\n\tEvent,\n\tQueryEventsInProcessingArgs,\n\tQueryEventsToProcessArgs,\n\tQueryFailedEventsArgs,\n\tQueryResolvers,\n} from '../../schema'\nimport { ActionsContext } from '../ActionsContext'\nimport { EventsToProcessQuery } from '../../../model/EventsToProcessQuery'\nimport { EventRow } from '../../../model/types'\nimport { DatabaseContext, StagesQuery } from '@contember/engine-system-api'\nimport { Client, DatabaseQuery } from '@contember/database'\nimport { EventsInProcessingQuery } from '../../../model/EventsInProcessingQuery'\nimport { FailedEventsQuery } from '../../../model/FailedEventsQuery'\nimport { ActionsAuthorizationActions } from '../../../authorization'\nimport { EventByIdQuery } from '../../../model/EventByIdQuery'\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\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":";;;;;;;;AAiBO,MAAM,oBAA8D;AAAA,EAC1E,MAAM,mBAAmB,QAAiB,EAAE,KAAA,GAAqC,KAAqB;AAC/F,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,wBAAwB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG9E,MAAM,gBAAgB,QAAiB,EAAE,KAAA,GAAkC,KAAqB;AACzF,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,qBAAqB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAG3E,MAAM,aAAa,QAAiB,EAAE,KAAA,GAA+B,KAAqB;AACnF,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAExD,WAAA,MAAM,KAAK,YAAY,IAAI,IAAI,IAAI,kBAAkB,QAAQ,CAAA,CAAE,CAAC;AAAA,EAAA;AAAA,EAGxE,MAAM,MAAM,QAAiB,EAAE,GAAA,GAAsB,KAA4C;AAC1F,UAAA,IAAI,cAAc,4BAA4B,WAAW;AAC/D,UAAM,SAAS,MAAM,KAAK,eAAe,IAAI,EAAE;AACzC,UAAA,SAAS,MAAM,IAAI,GAAG,aAAa,MAAM,IAAI,eAAe,EAAE,CAAC;AACrE,QAAI,CAAC,QAAQ;AACL,aAAA;AAAA,IAAA;AAER,WAAO,KAAK,aAAa,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;AAAA,EAAA;AAAA,EAG7C,MAAc,YAAY,IAAqB,OAAkC;AAChF,UAAM,SAAS,MAAM,KAAK,eAAe,EAAE;AACpC,WAAA,KAAK,aAAa,MAAM,GAAG,aAAa,MAAM,KAAK,GAAG,MAAM;AAAA,EAAA;AAAA,EAGpE,MAAc,eAAe,IAAsD;AAClF,WAAO,OAAO,aAAa,MAAM,GAAG,aAAa,MAAM,IAAI,YAAY,CAAC,GAAG,IAAI,QAAM,CAAC,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;AAAA,EAAA;AAAA,EAG/F,aAAa,MAAkB,WAA4C;AAE3E,WAAA,KAAK,IAAI,CAAQ,SAAA;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,EAAA;AAEJ;"}

package/dist/production/src/graphql/schema/actions.graphql.cjs CHANGED Viewed

@@ -35,6 +35,9 @@ const schema = graphqlTag.gql`
     type Event {
         id: Uuid!
         transactionId: Uuid!
+        identityId: Uuid
+        ipAddress: String
+        userAgent: String
         createdAt: DateTime!
         lastStateChange: DateTime!
         resolvedAt: DateTime
@@ -59,11 +62,11 @@ const schema = graphqlTag.gql`
     type ProcessBatchResponse {
         ok: Boolean!
     }
     type RetryEventResponse {
         ok: Boolean!
     }
     type StopEventResponse {
         ok: Boolean!
     }
@@ -72,12 +75,12 @@ const schema = graphqlTag.gql`
         variables: [VariableInput!]!
         mode: SetVariablesMode
     }
 	"""
-	Defines how it handles original variables.
+	Defines how it handles original variables.
 	- MERGE merges with new values (default behaviour)
 	- SET replaces all variables
-	- APPEND_ONLY_MISSING appends values if not already exist
+	- APPEND_ONLY_MISSING appends values if not already exist
 	"""
 	enum SetVariablesMode {
 		MERGE
@@ -89,7 +92,7 @@ const schema = graphqlTag.gql`
         name: String!
         value: String!
     }
 	type SetVariablesResponse {
 		ok: Boolean!
 	}

package/dist/production/src/graphql/schema/actions.graphql.cjs.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"actions.graphql.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/schema/actions.graphql.ts"],"sourcesContent":["import { gql } from 'graphql-tag'\nimport { DocumentNode } from 'graphql'\n\nexport const schema: DocumentNode = gql`\n scalar DateTime\n scalar Json\n scalar Uuid\n\n schema {\n query: Query\n mutation: Mutation\n }\n\n type Query {\n failedEvents(args: EventArgs): [Event!]!\n eventsToProcess(args: EventArgs): [Event!]!\n eventsInProcessing(args: EventArgs): [Event!]!\n event(id: Uuid!): Event\n variables: [Variable!]!\n }\n\n type Mutation {\n processBatch: ProcessBatchResponse!\n retryEvent(id: Uuid!): RetryEventResponse!\n stopEvent(id: Uuid!): StopEventResponse!\n setVariables(args: SetVariablesArgs!): SetVariablesResponse!\n }\n\n input EventArgs {\n offset: Int\n \"Max 10000\"\n limit: Int\n }\n\n type Event {\n id: Uuid!\n transactionId: Uuid!\n createdAt: DateTime!\n lastStateChange: DateTime!\n resolvedAt: DateTime\n visibleAt: DateTime\n numRetries: Int!\n state: EventState!\n stage: String!\n target: String!\n payload: Json!\n log: Json!\n }\n\n enum EventState {\n created\n retrying\n processing\n succeed\n failed\n stopped\n }\n\n type ProcessBatchResponse {\n ok: Boolean!\n }\n \n type RetryEventResponse {\n ok: Boolean!\n }\n \n type StopEventResponse {\n ok: Boolean!\n }\n\n input SetVariablesArgs {\n variables: [VariableInput!]!\n mode: SetVariablesMode\n }\n\t\n\t\"\"\"\n\tDefines how it handles original variables~~. \~~n\t- MERGE merges with new values (default behaviour)\n\t- SET replaces all variables\n\t- APPEND_ONLY_MISSING appends values if not already exist \n\t\"\"\"\n\tenum SetVariablesMode {\n\t\tMERGE\n\t\tSET\n\t\tAPPEND_ONLY_MISSING\n\t}\n\n input VariableInput {\n name: String!\n value: String!\n }\n\t\n\ttype SetVariablesResponse {\n\t\tok: Boolean!\n\t}\n\n type Variable {\n name: String!\n value: String!\n }\n\n`\n"],"names":["gql"],"mappings":";;;AAGO,MAAM,SAAuBA,WAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;"}
1	+ {"version":3,"file":"actions.graphql.cjs","sources":["../../../../../../packages/engine-actions/src/graphql/schema/actions.graphql.ts"],"sourcesContent":["import { gql } from 'graphql-tag'\nimport { DocumentNode } from 'graphql'\n\nexport const schema: DocumentNode = gql`\n scalar DateTime\n scalar Json\n scalar Uuid\n\n schema {\n query: Query\n mutation: Mutation\n }\n\n type Query {\n failedEvents(args: EventArgs): [Event!]!\n eventsToProcess(args: EventArgs): [Event!]!\n eventsInProcessing(args: EventArgs): [Event!]!\n event(id: Uuid!): Event\n variables: [Variable!]!\n }\n\n type Mutation {\n processBatch: ProcessBatchResponse!\n retryEvent(id: Uuid!): RetryEventResponse!\n stopEvent(id: Uuid!): StopEventResponse!\n setVariables(args: SetVariablesArgs!): SetVariablesResponse!\n }\n\n input EventArgs {\n offset: Int\n \"Max 10000\"\n limit: Int\n }\n\n type Event {\n id: Uuid!\n transactionId: Uuid!\n identityId: Uuid\n ipAddress: String\n userAgent: String\n createdAt: DateTime!\n lastStateChange: DateTime!\n resolvedAt: DateTime\n visibleAt: DateTime\n numRetries: Int!\n state: EventState!\n stage: String!\n target: String!\n payload: Json!\n log: Json!\n }\n\n enum EventState {\n created\n retrying\n processing\n succeed\n failed\n stopped\n }\n\n type ProcessBatchResponse {\n ok: Boolean!\n }\n\n type RetryEventResponse {\n ok: Boolean!\n }\n\n type StopEventResponse {\n ok: Boolean!\n }\n\n input SetVariablesArgs {\n variables: [VariableInput!]!\n mode: SetVariablesMode\n }\n\n\t\"\"\"\n\tDefines how it handles original variables.\n\t- MERGE merges with new values (default behaviour)\n\t- SET replaces all variables\n\t- APPEND_ONLY_MISSING appends values if not already exist\n\t\"\"\"\n\tenum SetVariablesMode {\n\t\tMERGE\n\t\tSET\n\t\tAPPEND_ONLY_MISSING\n\t}\n\n input VariableInput {\n name: String!\n value: String!\n }\n\n\ttype SetVariablesResponse {\n\t\tok: Boolean!\n\t}\n\n type Variable {\n name: String!\n value: String!\n }\n\n`\n"],"names":["gql"],"mappings":";;;AAGO,MAAM,SAAuBA,WAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;"}

package/dist/production/src/graphql/schema/actions.graphql.js CHANGED Viewed

@@ -33,6 +33,9 @@ const schema = gql`
     type Event {
         id: Uuid!
         transactionId: Uuid!
+        identityId: Uuid
+        ipAddress: String
+        userAgent: String
         createdAt: DateTime!
         lastStateChange: DateTime!
         resolvedAt: DateTime
@@ -57,11 +60,11 @@ const schema = gql`
     type ProcessBatchResponse {
         ok: Boolean!
     }
     type RetryEventResponse {
         ok: Boolean!
     }
     type StopEventResponse {
         ok: Boolean!
     }
@@ -70,12 +73,12 @@ const schema = gql`
         variables: [VariableInput!]!
         mode: SetVariablesMode
     }
 	"""
-	Defines how it handles original variables.
+	Defines how it handles original variables.
 	- MERGE merges with new values (default behaviour)
 	- SET replaces all variables
-	- APPEND_ONLY_MISSING appends values if not already exist
+	- APPEND_ONLY_MISSING appends values if not already exist
 	"""
 	enum SetVariablesMode {
 		MERGE
@@ -87,7 +90,7 @@ const schema = gql`
         name: String!
         value: String!
     }
 	type SetVariablesResponse {
 		ok: Boolean!
 	}

package/dist/production/src/graphql/schema/actions.graphql.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"actions.graphql.js","sources":["../../../../../../packages/engine-actions/src/graphql/schema/actions.graphql.ts"],"sourcesContent":["import { gql } from 'graphql-tag'\nimport { DocumentNode } from 'graphql'\n\nexport const schema: DocumentNode = gql`\n scalar DateTime\n scalar Json\n scalar Uuid\n\n schema {\n query: Query\n mutation: Mutation\n }\n\n type Query {\n failedEvents(args: EventArgs): [Event!]!\n eventsToProcess(args: EventArgs): [Event!]!\n eventsInProcessing(args: EventArgs): [Event!]!\n event(id: Uuid!): Event\n variables: [Variable!]!\n }\n\n type Mutation {\n processBatch: ProcessBatchResponse!\n retryEvent(id: Uuid!): RetryEventResponse!\n stopEvent(id: Uuid!): StopEventResponse!\n setVariables(args: SetVariablesArgs!): SetVariablesResponse!\n }\n\n input EventArgs {\n offset: Int\n \"Max 10000\"\n limit: Int\n }\n\n type Event {\n id: Uuid!\n transactionId: Uuid!\n createdAt: DateTime!\n lastStateChange: DateTime!\n resolvedAt: DateTime\n visibleAt: DateTime\n numRetries: Int!\n state: EventState!\n stage: String!\n target: String!\n payload: Json!\n log: Json!\n }\n\n enum EventState {\n created\n retrying\n processing\n succeed\n failed\n stopped\n }\n\n type ProcessBatchResponse {\n ok: Boolean!\n }\n \n type RetryEventResponse {\n ok: Boolean!\n }\n \n type StopEventResponse {\n ok: Boolean!\n }\n\n input SetVariablesArgs {\n variables: [VariableInput!]!\n mode: SetVariablesMode\n }\n\t\n\t\"\"\"\n\tDefines how it handles original variables~~. \~~n\t- MERGE merges with new values (default behaviour)\n\t- SET replaces all variables\n\t- APPEND_ONLY_MISSING appends values if not already exist \n\t\"\"\"\n\tenum SetVariablesMode {\n\t\tMERGE\n\t\tSET\n\t\tAPPEND_ONLY_MISSING\n\t}\n\n input VariableInput {\n name: String!\n value: String!\n }\n\t\n\ttype SetVariablesResponse {\n\t\tok: Boolean!\n\t}\n\n type Variable {\n name: String!\n value: String!\n }\n\n`\n"],"names":[],"mappings":";AAGO,MAAM,SAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;"}
1	+ {"version":3,"file":"actions.graphql.js","sources":["../../../../../../packages/engine-actions/src/graphql/schema/actions.graphql.ts"],"sourcesContent":["import { gql } from 'graphql-tag'\nimport { DocumentNode } from 'graphql'\n\nexport const schema: DocumentNode = gql`\n scalar DateTime\n scalar Json\n scalar Uuid\n\n schema {\n query: Query\n mutation: Mutation\n }\n\n type Query {\n failedEvents(args: EventArgs): [Event!]!\n eventsToProcess(args: EventArgs): [Event!]!\n eventsInProcessing(args: EventArgs): [Event!]!\n event(id: Uuid!): Event\n variables: [Variable!]!\n }\n\n type Mutation {\n processBatch: ProcessBatchResponse!\n retryEvent(id: Uuid!): RetryEventResponse!\n stopEvent(id: Uuid!): StopEventResponse!\n setVariables(args: SetVariablesArgs!): SetVariablesResponse!\n }\n\n input EventArgs {\n offset: Int\n \"Max 10000\"\n limit: Int\n }\n\n type Event {\n id: Uuid!\n transactionId: Uuid!\n identityId: Uuid\n ipAddress: String\n userAgent: String\n createdAt: DateTime!\n lastStateChange: DateTime!\n resolvedAt: DateTime\n visibleAt: DateTime\n numRetries: Int!\n state: EventState!\n stage: String!\n target: String!\n payload: Json!\n log: Json!\n }\n\n enum EventState {\n created\n retrying\n processing\n succeed\n failed\n stopped\n }\n\n type ProcessBatchResponse {\n ok: Boolean!\n }\n\n type RetryEventResponse {\n ok: Boolean!\n }\n\n type StopEventResponse {\n ok: Boolean!\n }\n\n input SetVariablesArgs {\n variables: [VariableInput!]!\n mode: SetVariablesMode\n }\n\n\t\"\"\"\n\tDefines how it handles original variables.\n\t- MERGE merges with new values (default behaviour)\n\t- SET replaces all variables\n\t- APPEND_ONLY_MISSING appends values if not already exist\n\t\"\"\"\n\tenum SetVariablesMode {\n\t\tMERGE\n\t\tSET\n\t\tAPPEND_ONLY_MISSING\n\t}\n\n input VariableInput {\n name: String!\n value: String!\n }\n\n\ttype SetVariablesResponse {\n\t\tok: Boolean!\n\t}\n\n type Variable {\n name: String!\n value: String!\n }\n\n`\n"],"names":[],"mappings":";AAGO,MAAM,SAAuB;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;"}