querysub 0.267.0 → 0.269.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.267.0",
+  "version": "0.269.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/edgeBootstrap.ts

@@ -247,11 +247,17 @@ async function edgeNodeFunction(config: {
     progressUI.setMessage("Finding available server...");
     let retryCount = 0;
     while (true) {
+        let cached = !!cachedConfig;
         try {
             let booted = await tryToBoot();
             if (booted) break;
         } catch (e) {
             console.error(e);
+            // If it's a cached failure, it might be that the cache is out of date, so rerun immediately without waiting or an error message.
+            if (cached) {
+                cachedConfig = undefined;
+                continue;
+            }
         }
         retryCount++;
         progressUI.setMessage(`No available servers, retried ${retryCount++} times`);
@@ -290,6 +296,7 @@ async function edgeNodeFunction(config: {
     }
     async function getEdgeNodeConfig(): Promise<EdgeNodeConfig> {
         let edgeIndex = cachedConfig || await (await fetch(config.edgeNodeConfigURL)).json() as EdgeNodesIndex;
+        cachedConfig = undefined;
 
         edgeIndex.edgeNodes.sort((a, b) => -(a.bootTime - b.bootTime));
         // Filter out duplicate hostnames (taking the max bootTime). We can't have multiple services using the same port, so duplicates are DEFINITELY dead. This fixes some issues with accessing old services, and generally makes reading the logs easier.
@@ -300,7 +307,6 @@ async function edgeNodeFunction(config: {
             return true;
         });
 
-        cachedConfig = undefined;
         let liveHashForced = false;
         if (Date.now() < liveHashOverrideExpiryTime) {
             liveHashForced = true;

package/src/4-deploy/edgeClientWatcher.tsx

@@ -10,7 +10,7 @@ import { showModal } from "../5-diagnostics/Modal";
 import { qreact } from "../4-dom/qreact";
 import { liveHashOverrideURL } from "./edgeBootstrap";
 import { css } from "typesafecss";
-import { formatTime } from "socket-function/src/formatting/format";
+import { formatNiceDateTime, formatTime } from "socket-function/src/formatting/format";
 import { delay } from "socket-function/src/batching";
 import { atomicObjectRead } from "../2-proxy/PathValueProxyWatcher";
 
@@ -109,8 +109,8 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
                                 <div className={css.vbox(10).maxWidth(250)}>
                                     <h3 className={css.margin(0)}>Server Update Available</h3>
                                     <div>The server has been updated. Please refresh the page to ensure you don't experience incompatibility issues.</div>
-                                    {i !== notifyIntervals.length - 2 && <div>This notification will be shown again in {formatTime(waitDuration)}</div>}
-                                    {i === notifyIntervals.length - 2 && <div>The page will automatically refresh in {formatTime(waitDuration)}</div>}
+                                    {i !== notifyIntervals.length - 2 && <div>This notification will be shown again at {formatNiceDateTime(Date.now() + waitDuration)}</div>}
+                                    {i === notifyIntervals.length - 2 && <div>The page will automatically refresh at {formatNiceDateTime(Date.now() + waitDuration)}</div>}
                                 </div>
                                 <div className={css.hbox(10).justifyContent("flex-end")}>
                                     <button

package/src/deployManager/spec.txt

@@ -1,13 +1,7 @@
-7) Broken loading of CYOA
-    1) Deploy (database functions)
-    2) deploy the CYOA service
-    3) Refresh the main page
-    RESULT: It tries to access the specific hash, but it wasn't loaded serverside, so permissions are refused
-
-8) Fix deploy user notification issue, where the refresh button doesn't work?
-    - For application level updates
-    - Just an application commit, then deploy the service, then the refresh button should show up, and work
+Bug, if we refresh immediately after an update, we get into a state where we know we should be using a new hash, but the lookup for the hashes is cached, so we think the server doesn't exist,
+    - Hopefully it's just that we're using the cache we received from the server. If it's actually being cached in Cloudflare, that's annoying and I think we just need to fall back if we see the live hash has been updated recently. Although I don't think we're storing the timestamps so that's annoying. 
 
+7) verify manually refreshing removes the message
 
 8) Use a special service for the HTTP bootstrapper, and then have 2 others that are on other ports
     --bootstraponly is added, and should work?