@versori/run 0.2.0 → 0.2.1-alpha.1

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

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VersoriCredentialsFactory = void 0;
+const connect_1 = require("@connectrpc/connect");
+const mod_js_1 = require("../../../observability/mod.js");
 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");
+const mod_js_2 = require("./credentials/mod.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.
@@ -86,56 +86,20 @@ class VersoriCredentialsFactory {
                 missingVars.push(constants_js_1.envVarCredsBaseURL);
             throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
         }
-        const log = logger || new mod_js_2.ConsoleLogger('debug');
+        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_1.VersoriCredentialClient(credsBaseURL);
+        const tokenClient = new mod_js_2.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
-    // if a valid URL object is passed, it will be returned as is
-    changeRequestInit(info, conn) {
-        if (typeof info === 'string') {
-            if (isValidURL(info)) {
-                return info;
-            }
-            return this.changeBaseUrl(info, conn);
-        }
-        else if (info instanceof URL) {
-            return info;
-        }
-        else if (info instanceof Request) {
-            const url = this.changeBaseUrl(info.url, conn);
-            return new Request(url, info);
-        }
-        return info;
-    }
-    changeBaseUrl(pathname, conn) {
-        const connBaseURL = conn.baseUrl;
-        // if the connection has no baseUrl set, but the pathname is a valid URL, return it as is
-        if (!connBaseURL && isValidURL(pathname)) {
-            this.log.debug('Using given URL as is', { url: pathname });
-            return pathname;
-        }
-        const connBaseURLObj = new URL(connBaseURL);
-        let _pathname = pathname;
-        if (isValidURL(pathname)) {
-            const pathnameObj = new URL(pathname);
-            _pathname = pathnameObj.pathname;
-        }
-        const newURL = new URL(_pathname, connBaseURLObj.origin);
-        this.log.debug('Using baseURL from connection', { url: newURL.toString() });
-        return newURL.toString();
-    }
     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', {
                 connectionName: connName,
             });
-            return undefined;
+            return Promise.resolve(undefined);
         }
-        const _fn = async (input, init) => {
+        return Promise.resolve(async (input, init) => {
             const conn = await this.platformAPIClient.getStaticConnection(cnxId);
             if (!conn) {
                 this.log.error('Connection not found for user, using default fetch', {
@@ -156,18 +120,19 @@ class VersoriCredentialsFactory {
                 default:
                     return fn(_input, init);
             }
-        };
-        return _fn;
+        });
     }
+    // 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
     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', {
                 templateName: templateName,
             });
-            return undefined;
+            return Promise.resolve(undefined);
         }
