querysub 0.565.0 → 0.567.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.565.0",
+  "version": "0.567.0",
   "main": "index.js",
   "license": "MIT",
   "note1": "note on node-forge fork, see https://github.com/digitalbazaar/forge/issues/744 for details",

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

@@ -19,6 +19,9 @@ function createSourceWindows(
     let timeRanges: [number, number][] = [];
     for (let windowIndex = 0; windowIndex < sourceWindows.length; windowIndex++) {
         let startTime = sourceWindows[windowIndex].startTime;
+        if (windowIndex === 0) {
+            startTime = 0;
+        }
         let endTime = sourceWindows[windowIndex + 1]?.startTime ?? Number.MAX_SAFE_INTEGER;
         if (startTime > endTime) throw new Error(`Source window ${formatDateTime(startTime)} starts after end of ${formatDateTime(endTime)}`);
         timeRanges.push([startTime, endTime]);
@@ -40,29 +43,29 @@ function archiveBuilder(bucket: string, overrides: Partial<RemoteConfigBase>) {
     const BACKBLAZE = `https://f002.backblazeb2.com/file/${bucket}/storage/storagerouting.json`;
     let sources = createSourceWindows(overrides, [
         {
-            startTime: 0,
+            startTime: +new Date("2026-07-20 18:00:00-04:00"),
             sources: [
-                { type: "remote", url: ONTARIO, route: [0, 0.5], },
-                { type: "remote", url: HETZNER, route: [0.5, 1], },
+                { type: "remote", url: ONTARIO, route: [0.5, 1], },
+                { type: "remote", url: HETZNER, route: [0, 0.5], },
                 { type: "remote", url: ONTARIO, },
                 { type: "remote", url: HETZNER, },
                 { type: "backblaze", url: BACKBLAZE, },
             ]
         },
         {
-            startTime: +new Date("2026-07-20 18:00:00-04:00"),
+            startTime: +new Date("2026-07-21 02:59:00-04:00"),
             sources: [
-                { type: "remote", url: ONTARIO, route: [0.5, 1], },
-                { type: "remote", url: HETZNER, route: [0, 0.5], },
+                { type: "remote", url: ONTARIO, route: [0, 0.5], },
+                { type: "remote", url: HETZNER, route: [0.5, 1], },
                 { type: "remote", url: ONTARIO, },
                 { type: "remote", url: HETZNER, },
                 { type: "backblaze", url: BACKBLAZE, },
             ]
-        }
+        },
     ]);
 
     return createArchives({
-        version: 14,
+        version: 15,
         sources,
     });
 }

package/src/deployManager/components/RouteConfigView.tsx

@@ -12,7 +12,7 @@ import type { RemoteConfig, RemoteConfigBase, HostedConfig, BackblazeConfig } fr
 import { showModal } from "../../5-diagnostics/Modal";
 import { FullscreenModal } from "../../5-diagnostics/FullscreenModal";
 import { Button } from "../../library-components/Button";
-import { Tag, TAG_FONT_SIZE, TAG_WARNING_COLOR, NO_FULL_SYNC_TAG } from "./Tag";
+import { Tag, TAG_FONT_SIZE, TAG_WARNING_COLOR, getSourceTags } from "./Tag";
 import { StorageSynced, type StorageServerBuckets } from "./StoragePage";
 
 module.hotreload = true;
@@ -343,21 +343,6 @@ function showConfigModal(bucketName: string, rawConfig: RemoteConfig): void {
     });
 }
 
