@vbarbarosh/node-helpers 3.72.0 → 3.72.2

package/README.md

@@ -20,7 +20,7 @@ npm install @vbarbarosh/node-helpers
 A subset of `@vbarbarosh/node-helpers` is available for browser:
 
 ```html
-<script src="https://unpkg.com/@vbarbarosh/node-helpers@3.72.0/dist/browser.js"></script>
+<script src="https://unpkg.com/@vbarbarosh/node-helpers@3.72.2/dist/browser.js"></script>
 ```
 
 ⚠️ All browser functions are exposed globally.

package/dist/browser.js

@@ -2499,10 +2499,10 @@ var __webpack_exports__ = {};
   \******************************/
 const ns = new URL(document.currentScript.src).searchParams.get('var') ?? 'h';
 if (typeof window[ns] !== 'undefined') {
-    console.log(`❌ @vbarbarosh/node-helpers@${"3.72.0"} was not injected — window.${ns} is already in use`);
+    console.log(`❌ @vbarbarosh/node-helpers@${"3.72.2"} was not injected — window.${ns} is already in use`);
 }
 else {
-    console.log(`🎉 @vbarbarosh/node-helpers@${"3.72.0"} successfully exposed as window.${ns}`);
+    console.log(`🎉 @vbarbarosh/node-helpers@${"3.72.2"} successfully exposed as window.${ns}`);
     window[ns] = {};
     // https://github.com/webpack/webpack/issues/625
     // https://webpack.js.org/guides/dependency-management/#require-context

package/package.json

@@ -2,7 +2,7 @@
     "author": "Vladimir Barbarosh <vladimir.barbarosh@gmail.com>",
     "license": "MIT",
     "name": "@vbarbarosh/node-helpers",
-    "version": "3.72.0",
+    "version": "3.72.2",
     "description": "A set of helpers for JavaScript/Node.js",
     "unpkg": "dist/browser.js",
     "jsdelivr": "dist/browser.js",
@@ -16,7 +16,7 @@
     ],
     "scripts": {
         "build": "rm -rf dist; webpack",
-        "test": "mocha src/**/*.test.js"
+        "test": "mocha 'src/**/*.test.js'"
     },
     "keywords": [
         "js",

package/src/cli-apps/watchdog.js

@@ -9,6 +9,7 @@ const make = require('@vbarbarosh/type-helpers/src/make');
 const now_human = require('../now_human');
 const pgid_exists = require('../pgid_exists');
 const pgid_kill_grace = require('../pgid_kill_grace');
+const pkg = require('../../package.json');
 const shell_spawn = require('../shell_spawn');
 
 const LOGS_ROOT_UID = cuid.createId();
@@ -30,7 +31,7 @@ cli(main, report);
 
 function report(error)
 {
-    log(`[heartbeat_end_error] ${error.message}`);
+    log(`[watchdog_end_error] ${error.message}`);
 }
 
 async function main()
@@ -41,27 +42,36 @@ async function main()
         process.exit(1);
     }
 
-    log('[heartbeat_begin]');
+    switch (args[0]) {
+    case '-v':
+    case '--version':
+        version();
+        process.exit(0);
+        break;
+    }
+
+    log(`[watchdog_begin] v${pkg.version}`);
 
     const WATCHDOG_INTERVAL = make(process.env.WATCHDOG_INTERVAL, {type: 'int', min: 1000, default: 5000});
     const heartbeat_server = new HeartbeatServer(WATCHDOG_INTERVAL);
     const WATCHDOG_SOCKET = heartbeat_server.socket_path;
-    heartbeat_server.on('heartbeat', () => log('[heartbeat_ping] ❤️'))
-    heartbeat_server.on('warning', error => log(`[heartbeat_warn] ⚠️ ${error}`))
+    heartbeat_server.on('heartbeat', () => log('[watchdog_ping] ❤️'))
+    heartbeat_server.on('warning', error => log(`[watchdog_warn] ⚠️ ${error}`))
 
     try {
-        log(`[heartbeat_socket_path] ${heartbeat_server.socket_path}`);
+        log(`[watchdog_interval] ${WATCHDOG_INTERVAL}`);
+        log(`[watchdog_socket_path] ${heartbeat_server.socket_path}`);
         const env = {...process.env, WATCHDOG_INTERVAL, WATCHDOG_SOCKET};
         const proc = await shell_spawn(args, {stdio: 'inherit', env, detached: true}).init();
         const pgid = proc.pid; // group id == leader pid
 
         const signal = new Promise(function (resolve, reject) {
             process.on('SIGTERM', function () {
-                log('[heartbeat_sigterm]');
+                log('[watchdog_sigterm]');
                 reject(new ExitCodeError(143, 'SIGTERM'));
             });
             process.on('SIGINT', function () {
-                log('[heartbeat_sigint]');
+                log('[watchdog_sigint]');
                 reject(new ExitCodeError(130, 'SIGINT'));
             });
         });
@@ -73,17 +83,17 @@ async function main()
         finally {
             if (pgid_exists(pgid)) {
                 await pgid_kill_grace(pgid, {
-                    log: s => log(`[heartbeat_pgid_kill_grace] ${s}`),
+                    log: s => log(`[watchdog_pgid_kill_grace] ${s}`),
                 });
             }
         }
     }
     finally {
-        log('[heartbeat_dispose] Closing heartbeat server...');
+        log('[watchdog_dispose] Closing heartbeat server...');
         await Promise.resolve(heartbeat_server.dispose()).timeout(1000);
     }
 
-    log('[heartbeat_end_ok]');
+    log('[watchdog_end_ok]');
     process.exit(0);
 }
 
@@ -144,3 +154,8 @@ watchdog internal error | 1
 -----------------------------------
 `.trim() + '\n');
 }
+
+function version()
+{
+    process.stdout.write(`watchdog v${pkg.version}\n`);
+}

package/src/cli-apps/watchdog.test.js

@@ -0,0 +1,7 @@
+const assert = require('assert');
+
+// watchdog true -> race condition; true exists too quickly; bug in shell_spawn
+
+describe.skip('watchdog', function () {
+
+});

package/src/shell_spawn.test.js

@@ -0,0 +1,23 @@
+const Promise = require('bluebird');
+const assert = require('assert');
+const pid_exists = require('./pid_exists');
+const shell_spawn = require('./shell_spawn');
+
+describe.skip('shell_spawn', function () {
+    describe('Happy Path', function () {
+        it('basic', async function () {
+            await shell_spawn(['true']).promise().timeout(100);
+        });
+        it('init + promise', async function () {
+            const proc = await shell_spawn(['true']).init();
+            await proc.promise().timeout(100);
+        });
+    });
+    it('🏎️ race condition: proc.promise is called after process was terminated', async function () {
+        const proc = shell_spawn(['true']);
+        assert(pid_exists(proc.pid));
+        await Promise.delay(10);
+        assert(!pid_exists(proc.pid));
+        await proc.promise().timeout(100);
+    });
+});