@versori/run 0.5.0-alpha.6 → 0.5.1

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

@@ -20,10 +20,9 @@ import { CredentialsProviderImpl } from '../../connection/CredentialsProvider.js
 import { DirectConnectionFactory } from '../../connection/DirectConnectionFactory.js';
 import { ContextProviderImpl } from '../../context/ContextProvider.js';
 import { VersoriConfigReader } from '../../dsl/http/versori/configloader.js';
+import { envVarEnvId, envVarEnvironmentName, envVarLocalRun, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarVersion, } from '../../dsl/http/versori/constants.js';
 import { CronAPIClient } from '../../dsl/http/versori/cronapi.js';
 import { WorkflowImpl } from '../../dsl/Workflow.js';
-import { envCronPort, envPort, envReadyCheckURL, envVarEnvId, envVarEnvironmentName, envVarOrgId, envVarOrgSlug, envVarOtelTracesURL, envVarProjectId, envVarSDKApiBaseURL, envVarVersion } from '../../internal/constants.js';
-import { Fake, registerWorkflow, signalReady, enabled as supervisorEnabled } from '../../internal/supervisor.js';
 import { IssueImpl } from '../../issues/Issues.js';
 import { MemoryKeyValueProvider } from '../../kv/memory/MemoryKeyValueProvider.js';
 import { SDKKeyValueProvider } from '../../kv/sdk/SDKKeyValueProvider.js';
