querysub 0.453.0 → 0.454.0

package/.claude/settings.local.json

@@ -22,7 +22,8 @@
       "mcp__node-debugger__waitForPause",
       "mcp__node-debugger__resume",
       "mcp__node-debugger__listBreakpoints",
-      "mcp__node-debugger__removeBreakpoint"
+      "mcp__node-debugger__removeBreakpoint",
+      "mcp__hottest__runTest"
     ]
   }
 }

package/package.json

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

@@ -509,7 +509,10 @@ export class ArchivesBackblaze {
     private last503Reset = 0;
     // IMPORTANT! We must always CATCH AROUND the apiRetryLogic, NEVER inside of fnc. Otherwise we won't
     //  be able to recreate the auth token.
+    //  `context` is a short label (verb + file path) included in every retry/error log so a stuck
+    //   silent-retry loop is identifiable from the logs.
     private async apiRetryLogic<T>(
+        context: string,
         fnc: (api: B2Api) => Promise<T>,
         retries = 3
     ): Promise<T> {
@@ -519,33 +522,33 @@ export class ArchivesBackblaze {
         } catch (err: any) {
             if (retries <= 0) throw err;
 
-            // If it's a 503 and it's been a minute since we last reset, then Wait and reset. 
+            // If it's a 503 and it's been a minute since we last reset, then Wait and reset.
             if (
                 (err.stack.includes(`"status": 503`)
                     || err.stack.includes(`"service_unavailable"`)
                     || err.stack.includes(`"internal_error"`)
                     || err.stack.includes(`ENOBUFS`)
                 ) && Date.now() - this.last503Reset > 60 * 1000) {
-                console.error("503 error, waiting a minute and resetting: " + err.message);
-                this.log("503 error, waiting a minute and resetting: " + err.message);
+                console.error(`[${context}] 503 error, waiting and resetting: ${err.message}`);
+                this.log(`[${context}] 503 error, waiting and resetting: ${err.message}`);
                 await delay(10 * 1000);
-                // We check again in case, and in the very likely case that this is being run in parallel, we only want to reset once. 
+                // We check again in case, and in the very likely case that this is being run in parallel, we only want to reset once.
                 if (Date.now() - this.last503Reset > 60 * 1000) {
-                    this.log("Resetting getAPI and getBucketAPI: " + err.message);
+                    this.log(`[${context}] Resetting getAPI and getBucketAPI: ${err.message}`);
                     this.last503Reset = Date.now();
                     getAPI.reset();
                     this.getBucketAPI.reset();
                 }
-                return this.apiRetryLogic(fnc, retries - 1);
+                return this.apiRetryLogic(context, fnc, retries - 1);
             }
 
             // If the error is that the authorization token is invalid, reset getBucketAPI and getAPI
             // If the error is that the bucket isn't found, reset getBucketAPI
             if (err.stack.includes(`"expired_auth_token"`)) {
-                this.log("Authorization token expired");
+                this.log(`[${context}] Authorization token expired`);
                 getAPI.reset();
                 this.getBucketAPI.reset();
-                return this.apiRetryLogic(fnc, retries - 1);
+                return this.apiRetryLogic(context, fnc, retries - 1);
             }
 
             if (
@@ -560,10 +563,10 @@ export class ArchivesBackblaze {
                 || err.stack.includes(`ECONNREFUSED`)
                 || err.stack.includes(`ENOBUFS`)
             ) {
-                console.error("Retrying in 5s: " + err.message);
-                this.log(err.message + " retrying in 5s");
+                console.error(`[${context}] Retrying in 5s: ${err.message}`);
+                this.log(`[${context}] ${err.message} retrying in 5s`);
                 await delay(5000);
-                return this.apiRetryLogic(fnc, retries - 1);
+                return this.apiRetryLogic(context, fnc, retries - 1);
             }
 
             if (err.stack.includes(`getaddrinfo ENOTFOUND`)) {
@@ -579,10 +582,11 @@ export class ArchivesBackblaze {
                         resolve(addresses);
                     });
                 });
-                console.error(`getaddrinfo ENOTFOUND ${hostname}`, { lookupAddresses, resolveAddresses, apiUrl: api.apiUrl, fullError: err.stack });
+                console.error(`[${context}] getaddrinfo ENOTFOUND ${hostname}`, { lookupAddresses, resolveAddresses, apiUrl: api.apiUrl, fullError: err.stack });
             }
 
             // TODO: Handle if the bucket is deleted?
+            console.error(`[${context}] giving up after ${3 - retries + 1} attempts: ${err.stack ?? err}`);
             throw err;
         }
     }
