querysub 0.265.0 → 0.267.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.265.0",
+  "version": "0.267.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

@@ -429,9 +429,8 @@ async function edgeNodeFunction(config: {
         let host = edgeNodeConfig.host;
         if (!host.endsWith("/")) host += "/";
         for (let entryPath of edgeNodeConfig.entryPaths) {
-            if (entryPath.startsWith("/")) {
-                entryPath = entryPath.slice("/".length);
-            }
+            // IMPORTANT! DO NOT REMOVE THE STARTING "/" FROM ENTRYPATH!
+            //  The server needs it, because paths need 1 "/" to begin with, so two ("//") means require with "/", instead of requiring relative to the current directory!
             await require("https://" + host + entryPath);
         }
     }

package/src/4-deploy/edgeClientWatcher.tsx

@@ -22,7 +22,7 @@ export function startEdgeNotifier() {
         let liveHash = String(deploySchema()[getDomain()].deploy.live.hash);
         if (!Querysub.isAllSynced()) return;
         if (liveHash === lastHashServer) return;
-        let refreshThresholdTime = atomicObjectRead(deploySchema()[getDomain()].deploy.live.refreshThresholdTime) || timeInMinute;
+        let refreshThresholdTime = atomicObjectRead(deploySchema()[getDomain()].deploy.live.refreshThresholdTime) || (Date.now() + timeInMinute * 15);
         lastHashServer = liveHash;
         if (!curHash) {
             curHash = liveHash;
@@ -64,6 +64,8 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
     }
     curHash = liveHash;
 
+    let duration = refreshThresholdTime - Date.now();
+
     // Start notification loop
     void (async () => {
         // Show notifications at intervals
@@ -71,7 +73,7 @@ function onLiveHashChange(liveHash: string, refreshThresholdTime: number) {
             // Don't show if a newer notification is active
             if (curHash !== liveHash) return;
 
-            let waitDuration = (notifyIntervals[i + 1] - notifyIntervals[i]) * refreshThresholdTime;
+            let waitDuration = (notifyIntervals[i + 1] - notifyIntervals[i]) * duration;
             // If the duration is short, and it's not the last one, skip it
             if (i < notifyIntervals.length - 2 && waitDuration <= 30 * 1000) continue;
 

package/src/4-deploy/edgeNodes.ts

@@ -146,6 +146,7 @@ const loadEntryPointsByHash = runInSerial(async function loadEntryPointsByHash(c
         FilePath: filePath,
         FunctionId: "entryPoint",
     });
+    console.log(magenta(`Loaded entry point from ${gitHash}, path: ${filePath}, resolved to ${module.filename}`));
 
     let depth = entryPaths[0].replaceAll("\\", "/").split("/").filter(x => x && x !== ".").length;
 

package/src/deployManager/components/ServiceDetailPage.tsx

@@ -133,7 +133,10 @@ type ServiceConfig = ${serviceConfigType}
                 onData: async (data: string) => {
                     Querysub.localCommit(() => {
                         let fullData = this.state.watchingOutputs[outputKey].data + data;
-                        fullData = fullData.slice(-100_000);
+                        // Don't trim every time, otherwise the relative scroll position changes by too much
+                        if (fullData.length > 1_000_000) {
+                            fullData = fullData.slice(-100_000);
+                        }
                         this.state.watchingOutputs[outputKey].data = fullData;
                     });
                 }