@versori/run 0.4.4 → 0.5.0-alpha.1

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 (177) hide show
  1. package/esm/src/connection/DirectConnectionFactory.d.ts.map +1 -1
  2. package/esm/src/connection/DirectConnectionFactory.js +2 -2
  3. package/esm/src/connection/internal/CredentialHolder.d.ts.map +1 -1
  4. package/esm/src/connection/internal/CredentialHolder.js +1 -1
  5. package/esm/src/connection/internal/FetchBuilder.d.ts +9 -2
  6. package/esm/src/connection/internal/FetchBuilder.d.ts.map +1 -1
  7. package/esm/src/connection/internal/FetchBuilder.js +120 -4
  8. package/esm/src/connection/internal/OutboundConnectionFactory.d.ts.map +1 -1
  9. package/esm/src/connection/internal/OutboundConnectionFactory.js +2 -2
  10. package/esm/src/context/Context.d.ts +1 -0
  11. package/esm/src/context/Context.d.ts.map +1 -1
  12. package/esm/src/context/Context.js +3 -0
  13. package/esm/src/context/ContextProvider.d.ts +1 -1
  14. package/esm/src/context/ContextProvider.d.ts.map +1 -1
  15. package/esm/src/context/ContextProvider.js +1 -1
  16. package/esm/src/dsl/Workflow.d.ts.map +1 -1
  17. package/esm/src/dsl/Workflow.js +2 -0
  18. package/esm/src/dsl/http/types.d.ts +2 -0
  19. package/esm/src/dsl/http/types.d.ts.map +1 -1
  20. package/esm/src/dsl/http/versori/configloader.js +1 -1
  21. package/esm/src/dsl/http/versori/cronapi.d.ts +2 -3
  22. package/esm/src/dsl/http/versori/cronapi.d.ts.map +1 -1
  23. package/esm/src/dsl/http/versori/cronapi.js +14 -15
  24. package/esm/src/dsl/http/versori/kvapi/core/OpenAPI.js +1 -1
  25. package/esm/src/dsl/http/versori/webhookmiddleware.d.ts.map +1 -1
  26. package/esm/src/dsl/http/versori/webhookmiddleware.js +69 -38
  27. package/esm/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  28. package/esm/src/dsl/triggers/WebhookTrigger.js +3 -1
  29. package/esm/src/internal/InternalAuth.d.ts +0 -1
  30. package/esm/src/internal/InternalAuth.d.ts.map +1 -1
  31. package/esm/src/internal/InternalAuth.js +1 -14
  32. package/esm/src/internal/constants.d.ts +3 -1
  33. package/esm/src/internal/constants.d.ts.map +1 -1
  34. package/esm/src/internal/constants.js +4 -1
  35. package/esm/src/internal/supervisor.d.ts +25 -0
  36. package/esm/src/internal/supervisor.d.ts.map +1 -0
  37. package/esm/src/internal/supervisor.js +156 -0
  38. package/esm/src/interpreter/durable/DurableInterpreter.d.ts +8 -2
  39. package/esm/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  40. package/esm/src/interpreter/durable/DurableInterpreter.js +79 -27
  41. package/esm/src/interpreter/durable/ObservableCompiler.d.ts +6 -1
  42. package/esm/src/interpreter/durable/ObservableCompiler.d.ts.map +1 -1
  43. package/esm/src/interpreter/durable/Queue.js +1 -1
  44. package/esm/src/interpreter/durable/compilers/catch.d.ts.map +1 -1
  45. package/esm/src/interpreter/durable/compilers/catch.js +1 -0
  46. package/esm/src/interpreter/durable/compilers/fn.d.ts.map +1 -1
  47. package/esm/src/interpreter/durable/compilers/fn.js +19 -4
  48. package/esm/src/interpreter/durable/compilers/http.d.ts.map +1 -1
  49. package/esm/src/interpreter/durable/compilers/http.js +40 -7
  50. package/esm/src/interpreter/durable/compilers/schedule.d.ts.map +1 -1
  51. package/esm/src/interpreter/durable/compilers/schedule.js +2 -1
  52. package/esm/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  53. package/esm/src/interpreter/durable/compilers/webhook.js +14 -4
  54. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts +7 -1
  55. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  56. package/esm/src/interpreter/memory/MemoryInterpreter.js +78 -18
  57. package/esm/src/interpreter/memory/ObservableCompiler.d.ts +6 -1
  58. package/esm/src/interpreter/memory/ObservableCompiler.d.ts.map +1 -1
  59. package/esm/src/interpreter/memory/compilers/catch.d.ts.map +1 -1
  60. package/esm/src/interpreter/memory/compilers/catch.js +1 -0
  61. package/esm/src/interpreter/memory/compilers/fn.d.ts.map +1 -1
  62. package/esm/src/interpreter/memory/compilers/fn.js +19 -16
  63. package/esm/src/interpreter/memory/compilers/http.d.ts.map +1 -1
  64. package/esm/src/interpreter/memory/compilers/http.js +39 -6
  65. package/esm/src/interpreter/memory/compilers/schedule.d.ts.map +1 -1
  66. package/esm/src/interpreter/memory/compilers/schedule.js +2 -1
  67. package/esm/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  68. package/esm/src/interpreter/memory/compilers/webhook.js +15 -4
  69. package/esm/src/issues/Issues.js +1 -1
  70. package/esm/src/observability/logging/ConsoleLogger.d.ts.map +1 -1
  71. package/package.json +3 -1
  72. package/script/src/connection/DirectConnectionFactory.d.ts.map +1 -1
  73. package/script/src/connection/DirectConnectionFactory.js +2 -2
  74. package/script/src/connection/internal/CredentialHolder.d.ts.map +1 -1
  75. package/script/src/connection/internal/CredentialHolder.js +1 -1
  76. package/script/src/connection/internal/FetchBuilder.d.ts +9 -2
  77. package/script/src/connection/internal/FetchBuilder.d.ts.map +1 -1
  78. package/script/src/connection/internal/FetchBuilder.js +143 -4
  79. package/script/src/connection/internal/OutboundConnectionFactory.d.ts.map +1 -1
  80. package/script/src/connection/internal/OutboundConnectionFactory.js +2 -2
  81. package/script/src/context/Context.d.ts +1 -0
  82. package/script/src/context/Context.d.ts.map +1 -1
  83. package/script/src/context/Context.js +3 -0
  84. package/script/src/context/ContextProvider.d.ts +1 -1
  85. package/script/src/context/ContextProvider.d.ts.map +1 -1
  86. package/script/src/context/ContextProvider.js +1 -1
  87. package/script/src/dsl/Workflow.d.ts.map +1 -1
  88. package/script/src/dsl/Workflow.js +2 -0
  89. package/script/src/dsl/http/types.d.ts +2 -0
  90. package/script/src/dsl/http/types.d.ts.map +1 -1
  91. package/script/src/dsl/http/versori/configloader.js +1 -1
  92. package/script/src/dsl/http/versori/cronapi.d.ts +2 -3
  93. package/script/src/dsl/http/versori/cronapi.d.ts.map +1 -1
  94. package/script/src/dsl/http/versori/cronapi.js +14 -15
  95. package/script/src/dsl/http/versori/kvapi/core/OpenAPI.js +1 -1
  96. package/script/src/dsl/http/versori/webhookmiddleware.d.ts.map +1 -1
  97. package/script/src/dsl/http/versori/webhookmiddleware.js +69 -38
  98. package/script/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  99. package/script/src/dsl/triggers/WebhookTrigger.js +3 -1
  100. package/script/src/internal/InternalAuth.d.ts +0 -1
  101. package/script/src/internal/InternalAuth.d.ts.map +1 -1
  102. package/script/src/internal/InternalAuth.js +0 -13
  103. package/script/src/internal/constants.d.ts +3 -1
  104. package/script/src/internal/constants.d.ts.map +1 -1
  105. package/script/src/internal/constants.js +5 -2
  106. package/script/src/internal/supervisor.d.ts +25 -0
  107. package/script/src/internal/supervisor.d.ts.map +1 -0
  108. package/script/src/internal/supervisor.js +163 -0
  109. package/script/src/interpreter/durable/DurableInterpreter.d.ts +8 -2
  110. package/script/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  111. package/script/src/interpreter/durable/DurableInterpreter.js +84 -32
  112. package/script/src/interpreter/durable/ObservableCompiler.d.ts +6 -1
  113. package/script/src/interpreter/durable/ObservableCompiler.d.ts.map +1 -1
  114. package/script/src/interpreter/durable/Queue.js +1 -1
  115. package/script/src/interpreter/durable/compilers/catch.d.ts.map +1 -1
  116. package/script/src/interpreter/durable/compilers/catch.js +1 -0
  117. package/script/src/interpreter/durable/compilers/fn.d.ts.map +1 -1
  118. package/script/src/interpreter/durable/compilers/fn.js +19 -4
  119. package/script/src/interpreter/durable/compilers/http.d.ts.map +1 -1
  120. package/script/src/interpreter/durable/compilers/http.js +40 -7
  121. package/script/src/interpreter/durable/compilers/schedule.d.ts.map +1 -1
  122. package/script/src/interpreter/durable/compilers/schedule.js +2 -1
  123. package/script/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  124. package/script/src/interpreter/durable/compilers/webhook.js +14 -4
  125. package/script/src/interpreter/memory/MemoryInterpreter.d.ts +7 -1
  126. package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  127. package/script/src/interpreter/memory/MemoryInterpreter.js +78 -18
  128. package/script/src/interpreter/memory/ObservableCompiler.d.ts +6 -1
  129. package/script/src/interpreter/memory/ObservableCompiler.d.ts.map +1 -1
  130. package/script/src/interpreter/memory/compilers/catch.d.ts.map +1 -1
  131. package/script/src/interpreter/memory/compilers/catch.js +1 -0
  132. package/script/src/interpreter/memory/compilers/fn.d.ts.map +1 -1
  133. package/script/src/interpreter/memory/compilers/fn.js +19 -16
  134. package/script/src/interpreter/memory/compilers/http.d.ts.map +1 -1
  135. package/script/src/interpreter/memory/compilers/http.js +39 -6
  136. package/script/src/interpreter/memory/compilers/schedule.d.ts.map +1 -1
  137. package/script/src/interpreter/memory/compilers/schedule.js +2 -1
  138. package/script/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  139. package/script/src/interpreter/memory/compilers/webhook.js +15 -4
  140. package/script/src/issues/Issues.js +1 -1
  141. package/script/src/observability/logging/ConsoleLogger.d.ts.map +1 -1
  142. package/esm/src/dsl/http/default.d.ts +0 -26
  143. package/esm/src/dsl/http/default.d.ts.map +0 -1
  144. package/esm/src/dsl/http/default.js +0 -56
  145. package/esm/src/dsl/http/versori/cli.d.ts +0 -2
  146. package/esm/src/dsl/http/versori/cli.d.ts.map +0 -1
  147. package/esm/src/dsl/http/versori/cli.js +0 -32
  148. package/esm/src/dsl/http/versori/constants.d.ts +0 -20
  149. package/esm/src/dsl/http/versori/constants.d.ts.map +0 -1
  150. package/esm/src/dsl/http/versori/constants.js +0 -37
  151. package/esm/src/dsl/http/versori/internalauth.d.ts +0 -15
  152. package/esm/src/dsl/http/versori/internalauth.d.ts.map +0 -1
  153. package/esm/src/dsl/http/versori/internalauth.js +0 -102
  154. package/esm/src/dsl/http/versori/proxyroundtripper.d.ts +0 -23
  155. package/esm/src/dsl/http/versori/proxyroundtripper.d.ts.map +0 -1
  156. package/esm/src/dsl/http/versori/proxyroundtripper.js +0 -208
  157. package/esm/src/internal/cli.d.ts +0 -2
  158. package/esm/src/internal/cli.d.ts.map +0 -1
  159. package/esm/src/internal/cli.js +0 -32
  160. package/script/src/dsl/http/default.d.ts +0 -26
  161. package/script/src/dsl/http/default.d.ts.map +0 -1
  162. package/script/src/dsl/http/default.js +0 -60
  163. package/script/src/dsl/http/versori/cli.d.ts +0 -2
  164. package/script/src/dsl/http/versori/cli.d.ts.map +0 -1
  165. package/script/src/dsl/http/versori/cli.js +0 -35
  166. package/script/src/dsl/http/versori/constants.d.ts +0 -20
  167. package/script/src/dsl/http/versori/constants.d.ts.map +0 -1
  168. package/script/src/dsl/http/versori/constants.js +0 -40
  169. package/script/src/dsl/http/versori/internalauth.d.ts +0 -15
  170. package/script/src/dsl/http/versori/internalauth.d.ts.map +0 -1
  171. package/script/src/dsl/http/versori/internalauth.js +0 -106
  172. package/script/src/dsl/http/versori/proxyroundtripper.d.ts +0 -23
  173. package/script/src/dsl/http/versori/proxyroundtripper.d.ts.map +0 -1
  174. package/script/src/dsl/http/versori/proxyroundtripper.js +0 -212
  175. package/script/src/internal/cli.d.ts +0 -2
  176. package/script/src/internal/cli.d.ts.map +0 -1
  177. package/script/src/internal/cli.js +0 -35
