@versori/run 0.4.7 → 0.5.0-alpha.2

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 (151) hide show
  1. package/esm/src/connection/internal/CredentialHolder.d.ts.map +1 -1
  2. package/esm/src/connection/internal/CredentialHolder.js +1 -1
  3. package/esm/src/connection/internal/FetchBuilder.d.ts +9 -2
  4. package/esm/src/connection/internal/FetchBuilder.d.ts.map +1 -1
  5. package/esm/src/connection/internal/FetchBuilder.js +120 -4
  6. package/esm/src/connection/internal/OutboundConnectionFactory.d.ts.map +1 -1
  7. package/esm/src/connection/internal/OutboundConnectionFactory.js +2 -2
  8. package/esm/src/context/Context.d.ts +1 -0
  9. package/esm/src/context/Context.d.ts.map +1 -1
  10. package/esm/src/context/Context.js +3 -0
  11. package/esm/src/context/ContextProvider.d.ts +1 -1
  12. package/esm/src/context/ContextProvider.d.ts.map +1 -1
  13. package/esm/src/context/ContextProvider.js +2 -1
  14. package/esm/src/dsl/Workflow.d.ts.map +1 -1
  15. package/esm/src/dsl/Workflow.js +2 -0
  16. package/esm/src/dsl/http/types.d.ts +2 -0
  17. package/esm/src/dsl/http/types.d.ts.map +1 -1
  18. package/esm/src/dsl/http/versori/configloader.d.ts.map +1 -1
  19. package/esm/src/dsl/http/versori/configloader.js +1 -1
  20. package/esm/src/dsl/http/versori/cronapi.d.ts +2 -3
  21. package/esm/src/dsl/http/versori/cronapi.d.ts.map +1 -1
  22. package/esm/src/dsl/http/versori/cronapi.js +14 -15
  23. package/esm/src/dsl/http/versori/kvapi/core/OpenAPI.js +1 -1
  24. package/esm/src/dsl/http/versori/webhookmiddleware.d.ts.map +1 -1
  25. package/esm/src/dsl/http/versori/webhookmiddleware.js +77 -38
  26. package/esm/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  27. package/esm/src/dsl/triggers/WebhookTrigger.js +3 -1
  28. package/esm/src/internal/InternalAuth.d.ts +0 -1
  29. package/esm/src/internal/InternalAuth.d.ts.map +1 -1
  30. package/esm/src/internal/InternalAuth.js +1 -14
  31. package/esm/src/internal/constants.d.ts +3 -1
  32. package/esm/src/internal/constants.d.ts.map +1 -1
  33. package/esm/src/internal/constants.js +4 -1
  34. package/esm/src/internal/supervisor.d.ts +27 -0
  35. package/esm/src/internal/supervisor.d.ts.map +1 -0
  36. package/esm/src/internal/supervisor.js +179 -0
  37. package/esm/src/interpreter/durable/DurableInterpreter.d.ts +8 -2
  38. package/esm/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  39. package/esm/src/interpreter/durable/DurableInterpreter.js +44 -13
  40. package/esm/src/interpreter/durable/ObservableCompiler.d.ts +6 -1
  41. package/esm/src/interpreter/durable/ObservableCompiler.d.ts.map +1 -1
  42. package/esm/src/interpreter/durable/Queue.js +1 -1
  43. package/esm/src/interpreter/durable/compilers/catch.d.ts.map +1 -1
  44. package/esm/src/interpreter/durable/compilers/catch.js +6 -7
  45. package/esm/src/interpreter/durable/compilers/fn.d.ts.map +1 -1
  46. package/esm/src/interpreter/durable/compilers/fn.js +19 -4
  47. package/esm/src/interpreter/durable/compilers/http.d.ts.map +1 -1
  48. package/esm/src/interpreter/durable/compilers/http.js +40 -7
  49. package/esm/src/interpreter/durable/compilers/schedule.d.ts.map +1 -1
  50. package/esm/src/interpreter/durable/compilers/schedule.js +2 -1
  51. package/esm/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  52. package/esm/src/interpreter/durable/compilers/webhook.js +14 -4
  53. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts +7 -1
  54. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  55. package/esm/src/interpreter/memory/MemoryInterpreter.js +43 -12
  56. package/esm/src/interpreter/memory/ObservableCompiler.d.ts +6 -1
  57. package/esm/src/interpreter/memory/ObservableCompiler.d.ts.map +1 -1
  58. package/esm/src/interpreter/memory/compilers/catch.d.ts.map +1 -1
  59. package/esm/src/interpreter/memory/compilers/catch.js +8 -7
  60. package/esm/src/interpreter/memory/compilers/fn.d.ts.map +1 -1
  61. package/esm/src/interpreter/memory/compilers/fn.js +20 -16
  62. package/esm/src/interpreter/memory/compilers/http.d.ts.map +1 -1
  63. package/esm/src/interpreter/memory/compilers/http.js +40 -6
  64. package/esm/src/interpreter/memory/compilers/schedule.d.ts.map +1 -1
  65. package/esm/src/interpreter/memory/compilers/schedule.js +4 -1
  66. package/esm/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  67. package/esm/src/interpreter/memory/compilers/webhook.js +22 -7
  68. package/esm/src/issues/Issues.js +1 -1
  69. package/esm/src/observability/logging/ConsoleLogger.d.ts.map +1 -1
  70. package/package.json +3 -1
  71. package/script/src/connection/internal/CredentialHolder.d.ts.map +1 -1
  72. package/script/src/connection/internal/CredentialHolder.js +1 -1
  73. package/script/src/connection/internal/FetchBuilder.d.ts +9 -2
  74. package/script/src/connection/internal/FetchBuilder.d.ts.map +1 -1
  75. package/script/src/connection/internal/FetchBuilder.js +143 -4
  76. package/script/src/connection/internal/OutboundConnectionFactory.d.ts.map +1 -1
  77. package/script/src/connection/internal/OutboundConnectionFactory.js +2 -2
  78. package/script/src/context/Context.d.ts +1 -0
  79. package/script/src/context/Context.d.ts.map +1 -1
  80. package/script/src/context/Context.js +3 -0
  81. package/script/src/context/ContextProvider.d.ts +1 -1
  82. package/script/src/context/ContextProvider.d.ts.map +1 -1
  83. package/script/src/context/ContextProvider.js +2 -1
  84. package/script/src/dsl/Workflow.d.ts.map +1 -1
  85. package/script/src/dsl/Workflow.js +2 -0
  86. package/script/src/dsl/http/types.d.ts +2 -0
  87. package/script/src/dsl/http/types.d.ts.map +1 -1
  88. package/script/src/dsl/http/versori/configloader.d.ts.map +1 -1
  89. package/script/src/dsl/http/versori/configloader.js +1 -1
  90. package/script/src/dsl/http/versori/cronapi.d.ts +2 -3
  91. package/script/src/dsl/http/versori/cronapi.d.ts.map +1 -1
  92. package/script/src/dsl/http/versori/cronapi.js +14 -15
  93. package/script/src/dsl/http/versori/kvapi/core/OpenAPI.js +1 -1
  94. package/script/src/dsl/http/versori/webhookmiddleware.d.ts.map +1 -1
  95. package/script/src/dsl/http/versori/webhookmiddleware.js +77 -38
  96. package/script/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  97. package/script/src/dsl/triggers/WebhookTrigger.js +3 -1
  98. package/script/src/internal/InternalAuth.d.ts +0 -1
  99. package/script/src/internal/InternalAuth.d.ts.map +1 -1
  100. package/script/src/internal/InternalAuth.js +0 -13
  101. package/script/src/internal/constants.d.ts +3 -1
  102. package/script/src/internal/constants.d.ts.map +1 -1
  103. package/script/src/internal/constants.js +5 -2
  104. package/script/src/internal/supervisor.d.ts +27 -0
  105. package/script/src/internal/supervisor.d.ts.map +1 -0
  106. package/script/src/internal/supervisor.js +187 -0
  107. package/script/src/interpreter/durable/DurableInterpreter.d.ts +8 -2
  108. package/script/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  109. package/script/src/interpreter/durable/DurableInterpreter.js +49 -18
  110. package/script/src/interpreter/durable/ObservableCompiler.d.ts +6 -1
  111. package/script/src/interpreter/durable/ObservableCompiler.d.ts.map +1 -1
  112. package/script/src/interpreter/durable/Queue.js +1 -1
  113. package/script/src/interpreter/durable/compilers/catch.d.ts.map +1 -1
  114. package/script/src/interpreter/durable/compilers/catch.js +6 -7
  115. package/script/src/interpreter/durable/compilers/fn.d.ts.map +1 -1
  116. package/script/src/interpreter/durable/compilers/fn.js +19 -4
  117. package/script/src/interpreter/durable/compilers/http.d.ts.map +1 -1
  118. package/script/src/interpreter/durable/compilers/http.js +40 -7
  119. package/script/src/interpreter/durable/compilers/schedule.d.ts.map +1 -1
  120. package/script/src/interpreter/durable/compilers/schedule.js +2 -1
  121. package/script/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  122. package/script/src/interpreter/durable/compilers/webhook.js +14 -4
  123. package/script/src/interpreter/memory/MemoryInterpreter.d.ts +7 -1
  124. package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  125. package/script/src/interpreter/memory/MemoryInterpreter.js +42 -11
  126. package/script/src/interpreter/memory/ObservableCompiler.d.ts +6 -1
  127. package/script/src/interpreter/memory/ObservableCompiler.d.ts.map +1 -1
  128. package/script/src/interpreter/memory/compilers/catch.d.ts.map +1 -1
  129. package/script/src/interpreter/memory/compilers/catch.js +8 -7
  130. package/script/src/interpreter/memory/compilers/fn.d.ts.map +1 -1
  131. package/script/src/interpreter/memory/compilers/fn.js +20 -16
  132. package/script/src/interpreter/memory/compilers/http.d.ts.map +1 -1
  133. package/script/src/interpreter/memory/compilers/http.js +40 -6
  134. package/script/src/interpreter/memory/compilers/schedule.d.ts.map +1 -1
  135. package/script/src/interpreter/memory/compilers/schedule.js +4 -1
  136. package/script/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  137. package/script/src/interpreter/memory/compilers/webhook.js +22 -7
  138. package/script/src/issues/Issues.js +1 -1
  139. package/script/src/observability/logging/ConsoleLogger.d.ts.map +1 -1
  140. package/esm/src/dsl/http/versori/constants.d.ts +0 -20
  141. package/esm/src/dsl/http/versori/constants.d.ts.map +0 -1
  142. package/esm/src/dsl/http/versori/constants.js +0 -37
  143. package/esm/src/internal/cli.d.ts +0 -2
  144. package/esm/src/internal/cli.d.ts.map +0 -1
  145. package/esm/src/internal/cli.js +0 -32
  146. package/script/src/dsl/http/versori/constants.d.ts +0 -20
  147. package/script/src/dsl/http/versori/constants.d.ts.map +0 -1
  148. package/script/src/dsl/http/versori/constants.js +0 -40
  149. package/script/src/internal/cli.d.ts +0 -2
  150. package/script/src/internal/cli.d.ts.map +0 -1
  151. package/script/src/internal/cli.js +0 -35
