@dbos-inc/dbos-sdk 3.0.27-preview → 3.0.29-preview

package/dist/src/dbos-executor.js

@@ -88,27 +88,6 @@ class DBOSExecutor {
     procedurePool;
     // Temporary workflows are created by calling transaction/send/recv directly from the executor class
     static tempWorkflowName = 'temp_workflow';
-    workflowInfoMap = new Map([
-        // We initialize the map with an entry for temporary workflows.
-        [
-            DBOSExecutor.tempWorkflowName,
-            {
-                workflow: async () => {
-                    this.logger.error('UNREACHABLE: Indirect invoke of temp workflow');
-                    return Promise.resolve();
-                },
-                workflowOrigFunction: async () => {
-                    this.logger.error('UNREACHABLE: Indirect invoke of temp workflow');
-                    return Promise.resolve();
-                },
-                config: {},
-            },
-        ],
-    ]);
-    transactionInfoMap = new Map();
-    stepInfoMap = new Map();
-    procedureInfoMap = new Map();
-    registeredOperations = [];
     telemetryCollector;
     static defaultNotificationTimeoutSec = 60;
     debugMode;
@@ -119,7 +98,6 @@ class DBOSExecutor {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     typeormEntities = [];
     drizzleEntities = {};
-    eventReceivers = [];
     scheduler = undefined;
     wfqEnded = undefined;
     executorID = utils_1.globalParams.executorID;
@@ -233,39 +211,6 @@ class DBOSExecutor {
             this.logger.debug('Loaded Postgres user database');
         }
     }
-    #registerClass(clsname) {
-        const registeredClassOperations = (0, decorators_1.getRegisteredOperationsByClassname)(clsname);
-        this.registeredOperations.push(...registeredClassOperations);
-        for (const ro of registeredClassOperations) {
-            if (ro.workflowConfig) {
-                this.#registerWorkflow(ro);
-            }
-            else if (ro.txnConfig) {
-                this.#registerTransaction(ro);
-            }
-            else if (ro.stepConfig) {
-                this.#registerStep(ro);
-            }
-            else if (ro.procConfig) {
-                this.#registerProcedure(ro);
-            }
-            for (const [evtRcvr, _cfg] of ro.eventReceiverInfo) {
-                if (!this.eventReceivers.includes(evtRcvr))
-                    this.eventReceivers.push(evtRcvr);
-            }
-        }
-    }
-    getRegistrationsFor(obj) {
-        const res = [];
-        for (const r of this.registeredOperations) {
-            if (!r.eventReceiverInfo.has(obj))
-                continue;
-            const methodConfig = r.eventReceiverInfo.get(obj);
-            const classConfig = r.defaults?.eventReceiverInfo.get(obj) ?? {};
-            res.push({ methodReg: r, methodConfig, classConfig });
-        }
-        return res;
-    }
     async init(classes) {
         if (this.initialized) {
             this.logger.error('Workflow executor already initialized!');
@@ -306,9 +251,6 @@ class DBOSExecutor {
                 this.logger.error('No user database configured!');
                 throw new error_1.DBOSInitializationError('No user database configured!');
             }
-            for (const cls of classnames) {
-                this.#registerClass(cls);
-            }
             // Debug mode doesn't need to initialize the DBs. Everything should appear to be read-only.
             await this.userDatabase.init(this.debugMode);
             if (!this.debugMode) {
@@ -342,7 +284,7 @@ class DBOSExecutor {
                     await cfg.initialize(new _1.InitContext());
                 }
             }
-            for (const v of this.registeredOperations) {
+            for (const v of (0, decorators_1.getAllRegisteredFunctions)()) {
                 const m = v;
                 if (m.init === true) {
                     this.logger.debug('Executing init method: ' + m.name);
@@ -402,109 +344,11 @@ class DBOSExecutor {
             throw err;
         }
     }
-    /* WORKFLOW OPERATIONS */
-    #registerWorkflow(ro) {
-        const wf = ro.registeredFunction;
-        if (wf.name === DBOSExecutor.tempWorkflowName) {
-            throw new error_1.DBOSError(`Unexpected use of reserved workflow name: ${wf.name}`);
-        }
-        const wfn = ro.className + '.' + ro.name;
-        if (this.workflowInfoMap.has(wfn)) {
-            throw new error_1.DBOSError(`Repeated workflow name: ${wfn}`);
-        }
-        const workflowInfo = {
-            workflow: wf,
-            workflowOrigFunction: ro.origFunction,
-            config: { ...ro.workflowConfig },
-            registration: ro,
-        };
-        this.workflowInfoMap.set(wfn, workflowInfo);
-        this.logger.debug(`Registered workflow ${wfn}`);
-    }
-    #registerTransaction(ro) {
-        const txf = ro.registeredFunction;
-        const tfn = ro.className + '.' + ro.name;
-        if (this.transactionInfoMap.has(tfn)) {
-            throw new error_1.DBOSError(`Repeated Transaction name: ${tfn}`);
-        }
-        const txnInfo = {
-            transaction: txf,
-            config: { ...ro.txnConfig },
-            registration: ro,
-        };
-        this.transactionInfoMap.set(tfn, txnInfo);
-        this.logger.debug(`Registered transaction ${tfn}`);
-    }
-    #registerStep(ro) {
-        const comm = ro.registeredFunction;
-        const cfn = ro.className + '.' + ro.name;
-        if (this.stepInfoMap.has(cfn)) {
-            throw new error_1.DBOSError(`Repeated Commmunicator name: ${cfn}`);
-        }
-        const stepInfo = {
-            step: comm,
-            config: { ...ro.stepConfig },
-            registration: ro,
-        };
-        this.stepInfoMap.set(cfn, stepInfo);
-        this.logger.debug(`Registered step ${cfn}`);
-    }
-    #registerProcedure(ro) {
-        const proc = ro.registeredFunction;
-        const cfn = ro.className + '.' + ro.name;
-        if (this.procedureInfoMap.has(cfn)) {
-            throw new error_1.DBOSError(`Repeated Procedure name: ${cfn}`);
-        }
-        const procInfo = {
-            procedure: proc,
-            config: { ...ro.procConfig },
-            registration: ro,
-        };
-        this.procedureInfoMap.set(cfn, procInfo);
-        this.logger.debug(`Registered stored proc ${cfn}`);
-    }
-    getWorkflowInfo(wf) {
-        const wfname = wf.name === DBOSExecutor.tempWorkflowName ? wf.name : (0, decorators_1.getRegisteredMethodClassName)(wf) + '.' + wf.name;
-        return this.workflowInfoMap.get(wfname);
-    }
-    getWorkflowInfoByStatus(wf) {
-        const wfname = wf.workflowClassName + '.' + wf.workflowName;
-        const wfInfo = this.workflowInfoMap.get(wfname);
-        // wfInfo may be undefined here, if this is a temp workflow
-        return { wfInfo, configuredInst: (0, decorators_1.getConfiguredInstance)(wf.workflowClassName, wf.workflowConfigName) };
-    }
-    getTransactionInfo(tf) {
-        const tfname = (0, decorators_1.getRegisteredMethodClassName)(tf) + '.' + tf.name;
-        return this.transactionInfoMap.get(tfname);
-    }
-    getTransactionInfoByNames(className, functionName, cfgName) {
-        const tfname = className + '.' + functionName;
-        const txnInfo = this.transactionInfoMap.get(tfname);
-        if (!txnInfo) {
-            throw new error_1.DBOSNotRegisteredError(tfname, `Transaction function name '${tfname}' is not registered.`);
-        }
-        return { txnInfo, clsInst: (0, decorators_1.getConfiguredInstance)(className, cfgName) };
-    }
-    getStepInfo(cf) {
-        const cfname = (0, decorators_1.getRegisteredMethodClassName)(cf) + '.' + cf.name;
-        return this.stepInfoMap.get(cfname);
-    }
-    getStepInfoByNames(className, functionName, cfgName) {
-        const cfname = className + '.' + functionName;
-        const stepInfo = this.stepInfoMap.get(cfname);
-        if (!stepInfo) {
-            throw new error_1.DBOSNotRegisteredError(cfname, `Step function name '${cfname}' is not registered.`);
-        }
-        return { commInfo: stepInfo, clsInst: (0, decorators_1.getConfiguredInstance)(className, cfgName) };
-    }
-    getProcedureClassName(pf) {
-        return (0, decorators_1.getRegisteredMethodClassName)(pf);
-    }
-    getProcedureInfo(pf) {
-        const pfName = (0, decorators_1.getRegisteredMethodClassName)(pf) + '.' + pf.name;
-        return this.procedureInfoMap.get(pfName);
+    // This could return WF, or the function underlying a temp wf
+    #getFunctionInfoFromWFStatus(wf) {
+        const methReg = (0, decorators_1.getFunctionRegistrationByName)(wf.workflowClassName, wf.workflowName);
+        return { methReg, configuredInst: (0, decorators_1.getConfiguredInstance)(wf.workflowClassName, wf.workflowConfigName) };
     }
