querysub 0.34.0 → 0.36.0

package/package.json

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

package/src/-c-identity/IdentityController.ts

@@ -174,7 +174,7 @@ const IdentityController = SocketFunction.register(
     })
 );
 
-const changeIdentityOnce = cache(measureWrap(async function changeIdentityOnce(connectionId: { nodeId: string }) {
+const changeIdentityOnce = cache(async function changeIdentityOnce(connectionId: { nodeId: string }) {
     let nodeId = connectionId.nodeId;
     let threadKeyCert = getThreadKeyCert();
     let issuer = getIdentityCA();
@@ -191,7 +191,7 @@ const changeIdentityOnce = cache(measureWrap(async function changeIdentityOnce(c
         IdentityController.nodes[nodeId].changeIdentity(signature, payload),
         () => new Error(`Timeout calling changeIdentity for ${nodeId}`)
     );
-}));
+});
 SocketFunction.addGlobalClientHook(async function identityHook(context) {
     if (context.call.classGuid === IdentityController._classGuid) return;
     // If we are talking to a client they should already know who we are (they established the connection!)

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

@@ -267,6 +267,7 @@ async function runHeartbeatAuditLoop() {
     await runInfinitePollCallAtStart(CHECK_INTERVAL * 0.9, async () => {
         if (shutdown) return;
         // Wait a bit longer, to try to prevent all nodes from synchronizing their audit times.
+        console.log(magenta(`Auditing node list`));
         await delay(CHECK_INTERVAL * Math.random() * 0.1);
         //console.log(magenta(`Auditing node list`));
 
@@ -275,8 +276,10 @@ async function runHeartbeatAuditLoop() {
         // We spent the money checking the node list, so we might as well update it
         setNodeIds(nodeIds);
 
+        let pendingDeadCount = 0;
+
         let removedNodeIds: string[] = [];
-        for (let nodeId of nodeIds) {
+        await Promise.all(nodeIds.map(async nodeId => {
             let lastTime = Number((await archives().get(nodeId))?.toString()) || 0;
             if (lastTime < deadTime) {
                 // Increment the dead count
@@ -290,15 +293,21 @@ async function runHeartbeatAuditLoop() {
                     deadCount.delete(nodeId);
                 } else {
                     console.log(yellow(`Node ${nodeId} was found to be dead, last heartbeat at ${formatDateTime(lastTime)} < dead threshold at ${formatDateTime(deadTime)}, dead count ${count}/${DEAD_CHECK_COUNT}. Total nodes seen ${nodeIds.length}`));
+                    pendingDeadCount++;
                 }
             } else {
                 deadCount.delete(nodeId);
                 diskLog("Read node heartbeat", { nodeId, lastTime });
             }
+        }));
+        if (pendingDeadCount) {
+            console.log(blue(`Pending dead nodes ${pendingDeadCount}/${nodeIds.length}`));
         }
 
         if (removedNodeIds.length > 0) {
-            void tellEveryoneNodesChanges();
+            console.log(blue(`Removed ${removedNodeIds.length}/${nodeIds.length} nodes from node list`), { removedNodeIds });
+            await syncArchives();
+            await tellEveryoneNodesChanges();
         }
     });
 }