@@ -10,6 +10,8 @@
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 { create } from '@bufbuild/protobuf';
14
+ import { timestampMs } from '@bufbuild/protobuf/wkt';
13
15
  import opentelemetry from '@opentelemetry/api';
14
16
  import { OTLPTraceExporter } from '@opentelemetry/exporter-trace-otlp-proto';
15
17
  import { resourceFromAttributes } from '@opentelemetry/resources';
@@ -18,32 +20,54 @@ import express from 'express';
18
20
  import { catchError, EMPTY, mergeMap, of, tap } from 'rxjs';
19
21
  import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
20
22
  import { ContextProviderImpl } from '../../context/ContextProvider.js';
21
- import { DefaultRoundTripperFactory } from '../../dsl/http/default.js';
22
23
  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
24
  import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
25
- import { ProxyRoundTripper } from '../../dsl/http/versori/proxyroundtripper.js';
26
25
  import { WorkflowImpl } from '../../dsl/Workflow.js';
26
+ import { envCronPort, envPort, envReadyCheckURL, envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarSDKApiBaseURL, envVarVersion, } from '../../internal/constants.js';
27
+ import { Fake, registerCrons, registerWebhooks, enabled as supervisorEnabled } from '../../internal/supervisor.js';
27
28
  import { IssueImpl } from '../../issues/Issues.js';
