querysub 0.676.0 → 0.677.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "querysub",
-  "version": "0.676.0",
+  "version": "0.677.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/setupMachineMain.ts

@@ -372,6 +372,13 @@ async function main() {
     await runPromise(`ssh ${sshRemote} "grep -qxF 'set-option -g history-limit 100000' ~/.tmux.conf 2>/dev/null || echo 'set-option -g history-limit 100000' >> ~/.tmux.conf"`);
     console.log("✅ Tmux scrollback history set to 100000");
 
+    // Before anything clones or installs, so an application that needs credentials on the machine (a private dependency it cannot yarn install without) can put them there first. As early as it can be: git is what the hook has to work with, and it is only installed above.
+    await runApplicationHook({
+        sshRemote,
+        hookName: "machineSetupStart",
+        onFailure: "Anything it was meant to set up on the machine is missing, so the clone and install below may fail.",
+    });
+
     // 5. Clone current repo into ~/machine-alwaysup with SSH key handling for private repos
     console.log("Setting up repository...");
     let gitURLLive = await getGitURLLive();
@@ -484,13 +491,18 @@ sudo systemctl start ${SERVICE_UNIT_NAME}
     console.log(`   Screen:  ssh ${sshRemote} -t "tmux attach -t ${SERVICE_NAME}"`);
     console.log(`   Status:  ssh ${sshRemote} "systemctl status ${SERVICE_UNIT_NAME}"`);
 
-    await runMachineDeployHook(sshRemote);
+    await runApplicationHook({
+        sshRemote,
+        hookName: "machineDeploy",
+        onFailure: "This is fine if the synchronization database hasn't been set up yet, or isn't running.",
+    });
 
     console.log("\n🎉 Machine setup complete!");
 }
 
-async function runMachineDeployHook(sshRemote: string) {
-    let hookPathBase = path.resolve("./machineDeploy");
+async function runApplicationHook(config: { sshRemote: string; hookName: string; onFailure: string }) {
+    let { sshRemote, hookName, onFailure } = config;
+    let hookPathBase = path.resolve(`./${hookName}`);
     let hookExists = false;
     for (let extension of [".ts", ".tsx", ".js"]) {
         if (await fsExistsAsync(hookPathBase + extension)) {
@@ -499,20 +511,21 @@ async function runMachineDeployHook(sshRemote: string) {
         }
     }
     if (!hookExists) {
-        console.log(`No machineDeploy file at ${hookPathBase}, skipping the application deploy hook`);
+        console.log(`No ${hookName} file at ${hookPathBase}, skipping that application hook`);
         return;
     }
-    console.log(`Running the machineDeploy hook at ${hookPathBase}`);
+    console.log(`Running the ${hookName} hook at ${hookPathBase}`);
     try {
-        let hookModule = await import(hookPathBase) as { machineDeploy?: (config: { sshRemote: string }) => Promise<void> };
-        if (!hookModule.machineDeploy) {
-            throw new Error(`Expected ${hookPathBase} to export machineDeploy, exports are: ${Object.keys(hookModule).join(", ") || "(none)"}`);
+        let hookModule = await import(hookPathBase) as { [exportName: string]: ((config: { sshRemote: string }) => Promise<void>) | undefined };
+        let hook = hookModule[hookName];
+        if (!hook) {
+            throw new Error(`Expected ${hookPathBase} to export ${hookName}, exports are: ${Object.keys(hookModule).join(", ") || "(none)"}`);
         }
-        await hookModule.machineDeploy({ sshRemote });
-        console.log("✅ machineDeploy hook finished");
+        await hook({ sshRemote });
+        console.log(`✅ ${hookName} hook finished`);
     } catch (e) {
         console.error((e as Error).stack || String(e));
-        console.error(`⚠️  The machineDeploy hook failed (see the error above). This is fine if the synchronization database hasn't been set up yet, or isn't running.`);
+        console.error(`⚠️  The ${hookName} hook failed (see the error above). ${onFailure}`);
     }
 }