@@ -597,7 +601,7 @@ export class ArchivesBackblaze {
                 setTimeout(downloadPoll, 5000);
             };
             setTimeout(downloadPoll, 5000);
-            let result = await this.apiRetryLogic(async (api) => {
+            let result = await this.apiRetryLogic(`get ${fileName}`, async (api) => {
                 let range = config?.range;
                 if (range) {
                     let fileInfo = await this.getInfo(fileName);
@@ -649,7 +653,7 @@ export class ArchivesBackblaze {
     public async set(fileName: string, data: Buffer): Promise<void> {
         this.log(`backblaze upload (${formatNumber(data.length)}B) ${fileName}`);
         let f = fileName;
-        await this.apiRetryLogic(async (api) => {
+        await this.apiRetryLogic(`uploadFile ${fileName}`, async (api) => {
             await api.uploadFile({ bucketId: this.bucketId, fileName, data: data, });
         });
         let existsChecks = 30;
@@ -677,7 +681,7 @@ export class ArchivesBackblaze {
     public async del(fileName: string): Promise<void> {
         this.log(`backblaze delete ${fileName}`);
         try {
-            await this.apiRetryLogic(async (api) => {
+            await this.apiRetryLogic(`hideFile ${fileName}`, async (api) => {
                 await api.hideFile({ bucketId: this.bucketId, fileName: fileName });
             });
         } catch (e: any) {
@@ -746,7 +750,7 @@ export class ArchivesBackblaze {
             dataQueue.unshift(data, secondData);
 
 
-            let uploadInfo = await this.apiRetryLogic(async (api) => {
+            let uploadInfo = await this.apiRetryLogic(`startLargeFile ${fileName}`, async (api) => {
                 return await api.startLargeFile({
                     bucketId: this.bucketId,
                     fileName: fileName,
@@ -755,7 +759,7 @@ export class ArchivesBackblaze {
                 });
             });
             onError.push(async () => {
-                await this.apiRetryLogic(async (api) => {
+                await this.apiRetryLogic(`cancelLargeFile ${fileName}`, async (api) => {
                     await api.cancelLargeFile({ fileId: uploadInfo.fileId });
                 });
             });
@@ -792,7 +796,7 @@ export class ArchivesBackblaze {
                 sha1.update(data);
                 let sha1Hex = sha1.digest("hex");
                 partSha1Array.push(sha1Hex);
-                await this.apiRetryLogic(async (api) => {
+                await this.apiRetryLogic(`uploadPart#${partNumber} ${fileName}`, async (api) => {
                     if (!data) throw new Error("Impossible, data is undefined");
 
                     let timeStr = formatTime(Date.now() - time);
@@ -818,7 +822,7 @@ export class ArchivesBackblaze {
             }
             this.log(`Finished uploading large file uploaded ${green(formatNumber(totalBytes))}B`);
 
-            await this.apiRetryLogic(async (api) => {
+            await this.apiRetryLogic(`finishLargeFile ${fileName}`, async (api) => {
                 await api.finishLargeFile({
                     fileId: uploadInfo.fileId,
                     partSha1Array: partSha1Array,
@@ -838,7 +842,7 @@ export class ArchivesBackblaze {
     }
 
     public async getInfo(fileName: string): Promise<{ writeTime: number; size: number; } | undefined> {
-        return await this.apiRetryLogic(async (api) => {
+        return await this.apiRetryLogic(`getInfo ${fileName}`, async (api) => {
             try {
                 // NOTE: Apparently, there's no other way to do this, as the file name does not equal the file ID, and git file info requires the file ID. 
                 let info = await api.listFileNames({ bucketId: this.bucketId, prefix: fileName, maxFileCount: 10 });
@@ -868,7 +872,7 @@ export class ArchivesBackblaze {
         return result.map(x => x.path);
     }
     public async findInfo(prefix: string, config?: { shallow?: boolean; type: "files" | "folders" }): Promise<{ path: string; createTime: number; size: number; }[]> {
-        return await this.apiRetryLogic(async (api) => {
+        return await this.apiRetryLogic(`findInfo ${prefix}`, async (api) => {
             if (!config?.shallow && config?.type === "folders") {
                 let allFiles = await this.findInfo(prefix);
                 let allFolders = new Map<string, { path: string; createTime: number; size: number }>();
@@ -935,7 +939,7 @@ export class ArchivesBackblaze {
         if (target instanceof ArchivesBackblaze) {
             let targetBucketId = target.bucketId;
             if (targetBucketId === this.bucketId && path === targetPath) return;
-            await this.apiRetryLogic(async (api) => {
+            await this.apiRetryLogic(`move ${path} -> ${targetPath}`, async (api) => {
                 // Ugh... listing the file name sucks, but... I guess it's still better than
                 //  downloading and re-uploading the entire file.
                 let info = await api.listFileNames({ bucketId: this.bucketId, prefix: path, maxFileCount: 10 });
@@ -974,7 +978,7 @@ export class ArchivesBackblaze {
     }
 
     public async getURL(path: string) {
-        return await this.apiRetryLogic(async (api) => {
+        return await this.apiRetryLogic(`getURL ${path}`, async (api) => {
             if (path.startsWith("/")) {
                 path = path.slice(1);
             }
@@ -996,7 +1000,7 @@ export class ArchivesBackblaze {
         fileNamePrefix: string;
         authorizationToken: string;
     }> {
-        return await this.apiRetryLogic(async (api) => {
+        return await this.apiRetryLogic(`getDownloadAuthorization ${config.fileNamePrefix ?? ""}`, async (api) => {
             return await api.getDownloadAuthorization({
                 bucketId: this.bucketId,
                 fileNamePrefix: config.fileNamePrefix ?? "",

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

@@ -208,11 +208,12 @@ export class PathValueArchives {
             let fullPath = pathIdentifier + "/" + file;
             console.log(`Write archive file ${fullPath}, with size ${formatNumber(data.byteLength)}B, and count ${formatNumber(values.length)}`);
             try {
+
                 await retryFunctional(() => archives().set(fullPath, data), {
                     maxRetries: 10,
                     minDelay: 1000,
                     maxDelay: 5000,
-                });
+                })();
             } catch (e) {
                 console.error(`Error writing archive file ${fullPath}. THIS IS BAD! WE ARE SHUTTING DOWN SO THIS ERROR IS LOUDER! WHAT'S THE POINT OF A DB THAT DOESN'T SAVE DATA!: ${(e as Error).stack ?? e}`);
                 await delay(5000);
@@ -420,10 +421,10 @@ export class PathValueArchives {
                 skipValues: config.skipValues,
             });
             if (dataValues.length !== decodedObj.valueCount) {
-                console.error(`Bad archive data file at ${config.path}, Decoded count ${formatNumber(decodedObj.valueCount)} !== count in file name ${formatNumber(dataValues.length)} (${decodedObj.valueCount} !== ${dataValues.length})`);
+                console.warn(`Bad archive data file at ${config.path}, Decoded count ${formatNumber(decodedObj.valueCount)} !== count in file name ${formatNumber(dataValues.length)} (${decodedObj.valueCount} !== ${dataValues.length})`);
             }
         } catch (e: any) {
-            console.log(red(`Bad archive data file at ${config.path}, error: ${e.stack}`));
+            console.warn(`Bad archive data file at ${config.path}, error: ${e.stack}`);
         }
         let rawCount = dataValues.length;