@@ -20,9 +20,10 @@ import { CredentialsProviderImpl } from '../../connection/CredentialsProvider.js
20
20
  import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
21
21
  import { ContextProviderImpl } from '../../context/ContextProvider.js';
22
22
  import { VersoriConfigReader } from '../../dsl/http/versori/configloader.js';
23
- import { envVarEnvId, envVarEnvironmentName, envVarLocalRun, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarSDKApiBaseURL, envVarVersion, } from '../../dsl/http/versori/constants.js';
24
23
  import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
25
24
  import { WorkflowImpl } from '../../dsl/Workflow.js';
25
+ import { envCronPort, envPort, envReadyCheckURL, envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarSDKApiBaseURL, envVarVersion } from '../../internal/constants.js';
26
+ import { Fake, registerCrons, registerWebhooks, enabled as supervisorEnabled } from '../../internal/supervisor.js';
26
27
  import { IssueImpl } from '../../issues/Issues.js';
27
28
  import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
28
29
  import { SDKKeyValueProvider } from '../../kv/sdk/SDKKeyValueProvider.js';
@@ -30,8 +31,8 @@ import { ConsoleLogger } from '../../observability/logging/ConsoleLogger.js';
30
31
  import { PlatformApiImpl } from '../../services/platform/PlatformApi.js';
