querysub 0.677.0 → 0.679.0

package/package.json

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

package/src/config.ts

@@ -32,8 +32,8 @@ let yargObj = parseArgsFactory()
     })
     .option("logbackblaze", { type: "boolean", desc: "Log all backblaze activity to disk." })
     .option("slowdown", { type: "number", desc: "Delay all input data values by this amount of time, pretending like we didn't even receive it until this time is up." })
-    .option("network", { type: "array", desc: `The networks this node is on (pass multiple arguments to be on multiple, ex: --network test --network default). Authorities only satisfy paths on their networks ("default" if unset). Function calls are put on the first network in the list. If no FunctionRunner is on a call's network, the call will fail to run.` })
-    .option("networkfile", { type: "string", desc: `The same as --network, except the networks are read from the given file (one per line). Supports "~/" for the home directory. If the file doesn't exist, the process exits with an error.` })
+    .option("network", { type: "array", desc: `The networks this node is on (pass multiple arguments to be on multiple, ex: --network test --network default, or comma separate them: --network test,default). Authorities only satisfy paths on their networks ("default" if unset). Function calls are put on the first network in the list. If no FunctionRunner is on a call's network, the call will fail to run.` })
+    .option("networkfile", { type: "string", desc: `The same as --network, except the networks are read from the given file (one per line, and commas separate as well). Supports "~/" for the home directory. If the file doesn't exist, the process exits with an error.` })
     .option("port", { type: "number", desc: "The storage port for `yarn storageserve`" })
     .argv
     ;
@@ -62,7 +62,7 @@ let networkFileNetworks = lazy((): string[] => {
         console.error(`--networkfile file not found: ${path}`);
         process.exit(1);
     }
-    return fs.readFileSync(path, "utf8").split("\n").map(x => x.trim()).filter(x => x);
+    return fs.readFileSync(path, "utf8").split(/[\n,]/).map(x => x.trim()).filter(x => x);
 });
 
 /** The networks a function runner listens on, from the command line (--network / --networkfile). */
@@ -73,7 +73,8 @@ export function getNetworks(): string[] {
     } else if (!Array.isArray(networks)) {
         networks = [networks];
     }
-    let result = networks.map(x => String(x));
+    // Comma separated is the same as repeating the flag, so a templated list of networks can be passed as one argument.
+    let result = networks.flatMap(x => String(x).split(",")).map(x => x.trim()).filter(x => x);
     if (isNode()) {
         result = [...result, ...networkFileNetworks()];
     }

package/src/diagnostics/logs/errorNotifications2/errorNotifications.ts

@@ -20,6 +20,7 @@ import { createLink } from "../../../library-components/ATag";
 import { showingManagementURL, managementPageURL } from "../../managementPages";
 import { atomic } from "../../../2-proxy/PathValueProxyWatcher";
 import { magenta } from "socket-function/src/formatting/logColors";
+import { formatTime } from "socket-function/src/formatting/format";
 import { TicketServiceBase } from "../errorTickets/tickets";
 import { getArchives2 } from "../../../-a-archives/archives2";
 
@@ -48,6 +49,8 @@ let pendingDiscordNotifications = new Map<string, {
     errorCount: number;
     isNew: boolean;
 }>();
+// Time the currently pending batch started collecting, so the digest can state the window it covers instead of reading as "this is happening right now".
+let pendingDiscordNotificationsStartTime = 0;
 export async function getSuppressionEntries(): Promise<SuppressionEntry[]> {
     return await suppression.values();
 }
@@ -247,6 +250,9 @@ Respond with a JSON object with a "pattern" field containing the search string.`
 }
 
 function queueDiscordNotification(suppressionId: string, errorCount: number, isNew: boolean) {
+    if (pendingDiscordNotifications.size === 0) {
+        pendingDiscordNotificationsStartTime = Date.now();
+    }
     const existing = pendingDiscordNotifications.get(suppressionId);
     if (existing) {
         existing.errorCount += errorCount;
@@ -307,8 +313,10 @@ const trySendDiscordNotificationsBase = batchFunction({ delay: 1000 * 3 }, async
         { param: showingManagementURL, value: true },
         { param: managementPageURL, value: "ErrorNotificationPage" },
     ]);
+
+    const digestWindow = Date.now() - (pendingDiscordNotificationsStartTime || Date.now());
     const messageText = messageLines.join("\n");
-    const message = `[${messageText}](${link})`;
+    const message = `Digest for errors for ${formatTime(digestWindow)}:\n[${messageText}](${link})`;
 
     try {
         await sendDiscordMessage({ webhookURL, message });
@@ -326,6 +334,7 @@ const trySendDiscordNotificationsBase = batchFunction({ delay: 1000 * 3 }, async
         }, EXISTING_SUPPRESSION_THROTTLE);
 
         pendingDiscordNotifications.clear();
+        pendingDiscordNotificationsStartTime = 0;
     } catch (error) {
         console.error("Failed to send Discord notification:", error);
     }