querysub 0.396.0 → 0.398.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.396.0",
+  "version": "0.398.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/archivesDisk.ts

@@ -118,7 +118,7 @@ class ArchivesDisk {
                 if (dir.endsWith(":")) break;
                 let files = await fs.promises.readdir(this.LOCAL_ARCHIVE_FOLDER + dir);
                 if (files.length > 0) break;
-                await fs.promises.rmdir(this.LOCAL_ARCHIVE_FOLDER + dir);
+                await fs.promises.rm(this.LOCAL_ARCHIVE_FOLDER + dir, { recursive: true });
             }
         } catch { }
     }
@@ -176,7 +176,7 @@ class ArchivesDisk {
         } catch { }
         if (files.length === 0) {
             try {
-                await fs.promises.rmdir(dir);
+                await fs.promises.rm(dir, { recursive: true });
             } catch { }
         }
     }

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

@@ -1,5 +1,6 @@
 import { lazy } from "socket-function/src/caching";
 import { Archives } from "./archives";
+import { green } from "socket-function/src/formatting/logColors";
 
 export type ArchiveT<T> = {
     get(key: string): Promise<T | undefined>;
@@ -26,10 +27,14 @@ export function archiveJSONT<T>(archives: () => Archives): ArchiveT<T> {
         return JSON.parse(buffer.toString()) as T;
     }
     async function set(key: string, value: T) {
-        await archives().set(key, Buffer.from(JSON.stringify(value)));
+        let a = archives();
+        console.log(`In archiveJSONT ${a.getDebugName()}, setting ${key} to ${JSON.stringify(value)}`);
+        await a.set(key, Buffer.from(JSON.stringify(value)));
     }
     async function deleteFnc(key: string) {
-        await archives().del(key);
+        let a = archives();
+        console.log(`In archiveJSONT ${a.getDebugName()}, deleting ${key}`);
+        await a.del(key);
     }
     async function keys() {
         return (await archives().find("")).map(value => value.toString());

package/src/3-path-functions/pathFunctionLoader.ts

@@ -170,7 +170,7 @@ let moduleResolver = async (spec: {
 
             // Remove any previous attempt to sync it
             if (fs.existsSync(repoPath)) {
-                await fs.promises.rmdir(repoPath, { recursive: true });
+                await fs.promises.rm(repoPath, { recursive: true });
             }
             // Clone it
             await executeCommand("git", ["clone", gitURL, repoPath]);
@@ -182,7 +182,7 @@ let moduleResolver = async (spec: {
             // Delete querysub, and replace it with a symlink. Otherwise the synchronization code
             //  will run again, and a lot of setup code will run again, etc, and nothing will work correctly.
             let querysubPath = repoPath + "node_modules/querysub";
-            await fs.promises.rmdir(querysubPath, { recursive: true });
+            await fs.promises.rm(querysubPath, { recursive: true });
 
             let actualQuerysubPath = path.resolve("./node_modules/querysub");
             await fs.promises.symlink(actualQuerysubPath, querysubPath, "junction");

package/src/deployManager/machineApplyMainCode.ts

@@ -600,7 +600,7 @@ const ensureGitSynced = measureWrap(async function ensureGitSynced(config: {
         await setGitRef(config);
     } catch (e: any) {
         console.warn(`Failed to set git ref, trying to delete and clone again (${config.gitFolder}): ${e.stack}`);
-        await fs.promises.rmdir(config.gitFolder, { recursive: true });
+        await fs.promises.rm(config.gitFolder, { recursive: true });
         await runPromise(`git clone ${config.repoUrl} ${config.gitFolder}`);
         await setGitRef(config);
     }

package/src/diagnostics/logs/errorNotifications2/ErrorNotificationPage.tsx

@@ -12,7 +12,7 @@ import { ErrorWarning } from "./ErrorWarning";
 import { getErrorNotificationsManager } from "./errorWatcher";
 import { createMatchesPattern } from "../IndexedLogs/bufferSearchFindMatcher";
 import { cacheLimited } from "socket-function/src/caching";
-import { managementPageURL } from "../../managementPages";
+import { managementPageURL, showingManagementURL } from "../../managementPages";
 import { searchTextURL, readProductionLogsURL } from "../IndexedLogs/LogViewerParams";
 import { startTimeParam, endTimeParam } from "../TimeRangeSelector";
 import { timeInHour } from "socket-function/src/misc";
@@ -56,6 +56,7 @@ export class LogDatumRenderer extends qreact.Component<{
         let logViewerValues: URLOverride[] | undefined;
         {
             logViewerValues = [
+                showingManagementURL.getOverride(true),
                 managementPageURL.getOverride("LogViewer3"),
                 readProductionLogsURL.getOverride(isPublic()),
                 startTimeParam.getOverride(datum.time - timeInHour),
@@ -147,7 +148,7 @@ export class LogDatumRenderer extends qreact.Component<{
                                 e.stopPropagation();
                             }
                             Querysub.onCommitFinished(async () => {
-                                await this.manager.updateTimeout(timedOutMatches[0].id, Infinity);
+                                await this.manager.updateTimeout(timedOutMatches[0].id, Number.MAX_SAFE_INTEGER);
                             });
                         }}
                     >
@@ -294,7 +295,7 @@ export class ErrorNotificationPage extends qreact.Component {
                                 if (pattern) {
                                     this.state.newNotABugPattern = pattern;
                                     Querysub.onCommitFinished(async () => {
-                                        await this.manager.addSuppression(pattern, Infinity);
+                                        await this.manager.addSuppression(pattern, Number.MAX_SAFE_INTEGER);
                                         Querysub.commit(() => {
                                             this.state.newNotABugPattern = "";
                                         });
@@ -370,7 +371,7 @@ class SuppressionItem extends qreact.Component<{
         }
 
         let timeoutText: preact.ComponentChild;
-        if (suppression.timeout === Infinity) {
+        if (suppression.timeout >= Number.MAX_SAFE_INTEGER) {
             timeoutText = "Never expires";
         } else if (suppression.timeout > Date.now()) {
             timeoutText = <span>Expires <b>{formatTime(suppression.timeout - Date.now())}</b></span>;
@@ -382,6 +383,7 @@ class SuppressionItem extends qreact.Component<{
             <div className={css.hbox(12)}>
                 <ATag
                     values={[
+                        showingManagementURL.getOverride(true),
                         managementPageURL.getOverride("LogViewer3"),
                         searchTextURL.getOverride(suppression.pattern),
                         readProductionLogsURL.getOverride(true),
@@ -404,7 +406,7 @@ class SuppressionItem extends qreact.Component<{
                     hue={120}
                     onClick={() => {
                         Querysub.onCommitFinished(async () => {
-                            await this.manager.updateTimeout(suppression.id, Infinity);
+                            await this.manager.updateTimeout(suppression.id, Number.MAX_SAFE_INTEGER);
                         });
                     }}
                 >