containerization debugging #2

apps/trawler/Dockerfile

@@ -18,4 +18,4 @@ RUN yarn install --network-timeout 1000000
 # EXPOSE 3000
 
 # Run the app when the container launches
-CMD ["node", "src/index.js"]
+CMD yarn launch

apps/trawler/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@nostr-fetch/adapter-nostr-tools": "0.13.1",
-    "@nostrwatch/controlflow": "^0.0.1",
+    "@nostrwatch/controlflow": "^0.0.2",
     "@nostrwatch/logger": "^0.0.1",
     "@nostrwatch/nocap": "^0.1.3",
     "@nostrwatch/nwcache": "^0.0.1",

apps/trawler/src/daemon.js

@@ -11,8 +11,6 @@ import { configureQueues } from './queue.js'
 import { bootstrap } from '@nostrwatch/seed'
 import { chunkArray, msToCronTime } from '@nostrwatch/utils'
 
-import { RedisConnectionDetails } from '@nostrwatch/utils'
-
 const {trawlQueue, trawlWorker} = await configureQueues()
 const logger = new Logger('daemon')
 let busy = false

apps/trawler/src/queue.js

@@ -1,14 +1,15 @@
-import { Worker } from 'bullmq';
-import Redis from 'ioredis';
-
 import { trawl } from './trawler.js';
 import Logger from '@nostrwatch/logger'
 
-import { TrawlQueue } from '@nostrwatch/controlflow'
+import { TrawlQueue, BullMQ } from '@nostrwatch/controlflow'
+
+const { Worker } = BullMQ
+
+import { RedisConnectionDetails } from '@nostrwatch/utils'
 
 export const configureQueues = async function(){
 
-  const connection = new Redis()
+  const connection = RedisConnectionDetails()
 
   /**********
    * Trawler 
@@ -21,6 +22,7 @@ export const configureQueues = async function(){
   const trawler = TrawlQueue({ removeOnComplete: { age: 30*60*1000 }, removeOnFail: { age: 30*60*1000 }, timeout: 1000*60*10 })
 
   const trawlJobProgress = async ($job, progress) => {
+    console.log("progress")
     if(!(progress instanceof Object)) return trawlLogger.warn(`Progress data is not an object, it's a ${typeof progress}`)
     const { type, source } = progress 
     if(type === 'found'){
@@ -50,14 +52,13 @@ export const configureQueues = async function(){
     trawlLogger.warn(`trawlJob ${$job.id} failed: ${err}`)
   }
 
-  const trawlWorker = new Worker(trawler.$Queue.name, trawl, { concurrency: 1, maxStalledCount: 1 })
+  const trawlWorker = new Worker(trawler.$Queue.name, trawl, { concurrency: 1, maxStalledCount: 1, connection })
         trawlWorker.on('completed', trawlJobCompleted)
         trawlWorker.on('failed', trawlJobFailed)
         trawlWorker.on('progress', trawlJobProgress)
 
   return {
     trawlQueue: trawler.$Queue,
-    trawlWorker,
-    connection
+    trawlWorker
   }
 }

packages/nocap/adapters/default/WebsocketAdapterDefault/index.js

@@ -81,7 +81,13 @@ class WebsocketAdapterDefault {
    * @returns null
    */
   handle_nostr_event(buffer){
-    const ev = JSON.parse(buffer.toString())
+    try{
+      const ev = JSON.parse(buffer.toString())
+    } 
+    catch(e){
+      this.$.logger.error(`${this.$.url} responded with invalid JSON: ${e}`)
+      return this.$.on_error(e)
+    }
     if(ev[0] === 'EVENT') {
       if(this.$.subid('read') === ev[1])
         this.$.on_event(ev[1], ev[2])

packages/nocap/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nostrwatch/nocap",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "main": "src/index.js",
   "type": "module",
   "license": "MIT",

packages/nocap/src/classes/Base.js

@@ -525,12 +525,12 @@ export default class {
    * @private
    * @returns null
    */
-    handle_error(){
-      // this.unsubscribe()
-      // this.close()
-      this.websocket_hard_fail()
-      // this.finish(this.current, { [this.current]: false, duration: -1 }, this.promises.get(this.current).reject)
-    }
+  handle_error(){
+    // this.unsubscribe()
+    // this.close()
+    this.websocket_hard_fail()
+    // this.finish(this.current, { [this.current]: false, duration: -1 }, this.promises.get(this.current).reject)
+  }
 
 
   /**