@versori/run 0.2.8 → 0.2.10

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.VersoriConfigReader = void 0;
 exports.LoadConfigFromFile = LoadConfigFromFile;
 const constants_js_1 = require("./constants.js");
 /**
@@ -20,3 +21,41 @@ function LoadConfigFromFile() {
     const cfg = JSON.parse(Deno.readTextFileSync(configFileName));
     return cfg;
 }
+class VersoriConfigReader {
+    constructor(cfg) {
+        Object.defineProperty(this, "versoriCfg", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.versoriCfg = cfg;
+    }
+    static fromEnv(log) {
+        const versoriCfg = LoadConfigFromFile();
+        if (!versoriCfg) {
+            log.error('Failed to load Versori SDK configuration');
+            throw new Error('Failed to load Versori SDK configuration');
+        }
+        return new VersoriConfigReader(versoriCfg);
+    }
+    getCnxMapping(name) {
+        return this.versoriCfg.mappings.find((c) => c.name.toLowerCase() === name.toLowerCase());
+    }
+    getConnectionID(connName) {
+        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
+            c.name.toLowerCase() === connName.toLowerCase());
+        if (!conn || !conn.connId) {
+            return '';
+        }
+        return conn.connId;
+    }
+    getTemplateID(templateName) {
+        const template = this.versoriCfg.mappings.find((c) => c.dynamic && c.name.toLowerCase() === templateName.toLowerCase());
+        if (!template || !template.templateId) {
+            return '';
+        }
+        return template.templateId;
+    }
+}
+exports.VersoriConfigReader = VersoriConfigReader;

package/script/src/dsl/http/versori/constants.d.ts

@@ -15,4 +15,5 @@ export declare const envVarClientSecret = "RUN_CLIENT_SECRET";
 export declare const envVarTokenEndpoint = "RUN_TOKEN_ENDPOINT";
 export declare const envVarInternalToken = "RUN_INTERNAL_TOKEN";
 export declare const envVarLocalRun = "RUN_LOCAL";
+export declare const cronPort = 3001;
 //# sourceMappingURL=constants.d.ts.map

package/script/src/dsl/http/versori/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAChD,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AACvD,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AACrD,eAAO,MAAM,wBAAwB,kCAAkC,CAAC;AACxE,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAChE,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,kBAAkB,yCAAyC,CAAC;AACzE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAGlD,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AACtD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AAGxD,eAAO,MAAM,cAAc,cAAc,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/constants.ts"],"names":[],"mappings":"AACA,eAAO,MAAM,WAAW,wBAAwB,CAAC;AACjD,eAAO,MAAM,WAAW,uBAAuB,CAAC;AAChD,eAAO,MAAM,qBAAqB,oBAAoB,CAAC;AACvD,eAAO,MAAM,eAAe,mBAAmB,CAAC;AAChD,eAAO,MAAM,aAAa,0BAA0B,CAAC;AACrD,eAAO,MAAM,wBAAwB,kCAAkC,CAAC;AACxE,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAChE,eAAO,MAAM,gBAAgB,qBAAqB,CAAC;AACnD,eAAO,MAAM,kBAAkB,yCAAyC,CAAC;AACzE,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AACzD,eAAO,MAAM,aAAa,wBAAwB,CAAC;AAEnD,eAAO,MAAM,gBAAgB,oBAAoB,CAAC;AAGlD,eAAO,MAAM,cAAc,kBAAkB,CAAC;AAC9C,eAAO,MAAM,kBAAkB,sBAAsB,CAAC;AACtD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AACxD,eAAO,MAAM,mBAAmB,uBAAuB,CAAC;AAGxD,eAAO,MAAM,cAAc,cAAc,CAAC;AAI1C,eAAO,MAAM,QAAQ,OAAO,CAAC"}

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.envVarLocalRun = exports.envVarInternalToken = exports.envVarTokenEndpoint = exports.envVarClientSecret = exports.envVarClientId = exports.envVarConfigFile = exports.envVarVersion = exports.envVarOtelTracesURL = exports.envVarCredsBaseURL = exports.envVarSelfRefURL = exports.envVarCronApiBaseURL = exports.envVarPlatformApiBaseURL = exports.envVarOrgSlug = exports.envVarProjectId = exports.envVarEnvironmentName = exports.envVarEnvId = exports.envVarOrgId = void 0;
+exports.cronPort = exports.envVarLocalRun = exports.envVarInternalToken = exports.envVarTokenEndpoint = exports.envVarClientSecret = exports.envVarClientId = exports.envVarConfigFile = exports.envVarVersion = exports.envVarOtelTracesURL = exports.envVarCredsBaseURL = exports.envVarSelfRefURL = exports.envVarCronApiBaseURL = exports.envVarPlatformApiBaseURL = exports.envVarOrgSlug = exports.envVarProjectId = exports.envVarEnvironmentName = exports.envVarEnvId = exports.envVarOrgId = void 0;
 // This file contains constants used in the Versori DSL HTTP client.
 exports.envVarOrgId = 'RUN_ORGANISATION_ID';
 exports.envVarEnvId = 'RUN_ENVIRONMENT_ID';
@@ -22,3 +22,5 @@ exports.envVarTokenEndpoint = 'RUN_TOKEN_ENDPOINT';
 exports.envVarInternalToken = 'RUN_INTERNAL_TOKEN';
 // The following are for running locally
 exports.envVarLocalRun = 'RUN_LOCAL';
+// please no changerino
+exports.cronPort = 3001; // The port on which the cron API communicates with the service

package/script/src/dsl/http/versori/contextcredentials.d.ts

@@ -3,10 +3,6 @@ export type Token = {
     tokenType: string;
     expiry?: Date;
 };
-export interface Credentials {
-    getRaw(name: string): Promise<Uint8Array>;
-    getAccessToken(name: string, forceRefresh?: boolean): Promise<Token>;
-}
 export interface CredentialsProvider {
     getRaw(name: string, activationId?: string): Promise<Uint8Array>;
     getAccessToken(name: string, forceRefresh?: boolean, activationId?: string): Promise<Token>;

package/script/src/dsl/http/versori/contextcredentials.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"contextcredentials.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/contextcredentials.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,WAAW;IACxB,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAE1C,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;CACxE;AAED,MAAM,WAAW,mBAAmB;IAChC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAEjE,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;CAC/F"}
+{"version":3,"file":"contextcredentials.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/contextcredentials.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,KAAK,GAAG;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,CAAC,EAAE,IAAI,CAAC;CACjB,CAAC;AAEF,MAAM,WAAW,mBAAmB;IAChC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;IAEjE,cAAc,CAAC,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;CAC/F"}

package/script/src/dsl/http/versori/cronapi.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cronapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/cronapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAW3C,KAAK,IAAI,GAAG;IACR,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAC9C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAOlE,MAAM,CAAC,OAAO,IAAI,aAAa;IAmBzB,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5D,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE;CAoB3B"}
+{"version":3,"file":"cronapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/cronapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAY3C,KAAK,IAAI,GAAG;IACR,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,qBAAa,aAAc,YAAW,YAAY;IAC9C,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,KAAK,CAAS;IACtB,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,QAAQ,CAAU;gBAEd,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM;IAOlE,MAAM,CAAC,OAAO,IAAI,aAAa;IAmBzB,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAyB5D,UAAU,CAAC,KAAK,EAAE,IAAI,EAAE;CAoB3B"}

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

@@ -43,7 +43,7 @@ class CronAPIClient {
             throw new Error('Missing required environment variables');
         }
         const integrationUrl = Deno.env.get(constants_js_1.envVarSelfRefURL) ||
-            `http://svc-${projectId.toLowerCase()}-${envName.toLowerCase()}.sb-${orgSlug.toLowerCase()}.svc.cluster.local`;
+            `http://svc-${projectId.toLowerCase()}-${envName.toLowerCase()}.sb-${orgSlug.toLowerCase()}.svc.cluster.local:${constants_js_1.cronPort}`;
         return new CronAPIClient(baseUrl, envId, integrationUrl);
     }
     async updateCrons(crons) {

package/script/src/dsl/http/versori/proxyroundtripper.d.ts

@@ -1,22 +1,20 @@
-import { DynamicFetcher, RoundTripperFactory } from '../types.js';
+import { ConfigReader, DynamicFetcher, RoundTripperFactory } from '../types.js';
 import { PlatformAPIClient } from './platformapi.js';
 import { Logger } from '../../../observability/mod.js';
-import { Credentials } from './contextcredentials.js';
+import { CredentialsProvider } from './contextcredentials.js';
 export declare class ProxyRoundTripper implements RoundTripperFactory {
     private platformApiBaseUrl;
-    private versoriCfg;
+    private cfgReader;
     private platformApiClient;
     private internalAuth;
     private log;
-    constructor(log: Logger, platformApiBaseUrl: string, platformApiClient: PlatformAPIClient);
+    constructor(log: Logger, platformApiBaseUrl: string, platformApiClient: PlatformAPIClient, cfgReader: ConfigReader);
     static fromEnv(log: Logger): ProxyRoundTripper;
-    private getConnectionID;
-    private getTemplateID;
     private makeProxyUrlString;
     private makeProxyInput;
     private makeProxyInit;
     create(connName: string): Promise<typeof fetch | undefined>;
     createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
-    credentials(): Credentials;
+    credentials(): CredentialsProvider;
 }
 //# sourceMappingURL=proxyroundtripper.d.ts.map

package/script/src/dsl/http/versori/proxyroundtripper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"proxyroundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/proxyroundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,cAAc,EAAE,mBAAmB,EAAoB,MAAM,aAAa,CAAC;AAEhG,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGvD,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AAKtD,qBAAa,iBAAkB,YAAW,mBAAmB;IACzD,OAAO,CAAC,kBAAkB,CAAS;IAEnC,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,GAAG,CAAS;gBAGhB,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,iBAAiB;IASxC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB;IAwB9C,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,cAAc;YA6BR,aAAa;IA4B3B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAoB3D,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqCxE,WAAW,IAAI,WAAW;CAc7B"}
+{"version":3,"file":"proxyroundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/proxyroundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,YAAY,EAAE,cAAc,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAE5F,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAK9D,qBAAa,iBAAkB,YAAW,mBAAmB;IACzD,OAAO,CAAC,kBAAkB,CAAS;IAEnC,OAAO,CAAC,SAAS,CAAe;IAEhC,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,GAAG,CAAS;gBAGhB,GAAG,EAAE,MAAM,EACX,kBAAkB,EAAE,MAAM,EAC1B,iBAAiB,EAAE,iBAAiB,EACpC,SAAS,EAAE,YAAY;IAS3B,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,iBAAiB;IA0B9C,OAAO,CAAC,kBAAkB;IAY1B,OAAO,CAAC,cAAc;YA6BR,aAAa;IA4B3B,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAoB3D,aAAa,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IAqCxE,WAAW,IAAI,mBAAmB;CAcrC"}

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

@@ -9,14 +9,14 @@ const internalauth_js_1 = require("./internalauth.js");
 // ProxyRoundTripper is a factory for creating roundtrippers that use the Versori Platform API proxy endpoints.
 // this should allow code from the platform to be run locally.
 class ProxyRoundTripper {
-    constructor(log, platformApiBaseUrl, platformApiClient) {
+    constructor(log, platformApiBaseUrl, platformApiClient, cfgReader) {
         Object.defineProperty(this, "platformApiBaseUrl", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "versoriCfg", {
+        Object.defineProperty(this, "cfgReader", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -40,7 +40,7 @@ class ProxyRoundTripper {
             writable: true,
             value: void 0
         });
-        this.versoriCfg = (0, configloader_js_1.LoadConfigFromFile)();
+        this.cfgReader = cfgReader;
         this.log = log;
         this.platformApiBaseUrl = platformApiBaseUrl;
         this.platformApiClient = platformApiClient;
@@ -50,6 +50,7 @@ class ProxyRoundTripper {
         const baseUrl = Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
         const orgId = Deno.env.get(constants_js_1.envVarOrgId);
         const envId = Deno.env.get(constants_js_1.envVarEnvId);
+        const cfgReader = configloader_js_1.VersoriConfigReader.fromEnv(log);
         if (!baseUrl || !orgId || !envId) {
             const missingVars = [];
             if (!baseUrl)
@@ -61,22 +62,7 @@ class ProxyRoundTripper {
             log.error(`Missing required environment variables: ${missingVars.join(', ')}`);
             throw new Error('Missing required environment variables: ' + missingVars.join(', '));
         }
-        return new ProxyRoundTripper(log, baseUrl, new platformapi_js_1.PlatformAPIClient(baseUrl, orgId, envId, log));
-    }
-    getConnectionID(connName) {
-        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
-            c.name.toLowerCase() === connName.toLowerCase());
-        if (!conn || !conn.connId) {
-            return '';
-        }
-        return conn.connId;
-    }
-    getTemplateID(templateName) {
-        const template = this.versoriCfg.mappings.find((c) => c.dynamic && c.name.toLowerCase() === templateName.toLowerCase());
-        if (!template || !template.templateId) {
-            return '';
-        }
-        return template.templateId;
+        return new ProxyRoundTripper(log, baseUrl, new platformapi_js_1.PlatformAPIClient(baseUrl, orgId, envId, log), cfgReader);
     }
     makeProxyUrlString(url, cnxId) {
         if ((0, helpers_js_1.isValidURL)(url)) {
@@ -137,7 +123,7 @@ class ProxyRoundTripper {
         return init;
     }
     create(connName) {
-        const cnxId = this.getConnectionID(connName);
+        const cnxId = this.cfgReader.getConnectionID(connName);
         if (!cnxId) {
             this.log.error(`Connection ${connName} not found in configuration`);
             return Promise.resolve(undefined);
@@ -151,7 +137,7 @@ class ProxyRoundTripper {
         return Promise.resolve(_fn);
     }
     createDynamic(templateName) {
-        const template = this.getTemplateID(templateName);
+        const template = this.cfgReader.getTemplateID(templateName);
         if (!template) {
             this.log.error(`Template ${templateName} not found in configuration, could be a static connection`);
             return Promise.resolve(undefined);
@@ -171,10 +157,10 @@ class ProxyRoundTripper {
     }
     credentials() {
         return {
-            getRaw: (_name) => {
+            getRaw: (_name, _actId) => {
                 return Promise.reject(new Error('Not implemented, getRaw is not supported in proxy mode'));
             },
-            getAccessToken: (_name, _forceRefresh) => {
+            getAccessToken: (_name, _forceRefresh, _actId) => {
                 return Promise.reject(new Error('Not implemented, getAccessToken is not supported in proxy mode'));
             },
         };

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

@@ -1,7 +1,7 @@
 import { Tracer } from '@opentelemetry/api';
 import { Logger } from '../../../observability/logging/Logger.js';
-import { DynamicFetcher, RoundTripperFactory } from '../types.js';
-import { Credentials, Token } from './contextcredentials.js';
+import { ConfigReader, DynamicFetcher, RoundTripperFactory } from '../types.js';
+import { CredentialsProvider, Token } from './contextcredentials.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
 /**
@@ -19,27 +19,26 @@ export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     private tokenClient;
     private credsBaseURL;
     private platformAPIClient;
-    private versoriCfg;
+    private cfgReader;
     private log;
     private tracer;
     private readonly defaultDynamic;
-    constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger, tracer: Tracer);
+    constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger, tracer: Tracer, cfgReader: ConfigReader);
     static fromEnv(logger: Logger, tracer: Tracer): VersoriCredentialsFactory;
     private changeRequestInit;
     private changeBaseUrl;
     create(connName: string): Promise<typeof fetch | undefined>;
     createDynamic(templateName: string): Promise<DynamicFetcher | undefined>;
     private traceFetch;
-    credentials(): Credentials;
+    credentials(): CredentialsProvider;
     getTokenByName(name: string, forceRefresh?: boolean, activationId?: string): Promise<Token>;
     getRawByName(name: string, activationId?: string): Promise<Uint8Array>;
     private getCredentialIDFromName;
-    private getConnectionID;
-    private getTemplateID;
     private apiKeyFetcher;
     private basicAuthFetcher;
     private bearerTokenFetcher;
     private oauth2Fetcher;
     private getToken;
+    private getRaw;
 }
 //# sourceMappingURL=roundtripper.d.ts.map

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

@@ -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,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAQrB,OAAO,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAG/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,UAAU,CAAmB;IAErC,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;IAelB,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,yBAAyB;IA4BzE,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,WAAW;IAOpB,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;YAoB9D,uBAAuB;IAoDrC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,aAAa;YAyDP,gBAAgB;YAqChB,kBAAkB;YAmClB,aAAa;YAwEb,QAAQ;CA4BzB"}
+{"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,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;AAErD;;;;;;;;;;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;IAO5B,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;CAyBvB"}

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

@@ -6,8 +6,8 @@ const mod_js_1 = require("../../../observability/mod.js");
 const configloader_js_1 = require("./configloader.js");
 const constants_js_1 = require("./constants.js");
 const mod_js_2 = require("./credentials/mod.js");
-const platformapi_js_1 = require("./platformapi.js");
 const helpers_js_1 = require("./helpers.js");
+const platformapi_js_1 = require("./platformapi.js");
 /**
  * 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.
@@ -20,7 +20,7 @@ const helpers_js_1 = require("./helpers.js");
  * ```
  */
 class VersoriCredentialsFactory {
-    constructor(credsClient, credsBaseURL, platformAPIClient, logger, tracer) {
+    constructor(credsClient, credsBaseURL, platformAPIClient, logger, tracer, cfgReader) {
         Object.defineProperty(this, "tokenClient", {
             enumerable: true,
             configurable: true,
@@ -39,7 +39,7 @@ class VersoriCredentialsFactory {
             writable: true,
             value: void 0
         });
-        Object.defineProperty(this, "versoriCfg", {
+        Object.defineProperty(this, "cfgReader", {
             enumerable: true,
             configurable: true,
             writable: true,
@@ -71,7 +71,7 @@ class VersoriCredentialsFactory {
         this.tokenClient = credsClient;
         this.credsBaseURL = credsBaseURL;
         this.platformAPIClient = platformAPIClient;
-        this.versoriCfg = (0, configloader_js_1.LoadConfigFromFile)();
+        this.cfgReader = cfgReader;
         this.log = logger;
         this.tracer = tracer;
         // lost 15 minutes because of this one
@@ -83,6 +83,7 @@ class VersoriCredentialsFactory {
         const platformApiBaseURL = Deno.env.get(constants_js_1.envVarPlatformApiBaseURL);
         const orgId = Deno.env.get(constants_js_1.envVarOrgId);
         const envId = Deno.env.get(constants_js_1.envVarEnvId);
+        const cfgReader = configloader_js_1.VersoriConfigReader.fromEnv(logger);
         if (!orgId || !envId || !platformApiBaseURL || !credsBaseURL) {
             const missingVars = [];
             if (!orgId)
@@ -98,7 +99,7 @@ class VersoriCredentialsFactory {
         const log = logger || new mod_js_1.ConsoleLogger('debug');
         const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId, log);
         const tokenClient = new mod_js_2.VersoriCredentialClient(credsBaseURL);
-        return new VersoriCredentialsFactory(tokenClient, credsBaseURL, pAPIClient, log, tracer);
+        return new VersoriCredentialsFactory(tokenClient, credsBaseURL, pAPIClient, log, tracer, cfgReader);
     }
     // takes the info and modifies the url using changeBaseUrl if necessary
     // if a full valid URL is passed as a string, it will be returned as is
@@ -137,7 +138,7 @@ class VersoriCredentialsFactory {
         return newURL.toString();
     }
     create(connName) {
-        const cnxId = this.getConnectionID(connName);
+        const cnxId = this.cfgReader.getConnectionID(connName);
         if (!cnxId) {
             this.log.debug('Connection not found in config, could be a dynamic connection', {
                 connectionName: connName,
@@ -169,7 +170,7 @@ class VersoriCredentialsFactory {
         return Promise.resolve(_fn);
     }
     createDynamic(templateName) {
-        const template = this.getTemplateID(templateName);
+        const template = this.cfgReader.getTemplateID(templateName);
         if (!template) {
             this.log.debug('Template not found in config, could be a static connection', {
                 templateName: templateName,
@@ -239,7 +240,7 @@ class VersoriCredentialsFactory {
     }
     async getTokenByName(name, forceRefresh = false, activationId) {
         const credId = await this.getCredentialIDFromName(name, activationId);
-        const token = await this.tokenClient.getToken(credId, forceRefresh);
+        const token = await this.getToken(credId, forceRefresh);
         if (!token?.token) {
             throw new Error(`Token not found for connection ${name} with credential ID ${credId}`);
         }
@@ -253,7 +254,7 @@ class VersoriCredentialsFactory {
     }
     async getRawByName(name, activationId) {
         const credId = await this.getCredentialIDFromName(name, activationId);
-        const raw = await this.tokenClient.getRaw(credId);
+        const raw = await this.getRaw(credId);
         if (!raw) {
             throw new Error(`Raw data not found for connection ${name} with credential ID ${credId}`);
         }
@@ -265,7 +266,7 @@ class VersoriCredentialsFactory {
     }
     async getCredentialIDFromName(name, activationId) {
         // fin connection config from versori file
-        const conn = this.versoriCfg.mappings.find((c) => c.name.toLowerCase() === name);
+        const conn = this.cfgReader.getCnxMapping(name);
         if (!conn) {
             return '';
         }
@@ -296,21 +297,6 @@ class VersoriCredentialsFactory {
         }
         return staticConn.credentials[0].credential.id;
     }
-    getConnectionID(connName) {
-        const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
-            c.name.toLowerCase() === connName.toLowerCase());
-        if (!conn || !conn.connId) {
-            return '';
-        }
-        return conn.connId;
-    }
-    getTemplateID(templateName) {
-        const template = this.versoriCfg.mappings.find((c) => c.dynamic && c.name.toLowerCase() === templateName.toLowerCase());
-        if (!template || !template.templateId) {
-            return '';
-        }
-        return template.templateId;
-    }
     apiKeyFetcher(conn, fn) {
         const _fn = async (input, init) => {
             const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
@@ -478,9 +464,10 @@ class VersoriCredentialsFactory {
             return await this.tokenClient.getToken(id, forceRefresh);
         }
         catch (error) {
-            this.log.error('unable to get credential', { error });
+            this.log.error('unable to get token credential', { error });
             if (error instanceof connect_1.ConnectError) {
-                if (error.rawMessage.includes('connection error received: not a result of an error') && error.code === connect_1.Code.Internal) {
+                if (error.rawMessage.includes('connection error received: not a result of an error') &&
+                    error.code === connect_1.Code.Internal) {
                     this.log.info('Connection error received, attempting to reconnect');
                     this.tokenClient = new mod_js_2.VersoriCredentialClient(this.credsBaseURL);
                     return await this.tokenClient.getToken(id);
@@ -490,5 +477,22 @@ class VersoriCredentialsFactory {
             throw error;
         }
     }
+    async getRaw(id) {
+        try {
+            return await this.tokenClient.getRaw(id);
+        }
+        catch (error) {
+            this.log.error('unable to get raw credential', { error });
+            if (error instanceof connect_1.ConnectError) {
+                if (error.rawMessage.includes('connection error received: not a result of an error') && error.code === connect_1.Code.Internal) {
+                    this.log.info('Connection error received, attempting to reconnect');
+                    this.tokenClient = new mod_js_2.VersoriCredentialClient(this.credsBaseURL);
+                    return await this.tokenClient.getRaw(id);
+                }
+                throw error;
+            }
+            throw error;
+        }
+    }
 }
 exports.VersoriCredentialsFactory = VersoriCredentialsFactory;

package/script/src/dsl/http/versori/webhookmiddleware.d.ts

@@ -0,0 +1,16 @@
+import { NextFunction, Response, Request } from 'express';
+import { CredentialsProvider } from './contextcredentials.js';
+import { ConfigReader, ConnectionProvider } from '../types.js';
+import { Logger } from '../../../observability/mod.js';
+export type CreateWebhookMiddleWareOpts = {
+    id: string;
+    connName?: string;
+    credentials: CredentialsProvider;
+    cnxProvider: ConnectionProvider;
+    cfgReader: ConfigReader;
+    log: Logger;
+};
+export declare function createStaticWebhookMiddleware(opts: CreateWebhookMiddleWareOpts): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+export declare function createActIdDynamicWebhookMiddleware(opts: CreateWebhookMiddleWareOpts): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+export declare function createUserIdDynamicWebhookMiddleware(opts: CreateWebhookMiddleWareOpts): (req: Request, res: Response, next: NextFunction) => Promise<void>;
+//# sourceMappingURL=webhookmiddleware.d.ts.map

package/script/src/dsl/http/versori/webhookmiddleware.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webhookmiddleware.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/webhookmiddleware.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAwB,YAAY,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAErF,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAGvD,MAAM,MAAM,2BAA2B,GAAG;IACtC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,mBAAmB,CAAC;IACjC,WAAW,EAAE,kBAAkB,CAAC;IAChC,SAAS,EAAE,YAAY,CAAC;IACxB,GAAG,EAAE,MAAM,CAAC;CACf,CAAC;AAIF,wBAAgB,6BAA6B,CACzC,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CA8DpE;AAED,wBAAgB,mCAAmC,CAC/C,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAiEpE;AAED,wBAAgB,oCAAoC,CAChD,IAAI,EAAE,2BAA2B,GAClC,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY,KAAK,OAAO,CAAC,IAAI,CAAC,CAkFpE"}