@dbos-inc/dbos-sdk 2.10.3-preview → 2.10.11-preview

package/dist/src/dbos.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.InitContext = exports.DBOS = void 0;
+exports.InitContext = exports.DBOS = exports.runAsWorkflowStep = exports.getExecutor = void 0;
 const context_1 = require("./context");
 const dbos_executor_1 = require("./dbos-executor");
 const logs_1 = require("./telemetry/logs");
@@ -54,6 +54,30 @@ function augmentProxy(target, proxy) {
         proto = Object.getPrototypeOf(proto);
     }
 }
+function getExecutor() {
+    if (!dbos_executor_1.DBOSExecutor.globalInstance) {
+        throw new error_1.DBOSExecutorNotInitializedError();
+    }
+    return dbos_executor_1.DBOSExecutor.globalInstance;
+}
+exports.getExecutor = getExecutor;
+function runAsWorkflowStep(callback, funcName, childWFID) {
+    if (DBOS.isWithinWorkflow()) {
+        if (DBOS.isInStep()) {
+            // OK to use directly
+            return dbos_executor_1.DBOSExecutor.globalInstance.runAsStep(callback, funcName, undefined, undefined, childWFID);
+        }
+        else if (DBOS.isInWorkflow()) {
+            const wfctx = (0, context_1.assertCurrentWorkflowContext)();
+            return dbos_executor_1.DBOSExecutor.globalInstance.runAsStep(callback, funcName, DBOS.workflowID, wfctx.functionIDGetIncrement(), childWFID);
+        }
+        else {
+            throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to \`${funcName}\` inside a \`transaction\` or \`procedure\``);
+        }
+    }
+    return dbos_executor_1.DBOSExecutor.globalInstance.runAsStep(callback, funcName, undefined, undefined, childWFID);
+}
+exports.runAsWorkflowStep = runAsWorkflowStep;
 class DBOS {
     ///////
     // Lifecycle
@@ -76,16 +100,16 @@ class DBOS {
      * @param runtimeConfig - configuration of runtime access to DBOS
      */
     static setConfig(config, runtimeConfig) {
-        DBOS.dbosConfig = config;
-        DBOS.runtimeConfig = runtimeConfig;
+        DBOS.#dbosConfig = config;
+        DBOS.#runtimeConfig = runtimeConfig;
         DBOS.translateConfig();
     }
     static translateConfig() {
-        if (DBOS.dbosConfig && !(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.dbosConfig)) {
+        if (DBOS.#dbosConfig && !(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.#dbosConfig)) {
             const isDebugging = DBOS.getDebugModeFromEnv() !== dbos_executor_1.DebugMode.DISABLED;
-            [DBOS.dbosConfig, DBOS.runtimeConfig] = (0, config_1.translatePublicDBOSconfig)(DBOS.dbosConfig, isDebugging);
+            [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.translatePublicDBOSconfig)(DBOS.#dbosConfig, isDebugging);
             if (process.env.DBOS__CLOUD === 'true') {
-                [DBOS.dbosConfig, DBOS.runtimeConfig] = (0, config_1.overwrite_config)(DBOS.dbosConfig, DBOS.runtimeConfig);
+                [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.overwrite_config)(DBOS.#dbosConfig, DBOS.#runtimeConfig);
             }
         }
     }
@@ -94,7 +118,7 @@ class DBOS {
      *   Use `setConfig`
      */
     static setAppConfig(key, newValue) {
-        const conf = DBOS.dbosConfig?.application;
+        const conf = DBOS.#dbosConfig?.application;
         if (!conf)
             throw new error_1.DBOSExecutorNotInitializedError();
         (0, lodash_1.set)(conf, key, newValue);
@@ -104,11 +128,11 @@ class DBOS {
      * USE IN TESTS ONLY - ALL WORKFLOWS, QUEUES, ETC. WILL BE LOST.
      */
     static async dropSystemDB() {
-        if (!DBOS.dbosConfig) {
-            DBOS.dbosConfig = (0, config_1.parseConfigFile)()[0];
+        if (!DBOS.#dbosConfig) {
+            DBOS.#dbosConfig = (0, config_1.parseConfigFile)()[0];
         }
         DBOS.translateConfig();
-        return system_database_1.PostgresSystemDatabase.dropSystemDB(DBOS.dbosConfig);
+        return system_database_1.PostgresSystemDatabase.dropSystemDB(DBOS.#dbosConfig);
     }
     /**
      * Use ORMEntities to set up database schema.
@@ -151,21 +175,20 @@ class DBOS {
             utils_1.globalParams.executorID = (0, node_crypto_1.randomUUID)();
         }
         // Initialize the DBOS executor
-        if (!DBOS.dbosConfig) {
-            [DBOS.dbosConfig, DBOS.runtimeConfig] = (0, config_1.parseConfigFile)({ forceConsole: isDebugging });
+        if (!DBOS.#dbosConfig) {
+            [DBOS.#dbosConfig, DBOS.#runtimeConfig] = (0, config_1.parseConfigFile)({ forceConsole: isDebugging });
         }
-        else if (!(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.dbosConfig)) {
+        else if (!(0, dbos_executor_1.isDeprecatedDBOSConfig)(DBOS.#dbosConfig)) {
             DBOS.translateConfig(); // This is a defensive measure for users who'd do DBOS.config = X instead of using DBOS.setConfig()
         }
-        if (!DBOS.dbosConfig) {
+        if (!DBOS.#dbosConfig) {
             throw new error_1.DBOSError('DBOS configuration not set');
         }
         dbos_executor_1.DBOSExecutor.createInternalQueue();
-        dbos_executor_1.DBOSExecutor.globalInstance = new dbos_executor_1.DBOSExecutor(DBOS.dbosConfig, {
+        dbos_executor_1.DBOSExecutor.globalInstance = new dbos_executor_1.DBOSExecutor(DBOS.#dbosConfig, {
             debugMode,
         });
         const executor = dbos_executor_1.DBOSExecutor.globalInstance;
-        DBOS.globalLogger = executor.logger;
         await executor.init();
         const debugWorkflowId = process.env.DBOS_DEBUG_WORKFLOW_ID;
         if (debugWorkflowId) {
@@ -188,14 +211,14 @@ class DBOS {
         }
         // Start the DBOS admin server
         const logger = DBOS.logger;
-        if (DBOS.runtimeConfig && DBOS.runtimeConfig.runAdminServer) {
+        if (DBOS.#runtimeConfig && DBOS.#runtimeConfig.runAdminServer) {
             const adminApp = server_1.DBOSHttpServer.setupAdminApp(executor);
             try {
-                await server_1.DBOSHttpServer.checkPortAvailabilityIPv4Ipv6(DBOS.runtimeConfig.admin_port, logger);
+                await server_1.DBOSHttpServer.checkPortAvailabilityIPv4Ipv6(DBOS.#runtimeConfig.admin_port, logger);
                 // Wrap the listen call in a promise to properly catch errors
                 DBOS.adminServer = await new Promise((resolve, reject) => {
-                    const server = adminApp.listen(DBOS.runtimeConfig?.admin_port, () => {
-                        DBOS.logger.debug(`DBOS Admin Server is running at http://localhost:${DBOS.runtimeConfig?.admin_port}`);
+                    const server = adminApp.listen(DBOS.#runtimeConfig?.admin_port, () => {
+                        DBOS.logger.debug(`DBOS Admin Server is running at http://localhost:${DBOS.#runtimeConfig?.admin_port}`);
                         resolve(server);
                     });
                     server.on('error', (err) => {
@@ -204,7 +227,7 @@ class DBOS {
                 });
             }
             catch (e) {
-                logger.warn(`Unable to start DBOS admin server on port ${DBOS.runtimeConfig.admin_port}`);
+                logger.warn(`Unable to start DBOS admin server on port ${DBOS.#runtimeConfig.admin_port}`);
             }
         }
         if (options?.koaApp) {
@@ -296,14 +319,9 @@ class DBOS {
     static async initEventReceivers() {
         return dbos_executor_1.DBOSExecutor.globalInstance?.initEventReceivers();
     }
-    /**
-     * Global DBOS executor instance
-     */
-    static get executor() {
-        if (!dbos_executor_1.DBOSExecutor.globalInstance) {
-            throw new error_1.DBOSExecutorNotInitializedError();
-        }
-        return dbos_executor_1.DBOSExecutor.globalInstance;
+    // Global DBOS executor instance
+    static get #executor() {
+        return getExecutor();
     }
     /**
      * Creates a node.js HTTP handler for all entrypoints registered with `@DBOS.getApi`
@@ -326,9 +344,9 @@ class DBOS {
      */
     static async launchAppHTTPServer() {
         const server = DBOS.setUpHandlerCallback();
-        if (DBOS.runtimeConfig) {
+        if (DBOS.#runtimeConfig) {
             // This will not listen if there's no decorated endpoint
-            DBOS.appServer = await server.appListen(DBOS.runtimeConfig.port);
+            DBOS.appServer = await server.appListen(DBOS.#runtimeConfig.port);
         }
     }
     /**
@@ -353,10 +371,12 @@ class DBOS {
     //////
     // Globals
     //////
-    static globalLogger;
-    static dbosConfig;
-    static runtimeConfig = undefined;
-    static invokeWrappers = new Map();
+    static #dbosConfig;
+    static #runtimeConfig = undefined;
+    static #invokeWrappers = new Map();
+    static get dbosConfig() {
+        return DBOS.#dbosConfig;
+    }
     //////
     // Context
     //////
@@ -477,8 +497,8 @@ class DBOS {
      */
     static get pgClient() {
         const client = DBOS.sqlClient;
-        if (!DBOS.isInStoredProc() && DBOS.dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.PGNODE) {
-            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.pgClient' but client is configured with type '${DBOS.dbosConfig?.userDbclient}'`);
+        if (!DBOS.isInStoredProc() && DBOS.#dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.PGNODE) {
+            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.pgClient' but client is configured with type '${DBOS.#dbosConfig?.userDbclient}'`);
         }
         return client;
     }
@@ -490,8 +510,8 @@ class DBOS {
         if (DBOS.isInStoredProc()) {
             throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.knexClient' from within a stored procedure`);
         }
-        if (DBOS.dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.KNEX) {
-            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.knexClient' but client is configured with type '${DBOS.dbosConfig?.userDbclient}'`);
+        if (DBOS.#dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.KNEX) {
+            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.knexClient' but client is configured with type '${DBOS.#dbosConfig?.userDbclient}'`);
         }
         const client = DBOS.sqlClient;
         return client;
@@ -504,8 +524,8 @@ class DBOS {
         if (DBOS.isInStoredProc()) {
             throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.prismaClient' from within a stored procedure`);
         }
-        if (DBOS.dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.PRISMA) {
-            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.prismaClient' but client is configured with type '${DBOS.dbosConfig?.userDbclient}'`);
+        if (DBOS.#dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.PRISMA) {
+            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.prismaClient' but client is configured with type '${DBOS.#dbosConfig?.userDbclient}'`);
         }
         const client = DBOS.sqlClient;
         return client;
@@ -518,8 +538,8 @@ class DBOS {
         if (DBOS.isInStoredProc()) {
             throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.typeORMClient' from within a stored procedure`);
         }
-        if (DBOS.dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.TYPEORM) {
-            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.typeORMClient' but client is configured with type '${DBOS.dbosConfig?.userDbclient}'`);
+        if (DBOS.#dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.TYPEORM) {
+            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.typeORMClient' but client is configured with type '${DBOS.#dbosConfig?.userDbclient}'`);
         }
         const client = DBOS.sqlClient;
         return client;
@@ -532,8 +552,8 @@ class DBOS {
         if (DBOS.isInStoredProc()) {
             throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.drizzleClient' from within a stored procedure`);
         }
-        if (DBOS.dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.DRIZZLE) {
-            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.drizzleClient' but client is configured with type '${DBOS.dbosConfig?.userDbclient}'`);
+        if (DBOS.#dbosConfig?.userDbclient !== user_database_1.UserDatabaseName.DRIZZLE) {
+            throw new error_1.DBOSInvalidWorkflowTransitionError(`Requested 'DBOS.drizzleClient' but client is configured with type '${DBOS.#dbosConfig?.userDbclient}'`);
         }
         const client = DBOS.sqlClient;
         return client;
@@ -550,8 +570,8 @@ class DBOS {
             return ctx.getConfig(key, defaultValue);
         if (ctx)
             return ctx.getConfig(key);
-        if (DBOS.executor)
-            return DBOS.executor.getConfig(key, defaultValue);
+        if (DBOS.#executor)
+            return DBOS.#executor.getConfig(key, defaultValue);
         return defaultValue;
     }
     /**
@@ -565,7 +585,7 @@ class DBOS {
         if (DBOS.isWithinWorkflow() && !DBOS.isInStep()) {
             throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `queryUserDB` inside a `workflow`, without being in a `step`');
         }
-        return DBOS.executor.queryUserDB(sql, params);
+        return DBOS.#executor.queryUserDB(sql, params);
     }
     //////
     // Access to system DB, for event receivers etc.
@@ -586,7 +606,7 @@ class DBOS {
      * @returns The latest system database state for the specified service+workflow+item
      */
     static async getEventDispatchState(svc, wfn, key) {
-        return await DBOS.executor.getEventDispatchState(svc, wfn, key);
+        return await DBOS.#executor.getEventDispatchState(svc, wfn, key);
     }
     /**
      * Set a state item into the system database, which provides a key/value store interface for event dispatchers.
@@ -598,26 +618,13 @@ class DBOS {
      * @returns The upsert returns the current record, which may be useful if it is more recent than the `state` provided.
      */
     static async upsertEventDispatchState(state) {
-        return await DBOS.executor.upsertEventDispatchState(state);
+        return await DBOS.#executor.upsertEventDispatchState(state);
     }
     //////
     // Workflow and other operations
     //////
-    static runAsWorkflowStep(callback, funcName, childWFID) {
-        if (DBOS.isWithinWorkflow()) {
-            if (DBOS.isInStep()) {
-                // OK to use directly
-                return dbos_executor_1.DBOSExecutor.globalInstance.runAsStep(callback, funcName, undefined, undefined, childWFID);
-            }
-            else if (DBOS.isInWorkflow()) {
-                const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                return dbos_executor_1.DBOSExecutor.globalInstance.runAsStep(callback, funcName, DBOS.workflowID, wfctx.functionIDGetIncrement(), childWFID);
-            }
-            else {
-                throw new error_1.DBOSInvalidWorkflowTransitionError(`Invalid call to \`${funcName}\` inside a \`transaction\` or \`procedure\``);
-            }
-        }
-        return dbos_executor_1.DBOSExecutor.globalInstance.runAsStep(callback, funcName, undefined, undefined, childWFID);
+    static #runAsWorkflowStep(callback, funcName) {
+        return runAsWorkflowStep(callback, funcName);
     }
     /**
      * Get the workflow status given a workflow ID
@@ -628,17 +635,17 @@ class DBOS {
         if (DBOS.isWithinWorkflow()) {
             if (DBOS.isInStep()) {
                 // OK to use directly
-                return DBOS.executor.getWorkflowStatus(workflowID);
+                return DBOS.#executor.getWorkflowStatus(workflowID);
             }
             else if (DBOS.isInWorkflow()) {
                 const wfctx = (0, context_1.assertCurrentWorkflowContext)();
-                return DBOS.executor.getWorkflowStatus(workflowID, DBOS.workflowID, wfctx.functionIDGetIncrement());
+                return DBOS.#executor.getWorkflowStatus(workflowID, DBOS.workflowID, wfctx.functionIDGetIncrement());
             }
             else {
                 throw new error_1.DBOSInvalidWorkflowTransitionError('Invalid call to `getWorkflowStatus` inside a `transaction` or `procedure`');
             }
         }
-        return DBOS.executor.getWorkflowStatus(workflowID);
+        return DBOS.#executor.getWorkflowStatus(workflowID);
     }
     /**
      * Get the workflow result, given a workflow ID
@@ -651,12 +658,13 @@ class DBOS {
         if (DBOS.isWithinWorkflow() && timeoutSeconds !== undefined) {
             timerFuncID = (0, context_1.assertCurrentWorkflowContext)().functionIDGetIncrement();
         }
-        return await DBOS.runAsWorkflowStep(async () => {
+        return await runAsWorkflowStep(async () => {
             const rres = await dbos_executor_1.DBOSExecutor.globalInstance.systemDatabase.awaitWorkflowResult(workflowID, timeoutSeconds, DBOS.workflowID, timerFuncID);
             if (!rres)
                 return null;
-            if (rres?.cancelled)
-                throw new error_1.DBOSTargetWorkflowCancelledError(workflowID); // TODO: Make semantically meaningful
+            if (rres?.cancelled) {
+                throw new error_1.DBOSAwaitedWorkflowCancelledError(workflowID);
+            }
             return dbos_executor_1.DBOSExecutor.reviveResultOrError(rres);
         }, 'DBOS.getResult', workflowID);
     }
@@ -674,7 +682,7 @@ class DBOS {
             }
             return (0, context_1.getCurrentDBOSContext)().retrieveWorkflow(workflowID);
         }
-        return DBOS.executor.retrieveWorkflow(workflowID);
+        return DBOS.#executor.retrieveWorkflow(workflowID);
     }
     /**
      * Query the system database for all workflows matching the provided predicate
@@ -683,8 +691,8 @@ class DBOS {
      * @deprecated Use `DBOS.listWorkflows` instead
      */
     static async getWorkflows(input) {
-        return await DBOS.runAsWorkflowStep(async () => {
-            const wfs = await DBOS.executor.listWorkflows(input);
+        return await DBOS.#runAsWorkflowStep(async () => {
+            const wfs = await DBOS.#executor.listWorkflows(input);
             return { workflowUUIDs: wfs.map((wf) => wf.workflowID) };
         }, 'DBOS.getWorkflows');
     }
@@ -694,8 +702,8 @@ class DBOS {
      * @returns `WorkflowStatus` array containing details of the matching workflows
      */
     static async listWorkflows(input) {
-        return await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.listWorkflows(input);
+        return await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.listWorkflows(input);
         }, 'DBOS.listWorkflows');
     }
     /**
@@ -704,8 +712,8 @@ class DBOS {
      * @returns `WorkflowStatus` array containing details of the matching workflows
      */
     static async listQueuedWorkflows(input) {
-        return await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.listQueuedWorkflows(input);
+        return await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.listQueuedWorkflows(input);
         }, 'DBOS.listQueuedWorkflows');
     }
     /**
@@ -714,8 +722,8 @@ class DBOS {
      * @returns `StepInfo` array listing the executed steps of the workflow. If the workflow is not found, `undefined` is returned.
      */
     static async listWorkflowSteps(workflowID) {
-        return await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.listWorkflowSteps(workflowID);
+        return await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.listWorkflowSteps(workflowID);
         }, 'DBOS.listWorkflowSteps');
     }
     /**
@@ -725,8 +733,8 @@ class DBOS {
      * @param workflowID - ID of the workflow
      */
     static async cancelWorkflow(workflowID) {
-        return await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.cancelWorkflow(workflowID);
+        return await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.cancelWorkflow(workflowID);
         }, 'DBOS.cancelWorkflow');
     }
     /**
@@ -734,8 +742,8 @@ class DBOS {
      * @param workflowID - ID of the workflow
      */
     static async resumeWorkflow(workflowID) {
-        await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.resumeWorkflow(workflowID);
+        await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.resumeWorkflow(workflowID);
         }, 'DBOS.resumeWorkflow');
         return this.retrieveWorkflow(workflowID);
     }
@@ -748,8 +756,8 @@ class DBOS {
      * @throws DBOSInvalidStepIDError if the `startStep` is greater than the maximum step ID of the workflow
      */
     static async forkWorkflow(workflowID, startStep, options) {
-        const forkedID = await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.forkWorkflow(workflowID, startStep, options);
+        const forkedID = await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.forkWorkflow(workflowID, startStep, options);
         }, 'DBOS.forkWorkflow');
         return this.retrieveWorkflow(forkedID);
     }
@@ -758,8 +766,8 @@ class DBOS {
      * @param input - Filter predicate, containing the queue name and other criteria
      */
     static async getWorkflowQueue(input) {
-        return await DBOS.runAsWorkflowStep(async () => {
-            return await DBOS.executor.getWorkflowQueue(input);
+        return await DBOS.#runAsWorkflowStep(async () => {
+            return await DBOS.#executor.getWorkflowQueue(input);
         }, 'DBOS.getWorkflowQueue');
     }
     /**
@@ -795,20 +803,7 @@ class DBOS {
      * @returns - Return value from `callback`
      */
     static async withNextWorkflowID(workflowID, callback) {
-        const pctx = (0, context_1.getCurrentContextStore)();
-        if (pctx) {
-            const pcwfid = pctx.idAssignedForNextWorkflow;
-            try {
-                pctx.idAssignedForNextWorkflow = workflowID;
-                return callback();
-            }
-            finally {
-                pctx.idAssignedForNextWorkflow = pcwfid;
-            }
-        }
-        else {
-            return (0, context_1.runWithTopContext)({ idAssignedForNextWorkflow: workflowID }, callback);
-        }
+        return DBOS.#withTopContext({ idAssignedForNextWorkflow: workflowID }, callback);
     }
     /**
      * Use the provided `callerName`, `span`, and `request` as context for any
@@ -820,16 +815,11 @@ class DBOS {
      * @returns - Return value from `callback`
      */
     static async withTracedContext(callerName, span, request, callback) {
-        const pctx = (0, context_1.getCurrentContextStore)();
-        if (pctx) {
-            pctx.operationCaller = callerName;
-            pctx.span = span;
-            pctx.request = request;
-            return callback();
-        }
-        else {
-            return (0, context_1.runWithTopContext)({ span, request }, callback);
-        }
+        return DBOS.#withTopContext({
+            operationCaller: callerName,
+            span,
+            request,
+        }, callback);
     }
     /**
      * Use the provided `authedUser` and `authedRoles` as the authenticated user for
@@ -841,15 +831,10 @@ class DBOS {
      * @returns - Return value from `callback`
      */
     static async withAuthedContext(authedUser, authedRoles, callback) {
-        const pctx = (0, context_1.getCurrentContextStore)();
-        if (pctx) {
-            pctx.authenticatedUser = authedUser;
-            pctx.authenticatedRoles = authedRoles;
-            return callback();
-        }
-        else {
-            return (0, context_1.runWithTopContext)({ authenticatedUser: authedUser, authenticatedRoles: authedRoles }, callback);
-        }
+        return DBOS.#withTopContext({
+            authenticatedUser: authedUser,
+            authenticatedRoles: authedRoles,
+        }, callback);
     }
     /**
      * This generic setter helps users calling DBOS operation to pass a name,
@@ -859,14 +844,7 @@ class DBOS {
      * @returns - Return value from `callback`
      */
     static async withNamedContext(callerName, callback) {
-        const pctx = (0, context_1.getCurrentContextStore)();
-        if (pctx) {
-            pctx.operationCaller = callerName;
-            return callback();
-        }
-        else {
-            return (0, context_1.runWithTopContext)({ operationCaller: callerName }, callback);
-        }
+        return DBOS.#withTopContext({ operationCaller: callerName }, callback);
     }
     /**
      * @deprecated
@@ -876,20 +854,7 @@ class DBOS {
      * @returns - Return value from `callback`
      */
     static async withWorkflowQueue(queueName, callback) {
-        const pctx = (0, context_1.getCurrentContextStore)();
-        if (pctx) {
-            const originalQueueName = pctx.queueAssignedForWorkflows;
-            try {
-                pctx.queueAssignedForWorkflows = queueName;
-                return callback();
-            }
-            finally {
-                pctx.queueAssignedForWorkflows = originalQueueName;
-            }
-        }
-        else {
-            return (0, context_1.runWithTopContext)({ queueAssignedForWorkflows: queueName }, callback);
-        }
+        return DBOS.#withTopContext({ queueAssignedForWorkflows: queueName }, callback);
     }
     /**
      * Specify workflow timeout for any workflows started within the `callback`.
@@ -898,19 +863,44 @@ class DBOS {
      * @returns - Return value from `callback`
      */
     static async withWorkflowTimeout(timeoutMS, callback) {
+        return DBOS.#withTopContext({ workflowTimeoutMS: timeoutMS }, callback);
+    }
+    /**
+     * Run a workflow with the option to set any of the contextual items
+     *
+     * @param options - Overrides for options
+     * @param callback - Function to run, which would call or start workflows
+     * @returns - Return value from `callback`
+     */
+    static async #withTopContext(options, callback) {
         const pctx = (0, context_1.getCurrentContextStore)();
         if (pctx) {
-            const originalTimeoutMS = pctx.workflowTimeoutMS;
+            // Save existing values and overwrite with new; hard to do cleanly but is actually type correct
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            const existing = {};
+            for (const k of Object.keys(options)) {
+                if (Object.hasOwn(pctx, k))
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    existing[k] = options[k];
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-member-access
+                pctx[k] = options[k];
+            }
             try {
-                pctx.workflowTimeoutMS = timeoutMS;
-                return callback();
+                return await callback();
             }
             finally {
-                pctx.workflowTimeoutMS = originalTimeoutMS;
+                for (const k of Object.keys(options)) {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+                    if (Object.hasOwn(existing, k))
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment
+                        pctx[k] = existing[k];
+                    else
+                        delete pctx[k];
+                }
             }
         }
         else {
-            return (0, context_1.runWithTopContext)({ workflowTimeoutMS: timeoutMS }, callback);
+            return (0, context_1.runWithTopContext)(options, callback);
         }
     }
     static startWorkflow(target, params) {
@@ -944,6 +934,11 @@ class DBOS {
                 deadlineEpochMS: wfctx.deadlineEpochMS,
                 enqueueOptions: inParams?.enqueueOptions,
             };
+            // Detach child deadline if a null timeout is configured
+            // We must check the inParams but also pctx (if the workflow was called withWorkflowTimeout)
+            if (inParams?.timeoutMS === null || pctx?.workflowTimeoutMS === null) {
+                wfParams.deadlineEpochMS = undefined;
+            }
             for (const op of ops) {
                 if (op.workflowConfig) {
                     proxy[op.name] = (...args) => dbos_executor_1.DBOSExecutor.globalInstance.internalWorkflow(op.registeredFunction, wfParams, wfctx.workflowUUID, funcId, ...args);
@@ -973,7 +968,7 @@ class DBOS {
             // If pctx has no span, e.g., has not been setup through `withTracedContext`, set up a parent span for the workflow here.
             let span = pctx.span;
             if (!span) {
-                span = DBOS.executor.tracer.startSpan(pctx.operationCaller || 'startWorkflow', {
+                span = DBOS.#executor.tracer.startSpan(pctx.operationCaller || 'startWorkflow', {
                     operationUUID: wfId,
                     operationType: pctx.operationType,
                     authenticatedUser: pctx.authenticatedUser,
@@ -998,7 +993,7 @@ class DBOS {
         };
         for (const op of ops) {
             if (op.workflowConfig) {
-                proxy[op.name] = (...args) => DBOS.executor.workflow(op.registeredFunction, wfParams, ...args);
+                proxy[op.name] = (...args) => DBOS.#executor.workflow(op.registeredFunction, wfParams, ...args);
             }
             else if (op.txnConfig) {
                 const txn = op.registeredFunction;
@@ -1022,7 +1017,7 @@ class DBOS {
             const pctx = (0, context_1.getCurrentContextStore)();
             let span = pctx?.span;
             if (!span) {
-                span = DBOS.executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
                     operationType: pctx?.operationType,
                     authenticatedUser: pctx?.authenticatedUser,
                     assumedRole: pctx?.assumedRole,
@@ -1136,7 +1131,7 @@ class DBOS {
             }
             return (0, context_1.getCurrentDBOSContext)().send(destinationID, message, topic);
         }
-        return DBOS.executor.send(destinationID, message, topic, idempotencyKey);
+        return DBOS.#executor.send(destinationID, message, topic, idempotencyKey);
     }
     /**
      * Receive a message on optional `topic` from within a workflow.
@@ -1196,7 +1191,7 @@ class DBOS {
             }
             return (0, context_1.getCurrentDBOSContext)().getEvent(workflowID, key, timeoutSeconds);
         }
-        return DBOS.executor.getEvent(workflowID, key, timeoutSeconds);
+        return DBOS.#executor.getEvent(workflowID, key, timeoutSeconds);
     }
     //////
     // Decorators
@@ -1254,6 +1249,10 @@ class DBOS {
                         timeoutMS: pctx?.workflowTimeoutMS,
                         deadlineEpochMS: wfctx.deadlineEpochMS,
                     };
+                    // Detach child deadline if a null timeout is configured
+                    if (pctx?.workflowTimeoutMS === null) {
+                        params.deadlineEpochMS = undefined;
+                    }
                     const cwfh = await dbos_executor_1.DBOSExecutor.globalInstance.internalWorkflow(registration.registeredFunction, params, wfctx.workflowUUID, funcId, ...rawArgs);
                     return await cwfh.getResult();
                 }
@@ -1263,7 +1262,7 @@ class DBOS {
                     // If pctx has no span, e.g., has not been setup through `withTracedContext`, set up a parent span for the workflow here.
                     let span = pctx.span;
                     if (!span) {
-                        span = DBOS.executor.tracer.startSpan(pctx.operationCaller || 'workflowCaller', {
+                        span = DBOS.#executor.tracer.startSpan(pctx.operationCaller || 'workflowCaller', {
                             operationUUID: wfId,
                             operationType: pctx.operationType,
                             authenticatedUser: pctx.authenticatedUser,
@@ -1285,7 +1284,7 @@ class DBOS {
                     parentCtx,
                     timeoutMS: pctx?.workflowTimeoutMS,
                 };
-                const handle = await DBOS.executor.workflow(registration.registeredFunction, wfParams, ...rawArgs);
+                const handle = await DBOS.#executor.workflow(registration.registeredFunction, wfParams, ...rawArgs);
                 return await handle.getResult();
             };
             descriptor.value = invokeWrapper;
@@ -1295,7 +1294,7 @@ class DBOS {
             });
             (0, decorators_1.registerFunctionWrapper)(invokeWrapper, registration);
             // TODO CTX this should not be in here already, or if it is we need to do something different...
-            DBOS.invokeWrappers.set(invokeWrapper, registration.registeredFunction);
+            DBOS.#invokeWrappers.set(invokeWrapper, registration.registeredFunction);
             return descriptor;
         }
         return decorator;
@@ -1335,7 +1334,7 @@ class DBOS {
                 const pctx = (0, context_1.getCurrentContextStore)();
                 let span = pctx?.span;
                 if (!span) {
-                    span = DBOS.executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                    span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
                         operationType: pctx?.operationType,
                         authenticatedUser: pctx?.authenticatedUser,
                         assumedRole: pctx?.assumedRole,
@@ -1358,7 +1357,7 @@ class DBOS {
                     parentCtx,
                     workflowUUID: wfId,
                 };
-                return await DBOS.executor.transaction(registration.registeredFunction, wfParams, ...rawArgs);
+                return await DBOS.#executor.transaction(registration.registeredFunction, wfParams, ...rawArgs);
             };
             descriptor.value = invokeWrapper;
             registration.wrappedFunction = invokeWrapper;
@@ -1391,7 +1390,7 @@ class DBOS {
                 const pctx = (0, context_1.getCurrentContextStore)();
                 let span = pctx?.span;
                 if (!span) {
-                    span = DBOS.executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                    span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
                         operationType: pctx?.operationType,
                         authenticatedUser: pctx?.authenticatedUser,
                         assumedRole: pctx?.assumedRole,
@@ -1413,7 +1412,7 @@ class DBOS {
                     parentCtx,
                     workflowUUID: wfId,
                 };
-                return await DBOS.executor.procedure(registration.registeredFunction, wfParams, ...rawArgs);
+                return await DBOS.#executor.procedure(registration.registeredFunction, wfParams, ...rawArgs);
             };
             descriptor.value = invokeWrapper;
             registration.wrappedFunction = invokeWrapper;
@@ -1462,7 +1461,7 @@ class DBOS {
                 const pctx = (0, context_1.getCurrentContextStore)();
                 let span = pctx?.span;
                 if (!span) {
-                    span = DBOS.executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
+                    span = DBOS.#executor.tracer.startSpan(pctx?.operationCaller || 'transactionCaller', {
                         operationType: pctx?.operationType,
                         authenticatedUser: pctx?.authenticatedUser,
                         assumedRole: pctx?.assumedRole,
@@ -1485,7 +1484,7 @@ class DBOS {
                     parentCtx,
                     workflowUUID: wfId,
                 };
-                return await DBOS.executor.external(registration.registeredFunction, wfParams, ...rawArgs);
+                return await DBOS.#executor.external(registration.registeredFunction, wfParams, ...rawArgs);
             };
             descriptor.value = invokeWrapper;
             registration.wrappedFunction = invokeWrapper;