querysub 0.134.0 → 0.136.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.134.0",
+  "version": "0.136.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/deployMain.ts

@@ -41,8 +41,8 @@ export async function deployMain() {
         // Mount, so we can write directly to the database
         await SocketFunction.mount({ port: 0, ...await getThreadKeyCert(), public: isPublic() });
 
-        //await setLiveDeployedHash({ hash: "d37fdcfc114db403a43d533d467cbdd53418c57b", refreshThresholdTime: 0, });
-        await setLiveDeployedHash({ hash: "17c5670151deaa6b09f559bfe2c5b777d82db7d9", refreshThresholdTime: 0, });
+        await setLiveDeployedHash({ hash: "7b94606dc1de8d03acb8b23952ff5d49e716a45e", refreshThresholdTime: 0, });
+        //await setLiveDeployedHash({ hash: "4cba43649682967bf1ff919d941820bea6719ef7", refreshThresholdTime: 0, });
         console.log(magenta(`SHUTTING DOWN`));
         await shutdown();
         return;

package/src/4-deploy/edgeBootstrap.ts

@@ -323,6 +323,10 @@ async function edgeNodeFunction(config: {
         //  though, as we need to know the entryPaths to import)
         {
             let curHost = document.location.host;
+            // Always include the port
+            if (!curHost.includes(":")) {
+                curHost += ":443";
+            }
             let exactNode = edgeNodes.find(x => x.host === curHost);
             if (exactNode) {
                 console.log(`MATCH exact host: ${getNodeDebugString(exactNode)}`);

package/src/4-deploy/edgeNodes.ts

@@ -82,6 +82,7 @@ export async function registerEdgeNode(config: {
         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)}`);
     }
     registeredEdgeNode = true;
+    let host = config.host;
 
     await waitForFirstTimeSync();
 
@@ -94,7 +95,7 @@ export async function registerEdgeNode(config: {
             loadedHash = hash;
             void Promise.resolve().then(async () => {
                 await loadEntryPointsByHash({
-                    host: config.host,
+                    host,
                     entryPaths: config.entryPaths,
                     hash,
                 });
@@ -109,7 +110,7 @@ export async function registerEdgeNode(config: {
         let edgeNodeConfig: EdgeNodeConfig = {
             nodeId,
             machineId,
-            host: config.host,
+            host,
             gitHash,
             bootTime: Date.now(),
             entryPaths: config.entryPaths,
@@ -119,7 +120,7 @@ export async function registerEdgeNode(config: {
         await edgeNodeStorage.set(getNextNodePath(), Buffer.from(JSON.stringify(edgeNodeConfig)));
     }
     registeredEdgeNode = {
-        host: config.host,
+        host,
         entryPaths: config.entryPaths,
     };