@versori/run 0.5.0-alpha.6 → 0.5.1

package/script/src/interpreter/memory/MemoryInterpreter.js

@@ -29,15 +29,14 @@ const configloader_js_1 = require("../../dsl/http/versori/configloader.js");
 const cronapi_js_1 = require("../../dsl/http/versori/cronapi.js");
 const Workflow_js_1 = require("../../dsl/Workflow.js");
 const constants_js_1 = require("../../internal/constants.js");
-const supervisor_js_1 = require("../../internal/supervisor.js");
 const Issues_js_1 = require("../../issues/Issues.js");
 const MemoryKeyValueProvider_js_1 = require("../../kv/memory/MemoryKeyValueProvider.js");
 const NatsKeyValueProvider_js_1 = require("../../kv/nats/NatsKeyValueProvider.js");
 const ConsoleLogger_js_1 = require("../../observability/logging/ConsoleLogger.js");
 const PlatformApi_js_1 = require("../../services/platform/PlatformApi.js");
 const ObservableCompiler_js_1 = require("./ObservableCompiler.js");
-function getKVProvider() {
-    if (supervisor_js_1.enabled) {
+function getKVProvider(runLocal) {
+    if (runLocal) {
         return Promise.resolve(new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider());
     }
     return NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv();
@@ -64,7 +63,7 @@ function getKVProvider() {
  * ```
  */
 class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
+    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -101,12 +100,6 @@ class MemoryInterpreter {
             writable: true,
             value: cronRegistry
         });
-        Object.defineProperty(this, "webhookRegistry", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: webhookRegistry
-        });
         Object.defineProperty(this, "cnxFactory", {
             enumerable: true,
             configurable: true,
@@ -173,13 +166,6 @@ class MemoryInterpreter {
             writable: true,
             value: false
         });
-        // Workflow registration promises only used when supervisor is enabled
-        Object.defineProperty(this, "wfRegistration", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
         if (typeof this.log === 'undefined') {
             // this captures the old way of instantiating the MemoryInterpreter and provides an
             // error message back to the user to let them know they should use the new way.
@@ -187,7 +173,7 @@ class MemoryInterpreter {
         }
     }
     static async newInstance(options = {}) {
-        const log = options.logger || new ConsoleLogger_js_1.ConsoleLogger('debug');
+        const log = options.logger || new ConsoleLogger_js_1.ConsoleLogger();
         const compiler = options.compiler || new ObservableCompiler_js_1.ObservableCompiler();
         const serviceName = Deno.env.get(constants_js_1.envVarProjectId) || 'example-service';
         const environmentID = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
@@ -198,6 +184,7 @@ class MemoryInterpreter {
         const otelTracesURL = Deno.env.get(constants_js_1.envVarOtelTracesURL);
         let otelSDK;
         const configReader = configloader_js_1.VersoriConfigReader.fromEnv(log);
+        const runLocal = Deno.env.get(constants_js_1.envVarLocalRun) === 'true';
         await waitForReady(log);
         // Do NOT change those attributes, they are used by the API to filter on
         const resource = (0, resources_1.resourceFromAttributes)({
@@ -219,29 +206,20 @@ class MemoryInterpreter {
             log.info('Starting OpenTelemetry SDK');
             otelSDK.start();
         }
-        else if (supervisor_js_1.enabled) {
-            otelSDK = new sdk_node_1.NodeSDK({
-                traceExporter: new supervisor_js_1.Fake(),
-                serviceName: serviceName,
-                resource: resource,
-            });
-            log.info('Starting Testing OpenTelemetry SDK');
-            otelSDK.start();
-        }
         const tracer = api_1.default.trace.getTracer(serviceName, version);
         const connectionFactory = DirectConnectionFactory_js_1.DirectConnectionFactory.fromEnv(log);
         const issuesProvider = new Issues_js_1.IssueImpl(log);
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
-            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);
+            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);
         }
-        const kvp = await getKVProvider();
+        const kvp = await getKVProvider(runLocal);
         const platformApi = PlatformApi_js_1.PlatformApiImpl.fromEnv();
         const organisationId = Deno.env.get(constants_js_1.envVarOrgId) || 'development';
         const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
         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);
-        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);
+        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);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -251,7 +229,10 @@ class MemoryInterpreter {
         if (!(workflow instanceof Workflow_js_1.WorkflowImpl)) {
             throw new Error('workflow is not an instance of WorkflowImpl');
         }
-        this.log.info('MemoryInterpreter.register', { workflow });
+        const triggerName = 'id' in workflow.trigger && typeof workflow.trigger.id === 'string'
+            ? workflow.trigger.id
+            : workflow.trigger.constructor.name;
+        this.log.info('MemoryInterpreter.register', { workflow, triggerName });
         const compilerContext = {
             compiler: this.compiler,
             log: this.log,
@@ -260,7 +241,6 @@ class MemoryInterpreter {
             cnxFactory: this.cnxFactory,
             platformApi: PlatformApi_js_1.PlatformApiImpl.fromEnv(),
             webhookRouter: this.webhookRouter,
-            webhookRegistry: this.webhookRegistry,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
             configReader: this.cfgReader,
@@ -270,23 +250,21 @@ class MemoryInterpreter {
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);
         const registration = {
+            triggerName,
             trigger$,
             task$,
             localAbortController,
             sigintListener: () => {
-                this.log.info('Received SIGINT, shutting down workflow');
+                this.log.info('Received SIGINT, shutting down workflow', { triggerName });
                 localAbortController.abort();
             },
         };
         this.registeredWorkflows.push(registration);
-        if (supervisor_js_1.enabled) {
-            this.wfRegistration.push((0, supervisor_js_1.registerWorkflow)(workflow));
-        }
         return registration;
     }
-    async start() {
-        const port = Deno.env.get(constants_js_1.envPort) || 3000;
-        const cronPort = Deno.env.get(constants_js_1.envCronPort) || 3001;
+    start() {
+        const port = Deno.env.get('PORT') || 3000;
+        const cronPort = Deno.env.get('CRON_PORT') || 3001;
         const webhookApp = (0, express_1.default)();
         const cronApp = (0, express_1.default)();
         cronApp.use(express_1.default.json());
@@ -305,23 +283,22 @@ class MemoryInterpreter {
             Deno.addSignalListener('SIGINT', registration.sigintListener);
             registration.subscription = registration.trigger$
                 .pipe((0, rxjs_1.tap)((ctx) => {
-                ctx.log.info('MemoryInterpreter.executionStarted', { data: ctx.data });
+                ctx.log.info('MemoryInterpreter.executionStarted', {
+                    triggerName: registration.triggerName,
+                });
             }), (0, rxjs_1.mergeMap)((ctx) => (0, rxjs_1.of)(ctx).pipe(registration.task$, (0, rxjs_1.catchError)((err) => {
                 ctx.log.error('MemoryInterpreter.executionError', {
+                    triggerName: registration.triggerName,
                     error: err instanceof Error ? err.toString() : err,
                 });
-                this.tracer.startActiveSpan('done', (span) => {
-                    span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
-                    span.setAttribute('execution.id', ctx.executionId);
-                    span.setAttribute('result', 'fail');
-                    span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
-                    span.end();
-                });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
                 catch (err) {
-                    ctx.log.error('MemoryInterpreter.onError Error: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
+                    ctx.log.error('MemoryInterpreter.onError Error: failed to call onError handler', {
+                        triggerName: registration.triggerName,
+                        error: err instanceof Error ? err.toString() : err,
+                    });
                     ctx.options.onError?.(ctx.withData({
                         message: 'Internal server error',
                         error: err instanceof Error ? err.toString() : err,
@@ -333,20 +310,17 @@ class MemoryInterpreter {
                 next: (ctx) => {
                     const durationMs = Date.now() - ctx.startTime.getTime();
                     ctx.log.info('MemoryInterpreter.executionCompleted', {
+                        triggerName: registration.triggerName,
                         durationMs,
-                        data: ctx.data,
-                    });
-                    this.tracer.startActiveSpan('done', (span) => {
-                        span.setAttribute('execution.id', ctx.executionId);
-                        span.setAttribute('result', 'pass');
-                        span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
-                        span.end();
                     });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
                     catch (err) {
-                        ctx.log.error('MemoryInterpreter.onSuccessError: failed to call onSuccess handler', { error: err instanceof Error ? err.toString() : err });
+                        ctx.log.error('MemoryInterpreter.onSuccessError: failed to call onSuccess handler', {
+                            triggerName: registration.triggerName,
+                            error: err instanceof Error ? err.toString() : err,
+                        });
                         ctx.options.onSuccess?.(ctx.withData({
                             message: 'Internal server error',
                             error: err instanceof Error ? err.toString() : err,
@@ -356,12 +330,15 @@ class MemoryInterpreter {
                 },
                 error: (err) => {
                     this.log.error('MemoryInterpreter.error', {
+                        triggerName: registration.triggerName,
                         error: err instanceof Error ? err.toString() : err,
                     });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
-                    this.log.info('MemoryInterpreter.workflowCompleted');
+                    this.log.info('MemoryInterpreter.workflowCompleted', {
+                        triggerName: registration.triggerName,
+                    });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
             });
@@ -397,7 +374,6 @@ class MemoryInterpreter {
             if (this.cronServer) {
                 this.cronServer.close();
             }
-            this.otelSDK?.shutdown();
             // Remove all signal listeners
             for (const registration of this.registeredWorkflows) {
                 Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -414,10 +390,6 @@ class MemoryInterpreter {
             }
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
-        if (supervisor_js_1.enabled) {
-            await Promise.all(this.wfRegistration);
-            await (0, supervisor_js_1.signalReady)();
-        }
         return new Promise((resolve) => {
             let serversClosed = 0;
             const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;
@@ -455,7 +427,7 @@ class MemoryInterpreter {
 }
 exports.MemoryInterpreter = MemoryInterpreter;
 async function waitForReady(log) {
-    const readyCheckUrl = Deno.env.get(constants_js_1.envReadyCheckURL);
+    const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
     if (!readyCheckUrl) {
         return Promise.resolve();
     }

package/script/src/interpreter/memory/ObservableCompiler.d.ts

@@ -1,7 +1,6 @@
 import { Tracer } from '@opentelemetry/api';
 import { Router } from 'express';
 import { Observable, OperatorFunction } from 'rxjs';
-import { ConnectionFactory } from '../../connection/types.js';
 import { ContextImpl } from '../../context/Context.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ConfigReader } from '../../dsl/http/types.js';
@@ -11,6 +10,7 @@ import { IssueAPI } from '../../issues/Issues.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { PlatformApi } from '../../services/platform/PlatformApi.js';
 import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
+import { ConnectionFactory } from '../../connection/types.js';
 export type CompilerContext = {
     compiler: ObservableCompiler;
     log: Logger;
@@ -23,11 +23,6 @@ export type CompilerContext = {
     issueProvider: IssueAPI;
     configReader: ConfigReader;
     cronRegistry: Map<string, string>;
-    webhookRegistry: Map<string, {
-        method: string;
-        path: string;
-        options: any;
-    }>;
     organisationId: string;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: CompilerContext, task: T) => OperatorFunction<In, Out>;

package/script/src/interpreter/memory/ObservableCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/ObservableCompiler.ts"],"names":[],"mappings":"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"}
+{"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"}

package/script/src/interpreter/memory/compilers/catch.d.ts.map

@@ -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;AA0FnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
+{"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;AAoFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

package/script/src/interpreter/memory/compilers/catch.js

@@ -22,13 +22,9 @@ function compileCatch(compilerCtx, task) {
     return (src) => src.pipe((0, rxjs_1.mergeMap)((ctx) => {
         return baseOperator((0, rxjs_1.of)(ctx)).pipe((0, rxjs_1.catchError)((error) => {
             return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
-                // TODO: do we even want this here? Can't be async in here I believe
-                // await sendTaskStartEvent(task.id, span);
                 span.setAttribute('execution.id', ctx.executionId);
                 span.setAttribute('task.type', 'catch');
-                span.setAttribute('type', 'task');
                 if (error instanceof Error) {
-                    span.setAttribute('status', 'fail');
                     span.recordException(error);
                     span.setAttribute('error.message', error.message);
                     span.setAttribute('error.stack', error.stack ?? '');
@@ -41,7 +37,7 @@ function compileCatch(compilerCtx, task) {
                         annotations: {
                             'error': error.message,
                             'stack': error.stack || '',
-                            'workflowId': ctx.options.workflowId || ctx.workflowId || '',
+                            'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                             'executionId': ctx.executionId,
                             'activationId': ctx.activation.id,
                             'activationExternalId': ctx.activation?.user.externalId,
@@ -55,7 +51,7 @@ function compileCatch(compilerCtx, task) {
                     annotations: {
                         'error': error.message,
                         'stack': error.stack || '',
-                        'workflowId': ctx.options.workflowId || ctx.workflowId || '',
+                        'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                         'executionId': ctx.executionId,
                         'activationId': ctx.activation.id,
                         'activationExternalId': ctx.activation?.user.externalId,
@@ -66,7 +62,6 @@ function compileCatch(compilerCtx, task) {
                 ctx.log.error('execution has encountered an error', {
                     error: error,
                 });
-                span.setAttribute('status', 'fail');
                 span.setAttribute('error', `${error}`);
                 span.end();
                 return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));

package/script/src/interpreter/memory/compilers/fn.d.ts.map

@@ -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"}
+{"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"}

package/script/src/interpreter/memory/compilers/fn.js

@@ -1,43 +1,32 @@
 "use strict";
+/*
+ * Copyright (c) 2025 Versori Group Inc
+ *
+ * Use of this software is governed by the Business Source License 1.1
+ * included in the LICENSE file at the root of this repository.
+ *
+ * Change Date: 2029-01-01
+ * Change License: Apache License, Version 2.0
+ *
+ * As of the Change Date, in accordance with the Business Source License,
+ * use of this software will be governed by the Apache License, Version 2.0.
+ */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fnCompiler = void 0;
 const rxjs_1 = require("rxjs");
 const FnTask_js_1 = require("../../../dsl/tasks/FnTask.js");
-const supervisor_js_1 = require("../../../internal/supervisor.js");
 function compileFn(compilerCtx, task) {
-    return (src) => src.pipe((0, rxjs_1.mergeMap)(async (ctx) => {
+    return (src) => src.pipe((0, rxjs_1.tap)({
+        complete: () => compilerCtx.log.debug('fn.complete'),
+    }), (0, rxjs_1.mergeMap)(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
-            ctx = await (0, supervisor_js_1.sendTaskStartEvent)(task.id, ctx, span);
             span.setAttribute('task.id', task.id);
-            span.setAttribute('type', 'task');
-            span.setAttribute('task.type', 'fn');
             span.setAttribute('execution.id', ctx.executionId);
-            span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
             try {
-                let result;
-                const spanContext = span.spanContext();
-                const ctxWithLogger = ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
                 if (typeof ctx.idx === 'number') {
-                    result = ctx.withData(await task._fn(ctxWithLogger, ctx.idx));
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
                 }
-                else {
-                    result = ctx.withData(await task._fn(ctxWithLogger));
-                }
-                if (supervisor_js_1.enabled) {
-                    span.setAttribute('response.body', JSON.stringify(result.data));
-                }
-                span.setAttribute('status', 'pass');
-                return result;
-            }
-            catch (error) {
-                if (error instanceof Error) {
-                    span.setAttribute('status', 'fail');
-                    span.recordException(error);
-                }
-                else {
-                    span.recordException(new Error(String(error)));
-                }
-                throw error;
+                return ctx.withData(await task._fn(ctx));
             }
             finally {
                 span.end();

package/script/src/interpreter/memory/compilers/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/http.ts"],"names":[],"mappings":"AAqBA,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"}
+{"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"}

package/script/src/interpreter/memory/compilers/http.js

@@ -14,32 +14,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.httpCompiler = void 0;
 const rxjs_1 = require("rxjs");
+const operators_1 = require("rxjs/operators");
 const DynamicFetchFactory_js_1 = require("../../../connection/DynamicFetchFactory.js");
-const FetchBuilder_js_1 = require("../../../connection/internal/FetchBuilder.js");
 const StaticFetchFactory_js_1 = require("../../../connection/StaticFetchFactory.js");
 const HttpTask_js_1 = require("../../../dsl/tasks/HttpTask.js");
-const supervisor_js_1 = require("../../../internal/supervisor.js");
 function compileHttp(compilerCtx, task) {
     const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
     let fetchFactory;
     if (!cnxMap) {
-        compilerCtx.log.warn(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
-        if (supervisor_js_1.enabled) {
-            // missing connection map and we are in supervised mode, so we use the fake fetcher
-            fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
-        }
-        else {
-            // missing connection map and not in supervised mode, so we use global fetch
-            fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
-        }
+        compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
+        fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(globalThis.fetch));
     }
     else if (cnxMap.dynamic) {
-        if (cnxMap.mockWithAI) {
-            fetchFactory = Promise.resolve(new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).buildSupervisedFetch()));
-        }
-        else {
-            fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
-        }
+        fetchFactory = Promise.resolve(new DynamicFetchFactory_js_1.DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
     }
     else {
         fetchFactory = compilerCtx.platformApi.getConnection({
@@ -49,21 +36,8 @@ function compileHttp(compilerCtx, task) {
             },
             throwOnError: true,
         })
-            .then(({ data }) => {
-            if (cnxMap.mockWithAI) {
-                // use the fake fetcher that calls the supervisor to generate a mock reponse
-                return new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, data).buildSupervisedFetch());
-            }
-            return Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? ''])
-                .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
-        })
-            .catch((err) => {
-            compilerCtx.log.error(`Failed to get connection ${task.opts.connection}`, err);
-            if (supervisor_js_1.enabled) {
-                return new StaticFetchFactory_js_1.StaticFetchFactory(new FetchBuilder_js_1.FetchBuilder(globalThis.fetch, { name: task.opts.connection }).build());
-            }
-            throw err;
-        });
+            .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
+            .then(([fetcher, baseUrl]) => new StaticFetchFactory_js_1.StaticFetchFactory(fetcher, baseUrl));
     }
     async function http(ctx) {
         const [fetch, baseUrl] = await fetchFactory.then((ff) => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
@@ -71,27 +45,19 @@ function compileHttp(compilerCtx, task) {
         const result = await task.fn(httpContext);
         return ctx.withData(result);
     }
-    return (src) => src.pipe((0, rxjs_1.mergeMap)((ctx) => {
+    return (src) => src.pipe((0, operators_1.tap)({
+        complete: () => compilerCtx.log.debug('http.complete'),
+    }), (0, rxjs_1.mergeMap)((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
-            ctx = await (0, supervisor_js_1.sendTaskStartEvent)(task.id, ctx, span);
             span.setAttribute('task.id', task.id);
             span.setAttribute('task.type', 'http');
-            span.setAttribute('type', 'task');
             span.setAttribute('execution.id', ctx.executionId);
             span.setAttribute('connection.name', task.opts.connection);
-            span.setAttribute('workflow.id', ctx.options.workflowId || 'unknown-workflow');
-            const spanContext = span.spanContext();
             try {
-                const newCtx = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
-                if (supervisor_js_1.enabled) {
-                    span.setAttribute('response.body', JSON.stringify(newCtx.data));
-                }
-                span.setAttribute('status', 'pass');
-                return newCtx;
+                return await http(ctx);
             }
             catch (error) {
                 if (error instanceof Error) {
-                    span.setAttribute('status', 'fail');
                     span.recordException(error);
                 }
                 else {

package/script/src/interpreter/memory/compilers/schedule.d.ts.map

@@ -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;AA8M7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"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"}

package/script/src/interpreter/memory/compilers/schedule.js

@@ -14,9 +14,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scheduleCompiler = void 0;
 const rxjs_1 = require("rxjs");
+const constants_js_1 = require("../../../dsl/http/versori/constants.js");
 const ScheduleTrigger_js_1 = require("../../../dsl/triggers/ScheduleTrigger.js");
-const constants_js_1 = require("../../../internal/constants.js");
-const supervisor_js_1 = require("../../../internal/supervisor.js");
 function compileSchedule(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
         // Add HTTP endpoint for manual triggering
@@ -29,43 +28,8 @@ function compileSchedule(ctx, trigger, signal) {
         const orgId = Deno.env.get(constants_js_1.envVarOrgId) || 'example-org';
         const client = ctx.platformApi;
         ctx.cronRegistry.set(trigger.id, trigger.schedule);
-        async function handleSchedule(req, res, span) {
+        async function handleSchedule(_req, res, span) {
             try {
-                // run for a single activation
-                const activationId = req.params.activationId;
-                if (activationId) {
-                    const { data: activation } = await client.getActivation({
-                        path: {
-                            organisation_id: ctx.organisationId,
-                            environment_id: environmentId,
-                            activation_id: activationId,
-                        },
-                        throwOnError: false,
-                    });
-                    if (!activation) {
-                        res.status(412).json({
-                            status: 'error',
-                            message: `No activation found for ID: ${activationId}`,
-                        });
-                        return;
-                    }
-                    const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
-                    span.setAttribute('execution.id', executionCtx.executionId);
-                    await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, executionCtx, span);
-                    try {
-                        ctx.log.info(`Running schedule ${trigger.id} for activation ${activationId}`);
-                        subscriber.next(executionCtx);
-                    }
-                    catch (error) {
-                        executionCtx.log.error('execution error inside schedule', { error });
-                    }
-                    res.status(200).json({
-                        status: 'triggered',
-                        executionId: executionCtx.executionId,
-                    });
-                    return;
-                }
-                // run for static activation only
                 if (trigger.activationPredicate === undefined) {
                     const { data: activation } = await client.listActivations({
                         path: {
@@ -84,9 +48,8 @@ function compileSchedule(ctx, trigger, signal) {
                         });
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation[0], {}, { workflowId: trigger.id });
+                    const executionCtx = ctx.contextProvider.create(activation[0], {});
                     span.setAttribute('execution.id', executionCtx.executionId);
-                    await (0, supervisor_js_1.sendTaskStartEvent)(trigger.id, executionCtx, span);
                     try {
                         subscriber.next(executionCtx);
                     }
@@ -99,7 +62,6 @@ function compileSchedule(ctx, trigger, signal) {
                     });
                     return;
                 }
-                // run for all activations
                 const { data: activations } = await client.listActivations({
                     path: {
                         organisation_id: ctx.organisationId,
@@ -118,9 +80,8 @@ function compileSchedule(ctx, trigger, signal) {
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
+                    const executionCtx = ctx.contextProvider.create(activation, {});
                     try {
-                        ctx.log.info(`Running schedule ${trigger.id} for activation ${activation.id}`);
                         subscriber.next(executionCtx);
                     }
                     catch (error) {
@@ -138,29 +99,11 @@ function compileSchedule(ctx, trigger, signal) {
             await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
                 span.setAttribute('task.id', trigger.id);
                 span.setAttribute('task.type', 'schedule');
-                span.setAttribute('type', 'task');
-                span.setAttribute('schedule', trigger.schedule);
-                span.setAttribute('project.id', projectId);
-                span.setAttribute('environment.id', environmentId);
-                span.setAttribute('environment.name', environmentName);
-                span.setAttribute('org.id', orgId);
-                span.setAttribute('workflow.id', trigger.id);
-                await handleSchedule(req, res, span);
-                span.end();
-            });
-        });
-        ctx.cronRouter.post(`/cron/${trigger.id}/activations/:activationId`, async (req, res) => {
-            await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
-                span.setAttribute('task.id', trigger.id);
-                span.setAttribute('activation.id', req.params.activationId);
-                span.setAttribute('task.type', 'schedule');
-                span.setAttribute('type', 'task');
                 span.setAttribute('schedule', trigger.schedule);
                 span.setAttribute('project.id', projectId);
                 span.setAttribute('environment.id', environmentId);
                 span.setAttribute('environment.name', environmentName);
                 span.setAttribute('org.id', orgId);
-                span.setAttribute('workflow.id', trigger.id);
                 await handleSchedule(req, res, span);
                 span.end();
             });

package/script/src/interpreter/memory/compilers/webhook.d.ts.map

@@ -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,CAsUxE,CAAC"}
+{"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"}