Support for multiple dbos app files in NextJs App

packages/create/templates/hello-nextjs/src/actions/dbosWorkflow.tsx

@@ -45,7 +45,8 @@ class dbosWorkflowClass {
 // This code needs to execute at least once to launch the DBOS runtime
 // Do not delete this code
 if (process.env.NEXT_PHASE !== "phase-production-build") {
-    await DBOS.launch();
+    await DBOS.register(dbosWorkflowClass);
+
 }
 
 // The exported function is the entry point for the workflow

src/dbos-executor.ts

@@ -38,7 +38,7 @@ import {
   DrizzleUserDatabase,
   UserDatabaseClient,
 } from './user_database';
-import { MethodRegistrationBase, getRegisteredOperations, getOrCreateClassRegistration, MethodRegistration, getRegisteredMethodClassName, getRegisteredMethodName, getConfiguredInstance, ConfiguredInstance, getAllRegisteredClasses } from './decorators';
+import { MethodRegistrationBase, getRegisteredOperations, getOrCreateClassRegistration, MethodRegistration, getRegisteredMethodClassName, getRegisteredMethodName, getConfiguredInstance, ConfiguredInstance, getAllRegisteredClasses,getRegisteredClassByName } from './decorators';
 import { SpanStatusCode } from '@opentelemetry/api';
 import knex, { Knex } from 'knex';
 import { DBOSContextImpl, InitContext, runWithWorkflowContext, runWithTransactionContext, runWithStepContext } from './context';
@@ -314,6 +314,18 @@ export class DBOSExecutor implements DBOSExecutorContext {
     }
   }
 
+  registerClass(className: string) {
+
+    const cls = getRegisteredClassByName(className);
+
+    if (cls === undefined) {
+      throw new DBOSError(`Class ${className} not found`);
+    }
+
+    this.#registerClass(cls.ctor);
+
+  }
+
   #registerClass(cls: object) {
     const registeredClassOperations = getRegisteredOperations(cls);
     this.registeredOperations.push(...registeredClassOperations);
@@ -504,13 +516,14 @@ export class DBOSExecutor implements DBOSExecutorContext {
   /* WORKFLOW OPERATIONS */
 
   #registerWorkflow(ro: MethodRegistrationBase) {
+
     const wf = ro.registeredFunction as Workflow<unknown[], unknown>;
     if (wf.name === DBOSExecutor.tempWorkflowName) {
       throw new DBOSError(`Unexpected use of reserved workflow name: ${wf.name}`);
     }
     const wfn = ro.className + '.' + ro.name;
     if (this.workflowInfoMap.has(wfn)) {
-      throw new DBOSError(`Repeated workflow name: ${wfn}`);
+      return
     }
     const workflowInfo: WorkflowRegInfo = {
       workflow: wf,
@@ -522,11 +535,12 @@ export class DBOSExecutor implements DBOSExecutorContext {
   }
 
   #registerTransaction(ro: MethodRegistrationBase) {
+
     const txf = ro.registeredFunction as Transaction<unknown[], unknown>;
     const tfn = ro.className + '.' + ro.name;
 
     if (this.transactionInfoMap.has(tfn)) {
-      throw new DBOSError(`Repeated Transaction name: ${tfn}`);
+      return;
     }
     const txnInfo: TransactionRegInfo = {
       transaction: txf,
@@ -541,7 +555,7 @@ export class DBOSExecutor implements DBOSExecutorContext {
     const comm = ro.registeredFunction as StepFunction<unknown[], unknown>;
     const cfn = ro.className + '.' + ro.name;
     if (this.stepInfoMap.has(cfn)) {
-      throw new DBOSError(`Repeated Commmunicator name: ${cfn}`);
+      return
     }
     const stepInfo: StepRegInfo = {
       step: comm,
@@ -557,7 +571,7 @@ export class DBOSExecutor implements DBOSExecutorContext {
     const cfn = ro.className + '.' + ro.name;
 
     if (this.procedureInfoMap.has(cfn)) {
-      throw new DBOSError(`Repeated Procedure name: ${cfn}`);
+      return
     }
     const procInfo: ProcedureRegInfo = {
       procedure: proc,

src/dbos.ts

@@ -147,9 +147,27 @@ export class DBOS {
     set(conf, key, newValue);
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  static async register(cls: any) {
+
+    await this.launch();
+
+    const executor = DBOSExecutor.globalInstance;
+
+    if (executor !== undefined) {
+      // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+      executor.registerClass(cls.name)
+    } else {
+      throw new DBOSExecutorNotInitializedError();
+    }
+
+  }
+
   static async launch(httpApps?: DBOSHttpApps) {
     // Do nothing is DBOS is already initialized
-    if (DBOSExecutor.globalInstance) return;
+    if (DBOSExecutor.globalInstance) {
+      return
+    }
 
     // Initialize the DBOS executor
     if (!DBOS.dbosConfig) {

src/decorators.ts

@@ -456,23 +456,24 @@ export function registerAndWrapFunctionTakingContext<This, Args extends unknown[
   }
 
   const registration = getOrCreateMethodRegistration(target, propertyKey, descriptor, true);
-
   return { descriptor, registration };
 }
 
 export function registerAndWrapDBOSFunction<This, Args extends unknown[], Return>(target: object, propertyKey: string, descriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>) {
   if (!descriptor.value) {
     throw Error("Use of decorator when original method is undefined");
   }
-
   const registration = getOrCreateMethodRegistration(target, propertyKey, descriptor, false);
-
   return { descriptor, registration };
 }
 
 type AnyConstructor = new (...args: unknown[]) => object;
 const classesByName: Map<string, ClassRegistration<AnyConstructor> > = new Map();
 
+export function getRegisteredClassByName(name: string) {
+  return classesByName.get(name);
+}
+
 export function getAllRegisteredClasses() {
   const ctors: AnyConstructor[] = [];
   for (const [_cn, creg] of classesByName) {
@@ -489,7 +490,6 @@ export function getOrCreateClassRegistration<CT extends { new (...args: unknown[
     classesByName.set(name, new ClassRegistration<CT>(ctor));
   }
   const clsReg: ClassRegistration<AnyConstructor> = classesByName.get(name)!;
-
   if (clsReg.needsInitialized) {
     clsReg.name = name;
     clsReg.needsInitialized = false;