@versori/run 0.1.0-alpha.9 → 0.2.0-alpha.2

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

@@ -1,74 +1,175 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookCompiler = void 0;
 // In src/interpreter/memory/compilers/webhook.ts
+const cors_1 = __importDefault(require("cors"));
 const rxjs_1 = require("rxjs");
+const promises_1 = require("node:stream/promises");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
+const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
+    status: 200,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
+const DEFAULT_SYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({ message: 'Internal server error', error: ctx.data }), {
+    status: 500,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
+const DEFAULT_ASYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify({
+    status: 'accepted',
+    executionId: ctx.executionId,
+}), {
+    status: 202,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
+const DEFAULT_ASYNC_ON_ERROR = (ctx) => new Response(JSON.stringify({
+    message: 'Internal server error',
+    executionId: ctx.executionId,
+}), {
+    status: 500,
+    headers: {
+        'Content-Type': 'application/json',
+        'X-Execution-Id': ctx.executionId,
+    },
+});
 exports.webhookCompiler = {
     ctor: WebhookTrigger_js_1.WebhookTrigger,
     compile: (ctx, trigger, signal) => {
+        const { response: { mode = 'async', } = {}, cors: corsOptions, } = trigger.options;
+        const isSync = mode === 'sync';
+        const isAsync = mode === 'async';
+        if (!isSync && !isAsync) {
+            throw new Error('Invalid response mode, must be either "sync" or "async"');
+        }
+        let onSuccess = isSync ? DEFAULT_SYNC_ON_SUCCESS : DEFAULT_ASYNC_ON_SUCCESS;
+        let onError = isSync ? DEFAULT_SYNC_ON_ERROR : DEFAULT_ASYNC_ON_ERROR;
+        if (trigger.options.response?.onSuccess) {
+            onSuccess = trigger.options.response.onSuccess;
+        }
+        if (trigger.options.response?.onError) {
+            onError = trigger.options.response.onError;
+        }
+        const ctxOptionsFn = (res) => ({
+            onSuccess: (ctx) => {
+                if (isSync) {
+                    sendResponse(res, onSuccess(ctx));
+                }
+            },
+            onError: (ctx) => {
+                if (isSync) {
+                    sendResponse(res, onError(ctx));
+                }
+            },
+        });
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.router) {
                 throw new Error('Router not available in compiler context');
             }
             // add the webhook endpoint to the router
             ctx.log.info('webhook endpoint added:', { trigger });
+            if (corsOptions) {
+                if (typeof corsOptions === 'boolean') {
+                    ctx.router.use((0, cors_1.default)());
+                }
+                else {
+                    ctx.router.use((0, cors_1.default)(corsOptions));
+                }
+            }
             // endpoint for sans user because I'm not quite sure how the dynamic routing works
             ctx.router.post(`/${trigger.id}`, (req, res) => {
-                const executionCtx = ctx.contextProvider.create(req.body, undefined);
+                const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
                 try {
                     subscriber.next(executionCtx);
-                    res.status(200).json({ status: 'accepted' });
+                    if (isAsync) {
+                        sendResponse(res, onSuccess(executionCtx));
+                    }
                 }
                 catch (error) {
-                    const message = error instanceof Error ? error.message : 'Unknown error';
-                    executionCtx.log.error('webhook execution error', { error });
-                    res.status(500).json({ status: 'error', message });
+                    executionCtx.log.error('webhook execution error', {
+                        error: JSON.stringify(error),
+                    });
+                    if (isAsync) {
+                        sendResponse(res, onError(executionCtx.withData(error)));
+                    }
                 }
             });
             // this endpoint will trigger the workflow for each activation given by the external user ID
             ctx.router.post(`/${trigger.id}/users/:userId`, async (req, res) => {
-                const userId = req.params.userId || undefined;
-                if (!userId) {
-                    res.status(400).json({ status: 'error', message: 'User ID is required' });
-                    return;
-                }
+                const userId = req.params.userId;
                 const activations = await ctx.connectionProvider.getUserActivations(userId);
                 if (!activations || activations.length === 0) {
-                    res.status(404).json({ status: 'error', message: `No activations found for user: ${userId}` });
+                    res.status(404).json({
+                        status: 'error',
+                        message: `No activations found for user: ${userId}`,
+                    });
                     return;
                 }
+                const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                const errors = [];
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create(req.body, activation);
+                    const activationCtx = executionCtx.withActivation(activation);
                     try {
-                        subscriber.next(executionCtx);
+                        subscriber.next(activationCtx);
                     }
                     catch (error) {
-                        const message = error instanceof Error ? error.message : 'Unknown error';
-                        executionCtx.log.error('webhook execution error', { error });
-                        res.status(500).json({ status: 'error', message });
+                        activationCtx.log.error('webhook execution error', {
+                            error: JSON.stringify(error),
+                        });
+                        errors.push({
+                            activationId: activation.id,
+                            error,
+                        });
                     }
                 });
-                res.status(200).json({ status: 'accepted' });
+                if (isAsync) {
+                    if (errors.length === 0) {
+                        sendResponse(res, onSuccess(executionCtx));
+                    }
+                    else {
+                        sendResponse(res, onError(executionCtx.withData(errors)));
+                    }
+                }
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
             ctx.router.post(`/${trigger.id}/activations/:activationId`, async (req, res) => {
-                const activationId = req.params.activationId || undefined;
+                const activationId = req.params.activationId;
                 const activation = await ctx.connectionProvider.getActivation(activationId);
                 if (!activation) {
                     // TODO report back actual errors
-                    res.status(404).json({ status: 'error', message: `No activation found for ID: ${activationId}` });
+                    res.status(404).json({
+                        status: 'error',
+                        message: `No activation found for ID: ${activationId}`,
+                    });
                     return;
                 }
-                const executionCtx = ctx.contextProvider.create(req.body, activation);
+                const activationCtx = ctx.contextProvider.create(req.body, {
+                    ...ctxOptionsFn(res),
+                    activation,
+                });
                 try {
-                    subscriber.next(executionCtx);
-                    res.status(200).json({ status: 'accepted' });
+                    subscriber.next(activationCtx);
+                    if (isAsync) {
+                        sendResponse(res, onSuccess(activationCtx));
+                    }
                 }
                 catch (error) {
-                    const message = error instanceof Error ? error.message : 'Unknown error';
-                    executionCtx.log.error('webhook execution error', { error });
-                    res.status(500).json({ status: 'error', message });
+                    activationCtx.log.error('webhook execution error', {
+                        error: JSON.stringify(error),
+                    });
+                    if (isAsync) {
+                        sendResponse(res, onError(activationCtx.withData(error)));
+                    }
                 }
             });
             function cleanup() {
@@ -83,3 +184,12 @@ exports.webhookCompiler = {
         });
     },
 };
+function sendResponse(res, response) {
+    res.status(response.status);
+    response.headers.forEach((value, key) => {
+        res.setHeader(key, value);
+    });
+    if (response.body) {
+        (0, promises_1.pipeline)(response.body, res);
+    }
+}

package/script/src/kv/nats/NatsKeyValueProvider.d.ts

@@ -19,7 +19,6 @@ export declare class NatsKeyValueProvider implements KeyValueProvider, AsyncDisp
     private constructor();
     static newInstance(opts?: Partial<NatsKeyValueProviderOptions>): Promise<NatsKeyValueProvider>;
     static fromEnv(): Promise<NatsKeyValueProvider>;
-    [Symbol.asyncDispose](): PromiseLike<void>;
     kv(options: KVOptions): KeyValue;
     destroy(options: DestroyOptions): Promise<void>;
     private subjectPrefix;

package/script/src/kv/nats/NatsKeyValueProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAGA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EACH,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACZ,MAAM,gBAAgB,CAAC;AA4CxB,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAI/C,CAAC,MAAM,CAAC,YAAY,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC;IAI1C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,OAAO,CAAC,aAAa;CAYxB"}
+{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAA+B,UAAU,EAAE,MAAM,+DAA+D,CAAC;AACxH,OAAO,EACH,cAAc,EAEd,QAAQ,EACR,gBAAgB,EAChB,SAAS,EACZ,MAAM,gBAAgB,CAAC;AA4CxB,MAAM,MAAM,2BAA2B,GAAG;IACtC,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,IAAI,EAAE;QACF,GAAG,EAAE,MAAM,CAAC;QACZ,SAAS,CAAC,EAAE,MAAM,CAAC;QACnB,GAAG,CAAC,EAAE,UAAU,CAAC;KACpB,CAAC;CACL,CAAC;AAuBF,qBAAa,oBAAqB,YAAW,gBAAgB,EAAE,eAAe;IAEtE,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,cAAc;IAC/B,OAAO,CAAC,QAAQ,CAAC,gBAAgB;IACjC,OAAO,CAAC,QAAQ,CAAC,IAAI;IALzB,OAAO;WAQM,WAAW,CACpB,IAAI,GAAE,OAAO,CAAC,2BAA2B,CAAM,GAChD,OAAO,CAAC,oBAAoB,CAAC;IA0BhC,MAAM,CAAC,OAAO,IAAI,OAAO,CAAC,oBAAoB,CAAC;IAQ/C,EAAE,CAAC,OAAO,EAAE,SAAS,GAAG,QAAQ;IAqB1B,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IAuBrD,OAAO,CAAC,aAAa;CAYxB"}

package/script/src/kv/nats/NatsKeyValueProvider.js

@@ -1,44 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NatsKeyValueProvider = void 0;
-const dntShim = __importStar(require("../../../_dnt.shims.js"));
 const mod_js_1 = require("../../../deps/jsr.io/@nats-io/jetstream/3.0.2/src/mod.js");
 const mod_js_2 = require("../../../deps/jsr.io/@nats-io/kv/3.0.2/src/mod.js");
 const mod_js_3 = require("../../../deps/jsr.io/@nats-io/transport-deno/3.0.2/src/mod.js");
 const KeyValue_js_1 = require("../KeyValue.js");
 const NatsKeyValue_js_1 = require("./NatsKeyValue.js");
 function getOptionsFromEnv() {
-    const natsTlsCaFile = dntShim.Deno.env.get('RUN_NATS_TLS_CA_FILE');
+    const natsTlsCaFile = Deno.env.get('RUN_NATS_TLS_CA_FILE');
     return {
-        organizationId: dntShim.Deno.env.get('RUN_ORGANISATION_ID'),
-        projectId: dntShim.Deno.env.get('RUN_SERVICE_ID'),
-        environment: dntShim.Deno.env.get('RUN_ENVIRONMENT'),
+        organizationId: Deno.env.get('RUN_ORGANISATION_ID'),
+        projectId: Deno.env.get('RUN_SERVICE_ID'),
+        environment: Deno.env.get('RUN_ENVIRONMENT'),
         nats: {
-            url: dntShim.Deno.env.get('RUN_NATS_URL') || 'nats://localhost:4222',
-            credsFile: dntShim.Deno.env.get('RUN_NATS_CREDS_FILE'),
+            url: Deno.env.get('RUN_NATS_URL') || 'nats://localhost:4222',
+            credsFile: Deno.env.get('RUN_NATS_CREDS_FILE'),
             ...(natsTlsCaFile && {
                 tls: {
                     caFile: natsTlsCaFile,
@@ -111,7 +87,7 @@ class NatsKeyValueProvider {
     static async newInstance(opts = {}) {
         const parsedOpts = mergeOptions(getOptionsFromEnv(), opts);
         const credsFile = parsedOpts.nats.credsFile
-            ? await dntShim.Deno.readFile(parsedOpts.nats.credsFile)
+            ? await Deno.readFile(parsedOpts.nats.credsFile)
             : undefined;
         const conn = await (0, mod_js_3.connect)({
             servers: [parsedOpts.nats.url],