28
29
  import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
29
30
  import { SDKKeyValueProvider } from '../../kv/sdk/SDKKeyValueProvider.js';
30
31
  import { ConsoleLogger } from '../../observability/logging/ConsoleLogger.js';
32
+ import { credentialv1alpha1 } from '../../services/credentials/mod.js';
31
33
  import { PlatformApiImpl } from '../../services/platform/PlatformApi.js';
32
34
  import { ObservableCompiler } from './ObservableCompiler.js';
33
35
  import { QueueImpl } from './Queue.js';
34
- function getKVProvider(runLocal) {
35
- if (runLocal) {
36
+ function getKVProvider() {
37
+ if (supervisorEnabled) {
36
38
  return Promise.resolve(new MemoryKeyValueProvider());
37
39
  }
38
40
  return SDKKeyValueProvider.fromEnv();
39
41
  }
40
- function getRoundTripperFactory(log, _tracer, opts) {
41
- if (opts && opts.runLocal) {
42
- log.info('Running in local mode, using ProxyRoundTripperFactory');
43
- return ProxyRoundTripper.fromEnv(log);
44
- }
45
- log.info('Running with default round tripper factory');
46
- return new DefaultRoundTripperFactory();
42
+ function getCredentialsProvider(d) {
43
+ return {
44
+ async getRaw(name, _activationId) {
45
+ const response = await d['credentials'].get({ id: name, organisationId: '' });
46
+ if (!response.credential) {
47
+ throw new Error(`Failed to get credential: ${name}`);
48
+ }
49
+ const rawData = create(credentialv1alpha1.CredentialDataRawSchema, response.credential.data);
50
+ return rawData.raw;
51
+ },
52
+ async getAccessToken(name, forceRefresh, _activationId) {
53
+ const response = await d['tokens'].getToken({ credentialId: name, forceRefresh: forceRefresh || false });
54
+ if (!response.token) {
55
+ throw new Error(`Failed to get token for credential: ${name}`);
56
+ }
57
+ return {
58
+ accessToken: response.token.accessToken,
59
+ tokenType: response.token.tokenType,
60
+ expiry: response.token.expiry ? new Date(timestampMs(response.token.expiry)) : undefined,
61
+ };
62
+ },
63
+ async getOAuth1Metadata(name, _activationId) {
64
+ const response = await d['oauth1'].getAuthorizationMetadata({ credentialId: name });
65
+ if (!response) {
66
+ throw new Error(`Failed to get OAuth1 metadata for credential: ${name}`);
67
+ }
68
+ return response;
69
+ },
70
+ };
47
71
  }
48
72
  /**
49
73
  * DurableInterpreter is an interpreter for executing Versori workflows with support for durable, queue-based workflow
@@ -70,7 +94,7 @@ function getRoundTripperFactory(log, _tracer, opts) {
70
94
  * ```
71
95
  */
72
96
  export class DurableInterpreter {
73
- constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, platformApi, cnxFetchFactory, cronProvider, tracer, issue, cfgReader, queueProvider, otelSDK) {
97
+ constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, platformApi, cnxFetchFactory, cronProvider, tracer, issue, cfgReader, queueProvider, otelSDK) {
74
98
  Object.defineProperty(this, "log", {
75
99
  enumerable: true,
76
100
  configurable: true,
@@ -107,6 +131,12 @@ export class DurableInterpreter {
107
131
  writable: true,
108
132
  value: cronRegistry
109
133
  });
134
+ Object.defineProperty(this, "webhookRegistry", {
135
+ enumerable: true,
136
+ configurable: true,
137
+ writable: true,
138
+ value: webhookRegistry
139
+ });
110
140
  Object.defineProperty(this, "platformApi", {
111
141
  enumerable: true,
112
142
  configurable: true,
@@ -205,7 +235,6 @@ export class DurableInterpreter {
205
235
  const otelTracesURL = Deno.env.get(envVarOtelTracesURL);
206
236
  let otelSDK;
207
237
  const configReader = VersoriConfigReader.fromEnv(log);
208
- const runLocal = Deno.env.get(envVarLocalRun) === 'true';
209
238
  await waitForReady(log);
210
239
  // Do NOT change those attributes, they are used by the API to filter on
211
240
  const resource = resourceFromAttributes({
@@ -227,24 +256,31 @@ export class DurableInterpreter {
227
256
  log.info('Starting OpenTelemetry SDK');
228
257
  otelSDK.start();
229
258
  }
259
+ else if (supervisorEnabled) {
260
+ otelSDK = new NodeSDK({
261
+ traceExporter: new Fake(),
262
+ serviceName: serviceName,
263
+ resource: resource,
264
+ });
265
+ log.info('Starting Testing OpenTelemetry SDK');
266
+ otelSDK.start();
267
+ }
230
268
  const tracer = opentelemetry.trace.getTracer(serviceName, version);
231
- const roundTripperFactory = getRoundTripperFactory(log, tracer, {
232
- skipVersoriCredentials: options.skipVersoriCredentials,
233
- runLocal: runLocal,
234
- });
269
+ const cnxFactory = DirectConnectionFactory.fromEnv(log);
270
+ const credentialsProvider = getCredentialsProvider(cnxFactory);
235
271
  const queueProvider = await QueueImpl.fromEnv(log);
236
272
  const issuesProvider = new IssueImpl(log);
237
273
  if (options.contextProvider) {
238
274
  // no need to set up a key-value provider if options.contextProvider is already
239
275
  // initialised.
240
- return new DurableInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
276
+ return new DurableInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), new Map(), PlatformApiImpl.fromEnv(), cnxFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
241
277
  }
242
- const kvp = await getKVProvider(runLocal);
278
+ const kvp = await getKVProvider();
243
279
  const platformApi = PlatformApiImpl.fromEnv();
244
280
  const organisationId = Deno.env.get(envVarOrgId) || 'development';
245
281
  const environmentId = Deno.env.get(envVarEnvId) || 'development';
246
- const ctxProvider = new ContextProviderImpl(log, kvp, roundTripperFactory.credentials(), platformApi, organisationId, environmentId, issuesProvider);
247
- return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
282
+ const ctxProvider = new ContextProviderImpl(log, kvp, credentialsProvider, platformApi, organisationId, environmentId, issuesProvider);
283
+ return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), new Map(), PlatformApiImpl.fromEnv(), cnxFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
248
284
  }
249
285
  register(workflow, options) {
250
286
  const localAbortController = new AbortController();
@@ -261,6 +297,7 @@ export class DurableInterpreter {
261
297
  tracer: this.tracer,
262
298
  contextProvider: this.contextProvider,
263
299
  webhookRouter: this.webhookRouter,
300
+ webhookRegistry: this.webhookRegistry,
264
301
  queueProvider: this.queueProvider,
265
302
  cronRouter: this.cronRouter,
266
303
  cronRegistry: this.cronRegistry,
@@ -284,9 +321,9 @@ export class DurableInterpreter {
284
321
  this.registeredWorkflows.push(registration);
285
322
  return registration;
286
323
  }
287
- start() {
288
- const port = Deno.env.get('PORT') || 3000;
289
- const cronPort = Deno.env.get('CRON_PORT') || 3001;
324
+ async start() {
325
+ const port = Deno.env.get(envPort) || 3000;
326
+ const cronPort = Deno.env.get(envCronPort) || 3001;
290
327
  const webhookApp = express();
291
328
  const cronApp = express();
292
329
  cronApp.use(express.json());
@@ -310,11 +347,17 @@ export class DurableInterpreter {
310
347
  ctx.log.error('DurableInterpreter.executionError', {
311
348
  error: err instanceof Error ? err.toString() : err,
312
349
  });
350
+ this.tracer.startActiveSpan('done', (span) => {
351
+ span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
352
+ span.setAttribute('execution.id', ctx.executionId);
353
+ span.setAttribute('result', 'fail');
354
+ span.end();
355
+ });
313
356
  try {
314
357
  ctx.options.onError?.(ctx.withData(err));
315
358
  }
316
359
  catch (err) {
317
- ctx.log.error('DurableInterpreter.onErrorError: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
360
+ ctx.log.error('DurableInterpreter.onError Error: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
318
361
  ctx.options.onError?.(ctx.withData({
319
362
  message: 'Internal server error',
320
363
  error: err instanceof Error ? err.toString() : err,
@@ -329,6 +372,11 @@ export class DurableInterpreter {
329
372
  durationMs,
330
373
  data: ctx.data,
331
374
  });
375
+ this.tracer.startActiveSpan('done', (span) => {
376
+ span.setAttribute('execution.id', ctx.executionId);
377
+ span.setAttribute('result', 'pass');
378
+ span.end();
379
+ });
332
380
  try {
333
381
  ctx.options.onSuccess?.(ctx);
334
382
  }
@@ -376,6 +424,9 @@ export class DurableInterpreter {
376
424
  });
377
425
  throw new Error('Unable to register scheduler tasks with central cron provider');
378
426
  }
427
+ // register with supervisor
428
+ await registerCrons(this.cronRegistry);
429
+ await registerWebhooks(this.webhookRegistry);
379
430
  this.webhookServer = webhookApp.listen(port, () => {
380
431
  this.log.info(`Express server listening on port ${port}`);
381
432
  });
@@ -395,6 +446,7 @@ export class DurableInterpreter {
395
446
  if (this.cronServer) {
396
447
  this.cronServer.close();
397
448
  }
449
+ this.otelSDK?.shutdown();
398
450
  // Remove all signal listeners
399
451
  for (const registration of this.registeredWorkflows) {
400
452
  Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -447,7 +499,7 @@ export class DurableInterpreter {
447
499
  }
448
500
  }
449
501
  async function waitForReady(log) {
450
- const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
502
+ const readyCheckUrl = Deno.env.get(envReadyCheckURL);
451
503
  if (!readyCheckUrl) {
452
504
  return Promise.resolve();
453
505
  }
@@ -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;AAmFnE,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);
@@ -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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"}