@versori/run 0.2.28 → 0.3.0-beta.2

package/esm/src/interpreter/durable/DurableInterpreter.d.ts

@@ -2,14 +2,23 @@ import { Tracer } from '@opentelemetry/api';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import { Router } from 'express';
 import { Observable, Subscription } from 'rxjs';
+import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
-import { ConfigReader, ConnectionProvider, CronProvider, RoundTripperFactory } from '../../dsl/http/types.js';
+import { ConfigReader, CronProvider } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
 import { IssueAPI } from '../../issues/Issues.js';
 import { ContextImpl, ContextOperatorFunction } from '../../mod.js';
 import { Logger } from '../../observability/logging/Logger.js';
+import { PlatformApi } from '../../services/platform/PlatformApi.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
 import { QueueAPI } from './Queue.js';
+declare global {
+    namespace Express {
+        interface Request {
+            rawBody: Uint8Array;
+        }
+    }
+}
 export type DurableInterpreterOptions = {
     logger?: Logger;
     compiler?: ObservableCompiler;
@@ -28,11 +37,11 @@ export declare class DurableInterpreter {
     private readonly log;
     private readonly compiler;
     private readonly contextProvider;
-    private readonly roundTripperFactory;
     private readonly webhookRouter;
     private readonly cronRouter;
-    private cronRegistry;
-    private readonly connectionProvider;
+    private readonly cronRegistry;
+    private readonly platformApi;
+    private readonly cnxFetchFactory;
     private readonly cronProvider;
     private readonly tracer;
     private readonly issue;
@@ -44,7 +53,7 @@ export declare class DurableInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
-    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, roundTripperFactory: RoundTripperFactory, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, connectionProvider: ConnectionProvider, cronProvider: CronProvider, tracer: Tracer, issue: IssueAPI, cfgReader: ConfigReader, queueProvider: QueueAPI, otelSDK?: NodeSDK | undefined);
+    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, platformApi: PlatformApi, cnxFetchFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issue: IssueAPI, cfgReader: ConfigReader, queueProvider: QueueAPI, otelSDK?: NodeSDK | undefined);
     static newInstance(options?: DurableInterpreterOptions): Promise<DurableInterpreter>;
     register<O>(workflow: Workflow<O>, options?: DurableInterpreterOptions): Registration;
     start(): Promise<void>;

package/esm/src/interpreter/durable/DurableInterpreter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DurableInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/DurableInterpreter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DurableInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/DurableInterpreter.ts"],"names":[],"mappings":"AAAA,OAAsB,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAG3D,OAAO,EAAE,OAAO,EAAE,MAAM,yBAAyB,CAAC;AAClD,OAAgB,EAAqB,MAAM,EAAE,MAAM,SAAS,CAAC;AAI7D,OAAO,EAA+B,UAAU,EAAM,YAAY,EAAO,MAAM,MAAM,CAAC;AACtF,OAAO,EAAE,uBAAuB,EAAE,MAAM,6CAA6C,CAAC;AACtF,OAAO,EAAE,eAAe,EAAuB,MAAM,kCAAkC,CAAC;AAExF,OAAO,EAAE,YAAY,EAAE,YAAY,EAAuB,MAAM,yBAAyB,CAAC;AAe1F,OAAO,EAAE,QAAQ,EAAgB,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAE,QAAQ,EAAa,MAAM,wBAAwB,CAAC;AAG7D,OAAO,EAAE,WAAW,EAAE,uBAAuB,EAAoB,MAAM,cAAc,CAAC;AAEtF,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAmB,MAAM,wCAAwC,CAAC;AACtF,OAAO,EAA0B,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAa,MAAM,YAAY,CAAC;AAEjD,OAAO,CAAC,MAAM,CAAC;IACX,UAAU,OAAO,CAAC;QACd,UAAU,OAAO;YACb,OAAO,EAAE,UAAU,CAAC;SACvB;KACJ;CACJ;AAGD,MAAM,MAAM,yBAAyB,GAAG;IACpC,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,CAAC;AAoCF,qBAAa,kBAAkB;IAQvB,OAAO,CAAC,QAAQ,CAAC,GAAG;IACpB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,KAAK;IACtB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,aAAa;IAC9B,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC;IApB7B,OAAO,CAAC,mBAAmB,CAA2B;IACtD,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,UAAU,CAAC,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAC,CAAa;IACpC,OAAO,CAAC,cAAc,CAAS;gBAGV,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,kBAAkB,EAC5B,eAAe,EAAE,eAAe,EAChC,aAAa,EAAE,MAAM,EACrB,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACjC,WAAW,EAAE,WAAW,EACxB,eAAe,EAAE,uBAAuB,EACxC,YAAY,EAAE,YAAY,EAC1B,MAAM,EAAE,MAAM,EACd,KAAK,EAAE,QAAQ,EACf,SAAS,EAAE,YAAY,EACvB,aAAa,EAAE,QAAQ,EACvB,OAAO,CAAC,EAAE,OAAO,YAAA;WAWzB,WAAW,CAAC,OAAO,GAAE,yBAA8B,GAAG,OAAO,CAAC,kBAAkB,CAAC;IAuG9F,QAAQ,CAAC,CAAC,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,yBAAyB;IAoDhE,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IA4MtB,IAAI,IAAI,OAAO,CAAC,IAAI,CAAC;CAO9B"}