-    // TODO: getProcedureInfoByNames??
     static reviveResultOrError(r, success) {
         if (success === true || !r.error) {
             return utils_1.DBOSJSON.parse(r.output ?? null);
@@ -541,18 +385,21 @@ class DBOSExecutor {
             }
         }
         const pctx = (0, context_1.getCurrentContextStore)();
-        const wInfo = this.getWorkflowInfo(wf);
-        if (wInfo === undefined) {
-            throw new error_1.DBOSNotRegisteredError(wf.name);
+        let wConfig = {};
+        const wInfo = (0, decorators_1.getFunctionRegistration)(wf);
+        if (wf.name !== DBOSExecutor.tempWorkflowName) {
+            if (!wInfo || !wInfo.workflowConfig) {
+                throw new error_1.DBOSNotRegisteredError(wf.name);
+            }
+            wConfig = wInfo.workflowConfig;
         }
-        const wConfig = wInfo.config;
         const maxRecoveryAttempts = wConfig.maxRecoveryAttempts ? wConfig.maxRecoveryAttempts : 50;
         const wfname = wf.name; // TODO: Should be what was registered in wfInfo...
         const span = this.tracer.startSpan(wfname, {
             status: workflow_1.StatusString.PENDING,
             operationUUID: workflowID,
             operationType: exports.OperationType.WORKFLOW,
-            operationName: wInfo.registration?.name ?? wf.name,
+            operationName: wInfo?.name ?? wf.name,
             authenticatedUser: pctx?.authenticatedUser ?? '',
             authenticatedRoles: pctx?.authenticatedRoles ?? [],
             assumedRole: pctx?.assumedRole ?? '',
@@ -561,8 +408,8 @@ class DBOSExecutor {
         const internalStatus = {
             workflowUUID: workflowID,
             status: params.queueName !== undefined ? workflow_1.StatusString.ENQUEUED : workflow_1.StatusString.PENDING,
-            workflowName: wfname,
-            workflowClassName: isTempWorkflow ? '' : (0, decorators_1.getRegisteredMethodClassName)(wf),
+            workflowName: (0, decorators_1.getRegisteredFunctionName)(wf),
+            workflowClassName: isTempWorkflow ? '' : (0, decorators_1.getRegisteredFunctionClassName)(wf),
             workflowConfigName: params.configuredInstance?.name || '',
             queueName: params.queueName,
             output: null,
@@ -837,7 +684,7 @@ class DBOSExecutor {
         }
         return rows;
     }
-    async transaction(txn, params, ...args) {
+    async runTransactionTempWF(txn, params, ...args) {
         return await (await this.startTransactionTempWF(txn, params, undefined, undefined, ...args)).getResult();
     }
     async startTransactionTempWF(txn, params, callerWFID, callerFunctionID, ...args) {
@@ -848,13 +695,13 @@ class DBOSExecutor {
         return await this.internalWorkflow(temp_workflow, {
             ...params,
             tempWfType: exports.TempWorkflowType.transaction,
-            tempWfName: (0, decorators_1.getRegisteredMethodName)(txn),
-            tempWfClass: (0, decorators_1.getRegisteredMethodClassName)(txn),
+            tempWfName: (0, decorators_1.getRegisteredFunctionName)(txn),
+            tempWfClass: (0, decorators_1.getRegisteredFunctionClassName)(txn),
         }, callerWFID, callerFunctionID, ...args);
     }
     async callTransactionFunction(txn, clsinst, ...args) {
-        const txnInfo = this.getTransactionInfo(txn);
-        if (txnInfo === undefined) {
+        const txnReg = (0, decorators_1.getFunctionRegistration)(txn);
+        if (!txnReg || !txnReg.txnConfig) {
             throw new error_1.DBOSNotRegisteredError(txn.name);
         }
         const pctx = (0, context_1.getCurrentContextStore)();
@@ -871,7 +718,7 @@ class DBOSExecutor {
             authenticatedUser: pctx.authenticatedUser ?? '',
             assumedRole: pctx.assumedRole ?? '',
             authenticatedRoles: pctx.authenticatedRoles ?? [],
-            isolationLevel: txnInfo.config.isolationLevel,
+            isolationLevel: txnReg.txnConfig.isolationLevel,
         }, pctx.span);
         while (true) {
             await this.systemDatabase.checkIfCanceled(wfid);
@@ -959,7 +806,7 @@ class DBOSExecutor {
                 return result;
             };
             try {
-                const result = await this.userDatabase.transaction(wrappedTransaction, txnInfo.config);
+                const result = await this.userDatabase.transaction(wrappedTransaction, txnReg.txnConfig);
                 span.setStatus({ code: api_1.SpanStatusCode.OK });
                 this.tracer.endSpan(span);
                 return result;
@@ -989,7 +836,7 @@ class DBOSExecutor {
             }
         }
     }
-    async procedure(proc, params, ...args) {
+    async runProcedureTempWF(proc, params, ...args) {
         // Create a workflow and call procedure.
         const temp_workflow = async (...args) => {
             return this.callProcedureFunction(proc, ...args);
@@ -997,19 +844,20 @@ class DBOSExecutor {
         return await (await this.workflow(temp_workflow, {
             ...params,
             tempWfType: exports.TempWorkflowType.procedure,
-            tempWfName: (0, decorators_1.getRegisteredMethodName)(proc),
-            tempWfClass: (0, decorators_1.getRegisteredMethodClassName)(proc),
+            tempWfName: (0, decorators_1.getRegisteredFunctionName)(proc),
+            tempWfClass: (0, decorators_1.getRegisteredFunctionClassName)(proc),
         }, ...args)).getResult();
     }
     async callProcedureFunction(proc, ...args) {
-        const procInfo = this.getProcedureInfo(proc);
-        if (procInfo === undefined) {
+        const procInfo = (0, decorators_1.getFunctionRegistration)(proc);
+        if (!procInfo || !procInfo.procConfig) {
             throw new error_1.DBOSNotRegisteredError(proc.name);
         }
+        const procConfig = procInfo.procConfig;
         const pctx = (0, context_1.getCurrentContextStore)();
         const wfid = pctx.workflowId;
         await this.systemDatabase.checkIfCanceled(wfid);
-        const executeLocally = this.debugMode || (procInfo.config.executeLocally ?? false);
+        const executeLocally = this.debugMode || (procConfig.executeLocally ?? false);
         const funcId = (0, context_1.functionIDGetIncrement)();
         const span = this.tracer.startSpan(proc.name, {
             operationUUID: wfid,
@@ -1018,13 +866,13 @@ class DBOSExecutor {
             authenticatedUser: pctx.authenticatedUser ?? '',
             assumedRole: pctx.assumedRole ?? '',
             authenticatedRoles: pctx.authenticatedRoles ?? [],
-            isolationLevel: procInfo.config.isolationLevel,
+            isolationLevel: procInfo.procConfig.isolationLevel,
             executeLocally,
         }, pctx.span);
         try {
             const result = executeLocally
                 ? await this.#callProcedureFunctionLocal(proc, args, span, procInfo, funcId)
-                : await this.#callProcedureFunctionRemote(proc, args, span, procInfo.config, funcId);
+                : await this.#callProcedureFunctionRemote(proc, args, span, procConfig, funcId);
             span.setStatus({ code: api_1.SpanStatusCode.OK });
             return result;
         }
@@ -1120,7 +968,7 @@ class DBOSExecutor {
             };
             try {
                 const result = await this.invokeStoredProcFunction(wrappedProcedure, {
-                    isolationLevel: procInfo.config.isolationLevel,
+                    isolationLevel: procInfo.procConfig.isolationLevel,
                 });
                 span.setStatus({ code: api_1.SpanStatusCode.OK });
                 return result;
@@ -1188,8 +1036,8 @@ class DBOSExecutor {
     async #invokeStoredProc(proc, args) {
         const client = await this.procedurePool.connect();
         const log = (msg) => this.#logNotice(msg);
-        const procClassName = this.getProcedureClassName(proc);
-        const plainProcName = `${procClassName}_${proc.name}_p`;
+        const procname = (0, decorators_1.getRegisteredFunctionFullName)(proc);
+        const plainProcName = `${procname.className}_${procname.name}_p`;
         const procName = utils_1.globalParams.wasComputed ? plainProcName : `v${utils_1.globalParams.appVersion}_${plainProcName}`;
         const sql = `CALL "${procName}"(${args.map((_v, i) => `$${i + 1}`).join()});`;
         try {
@@ -1222,7 +1070,7 @@ class DBOSExecutor {
             client.release();
         }
     }
-    async external(stepFn, params, ...args) {
+    async runStepTempWF(stepFn, params, ...args) {
         return await (await this.startStepTempWF(stepFn, params, undefined, undefined, ...args)).getResult();
     }
     async startStepTempWF(stepFn, params, callerWFID, callerFunctionID, ...args) {
@@ -1233,8 +1081,8 @@ class DBOSExecutor {
         return await this.internalWorkflow(temp_workflow, {
             ...params,
             tempWfType: exports.TempWorkflowType.step,
-            tempWfName: (0, decorators_1.getRegisteredMethodName)(stepFn),
-            tempWfClass: (0, decorators_1.getRegisteredMethodClassName)(stepFn),
+            tempWfName: (0, decorators_1.getRegisteredFunctionName)(stepFn),
+            tempWfClass: (0, decorators_1.getRegisteredFunctionClassName)(stepFn),
         }, callerWFID, callerFunctionID, ...args);
     }
     /**
@@ -1245,8 +1093,8 @@ class DBOSExecutor {
     async callStepFunction(stepFn, stepFnName, stepConfig, clsInst, ...args) {
         stepFnName = stepFnName ?? stepFn.name ?? '<unnamed>';
         if (!stepConfig) {
-            const stepReg = this.getStepInfo(stepFn);
-            stepConfig = stepReg?.config;
+            const stepReg = (0, decorators_1.getFunctionRegistration)(stepFn);
+            stepConfig = stepReg?.stepConfig;
         }
         if (stepConfig === undefined) {
             throw new error_1.DBOSNotRegisteredError(stepFnName);
@@ -1354,7 +1202,7 @@ class DBOSExecutor {
             return result;
         }
     }
-    async send(destinationId, message, topic, idempotencyKey) {
+    async runSendTempWF(destinationId, message, topic, idempotencyKey) {
         // Create a workflow and call send.
         const temp_workflow = async (destinationId, message, topic) => {
             const ctx = (0, context_1.getCurrentContextStore)();
@@ -1434,26 +1282,6 @@ class DBOSExecutor {
             return await this.userDatabase.query(sql);
         }
     }
-    async userDBListen(channels, callback) {
-        const notificationsClient = await this.procedurePool.connect();
-        for (const nname of channels) {
-            await notificationsClient.query(`LISTEN ${nname};`);
-        }
-        notificationsClient.on('notification', callback);
-        return {
-            close: async () => {
-                for (const nname of channels) {
-                    try {
-                        await notificationsClient.query(`UNLISTEN ${nname};`);
-                    }
-                    catch (e) {
-                        this.logger.warn(e);
-                    }
-                    notificationsClient.release();
-                }
-            },
-        };
-    }
     /* INTERNAL HELPERS */
     /**
      * A recovery process that by default runs during executor init time.
@@ -1501,9 +1329,6 @@ class DBOSExecutor {
         this.scheduler = new scheduler_1.DBOSScheduler(this);
         this.scheduler.initScheduler();
         this.wfqEnded = wfqueue_1.wfQueueRunner.dispatchLoop(this);
-        for (const evtRcvr of this.eventReceivers) {
-            await evtRcvr.initialize(this);
-        }
         for (const lcl of (0, decorators_1.getLifecycleListeners)()) {
             await lcl.initialize?.();
         }
@@ -1519,16 +1344,7 @@ class DBOSExecutor {
                 this.logger.warn(`Error destroying lifecycle listener: ${e.message}`);
             }
         }
-        this.logger.debug('Deactivating event receivers');
-        for (const evtRcvr of this.eventReceivers || []) {
-            try {
-                await evtRcvr.destroy();
-            }
-            catch (err) {
-                const e = err;
-                this.logger.warn(`Error destroying event receiver: ${e.message}`);
-            }
-        }
+        this.logger.debug('Deactivating scheduler');
         try {
             await this.scheduler?.destroyScheduler();
         }
@@ -1536,6 +1352,7 @@ class DBOSExecutor {
             const e = err;
             this.logger.warn(`Error destroying scheduler: ${e.message}`);
         }
+        this.logger.debug('Deactivating queue runner');
         if (stopQueueThread) {
             try {
                 wfqueue_1.wfQueueRunner.stop();
@@ -1559,12 +1376,12 @@ class DBOSExecutor {
         }
         const inputs = utils_1.DBOSJSON.parse(wfStatus.input);
         const recoverCtx = this.#getRecoveryContext(workflowID, wfStatus);
-        const { wfInfo, configuredInst } = this.getWorkflowInfoByStatus(wfStatus);
+        const { methReg, configuredInst } = this.#getFunctionInfoFromWFStatus(wfStatus);
         // If starting a new workflow, assign a new UUID. Otherwise, use the workflow's original UUID.
         const workflowStartID = startNewWorkflow ? undefined : workflowID;
-        if (wfInfo) {
+        if (methReg?.workflowConfig) {
             return await (0, context_1.runWithTopContext)(recoverCtx, async () => {
-                return await this.workflow(wfInfo.workflow, {
+                return await this.workflow(methReg.registeredFunction, {
                     workflowUUID: workflowStartID,
                     configuredInstance: configuredInst,
                     queueName: wfStatus.queueName,
@@ -1577,34 +1394,33 @@ class DBOSExecutor {
         const wfName = wfStatus.workflowName;
         const nameArr = wfName.split('-');
         if (!nameArr[0].startsWith(DBOSExecutor.tempWorkflowName)) {
-            // CB - Doesn't this happen if the user changed the function name in their code?
-            throw new error_1.DBOSError(`This should never happen! Cannot find workflow info for a non-temporary workflow! UUID ${workflowID}, name ${wfName}`);
+            throw new error_1.DBOSError(`Cannot find workflow function for a non-temporary workflow, ID ${workflowID}, class '${wfStatus.workflowClassName}', function '${wfName}'; did you change your code?`);
         }
         if (nameArr[1] === exports.TempWorkflowType.transaction) {
-            const { txnInfo, clsInst } = this.getTransactionInfoByNames(wfStatus.workflowClassName, nameArr[2], wfStatus.workflowConfigName);
-            if (!txnInfo) {
-                this.logger.error(`Cannot find transaction info for UUID ${workflowID}, name ${nameArr[2]}`);
+            const txnReg = (0, decorators_1.getFunctionRegistrationByName)(wfStatus.workflowClassName, nameArr[2]);
+            if (!txnReg?.txnConfig) {
+                this.logger.error(`Cannot find transaction info for ID ${workflowID}, name ${nameArr[2]}`);
                 throw new error_1.DBOSNotRegisteredError(nameArr[2]);
             }
             return await (0, context_1.runWithTopContext)(recoverCtx, async () => {
-                return await this.startTransactionTempWF(txnInfo.transaction, {
+                return await this.startTransactionTempWF(txnReg.registeredFunction, {
                     workflowUUID: workflowStartID,
-                    configuredInstance: clsInst,
+                    configuredInstance: configuredInst,
                     queueName: wfStatus.queueName,
                     executeWorkflow: true,
                 }, undefined, undefined, ...inputs);
             });
         }
         else if (nameArr[1] === exports.TempWorkflowType.step) {
-            const { commInfo, clsInst } = this.getStepInfoByNames(wfStatus.workflowClassName, nameArr[2], wfStatus.workflowConfigName);
-            if (!commInfo) {
-                this.logger.error(`Cannot find step info for UUID ${workflowID}, name ${nameArr[2]}`);
+            const stepReg = (0, decorators_1.getFunctionRegistrationByName)(wfStatus.workflowClassName, nameArr[2]);
+            if (!stepReg?.stepConfig) {
+                this.logger.error(`Cannot find step info for ID ${workflowID}, name ${nameArr[2]}`);
                 throw new error_1.DBOSNotRegisteredError(nameArr[2]);
             }
             return await (0, context_1.runWithTopContext)(recoverCtx, async () => {
-                return await this.startStepTempWF(commInfo.step, {
+                return await this.startStepTempWF(stepReg.registeredFunction, {
                     workflowUUID: workflowStartID,
-                    configuredInstance: clsInst,
+                    configuredInstance: configuredInst,
                     queueName: wfStatus.queueName, // Probably null
                     executeWorkflow: true,
                 }, undefined, undefined, ...inputs);
@@ -1667,7 +1483,7 @@ class DBOSExecutor {
     }
     logRegisteredHTTPUrls() {
         this.logger.info('HTTP endpoints supported:');
-        this.registeredOperations.forEach((registeredOperation) => {
+        (0, decorators_1.getAllRegisteredFunctions)().forEach((registeredOperation) => {
             const ro = registeredOperation;
             if (ro.apiURL) {
                 this.logger.info('    ' + ro.apiType.padEnd(6) + '  :  ' + ro.apiURL);
@@ -1695,8 +1511,9 @@ class DBOSExecutor {
      */
     computeAppVersion() {
         const hasher = crypto.createHash('md5');
-        const sortedWorkflowSource = Array.from(this.workflowInfoMap.values())
-            .map((i) => i.workflowOrigFunction.toString())
+        const sortedWorkflowSource = Array.from((0, decorators_1.getAllRegisteredFunctions)())
+            .filter((e) => e.workflowConfig)
+            .map((i) => i.origFunction.toString())
             .sort();
         // Different DBOS versions should produce different hashes.
         sortedWorkflowSource.push(utils_1.globalParams.dbosVersion);