@versori/run 0.5.0-alpha.3 → 0.5.0-alpha.5

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

@@ -11,12 +11,11 @@
  * use of this software will be governed by the Apache License, Version 2.0.
  */
 import { mergeMap } from 'rxjs';
-import { tap } from 'rxjs/operators';
 import { DynamicFetchFactory } from '../../../connection/DynamicFetchFactory.js';
 import { FetchBuilder } from '../../../connection/internal/FetchBuilder.js';
 import { StaticFetchFactory } from '../../../connection/StaticFetchFactory.js';
 import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
-import { enabled as supervisorEnabled } from '../../../internal/supervisor.js';
+import { sendTaskStartEvent, enabled as supervisorEnabled } from '../../../internal/supervisor.js';
 function compileHttp(compilerCtx, task) {
     const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
     let fetchFactory;
@@ -69,25 +68,27 @@ function compileHttp(compilerCtx, task) {
         const result = await task.fn(httpContext);
         return ctx.withData(result);
     }
-    return (src) => src.pipe(tap({
-        complete: () => compilerCtx.log.debug('http.complete'),
-    }), mergeMap((ctx) => {
+    return (src) => src.pipe(mergeMap((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
+            await 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 result = await http(ctx.withLogger(ctx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId })));
                 if (supervisorEnabled) {
                     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 {

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":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAmJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/schedule.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqJ7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

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

@@ -52,7 +52,7 @@ function compileSchedule(ctx, trigger, signal) {
                         });
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation[0], {});
+                    const executionCtx = ctx.contextProvider.create(activation[0], {}, { workflowId: trigger.id });
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -84,7 +84,7 @@ function compileSchedule(ctx, trigger, signal) {
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(activation, {});
+                    const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
                     try {
                         subscriber.next(executionCtx);
                     }

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":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAwTxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AA2BA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2TxE,CAAC"}

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

@@ -84,6 +84,7 @@ export const webhookCompiler = {
             onError = trigger.options.response.onError;
         }
         const ctxOptionsFn = (req, res) => ({
+            workflowId: trigger.id,
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -108,8 +109,10 @@ export const webhookCompiler = {
             if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
             }
-            // add the webhook endpoint to the router
-            ctx.log.info('webhook endpoint added:', { trigger });
+            ctx.log.info('webhook endpoint added', {
+                id: trigger.id,
+                method,
+            });
             if (corsOptions) {
                 if (typeof corsOptions === 'boolean') {
                     ctx.webhookRouter.use(cors());

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

@@ -88,6 +88,7 @@ export declare class MemoryInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
+    private wfRegistration;
     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;

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

@@ -23,7 +23,7 @@ import { VersoriConfigReader } from '../../dsl/http/versori/configloader.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 { Fake, registerWorkflow, signalReady, 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';
@@ -167,6 +167,13 @@ export 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.
@@ -266,6 +273,9 @@ export class MemoryInterpreter {
             },
         };
         this.registeredWorkflows.push(registration);
+        if (supervisorEnabled) {
+            this.wfRegistration.push(registerWorkflow(workflow));
+        }
         return registration;
     }
     async start() {
@@ -298,6 +308,7 @@ export class MemoryInterpreter {
                     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 {
@@ -322,6 +333,7 @@ export class MemoryInterpreter {
                     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 {
@@ -360,9 +372,6 @@ 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}`);
         });
@@ -399,6 +408,10 @@ export class MemoryInterpreter {
             }
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
+        if (supervisorEnabled) {
+            await Promise.all(this.wfRegistration);
+            await signalReady();
+        }
         return new Promise((resolve) => {
             let serversClosed = 0;
             const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;

package/esm/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;AAwFnE,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;AA0FnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

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

@@ -25,6 +25,7 @@ function compileCatch(compilerCtx, task) {
                 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 ?? '');
@@ -62,6 +63,7 @@ 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(of(ctx.withData(new ExecutionError(ctx, `${error}`, { cause: error }))));

package/esm/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;AA6CnE,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;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"}

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

@@ -1,16 +1,15 @@
-import { mergeMap, tap } from 'rxjs';
+import { mergeMap } from 'rxjs';
 import { FnTask } from '../../../dsl/tasks/FnTask.js';
 import { sendTaskStartEvent, 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 (src) => src.pipe(mergeMap(async (ctx) => {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
-            await sendTaskStartEvent(task.id, span);
+            ctx = await 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();
@@ -24,8 +23,19 @@ function compileFn(compilerCtx, task) {
                 if (supervisorEnabled) {
                     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;
+            }
             finally {
                 span.end();
             }

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

@@ -11,7 +11,6 @@
  * use of this software will be governed by the Apache License, Version 2.0.
  */
 import { mergeMap } from 'rxjs';
-import { tap } from 'rxjs/operators';
 import { DynamicFetchFactory } from '../../../connection/DynamicFetchFactory.js';
 import { FetchBuilder } from '../../../connection/internal/FetchBuilder.js';
 import { StaticFetchFactory } from '../../../connection/StaticFetchFactory.js';
@@ -69,26 +68,27 @@ function compileHttp(compilerCtx, task) {
         const result = await task.fn(httpContext);
         return ctx.withData(result);
     }
-    return (src) => src.pipe(tap({
-        complete: () => compilerCtx.log.debug('http.complete'),
-    }), mergeMap((ctx) => {
+    return (src) => src.pipe(mergeMap((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
-            await sendTaskStartEvent(task.id, span);
+            ctx = await 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 (supervisorEnabled) {
                     span.setAttribute('response.body', JSON.stringify(newCtx.data));
                 }
+                span.setAttribute('status', 'pass');
                 return newCtx;
             }
             catch (error) {
                 if (error instanceof Error) {
+                    span.setAttribute('status', 'fail');
                     span.recordException(error);
                 }
                 else {

package/esm/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;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA4I7C,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":"AAiBA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAQzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+I7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

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

@@ -46,8 +46,9 @@ function compileSchedule(ctx, trigger, signal) {
                         });
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(activation[0], {});
+                    const executionCtx = ctx.contextProvider.create(activation[0], {}, { workflowId: trigger.id });
                     span.setAttribute('execution.id', executionCtx.executionId);
+                    await sendTaskStartEvent(trigger.id, executionCtx, span);
                     try {
                         subscriber.next(executionCtx);
                     }
@@ -78,7 +79,7 @@ function compileSchedule(ctx, trigger, signal) {
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(activation, {});
+                    const executionCtx = ctx.contextProvider.create(activation, {}, { workflowId: trigger.id });
                     try {
                         subscriber.next(executionCtx);
                     }
@@ -95,7 +96,6 @@ function compileSchedule(ctx, trigger, signal) {
         }
         ctx.cronRouter.post(`/cron/${trigger.id}`, async (req, res) => {
             await ctx.tracer.startActiveSpan(`schedule-${trigger.id}`, async (span) => {
-                await sendTaskStartEvent(trigger.id, span);
                 span.setAttribute('task.id', trigger.id);
                 span.setAttribute('task.type', 'schedule');
                 span.setAttribute('type', 'task');
@@ -104,6 +104,7 @@ function compileSchedule(ctx, trigger, signal) {
                 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/esm/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;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAkUxE,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;AAItF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAsUxE,CAAC"}

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

@@ -85,6 +85,7 @@ export const webhookCompiler = {
             onError = trigger.options.response.onError;
         }
         const ctxOptionsFn = (req, res) => ({
+            workflowId: trigger.id,
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -108,8 +109,10 @@ export const webhookCompiler = {
             if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
             }
-            // add the webhook endpoint to the router
-            ctx.log.info('webhook endpoint added:', { trigger });
+            ctx.log.info('webhook endpoint added', {
+                id: trigger.id,
+                method,
+            });
             if (corsOptions) {
                 if (typeof corsOptions === 'boolean') {
                     ctx.webhookRouter.use(cors());
@@ -131,16 +134,16 @@ export const webhookCompiler = {
                 log: ctx.log,
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
-                    await sendTaskStartEvent(trigger.id, span);
                     span.setAttribute('task.id', trigger.id);
+                    span.setAttribute('workflow.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('type', 'task');
                     const staticActivation = res.locals.activation;
                     let executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
                     const spanContext = span.spanContext();
                     executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
-                    executionCtx.log.info("stack", { stack: new Error().stack });
                     span.setAttribute('execution.id', executionCtx.executionId);
+                    await sendTaskStartEvent(trigger.id, executionCtx, span);
                     try {
                         subscriber.next(executionCtx);
                         if (isAsync) {
@@ -172,8 +175,8 @@ export const webhookCompiler = {
                 log: ctx.log,
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
-                    await sendTaskStartEvent(trigger.id, span);
                     span.setAttribute('task.id', trigger.id);
+                    span.setAttribute('workflow.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('type', 'task');
                     span.setAttribute('user.id', req.params.userId);
@@ -193,6 +196,7 @@ export const webhookCompiler = {
                         return;
                     }
                     let executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
+                    await sendTaskStartEvent(trigger.id, executionCtx, span);
                     const spanContext = span.spanContext();
                     executionCtx = executionCtx.withLogger(executionCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
                     span.setAttribute('execution.id', executionCtx.executionId);
@@ -232,8 +236,8 @@ export const webhookCompiler = {
                 log: ctx.log,
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
-                    await sendTaskStartEvent(trigger.id, span);
                     span.setAttribute('task.id', trigger.id);
+                    span.setAttribute('workflow.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('type', 'task');
                     span.setAttribute('activation.id', req.params.activationId);
@@ -254,6 +258,7 @@ export const webhookCompiler = {
                     const spanContext = span.spanContext();
                     activationCtx = activationCtx.withLogger(activationCtx.log.child({ spanId: spanContext.spanId, traceId: spanContext.traceId }));
                     span.setAttribute('execution.id', activationCtx.executionId);
+                    await sendTaskStartEvent(trigger.id, activationCtx, span);
                     try {
                         subscriber.next(activationCtx);
                         if (isAsync) {

package/esm/src/issues/Issues.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Issues.d.ts","sourceRoot":"","sources":["../../../src/src/issues/Issues.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC3B,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACrB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QACtC,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAC7B;AAED,qBAAa,SAAU,YAAW,QAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IAExC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,MAAM;IA2BjB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QACtC,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;YAWX,MAAM;CA2DvB;AAED,qBAAa,UAAW,YAAW,QAAQ;IACvC,WAAW,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE;QACnC,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAG5B"}
+{"version":3,"file":"Issues.d.ts","sourceRoot":"","sources":["../../../src/src/issues/Issues.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,MAAM,EAAE,MAAM,yBAAyB,CAAC;AAEjD,MAAM,MAAM,WAAW,GAAG;IACtB,MAAM,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC3B,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACnC,CAAC;AAEF,MAAM,MAAM,KAAK,GAAG;IAChB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACpC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC/B,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAC;IAC1B,gBAAgB,EAAE,MAAM,GAAG,IAAI,CAAC;IAChC,aAAa,EAAE,MAAM,CAAC;IACtB,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF,MAAM,WAAW,QAAQ;IACrB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAE/C,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QACtC,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;CAC7B;AAED,qBAAa,SAAU,YAAW,QAAQ;IACtC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAS;IACjC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAS;IACnC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAS;IACvC,OAAO,CAAC,QAAQ,CAAC,cAAc,CAAS;IAExC,OAAO,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAS;IAC3C,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAS;IAClC,OAAO,CAAC,GAAG,CAAS;gBAER,GAAG,EAAE,MAAM;IA2BjB,WAAW,CAAC,KAAK,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAQpD,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QACtC,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;YAWX,MAAM;CAiEvB;AAED,qBAAa,UAAW,YAAW,QAAQ;IACvC,WAAW,CAAC,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,CAAC,CAAC,EAAE,WAAW,EAAE,QAAQ,CAAC,EAAE;QACnC,WAAW,CAAC,EAAE,OAAO,CAAC;QACtB,cAAc,CAAC,EAAE,MAAM,CAAC;KAC3B,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;CAG5B"}

package/esm/src/issues/Issues.js

@@ -12,6 +12,7 @@
  */
 import { createHash } from 'node:crypto';
 import { envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarProjectId, envVarSDKApiBaseURL, envVarVersion, } from '../internal/constants.js';
+import { enabled as supervisorEnabled } from '../internal/supervisor.js';
 export class IssueImpl {
     constructor(log) {
         Object.defineProperty(this, "baseUrl", {
@@ -107,6 +108,10 @@ export class IssueImpl {
         issue.annotations['environmentId'] = this.environmentId;
         issue.annotations['organisationId'] = this.organisationId;
         try {
+            if (supervisorEnabled) {
+                this.log.info('Issue to be submitted', { issue: issue });
+                return Promise.resolve(null);
+            }
             const response = await fetch(`${this.baseUrl}/v1/issues/submit`, {
                 method: 'POST',
                 headers: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@versori/run",
-  "version": "0.5.0-alpha.3",
+  "version": "0.5.0-alpha.5",
   "description": "Versori Run",
   "homepage": "https://github.com/versori/versori-run#readme",
   "repository": {

package/script/src/connection/internal/FetchBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FetchBuilder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/FetchBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAA;AAED;;;;GAIG;AACH,qBAAa,YAAY;;IACrB,WAAW,EAAE,kBAAkB,EAAE,CAAC;gBAMtB,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe;IAalD,GAAG,CAAC,EAAE,EAAE,kBAAkB;IAI1B,KAAK,IAAI,SAAS;IAalB,oBAAoB,IAAI,SAAS;IAOjC,OAAO,CAAC,eAAe;IAiBvB,OAAO,CAAC,eAAe;CAyE1B"}
+{"version":3,"file":"FetchBuilder.d.ts","sourceRoot":"","sources":["../../../../src/src/connection/internal/FetchBuilder.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAE5D,MAAM,MAAM,eAAe,GAAG;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF;;;;GAIG;AACH,qBAAa,YAAY;;IACrB,WAAW,EAAE,kBAAkB,EAAE,CAAC;gBAMtB,KAAK,EAAE,SAAS,EAAE,GAAG,EAAE,eAAe;IAelD,GAAG,CAAC,EAAE,EAAE,kBAAkB;IAI1B,KAAK,IAAI,SAAS;IAYlB,oBAAoB,IAAI,SAAS;IAOjC,OAAO,CAAC,eAAe;IAevB,OAAO,CAAC,eAAe;CAyF1B"}

package/script/src/connection/internal/FetchBuilder.js

@@ -70,11 +70,12 @@ class FetchBuilder {
         __classPrivateFieldSet(this, _FetchBuilder_base, fetch, "f");
         __classPrivateFieldSet(this, _FetchBuilder_cnx, cnx, "f");
         __classPrivateFieldSet(this, _FetchBuilder_tracer, api_1.default.trace.getTracer('fetch-builder', '1.0.0'), "f");
+        const traceMiddleware = this.wrapWithTracing.bind(this);
         if (cnx.baseUrl) {
-            this.middlewares = [changeRequestbaseURLMiddleware(cnx)];
+            this.middlewares = [changeRequestbaseURLMiddleware(cnx), traceMiddleware];
         }
         else {
-            this.middlewares = [];
+            this.middlewares = [traceMiddleware];
         }
         this.supervisedFetch = this.supervisedFetch.bind(this);
     }
@@ -88,15 +89,14 @@ class FetchBuilder {
             // order they were added
             fetch = this.middlewares[i](fetch);
         }
-        // Wrap the final fetch with OpenTelemetry tracing
-        return this.wrapWithTracing(fetch, false);
+        return fetch;
     }
     buildSupervisedFetch() {
         return this.supervisedFetch();
     }
     // during testing the user can choose to use a real connection or AI mock.
     // so in supervised mode this function is used instead of the normal build() function.
-    // and it will make the desition on using mock or real at runtime at the cost of performance 
+    // and it will make the decision on using mock or real at runtime at the cost of performance
     supervisedFetch() {
         return (input, init) => {
             let fetch = (input, init) => {
@@ -107,35 +107,40 @@ class FetchBuilder {
                 // order they were added
                 fetch = this.middlewares[i](fetch);
             }
-            const traced = this.wrapWithTracing(fetch, true);
-            return traced(input, init);
+            return fetch(input, init);
         };
     }
-    wrapWithTracing(fetch, mock) {
+    wrapWithTracing(fetch) {
         const connectionId = __classPrivateFieldGet(this, _FetchBuilder_cnx, "f")?.id || '';
         const connectionName = __classPrivateFieldGet(this, _FetchBuilder_cnx, "f")?.name || '';
         return (input, init) => {
             const url = getUrl(input);
-            return __classPrivateFieldGet(this, _FetchBuilder_tracer, "f").startActiveSpan(`fetch ${url}`, async (span) => {
+            return __classPrivateFieldGet(this, _FetchBuilder_tracer, "f").startActiveSpan(`fetch ${connectionName}/${connectionId}`, async (span) => {
                 // Set span attributes
                 span.setAttribute('http.url', url);
                 span.setAttribute('type', 'fetch');
                 span.setAttribute('connection.id', connectionId);
                 span.setAttribute('connection.name', connectionName);
-                span.setAttribute('isMocked', mock);
-                if (init?.method) {
-                    span.setAttribute('http.method', init.method);
-                }
+                span.setAttribute('isConnected', connectionId !== '');
                 try {
                     const response = await fetch(input, init);
                     if (supervisor_js_1.enabled) {
+                        if (init?.method) {
+                            span.setAttribute('http.method', init.method);
+                        }
+                        else {
+                            span.setAttribute('http.method', 'GET');
+                        }
                         // when we are in supervisor mode, we need to store the response body in the span attribute
                         // this will be shown the end-user in some UI in the future(the future is now)
                         const body = await response.clone().arrayBuffer();
                         // if response is text/* or json we store the body as a string, otherwise we store it as a base64 string
                         const contentType = response.headers.get('Content-Type');
                         span.setAttribute('response.content_type', contentType || '');
-                        if (contentType && (contentType.startsWith('text/') || contentType.startsWith('application/json'))) {
+                        span.setAttribute('request.headers', JSON.stringify(init?.headers || {}));
+                        if (contentType &&
+                            (contentType.startsWith('text/') ||
+                                contentType.startsWith('application/json'))) {
                             span.setAttribute('response.body', new TextDecoder().decode(body));
                         }
                         else {

package/script/src/dsl/http/versori/webhookmiddleware.js

@@ -68,7 +68,7 @@ function createStaticWebhookMiddleware(opts) {
         next();
     };
     if (opts.connName === undefined) {
-        opts.log.warn(`No connection ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        opts.log.warn(`No connection ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
         return staticMiddleware;
     }
     // TODO(@teo): move db access to outside of the middleware??? (genuine question - not instruction)
@@ -136,7 +136,7 @@ function createActIdDynamicWebhookMiddleware(opts) {
         next();
     };
     if (!opts.connName) {
-        opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        opts.log.warn(`No template ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
         return staticMiddleware;
     }
     return async (req, res, next) => {
@@ -200,7 +200,7 @@ function createUserIdDynamicWebhookMiddleware(opts) {
         next();
     };
     if (!opts.connName) {
-        opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
+        opts.log.warn(`No template ID found for webhook, accepting any requests which is insecure!`, { webhookId: opts.id });
         return staticMiddleware;
     }
     return async (req, res, next) => {

package/script/src/internal/InternalAuth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AAoBA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IA2BpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAsBrD"}
+{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AAoBA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IAyBpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CAsBrD"}

package/script/src/internal/InternalAuth.js

@@ -54,7 +54,6 @@ class InternalAuth {
         if (Deno.env.get(constants_js_1.envVarInternalToken)) {
             this.accessToken = Deno.env.get(constants_js_1.envVarInternalToken) || '';
             this.expiresAt = Date.now() + 365 * 24 * 60 * 60 * 1000; // expires in 1 year
-            console.log(`Using static token provided by ${constants_js_1.envVarInternalToken}`);
             return;
         }
         if (!this.clientId || !this.clientSecret || !this.tokenEndpoint) {

package/script/src/internal/supervisor.d.ts

@@ -1,21 +1,17 @@
-import { Span } from '@opentelemetry/api';
 import { ExportResult } from '@opentelemetry/core';
 import { ReadableSpan, SpanExporter } from '@opentelemetry/sdk-trace-node';
+import { Span } from '@opentelemetry/api';
+import { ContextImpl } from '../context/Context.js';
+import { WorkflowImpl } from '../dsl/Workflow.js';
 export declare const enabled: boolean;
-type Webhooks = Map<string, {
-    method: string;
-    path: string;
-    options: any;
-}>;
-type Crons = Map<string, string>;
 type MockConnection = {
     name: string;
     id?: string;
     baseUrl?: string;
 };
-export declare function registerWebhooks(webhooks: Webhooks): Promise<void>;
-export declare function sendTaskStartEvent(taskId: string, span: Span): Promise<void>;
-export declare function registerCrons(crons: Crons): Promise<void>;
+export declare function signalReady(): Promise<void>;
+export declare function registerWorkflow<I, O>(workflow: WorkflowImpl<I, O>): Promise<void>;
+export declare function sendTaskStartEvent<I, O>(taskId: string, ctx: ContextImpl<I, O>, span: Span): Promise<ContextImpl<I, O>>;
 export declare function mockAPIRequest(info: RequestInfo | URL, cnx?: MockConnection, options?: RequestInit): Promise<Response>;
 export declare class Fake implements SpanExporter {
     constructor();