querysub 0.322.0 → 0.324.0

package/package.json

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

package/src/4-querysub/Querysub.ts

@@ -517,9 +517,9 @@ export class Querysub {
     public static getOwnMachineId = getOwnMachineId;
     public static getSelfMachineId = getOwnMachineId;
 
-    public static getOwnNodeId = getOwnNodeId;
-    public static getSelfNodeId = getOwnNodeId;
-    public static getOwnThreadId = getOwnThreadId;
+    public static getOwnNodeId = () => getOwnNodeId();
+    public static getSelfNodeId = () => getOwnNodeId();
+    public static getOwnThreadId = () => getOwnThreadId();
 
     /** Set ClientWatcher.DEBUG_SOURCES to true for to be populated */
     public static getTriggerReason() {

package/src/diagnostics/logs/diskLogger.ts

@@ -177,7 +177,7 @@ function packageLogObj(type: string, args: unknown[]): LogDatum {
     let stringCount = 0;
     for (let i = 0; i < args.length; i++) {
         let param = args[i];
-        if (canHaveChildren(param)) {
+        if (canHaveChildren(param) && !Array.isArray(param)) {
             Object.assign(logObj, param);
         } else {
             logObj["param" + stringCount] = param;

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

@@ -386,7 +386,8 @@ class RecentErrors {
     });
 
     private _recentErrors: LogDatum[] = [];
-    private updateRecentErrors = (objs: LogDatum[]) => {
+    private updateRecentErrors = async (objs: LogDatum[]) => {
+        objs = await suppressionList.filterObjsToNonSuppressed(objs);
         let newRecentErrors = limitRecentErrors(objs);
         // If any changed
         let prev = new Set(this._recentErrors);
@@ -413,15 +414,15 @@ class RecentErrors {
         recentErrorsChannel.broadcast(true);
     });
 
-    private addErrors(objs: LogDatum[]) {
+    private async addErrors(objs: LogDatum[]) {
         for (let obj of objs) {
             this._recentErrors.push(obj);
         }
-        this.updateRecentErrors(this._recentErrors);
+        await this.updateRecentErrors(this._recentErrors);
     }
 
     public async onSuppressionChanged() {
-        this.updateRecentErrors(await suppressionList.filterObjsToNonSuppressed(this._recentErrors));
+        await this.updateRecentErrors(this._recentErrors);
     }
 
     private scannedHashes = new Set<string>();
@@ -440,7 +441,7 @@ class RecentErrors {
                 noLocalFiles: config.noLocalFiles,
             });
             // Filter again, as new suppressions change the errors
-            this.updateRecentErrors(await suppressionList.filterObjsToNonSuppressed(this._recentErrors));
+            await this.updateRecentErrors(this._recentErrors);
             let recentLimit = 0;
             const applyRecentLimit = () => {
                 if (this._recentErrors.length < MAX_RECENT_ERRORS) return;
@@ -512,7 +513,7 @@ class RecentErrors {
                         await fd.close();
                     }
                     let newErrors = await scanner.finish();
-                    this.addErrors(newErrors);
+                    await this.addErrors(newErrors);
                     applyRecentLimit();
                 } catch (e: any) {
                     console.error(`Failed to scan file ${file.url}, size is ${size}, error is:\n${e.stack}`);