@versori/run 0.0.1-alpha.7 → 0.1.0-alpha.10

package/script/src/kv/memory/MemoryKeyValueProvider.js

@@ -17,26 +17,26 @@ class MemoryKeyValueProvider {
             value: new MemoryKeyValue_js_1.MemoryKeyValue()
         });
     }
-    kv(scope, executionId) {
-        switch (scope) {
+    kv(options) {
+        switch (options.scope) {
             case ':execution:':
-                if (typeof executionId === 'undefined') {
+                if (typeof options.executionId === 'undefined') {
                     throw new Error('executionId is required when scope is :execution:');
                 }
-                return this.getExecutionKv(executionId);
+                return this.getExecutionKv(options.executionId);
             case ':project:':
                 return this.projectKv;
             default:
-                throw new Error(`Unsupported scope: ${scope}`);
+                throw new Error(`Unsupported scope: ${options.scope}`);
         }
     }
-    destroy(scope, executionId) {
-        switch (scope) {
+    destroy(options) {
+        switch (options.scope) {
             case ':execution:':
-                if (typeof executionId === 'undefined') {
+                if (typeof options.executionId === 'undefined') {
                     throw new Error('executionId is required when scope is :execution:');
                 }
-                this.executionKv.delete(executionId);
+                this.executionKv.delete(options.executionId);
                 return Promise.resolve();
             default:
                 return Promise.resolve();

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

@@ -0,0 +1,12 @@
+import { KV } from '../../../deps/jsr.io/@nats-io/kv/3.0.2/src/mod.js';
+import { GetOptions, KeyValue } from '../KeyValue.js';
+export declare class NatsKeyValue implements KeyValue {
+    private readonly kv;
+    private readonly prefix;
+    constructor(kv: KV, prefix: string);
+    get<T>(key: string, options?: GetOptions<T>): Promise<T | undefined>;
+    set<T>(key: string, value: T): Promise<void>;
+    delete(key: string): Promise<void>;
+    private generateKey;
+}
+//# sourceMappingURL=NatsKeyValue.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NatsKeyValue.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValue.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAW,MAAM,mDAAmD,CAAC;AAChF,OAAO,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAGtD,qBAAa,YAAa,YAAW,QAAQ;IAC7B,OAAO,CAAC,QAAQ,CAAC,EAAE;IAAM,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAA/B,EAAE,EAAE,EAAE,EAAmB,MAAM,EAAE,MAAM;IAE9D,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,GAAE,UAAU,CAAC,CAAC,CAAM,GAAG,OAAO,CAAC,CAAC,GAAG,SAAS,CAAC;IAwBxE,GAAG,CAAC,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAM5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,OAAO,CAAC,WAAW;CAGtB"}

package/script/src/kv/nats/NatsKeyValue.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NatsKeyValue = void 0;
+const KVNotFoundError_js_1 = require("../KVNotFoundError.js");
+class NatsKeyValue {
+    constructor(kv, prefix) {
+        Object.defineProperty(this, "kv", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: kv
+        });
+        Object.defineProperty(this, "prefix", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: prefix
+        });
+    }
+    async get(key, options = {}) {
+        let entry;
+        try {
+            entry = await this.kv.get(this.generateKey(key));
+        }
+        catch (error) {
+            console.error('Unknown error reading from KV store', error);
+            throw new Error('Unknown error reading from KV store');
+        }
+        if (!entry || ['DEL', 'PURGE'].includes(entry.operation)) {
+            if (options.throwOnNotFound) {
+                throw new KVNotFoundError_js_1.KVNotFoundError(key);
+            }
+            else if (typeof options.defaultValue !== 'undefined') {
+                return options.defaultValue;
+            }
+            return undefined;
+        }
+        return entry.json();
+    }
+    async set(key, value) {
+        const payload = JSON.stringify(value);
+        await this.kv.put(this.generateKey(key), payload);
+    }
+    async delete(key) {
+        await this.kv.delete(this.generateKey(key));
+    }
+    generateKey(key) {
+        return `${this.prefix}.${key}`;
+    }
+}
+exports.NatsKeyValue = NatsKeyValue;

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

@@ -0,0 +1,27 @@
+import { TlsOptions } from '../../../deps/jsr.io/@nats-io/transport-deno/3.0.2/src/mod.js';
+import { DestroyOptions, KeyValue, KeyValueProvider, KVOptions } from '../KeyValue.js';
+export type NatsKeyValueProviderOptions = {
+    organizationId: string;
+    projectId: string;
+    environment: string;
+    nats: {
+        url: string;
+        credsFile?: string;
+        tls?: TlsOptions;
+    };
+};
+export declare class NatsKeyValueProvider implements KeyValueProvider, AsyncDisposable {
+    private readonly kvm;
+    private readonly kvOrgScope;
+    private readonly kvProjectScope;
+    private readonly kvExecutionScope;
+    private readonly opts;
+    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;
+}
+//# sourceMappingURL=NatsKeyValueProvider.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"NatsKeyValueProvider.d.ts","sourceRoot":"","sources":["../../../../src/src/kv/nats/NatsKeyValueProvider.ts"],"names":[],"mappings":"AAGA,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"}

package/script/src/kv/nats/NatsKeyValueProvider.js

@@ -0,0 +1,182 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.NatsKeyValueProvider = void 0;
+const dntShim = __importStar(require("../../../_dnt.shims.js"));
+const mod_js_1 = require("../../../deps/jsr.io/@nats-io/jetstream/3.0.2/src/mod.js");
+const mod_js_2 = require("../../../deps/jsr.io/@nats-io/kv/3.0.2/src/mod.js");
+const mod_js_3 = require("../../../deps/jsr.io/@nats-io/transport-deno/3.0.2/src/mod.js");
+const KeyValue_js_1 = require("../KeyValue.js");
+const NatsKeyValue_js_1 = require("./NatsKeyValue.js");
+function getOptionsFromEnv() {
+    const natsTlsCaFile = dntShim.Deno.env.get('RUN_NATS_TLS_CA_FILE');
+    return {
+        organizationId: dntShim.Deno.env.get('RUN_ORGANISATION_ID'),
+        projectId: dntShim.Deno.env.get('RUN_SERVICE_ID'),
+        environment: dntShim.Deno.env.get('RUN_ENVIRONMENT'),
+        nats: {
+            url: dntShim.Deno.env.get('RUN_NATS_URL') || 'nats://localhost:4222',
+            credsFile: dntShim.Deno.env.get('RUN_NATS_CREDS_FILE'),
+            ...(natsTlsCaFile && {
+                tls: {
+                    caFile: natsTlsCaFile,
+                },
+            }),
+        },
+    };
+}
+function mergeOptions(defaults, provided) {
+    const merged = {
+        ...defaults,
+        ...provided,
+    };
+    if (!merged.organizationId) {
+        throw new Error('organizationId is required but not provided and VERSORI_ORGANIZATION_ID is not set');
+    }
+    if (!merged.projectId) {
+        throw new Error('projectId is required but not provided and VERSORI_PROJECT_ID is not set');
+    }
+    return merged;
+}
+async function openOrCreateKV(kvm, bucket) {
+    try {
+        const kv = await kvm.open(bucket);
+        await kv.status();
+        return kv;
+    }
+    catch (error) {
+        if (error instanceof mod_js_1.JetStreamApiError &&
+            error.code === mod_js_1.JetStreamApiCodes.StreamNotFound) {
+            console.log('stream not found, creating...');
+            return await kvm.create(bucket);
+        }
+        throw error;
+    }
+}
+class NatsKeyValueProvider {
+    constructor(kvm, kvOrgScope, kvProjectScope, kvExecutionScope, opts) {
+        Object.defineProperty(this, "kvm", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: kvm
+        });
+        Object.defineProperty(this, "kvOrgScope", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: kvOrgScope
+        });
+        Object.defineProperty(this, "kvProjectScope", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: kvProjectScope
+        });
+        Object.defineProperty(this, "kvExecutionScope", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: kvExecutionScope
+        });
+        Object.defineProperty(this, "opts", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: opts
+        });
+    }
+    static async newInstance(opts = {}) {
+        const parsedOpts = mergeOptions(getOptionsFromEnv(), opts);
+        const credsFile = parsedOpts.nats.credsFile
+            ? await dntShim.Deno.readFile(parsedOpts.nats.credsFile)
+            : undefined;
+        const conn = await (0, mod_js_3.connect)({
+            servers: [parsedOpts.nats.url],
+            authenticator: credsFile ? (0, mod_js_3.credsAuthenticator)(credsFile) : undefined,
+            ...(parsedOpts.nats.tls && {
+                tls: parsedOpts.nats.tls,
+            }),
+        });
+        const kvm = new mod_js_2.Kvm(conn);
+        const [orgKv, projKv, execKv] = await Promise.all([
+            openOrCreateKV(kvm, `ORG_${parsedOpts.organizationId}`),
+            openOrCreateKV(kvm, `PROJECT_${parsedOpts.projectId}`),
+            openOrCreateKV(kvm, `EXECUTION_${parsedOpts.projectId}`),
+        ]);
+        return new NatsKeyValueProvider(kvm, orgKv, projKv, execKv, parsedOpts);
+    }
+    static fromEnv() {
+        return NatsKeyValueProvider.newInstance(getOptionsFromEnv());
+    }
+    [Symbol.asyncDispose]() {
+        return this.kvm.js.nc.close();
+    }
+    kv(options) {
+        switch (options.scope) {
+            case ':organization:':
+                return new NatsKeyValue_js_1.NatsKeyValue(this.kvOrgScope, this.subjectPrefix(options));
+            case ':project:':
+                return new NatsKeyValue_js_1.NatsKeyValue(this.kvProjectScope, this.subjectPrefix(options));
+            case ':execution:':
+                if (!(0, KeyValue_js_1.isKVOptionsExecution)(options)) {
+                    throw new Error('invalid KV options, executionId is required for :execution: scope');
+                }
+                return new NatsKeyValue_js_1.NatsKeyValue(this.kvExecutionScope, this.subjectPrefix(options));
+            default:
+                throw new Error(`invalid KV options, scope ${options.scope} is not supported`);
+        }
+    }
+    async destroy(options) {
+        if (options.scope === ':execution:') {
+            if (typeof options.executionId === 'undefined') {
+                throw new Error('executionId is required when scope is :execution:');
+            }
+            const keys = await this.kvExecutionScope.keys(`${this.subjectPrefix(options)}.>`);
+            for await (const key of keys) {
+                try {
+                    await this.kvExecutionScope.purge(key);
+                }
+                catch (error) {
+                    console.error(`Failed to purge key: ${key}`, error);
+                }
+            }
+        }
+        // TODO: interface may need updating, workers should not be deleting KV buckets, only execution keys should be purged.
+        return;
+    }
+    subjectPrefix(options) {
+        const activationSuffix = options.activationId ? `.${options.activationId}` : '';
+        switch (options.scope) {
+            case ':organization:':
+                return `${this.opts.organizationId}${activationSuffix}`;
+            case ':project:':
+                return `${this.opts.organizationId}.${this.opts.projectId}.${this.opts.environment}${activationSuffix}`;
+            case ':execution:':
+                return `${this.opts.organizationId}.${this.opts.projectId}.${this.opts.environment}.${options.executionId}${activationSuffix}`;
+        }
+    }
+}
+exports.NatsKeyValueProvider = NatsKeyValueProvider;

package/esm/src/dsl/http/versori/connectapi.d.ts

@@ -1,11 +0,0 @@
-import { Connection } from '../types.js';
-export declare class ConnectAPIClient {
-    private baseUrl;
-    private orgId;
-    private serviceConnId;
-    private internalAuth;
-    private cache;
-    constructor(baseUrl: string, orgId: string, serviceConnId: string, cache?: Record<string, Connection>);
-    getConnection(cnxId: string): Promise<Connection | undefined>;
-}
-//# sourceMappingURL=connectapi.d.ts.map

package/esm/src/dsl/http/versori/connectapi.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"connectapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/connectapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,qBAAa,gBAAgB;IACzB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,KAAK,CAA6B;gBAGtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAM;IASpC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAwBtE"}

