nano-pow 4.1.2 → 4.1.4

package/dist/bin/cli.js

@@ -1,12 +1,13 @@
 #!/usr/bin/env node
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
+import { spawn } from "node:child_process";
 import { getRandomValues } from "node:crypto";
 import { createInterface } from "node:readline/promises";
 process.title = "NanoPow CLI";
 delete process.env.NANO_POW_DEBUG;
-process.env.NANO_POW_EFFORT = "";
-process.env.NANO_POW_PORT = "5041";
+delete process.env.NANO_POW_EFFORT;
+delete process.env.NANO_POW_PORT;
 function log(...args2) {
   if (process.env.NANO_POW_DEBUG) console.log(new Date(Date.now()).toLocaleString(), "NanoPow", args2);
 }
@@ -35,16 +36,15 @@ BLOCKHASH is a 64-character hexadecimal string. Multiple blockhashes must be sep
 Prints the result as a Javascript object to standard output as soon as it is calculated.
 If using --batch, results are printed only after all BLOCKHASH(es) have be processed.
 If using --validate, results will also include validity properties.
-
-  -h, --help                  show this dialog
-      --debug                 enable additional logging output
-      --benchmark <value>     generate work for specified number of random hashes
-
   -b, --batch                 process all data before returning final results as array
   -d, --difficulty <value>    override the minimum difficulty value
   -e, --effort <value>        increase demand on GPU processing
   -v, --validate <value>      check an existing work value instead of searching for one
 
+  -h, --help                  show this dialog
+      --debug                 enable additional logging output
+      --benchmark <value>     generate work for specified number of random hashes
+
 If validating a nonce, it must be a 16-character hexadecimal value.
 Effort must be a decimal number between 1-32.
 Difficulty must be a hexadecimal string between 1-FFFFFFFFFFFFFFFF.
@@ -121,7 +121,19 @@ for (const stdinErr of stdinErrors) {
   log(stdinErr);
 }
 log("Starting NanoPow CLI");
-await import("./server.js");
+const server = spawn(process.execPath, [new URL(import.meta.resolve("./server.js")).pathname], { stdio: ["pipe", "pipe", "pipe", "ipc"] });
+const port = await new Promise((resolve, reject) => {
+  server.on("message", (msg) => {
+    if (msg.type === "listening") {
+      if (msg.port != null) {
+        log(`Server listening on port ${msg.port}`);
+        resolve(msg.port);
+      } else {
+        reject("Server failed to provide port");
+      }
+    }
+  });
+});
 const results = [];
 const aborter = new AbortController();
 if (isBenchmark) console.log("Starting benchmark...");
