querysub 0.312.0 → 0.314.0

package/src/5-diagnostics/Table.tsx

@@ -33,6 +33,8 @@ export class Table<RowT extends RowType> extends qreact.Component<TableType<RowT
     lineLimit?: number;
     characterLimit?: number;
     dark?: boolean;
+
+    getRowAttributes?: (row: RowT, index: number) => preact.JSX.HTMLAttributes<HTMLTableRowElement>;
 }> {
     state = {
         limit: this.props.initialLimit || 100,
@@ -67,6 +69,7 @@ export class Table<RowT extends RowType> extends qreact.Component<TableType<RowT
                             //      be able to above our siblings, which breaks palettes).
                             + css.relative
                         }
+                        {...this.props.getRowAttributes?.(row, index)}
                     >
                         <td class={css.center}>{index + 1}</td>
                         {Object.entries(columns).filter(x => x[1] !== null).map(([columnName, column]) => {

package/src/5-diagnostics/diskValueAudit.ts

@@ -11,6 +11,7 @@ import { isDevDebugbreak } from "../config";
 import { DebugLog, auditLog, getLogHistoryEquals } from "../0-path-value-core/auditLogs";
 import { getOwnNodeId } from "../-f-node-discovery/NodeDiscovery";
 import { sort } from "socket-function/src/misc";
+import { logDisk } from "../diagnostics/logs/diskLogger";
 
 const AUDIT_INTERVAL = ARCHIVE_FLUSH_LIMIT;
 const AUDIT_THRESHOLD = ARCHIVE_FLUSH_LIMIT;
@@ -187,7 +188,7 @@ async function checkAuthority(authority: AuthorityPath, threshold: number) {
         console.error(`Value mismatch between disk and memory for ${formatNumber(changedValues.size)} values. Ex: ${firstValue.path}`);
     }
     if (removedValues.size > 0) {
-        console.info(green(`Removing ${formatNumber(removedValues.size)} paths from memory which have been GCed on the disk.`));
+        logDisk("log", green(`Removing ${formatNumber(removedValues.size)} paths from memory which have been GCed on the disk.`));
     }
     if (changedValues.size > 0 || removedValues.size > 0) {
         let allValues = new Set([...changedValues, ...removedValues]);

package/src/5-diagnostics/nodeMetadata.ts

@@ -10,7 +10,6 @@ import { sort, throttleFunction, timeInMinute } from "socket-function/src/misc";
 import { formatNumber, formatPercent, formatTime } from "socket-function/src/formatting/format";
 import os from "os";
 import { isNode } from "typesafecss";
-import { diskLog } from "../diagnostics/logs/diskLogger";
 import { devDebugbreak } from "../config";
 import { addStatPeriodic, addStatSumPeriodic, addTimeProfileDistribution, onTimeProfile, logNodeStats, logNodeStateStats, registerNodeMetadata } from "../-0-hooks/hooks";
 import { magenta } from "socket-function/src/formatting/logColors";

package/src/deployManager/components/MachineDetailPage.tsx

@@ -5,8 +5,10 @@ import { css } from "typesafecss";
 import { currentViewParam, selectedMachineIdParam, selectedServiceIdParam } from "../urlParams";
 import { formatNumber, formatVeryNiceDateTime } from "socket-function/src/formatting/format";
 import { sort } from "socket-function/src/misc";
-import { Anchor } from "../../library-components/ATag";
+import { ATag, Anchor } from "../../library-components/ATag";
 import { ShowMore } from "../../library-components/ShowMore";
+import { filterParam } from "../../diagnostics/logs/FastArchiveViewer";
+import { managementPageURL } from "../../diagnostics/managementPages";
 
 export class MachineDetailPage extends qreact.Component {
     render() {
@@ -62,6 +64,12 @@ export class MachineDetailPage extends qreact.Component {
                     <div>
                         Apply Node ID: {machine.applyNodeId}
                     </div>
+                    <ATag values={[
+                        managementPageURL.getOverride("LogViewer2"),
+                        filterParam.getOverride(`__machineId = ${machineInfo.machineId}`),
+                    ]}>
+                        Machine Logs
+                    </ATag>
                 </div>
 
                 <div>

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -13,13 +13,15 @@ import { Button } from "../../library-components/Button";
 import { isDefined } from "../../misc";
 import { watchScreenOutput, stopWatchingScreenOutput } from "../machineController";
 import { getPathStr2 } from "../../path";
-import { Anchor } from "../../library-components/ATag";
+import { ATag, Anchor } from "../../library-components/ATag";
 import { ScrollOnMount } from "../../library-components/ScrollOnMount";
 import { StickyBottomScroll } from "../../library-components/StickyBottomScroll";
 import { PrimitiveDisplay } from "../../diagnostics/logs/ObjectDisplay";
 import { parseAnsiColors, rgbToHsl } from "../../diagnostics/logs/ansiFormat";
 import { RenderGitRefInfo, UpdateServiceButtons, bigEmoji, buttonStyle } from "./deployButtons";
 import { TypedConfigEditor } from "../../library-components/TypedConfigEditor";
+import { filterParam } from "../../diagnostics/logs/FastArchiveViewer";
+import { managementPageURL } from "../../diagnostics/managementPages";
 
 
 
@@ -333,6 +335,13 @@ export class ServiceDetailPage extends qreact.Component {
                                 >
                                     {isWatching ? "Stop Watching Output" : "Watch Screen Output"}
                                 </div>
+
+                                <ATag values={[
+                                    managementPageURL.getOverride("LogViewer2"),
+                                    filterParam.getOverride(`__machineId = ${machineId}`),
+                                ]}>
+                                    Machine Logs
+                                </ATag>
                             </div>
                             {hasError && (
                                 <div

package/src/deployManager/setupMachineMain.ts

@@ -171,7 +171,9 @@ async function main() {
     // Get RAM amount to calculate appropriate swap size
     const memInfo = await runPromise(`ssh ${sshRemote} "free -m | grep Mem"`);
     const ramMB = parseInt(memInfo.split(/\s+/)[1]);
-    if (swapTotal > 0) {
+    if (Number.isNaN(swapTotal) || Number.isNaN(ramMB)) {
+        console.error(`Error getting swap or memory info, swapInfo: ${swapInfo}, memInfo: ${memInfo}`);
+    } else if (swapTotal > 0) {
         console.log(`✅ Swap already configured: ${swapTotal}MB SWAP vs ${ramMB}MB REAL MEMORY`);
     } else {
         // Calculate swap size based on RAM:
@@ -213,6 +215,11 @@ async function main() {
 
     console.log("Setting up machine:", sshRemote);
 
+    // 0. Update apt
+    console.log("Updating apt...");
+    await runPromise(`ssh ${sshRemote} "sudo apt update"`);
+    console.log("✅ Apt updated");
+
     // 1. Copy backblaze file to remote server (~/backblaze.json)
     console.log("Copying backblaze credentials...");
     if (fs.existsSync(backblazePath)) {

package/src/diagnostics/NodeViewer.tsx

@@ -23,7 +23,6 @@ import { ValueAuditController } from "../../src/5-diagnostics/memoryValueAudit";
 import { getExternalIP } from "../../src/misc/networking";
 import dns from "dns";
 import { getNodeIdDomain, getNodeIdIP } from "socket-function/src/nodeCache";
-import { debugGetRawEdgeCert } from "../../src/-e-certs/EdgeCertController";
 import ws from "ws";
 import https from "https";
 import debugbreak from "debugbreak";
@@ -35,9 +34,10 @@ import { ButtonSelector } from "../library-components/ButtonSelector";
 import { assertIsManagementUser, managementPageURL } from "./managementPages";
 import { SocketRegistered } from "socket-function/SocketFunctionTypes";
 import { ATag } from "../library-components/ATag";
-import { filterURL, selectedNodeId } from "./logs/DiskLoggerPage";
 import { getSyncedController } from "../library-components/SyncedController";
 import child_process from "child_process";
+import { filterParam } from "./logs/FastArchiveViewer";
+import { getHTTPSKeyCert } from "../-e-certs/certAuthority";
 
 
 type NodeData = {
@@ -296,9 +296,8 @@ export class NodeViewer extends qreact.Component {
 
                                         return (
                                             <ATag values={[
-                                                managementPageURL.getOverride("DiskLoggerPage"),
-                                                selectedNodeId.getOverride(str),
-                                                filterURL.getOverride(`"__nodeId":"${str}"`),
+                                                managementPageURL.getOverride("LogViewer2"),
+                                                filterParam.getOverride(`__nodeId = ${str}`),
                                             ]}>
                                                 Logs
                                             </ATag>
@@ -432,7 +431,7 @@ class NodeViewerControllerBase {
         });
 
         let baseNodeIP = getNodeIdIP(nodeId);
-        let cert = await debugGetRawEdgeCert();
+        let cert = await getHTTPSKeyCert(getDomain());
 
         const child = child_process.spawn("node", [
             "-e",