querysub 0.462.0 → 0.463.0

package/src/diagnostics/managementPages.tsx

@@ -1,4 +1,4 @@
-import { Querysub } from "../../src/4-querysub/QuerysubController";
+import { Querysub } from "../../src/4-querysub/Querysub";
 import { isClient, isServer } from "../../src/config2";
 import { logErrors } from "../../src/errors";
 import { SocketFunction } from "socket-function/SocketFunction";
@@ -27,10 +27,9 @@ import { addComponentButton } from "../5-diagnostics/qreactDebug";
 import { closeAllModals } from "../5-diagnostics/Modal";
 import { delay } from "socket-function/src/batching";
 import { currentViewParam, selectedServiceIdParam } from "../deployManager/urlParams";
-import { FunctionCallInfo } from "./FunctionCallInfo";
-import { PathDistributionInfo } from "./PathDistributionInfo";
-import { ValuePathWarning } from "./ValuePathWarning";
 import { isCurrentUserSuperUser } from "../user-implementation/userData";
+import { StatsHeader } from "./StatsHeader";
+import { getQuerysubStatsSync } from "./statsDefinitions";
 
 export const managementPageURL = new URLParam("managementpage", "");
 export const showingManagementURL = new URLParam("showingmanagement", false);
@@ -318,7 +317,6 @@ export function renderIsManagementUser() {
 }
 
 const ErrorWarning = createLazyComponent(() => import("./logs/errorNotifications2/ErrorWarning"))("ErrorWarning");
