querysub 0.462.0 → 0.463.0

package/src/deployManager/machineApplyMainCode.ts

@@ -3,7 +3,7 @@ import "../inject";
 import { measureWrap } from "socket-function/src/profiling/measure";
 import { getOwnMachineId } from "../-a-auth/certs";
 import { forceRemoveNode, getOurNodeId, getOurNodeIdAssert } from "../-f-node-discovery/NodeDiscovery";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { MACHINE_RESYNC_INTERVAL, MachineServiceControllerBase, MachineInfo, ServiceConfig, serviceConfigs, SERVICE_FOLDER, machineInfos, SERVICE_NODE_FILE_NAME, getEffectiveServiceConfigs, recordLaunch } from "./machineSchema";
 import { runPromise } from "../functional/runCommand";
 import { getExternalIP } from "socket-function/src/networking";

package/src/deployManager/machineController.ts

@@ -6,7 +6,7 @@ import { timeInMinute } from "socket-function/src/misc";
 import { assertIsManagementUser } from "../diagnostics/managementPages";
 import { isNode } from "typesafecss";
 import { streamScreenOutput, getRollingServiceInfo, killRollingServicesForService } from "./machineApplyMainCode";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { getPathStr2 } from "../path";
 import { getGitURLLive, setGitRef } from "../4-deploy/git";
 import os from "os";

package/src/deployManager/machineSchema.ts

@@ -21,7 +21,7 @@ import { runPromise } from "../functional/runCommand";
 import { isNode } from "typesafecss";
 import { DeployProgress, deployFunctions, deployGetFunctions } from "../4-deploy/deployFunctions";
 import { FunctionSpec, functionSchema } from "../3-path-functions/PathFunctionRunner";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { green, red } from "socket-function/src/formatting/logColors";
 import { fsExistsAsync } from "../fs";
 

package/src/deployManager/setupMachineMain.ts

@@ -1,6 +1,6 @@
 import { getBackblazePath } from "../-a-archives/archivesBackBlaze";
 import { getGitURLLive, getGitRefLive } from "../4-deploy/git";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { runPromise } from "../functional/runCommand";
 import fs from "fs";
 import os from "os";

package/src/diagnostics/FunctionCallInfoState.ts

@@ -1,4 +1,4 @@
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { onPredictionFinished } from "../4-querysub/querysubPrediction";
 import { lazy } from "socket-function/src/caching";
 import { t } from "../2-proxy/schema2";
