querysub 0.304.0 → 0.306.0

package/package.json

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

package/src/-f-node-discovery/NodeDiscovery.ts

@@ -19,6 +19,7 @@ import { decodeNodeId, decodeNodeIdAssert } from "../-a-auth/certs";
 import { isDefined } from "../misc";
 import { diskLog } from "../diagnostics/logs/diskLogger";
 import { getBootedEdgeNode } from "../-0-hooks/hooks";
+import { EdgeNodeConfig } from "../4-deploy/edgeNodes";
 
 let HEARTBEAT_INTERVAL = timeInMinute * 15;
 // Interval which we check other heartbeats
@@ -221,11 +222,12 @@ export function configRootDiscoveryLocation(config: {
     rootDiscoveryNodeId = getNodeId(config.domain, config.port);
 }
 
-export function updateRootDiscoveryLocation(nodeId: string) {
+export function updateRootDiscoveryLocation(edgeNode: EdgeNodeConfig) {
     let prevRootId = getBrowserUrlNode();
     if (!isClient()) {
         throw new Error(`updateRootDiscoveryLocation should only be called in the browser. If not a client, you should be able to discovery new nodes automatically`);
     }
+    let nodeId = edgeNode.host;
     let nodeCache = Object.entries(require.cache);
     for (let [path, module] of nodeCache) {
         if (!module) continue;
@@ -254,6 +256,7 @@ export function updateRootDiscoveryLocation(nodeId: string) {
             }
         }
     }
+    globalThis.BOOTED_EDGE_NODE = edgeNode;
     rootDiscoveryNodeId = nodeId;
     addNodeId(nodeId);
 }

package/src/4-deploy/edgeClientWatcher.tsx

@@ -215,7 +215,7 @@ const runRefreshLoop = lazy(async () => {
             console.log(yellow(`Server timed out, finding new server`));
             try {
                 let config = await getEdgeNodeConfig();
-                updateRootDiscoveryLocation(config.host);
+                updateRootDiscoveryLocation(config);
             } catch (e: any) {
                 console.warn(`Failed to find new edge node, trying again in 15 seconds: ${e.message}`);
                 await delay(15000);

package/src/deployManager/machineApplyMainCode.ts

@@ -334,19 +334,12 @@ const runScreenCommand = measureWrap(async function runScreenCommand(config: {
     let prefix = getTmuxPrefix();
     let screenName = config.screenName;
 
-    if (config.rollingWindow) {
+    if (config.rollingWindow !== undefined) {
         let screens = await getScreenState();
         let rollingObj = rollingKeepScreenAlive.get(screenName);
         if (rollingObj) {
             rollingObj.pinnedDuration = config.rollingWindow;
         }
-        // Without this check we might have only 1 service up for a long period of time. I guess even with it we can still have only 1 service up for a long period of time (if the rolling window is alive, but barely), but... idk... this seems better?
-        if (rollingObj && rollingObj.pinnedTime + rollingObj.pinnedDuration < Date.now()) {
-            console.log(red(`Rolling screen ${screenName} is finished, deleting it, it should be killed shortly`));
-            rollingKeepScreenAlive.delete(screenName);
-            rollingScreens.delete(rollingObj.rollingScreenName);
-            rollingObj = undefined;
-        }
         let existingScreen = screens.find(x => x.screenName === screenName);
         if (existingScreen && !rollingObj) {
             let nodeIdPath = os.homedir() + "/" + SERVICE_FOLDER + screenName + "/" + SERVICE_NODE_FILE_NAME;

package/src/deployManager/spec.txt

@@ -1,10 +1,5 @@
-// updateRootDiscoveryLocation("127-0-0-1.querysubtest.com:7008")
 
-Get updateRootDiscoveryLocation called when we disconnect, and don't reconnect?
-
-
-
-1) Redeploy everything to latest
+1) Update everything to latest
 3) Update cyoa rolling time back to 4 hours