-const LaunchTrackingHeader = createLazyComponent(() => import("../deployManager/LaunchTrackingHeader"))("LaunchTrackingHeader");
 const GrossStatsInfo = createLazyComponent(() => import("./grossStats/GrossStatsInfo"))("GrossStatsInfo");
 
 class ManagementRoot extends qreact.Component {
@@ -388,11 +386,8 @@ class ManagementRoot extends qreact.Component {
                         {pages.map(page =>
                             <ATag values={[{ param: managementPageURL, value: page.componentName }]}>{page.title}</ATag>
                         )}
-                        {isCurrentUserSuperUser() && <FunctionCallInfo />}
                         {isCurrentUserSuperUser() && <div className={css.vbox(4)}>
-                            <PathDistributionInfo />
-                            <ValuePathWarning />
-                            <LaunchTrackingHeader />
+                            <StatsHeader getStats={getQuerysubStatsSync} />
                             <GrossStatsInfo />
                         </div>}
                     </div>

package/src/diagnostics/misc-pages/ArchiveViewer.tsx

@@ -7,7 +7,7 @@ import { rootPathStr } from "../../path";
 import { css } from "typesafecss";
 import { cacheArgsEqual, cacheLimited, cacheShallowConfigArgEqual, lazy } from "socket-function/src/caching";
 import { atomic, atomicObjectWrite, atomicObjectWriteNoFreeze, doAtomicWrites, proxyWatcher } from "../../2-proxy/PathValueProxyWatcher";
-import { Querysub } from "../../4-querysub/QuerysubController";
+import { Querysub } from "../../4-querysub/Querysub";
 import { formatDate, formatDateTime, formatNumber, formatPercent, formatTime } from "socket-function/src/formatting/format";
 import { Histogram, XYValue } from "../../library-components/Histogram";
 import { Button } from "../../library-components/Button";

package/src/diagnostics/misc-pages/ArchiveViewerTree.tsx

@@ -1,6 +1,6 @@
 import preact from "preact";
 import { PathValue } from "../../0-path-value-core/pathValueCore";
-import { Querysub } from "../../4-querysub/QuerysubController";
+import { Querysub } from "../../4-querysub/Querysub";
 import { createURLSync } from "../../library-components/URLParam";
 import { appendToPathStr, getPathDepth, getPathFromStr, getPathIndex, getPathPrefix, getPathStr, getPathSuffix, rootPathStr } from "../../path";
 import { cache, cacheArgsEqual, cacheLimited, cacheShallowConfigArgEqual } from "socket-function/src/caching";

package/src/diagnostics/misc-pages/DNSPage.tsx

@@ -7,7 +7,7 @@ import { getBrowserUrlNode } from "../../-f-node-discovery/NodeDiscovery";
 import { getSyncedController } from "../../library-components/SyncedController";
 import { assertIsManagementUser } from "../managementPages";
 import { t } from "../../2-proxy/schema2";
-import { Querysub } from "../../4-querysub/QuerysubController";
+import { Querysub } from "../../4-querysub/Querysub";
 import { sort, timeInDay } from "socket-function/src/misc";
 import { isNode } from "typesafecss";
 import { formatDateJSX } from "../../misc/formatJSX";

package/src/diagnostics/pathAuditer.ts

@@ -206,7 +206,7 @@ async function processPendingValidityChecks(now: number) {
 
     for (let i = 0; i < splitIndex; i++) {
         let pendingCheck = pendingValidityChecks[i];
-        let currentValue = authorityStorage.getValueAtTime(pendingCheck.path);
+        let currentValue = authorityStorage.getValueAtOrBeforeTime(pendingCheck.path);
         if (currentValue && currentValue.valid && currentValue.time !== epochTime) {
             trackSyncAge({
                 path: pendingCheck.path,
@@ -278,7 +278,7 @@ async function auditAuthority(nodeId: string, pathsToAudit: { path: string }[],
 
     for (let pathObj of pathsToAudit) {
         let path = pathObj.path;
-        let ourLatest = authorityStorage.getValueAtTime(path);
+        let ourLatest = authorityStorage.getValueAtOrBeforeTime(path);
         if (ourLatest?.event) continue;
         originalValues.set(path, ourLatest);
 
@@ -310,7 +310,7 @@ async function auditAuthority(nodeId: string, pathsToAudit: { path: string }[],
 
     for (let response of responses) {
         let originalValue = originalValues.get(response.path);
-        let ourValue = authorityStorage.getValueAtTime(response.path) || createMissingEpochValue(response.path);
+        let ourValue = authorityStorage.getValueAtOrBeforeTime(response.path) || createMissingEpochValue(response.path);
 
         if (ourValue.event || response.event) continue;
 
@@ -413,7 +413,7 @@ async function auditAuthority(nodeId: string, pathsToAudit: { path: string }[],
 
     if (pathsToForceSync.size > 0) {
         for (let path of pathsToForceSync) {
-            let valueToForce = authorityStorage.getValueAtTime(path);
+            let valueToForce = authorityStorage.getValueAtOrBeforeTime(path);
             if (valueToForce) {
                 let allAuthorities = PathRouter.getAllAuthoritiesForValues([valueToForce]);
                 for (let [authorityNodeId, _] of allAuthorities.entries()) {
@@ -444,7 +444,7 @@ class PathAuditerService {
     public async getValidStates(requests: PathTimeRequest[]): Promise<ValidStateResponse[]> {
         let results: ValidStateResponse[] = [];
         for (let request of requests) {
-            let value = authorityStorage.getValueAtTime(request.path, request.time);
+            let value = authorityStorage.getValueAtOrBeforeTime(request.path, request.time);
             results.push({
                 path: request.path,
                 time: value?.time,
@@ -459,7 +459,7 @@ class PathAuditerService {
     public async getPathValues(requests: PathTimeRequest[]): Promise<PathValue[]> {
         let results: PathValue[] = [];
         for (let request of requests) {
-            let value = authorityStorage.getValueAtTime(request.path, request.time);
+            let value = authorityStorage.getValueAtOrBeforeTime(request.path, request.time);
             if (value) {
                 results.push(value);
             }

package/src/diagnostics/statsDefinitions.tsx

@@ -0,0 +1,253 @@
+import { formatTime } from "socket-function/src/formatting/format";
+import { lazy } from "socket-function/src/caching";
+import { sort } from "socket-function/src/misc";
+import { SocketFunction } from "socket-function/SocketFunction";
+import { callState, ensureSubscribed } from "./FunctionCallInfoState";
+import { StatDefinition } from "./StatsHeader";
+import { getBrowserUrlNode } from "../-f-node-discovery/NodeDiscovery";
+import { MachineServiceController } from "../deployManager/machineSchema";
+import { QuerysubController } from "../4-querysub/QuerysubController";
+import { getSyncedController } from "../library-components/SyncedController";
+import { qreact } from "../4-dom/qreact";
+import { getStatOverrideSync, statOffenderKey } from "./StatsOverrides";
+
+// How often we force the cached debug controller calls (value path count, node specs, launches) to
+//  refetch, so the header doesn't show numbers that are hours stale.
+const STALE_REFRESH_INTERVAL = 30 * 60 * 1000;
+const LAUNCH_SINCE_DAYS = 2;
+const DISTINCT_SOURCE_THRESHOLD = 100;
+
+function makeDistinctSourceStatsSync(config: {
+    category: string;
+    label: string;
+    distinctEmoji: string;
+    aboveThresholdEmoji: string;
+    getEntries: () => [string, number][];
+}): StatDefinition[] {
+    let formatBreakdown = (title: string, onlyAboveThreshold: boolean) => {
+        let entries = config.getEntries();
+        if (onlyAboveThreshold) {
+            entries = entries.filter(([, count]) => count > DISTINCT_SOURCE_THRESHOLD);
+        }
+        entries = sort(entries, ([, count]) => -count);
+        let counts = entries.map(([, count]) => count).join(" | ");
+        let detailed = entries.map(([source, count]) => `${source} (${count})`).join(" | ");
+        return <span title={`${title}: ${detailed}`}>{counts}</span>;
+    };
+    let distinctTitle = `Distinct ${config.label}`;
+    let aboveTitle = `Distinct ${config.label} above ${DISTINCT_SOURCE_THRESHOLD}`;
+    return [
+        {
+            category: config.category, title: distinctTitle, emoji: config.distinctEmoji,
+            threshold: config.label.includes("function") ? 5 : 10,
+            getValue: () => config.getEntries().length,
+            formatter: () => formatBreakdown(distinctTitle, false),
+        },
+        {
+            category: config.category, title: aboveTitle, emoji: config.aboveThresholdEmoji,
+            threshold: config.label.includes("function") ? 2 : 3,
+            getValue: () => config.getEntries().filter(([, count]) => count > DISTINCT_SOURCE_THRESHOLD).length,
+            formatter: () => formatBreakdown(aboveTitle, true),
+        },
+    ];
+}
+
+const TOP_FUNCTION_BREAKDOWN_COUNT = 3;
+
+type PerFunctionStats = ReturnType<typeof callState>["perFunctionStats"][string];
+
+function makeCallStatSync(config: {
+    perFn: { [id: string]: PerFunctionStats };
+    category: string;
+    title: string;
+    emoji: string;
+    threshold: number;
+    getFnValue: (fn: PerFunctionStats) => number;
+    formatValue?: (value: number) => string;
+}): StatDefinition {
+    let formatValue = config.formatValue || ((value: number) => String(value));
+    let getFilteredEntries = () => {
+        let now = Date.now();
+        let entries: { fnId: string; value: number }[] = [];
+        for (let fnId of Object.keys(config.perFn)) {
+            let value = config.getFnValue(config.perFn[fnId]);
+            let override = getStatOverrideSync(statOffenderKey(config.title, fnId));
+            let ignoredUntil = override.ignoreUntilMs || 0;
+            if (ignoredUntil > now) continue;
+            let fnThresholdOverride = override.thresholdOverride || 0;
+            if (value < fnThresholdOverride) continue;
+            entries.push({ fnId, value });
+        }
+        return entries;
+    };
+    let getTopOffenders = () => {
+        let above = sort(
+            getFilteredEntries().filter(entry => entry.value >= config.threshold),
+            entry => -entry.value,
+        );
+        return above.slice(0, TOP_FUNCTION_BREAKDOWN_COUNT);
+    };
+    return {
+        category: config.category,
+        title: config.title,
+        emoji: config.emoji,
+        threshold: config.threshold,
+        getValue: () => {
+            let max = 0;
+            for (let entry of getFilteredEntries()) {
+                if (entry.value > max) {
+                    max = entry.value;
+                }
+            }
+            return max;
+        },
+        formatter: () => {
+            let sorted = sort(getFilteredEntries(), entry => -entry.value);
+            let top = sorted.slice(0, TOP_FUNCTION_BREAKDOWN_COUNT);
+            let breakdown = top.map(entry => `${entry.fnId} (${formatValue(entry.value)})`).join(" | ");
+            let detailed = sorted.map(entry => `${entry.fnId} (${formatValue(entry.value)})`).join(" | ");
+            return <span title={`${config.title}: ${detailed}`}>{breakdown}</span>;
+        },
+        getOffenders: () => getTopOffenders().map(entry => ({ id: entry.fnId, value: entry.value })),
+    };
+}
+
+if (!QuerysubController) {
+    require("debugbreak")(2);
+    debugger;
+}
+let querysubController = getSyncedController(QuerysubController);
+
+let ensureRefreshInterval = lazy(() => {
+    setInterval(() => {
+        let nodeId = SocketFunction.browserNodeId();
+        querysubController(nodeId).debugGetValuePathCount.refresh();
+        querysubController(nodeId).debugGetDetailedSyncing.refresh();
+        MachineServiceController(getBrowserUrlNode()).getRecentLaunches.refresh(LAUNCH_SINCE_DAYS);
+    }, STALE_REFRESH_INTERVAL);
+});
+
+export function getQuerysubStatsSync(): StatDefinition[] {
+    ensureSubscribed();
+    ensureRefreshInterval();
+    let state = callState();
+
+    let perFn = state.perFunctionStats;
+    let avgFn = (s: { count: number; sum: number }) => s.count && s.sum / s.count || 0;
+
+    let callStatDefs: StatDefinition[] = [
+        makeCallStatSync({
+            perFn, category: "Calls", title: "Committed synced calls", emoji: "⚡",
+            threshold: 50_000,
+            getFnValue: fn => fn.totalCalls,
+        }),
+        makeCallStatSync({
+            perFn, category: "Calls", title: "Rejected calls (full reruns)", emoji: "⚠️",
+            threshold: 10,
+            getFnValue: fn => fn.totalFullReruns - fn.totalCalls,
+        }),
+        makeCallStatSync({
+            perFn, category: "Calls", title: "Total internal reruns", emoji: "♻️",
+            threshold: 10,
+            getFnValue: fn => fn.totalInternalReruns - fn.totalCalls,
+        }),
+        makeCallStatSync({
+            perFn, category: "Calls", title: "Calls with multiple internal runs", emoji: "🔦",
+            threshold: 10,
+            getFnValue: fn => fn.callsWithMultipleInternalRuns,
+        }),
+        makeCallStatSync({
+            perFn, category: "Calls", title: "Calls needing cascading syncing", emoji: "📈",
+            threshold: 10,
+            getFnValue: fn => fn.callsWithCascadingRuns,
+        }),
+    ];
+
+    let timingStatDefs: StatDefinition[] = [
+        makeCallStatSync({
+            perFn, category: "Timing", title: "Average evaluation time", emoji: "💫",
+            threshold: 100,
+            getFnValue: fn => avgFn(fn.evalTimeStats),
+            formatValue: formatTime,
+        }),
+        makeCallStatSync({
+            perFn, category: "Timing", title: "Average full time (sync, etc)", emoji: "🕒",
+            threshold: 1000,
+            getFnValue: fn => avgFn(fn.totalTimeStats),
+            formatValue: formatTime,
+        }),
+    ];
+
+    let callServerStats = makeDistinctSourceStatsSync({
+        category: "Servers",
+        label: "function call servers",
+        distinctEmoji: "⚡",
+        aboveThresholdEmoji: "⚡",
+        getEntries: () => Object.entries(state.callsByServer),
+    });
+    let valuePathServerStats = makeDistinctSourceStatsSync({
+        category: "Servers",
+        label: "value path servers",
+        distinctEmoji: "🗄️",
+        aboveThresholdEmoji: "🗄️",
+        getEntries: () => Array.from(querysubController(SocketFunction.browserNodeId()).debugGetDetailedSyncing()?.entries() ?? []),
+    });
+
+    let stats: StatDefinition[] = [
+        ...callStatDefs,
+        ...valuePathServerStats,
+        ...callServerStats,
+        ...timingStatDefs,
+        {
+            category: "Sync Footprint", title: "Remote watched paths", emoji: "🔥",
+            threshold: 1000,
+            dietThreshold: 200,
+            getValue: () => (state.remotePathCount),
+        },
+        {
+            category: "Sync Footprint", title: "Local watched paths", emoji: "🏠",
+            threshold: 5000,
+            dietThreshold: 500,
+            getValue: () => (state.localPathCount),
+        },
+        {
+            category: "Sync Footprint", title: "Total values in memory", emoji: "📦",
+            threshold: 25000,
+            getValue: () => (state.totalValueCount),
+        },
+        {
+            category: "Sync Footprint", title: "Active watchers", emoji: "🕵🏻‍♀️",
+            threshold: 1000,
+            dietThreshold: 100,
+            getValue: () => (state.proxyWatcherCount),
+        },
+        {
+            category: "Sync Footprint", title: "Stored value paths on node", emoji: "📄",
+            threshold: 1_000_000,
+            getValue: () => querysubController(SocketFunction.browserNodeId()).debugGetValuePathCount() || 0,
+        },
+    ];
+
+    let summaries = MachineServiceController(getBrowserUrlNode()).getRecentLaunches(LAUNCH_SINCE_DAYS);
+    let crashes = 0;
+    let updates = 0;
+    for (let summary of summaries || []) {
+        if (summary.reason === "crashed") {
+            crashes++;
+        } else {
+            updates++;
+        }
+    }
+    stats.push({
+        category: "Launches", title: `Crashes (last ${LAUNCH_SINCE_DAYS} days)`, emoji: "🚀",
+        getValue: () => crashes,
+        threshold: 1,
+    });
+    stats.push({
+        category: "Launches", title: `Updates (last ${LAUNCH_SINCE_DAYS} days)`, emoji: "🔄",
+        getValue: () => updates,
+        threshold: 100,
+    });
+
+    return stats;
+}

package/src/functional/throttleRender.ts

@@ -6,7 +6,7 @@ import { cache, lazy } from "socket-function/src/caching";
 import { proxyWatcher, SyncWatcher } from "../2-proxy/PathValueProxyWatcher";
 import { qreact } from "../4-dom/qreact";
 import { onNextPaint } from "./onNextPaint";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 
 let disabled = false;
 export function setThrottleRenderDisabled(value: boolean) {

package/src/library-components/AspectSizedComponent.tsx

@@ -1,4 +1,4 @@
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { css } from "../4-dom/css";
 import { qreact } from "../4-dom/qreact";
 

package/src/library-components/Button.tsx

@@ -1,7 +1,7 @@
 import preact from "preact";
 import { isNode, list, nextId } from "socket-function/src/misc";
 import { css } from "typesafecss";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { qreact } from "../4-dom/qreact";
 import { isShowingModal } from "../5-diagnostics/Modal";
 

package/src/library-components/ButtonSelector.tsx

@@ -1,5 +1,5 @@
 import preact from "preact"; import { qreact } from "../../src/4-dom/qreact";
-import { Querysub } from "../../src/4-querysub/QuerysubController";
+import { Querysub } from "../../src/4-querysub/Querysub";
 import { css } from "../../src/4-dom/css";
 import { Button } from "../../src/library-components/Button";
 

package/src/library-components/DropdownCustom.tsx

@@ -1,6 +1,6 @@
 import preact from "preact"; import { qreact } from "../../src/4-dom/qreact";
 
-import { Querysub } from "../../src/4-querysub/QuerysubController";
+import { Querysub } from "../../src/4-querysub/Querysub";
 import { Icon } from "../../src/library-components/icons";
 import { css } from "../../src/4-dom/css";
 import { LengthOrPercentage } from "../../src/4-dom/cssTypes";

package/src/library-components/DropdownSelector.tsx

@@ -1,5 +1,5 @@
 import preact from "preact";
-import { Querysub } from "../../src/4-querysub/QuerysubController";
+import { Querysub } from "../../src/4-querysub/Querysub";
 import { qreact } from "../../src/4-dom/qreact";
 
 

package/src/library-components/Histogram.tsx

@@ -8,7 +8,7 @@ import { atomic, atomicObjectSymbol, atomicObjectWrite } from "../2-proxy/PathVa
 import { getProxyPath } from "../2-proxy/pathValueProxy";
 import { authorityStorage } from "../0-path-value-core/pathValueCore";
 import { addEpsilons } from "../bits";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { MeasuredDiv } from "../library-components/MeasuredDiv";
 
 export type ColumnDesc = {

package/src/library-components/InlinePopup.tsx

@@ -1,5 +1,5 @@
 import preact from "preact";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { qreact } from "../4-dom/qreact";
 import { Button } from "../library-components/Button";
 import { Icon } from "../library-components/icons";

package/src/library-components/LazyComponent.tsx

@@ -1,11 +1,15 @@
 import debugbreak from "debugbreak";
 import { cache, lazy } from "socket-function/src/caching";
 import { isNode, sort } from "socket-function/src/misc";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { qreact } from "../4-dom/qreact";
 import { registerImportBlockers } from "../3-path-functions/pathFunctionLoader";
 
 let nextSeqNum = 0;
+if (!Querysub) {
+    require("debugbreak")(2);
+    debugger;
+}
 let schema = Querysub.createLocalSchema<{
     loaded: { [seqNum: number]: true };
 }>("LazyComponent");

package/src/library-components/StickyBottomScroll.tsx

@@ -1,6 +1,6 @@
 import { css } from "../4-dom/css";
 import { qreact } from "../4-dom/qreact";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 /** MOST of the time ScrollOnMount will work. But sometimes it won't, in which case this case work IF the holder size is fixed.
  *      - This also works well with cases where your content starts small, as this forces you to always have overflow, and also a bit of buffer at the bottom.
  * 

package/src/library-components/TypedConfigEditor.tsx

@@ -1,7 +1,7 @@
 import { qreact } from "../4-dom/qreact";
 import { t } from "../2-proxy/schema2";
 import { css } from "typesafecss";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 
 // Type declarations for Monaco editor
 declare global {

package/src/library-components/URLParam.ts

@@ -4,14 +4,13 @@ import { deepCloneJSON, throttleFunction, timeInMinute } from "socket-function/s
 import { isNode } from "typesafecss";
 import { atomicObjectRead, doAtomicWrites, noAtomicSchema, proxyWatcher } from "../2-proxy/PathValueProxyWatcher";
 import { syncSchema } from "../3-path-functions/syncSchema";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { isDefined } from "../misc";
 import { deserializeURLParam, serializeURLParam } from "./niceStringify";
 import { logErrors } from "../errors";
 import { canHaveChildren } from "socket-function/src/types";
 import { URLOverride } from "./ATag";
-import { lazy } from "socket-function/src/caching";
-import { LOCAL_DOMAIN } from "../0-path-value-core/PathRouter";
+import { LOCAL_DOMAIN } from "../0-path-value-core/PathRouterConstants";
 
 export interface URLParam<T = unknown> {
     value: T;
@@ -85,7 +84,8 @@ export function createURLSync<T>(urlKey: string, defaultValue: T, config?: URLPa
     if (config?.storage === "localStorage") {
         localStorageKeys.add(urlKey);
     }
-    function setDefaults() {
+    async function setDefaults() {
+        let { Querysub } = await import("../4-querysub/Querysub");
         Querysub.localCommit(() => {
             data().defaults[urlKey] = defaultValue;
             if (!(urlKey in loadSearchCache)) {
@@ -93,11 +93,7 @@ export function createURLSync<T>(urlKey: string, defaultValue: T, config?: URLPa
             }
         });
     }
-    if (!Querysub) {
-        setImmediate(setDefaults);
-    } else {
-        setDefaults();
-    }
+    setTimeout(setDefaults);
     function deleteKeys(obj: any) {
         if (!canHaveChildren(obj)) return;
         for (let key in obj) {

package/src/library-components/drag.ts

@@ -1,5 +1,5 @@
 import { nextId, throttleFunction } from "socket-function/src/misc";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { throttleFunctionFast } from "../functional/onNextPaint";
 
 export let dragCount = 0;

package/src/misc/formatJSX.tsx

@@ -1,6 +1,6 @@
 import { qreact } from "../4-dom/qreact";
 import { formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 
 export function formatDateJSX(time: number) {
     let diff = time - Querysub.nowDelayed(10 * 1000);

package/src/user-implementation/userData.ts

@@ -1,5 +1,5 @@
 import { atomic, atomicObjectWrite } from "../2-proxy/PathValueProxyWatcher";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { red } from "socket-function/src/formatting/logColors";
 import { isNode, sha256Hash, timeInHour } from "socket-function/src/misc";
 import { registerAliveChecker } from "../2-proxy/garbageCollection";

package/test2.ts

@@ -7,7 +7,7 @@ import { timeInSecond } from "socket-function/src/misc";
 import { getErrorLogs, getLoggers2Async } from "./src/diagnostics/logs/diskLogger";
 import { watchAllValues } from "./src/diagnostics/logs/errorNotifications2/logWatcher";
 import { delay } from "socket-function/src/batching";
-import { Querysub } from "./src/4-querysub/QuerysubController";
+import { Querysub } from "./src/4-querysub/Querysub";
 
 async function main() {
     await Querysub.hostService("test");

package/testEntry2.ts

@@ -3,7 +3,7 @@ import { getOwnMachineId } from "./src/-a-auth/certs";
 import { getOwnThreadId } from "./src/-f-node-discovery/NodeDiscovery";
 import { shutdown } from "./src/diagnostics/periodic";
 import { testTCPIsListening } from "socket-function/src/networking";
-import { Querysub } from "./src/4-querysub/QuerysubController";
+import { Querysub } from "./src/4-querysub/Querysub";
 import { timeInSecond } from "socket-function/src/misc";
 import { waitForFirstTimeSync } from "socket-function/time/trueTimeShim";