package/esm/src/interpreter/durable/DurableInterpreter.js

@@ -4,19 +4,19 @@ import { resourceFromAttributes } from '@opentelemetry/resources';
 import { NodeSDK } from '@opentelemetry/sdk-node';
 import express from 'express';
 import { catchError, EMPTY, mergeMap, of, tap } from 'rxjs';
+import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextProviderImpl } from '../../context/ContextProvider.js';
 import { DefaultRoundTripperFactory } from '../../dsl/http/default.js';
 import { VersoriConfigReader } from '../../dsl/http/versori/configloader.js';
 import { envVarEnvId, envVarEnvironmentName, envVarLocalRun, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarSDKApiBaseURL, envVarVersion, } from '../../dsl/http/versori/constants.js';
 import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
-import { PlatformAPIClient } from '../../dsl/http/versori/platformapi.js';
 import { ProxyRoundTripper } from '../../dsl/http/versori/proxyroundtripper.js';
-import { VersoriCredentialsFactory } from '../../dsl/http/versori/roundtripper.js';
 import { WorkflowImpl } from '../../dsl/Workflow.js';
 import { IssueImpl } from '../../issues/Issues.js';
 import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
 import { SDKKeyValueProvider } from '../../kv/sdk/SDKKeyValueProvider.js';
 import { ConsoleLogger } from '../../observability/logging/ConsoleLogger.js';
