sefy-cli 0.11.0 → 0.11.1

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "sefy-cli",
-  "version": "0.11.0",
+  "version": "0.11.1",
   "sefy": {
-    "binary": "v0.11.0"
+    "binary": "v0.11.1"
   },
   "description": "An inconspicuous encrypted store for notes, credentials and files",
   "license": "MIT",

package/run.js

@@ -2,12 +2,35 @@
 // Thin launcher: forwards everything to the sefy binary, downloading it on
 // first run when the postinstall script was skipped (npm v12 default).
 const fs = require("fs");
+const os = require("os");
 const { spawnSync } = require("child_process");
 const { install, exePath } = require("./download");
 
+// The keystrokes a terminal sends to every process on it, this launcher
+// included. Left to the default, the launcher would die at once and hand the
+// prompt back while sefy - or the command `sefy run` started - is still
+// deciding what to do with the same keystroke. Listening keeps the launcher
+// alive until the binary is done; the binary alone decides.
+const KEYSTROKES =
+  process.platform === "win32" ? ["SIGINT", "SIGBREAK"] : ["SIGINT", "SIGQUIT"];
+
 function exec() {
+  const stayPut = () => {};
+  for (const signal of KEYSTROKES) process.on(signal, stayPut);
+
   const result = spawnSync(exePath, process.argv.slice(2), { stdio: "inherit" });
-  process.exit(result.status === null ? 1 : result.status);
+  if (result.error) {
+    console.error(`sefy-cli: cannot start ${exePath}: ${result.error.message}`);
+    process.exit(1);
+  }
+  if (result.signal) {
+    // Ended by a signal: end the same way, so the shell reports it as it
+    // would for the binary run directly (130 after Ctrl+C), not as a plain 1.
+    for (const signal of KEYSTROKES) process.removeListener(signal, stayPut);
+    process.kill(process.pid, result.signal);
+    process.exit(128 + (os.constants.signals[result.signal] || 0));
+  }
+  process.exit(result.status);
 }
 
 if (fs.existsSync(exePath)) {