@versori/run 0.2.0-alpha.8 → 0.2.0

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

@@ -2,6 +2,7 @@ import { DynamicFetcher, RoundTripperFactory } from '../types.js';
 import { VersoriCredentialClient } from './credentials/mod.js';
 import { PlatformAPIClient } from './platformapi.js';
 import { Logger } from '../../../observability/logging/Logger.js';
+import { Credentials } from './contextcredentials.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.
@@ -9,28 +10,34 @@ import { Logger } from '../../../observability/logging/Logger.js';
  *
  * @example
  * ```typescript
- * const factory = new VersoriRoundTripperFactory(connectAPIClient, tokenClient);
+ * const factory = new VersoriCredentialsFactory(connectAPIClient, tokenClient);
  * const customFetch = await factory.create('connectionName');
  * const response = await customFetch('https://api.example.com/data');
  * ```
  */
-export declare class VersoriRoundTripperFactory implements RoundTripperFactory {
+export declare class VersoriCredentialsFactory implements RoundTripperFactory {
     private tokenClient;
+    private credsBaseURL;
     private platformAPIClient;
     private versoriCfg;
     private log;
     private readonly defaultDynamic;
-    constructor(credsClient: VersoriCredentialClient, platformAPIClient: PlatformAPIClient, logger: Logger);
-    static fromEnv(logger?: Logger): VersoriRoundTripperFactory;
+    constructor(credsClient: VersoriCredentialClient, credsBaseURL: string, platformAPIClient: PlatformAPIClient, logger: Logger);
+    static fromEnv(logger?: Logger): VersoriCredentialsFactory;
     private changeRequestInit;
     private changeBaseUrl;
     create(connName: string, fn?: typeof fetch): Promise<typeof fetch | undefined>;
     createDynamic(templateName: string, fn?: typeof fetch): Promise<DynamicFetcher | undefined>;
+    credentials(): Credentials;
+    private getTokenByName;
+    private getRawByName;
+    private getCredentialIDFromName;
     private getConnectionID;
     private getTemplateID;
     private apiKeyFetcher;
     private basicAuthFetcher;
     private bearerTokenFetcher;
     private oauth2Fetcher;
+    private getToken;
 }
 //# 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":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAUlE;;;;;;;;;;;GAWG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IAClE,OAAO,CAAC,WAAW,CAA0B;IAE7C,OAAO,CAAC,iBAAiB,CAAoB;IAE7C,OAAO,CAAC,UAAU,CAAmB;IAErC,OAAO,CAAC,GAAG,CAAS;IAEpB,OAAO,CAAC,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAQlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,0BAA0B;IA4B3D,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBf,MAAM,CACR,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAqC9B,aAAa,CACf,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA+CtC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;YAYP,aAAa;YAyDb,gBAAgB;YAqChB,kBAAkB;YAmClB,aAAa;CAuE9B"}
+{"version":3,"file":"roundtripper.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/roundtripper.ts"],"names":[],"mappings":"AAAA,OAAO,EAGH,cAAc,EACd,mBAAmB,EAEtB,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,0CAA0C,CAAC;AAWlE,OAAO,EAAE,WAAW,EAAS,MAAM,yBAAyB,CAAC;AAE7D;;;;;;;;;;;GAWG;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,QAAQ,CAAC,cAAc,CAK7B;gBAGE,WAAW,EAAE,uBAAuB,EACpC,YAAY,EAAE,MAAM,EACpB,iBAAiB,EAAE,iBAAiB,EACpC,MAAM,EAAE,MAAM;IAWlB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,yBAAyB;IA6B1D,OAAO,CAAC,iBAAiB;IAezB,OAAO,CAAC,aAAa;IAwBrB,MAAM,CACF,QAAQ,EAAE,MAAM,EAChB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,OAAO,KAAK,GAAG,SAAS,CAAC;IAqCpC,aAAa,CACT,YAAY,EAAE,MAAM,EACpB,EAAE,GAAE,OAAO,KAAwB,GACpC,OAAO,CAAC,cAAc,GAAG,SAAS,CAAC;IA+CtC,WAAW,IAAI,WAAW;YAOZ,cAAc;YAed,YAAY;YAaZ,uBAAuB;IAkBrC,OAAO,CAAC,eAAe;IAcvB,OAAO,CAAC,aAAa;IAYrB,OAAO,CAAC,aAAa;IAyDrB,OAAO,CAAC,gBAAgB;IAqCxB,OAAO,CAAC,kBAAkB;IAmC1B,OAAO,CAAC,aAAa;YAwEP,QAAQ;CAuBzB"}

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

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.VersoriRoundTripperFactory = void 0;
+exports.VersoriCredentialsFactory = void 0;
 const configloader_js_1 = require("./configloader.js");
 const mod_js_1 = require("./credentials/mod.js");
 const platformapi_js_1 = require("./platformapi.js");
 const mod_js_2 = require("../../../observability/mod.js");
 const constants_js_1 = require("./constants.js");
