@versori/run 0.3.0-veta.2 → 0.4.0-alpha.2

package/esm/src/interpreter/durable/Queue.d.ts

@@ -1,34 +1,26 @@
 import { Logger } from '../../observability/mod.js';
 export type WorkflowMsgMetadata = {
     parentWorkflowId?: string;
-    executionId: string;
-    activationId: string;
+    executionId?: string;
+    activationId?: string;
     userId?: string;
 };
 export type Workflows = {
-    workflows: Workflow[];
+    workflows: WorkflowMsg[];
 };
-export type Workflow = {
-    id: string;
-    projectId: string;
-    environmentId: string;
+export type WorkflowMsg = {
+    id?: string;
+    projectId?: string;
+    environmentId?: string;
     group: string;
-    payload: string;
+    payload?: string;
     output?: string;
     status?: 'available' | 'locked' | 'completed' | 'failed';
-    attempt: number;
-    maxAttempts?: number;
-    timeout: string;
-    createdAt: string;
-    metadata: WorkflowMsgMetadata;
-};
-export type SubmitWorkflow = {
-    group: string;
-    payload: string;
+    attempt?: number;
     maxAttempts?: number;
-    metadata: WorkflowMsgMetadata;
-    projectId?: string;
-    environmentId?: string;
+    timeout?: string;
+    createdAt?: string;
+    metadata?: WorkflowMsgMetadata;
 };
 export type CompleteWorkflowRequest = {
     id: string;
@@ -47,14 +39,14 @@ export type RescheduleWorkflowRequest = {
     after: string;
 };
 export type SubmitWorkflowsRequest = {
-    workflows: SubmitWorkflow[];
+    workflows: WorkflowMsg[];
 };
 export interface QueueAPI {
     complete(request: CompleteWorkflowRequest): Promise<void>;
     submit(request: SubmitWorkflowsRequest): Promise<Workflows>;
     fetchWorkflows(request: FetchWorkflowsRequest): Promise<Workflows | undefined>;
     reschedule(request: RescheduleWorkflowRequest): Promise<void>;
-    getWorkflow(workflowId: string): Promise<Workflow>;
+    poll(workflowId: string): Promise<WorkflowMsg>;
 }
 export declare class QueueImpl implements QueueAPI {
     private baseUrl;
@@ -67,7 +59,7 @@ export declare class QueueImpl implements QueueAPI {
     submit(request: SubmitWorkflowsRequest): Promise<Workflows>;
     fetchWorkflows(request: FetchWorkflowsRequest): Promise<Workflows | undefined>;
     reschedule(request: RescheduleWorkflowRequest): Promise<void>;
-    getWorkflow(workflowId: string): Promise<Workflow>;
+    poll(workflowId: string): Promise<WorkflowMsg>;
 }
 export declare class MockQueue implements QueueAPI {
     constructor();
@@ -75,6 +67,6 @@ export declare class MockQueue implements QueueAPI {
     submit(_request: SubmitWorkflowsRequest): Promise<Workflows>;
     fetchWorkflows(_request: FetchWorkflowsRequest): Promise<Workflows | undefined>;
     reschedule(_request: RescheduleWorkflowRequest): Promise<void>;
-    getWorkflow(_workflowId: string): Promise<Workflow>;
+    poll(_workflowId: string): Promise<WorkflowMsg>;
 }
 //# sourceMappingURL=Queue.d.ts.map

package/esm/src/interpreter/durable/Queue.d.ts.map

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

package/esm/src/interpreter/durable/Queue.js

@@ -1,4 +1,4 @@
-import { envVarEnvId, envVarProjectId, envVarSDKApiBaseURL, } from '../../dsl/http/versori/constants.js';
+import { envVarEnvId, envVarProjectId, envVarSDKApiBaseURL, } from '../../internal/constants.js';
 import { ConsoleLogger } from '../../mod.js';
 export class QueueImpl {
     constructor(baseUrl, projectId, environmentId, log) {
@@ -57,7 +57,7 @@ export class QueueImpl {
                 output: request.output,
                 status: request.status,
             });
-            throw new Error(await resp.text());
+            throw new Error('Failed to complete workflow');
         }
         return;
     }
@@ -130,7 +130,8 @@ export class QueueImpl {
         }
         return;
     }
-    async getWorkflow(workflowId) {
+    async poll(workflowId) {
+        // this endpoint returns a 404 if the workflow is not completed
         const resp = await fetch(`${this.baseUrl}/v1/workflows/fetch/${workflowId}`, {
             method: 'GET',
         });
@@ -157,7 +158,7 @@ export class MockQueue {
     reschedule(_request) {
         throw new Error('Method not implemented.');
     }
-    getWorkflow(_workflowId) {
+    poll(_workflowId) {
         throw new Error('Method not implemented.');
     }
 }

package/esm/src/interpreter/durable/compilers/catch.d.ts.map

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

@@ -10,6 +10,7 @@ function compileCatch(compilerCtx, task) {
                 return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
                     span.setAttribute('execution.id', ctx.executionId);
                     span.setAttribute('task.type', 'catch');
+                    span.setAttribute('type', 'task');
                     if (error instanceof Error) {
                         span.recordException(error);
                         span.setAttribute('error.message', error.message);
@@ -23,7 +24,7 @@ function compileCatch(compilerCtx, task) {
                             annotations: {
                                 'error': error.message,
                                 'stack': error.stack || '',
-                                'workflowId': ctx.options.workflow?.id || ctx.workflow?.id ||
+                                'workflowId': ctx.options.workflowId || ctx.workflowId ||
                                     '',
                                 'executionId': ctx.executionId,
                             },
@@ -39,7 +40,7 @@ function compileCatch(compilerCtx, task) {
                         annotations: {
                             'error': error.message || '',
                             'stack': error.stack || '',
-                            'workflowId': ctx.options.workflow?.id || ctx.workflow?.id ||
+                            'workflowId': ctx.options.workflowId || ctx.workflowId ||
                                 '',
                             'executionId': ctx.executionId,
                         },

package/esm/src/interpreter/durable/compilers/durableworkflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/durableworkflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAW,WAAW,EAAE,MAAM,iBAAiB,CAAC;AACvD,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAK3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CA8F9C;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAIhG,CAAC"}
+{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/durableworkflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAmG9C;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAIhG,CAAC"}

package/esm/src/interpreter/durable/compilers/durableworkflow.js

@@ -1,7 +1,6 @@
 import { Observable } from 'rxjs';
 import { DurableWorkflowTrigger, } from '../../../dsl/triggers/DurableTrigger.js';
 import { envVarEnvId } from '../../../internal/constants.js';
-import { ulid } from '../../../../deps/jsr.io/@std/ulid/1.0.0/mod.js';
 export function compileDurableWorkflow(ctx, trigger, signal) {
     return new Observable((subscriber) => {
         function cleanup() {
@@ -36,9 +35,24 @@ export function compileDurableWorkflow(ctx, trigger, signal) {
                         continue;
                     }
                     for (const wf of wfs.workflows) {
+                        if (wf.id &&
+                            wf.attempt !== undefined &&
+                            trigger.options.maxAttempts &&
+                            wf.attempt > trigger.options.maxAttempts) {
+                            ctx.log.error('Workflow exceeded max attempts failing', {
+                                workflowId: wf.id,
+                                attempts: wf.attempt,
+                            });
+                            await ctx.queueProvider.complete({
+                                id: wf.id,
+                                output: wf.output,
+                                status: 'failed',
+                            });
+                            continue;
+                        }
                         const data = JSON.parse(atob(wf.payload ?? '{}'));
                         let activation;
-                        try {
+                        if (wf.metadata?.activationId) {
                             const { data } = await ctx.platformApi.getActivation({
                                 path: {
                                     activation_id: wf.metadata.activationId,
@@ -49,23 +63,9 @@ export function compileDurableWorkflow(ctx, trigger, signal) {
                             });
                             activation = data;
                         }
-                        catch (error) {
-                            ctx.log.error('Failed to get activation', { error });
-                            throw new Error('Failed to get activation');
-                        }
-                        const newContext = ctx.contextProvider.createWithExecutionId(activation, data, wf.metadata.executionId ?? ulid().toString(), {
-                            workflow: wf,
-                            onSuccess: (completedContext) => {
-                                // locked status means we own the workflow and it's not completed yet
-                                if (wf.status !== 'locked') {
-                                    return;
-                                }
-                                ctx.queueProvider.complete({
-                                    id: wf.id,
-                                    output: btoa(JSON.stringify(completedContext.data)),
-                                    status: 'completed',
-                                });
-                            },
+                        const newContext = ctx.contextProvider.create(data, {
+                            activation: activation,
+                            workflowId: wf.id,
                         });
                         consecutiveErrors = 0;
                         subscriber.next(newContext);

package/esm/src/interpreter/durable/compilers/fn.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA4BnE,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/durable/compilers/fn.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAGtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAwCnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

package/esm/src/interpreter/durable/compilers/fn.js

@@ -1,18 +1,31 @@
 import { mergeMap, tap } from 'rxjs';
 import { FnTask } from '../../../dsl/tasks/FnTask.js';
+import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileFn(compilerCtx, task) {
     return (src) => src.pipe(tap({
         complete: () => compilerCtx.log.debug('fn.complete')
     }), mergeMap(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
+            span.setAttribute('type', 'task');
+            span.setAttribute('task.type', 'fn');
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                let result;
+                if (typeof ctx.idx === 'number') {
+                    result = ctx.withData(await task._fn(ctx, ctx.idx));
+                }
+                else {
+                    result = ctx.withData(await task._fn(ctx));
+                }
+                if (supervisorEnabled) {
+                    span.setAttribute('response.body', JSON.stringify(result.data));
+                }
+                return result;
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

package/esm/src/interpreter/durable/compilers/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoFnE,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/durable/compilers/http.ts"],"names":[],"mappings":"AAOA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAG/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"}

package/esm/src/interpreter/durable/compilers/http.js

@@ -1,8 +1,9 @@
 import { mergeMap } from 'rxjs';
 import { tap } from 'rxjs/operators';
-import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
 import { DynamicFetchFactory } from '../../../connection/DynamicFetchFactory.js';
 import { StaticFetchFactory } from '../../../connection/StaticFetchFactory.js';
+import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
+import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileHttp(compilerCtx, task) {
     const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
     let fetchFactory;
@@ -36,10 +37,15 @@ function compileHttp(compilerCtx, task) {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (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);
             try {
-                return await http(ctx);
+                let result = await http(ctx);
+                if (supervisorEnabled) {
+                    span.setAttribute('http.response.body', JSON.stringify(result.data));
+                }
+                return result;
             }
             catch (error) {
                 if (error instanceof Error) {

package/esm/src/interpreter/durable/compilers/schedule.d.ts.map

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

package/esm/src/interpreter/durable/compilers/schedule.js

@@ -1,6 +1,6 @@
 import { Observable } from 'rxjs';
-import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarProjectId, } from '../../../dsl/http/versori/constants.js';
 import { ScheduleTrigger } from '../../../dsl/triggers/ScheduleTrigger.js';
+import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarProjectId, } from '../../../internal/constants.js';
 function compileSchedule(ctx, trigger, signal) {
     return new Observable((subscriber) => {
         // Add HTTP endpoint for manual triggering
@@ -91,6 +91,7 @@ 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);

package/esm/src/interpreter/durable/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,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,CAuSxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAcA,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"}

package/esm/src/interpreter/durable/compilers/webhook.js

@@ -1,11 +1,11 @@
 import cors from 'cors';
 import express from 'express';
+import xmlparser from 'express-xml-bodyparser';
 import { pipeline } from 'node:stream/promises';
 import { Observable } from 'rxjs';
 import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
 import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
 import { envVarEnvId } from '../../../internal/constants.js';
-import xmlparser from 'express-xml-bodyparser';
 const xml2jsDefaults = {
     explicitArray: false,
     normalize: false,
@@ -119,6 +119,7 @@ export const webhookCompiler = {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
+                    span.setAttribute('task.type', 'fn');
                     const staticActivation = res.locals.activation;
                     const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
@@ -155,6 +156,7 @@ export const webhookCompiler = {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
+                    span.setAttribute('type', 'task');
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.userId;
                     const activation = res.locals.activation;
@@ -210,6 +212,7 @@ export const webhookCompiler = {
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
+                    span.setAttribute('type', 'task');
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
                     const activation = res.locals.activation;

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts

@@ -2,6 +2,7 @@ import { Tracer } from '@opentelemetry/api';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import { Router } from 'express';
 import { Observable, Subscription } from 'rxjs';
+import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ConfigReader, CronProvider } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
@@ -9,7 +10,6 @@ import { IssueAPI } from '../../issues/Issues.js';
 import { ContextImpl, ContextOperatorFunction } from '../../mod.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
-import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 export type MemoryInterpreterOptions = {
     logger?: Logger;
     compiler?: ObservableCompiler;
@@ -24,6 +24,11 @@ type Registration = {
     sigintListener: () => void;
     subscription?: Subscription;
 };
+type WebhookRegistry = Map<string, {
+    method: string;
+    path: string;
+    options: any;
+}>;
 export declare class MemoryInterpreter {
     private readonly log;
     private readonly compiler;
@@ -31,6 +36,7 @@ export declare class MemoryInterpreter {
     private readonly webhookRouter;
     private readonly cronRouter;
     private cronRegistry;
+    private webhookRegistry;
     private readonly cnxFactory;
     private readonly cronProvider;
     private readonly tracer;
@@ -42,7 +48,7 @@ export declare class MemoryInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
-    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);
+    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);
     static newInstance(options?: MemoryInterpreterOptions): Promise<MemoryInterpreter>;
     register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): Registration;
     start(): Promise<void>;

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts.map

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

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

@@ -4,31 +4,32 @@ import { resourceFromAttributes } from '@opentelemetry/resources';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import express from 'express';
 import { catchError, EMPTY, mergeMap, of, tap } from 'rxjs';
+import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextProviderImpl } from '../../context/ContextProvider.js';
 import { DefaultRoundTripperFactory } from '../../dsl/http/default.js';
 import { VersoriConfigReader } from '../../dsl/http/versori/configloader.js';
-import { envVarEnvId, envVarEnvironmentName, envVarLocalRun, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarVersion, } from '../../dsl/http/versori/constants.js';
 import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
 import { WorkflowImpl } from '../../dsl/Workflow.js';
+import { envCronPort, envPort, envReadyCheckURL, envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarVersion, } from '../../internal/constants.js';
+import { Fake, registerCrons, registerWebhooks, enabled as supervisorEnabled } from '../../internal/supervisor.js';
 import { IssueImpl } from '../../issues/Issues.js';
 import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
 import { NatsKeyValueProvider } from '../../kv/nats/NatsKeyValueProvider.js';
 import { ConsoleLogger } from '../../observability/logging/ConsoleLogger.js';
-import { ObservableCompiler } from './ObservableCompiler.js';
 import { PlatformApiImpl } from '../../services/platform/PlatformApi.js';
-import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
-function getKVProvider(runLocal) {
-    if (runLocal) {
+import { ObservableCompiler } from './ObservableCompiler.js';
+function getKVProvider() {
+    if (supervisorEnabled) {
         return Promise.resolve(new MemoryKeyValueProvider());
     }
     return NatsKeyValueProvider.fromEnv();
 }
-function getRoundTripperFactory(log, tracer, opts) {
+function getRoundTripperFactory(log) {
     log.info('Running with default round tripper factory');
     return new DefaultRoundTripperFactory();
 }
 export class MemoryInterpreter {
-    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
+    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, cnxFactory, cronProvider, tracer, issuesProvider, cfgReader, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -65,6 +66,12 @@ export 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,
@@ -149,7 +156,6 @@ export class MemoryInterpreter {
         const otelTracesURL = Deno.env.get(envVarOtelTracesURL);
         let otelSDK;
         const configReader = VersoriConfigReader.fromEnv(log);
-        const runLocal = Deno.env.get(envVarLocalRun) === 'true';
         await waitForReady(log);
         // Do NOT change those attributes, they are used by the API to filter on
         const resource = resourceFromAttributes({
@@ -171,23 +177,29 @@ export class MemoryInterpreter {
             log.info('Starting OpenTelemetry SDK');
             otelSDK.start();
         }
+        else if (supervisorEnabled) {
+            otelSDK = new NodeSDK({
+                traceExporter: new Fake(),
+                serviceName: serviceName,
+                resource: resource,
+            });
+            log.info('Starting Testing OpenTelemetry SDK');
+            otelSDK.start();
+        }
         const tracer = opentelemetry.trace.getTracer(serviceName, version);
-        const roundTripperFactory = getRoundTripperFactory(log, tracer, {
-            skipVersoriCredentials: options.skipVersoriCredentials,
-            runLocal: runLocal,
-        });
+        const roundTripperFactory = getRoundTripperFactory(log);
         const issuesProvider = new 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.Router(), express.Router(), new Map(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+            return new MemoryInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), new Map(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
         }
-        const kvp = await getKVProvider(runLocal);
+        const kvp = await getKVProvider();
         const platformApi = PlatformApiImpl.fromEnv();
         const organisationId = Deno.env.get(envVarOrgId) || 'development';
         const environmentId = Deno.env.get(envVarEnvId) || 'development';
         const ctxProvider = new ContextProviderImpl(log, kvp, roundTripperFactory.credentials(), platformApi, organisationId, environmentId, issuesProvider);
-        return new MemoryInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
+        return new MemoryInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), new Map(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -206,6 +218,7 @@ export class MemoryInterpreter {
             cnxFactory: this.cnxFactory,
             platformApi: PlatformApiImpl.fromEnv(),
             webhookRouter: this.webhookRouter,
+            webhookRegistry: this.webhookRegistry,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
             configReader: this.cfgReader,
@@ -227,8 +240,8 @@ export class MemoryInterpreter {
         return registration;
     }
     async start() {
-        const port = Deno.env.get('PORT') || 3000;
-        const cronPort = Deno.env.get('CRON_PORT') || 3001;
+        const port = Deno.env.get(envPort) || 3000;
+        const cronPort = Deno.env.get(envCronPort) || 3001;
         const webhookApp = express();
         const cronApp = express();
         cronApp.use(express.json());
@@ -252,6 +265,12 @@ export class MemoryInterpreter {
                 ctx.log.error('MemoryInterpreter.executionError', {
                     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.end();
+                });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
@@ -271,6 +290,11 @@ export class MemoryInterpreter {
                         durationMs,
                         data: ctx.data,
                     });
+                    this.tracer.startActiveSpan('done', (span) => {
+                        span.setAttribute('execution.id', ctx.executionId);
+                        span.setAttribute('result', 'pass');
+                        span.end();
+                    });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
@@ -307,6 +331,9 @@ export class MemoryInterpreter {
             });
             throw new Error('Unable to register scheduler tasks with central cron provider');
         }
+        // register with suopervisor
+        await registerCrons(this.cronRegistry);
+        await registerWebhooks(this.webhookRegistry);
         this.webhookServer = webhookApp.listen(port, () => {
             this.log.info(`Express server listening on port ${port}`);
         });
@@ -326,6 +353,7 @@ export 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);
@@ -377,7 +405,7 @@ export class MemoryInterpreter {
     }
 }
 async function waitForReady(log) {
-    const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
+    const readyCheckUrl = Deno.env.get(envReadyCheckURL);
     if (!readyCheckUrl) {
         return Promise.resolve();
     }

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

@@ -1,6 +1,7 @@
 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';
@@ -10,7 +11,6 @@ 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,6 +23,11 @@ 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>;