querysub 0.26.0 → 0.28.0

package/package.json

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

@@ -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/4-querysub/QuerysubController.ts

@@ -37,6 +37,7 @@ import { getCallResultPath } from "./querysubPrediction";
 import { pathValueAuthority2 } from "../0-path-value-core/NodePathAuthorities";
 import { diskLog } from "../diagnostics/logs/diskLogger";
 import { assertIsManagementUser } from "../diagnostics/managementPages";
+import { getBrowserUrlNode } from "../-f-node-discovery/NodeDiscovery";
 setFlag(require, "preact", "allowclient", true);
 
 export { Querysub, id };
@@ -49,7 +50,15 @@ export { Querysub, id };
 //  very lightweight, hopefully...)
 //  - I guess we track our watches, but even that... should be fairly light, and... there
 //      is little benefit to sharding that?
-export const querysubNodeId = lazy(() => getControllerNodeId(QuerysubController));
+export const querysubNodeId = lazy(() => {
+    if (isNode()) {
+        return getControllerNodeId(QuerysubController);
+    } else {
+        // NOTE: We won't be able to directly connect to some querysub nodes (because they are from other
+        //  developers), so... just use the browser url.
+        return getBrowserUrlNode();
+    }
+});
 
 setImmediate(() => {
     async function querysubWatchLatest(config: WatchConfig) {

package/src/4-querysub/querysubPrediction.ts

@@ -19,6 +19,7 @@ import { setFlag } from "socket-function/require/compileFlags";
 import cbor from "cbor-x";
 import { FunctionMetadata } from "../3-path-functions/syncSchema";
 import { isNode, nextId, sort } from "socket-function/src/misc";
+import { getBrowserUrlNode } from "../-f-node-discovery/NodeDiscovery";
 setFlag(require, "cbor-x", "allowclient", true);
 const cborEncoder = lazy(() => new cbor.Encoder({ structuredClone: true }));
 

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);