@@ -31,8 +30,8 @@ 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() {
-    if (supervisorEnabled) {
+function getKVProvider(runLocal) {
+    if (runLocal) {
         return Promise.resolve(new MemoryKeyValueProvider());
     }
     return SDKKeyValueProvider.fromEnv();
@@ -62,7 +61,7 @@ function getKVProvider() {
  * ```
  */
 export class DurableInterpreter {
-    constructor(log, compiler, contextProvider, webhookRouter, cronRouter, cronRegistry, webhookRegistry, platformApi, cnxFetchFactory, 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,
@@ -99,12 +98,6 @@ export class DurableInterpreter {
             writable: true,
             value: cronRegistry
         });
-        Object.defineProperty(this, "webhookRegistry", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: webhookRegistry
-        });
         Object.defineProperty(this, "platformApi", {
             enumerable: true,
             configurable: true,
@@ -183,13 +176,6 @@ export class DurableInterpreter {
             writable: true,
             value: false
         });
-        // Workflow registration promises only used when supervisor is enabled
-        Object.defineProperty(this, "wfRegistration", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: []
-        });
         if (typeof this.log === 'undefined') {
             // this captures the old way of instantiating the DurableInterpreter and provides an
             // error message back to the user to let them know they should use the new way.
@@ -197,19 +183,18 @@ export class DurableInterpreter {
         }
     }
     static async newInstance(options = {}) {
-        const log = options.logger || new ConsoleLogger('debug');
+        const log = options.logger || new ConsoleLogger();
         const compiler = options.compiler || new ObservableCompiler();
         const serviceName = Deno.env.get(envVarProjectId) || 'example-service';
         const environmentID = Deno.env.get(envVarEnvId) || 'development';
-        const _serviceId = Deno.env.get(envVarProjectId) || 'development';
         const version = Deno.env.get(envVarVersion) || '1.0.0';
         const environment = Deno.env.get(envVarEnvironmentName) || 'development';
-        const _sdkAPIBaseURL = Deno.env.get(envVarSDKApiBaseURL) || 'http://localhost:8902';
         const orgId = Deno.env.get(envVarOrgId) || 'development';
         const orgSlug = Deno.env.get(envVarOrgSlug) || 'development';
         const otelTracesURL = Deno.env.get(envVarOtelTracesURL);
         let otelSDK;
         const configReader = VersoriConfigReader.fromEnv(log);
+        const runLocal = Deno.env.get(envVarLocalRun) === 'true';
         await waitForReady(log);
         // Do NOT change those attributes, they are used by the API to filter on
         const resource = resourceFromAttributes({
@@ -231,15 +216,6 @@ export class DurableInterpreter {
             log.info('Starting OpenTelemetry SDK');
             otelSDK.start();
         }
-        else if (supervisorEnabled) {
-            otelSDK = new NodeSDK({
-                traceExporter: new Fake(),
-                serviceName: serviceName,
-                resource: resource,
-            });
-            log.info('Starting Testing OpenTelemetry SDK');
-            otelSDK.start();
-        }
         const tracer = opentelemetry.trace.getTracer(serviceName, version);
         const queueProvider = await QueueImpl.fromEnv(log);
         const connectionFactory = DirectConnectionFactory.fromEnv(log);
@@ -247,14 +223,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, express.Router(), express.Router(), new Map(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
+            return new DurableInterpreter(log, compiler, options.contextProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
         }
-        const kvp = await getKVProvider();
+        const kvp = await getKVProvider(runLocal);
         const platformApi = PlatformApiImpl.fromEnv();
         const organisationId = Deno.env.get(envVarOrgId) || 'development';
         const environmentId = Deno.env.get(envVarEnvId) || 'development';
-        const ctxProvider = new ContextProviderImpl(log, kvp, new CredentialsProviderImpl(connectionFactory.credentials, connectionFactory.tokens, connectionFactory.oauth1, configReader, platformApi), platformApi, organisationId, environmentId, issuesProvider);
-        return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
+        const ctxProvider = new ContextProviderImpl(log, kvp, new CredentialsProviderImpl(connectionFactory.credentials, connectionFactory.tokens, connectionFactory.oauth1, configReader, platformApi), platformApi, organisationId, environmentId, issuesProvider, queueProvider);
+        return new DurableInterpreter(log, compiler, ctxProvider, express.Router(), express.Router(), new Map(), PlatformApiImpl.fromEnv(), connectionFactory, CronAPIClient.fromEnv(), tracer, issuesProvider, configReader, queueProvider, otelSDK);
     }
     register(workflow, options) {
         const localAbortController = new AbortController();
@@ -264,14 +240,16 @@ export class DurableInterpreter {
         if (!(workflow instanceof WorkflowImpl)) {
             throw new Error('workflow is not an instance of WorkflowImpl');
         }
-        this.log.info('DurableInterpreter.register', { workflow });
+        const triggerName = 'id' in workflow.trigger && typeof workflow.trigger.id === 'string'
+            ? workflow.trigger.id
+            : workflow.trigger.constructor.name;
+        this.log.info('DurableInterpreter.register', { workflow, triggerName });
         const compilerContext = {
             compiler: this.compiler,
             log: this.log,
             tracer: this.tracer,
             contextProvider: this.contextProvider,
             webhookRouter: this.webhookRouter,
-            webhookRegistry: this.webhookRegistry,
             queueProvider: this.queueProvider,
             cronRouter: this.cronRouter,
             cronRegistry: this.cronRegistry,
@@ -284,23 +262,21 @@ export class DurableInterpreter {
         const trigger$ = this.compiler.compileTrigger(compilerContext, workflow.trigger, combinedSignal);
         const task$ = this.compiler.compileTask(compilerContext, workflow.task);
         const registration = {
+            triggerName,
             trigger$,
             task$,
             localAbortController,
             sigintListener: () => {
-                this.log.info('Received SIGINT, shutting down workflow');
+                this.log.info('Received SIGINT, shutting down workflow', { triggerName });
                 localAbortController.abort();
             },
         };
         this.registeredWorkflows.push(registration);
-        if (supervisorEnabled) {
-            this.wfRegistration.push(registerWorkflow(workflow));
-        }
         return registration;
     }
-    async start() {
-        const port = Deno.env.get(envPort) || 3000;
-        const cronPort = Deno.env.get(envCronPort) || 3001;
+    start() {
+        const port = Deno.env.get('PORT') || 3000;
+        const cronPort = Deno.env.get('CRON_PORT') || 3001;
         const webhookApp = express();
         const cronApp = express();
         cronApp.use(express.json());
@@ -319,23 +295,22 @@ export class DurableInterpreter {
             Deno.addSignalListener('SIGINT', registration.sigintListener);
             registration.subscription = registration.trigger$
                 .pipe(tap((ctx) => {
-                ctx.log.info('DurableInterpreter.executionStarted', { data: ctx.data });
+                ctx.log.info('DurableInterpreter.executionStarted', {
+                    triggerName: registration.triggerName,
+                });
             }), mergeMap((ctx) => of(ctx).pipe(registration.task$, catchError((err) => {
                 ctx.log.error('DurableInterpreter.executionError', {
+                    triggerName: registration.triggerName,
                     error: err instanceof Error ? err.toString() : err,
                 });
-                this.tracer.startActiveSpan('done', (span) => {
-                    span.setAttribute('error.message', err instanceof Error ? err.toString() : err);
-                    span.setAttribute('execution.id', ctx.executionId);
-                    span.setAttribute('result', 'fail');
-                    span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
-                    span.end();
-                });
                 try {
                     ctx.options.onError?.(ctx.withData(err));
                 }
                 catch (err) {
-                    ctx.log.error('DurableInterpreter.onError Error: failed to call onError handler', { error: err instanceof Error ? err.toString() : err });
+                    ctx.log.error('DurableInterpreter.onErrorError: failed to call onError handler', {
+                        triggerName: registration.triggerName,
+                        error: err instanceof Error ? err.toString() : err,
+                    });
                     ctx.options.onError?.(ctx.withData({
                         message: 'Internal server error',
                         error: err instanceof Error ? err.toString() : err,
@@ -344,49 +319,38 @@ export class DurableInterpreter {
                 return EMPTY;
             }))))
                 .subscribe({
-                next: async (ctx) => {
+                next: (ctx) => {
                     const durationMs = Date.now() - ctx.startTime.getTime();
                     ctx.log.info('DurableInterpreter.executionCompleted', {
+                        triggerName: registration.triggerName,
                         durationMs,
-                        data: ctx.data,
-                    });
-                    this.tracer.startActiveSpan('done', (span) => {
-                        span.setAttribute('execution.id', ctx.executionId);
-                        span.setAttribute('result', 'pass');
-                        span.setAttribute('workflow.id', ctx.workflowId || 'unknown-workflow');
-                        span.end();
                     });
                     try {
                         ctx.options.onSuccess?.(ctx);
                     }
                     catch (err) {
-                        ctx.log.error('DurableInterpreter.onSuccessError: failed to call onSuccess handler', { error: err instanceof Error ? err.toString() : err });
+                        ctx.log.error('DurableInterpreter.onSuccessError: failed to call onSuccess handler', {
+                            triggerName: registration.triggerName,
+                            error: err instanceof Error ? err.toString() : err,
+                        });
                         ctx.options.onSuccess?.(ctx.withData({
                             message: 'Internal server error',
                             error: err instanceof Error ? err.toString() : err,
                         }));
                     }
-                    if (ctx.workflowId) {
-                        this.log.info('Async workflow completed', {
-                            workflowId: ctx.workflowId,
-                        });
-                        const output = ctx.data ? btoa(JSON.stringify(ctx.data)) : undefined;
-                        await ctx.queue?.complete({
-                            id: ctx.workflowId,
-                            output,
-                            status: 'completed',
-                        });
-                    }
                     this.contextProvider.destroy(ctx);
                 },
                 error: (err) => {
                     this.log.error('DurableInterpreter.error', {
+                        triggerName: registration.triggerName,
                         error: err instanceof Error ? err.toString() : err,
                     });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
                 complete: () => {
-                    this.log.info('DurableInterpreter.workflowCompleted');
+                    this.log.info('DurableInterpreter.workflowCompleted', {
+                        triggerName: registration.triggerName,
+                    });
                     Deno.removeSignalListener('SIGINT', registration.sigintListener);
                 },
             });
@@ -422,7 +386,6 @@ export class DurableInterpreter {
             if (this.cronServer) {
                 this.cronServer.close();
             }
-            this.otelSDK?.shutdown();
             // Remove all signal listeners
             for (const registration of this.registeredWorkflows) {
                 Deno.removeSignalListener('SIGINT', registration.sigintListener);
@@ -439,10 +402,6 @@ export class DurableInterpreter {
             }
         };
         Deno.addSignalListener('SIGINT', this.shutdownServer);
-        if (supervisorEnabled) {
-            await Promise.all(this.wfRegistration);
-            await signalReady();
-        }
         return new Promise((resolve) => {
             let serversClosed = 0;
             const totalServers = [this.webhookServer, this.cronServer].filter(Boolean).length;
@@ -479,7 +438,7 @@ export class DurableInterpreter {
     }
 }
 async function waitForReady(log) {
-    const readyCheckUrl = Deno.env.get(envReadyCheckURL);
+    const readyCheckUrl = Deno.env.get('READY_CHECK_URL');
     if (!readyCheckUrl) {
         return Promise.resolve();
     }

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

@@ -1,7 +1,6 @@
 import { Tracer } from '@opentelemetry/api';
 import { Router } from 'express';
 import { Observable, OperatorFunction } from 'rxjs';
-import { ConnectionFactory } from '../../connection/types.js';
 import { ContextImpl } from '../../context/Context.js';
 import { ContextProvider } from '../../context/ContextProvider.js';
 import { ConfigReader } from '../../dsl/http/types.js';
@@ -12,6 +11,7 @@ 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;
@@ -22,11 +22,6 @@ export type DurableCompilerContext = {
     queueProvider: QueueAPI;
     issueProvider: IssueAPI;
     webhookRouter: Router;
-    webhookRegistry: Map<string, {
-        method: string;
-        path: string;
-        options: any;
-    }>;
     cronRouter: Router;
     configReader: ConfigReader;
     cronRegistry: Map<string, string>;

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":"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"}
+{"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/Queue.d.ts

@@ -1,26 +1,34 @@
 import { Logger } from '../../observability/mod.js';
 export type WorkflowMsgMetadata = {
     parentWorkflowId?: string;
-    executionId?: string;
-    activationId?: string;
+    executionId: string;
+    activationId: string;
     userId?: string;
 };
 export type Workflows = {
-    workflows: WorkflowMsg[];
+    workflows: Workflow[];
 };
-export type WorkflowMsg = {
-    id?: string;
-    projectId?: string;
-    environmentId?: string;
+export type Workflow = {
+    id: string;
+    projectId: string;
+    environmentId: string;
     group: string;
-    payload?: string;
+    payload: string;
     output?: string;
     status?: 'available' | 'locked' | 'completed' | 'failed';
-    attempt?: number;
+    attempt: number;
+    maxAttempts?: number;
+    timeout: string;
+    createdAt: string;
+    metadata: WorkflowMsgMetadata;
+};
+export type SubmitWorkflow = {
+    group: string;
+    payload: string;
     maxAttempts?: number;
-    timeout?: string;
-    createdAt?: string;
-    metadata?: WorkflowMsgMetadata;
+    metadata: WorkflowMsgMetadata;
+    projectId?: string;
+    environmentId?: string;
 };
 export type CompleteWorkflowRequest = {
     id: string;
@@ -39,14 +47,14 @@ export type RescheduleWorkflowRequest = {
     after: string;
 };
 export type SubmitWorkflowsRequest = {
-    workflows: WorkflowMsg[];
+    workflows: SubmitWorkflow[];
 };
 export interface QueueAPI {
     complete(request: CompleteWorkflowRequest): Promise<void>;
     submit(request: SubmitWorkflowsRequest): Promise<Workflows>;
     fetchWorkflows(request: FetchWorkflowsRequest): Promise<Workflows | undefined>;
     reschedule(request: RescheduleWorkflowRequest): Promise<void>;
-    poll(workflowId: string): Promise<WorkflowMsg>;
+    getWorkflow(workflowId: string): Promise<Workflow>;
 }
 export declare class QueueImpl implements QueueAPI {
     private baseUrl;
@@ -59,7 +67,7 @@ export declare class QueueImpl implements QueueAPI {
     submit(request: SubmitWorkflowsRequest): Promise<Workflows>;
     fetchWorkflows(request: FetchWorkflowsRequest): Promise<Workflows | undefined>;
     reschedule(request: RescheduleWorkflowRequest): Promise<void>;
-    poll(workflowId: string): Promise<WorkflowMsg>;
+    getWorkflow(workflowId: string): Promise<Workflow>;
 }
 export declare class MockQueue implements QueueAPI {
     constructor();
@@ -67,6 +75,6 @@ export declare class MockQueue implements QueueAPI {
     submit(_request: SubmitWorkflowsRequest): Promise<Workflows>;
     fetchWorkflows(_request: FetchWorkflowsRequest): Promise<Workflows | undefined>;
     reschedule(_request: RescheduleWorkflowRequest): Promise<void>;
-    poll(_workflowId: string): Promise<WorkflowMsg>;
+    getWorkflow(_workflowId: string): Promise<Workflow>;
 }
 //# sourceMappingURL=Queue.d.ts.map

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

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

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

@@ -10,7 +10,7 @@
  * As of the Change Date, in accordance with the Business Source License,
  * use of this software will be governed by the Apache License, Version 2.0.
  */
-import { envVarEnvId, envVarProjectId, envVarSDKApiBaseURL, } from '../../internal/constants.js';
+import { envVarEnvId, envVarProjectId, envVarSDKApiBaseURL, } from '../../dsl/http/versori/constants.js';
 import { ConsoleLogger } from '../../mod.js';
 export class QueueImpl {
     constructor(baseUrl, projectId, environmentId, log) {
@@ -44,9 +44,8 @@ export class QueueImpl {
         this.environmentId = environmentId;
     }
     static fromEnv(log) {
-        // TODO make these environment variables configurable in constants/ts
         const baseUrl = Deno.env.get(envVarSDKApiBaseURL);
-        const _log = log || new ConsoleLogger('debug');
+        const _log = log || new ConsoleLogger();
         const projectId = Deno.env.get(envVarProjectId) || 'default-project';
         const environmentId = Deno.env.get(envVarEnvId) || 'default-environment';
         if (!baseUrl) {
@@ -69,7 +68,7 @@ export class QueueImpl {
                 output: request.output,
                 status: request.status,
             });
-            throw new Error('Failed to complete workflow');
+            throw new Error(await resp.text());
         }
         return;
     }
@@ -107,16 +106,27 @@ export class QueueImpl {
             }),
         });
         if (!resp.ok) {
-            const errorText = (await resp.json());
+            let errorText = "";
+            try {
+                const vErr = (await resp.json());
+                errorText = vErr.message;
+            }
+            catch {
+                errorText = await resp.text();
+            }
             this.log.error('Failed to fetch workflows', {
-                error: errorText.message,
+                error: errorText,
                 ttl: request.ttl,
                 limit: request.limit,
                 group: request.group,
                 projectId: this.projectId || request.projectId,
+                response: {
+                    status: resp.status,
+                    statusText: resp.statusText,
+                },
             });
             throw new Error('failed to fetch workflows', {
-                cause: new Error(errorText.message),
+                cause: new Error(errorText),
             });
         }
         if (resp.status === 204) {
@@ -142,8 +152,7 @@ export class QueueImpl {
         }
         return;
     }
-    async poll(workflowId) {
-        // this endpoint returns a 404 if the workflow is not completed
+    async getWorkflow(workflowId) {
         const resp = await fetch(`${this.baseUrl}/v1/workflows/fetch/${workflowId}`, {
             method: 'GET',
         });
@@ -170,7 +179,7 @@ export class MockQueue {
     reschedule(_request) {
         throw new Error('Method not implemented.');
     }
-    poll(_workflowId) {
+    getWorkflow(_workflowId) {
         throw new Error('Method not implemented.');
     }
 }

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

@@ -1 +1 @@
-{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAuFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}
+{"version":3,"file":"catch.d.ts","sourceRoot":"","sources":["../../../../../src/src/interpreter/durable/compilers/catch.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;AAG5D,OAAO,EAA2B,YAAY,EAAE,MAAM,YAAY,CAAC;AAqFnE,eAAO,MAAM,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAGrE,CAAC"}

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

@@ -22,9 +22,7 @@ function compileCatch(compilerCtx, task) {
                 return compilerCtx.tracer.startActiveSpan(`catch`, (span) => {
                     span.setAttribute('execution.id', ctx.executionId);
                     span.setAttribute('task.type', 'catch');
-                    span.setAttribute('type', 'task');
                     if (error instanceof Error) {
-                        span.setAttribute('status', 'fail');
                         span.recordException(error);
                         span.setAttribute('error.message', error.message);
                         span.setAttribute('error.stack', error.stack ?? '');
@@ -37,7 +35,7 @@ function compileCatch(compilerCtx, task) {
                             annotations: {
                                 'error': error.message,
                                 'stack': error.stack || '',
-                                'workflowId': ctx.options.workflowId || ctx.workflowId || '',
+                                'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                                 'executionId': ctx.executionId,
                                 'activationId': ctx.activation.id,
                                 'activationExternalId': ctx.activation?.user.externalId,
@@ -54,7 +52,7 @@ function compileCatch(compilerCtx, task) {
                         annotations: {
                             'error': error.message,
                             'stack': error.stack || '',
-                            'workflowId': ctx.options.workflowId || ctx.workflowId || '',
+                            'workflowId': ctx.options.workflow?.id || ctx.workflow?.id || '',
                             'executionId': ctx.executionId,
                             'activationId': ctx.activation.id,
                             'activationExternalId': ctx.activation?.user.externalId,
@@ -62,7 +60,7 @@ function compileCatch(compilerCtx, task) {
                         reason: 'error',
                         severity: 'low',
                     });
-                    span.setAttribute('status', 'fail');
+                    span.setAttribute('error', `${error}`);
                     span.end();
                     return errorOperator(of(ctx.withData(new ExecutionError(ctx, `${error}`, { cause: error }))));
                 });

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,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AAGjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,wBAAgB,sBAAsB,CAClC,GAAG,EAAE,sBAAsB,EAC3B,OAAO,EAAE,sBAAsB,EAC/B,MAAM,EAAE,WAAW,GACpB,UAAU,CAAC,WAAW,CAAC,mBAAmB,CAAC,CAAC,CAkG9C;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":"AAeA,OAAO,EAAE,UAAU,EAAE,MAAM,MAAM,CAAC;AAClC,OAAO,EAAW,WAAW,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,EACH,mBAAmB,EACnB,sBAAsB,EACzB,MAAM,yCAAyC,CAAC;AAEjD,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAE3C,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,CAIhG,CAAC"}