clean up

src/dbos-executor.ts

@@ -184,7 +184,6 @@ export class DBOSExecutor implements DBOSExecutorContext {
   constructor(readonly config: DBOSConfig, systemDatabase?: SystemDatabase) {
     this.debugMode = config.debugMode ?? false;
     this.debugProxy = config.debugProxy;
-    console.log("start DBOSExecutor constructor")
 
     // Set configured environment variables
     if (config.env) {
@@ -243,7 +242,6 @@ export class DBOSExecutor implements DBOSExecutorContext {
     this.initialized = false;
     DBOSExecutor.globalInstance = this;
 
-    console.log("exit DBOSExecutor constructor")
   }
 
   configureDbClient() {
@@ -317,29 +315,21 @@ export class DBOSExecutor implements DBOSExecutorContext {
 
   registerClass(className: string) {
 
-    console.log("DBOSExecutor Registering class", className)
-
     const cls = getRegisteredClassByName(className);
 
     if (cls === undefined) {
       throw new DBOSError(`Class ${className} not found`);
     }
 
-    // this.#registerClass(cls);
     this.#registerClass(cls.ctor);
 
-
-    // cls.regComplete = true;
   }
 
 
   #registerClass(cls: object) {
 
-    console.log("#Registering class", cls)
-
 
     const registeredClassOperations = getRegisteredOperations(cls);
-    // console.log("registeredClassOperations", registeredClassOperations)
     this.registeredOperations.push(...registeredClassOperations);
     for (const ro of registeredClassOperations) {
       if (ro.workflowConfig) {
@@ -369,24 +359,13 @@ export class DBOSExecutor implements DBOSExecutorContext {
   }
 
   async init(classes?: object[]): Promise<void> {
-    console.log("DbosExecutor init")
     if (this.initialized) {
-      /* this.logger.error("Workflow executor already initialized!");
-      if (!classes || !classes.length) {
-        classes = getAllRegisteredClasses();
-        console.log("registered Classes", classes)
-      }
-      for (const cls of classes) {
-        console.log("Registering class", cls)
-        this.#registerClass(cls);
-      } */
       this.logger.error("Workflow executor already initialized!");
       return;
     }
 
     if (!classes || !classes.length) {
       classes = getAllRegisteredClasses();
-      console.log("registered Classes", classes)
     }
 
     type AnyConstructor = new (...args: unknown[]) => object;
@@ -418,7 +397,6 @@ export class DBOSExecutor implements DBOSExecutorContext {
       }
 
       for (const cls of classes) {
-        console.log("Registering class", cls)
         this.#registerClass(cls);
       }
 
@@ -541,16 +519,13 @@ export class DBOSExecutor implements DBOSExecutorContext {
 
   #registerWorkflow(ro: MethodRegistrationBase) {
 
-    console.log("registering workflow")
-
     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)) {
       return
-      // throw new DBOSError(`Repeated workflow name: ${wfn}`);
     }
     const workflowInfo: WorkflowRegInfo = {
       workflow: wf,
@@ -563,14 +538,10 @@ export class DBOSExecutor implements DBOSExecutorContext {
 
   #registerTransaction(ro: MethodRegistrationBase) {
 
-    console.log("registering transaction")
-
     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}`);
-      console.log(`Repeated Transaction name: ${tfn}`);
       return;
     }
     const txnInfo: TransactionRegInfo = {

src/dbos.ts

@@ -147,17 +147,14 @@
     set(conf, key, newValue);
   }
 
   static async register(cls: any) {
 
-    console.log("DBOS.register class: ", cls.name);
-
     await this.launch();
 
     const executor = DBOSExecutor.globalInstance;
 
     if (executor !== undefined) {
-      // executor.registerClass(cls.mjclassName);
       executor.registerClass(cls.name)
     } else {
       throw new DBOSExecutorNotInitializedError();
     }
@@ -167,13 +164,9 @@
   static async launch(httpApps?: DBOSHttpApps) {
     // Do nothing is DBOS is already initialized
     if (DBOSExecutor.globalInstance) {
-      // console.log("DBOS already initialized. But running init again");
-      // DBOSExecutor.globalInstance.init();
       return
     }
 
-    console.log("Launching DBOS.launch()");
-
     // Initialize the DBOS executor
     if (!DBOS.dbosConfig) {
       const [dbosConfig, runtimeConfig]: [DBOSConfig, DBOSRuntimeConfig] = parseConfigFile();
@@ -839,10 +832,6 @@
       inDescriptor: TypedPropertyDescriptor<(this: This, ...args: Args) => Promise<Return>>)
     {
 
-      console.log("mjjjj Transaction decorator called");
-
-
-
       const { descriptor, registration } = registerAndWrapContextFreeFunction(target, propertyKey, inDescriptor);
       registration.txnConfig = config;
 

src/decorators.ts

@@ -260,25 +260,15 @@
 export function getRegisteredOperations(target: object): ReadonlyArray<MethodRegistrationBase> {
   const registeredOperations: MethodRegistrationBase[] = [];
 
-
-
-  // const clname = (target as any).mjclassName  
-
-  // console.log("We are in getRegisteredOperations", clname)
-
 
   if (typeof target === 'function') { // Constructor case
     const classReg = classesByName.get(target.name);
-    // const classReg = classesByName.get(clname);
-    console.log("function classReg", classReg)
     classReg?.registeredOperations?.forEach((m) =>registeredOperations.push(m));
   }
   else {
     let current: object | undefined = target;
     while (current) {
       const cname = current.constructor.name;
-      // const cname = clname;
-      console.log("not a function classReg", cname, classesByName)
       if (classesByName.has(cname)) {
         registeredOperations.push(...getRegisteredOperations(current.constructor));
       }
@@ -467,11 +457,7 @@
     throw Error("Use of decorator when original method is undefined");
   }
 
-
-  console.log("mjjjj We are in registerAndWrapContextFreeFunction", target.constructor.name, target, propertyKey, descriptor);
-  console.log("generated class name", (target as any).mjclassName);
   const registration = getOrCreateMethodRegistration(target, propertyKey, descriptor, false);
-
   return { descriptor, registration };
 }
 
@@ -491,26 +477,15 @@
 }
 
 export function getOrCreateClassRegistration<CT extends { new (...args: unknown[]) : object }>(
   ctor: CT, propertyKey?: string | symbol
 ) {
 
-  console.log("We are in getOrCreateClassRegistration", ctor);
-  // console.log("before number of regis", classesByName.size);
-  // console.trace();
-
   const name = ctor.name;
-  // const name = propertyKey ? propertyKey.toString() : ctor.name;
-  // const name: string = (ctor as any).mjclassName
-  console.log("name we are using ",name)
+
   if (!classesByName.has(name)) {
-
-    console.log("Inserting class registration", name);
     classesByName.set(name, new ClassRegistration<CT>(ctor));
-    console.log("Done Inserting class registration", name);
-
   }
 
-  console.log("after number of regis", classesByName.size);
   const clsReg: ClassRegistration<AnyConstructor> = classesByName.get(name)!;
 
   if (clsReg.needsInitialized) {
@@ -623,14 +598,12 @@
 
 export function DefaultArgOptional<T extends { new (...args: unknown[]) : object }>(ctor: T)
 {
-  console.log("We are in DefaultArgOptional", ctor.name);
    const clsreg = getOrCreateClassRegistration(ctor);
    clsreg.defaultArgRequired = ArgRequiredOptions.OPTIONAL;
 }
 
 export function configureInstance<R extends ConfiguredInstance, T extends unknown[]>(cls: new (name:string, ...args: T) => R, name: string, ...args: T) : R
 {
-  console.log("We are in configureInstance", cls.name, name);
   const inst = new cls(name, ...args);
   const creg = getOrCreateClassRegistration(cls as new(...args: unknown[])=>R);
   if (creg.configuredInstances.has(name)) {
@@ -678,15 +651,6 @@
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     inDescriptor: TypedPropertyDescriptor<(this: This, ctx: TransactionContext<any>, ...args: Args) => Promise<Return>>)
   {
-
-    console.log("mjjjj We are in Transaction decorator", target, propertyKey, inDescriptor);  
-    const xxxName = Reflect.getMetadata('design:type', target)?.name ?? 'UnknownClass';
-
-    console.log(`Transaction decorator applied to: ${xxxName}.${propertyKey}`);
-
-
-    const className = (target as any).constructor.mjclassName;
-    console.log("In Transaction decorator Class Name:", className, propertyKey);
     const { descriptor, registration } = registerAndWrapFunction(target, propertyKey, inDescriptor);
     registration.txnConfig = config;
     return descriptor;