@@ -130,7 +142,7 @@ for (const hash of hashes) {
   try {
     body.hash = hash;
     const kill = setTimeout(() => aborter.abort(), 6e4);
-    const response = await fetch(`http://localhost:${process.env.NANO_POW_PORT}`, {
+    const response = await fetch(`http://localhost:${port}`, {
       method: "POST",
       body: JSON.stringify(body),
       signal: aborter.signal
@@ -151,4 +163,8 @@ if (isBatch && !isBenchmark) console.log(results);
 if (process.env.NANO_POW_DEBUG || isBenchmark) {
   console.log(end - start, "ms total |", (end - start) / hashes.length, "ms avg");
 }
-process.exit(0);
+server.on("close", (code) => {
+  log(`Server closed with exit code ${code}`);
+  process.exit(code);
+});
+server.kill();

package/dist/bin/nano-pow.sh

@@ -10,7 +10,7 @@ NANO_POW_LOGS="$NANO_POW_HOME"/logs;
 mkdir -p "$NANO_POW_LOGS";
 if [ "$1" = '--server' ]; then
 	shift;
-	node "$SCRIPT_DIR"/server.js > "$NANO_POW_LOGS"/nano-pow-server-$(date -u -Iseconds).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
+	node "$SCRIPT_DIR"/server.js >> "$NANO_POW_LOGS"/nano-pow-server-$(date -I).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
 	sleep 0.1;
 	if [ "$(ps | grep $(cat $NANO_POW_HOME/server.pid))" = '' ]; then
 		cat $(ls -td "$NANO_POW_LOGS"/* | head -n1);

package/dist/bin/server.js

@@ -3,43 +3,61 @@
 //! SPDX-License-Identifier: GPL-3.0-or-later
 import { launch } from "puppeteer";
 import { subtle } from "node:crypto";
-import { lookup } from "node:dns/promises";
 import { readFile, unlink, writeFile } from "node:fs/promises";
 import * as http from "node:http";
-import { homedir, hostname } from "node:os";
+import { homedir } from "node:os";
 import { join } from "node:path";
+function log(...args) {
+  if (CONFIG.DEBUG) {
+    const d = new Date(Date.now());
+    const opts = {
+      hour12: false,
+      dateStyle: "medium",
+      timeStyle: "medium"
+    };
+    console.log(d.toLocaleString(navigator.language, opts), `NanoPow[${process.pid}]:`, args);
+  }
+}
 process.title = "NanoPow Server";
 const MAX_REQUEST_SIZE = 1024;
 const MAX_BODY_SIZE = 158;
-let DEBUG = !!(process.env.NANO_POW_DEBUG || false);
-let EFFORT = +(process.env.NANO_POW_EFFORT || 8);
-let PORT = +(process.env.NANO_POW_PORT || 5040);
-let browser;
-let page;
-function log(...args) {
-  if (DEBUG) console.log(new Date(Date.now()).toLocaleString(), "NanoPow", args);
-}
+const CONFIG = {
+  DEBUG: false,
+  EFFORT: 8,
+  PORT: 5040
+};
 async function loadConfig() {
-  const contents = await readFile(join(homedir(), ".nano-pow", "config"), "utf-8");
+  let contents = null;
+  try {
+    contents = await readFile(join(homedir(), ".nano-pow", "config"), "utf-8");
+  } catch (err) {
+    log("Config file not found");
+  }
   if (typeof contents === "string") {
-    const config = contents.split("\n");
-    for (const line of config) {
+    for (const line of contents.split("\n")) {
       const debugMatch = line.match(/^[ \t]*debug[ \t]*(true|false)[ \t]*(#.*)?$/i);
       if (Array.isArray(debugMatch)) {
-        DEBUG = !!process.env.NANO_POW_DEBUG || debugMatch?.[1] === "true" || false;
+        CONFIG.DEBUG = debugMatch[1] === "true";
       }
       const effortMatch = line.match(/^[ \t]*effort[ \t]*(\d{1,2})[ \t]*(#.*)?$/i);
       if (Array.isArray(effortMatch)) {
-        EFFORT = +(process.env.NANO_POW_EFFORT || effortMatch?.[1] || 8);
+        CONFIG.EFFORT = +effortMatch[1];
       }
       const portMatch = line.match(/^[ \t]*port[ \t]*(\d{1,5})[ \t]*(#.*)?$/i);
       if (Array.isArray(portMatch)) {
-        PORT = +(process.env.NANO_POW_PORT || portMatch?.[1] || 5040);
+        CONFIG.PORT = +portMatch[1];
       }
     }
   }
+  CONFIG.DEBUG = !!process.env.NANO_POW_DEBUG || CONFIG.DEBUG;
+  CONFIG.EFFORT = +(process.env.NANO_POW_EFFORT ?? "") || CONFIG.EFFORT;
+  CONFIG.PORT = process.send ? 0 : +(process.env.NANO_POW_PORT ?? "") || CONFIG.PORT;
 }
 await loadConfig();
+process.on("SIGHUP", async () => {
+  log("Reloading configuration");
+  await loadConfig();
+});
 async function respond(res, data) {
   let statusCode = 500;
   let headers = { "Content-Type": "application/json" };
@@ -64,8 +82,8 @@ async function respond(res, data) {
     }
     response = `${action} failed`;
     const options = {
-      debug: DEBUG,
-      effort: EFFORT,
+      debug: CONFIG.DEBUG,
+      effort: CONFIG.EFFORT,
       difficulty
     };
     const args = [];
@@ -139,7 +157,8 @@ function shutdown() {
     log("Server unresponsive, forcefully stopped");
     process.exit(1);
   }, 1e4);
-  server.close(() => {
+  server.close(async () => {
+    await browser.close();
     clearTimeout(kill);
     log("Server stopped");
     process.exit(0);
@@ -149,7 +168,10 @@ process.on("SIGINT", shutdown);
 process.on("SIGTERM", shutdown);
 log("Starting NanoPow work server");
 const NanoPow = await readFile(new URL("../main.min.js", import.meta.url), "utf-8");
-browser = await launch({
+const browser = await launch({
+  handleSIGHUP: false,
+  handleSIGINT: false,
+  handleSIGTERM: false,
   headless: true,
   args: [
     "--headless=new",
@@ -159,7 +181,7 @@ browser = await launch({
     "--enable-unsafe-webgpu"
   ]
 });
-page = await browser.newPage();
+const page = await browser.newPage();
 page.on("console", (msg) => log(msg.text()));
 const path = new URL(import.meta.url).pathname;
 const dir = path.slice(0, path.lastIndexOf("/"));
@@ -180,7 +202,9 @@ await page.setContent(`
 `);
 await unlink(filename);
 log("Puppeteer initialized");
-server.listen(PORT, async () => {
-  const ip = await lookup(hostname(), { family: 4 });
-  log(`Server process ${process.pid} running at ${ip.address}:${PORT}/`);
+server.listen(CONFIG.PORT, async () => {
+  const { port } = server.address();
+  CONFIG.PORT = port;
+  log(`Server listening on port ${port}`);
+  process.send?.({ type: "listening", port });
 });

package/docs/nano-pow.1

@@ -25,15 +25,6 @@ If \fB--validate\fR is used, the original work value is returned instead along w
 \fB--server\fR
 Start work server (see SERVER below). Must be the first argument in order to be recognized.
 .TP
-\fB\-h\fR, \fB\-\-help\fR
-Show this help dialog and exit.
-.TP
-\fB\-\-debug\fR
-Enable additional logging output.
-.TP
-\fB\-\-benchmark\fR \fICOUNT\fR
-Generate work for the specified number of random hashes.
-.TP
 \fB\-b\fR, \fB\-\-batch\fR
 Format final output of all hashes as a JSON array instead of incrementally returning an object for each result as soon as it is calculated.
 .TP
@@ -45,6 +36,15 @@ Increase demand on GPU processing. Must be between 1 and 32 inclusive.
 .TP
 \fB\-v\fR, \fB\-\-validate\fR \fIWORK\fR
 Check an existing work value instead of searching for one. If you pass multiple blockhashes, the work value will be validated against each one.
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Show this help dialog and exit.
+.TP
+\fB\-\-debug\fR
+Enable additional logging output.
+.TP
+\fB\-\-benchmark\fR \fICOUNT\fR
+Generate work for the specified number of random hashes.
 
 .SH SERVER
 Calling \fBnano-pow\fR with the \fI--server\fR option will start the NanoPow work server in a detached process.

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nano-pow",
-	"version": "4.1.2",
+	"version": "4.1.4",
 	"description": "Proof-of-work generation and validation with WebGPU/WebGL for Nano cryptocurrency.",
 	"keywords": [
 		"nemo",
@@ -52,11 +52,14 @@
 		"test": "npm run build && ./test/script.sh"
 	},
 	"devDependencies": {
-		"@types/node": "^22.13.11",
-		"@webgpu/types": "^0.1.57",
-		"esbuild": "^0.25.1",
+		"@types/node": "^22.14.1",
+		"@webgpu/types": "^0.1.60",
+		"esbuild": "^0.25.2",
 		"esbuild-plugin-glsl": "^1.4.0",
-		"typescript": "^5.8.2"
+		"typescript": "^5.8.3"
+	},
+	"optionalDependencies": {
+		"puppeteer": "^24.6.1"
 	},
 	"type": "module",
 	"exports": {
@@ -66,8 +69,5 @@
 		}
 	},
 	"types": "./dist/types.d.ts",
-	"unpkg": "./dist/main.min.js",
-	"optionalDependencies": {
-		"puppeteer": "^24.4.0"
-	}
+	"unpkg": "./dist/main.min.js"
 }