querysub 0.31.0 → 0.33.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.31.0",
+    "version": "0.33.0",
     "main": "index.js",
     "license": "MIT",
     "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

package/src/-f-node-discovery/NodeDiscovery.ts

@@ -49,6 +49,9 @@ let DISK_AUDIT_RATE = timeInMinute * 5;
 let API_AUDIT_RATE = timeInSecond;
 let API_AUDIT_COUNT = 12;
 
+
+let DEAD_NODE_POLL_COOLDOWN = timeInMinute * 5;
+
 let shutdown = false;
 
 const archives = lazy(() => getArchives("nodes/"));
@@ -292,12 +295,27 @@ async function runHeartbeatAuditLoop() {
     });
 }
 
+// NOTE: Not just dead nodes, but also nodes that are unreachable, such as developer nodes.
+let deadNodes = new Map<string, number>();
 async function fastMemorySync() {
-    let checkNodes = shuffle(Array.from(allNodeIds2).filter(x => x !== getOurNodeId()), Date.now()).slice(0, API_AUDIT_COUNT);
+    let aliveNodes = new Set(Array.from(allNodeIds2).filter(x => x !== getOurNodeId()));
+    let deadThreshold = Date.now() - DEAD_NODE_POLL_COOLDOWN;
+    for (let [nodeId, time] of Array.from(deadNodes)) {
+        if (time < deadThreshold) {
+            deadNodes.delete(nodeId);
+        } else {
+            aliveNodes.delete(nodeId);
+        }
+    }
+    let checkNodes = shuffle(Array.from(aliveNodes), Date.now()).slice(0, API_AUDIT_COUNT);
     let otherNodesAll = await Promise.all(
-        checkNodes.map(async nodeId =>
-            await timeoutToUndefinedSilent(200, NodeDiscoveryController.nodes[nodeId].getAllNodeIds()) || []
-        )
+        checkNodes.map(async nodeId => {
+            let nodes = await timeoutToUndefinedSilent(200, NodeDiscoveryController.nodes[nodeId].getAllNodeIds());
+            if (!nodes) {
+                deadNodes.set(nodeId, Date.now());
+            }
+            return nodes || [];
+        })
     );
     let otherNodes = Array.from(new Set(otherNodesAll.flat()));
     // This would log WAY too much, because we poll a lot, because we want to minimize downtime

package/src/config.ts

@@ -54,5 +54,8 @@ export function authorityRaw() {
 }
 
 export function isPublic() {
+    if (!isNode()) {
+        return !location.hostname.startsWith("noproxy.");
+    }
     return !!yargObj.public;
 }