npm - @versori/run - Versions diffs - 0.2.18 → 0.2.20 - Mend

@versori/run 0.2.18 → 0.2.20

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (27) hide show

package/esm/src/context/Context.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import type * as express from 'express';
 import { Activation } from '../dsl/http/types.js';
 import { CredentialsProvider } from '../dsl/http/versori/contextcredentials.js';
 import { QueueAPI } from '../interpreter/durable/Queue.js';
@@ -10,6 +11,7 @@ export type OnErrorFn = (ctx: Context<any>) => void;
 export type ContextOptions = {
     activation?: Activation;
     workflowId?: string;
+    request?: express.Request;
     onSuccess?: OnSuccessFn;
     onError?: OnErrorFn;
 };
@@ -40,6 +42,7 @@ export interface Context<D> {
     createIssue(issue: CreateIssue, options?: {
         deduplicate?: boolean;
     }): Promise<Issue | null>;
+    request(): express.Request | undefined;
 }
 export declare class ContextImpl<D, Index = void> implements Context<D> {
     #private;
@@ -58,6 +61,7 @@ export declare class ContextImpl<D, Index = void> implements Context<D> {
     withActivation(activation: Activation): ContextImpl<D, Index>;
     withData<D2>(data: D2): ContextImpl<D2, Index>;
     openKv(scope?: KeyValueScope): KeyValue;
+    request(): express.Request | undefined;
     start(group: string, opts: WorkflowOpts): Promise<AsyncWorkflow>;
     createIssue(issue: CreateIssue, options?: {
         deduplicate?: boolean;

package/esm/src/context/Context.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../../src/src/context/Context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AACtD,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IACzB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,OAAO,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAKF,MAAM,MAAM,YAAY,GAAG;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,OAAO,CAAC,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,QAAQ,CAAC;IAExC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAE9E,WAAW,IAAI,mBAAmB,CAAC;IAEnC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;~~CAC/F~~;AAED,qBAAa,WAAW,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;;IAC3D,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjB,GAAG,EAAE,KAAK,CAAC;IAEX,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAE1B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;gBAI7B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,gBAAgB,EACrB,KAAK,EAAE,mBAAmB,EAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,IAAI,EACf,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,QAAQ,EAChB,KAAK,CAAC,EAAE,QAAQ,EAChB,OAAO,GAAE,cAAmB;IAsBhC,IAAI,UAAU,IAAI,UAAU,GAAG,SAAS,CAEvC;IAED,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC;IAiB7C,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC;IAsB7D,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC;IAc9C,MAAM,CAAC,KAAK,GAAE,aAA2B,GAAG,QAAQ;~~IAe9C~~,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAgCtE,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAO3F,WAAW,IAAI,mBAAmB;IAQlC,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAQlD"}
1	+ {"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../../src/src/context/Context.ts"],"names":[],"mappings":"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"}

package/esm/src/context/Context.js CHANGED Viewed

@@ -117,6 +117,9 @@ export class ContextImpl {
             activationId: this.activation?.id,
         });
     }
+    request() {
+        return this.options.request;
+    }
     async start(group, opts) {
         // this makes a post request to the endpoint sending a message and schedule the workflow to run
         if (!this.queue) {

package/esm/src/dsl/http/versori/roundtripper.d.ts CHANGED Viewed

@@ -4,6 +4,9 @@ import { BaseUrlFetcher, ConfigReader, DynamicFetcher, RoundTripperFactory } fro
 import { CredentialsProvider, Token } from './contextcredentials.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
+type denoFetch = (input: RequestInfo | URL, init?: RequestInit & {
+    client?: Deno.HttpClient;
+}) => Promise<Response>;
 /**
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
  * This is the intended implementation for when projects/services are hosted on Versori infrastructure.
@@ -27,7 +30,7 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     static fromEnv(logger: Logger, tracer: Tracer): VersoriCredentialsFactory;
     private changeRequestInit;
     private changeBaseUrl;
-    create(connName: string): Promise<typeof fetch | undefined>;
+    create(connName: string): Promise<denoFetch | undefined>;
     createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
     private traceFetch;
     credentials(): CredentialsProvider;
@@ -39,7 +42,9 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     private basicAuthFetcher;
     private bearerTokenFetcher;
     private oauth2Fetcher;
+    private mtlsFetcher;
     private getToken;
     private getRaw;
 }
+export {};
 //# sourceMappingURL=roundtripper.d.ts.map

package/esm/src/dsl/http/versori/roundtripper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,~~EAEZ~~,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAM/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;~~AAGrD~~;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,~~OAAO~~,~~KAAK,~~GAAG,SAAS,CAAC;~~IAqC3D~~,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;~~IAgDxE~~,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAOlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;~~IAuC9C~~,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;~~YAoDP~~,gBAAgB;~~YAmChB~~,kBAAkB;~~YAiClB~~,aAAa;~~YAwEb~~,QAAQ;YA2BR,MAAM;CA0BvB"}
1	+ {"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAM/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAIrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAIvB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAkDxD,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA6DxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAOlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;CA0BvB"}

package/esm/src/dsl/http/versori/roundtripper.js CHANGED Viewed

@@ -151,18 +151,29 @@ export class VersoriCredentialsFactory {
                 return this.traceFetch(input, init);
             }
             const _input = this.changeRequestInit(input, conn);
-            switch (conn.credentials[0].authSchemeConfig.type) {
-                case 'api-key':
-                    return (await this.apiKeyFetcher(conn, this.traceFetch))(_input, init);
-                case 'basic-auth':
-                    return (await this.basicAuthFetcher(conn, this.traceFetch))(_input, init);
-                case 'jwt-bearer':
-                    return (await this.bearerTokenFetcher(conn, this.traceFetch))(_input, init);
-                case 'oauth2':
-                    return (await this.oauth2Fetcher(conn, this.traceFetch))(_input, init);
-                default:
-                    return this.traceFetch(_input, init);
-            }
+            let _fetch = this.traceFetch;
+            conn.credentials.forEach((cred) => {
+                switch (cred.authSchemeConfig.type) {
+                    case 'api-key':
+                        _fetch = this.apiKeyFetcher(cred, _fetch);
+                        break;
+                    case 'basic-auth':
+                        _fetch = this.basicAuthFetcher(cred, _fetch);
+                        break;
+                    case 'jwt-bearer':
+                        _fetch = this.bearerTokenFetcher(cred, _fetch);
+                        break;
+                    case 'oauth2':
+                        _fetch = this.oauth2Fetcher(cred, _fetch);
+                        break;
+                    case 'certificate':
+                        _fetch = this.mtlsFetcher(cred, _fetch);
+                        break;
+                    default:
+                        break;
+                }
+            });
+            return _fetch(_input, init);
         };
         return Promise.resolve(_fn);
     }
@@ -184,18 +195,29 @@ export class VersoriCredentialsFactory {
                 })(activation, input, init);
             }
             const _input = this.changeRequestInit(input, conn);
-            switch (conn.credentials[0].authSchemeConfig.type) {
-                case 'api-key':
-                    return (await this.apiKeyFetcher(conn, this.traceFetch))(_input, init);
-                case 'basic-auth':
-                    return (await this.basicAuthFetcher(conn, this.traceFetch))(_input, init);
-                case 'jwt-bearer':
-                    return (await this.bearerTokenFetcher(conn, this.traceFetch))(_input, init);
-                case 'oauth2':
-                    return (await this.oauth2Fetcher(conn, this.traceFetch))(_input, init);
-                default:
-                    return this.traceFetch(_input, init);
-            }
+            let _fetch = this.traceFetch;
+            conn.credentials.forEach((cred) => {
+                switch (cred.authSchemeConfig.type) {
+                    case 'api-key':
+                        _fetch = this.apiKeyFetcher(cred, _fetch);
+                        break;
+                    case 'basic-auth':
+                        _fetch = this.basicAuthFetcher(cred, _fetch);
+                        break;
+                    case 'jwt-bearer':
+                        _fetch = this.bearerTokenFetcher(cred, _fetch);
+                        break;
+                    case 'oauth2':
+                        _fetch = this.oauth2Fetcher(cred, _fetch);
+                        break;
+                    case 'certificate':
+                        _fetch = this.mtlsFetcher(cred, _fetch);
+                        break;
+                    default:
+                        break;
+                }
+            });
+            return _fetch(_input, init);
         };
         return Promise.resolve(_fn);
     }
@@ -283,7 +305,7 @@ export class VersoriCredentialsFactory {
         if (!raw) {
             throw new Error(`Raw data not found for connection ${name} with credential ID ${credId}`);
         }
-        let buffer = raw?.credential?.data['raw'] ?? undefined;
+        const buffer = raw?.credential?.data['raw'] ?? undefined;
         if (!buffer) {
             throw new Error(`Credential ${raw?.credential?.id} is missing raw data, please contact your administrator`);
         }
@@ -322,11 +344,11 @@ export class VersoriCredentialsFactory {
         }
         return staticConn.credentials[0].credential.id;
     }
-    apiKeyFetcher(conn, fn) {
+    apiKeyFetcher(cred, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(cred.credential.id);
             const token = tokenResponse.token?.accessToken;
-            const asc = conn.credentials[0].authSchemeConfig.apiKey;
+            const asc = cred.authSchemeConfig.apiKey;
             if (!token) {
                 throw new Error('Token not found');
             }
@@ -368,11 +390,11 @@ export class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
     }
-    async basicAuthFetcher(conn, fn) {
+    basicAuthFetcher(cred, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(cred.credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
                 throw new Error('Token not found');
@@ -397,12 +419,12 @@ export class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
-    async bearerTokenFetcher(conn, fn) {
+    bearerTokenFetcher(cred, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(cred.credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
                 throw new Error('Token not found');
@@ -427,11 +449,11 @@ export class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
     }
-    async oauth2Fetcher(conn, fn) {
+    oauth2Fetcher(cred, fn) {
         const refreshFn = async (input, init, forceRefresh = false) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id, forceRefresh);
+            const tokenResponse = await this.getToken(cred.credential.id, forceRefresh);
             const token = tokenResponse.token?.accessToken;
             const tokenType = tokenResponse.token?.tokenType;
             if (!token) {
@@ -482,7 +504,28 @@ export class VersoriCredentialsFactory {
             }
             return Promise.resolve(resp);
         };
-        return Promise.resolve(_fn);
+        return _fn;
+    }
+    mtlsFetcher(cred, fn) {
+        const _fn = async (input, init) => {
+            const raw = await this.getRaw(cred.credential.id);
+            if (!raw?.credential?.data) {
+                throw new Error(`Cannot fetch MTLS credentials for connection ${cred.credential.name}, no data found`);
+            }
+            const cert = new TextDecoder().decode(raw.credential.data['certificate']);
+            const key = new TextDecoder().decode(raw.credential.data['key']);
+            const caCerts = new TextDecoder().decode(raw.credential.data['ca'] || '');
+            const httpClient = Deno.createHttpClient({
+                cert,
+                key,
+                caCerts: caCerts ? [caCerts] : [],
+            });
+            return fn(input, {
+                ...init,
+                client: httpClient,
+            });
+        };
+        return _fn;
     }
     async getToken(id, forceRefresh = false) {
         try {

package/esm/src/dsl/tasks/HttpTask.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import type * as express from 'express';
 import { AsyncWorkflow } from '../../context/AsyncWorkflow.js';
 import { Context, ContextImpl, CreateIssue } from '../../context/Context.js';
 import { Issue } from '../../issues/Issues.js';
@@ -55,6 +56,7 @@ export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, Pa
     get fetch(): typeof globalThis.fetch;
     get baseUrl(): Promise<string>;
     nextPage(_nextParams: PageParams): Promise<void>;
+    request(): express.Request | undefined;
 }
 export declare function http<In = any, Out = any, PageParams = unknown>(taskId: string, opts: HttpOptions<In, Out, PageParams>, fn: HttpContextFunc<In, Out, PageParams>): Task<In, Out>;
 //# sourceMappingURL=HttpTask.d.ts.map

package/esm/src/dsl/tasks/HttpTask.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,gCAAgC,CAAC;AAC/D,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAC;AAC/C,OAAO,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAE/D,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,cAAc,EAAsB,MAAM,kBAAkB,CAAC;AAClG,OAAO,EAAE,mBAAmB,EAAE,MAAM,uCAAuC,CAAC;AAC5E,OAAO,EAAE,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAMjE,MAAM,WAAW,WAAW,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,CAAE,SAAQ,OAAO,CAAC,IAAI,CAAC;IAC5E,KAAK,EAAE,OAAO,KAAK,CAAC;IACpB,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IACzC,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,QAAQ,EAAE,CAAC,UAAU,EAAE,UAAU,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;IACpD,OAAO,EAAE,OAAO,CAAC,MAAM,CAAC,CAAC;CAC5B;AAED,MAAM,MAAM,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI,CAC/C,GAAG,EAAE,WAAW,CAAC,EAAE,EAAE,UAAU,CAAC,KAC/B,OAAO,CAAC,GAAG,CAAC,CAAC;AAElB,MAAM,MAAM,eAAe,CAAC,CAAC,IAAI;IAC7B,aAAa,EAAE,CAAC,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,IAAI;IAC3C,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,CAAC,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;CAC5C,CAAC;AAEF,qBAAa,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAE,YAAW,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;IACnE,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAU;IAE5B,EAAE,EAAE,MAAM,CAAC;IAEX,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;IAEzC,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,CAAC;gBAGnC,EAAE,EAAE,MAAM,EACV,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC;IAO5C,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAI9D,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC;IAIjE,UAAU,IAAI,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC;IAI5B,MAAM,CAAC,OAAO,GAAG,GAAG,SAAS,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,IAAI,GAAG,GAAG,KAAK,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IACtF,MAAM,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,GAAG,KAAK,OAAO,EAAE,GAAG,SAAS,CAAC,EAAE,EAAE,OAAO,CAAC;IASzE,KAAK,IAAI,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC;CAGzB;AAED,qBAAa,eAAe,CAAC,CAAC,EAAE,UAAU,CAAE,YAAW,WAAW,CAAC,CAAC,EAAE,UAAU,CAAC;;IAC7E,mBAAmB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAM;IAC9C,UAAU,CAAC,EAAE,UAAU,CAAC;gBAUpB,GAAG,EAAE,WAAW,CAAC,CAAC,EAAE,GAAG,CAAC,EACxB,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnC,cAAc,EAAE,cAAc,EAC9B,aAAa,CAAC,EAAE,OAAO,UAAU,CAAC,KAAK,EACvC,cAAc,CAAC,EAAE,cAAc,EAC/B,UAAU,CAAC,EAAE,UAAU;IAiB3B,IAAI,GAAG,IAAI,MAAM,CAEhB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,SAAS,IAAI,IAAI,CAEpB;IAED,IAAI,UAAU,IAAI,UAAU,GAAG,SAAS,CAEvC;IAED,IAAI,IAAI,IAAI,CAAC,CAEZ;IAED,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,QAAQ;IAIvC,WAAW,IAAI,mBAAmB;IAIlC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAI7E,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;IAIzB,IAAI,KAAK,IAAI,OAAO,UAAU,CAAC,KAAK,CAKnC;IAED,IAAI,OAAO,IAAI,OAAO,CAAC,MAAM,CAAC,CAE7B;IAEK,QAAQ,CAAC,WAAW,EAAE,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;~~CAGzD~~;AAED,wBAAgB,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,UAAU,GAAG,OAAO,EAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GACzC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAEf"}
1	+ {"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"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"}

package/esm/src/dsl/tasks/HttpTask.js CHANGED Viewed

@@ -138,6 +138,9 @@ export class HttpContextImpl {
     async nextPage(_nextParams) {
         throw new Error('Method not implemented.');
     }
+    request() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").request();
+    }
 }
 _HttpContextImpl_dynamicFetcher = new WeakMap(), _HttpContextImpl_staticFetcher = new WeakMap(), _HttpContextImpl_baseUrlFetcher = new WeakMap(), _HttpContextImpl_inner = new WeakMap();
 export function http(taskId, opts, fn) {

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

	@@ -1 +1 @@
1	- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;~~AACtF~~,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;~~AAmD7C~~,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,~~CAuRxE~~,CAAC"}
1	+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8RxE,CAAC"}

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

@@ -1,8 +1,8 @@
 import cors from 'cors';
 import { pipeline } from 'node:stream/promises';
 import { Observable } from 'rxjs';
+import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
 import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
-import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware } from '../../../dsl/http/versori/webhookmiddleware.js';
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,
     headers: {
@@ -54,7 +54,7 @@ export const webhookCompiler = {
         if (trigger.options.response?.onError) {
             onError = trigger.options.response.onError;
         }
-        const ctxOptionsFn = (res) => ({
+        const ctxOptionsFn = (req, res) => ({
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -65,6 +65,7 @@ export const webhookCompiler = {
                     sendResponse(res, onError(ctx));
                 }
             },
+            request: req,
         });
         return new Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -92,7 +93,7 @@ export const webhookCompiler = {
                 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));
+                    let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     const staticActivation = res.locals.activation;
                     if (staticActivation) {
                         executionCtx = executionCtx.withActivation(staticActivation);
@@ -146,7 +147,7 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     activations.forEach((activation) => {
@@ -202,7 +203,7 @@ export const webhookCompiler = {
                         return;
                     }
                     const activationCtx = ctx.contextProvider.create(req.body, {
-                        ...ctxOptionsFn(res),
+                        ...ctxOptionsFn(req, res),
                         activation,
                     });
                     span.setAttribute('execution.id', activationCtx.executionId);

package/esm/src/interpreter/memory/compilers/webhook.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;~~AAkD7C~~,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,~~CAuRxE~~,CAAC"}
1	+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8RxE,CAAC"}

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

@@ -1,8 +1,8 @@
 import cors from 'cors';
 import { pipeline } from 'node:stream/promises';
 import { Observable } from 'rxjs';
+import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
 import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
-import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware } from '../../../dsl/http/versori/webhookmiddleware.js';
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,
     headers: {
@@ -54,7 +54,7 @@ export const webhookCompiler = {
         if (trigger.options.response?.onError) {
             onError = trigger.options.response.onError;
         }
-        const ctxOptionsFn = (res) => ({
+        const ctxOptionsFn = (req, res) => ({
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -65,6 +65,7 @@ export const webhookCompiler = {
                     sendResponse(res, onError(ctx));
                 }
             },
+            request: req,
         });
         return new Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -92,7 +93,7 @@ export const webhookCompiler = {
                 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));
+                    let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     const staticActivation = res.locals.activation;
                     if (staticActivation) {
                         executionCtx = executionCtx.withActivation(staticActivation);
@@ -146,7 +147,7 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     activations.forEach((activation) => {
@@ -202,7 +203,7 @@ export const webhookCompiler = {
                         return;
                     }
                     const activationCtx = ctx.contextProvider.create(req.body, {
-                        ...ctxOptionsFn(res),
+                        ...ctxOptionsFn(req, res),
                         activation,
                     });
                     span.setAttribute('execution.id', activationCtx.executionId);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@versori/run",
-  "version": "v0.2.18",
+  "version": "v0.2.20",
   "description": "Versori Run",
   "homepage": "https://github.com/versori/versori-run#readme",
   "repository": {

package/script/src/context/Context.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import type * as express from 'express';
 import { Activation } from '../dsl/http/types.js';
 import { CredentialsProvider } from '../dsl/http/versori/contextcredentials.js';
 import { QueueAPI } from '../interpreter/durable/Queue.js';
@@ -10,6 +11,7 @@ export type OnErrorFn = (ctx: Context<any>) => void;
 export type ContextOptions = {
     activation?: Activation;
     workflowId?: string;
+    request?: express.Request;
     onSuccess?: OnSuccessFn;
     onError?: OnErrorFn;
 };
@@ -40,6 +42,7 @@ export interface Context<D> {
     createIssue(issue: CreateIssue, options?: {
         deduplicate?: boolean;
     }): Promise<Issue | null>;
+    request(): express.Request | undefined;
 }
 export declare class ContextImpl<D, Index = void> implements Context<D> {
     #private;
@@ -58,6 +61,7 @@ export declare class ContextImpl<D, Index = void> implements Context<D> {
     withActivation(activation: Activation): ContextImpl<D, Index>;
     withData<D2>(data: D2): ContextImpl<D2, Index>;
     openKv(scope?: KeyValueScope): KeyValue;
+    request(): express.Request | undefined;
     start(group: string, opts: WorkflowOpts): Promise<AsyncWorkflow>;
     createIssue(issue: CreateIssue, options?: {
         deduplicate?: boolean;

package/script/src/context/Context.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../../src/src/context/Context.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAClD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2CAA2C,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAC9E,OAAO,EAAE,MAAM,EAAE,MAAM,oCAAoC,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,MAAM,WAAW,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AACtD,MAAM,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;AAEpD,MAAM,MAAM,cAAc,GAAG;IACzB,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,WAAW,CAAC;IACxB,OAAO,CAAC,EAAE,SAAS,CAAC;CACvB,CAAC;AAKF,MAAM,MAAM,YAAY,GAAG;IACvB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CACpB,CAAC;AAEF,MAAM,MAAM,WAAW,GAAG;IACtB,QAAQ,EAAE,KAAK,GAAG,QAAQ,GAAG,MAAM,CAAC;IACpC,KAAK,EAAE,MAAM,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACvC,CAAC;AAEF,MAAM,WAAW,OAAO,CAAC,CAAC;IACtB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjB,UAAU,CAAC,EAAE,UAAU,CAAC;IAExB;;;OAGG;IACH,MAAM,CAAC,KAAK,CAAC,EAAE,aAAa,GAAG,QAAQ,CAAC;IAExC,KAAK,CAAC,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;IAE9E,WAAW,IAAI,mBAAmB,CAAC;IAEnC,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC,CAAC;~~CAC/F~~;AAED,qBAAa,WAAW,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,CAAE,YAAW,OAAO,CAAC,CAAC,CAAC;;IAC3D,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,IAAI,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC;IAEjB,GAAG,EAAE,KAAK,CAAC;IAEX,QAAQ,CAAC,GAAG,EAAE,gBAAgB,CAAC;IAC/B,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC;IAE1B,QAAQ,CAAC,OAAO,EAAE,cAAc,CAAC;gBAI7B,GAAG,EAAE,MAAM,EACX,GAAG,EAAE,gBAAgB,EACrB,KAAK,EAAE,mBAAmB,EAC1B,WAAW,EAAE,MAAM,EACnB,SAAS,EAAE,IAAI,EACf,IAAI,EAAE,CAAC,EACP,MAAM,EAAE,QAAQ,EAChB,KAAK,CAAC,EAAE,QAAQ,EAChB,OAAO,GAAE,cAAmB;IAsBhC,IAAI,UAAU,IAAI,UAAU,GAAG,SAAS,CAEvC;IAED,IAAI,UAAU,IAAI,MAAM,GAAG,SAAS,CAEnC;IAED,QAAQ,CAAC,GAAG,EAAE,MAAM,GAAG,WAAW,CAAC,CAAC,EAAE,MAAM,CAAC;IAiB7C,cAAc,CAAC,UAAU,EAAE,UAAU,GAAG,WAAW,CAAC,CAAC,EAAE,KAAK,CAAC;IAsB7D,QAAQ,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,GAAG,WAAW,CAAC,EAAE,EAAE,KAAK,CAAC;IAc9C,MAAM,CAAC,KAAK,GAAE,aAA2B,GAAG,QAAQ;~~IAe9C~~,KAAK,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,YAAY,GAAG,OAAO,CAAC,aAAa,CAAC;IAgCtE,WAAW,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,CAAC,EAAE;QAAE,WAAW,CAAC,EAAE,OAAO,CAAA;KAAE,GAAG,OAAO,CAAC,KAAK,GAAG,IAAI,CAAC;IAO3F,WAAW,IAAI,mBAAmB;IAQlC,OAAO,CAAC,KAAK,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAe5C,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;CAQlD"}
1	+ {"version":3,"file":"Context.d.ts","sourceRoot":"","sources":["../../../src/src/context/Context.ts"],"names":[],"mappings":"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"}

package/script/src/context/Context.js CHANGED Viewed

@@ -120,6 +120,9 @@ class ContextImpl {
             activationId: this.activation?.id,
         });
     }
+    request() {
+        return this.options.request;
+    }
     async start(group, opts) {
         // this makes a post request to the endpoint sending a message and schedule the workflow to run
         if (!this.queue) {

package/script/src/dsl/http/versori/roundtripper.d.ts CHANGED Viewed

@@ -4,6 +4,9 @@ import { BaseUrlFetcher, ConfigReader, DynamicFetcher, RoundTripperFactory } fro
 import { CredentialsProvider, Token } from './contextcredentials.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
+type denoFetch = (input: RequestInfo | URL, init?: RequestInit & {
+    client?: Deno.HttpClient;
+}) => Promise<Response>;
 /**
  * VersoriRoundTripper is an implementation of the RoundTripperFactory interface for Versori connections.
  * This is the intended implementation for when projects/services are hosted on Versori infrastructure.
@@ -27,7 +30,7 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     static fromEnv(logger: Logger, tracer: Tracer): VersoriCredentialsFactory;
     private changeRequestInit;
     private changeBaseUrl;
-    create(connName: string): Promise<typeof fetch | undefined>;
+    create(connName: string): Promise<denoFetch | undefined>;
     createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
     private traceFetch;
     credentials(): CredentialsProvider;
@@ -39,7 +42,9 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     private basicAuthFetcher;
     private bearerTokenFetcher;
     private oauth2Fetcher;
+    private mtlsFetcher;
     private getToken;
     private getRaw;
 }
+export {};
 //# sourceMappingURL=roundtripper.d.ts.map

package/script/src/dsl/http/versori/roundtripper.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,~~EAEZ~~,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAM/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;~~AAGrD~~;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,~~OAAO~~,~~KAAK,~~GAAG,SAAS,CAAC;~~IAqC3D~~,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;~~IAgDxE~~,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAOlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;~~IAuC9C~~,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;~~YAoDP~~,gBAAgB;~~YAmChB~~,kBAAkB;~~YAiClB~~,aAAa;~~YAwEb~~,QAAQ;YA2BR,MAAM;CA0BvB"}
1	+ {"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAElE,OAAO,EAEH,cAAc,EACd,YAAY,EAGZ,cAAc,EACd,mBAAmB,EACtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,mBAAmB,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAM/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAIrD,KAAK,SAAS,GAAG,CACb,KAAK,EAAE,WAAW,GAAG,GAAG,EACxB,IAAI,CAAC,EAAE,WAAW,GAAG;IAAE,MAAM,CAAC,EAAE,IAAI,CAAC,UAAU,CAAA;CAAE,KAChD,OAAO,CAAC,QAAQ,CAAC,CAAC;AAIvB;;;;;;;;;;GAUG;AACH,qBAAa,yBAA0B,YAAW,mBAAmB;IACjE,OAAO,CAAC,WAAW,CAA0B;IAC7C,OAAO,CAAC,YAAY,CAAS;IAE7B,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,MAAM,CAAS;IAEvB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM,EACd,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,YAAY;IAe3B,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IAoCzE,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;IAkDxD,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA6DxE,OAAO,CAAC,UAAU;IAqClB,WAAW,IAAI,mBAAmB;IAOlC,cAAc,CAAC,YAAY,EAAE,MAAM,GAAG,cAAc;IAyC9C,cAAc,CAChB,IAAI,EAAE,MAAM,EACZ,YAAY,UAAQ,EACpB,YAAY,CAAC,EAAE,MAAM,GACtB,OAAO,CAAC,KAAK,CAAC;IAiBX,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC;YAqB9D,uBAAuB;IAoDrC,OAAO,CAAC,aAAa;IAoDrB,OAAO,CAAC,gBAAgB;IAmCxB,OAAO,CAAC,kBAAkB;IAiC1B,OAAO,CAAC,aAAa;IAqErB,OAAO,CAAC,WAAW;YA6BL,QAAQ;YA2BR,MAAM;CA0BvB"}

package/script/src/dsl/http/versori/roundtripper.js CHANGED Viewed

@@ -154,18 +154,29 @@ class VersoriCredentialsFactory {
                 return this.traceFetch(input, init);
             }
             const _input = this.changeRequestInit(input, conn);
-            switch (conn.credentials[0].authSchemeConfig.type) {
-                case 'api-key':
-                    return (await this.apiKeyFetcher(conn, this.traceFetch))(_input, init);
-                case 'basic-auth':
-                    return (await this.basicAuthFetcher(conn, this.traceFetch))(_input, init);
-                case 'jwt-bearer':
-                    return (await this.bearerTokenFetcher(conn, this.traceFetch))(_input, init);
-                case 'oauth2':
-                    return (await this.oauth2Fetcher(conn, this.traceFetch))(_input, init);
-                default:
-                    return this.traceFetch(_input, init);
-            }
+            let _fetch = this.traceFetch;
+            conn.credentials.forEach((cred) => {
+                switch (cred.authSchemeConfig.type) {
+                    case 'api-key':
+                        _fetch = this.apiKeyFetcher(cred, _fetch);
+                        break;
+                    case 'basic-auth':
+                        _fetch = this.basicAuthFetcher(cred, _fetch);
+                        break;
+                    case 'jwt-bearer':
+                        _fetch = this.bearerTokenFetcher(cred, _fetch);
+                        break;
+                    case 'oauth2':
+                        _fetch = this.oauth2Fetcher(cred, _fetch);
+                        break;
+                    case 'certificate':
+                        _fetch = this.mtlsFetcher(cred, _fetch);
+                        break;
+                    default:
+                        break;
+                }
+            });
+            return _fetch(_input, init);
         };
         return Promise.resolve(_fn);
     }
@@ -187,18 +198,29 @@ class VersoriCredentialsFactory {
                 })(activation, input, init);
             }
             const _input = this.changeRequestInit(input, conn);
-            switch (conn.credentials[0].authSchemeConfig.type) {
-                case 'api-key':
-                    return (await this.apiKeyFetcher(conn, this.traceFetch))(_input, init);
-                case 'basic-auth':
-                    return (await this.basicAuthFetcher(conn, this.traceFetch))(_input, init);
-                case 'jwt-bearer':
-                    return (await this.bearerTokenFetcher(conn, this.traceFetch))(_input, init);
-                case 'oauth2':
-                    return (await this.oauth2Fetcher(conn, this.traceFetch))(_input, init);
-                default:
-                    return this.traceFetch(_input, init);
-            }
+            let _fetch = this.traceFetch;
+            conn.credentials.forEach((cred) => {
+                switch (cred.authSchemeConfig.type) {
+                    case 'api-key':
+                        _fetch = this.apiKeyFetcher(cred, _fetch);
+                        break;
+                    case 'basic-auth':
+                        _fetch = this.basicAuthFetcher(cred, _fetch);
+                        break;
+                    case 'jwt-bearer':
+                        _fetch = this.bearerTokenFetcher(cred, _fetch);
+                        break;
+                    case 'oauth2':
+                        _fetch = this.oauth2Fetcher(cred, _fetch);
+                        break;
+                    case 'certificate':
+                        _fetch = this.mtlsFetcher(cred, _fetch);
+                        break;
+                    default:
+                        break;
+                }
+            });
+            return _fetch(_input, init);
         };
         return Promise.resolve(_fn);
     }
@@ -286,7 +308,7 @@ class VersoriCredentialsFactory {
         if (!raw) {
             throw new Error(`Raw data not found for connection ${name} with credential ID ${credId}`);
         }
-        let buffer = raw?.credential?.data['raw'] ?? undefined;
+        const buffer = raw?.credential?.data['raw'] ?? undefined;
         if (!buffer) {
             throw new Error(`Credential ${raw?.credential?.id} is missing raw data, please contact your administrator`);
         }
@@ -325,11 +347,11 @@ class VersoriCredentialsFactory {
         }
         return staticConn.credentials[0].credential.id;
     }
-    apiKeyFetcher(conn, fn) {
+    apiKeyFetcher(cred, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(cred.credential.id);
             const token = tokenResponse.token?.accessToken;
-            const asc = conn.credentials[0].authSchemeConfig.apiKey;
+            const asc = cred.authSchemeConfig.apiKey;
             if (!token) {
                 throw new Error('Token not found');
             }
@@ -371,11 +393,11 @@ class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
     }
-    async basicAuthFetcher(conn, fn) {
+    basicAuthFetcher(cred, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(cred.credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
                 throw new Error('Token not found');
@@ -400,12 +422,12 @@ class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
-    async bearerTokenFetcher(conn, fn) {
+    bearerTokenFetcher(cred, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(cred.credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
                 throw new Error('Token not found');
@@ -430,11 +452,11 @@ class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        return Promise.resolve(_fn);
+        return _fn;
     }
-    async oauth2Fetcher(conn, fn) {
+    oauth2Fetcher(cred, fn) {
         const refreshFn = async (input, init, forceRefresh = false) => {
-            const tokenResponse = await this.getToken(conn.credentials[0].credential.id, forceRefresh);
+            const tokenResponse = await this.getToken(cred.credential.id, forceRefresh);
             const token = tokenResponse.token?.accessToken;
             const tokenType = tokenResponse.token?.tokenType;
             if (!token) {
@@ -485,7 +507,28 @@ class VersoriCredentialsFactory {
             }
             return Promise.resolve(resp);
         };
-        return Promise.resolve(_fn);
+        return _fn;
+    }
+    mtlsFetcher(cred, fn) {
+        const _fn = async (input, init) => {
+            const raw = await this.getRaw(cred.credential.id);
+            if (!raw?.credential?.data) {
+                throw new Error(`Cannot fetch MTLS credentials for connection ${cred.credential.name}, no data found`);
+            }
+            const cert = new TextDecoder().decode(raw.credential.data['certificate']);
+            const key = new TextDecoder().decode(raw.credential.data['key']);
+            const caCerts = new TextDecoder().decode(raw.credential.data['ca'] || '');
+            const httpClient = Deno.createHttpClient({
+                cert,
+                key,
+                caCerts: caCerts ? [caCerts] : [],
+            });
+            return fn(input, {
+                ...init,
+                client: httpClient,
+            });
+        };
+        return _fn;
     }
     async getToken(id, forceRefresh = false) {
         try {

package/script/src/dsl/tasks/HttpTask.d.ts CHANGED Viewed

@@ -1,3 +1,4 @@
+import type * as express from 'express';
 import { AsyncWorkflow } from '../../context/AsyncWorkflow.js';
 import { Context, ContextImpl, CreateIssue } from '../../context/Context.js';
 import { Issue } from '../../issues/Issues.js';
@@ -55,6 +56,7 @@ export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, Pa
     get fetch(): typeof globalThis.fetch;
     get baseUrl(): Promise<string>;
     nextPage(_nextParams: PageParams): Promise<void>;
+    request(): express.Request | undefined;
 }
 export declare function http<In = any, Out = any, PageParams = unknown>(taskId: string, opts: HttpOptions<In, Out, PageParams>, fn: HttpContextFunc<In, Out, PageParams>): Task<In, Out>;
 //# sourceMappingURL=HttpTask.d.ts.map

package/script/src/dsl/tasks/HttpTask.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"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~~CAGzD~~;AAED,wBAAgB,IAAI,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,UAAU,GAAG,OAAO,EAC1D,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,EACtC,EAAE,EAAE,eAAe,CAAC,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GACzC,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,CAEf"}
1	+ {"version":3,"file":"HttpTask.d.ts","sourceRoot":"","sources":["../../../../src/src/dsl/tasks/HttpTask.ts"],"names":[],"mappings":"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"}

package/script/src/dsl/tasks/HttpTask.js CHANGED Viewed

@@ -143,6 +143,9 @@ class HttpContextImpl {
     async nextPage(_nextParams) {
         throw new Error('Method not implemented.');
     }
+    request() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").request();
+    }
 }
 exports.HttpContextImpl = HttpContextImpl;
 _HttpContextImpl_dynamicFetcher = new WeakMap(), _HttpContextImpl_staticFetcher = new WeakMap(), _HttpContextImpl_baseUrlFetcher = new WeakMap(), _HttpContextImpl_inner = new WeakMap();

package/script/src/interpreter/durable/compilers/webhook.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;~~AACtF~~,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;~~AAmD7C~~,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,~~CAuRxE~~,CAAC"}
1	+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8RxE,CAAC"}

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

@@ -7,8 +7,8 @@ exports.webhookCompiler = void 0;
 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 WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,
     headers: {
@@ -60,7 +60,7 @@ exports.webhookCompiler = {
         if (trigger.options.response?.onError) {
             onError = trigger.options.response.onError;
         }
-        const ctxOptionsFn = (res) => ({
+        const ctxOptionsFn = (req, res) => ({
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -71,6 +71,7 @@ exports.webhookCompiler = {
                     sendResponse(res, onError(ctx));
                 }
             },
+            request: req,
         });
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -98,7 +99,7 @@ exports.webhookCompiler = {
                 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));
+                    let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     const staticActivation = res.locals.activation;
                     if (staticActivation) {
                         executionCtx = executionCtx.withActivation(staticActivation);
@@ -152,7 +153,7 @@ exports.webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     activations.forEach((activation) => {
@@ -208,7 +209,7 @@ exports.webhookCompiler = {
                         return;
                     }
                     const activationCtx = ctx.contextProvider.create(req.body, {
-                        ...ctxOptionsFn(res),
+                        ...ctxOptionsFn(req, res),
                         activation,
                     });
                     span.setAttribute('execution.id', activationCtx.executionId);

package/script/src/interpreter/memory/compilers/webhook.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"~~AAOA~~,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;~~AAkD7C~~,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,~~CAuRxE~~,CAAC"}
1	+ {"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAgD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA8RxE,CAAC"}

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

@@ -7,8 +7,8 @@ exports.webhookCompiler = void 0;
 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 WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,
     headers: {
@@ -60,7 +60,7 @@ exports.webhookCompiler = {
         if (trigger.options.response?.onError) {
             onError = trigger.options.response.onError;
         }
-        const ctxOptionsFn = (res) => ({
+        const ctxOptionsFn = (req, res) => ({
             onSuccess: (ctx) => {
                 if (isSync) {
                     sendResponse(res, onSuccess(ctx));
@@ -71,6 +71,7 @@ exports.webhookCompiler = {
                     sendResponse(res, onError(ctx));
                 }
             },
+            request: req,
         });
         return new rxjs_1.Observable((subscriber) => {
             if (!ctx.webhookRouter) {
@@ -98,7 +99,7 @@ exports.webhookCompiler = {
                 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));
+                    let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     const staticActivation = res.locals.activation;
                     if (staticActivation) {
                         executionCtx = executionCtx.withActivation(staticActivation);
@@ -152,7 +153,7 @@ exports.webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(res));
+                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
                     activations.forEach((activation) => {
@@ -208,7 +209,7 @@ exports.webhookCompiler = {
                         return;
                     }
                     const activationCtx = ctx.contextProvider.create(req.body, {
-                        ...ctxOptionsFn(res),
+                        ...ctxOptionsFn(req, res),
                         activation,
                     });
                     span.setAttribute('execution.id', activationCtx.executionId);