package/esm/src/dsl/http/versori/connectapi.js

@@ -1,57 +0,0 @@
-import { InternalAuth } from './internalauth.js';
-export class ConnectAPIClient {
-    constructor(baseUrl, orgId, serviceConnId, cache = {} // for now this is an in-memory cache
-    ) {
-        Object.defineProperty(this, "baseUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "orgId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "serviceConnId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "internalAuth", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cache", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.baseUrl = baseUrl;
-        this.orgId = orgId;
-        this.cache = cache;
-        this.serviceConnId = serviceConnId;
-        this.internalAuth = new InternalAuth();
-    }
-    async getConnection(cnxId) {
-        if (this.cache[cnxId]) {
-            return this.cache[cnxId];
-        }
-        const resp = await fetch(`${this.baseUrl}/connect/v1/o/${this.orgId}/connectors/${this.serviceConnId}/connections/${cnxId}`, {
-            headers: {
-                'x-versori-internal-token': await this.internalAuth.getToken(),
-            },
-        });
-        if (!resp.ok) {
-            return undefined;
-        }
-        const result = (await resp.json());
-        this.cache[cnxId] = result;
-        return result;
-    }
-}

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

@@ -1,11 +0,0 @@
-import { Connection } from '../types.js';
-export declare class ConnectAPIClient {
-    private baseUrl;
-    private orgId;
-    private serviceConnId;
-    private internalAuth;
-    private cache;
-    constructor(baseUrl: string, orgId: string, serviceConnId: string, cache?: Record<string, Connection>);
-    getConnection(cnxId: string): Promise<Connection | undefined>;
-}
-//# sourceMappingURL=connectapi.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"connectapi.d.ts","sourceRoot":"","sources":["../../../../../src/src/dsl/http/versori/connectapi.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAGzC,qBAAa,gBAAgB;IACzB,OAAO,CAAC,OAAO,CAAS;IAExB,OAAO,CAAC,KAAK,CAAS;IAEtB,OAAO,CAAC,aAAa,CAAS;IAE9B,OAAO,CAAC,YAAY,CAAe;IAEnC,OAAO,CAAC,KAAK,CAA6B;gBAGtC,OAAO,EAAE,MAAM,EACf,KAAK,EAAE,MAAM,EACb,aAAa,EAAE,MAAM,EACrB,KAAK,GAAE,MAAM,CAAC,MAAM,EAAE,UAAU,CAAM;IASpC,aAAa,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;CAwBtE"}

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

@@ -1,61 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ConnectAPIClient = void 0;
-const internalauth_js_1 = require("./internalauth.js");
-class ConnectAPIClient {
-    constructor(baseUrl, orgId, serviceConnId, cache = {} // for now this is an in-memory cache
-    ) {
-        Object.defineProperty(this, "baseUrl", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "orgId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "serviceConnId", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "internalAuth", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        Object.defineProperty(this, "cache", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
-        this.baseUrl = baseUrl;
-        this.orgId = orgId;
-        this.cache = cache;
-        this.serviceConnId = serviceConnId;
-        this.internalAuth = new internalauth_js_1.InternalAuth();
-    }
-    async getConnection(cnxId) {
-        if (this.cache[cnxId]) {
-            return this.cache[cnxId];
-        }
-        const resp = await fetch(`${this.baseUrl}/connect/v1/o/${this.orgId}/connectors/${this.serviceConnId}/connections/${cnxId}`, {
-            headers: {
-                'x-versori-internal-token': await this.internalAuth.getToken(),
-            },
-        });
-        if (!resp.ok) {
-            return undefined;
-        }
-        const result = (await resp.json());
-        this.cache[cnxId] = result;
-        return result;
-    }
-}
-exports.ConnectAPIClient = ConnectAPIClient;