querysub 0.439.0 → 0.441.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.439.0",
+  "version": "0.441.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -61,10 +61,9 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "querysub": "^0.357.0",
-    "socket-function": "^1.1.21",
+    "socket-function": "^1.1.23",
     "terser": "^5.31.0",
-    "typesafecss": "^0.28.0",
+    "typesafecss": "^0.29.0",
     "yaml": "^2.5.0",
     "yargs": "^15.3.1"
   },

package/src/-b-authorities/dnsAuthority.ts

@@ -136,4 +136,4 @@ export async function addRecord(type: string, key: string, value: string, proxie
         console.log(`${ttlLeft} seconds left...`);
     }
     console.log(`Done waiting for DNS to update.`);
-}
+}

package/src/2-proxy/PathValueProxyWatcher.ts

@@ -1192,7 +1192,7 @@ export class PathValueProxyWatcher {
         };
         watcher.hasAnyUnsyncedAccesses = () => {
             if (watcher.options.waitForIncompleteTransactions) {
-                waitIfReceivedIncompleteTransaction();
+                waitIfReceivedIncompleteTransaction(watcher);
             }
             return (
                 watcher.pendingUnsyncedAccesses.size > 0

package/src/2-proxy/TransactionDelayer.ts

@@ -1,6 +1,6 @@
 import { delay } from "socket-function/src/batching";
 import { PathValue, hashPathForTransaction, compareTime, Time } from "../0-path-value-core/pathValueCore";
-import { proxyWatcher } from "./PathValueProxyWatcher";
+import { SyncWatcher, proxyWatcher } from "./PathValueProxyWatcher";
 
 const MISSING_TRANSACTION_PART_TIMEOUT = 5000;
 
@@ -62,9 +62,8 @@ export function isMissingTransactionPart(pathValues: PathValue[]): { time: numbe
     return newestWaitTime;
 }
 
-export function getAllPendingPathValueReads() {
+export function getAllPendingPathValueReads(watcher = proxyWatcher.getTriggeredWatcher()) {
     let values: PathValue[] = [];
-    let watcher = proxyWatcher.getTriggeredWatcher();
     for (let map of watcher.pendingAccesses.values()) {
         for (let pathValue of map.values()) {
             values.push(pathValue.pathValue);
@@ -74,13 +73,11 @@ export function getAllPendingPathValueReads() {
 }
 
 
-export function waitIfReceivedIncompleteTransaction() {
-    // 1) Keep track of the last proxy watcher we just registered it for. And then if the proxy watcher is the same as that one and that proxy watcher is waiting on a promise, don't register it again. 
-    let watcher = proxyWatcher.getTriggeredWatcher();
+export function waitIfReceivedIncompleteTransaction(watcher: SyncWatcher) {
     // We don't want to register a whole bunch of duplicate promises. So if somebody's waiting, there's no need to even do our check. 
     if (watcher.specialPromiseUnsynced) return;
 
-    let newestTime = isMissingTransactionPart(getAllPendingPathValueReads());
+    let newestTime = isMissingTransactionPart(getAllPendingPathValueReads(watcher));
     if (!newestTime) return;
 
     let timeout = newestTime.time + MISSING_TRANSACTION_PART_TIMEOUT;

package/src/4-querysub/Querysub.ts

@@ -10,7 +10,7 @@ Promise.race = PromiseRace;
 import { shimDateNow } from "socket-function/time/trueTimeShim";
 shimDateNow();
 
-import { isNode, isNodeTrue, timeInMinute, timeInSecond, timeoutToUndefined } from "socket-function/src/misc";
+import { isNode, isNodeTrue, nextId, timeInMinute, timeInSecond, timeoutToUndefined } from "socket-function/src/misc";
 
 import { SocketFunction } from "socket-function/SocketFunction";
 import { isHotReloading, watchFilesAndTriggerHotReloading } from "socket-function/hot/HotReloadController";
@@ -183,6 +183,9 @@ export class Querysub {
     public static AUDIT_PREDICTIONS = true;
     public static SIMULATE_LAG = 0;
 
+    public static registerAliveChecker = <T>(config: AliveChecker<T>) => registerAliveChecker(config);
+    public static registerGarbageCollection = <T>(config: AliveChecker<T>) => registerAliveChecker(config);
+
     /** Delay used when functions are specified as delayCommit */
     public static DELAY_COMMIT_DELAY = 1000 * 3;
 
@@ -218,7 +221,10 @@ export class Querysub {
     // Returns a random value between 0 and 1. The value depends on the callId, and index (being identical for
     //      the same callid and index).
     public static callRandom = () => hashRandom(Querysub.getCallId(), getNextCallIndex());
-    public static nextId = () => Querysub.getCallId() + "_" + getNextCallIndex();
+    public static nextId = () => {
+        if (!Querysub.isInSyncedCall()) return nextId();
+        return Querysub.getCallId() + "_" + getNextCallIndex();
+    };
 
     public static getNextCallIndex = getNextCallIndex;
 
@@ -1336,4 +1342,5 @@ import { onAllPredictionsFinished } from "../-0-hooks/hooks";
 import { LOCAL_DOMAIN } from "../0-path-value-core/PathRouter";
 import { authorityLookup } from "../0-path-value-core/AuthorityLookup";
 import { encodeParentFilter } from "../0-path-value-core/hackedPackedPathParentFiltering";
+import { AliveChecker, registerAliveChecker } from "../2-proxy/garbageCollection";
 

package/src/deployManager/components/DeployPage.tsx

@@ -4,7 +4,7 @@ import { qreact } from "../../4-dom/qreact";
 import { deployGetFunctions } from "../../4-deploy/deployFunctions";
 import { MachineServiceController, deployFunctionsWithProgress } from "../machineSchema";
 import { functionSchema, FunctionSpec } from "../../3-path-functions/PathFunctionRunner";
-import { getDomain } from "../../config";
+import { getDomain, isPublic } from "../../config";
 import { RenderGitRefInfo, UpdateButtons, bigEmoji, buttonStyle } from "./deployButtons";
 import { css } from "typesafecss";
 import { timeInHour, timeInMinute } from "socket-function/src/misc";
@@ -269,6 +269,7 @@ export class DeployPage extends qreact.Component {
 
         return <div className={css.vbox(40).marginTop(20)}>
             <div className={css.hbox(10)}>
+                {isPublic() && <h1>Don't deploy on public servers! It won't work, it will just deploy what that server is already running. TODO: Fix this.</h1>}
                 <UpdateButtons services={[]} />
                 <button
                     disabled={controller.isAnyLoading()}

package/src/diagnostics/logs/IndexedLogs/IndexedLogs.ts

@@ -756,14 +756,20 @@ export class IndexedLogs<T> {
     }
 }
 
+
+function getLogByName(name: string): IndexedLogs<unknown> {
+    let indexedLogs = loggerByName.get(name);
+    if (!indexedLogs) throw new Error(`Indexed logs ${name} not found, have ${Array.from(loggerByName.keys()).join(" | ")}`);
+    return indexedLogs;
+}
 class IndexedLogClient {
+
     public async onFind(config: {
         findId: string;
         indexedLogsName: string;
         result: unknown;
     }) {
-        let indexedLogs = loggerByName.get(config.indexedLogsName);
-        if (!indexedLogs) throw new Error(`Indexed logs ${config.indexedLogsName} not found`);
+        let indexedLogs = getLogByName(config.indexedLogsName);
         indexedLogs.onFindResult({
             findId: config.findId,
             result: config.result,
@@ -774,8 +780,7 @@ class IndexedLogClient {
         indexedLogsName: string;
         results: IndexedLogResults;
     }): Promise<boolean> {
-        let indexedLogs = loggerByName.get(config.indexedLogsName);
-        if (!indexedLogs) throw new Error(`Indexed logs ${config.indexedLogsName} not found`);
+        let indexedLogs = getLogByName(config.indexedLogsName);
         return await indexedLogs.onResults({
             findId: config.findId,
             results: config.results,
@@ -789,8 +794,7 @@ class IndexedLogShim {
         params: SearchParams;
     }): Promise<IndexedLogResults> {
         let caller = SocketFunction.getCaller();
-        let indexedLogs = loggerByName.get(config.indexedLogsName);
-        if (!indexedLogs) throw new Error(`Indexed logs ${config.indexedLogsName} not found`);
+        let indexedLogs = getLogByName(config.indexedLogsName);
 
         return indexedLogs.find({
             params: config.params,
@@ -822,8 +826,7 @@ class IndexedLogShim {
         only?: "local" | "public";
         forceReadProduction?: boolean;
     }): Promise<TimeFilePathWithSize[]> {
-        let indexedLogs = loggerByName.get(config.indexedLogsName);
-        if (!indexedLogs) throw new Error(`Indexed logs ${config.indexedLogsName} not found`);
+        let indexedLogs = getLogByName(config.indexedLogsName);
         return indexedLogs.getPaths({
             startTime: config.startTime,
             endTime: config.endTime,
@@ -835,8 +838,7 @@ class IndexedLogShim {
     public async forceMoveLogsToPublic(config: {
         indexedLogsName: string;
     }) {
-        let indexedLogs = loggerByName.get(config.indexedLogsName);
-        if (!indexedLogs) throw new Error(`Indexed logs ${config.indexedLogsName} not found`);
+        let indexedLogs = getLogByName(config.indexedLogsName);
         await indexedLogs.moveLogsToPublic(true);
     }