querysub 0.25.0 → 0.27.0

package/package.json

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

package/src/-e-certs/EdgeCertController.ts

@@ -169,7 +169,7 @@ export async function publishMachineARecords() {
             //  and not set public (such as the FunctionRunner). SO... just ignore this, leaving the records as
             //  public, even though the current run doesn't have public set.
             if (process.argv[1].includes("server.ts")) {
-                console.log(yellow(`Current process is not marked as public, but machine previous had public services. NOT publishing A records to point to 127.0.0.1, which will make service inaccessible if the port is not forwarded open on the public ip.`));
+                console.log(yellow(`Current process is not marked as public, but machine previous had public services. NOT publishing A records to point to 127.0.0.1, which will make service inaccessible if the port is not port forwarded (or open). I recommend using noproxy.DOMAIN.com to access the server. 127-0-0-1.DOMAIN.com might work as well.`));
             }
             return;
         }

package/src/0-path-value-core/NodePathAuthorities.ts

@@ -194,12 +194,11 @@ class NodePathAuthorities {
     private async watchAuthorityPaths() {
         await onNodeDiscoveryReady();
 
-        onReadyReady = (nodeId, time) => {
+        onReadReady = (nodeId, time) => {
             let obj = this.authorities.get(nodeId);
             if (!obj) {
-                // HACK: Sometimes when a node is first added we can't identify it yet. I THINK this is because
-                //  we haven't learned to trust the key, or... something? Hmm...
-                // ingestNewNodeIds([nodeId], []);
+                // Might as well use this to add the node, if we don't know about it yet.
+                ingestNewNodeIds([nodeId], []);
                 return;
             }
             obj.isReadReady = time;
@@ -936,7 +935,7 @@ function authoritiesMightOverlap(other: AuthorityPath, current: AuthorityPath):
 
 
 
-let onReadyReady = (nodeId: string, time: number) => { };
+let onReadReady = (nodeId: string, time: number) => { };
 class PathControllerBase {
     public async getAuthorityPaths() {
         return pathValueAuthority2.getSelfAuthorities();
@@ -953,7 +952,7 @@ class PathControllerBase {
     public async broadcastReadReady(time: number) {
         let nodeIdCaller = IdentityController_getCurrentReconnectNodeIdAssert();
         console.log(magenta(`Received ready broadcast`), { nodeIdCaller });
-        onReadyReady(nodeIdCaller, time);
+        onReadReady(nodeIdCaller, time);
     }
 }
 const PathController = SocketFunction.register(

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

@@ -121,6 +121,8 @@ export function setGitURLMapping(config: {
     gitURLRefMappings.set(getSpecKey(config.spec), config.resolvedPath);
 }
 
+const loadTimeIndicatorFileName = "loadTimeIndicator-71cd93ba-1667-49ac-9206-b27930bbd983";
+
 /** spec => path that we can use with require */
 let moduleResolver = async (spec: FunctionSpec) => {
     let gitURL = spec.gitURL;
@@ -145,24 +147,26 @@ let moduleResolver = async (spec: FunctionSpec) => {
     const lockFolder = getSubFolder("synced_repos_locks");
     let lockPath = lockFolder + sha256(repoPath).slice(0, 16) + ".loadinglock";
     let exists = fs.existsSync(repoPath);
-    if (exists) {
-        if (!await isRepoCloned(repoPath)) {
-            exists = false;
-        }
+    if (exists && !fs.existsSync(repoPath + loadTimeIndicatorFileName)) {
+        exists = false;
     }
     if (!exists) {
         await getFileLock(lockPath, async () => {
-            if (fs.existsSync(repoPath) && !await isRepoCloned(repoPath)) {
-                // Just move it, and try again
+            if (fs.existsSync(repoPath + loadTimeIndicatorFileName)) return;
+
+            // Remove any previous attempt to sync it
+            if (fs.existsSync(repoPath)) {
                 await fs.promises.rename(repoPath, repoPath + "_" + Date.now());
             }
-            if (!fs.existsSync(repoPath)) {
-                await executeCommand("git", ["clone", gitURL, repoPath]);
-                await executeCommand("git", ["reset", "--hard", spec.gitRef], { cwd: repoPath });
-            }
-            if (!fs.existsSync(repoPath + "node_modules")) {
-                await executeCommand("yarn", ["install"], { cwd: repoPath });
-            }
+            // Clone it
+            await executeCommand("git", ["clone", gitURL, repoPath]);
+            await executeCommand("git", ["reset", "--hard", spec.gitRef], { cwd: repoPath });
+
+            // Yarn install
+            await executeCommand("yarn", ["install"], { cwd: repoPath });
+
+            // Mark it as loaded. If we don't reach this point we will move the folder and try again next time
+            await fs.promises.writeFile(repoPath + loadTimeIndicatorFileName, Date.now() + "");
         });
     }
 
@@ -220,15 +224,6 @@ async function getFileLock(file: string, callback: () => Promise<void>) {
     }
 }
 
-async function isRepoCloned(path: string): Promise<boolean> {
-    try {
-        await executeCommand("git", ["-C", path, "rev-parse", "--is-inside-work-tree"]);
-        return true;
-    } catch {
-        return false;
-    }
-}
-
 export function isDynamicModule(module: NodeJS.Module): boolean {
     return isDynamicModulePath(module.filename);
 }

package/src/diagnostics/NodeViewer.tsx

@@ -185,7 +185,7 @@ export class NodeViewer extends qreact.Component {
         }
 
         let builtinGroups = {
-            "Default": ["buttons", "devToolsURL", "nodeId", "ip", "uptime", "loadTime", "Heap", "All Memory", "Blocking Lag", "port", "threadId", "machineId", "apiError", "live_entryPoint"],
+            "Default": ["buttons", "devToolsURL", "nodeId", "ip", "uptime", "loadTime", "Heap", "Buffers", "All Memory", "Blocking Lag", "port", "threadId", "machineId", "apiError", "live_entryPoint"],
         };
         // Column => group
         let builtInGroupsLookup = new Map<string, string>();

package/src/diagnostics/trackResources.ts

@@ -85,7 +85,7 @@ function logResourcesNow() {
 }
 
 registerMeasureInfo(() => {
-    return formatNumber(getHeapSize()) + "B";
+    return `${formatNumber(getUsedHeapSize())}B+${formatNumber(getBufferUsage())}B/${formatNumber(getHeapSize())}B`;
 });
 
 registerPeriodic(logResourcesNow);