@versori/run 0.7.0-alpha.9 → 1.0.0-alpha.2

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

@@ -18,6 +18,7 @@ const mod_js_1 = require("../../../../deps/jsr.io/@std/ulid/1.0.0/mod.js");
 const rxjs_1 = require("rxjs");
 const DurableTrigger_js_1 = require("../../../dsl/triggers/DurableTrigger.js");
 const constants_js_1 = require("../../../internal/constants.js");
+const tracePropagation_js_1 = require("../../../observability/tracePropagation.js");
 function compileDurableWorkflow(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
         function cleanup() {
@@ -44,41 +45,77 @@ function compileDurableWorkflow(ctx, trigger, signal) {
                         continue;
                     }
                     for (const wf of wfs.workflows) {
-                        const data = JSON.parse(atob(wf.payload ?? '{}'));
-                        let activation;
-                        if (wf.metadata?.activationId) {
+                        // If the metadata carries a traceparent, extractTraceContext returns a
+                        // context with the remote span as parent; otherwise it returns the
+                        // current active context, which causes startActiveSpan to create a new
+                        // root span (new trace). Either way the SDK does the right thing.
+                        const parentCtx = (0, tracePropagation_js_1.extractTraceContext)(wf.metadata);
+                        await ctx.tracer.startActiveSpan(`durableworkflow-${trigger.id}`, {}, parentCtx, async (span) => {
+                            span.setAttribute('task.id', trigger.id);
+                            span.setAttribute('task.type', 'durableworkflow');
+                            span.setAttribute('execution.id', wf.metadata?.executionId ?? '');
+                            if (wf.metadata?.activationId) {
+                                span.setAttribute('activation.id', wf.metadata.activationId);
+                            }
+                            if (wf.metadata?.traceparent) {
+                                span.setAttribute('trace.continuation', true);
+                            }
                             try {
-                                const { data } = await ctx.platformApi.getActivation({
-                                    path: {
-                                        activation_id: wf.metadata.activationId,
-                                        organisation_id: ctx.organisationId,
-                                        environment_id: Deno.env.get(constants_js_1.envVarEnvId) || 'development',
+                                const payload = wf.payload ? atob(wf.payload) : '{}';
+                                const data = JSON.parse(payload);
+                                let activation;
+                                if (wf.metadata?.activationId) {
+                                    try {
+                                        const { data } = await ctx.platformApi
+                                            .getActivation({
+                                            path: {
+                                                activation_id: wf.metadata.activationId,
+                                                organisation_id: ctx.organisationId,
+                                                environment_id: Deno.env.get(constants_js_1.envVarEnvId) ||
+                                                    'development',
+                                            },
+                                            throwOnError: true,
+                                        });
+                                        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 ?? (0, mod_js_1.ulid)().toString(), {
+                                    workflow: wf,
+                                    onSuccess: (completedContext) => {
+                                        const opts = completedContext
+                                            .options;
+                                        if (opts.recoveredFromCatch) {
+                                            return;
+                                        }
+                                        // 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',
+                                        });
                                     },
-                                    throwOnError: true,
                                 });
-                                activation = data;
+                                consecutiveErrors = 0;
+                                subscriber.next(newContext);
                             }
                             catch (error) {
-                                ctx.log.error('Failed to get activation', { error });
-                                throw new Error('Failed to get activation');
+                                span.recordException(error instanceof Error ? error : new Error(String(error)));
+                                ctx.log.error('Error processing workflow', { error });
+                            }
+                            finally {
+                                span.end();
                             }
-                        }
-                        const newContext = ctx.contextProvider.createWithExecutionId(activation, data, wf.metadata?.executionId ?? (0, mod_js_1.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',
-                                });
-                            },
                         });
-                        consecutiveErrors = 0;
-                        subscriber.next(newContext);
                     }
                 }
                 catch (error) {

package/script/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":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
+{"version":3,"file":"fn.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/fn.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,MAAM,EAAE,MAAM,8BAA8B,CAAC;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAiCnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}

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

@@ -22,12 +22,15 @@ function compileFn(compilerCtx, task) {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                if (typeof ctx.idx === 'number') {
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
+                }
+                return ctx.withData(await task._fn(ctx));
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

package/script/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,CA0SxE,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,CAySxE,CAAC"}

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

@@ -102,12 +102,13 @@ exports.webhookCompiler = {
             },
             request: req,
         });
+        const routeMiddleware = [];
         if (!trigger.options.request?.rawBody) {
-            ctx.webhookRouter.use(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
-            ctx.webhookRouter.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
+            routeMiddleware.push(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
+            routeMiddleware.push((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         }
         else {
-            ctx.webhookRouter.use(express_1.default.raw({ type: '*/*', limit: '50mb' }));
+            routeMiddleware.push(express_1.default.raw({ type: '*/*', limit: '50mb' }));
         }
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -124,7 +125,7 @@ exports.webhookCompiler = {
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.webhookRouter[method](`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}`, ...routeMiddleware, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -160,7 +161,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -216,7 +217,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',

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;AAoFnE,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;AAsFnE,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

@@ -45,12 +45,12 @@ function compileCatch(compilerCtx, task) {
                         reason: 'error',
                         severity: 'high',
                     });
-                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }))));
+                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }), { recoveredFromCatch: true })));
                 }
                 compilerCtx.issueProvider.submitIssue({
                     annotations: {
-                        'error': error.message,
-                        'stack': error.stack || '',
+                        'error': String(error),
+                        'stack': '',
                         'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                         'executionId': ctx.executionId,
                         'activationId': ctx.activation.id,
@@ -64,7 +64,7 @@ function compileCatch(compilerCtx, task) {
                 });
                 span.setAttribute('error', `${error}`);
                 span.end();
-                return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));
+                return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }), { recoveredFromCatch: true })));
             });
         }));
     }));

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;AAEtD,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA+BnE,eAAO,MAAM,UAAU,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,CAG/D,CAAC"}
+{"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

@@ -22,12 +22,15 @@ function compileFn(compilerCtx, task) {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                if (typeof ctx.idx === 'number') {
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
+                }
+                return ctx.withData(await task._fn(ctx));
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

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;AAGtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2SxE,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"}

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

@@ -102,12 +102,13 @@ exports.webhookCompiler = {
             },
             request: req,
         });