+const connect_1 = require("@connectrpc/connect");
 /**
  * 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.
@@ -13,19 +14,25 @@ const constants_js_1 = require("./constants.js");
  *
  * @example
  * ```typescript
- * const factory = new VersoriRoundTripperFactory(connectAPIClient, tokenClient);
+ * const factory = new VersoriCredentialsFactory(connectAPIClient, tokenClient);
  * const customFetch = await factory.create('connectionName');
  * const response = await customFetch('https://api.example.com/data');
  * ```
  */
-class VersoriRoundTripperFactory {
-    constructor(credsClient, platformAPIClient, logger) {
+class VersoriCredentialsFactory {
+    constructor(credsClient, credsBaseURL, platformAPIClient, logger) {
         Object.defineProperty(this, "tokenClient", {
             enumerable: true,
             configurable: true,
             writable: true,
             value: void 0
         });
+        Object.defineProperty(this, "credsBaseURL", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         Object.defineProperty(this, "platformAPIClient", {
             enumerable: true,
             configurable: true,
@@ -56,9 +63,11 @@ class VersoriRoundTripperFactory {
             }
         });
         this.tokenClient = credsClient;
+        this.credsBaseURL = credsBaseURL;
         this.platformAPIClient = platformAPIClient;
         this.versoriCfg = (0, configloader_js_1.LoadConfigFromFile)();
         this.log = logger;
+        this.credentials = this.credentials.bind(this);
     }
     static fromEnv(logger) {
         const credsBaseURL = Deno.env.get(constants_js_1.envVarCredsBaseURL);
@@ -77,10 +86,10 @@ class VersoriRoundTripperFactory {
                 missingVars.push(constants_js_1.envVarCredsBaseURL);
             throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
         }
-        const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId);
-        const tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
         const log = logger || new mod_js_2.ConsoleLogger('debug');
-        return new VersoriRoundTripperFactory(tokenClient, pAPIClient, log);
+        const pAPIClient = new platformapi_js_1.PlatformAPIClient(platformApiBaseURL, orgId, envId, log);
+        const tokenClient = new mod_js_1.VersoriCredentialClient(credsBaseURL);
+        return new VersoriCredentialsFactory(tokenClient, credsBaseURL, pAPIClient, log);
     }
     // 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
@@ -118,7 +127,7 @@ class VersoriRoundTripperFactory {
         this.log.debug('Using baseURL from connection', { url: newURL.toString() });
         return newURL.toString();
     }
-    async create(connName, fn = globalThis.fetch) {
+    create(connName, fn = globalThis.fetch) {
         const cnxId = this.getConnectionID(connName);
         if (!cnxId) {
             this.log.debug('Connection not found in config, could be a dynamic connection', {
@@ -150,7 +159,7 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
-    async createDynamic(templateName, fn = globalThis.fetch) {
+    createDynamic(templateName, fn = globalThis.fetch) {
         const template = this.getTemplateID(templateName);
         if (!template) {
             this.log.debug('Template not found in config, could be a static connection', {
@@ -183,6 +192,47 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
+    credentials() {
+        return {
+            getRaw: this.getRawByName.bind(this),
+            getAccessToken: this.getTokenByName.bind(this),
+        };
+    }
+    async getTokenByName(name) {
+        const credId = await this.getCredentialIDFromName(name);
+        const token = await this.tokenClient.getToken(credId);
+        if (!token?.token) {
+            throw new Error(`Token not found for connection ${name} with credential ID ${credId}`);
+        }
+        return {
+            accessToken: token.token.accessToken,
+            tokenType: token.token.tokenType,
+            expiry: token.token.expiry ? new Date(Number(token.token.expiry.seconds) * 1000) : undefined,
+        };
+    }
+    async getRawByName(name) {
+        const credId = await this.getCredentialIDFromName(name);
+        const raw = await this.tokenClient.getRaw(credId);
+        if (!raw) {
+            throw new Error(`Raw data not found for connection ${name} with credential ID ${credId}`);
+        }
+        let buffer = raw?.credential?.data['raw'];
+        return buffer;
+    }
+    async getCredentialIDFromName(name) {
+        const conId = this.getConnectionID(name);
+        if (!conId) {
+            throw new Error(`Connection ${name} not found`);
+        }
+        const conn = await this.platformAPIClient.getStaticConnection(conId);
+        if (!conn) {
+            throw new Error(`Connection ${name} not found`);
+        }
+        if (!conn?.credentials[0]?.credential?.id) {
+            throw new Error(`Connection ${name}/${conId} has no credentials defined on it`);
+        }
+        return conn.credentials[0].credential.id;
+    }
     getConnectionID(connName) {
         const conn = this.versoriCfg.mappings.find((c) => (c.dynamic === undefined || c.dynamic === false) &&
             c.name.toLowerCase() === connName.toLowerCase());
@@ -198,9 +248,9 @@ class VersoriRoundTripperFactory {
         }
         return template.templateId;
     }
-    async apiKeyFetcher(conn, fn) {
+    apiKeyFetcher(conn, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
             const token = tokenResponse.token?.accessToken;
             const asc = conn.credentials[0].authSchemeConfig.apiKey;
             if (!token) {
@@ -246,9 +296,9 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
-    async basicAuthFetcher(conn, fn) {
+    basicAuthFetcher(conn, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
                 throw new Error('Token not found');
@@ -276,9 +326,9 @@ class VersoriRoundTripperFactory {
         return _fn;
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
-    async bearerTokenFetcher(conn, fn) {
+    bearerTokenFetcher(conn, fn) {
         const _fn = async (input, init) => {
-            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id);
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
                 throw new Error('Token not found');
@@ -305,9 +355,9 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
-    async oauth2Fetcher(conn, fn) {
+    oauth2Fetcher(conn, fn) {
         const refreshFn = async (input, init, forceRefresh = false) => {
-            const tokenResponse = await this.tokenClient.getToken(conn.credentials[0].credential.id, forceRefresh);
+            const tokenResponse = await this.getToken(conn.credentials[0].credential.id, forceRefresh);
             const token = tokenResponse.token?.accessToken;
             const tokenType = tokenResponse.token?.tokenType;
             if (!token) {
@@ -360,8 +410,25 @@ class VersoriRoundTripperFactory {
         };
         return _fn;
     }
+    async getToken(id) {
+        try {
+            return await this.tokenClient.getToken(id);
+        }
+        catch (error) {
+            this.log.error('unable to get 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_1.VersoriCredentialClient(this.credsBaseURL);
+                    return await this.tokenClient.getToken(id);
+                }
+                throw error;
+            }
+            throw error;
+        }
+    }
 }
-exports.VersoriRoundTripperFactory = VersoriRoundTripperFactory;
+exports.VersoriCredentialsFactory = VersoriCredentialsFactory;
 function isValidURL(url) {
     try {
         new URL(url);

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

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

@@ -66,7 +66,7 @@ class HttpContextImpl extends Context_js_1.ContextImpl {
     constructor(ctx, connectionVars, staticFetcher, dynamicFetcher, pageParams) {
         // We need to cast ctx to InternalContext to access kvp
         const internalCtx = ctx;
-        super(ctx.log, internalCtx.kvp, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
+        super(ctx.log, internalCtx.kvp, ctx.creds, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,

package/script/src/interpreter/memory/MemoryInterpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AAAA,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAA+B,UAAU,EAAW,YAAY,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGhG,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAIpE,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,KAAK,EAAE,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,oBAAoB,EAAE,eAAe,CAAC;IACtC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAA;AAED,qBAAa,iBAAiB;IAOtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAbjC,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,cAAc,CAAS;gBAGV,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY;WASlC,WAAW,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwC5F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;IA8C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA2ItB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"AACA,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAA+B,UAAU,EAAW,YAAY,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AAExF,OAAO,EAAE,kBAAkB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAGhG,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAI/D,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAmB,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC9E,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAE,MAAM,cAAc,CAAC;AAKpE,MAAM,MAAM,wBAAwB,GAAG;IACnC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,kBAAkB,CAAC;IAC9B,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC,MAAM,CAAC,EAAE,WAAW,CAAC;IACrB,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,CAAC;AAEF,KAAK,YAAY,GAAG;IAChB,QAAQ,EAAE,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC;IAC7C,KAAK,EAAE,uBAAuB,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;IAC9C,oBAAoB,EAAE,eAAe,CAAC;IACtC,cAAc,EAAE,MAAM,IAAI,CAAC;IAC3B,YAAY,CAAC,EAAE,YAAY,CAAC;CAC/B,CAAA;AAED,qBAAa,iBAAiB;IAOtB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,QAAQ,CAAC,kBAAkB;IACnC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAbjC,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,MAAM,CAAC,CAAS;IACxB,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,cAAc,CAAS;gBAGV,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,mBAAmB,EAAE,mBAAmB,EACxC,MAAM,EAAE,MAAM,EACvB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACxB,kBAAkB,EAAE,kBAAkB,EACtC,YAAY,EAAE,YAAY;WASlC,WAAW,CAAC,OAAO,GAAE,wBAA6B,GAAG,OAAO,CAAC,iBAAiB,CAAC;IAwC5F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,wBAAwB;IA8C/D,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAoJtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}

package/script/src/interpreter/memory/MemoryInterpreter.js

@@ -4,6 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MemoryInterpreter = void 0;
+const express_xml_bodyparser_1 = __importDefault(require("express-xml-bodyparser"));
 const express_1 = __importDefault(require("express"));
 const rxjs_1 = require("rxjs");
 const ContextProvider_js_1 = require("../../context/ContextProvider.js");
@@ -101,7 +102,7 @@ class MemoryInterpreter {
         const compiler = options.compiler || new ObservableCompiler_js_1.ObservableCompiler();
         const roundTripperFactory = options.skipVersoriCredentials
             ? new default_js_1.DefaultRoundTripperFactory()
-            : roundtripper_js_1.VersoriRoundTripperFactory.fromEnv(log);
+            : roundtripper_js_1.VersoriCredentialsFactory.fromEnv(log);
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
@@ -110,7 +111,7 @@ class MemoryInterpreter {
         const kvp = await (options.skipVersoriCredentials
             ? new MemoryKeyValueProvider_js_1.MemoryKeyValueProvider()
             : NatsKeyValueProvider_js_1.NatsKeyValueProvider.fromEnv());
-        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
+        return new MemoryInterpreter(log, compiler, new ContextProvider_js_1.ContextProviderImpl(log, kvp, roundTripperFactory.credentials()), roundTripperFactory, express_1.default.Router(), new Map(), platformapi_js_1.PlatformAPIClient.fromEnv(), cronapi_js_1.CronAPIClient.fromEnv());
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -148,6 +149,13 @@ class MemoryInterpreter {
         const port = Deno.env.get('PORT') || 3000;
         const app = (0, express_1.default)();
         app.use(express_1.default.json()); // Add JSON body parser middleware
+        const xml2jsDefaults = {
+            explicitArray: false,
+            normalize: false,
+            normalizeTags: false,
+            trim: true,
+        };
+        app.use((0, express_xml_bodyparser_1.default)(xml2jsDefaults));
         // Add health check route
         this.router.get("/health", (_req, res) => {
             res.json({ status: "healthy" });

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

@@ -10,6 +10,7 @@ export declare class ConsoleLogger implements Logger {
     constructor(level: LogLevel, fields?: Record<string, unknown>);
     debug(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;
     child(fields: {
         [key: string]: string;

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;AAmF/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,MAAM,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI;IAO9D,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,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

@@ -25,41 +25,132 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConsoleLogger = void 0;
 const log = __importStar(require("../../../deps/jsr.io/@std/log/0.224.14/mod.js"));
-function valueOfUnknown(obj, idx) {
-    switch (typeof obj) {
+function isObjectLiteral(obj) {
+    return Object.getPrototypeOf(obj) === Object.prototype;
+}
+function formatError(err) {
+    if (Symbol.toPrimitive in err) {
+        const toPrimitive = err[Symbol.toPrimitive];
+        if (typeof toPrimitive === 'function') {
+            return toPrimitive();
+        }
+    }
+    const ret = {
+        error: err.message,
+    };
+    if (err.cause) {
+        if (err.cause instanceof Error) {
+            ret.cause = formatError(err.cause);
+        }
+        else {
+            // potential place to Deno.inspect?
+            ret.cause = formatArg(err.cause);
+        }
+    }
+    if (err.stack) {
+        ret.stacktrace = err.stack;
+    }
+    return ret;
+}
+// deno-lint-ignore ban-types
+function formatFunction(fn) {
+    const str = fn.toString();
+    return {
+        [`<fn:${fn.name}>`]: str.length > 40 ? `${str.substring(0, 40)}...` : str,
+    };
+}
+function formatArg(arg, nested = false) {
+    switch (typeof arg) {
         case 'object':
-            if (obj instanceof Object) {
-                const valueOf = obj.valueOf();
-                if (typeof valueOf === 'object' && !Array.isArray(valueOf)) {
-                    return valueOf;
+            if (arg === null) {
+                return null;
+            }
+            if (Array.isArray(arg)) {
+                return arg.map((arg) => formatArg(arg));
+            }
+            if (arg instanceof Date) {
+                return arg.toISOString();
+            }
+            if (Symbol.toPrimitive in arg) {
+                const toPrimitive = arg[Symbol.toPrimitive];
+                if (typeof toPrimitive === 'function') {
+                    return toPrimitive();
+                }
+            }
+            if (arg instanceof Error) {
+                if (nested) {
+                    return formatError(arg);
                 }
-                return {
-                    [`arg${idx}`]: obj,
-                };
+                return arg;
             }
-            if (obj === null) {
-                return {
-                    [`arg${idx}`]: null,
-                };
+            if (isObjectLiteral(arg)) {
+                // object literal or directly created by `new Object()`, not subclasses of Object.
+                return Object.entries(arg).reduce((acc, [key, value]) => ({
+                    ...acc,
+                    [key]: formatArg(value, true),
+                }), {});
             }
-            return obj;
+            return Deno.inspect(arg);
         case 'undefined':
-            return {
-                [`arg${idx}`]: undefined,
-            };
+            return '<undefined>';
         case 'function':
-            return {
-                [`arg${idx}`]: obj.valueOf(),
-            };
+            return formatFunction(arg);
         default:
-            return {
-                [`arg${idx}`]: obj,
-            };
+            return arg;
+    }
+}
+function formatArgs(args) {
+    if (args.length === 0) {
+        return {};
+    }
+    if (args.length === 1) {
+        const formatted = formatArg(args[0]);
+        if (formatted instanceof Error) {
+            return formatError(formatted);
+        }
+        if (typeof formatted === 'object' && formatted !== null) {
+            return formatted;
+        }
+        return {
+            arg0: formatted,
+        };
+    }
+    const errors = [];
+    const others = [];
+    for (const arg of args) {
+        const formatted = formatArgs([arg]);
+        if (arg instanceof Error) {
+            // formatted isn't an instanceof Error after `formatArgs()`, so check original `arg`.
+            errors.push(formatted);
+        }
+        else {
+            others.push(formatted);
+        }
+    }
+    const othersMerged = others.length === 1
+        ? others[0]
+        : others.reduce((acc, value, idx) => ({
+            ...acc,
+            [`arg${idx}`]: value,
+        }), {});
+    if (errors.length === 1) {
+        return {
+            ...othersMerged,
+            // if there's only one error, we want to splat 'error', 'cause' and 'stacktrace' over
+            // all other merged fields.
+            ...errors[0],
+        };
     }
+    return {
+        ...othersMerged,
+        // array of errors.
+        errors: errors,
+    };
 }
 log.setup({
     handlers: {
         default: new log.ConsoleHandler('DEBUG', {
+            useColors: false,
             formatter: (record) => {
                 // log.formatters.jsonFormatter bugs me:
                 // - time is in unix milliseconds
@@ -72,12 +163,7 @@ log.setup({
                         time: record.datetime.toISOString(),
                         ...(record.loggerName ? { name: record.loggerName } : {}),
                         msg: record.msg,
-                        ...(Array.isArray(record.args)
-                            ? (record.args.reduce((acc, next, idx) => ({
-                                ...acc,
-                                ...(valueOfUnknown(next, idx)),
-                            }), {}))
-                            : {}),
+                        ...formatArgs(record.args),
                     });
                 }
                 catch (err) {
@@ -138,9 +224,17 @@ class ConsoleLogger {
             ...fields,
         });
     }
-    error(message, fields) {
+    error(message, fieldsOrError, fields) {
+        if (fieldsOrError instanceof Error) {
+            this.log.error(message, fieldsOrError, {
+                ...this.fields,
+                ...fields,
+            });
+            return;
+        }
         this.log.error(message, {
             ...this.fields,
+            ...fieldsOrError,
             ...fields,
         });
     }