@versori/run 0.6.0-alpha.1 → 0.6.0

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 (181) hide show
  1. package/esm/deps/jsr.io/@std/fmt/1.0.10/colors.d.ts.map +1 -0
  2. package/esm/deps/jsr.io/@std/fmt/{1.0.9 → 1.0.10}/colors.js +2 -2
  3. package/esm/deps/jsr.io/@std/log/0.224.14/console_handler.js +1 -1
  4. package/esm/src/connection/internal/CredentialHolder.js +1 -1
  5. package/esm/src/connection/internal/FetchBuilder.d.ts +2 -9
  6. package/esm/src/connection/internal/FetchBuilder.d.ts.map +1 -1
  7. package/esm/src/connection/internal/FetchBuilder.js +3 -124
  8. package/esm/src/context/Context.d.ts +0 -5
  9. package/esm/src/context/Context.d.ts.map +1 -1
  10. package/esm/src/context/Context.js +1 -6
  11. package/esm/src/context/VanillaContext.d.ts.map +1 -1
  12. package/esm/src/context/VanillaContext.js +1 -0
  13. package/esm/src/context/WorkflowClient.d.ts +1 -0
  14. package/esm/src/context/WorkflowClient.d.ts.map +1 -1
  15. package/esm/src/context/WorkflowClient.js +1 -0
  16. package/esm/src/dsl/Workflow.d.ts.map +1 -1
  17. package/esm/src/dsl/Workflow.js +0 -2
  18. package/esm/src/dsl/http/types.d.ts +0 -2
  19. package/esm/src/dsl/http/types.d.ts.map +1 -1
  20. package/esm/src/dsl/http/versori/configloader.d.ts.map +1 -1
  21. package/esm/src/dsl/http/versori/configloader.js +1 -1
  22. package/esm/src/dsl/http/versori/constants.d.ts +21 -0
  23. package/esm/src/dsl/http/versori/constants.d.ts.map +1 -0
  24. package/esm/src/dsl/http/versori/constants.js +38 -0
  25. package/esm/src/dsl/http/versori/cronapi.d.ts +3 -2
  26. package/esm/src/dsl/http/versori/cronapi.d.ts.map +1 -1
  27. package/esm/src/dsl/http/versori/cronapi.js +15 -14
  28. package/esm/src/dsl/http/versori/kvapi/core/OpenAPI.js +1 -1
  29. package/esm/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  30. package/esm/src/dsl/triggers/WebhookTrigger.js +1 -3
  31. package/esm/src/internal/constants.d.ts +0 -3
  32. package/esm/src/internal/constants.d.ts.map +1 -1
  33. package/esm/src/internal/constants.js +0 -3
  34. package/esm/src/interpreter/durable/DurableInterpreter.d.ts +2 -9
  35. package/esm/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  36. package/esm/src/interpreter/durable/DurableInterpreter.js +13 -57
  37. package/esm/src/interpreter/durable/ObservableCompiler.d.ts +1 -6
  38. package/esm/src/interpreter/durable/ObservableCompiler.d.ts.map +1 -1
  39. package/esm/src/interpreter/durable/Queue.d.ts +1 -0
  40. package/esm/src/interpreter/durable/Queue.d.ts.map +1 -1
  41. package/esm/src/interpreter/durable/Queue.js +1 -1
  42. package/esm/src/interpreter/durable/compilers/catch.d.ts.map +1 -1
  43. package/esm/src/interpreter/durable/compilers/catch.js +1 -3
  44. package/esm/src/interpreter/durable/compilers/fn.d.ts.map +1 -1
  45. package/esm/src/interpreter/durable/compilers/fn.js +6 -29
  46. package/esm/src/interpreter/durable/compilers/http.d.ts.map +1 -1
  47. package/esm/src/interpreter/durable/compilers/http.js +11 -45
  48. package/esm/src/interpreter/durable/compilers/schedule.d.ts.map +1 -1
  49. package/esm/src/interpreter/durable/compilers/schedule.js +3 -4
  50. package/esm/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  51. package/esm/src/interpreter/durable/compilers/webhook.js +0 -2
  52. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts +1 -8
  53. package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  54. package/esm/src/interpreter/memory/MemoryInterpreter.js +12 -56
  55. package/esm/src/interpreter/memory/ObservableCompiler.d.ts +1 -6
  56. package/esm/src/interpreter/memory/ObservableCompiler.d.ts.map +1 -1
  57. package/esm/src/interpreter/memory/compilers/catch.d.ts.map +1 -1
  58. package/esm/src/interpreter/memory/compilers/catch.js +0 -5
  59. package/esm/src/interpreter/memory/compilers/fn.d.ts.map +1 -1
  60. package/esm/src/interpreter/memory/compilers/fn.js +18 -29
  61. package/esm/src/interpreter/memory/compilers/http.d.ts.map +1 -1
  62. package/esm/src/interpreter/memory/compilers/http.js +10 -44
  63. package/esm/src/interpreter/memory/compilers/schedule.d.ts.map +1 -1
  64. package/esm/src/interpreter/memory/compilers/schedule.js +4 -61
  65. package/esm/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  66. package/esm/src/interpreter/memory/compilers/webhook.js +3 -9
  67. package/esm/src/interpreter/vanilla/VanillaInterpreter.d.ts +0 -1
  68. package/esm/src/interpreter/vanilla/VanillaInterpreter.d.ts.map +1 -1
  69. package/esm/src/interpreter/vanilla/VanillaInterpreter.js +6 -30
  70. package/esm/src/interpreter/vanilla/compilers/schedule.js +1 -1
  71. package/esm/src/issues/Issues.d.ts.map +1 -1
  72. package/esm/src/issues/Issues.js +1 -6
  73. package/esm/src/kv/KeyValue.d.ts +7 -3
  74. package/esm/src/kv/KeyValue.d.ts.map +1 -1
  75. package/esm/src/kv/fingerprintExternalUserId.d.ts +6 -0
  76. package/esm/src/kv/fingerprintExternalUserId.d.ts.map +1 -0
  77. package/esm/src/kv/fingerprintExternalUserId.js +20 -0
  78. package/esm/src/kv/memory/MemoryKeyValueProvider.d.ts +4 -0
  79. package/esm/src/kv/memory/MemoryKeyValueProvider.d.ts.map +1 -1
  80. package/esm/src/kv/memory/MemoryKeyValueProvider.js +50 -0
  81. package/esm/src/kv/nats/NatsKeyValueProvider.d.ts.map +1 -1
  82. package/esm/src/kv/nats/NatsKeyValueProvider.js +14 -0
  83. package/esm/src/kv/sdk/SDKKeyValueProvider.d.ts.map +1 -1
  84. package/esm/src/kv/sdk/SDKKeyValueProvider.js +12 -0
  85. package/esm/src/observability/logging/ConsoleLogger.d.ts.map +1 -1
  86. package/package.json +1 -3
  87. package/script/deps/jsr.io/@std/fmt/1.0.10/colors.d.ts.map +1 -0
  88. package/script/deps/jsr.io/@std/fmt/{1.0.9 → 1.0.10}/colors.js +2 -2
  89. package/script/deps/jsr.io/@std/log/0.224.14/console_handler.js +1 -1
  90. package/script/src/connection/internal/CredentialHolder.js +1 -1
  91. package/script/src/connection/internal/FetchBuilder.d.ts +2 -9
  92. package/script/src/connection/internal/FetchBuilder.d.ts.map +1 -1
  93. package/script/src/connection/internal/FetchBuilder.js +3 -147
  94. package/script/src/context/Context.d.ts +0 -5
  95. package/script/src/context/Context.d.ts.map +1 -1
  96. package/script/src/context/Context.js +1 -6
  97. package/script/src/context/VanillaContext.d.ts.map +1 -1
  98. package/script/src/context/VanillaContext.js +1 -0
  99. package/script/src/context/WorkflowClient.d.ts +1 -0
  100. package/script/src/context/WorkflowClient.d.ts.map +1 -1
  101. package/script/src/context/WorkflowClient.js +1 -0
  102. package/script/src/dsl/Workflow.d.ts.map +1 -1
  103. package/script/src/dsl/Workflow.js +0 -2
  104. package/script/src/dsl/http/types.d.ts +0 -2
  105. package/script/src/dsl/http/types.d.ts.map +1 -1
  106. package/script/src/dsl/http/versori/configloader.d.ts.map +1 -1
  107. package/script/src/dsl/http/versori/configloader.js +1 -1
  108. package/script/src/dsl/http/versori/constants.d.ts +21 -0
  109. package/script/src/dsl/http/versori/constants.d.ts.map +1 -0
  110. package/script/src/dsl/http/versori/constants.js +41 -0
  111. package/script/src/dsl/http/versori/cronapi.d.ts +3 -2
  112. package/script/src/dsl/http/versori/cronapi.d.ts.map +1 -1
  113. package/script/src/dsl/http/versori/cronapi.js +15 -14
  114. package/script/src/dsl/http/versori/kvapi/core/OpenAPI.js +1 -1
  115. package/script/src/dsl/triggers/WebhookTrigger.d.ts.map +1 -1
  116. package/script/src/dsl/triggers/WebhookTrigger.js +1 -3
  117. package/script/src/internal/constants.d.ts +0 -3
  118. package/script/src/internal/constants.d.ts.map +1 -1
  119. package/script/src/internal/constants.js +1 -4
  120. package/script/src/interpreter/durable/DurableInterpreter.d.ts +2 -9
  121. package/script/src/interpreter/durable/DurableInterpreter.d.ts.map +1 -1
  122. package/script/src/interpreter/durable/DurableInterpreter.js +18 -62
  123. package/script/src/interpreter/durable/ObservableCompiler.d.ts +1 -6
  124. package/script/src/interpreter/durable/ObservableCompiler.d.ts.map +1 -1
  125. package/script/src/interpreter/durable/Queue.d.ts +1 -0
  126. package/script/src/interpreter/durable/Queue.d.ts.map +1 -1
  127. package/script/src/interpreter/durable/Queue.js +1 -1
  128. package/script/src/interpreter/durable/compilers/catch.d.ts.map +1 -1
  129. package/script/src/interpreter/durable/compilers/catch.js +1 -3
  130. package/script/src/interpreter/durable/compilers/fn.d.ts.map +1 -1
  131. package/script/src/interpreter/durable/compilers/fn.js +5 -28
  132. package/script/src/interpreter/durable/compilers/http.d.ts.map +1 -1
  133. package/script/src/interpreter/durable/compilers/http.js +11 -45
  134. package/script/src/interpreter/durable/compilers/schedule.d.ts.map +1 -1
  135. package/script/src/interpreter/durable/compilers/schedule.js +3 -4
  136. package/script/src/interpreter/durable/compilers/webhook.d.ts.map +1 -1
  137. package/script/src/interpreter/durable/compilers/webhook.js +0 -2
  138. package/script/src/interpreter/memory/MemoryInterpreter.d.ts +1 -8
  139. package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map +1 -1
  140. package/script/src/interpreter/memory/MemoryInterpreter.js +11 -55
  141. package/script/src/interpreter/memory/ObservableCompiler.d.ts +1 -6
  142. package/script/src/interpreter/memory/ObservableCompiler.d.ts.map +1 -1
  143. package/script/src/interpreter/memory/compilers/catch.d.ts.map +1 -1
  144. package/script/src/interpreter/memory/compilers/catch.js +0 -5
  145. package/script/src/interpreter/memory/compilers/fn.d.ts.map +1 -1
  146. package/script/src/interpreter/memory/compilers/fn.js +17 -28
  147. package/script/src/interpreter/memory/compilers/http.d.ts.map +1 -1
  148. package/script/src/interpreter/memory/compilers/http.js +10 -44
  149. package/script/src/interpreter/memory/compilers/schedule.d.ts.map +1 -1
  150. package/script/src/interpreter/memory/compilers/schedule.js +4 -61
  151. package/script/src/interpreter/memory/compilers/webhook.d.ts.map +1 -1
  152. package/script/src/interpreter/memory/compilers/webhook.js +3 -9
  153. package/script/src/interpreter/vanilla/VanillaInterpreter.d.ts +0 -1
  154. package/script/src/interpreter/vanilla/VanillaInterpreter.d.ts.map +1 -1
  155. package/script/src/interpreter/vanilla/VanillaInterpreter.js +6 -30
  156. package/script/src/interpreter/vanilla/compilers/schedule.js +1 -1
  157. package/script/src/issues/Issues.d.ts.map +1 -1
  158. package/script/src/issues/Issues.js +1 -6
  159. package/script/src/kv/KeyValue.d.ts +7 -3
  160. package/script/src/kv/KeyValue.d.ts.map +1 -1
  161. package/script/src/kv/fingerprintExternalUserId.d.ts +6 -0
  162. package/script/src/kv/fingerprintExternalUserId.d.ts.map +1 -0
  163. package/script/src/kv/fingerprintExternalUserId.js +23 -0
  164. package/script/src/kv/memory/MemoryKeyValueProvider.d.ts +4 -0
  165. package/script/src/kv/memory/MemoryKeyValueProvider.d.ts.map +1 -1
  166. package/script/src/kv/memory/MemoryKeyValueProvider.js +50 -0
  167. package/script/src/kv/nats/NatsKeyValueProvider.d.ts.map +1 -1
  168. package/script/src/kv/nats/NatsKeyValueProvider.js +14 -0
  169. package/script/src/kv/sdk/SDKKeyValueProvider.d.ts.map +1 -1
  170. package/script/src/kv/sdk/SDKKeyValueProvider.js +12 -0
  171. package/script/src/observability/logging/ConsoleLogger.d.ts.map +1 -1
  172. package/esm/deps/jsr.io/@std/fmt/1.0.9/colors.d.ts.map +0 -1
  173. package/esm/src/internal/supervisor.d.ts +0 -23
  174. package/esm/src/internal/supervisor.d.ts.map +0 -1
  175. package/esm/src/internal/supervisor.js +0 -267
  176. package/script/deps/jsr.io/@std/fmt/1.0.9/colors.d.ts.map +0 -1
  177. package/script/src/internal/supervisor.d.ts +0 -23
  178. package/script/src/internal/supervisor.d.ts.map +0 -1
  179. package/script/src/internal/supervisor.js +0 -275
  180. /package/esm/deps/jsr.io/@std/fmt/{1.0.9 → 1.0.10}/colors.d.ts +0 -0
  181. /package/script/deps/jsr.io/@std/fmt/{1.0.9 → 1.0.10}/colors.d.ts +0 -0
