querysub 0.350.0 → 0.351.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.350.0",
+  "version": "0.351.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -32,7 +32,6 @@
     "gc-watch-public": "./bin/gc-watch-public.js",
     "join": "./bin/join.js",
     "join-public": "./bin/join-public.js",
-    "merge": "./bin/merge.js",
     "addsuperuser": "./bin/addsuperuser.js",
     "error-email": "./bin/error-email.js",
     "error-im": "./bin/error-im.js"
@@ -51,9 +50,9 @@
     "js-sha512": "^0.9.0",
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
-    "socket-function": "^0.153.0",
+    "socket-function": "^1.0.1",
     "terser": "^5.31.0",
-    "typesafecss": "^0.23.0",
+    "typesafecss": "^0.25.0",
     "yaml": "^2.5.0",
     "yargs": "^15.3.1"
   },

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

@@ -550,6 +550,8 @@ export class ArchivesBackblaze {
                 //  we can remove this line.
                 || err.stack.includes(`400 Bad Request`)
                 || err.stack.includes(`getaddrinfo ENOTFOUND`)
+                || err.stack.includes(`ECONNRESET`)
+                || err.stack.includes(`ECONNREFUSED`)
             ) {
                 this.log(err.message + " retrying in 5s");
                 await delay(5000);

package/src/2-proxy/PathValueProxyWatcher.ts

@@ -1015,7 +1015,7 @@ export class PathValueProxyWatcher {
         options: WatcherOptions<Result>
     ): SyncWatcher {
         if (isAsyncFunction(options.watchFunction)) {
-            throw new Error(`Async functions are not supported in watchers. They must run the caller synchronously. You are likely not using Await anyway, so just remove the async and make it a synchronous function. The caller will be called again whenever the data you access changes, And if you are running this to return a result, it will be rerun until all the data you want is synchronized. Watch function: ${options.watchFunction.toString()}`);
+            throw new Error(`A watcher function cannot be async, it must be synchronous. You probably did Querysub.commitAsync(async () => {}). Just remove the async, and do Querysub.commit(() => {}). The caller will be called again whenever the data you access changes, And if you are running this to return a result, it will be rerun until all the data you want is synchronized. Watch function: ${options.watchFunction.toString()}`);
         }
         // NOTE: Setting an order is needed for rendering, so parents render before children. I believe
         //  it is generally what we want, so event triggering is consistent, and fits with any tree based

package/src/5-diagnostics/Modal.tsx

@@ -74,6 +74,7 @@ function closeModal(id: string) {
 export function showModal(config: {
     content: preact.ComponentChild;
     onClose?: () => void | "abortClose";
+    onlyCloseExplicitly?: boolean;
 }): {
     close: () => void;
 } {
@@ -83,6 +84,7 @@ export function showModal(config: {
         data().modals[id] = atomicObjectWriteNoFreeze({
             value: config.content,
             onClose: config.onClose,
+            onlyExplicitClose: config.onlyCloseExplicitly,
         });
     });
     function close() {
@@ -94,6 +96,7 @@ export function showModal(config: {
 export function closeAllModals() {
     Querysub.commit(() => {
         for (let [id, obj] of Object.entries(data().modals)) {
+            if (obj.onlyExplicitClose) continue;
             closeModal(id);
         }
     });

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

@@ -548,14 +548,16 @@ export class RecentErrors {
     });
 
     private _recentErrors: LogDatum[] = [];
-    private updateRecentErrors = runInSerial(async (objs: LogDatum[]) => {
-        objs = await suppressionList.filterObjsToNonSuppressed(objs);
-        let newRecentErrors = limitRecentErrors(objs);
+    private _lastSentErrors: LogDatum[] = [];
+    private updateRecentErrors = runInSerial(async () => {
+        let newList = this._recentErrors;
+        newList = await suppressionList.filterObjsToNonSuppressed(newList);
+        newList = limitRecentErrors(newList);
         // If any changed
-        let prev = new Set(this._recentErrors);
-        let newErrors = new Set(newRecentErrors);
+        let prev = new Set(this._lastSentErrors);
+        let newErrors = new Set(newList);
         function hasAnyChanged() {
-            for (let obj of newRecentErrors) {
+            for (let obj of newList) {
                 if (!prev.has(obj)) {
                     return true;
                 }
@@ -567,8 +569,8 @@ export class RecentErrors {
             }
             return false;
         }
+        this._lastSentErrors = newList;
         if (hasAnyChanged()) {
-            this._recentErrors = newRecentErrors;
             void this.broadcastUpdate(undefined);
         }
     });
@@ -586,7 +588,7 @@ export class RecentErrors {
         for (let obj of objs) {
             this._recentErrors.push(obj);
         }
-        await this.updateRecentErrors(this._recentErrors);
+        await this.updateRecentErrors();
     });
 
     private lastSuppressionList = new Map<string, SuppressionEntry>();
@@ -613,7 +615,7 @@ export class RecentErrors {
             void this.scanNow({});
         }
         this.lastSuppressionList = newSuppressionList;
-        await this.updateRecentErrors(this._recentErrors);
+        await this.updateRecentErrors();
     });
 
     private scannedHashes = new Set<string>();
@@ -636,7 +638,7 @@ export class RecentErrors {
                 noLocalFiles: config.noLocalFiles,
             });
             // Filter again, as new suppressions change the errors
-            await this.updateRecentErrors(this._recentErrors);
+            await this.updateRecentErrors();
             let recentLimit = 0;
             const applyRecentLimit = () => {
                 if (this._recentErrors.length < MAX_RECENT_ERRORS) return;

package/src/diagnostics/logs/errorNotifications/ErrorWarning.tsx

@@ -147,7 +147,9 @@ export class ErrorWarning extends qreact.Component {
         if (recentErrors[0].__matchedOutdatedSuppressionKey) {
             let key = recentErrors[0].__matchedOutdatedSuppressionKey;
             topExpired = suppressionList.find(x => x.key === key);
-
+        }
+        function showSpecialCharacters(text: string) {
+            return text.replaceAll("\n", "\\n");
         }
 
         return (
@@ -181,12 +183,12 @@ export class ErrorWarning extends qreact.Component {
                             Match Pattern =
                         </div>
                         <div className={css.hsl(200, 40, 40).pad2(4, 2).colorhsl(0, 0, 95)}>
-                            {topExpired.match}
+                            {showSpecialCharacters(topExpired.match)}
                         </div>
                     </div>
                 }
                 <div className={css.hbox(8).hsl(0, 50, 50).pad2(4, 2).colorhsl(0, 50, 95)}>
-                    ({formatDateJSX(recentErrors[0].time)}) {recentErrors[0].param0} ({recentErrors[0].__NAME__})
+                    ({formatDateJSX(recentErrors[0].time)}) {showSpecialCharacters(String(recentErrors[0].param0))} ({recentErrors[0].__NAME__})
                 </div>
 
                 <div className={css.hbox(8).fillWidth}>

package/src/library-components/Notifications.tsx

@@ -85,7 +85,7 @@ class CloseWrapper extends qreact.Component<{ seqNum: number }> {
     }
 }
 let ensureNotifications = lazy(() => {
-    showModal({ content: <Notifications /> });
+    showModal({ content: <Notifications />, onlyCloseExplicitly: true });
 });
 
 /** Allows capturing the current state so the notification can be closed later on */

package/src/library-components/errorNotifications.tsx

@@ -52,9 +52,11 @@ function onMessage(config: {
     // Detach entirely from any state, as we are triggered from console.error, which may be called in
     //  very fragile states.
     setImmediate(() => {
-        let title = stripConsoleRenderedColors(config.message).split("\n")[0];
+        let title = stripConsoleRenderedColors(config.message);
         if (title.startsWith("Error: ")) {
-            title = title.slice("Error: ".length);
+            title = title.slice("Error: ".length).split("\n")[0];
+        } else {
+            title = title.replaceAll("\n", " ").slice(0, 200);
         }
         showNotification({
             pos: "topRight",
@@ -80,5 +82,5 @@ function onMessage(config: {
 // \033[38;2;<r>;<g>;<b>m 
 
 function stripConsoleRenderedColors(text: string) {
-    return String(text).replaceAll(/\033\[\d+(;\d+)*m/g, "");
-}
+    return String(text).replaceAll(/\x1b\[\d+(;\d+)*m/g, "");
+}