@vbarbarosh/node-helpers 3.72.2 → 3.72.4

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.2/dist/browser.js"></script>
+<script src="https://unpkg.com/@vbarbarosh/node-helpers@3.72.4/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.2"} was not injected — window.${ns} is already in use`);
+    console.log(`❌ @vbarbarosh/node-helpers@${"3.72.4"} was not injected — window.${ns} is already in use`);
 }
 else {
-    console.log(`🎉 @vbarbarosh/node-helpers@${"3.72.2"} successfully exposed as window.${ns}`);
+    console.log(`🎉 @vbarbarosh/node-helpers@${"3.72.4"} 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.2",
+    "version": "3.72.4",
     "description": "A set of helpers for JavaScript/Node.js",
     "unpkg": "dist/browser.js",
     "jsdelivr": "dist/browser.js",

package/src/cli-apps/watchdog.js

@@ -5,15 +5,19 @@ const HeartbeatServer = require('../HeartbeatServer');
 const Promise = require('bluebird');
 const cli = require('../cli');
 const cuid = require('@paralleldrive/cuid2');
+const format_ms3 = require('../format_ms3');
+const format_thousands = require('../format_thousands');
 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 STARTED_AT = Date.now();
 const LOGS_ROOT_UID = cuid.createId();
 
+let PING_COUNTER = 0;
+
 // 💎 Only the lack of a valid PING within WATCHDOG_INTERVAL is fatal
 
 // Ctrl-C should gracefully terminate a child process and close heartbeat server
@@ -31,7 +35,7 @@ cli(main, report);
 
 function report(error)
 {
-    log(`[watchdog_end_error] ${error.message}`);
+    log(`[watchdog_end_error] ${render_stats()} | ${error.message}`);
 }
 
 async function main()
@@ -55,10 +59,11 @@ async function main()
     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('[watchdog_ping] ❤️'))
+    heartbeat_server.on('heartbeat', () => log(`[watchdog_ping] ❤️ ${render_stats(++PING_COUNTER)}`))
     heartbeat_server.on('warning', error => log(`[watchdog_warn] ⚠️ ${error}`))
 
     try {
+        log(`[watchdog_args] ${args.join(' ')}`);
         log(`[watchdog_interval] ${WATCHDOG_INTERVAL}`);
         log(`[watchdog_socket_path] ${heartbeat_server.socket_path}`);
         const env = {...process.env, WATCHDOG_INTERVAL, WATCHDOG_SOCKET};
@@ -93,7 +98,7 @@ async function main()
         await Promise.resolve(heartbeat_server.dispose()).timeout(1000);
     }
 
-    log('[watchdog_end_ok]');
+    log(`[watchdog_end_ok] ${render_stats()}`);
     process.exit(0);
 }
 
@@ -101,13 +106,18 @@ function log(s)
 {
     const ss = JSON.stringify(s).slice(1, -1).replaceAll('\\"', '"');
     if (ss[0] === '[') {
-        console.log(`[${LOGS_ROOT_UID}][${now_human()}]${ss}`);
+        console.log(`[${LOGS_ROOT_UID}][+${format_ms3(Date.now() - STARTED_AT)}]${ss}`);
     }
     else {
-        console.log(`[${LOGS_ROOT_UID}][${now_human()}] ${ss}`);
+        console.log(`[${LOGS_ROOT_UID}][+${format_ms3(Date.now() - STARTED_AT)}] ${ss}`);
     }
 }
 
+function render_stats()
+{
+    return `pings=${format_thousands(PING_COUNTER)}`;
+}
+
 function usage()
 {
     process.stdout.write(`