@@ -23,6 +23,7 @@ interface CallStatsData {
     remotePathCount: number;
     totalValueCount: number;
     proxyWatcherCount: number;
+    callsByServer: { [creatorId: string]: number };
     perFunctionStats: {
         [functionId: string]: {
             totalCalls: number;
@@ -56,6 +57,7 @@ let statsData: CallStatsData = {
     remotePathCount: 0,
     totalValueCount: 0,
     proxyWatcherCount: 0,
+    callsByServer: {},
     perFunctionStats: {},
 };
 
@@ -75,8 +77,9 @@ export function callState(): CallStatsData {
 export let ensureSubscribed = lazy(() => {
     onPredictionFinished((data) => {
         statsData.totalCalls++;
-        statsData.totalInternalReruns += data.result.totalInternalLoopCount;
-        statsData.totalFullReruns += data.result.outerLoopCount;
+        statsData.callsByServer[data.creatorId] = (statsData.callsByServer[data.creatorId] || 0) + 1;
+        statsData.totalInternalReruns += data.result.totalInternalLoopCount - 1;
+        statsData.totalFullReruns += data.result.outerLoopCount - 1;
         addToStatsValue(statsData.evalTimeStats, data.result.evalTime);
         addToStatsValue(statsData.timeTakenStats, data.result.timeTaken);
         addToStatsValue(statsData.totalTimeStats, data.result.totalTime);

package/src/diagnostics/MachineThreadInfo.tsx

@@ -15,7 +15,7 @@ import dns from "dns";
 import { isDefined } from "../misc";
 import { getDebuggerUrl } from "./listenOnDebugger";
 import { Button } from "../library-components/Button";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { NodeViewerController } from "./NodeViewer";
 import { showFullscreenModal } from "../5-diagnostics/FullscreenModal";
 import { css } from "../4-dom/css";

package/src/diagnostics/NodeViewer.tsx

@@ -3,7 +3,8 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { css } from "typesafecss";
 import { getAllNodeIds, getBrowserUrlNode, syncNodesNow } from "../../src/-f-node-discovery/NodeDiscovery";
 import { errorToUndefined, errorToUndefinedSilent, logErrors, timeoutToError } from "../../src/errors";
-import { Querysub, QuerysubController } from "../../src/4-querysub/QuerysubController";
+import { QuerysubController } from "../../src/4-querysub/QuerysubController";
+import { Querysub } from "../../src/4-querysub/Querysub";
 import { NodeCapabilitiesController, getControllerNodeIdList } from "../../src/-g-core-values/NodeCapabilities";
 import { lazy } from "socket-function/src/caching";
 import { atomicObjectWrite } from "../../src/2-proxy/PathValueProxyWatcher";

package/src/diagnostics/StatWarning.tsx

@@ -0,0 +1,56 @@
+import { qreact } from "../4-dom/qreact";
+import { css } from "../4-dom/css";
+
+module.hotreload = true;
+
+const FLASH_CLASS_NAME = "StatWarning-flash";
+
+export type StatWarningAction = { label: string; onClick: () => void };
+
+export class StatWarning extends qreact.Component<{
+    emoji: string;
+    name: string;
+    threshold: number;
+    flashing?: boolean;
+    actions?: StatWarningAction[];
+    children?: qreact.ComponentChildren;
+}> {
+    render() {
+        let isFlashing = this.props.flashing !== false;
+        let actions = this.props.actions || [];
+        let alertClass = css.hbox(6).pad2(6, 2) + " " + css.hsl(0, 80, 60)
+            + (isFlashing && (" " + FLASH_CLASS_NAME) || "");
+        let restClass = css.hbox(8).pad2(6, 2).wrap + " " + css.hsl(0, 0, 25);
+        return <div className={css.hbox(0).wrap}>
+            <div className={alertClass}>
+                <span>{this.props.emoji}</span>
+                <span>Threshold exceeded: {this.props.threshold}</span>
+            </div>
+            <div className={restClass}>
+                <span>{this.props.children}</span>
+                <span> -</span>
+                <span>{this.props.name}</span>
+                {actions.map(action =>
+                    <div
+                        className={css.button.pad2(6, 2).background("hsla(0, 0%, 100%, 0.15)")}
+                        onClick={event => {
+                            event.stopPropagation();
+                            action.onClick();
+                        }}
+                    >
+                        {action.label}
+                    </div>
+                )}
+            </div>
+            {isFlashing && <style>{`
+                @keyframes ${FLASH_CLASS_NAME}-anim {
+                    0%, 100% { background-color: hsl(0, 80%, 60%); }
+                    50% { background-color: hsl(0, 80%, 30%); }
+                }
+                .${FLASH_CLASS_NAME} {
+                    animation: ${FLASH_CLASS_NAME}-anim 0.6s infinite;
+                }
+            `}</style>}
+        </div>;
+    }
+}

package/src/diagnostics/StatsHeader.tsx

@@ -0,0 +1,248 @@
+import { qreact } from "../4-dom/qreact";
+import { css } from "../4-dom/css";
+import { t } from "../2-proxy/schema2";
+import { timeInHour } from "socket-function/src/misc";
+import { isCurrentUserSuperUser } from "../user-implementation/userData";
+import { Querysub } from "../4-querysub/Querysub";
+import { StatWarning, StatWarningAction } from "./StatWarning";
+import { getStatOverridesSync, setStatOverride, statOffenderKey } from "./StatsOverrides";
+
+module.hotreload = true;
+
+const IGNORE_SHORT_MS = 12 * timeInHour;
+const IGNORE_LONG_MS = 3 * 24 * timeInHour;
+const PEAK_MULTIPLIER = 2;
+const REEVALUATE_INTERVAL_MS = 60_000;
+
+export interface StatDefinition {
+    category: string;
+    title: string;
+    emoji: string;
+    // Warns when >= threshold
+    threshold: number;
+    // Highlights with a blue background when >= dietThreshold (and below threshold). No dismiss action.
+    dietThreshold?: number;
+    formatter?: (value: number) => qreact.ComponentChildren;
+    getValue: () => number;
+    // Per-instance offenders responsible for the warning; used to render extra "raise/ignore for this one" buttons.
+    getOffenders?: () => { id: string; value: number }[];
+}
+
+let peakValues = new Map<string, number>();
+let offenderPeaks = new Map<string, number>();
+
+type StatInfo = {
+    stat: StatDefinition;
+    value: number;
+    threshold: number;
+    isOverThreshold: boolean;
+    isIgnored: boolean;
+    isOverDiet: boolean;
+};
+
+export class StatsHeader extends qreact.Component<{ getStats: () => StatDefinition[] }> {
+    state = t.state({
+        expanded: t.lookup({ open: t.booleanOptional }),
+        nowTick: t.number,
+    });
+
+    componentDidMount() {
+        setInterval(() => {
+            Querysub.localCommit(() => {
+                this.state.nowTick = Date.now();
+            });
+        }, REEVALUATE_INTERVAL_MS);
+    }
+
+    toggle(category: string) {
+        if (category in this.state.expanded) {
+            delete this.state.expanded[category];
+            return;
+        }
+        this.state.expanded[category] = { open: true };
+    }
+
+    buildInfos(): { categories: string[]; byCategory: Map<string, StatInfo[]>; infos: StatInfo[] } {
+        let now = Date.now();
+        let overrides = getStatOverridesSync();
+        let categories: string[] = [];
+        let byCategory = new Map<string, StatInfo[]>();
+        let infos: StatInfo[] = [];
+
+        for (let stat of this.props.getStats()) {
+            let value = stat.getValue();
+            let priorPeak = peakValues.get(stat.title) || 0;
+            if (value > priorPeak) {
+                peakValues.set(stat.title, value);
+            }
+            if (stat.getOffenders) {
+                for (let offender of stat.getOffenders()) {
+                    let key = statOffenderKey(stat.title, offender.id);
+                    let priorOffenderPeak = offenderPeaks.get(key) || 0;
+                    if (offender.value > priorOffenderPeak) {
+                        offenderPeaks.set(key, offender.value);
+                    }
+                }
+            }
+            let override = overrides[stat.title] || {};
+            let threshold = override.thresholdOverride || stat.threshold;
+            let ignoredUntil = override.ignoreUntilMs || 0;
+            let isOverThreshold = value >= threshold;
+            let isIgnored = isOverThreshold && ignoredUntil > now;
+            let isOverDiet = !isOverThreshold && !!stat.dietThreshold && value >= stat.dietThreshold;
+            let info: StatInfo = { stat, value, threshold, isOverThreshold, isIgnored, isOverDiet };
+            infos.push(info);
+
+            let list = byCategory.get(stat.category);
+            if (!list) {
+                list = [];
+                byCategory.set(stat.category, list);
+                categories.push(stat.category);
+            }
+            list.push(info);
+        }
+
+        return { categories, byCategory, infos };
+    }
+
+    renderWarning(info: StatInfo): qreact.ComponentChildren {
+        let title = info.stat.title;
+        let actions: StatWarningAction[] = [
+            {
+                label: `Raise to ${PEAK_MULTIPLIER}× peak`,
+                onClick: () => {
+                    let peak = peakValues.get(title) || info.value;
+                    setStatOverride(title, { thresholdOverride: peak * PEAK_MULTIPLIER });
+                },
+            },
+            {
+                label: "Ignore 12h",
+                onClick: () => {
+                    setStatOverride(title, { ignoreUntilMs: Date.now() + IGNORE_SHORT_MS });
+                },
+            },
+            {
+                label: "Ignore 3d",
+                onClick: () => {
+                    setStatOverride(title, { ignoreUntilMs: Date.now() + IGNORE_LONG_MS });
+                },
+            },
+        ];
+        if (info.stat.getOffenders) {
+            for (let offender of info.stat.getOffenders()) {
+                let offenderKey = statOffenderKey(title, offender.id);
+                actions.push({
+                    label: `${offender.id}: ${PEAK_MULTIPLIER}× peak`,
+                    onClick: () => {
+                        let peak = offenderPeaks.get(offenderKey) || offender.value;
+                        setStatOverride(offenderKey, { thresholdOverride: peak * PEAK_MULTIPLIER });
+                    },
+                });
+                actions.push({
+                    label: `${offender.id}: ignore 12h`,
+                    onClick: () => {
+                        setStatOverride(offenderKey, { ignoreUntilMs: Date.now() + IGNORE_SHORT_MS });
+                    },
+                });
+                actions.push({
+                    label: `${offender.id}: ignore 3d`,
+                    onClick: () => {
+                        setStatOverride(offenderKey, { ignoreUntilMs: Date.now() + IGNORE_LONG_MS });
+                    },
+                });
+            }
+        }
+        let formatted = info.stat.formatter && info.stat.formatter(info.value) || info.value;
+        return <StatWarning
+            emoji={info.stat.emoji}
+            name={title}
+            threshold={info.threshold}
+            actions={actions}
+        >
+            {formatted}
+        </StatWarning>;
+    }
+
+    renderStatInline(info: StatInfo): qreact.ComponentChildren {
+        let stat = info.stat;
+        let formatted = stat.formatter && stat.formatter(info.value) || info.value;
+        let baseClass = css.hbox(4).pad2(6, 2);
+        let className = info.isOverDiet
+            && baseClass + " " + css.background("hsl(210, 70%, 35%)")
+            || baseClass;
+        let dietSuffix = info.isOverDiet && ` (diet threshold ${stat.dietThreshold})` || "";
+        return <span
+            title={`${stat.title}${dietSuffix}`}
+            className={className}
+        >
+            {stat.emoji} {formatted}
+        </span>;
+    }
+
+    render() {
+        if (!isCurrentUserSuperUser()) return undefined;
+
+        let { categories, byCategory, infos } = this.buildInfos();
+        let activeWarnings = infos.filter(info =>
+            info.isOverThreshold && !info.isIgnored && !(info.stat.category in this.state.expanded)
+        );
+        let activeDietWarnings = infos.filter(info =>
+            info.isOverDiet && !(info.stat.category in this.state.expanded)
+        );
+
+        return <div className={css.vbox(4)}>
+            <div className={css.hbox(2).wrap}>
+                {categories.map(category => {
+                    let isOpen = category in this.state.expanded;
+                    let baseClass = css.button.hbox(4).pad2(10, 4)
+                        .bord(1, "hsla(0, 0%, 100%, 0.25)")
+                        .background(isOpen && "hsla(0, 0%, 100%, 0.18)" || "hsla(0, 0%, 100%, 0.06)");
+                    return <div
+                        className={baseClass + ""}
+                        onClick={() => this.toggle(category)}
+                    >
+                        <span>{category}</span>
+                    </div>;
+                })}
+            </div>
+            {categories.filter(category => category in this.state.expanded).map(category => {
+                let list = byCategory.get(category) || [];
+                let inline = list.filter(info => !info.isOverThreshold);
+                let warnings = list.filter(info => info.isOverThreshold);
+                return <div className={css.vbox(2).pad2(6, 2).background("hsla(0, 0%, 100%, 0.04)")}>
+                    <div className={css.colorhsl(0, 0, 50).fontSize(11)}>{category}</div>
+                    <div className={css.hbox(12).wrap}>
+                        {inline.map(info => this.renderStatInline(info))}
+                    </div>
+                    {warnings.length > 0 && <div className={css.vbox(4)}>
+                        {warnings.map(info => this.renderWarning(info))}
+                    </div>}
+                </div>;
+            })}
+            {activeDietWarnings.length > 0 && <div className={css.vbox(4)}>
+                {(() => {
+                    let dietCategories: string[] = [];
+                    let dietByCategory = new Map<string, StatInfo[]>();
+                    for (let info of activeDietWarnings) {
+                        let list = dietByCategory.get(info.stat.category);
+                        if (!list) {
+                            list = [];
+                            dietByCategory.set(info.stat.category, list);
+                            dietCategories.push(info.stat.category);
+                        }
+                        list.push(info);
+                    }
+                    return dietCategories.map(category =>
+                        <div className={css.hbox(8).wrap}>
+                            <span className={css.colorhsl(0, 0, 50).fontSize(11)}>{category}</span>
+                            {(dietByCategory.get(category) || []).map(info => this.renderStatInline(info))}
+                        </div>
+                    );
+                })()}
+            </div>}
+            {activeWarnings.length > 0 && <div className={css.vbox(4)}>
+                {activeWarnings.map(info => this.renderWarning(info))}
+            </div>}
+        </div>;
+    }
+}

package/src/diagnostics/StatsOverrides.ts

@@ -0,0 +1,50 @@
+import { Querysub } from "../4-querysub/Querysub";
+import { t } from "../2-proxy/schema2";
+
+const LOCAL_STORAGE_KEY = "StatsHeader.overrides.v2";
+
+export type StatOverride = { thresholdOverride?: number; ignoreUntilMs?: number };
+type OverridesMap = { [key: string]: StatOverride };
+
+let cachedOverrides: OverridesMap | undefined;
+
+let overridesSchema = Querysub.createLocalSchema("statsOverrides", {
+    sequenceNumber: t.number,
+});
+
+function loadFromStorage(): OverridesMap {
+    if (cachedOverrides) {
+        return cachedOverrides;
+    }
+    try {
+        let raw = localStorage.getItem(LOCAL_STORAGE_KEY);
+        cachedOverrides = raw && JSON.parse(raw) as OverridesMap || {};
+    } catch (e) {
+        console.error(`StatsOverrides: failed to load:`, (e as Error)?.stack || e);
+        cachedOverrides = {};
+    }
+    return cachedOverrides;
+}
+
+export function getStatOverridesSync(): OverridesMap {
+    overridesSchema().sequenceNumber;
+    return loadFromStorage();
+}
+
+export function getStatOverrideSync(key: string): StatOverride {
+    return getStatOverridesSync()[key] || {};
+}
+
+export function setStatOverride(key: string, patch: StatOverride) {
+    let current = loadFromStorage();
+    let next: OverridesMap = { ...current };
+    next[key] = { ...next[key], ...patch };
+    cachedOverrides = next;
+    localStorage.setItem(LOCAL_STORAGE_KEY, JSON.stringify(next));
+    let schema = overridesSchema();
+    schema.sequenceNumber = schema.sequenceNumber + 1;
+}
+
+export function statOffenderKey(statTitle: string, offenderId: string): string {
+    return `${statTitle}::${offenderId}`;
+}

package/src/diagnostics/SyncTestPage.tsx

@@ -2,7 +2,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../4-dom/qreact";
 import { assertIsManagementUser } from "./managementPages";
 import { getSyncedController } from "../library-components/SyncedController";
-import { Querysub } from "../4-querysub/QuerysubController";
+import { Querysub } from "../4-querysub/Querysub";
 import { isRegisteredUserPERMISSIONS, isSuperUserPERMISSIONS } from "../user-implementation/userData";
 import { css } from "typesafecss";
 import { Button } from "../library-components/Button";
@@ -58,7 +58,7 @@ let { data, functions } = Querysub.createSchema({
                 }
                 for (let path of watcher.pendingWatches.paths) {
                     if (!path.includes("syncText")) continue;
-                    let pathValue = authorityStorage.getValueAtTime(path, undefined, false, "noAudit");
+                    let pathValue = authorityStorage.getValueAtOrBeforeTime(path, undefined, false, "noAudit");
                     let source = remoteWatcher.getExistingWatchRemoteNodeId(path);
                     console.log("Path value", pathValue?.time.time, pathValueSerializer.getPathValue(pathValue), path, source);
                 }
@@ -315,7 +315,7 @@ class SyncTestControllerBase {
     }
 
     public async getValueAndTime(path: string) {
-        let pathValue = authorityStorage.getValueAtTime(path, undefined, false, "noAudit");
+        let pathValue = authorityStorage.getValueAtOrBeforeTime(path, undefined, false, "noAudit");
         let value = pathValueSerializer.getPathValue(pathValue);
         let time = pathValue?.time.time;
         return { value, time };

package/src/diagnostics/TimeDebug.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 { formatTime } from "socket-function/src/formatting/format";
 import { getTrueTimeOffset } from "socket-function/time/trueTimeShim";
 import { css } from "typesafecss";

package/src/diagnostics/debugger/mcp-server.ts

@@ -41,7 +41,7 @@ import * as dns from "dns";
 import "../../inject";
 
 import { DebuggerRemote } from "./debugger-remote";
-import { Querysub } from "../../4-querysub/QuerysubController";
+import { Querysub } from "../../4-querysub/Querysub";
 import { getAllNodeIds } from "../../-f-node-discovery/NodeDiscovery";
 import { NodeCapabilitiesController } from "../../-g-core-values/NodeCapabilities";
 import { timeoutToUndefinedSilent } from "../../errors";

package/src/diagnostics/grossStats/GrossStatsPage.tsx

@@ -1,7 +1,7 @@
 import preact from "preact";
 import { qreact } from "../../4-dom/qreact";
 import { css } from "../../4-dom/css";
-import { Querysub } from "../../4-querysub/QuerysubController";
+import { Querysub } from "../../4-querysub/Querysub";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { formatDateTime, formatNumber } from "socket-function/src/formatting/format";
 import { timeInHour, timeInMinute } from "socket-function/src/misc";

package/src/diagnostics/logs/IndexedLogs/LogViewer3.tsx

@@ -8,7 +8,7 @@ import { getLoggers2Async, LogDatum } from "../diskLogger";
 import { list, timeInDay, timeInHour, keyByArray, sort, throttleFunction } from "socket-function/src/misc";
 import { formatDateTime, formatDateTimeDetailed, formatNumber, formatTime, formatPercent } from "socket-function/src/formatting/format";
 import { IndexedLogs, TimeFilePathWithSize } from "./IndexedLogs";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { URLParam } from "../../../library-components/URLParam";
 import { getOwnMachineId, getOwnThreadId } from "../../../-f-node-discovery/NodeDiscovery";
 import { FilePathSelector, FilePathsByMachine } from "./FilePathSelector";

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

@@ -15,7 +15,7 @@ import "../../../inject";
 
 import * as http from "http";
 import { logErrors, timeoutToUndefinedSilent } from "../../../errors";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { MCPIndexedLogs } from "./MCPIndexedLogs";
 import { getAllNodeIds } from "../../../-f-node-discovery/NodeDiscovery";
 import { NodeCapabilitiesController } from "../../../-g-core-values/NodeCapabilities";

package/src/diagnostics/logs/TimeRangeSelector.tsx

@@ -6,7 +6,7 @@ import { css } from "../../4-dom/css";
 import { formatTime } from "socket-function/src/formatting/format";
 import { InputLabel } from "../../library-components/InputLabel";
 import { Button } from "../../library-components/Button";
-import { Querysub } from "../../4-querysub/QuerysubController";
+import { Querysub } from "../../4-querysub/Querysub";
 import { timeInDay, timeInHour, timeInMinute } from "socket-function/src/misc";
 
 // URL parameters for time range

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

@@ -4,7 +4,7 @@ import { css } from "typesafecss";
 import { LogDatum } from "../diskLogger";
 import { sort, timeInDay } from "socket-function/src/misc";
 import { formatDateTime, formatNumber, formatTime } from "socket-function/src/formatting/format";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { InputLabel } from "../../../library-components/InputLabel";
 import { isPublic } from "../../../config";
 import { MachineThreadInfo } from "../../MachineThreadInfo";

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

@@ -1,7 +1,6 @@
 import { qreact } from "../../../4-dom/qreact";
 import { t } from "../../../2-proxy/schema2";
 import { css } from "typesafecss";
-import { Querysub } from "../../../4-querysub/QuerysubController";
 import { ATag } from "../../../library-components/ATag";
 import { managementPageURL, showingManagementURL } from "../../managementPages";
 import { LogDatumRenderer } from "./ErrorNotificationPage";

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

@@ -2,7 +2,7 @@ import { cacheLimited, lazy } from "socket-function/src/caching";
 import { nestArchives } from "../../../-a-archives/archives";
 import { getArchivesBackblaze } from "../../../-a-archives/archivesBackBlaze";
 import { archiveJSONT } from "../../../-a-archives/archivesJSONT";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { getDomain, isPublic } from "../../../config";
 import { MachineInfo } from "../../../deployManager/machineSchema";
 import { createMatchesPattern } from "../IndexedLogs/bufferSearchFindMatcher";

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

@@ -2,7 +2,7 @@ import "../../../forceProduction";
 import "../../../inject";
 
 import { logErrors } from "../../../errors";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { exposeErrorWatchService } from "./errorNotifications";
 
 logErrors(main());

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

@@ -2,7 +2,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { lazy } from "socket-function/src/caching";
 import { nextId } from "socket-function/src/misc";
 import { t } from "../../../2-proxy/schema2";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { LogDatum } from "../diskLogger";
 import { SuppressionMatch, watchUnmatchedErrors, ErrorNotificationsController } from "./errorNotifications";
 

package/src/diagnostics/logs/lifeCycleAnalysis/LifeCycleEntryEditor.tsx

@@ -3,7 +3,7 @@ import { deepCloneJSON } from "socket-function/src/misc";
 import { css } from "typesafecss";
 import { t } from "../../../2-proxy/schema2";
 import { qreact } from "../../../4-dom/qreact";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { Button } from "../../../library-components/Button";
 import { InputLabel } from "../../../library-components/InputLabel";
 import { LogDatum } from "../diskLogger";

package/src/diagnostics/logs/lifeCycleAnalysis/LifeCycleEntryReadMode.tsx

@@ -3,7 +3,7 @@ import { deepCloneJSON } from "socket-function/src/misc";
 import { css } from "typesafecss";
 import { t } from "../../../2-proxy/schema2";
 import { qreact } from "../../../4-dom/qreact";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { Button } from "../../../library-components/Button";
 import { niceStringify } from "../../../niceStringify";
 import { LogDatum } from "../diskLogger";

package/src/diagnostics/logs/lifeCycleAnalysis/LifeCyclePage.tsx

@@ -2,7 +2,7 @@ import { qreact } from "../../../4-dom/qreact";
 import { t } from "../../../2-proxy/schema2";
 import { css } from "typesafecss";
 import { deepCloneJSON, nextId, sort } from "socket-function/src/misc";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { InputLabel } from "../../../library-components/InputLabel";
 import { Button } from "../../../library-components/Button";
 import { LifeCycle, LifeCycleEntry, LifeCyclesController, getVariables } from "./lifeCycles";

package/src/diagnostics/logs/lifeCycleAnalysis/LifeCycleRenderer.tsx

@@ -4,7 +4,7 @@ import { deepCloneJSON, nextId } from "socket-function/src/misc";
 import { css } from "typesafecss";
 import { t } from "../../../2-proxy/schema2";
 import { qreact } from "../../../4-dom/qreact";
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { formatValue } from "../../../5-diagnostics/GenericFormat";
 import { Button } from "../../../library-components/Button";
 import { InputLabel } from "../../../library-components/InputLabel";

package/src/diagnostics/logs/lifeCycleAnalysis/lifeCycleSearch.tsx

@@ -1,4 +1,4 @@
-import { Querysub } from "../../../4-querysub/QuerysubController";
+import { Querysub } from "../../../4-querysub/Querysub";
 import { getTimeRange } from "../TimeRangeSelector";
 import { throttleFunction, sort } from "socket-function/src/misc";
 import { getLoggers2Async, LogDatum } from "../diskLogger";