querysub 0.30.0 → 0.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.30.0",
+    "version": "0.32.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,26 @@ async function runHeartbeatAuditLoop() {
     });
 }
 
+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/3-path-functions/PathFunctionHelpers.ts

@@ -59,7 +59,7 @@ export async function replaceFunctions(config: {
 
             for (let previous of previousFunctions) {
                 if (!currentFunctionNames.has(getFunctionName(previous))) {
-                    messages.push({ text: `Removing  ${red(debugFunction(previous))}`, order: 3 });
+                    messages.push({ text: `Removing\t ${red(debugFunction(previous))}`, order: 3 });
                     base[previous.ModuleId].Sources[previous.FunctionId] = undefined;
                 }
             }

package/src/4-querysub/querysubPrediction.ts

@@ -487,24 +487,14 @@ export async function getCallWrites(config: {
     let { call, debugName } = config;
     const { functionSpec } = await proxyWatcher.commitFunction({
         watchFunction: function getModuleConfig() {
-            //let moduleConfig = atomicObjectRead(functionSchema()[call.DomainName].PathFunctionRunner[call.ModuleId].Module);
-            // if (!(call.DomainName in functionSchema())) {
-            //     throw new Error(`Domain not found ${call.DomainName}`);
-            // }
             let domainObject = functionSchema()[call.DomainName];
-            // if (!(call.ModuleId in domainObject.PathFunctionRunner)) {
-            //     throw new Error(`Module not found ${call.DomainName}.${call.ModuleId}`);
-            // }
             let moduleObject = domainObject.PathFunctionRunner[call.ModuleId];
-            if (!(call.FunctionId in moduleObject.Sources) && Querysub.isAllSynced()) {
-                throw new Error(`Function not found in database ${call.DomainName}.${call.ModuleId}.${call.FunctionId}, have ${JSON.stringify(Object.keys(moduleObject.Sources))}`);
-            }
             let functionSpec = atomicObjectRead(moduleObject.Sources[call.FunctionId]);
             return { functionSpec };
         }
     });
     if (!functionSpec) {
-        throw new Error(`Function not found ${call.DomainName}.${call.ModuleId}.${call.FunctionId}`);
+        throw new Error(`Function not found in database ${call.DomainName}.${call.ModuleId}.${call.FunctionId}`);
     }
 
     await addModuleToLoader(functionSpec);