+        const routeMiddleware = [];
         if (!trigger.options.request?.rawBody) {
-            ctx.webhookRouter.use(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
-            ctx.webhookRouter.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
+            routeMiddleware.push(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
+            routeMiddleware.push((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         }
         else {
-            ctx.webhookRouter.use(express_1.default.raw({ type: '*/*', limit: '50mb' }));
+            routeMiddleware.push(express_1.default.raw({ type: '*/*', limit: '50mb' }));
         }
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -124,7 +125,7 @@ exports.webhookCompiler = {
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.webhookRouter[method](`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}`, ...routeMiddleware, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',
@@ -160,7 +161,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 connName: trigger.options.connection,
                 organisationId: ctx.organisationId,
@@ -216,7 +217,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
+            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, ...routeMiddleware, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
                 id: trigger.id,
                 organisationId: ctx.organisationId,
                 environmentId: Deno.env.get(constants_js_1.envVarEnvId) ?? '',

package/script/src/interpreter/vanilla/ExecutionError.d.ts

@@ -1,10 +1,8 @@
 import { Context } from '../../context/Context.js';
 /**
  * ExecutionError wraps errors that occur during durable workflow execution, providing access to the context at the
- * time of the error. This is used with the {@link DurableInterpreter}.
+ * time of the error. This is used with the {@link VanillaInterpreter}.
  *
- * Note: When using the {@link MemoryInterpreter}, errors in `.catch()` handlers will be instances of the regular
- * `ExecutionError` instead.
  */
 export declare class ExecutionError extends Error {
     /**

package/script/src/interpreter/vanilla/ExecutionError.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ExecutionError.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/vanilla/ExecutionError.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;;;;;GAMG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACrC;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAElB;;;;;;OAMG;gBACS,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY;IAOnE,MAAM;;;;CAMT"}
+{"version":3,"file":"ExecutionError.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/vanilla/ExecutionError.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,OAAO,EAAE,MAAM,0BAA0B,CAAC;AAEnD;;;;GAIG;AACH,qBAAa,cAAe,SAAQ,KAAK;IACrC;;OAEG;IACH,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,CAAC;IAElB;;;;;;OAMG;gBACS,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,YAAY;IAOnE,MAAM;;;;CAMT"}

package/script/src/interpreter/vanilla/ExecutionError.js

@@ -15,10 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ExecutionError = void 0;
 /**
  * ExecutionError wraps errors that occur during durable workflow execution, providing access to the context at the
- * time of the error. This is used with the {@link DurableInterpreter}.
+ * time of the error. This is used with the {@link VanillaInterpreter}.
  *
- * Note: When using the {@link MemoryInterpreter}, errors in `.catch()` handlers will be instances of the regular
- * `ExecutionError` instead.
  */
 class ExecutionError extends Error {
     /**

package/script/src/interpreter/vanilla/VanillaInterpreter.d.ts.map

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

package/script/src/interpreter/vanilla/VanillaInterpreter.js

@@ -215,7 +215,7 @@ class VanillaInterpreter {
         const kvp = await getKVProvider(runLocal);
         const organisationId = Deno.env.get(constants_js_1.envVarOrgId) || 'development';
         const environmentId = Deno.env.get(constants_js_1.envVarEnvId) || 'development';
-        const ctxProvider = new VanillaContext_js_1.VanillaContextProvider(log, kvp, organisationId, environmentId, issuesProvider);
+        const ctxProvider = new VanillaContext_js_1.VanillaContextProvider(log, kvp, organisationId, environmentId, issuesProvider, queueProvider);
         return new VanillaInterpreter(log, compiler, ctxProvider, express_1.default.Router(), express_1.default.Router(), new Map(), connectionFactory, cronapi_js_1.CronAPIClient.fromEnv(), tracer, configReader, queueProvider, otelSDK);
     }
     register(workflow, options) {

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

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

@@ -47,7 +47,7 @@ function compileCatch(compilerCtx, task) {
                         //     reason: 'error',
                         //     severity: 'high',
                         // });
-                        return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }))));
+                        return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, error.message, { cause: error }), { recoveredFromCatch: true })));
                     }
                     ctx.log.error('execution has encountered an error', {
                         error: error,
@@ -66,7 +66,7 @@ function compileCatch(compilerCtx, task) {
                     // });
                     span.setAttribute('error', `${error}`);
                     span.end();
-                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }))));
+                    return errorOperator((0, rxjs_1.of)(ctx.withData(new ExecutionError_js_1.ExecutionError(ctx, `${error}`, { cause: error }), { recoveredFromCatch: true })));
                 });
             }));
         }));

package/script/src/interpreter/vanilla/compilers/durableworkflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/vanilla/compilers/durableworkflow.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAqB,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAEpE,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CAqFjD;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAI5F,CAAC"}
+{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/vanilla/compilers/durableworkflow.ts"],"names":[],"mappings":"AAcA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAElC,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAqB,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AACrF,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AAGpE,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,cAAc,CAAC,mBAAmB,CAAC,CAAC,CA+HjD;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAI5F,CAAC"}

package/script/src/interpreter/vanilla/compilers/durableworkflow.js

@@ -14,31 +14,25 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.durableWorkflowCompiler = void 0;
 exports.compileDurableWorkflow = compileDurableWorkflow;
+const mod_js_1 = require("../../../../deps/jsr.io/@std/ulid/1.0.0/mod.js");
 const rxjs_1 = require("rxjs");
 const DurableTrigger_js_1 = require("../../../dsl/triggers/DurableTrigger.js");
 const ObservableCompiler_js_1 = require("../ObservableCompiler.js");
+const tracePropagation_js_1 = require("../../../observability/tracePropagation.js");
 function compileDurableWorkflow(ctx, trigger, signal) {
     return new rxjs_1.Observable((subscriber) => {
         function cleanup() {
-            ctx.log.debug('webhook trigger stopped');
+            ctx.log.debug('durable workflow trigger stopped');
             subscriber.complete();
         }
         signal.addEventListener('abort', cleanup, { once: true });
         let consecutiveErrors = 0;
-        const maxConsecutiveErrors = 5;
         (async () => {
             while (true) {
                 if (signal.aborted) {
                     cleanup();
                     break;
                 }
-                if (consecutiveErrors >= maxConsecutiveErrors) {
-                    ctx.log.error('reached too many consecutive errors stopping trigger', {
-                        'triggerId': trigger.id,
-                    });
-                    cleanup();
-                    break;
-                }
                 try {
                     // Right now the API itself will hang for a period of time if no workflows are available.
                     // so we don't need to add a delay here.
@@ -51,34 +45,61 @@ 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 ?? '{}'));
-                        const activation = ObservableCompiler_js_1.VanillaActivation;
-                        const newContext = ctx.contextProvider.create(data, {
-                            activation: activation,
-                            workflowId: wf.id,
+                        // If the metadata carries a traceparent, extractTraceContext returns a
+                        // context with the remote span as parent; otherwise it returns the
+                        // current active context, which causes startActiveSpan to create a new
+                        // root span (new trace). Either way the SDK does the right thing.
+                        const parentCtx = (0, tracePropagation_js_1.extractTraceContext)(wf.metadata);
+                        await ctx.tracer.startActiveSpan(`durableworkflow-${trigger.id}`, {}, parentCtx, (span) => {
+                            span.setAttribute('task.id', trigger.id);
+                            span.setAttribute('task.type', 'durableworkflow');
+                            span.setAttribute('execution.id', wf.metadata?.executionId ?? '');
+                            if (wf.metadata?.activationId) {
+                                span.setAttribute('activation.id', wf.metadata.activationId);
+                            }
+                            if (wf.metadata?.traceparent) {
+                                span.setAttribute('trace.continuation', true);
+                            }
+                            try {
+                                const payload = wf.payload ? atob(wf.payload) : '{}';
+                                const data = JSON.parse(payload);
+                                const newContext = ctx.contextProvider
+                                    .createWithExecutionId(ObservableCompiler_js_1.VanillaActivation, data, wf.metadata?.executionId ?? (0, mod_js_1.ulid)().toString(), {
+                                    workflow: wf,
+                                    onSuccess: (completedContext) => {
+                                        const opts = completedContext.options;
+                                        if (opts.recoveredFromCatch) {
+                                            return;
+                                        }
+                                        // 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',
+                                        });
+                                    },
+                                });
+                                consecutiveErrors = 0;
+                                subscriber.next(newContext);
+                            }
+                            catch (error) {
+                                span.recordException(error instanceof Error ? error : new Error(String(error)));
+                                ctx.log.error('Error processing workflow', { error });
+                            }
+                            finally {
+                                span.end();
+                            }
                         });
-                        consecutiveErrors = 0;
-                        subscriber.next(newContext);
                     }
                 }
                 catch (error) {
                     ctx.log.error('Error fetching workflows', { error });
                     consecutiveErrors++;
+                    // no workflows available, back-off a bit before retrying
+                    await new Promise((resolve) => setTimeout(resolve, Math.min(consecutiveErrors * 1000, 30000)));
                 }
             }
         })();

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

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

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

@@ -22,12 +22,15 @@ function compileFn(compilerCtx, task) {
         return await compilerCtx.tracer.startActiveSpan(`fn-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('execution.id', ctx.executionId);
-            if (typeof ctx.idx === 'number') {
+            try {
+                if (typeof ctx.idx === 'number') {
+                    return ctx.withData(await task._fn(ctx, ctx.idx));
+                }
+                return ctx.withData(await task._fn(ctx));
+            }
+            finally {
                 span.end();
-                return ctx.withData(await task._fn(ctx, ctx.idx));
             }
-            span.end();
-            return ctx.withData(await task._fn(ctx));
         });
     }));
 }

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

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/vanilla/compilers/webhook.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA+D7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA+QxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/vanilla/compilers/webhook.ts"],"names":[],"mappings":"AAuBA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAmE7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA6QxE,CAAC"}

package/script/src/interpreter/vanilla/compilers/webhook.js

@@ -79,7 +79,7 @@ exports.webhookCompiler = {
             throw new Error('Invalid response mode, must be either "sync" or "async"');
         }
         const method = trigger.options.method || 'post';
-        const validMethods = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head'];
+        const validMethods = ['get', 'post', 'put', 'delete', 'patch', 'options', 'head', 'all'];
         if (method !== method.toLowerCase()) {
             throw new Error(`HTTP method must be in lowercase: ${method} on webhook ${trigger.id}`);
         }
@@ -107,13 +107,15 @@ exports.webhookCompiler = {
             },
             request: req,
         });
+        const routeMiddleware = [];
         if (!trigger.options.request?.rawBody) {
-            ctx.webhookRouter.use(express_1.default.json({ limit: '50mb' }));
-            ctx.webhookRouter.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
+            routeMiddleware.push(express_1.default.json({ limit: '50mb', type: ['application/json', '*/*+json'] }));
+            routeMiddleware.push((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         }
         else {
-            ctx.webhookRouter.use(express_1.default.raw({ type: '*/*', limit: '50mb' }));
+            routeMiddleware.push(express_1.default.raw({ type: '*/*', limit: '50mb' }));
         }
+        routeMiddleware.push(vanillaWebhookMiddleware());
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
                 throw new Error('Router not available in compiler context');
@@ -129,7 +131,7 @@ exports.webhookCompiler = {
                 }
             }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
-            ctx.webhookRouter[method](`/${trigger.id}`, vanillaWebhookMiddleware(), async (req, res) => {
+            ctx.webhookRouter[method](`/${trigger.id}`, ...routeMiddleware, async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
@@ -156,7 +158,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
-            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, vanillaWebhookMiddleware(), async (req, res) => {
+            ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, ...routeMiddleware, async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
@@ -203,7 +205,7 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, vanillaWebhookMiddleware(), async (req, res) => {
+            ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, ...routeMiddleware, async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');