querysub 0.506.0 → 0.508.0

package/package.json

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

package/src/0-path-value-core/PathWatcher.ts

@@ -247,9 +247,9 @@ class PathWatcher {
             obj.watchers.delete(callback);
 
             if (isOwnNodeId(callback)) {
-                auditLog("local UNWATCH PARENT", { path, network: decodeParentFilter(path)?.network || DEFAULT_NETWORK, reason });
+                auditLog("local UNWATCH PARENT", { path, network: decodeParentFilter(path)?.network || DEFAULT_NETWORK, reason, remainingWatchers: obj.watchers.size });
             } else {
-                auditLog("non-local UNWATCH PARENT", { path, network: decodeParentFilter(path)?.network || DEFAULT_NETWORK, watcher: callback, remoteNodeId: debugNodeId(callback), remoteNodeThreadId: debugNodeThread(callback), reason });
+                auditLog("non-local UNWATCH PARENT", { path, network: decodeParentFilter(path)?.network || DEFAULT_NETWORK, watcher: callback, remoteNodeId: debugNodeId(callback), remoteNodeThreadId: debugNodeThread(callback), reason, remainingWatchers: obj.watchers.size });
             }
 
             if (obj.watchers.size === 0) {

package/src/0-path-value-core/pathValueCore.ts

@@ -582,8 +582,6 @@ class AuthorityPathValueStorage {
         // NOTE: I don't think we have to handle the case where we are the authority,
         //  because we don't delete any actual data here.
         this.parentsSynced.delete(path);
-        let decoded = decodeParentFilter(path);
-        this.parentsSynced.delete(this.parentSyncKey(hack_stripPackedPath(path), decoded?.network));
     }
 
     /** Used for atomic operations, to ensure a path is stable enough (and to check that it hasn't
@@ -610,10 +608,6 @@ class AuthorityPathValueStorage {
         }
         return true;
     }
-    private parentSyncKey(strippedParentPath: string, network: string | undefined): string {
-        if (!network || network === DEFAULT_NETWORK) return strippedParentPath;
-        return strippedParentPath + String.fromCharCode(1) + "network=" + network;
-    }
 
     public isSynced(path: string) {
         if (PathRouter.isSelfAuthority(path)) return true;
@@ -643,7 +637,7 @@ class AuthorityPathValueStorage {
         let remoteWatchRoute = remoteWatcher.getRemoteParentWatchRoute(path);
         if (remoteWatchRoute !== undefined) {
             let parent = getParentPathStr(path);
-            let ranges = this.parentsSynced.get(this.parentSyncKey(parent, getPathNetwork(path)));
+            let ranges = this.parentsSynced.get(parent);
             // NOTE: We can't cache this because when we stop watching the parent, the remote watch will remove it, which will cause us to be no longer synced. However, it's not going to know to go into our synced cache and remove it. 
             if (ranges === true) return true;
             if (ranges) {
@@ -665,7 +659,7 @@ class AuthorityPathValueStorage {
         parentPath = hack_stripPackedPath(parentPath);
         if (PathRouter.isLocalPath(parentPath)) return true;
 
-        let synced = this.parentsSynced.get(originalPath) || this.parentsSynced.get(this.parentSyncKey(parentPath, range?.network));
+        let synced = this.parentsSynced.get(originalPath) || this.parentsSynced.get(parentPath);
         if (synced === true) return true;
         // See if the ranges received so far cover the requested range. If we only request a partial range, then this will always be the case. We'll never fully synchronize the path. 
         if (synced && range) {
@@ -707,7 +701,7 @@ class AuthorityPathValueStorage {
 
             let decoded = decodeParentFilter(obj.parentPath);
             let range = decoded ? { start: decoded.start, end: decoded.end } : { start: 0, end: 1 };
-            let parentPath = this.parentSyncKey(hack_stripPackedPath(obj.parentPath), decoded?.network);
+            let parentPath = hack_stripPackedPath(obj.parentPath);
 
             let prevSynced = this.parentsSynced.get(parentPath);
             if (prevSynced === true) continue;

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

@@ -1,4 +1,4 @@
-import { delay, runInfinitePoll } from "socket-function/src/batching";
+import { batchFunction, delay, runInfinitePoll } from "socket-function/src/batching";
 import { cache } from "socket-function/src/caching";
 import { blue, magenta, yellow } from "socket-function/src/formatting/logColors";
 import { timeInHour, timeInSecond } from "socket-function/src/misc";
@@ -492,20 +492,16 @@ export class PathFunctionRunner {
         );
     };
 
-    private pendingTickWaiters: { runAtTime: Time; resolve: () => void; }[] | undefined;
-    private async letIOClear(runAtTime: Time): Promise<void> {
-        if (!this.pendingTickWaiters) {
-            let waiters: { runAtTime: Time; resolve: () => void; }[] = [];
-            this.pendingTickWaiters = waiters;
-            void delay(100).then(() => {
-                this.pendingTickWaiters = undefined;
-                waiters.sort((a, b) => compareTime(a.runAtTime, b.runAtTime));
-                for (let w of waiters) w.resolve();
-            });
+    private letIOClearBatch = batchFunction(
+        { delay: 1, throttleWindow: 5000 },
+        (waiters: { runAtTime: Time; resolve: () => void; }[]) => {
+            waiters.sort((a, b) => compareTime(a.runAtTime, b.runAtTime));
+            for (let w of waiters) w.resolve();
         }
-        let waiters = this.pendingTickWaiters;
+    );
+    private async letIOClear(runAtTime: Time): Promise<void> {
         await new Promise<void>(resolve => {
-            waiters.push({ runAtTime, resolve });
+            void this.letIOClearBatch({ runAtTime, resolve });
         });
     }
 

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

@@ -22,7 +22,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 { exposeTicketService } from "../errorTickets/tickets";
+import { TicketServiceBase } from "../errorTickets/tickets";
 
 
 export type SuppressionEntry = {
@@ -307,7 +307,7 @@ const trySendDiscordNotificationsBase = batchFunction({ delay: 1000 * 3 }, async
 
 export async function exposeErrorWatchService() {
     SocketFunction.expose(ErrorNotificationServiceBase);
-    exposeTicketService();
+    SocketFunction.expose(TicketServiceBase);
 
     let errorLogs = await getErrorLogs();
     for await (let error of watchAllValues(errorLogs)) {

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

@@ -204,14 +204,10 @@ export const TicketServiceBase = SocketFunction.register(
     }
 );
 
-export function exposeTicketService() {
-    SocketFunction.expose(TicketServiceBase);
-}
-
 async function getTicketServiceNode(): Promise<string> {
-    let controllerNodeId = await getControllerNodeId(TicketServiceBase, !isPublic());
+    let controllerNodeId = await getControllerNodeId(TicketServiceBase);
     if (!controllerNodeId) {
-        throw new Error(`Could not find node exposing controller TicketServiceBase. Is \`yarn tickets\` running?`);
+        throw new Error(`Could not find node exposing controller TicketServiceBase. Is the \`yarn error-watch\` service running?`);
     }
     return controllerNodeId;
 }