querysub 0.590.0 → 0.591.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.590.0",
+  "version": "0.591.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -71,7 +71,7 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.65",
+    "sliftutils": "^1.7.66",
     "socket-function": "^1.2.27",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",

package/src/-a-archives/archiveCache2.ts

@@ -116,7 +116,7 @@ export function wrapArchivesWithCache2(archives: IArchives, rootConfig?: {
         get2: async (fileName: string, config?: GetConfig) => {
             let result = await archives.get2(fileName, config);
             // Range reads are partial, so they can't populate the cache.
-            if (result && !config?.range) {
+            if (result?.data && !config?.range) {
                 await cacheBuffer(fileName, result.data);
             }
             return result;

package/src/deployManager/components/ServiceMeasureBars.tsx

@@ -2,7 +2,8 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../4-dom/qreact";
 import { css } from "typesafecss";
 import { formatNumber, formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
-import { timeoutToUndefinedSilent, timeInSecond } from "socket-function/src/misc";
+import { timeInSecond } from "socket-function/src/misc";
+import { timeoutToError } from "../../errors";
 import { StatsValue, getStatsTop } from "socket-function/src/profiling/stats";
 import type { MeasureChunk, MeasureSummary } from "../../diagnostics/watchdog";
 import { NodeCapabilitiesController } from "../../-g-core-values/NodeCapabilities";
@@ -10,19 +11,19 @@ import { getSyncedController } from "../../library-components/SyncedController";
 import { assertIsManagementUser } from "../../diagnostics/managementPages";
 
 const NODE_CALL_TIMEOUT = timeInSecond * 10;
-const BAR_HEIGHT_PX = 10;
-const MIN_SEGMENT_WIDTH_PX = 30;
+const BAR_HEIGHT_PX = 6;
+const MIN_BAR_WIDTH_PX = 30;
+// Green at idle, red at fully busy.
+const BAR_IDLE_HUE = 120;
+const BAR_FLASH_THRESHOLD = 0.6;
+const FLASH_CLASS_NAME = "ServiceMeasureBars-flash";
 
 class ServiceMeasureControllerBase {
-    public async getMeasureSummaries(nodeIds: string[]): Promise<Record<string, MeasureSummary | undefined>> {
-        let result: Record<string, MeasureSummary | undefined> = {};
-        await Promise.all(nodeIds.map(async nodeId => {
-            result[nodeId] = await timeoutToUndefinedSilent(NODE_CALL_TIMEOUT, NodeCapabilitiesController.nodes[nodeId].getMeasureSummary());
-        }));
-        return result;
+    public async getMeasureSummary(nodeId: string): Promise<MeasureSummary | undefined> {
+        return await timeoutToError(NODE_CALL_TIMEOUT, NodeCapabilitiesController.nodes[nodeId].getMeasureSummary(), () => new Error(`Timed out asking ${nodeId} for its measure summary`));
     }
     public async getMeasureBreakdown(nodeId: string, range: { startTime: number; endTime: number }): Promise<{ chunk?: MeasureChunk }> {
-        let chunk = await timeoutToUndefinedSilent(NODE_CALL_TIMEOUT, NodeCapabilitiesController.nodes[nodeId].getMeasureBreakdown(range));
+        let chunk = await timeoutToError(NODE_CALL_TIMEOUT, NodeCapabilitiesController.nodes[nodeId].getMeasureBreakdown(range), () => new Error(`Timed out asking ${nodeId} for its measure breakdown`));
         return { chunk };
     }
 }
@@ -30,7 +31,7 @@ export const ServiceMeasureController = getSyncedController(SocketFunction.regis
     "ServiceMeasureController-3f8c1de2-5b74-4e0f-a6c9-8d21f47b90a5",
     new ServiceMeasureControllerBase(),
     () => ({
-        getMeasureSummaries: { hooks: [assertIsManagementUser], compress: true },
+        getMeasureSummary: { hooks: [assertIsManagementUser], compress: true },
         getMeasureBreakdown: { hooks: [assertIsManagementUser], compress: true },
     }),
     () => ({
@@ -41,52 +42,55 @@ function percent(value: number) {
     return `${(value * 100).toFixed(2)}%`;
 }
 
-function nameHue(name: string) {
-    let hash = 0;
-    for (let i = 0; i < name.length; i++) {
-        hash = (hash * 31 + name.charCodeAt(i)) | 0;
-    }
-    return Math.abs(hash) % 360;
-}
-
 export class ServiceMeasureBars extends qreact.Component<{
     serviceNodeIds: string[];
-    /** Every node id on the page, so all rows share one cached call. */
-    allNodeIds: string[];
     expandedNodeId: string;
     onToggleNode: (nodeId: string) => void;
 }> {
     render() {
         let controller = ServiceMeasureController(SocketFunction.browserNodeId());
-        let summaries = controller.getMeasureSummaries(this.props.allNodeIds);
-        if (!summaries) return undefined;
 
-        return <div className={css.vbox(2)}>
+        return <div className={css.vbox(1).alignItems("stretch")}>
             {this.props.serviceNodeIds.map(nodeId => {
-                let summary = summaries[nodeId];
+                let isExpanded = this.props.expandedNodeId === nodeId;
+                let summary: MeasureSummary | undefined;
+                try {
+                    summary = controller.getMeasureSummary(nodeId);
+                } catch (err) {
+                    return <div key={nodeId}
+                        className={css.height(BAR_HEIGHT_PX).hsl(0, 70, 55)}
+                        title={`Node did not respond (it likely doesn't have the measure API yet)\n${nodeId}\n${(err as Error).stack ?? err}`}
+                    />;
+                }
                 if (!summary) return undefined;
                 let timeRunFor = summary.endTime - summary.startTime;
                 if (timeRunFor <= 0) return undefined;
-                let isExpanded = this.props.expandedNodeId === nodeId;
-                return <div key={nodeId}
-                    className={
-                        css.hbox(1).wrap.button
-                        + (isExpanded && css.outline("1px solid hsl(210, 60%, 50%)") || "")
-                    }
-                    onClick={() => this.props.onToggleNode(nodeId)}
-                >
-                    {summary.entries.map(entry => {
-                        let fraction = entry.ownTime / timeRunFor;
-                        return <div key={entry.name}
-                            className={css
-                                .height(BAR_HEIGHT_PX)
+                let fraction = summary.profiledTime / timeRunFor;
+                let clampedFraction = Math.min(1, Math.max(0, fraction));
+                let hue = BAR_IDLE_HUE * (1 - clampedFraction);
+                let isFlashing = fraction > BAR_FLASH_THRESHOLD;
+                return <div key={nodeId} className={css.hbox(0)}>
+                    <div
+                        className={
+                            css.height(BAR_HEIGHT_PX)
                                 .width(`${fraction * 100}%`)
-                                .minWidth(MIN_SEGMENT_WIDTH_PX)
-                                .background(`hsl(${nameHue(entry.name)}, 60%, 60%)`)
-                            }
-                            title={`${entry.name}\n${formatTime(entry.ownTime)} (${percent(fraction)} of ${formatTime(timeRunFor)} profiled)\n${nodeId}`}
-                        />;
-                    })}
+                                .minWidth(MIN_BAR_WIDTH_PX)
+                                .button
+                                .hsl(hue, 70, isExpanded ? 40 : 55)
+                            + (isFlashing && (" " + FLASH_CLASS_NAME) || "")
+                        }
+                        title={`Profiled ${formatTime(summary.profiledTime)} of ${formatTime(timeRunFor)} (${percent(fraction)} CPU)\n${nodeId}`}
+                        onClick={() => this.props.onToggleNode(nodeId)}
+                    />
+                    {isFlashing && <style>{`
+                        @keyframes ${FLASH_CLASS_NAME}-anim {
+                            0%, 100% { opacity: 1; }
+                            50% { opacity: 0.3; }
+                        }
+                        .${FLASH_CLASS_NAME} {
+                            animation: ${FLASH_CLASS_NAME}-anim 0.8s infinite;
+                        }
+                    `}</style>}
                 </div>;
             })}
         </div>;
@@ -95,15 +99,21 @@ export class ServiceMeasureBars extends qreact.Component<{
 
 export class ServiceMeasureBreakdown extends qreact.Component<{
     nodeId: string;
-    allNodeIds: string[];
 }> {
     render() {
         let controller = ServiceMeasureController(SocketFunction.browserNodeId());
-        let summaries = controller.getMeasureSummaries(this.props.allNodeIds);
-        let summary = summaries?.[this.props.nodeId];
-        if (!summary) return undefined;
-
-        let result = controller.getMeasureBreakdown(this.props.nodeId, { startTime: summary.startTime, endTime: summary.endTime });
+        let summary: MeasureSummary | undefined;
+        let result: { chunk?: MeasureChunk } | undefined;
+        try {
+            summary = controller.getMeasureSummary(this.props.nodeId);
+            if (!summary) return undefined;
+            result = controller.getMeasureBreakdown(this.props.nodeId, { startTime: summary.startTime, endTime: summary.endTime });
+        } catch (err) {
+            return <div className={css.pad2(10).hsl(0, 70, 92).bord2(0, 0, 20)}>
+                <div className={css.boldStyle.colorhsl(0, 70, 35)}>Node did not respond (it likely doesn't have the measure API yet)</div>
+                <pre className={css.whiteSpace("pre-wrap").fontSize(12)}>{(err as Error).stack ?? String(err)}</pre>
+            </div>;
+        }
         if (!result) {
             return <div className={css.pad2(10).hsl(0, 0, 98).bord2(0, 0, 20)}>Loading breakdown...</div>;
         }

package/src/deployManager/components/ServicesListPage.tsx

@@ -81,7 +81,6 @@ export class ServicesListPage extends qreact.Component {
                 serviceNodeIds.set(serviceId, nodeIds);
             }
         }
-        let allNodeIds = sort(Array.from(new Set(Array.from(serviceNodeIds.values()).flat())), x => x);
 
         return <div className={css.vbox(16)}>
             <div className={css.hbox(12).wrap}>
@@ -168,10 +167,10 @@ export class ServicesListPage extends qreact.Component {
                     let duplicateKey = (keyCounts.get(config.parameters.key || "") || 0) > 1;
                     let measureNodeIds = serviceNodeIds.get(serviceId) || [];
                     let expandedMeasureNodeId = this.state.expandedMeasureNodes[serviceId] || "";
-                    return <div className={css.vbox(4)} key={serviceId}>
+                    return <div className={css.vbox(4).alignItems("stretch")} key={serviceId}>
                         <div className={css.hbox(10)}>
                         <ServiceCategoryBadge config={config} />
-                        <div className={css.vbox(4)}>
+                        <div className={css.vbox(4).alignItems("stretch")}>
                         <Anchor noStyles
                             values={[currentViewParam.getOverride("service-detail"), selectedServiceIdParam.getOverride(serviceId)]}
                             className={
@@ -240,7 +239,6 @@ export class ServicesListPage extends qreact.Component {
                         </Anchor>
                         {this.state.measurementsEnabled && measureNodeIds.length > 0 && <ServiceMeasureBars
                             serviceNodeIds={measureNodeIds}
-                            allNodeIds={allNodeIds}
                             expandedNodeId={expandedMeasureNodeId}
                             onToggleNode={nodeId => {
                                 if (this.state.expandedMeasureNodes[serviceId] === nodeId) {
@@ -256,7 +254,6 @@ export class ServicesListPage extends qreact.Component {
                         </div>
                         {this.state.measurementsEnabled && expandedMeasureNodeId && <ServiceMeasureBreakdown
                             nodeId={expandedMeasureNodeId}
-                            allNodeIds={allNodeIds}
                         />}
                     </div>
                         ;

package/src/diagnostics/watchdog.ts

@@ -38,10 +38,6 @@ export type MeasureSummary = {
     startTime: number;
     endTime: number;
     profiledTime: number;
-    entries: {
-        name: string;
-        ownTime: number;
-    }[];
 };
 
 let measureChunks: MeasureChunk[] = [];
@@ -78,7 +74,6 @@ export function getLastMeasureSummary(): MeasureSummary | undefined {
         startTime: chunk.startTime,
         endTime: chunk.endTime,
         profiledTime: chunk.profiledTime,
-        entries: chunk.entries.map(x => ({ name: x.name, ownTime: x.ownTime.sum })),
     };
 }
 export function getMeasureBreakdown(range: { startTime: number; endTime: number }): MeasureChunk | undefined {