querysub 0.697.0 → 0.699.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.697.0",
+  "version": "0.699.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -80,7 +80,7 @@
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
     "sliftutils": "^1.7.149",
-    "socket-function": "^1.2.36",
+    "socket-function": "^1.3.1",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",
     "typesafecss": "^0.32.0",

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

@@ -492,7 +492,6 @@ export class PathRouter {
     public static isLocalPath(path: string): boolean {
         return path.startsWith(LOCAL_DOMAIN_PATH);
     }
-    @measureFnc
     public static isSelfAuthority(path: string): boolean {
         if (this.isLocalPath(path)) return true;
         let ourSpec = authorityLookup.getOurSpec();

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

@@ -15,7 +15,6 @@ import { isDefined } from "../misc";
 
 class ValidStateComputer {
 
-    @measureFnc
     public ingestValuesAndValidStates(config: {
         pathValues: PathValue[];
         parentSyncs: { parentPath: string; sourceNodeId: string }[];

package/src/1-path-client/pathValueClientWatcher.ts

@@ -557,7 +557,6 @@ export class ClientWatcher {
     //  - You can just fragment your writes into different components to isolate any slow loading parts, so partial
     //      loading of data really isn't needed.
     // NOTE: Takes ownership of paths and parentPaths, so... don't mutate them after calling this!
-    @measureFnc
     public setWatches(watchSpec: WatchSpec) {
         // NOTE: Yes, setWatches shows up as being slow in the profiler. I added measureBlock to every single section, and none of them showed up as being slow.
         //  - My best guess is that after we clobber values in various lookups, but BEFORE we return, the destructor for those old resources runs. So their destruct time gets put in our profiler?
@@ -663,7 +662,6 @@ export class ClientWatcher {
     // NOTE: This synchronously predicts the values, so you don't need to wait. When the promise resolves
     //  the values will be committed and they won't belost (although it is still possible for them to become
     //  rejected).
-    @measureFnc
     public setValues(
         config: {
             values: Map<string, Value>;

package/src/2-proxy/PathValueProxyWatcher.ts

@@ -581,8 +581,7 @@ export class PathValueProxyWatcher {
         }
     };
 
-    // TEMPORARY measure, remove once the catalog import's slowness is found.
-    public getCallbackPathValue = measureWrap((pathStr: string, syncParentKeys?: "parentKeys"): PathValue | undefined => {
+    public getCallbackPathValue = ((pathStr: string, syncParentKeys?: "parentKeys"): PathValue | undefined => {
         const watcher = this.runningWatcher;
         if (!watcher) {
             debugger;
@@ -671,9 +670,8 @@ export class PathValueProxyWatcher {
         }
 
         return pathValue;
-    }, "PathValueProxyWatcher|getCallbackPathValue");
-    // TEMPORARY measure, remove once the catalog import's slowness is found.
-    public getCallback = measureWrap((pathStr: string, syncParentKeys?: "parentKeys", readTransparent?: "readTransparent"): { value: unknown } | undefined => {
+    });
+    public getCallback = ((pathStr: string, syncParentKeys?: "parentKeys", readTransparent?: "readTransparent"): { value: unknown } | undefined => {
         if (this.runningWatcher && this.runningWatcher.evaluationGetCallbacks.length > 0) {
             for (let callback of this.runningWatcher.evaluationGetCallbacks) callback(pathStr);
         }
@@ -752,7 +750,7 @@ export class PathValueProxyWatcher {
             }
             return { value: readValue };
         }
-    }, "PathValueProxyWatcher|getCallback");
+    });
 
     // We exclude undefined, BUT, we include "null", etc.
     //  - This differs from javascript, but... due to how deletions work, we can't/don't differentiate between
@@ -762,8 +760,7 @@ export class PathValueProxyWatcher {
         return value?.value !== undefined;
     };
 
-    // TEMPORARY measure, remove once the catalog import's slowness is found.
-    public setCallback = measureWrap((pathStr: string, value: unknown, inRecursion = false, allowSpecial = false): void => {
+    public setCallback = ((pathStr: string, value: unknown, inRecursion = false, allowSpecial = false): void => {
         if (this.runningWatcher && this.runningWatcher.evaluationSetCallbacks.length > 0) {
             for (let callback of this.runningWatcher.evaluationSetCallbacks) callback(pathStr);
         }
@@ -939,10 +936,9 @@ export class PathValueProxyWatcher {
             }
             watcher.pendingWrites.set(pathStr, value);
         }
-    }, "PathValueProxyWatcher|setCallback");
+    });
     /** Syncs keys AND values (as we won't return a key for a value that is undefined). */
-    // TEMPORARY measure, remove once the catalog import's slowness is found.
-    public getKeys = measureWrap((pathStr: string): string[] => {
+    public getKeys = ((pathStr: string): string[] => {
         if (this.runningWatcher && this.runningWatcher.evaluationGetKeysCallbacks.length > 0) {
             for (let callback of this.runningWatcher.evaluationGetKeysCallbacks) callback(pathStr);
         }
@@ -1026,7 +1022,7 @@ export class PathValueProxyWatcher {
         keysArray.sort();
 
         return keysArray;
-    }, "PathValueProxyWatcher|getKeys");
+    });
 
     private getSymbol = (pathStr: string, symbol: symbol): { value: unknown } | undefined => {
         if (symbol === Symbol.toPrimitive) return {

package/src/4-deploy/git.ts

@@ -144,6 +144,10 @@ export async function getGitDiff(gitDir = "."): Promise<string> {
     return diff;
 }
 
+export async function gitPull(gitDir = ".") {
+    await runGitCommand(`git pull`, { cwd: gitDir });
+}
+
 export async function getLatestRefOnUpstreamBranch(gitDir = ".") {
     await runGitCommand(`git fetch`, { cwd: gitDir });
     return (await runGitCommand(`git rev-parse @{upstream}`, { cwd: gitDir })).trim();

package/src/deployManager/components/deployButtons.tsx

@@ -108,7 +108,6 @@ export function confirmNoOverlapDeploy(actionLabel: string, onConfirm: () => voi
 
 const CONFIRM_LIST_MAX_HEIGHT = 220;
 
-/** Deploying every outdated service restarts all of them at once, which is most of the cluster — worth naming what is about to restart before it happens. */
 class DeployAllConfirmModal extends qreact.Component<{ titles: string[]; latestRef: string; onConfirm: () => void }> {
     render() {
         let count = this.props.titles.length;
@@ -149,16 +148,14 @@ export class UpdateButtons extends qreact.Component<{
     state = t.state({
         isDeploying: t.type(false),
     });
-    // Deploys all outdated services to latestRef, always immediately. The overlap is what keeps the service up - the old instances keep running for it, so connections have somewhere to go while clients move across.
-    private deployAll(outdatedServices: ServiceConfig[], latestRef: string) {
+    private deployAll(outdatedServices: ServiceConfig[], latestRef: string, noOverlap: boolean) {
         this.state.isDeploying = true;
         // Props are synchronized state, so everything the async work needs is cloned into plain locals HERE, in the synced part
         let toDeploy = outdatedServices.map(service => {
             let updated = deepCloneJSON(service);
             updated.parameters.gitRef = latestRef;
             updated.parameters.releaseTime = Date.now();
-            // Always set, never inherited: the overlap belongs to the deploy being made, and leaving the previous deploy's value in place means one no-overlap deploy silently makes every later deploy a no-overlap one.
-            updated.parameters.overlapTime = DEFAULT_OVERLAP_TIME;
+            updated.parameters.overlapTime = noOverlap ? 0 : DEFAULT_OVERLAP_TIME;
             return updated;
         });
         let controller = MachineServiceController(SocketFunction.browserNodeId());
@@ -232,7 +229,7 @@ export class UpdateButtons extends qreact.Component<{
                         confirmDeployAll({
                             titles: outdatedServices.map(service => service.info.title),
                             latestRef: gitInfo.latestRef,
-                            onConfirm: () => this.deployAll(outdatedServices, gitInfo.latestRef),
+                            onConfirm: () => this.deployAll(outdatedServices, gitInfo.latestRef, false),
                         });
                     }}
                 >
@@ -249,15 +246,17 @@ export class UpdateButtons extends qreact.Component<{
                     </div>)}
                 </button>
                 <button
-                    className={buttonStyle.hsl(45, 85, 82)}
+                    className={buttonStyle.hsl(0, 85, 70)}
                     disabled={this.state.isDeploying}
-                    title="Deploys every outdated service straight away, without asking. Same overlap as the confirmed deploy — the old instances keep running before shutting down"
+                    title="Deploys now AND shuts the old instances down as soon as the new ones are up (overlap of 0)"
                     onClick={() => {
-                        this.deployAll(outdatedServices, gitInfo.latestRef);
+                        confirmNoOverlapDeploy(`Deploy All (${outdatedServices.length}), No Overlap`, () => {
+                            this.deployAll(outdatedServices, gitInfo.latestRef, true);
+                        });
                     }}
                 >
                     <div>
-                        {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All Now (${outdatedServices.length})`}</span>
+                        {bigEmoji("⚡")} <span>{this.state.isDeploying && "⏳ Deploying..." || `Deploy All (${outdatedServices.length}), No Overlap`}</span>
                     </div>
                 </button>
             </>}

package/src/errors.ts

@@ -121,6 +121,24 @@ export function errorify(error: any, messageOverride?: string) {
     return errorObj;
 }
 
+const STACK_FRAME_PREFIX = /^(\s*)at\s+/;
+const STACK_FRAME_POSITION = /:(\d+):(\d+)\)?\s*$/;
+
+export function filterErrorStack(error: unknown): string {
+    let stack = errorify(error).stack || "";
+    return stack.split("\n").map(filterStackFrame).join("\n");
+}
+
+function filterStackFrame(line: string): string {
+    let prefix = STACK_FRAME_PREFIX.exec(line);
+    if (!prefix) return line;
+    let name = line.slice(prefix[0].length).split(" (")[0].trim();
+    if (name.includes("://")) name = "";
+    let position = STACK_FRAME_POSITION.exec(line);
+    if (!position) return `${prefix[1]}at ${name}`;
+    return `${prefix[1]}at ${name && name + " " || ""}(${position[1]}:${position[2]})`;
+}
+
 export function assertValue<T>(value: T | undefined | null, message?: string): T {
     if (value === undefined || value === null) {
         throw new Error(`Value is ${value === undefined ? "undefined" : "null"}, ${message}`);

package/src/library-components/EdgeNodeSelector.tsx

@@ -1,7 +1,7 @@
 import { css } from "typesafecss";
 import { qreact } from "../4-dom/qreact";
 import { Querysub } from "../4-querysub/Querysub";
-import { sort, timeInSecond } from "socket-function/src/misc";
+import { sort, timeInMinute, timeInSecond } from "socket-function/src/misc";
 import { formatTime } from "socket-function/src/formatting/format";
 import { isCurrentUserSuperUser } from "../user-implementation/userData";
 import type { EdgeNodeConfig, EdgeNodeStat } from "../4-deploy/edgeNodes";
@@ -12,8 +12,7 @@ const EDGE_NODE_URL_PARAM = "edgenode";
 export class EdgeNodeSelector extends qreact.Component<{}> {
     render() {
         if (!(isCurrentUserSuperUser() || location.hostname.startsWith("127-0-0-1"))) return undefined;
-        // The stats are a plain global the bootstrapper updates as its probes finish, so we re-read them every second
-        Querysub.nowDelayed(timeInSecond);
+        Querysub.nowDelayed(timeInMinute);
         let stats = globalThis.EDGE_NODE_STATS;
         const booted = (globalThis as any).BOOTED_EDGE_NODE as EdgeNodeConfig | undefined;
         if (!booted) return undefined;

package/src/library-components/InputLabel.tsx

@@ -50,7 +50,6 @@ export class InputLabel extends qreact.Component<InputLabelProps> {
     render() {
         let { ...props } = { ...this.props };
         let label = props.label || this.props.children;
-        (this.props as any).title = this.props.tooltip;
         if (props.fontSize !== undefined) {
             props.style = { ...props.style as any, fontSize: props.fontSize };
         }
@@ -152,7 +151,7 @@ export class InputLabel extends qreact.Component<InputLabelProps> {
             </span>;
         }
         return (
-            <label onClick={onClick} class={
+            <label onClick={onClick} title={props.tooltip} class={
                 css.hbox(props.checkbox ? CHECKBOX_LABEL_GAP : LABEL_GAP).button.relative
                 + " trigger-hover "
                 + props.outerClass

package/src/library-components/SimpleNotification.tsx

@@ -29,6 +29,7 @@ export class SimpleNotification extends qreact.Component<{
     seqNum = nextSeqNum++;
     render() {
         let { type, title, children, usesClickEvents } = this.props;
+
         let color = (
             type === "info" && { h: 188, s: 52 }
             || type === "warn" && { h: 50, s: 100 }
@@ -51,7 +52,10 @@ export class SimpleNotification extends qreact.Component<{
                     + " " + animClassName
                 }
                 onClick={() => {
-                    void navigator.clipboard.writeText(title);
+                    let copyText = this.props.tooltip || title;
+                    Querysub.onCommitFinished(() => {
+                        void navigator.clipboard.writeText(copyText);
+                    });
                     if (!usesClickEvents) {
                         closeCurrentNotification();
                     }

package/src/library-components/URLParam.ts

@@ -235,7 +235,7 @@ function loadParamsFromURL() {
 }
 
 function syncStateToStorage() {
-    Querysub.createWriteWatcher(function syncStateToURL() {
+    Querysub.createWriteWatcher(function syncStateToStorage() {
         for (let [key, value] of Object.entries(data().params)) {
             if (localStorageKeys.has(key)) {
                 localStorage.setItem(key, JSON.stringify(value));

package/src/library-components/uncaughtToast.tsx

@@ -4,6 +4,7 @@ import { SimpleNotification } from "./SimpleNotification";
 import { qreact } from "../4-dom/qreact";
 import { Querysub } from "../4-querysub/Querysub";
 import { css } from "../4-dom/css";
+import { filterErrorStack } from "../errors";
 
 function onUncaught(...args: unknown[]) {
     let error = args[4] as Error;
@@ -66,7 +67,7 @@ function onMessage(config: {
             notification: <SimpleNotification
                 type={config.type}
                 title={title}
-                tooltip={config.stack}
+                tooltip={filterErrorStack(config.stack)}
             >
                 {/* NOTE: I've stopping showing this info. It's annoying, as they can just look in the console
                 (as most of these come from console.error anyways). */}