@versori/run 0.2.8 → 0.2.10

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

@@ -8,6 +8,7 @@ const cors_1 = __importDefault(require("cors"));
 const promises_1 = require("node:stream/promises");
 const rxjs_1 = require("rxjs");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
+const webhookmiddleware_js_1 = require("../../../dsl/http/versori/webhookmiddleware.js");
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,
     headers: {
@@ -72,28 +73,35 @@ exports.webhookCompiler = {
             },
         });
         return new rxjs_1.Observable((subscriber) => {
-            if (!ctx.router) {
+            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 });
             if (corsOptions) {
                 if (typeof corsOptions === 'boolean') {
-                    ctx.router.use((0, cors_1.default)());
+                    ctx.webhookRouter.use((0, cors_1.default)());
                 }
                 else {
-                    ctx.router.use((0, cors_1.default)(corsOptions));
+                    ctx.webhookRouter.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}`, async (req, res) => {
+            ctx.webhookRouter.post(`/${trigger.id}`, (0, webhookmiddleware_js_1.createStaticWebhookMiddleware)({
+                id: trigger.id,
+                connName: trigger.options.connection,
+                credentials: ctx.roundTripperFactory.credentials(),
+                cnxProvider: ctx.connectionProvider,
+                cfgReader: ctx.configReader,
+                log: ctx.log,
+            }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
-                    const activation = await ctx.connectionProvider.getStaticActivation();
-                    if (activation) {
-                        executionCtx = executionCtx.withActivation(activation);
+                    const staticActivation = res.locals.activation;
+                    if (staticActivation) {
+                        executionCtx = executionCtx.withActivation(staticActivation);
                     }
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
@@ -116,13 +124,24 @@ exports.webhookCompiler = {
                 });
             });
             // 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) => {
+            ctx.webhookRouter.post(`/${trigger.id}/users/:userId`, (0, webhookmiddleware_js_1.createUserIdDynamicWebhookMiddleware)({
+                id: trigger.id,
+                connName: trigger.options.connection,
+                credentials: ctx.roundTripperFactory.credentials(),
+                cnxProvider: ctx.connectionProvider,
+                cfgReader: ctx.configReader,
+                log: ctx.log,
+            }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.userId;
-                    const activations = await ctx.connectionProvider.getUserActivations(userId);
+                    const activation = res.locals.activation;
+                    const activations = [activation];
+                    // Right now we only support a user having one activation
+                    // so this will need changing when we support multiple activations per user
+                    // as will the middleware
                     if (!activations || activations.length === 0) {
                         res.status(404).json({
                             status: 'error',
@@ -163,13 +182,20 @@ exports.webhookCompiler = {
                 });
             });
             // this endpoint will trigger the workflow only for the activation given by its ID
-            ctx.router.post(`/${trigger.id}/activations/:activationId`, async (req, res) => {
+            ctx.webhookRouter.post(`/${trigger.id}/activations/:activationId`, (0, webhookmiddleware_js_1.createActIdDynamicWebhookMiddleware)({
+                id: trigger.id,
+                connName: trigger.options.connection,
+                credentials: ctx.roundTripperFactory.credentials(),
+                cnxProvider: ctx.connectionProvider,
+                cfgReader: ctx.configReader,
+                log: ctx.log,
+            }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
-                    const activationId = req.params.activationId;
-                    const activation = await ctx.connectionProvider.getActivation(activationId);
+                    const activation = res.locals.activation;
+                    const activationId = activation.id || req.params.activationId;
                     if (!activation) {
                         // TODO report back actual errors
                         res.status(404).json({

package/script/src/observability/logging/ConsoleLogger.d.ts

@@ -9,6 +9,7 @@ export declare class ConsoleLogger implements Logger {
     fields: Record<string, unknown>;
     constructor(level: LogLevel, fields?: Record<string, unknown>);
     debug(message: string, fields?: Record<string, unknown>): void;
+    warn(message: string, fields?: Record<string, unknown>): void;
     info(message: string, fields?: Record<string, unknown>): void;
     error(message: string, err?: Error, fields?: Record<string, unknown>): void;
     error(message: string, fields?: Record<string, unknown>): void;

package/script/src/observability/logging/ConsoleLogger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAoM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}
+{"version":3,"file":"ConsoleLogger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/ConsoleLogger.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,GAAG,MAAM,+CAA+C,CAAC;AACrE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AAqM/C;;GAEG;AACH,qBAAa,aAAc,YAAW,MAAM;IACxC,GAAG,EAAE,GAAG,CAAC,MAAM,CAAC;IAEhB,KAAK,EAAE,QAAQ,CAAC;IAEhB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBAEpB,KAAK,EAAE,QAAQ,EAAE,MAAM,GAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAM;IAOjE,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO7D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAC3E,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAsB9D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,aAAa;IAOvD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI;CAGlC"}

package/script/src/observability/logging/ConsoleLogger.js

@@ -181,6 +181,7 @@ log.setup({
 });
 const levelMap = {
     debug: log.getLevelByName('DEBUG'),
+    warn: log.getLevelByName('WARN'),
     info: log.getLevelByName('INFO'),
     error: log.getLevelByName('ERROR'),
 };
@@ -218,6 +219,12 @@ class ConsoleLogger {
             ...fields,
         });
     }
+    warn(message, fields) {
+        this.log.warn(message, {
+            ...this.fields,
+            ...fields,
+        });
+    }
     info(message, fields) {
         this.log.info(message, {
             ...this.fields,

package/script/src/observability/logging/Logger.d.ts

@@ -1,7 +1,8 @@
-export type LogLevel = 'debug' | 'info' | 'error';
+export type LogLevel = 'debug' | 'warn' | 'info' | 'error';
 export interface Logger {
     level: LogLevel;
     debug(message: string, fields?: Record<string, unknown>): void;
+    warn(message: string, fields?: Record<string, unknown>): void;
     info(message: string, fields?: Record<string, unknown>): void;
     error(message: string, fields?: Record<string, unknown>): void;
     child(fields: {

package/script/src/observability/logging/Logger.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/Logger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,OAAO,CAAC;AAElD,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,QAAQ,CAAC;IAEhB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IAEjD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;CACnC"}
+{"version":3,"file":"Logger.d.ts","sourceRoot":"","sources":["../../../../src/src/observability/logging/Logger.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,GAAG,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;AAE3D,MAAM,WAAW,MAAM;IACnB,KAAK,EAAE,QAAQ,CAAC;IAEhB,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9D,IAAI,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE9D,KAAK,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC;IAE/D,KAAK,CAAC,MAAM,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,GAAG,MAAM,CAAC;IAEjD,QAAQ,CAAC,KAAK,EAAE,QAAQ,GAAG,IAAI,CAAC;CACnC"}