@versori/run 0.2.29 → 0.3.0-beta.3

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

@@ -1,15 +1,39 @@
-import { createHmac } from 'node:crypto';
-import { Buffer } from 'node:buffer';
+// TODO: this gets called for every request for all endpoints, can we cache this?
+async function getStaticActivation(opts) {
+    const { data: activations } = await opts.platformApi.listActivations({
+        path: {
+            organisation_id: opts.organisationId,
+            environment_id: opts.environmentId,
+        },
+        query: {
+            static: true,
+        },
+        throwOnError: true,
+    });
+    let activation;
+    if (activations && activations.length > 0) {
+        if (activations.length > 1) {
+            opts.log.warn('Multiple static activations found, using the first one', {
+                activationsCount: activations.length,
+            });
+        }
+        activation = activations[0];
+    }
+    else {
+        opts.log.error('No static activation found', { webhookId: opts.id });
+    }
+    return activation;
+}
 // TODO: Refactor this so we don't have like three different middlewares for static and dynamic webhooks
 export function createStaticWebhookMiddleware(opts) {
     if (opts.connName === undefined) {
         opts.log.warn(`No connection ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (_req, res, next) => {
-            const activation = await opts.cnxProvider.getStaticActivation();
-            res.locals.activation = activation;
+            res.locals.activation = await getStaticActivation(opts);
             next();
         };
     }
+    // TODO(@teo): move db access to outside of the middleware??? (genuine question - not instruction)
     return async (req, res, next) => {
         if (!opts.connName) {
             // This is mainly for type safety, but we should never reach this point
@@ -18,36 +42,32 @@ export function createStaticWebhookMiddleware(opts) {
             return;
         }
         const cnxId = opts.cfgReader.getConnectionID(opts.connName);
-        const conn = await opts.cnxProvider.getStaticConnection(cnxId);
-        const activation = await opts.cnxProvider.getStaticActivation();
-        if (conn === undefined || activation === undefined) {
-            opts.log.error(`Connection or activation not found for webhook: /${opts.id}`);
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        const key = await opts.credentials.getRaw(opts.connName);
-        const asc = conn.credentials[0].authSchemeConfig;
-        if (!asc || !asc.hmac) {
-            opts.log.error('HMAC AuthSchemeConfig not found for webhook');
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        const digest = createDigest(asc.hmac, req, key);
-        let requestDigest;
-        try {
-            requestDigest = extractDigest(asc.hmac, req);
-        }
-        catch (error) {
-            opts.log.error('Error extracting HMAC digest from request', { error });
-            res.status(401).json({ error: 'Unauthorised' });
+        if (!cnxId) {
+            opts.log.error('Missing connection ID for webhook, either omit the connection option from your webhook or configure your connection', { webhookId: opts.id, connName: opts.connName });
+            res.status(500).json({ error: 'Missing connection for webhook' });
             return;
         }
-        if (digest !== requestDigest) {
-            res.status(401).json({ error: 'Unauthorised' });
+        const activation = await getStaticActivation(opts);
+        if (!activation) {
+            opts.log.error('No activation found for static webhook', { webhookId: opts.id, connName: opts.connName });
+            res.status(500).json({ error: 'No activation found for static webhook' });
             return;
         }
         res.locals.activation = activation;
-        next();
+        const { data: cnx } = await opts.platformApi.getConnection({
+            path: {
+                organisation_id: opts.organisationId,
+                connection_id: cnxId,
+            },
+        });
+        if (!cnx) {
+            opts.log.error(`No connection found for webhook`, { webhookId: opts.id, connName: opts.connName });
+            res.status(500).json({ error: 'No connection found for webhook' });
+            return;
+        }
+        const connectedHandler = await opts.cnxFactory.handler(cnx);
+        // this will call next on our behalf if there's no error, it handles HMAC, API key and basic auth.
+        connectedHandler(req, res, next);
     };
 }
 export function createActIdDynamicWebhookMiddleware(opts) {
@@ -55,7 +75,14 @@ export function createActIdDynamicWebhookMiddleware(opts) {
         opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (req, res, next) => {
             const activationId = req.params.activationId;
-            const activation = await opts.cnxProvider.getActivation(activationId);
+            const activation = await opts.platformApi.getActivation({
+                path: {
+                    organisation_id: opts.organisationId,
+                    environment_id: opts.environmentId,
+                    activation_id: activationId,
+                },
+                throwOnError: true,
+            });
             res.locals.activation = activation;
             next();
         };
@@ -69,36 +96,29 @@ export function createActIdDynamicWebhookMiddleware(opts) {
         }
         const templateId = opts.cfgReader.getTemplateID(opts.connName);
         const activationId = req.params.activationId;
-        const activation = await opts.cnxProvider.getActivation(activationId);
-        const conn = await opts.cnxProvider.getActivationConnection(templateId, activationId);
+        const activation = await opts.platformApi.getActivation({
+            path: {
+                organisation_id: opts.organisationId,
+                environment_id: opts.environmentId,
+                activation_id: activationId,
+            },
+            throwOnError: true,
+        });
+        const conn = await opts.platformApi.getActivationConnection({
+            path: {
+                organisation_id: opts.organisationId,
+                env_system_id: templateId,
+                activation_id: activationId,
+            },
+            throwOnError: true,
+        });
         if (activation === undefined || conn === undefined) {
             opts.log.error(`Activation or connection not found for webhook: /${opts.id}/activations/${activationId}`);
             res.status(401).json({ error: 'Unauthorised' });
             return;
         }
-        const key = await opts.credentials.getRaw(opts.connName, activationId);
-        const asc = conn.credentials[0].authSchemeConfig;
-        if (!asc || !asc.hmac) {
-            opts.log.error('HMAC AuthSchemeConfig not found for webhook');
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        const digest = createDigest(asc.hmac, req, key);
-        let requestDigest;
-        try {
-            requestDigest = extractDigest(asc.hmac, req);
-        }
-        catch (error) {
-            opts.log.error('Error extracting HMAC digest from request', { error });
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        if (digest !== requestDigest) {
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        res.locals.activation = activation;
-        next();
+        const handler = await opts.cnxFactory.handler(conn.data);
+        handler(req, res, next);
     };
 }
 export function createUserIdDynamicWebhookMiddleware(opts) {
@@ -106,14 +126,23 @@ export function createUserIdDynamicWebhookMiddleware(opts) {
         opts.log.warn(`No template ID found for webhook, accepting any requests which is unsecure!`, { webhookId: opts.id });
         return async (req, res, next) => {
             const userId = req.params.userId;
-            const activations = await opts.cnxProvider.getUserActivations(userId);
+            const { data: activations } = await opts.platformApi.listUserActivations({
+                path: {
+                    organisation_id: opts.organisationId,
+                    environment_id: opts.environmentId,
+                    external_user_id: userId,
+                },
+                throwOnError: true,
+            });
             if (activations.length === 0) {
                 opts.log.error(`No activations found for user: ${userId}`);
                 res.status(401).json({ error: 'Unauthorised' });
                 return;
             }
-            const activation = activations[0];
-            res.locals.activation = activation;
+            if (activations.length > 1) {
+                opts.log.warn(`Multiple activations found for user: ${userId}, using the first one: ${activations[0].id}`);
+            }
+            res.locals.activation = activations[0];
             next();
         };
     }
@@ -126,72 +155,34 @@ export function createUserIdDynamicWebhookMiddleware(opts) {
         }
         const templateId = opts.cfgReader.getTemplateID(opts.connName);
         const userId = req.params.userId;
-        const activations = await opts.cnxProvider.getUserActivations(userId);
+        const { data: activations } = await opts.platformApi.listUserActivations({
+            path: {
+                organisation_id: opts.organisationId,
+                environment_id: opts.environmentId,
+                external_user_id: userId,
+            },
+            throwOnError: true,
+        });
         if (activations.length === 0) {
+            opts.log.error(`No activations found for user: ${userId}`);
             res.status(401).json({ error: 'Unauthorised' });
             return;
         }
         const activation = activations[0]; // Right now we only support a user having one activation
-        const conn = await opts.cnxProvider.getActivationConnection(templateId, activation.id);
+        const conn = await opts.platformApi.getActivationConnection({
+            path: {
+                organisation_id: opts.organisationId,
+                env_system_id: templateId,
+                activation_id: activation.id,
+            },
+            throwOnError: true,
+        });
         if (conn === undefined) {
             opts.log.error(`Connection not found for webhook: /${opts.id}/users/${userId}`);
             res.status(401).json({ error: 'Unauthorised' });
             return;
         }
-        const key = await opts.credentials.getRaw(opts.connName, activation.id);
-        const asc = conn.credentials[0].authSchemeConfig;
-        if (!asc || !asc.hmac) {
-            opts.log.error('HMAC AuthSchemeConfig not found for webhook');
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        const digest = createDigest(asc.hmac, req, key);
-        let requestDigest;
-        try {
-            requestDigest = extractDigest(asc.hmac, req);
-        }
-        catch (error) {
-            opts.log.error('Error extracting HMAC digest from request', { error });
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        if (digest !== requestDigest) {
-            res.status(401).json({ error: 'Unauthorised' });
-            return;
-        }
-        res.locals.activation = activation;
-        next();
+        const handler = await opts.cnxFactory.handler(conn.data);
+        handler(req, res, next);
     };
 }
-// createDigest creates a HMAC digest for the request using the provided key.
-// Note that this assumes the request body is a JSON object, as one would normally
-// expect for our use case.
-// TODO: implement the case where we might want to digest the body + url or url + body
-// or url...
-function createDigest(asc, req, key) {
-    const hmac = createHmac(asc.algorithm, Buffer.from(key).toString('utf8'));
-    hmac.update(JSON.stringify(req.body));
-    return hmac.digest(asc.encoding);
-}
-function extractDigest(asc, req) {
-    switch (asc.in) {
-        case 'query':
-            if (req.query[asc.name]) {
-                return req.query[asc.name];
-            }
-            break;
-        case 'header':
-            if (req.headers[asc.name.toLowerCase()]) {
-                return req.headers[asc.name.toLowerCase()];
-            }
-            break;
-        case 'cookie':
-            if (req.cookies[asc.name]) {
-                return req.cookies[asc.name];
-            }
-            break;
-        default:
-            throw new Error(`Unsupported HMAC digest extraction method: ${asc.in}`);
-    }
-    throw new Error(`HMAC digest not found in request: ${asc.name}`);
-}

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

@@ -5,9 +5,10 @@ import { Issue } from '../../issues/Issues.js';
 import { KeyValue, KeyValueScope } from '../../kv/KeyValue.js';
 import { WorkflowOpts } from '../../mod.js';
 import { Logger } from '../../observability/logging/Logger.js';
-import { Activation, BaseUrlFetcher, DynamicFetcher } from '../http/types.js';
 import { CredentialsProvider } from '../http/versori/contextcredentials.js';
 import { ArrayTask, Task, Taskable, TaskType } from '../Task.js';
+import { ActivationImpl } from '../../context/ActivationImpl.js';
+import { FetchLike } from '../../connection/types.js';
 export interface HttpContext<Data, PageParams = undefined> extends Context<Data> {
     fetch: typeof fetch;
     connectionVariables: Record<string, any>;
@@ -40,11 +41,13 @@ export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, Pa
     #private;
     connectionVariables: Record<string, any>;
     pageParams?: PageParams;
-    constructor(ctx: ContextImpl<D, any>, connectionVars: Record<string, any>, baseUrlFetcher: BaseUrlFetcher, staticFetcher?: typeof globalThis.fetch, dynamicFetcher?: DynamicFetcher, pageParams?: PageParams);
+    readonly fetch: FetchLike;
+    readonly baseUrl: Promise<string>;
+    constructor(ctx: ContextImpl<D, any>, connectionVars: Record<string, any>, fetch: FetchLike, baseUrl: string, pageParams?: PageParams);
     get log(): Logger;
     get executionId(): string;
     get startTime(): Date;
-    get activation(): Activation | undefined;
+    get activation(): ActivationImpl;
     get data(): D;
     openKv(scope?: KeyValueScope): KeyValue;
     destroy(scope: KeyValueScope): Promise<void>;
@@ -54,8 +57,6 @@ export declare class HttpContextImpl<D, PageParams> implements HttpContext<D, Pa
         deduplicate?: boolean;
         duplicationKey?: string;
     }): Promise<Issue | null>;
-    get fetch(): typeof globalThis.fetch;
-    get baseUrl(): Promise<string>;
     nextPage(_nextParams: PageParams): Promise<void>;
     request(): express.Request | undefined;
 }

package/esm/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/esm/src/dsl/tasks/HttpTask.js

@@ -9,9 +9,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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_baseUrlFetcher, _HttpContextImpl_inner;
+var _a, _HttpContextImpl_inner;
 import { ensureTask } from '../ensureTask.js';
-import { wrapDynamicFetcher } from '../http/types.js';
 import { TaskType } from '../Task.js';
 import { BackgroundTask } from './BackgroundTask.js';
 import { CatchTask } from './CatchTask.js';
@@ -68,7 +67,7 @@ export class HttpTaskImpl {
 }
 _a = TaskType;
 export class HttpContextImpl {
-    constructor(ctx, connectionVars, baseUrlFetcher, staticFetcher, dynamicFetcher, pageParams) {
+    constructor(ctx, connectionVars, fetch, baseUrl, pageParams) {
         Object.defineProperty(this, "connectionVariables", {
             enumerable: true,
             configurable: true,
@@ -81,17 +80,24 @@ export class HttpContextImpl {
             writable: true,
             value: void 0
         });
-        // ideally only one of these should be set to a value
-        _HttpContextImpl_dynamicFetcher.set(this, void 0);
-        _HttpContextImpl_staticFetcher.set(this, void 0);
-        _HttpContextImpl_baseUrlFetcher.set(this, void 0);
         _HttpContextImpl_inner.set(this, void 0);
+        Object.defineProperty(this, "fetch", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "baseUrl", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
         __classPrivateFieldSet(this, _HttpContextImpl_inner, ctx, "f");
         this.pageParams = pageParams;
         this.connectionVariables = connectionVars;
-        __classPrivateFieldSet(this, _HttpContextImpl_dynamicFetcher, dynamicFetcher, "f");
-        __classPrivateFieldSet(this, _HttpContextImpl_staticFetcher, staticFetcher, "f");
-        __classPrivateFieldSet(this, _HttpContextImpl_baseUrlFetcher, baseUrlFetcher, "f");
+        this.fetch = fetch;
+        this.baseUrl = Promise.resolve(baseUrl);
         // all methods on HttpContextImpl which are exposed via the Context interface need to be
         // bound so that destructuring the context object doesn't break the binding of the methods
         // to the correct instance.
@@ -130,23 +136,14 @@ export class HttpContextImpl {
     createIssue(issue, options) {
         return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").createIssue(issue, options);
     }
-    get fetch() {
-        // This is maybe hard to read.
-        return __classPrivateFieldGet(this, _HttpContextImpl_dynamicFetcher, "f") && __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation
-            ? wrapDynamicFetcher(__classPrivateFieldGet(this, _HttpContextImpl_dynamicFetcher, "f"), __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation)
-            : __classPrivateFieldGet(this, _HttpContextImpl_staticFetcher, "f") ?? globalThis.fetch;
-    }
-    get baseUrl() {
-        return __classPrivateFieldGet(this, _HttpContextImpl_baseUrlFetcher, "f").call(this, __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").activation?.id ?? '');
-    }
-    async nextPage(_nextParams) {
-        throw new Error('Method not implemented.');
+    nextPage(_nextParams) {
+        return Promise.reject(new Error('Method not implemented.'));
     }
     request() {
         return __classPrivateFieldGet(this, _HttpContextImpl_inner, "f").request();
     }
 }
-_HttpContextImpl_dynamicFetcher = new WeakMap(), _HttpContextImpl_staticFetcher = new WeakMap(), _HttpContextImpl_baseUrlFetcher = new WeakMap(), _HttpContextImpl_inner = new WeakMap();
+_HttpContextImpl_inner = new WeakMap();
 export function http(taskId, opts, fn) {
     return new HttpTaskImpl(taskId, opts, fn);
 }

package/esm/src/internal/InternalAuth.d.ts

@@ -0,0 +1,15 @@
+type internalAuthHeader = {
+    [key: string]: string;
+};
+export declare class InternalAuth {
+    private clientId;
+    private clientSecret;
+    private tokenEndpoint;
+    private runLocal;
+    private accessToken;
+    private expiresAt;
+    constructor();
+    getAuthHeader(): Promise<internalAuthHeader>;
+}
+export {};
+//# sourceMappingURL=InternalAuth.d.ts.map

package/esm/src/internal/InternalAuth.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"InternalAuth.d.ts","sourceRoot":"","sources":["../../../src/src/internal/InternalAuth.ts"],"names":[],"mappings":"AASA,KAAK,kBAAkB,GAAG;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAE,CAAC;AAEpD,qBAAa,YAAY;IACrB,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,QAAQ,CAAU;IAE1B,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,SAAS,CAAS;;IAkCpB,aAAa,IAAI,OAAO,CAAC,kBAAkB,CAAC;CA0BrD"}

package/esm/src/internal/InternalAuth.js

@@ -0,0 +1,90 @@
+import { getVersoriCookie } from './cli.js';
+import { envVarClientId, envVarClientSecret, envVarInternalToken, envVarLocalRun, envVarTokenEndpoint, } from './constants.js';
+export class InternalAuth {
+    constructor() {
+        Object.defineProperty(this, "clientId", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "clientSecret", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "tokenEndpoint", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "runLocal", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "accessToken", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        Object.defineProperty(this, "expiresAt", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.clientId = Deno.env.get(envVarClientId) || '';
+        this.clientSecret = Deno.env.get(envVarClientSecret) || '';
+        this.tokenEndpoint = Deno.env.get(envVarTokenEndpoint) || '';
+        this.accessToken = '';
+        this.expiresAt = 0;
+        this.runLocal = Deno.env.get(envVarLocalRun) === 'true';
+        if (Deno.env.get(envVarInternalToken)) {
+            this.accessToken = Deno.env.get(envVarInternalToken) || '';
+            this.expiresAt = Date.now() + 365 * 24 * 60 * 60 * 1000; // expires in 1 year
+            console.log(`Using static token provided by ${envVarInternalToken}`);
+            return;
+        }
+        if (this.runLocal) {
+            console.info('Running in local mode using cookie for authentication');
+            this.accessToken = getVersoriCookie();
+            return;
+        }
+        if (!this.clientId || !this.clientSecret || !this.tokenEndpoint) {
+            const missingVars = [];
+            if (!this.clientId)
+                missingVars.push(envVarClientId);
+            if (!this.clientSecret)
+                missingVars.push(envVarClientSecret);
+            if (!this.tokenEndpoint)
+                missingVars.push(envVarTokenEndpoint);
+            throw new Error(`Missing environment variables: ${missingVars.join(', ')}`);
+        }
+    }
+    async getAuthHeader() {
+        if (this.runLocal) {
+            return { 'Cookie': this.accessToken };
+        }
+        if (this.accessToken && this.expiresAt > Date.now()) {
+            return { 'X-Versori-Internal-Token': this.accessToken };
+        }
+        const encoded = btoa(`${this.clientId}:${this.clientSecret}`);
+        const response = await fetch(this.tokenEndpoint, {
+            method: 'POST',
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded',
+                Authorization: `Basic ${encoded}`,
+            },
+            body: `grant_type=client_credentials`,
+        });
+        const data = await response.json();
+        this.accessToken = data.access_token;
+        this.expiresAt = Date.now() + data.expires_in * 1000 - 2 * 60 * 1000; // 2 minutes before expiration
+        return { 'X-Versori-Internal-Token': this.accessToken };
+    }
+}

package/esm/src/internal/cli.d.ts

@@ -0,0 +1,2 @@
+export declare function getVersoriCookie(): string;
+//# sourceMappingURL=cli.d.ts.map

package/esm/src/internal/cli.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../../../src/src/internal/cli.ts"],"names":[],"mappings":"AAiBA,wBAAgB,gBAAgB,IAAI,MAAM,CAoBzC"}

package/esm/src/internal/cli.js

@@ -0,0 +1,20 @@
+// This file contains functions that can read stuff generated by the Versori CLI. This is used when running locally.
+import { homedir } from 'node:os';
+const cookiesFileName = 'cookies.json';
+const versoriCookieName = 'versori_sess';
+export function getVersoriCookie() {
+    const cookiesFilePath = `${homedir()}/.config/versori/${cookiesFileName}`;
+    let cookiesFile;
+    try {
+        cookiesFile = JSON.parse(Deno.readTextFileSync(cookiesFilePath));
+    }
+    catch (e) {
+        console.error('Error reading file, have you run the Versori CLI to log in?');
+        throw new Error(`Failed to read or parse cookies file at ${cookiesFilePath}: ${e}`);
+    }
+    const versoriCookie = cookiesFile.cookies.find(cookie => cookie.Name === versoriCookieName);
+    if (!versoriCookie) {
+        throw new Error(`Cookie 'versori_sess' not found in ${cookiesFilePath}`);
+    }
+    return `${versoriCookieName}=${versoriCookie.Value}`;
+}

package/esm/src/internal/constants.d.ts

@@ -0,0 +1,20 @@
+export declare const envVarOrgId = "RUN_ORGANISATION_ID";
+export declare const envVarEnvId = "RUN_ENVIRONMENT_ID";
+export declare const envVarEnvironmentName = "RUN_ENVIRONMENT";
+export declare const envVarProjectId = "RUN_SERVICE_ID";
+export declare const envVarOrgSlug = "RUN_ORGANISATION_SLUG";
+export declare const envVarPlatformApiBaseURL = "RUN_PLATFORM_API_INTERNAL_URL";
+export declare const envVarCronApiBaseURL = "RUN_CRON_API_INTERNAL_URL";
+export declare const envVarSDKApiBaseURL = "RUN_SDK_API_URL";
+export declare const envVarSelfRefURL = "RUN_SELF_REF_URL";
+export declare const envVarCredsBaseURL = "RUN_CREDENTIALS_SERVICE_INTERNAL_URL";
+export declare const envVarOtelTracesURL = "RUN_OTEL_TRACES_URL";
+export declare const envVarVersion = "RUN_SERVICE_VERSION";
+export declare const envVarConfigFile = "RUN_CONFIG_FILE";
+export declare const envVarClientId = "RUN_CLIENT_ID";
+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/esm/src/internal/constants.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/src/internal/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,mBAAmB,oBAAoB,CAAC;AACrD,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;AAG1C,eAAO,MAAM,QAAQ,OAAO,CAAC"}

package/esm/src/internal/constants.js

@@ -0,0 +1,24 @@
+// This file contains constants used in the Versori DSL HTTP client.
+export const envVarOrgId = 'RUN_ORGANISATION_ID';
+export const envVarEnvId = 'RUN_ENVIRONMENT_ID';
+export const envVarEnvironmentName = 'RUN_ENVIRONMENT';
+export const envVarProjectId = 'RUN_SERVICE_ID';
+export const envVarOrgSlug = 'RUN_ORGANISATION_SLUG';
+export const envVarPlatformApiBaseURL = 'RUN_PLATFORM_API_INTERNAL_URL';
+export const envVarCronApiBaseURL = 'RUN_CRON_API_INTERNAL_URL';
+export const envVarSDKApiBaseURL = 'RUN_SDK_API_URL';
+export const envVarSelfRefURL = 'RUN_SELF_REF_URL';
+export const envVarCredsBaseURL = 'RUN_CREDENTIALS_SERVICE_INTERNAL_URL';
+export const envVarOtelTracesURL = 'RUN_OTEL_TRACES_URL';
+export const envVarVersion = 'RUN_SERVICE_VERSION';
+// The following environment variables are used for the config file
+export const envVarConfigFile = 'RUN_CONFIG_FILE';
+// The following environment variables are used for internal authentication
+export const envVarClientId = 'RUN_CLIENT_ID';
+export const envVarClientSecret = 'RUN_CLIENT_SECRET';
+export const envVarTokenEndpoint = 'RUN_TOKEN_ENDPOINT';
+export const envVarInternalToken = 'RUN_INTERNAL_TOKEN';
+// The following are for running locally
+export const envVarLocalRun = 'RUN_LOCAL';
+// please no changerino
+export const cronPort = 3001; // The port on which the cron API communicates with the service