querysub 0.33.0 → 0.35.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "querysub",
-    "version": "0.33.0",
+    "version": "0.35.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

@@ -228,6 +228,14 @@ export function getBrowserUrlNode() {
     return rootLocation;
 }
 
+export async function triggerNodeChange() {
+    await syncNodesNow();
+    await Promise.allSettled(Array.from(allNodeIds2).map(async nodeId => {
+        if (isOwnNodeId(nodeId)) return;
+        await timeoutToUndefinedSilent(timeInSecond * 5, errorToUndefinedSilent(NodeDiscoveryController.nodes[nodeId].addNode(getOwnNodeId())));
+    }));
+}
+
 let seenNodesForEvilDNS = new Set<string>();
 async function syncArchives() {
     if (isServer()) {
@@ -267,8 +275,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
@@ -282,14 +292,20 @@ 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) {
+            console.log(blue(`Removed ${removedNodeIds.length}/${nodeIds.length} nodes from node list`), { removedNodeIds });
+            await syncArchives();
             void tellEveryoneNodesChanges();
         }
     });

package/src/0-path-value-core/NodePathAuthorities.ts

@@ -2,7 +2,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { measureFnc, measureWrap } from "socket-function/src/profiling/measure";
 import { errorToUndefined, errorToUndefinedSilent, ignoreErrors, logErrors, timeoutToUndefined, timeoutToUndefinedSilent } from "../errors";
 import { PromiseObj } from "../promise";
-import { getAllNodeIds, getBrowserUrlNode, getOwnNodeId, isNodeDiscoveryLogging, isOwnNodeId, onNodeDiscoveryReady, watchDeltaNodeIds, watchNodeIds } from "../-f-node-discovery/NodeDiscovery";
+import { getAllNodeIds, getBrowserUrlNode, getOwnNodeId, isNodeDiscoveryLogging, isOwnNodeId, onNodeDiscoveryReady, triggerNodeChange, watchDeltaNodeIds, watchNodeIds } from "../-f-node-discovery/NodeDiscovery";
 import { PathValueController } from "./PathValueController";
 import { MAX_ACCEPTED_AUTHORITY_STARTUP_TIME, PathValueSnapshot, STARTUP_CUTOFF_TIME, authorityStorage, matchesParentRangeFilterPart } from "./pathValueCore";
 import { pathValueArchives } from "./pathValueArchives";
@@ -453,6 +453,8 @@ class NodePathAuthorities {
         for (let nodeId of await getAllNodeIds()) {
             ignoreErrors(PathController.nodes[nodeId].broadcastReadReady(readyTime));
         }
+        // Tell all nodes we exist, in case we started at the same time.
+        await triggerNodeChange();
 
         if (this.getSelfAuthorities().length > 0) {
             console.log(green(`Became an authority for:`));