querysub 0.489.0 → 0.491.0

package/src/0-path-value-core/pathValueArchives.ts

@@ -8,9 +8,9 @@ import { pathValueSerializer } from "../-h-path-value-serialize/PathValueSeriali
 import debugbreak from "debugbreak";
 import { formatNumber, formatTime } from "socket-function/src/formatting/format";
 import { list } from "socket-function/src/misc";
-import { NodeIdParts, decodeNodeId, decodeNodeIdAssert, encodeNodeId } from "../-a-auth/certs";
+import { NodeIdParts, decodeNodeId, decodeNodeIdAssert, encodeNodeId } from "sliftutils/misc/https/certs";
 import { createArchiveLocker2 } from "./archiveLocks/ArchiveLocks2";
-import { devDebugbreak, isNoNetwork } from "../config";
+import { devDebugbreak, isNoNetwork, getDomain } from "../config";
 import { wrapArchivesWithCache } from "../-a-archives/archiveCache";
 import { AuthoritySpec, PathRouter, debugSpec } from "./PathRouter";
 import { authorityLookup } from "./AuthorityLookup";
@@ -86,7 +86,7 @@ export class PathValueArchives {
         let parts = fileName.split("_");
         if (parts[0] !== "data") return defaultDecodedValuePath(dataPath);
         let nodeId = parts[1];
-        let decodedNodeId = decodeNodeId(nodeId);
+        let decodedNodeId = decodeNodeId(nodeId, getDomain());
         if (!decodedNodeId) return defaultDecodedValuePath(dataPath);
         let time = +parts[2] || 0;
         let seqNum = +parts[3] || 0;
@@ -111,7 +111,7 @@ export class PathValueArchives {
 
     public getDefaultValuePathInput(): DecodedValuePathInput {
         return {
-            ...decodeNodeIdAssert(getOwnNodeIdAssert()),
+            ...decodeNodeIdAssert(getOwnNodeIdAssert(), getDomain()),
             time: Date.now(),
             seqNum: this.nextWriteSeqNum++,
             valueCount: 0,

package/src/0-path-value-core/pathValueCore.ts

@@ -27,7 +27,9 @@ import { decodeParentFilter, filterChildPathsBase } from "./hackedPackedPathPare
 import { isDiskAudit } from "../config";
 import { removeRange } from "../rangeMath";
 import { remoteWatcher } from "../1-path-client/RemoteWatcher";
+import { setFlag } from "socket-function/require/compileFlags";
 import { sha256 } from "js-sha256";
+setFlag(require, "js-sha256", "allowclient", true);
 import { evaluateValidStates, isServer } from "../config2";
 
 setImmediate(async () => {

package/src/1-path-client/pathValueClientWatcher.ts

@@ -27,10 +27,10 @@ import { runInfinitePoll } from "socket-function/src/batching";
 import { registerResource } from "../diagnostics/trackResources";
 import { getOwnNodeId } from "../-f-node-discovery/NodeDiscovery";
 import { PromiseObj } from "../promise";
-import { getOwnMachineId } from "../-a-auth/certs";
+import { getOwnMachineId } from "sliftutils/misc/https/certs";
 import { remoteWatcher } from "./RemoteWatcher";
 import { heapTagObj } from "../diagnostics/heapTag";
-import { isDevDebugbreak } from "../config";
+import { isDevDebugbreak, getDomain } from "../config";
 import { matchesParentRangeFilter } from "../0-path-value-core/hackedPackedPathParentFiltering";
 import { LOCAL_DOMAIN_PATH } from "../0-path-value-core/PathRouter";
 
@@ -718,7 +718,7 @@ export class ClientWatcher {
         let source = config.source;
 
         if (!source) {
-            let debugName = getOwnMachineId().slice(0, 8);
+            let debugName = getOwnMachineId(getDomain()).slice(0, 8);
             if (this.activeWatchSpec?.debugName) {
                 debugName += "|" + this.activeWatchSpec.debugName;
             }

package/src/2-proxy/PathValueProxyWatcher.ts

@@ -8,7 +8,7 @@ import { delay, runInSerial, runInfinitePoll } from "socket-function/src/batchin
 import { errorify, logErrors } from "../errors";
 import { appendToPathStr, getLastPathPart, getParentPathStr, getPathDepth, getPathFromStr, getPathIndex, getPathIndexAssert, getPathPrefix, getPathStr1, getPathStr2, getPathSuffix, slicePathStrToDepth } from "../path";
 import { addEpsilons, getTimeUnique } from "socket-function/src/bits";
-import { getThreadKeyCert } from "../-a-auth/certs";
+import { getThreadKeyCert } from "sliftutils/misc/https/certs";
 import { ActionsHistory } from "../diagnostics/ActionsHistory";
 import { registerResource } from "../diagnostics/trackResources";
 import { ClientWatcher, WatchSpecData, clientWatcher } from "../1-path-client/pathValueClientWatcher";

package/src/3-path-functions/PathFunctionHelpers.ts

@@ -1,4 +1,4 @@
-import { getOwnMachineId } from "../-a-auth/certs";
+import { getOwnMachineId } from "sliftutils/misc/https/certs";
 import { atomicObjectWrite, proxyWatcher, specialObjectWriteSymbol } from "../2-proxy/PathValueProxyWatcher";
 import { pathValueCommitter } from "../0-path-value-core/PathValueController";
 import { getNextTime } from "../0-path-value-core/pathValueCore";
@@ -181,7 +181,7 @@ export function writeFunctionCall(config: {
         DomainName: domainName,
         FunctionId: functionId,
         runAtTime: getNextTime(),
-        callerMachineId: getOwnMachineId(),
+        callerMachineId: getOwnMachineId(getDomain()),
         // Will be updated by Querysub to be correct (unless we are directly writing, then...
         //  this is fine).
         callerIP: "127.0.0.1",

package/src/3-path-functions/PathFunctionRunnerMain.ts

@@ -13,7 +13,7 @@ let yargObj = yargs(process.argv)
 import { logErrors } from "../errors";
 import { PathFunctionRunner } from "./PathFunctionRunner";
 import { SocketFunction } from "socket-function/SocketFunction";
-import { getThreadKeyCert } from "../-a-auth/certs";
+import { getThreadKeyCert } from "sliftutils/misc/https/certs";
 import { ClientWatcher } from "../1-path-client/pathValueClientWatcher";
 import { timeInMinute } from "socket-function/src/misc";
 import { getDomain, isLocal, isPublic } from "../config";

package/src/3-path-functions/tests/rejectTest.ts

@@ -1,6 +1,7 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { delay } from "socket-function/src/batching";
-import { getThreadKeyCert } from "../../-a-auth/certs";
+import { getThreadKeyCert } from "sliftutils/misc/https/certs";
+import { getDomain } from "../../config";
 import { ActionsHistory } from "../../diagnostics/ActionsHistory";
 import { errorToUndefined } from "../../errors";
 import { rawSchema } from "../../2-proxy/pathDatabaseProxyBase";
@@ -56,7 +57,7 @@ async function main() {
     PathValueProxyWatcher.TRACE = true;
     PathFunctionRunner.DEBUG_CALLS = true;
 
-    await SocketFunction.mount({ port: 0, ...await getThreadKeyCert() });
+    await SocketFunction.mount({ port: 0, ...await getThreadKeyCert(getDomain()) });
     if (process.argv.includes("--reader")) {
         ActionsHistory.LOG_ACTION_HISTORY = "reader";
         await reader();

package/src/4-deploy/deployGetFunctionsInner.ts

@@ -1,7 +1,7 @@
 import path from "path";
 import { deployBlock } from "./deployBlock";
 import { SocketFunction } from "socket-function/SocketFunction";
-import { getThreadKeyCert } from "../-a-auth/certs";
+import { getThreadKeyCert } from "sliftutils/misc/https/certs";
 import { getDomain, isPublic } from "../config";
 import { getSchemaObject, getModuleRelativePath, PERMISSIONS_FUNCTION_ID, getExportPath, getPrefixesForDeploy } from "../3-path-functions/syncSchema";
 import { getPathStr2 } from "../path";
@@ -20,7 +20,7 @@ async function main() {
     await deployBlock();
 
     // Mount, so we can write directly to the database
-    await SocketFunction.mount({ port: 0, ...await getThreadKeyCert(), public: isPublic() });
+    await SocketFunction.mount({ port: 0, ...await getThreadKeyCert(getDomain()), public: isPublic() });
 
     let folderRoot = path.resolve(".").replaceAll("\\", "/");
     const deployPath = path.resolve("./deploy.ts");

package/src/4-deploy/edgeNodes.ts

@@ -1,5 +1,5 @@
 import { waitForFirstTimeSync } from "socket-function/time/trueTimeShim";
-import { getOwnMachineId } from "../-a-auth/certs";
+import { getOwnMachineId } from "sliftutils/misc/https/certs";
 import { devDebugbreak, getDomain, isLocal, isPublic, noSyncing } from "../config";
 import child_process from "child_process";
 import { getAllNodeIds, getOwnNodeId } from "../-f-node-discovery/NodeDiscovery";
@@ -144,7 +144,7 @@ export async function registerEdgeNode(config: {
         let gitHash = await getGitRefLive();
 
         let nodeId = getOwnNodeId();
-        let machineId = getOwnMachineId();
+        let machineId = getOwnMachineId(getDomain());
 
         let edgeNodeConfig: EdgeNodeConfig = {
             nodeId,
@@ -194,7 +194,7 @@ const loadEntryPointsByHash = runInSerial(async function loadEntryPointsByHash(c
     entryPaths = entryPaths.map(x => path.resolve(rootPath + x).replaceAll("\\", "/"));
 
     let nodeId = getOwnNodeId();
-    let machineId = getOwnMachineId();
+    let machineId = getOwnMachineId(getDomain());
 
     let edgeNodeConfig: EdgeNodeConfig = {
         nodeId,

package/src/4-querysub/Querysub.ts

@@ -16,7 +16,7 @@ import { SocketFunction } from "socket-function/SocketFunction";
 import { isHotReloading, watchFilesAndTriggerHotReloading } from "socket-function/hot/HotReloadController";
 import { RequireController, setRequireBootRequire } from "socket-function/require/RequireController";
 import { cache, cacheLimited, lazy } from "socket-function/src/caching";
-import { getOwnMachineId, getOwnThreadId, getThreadKeyCert, verifyMachineIdForPublicKey } from "../-a-auth/certs";
+import { getIdentityCAPromise, getOwnMachineId, getOwnThreadId, getThreadKeyCert, verifyMachineIdForPublicKey } from "sliftutils/misc/https/certs";
 import { getHostedIP, getSNICerts, publishMachineARecords } from "../-e-certs/EdgeCertController";
 import { debugCoreMode, registerGetCompressNetwork, authorityStorage, enableDebugRejections } from "../0-path-value-core/pathValueCore";
 import { clientWatcher, ClientWatcher } from "../1-path-client/pathValueClientWatcher";
@@ -28,7 +28,7 @@ import { logErrors } from "../errors";
 import { getLastPathPart, getPathIndexAssert, getPathStr2 } from "../path";
 import { PermissionsCheck } from "./permissions";
 import { inlineNestedCalls, syncSchema } from "../3-path-functions/syncSchema";
-import type { identityStorageKey, IdentityStorageType } from "../-a-auth/certs";
+import type { identityStorageKey, IdentityStorageType } from "sliftutils/misc/https/certs";
 
 import { ExternalRenderClass, qreact } from "../4-dom/qreact";
 import { configRootDiscoveryLocation, getOwnNodeId, onNodeBroadcasted, onNodeDiscoveryReady } from "../-f-node-discovery/NodeDiscovery";
@@ -185,7 +185,8 @@ export class Querysub {
     public static DEBUG_CALLS = false;
     public static DEBUG_PREDICTIONS = false;
     public static PREDICT_CALLS = true;
-    public static AUDIT_PREDICTIONS = true;
+    // These audits are mostly wrong, so I'm just disabling them. 
+    public static AUDIT_PREDICTIONS = false;
     public static SIMULATE_LAG = 0;
 
     public static registerAliveChecker = <T>(config: AliveChecker<T>) => registerAliveChecker(config);
@@ -235,7 +236,7 @@ export class Querysub {
 
     public static getCallerMachineId() {
         let call = getCurrentCallAllowUndefined();
-        if (!call) return getOwnMachineId();
+        if (!call) return getOwnMachineId(getDomain());
         return getCurrentCall().callerMachineId;
     }
     public static getCallerIP = () => getCurrentCall().callerIP;
@@ -553,12 +554,12 @@ export class Querysub {
     };
     public static onCommitPredictFinished = this.onCallPredict;
 
-    public static getOwnMachineId = getOwnMachineId;
-    public static getSelfMachineId = getOwnMachineId;
+    public static getOwnMachineId = () => getOwnMachineId(getDomain());
+    public static getSelfMachineId = () => getOwnMachineId(getDomain());
 
     public static getOwnNodeId = () => getOwnNodeId();
     public static getSelfNodeId = () => getOwnNodeId();
-    public static getOwnThreadId = () => getOwnThreadId();
+    public static getOwnThreadId = () => getOwnThreadId(getDomain());
 
     /** Set ClientWatcher.DEBUG_SOURCES to true for to be populated */
     public static getTriggerReason() {
@@ -758,6 +759,8 @@ export class Querysub {
 
         sourceCheck?: MachineSourceCheck<any>;
     }) {
+        await getIdentityCAPromise(getDomain());
+
         console.log(`Hosting server with config: ${JSON.stringify(config)}`);
         this.socketFunctionInit();
 
@@ -839,7 +842,7 @@ export class Querysub {
             public: isPublic(),
             port: config.port,
             autoForwardPort: true,
-            ...await getThreadKeyCert(),
+            ...await getThreadKeyCert(getDomain()),
             SNICerts: {
                 ...await getSNICerts({
                     publicPort: config.port,
@@ -903,7 +906,7 @@ export class Querysub {
             globalThis.remapImportRequestsClientside = globalThis.remapImportRequestsClientside || [];
             globalThis.remapImportRequestsClientside.push(async (args) => {
                 try {
-                    let key: typeof identityStorageKey = "machineCA_9";
+                    let key: typeof identityStorageKey = "machineCA_14";
                     let storageValueJSON = localStorage.getItem(key);
                     if (!storageValueJSON) return args;
                     let storageValue = JSON.parse(storageValueJSON) as IdentityStorageType;
@@ -1055,6 +1058,7 @@ export class Querysub {
         if (isClient()) {
             throw new Error(`--client processes cannot host a service. Either stop passing --client and keep the process on the network and trusted, or stop calling hostServer and call Querysub.configRootDiscoveryLocation instead. You MUST provide configRootDiscoveryLocation a valid nodeId. Which means either you do server selection manually, or if you are developing, just point it to "127-0-0-1.${getDomain()}:your local port here"`);
         }
+        await getIdentityCAPromise(getDomain());
         let times: {
             name: string;
             duration: number
@@ -1069,7 +1073,7 @@ export class Querysub {
         let mountPromise = SocketFunction.mount({
             public: isPublic(),
             port,
-            ...await getThreadKeyCert(),
+            ...await getThreadKeyCert(getDomain()),
         });
 
         let publishPromise = publishMachineARecords();

package/src/4-querysub/querysubPrediction.ts

@@ -351,7 +351,6 @@ function predictCallBase(config: {
         //      which create a memory leak.
         rejectPrediction();
 
-
         if (Querysub.AUDIT_PREDICTIONS && predictions) {
             // Wait to receive all parts of the prediction
             await delay(10_000);
@@ -370,16 +369,6 @@ function predictCallBase(config: {
                 let predictBuffer = cborEncoder().encode(predictValue);
                 // If they are different, warn
                 if (!finalBuffer.equals(predictBuffer)) {
-                    // NOTE: This MIGHT be due to delayCommit on another function. We can't know when to force flush
-                    //  delayCommit values, and so we only force flush if other (non-delayCommit) functions are committed
-                    //  in the same schema, which will be wrong if data is accessed cross schema.
-                    //  - If this happens, and is a problem, we COULD handle it, but... it is very difficult, as we would need
-                    //      to evaluate the other function, detect it conflicts with a delayCommit functions, then run the delayCommit
-                    //      function, then re-evaluated the conflicted prediction (which is a lot of communication and reruns
-                    //      between a lot of systems... especially because in a second this will resolve by the server
-                    //      clobbering our prediction).
-                    //      - AND, we can't commit the pending calls until we sort out the order, so this necessarily requires
-                    //          slowing down commits if we are delaying other calls.
                     console.warn(`${red("Prediction was wrong")}: for ${call.DomainName}.${call.FunctionId} value path ${getPathFromStr(predict.path).join(".")} predict != finalValue. ${config.metadata.delayCommit && "This function is using delay commit. It's likely that you are using the time from Querysub.now() (or accessing the function call time in some other way). This doesn't work with delay commit because the server will rewrite the commit time, instead you should pass the timestamp as a parameter (And then make sure it's not some kind of privilege value that the user could cheat)" || ""} It might be the case that you shouldn't even predict the call client side (you can use the functionMetadata to set it as nopredict). It might also be the case that you do want to predict it, but you should batch the calls, so you only make one call, instead of many calls at once.`, predictValue, finalValue);
                 }
             }

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -25,7 +25,7 @@ import { managementPageURL } from "../../diagnostics/managementPages";
 import { getLogViewerParams } from "../../diagnostics/logs/IndexedLogs/LogViewerParams";
 import { getScreenName } from "../machineApplyMainCode";
 import { getOwnThreadId } from "../../-f-node-discovery/NodeDiscovery";
-import { decodeNodeId } from "../../-a-auth/certs";
+import { decodeNodeId } from "sliftutils/misc/https/certs";
 
 
 

package/src/deployManager/machineApplyMainCode.ts

@@ -1,7 +1,7 @@
 import "../inject";
 
 import { measureWrap } from "socket-function/src/profiling/measure";
-import { getOwnMachineId } from "../-a-auth/certs";
+import { getOwnMachineId } from "sliftutils/misc/https/certs";
 import { forceRemoveNode, getOurNodeId, getOurNodeIdAssert } from "../-f-node-discovery/NodeDiscovery";
 import { Querysub } from "../4-querysub/Querysub";
 import { MACHINE_RESYNC_INTERVAL, MachineServiceControllerBase, MachineInfo, ServiceConfig, serviceConfigs, SERVICE_FOLDER, machineInfos, SERVICE_NODE_FILE_NAME, getEffectiveServiceConfigs, recordLaunch } from "./machineSchema";
@@ -86,7 +86,7 @@ const getDiskInfo = measureWrap(async function getDiskInfo(): Promise<{ value: n
 
 const getLiveMachineInfo = measureWrap(async function getLiveMachineInfo() {
     let machineInfo: MachineInfo = {
-        machineId: getOwnMachineId(),
+        machineId: getOwnMachineId(getDomain()),
         applyNodeId: getOurNodeIdAssert(),
         heartbeat: Date.now(),
         info: {},
@@ -661,7 +661,7 @@ let launchesPerService = new Map<string, number>();
 let lastLaunchedTimePerService = new Map<string, number>();
 
 async function quickIsOutdated() {
-    let machineId = getOwnMachineId();
+    let machineId = getOwnMachineId(getDomain());
     // If any rolling are ready to restart, we are outdated
     for (let [rollingScreenName, rollingInfo] of rollingKeepScreenAlive) {
         if (rollingInfo.pinnedTime + rollingInfo.pinnedDuration < Date.now()) {
@@ -697,7 +697,7 @@ async function quickIsOutdated() {
 
 const resyncServicesBase = runInSerial(measureWrap(async function resyncServices() {
     console.log(magenta("Resyncing services"));
-    let machineId = getOwnMachineId();
+    let machineId = getOwnMachineId(getDomain());
     let configs = await getEffectiveServiceConfigs();
     let relevantConfigs = configs.filter(config => config.machineIds.includes(machineId)).filter(x => x.parameters.deploy);
 

package/src/deployManager/machineSchema.ts

@@ -9,7 +9,7 @@ import { getCallObj } from "socket-function/src/nodeProxy";
 import { getSyncedController } from "../library-components/SyncedController";
 import { requiresNetworkTrustHook } from "../-d-trust/NetworkTrust2";
 import { extractType } from "../misc/extractType";
-import { getOwnMachineId } from "../-a-auth/certs";
+import { getOwnMachineId } from "sliftutils/misc/https/certs";
 import { delay, runInSerial, runInfinitePollCallAtStart } from "socket-function/src/batching";
 import { lazy } from "socket-function/src/caching";
 import { errorToUndefinedSilent } from "../errors";

package/src/diagnostics/MachineThreadInfo.tsx

@@ -9,7 +9,8 @@ import { getNodeIdDomain, getNodeIdLocation, getNodeIdDomainMaybeUndefined } fro
 import { assertIsNetworkTrusted } from "../-d-trust/NetworkTrust2";
 import { runPromise } from "../functional/runCommand";
 import { errorToUndefinedSilent } from "../errors";
-import { decodeNodeId } from "../-a-auth/certs";
+import { decodeNodeId } from "sliftutils/misc/https/certs";
+import { getDomain } from "../config";
 import { keyBy, keyByArray, timeInSecond, timeoutToUndefined, timeoutToUndefinedSilent } from "socket-function/src/misc";
 import dns from "dns";
 import { isDefined } from "../misc";
@@ -193,7 +194,7 @@ class MachineThreadInfoBase {
     }> {
         let nodeIds = await getAllNodeIds();
         let specialInfos = await Promise.all(nodeIds.map(async (nodeId): Promise<NodeSpecialInfo | undefined> => {
-            const nodeParts = decodeNodeId(nodeId);
+            const nodeParts = decodeNodeId(nodeId, getDomain());
             if (!nodeParts) return undefined;
 
             const location = getNodeIdLocation(nodeId);

package/src/diagnostics/NodeViewer.tsx

@@ -64,13 +64,17 @@ export class NodeViewer extends qreact.Component {
             // atomic
             [nodeId: string]: NodeData
         },
+        nodesVersion: 0,
     };
     populateNodeInfos = lazy(() => {
         logErrors((async () => {
             try {
                 const controller = NodeViewerController.nodes[getBrowserUrlNode()];
                 let nodeIds = await controller.getAllNodeIds();
-                Querysub.commit(() => this.state.nodeIds = nodeIds);
+                Querysub.commit(() => {
+                    this.state.nodeIds = nodeIds;
+                    this.state.nodesVersion++;
+                });
 
                 let ourIP = await controller.getCallerIP();
                 let ourExternalIP = await getExternalIP();
@@ -109,6 +113,7 @@ export class NodeViewer extends qreact.Component {
                     data.loadTime = time;
                     Querysub.commit(() => {
                         this.state.nodes[nodeId] = atomicObjectWrite(data);
+                        this.state.nodesVersion++;
                     });
                 }));
             } catch (e: any) {
@@ -146,6 +151,7 @@ export class NodeViewer extends qreact.Component {
         if (this.state.access === "verifying") {
             return <div>Verifying access...</div>;
         }
+        void this.state.nodesVersion;
         let nodeDatas = Object.values(this.state.nodes);
         let deadCount = 0;
         if (!showNotReadyNodes.value) {

package/src/diagnostics/logs/IndexedLogs/IndexedLogs.ts

@@ -7,7 +7,7 @@ import { IndexedLogResults, Reader, SearchParams, addReadToResults, createEmptyI
 import { getDomain, isPublic } from "../../../config";
 import { getArchivesHome, getArchivesLocal } from "../../../-a-archives/archivesDisk";
 import { getArchivesBackblaze, getArchivesBackblazePrivateImmutable } from "../../../-a-archives/archivesBackBlaze";
-import { getMachineId, getOwnThreadId } from "../../../-a-auth/certs";
+import { getMachineId, getOwnThreadId } from "sliftutils/misc/https/certs";
 import { ArchivesMemoryCacheStats, createArchivesMemoryCache } from "../../../-a-archives/archivesMemoryCache";
 import { registerShutdownHandler } from "../../periodic";
 import { measureBlock, measureFnc, measureWrap } from "socket-function/src/profiling/measure";
@@ -278,7 +278,7 @@ export class IndexedLogs<T> {
     private async getMachineNodes(): Promise<string[]> {
         let nodeIds = await getAllNodeIds();
         nodeIds = nodeIds.filter(x => !isNodeIdOnOwnMachineId(x));
-        let byMachineId = keyByArray(nodeIds, x => getMachineId(x));
+        let byMachineId = keyByArray(nodeIds, x => getMachineId(x, getDomain()));
 
         let nextCache = new Map<string, string>();
 

package/src/diagnostics/logs/IndexedLogs/MCPIndexedLogs.ts

@@ -1,6 +1,7 @@
 import { sort, timeInHour, timeInMinute, timeInSecond, timeoutToError, timeoutToUndefined, timeoutToUndefinedSilent } from "socket-function/src/misc";
 import { lazy } from "socket-function/src/caching";
-import { getMachineId } from "../../../-a-auth/certs";
+import { getMachineId } from "sliftutils/misc/https/certs";
+import { getDomain } from "../../../config";
 import { getAllNodeIds, getOwnMachineId, isOwnNodeId } from "../../../-f-node-discovery/NodeDiscovery";
 import { NodeCapabilitiesController } from "../../../-g-core-values/NodeCapabilities";
 import { getLoggers2Async, LogDatum } from "../diskLogger";
@@ -537,7 +538,7 @@ export class MCPIndexedLogs {
     // list and tries each until one services the request.
     private async findRemoteNodesOnMachine(machineId: string): Promise<string[]> {
         let allIds = await getAllNodeIds();
-        let candidates = allIds.filter(id => !isOwnNodeId(id) && getMachineId(id) === machineId);
+        let candidates = allIds.filter(id => !isOwnNodeId(id) && getMachineId(id, getDomain()) === machineId);
         if (candidates.length === 0) return [];
 
         let preferred: string[] = [];

package/src/diagnostics/logs/diskLogGlobalContext.ts

@@ -1,8 +1,9 @@
 import { SocketFunction } from "socket-function/SocketFunction";
 import { lazy } from "socket-function/src/caching";
 import { getExternalIP } from "socket-function/src/networking";
-import { decodeNodeId, getOwnMachineId, getOwnThreadId } from "../../-a-auth/certs";
+import { decodeNodeId, getOwnMachineId, getOwnThreadId } from "sliftutils/misc/https/certs";
 import { getOwnNodeId } from "../../-f-node-discovery/NodeDiscovery";
+import { getDomain } from "../../config";
 import { logErrors } from "../../errors";
 import { addGlobalContext } from "./diskLogger";
 import child_process from "child_process";
@@ -19,9 +20,9 @@ export function addBuiltInContext() {
         let nodeId = getOwnNodeId();
         let nodeParts = getNodeIdLocation(nodeId);
         return {
-            __machineId: getOwnMachineId(),
+            __machineId: getOwnMachineId(getDomain()),
             __mountId: SocketFunction.mountedNodeId,
-            __threadId: getOwnThreadId(),
+            __threadId: getOwnThreadId(getDomain()),
             __port: nodeParts?.port,
             __nodeId: nodeId,
             __entry: process.argv[1],

package/src/diagnostics/misc-pages/DNSPage.tsx

@@ -28,12 +28,16 @@ export type DNSRecord = {
     ttl: number;
     createdOn: number;
     modifiedOn: number;
+    // Time we last asserted this record, parsed from our freshness comment tag, falling back to
+    //  Cloudflare's modified_on when the tag is absent. This is the time used for staleness.
+    setOn: number;
 };
 
 class DNSPageControllerBase {
     public async getAllRecords(): Promise<DNSRecord[]> {
         if (!isNode()) throw new Error(`getAllRecords must be called serverside`);
         const { cloudflareGETCall } = await import("../../-b-authorities/cloudflareHelpers");
+        const { freshnessTime } = await import("../../-b-authorities/dnsAuthority");
         const { getDomain } = await import("../../config");
 
         let zones = await cloudflareGETCall<{ id: string; name: string }[]>("/zones", {
@@ -55,11 +59,13 @@ class DNSPageControllerBase {
                     ttl: number;
                     created_on: string;
                     modified_on: string;
+                    comment?: string;
                 }[]>(`/zones/${zone.id}/dns_records`, {
                     per_page: String(RECORDS_PER_PAGE),
                     page: String(page),
                 });
                 for (let record of records) {
+                    let modifiedOn = new Date(record.modified_on).getTime();
                     allRecords.push({
                         id: record.id,
                         zoneId: zone.id,
@@ -70,7 +76,8 @@ class DNSPageControllerBase {
                         proxied: record.proxied,
                         ttl: record.ttl,
                         createdOn: new Date(record.created_on).getTime(),
-                        modifiedOn: new Date(record.modified_on).getTime(),
+                        modifiedOn,
+                        setOn: freshnessTime(record.comment) || modifiedOn,
                     });
                 }
                 if (records.length < RECORDS_PER_PAGE) break;
@@ -161,7 +168,7 @@ export class DNSPage extends qreact.Component {
     }
 
     private async deleteStaleHexRecords(content: string, matching: DNSRecord[]) {
-        let listText = matching.map(r => `  ${r.type} ${r.name}  (modified ${new Date(r.modifiedOn).toISOString()})`).join("\n");
+        let listText = matching.map(r => `  ${r.type} ${r.name}  (set ${new Date(r.setOn).toISOString()})`).join("\n");
         let typed = prompt(`Type "${content}" to confirm deleting ${matching.length} stale hex-subdomain record(s):\n\n${listText}`);
         if (typed === null) return;
         if (typed !== content) {
@@ -237,7 +244,7 @@ export class DNSPage extends qreact.Component {
         let groupEntries = Array.from(groups.entries()).map(([content, list]) => ({ content, records: list }));
         sort(groupEntries, x => -x.records.length);
         for (let group of groupEntries) {
-            sort(group.records, r => -r.modifiedOn);
+            sort(group.records, r => -r.setOn);
         }
 
         return <div className={css.vbox(12).pad2(16).fillWidth}>
@@ -289,13 +296,13 @@ export class DNSPage extends qreact.Component {
                             {(() => {
                                 let staleHex = list.filter(r =>
                                     HEX_SUBDOMAIN_REGEX.test(r.name)
-                                    && Date.now() - r.modifiedOn > STALE_HEX_SUBDOMAIN_AGE
+                                    && Date.now() - r.setOn > STALE_HEX_SUBDOMAIN_AGE
                                 );
                                 if (staleHex.length === 0) return undefined;
                                 let staleHexBusy = !!this.state.busyKeys[`staleHex:${content}`];
                                 return <div className={css.vbox(4).pad2(8).bord2(30, 60, 60).hsl(30, 70, 96)}>
                                     <div className={css.hbox(10).alignItems("center")}>
-                                        <span className={css.boldStyle}>Stale hex-subdomain records (modified &gt;7d ago): {staleHex.length}</span>
+                                        <span className={css.boldStyle}>Stale hex-subdomain records (set &gt;7d ago): {staleHex.length}</span>
                                         <div className={css.flexGrow(1)} />
                                         <button
                                             className={css.pad2(10, 6).button.bord2(0, 80, 50)
@@ -307,7 +314,7 @@ export class DNSPage extends qreact.Component {
                                         </button>
                                     </div>
                                     <div className={css.vbox(2).fontFamily("monospace").colorhsl(0, 0, 30)}>
-                                        {staleHex.map(r => <div key={r.id}>{r.type} {r.name} — modified {formatDateJSX(r.modifiedOn)}</div>)}
+                                        {staleHex.map(r => <div key={r.id}>{r.type} {r.name} — set {formatDateJSX(r.setOn)}</div>)}
                                     </div>
                                 </div>;
                             })()}
@@ -324,6 +331,9 @@ export class DNSPage extends qreact.Component {
                                     <span className={css.colorhsl(0, 0, 50)}>
                                         modified {formatDateJSX(record.modifiedOn)}
                                     </span>
+                                    <span className={css.colorhsl(0, 0, 50)}>
+                                        set {formatDateJSX(record.setOn)}
+                                    </span>
                                     <span className={css.colorhsl(0, 0, 50)}>{record.zoneName}</span>
                                     <button
                                         className={css.pad2(8, 4).button.bord2(0, 0, 60)

package/src/diagnostics/pathAuditer.ts

@@ -12,12 +12,12 @@ import { authorityLookup } from "../0-path-value-core/AuthorityLookup";
 import { pathValueSerializer } from "../-h-path-value-serialize/PathValueSerializer";
 import { validStateComputer } from "../0-path-value-core/ValidStateComputer";
 import { SocketFunction } from "socket-function/SocketFunction";
-import { decodeNodeId } from "../-a-auth/certs";
+import { decodeNodeId } from "sliftutils/misc/https/certs";
 import { requiresNetworkTrustHook } from "../-d-trust/NetworkTrust2";
 import { assertIsManagementUser } from "./managementPages";
 import { isNode } from "typesafecss";
 import { isClient } from "../config2";
-import { isLocal } from "../config";
+import { isLocal, getDomain } from "../config";
 import { pathWatcher } from "../0-path-value-core/PathWatcher";
 import { debugNodeId } from "../-c-identity/IdentityController";
 import debugbreak from "debugbreak";
@@ -253,7 +253,7 @@ function trackSyncAge(config: {
             ourValid: config.ourValid,
             remoteValid: config.remoteValid,
             remoteNodeId: config.remoteNodeId,
-            remoteNodeThreadId: decodeNodeId(config.remoteNodeId)?.threadId,
+            remoteNodeThreadId: decodeNodeId(config.remoteNodeId, getDomain())?.threadId,
         });
     } else if (age >= WARN_THRESHOLD) {
         stats.warningCount++;
@@ -265,7 +265,7 @@ function trackSyncAge(config: {
             ourValid: config.ourValid,
             remoteValid: config.remoteValid,
             remoteNodeId: config.remoteNodeId,
-            remoteNodeThreadId: decodeNodeId(config.remoteNodeId)?.threadId,
+            remoteNodeThreadId: decodeNodeId(config.remoteNodeId, getDomain())?.threadId,
         });
     } else {
         stats.fixedCount++;

package/src/diagnostics/watchdog.ts

@@ -4,7 +4,7 @@ import { logErrors } from "../errors";
 import { isNode, sort } from "socket-function/src/misc";
 import debugbreak from "debugbreak";
 import { registerPeriodic } from "./periodic";
-import { getOwnMachineId } from "../-a-auth/certs";
+import { getOwnMachineId } from "sliftutils/misc/https/certs";
 import { SocketFunction } from "socket-function/SocketFunction";
 import { formatPercent, formatTime } from "socket-function/src/formatting/format";
 import { pathWatcher } from "../0-path-value-core/PathWatcher";

package/src/server.ts

@@ -3,7 +3,7 @@ import "./inject";
 
 import { isNode, isNodeTrue } from "socket-function/src/misc";
 import { SocketFunction } from "socket-function/SocketFunction";
-import { getThreadKeyCert } from "./-a-auth/certs";
+import { getThreadKeyCert } from "sliftutils/misc/https/certs";
 import { logErrors } from "./errors";
 import { green } from "socket-function/src/formatting/logColors";
 import { formatTime } from "socket-function/src/formatting/format";