querysub 0.264.0 → 0.265.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.264.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/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;
     }>;
 };