@@ -29,15 +29,14 @@ const configloader_js_1 = require("../../dsl/http/versori/configloader.js");
29
29
  const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
30
30
  const Workflow_js_1 = require("../../dsl/Workflow.js");
31
31
  const constants_js_1 = require("../../internal/constants.js");
32
- const supervisor_js_1 = require("../../internal/supervisor.js");
33
32
  const Issues_js_1 = require("../../issues/Issues.js");
34
33
  const MemoryKeyValueProvider_js_1 = require("../../kv/memory/MemoryKeyValueProvider.js");
35
34
  const NatsKeyValueProvider_js_1 = require("../../kv/nats/NatsKeyValueProvider.js");
36
35
  const ConsoleLogger_js_1 = require("../../observability/logging/ConsoleLogger.js");
37
36
  const PlatformApi_js_1 = require("../../services/platform/PlatformApi.js");
38
37
  const ObservableCompiler_js_1 = require("./ObservableCompiler.js");
39
- function getKVProvider() {
40
- if (supervisor_js_1.enabled) {
38
+ function getKVProvider(runLocal) {
39
+ if (runLocal) {
41
40
  return Promise.resolve(new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider());
42
41
  }
43
42
  return NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv();
@@ -64,7 +63,7 @@ function getKVProvider() {
64
63
  * ```
65
64
  */
66
65
  class MemoryInterpreter {
67
- constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
66
+ constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
68
67
  Object.defineProperty(this, "log", {
69
68
  enumerable: true,
70
69
  configurable: true,
@@ -101,12 +100,6 @@ class MemoryInterpreter {
101
100
  writable: true,
102
101
  value: cronRegistry
103
102
  });
104
- Object.defineProperty(this, "webhookRegistry", {
105
- enumerable: true,
106
- configurable: true,
107
- writable: true,
108
- value: webhookRegistry
109
- });
110
103
  Object.defineProperty(this, "cnxFactory", {
111
104
  enumerable: true,
112
105
  configurable: true,
@@ -173,13 +166,6 @@ class MemoryInterpreter {
173
166
  writable: true,
174
167
  value: false
175
168
  });
176
- // Workflow registration promises only used when supervisor is enabled
177
- Object.defineProperty(this, "wfRegistration", {
178
- enumerable: true,
179
- configurable: true,
180
- writable: true,
181
- value: []
182
- });
183
169
  if (typeof this.log === 'undefined') {
184
170
  // this captures the old way of instantiating the MemoryInterpreter and provides an
185
171
  // error message back to the user to let them know they should use the new way.
@@ -198,6 +184,7 @@ class MemoryInterpreter {
198
184
  const otelTracesURL = Deno.env.get(constants_js_1.envVarOtelTracesURL);
199
185
  let otelSDK;
200
186
  const configReader = configloader_js_1.VersoriConfigReader.fromEnv(log);
187
+ const runLocal = Deno.env.get(constants_js_1.envVarLocalRun) === 'true';
201
188
  await waitForReady(log);
202
189
  // Do NOT change those attributes, they are used by the API to filter on
203
190
  const resource = (0, resources_1.resourceFromAttributes)({
@@ -219,29 +206,20 @@ class MemoryInterpreter {
219
206
  log.info('Starting OpenTelemetry SDK');
220
207
  otelSDK.start();
221
208
  }
222
- else if (supervisor_js_1.enabled) {
223
- otelSDK = new sdk_node_1.NodeSDK({
224
- traceExporter: new supervisor_js_1.Fake(),
225
- serviceName: serviceName,
226
- resource: resource,
227
- });
228
- log.info('Starting Testing OpenTelemetry SDK');
229
- otelSDK.start();
230
- }
231
209
  const tracer = api_1.default.trace.getTracer(serviceName, version);
232
210
  const connectionFactory = DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log);
233
211
  const issuesProvider = new Issues_js_1.IssueImpl(log);
234
212
  if (options.contextProvider) {
235
213
  // no need to set up a key-value provider if options.contextProvider is already
236
214
  // initialised.
237
- return new MemoryInterpreter(log, compiler, options.contextProvider, express_1.default.Router(), express_1.default.Router(), new Map(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
215
+ return new MemoryInterpreter(log, compiler, options.contextProvider, express_1.default.Router(), express_1.default.Router(), new Map(), DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log), cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
238
216
  }
239
- const kvp = await getKVProvider();
217
+ const kvp = await getKVProvider(runLocal);
240
218
  const platformApi = PlatformApi_js_1.PlatformApiImpl.fromEnv();
241
219
  const organisationId = Deno.env.get(constants_js_1.envVarOrgId) || 'development';
242
220
  const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
243
221
  const ctxProvider = new ContextProvider_js_1.ContextProviderImpl(log, kvp, new CredentialsProvider_js_1.CredentialsProviderImpl(connectionFactory.credentials, connectionFactory.tokens, connectionFactory.oauth1, configReader, platformApi), platformApi, organisationId, environmentId, issuesProvider);
244
- return new MemoryInterpreter(log, compiler, ctxProvider, express_1.default.Router(), express_1.default.Router(), new Map(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
222
+ return new MemoryInterpreter(log, compiler, ctxProvider, express_1.default.Router(), express_1.default.Router(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
245
223
  }
246
224
  register(workflow, options) {
247
225
  const localAbortController = new AbortController();
@@ -263,7 +241,6 @@ class MemoryInterpreter {
263
241
  cnxFactory: this.cnxFactory,
264
242
  platformApi: PlatformApi_js_1.PlatformApiImpl.fromEnv(),
265
243
  webhookRouter: this.webhookRouter,
266
- webhookRegistry: this.webhookRegistry,
267
244
  cronRouter: this.cronRouter,
268
245
  cronRegistry: this.cronRegistry,
269
246
  configReader: this.cfgReader,
@@ -283,14 +260,11 @@ class MemoryInterpreter {
283
260
  },
284
261
  };
285
262
  this.registeredWorkflows.push(registration);
286
- if (supervisor_js_1.enabled) {
287
- this.wfRegistration.push((0, supervisor_js_1.registerWorkflow)(workflow));
288
- }
289
263
  return registration;
290
264
  }
291
- async start() {
292
- const port = Deno.env.get(constants_js_1.envPort) || 3000;
293
- const cronPort = Deno.env.get(constants_js_1.envCronPort) || 3001;
265
+ start() {
266
+ const port = Deno.env.get('PORT') || 3000;
267
+ const cronPort = Deno.env.get('CRON_PORT') || 3001;
294
268
  const webhookApp = (0, express_1.default)();
295
269
  const cronApp = (0, express_1.default)();
296
270
  cronApp.use(express_1.default.json());
@@ -317,13 +291,6 @@ class MemoryInterpreter {
317
291
  triggerName: registration.triggerName,
318
292
  error: err instanceof Error ? err.toString() : err,
319
293
  });
320
- this.tracer.startActiveSpan('done', (span) => {
321
- span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
322
- span.setAttribute('execution.id', ctx.executionId);
323
- span.setAttribute('result', 'fail');
324
- span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
325
- span.end();
326
- });
327
294
  try {
328
295
  ctx.options.onError?.(ctx.withData(err));
329
296
  }
@@ -346,12 +313,6 @@ class MemoryInterpreter {
346
313
  triggerName: registration.triggerName,
347
314
  durationMs,
348
315
  });
349
- this.tracer.startActiveSpan('done', (span) => {
350
- span.setAttribute('execution.id', ctx.executionId);
351
- span.setAttribute('result', 'pass');
352
- span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
353
- span.end();
354
- });
355
316
  try {
356
317
  ctx.options.onSuccess?.(ctx);
357
318
  }
@@ -413,7 +374,6 @@ class MemoryInterpreter {
413
374
  if (this.cronServer) {
414
375
  this.cronServer.close();
415
376
  }
416
- this.otelSDK?.shutdown();
417
377
  // Remove all signal listeners
418
378
  for (const registration of this.registeredWorkflows) {
419
379
  Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -430,10 +390,6 @@ class MemoryInterpreter {
430
390
  }
431
391
  };
432
392
  Deno.addSignalListener('SIGINT', this.shutdownServer);
433
- if (supervisor_js_1.enabled) {
434
- await Promise.all(this.wfRegistration);
435
- await (0, supervisor_js_1.signalReady)();
436
- }
437
393
  return new Promise((resolve) => {
438
394
  let serversClosed = 0;
439
395
  const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;
@@ -471,7 +427,7 @@ class MemoryInterpreter {
471
427
  }
472
428
  exports.MemoryInterpreter = MemoryInterpreter;
473
429
  async function waitForReady(log) {
474
- const readyCheckUrl = Deno.env.get(constants_js_1.envReadyCheckURL);
430
+ const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
475
431
  if (!readyCheckUrl) {
476
432
  return Promise.resolve();
477
433
  }
@@ -1,7 +1,6 @@
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';
5
4
  import { ContextImpl } from '../../context/Context.js';
6
5
  import { ContextProvider } from '../../context/ContextProvider.js';
7
6
  import { ConfigReader } from '../../dsl/http/types.js';
@@ -11,6 +10,7 @@ import { IssueAPI } from '../../issues/Issues.js';
11
10
  import { Logger } from '../../observability/logging/Logger.js';
12
11
  import { PlatformApi } from '../../services/platform/PlatformApi.js';
13
12
  import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
13
+ import { ConnectionFactory } from '../../connection/types.js';
14
14
  export type CompilerContext = {
15
15
  compiler: ObservableCompiler;
16
16
  log: Logger;
@@ -23,11 +23,6 @@ export type CompilerContext = {
23
23
  issueProvider: IssueAPI;
24
24
  configReader: ConfigReader;
25
25
  cronRegistry: Map<string, string>;
26
- webhookRegistry: Map<string, {
27
- method: string;
28
- path: string;
29
- options: any;
30
- }>;
31
26
  organisationId: string;
32
27
  };
33
28
  export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;
@@ -1 +1 @@
1
- {"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/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;AAEpD,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,wCAAwC,CAAC;AASrE,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,MAAM,eAAe,GAAG;IAC1B,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,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,QAAQ,CAAC;IACxB,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,eAAe,EACpB,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;;IAgBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,eAAe,EACpB,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,eAAe,EACpB,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 +1 @@
1
- {"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA4FnE,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/memory/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAsFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
@@ -22,13 +22,9 @@ function compileCatch(compilerCtx, task) {
22
22
  return (src) => src.pipe((0, rxjs_1.mergeMap)((ctx) => {
23
23
  return baseOperator((0, rxjs_1.of)(ctx)).pipe((0, rxjs_1.catchError)((error) => {
24
24
  return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
25
- // TODO: do we even want this here? Can't be async in here I believe
26
- // await sendTaskStartEvent(task.id, span);
27
25
  span.setAttribute('execution.id', ctx.executionId);
28
26
  span.setAttribute('task.type', 'catch');
29
- span.setAttribute('type', 'task');
30
27
  if (error instanceof Error) {
31
- span.setAttribute('status', 'fail');
32
28
  span.recordException(error);
33
29
  span.setAttribute('error.message', error.message);
34
30
  span.setAttribute('error.stack', error.stack ?? '');
@@ -66,7 +62,6 @@ function compileCatch(compilerCtx, task) {
66
62
  ctx.log.error('execution has encountered an error', {
67
63
  error: error,
68
64
  });
69
- span.setAttribute('status', 'fail');
70
65
  span.setAttribute('error', `${error}`);
71
66
  span.end();
72
67
  return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }), { recoveredFromCatch: true })));
@@ -1 +1 @@
1
- {"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoDnE,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/memory/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAiCnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
@@ -1,43 +1,32 @@
1
1
  "use strict";
2
+ /*
3
+ * Copyright (c) 2025 Versori Group Inc
4
+ *
5
+ * Use of this software is governed by the Business Source License 1.1
6
+ * included in the LICENSE file at the root of this repository.
7
+ *
8
+ * Change Date: 2029-01-01
9
+ * Change License: Apache License, Version 2.0
10
+ *
11
+ * As of the Change Date, in accordance with the Business Source License,
12
+ * use of this software will be governed by the Apache License, Version 2.0.
13
+ */
2
14
  Object.defineProperty(exports, "__esModule", { value: true });
3
15
  exports.fnCompiler = void 0;
4
16
  const rxjs_1 = require("rxjs");
5
17
  const FnTask_js_1 = require("../../../dsl/tasks/FnTask.js");
6
- const supervisor_js_1 = require("../../../internal/supervisor.js");
7
18
  function compileFn(compilerCtx, task) {
8
- return (src) => src.pipe((0, rxjs_1.mergeMap)(async (ctx) => {
19
+ return (src) => src.pipe((0, rxjs_1.tap)({
20
+ complete: () => compilerCtx.log.debug('fn.complete'),
21
+ }), (0, rxjs_1.mergeMap)(async (ctx) => {
9
22
  return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
10
- ctx = await (0, supervisor_js_1.sendTaskStartEvent)(task.id, ctx, span);
11
23
  span.setAttribute('task.id', task.id);
12
- span.setAttribute('type', 'task');
13
- span.setAttribute('task.type', 'fn');
14
24
  span.setAttribute('execution.id', ctx.executionId);
15
- span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
16
25
  try {
17
- let result;
18
- const spanContext = span.spanContext();
19
- const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
20
26
  if (typeof ctx.idx === 'number') {
21
- result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
27
+ return ctx.withData(await task._fn(ctx, ctx.idx));
22
28
  }
23
- else {
24
- result = ctx.withData(await task._fn(ctxWithLogger));
25
- }
26
- if (supervisor_js_1.enabled) {
27
- span.setAttribute('response.body', JSON.stringify(result.data));
28
- }
29
- span.setAttribute('status', 'pass');
30
- return result;
31
- }
32
- catch (error) {
33
- if (error instanceof Error) {
34
- span.setAttribute('status', 'fail');
35
- span.recordException(error);
36
- }
37
- else {
38
- span.recordException(new Error(String(error)));
39
- }
40
- throw error;
29
+ return ctx.withData(await task._fn(ctx));
41
30
  }
42
31
  finally {
43
32
  span.end();
@@ -1 +1 @@
1
- {"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAyHnE,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/memory/compilers/http.ts"],"names":[],"mappings":"AAoBA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqFnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
@@ -14,32 +14,19 @@
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.httpCompiler = void 0;
16
16
  const rxjs_1 = require("rxjs");
17
+ const operators_1 = require("rxjs/operators");
17
18
  const DynamicFetchFactory_js_1 = require("../../../connection/DynamicFetchFactory.js");
18
- const FetchBuilder_js_1 = require("../../../connection/internal/FetchBuilder.js");
19
19
  const StaticFetchFactory_js_1 = require("../../../connection/StaticFetchFactory.js");
20
20
  const HttpTask_js_1 = require("../../../dsl/tasks/HttpTask.js");
21
- const supervisor_js_1 = require("../../../internal/supervisor.js");
22
21
  function compileHttp(compilerCtx, task) {
23
22
  const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
24
23
  let fetchFactory;
25
24
  if (!cnxMap) {
26
- compilerCtx.log.warn(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
27
- if (supervisor_js_1.enabled) {
28
- // missing connection map and we are in supervised mode, so we use the fake fetcher
29
- fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
30
- }
31
- else {
32
- // missing connection map and not in supervised mode, so we use global fetch
33
- fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
34
- }
25
+ compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
26
+ fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
35
27
  }
36
28
  else if (cnxMap.dynamic) {
37
- if (cnxMap.mockWithAI) {
38
- fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
39
- }
40
- else {
41
- fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
42
- }
29
+ fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
43
30
  }
44
31
  else {
45
32
  fetchFactory = compilerCtx.platformApi.getConnection({
@@ -49,21 +36,8 @@ function compileHttp(compilerCtx, task) {
49
36
  },
50
37
  throwOnError: true,
51
38
  })
52
- .then(({ data }) => {
53
- if (cnxMap.mockWithAI) {
54
- // use the fake fetcher that calls the supervisor to generate a mock reponse
55
- return new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, data).buildSupervisedFetch());
56
- }
57
- return Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? ''])
58
- .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
59
- })
60
- .catch((err) => {
61
- compilerCtx.log.error(`Failed to get connection ${task.opts.connection}`, err);
62
- if (supervisor_js_1.enabled) {
63
- return new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).build());
64
- }
65
- throw err;
66
- });
39
+ .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
40
+ .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
67
41
  }
68
42
  async function http(ctx) {
69
43
  const [fetch, baseUrl] = await fetchFactory.then((ff) => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
@@ -71,27 +45,19 @@ function compileHttp(compilerCtx, task) {
71
45
  const result = await task.fn(httpContext);
72
46
  return ctx.withData(result);
73
47
  }
74
- return (src) => src.pipe((0, rxjs_1.mergeMap)((ctx) => {
48
+ return (src) => src.pipe((0, operators_1.tap)({
49
+ complete: () => compilerCtx.log.debug('http.complete'),
50
+ }), (0, rxjs_1.mergeMap)((ctx) => {
75
51
  return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
76
- ctx = await (0, supervisor_js_1.sendTaskStartEvent)(task.id, ctx, span);
77
52
  span.setAttribute('task.id', task.id);
78
53
  span.setAttribute('task.type', 'http');
79
- span.setAttribute('type', 'task');
80
54
  span.setAttribute('execution.id', ctx.executionId);
81
55
  span.setAttribute('connection.name', task.opts.connection);
82
- span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
83
- const spanContext = span.spanContext();
84
56
  try {
85
- const newCtx = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
86
- if (supervisor_js_1.enabled) {
87
- span.setAttribute('response.body', JSON.stringify(newCtx.data));
88
- }
89
- span.setAttribute('status', 'pass');
90
- return newCtx;
57
+ return await http(ctx);
91
58
  }
92
59
  catch (error) {
93
60
  if (error instanceof Error) {
94
- span.setAttribute('status', 'fail');
95
61
  span.recordException(error);
96
62
  }
97
63
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AASzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+M7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
1
+ {"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyI7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
@@ -14,9 +14,8 @@
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
15
  exports.scheduleCompiler = void 0;
16
16
  const rxjs_1 = require("rxjs");
17
+ const constants_js_1 = require("../../../dsl/http/versori/constants.js");
17
18
  const ScheduleTrigger_js_1 = require("../../../dsl/triggers/ScheduleTrigger.js");
18
- const constants_js_1 = require("../../../internal/constants.js");
19
- const supervisor_js_1 = require("../../../internal/supervisor.js");
20
19
  function compileSchedule(ctx, trigger, signal) {
21
20
  return new rxjs_1.Observable((subscriber) => {
22
21
  // Add HTTP endpoint for manual triggering
@@ -29,43 +28,8 @@ function compileSchedule(ctx, trigger, signal) {
29
28
  const orgId = Deno.env.get(constants_js_1.envVarOrgId) || 'example-org';
30
29
  const client = ctx.platformApi;
31
30
  ctx.cronRegistry.set(trigger.id, trigger.schedule);
32
- async function handleSchedule(req, res, span) {
31
+ async function handleSchedule(_req, res, span) {
33
32
  try {
34
- // run for a single activation
35
- const activationId = req.params.activationId;
36
- if (activationId) {
37
- const { data: activation } = await client.getActivation({
38
- path: {
39
- organisation_id: ctx.organisationId,
40
- environment_id: environmentId,
41
- activation_id: activationId,
42
- },
43
- throwOnError: false,
44
- });
45
- if (!activation) {
46
- res.status(412).json({
47
- status: 'error',
48
- message: `No activation found for ID: ${activationId}`,
49
- });
50
- return;
51
- }
52
- const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
53
- span.setAttribute('execution.id', executionCtx.executionId);
54
- await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, executionCtx, span);
55
- try {
56
- ctx.log.info(`Running schedule ${trigger.id} for activation ${activationId}`);
57
- subscriber.next(executionCtx);
58
- }
59
- catch (error) {
60
- executionCtx.log.error('execution error inside schedule', { error });
61
- }
62
- res.status(200).json({
63
- status: 'triggered',
64
- executionId: executionCtx.executionId,
65
- });
66
- return;
67
- }
68
- // run for static activation only
69
33
  if (trigger.activationPredicate === undefined) {
70
34
  const { data: activation } = await client.listActivations({
71
35
  path: {
@@ -84,9 +48,8 @@ function compileSchedule(ctx, trigger, signal) {
84
48
  });
85
49
  return;
86
50
  }
87
- const executionCtx = ctx.contextProvider.create(activation[0], {}, { workflowId: trigger.id });
51
+ const executionCtx = ctx.contextProvider.create(activation[0], {});
88
52
  span.setAttribute('execution.id', executionCtx.executionId);
89
- await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, executionCtx, span);
90
53
  try {
91
54
  subscriber.next(executionCtx);
92
55
  }
@@ -99,7 +62,6 @@ function compileSchedule(ctx, trigger, signal) {
99
62
  });
100
63
  return;
101
64
  }
102
- // run for all activations
103
65
  const { data: activations } = await client.listActivations({
104
66
  path: {
105
67
  organisation_id: ctx.organisationId,
@@ -118,9 +80,8 @@ function compileSchedule(ctx, trigger, signal) {
118
80
  return;
119
81
  }
120
82
  activations.forEach((activation) => {
121
- const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
83
+ const executionCtx = ctx.contextProvider.create(activation, {});
122
84
  try {
123
- ctx.log.info(`Running schedule ${trigger.id} for activation ${activation.id}`);
124
85
  subscriber.next(executionCtx);
125
86
  }
126
87
  catch (error) {
@@ -138,29 +99,11 @@ function compileSchedule(ctx, trigger, signal) {
138
99
  await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
139
100
  span.setAttribute('task.id', trigger.id);
140
101
  span.setAttribute('task.type', 'schedule');
141
- span.setAttribute('type', 'task');
142
- span.setAttribute('schedule', trigger.schedule);
143
- span.setAttribute('project.id', projectId);
144
- span.setAttribute('environment.id', environmentId);
145
- span.setAttribute('environment.name', environmentName);
146
- span.setAttribute('org.id', orgId);
147
- span.setAttribute('workflow.id', trigger.id);
148
- await handleSchedule(req, res, span);
149
- span.end();
150
- });
151
- });
152
- ctx.cronRouter.post(`/cron/${trigger.id}/activations/:activationId`, async (req, res) => {
153
- await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
154
- span.setAttribute('task.id', trigger.id);
155
- span.setAttribute('activation.id', req.params.activationId);
156
- span.setAttribute('task.type', 'schedule');
157
- span.setAttribute('type', 'task');
158
102
  span.setAttribute('schedule', trigger.schedule);
159
103
  span.setAttribute('project.id', projectId);
160
104
  span.setAttribute('environment.id', environmentId);
161
105
  span.setAttribute('environment.name', environmentName);
162
106
  span.setAttribute('org.id', orgId);
163
- span.setAttribute('workflow.id', trigger.id);
164
107
  await handleSchedule(req, res, span);
165
108
  span.end();
166
109
  });
@@ -1 +1 @@
1
- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAItF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAmTxE,CAAC"}
1
+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/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,CA0SxE,CAAC"}
@@ -24,7 +24,6 @@ const rxjs_1 = require("rxjs");
24
24
  const webhookmiddleware_js_1 = require("../../../dsl/http/versori/webhookmiddleware.js");
25
25
  const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
26
26
  const constants_js_1 = require("../../../internal/constants.js");
27
- const supervisor_js_1 = require("../../../internal/supervisor.js");
28
27
  const xml2jsDefaults = {
29
28
  explicitArray: false,
30
29
  normalize: false,
@@ -91,7 +90,6 @@ exports.webhookCompiler = {
91
90
  onError = trigger.options.response.onError;
92
91
  }
93
92
  const ctxOptionsFn = (req, res) => ({
94
- workflowId: trigger.id,
95
93
  onSuccess: (ctx) => {
96
94
  if (isSync) {
97
95
  sendResponse(res, onSuccess(ctx));
@@ -112,7 +110,6 @@ exports.webhookCompiler = {
112
110
  else {
113
111
  routeMiddleware.push(express_1.default.raw({ type: '*/*', limit: '50mb' }));
114
112
  }
115
- ctx.webhookRegistry.set(trigger.id, { method, path: `/${trigger.id}`, options: trigger.options });
116
113
  return new rxjs_1.Observable((subscriber) => {
117
114
  if (!ctx.webhookRouter) {
118
115
  throw new Error('Router not available in compiler context');
@@ -138,13 +135,12 @@ exports.webhookCompiler = {
138
135
  cfgReader: ctx.configReader,
139
136
  log: ctx.log,
140
137
  }), async (req, res) => {
141
- await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
138
+ await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
142
139
  span.setAttribute('task.id', trigger.id);
143
140
  span.setAttribute('task.type', 'webhook');
144
141
  const staticActivation = res.locals.activation;
145
142
  const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
146
143
  span.setAttribute('execution.id', executionCtx.executionId);
147
- await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, executionCtx, span);
148
144
  try {
149
145
  subscriber.next(executionCtx);
150
146
  if (isAsync) {
@@ -175,7 +171,7 @@ exports.webhookCompiler = {
175
171
  cfgReader: ctx.configReader,
176
172
  log: ctx.log,
177
173
  }), async (req, res) => {
178
- await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
174
+ await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
179
175
  span.setAttribute('task.id', trigger.id);
180
176
  span.setAttribute('task.type', 'webhook');
181
177
  span.setAttribute('user.id', req.params.userId);
@@ -196,7 +192,6 @@ exports.webhookCompiler = {
196
192
  }
197
193
  const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
198
194
  span.setAttribute('execution.id', executionCtx.executionId);
199
- await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, executionCtx, span);
200
195
  const errors = [];
201
196
  try {
202
197
  subscriber.next(executionCtx);
@@ -232,7 +227,7 @@ exports.webhookCompiler = {
232
227
  cfgReader: ctx.configReader,
233
228
  log: ctx.log,
234
229
  }), async (req, res) => {
235
- await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
230
+ await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
236
231
  span.setAttribute('task.id', trigger.id);
237
232
  span.setAttribute('task.type', 'webhook');
238
233
  span.setAttribute('activation.id', req.params.activationId);
@@ -251,7 +246,6 @@ exports.webhookCompiler = {
251
246
  }
252
247
  const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
253
248
  span.setAttribute('execution.id', activationCtx.executionId);
254
- await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, activationCtx, span);
255
249
  try {
256
250
  subscriber.next(activationCtx);
257
251
  if (isAsync) {
@@ -86,7 +86,6 @@ export declare class VanillaInterpreter {
86
86
  private cronServer?;
87
87
  private shutdownServer?;
88
88
  private isShuttingDown;
89
- private wfRegistration;
90
89
  constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, cnxFetchFactory: DefaultConnectionFactory, cronProvider: CronProvider, tracer: Tracer, cfgReader: ConfigReader, queueProvider: QueueAPI, otelSDK?: NodeSDK | undefined);
91
90
  static newInstance(options?: VanillaInterpreterOptions): Promise<VanillaInterpreter>;
92
91
  register<O>(workflow: Workflow<O>, options?: VanillaInterpreterOptions): Registration;
@@ -1 +1 @@
1
- {"version":3,"file":"VanillaInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/vanilla/VanillaInterpreter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"VanillaInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/vanilla/VanillaInterpreter.ts"],"names":[],"mappings":"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"}