querysub 0.410.0 → 0.412.0

package/package.json

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

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

@@ -147,13 +147,16 @@ class IdentityControllerBase {
         if (!areNodeIdsEqual(payload.serverId, localNodeId)) {
             throw new Error(`Identity is for another server! The connection is calling us ${localNodeId}, but signature is for ${payload.serverId}`);
         }
-        let calledMachineId = getMachineId(payload.serverId);
-        if (calledMachineId !== "127-0-0-1" && calledMachineId !== getOwnMachineId()) {
-            throw new Error(`Tried to call a different machine. We are ${getOwnMachineId()}, they called ${calledMachineId}`);
-        }
-        let calledThreadId = decodeNodeId(payload.serverId)?.threadId;
-        if (calledThreadId && calledThreadId !== "127-0-0-1" && calledThreadId !== getOwnThreadId()) {
-            throw new Error(`Tried to call a different thread. We are ${getOwnThreadId()}, they called ${calledThreadId}`);
+        // If they're calling from the browser, then they're not going to be able to use our machine ID, etc. However, they should be calling an actual https node, so it should still be secure for them. 
+        if (payload.clientIsNode) {
+            let calledMachineId = getMachineId(payload.serverId);
+            if (calledMachineId !== "127-0-0-1" && calledMachineId !== getOwnMachineId()) {
+                throw new Error(`Tried to call a different machine. We are ${getOwnMachineId()}, they called ${calledMachineId}`);
+            }
+            let calledThreadId = decodeNodeId(payload.serverId)?.threadId;
+            if (calledThreadId && calledThreadId !== "127-0-0-1" && calledThreadId !== getOwnThreadId()) {
+                throw new Error(`Tried to call a different thread. We are ${getOwnThreadId()}, they called ${calledThreadId}`);
+            }
         }
 
 

package/src/4-deploy/edgeNodes.ts

@@ -19,7 +19,7 @@ import { getControllerNodeIdList } from "../-g-core-values/NodeCapabilities";
 import { blue, magenta } from "socket-function/src/formatting/logColors";
 import { errorToUndefined } from "../errors";
 import { deploySchema } from "./deploySchema";
-import { proxyWatcher } from "../2-proxy/PathValueProxyWatcher";
+import { atomic, proxyWatcher } from "../2-proxy/PathValueProxyWatcher";
 import { Querysub } from "../4-querysub/QuerysubController";
 import { onEdgeNodesChanged } from "./edgeBootstrap";
 import { startEdgeNotifier } from "./edgeClientWatcher";
@@ -82,6 +82,7 @@ export async function registerEdgeNode(config: {
     if (!SocketFunction.isMounted()) {
         throw new Error("registerEdgeNode must be called after SocketFunction.mount");
     }
+    console.log(magenta(`registerEdgeNode ${JSON.stringify(config.host)}`));
 
     if (registeredEdgeNode) {
         throw new Error(`registerEdgeNode already called. Should only host 1 edgeNode per node. Previously registered with ${JSON.stringify(registeredEdgeNode)}, new call used ${JSON.stringify(config)}`);
@@ -272,9 +273,14 @@ async function updateEdgeNodesFile() {
 
     let liveHash = "";
     if (!noSyncing()) {
-        liveHash = await Querysub.commitSynced(() => {
-            return String(deploySchema()[getDomain()].deploy.live.hash);
+        liveHash = await Querysub.commitAsync(() => {
+            return atomic(deploySchema()[getDomain()].deploy.live.hash);
         });
+        if (!liveHash) {
+            require("debugbreak")(2);
+            debugger;
+            throw new Error(`No live hash set?`);
+        }
     }
 
     let diff = !!compareArray(edgeNodeNodeIds.sort(), prevEdgeNodeIndex.edgeNodes.map(x => x.nodeId).sort());

package/src/diagnostics/auditDiskValues.ts

@@ -75,8 +75,8 @@ export async function auditDiskValues(spec: AuthoritySpec) {
             serverSnapshotsByAuthority.set(authority.nodeId, { spec: authority, serverMap });
             authoritiesLoaded++;
             console.log(magenta(`Loaded authority ${magenta(String(authoritiesLoaded))}/${green(formatNumber(authoritiesToCheck.length))}: ${authority.nodeId} (${magenta(formatNumber(serverSnapshot.length))} entries)`));
-        } catch (error) {
-            console.error(`Failed to get audit snapshot from authority ${authority.nodeId}`, error);
+        } catch (error: any) {
+            console.warn(`Failed to get audit snapshot from authority ${authority.nodeId}`, { error: error.stack });
         }
     }));
     let timeLoadAuthorities = Date.now() - timeStartLoadAuthorities;

package/tempnotes.txt

@@ -1,4 +1,20 @@
 
+1) The machines think they're using a local IP, so something's wrong with how they're determining their own IP. 
+2) The machines all think their port is the same, but they shouldn't think that. 
+
+Oh, we broke our live file at some time. The host of everything is saying it's the same thing. It's just wrong. That's not the host based on the node ID. Where did that even come from? 
+
+Oh, our live hash in the edge node index file is wrong. Let's see if it's wrong in the database or if we're just creating the file wrong. 
+    - As in, it's corrupted, as in it's the string object representation. 
+
+1) Test local querysub server
+1.0) If it doesn't work, try to run the test script with a simple watcher to see if we can sync paths
+1.1) If it does... run a public querysub server locally?
+
+Well, let's run locally and see if our local query subserver works. 
+
+It's not working. The server isn't starting up. 
+
 
 3) Deploy EVERYTHING (all services) to remote servers
     3.0) deploy the path value servers shard it like we were testing locally

package/test.ts

@@ -9,18 +9,19 @@ import { green, yellow } from "socket-function/src/formatting/logColors";
 import { Querysub } from "./src/4-querysub/Querysub";
 import { pathValueArchives } from "./src/0-path-value-core/pathValueArchives";
 import { getAllAuthoritySpec } from "./src/0-path-value-core/PathRouterServerAuthoritySpec";
+import { deploySchema } from "./src/4-deploy/deploySchema";
+import { getDomain } from "./src/config";
 
 
 async function main() {
     await Querysub.hostService("test");
 
-    let spec = await getAllAuthoritySpec();
-
-    let data = await pathValueArchives.loadValues({
-        ...spec,
-        routeStart: 0.5,
-        routeEnd: 0.6,
+    let test = await Querysub.commitAsync(() => {
+        let live = deploySchema()[getDomain()].deploy.live.hash;
+        console.log({ live });
+        return String(live);
     });
+    console.log({ test });
 }
 
 main().catch(console.error)