31
32
  import { ObservableCompiler } from './ObservableCompiler.js';
32
33
  import { QueueImpl } from './Queue.js';
33
- function getKVProvider(runLocal) {
34
- if (runLocal) {
34
+ function getKVProvider() {
35
+ if (supervisorEnabled) {
35
36
  return Promise.resolve(new MemoryKeyValueProvider());
36
37
  }
37
38
  return SDKKeyValueProvider.fromEnv();
@@ -61,7 +62,7 @@ function getKVProvider(runLocal) {
61
62
  * ```
62
63
  */
63
64
  export class DurableInterpreter {
64
- constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, platformApi, cnxFetchFactory, cronProvider, tracer, issue, cfgReader, queueProvider, otelSDK) {
65
+ constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, platformApi, cnxFetchFactory, cronProvider, tracer, issue, cfgReader, queueProvider, otelSDK) {
65
66
  Object.defineProperty(this, "log", {
66
67
  enumerable: true,
67
68
  configurable: true,
@@ -98,6 +99,12 @@ export class DurableInterpreter {
98
99
  writable: true,
99
100
  value: cronRegistry
100
101
  });
102
+ Object.defineProperty(this, "webhookRegistry", {
103
+ enumerable: true,
104
+ configurable: true,
105
+ writable: true,
106
+ value: webhookRegistry
107
+ });
101
108
  Object.defineProperty(this, "platformApi", {
102
109
  enumerable: true,
103
110
  configurable: true,
@@ -196,7 +203,6 @@ export class DurableInterpreter {
196
203
  const otelTracesURL = Deno.env.get(envVarOtelTracesURL);
197
204
  let otelSDK;
198
205
  const configReader = VersoriConfigReader.fromEnv(log);
199
- const runLocal = Deno.env.get(envVarLocalRun) === 'true';
200
206
  await waitForReady(log);
201
207
  // Do NOT change those attributes, they are used by the API to filter on
202
208
  const resource = resourceFromAttributes({
@@ -218,6 +224,15 @@ export class DurableInterpreter {
218
224
  log.info('Starting OpenTelemetry SDK');
219
225
  otelSDK.start();
220
226
  }
227
+ else if (supervisorEnabled) {
228
+ otelSDK = new NodeSDK({
229
+ traceExporter: new Fake(),
230
+ serviceName: serviceName,
231
+ resource: resource,
232
+ });
233
+ log.info('Starting Testing OpenTelemetry SDK');
234
+ otelSDK.start();
235
+ }
221
236
  const tracer = opentelemetry.trace.getTracer(serviceName, version);
222
237
  const queueProvider = await QueueImpl.fromEnv(log);
223
238
  const connectionFactory = DirectConnectionFactory.fromEnv(log);
@@ -225,14 +240,14 @@ export class DurableInterpreter {
225
240
  if (options.contextProvider) {
226
241
  // no need to set up a key-value provider if options.contextProvider is already
227
242
  // initialised.
228
- return new DurableInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
243
+ return new DurableInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
229
244
  }
230
- const kvp = await getKVProvider(runLocal);
245
+ const kvp = await getKVProvider();
231
246
  const platformApi = PlatformApiImpl.fromEnv();
232
247
  const organisationId = Deno.env.get(envVarOrgId) || 'development';
233
248
  const environmentId = Deno.env.get(envVarEnvId) || 'development';
234
249
  const ctxProvider = new ContextProviderImpl(log, kvp, new CredentialsProviderImpl(connectionFactory.credentials, connectionFactory.tokens, connectionFactory.oauth1, configReader, platformApi), platformApi, organisationId, environmentId, issuesProvider);
235
- return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
250
+ return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
236
251
  }
237
252
  register(workflow, options) {
238
253
  const localAbortController = new AbortController();
@@ -249,6 +264,7 @@ export class DurableInterpreter {
249
264
  tracer: this.tracer,
250
265
  contextProvider: this.contextProvider,
251
266
  webhookRouter: this.webhookRouter,
267
+ webhookRegistry: this.webhookRegistry,
252
268
  queueProvider: this.queueProvider,
253
269
  cronRouter: this.cronRouter,
254
270
  cronRegistry: this.cronRegistry,
@@ -272,9 +288,9 @@ export class DurableInterpreter {
272
288
  this.registeredWorkflows.push(registration);
273
289
  return registration;
274
290
  }
275
- start() {
276
- const port = Deno.env.get('PORT') || 3000;
277
- const cronPort = Deno.env.get('CRON_PORT') || 3001;
291
+ async start() {
292
+ const port = Deno.env.get(envPort) || 3000;
293
+ const cronPort = Deno.env.get(envCronPort) || 3001;
278
294
  const webhookApp = express();
279
295
  const cronApp = express();
280
296
  cronApp.use(express.json());
@@ -298,11 +314,17 @@ export class DurableInterpreter {
298
314
  ctx.log.error('DurableInterpreter.executionError', {
299
315
  error: err instanceof Error ? err.toString() : err,
300
316
  });
317
+ this.tracer.startActiveSpan('done', (span) => {
318
+ span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
319
+ span.setAttribute('execution.id', ctx.executionId);
320
+ span.setAttribute('result', 'fail');
321
+ span.end();
322
+ });
301
323
  try {
302
324
  ctx.options.onError?.(ctx.withData(err));
303
325
  }
304
326
  catch (err) {
305
- ctx.log.error('DurableInterpreter.onErrorError: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
327
+ ctx.log.error('DurableInterpreter.onError Error: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
306
328
  ctx.options.onError?.(ctx.withData({
307
329
  message: 'Internal server error',
308
330
  error: err instanceof Error ? err.toString() : err,
@@ -317,6 +339,11 @@ export class DurableInterpreter {
317
339
  durationMs,
318
340
  data: ctx.data,
319
341
  });
342
+ this.tracer.startActiveSpan('done', (span) => {
343
+ span.setAttribute('execution.id', ctx.executionId);
344
+ span.setAttribute('result', 'pass');
345
+ span.end();
346
+ });
320
347
  try {
321
348
  ctx.options.onSuccess?.(ctx);
322
349
  }
@@ -364,6 +391,9 @@ export class DurableInterpreter {
364
391
  });
365
392
  throw new Error('Unable to register scheduler tasks with central cron provider');
366
393
  }
394
+ // register with supervisor
395
+ await registerCrons(this.cronRegistry);
396
+ await registerWebhooks(this.webhookRegistry);
367
397
  this.webhookServer = webhookApp.listen(port, () => {
368
398
  this.log.info(`Express server listening on port ${port}`);
369
399
  });
@@ -383,6 +413,7 @@ export class DurableInterpreter {
383
413
  if (this.cronServer) {
384
414
  this.cronServer.close();
385
415
  }
416
+ this.otelSDK?.shutdown();
386
417
  // Remove all signal listeners
387
418
  for (const registration of this.registeredWorkflows) {
388
419
  Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -435,7 +466,7 @@ export class DurableInterpreter {
435
466
  }
436
467
  }
437
468
  async function waitForReady(log) {
438
- const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
469
+ const readyCheckUrl = Deno.env.get(envReadyCheckURL);
439
470
  if (!readyCheckUrl) {
440
471
  return Promise.resolve();
441
472
  }
@@ -1,6 +1,7 @@
1
1
  import { Tracer } from '@opentelemetry/api';
2
2
  import { Router } from 'express';
3
3
  import { Observable, OperatorFunction } from 'rxjs';
4
+ import { ConnectionFactory } from '../../connection/types.js';
4
5
  import { ContextImpl } from '../../context/Context.js';
5
6
  import { ContextProvider } from '../../context/ContextProvider.js';
6
7
  import { ConfigReader } from '../../dsl/http/types.js';
@@ -11,7 +12,6 @@ import { Logger } from '../../observability/logging/Logger.js';
11
12
  import { PlatformApi } from '../../services/platform/mod.js';
12
13
  import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
13
14
  import { QueueAPI } from './Queue.js';
14
- import { ConnectionFactory } from '../../connection/types.js';
15
15
  export type DurableCompilerContext = {
16
16
  compiler: ObservableCompiler;
17
17
  log: Logger;
@@ -22,6 +22,11 @@ export type DurableCompilerContext = {
22
22
  queueProvider: QueueAPI;
23
23
  issueProvider: IssueAPI;
24
24
  webhookRouter: Router;
25
+ webhookRegistry: Map<string, {
26
+ method: string;
27
+ path: string;
28
+ options: any;
29
+ }>;
25
30
  cronRouter: Router;
26
31
  configReader: ConfigReader;
27
32
  cronRegistry: Map<string, string>;
@@ -1 +1 @@
1
- {"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/ObservableCompiler.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAU7D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAkBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}
1
+ {"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/ObservableCompiler.ts"],"names":[],"mappings":"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"}
@@ -10,7 +10,7 @@
10
10
  * As of the Change Date, in accordance with the Business Source License,
11
11
  * use of this software will be governed by the Apache License, Version 2.0.
12
12
  */
13
- import { envVarEnvId, envVarProjectId, envVarSDKApiBaseURL, } from '../../dsl/http/versori/constants.js';
13
+ import { envVarEnvId, envVarProjectId, envVarSDKApiBaseURL, } from '../../internal/constants.js';
14
14
  import { ConsoleLogger } from '../../mod.js';
15
15
  export class QueueImpl {
16
16
  constructor(baseUrl, projectId, environmentId, log) {
@@ -1 +1 @@
1
- {"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
1
+ {"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
@@ -22,6 +22,7 @@ function compileCatch(compilerCtx, task) {
22
22
  return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
23
23
  span.setAttribute('execution.id', ctx.executionId);
24
24
  span.setAttribute('task.type', 'catch');
25
+ span.setAttribute('type', 'task');
25
26
  if (error instanceof Error) {
26
27
  span.recordException(error);
27
28
  span.setAttribute('error.message', error.message);
@@ -35,10 +36,9 @@ function compileCatch(compilerCtx, task) {
35
36
  annotations: {
36
37
  'error': error.message,
37
38
  'stack': error.stack || '',
38
- 'workflowId': ctx.options.workflowId || ctx.workflowId || '',
39
+ 'workflowId': ctx.options.workflowId || ctx.workflowId ||
40
+ '',
39
41
  'executionId': ctx.executionId,
40
- 'activationId': ctx.activation.id,
41
- 'activationExternalId': ctx.activation?.user.externalId,
42
42
  },
43
43
  reason: 'error',
44
44
  severity: 'high',
@@ -50,12 +50,11 @@ function compileCatch(compilerCtx, task) {
50
50
  });
51
51
  compilerCtx.issueProvider.submitIssue({
52
52
  annotations: {
53
- 'error': error.message,
53
+ 'error': error.message || '',
54
54
  'stack': error.stack || '',
55
- 'workflowId': ctx.options.workflowId || ctx.workflowId || '',
55
+ 'workflowId': ctx.options.workflowId || ctx.workflowId ||
56
+ '',
56
57
  'executionId': ctx.executionId,
57
- 'activationId': ctx.activation.id,
58
- 'activationExternalId': ctx.activation?.user.externalId,
59
58
  },
60
59
  reason: 'error',
61
60
  severity: 'low',
@@ -1 +1 @@
1
- {"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
1
+ {"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AA+BA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA0CnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
@@ -12,19 +12,34 @@
12
12
  */
13
13
  import { mergeMap, tap } from 'rxjs';
14
14
  import { FnTask } from '../../../dsl/tasks/FnTask.js';
15
+ import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
15
16
  function compileFn(compilerCtx, task) {
16
17
  return (src) => src.pipe(tap({
17
18
  complete: () => compilerCtx.log.debug('fn.complete'),
18
19
  }), mergeMap(async (ctx) => {
19
20
  return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
20
21
  span.setAttribute('task.id', task.id);
22
+ span.setAttribute('type', 'task');
23
+ span.setAttribute('task.type', 'fn');
21
24
  span.setAttribute('execution.id', ctx.executionId);
22
- if (typeof ctx.idx === 'number') {
25
+ try {
26
+ const spanContext = span.spanContext();
27
+ const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
28
+ let result;
29
+ if (typeof ctx.idx === 'number') {
30
+ result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
31
+ }
32
+ else {
33
+ result = ctx.withData(await task._fn(ctxWithLogger));
34
+ }
35
+ if (supervisorEnabled) {
36
+ span.setAttribute('response.body', JSON.stringify(result.data));
37
+ }
38
+ return result;
39
+ }
40
+ finally {
23
41
  span.end();
24
- return ctx.withData(await task._fn(ctx, ctx.idx));
25
42
  }
26
- span.end();
27
- return ctx.withData(await task._fn(ctx));
28
43
  });
29
44
  }));
30
45
  }
@@ -1 +1 @@
1
- {"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAwFnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
1
+ {"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuHnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
@@ -12,18 +12,32 @@
12
12
  */
13
13
  import { mergeMap } from 'rxjs';
14
14
  import { tap } from 'rxjs/operators';
15
- import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
16
15
  import { DynamicFetchFactory } from '../../../connection/DynamicFetchFactory.js';
16
+ import { FetchBuilder } from '../../../connection/internal/FetchBuilder.js';
17
17
  import { StaticFetchFactory } from '../../../connection/StaticFetchFactory.js';
18
+ import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
19
+ import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
18
20
  function compileHttp(compilerCtx, task) {
19
21
  const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
20
22
  let fetchFactory;
21
23
  if (!cnxMap) {
22
- compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
23
- fetchFactory = Promise.resolve(new StaticFetchFactory(globalThis.fetch));
24
+ compilerCtx.log.warn(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
25
+ if (supervisorEnabled) {
26
+ // missing connection map and we are in supervised mode, so we use the fake fetcher
27
+ fetchFactory = Promise.resolve(new StaticFetchFactory(new FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
28
+ }
29
+ else {
30
+ // missing connection map and not in supervised mode, so we use global fetch
31
+ fetchFactory = Promise.resolve(new StaticFetchFactory(globalThis.fetch));
32
+ }
24
33
  }
25
34
  else if (cnxMap.dynamic) {
26
- fetchFactory = Promise.resolve(new DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
35
+ if (cnxMap.mockWithAI) {
36
+ fetchFactory = Promise.resolve(new StaticFetchFactory(new FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
37
+ }
38
+ else {
39
+ fetchFactory = Promise.resolve(new DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
40
+ }
27
41
  }
28
42
  else {
29
43
  fetchFactory = compilerCtx.platformApi.getConnection({
@@ -33,8 +47,21 @@ function compileHttp(compilerCtx, task) {
33
47
  },
34
48
  throwOnError: true,
35
49
  })
36
- .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
37
- .then(([fetcher, baseUrl]) => new StaticFetchFactory(fetcher, baseUrl));
50
+ .then(({ data }) => {
51
+ if (cnxMap.mockWithAI) {
52
+ // use the fake fetcher that calls the supervisor to generate a mock reponse
53
+ return new StaticFetchFactory(new FetchBuilder(globalThis.fetch, data).buildSupervisedFetch());
54
+ }
55
+ return Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? ''])
56
+ .then(([fetcher, baseUrl]) => new StaticFetchFactory(fetcher, baseUrl));
57
+ })
58
+ .catch((err) => {
59
+ compilerCtx.log.error(`Failed to get connection ${task.opts.connection}`, err);
60
+ if (supervisorEnabled) {
61
+ return new StaticFetchFactory(new FetchBuilder(globalThis.fetch, { name: task.opts.connection }).build());
62
+ }
63
+ throw err;
64
+ });
38
65
  }
39
66
  async function http(ctx) {
40
67
  const [fetch, baseUrl] = await fetchFactory.then((ff) => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
@@ -48,10 +75,16 @@ function compileHttp(compilerCtx, task) {
48
75
  return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
49
76
  span.setAttribute('task.id', task.id);
50
77
  span.setAttribute('task.type', 'http');
78
+ span.setAttribute('type', 'task');
51
79
  span.setAttribute('execution.id', ctx.executionId);
52
80
  span.setAttribute('connection.name', task.opts.connection);
81
+ const spanContext = span.spanContext();
53
82
  try {
54
- return await http(ctx);
83
+ const result = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
84
+ if (supervisorEnabled) {
85
+ span.setAttribute('response.body', JSON.stringify(result.data));
86
+ }
87
+ return result;
55
88
  }
56
89
  catch (error) {
57
90
  if (error instanceof Error) {
@@ -1 +1 @@
1
- {"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAkJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
1
+ {"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAmJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
@@ -11,8 +11,8 @@
11
11
  * use of this software will be governed by the Apache License, Version 2.0.
12
12
  */
13
13
  import { Observable } from 'rxjs';
14
- import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarProjectId, } from '../../../dsl/http/versori/constants.js';
15
14
  import { ScheduleTrigger } from '../../../dsl/triggers/ScheduleTrigger.js';
15
+ import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarProjectId, } from '../../../internal/constants.js';
16
16
  function compileSchedule(ctx, trigger, signal) {
17
17
  return new Observable((subscriber) => {
18
18
  // Add HTTP endpoint for manual triggering
@@ -103,6 +103,7 @@ function compileSchedule(ctx, trigger, signal) {
103
103
  await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
104
104
  span.setAttribute('task.id', trigger.id);
105
105
  span.setAttribute('task.type', 'schedule');
106
+ span.setAttribute('type', 'task');
106
107
  span.setAttribute('schedule', trigger.schedule);
107
108
  span.setAttribute('project.id', projectId);
108
109
  span.setAttribute('environment.id', environmentId);
@@ -1 +1 @@
1
- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA0BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2SxE,CAAC"}
1
+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAwTxE,CAAC"}
@@ -12,12 +12,12 @@
12
12
  */
13
13
  import cors from 'cors';
14
14
  import express from 'express';
15
+ import xmlparser from 'express-xml-bodyparser';
15
16
  import { pipeline } from 'node:stream/promises';
16
17
  import { Observable } from 'rxjs';
17
18
  import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
18
19
  import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
19
20
  import { envVarEnvId } from '../../../internal/constants.js';
20
- import xmlparser from 'express-xml-bodyparser';
21
21
  const xml2jsDefaults = {
22
22
  explicitArray: false,
23
23
  normalize: false,
@@ -103,6 +103,7 @@ export const webhookCompiler = {
103
103
  else {
104
104
  ctx.webhookRouter.use(express.raw({ type: '*/*', limit: '50mb' }));
105
105
  }
106
+ ctx.webhookRegistry.set(trigger.id, { method, path: `/${trigger.id}`, options: trigger.options });
106
107
  return new Observable((subscriber) => {
107
108
  if (!ctx.webhookRouter) {
108
109
  throw new Error('Router not available in compiler context');
@@ -131,8 +132,11 @@ export const webhookCompiler = {
131
132
  await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
132
133
  span.setAttribute('task.id', trigger.id);
133
134
  span.setAttribute('task.type', 'webhook');
135
+ span.setAttribute('type', 'task');
134
136
  const staticActivation = res.locals.activation;
135
- const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
137
+ let executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
138
+ const spanContext = span.spanContext();
139
+ executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
136
140
  span.setAttribute('execution.id', executionCtx.executionId);
137
141
  try {
138
142
  subscriber.next(executionCtx);
@@ -167,6 +171,7 @@ export const webhookCompiler = {
167
171
  await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
168
172
  span.setAttribute('task.id', trigger.id);
169
173
  span.setAttribute('task.type', 'webhook');
174
+ span.setAttribute('type', 'task');
170
175
  span.setAttribute('user.id', req.params.userId);
171
176
  const userId = req.params.userId;
172
177
  const activation = res.locals.activation;
@@ -183,7 +188,9 @@ export const webhookCompiler = {
183
188
  span.end();
184
189
  return;
185
190
  }
186
- const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
191
+ let executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
192
+ const spanContext = span.spanContext();
193
+ executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
187
194
  span.setAttribute('execution.id', executionCtx.executionId);
188
195
  const errors = [];
189
196
  try {
@@ -222,6 +229,7 @@ export const webhookCompiler = {
222
229
  }), async (req, res) => {
223
230
  await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
224
231
  span.setAttribute('task.id', trigger.id);
232
+ span.setAttribute('type', 'task');
225
233
  span.setAttribute('task.type', 'webhook');
226
234
  span.setAttribute('activation.id', req.params.activationId);
227
235
  const activation = res.locals.activation;
@@ -237,7 +245,9 @@ export const webhookCompiler = {
237
245
  span.end();
238
246
  return;
239
247
  }
240
- const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
248
+ let activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
249
+ const spanContext = span.spanContext();
250
+ activationCtx = activationCtx.withLogger(activationCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
241
251
  span.setAttribute('execution.id', activationCtx.executionId);
242
252
  try {
243
253
  subscriber.next(activationCtx);
@@ -43,6 +43,11 @@ type Registration = {
43
43
  sigintListener: () => void;
44
44
  subscription?: Subscription;
45
45
  };
46
+ type WebhookRegistry = Map<string, {
47
+ method: string;
48
+ path: string;
49
+ options: any;
50
+ }>;
46
51
  /**
47
52
  * MemoryInterpreter is the default interpreter for executing Versori workflows. It handles registration and execution
48
53
  * of workflows triggered by schedules and webhooks.
@@ -71,6 +76,7 @@ export declare class MemoryInterpreter {
71
76
  private readonly webhookRouter;
72
77
  private readonly cronRouter;
73
78
  private cronRegistry;
79
+ private webhookRegistry;
74
80
  private readonly cnxFactory;
75
81
  private readonly cronProvider;
76
82
  private readonly tracer;
@@ -82,7 +88,7 @@ export declare class MemoryInterpreter {
82
88
  private cronServer?;
83
89
  private shutdownServer?;
84
90
  private isShuttingDown;
85
- constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
91
+ constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, webhookRegistry: WebhookRegistry, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
86
92
  static newInstance(options?: MemoryInterpreterOptions): Promise<MemoryInterpreter>;
87
93
  register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): Registration;
88
94
  start(): Promise<void>;
@@ -1 +1 @@
1
- {"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}