+import { PlatformApiImpl } from '../../services/platform/PlatformApi.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
 import { QueueImpl } from './Queue.js';
 function getKVProvider(runLocal) {
@@ -30,14 +30,11 @@ function getRoundTripperFactory(log, tracer, opts) {
         log.info('Running in local mode, using ProxyRoundTripperFactory');
         return ProxyRoundTripper.fromEnv(log);
     }
-    if (!opts || !opts.skipVersoriCredentials) {
-        return VersoriCredentialsFactory.fromEnv(log, tracer);
-    }
     log.info('Running with default round tripper factory');
     return new DefaultRoundTripperFactory();
 }
 export class DurableInterpreter {
-    constructor(log, compiler, contextProvider, roundTripperFactory, webhookRouter, cronRouter, cronRegistry, connectionProvider, cronProvider, tracer, issue, cfgReader, queueProvider, otelSDK) {
+    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, platformApi, cnxFetchFactory, cronProvider, tracer, issue, cfgReader, queueProvider, otelSDK) {
         Object.defineProperty(this, "log", {
             enumerable: true,
             configurable: true,
@@ -56,12 +53,6 @@ export class DurableInterpreter {
             writable: true,
             value: contextProvider
         });
-        Object.defineProperty(this, "roundTripperFactory", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: roundTripperFactory
-        });
         Object.defineProperty(this, "webhookRouter", {
             enumerable: true,
             configurable: true,
@@ -80,11 +71,17 @@ export class DurableInterpreter {
             writable: true,
             value: cronRegistry
         });
-        Object.defineProperty(this, "connectionProvider", {
+        Object.defineProperty(this, "platformApi", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: platformApi
+        });
+        Object.defineProperty(this, "cnxFetchFactory", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: connectionProvider
+            value: cnxFetchFactory
         });
         Object.defineProperty(this, "cronProvider", {
             enumerable: true,
@@ -204,10 +201,14 @@ export class DurableInterpreter {
         if (options.contextProvider) {
             // no need to set up a key-value provider if options.contextProvider is already
             // initialised.
-            return new DurableInterpreter(log, compiler, options.contextProvider, roundTripperFactory, express.Router(), express.Router(), new Map(), PlatformAPIClient.fromEnv(), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
+            return new DurableInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
         }
         const kvp = await getKVProvider(runLocal);
-        return new DurableInterpreter(log, compiler, new ContextProviderImpl(log, kvp, roundTripperFactory.credentials(), issuesProvider, queueProvider), roundTripperFactory, express.Router(), express.Router(), new Map(), PlatformAPIClient.fromEnv(), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
+        const platformApi = PlatformApiImpl.fromEnv();
+        const organisationId = Deno.env.get(envVarOrgId) || 'development';
+        const environmentId = Deno.env.get(envVarEnvId) || 'development';
+        const ctxProvider = new ContextProviderImpl(log, kvp, roundTripperFactory.credentials(), platformApi, organisationId, environmentId, issuesProvider);
+        return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), DirectConnectionFactory.fromEnv(log), CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -223,14 +224,15 @@ export class DurableInterpreter {
             log: this.log,
             tracer: this.tracer,
             contextProvider: this.contextProvider,
-            roundTripperFactory: this.roundTripperFactory,
             webhookRouter: this.webhookRouter,
             queueProvider: this.queueProvider,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
             issueProvider: this.issue,
-            connectionProvider: this.connectionProvider,
             configReader: this.cfgReader,
+            platformApi: this.platformApi,
+            cnxFactory: this.cnxFetchFactory,
+            organisationId: Deno.env.get(envVarOrgId) || 'development',
         };
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);

package/esm/src/interpreter/durable/ObservableCompiler.d.ts

@@ -3,26 +3,29 @@ import { Router } from 'express';
 import { Observable, OperatorFunction } from 'rxjs';
 import { ContextImpl } from '../../context/Context.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
-import { ConfigReader, ConnectionProvider, RoundTripperFactory } from '../../dsl/http/types.js';
+import { ConfigReader } from '../../dsl/http/types.js';
 import { Task } from '../../dsl/Task.js';
 import { Trigger } from '../../dsl/Trigger.js';
 import { IssueAPI } from '../../issues/Issues.js';
 import { Logger } from '../../observability/logging/Logger.js';
+import { PlatformApi } from '../../services/platform/mod.js';
 import { ContextOperatorFunction, TaskCompiler, TriggerCompiler } from './compilers/types.js';
 import { QueueAPI } from './Queue.js';
+import { ConnectionFactory } from '../../connection/types.js';
 export type DurableCompilerContext = {
     compiler: ObservableCompiler;
     log: Logger;
     tracer: Tracer;
     contextProvider: ContextProvider;
-    roundTripperFactory: RoundTripperFactory;
-    connectionProvider: ConnectionProvider;
+    cnxFactory: ConnectionFactory;
+    platformApi: PlatformApi;
     queueProvider: QueueAPI;
     issueProvider: IssueAPI;
     webhookRouter: Router;
     cronRouter: Router;
     configReader: ConfigReader;
     cronRegistry: Map<string, string>;
+    organisationId: string;
 };
 export type CompilerFunc<In = any, Out = any, T extends Task<In, Out> = Task<In, Out>> = (ctx: DurableCompilerContext, task: T) => OperatorFunction<In, Out>;
 export declare class ObservableCompiler {

package/esm/src/interpreter/durable/ObservableCompiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,yBAAyB,CAAC;AAChG,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAU/D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,mBAAmB,EAAE,mBAAmB,CAAC;IACzC,kBAAkB,EAAE,kBAAkB,CAAC;IACvC,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CACrC,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAkBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}
+{"version":3,"file":"ObservableCompiler.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/durable/ObservableCompiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAC;AAC5C,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AACvD,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,IAAI,EAAY,MAAM,mBAAmB,CAAC;AACnD,OAAO,EAAE,OAAO,EAAe,MAAM,sBAAsB,CAAC;AAC5D,OAAO,EAAE,QAAQ,EAAE,MAAM,wBAAwB,CAAC;AAClD,OAAO,EAAE,MAAM,EAAE,MAAM,uCAAuC,CAAC;AAC/D,OAAO,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAU7D,OAAO,EAAE,uBAAuB,EAAE,YAAY,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG9F,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAE9D,MAAM,MAAM,sBAAsB,GAAG;IACjC,QAAQ,EAAE,kBAAkB,CAAC;IAC7B,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,eAAe,EAAE,eAAe,CAAC;IACjC,UAAU,EAAE,iBAAiB,CAAC;IAC9B,WAAW,EAAE,WAAW,CAAC;IACzB,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,QAAQ,CAAC;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,YAAY,CAAC;IAC3B,YAAY,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAClC,cAAc,EAAE,MAAM,CAAC;CAC1B,CAAC;AAEF,MAAM,MAAM,YAAY,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,IAAI,CACrF,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,CAAC,KACN,gBAAgB,CAAC,EAAE,EAAE,GAAG,CAAC,CAAC;AAE/B,qBAAa,kBAAkB;IAC3B,OAAO,CAAC,aAAa,CAAkD;IACvE,OAAO,CAAC,gBAAgB,CAAgD;;IAkBxE,WAAW,CAAC,EAAE,GAAG,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,KAAK,GAAG,IAAI,EACzC,GAAG,EAAE,sBAAsB,EAC3B,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,GACpB,uBAAuB,CAAC,EAAE,EAAE,GAAG,EAAE,KAAK,CAAC;IAe1C,cAAc,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,EAC3D,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,CAAC,EACV,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;IAerC,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,SAAS,IAAI,CAAC,EAAE,EAAE,GAAG,CAAC,EAAE,QAAQ,EAAE,YAAY,CAAC,EAAE,EAAE,GAAG,EAAE,CAAC,CAAC;IAKjF,eAAe,CAAC,GAAG,EAAE,CAAC,SAAS,OAAO,CAAC,GAAG,CAAC,EAAE,QAAQ,EAAE,eAAe,CAAC,GAAG,EAAE,CAAC,CAAC;CAIjF"}

package/esm/src/interpreter/durable/compilers/durableworkflow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/durableworkflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAG3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CA2F9C;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAI5F,CAAC"}
+{"version":3,"file":"durableworkflow.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/durableworkflow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAE,sBAAsB,EAAE,MAAM,WAAW,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAI3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAmG9C;AAED,eAAO,MAAM,uBAAuB,EAAE,eAAe,CAAC,mBAAmB,EAAE,sBAAsB,CAIhG,CAAC"}

package/esm/src/interpreter/durable/compilers/durableworkflow.js

@@ -1,5 +1,6 @@
 import { Observable } from 'rxjs';
 import { DurableWorkflowTrigger, } from '../../../dsl/triggers/DurableTrigger.js';
+import { envVarEnvId } from '../../../internal/constants.js';
 export function compileDurableWorkflow(ctx, trigger, signal) {
     return new Observable((subscriber) => {
         function cleanup() {
@@ -52,7 +53,15 @@ export function compileDurableWorkflow(ctx, trigger, signal) {
                         const data = JSON.parse(atob(wf.payload ?? '{}'));
                         let activation;
                         if (wf.metadata?.activationId) {
-                            activation = await ctx.connectionProvider.getActivation(wf.metadata.activationId);
+                            const { data } = await ctx.platformApi.getActivation({
+                                path: {
+                                    activation_id: wf.metadata.activationId,
+                                    organisation_id: ctx.organisationId,
+                                    environment_id: Deno.env.get(envVarEnvId) || 'development',
+                                },
+                                throwOnError: true
+                            });
+                            activation = data;
                         }
                         const newContext = ctx.contextProvider.create(data, {
                             activation: activation,

package/esm/src/interpreter/durable/compilers/http.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AA2DnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}
+{"version":3,"file":"http.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/http.ts"],"names":[],"mappings":"AAIA,OAAO,EAAmB,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAE/E,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAoFnE,eAAO,MAAM,YAAY,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAG5E,CAAC"}

package/esm/src/interpreter/durable/compilers/http.js

@@ -1,28 +1,45 @@
 import { mergeMap } from 'rxjs';
 import { tap } from 'rxjs/operators';
 import { HttpContextImpl, HttpTaskImpl } from '../../../dsl/tasks/HttpTask.js';
+import { DynamicFetchFactory } from '../../../connection/DynamicFetchFactory.js';
+import { StaticFetchFactory } from '../../../connection/StaticFetchFactory.js';
 function compileHttp(compilerCtx, task) {
-    const roundtripper = compilerCtx.roundTripperFactory.create(task.opts.connection);
-    const dynamicFetcher = compilerCtx.roundTripperFactory.createDynamic(task.opts.connection);
-    const baseUrlFetcher = compilerCtx.roundTripperFactory.baseUrlFetcher(task.opts.connection);
+    const cnxMap = compilerCtx.configReader.getCnxMapping(task.opts.connection);
+    let fetchFactory;
+    if (!cnxMap) {
+        compilerCtx.log.error(`Connection ${task.opts.connection} not found, using default fetch with no credentials`);
+        fetchFactory = Promise.resolve(new StaticFetchFactory(globalThis.fetch));
+    }
+    else if (cnxMap.dynamic) {
+        fetchFactory = Promise.resolve(new DynamicFetchFactory(compilerCtx.cnxFactory, compilerCtx.platformApi, compilerCtx.organisationId, cnxMap.templateId));
+    }
+    else {
+        fetchFactory = compilerCtx.platformApi.getConnection({
+            path: {
+                organisation_id: compilerCtx.organisationId,
+                connection_id: cnxMap.connId,
+            },
+            throwOnError: true,
+        })
+            .then(({ data }) => Promise.all([compilerCtx.cnxFactory.fetcher(data), data.baseUrl ?? '']))
+            .then(([fetcher, baseUrl]) => new StaticFetchFactory(fetcher, baseUrl));
+    }
     async function http(ctx) {
-        const _fetch = await roundtripper;
-        const _dynamicFetcher = await dynamicFetcher;
-        const httpContext = new HttpContextImpl(ctx, {}, baseUrlFetcher, _fetch, _dynamicFetcher);
+        const [fetch, baseUrl] = await fetchFactory.then(ff => Promise.all([ff.fetcher(ctx), ff.baseUrl(ctx)]));
+        const httpContext = new HttpContextImpl(ctx, {}, fetch, baseUrl);
         const result = await task.fn(httpContext);
         return ctx.withData(result);
     }
     return (src) => src.pipe(tap({
         complete: () => compilerCtx.log.debug('http.complete'),
-    }), mergeMap(async (ctx) => {
+    }), mergeMap((ctx) => {
         return compilerCtx.tracer.startActiveSpan(`http-${task.id}`, async (span) => {
             span.setAttribute('task.id', task.id);
             span.setAttribute('task.type', 'http');
             span.setAttribute('execution.id', ctx.executionId);
             span.setAttribute('connection.name', task.opts.connection);
             try {
-                let result = await http(ctx);
-                return result;
+                return await http(ctx);
             }
             catch (error) {
                 if (error instanceof Error) {

package/esm/src/interpreter/durable/compilers/schedule.d.ts.map

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

package/esm/src/interpreter/durable/compilers/schedule.js

@@ -11,13 +11,36 @@ function compileSchedule(ctx, trigger, signal) {
         const environmentId = Deno.env.get(envVarEnvId) || 'example-environment';
         const environmentName = Deno.env.get(envVarEnvironmentName) || 'example-environment';
         const orgId = Deno.env.get(envVarOrgId) || 'example-org';
-        const client = ctx.connectionProvider;
+        const client = ctx.platformApi;
         ctx.cronRegistry.set(trigger.id, trigger.schedule);
-        async function handleSchedule(req, res, span) {
+        async function handleSchedule(_req, res, span) {
             try {
                 if (trigger.activationPredicate === undefined) {
-                    const activation = await client.getStaticActivation();
-                    const executionCtx = ctx.contextProvider.create({}, { activation });
+                    const { data: activation } = await client.listActivations({
+                        path: {
+                            organisation_id: ctx.organisationId,
+                            environment_id: environmentId,
+                        },
+                        query: {
+                            static: true,
+                        },
+                        throwOnError: false,
+                    });
+                    if (!activation) {
+                        res.status(412).json({
+                            status: 'error',
+                            message: 'No activation found',
+                        });
+                        return;
+                    }
+                    if (activation.length === 0) {
+                        res.status(412).json({
+                            status: 'error',
+                            message: 'No activation found',
+                        });
+                        return;
+                    }
+                    const executionCtx = ctx.contextProvider.create(activation[0], {});
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -31,25 +54,25 @@ function compileSchedule(ctx, trigger, signal) {
                     });
                     return;
                 }
-                const activations = await client.listActivations();
+                const { data: activations } = await client.listActivations({
+                    path: {
+                        organisation_id: ctx.organisationId,
+                        environment_id: environmentId,
+                    },
+                    query: {
+                        static: false,
+                    },
+                    throwOnError: false,
+                });
                 if (!activations || activations.length === 0) {
-                    const executionCtx = ctx.contextProvider.create({}, undefined);
-                    span.setAttribute('execution.id', executionCtx.executionId);
-                    executionCtx.log.info('no activations found, continuing');
-                    try {
-                        subscriber.next(executionCtx);
-                    }
-                    catch (error) {
-                        executionCtx.log.error('execution error inside schedule', { error });
-                    }
-                    res.status(200).json({
-                        status: 'triggered',
-                        executionId: executionCtx.executionId,
+                    ctx.log.info('no activations found, continuing');
+                    res.status(204).json({
+                        status: 'no-activations',
                     });
                     return;
                 }
                 activations.forEach((activation) => {
-                    const executionCtx = ctx.contextProvider.create({}, { activation });
+                    const executionCtx = ctx.contextProvider.create(activation, {});
                     try {
                         subscriber.next(executionCtx);
                     }

package/esm/src/interpreter/durable/compilers/webhook.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CA2SxE,CAAC"}
+{"version":3,"file":"webhook.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/webhook.ts"],"names":[],"mappings":"AAaA,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AAEtF,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAyD7C,eAAO,MAAM,eAAe,EAAE,eAAe,CAAC,WAAW,EAAE,cAAc,CAuSxE,CAAC"}

package/esm/src/interpreter/durable/compilers/webhook.js

@@ -4,6 +4,7 @@ import { pipeline } from 'node:stream/promises';
 import { Observable } from 'rxjs';
 import { createActIdDynamicWebhookMiddleware, createStaticWebhookMiddleware, createUserIdDynamicWebhookMiddleware, } from '../../../dsl/http/versori/webhookmiddleware.js';
 import { WebhookTrigger } from '../../../dsl/triggers/WebhookTrigger.js';
+import { envVarEnvId } from '../../../internal/constants.js';
 import xmlparser from 'express-xml-bodyparser';
 const xml2jsDefaults = {
     explicitArray: false,
@@ -108,19 +109,18 @@ export const webhookCompiler = {
             ctx.webhookRouter[method](`/${trigger.id}`, createStaticWebhookMiddleware({
                 id: trigger.id,
                 connName: trigger.options.connection,
-                credentials: ctx.roundTripperFactory.credentials(),
-                cnxProvider: ctx.connectionProvider,
+                organisationId: ctx.organisationId,
+                environmentId: Deno.env.get(envVarEnvId) ?? '',
+                platformApi: ctx.platformApi,
+                cnxFactory: ctx.cnxFactory,
                 cfgReader: ctx.configReader,
                 log: ctx.log,
             }), async (req, res) => {
                 await ctx.tracer.startActiveSpan(`webhook-${trigger.id}`, async (span) => {
                     span.setAttribute('task.id', trigger.id);
                     span.setAttribute('task.type', 'webhook');
-                    let executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
                     const staticActivation = res.locals.activation;
-                    if (staticActivation) {
-                        executionCtx = executionCtx.withActivation(staticActivation);
-                    }
+                    const executionCtx = ctx.contextProvider.create(staticActivation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     try {
                         subscriber.next(executionCtx);
@@ -145,8 +145,10 @@ export const webhookCompiler = {
             ctx.webhookRouter[method](`/${trigger.id}/users/:userId`, createUserIdDynamicWebhookMiddleware({
                 id: trigger.id,
                 connName: trigger.options.connection,
-                credentials: ctx.roundTripperFactory.credentials(),
-                cnxProvider: ctx.connectionProvider,
+                organisationId: ctx.organisationId,
+                environmentId: Deno.env.get(envVarEnvId) ?? '',
+                platformApi: ctx.platformApi,
+                cnxFactory: ctx.cnxFactory,
                 cfgReader: ctx.configReader,
                 log: ctx.log,
             }), async (req, res) => {
@@ -156,11 +158,10 @@ export const webhookCompiler = {
                     span.setAttribute('user.id', req.params.userId);
                     const userId = req.params.userId;
                     const activation = res.locals.activation;
-                    const activations = [activation];
                     // Right now we only support a user having one activation
                     // so this will need changing when we support multiple activations per user
                     // as will the middleware
-                    if (!activations || activations.length === 0) {
+                    if (!activation) {
                         res.status(404).json({
                             status: 'error',
                             message: `No activations found for user: ${userId}`,
@@ -170,24 +171,21 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const executionCtx = ctx.contextProvider.create(req.body, ctxOptionsFn(req, res));
+                    const executionCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', executionCtx.executionId);
                     const errors = [];
-                    activations.forEach((activation) => {
-                        const activationCtx = executionCtx.withActivation(activation);
-                        try {
-                            subscriber.next(activationCtx);
-                        }
-                        catch (error) {
-                            activationCtx.log.error('webhook execution error', {
-                                error: JSON.stringify(error),
-                            });
-                            errors.push({
-                                activationId: activation.id,
-                                error,
-                            });
-                        }
-                    });
+                    try {
+                        subscriber.next(executionCtx);
+                    }
+                    catch (error) {
+                        executionCtx.log.error('webhook execution error', {
+                            error: JSON.stringify(error),
+                        });
+                        errors.push({
+                            activationId: activation.id,
+                            error,
+                        });
+                    }
                     if (isAsync) {
                         if (errors.length === 0) {
                             sendResponse(res, onSuccess(executionCtx));
@@ -202,9 +200,11 @@ export const webhookCompiler = {
             // this endpoint will trigger the workflow only for the activation given by its ID
             ctx.webhookRouter[method](`/${trigger.id}/activations/:activationId`, createActIdDynamicWebhookMiddleware({
                 id: trigger.id,
+                organisationId: ctx.organisationId,
+                environmentId: Deno.env.get(envVarEnvId) ?? '',
                 connName: trigger.options.connection,
-                credentials: ctx.roundTripperFactory.credentials(),
-                cnxProvider: ctx.connectionProvider,
+                platformApi: ctx.platformApi,
+                cnxFactory: ctx.cnxFactory,
                 cfgReader: ctx.configReader,
                 log: ctx.log,
             }), async (req, res) => {
@@ -213,7 +213,7 @@ export const webhookCompiler = {
                     span.setAttribute('task.type', 'webhook');
                     span.setAttribute('activation.id', req.params.activationId);
                     const activation = res.locals.activation;
-                    const activationId = activation.id || req.params.activationId;
+                    const activationId = activation?.id ?? req.params.activationId;
                     if (!activation) {
                         // TODO report back actual errors
                         res.status(404).json({
@@ -225,10 +225,7 @@ export const webhookCompiler = {
                         span.end();
                         return;
                     }
-                    const activationCtx = ctx.contextProvider.create(req.body, {
-                        ...ctxOptionsFn(req, res),
-                        activation,
-                    });
+                    const activationCtx = ctx.contextProvider.create(activation, req.body, ctxOptionsFn(req, res));
                     span.setAttribute('execution.id', activationCtx.executionId);
                     try {
                         subscriber.next(activationCtx);

package/esm/src/interpreter/memory/MemoryInterpreter.d.ts

@@ -3,12 +3,13 @@ import { NodeSDK } from '@opentelemetry/sdk-node';
 import { Router } from 'express';
 import { Observable, Subscription } from 'rxjs';
 import { ContextProvider } from '../../context/ContextProvider.js';
-import { ConfigReader, ConnectionProvider, CronProvider, RoundTripperFactory } from '../../dsl/http/types.js';
+import { ConfigReader, CronProvider } from '../../dsl/http/types.js';
 import { Workflow } from '../../dsl/Workflow.js';
 import { IssueAPI } from '../../issues/Issues.js';
 import { ContextImpl, ContextOperatorFunction } from '../../mod.js';
 import { Logger } from '../../observability/logging/Logger.js';
 import { ObservableCompiler } from './ObservableCompiler.js';
+import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 export type MemoryInterpreterOptions = {
     logger?: Logger;
     compiler?: ObservableCompiler;
@@ -27,11 +28,10 @@ export declare class MemoryInterpreter {
     private readonly log;
     private readonly compiler;
     private readonly contextProvider;
-    private readonly roundTripperFactory;
     private readonly webhookRouter;
     private readonly cronRouter;
     private cronRegistry;
-    private readonly connectionProvider;
+    private readonly cnxFactory;
     private readonly cronProvider;
     private readonly tracer;
     private readonly issuesProvider;
@@ -42,7 +42,7 @@ export declare class MemoryInterpreter {
     private cronServer?;
     private shutdownServer?;
     private isShuttingDown;
-    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, roundTripperFactory: RoundTripperFactory, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, connectionProvider: ConnectionProvider, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
+    constructor(log: Logger, compiler: ObservableCompiler, contextProvider: ContextProvider, webhookRouter: Router, cronRouter: Router, cronRegistry: Map<string, string>, cnxFactory: DirectConnectionFactory, cronProvider: CronProvider, tracer: Tracer, issuesProvider: IssueAPI, cfgReader: ConfigReader, otelSDK?: NodeSDK | undefined);
     static newInstance(options?: MemoryInterpreterOptions): Promise<MemoryInterpreter>;
     register<O>(workflow: Workflow<O>, options?: MemoryInterpreterOptions): Registration;
     start(): Promise<void>;

package/esm/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":"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"}
+{"version":3,"file":"MemoryInterpreter.d.ts","sourceRoot":"","sources":["../../../../src/src/interpreter/memory/MemoryInterpreter.ts"],"names":[],"mappings":"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"}