fix nip-01 incompatible websocket servers reporting online

sandwichfarm · Mar 16, 2024 · 1b2395c · 1b2395c
1 parent c6af92b
commit 1b2395c
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/apps/nocapd/package.json b/apps/nocapd/package.json
@@ -9,7 +9,7 @@
     "@nostrwatch/announce": "^0.0.7",
     "@nostrwatch/controlflow": "^0.0.3",
     "@nostrwatch/logger": "^0.0.4",
-    "@nostrwatch/nocap": "^0.2.4",
+    "@nostrwatch/nocap": "^0.3.0",
     "@nostrwatch/nwcache": "^0.0.2",
     "@nostrwatch/publisher": "^0.3.2",
     "@nostrwatch/seed": "^0.0.1",

diff --git a/apps/nocapd/src/classes/Worker.js b/apps/nocapd/src/classes/Worker.js
@@ -91,7 +91,7 @@ export class NWWorker {
     catch(err) {
       console.log(err)
       failure(new Error(`Failure inside work() block: ${err}`))
-      return { result: false }
+      return { result: { url: job.data.relay, open: { data: false }} }
     }
   }
 
@@ -128,7 +128,9 @@ export class NWWorker {
     this.log.debug(`after_completed(): ${result.url}`)
     this.processed++
     await this.updateRelayCache( { ...result } )      
+    await delay(200)
     await this.retry.setRetries( result.url, !error )
+    await delay(200)
     await this.setLastChecked( result.url, Date.now() )
   }
 
@@ -139,7 +141,7 @@ export class NWWorker {
   }
 
   cbcall(...args){
-    //this.log.debug(`cbcall(): ${args}`)
+    this.log.debug(`cbcall(): ${JSON.stringify(args)}`)
     const handler = [].shift.call(args)
     if(this?.[`on_${handler}`] && typeof this[`on_${handler}`] === 'function')
       this[`on_${handler}`](...args)
@@ -148,32 +150,30 @@ export class NWWorker {
   }
 
   async addRelayJobs(relays){
-    //this.log.debug(`Relay Counts: ${JSON.stringify(await this.counts())}`)
+    this.log.debug(`Relay Counts: ${JSON.stringify(await this.counts())}`)
     for await ( const relay of relays ){
       const $job = await this.addRelayJob({ relay })
       if($job?.id)
         this.total++
     }
-    const c = await this.counts()
-    //this.log.debug(`Relay Counts: ${JSON.stringify(c)}`)
   }
 
   async addRelayJob(jdata){
-    //this.log.debug(`Adding job for ${jdata.relay} with ${this.opts.checks.enabled} nocap checks: ${JSON.stringify(jdata)}`)
+    this.log.debug(`Adding job for ${jdata.relay} with ${this.opts.checks.enabled} nocap checks: ${JSON.stringify(jdata)}`)
     const priority = this.getPriority(jdata.relay)
     this.updateJobOpts({ priority })
     return this.$.queue.add( this.id(), jdata, { jobId: this.jobId(jdata.relay), ...this.jobOpts})
   }
 
   calculateProgress() {
-    //this.log.debug(`calculateProgress()`)
+    this.log.debug(`calculateProgress()`)
     if (this.total === 0) return "0.00%"; // Prevent division by zero
     let percentage = (this.processed / this.total) * 100;
     return percentage.toFixed(2) + "%";
   }
 
   async progressMessage(url, result={}, error=false){
-    //this.log.debug(`progressMessage()`)
+    this.log.debug(`progressMessage()`)
     const failure = chalk.red;
     const success = chalk.bold.green;
     const mute = chalk.gray

diff --git a/apps/trawler/src/check-cache.js b/apps/trawler/src/check-cache.js
@@ -114,4 +114,5 @@ const setRetries = async ( url, online ) => {
     // logger.info(url, 'is offline')
     id = await rcache.retry.increment(retryId(url))
   }
+  return id
 }
diff --git a/packages/nocap/adapters/default/EveryAdapterDefault/package.json b/packages/nocap/adapters/default/EveryAdapterDefault/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nostrwatch/nocap-every-adapter-default",
-  "version": "1.1.1",
+  "version": "1.2.0",
   "type": "module",
   "main": "index.js",
   "license": "MIT",
@@ -9,6 +9,6 @@
     "@nostrwatch/nocap-geo-adapter-default": "^1.0.1",
     "@nostrwatch/nocap-info-adapter-default": "^1.0.1",
     "@nostrwatch/nocap-ssl-adapter-default": "^1.0.1",
-    "@nostrwatch/nocap-websocket-adapter-default": "^1.1.0"
+    "@nostrwatch/nocap-websocket-adapter-default": "^1.2.0"
   }
 }
diff --git a/packages/nocap/adapters/default/WebsocketAdapterDefault/package.json b/packages/nocap/adapters/default/WebsocketAdapterDefault/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nostrwatch/nocap-websocket-adapter-default",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "type": "module",
   "main": "index.js",
   "license": "MIT",

diff --git a/packages/nocap/package.json b/packages/nocap/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@nostrwatch/nocap",
-  "version": "0.2.4",
+  "version": "0.3.0",
   "main": "src/index.js",
   "type": "module",
   "license": "MIT",
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@nostrwatch/logger": "^0.0.1",
-    "@nostrwatch/nocap-every-adapter-default": "^1.1.1",
+    "@nostrwatch/nocap-every-adapter-default": "^1.2.0",
     "@nostrwatch/utils": "^0.0.1",
     "fetch-h2": "3.0.2",
     "get-ssl-certificate": "2.3.3",