querysub 0.263.0 → 0.265.0

package/package.json

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

package/src/3-path-functions/pathFunctionLoader.ts

@@ -379,8 +379,10 @@ async function getModuleFromSpecBase(
         throw new Error(`Module not found: ${moduleId} (for ${spec.FunctionId})`);
     }
 
-    if (hotReloadPackagePath) {
-        hotReloadUnderPath(hotReloadPackagePath);
+    if (!isPublic()) {
+        if (hotReloadPackagePath) {
+            hotReloadUnderPath(hotReloadPackagePath);
+        }
     }
 
     return moduleImported;

package/src/4-deploy/edgeNodes.ts

@@ -136,11 +136,14 @@ const loadEntryPointsByHash = runInSerial(async function loadEntryPointsByHash(c
     let gitHash = config.hash;
     let entryPaths = config.entryPaths;
 
+    let gitURL = await getGitURLLive();
+    let filePath = entryPaths[0];
+    console.log(magenta(`Loading entry point from ${gitHash}, path: ${filePath}`));
 
     let module = await getModuleFromConfig({
-        gitURL: await getGitURLLive(),
+        gitURL,
         gitRef: gitHash,
-        FilePath: entryPaths[0],
+        FilePath: filePath,
         FunctionId: "entryPoint",
     });
 
@@ -165,7 +168,7 @@ const loadEntryPointsByHash = runInSerial(async function loadEntryPointsByHash(c
     };
 
     await edgeNodeStorage.set(getNextNodePath(), Buffer.from(JSON.stringify(edgeNodeConfig)));
-    console.log(magenta(`Deployed edge node`), edgeNodeConfig);
+    console.log(magenta(`Registered edge node`), edgeNodeConfig);
 
     await updateEdgeNodesFile();
 

package/src/4-querysub/Querysub.ts

@@ -714,7 +714,8 @@ export class Querysub {
             Querysub.trustedDomains.add(domain);
         }
 
-        if (config.hotReload) {
+        // Hot reloading on public servers breaks things when we update (as the git pull triggers a hot reload), so... don't do that.
+        if (config.hotReload && !isPublic()) {
             watchFilesAndTriggerHotReloading();
         }
 

package/src/deployManager/components/MachineDetailPage.tsx

@@ -134,6 +134,9 @@ export class MachineDetailPage extends qreact.Component {
                                         <div>
                                             Launches: {serviceInfo.totalTimesLaunched}
                                         </div>
+                                        <div>
+                                            Guessed Node ID: {serviceInfo.nodeId}
+                                        </div>
                                         {hasError && (
                                             <div className={css.colorhsl(0, 80, 50)}>
                                                 ⚠️ Has Error

package/src/deployManager/components/deployButtons.tsx

@@ -28,7 +28,7 @@ export class RenderGitRefInfo extends qreact.Component<{
         });
         if (!gitRefInfo) return undefined;
         return <div className={css.fontWeight("normal")}>
-            {formatDateJSX(gitRefInfo.time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{gitRefInfo.description}</span>
+            {formatDateJSX(gitRefInfo.time)} AGO <span className={css.hsl(0, 0, 80).pad2(5, 2).italic}>{gitRefInfo.description}</span> ({this.props.gitRef.slice(0, 6)})
         </div>;
     }
 }

package/src/deployManager/machineApplyMainCode.ts

@@ -481,6 +481,7 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
                 lastLaunchedTime,
                 errorFromLastRun: "",
                 totalTimesLaunched: launchCount,
+                nodeId: "",
             };
             try {
                 let folder = root + screenName + "/";
@@ -523,6 +524,12 @@ const resyncServicesBase = runInSerial(measureWrap(async function resyncServices
 
                 await fs.promises.writeFile(parameterPath, newParametersString);
 
+                let nodePathId = folder + SERVICE_NODE_FILE_NAME;
+                if (fs.existsSync(nodePathId)) {
+                    let nodeId = await fs.promises.readFile(nodePathId, "utf8");
+                    machineInfo.services[config.serviceId].nodeId = nodeId;
+                }
+
                 await runScreenCommand({
                     screenName,
                     command: config.parameters.command,

package/src/deployManager/machineSchema.ts

@@ -52,6 +52,8 @@ export type MachineInfo = {
         errorFromLastRun: string;
         // Only times launched for the current applyNodeId, but... still very useful.
         totalTimesLaunched: number;
+        // Might take a while to set (15 minutes or more). It's better to look in the nodes list and find the one that seems to match (maybe looking at the startup path to find it?)
+        nodeId: string;
     }>;
 };
 

package/src/deployManager/spec.txt

@@ -1,21 +1,28 @@
+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
 
 
-What about cloudflare registration?
 8) Use a special service for the HTTP bootstrapper, and then have 2 others that are on other ports
-    - Find a way to prevent the bootstrapper from being picked as the backend as well, so we don't need to update it!
-
     --bootstraponly is added, and should work?
 
+9) Verify the bootstrap server can't be picked as the endpoint server
+
+
 9) Rolling service updates
     - Add rollingWindow to the definition
     - Set for public facing services (but not for scripts)
         - PathValueServer - 10 minutes
         - FunctionRunner - 10 minutes
         - HTTP - 4 hours
+        - Boostrapper - NO rolling
+        - gc/join - NO rolling
     - Show the rolling time in the update buttons (both list and the save button on the details page), so we know it will be a rolling update
     - Keep the oldest service alive when we update
         - Tracked per serviceId
@@ -30,3 +37,6 @@ What about cloudflare registration?
         - Filled, but the total size will also depend on the maximum (to a degree), so it's very nice.
         - A bar, with a label, or something. The AI can give us a few options
     (Yes, it overlaps with node metrics, but that's okay, sometimes we want to look at machines, other times services, and the types of errors that show up in either changes).
+
+
+11) Restart the server and verify everything starts up nicely on reboot!