querysub 0.633.0 → 0.634.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.633.0",
+  "version": "0.634.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",
@@ -79,8 +79,8 @@
     "node-forge": "https://github.com/sliftist/forge#e618181b469b07bdc70b968b0391beb8ef5fecd6",
     "pako": "^2.1.0",
     "peggy": "^5.0.6",
-    "sliftutils": "^1.7.103",
-    "socket-function": "^1.2.30",
+    "sliftutils": "^1.7.105",
+    "socket-function": "^1.2.31",
     "terser": "^5.31.0",
     "typenode": "^6.6.1",
     "typesafecss": "^0.32.0",

package/src/-c-identity/IdentityController.ts

@@ -6,7 +6,7 @@
 
 import debugbreak from "debugbreak";
 import { SocketFunction } from "socket-function/SocketFunction";
-import { CallerContext } from "socket-function/SocketFunctionTypes";
+import { CallerContext, ClientHookContext } from "socket-function/SocketFunctionTypes";
 import { cache, cacheWeak, lazy } from "socket-function/src/caching";
 import { getClientNodeId, getNodeId, getNodeIdDomain, getNodeIdIP, getNodeIdLocation, isClientNodeId } from "socket-function/src/nodeCache";
 import { decodeNodeId, getCommonName, getIdentityCA, getMachineId, getOwnMachineId, getPublicIdentifier, getThreadKeyCert, parseCert, sign, validateCertificate, verify } from "sliftutils/misc/https/certs";
@@ -252,7 +252,7 @@ const changeIdentityOnce = cacheWeak(async function changeIdentityOnce(connectio
     );
 });
 let startupTime = Date.now();
-SocketFunction.addGlobalClientHook(async function identityHook(context) {
+async function identityHook(context: ClientHookContext) {
     if (context.call.classGuid === IdentityController._classGuid) return;
     // This is for US to tell them our identity. And if they established the connection the identity will come from their original connection url (that they used to connect to us), and they validated it either being a real certificate, or they added the cert from the trusted backblaze bucket. If it just from a real certificate it means we identified them, but they might not have network trust. But that's fine, as IdentityController is JUST for identification, and if it's a real certificate we know who they are! (Which doesn't mean we trust them).
     if (isClientNodeId(context.call.nodeId)) {
@@ -265,4 +265,7 @@ SocketFunction.addGlobalClientHook(async function identityHook(context) {
     if (duration > 200 && now - startupTime > timeInMinute) {
         console.log(red(`IdentityHook took ${formatTime(duration)} for ${context.connectionId.nodeId} ${context.call.classGuid}.${context.call.functionName}`));
     }
-});
+}
+// Don't measure this, as oftentimes it blocks on other servers, and so it isn't interesting to measure it. 
+identityHook.noMeasure = true;
+SocketFunction.addGlobalClientHook(identityHook);

package/src/deployManager/components/ServiceMeasureBars.tsx

@@ -13,6 +13,8 @@ import { assertIsManagementUser } from "../../diagnostics/managementPages";
 const NODE_CALL_TIMEOUT = timeInSecond * 10;
 const BAR_HEIGHT_PX = 6;
 const MIN_BAR_WIDTH_PX = 30;
+// A percentage width would be against the bar's own content-sized wrapper, which has no width, so it resolves to zero and every bar sits at the minimum. The width is instead this many pixels at 100% CPU.
+const FULL_BAR_WIDTH_PX = 300;
 // Green at idle, red at fully busy.
 const BAR_IDLE_HUE = 120;
 const BAR_FLASH_THRESHOLD = 0.6;
@@ -73,7 +75,7 @@ export class ServiceMeasureBars extends qreact.Component<{
                     <div
                         className={
                             css.height(BAR_HEIGHT_PX)
-                                .width(`${fraction * 100}%`)
+                                .width(Math.round(clampedFraction * FULL_BAR_WIDTH_PX))
                                 .minWidth(MIN_BAR_WIDTH_PX)
                                 .button
                                 .hsl(hue, 70, isExpanded ? 40 : 55)

package/src/deployManager/components/storage/StorageLogsPage.tsx

@@ -3,6 +3,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../../4-dom/qreact";
 import { css } from "typesafecss";
 import { Querysub } from "../../../4-querysub/Querysub";
+import { t } from "../../../2-proxy/schema2";
 import { isDefined } from "../../../misc";
 import { formatNumber, formatTime, formatDateTime } from "socket-function/src/formatting/format";
 import { timeInSecond } from "socket-function/src/misc";
@@ -35,20 +36,6 @@ type ServerLogListing = {
     fetchTime?: number;
 };
 
-type SearchState = {
-    searching: boolean;
-    doneFiles: number;
-    totalFiles: number;
-    currentFile: string;
-    /** How long the last search took */
-    durationTime: number;
-    /** The oldest fetch time among the results being displayed */
-    resultsFetchTime: number;
-    rows: Record<string, unknown>[];
-    columns: string[];
-    error: string;
-};
-
 /** Whether a log file could hold entries in the range - a live file (no endTime) runs to now. */
 function fileOverlapsRange(file: LogFileInfo, startTime: number, endTime: number): boolean {
     let fileEnd = file.endTime ?? Date.now();
@@ -56,17 +43,19 @@ function fileOverlapsRange(file: LogFileInfo, startTime: number, endTime: number
 }
 
 export class StorageLogsPage extends qreact.Component {
-    state: SearchState = {
-        searching: false,
-        doneFiles: 0,
-        totalFiles: 0,
-        currentFile: "",
-        durationTime: 0,
-        resultsFetchTime: 0,
-        rows: [],
-        columns: [],
-        error: "",
-    };
+    state = t.state({
+        searching: t.boolean,
+        doneFiles: t.number,
+        totalFiles: t.number,
+        currentFile: t.string,
+        /** How long the last search took */
+        durationTime: t.number,
+        /** The oldest fetch time among the results being displayed */
+        resultsFetchTime: t.number,
+        rows: t.atomic<Record<string, unknown>[]>([]),
+        columns: t.atomic<string[]>([]),
+        error: t.string,
+    });
 
     private getListings(): ServerLogListing[] {
         let machineController = MachineServiceController(SocketFunction.browserNodeId());
@@ -125,7 +114,7 @@ export class StorageLogsPage extends qreact.Component {
                 let columns: string[] = [...LEADING_COLUMNS];
                 for (let file of result.files) {
                     for (let entry of file.entries) {
-                        let fields = entry && typeof entry === "object" && entry as Record<string, unknown> || { value: String(entry) };
+                        let fields: Record<string, unknown> = entry && typeof entry === "object" ? entry as Record<string, unknown> : { value: String(entry) };
                         // The file selection is only as granular as whole files, so the entries themselves still need the range applied
                         let time = fields.time;
                         if (typeof time === "number" && (time < startTime || time > endTime)) continue;

package/src/deployManager/components/storage/bucketRows.ts

@@ -1,7 +1,7 @@
 import { formatNumber } from "socket-function/src/formatting/format";
 import { sort } from "socket-function/src/misc";
 import type { ArchivesConfig, RemoteConfig, HostedConfig } from "sliftutils/storage/IArchives";
-import type { BucketWriteStats } from "sliftutils/storage/remoteStorage/storageServerState";
+import type { BucketWriteStats } from "sliftutils/storage/remoteStorage/accessStats";
 import type { BucketDiskInfo } from "sliftutils/storage/remoteStorage/bucketDisk";
 import { parseHostedUrl } from "sliftutils/storage/remoteStorage/remoteConfig";
 import { SourceTag, getSourceTags } from "./Tag";