querysub 0.678.0 → 0.680.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.678.0",
+  "version": "0.680.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/archivesJSONT.ts

@@ -14,9 +14,12 @@ export type ArchiveT<T> = {
     [Symbol.asyncIterator](): AsyncIterator<[string, T]>;
 };
 
-export function archiveJSONT<T>(archives: () => IArchives, config?: { fallbacks?: boolean }): ArchiveT<T> {
+export function archiveJSONT<T>(archives: () => IArchives, config?: { setFallbacks?: boolean; findFallbacks?: boolean }): ArchiveT<T> {
     archives = lazy(archives);
 
+    let setConfig: SetConfig = { fallbacks: config?.setFallbacks };
+    let findConfig: FindConfig = { fallbacks: config?.findFallbacks };
+
     let valuesCache = new Map<string, {
         createTime: number;
         size: number;
@@ -31,7 +34,7 @@ export function archiveJSONT<T>(archives: () => IArchives, config?: { fallbacks?
     async function set(key: string, value: T) {
         let a = archives();
         console.log(`In archiveJSONT ${a.getDebugName()}, setting ${key} to ${JSON.stringify(value)}`);
-        await a.set(key, Buffer.from(JSON.stringify(value)), config);
+        await a.set(key, Buffer.from(JSON.stringify(value)), setConfig);
     }
     async function deleteFnc(key: string) {
         let a = archives();
@@ -39,10 +42,10 @@ export function archiveJSONT<T>(archives: () => IArchives, config?: { fallbacks?
         await a.del(key);
     }
     async function keys() {
-        return (await archives().find("", config)).map(value => value.toString());
+        return (await archives().find("", findConfig)).map(value => value.toString());
     }
     async function values() {
-        let infos = await archives().findInfo("", config);
+        let infos = await archives().findInfo("", findConfig);
 
         let needsUpdate = false;
         let currentKeys = new Set(infos.map(info => info.path));
@@ -64,7 +67,7 @@ export function archiveJSONT<T>(archives: () => IArchives, config?: { fallbacks?
             let maxRetries = 10;
             let updated = false;
             for (let attempt = 0; attempt < maxRetries; attempt++) {
-                infos = await archives().findInfo("", config);
+                infos = await archives().findInfo("", findConfig);
 
                 let newCache = new Map<string, {
                     createTime: number;
@@ -93,7 +96,7 @@ export function archiveJSONT<T>(archives: () => IArchives, config?: { fallbacks?
 
                 if (!allFound) continue;
 
-                let newInfos = await archives().findInfo("", config);
+                let newInfos = await archives().findInfo("", findConfig);
                 if (newInfos.length !== infos.length) continue;
                 function anyChanged() {
                     for (let i = 0; i < newInfos.length; i++) {

package/src/4-deploy/edgeNodes.ts

@@ -304,7 +304,7 @@ async function updateEdgeNodesFile() {
         }
     }
 
-    let edgeNodeFiles = await edgeNodeStorage.find("node", { type: "files" });
+    let edgeNodeFiles = await edgeNodeStorage.find("node", { type: "files", fallbacks: true });
     // Reads are independent, so run them in parallel (bounded): with many files a serial pass would take files × read-latency, which could be minutes.
     let readEdgeNodeFile = runInParallel({ parallelCount: EDGE_NODE_READ_PARALLEL }, async (nodeFile: string) => {
         let buffer = await edgeNodeStorage.get(nodeFile);

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/deployManager/machineSchema.ts

@@ -35,9 +35,9 @@ export type MachineConfig = {
     disabled: boolean;
 };
 // We want all of these to have very high availability. Even if they're wrong, it's better to have an old service deployed or even view information on an old service, or even set information only in back plays rather than have the server be completely down. 
-export const machineInfos = archiveJSONT<MachineInfo>(() => getArchives2("machines/machine-heartbeats/"), { fallbacks: true });
-export const serviceConfigs = archiveJSONT<ServiceConfig>(() => getArchives2("machines/service-configs/"), { fallbacks: true });
-export const machineConfigs = archiveJSONT<MachineConfig>(() => getArchives2("machines/machine-configs/"), { fallbacks: true });
+export const machineInfos = archiveJSONT<MachineInfo>(() => getArchives2("machines/machine-heartbeats/"), { setFallbacks: true, findFallbacks: true });
+export const serviceConfigs = archiveJSONT<ServiceConfig>(() => getArchives2("machines/service-configs/"), { setFallbacks: true, findFallbacks: true });
+export const machineConfigs = archiveJSONT<MachineConfig>(() => getArchives2("machines/machine-configs/"), { setFallbacks: true, findFallbacks: true });
 
 export type MachineInfo = {
     machineId: string;
@@ -557,7 +557,7 @@ export class MachineServiceControllerBase {
         for (let i = 0; i <= sinceDays; i++) {
             dayStrings.push(formatLaunchDay(now - i * timeInDay));
         }
-        let keyLists = await Promise.all(dayStrings.map(day => launches().find(`${day}/`)));
+        let keyLists = await Promise.all(dayStrings.map(day => launches().find(`${day}/`, { fallbacks: true })));
         let summaries: LaunchSummary[] = [];
         for (let keys of keyLists) {
             for (let key of keys) {

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

@@ -36,7 +36,7 @@ export type SuppressionEntry = {
     createdTime: number;
     lastUpdatedTime: number;
 };
-const suppression = archiveJSONT<SuppressionEntry>(() => getArchives2("logs/error-suppression/"));
+const suppression = archiveJSONT<SuppressionEntry>(() => getArchives2("logs/error-suppression/"), { findFallbacks: true });
 
 // In-memory Discord notification throttling
 const timeInHour = 60 * 60 * 1000;

package/src/diagnostics/logs/errorTickets/tickets.ts

@@ -13,7 +13,7 @@ import { Ticket, TicketComment, TicketPatchStatus, TicketState } from "./ticketT
 
 const TICKET_CACHE_POLL_INTERVAL = timeInMinute * 5;
 
-export const ticketsArchive = archiveJSONT<Ticket>(() => getArchives2("logs/error-tickets/"));
+export const ticketsArchive = archiveJSONT<Ticket>(() => getArchives2("logs/error-tickets/"), { findFallbacks: true });
 
 let ticketCache = new Map<string, Ticket>();
 let ensureWatching = lazy(async () => {

package/src/diagnostics/logs/lifeCycleAnalysis/lifeCycles.tsx

@@ -54,7 +54,7 @@ export function getVariables(entry: LifeCycleEntry): { key: string, title?: stri
     return variables;
 }
 
-const lifeCycles = archiveJSONT<LifeCycle>(() => getArchives2("logs/life-cycles/"));
+const lifeCycles = archiveJSONT<LifeCycle>(() => getArchives2("logs/life-cycles/"), { findFallbacks: true });
 let lifeCyclesCache: LifeCycle[] = [];
 
 let ensureWatching = lazy(async () => {