hfs 3.1.2 → 3.1.3

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "hfs",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "hfs",
-      "version": "3.1.2",
+      "version": "3.1.3",
       "license": "GPL-3.0",
       "dependencies": {
         "@gregoranders/csv": "^0.0.13",
@@ -230,9 +230,9 @@
       }
     },
     "node_modules/@peculiar/utils": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/@peculiar/utils/-/utils-2.0.2.tgz",
-      "integrity": "sha512-lHhrK/1QAXGn0GUYkme7t4zo0mQ5QIp+/8YED6pzu8AQFdjA9bAXeNURAHk4sw7n9i89MMNQVom0LkuuLUZMog==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@peculiar/utils/-/utils-2.0.3.tgz",
+      "integrity": "sha512-+oL3HPFRIZ1St2K50lWCXiioIgSoxzz7R1J3uF6neO2yl1sgmpgY6XXJH4BdpoDkMWznQTeYF6oWNDZLCdQ4eQ==",
       "license": "MIT",
       "dependencies": {
         "tslib": "^2.8.1"
@@ -361,12 +361,12 @@
       "license": "MIT"
     },
     "node_modules/axios": {
-      "version": "1.15.2",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz",
-      "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==",
+      "version": "1.16.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.16.0.tgz",
+      "integrity": "sha512-6hp5CwvTPlN2A31g5dxnwAX0orzM7pmCRDLnZSX772mv8WDqICwFjowHuPs04Mc8deIld1+ejhtaMn5vp6b+1w==",
       "license": "MIT",
       "dependencies": {
-        "follow-redirects": "^1.15.11",
+        "follow-redirects": "^1.16.0",
         "form-data": "^4.0.5",
         "proxy-from-env": "^2.1.0"
       }
@@ -1908,9 +1908,9 @@
       }
     },
     "node_modules/yaml": {
-      "version": "2.8.3",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.3.tgz",
-      "integrity": "sha512-AvbaCLOO2Otw/lW5bmh9d/WEdcDFdQp2Z2ZUH3pX9U2ihyUY0nvLv7J6TrWowklRGPYbB/IuIMfYgxaCPg5Bpg==",
+      "version": "2.8.4",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.4.tgz",
+      "integrity": "sha512-ml/JPOj9fOQK8RNnWojA67GbZ0ApXAUlN2UQclwv2eVgTgn7O9gg9o7paZWKMp4g0H3nTLtS9LVzhkpOFIKzog==",
       "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hfs",
-  "version": "3.1.2",
+  "version": "3.1.3",
   "description": "HTTP File Server",
   "keywords": [
     "file server",

package/src/first.js

@@ -3,8 +3,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.quitting = void 0;
+exports.exitCode = exports.quitting = void 0;
 exports.onProcessExit = onProcessExit;
+exports.quit = quit;
 exports.onFirstEvent = onFirstEvent;
 const lodash_1 = __importDefault(require("lodash"));
 const assert_1 = __importDefault(require("assert"));
@@ -16,13 +17,14 @@ function onProcessExit(cb, order = 10) {
     return () => cbsOnExit.delete(rec);
 }
 exports.quitting = false;
+exports.exitCode = 0;
 // 'exit' event is handled as the last resort, but it's not compatible with async callbacks
-onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP'], async (signal) => {
+onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP', 'beforeExit'], async (signal) => {
     console.log('Quitting with signal:', signal || 'unknown');
     exports.quitting = true;
     const byOrder = lodash_1.default.groupBy(Array.from(cbsOnExit), 'order'); // this will be inherently ordered because keys are positive integers
-    for (const recs of Object.values(byOrder))
-        await Promise.allSettled(recs.map(({ cb }) => {
+    for (const recs of Object.values(byOrder)) {
+        const ret = Promise.allSettled(recs.map(({ cb }) => {
             try {
                 return cb(signal);
             }
@@ -32,9 +34,17 @@ onFirstEvent(process, ['exit', 'SIGQUIT', 'SIGTERM', 'SIGINT', 'SIGHUP'], async
                 return Promise.reject(e);
             }
         }));
+        if (signal !== 'exit') // exit is sync
+            await ret;
+    }
+    cbsOnExit.clear();
     console.debug('Process exit');
-    process.exit(0);
+    process.exit(exports.exitCode);
 });
+function quit(code = 0) {
+    exports.exitCode = code;
+    process.emit('SIGINT');
+}
 // keep calling cb in a sync fashion – returning a promise instead would break the code for argv.updating (update.ts)
 function onFirstEvent(emitter, events, cb) {
     let already = false;

package/src/update.js

@@ -201,7 +201,8 @@ async function update(tagOrUrl = '') {
             (0, child_process_1.spawnSync)((0, util_os_1.cmdEscape)(newBin), ['--updating', binFile, '--cwd .'], { shell: true, stdio: [0, 1, 2] }); // sync necessary to work on Mac by double-click
         });
         console.log("Quitting");
-        setTimeout(() => process.exit(100)); // non-zero, otherwise some service managers (like Shawl) won't restart the process
+        setTimeout(() => (0, first_1.quit)(100), // non-zero, otherwise some service managers (like Shawl) won't restart the process.
+        200); // give time to return (and caller to complete, eg: rest api to reply)
     }
     catch (e) {
         plugins_1.pluginsWatcher.unpause();