more stable queues

apps/trawler/src/sanitizers.js

@@ -4,13 +4,13 @@
  * @returns Filtered and deduped list of relays
  */
 
-import isLocal from "url-local"
-
-import lmdb from './relaydb.js'
 import Logger from '@nostrwatch/logger'
+import isLocal from "url-local"
 
 const logger = new Logger('sanitizers')
 
+const BLOCK_HOSTNAMES = [];
+
 export const normalizeRelays = (relays) => {
   return relays 
           .map( sanitizeRelayUrl )
@@ -33,11 +33,6 @@ export const sanitizeRelayList = (relays) => {
   return relays
 }
 
-export const relayAlreadyKnown = async (relay) => {
-  if(await lmdb.relay.exists(relay))
-    return false
-}
-
 export const qualifyRelayUrl = (relay) => {
   if(isLocal(relay))
     return false
@@ -79,6 +74,7 @@ const normalizeRelayUrl = (relay) => {
   try {
     const url = new URL(relay)
     url.hash = ''
+    url.search = ''
     return url.toString()
   }
   catch(e) {
@@ -102,7 +98,6 @@ export const sanitizeRelayUrl = (relay) => {
   }
 }
 
-
 export const relaysFilterInvalid = (relays) => {
   let invalids = 0;
   const re = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])$/;
@@ -128,7 +123,6 @@ export const relaysFilterInvalid = (relays) => {
   return validRelays;
 }
 
-
 export const relaysFilterDuplicates = (relays) => {
   const hostnameMap = new Map();
   return relays.filter(url => {

internal/controlflow/index.js

@@ -1,3 +1,3 @@
-export { SyncQueue, TrawlQueue, NocapdQueue, RestApiQueue, QueueInit, BullMQ } from './src/queues.js'
-export { Scheduler } from './src/scheduler.js' 
-export { RetryManager } from './src/retry.js'
+export * from './src/queues.js'
+export * from './src/scheduler.js' 
+export * from './src/retry.js'

internal/controlflow/src/queues.js

@@ -13,6 +13,10 @@ export const TrawlQueue = (qopts={}) => {
   return QueueInit('TrawlQueue', qopts)
 }
 
+export const LivenessQueue = (qopts={}) => {
+  return QueueInit('LivenessQueue', qopts)
+}
+
 export const NocapdQueue = (name=null, qopts={}) => {
   name = name? name: 'NocapdQueue'
   return QueueInit(name, qopts)
@@ -45,6 +49,7 @@ export const BullMQ = {
 export default {
   SyncQueue,
   TrawlQueue,
+  LivenessQueue,
   NocapdQueue,
   RestApiQueue,
   QueueInit,

internal/redis/.gitignore

@@ -0,0 +1 @@
+bullboard.js

libraries/nocap/src/classes/Base.js

@@ -1162,5 +1162,27 @@ export default class Base {
   static checksSupported() {
     return ['open', 'read', 'write', 'ssl', 'dns', 'geo', 'info'];
   }
+
+  /**
+   * translateCheckKeys
+   * Translates check key shortcuts and synonyms to internal keys. 
+   * 
+   * @public
+   * @static
+   * @param {string[]} checks - The array of checks to translate
+   */
+  static translateCheckKeys(checks) {
+    const translation = {
+      'rtt' : ['open', 'read', 'write'],
+      'nip11': ['info']
+    }
+    const translated = []
+    checks.forEach(check => {
+      if(translation?.[check])
+        return translated.push(...translation[check]);
+      translated.push(check)
+    })
+    return Array.from(new Set(translated))
+  }
 }