querysub 0.709.0 → 0.710.0

package/package.json

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

package/src/deployManager/machineApplyMainCode.ts

@@ -247,6 +247,23 @@ function checkGitSyncedAndClean(gitFolder: string, gitRef: string): Promise<bool
     return cached;
 }
 
+async function getQuerysubVersionMismatch(gitFolder: string): Promise<string> {
+    let packageJson = JSON.parse(await fs.promises.readFile(gitFolder + "package.json", "utf8")) as { dependencies?: { [name: string]: string } };
+    let requested = packageJson.dependencies?.querysub;
+    if (!requested || !/^[\^~]?\d+\.\d+\.\d+$/.test(requested)) return "";
+    let installedPath = gitFolder + "node_modules/querysub/package.json";
+    if (!await fsExistsAsync(installedPath)) return `requested ${requested}, not installed`;
+    let installed = (JSON.parse(await fs.promises.readFile(installedPath, "utf8")) as { version: string }).version;
+    let installedParts = installed.split(".").map(Number);
+    let requestedParts = requested.replace(/^[\^~]/, "").split(".").map(Number);
+    for (let i = 0; i < requestedParts.length; i++) {
+        if (installedParts[i] === requestedParts[i]) continue;
+        if (installedParts[i] > requestedParts[i]) return "";
+        return `requested ${requested}, installed ${installed}`;
+    }
+    return "";
+}
+
 const ensureGitSynced = measureWrap(async function ensureGitSynced(config: {
     // Forces the checkout at gitFolder to gitRef. Escalates through increasingly destructive recoveries, but only ever destroys the working tree as an absolute last resort — a network blip must never wipe node_modules out from under a running service.
     gitFolder: string;
@@ -484,10 +501,10 @@ async function ensureScreen(config: {
                 } catch { }
                 await ensureGitSynced({ gitFolder, repoUrl: parameters.repoUrl, gitRef: parameters.gitRef });
                 let afterGitRef = await getGitRefLive(gitFolder);
-                // Reinstall when the ref changed OR node_modules is missing. A recovery re-clone can land on the same commit, so a ref-only check would leave the service with no node_modules.
                 let nodeModulesMissing = !await fsExistsAsync(gitFolder + "node_modules");
-                if (afterGitRef !== prevGitRef || nodeModulesMissing) {
-                    console.log(green(`Yarn installing for ${magenta(screenName)} (ref ${prevGitRef} -> ${afterGitRef}, nodeModulesMissing=${nodeModulesMissing})`));
+                let querysubMismatch = await getQuerysubVersionMismatch(gitFolder);
+                if (afterGitRef !== prevGitRef || nodeModulesMissing || querysubMismatch) {
+                    console.log(green(`Yarn installing for ${magenta(screenName)} (ref ${prevGitRef} -> ${afterGitRef}, nodeModulesMissing=${nodeModulesMissing}, querysubMismatch=${querysubMismatch || "none"})`));
                     await runPromise(`yarn install --mutex network`, { cwd: gitFolder });
                 }
             }