querysub 0.420.0 → 0.422.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.420.0",
+  "version": "0.422.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/archivesMemoryCache.ts

@@ -338,7 +338,13 @@ export function createArchivesMemoryCache(
         // After merging, find the single entry that covers our aligned range
         let pathEntries = cacheByPath.get(path);
         if (!pathEntries) {
-            throw new Error(`Expected cached entries for path ${path} after merge`);
+            console.error(`Expected cached entries for path ${path} after merge, reading range ${start}-${end}. Falling back to reading from the source.`);
+            let result = await archives.get(path, {
+                ...getConfig,
+                range: { start, end }
+            });
+            updateStats(false, result?.length);
+            return result;
         }
 
         let coveringEntry: CacheEntry | undefined = undefined;

package/src/4-deploy/edgeNodes.ts

@@ -337,10 +337,10 @@ export async function preloadUI(hash: string, progress?: DeployProgress) {
         let controller = EdgeNodeController.nodes[nodeId.nodeId];
         let section = `${nodeId.entryPoint}:${nodeId.nodeId}|Preloading UI`;
         progress?.({ section, progress: 0 });
-        console.log(blue(`Preloading UI on ${String(nodeId)}, hash: ${hash}`));
+        console.log(blue(`Preloading UI on ${nodeId.nodeId}, hash: ${hash}`));
         await errorToUndefined(controller.preloadUI({ hash }));
         progress?.({ section, progress: 1 });
-        console.log(blue(`Finished preloading UI on ${String(nodeId)}`));
+        console.log(blue(`Finished preloading UI on ${nodeId.nodeId}`));
     }));
 }
 

package/src/diagnostics/logs/IndexedLogs/moveIndexLogsToPublic.ts

@@ -147,7 +147,8 @@ export async function moveLogsToPublic(config: {
         }));
         if (buffers.length === 0) continue;
 
-        console.log(magenta(`Merging and moving ${group.length} log files backblaze (${blue(config.loggerName)})`));
+        let totalSize = buffers.reduce((acc, x) => acc + x.buffer.length, 0);
+        console.log(magenta(`Merging and moving ${group.length} log files (${formatNumber(totalSize)}B) backblaze (${blue(config.loggerName)})`));
 
         let allBuffers: Buffer[][] = [];
 

package/src/diagnostics/logs/IndexedLogs/moveLogsEntry.ts

@@ -4,7 +4,7 @@ import { logErrors } from "../../../errors";
 import { IndexedLogs } from "./IndexedLogs";
 
 async function main() {
-    IndexedLogs.runLogMoveLoop();
+    void IndexedLogs.runLogMoveLoop();
 }
 
 main().catch(logErrors);

package/src/diagnostics/logs/diskLogger.ts

@@ -54,17 +54,10 @@ export function getLogFile(obj: LogDatum) {
             logType = match[1];
         }
     }
-    if (obj[LOG_LINE_LIMIT_ID]) {
-        logType += "::" + String(obj[LOG_LINE_LIMIT_ID]);
-    }
     return logType;
 
 }
-export const LOG_LIMIT_FLAG = String.fromCharCode(44533) + "LOGS_LIMITED_FLAG-9277640b-d709-4591-ab08-2bb29bbb94f4";
-export const LOG_LINE_LIMIT_FLAG = String.fromCharCode(44534) + "LOGS_LINE_LIMIT_FLAG-dd50ab1f-3021-45e3-82fc-d2702c7a64c8";
 
-/** If this key exists in the logged object, as in a key in one of the objects logged, then we will use the value of it as the limit ID. This is useful as it allows us to either override a limit or limit something independently from other logs in the file. */
-export const LOG_LINE_LIMIT_ID = "LIMIT_LINE_ID";
 
 let loggersObj: {
     logLogs: IndexedLogs<LogDatum>;
@@ -127,11 +120,6 @@ export function logDisk(type: "log" | "warn" | "info" | "error", ...args: unknow
         if (logObj.__FILE__) {
             logType = String(logObj.__FILE__);
         }
-        let hasLineLimit = false;
-        if (logObj[LOG_LINE_LIMIT_ID]) {
-            logType += "::" + String(logObj[LOG_LINE_LIMIT_ID]);
-            hasLineLimit = true;
-        }
 
         // NOTE: Local logs now log to their local disk instead of backblaze, so we can log even if in development (they just won't show up on the remote server).
         //if (isPublic())

package/testEntry2.ts

@@ -5,7 +5,6 @@ import { shutdown } from "./src/diagnostics/periodic";
 import { testTCPIsListening } from "socket-function/src/networking";
 import { Querysub } from "./src/4-querysub/QuerysubController";
 import { timeInSecond } from "socket-function/src/misc";
-import { LOG_LINE_LIMIT_ID } from "./src/diagnostics/logs/diskLogger";
 import { waitForFirstTimeSync } from "socket-function/time/trueTimeShim";
 
 export async function testMain() {