querysub 0.35.0 → 0.37.0

package/package.json

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

package/src/-a-archives/archivesBackBlaze.ts

@@ -41,6 +41,8 @@ let backblazeCreds = lazy((): BackblazeCreds => (
 const getAPI = lazy(async () => {
     let creds = backblazeCreds();
 
+    // NOTE: On errors, our retry code resets this lazy, so we DO get new authorize when needed.
+    // TODO: Maybe we should get new authorization periodically at well?
     let authorizeRaw = await httpsRequest("https://api.backblazeb2.com/b2api/v2/b2_authorize_account", undefined, "GET", undefined, {
         headers: {
             Authorization: "Basic " + Buffer.from(creds.applicationKeyId + ":" + creds.applicationKey).toString("base64"),
@@ -65,11 +67,14 @@ const getAPI = lazy(async () => {
                 arg = { accountId: auth.accountId, ...arg };
             }
             try {
-                let result = await httpsRequest(auth.apiUrl + "/b2api/v2/" + name, Buffer.from(JSON.stringify(arg)), type, undefined, {
+                let url = auth.apiUrl + "/b2api/v2/" + name;
+                console.log(`Backblaze API ${type} ${url}`);
+                let result = await httpsRequest(url, Buffer.from(JSON.stringify(arg)), type, undefined, {
                     headers: {
                         Authorization: auth.authorizationToken,
                     }
                 });
+                console.log(`Finished Backblaze API ${type} ${url}`);
                 return JSON.parse(result.toString());
             } catch (e: any) {
                 throw new Error(`Error in ${name}, arg ${JSON.stringify(arg).slice(0, 1000)}: ${e.stack}`);
@@ -479,8 +484,8 @@ class Backblaze {
         await this.apiRetryLogic(async (api) => {
             try {
                 await api.hideFile({ bucketId: this.bucketId, fileName: fileName });
-            } catch {
-                // Probably already deleted
+            } catch (e: any) {
+                this.log(`backblaze error in hide, possibly already hidden ${fileName}\n${e.stack}`);
             }
         });
 

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`));
 
@@ -278,7 +279,7 @@ async function runHeartbeatAuditLoop() {
         let pendingDeadCount = 0;
 
         let removedNodeIds: string[] = [];
-        await Promise.all(nodeIds.map(async nodeId => {
+        for (let nodeId of nodeIds) {
             let lastTime = Number((await archives().get(nodeId))?.toString()) || 0;
             if (lastTime < deadTime) {
                 // Increment the dead count
@@ -298,7 +299,7 @@ async function runHeartbeatAuditLoop() {
                 deadCount.delete(nodeId);
                 diskLog("Read node heartbeat", { nodeId, lastTime });
             }
-        }));
+        }
         if (pendingDeadCount) {
             console.log(blue(`Pending dead nodes ${pendingDeadCount}/${nodeIds.length}`));
         }
@@ -306,7 +307,7 @@ async function runHeartbeatAuditLoop() {
         if (removedNodeIds.length > 0) {
             console.log(blue(`Removed ${removedNodeIds.length}/${nodeIds.length} nodes from node list`), { removedNodeIds });
             await syncArchives();
-            void tellEveryoneNodesChanges();
+            await tellEveryoneNodesChanges();
         }
     });
 }