-        const _fn = async (activation, input, init) => {
+        return Promise.resolve(async (activation, input, init) => {
             const conn = await this.platformAPIClient.getActivationConnection(template, activation.id);
             if (!conn) {
                 return this.defaultDynamic('Connection not found for user, using default fetch', {
@@ -189,8 +154,7 @@ class VersoriCredentialsFactory {
                 default:
                     return fn(_input, init);
             }
-        };
-        return _fn;
+        });
     }
     credentials() {
         return {
@@ -198,9 +162,43 @@ class VersoriCredentialsFactory {
             getAccessToken: this.getTokenByName.bind(this),
         };
     }
-    async getTokenByName(name) {
+    // if a valid URL object is passed, it will be returned as is
+    changeRequestInit(info, conn) {
+        if (typeof info === 'string') {
+            if (isValidURL(info)) {
+                return info;
+            }
+            return this.changeBaseUrl(info, conn);
+        }
+        else if (info instanceof URL) {
+            return info;
+        }
+        else if (info instanceof Request) {
+            const url = this.changeBaseUrl(info.url, conn);
+            return new Request(url, info);
+        }
+        return info;
+    }
+    changeBaseUrl(pathname, conn) {
+        const connBaseURL = conn.baseUrl;
+        // if the connection has no baseUrl set, but the pathname is a valid URL, return it as is
+        if (!connBaseURL && isValidURL(pathname)) {
+            this.log.debug('Using given URL as is', { url: pathname });
+            return pathname;
+        }
+        const connBaseURLObj = new URL(connBaseURL);
+        let _pathname = pathname;
+        if (isValidURL(pathname)) {
+            const pathnameObj = new URL(pathname);
+            _pathname = pathnameObj.pathname;
+        }
+        const newURL = new URL(_pathname, connBaseURLObj.origin);
+        this.log.debug('Using baseURL from connection', { url: newURL.toString() });
+        return newURL.toString();
+    }
+    async getTokenByName(name, forceRefresh = false) {
         const credId = await this.getCredentialIDFromName(name);
-        const token = await this.tokenClient.getToken(credId);
+        const token = await this.tokenClient.getToken(credId, forceRefresh);
         if (!token?.token) {
             throw new Error(`Token not found for connection ${name} with credential ID ${credId}`);
         }
@@ -216,8 +214,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'];
-        return buffer;
+        return raw?.credential?.data['raw'] ?? new Uint8Array(0);
     }
     async getCredentialIDFromName(name) {
         const conId = this.getConnectionID(name);
@@ -249,7 +246,7 @@ class VersoriCredentialsFactory {
         return template.templateId;
     }
     apiKeyFetcher(conn, fn) {
-        const _fn = async (input, init) => {
+        return Promise.resolve(async (input, init) => {
             const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
             const token = tokenResponse.token?.accessToken;
             const asc = conn.credentials[0].authSchemeConfig.apiKey;
@@ -270,7 +267,7 @@ class VersoriCredentialsFactory {
                     if (init.headers instanceof Headers) {
                         init.headers.set(asc.name, token);
                     }
-                    else if (init.headers instanceof Array) {
+                    else if (Array.isArray(init.headers)) {
                         init.headers.push([asc.name, token]);
                     }
                     else {
@@ -293,11 +290,10 @@ class VersoriCredentialsFactory {
                     break;
             }
             return fn(input, init);
-        };
-        return _fn;
+        });
     }
     basicAuthFetcher(conn, fn) {
-        const _fn = async (input, init) => {
+        return Promise.resolve(async (input, init) => {
             const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
@@ -322,12 +318,11 @@ class VersoriCredentialsFactory {
                 };
             }
             return fn(input, init);
-        };
-        return _fn;
+        });
     }
     // TODO: need to make the prefix and header name configurable from authschemeconfig
     bearerTokenFetcher(conn, fn) {
-        const _fn = async (input, init) => {
+        return Promise.resolve(async (input, init) => {
             const tokenResponse = await this.getToken(conn.credentials[0].credential.id);
             const token = tokenResponse.token?.accessToken;
             if (!token) {
@@ -352,8 +347,7 @@ class VersoriCredentialsFactory {
                 };
             }
             return fn(input, init);
-        };
-        return _fn;
+        });
     }
     oauth2Fetcher(conn, fn) {
         const refreshFn = async (input, init, forceRefresh = false) => {
@@ -396,7 +390,7 @@ class VersoriCredentialsFactory {
             }
             return fn(input, init);
         };
-        const _fn = async (input, init) => {
+        return Promise.resolve(async (input, init) => {
             const resp = await refreshFn(input, init, false);
             if (resp.status === 401) {
                 this.log.debug('Received 401 Unauthorized response, attempting refresh', {
@@ -407,19 +401,18 @@ class VersoriCredentialsFactory {
                 return refreshFn(input, init, true);
             }
             return Promise.resolve(resp);
-        };
-        return _fn;
+        });
     }
-    async getToken(id) {
+    async getToken(id, forceRefresh = false) {
         try {
-            return await this.tokenClient.getToken(id);
+            return await this.tokenClient.getToken(id, forceRefresh);
         }
         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);
+                    this.tokenClient = new mod_js_2.VersoriCredentialClient(this.credsBaseURL);
                     return await this.tokenClient.getToken(id);
                 }
                 throw error;

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

@@ -1,5 +1,8 @@
 import { Context, ContextImpl } from '../../context/Context.js';
-import { DynamicFetcher } from '../http/types.js';
+import { KeyValueScope, KeyValue } from '../../kv/KeyValue.js';
+import { Logger } from '../../observability/logging/Logger.js';
+import { Activation, DynamicFetcher } from '../http/types.js';
+import { Credentials } from '../http/versori/contextcredentials.js';
 import { ArrayTask, Task, Taskable, TaskType } from '../Task.js';
 export interface HttpContext<Data, PageParams = undefined> extends Context<Data> {
     fetch: typeof fetch;
@@ -28,12 +31,18 @@ export declare class HttpTaskImpl<In, Out, PageParams> implements Task<In, Out>
     unpack<NextOut>(mapper: (data: Out) => NextOut[]): ArrayTask<In, NextOut>;
     clone(): Task<In, Out>;
 }
-export declare class HttpContextImpl<D, PageParams> extends ContextImpl<D> implements HttpContext<D, PageParams> {
+export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, PageParams> {
+    #private;
     connectionVariables: Record<string, any>;
     pageParams?: PageParams;
-    private dynamicFetcher?;
-    private staticFetcher?;
     constructor(ctx: ContextImpl<D, any>, connectionVars: Record<string, any>, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
+    get log(): Logger;
+    get executionId(): string;
+    get startTime(): Date;
+    get activation(): Activation | undefined;
+    get data(): D;
+    openKv(scope?: KeyValueScope): KeyValue;
+    credentials(): Credentials;
     get fetch(): typeof globalThis.fetch;
     nextPage(nextParams: PageParams): Promise<void>;
 }

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

@@ -1,9 +1,19 @@
 "use strict";
-var _a;
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _a, _HttpContextImpl_dynamicFetcher, _HttpContextImpl_staticFetcher, _HttpContextImpl_inner;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HttpContextImpl = exports.HttpTaskImpl = void 0;
 exports.http = http;
-const Context_js_1 = require("../../context/Context.js");
 const ensureTask_js_1 = require("../ensureTask.js");
 const types_js_1 = require("../http/types.js");
 const Task_js_1 = require("../Task.js");
@@ -62,11 +72,8 @@ class HttpTaskImpl {
 }
 exports.HttpTaskImpl = HttpTaskImpl;
 _a = Task_js_1.TaskType;
-class HttpContextImpl extends Context_js_1.ContextImpl {
+class HttpContextImpl {
     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.creds, ctx.executionId, ctx.startTime, ctx.data, ctx.options);
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,
@@ -80,32 +87,46 @@ class HttpContextImpl extends Context_js_1.ContextImpl {
             value: void 0
         });
         // ideally only one of these should be set to a value
-        Object.defineProperty(this, "dynamicFetcher", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "staticFetcher", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
+        _HttpContextImpl_dynamicFetcher.set(this, void 0);
+        _HttpContextImpl_staticFetcher.set(this, void 0);
+        _HttpContextImpl_inner.set(this, void 0);
+        __classPrivateFieldSet(this, _HttpContextImpl_inner, ctx, "f");
         this.pageParams = pageParams;
         this.connectionVariables = connectionVars;
-        this.dynamicFetcher = dynamicFetcher;
-        this.staticFetcher = staticFetcher;
+        __classPrivateFieldSet(this, _HttpContextImpl_dynamicFetcher, dynamicFetcher, "f");
+        __classPrivateFieldSet(this, _HttpContextImpl_staticFetcher, staticFetcher, "f");
+    }
+    get log() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").log;
+    }
+    get executionId() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").executionId;
+    }
+    get startTime() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").startTime;
+    }
+    get activation() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation;
+    }
+    get data() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").data;
+    }
+    openKv(scope) {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").openKv(scope);
+    }
+    credentials() {
+        return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").credentials();
     }
     get fetch() {
         // This is maybe hard to read.
-        return this.dynamicFetcher && this.activation ? (0, types_js_1.wrapDynamicFetcher)(this.dynamicFetcher, this.activation) : this.staticFetcher ?? globalThis.fetch;
+        return __classPrivateFieldGet(this, _HttpContextImpl_dynamicFetcher, "f") && __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation ? (0, types_js_1.wrapDynamicFetcher)(__classPrivateFieldGet(this, _HttpContextImpl_dynamicFetcher, "f"), __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation) : __classPrivateFieldGet(this, _HttpContextImpl_staticFetcher, "f") ?? globalThis.fetch;
     }
     async nextPage(nextParams) {
         throw new Error("Method not implemented.");
     }
 }
 exports.HttpContextImpl = HttpContextImpl;
+_HttpContextImpl_dynamicFetcher = new WeakMap(), _HttpContextImpl_staticFetcher = new WeakMap(), _HttpContextImpl_inner = new WeakMap();
 function http(taskId, opts, fn) {
     return new HttpTaskImpl(taskId, opts, fn);
 }

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":"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"}
+{"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;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;IAoJtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAK9B"}

package/script/src/interpreter/memory/compilers/schedule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAuF7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}
+{"version":3,"file":"schedule.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/memory/compilers/schedule.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAEzF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAsF7C,eAAO,MAAM,gBAAgB,EAAE,eAAe,CAAC,YAAY,EAAE,eAAe,CAG3E,CAAC"}

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

@@ -50,7 +50,7 @@ function compileSchedule(ctx, trigger, signal) {
                 res.status(200).json({ status: 'triggered' });
             }
             catch (error) {
-                executionCtx.log.error('execution error inside schedule', { error });
+                ctx.log.error('execution error inside schedule', { error });
                 res.status(500).json({ error: 'Failed to trigger schedule' });
             }
         });

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

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.webhookCompiler = void 0;
 // In src/interpreter/memory/compilers/webhook.ts
 const cors_1 = __importDefault(require("cors"));
-const rxjs_1 = require("rxjs");
 const promises_1 = require("node:stream/promises");
+const rxjs_1 = require("rxjs");
 const WebhookTrigger_js_1 = require("../../../dsl/triggers/WebhookTrigger.js");
 const DEFAULT_SYNC_ON_SUCCESS = (ctx) => new Response(JSON.stringify(ctx.data), {
     status: 200,

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

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

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

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