cleanup NocapdQueues and NWWorker, improve nocap, remove monitor package

sandwichfarm · Mar 15, 2024 · 8f91929 · 8f91929
1 parent 37e18c0
commit 8f91929
Show file tree

Hide file tree

Showing 10 changed files with 137 additions and 413 deletions.
diff --git a/apps/nocapd/src/classes/NocapdQueues.js b/apps/nocapd/src/classes/NocapdQueues.js
@@ -1,41 +1,19 @@
 export class NocapdQueues {
-  constructor(config){
-    /** @type {object} */
-    // this.checks = {}
-    /** @type {BullQueue} */
-    this.queue = null 
-    /** @type {BullQueueEvents} */
-    this.events = null 
-    /** @type {BullWorker} */ 
-    this.worker = null
-    // /** @type {WorkerManager} */
-    this.checks = null 
-    /** @type {Scheduler} */ 
-    this.scheduler = null
-    /** @type {object} */
-    this.cb = {}
-    /** @type {object} */
-    this.pubkey = config?.pubkey? config.pubkey: null
-
-    /** @type {array} */
-    this.worker_events = ['completed', 'failed', 'progress', 'stalled', 'waiting', 'active', 'delayed', 'drained', 'paused', 'resumed']
-
+  constructor(opts){
+    this.setup(opts)
     if(!this.pubkey)
       throw new Error(`NocapdQueues requires a pubkey`)
   }
 
-  route(job){
-    const { name } = job
-    const daemonManager = name.split('@')[0]
-    const daemonPubkey = name.split('@')[1]
-
-    // if(daemonPubkey !== this.pubkey) 
-    //   console.warn(`[route] ${daemonPubkey} !== ${this.pubkey}`)
-
-    if(!this.checks[daemonManager])
-      throw new Error(`No manager found for ${daemonManager}`)
-
-    return this.checks[daemonManager].work(job)
+  setup(opts){
+    this.pubkey = opts?.pubkey? opts.pubkey: null
+    this.cb = {}
+    this.queue = null 
+    this.events = null 
+    this.worker = null
+    this.checker = null
+    this.worker_events = ['completed', 'failed', 'progress', 'stalled', 'waiting', 'active', 'delayed', 'drained', 'paused', 'resumed']
+
   }
 
   route_event(event, ...args){
@@ -49,24 +27,10 @@ export class NocapdQueues {
       name = job.split(':')[0]
 
     if(name) {
-      const daemonManager = name.split('@')[0]
-      const daemonPubkey = name.split('@')[1]
-
-      // if(daemonPubkey !== this.pubkey) 
-      //   return this.log.warn(`[route_event] ${daemonPubkey} !== ${this.pubkey}`)
-
-      if(!this.checks[daemonManager])
-        return 
-        // this.log.warn(`No manager found for ${daemonManager} to handle ${event} event for pubkey: ${daemonPubkey}`)
-
-      return this.checks[daemonManager].cbcall(event, ...args)
+      return this.checker.cbcall(event, ...args)
     }
-    //these events apply to the worker not the manager an d don't have any parameters, 
-    //so cannot be routed like completions and failures.
     else if( event === 'drained' ) {
-      for( const manager in this.checks ) {
-        this.checks[manager].cbcall(event)
-      }
+      this.checker.cbcall(event)
     }
     else {
       this.cbcall(event, ...args)
@@ -96,14 +60,6 @@ export class NocapdQueues {
       this.cb[handler](...args)
   }
 
-  async populateAll(){
-    const mkeys = Object.keys(this.checks)
-    for await ( const mkey of mkeys ){
-      // this.log.debug(`populateAll() -> ${mkey}:populator()`)
-      await this.checks[mkey].populator()
-    }
-  }
-
   pause(q){
     if(q)
       return this.queue?.[q].pause()