querysub 0.515.0 → 0.517.0

package/package.json

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

package/src/4-deploy/edgeBootstrap.ts

@@ -475,6 +475,15 @@ async function edgeNodeFunction(config: {
         // The url override wins over everything (including the IP domain default). If the host isn't in the list, it is ignored.
         {
             let overrideHost = new URL(document.location.href).searchParams.get("edgenode");
+            if (overrideHost) {
+                // The URLParam system rewrites search params JSON encoded (strings get quotation marks), so decode the same way it does
+                try {
+                    let parsed = JSON.parse(overrideHost);
+                    if (typeof parsed === "string") {
+                        overrideHost = parsed;
+                    }
+                } catch { }
+            }
             if (overrideHost) {
                 let overrideNode = edgeNodes.find(x => x.host === overrideHost);
                 if (overrideNode) {

package/src/deployManager/components/ServicesListPage.tsx

@@ -1,16 +1,16 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { qreact } from "../../4-dom/qreact";
-import { DEFAULT_OVERLAP_TIME, MachineServiceController, ServiceConfig } from "../machineSchema";
+import { DEFAULT_OVERLAP_TIME, MachineServiceController, ServiceConfig, getLiveServiceParameters } from "../machineSchema";
 import { css } from "typesafecss";
 import { t } from "../../2-proxy/schema2";
 import { Querysub } from "../../4-querysub/Querysub";
 import { currentViewParam, selectedServiceIdParam } from "../urlParams";
-import { formatNiceDateTime, formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
-import { sort, timeInMinute } from "socket-function/src/misc";
+import { formatDateTimeDetailed, formatNiceDateTime, formatTime, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
+import { sort, timeInMinute, timeInSecond } from "socket-function/src/misc";
 import { cache } from "socket-function/src/caching";
 import { Anchor } from "../../library-components/ATag";
 import { isPublic } from "../../config";
-import { UpdateButtons, UpdateServiceButtons } from "./deployButtons";
+import { PendingDeployInfo, UpdateButtons, UpdateServiceButtons } from "./deployButtons";
 import { isDefined } from "../../misc";
 import { formatDateJSX } from "../../misc/formatJSX";
 import { Tools } from "./Tools";
@@ -26,6 +26,8 @@ export class ServicesListPage extends qreact.Component {
 
         if (!serviceList) return <div>Loading services...</div>;
 
+        let now = Querysub.nowDelayed(timeInSecond);
+
         let services = serviceList.map(serviceId => [serviceId, controller.getServiceConfig(serviceId)] as const);
         sort(services, x => -(x[1]?.info.lastUpdatedTime || Date.now()) - (x[1]?.parameters.deploy && (Number.MAX_SAFE_INTEGER / 2) || 0));
 
@@ -140,10 +142,32 @@ export class ServicesListPage extends qreact.Component {
                                 <div className={css.vbox(4)}>
                                     <div>Updated {formatDateJSX(config.info.lastUpdatedTime)} AGO</div>
                                     {config.parameters.overlapTime && <div className={css.colorhsl(210, 50, 50).fontSize(14).fontWeight("bold")}>Deploy overlap: {formatTime(config.parameters.overlapTime)}</div> || undefined}
+                                    {(() => {
+                                        let releaseTime = config.parameters.releaseTime || 0;
+                                        if (!releaseTime || releaseTime <= now || !config.oldParameters) return undefined;
+                                        let live = getLiveServiceParameters(config) as Record<string, unknown>;
+                                        let next = config.parameters as Record<string, unknown>;
+                                        let diffLines: string[] = [];
+                                        for (let key of new Set([...Object.keys(live), ...Object.keys(next)])) {
+                                            if (key === "releaseTime") continue;
+                                            let oldValue = JSON.stringify(live[key]);
+                                            let newValue = JSON.stringify(next[key]);
+                                            if (oldValue !== newValue) {
+                                                diffLines.push(`${key}: ${oldValue} -> ${newValue}`);
+                                            }
+                                        }
+                                        return <div
+                                            className={css.colorhsl(35, 80, 45).fontSize(14).fontWeight("bold")}
+                                            title={`Deploys at ${formatDateTimeDetailed(releaseTime)}\n\n${diffLines.join("\n")}`}
+                                        >
+                                            🕐 Deploys in {formatTime(releaseTime - now)}
+                                        </div>;
+                                    })()}
                                 </div>
                             </div>
                         </Anchor>
                         <UpdateServiceButtons service={config} />
+                        <PendingDeployInfo service={config} />
                     </div>
                         ;
                 })}

package/src/deployManager/components/deployButtons.tsx

@@ -5,7 +5,8 @@ import { Querysub } from "../../4-querysub/Querysub";
 import { DEFAULT_OVERLAP_TIME, MachineServiceController, MachineInfo, ServiceConfig } from "../machineSchema";
 import { showFullscreenModal } from "../../5-diagnostics/FullscreenModal";
 import { css } from "../../4-dom/css";
-import { formatTime } from "socket-function/src/formatting/format";
+import { formatDateTimeDetailed, formatTime } from "socket-function/src/formatting/format";
+import { timeInSecond } from "socket-function/src/misc";
 import { formatDateJSX } from "../../misc/formatJSX";
 import { MachineController } from "../machineController";
 import { deepCloneJSON } from "socket-function/src/misc";
@@ -192,6 +193,36 @@ export class UpdateServiceButtons extends qreact.Component<{
     }
 }
 
+/** Shows a service's scheduled (not yet live) deploy, in the same style as the update buttons (but blue, and not clickable): when it goes live, and the new vs currently live commit. */
+export class PendingDeployInfo extends qreact.Component<{
+    service: ServiceConfig;
+}> {
+    render() {
+        let service = this.props.service;
+        let releaseTime = service.parameters.releaseTime || 0;
+        let now = Querysub.nowDelayed(timeInSecond);
+        const oldParameters = service.oldParameters;
+        if (!releaseTime || releaseTime <= now || !oldParameters) return undefined;
+
+        return <div
+            className={css.pad2(12, 8).bord2(210, 60, 40).fontWeight("bold").vbox(2).alignItems("center").alignSelf("stretch").hsl(210, 70, 90)}
+            title={formatDateTimeDetailed(releaseTime)}
+        >
+            <div>
+                {bigEmoji("🕐", -4)} <span>Deploys in {formatTime(releaseTime - now)}</span>
+            </div>
+            <div className={css.hbox(5)}>
+                <b>New</b>
+                <RenderGitRefInfo gitRef={service.parameters.gitRef} />
+            </div>
+            <div className={css.hbox(5)}>
+                <b>Current</b>
+                <RenderGitRefInfo gitRef={oldParameters.gitRef} />
+            </div>
+        </div>;
+    }
+}
+
 export class DeployMachineButtons extends qreact.Component<{
     machines: MachineInfo[];
 }> {

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

@@ -57,7 +57,7 @@ function TicketButton(props: {
 }
 qreact.inline(TicketButton);
 
-let getMatcher = cacheLimited(100, (pattern: string) =>
+export let getMatcher = cacheLimited(100, (pattern: string) =>
     createMatchesPattern(Buffer.from(pattern), false)
 );
 

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

@@ -4,8 +4,9 @@ import { css } from "typesafecss";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { ATag } from "../../../library-components/ATag";
 import { managementPageURL, showingManagementURL } from "../../managementPages";
-import { LogDatumRenderer } from "./ErrorNotificationPage";
+import { getMatcher, LogDatumRenderer } from "./ErrorNotificationPage";
 import { getErrorNotificationsManager } from "./errorWatcher";
+import { LogDatum } from "../diskLogger";
 import { TicketsController } from "../errorTickets/tickets";
 import { STATE_HUES, ticketFilterURL } from "../errorTickets/TicketPage";
 import { isTicketFinished, TicketState, TICKET_STATES } from "../errorTickets/ticketTypes";
@@ -49,9 +50,21 @@ export class ErrorWarning extends qreact.Component {
     render() {
         let ticketCounts = this.renderTicketCounts();
 
+        // Errors that already have a ticket in an open (not finished) state are hidden here — there's no point telling the user about a bug that is already under investigation
+        let openTicketPatterns: string[] = [];
+        for (let ticket of TicketsController(SocketFunction.browserNodeId()).getTickets() || []) {
+            if (isTicketFinished(ticket.state)) continue;
+            if (!ticket.suppressionPattern) continue;
+            openTicketPatterns.push(ticket.suppressionPattern);
+        }
+        const isCoveredByOpenTicket = (datum: LogDatum) => {
+            let errorBuffer = Buffer.from(JSON.stringify(datum));
+            return openTicketPatterns.some(pattern => getMatcher(pattern)(errorBuffer));
+        };
+
         let errorWarning: preact.ComponentChild = undefined;
-        if (!this.manager.state.isLoading && this.manager.state.unmatchedErrors.length > 0) {
-            let firstError = this.manager.state.unmatchedErrors[0];
+        let firstError = !this.manager.state.isLoading && this.manager.state.unmatchedErrors.find(x => !isCoveredByOpenTicket(x)) || undefined;
+        if (firstError) {
             errorWarning = <div className={css.hbox(4).alignItems("start").hsl(0, 0, 90).bord2(0, 0, 85).pad2(4, 2).hslcolor(0, 0, 0)}>
                 <ATag className={css.paddingTop(5).flexShrink0} values={[
                     showingManagementURL.getOverride(true),

package/src/diagnostics/managementPages.tsx

@@ -80,6 +80,23 @@ export async function registerManagementPages2(config: {
     let inputPages: typeof config.pages = [];
 
 
+    inputPages.push({
+        title: "Routing Table",
+        componentName: "AuthoritySpecPage",
+        controllerName: "AuthoritySpecPageController",
+        getModule: () => import("./misc-pages/AuthoritySpecPage"),
+    });
+    inputPages.push({
+        title: "LOG VIEWER",
+        componentName: "LogViewer3",
+        getModule: () => import("./logs/IndexedLogs/LogViewer3"),
+    });
+    inputPages.push({
+        title: "Tickets",
+        componentName: "TicketPage",
+        controllerName: "",
+        getModule: () => import("./logs/errorTickets/TicketPage"),
+    });
     // IMPORTANT! The controller name has to be the name of the controller in the file. No human would just randomly put some junk there, but the AI keeps putting random junk there and being surprised when they get an error because that controller doesn't actually exist in that file.
     inputPages.push({
         title: "Machines",
@@ -111,12 +128,6 @@ export async function registerManagementPages2(config: {
         controllerName: "SnapshotViewerController",
         getModule: () => import("./misc-pages/SnapshotViewer"),
     });
-    inputPages.push({
-        title: "Routing Table",
-        componentName: "AuthoritySpecPage",
-        controllerName: "AuthoritySpecPageController",
-        getModule: () => import("./misc-pages/AuthoritySpecPage"),
-    });
     inputPages.push({
         title: "DNS",
         componentName: "DNSPage",
@@ -134,11 +145,6 @@ export async function registerManagementPages2(config: {
         componentName: "FunctionCaptureAnalyzePage",
         getModule: () => import("./misc-pages/FunctionCaptureAnalyzePage"),
     });
-    inputPages.push({
-        title: "LOG VIEWER",
-        componentName: "LogViewer3",
-        getModule: () => import("./logs/IndexedLogs/LogViewer3"),
-    });
     // It's really sad to comment out the life cycles page, but I'm just never going to use it, it's just too slow and too annoying. It's easier to get the AI to search stuff. 
     // inputPages.push({
     //     title: "Life Cycles",
@@ -152,12 +158,7 @@ export async function registerManagementPages2(config: {
         controllerName: "",
         getModule: () => import("./logs/errorNotifications2/ErrorNotificationPage"),
     });
-    inputPages.push({
-        title: "Tickets",
-        componentName: "TicketPage",
-        controllerName: "",
-        getModule: () => import("./logs/errorTickets/TicketPage"),
-    });
+
     // NOTE: Even if we never use this, it is needed if a server or site is bootstrapping. However, they should probably include this in their own header dynamically as well. 
     inputPages.push({
         title: "Security",

package/src/library-components/EdgeNodeSelector.tsx

@@ -17,12 +17,21 @@ export class EdgeNodeSelector extends qreact.Component<{}> {
         let stats = globalThis.EDGE_NODE_STATS;
         const booted = (globalThis as any).BOOTED_EDGE_NODE as EdgeNodeConfig | undefined;
         if (!booted) return undefined;
+        // The URLParam system rewrites search params JSON encoded (strings get quotation marks), so read/write the same way it does
         let forced = new URL(document.location.href).searchParams.get(EDGE_NODE_URL_PARAM) || "";
+        if (forced) {
+            try {
+                let parsed = JSON.parse(forced);
+                if (typeof parsed === "string") {
+                    forced = parsed;
+                }
+            } catch { }
+        }
 
         const setEdgeNode = (host: string) => {
             let url = new URL(document.location.href);
             if (host) {
-                url.searchParams.set(EDGE_NODE_URL_PARAM, host);
+                url.searchParams.set(EDGE_NODE_URL_PARAM, JSON.stringify(host));
             } else {
                 url.searchParams.delete(EDGE_NODE_URL_PARAM);
             }