-function getSourceTags(source: Source): { icon: string; text: string }[] {
-    let tags: { icon: string; text: string }[] = [];
-    if (source.public) tags.push({ icon: "🌐", text: "public" });
-    if (source.immutable) tags.push({ icon: "🔒", text: "immutable" });
-    if (source.noFullSync) tags.push(NO_FULL_SYNC_TAG);
-    if (source.intermediate) tags.push({ icon: "⏳", text: "intermediate" });
-    if (source.type === "remote") {
-        if (source.fast) tags.push({ icon: "⚡", text: "fast" });
-        if (source.rawDisk) tags.push({ icon: "💽", text: "rawDisk" });
-        if (source.writeDelay !== undefined) tags.push({ icon: "⏱", text: `writeDelay ${formatTime(source.writeDelay)}` });
-    }
-    if (source.readerDiskLimit !== undefined) tags.push({ icon: "📦", text: `readCache ${formatNumber(source.readerDiskLimit)}B` });
-    return tags;
-}
-
 /** Watching a source pins that server's own live view of the bucket to the top of the page, so disagreements between servers are visible directly. */
 class WatchButton extends qreact.Component<{ source: Source; bucketName: string }> {
     render() {

package/src/deployManager/components/StoragePage.tsx

@@ -17,7 +17,7 @@ import { isDefined } from "../../misc";
 import { STORAGE_ACCOUNT } from "../../-a-archives/archives2";
 import { Table } from "../../5-diagnostics/Table";
 import { RouteConfigView } from "./RouteConfigView";
-import { Tag, NO_FULL_SYNC_TAG } from "./Tag";
+import { Tag, SourceTag, getSourceTags } from "./Tag";
 
 module.hotreload = true;
 
@@ -134,7 +134,7 @@ type BucketRow = {
     state: string;
     files: string;
     bytes: string;
-    noFullSync: boolean;
+    flags: SourceTag[];
     indexSources: ArchivesConfig["indexSources"];
     readerDiskLimit: string;
     writes: string;
@@ -152,13 +152,13 @@ const DISK_BAR_TYPE = "DISK";
 const ACTIVE_STATE = "active";
 const INACTIVE_STATE = "inactive";
 
-/** Whether this server only caches what is read of the bucket instead of keeping a full copy, read off its own entry in the bucket's routing config. */
-function getNoFullSync(serverUrl: string, bucketName: string, remoteConfig: RemoteConfig | undefined): boolean {
+/** The flags this server's own entries in the bucket's routing config set - how it holds the bucket, which is not something the bucket's own state reports. */
+function getBucketFlags(serverUrl: string, bucketName: string, remoteConfig: RemoteConfig | undefined): SourceTag[] {
     let host: URL;
     try {
         host = new URL(serverUrl);
     } catch {
-        return false;
+        return [];
     }
     let selfEntries: HostedConfig[] = [];
     for (let source of remoteConfig?.sources || []) {
@@ -173,7 +173,15 @@ function getNoFullSync(serverUrl: string, bucketName: string, remoteConfig: Remo
             // A malformed url in the config is not this column's problem
         }
     }
-    return selfEntries.some(x => x.noFullSync);
+    // A server can hold several entries for one bucket (different windows or route shards), so the flags are the union of theirs, deduped by what they say
+    let flags = new Map<string, SourceTag>();
+    for (let entry of selfEntries) {
+        for (let tag of getSourceTags(entry)) {
+            if (flags.has(tag.text)) continue;
+            flags.set(tag.text, tag);
+        }
+    }
+    return [...flags.values()];
 }
 
 /** How much fast-mode coalescing saved: every accepted write over the ones that actually reached a source. */
@@ -195,7 +203,7 @@ function getBucketRows(servers: StorageServerBuckets[]): BucketRow[] {
             state: "",
             files: "",
             bytes: "",
-            noFullSync: false,
+            flags: [],
             indexSources: undefined,
             readerDiskLimit: "",
             writes: "",
@@ -225,7 +233,7 @@ function getBucketRows(servers: StorageServerBuckets[]): BucketRow[] {
                 state: bucket.active && ACTIVE_STATE || INACTIVE_STATE,
                 files: config?.index && formatNumber(config.index.fileCount) || "",
                 bytes: config?.index && formatNumber(config.index.byteCount) + "B" || "",
-                noFullSync: getNoFullSync(server.url, bucket.bucketName, config?.remoteConfig),
+                flags: getBucketFlags(server.url, bucket.bucketName, config?.remoteConfig),
                 indexSources: config?.indexSources,
                 readerDiskLimit: config?.readerDiskLimit && formatNumber(config.readerDiskLimit) + "B" || "",
                 writes: bucket.writeStats && formatNumber(bucket.writeStats.originalWrites) || "",
@@ -581,10 +589,12 @@ export class StoragePage extends qreact.Component {
                     },
                     files: { title: "Files" },
                     bytes: { title: "Bytes" },
-                    noFullSync: {
-                        title: "Sync",
-                        // Nothing to show when a full copy is kept - that is the default, and the tag is the flag
-                        formatter: noFullSync => noFullSync && <Tag icon={NO_FULL_SYNC_TAG.icon} text={NO_FULL_SYNC_TAG.text} /> || ""
+                    flags: {
+                        title: "Flags",
+                        // Only flags that are set produce a tag, so an empty cell means every default
+                        formatter: flags => <div className={css.hbox(4).wrap}>
+                            {(flags || []).map(tag => <Tag key={tag.text} icon={tag.icon} text={tag.text} />)}
+                        </div>
                     },
                     indexSources: {
                         title: "Index sources",

package/src/deployManager/components/Tag.tsx

@@ -1,5 +1,7 @@
 import { qreact } from "../../4-dom/qreact";
 import { css } from "typesafecss";
+import { formatNumber, formatTime } from "socket-function/src/formatting/format";
+import type { HostedConfig, BackblazeConfig } from "sliftutils/storage/IArchives";
 
 module.hotreload = true;
 
@@ -9,8 +11,23 @@ export const TAG_COLOR: TagColor = { h: 210, s: 45, l: 88 };
 export const TAG_WARNING_COLOR: TagColor = { h: 35, s: 90, l: 85 };
 export const TAG_FONT_SIZE = 11;
 
-/** A source flag, shown wherever that flag matters. The tag is only ever rendered when the flag is on - an absent tag is the default, so there is nothing to show for it. */
-export const NO_FULL_SYNC_TAG = { icon: "⇣", text: "noFullSync" };
+export type SourceTag = { icon: string; text: string };
+
+/** Every flag a source has set. Only flags that are on produce a tag - an absent tag is the default, so there is nothing to show for it. */
+export function getSourceTags(source: HostedConfig | BackblazeConfig): SourceTag[] {
+    let tags: SourceTag[] = [];
+    if (source.public) tags.push({ icon: "🌐", text: "public" });
+    if (source.immutable) tags.push({ icon: "🔒", text: "immutable" });
+    if (source.noFullSync) tags.push({ icon: "⇣", text: "noFullSync" });
+    if (source.intermediate) tags.push({ icon: "⏳", text: "intermediate" });
+    if (source.type === "remote") {
+        if (source.fast) tags.push({ icon: "⚡", text: "fast" });
+        if (source.rawDisk) tags.push({ icon: "💽", text: "rawDisk" });
+        if (source.writeDelay !== undefined) tags.push({ icon: "⏱", text: `writeDelay ${formatTime(source.writeDelay)}` });
+    }
+    if (source.readerDiskLimit !== undefined) tags.push({ icon: "📦", text: `readCache ${formatNumber(source.readerDiskLimit)}B` });
+    return tags;
+}
 
 export class Tag extends qreact.Component<{ icon: string; text: string; warning?: boolean; color?: TagColor; title?: string; }> {
     render() {