nano-pow 4.1.5 → 4.1.6

package/dist/bin/cli.js

@@ -1,18 +1,78 @@
 #!/usr/bin/env node
-//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
-//! SPDX-License-Identifier: GPL-3.0-or-later
+
+// src/bin/cli.ts
 import { spawn } from "node:child_process";
 import { getRandomValues } from "node:crypto";
 import { createInterface } from "node:readline/promises";
+
+// src/utils/index.ts
+function average(times) {
+  if (times == null || times.length === 0) return {};
+  let count = times.length;
+  let min = Number.MAX_SAFE_INTEGER;
+  let logarithms, max, median, rate, reciprocals, total, truncated, truncatedCount;
+  logarithms = max = median = rate = reciprocals = total = truncated = truncatedCount = 0;
+  times.sort((a, b) => a - b);
+  for (let i = 0; i < count; i++) {
+    const time = times[i];
+    total += time;
+    reciprocals += 1 / time;
+    logarithms += Math.log(time);
+    min = Math.min(min, time);
+    max = Math.max(max, time);
+    if (i + 1 === Math.ceil(count / 2)) median = time;
+    if (count < 3 || i > 0.1 * count && i < 0.9 * (count - 1)) {
+      truncated += time;
+      truncatedCount++;
+    }
+  }
+  return {
+    count,
+    total,
+    min,
+    max,
+    median,
+    arithmetic: total / count,
+    harmonic: count / reciprocals,
+    geometric: Math.exp(logarithms / count),
+    truncated: truncated / truncatedCount,
+    rate: 1e3 * truncatedCount / (truncated || total)
+  };
+}
+function isHex(input, min, max) {
+  if (typeof input !== "string") {
+    return false;
+  }
+  if (typeof min !== "undefined" && typeof min !== "number") {
+    throw new Error(`Invalid argument for parameter 'min'`);
+  }
+  if (typeof max !== "undefined" && typeof max !== "number") {
+    throw new Error(`Invalid argument for parameter 'max'`);
+  }
+  const range = min === void 0 && max === void 0 ? "+" : `{${min ?? "0"},${max ?? ""}}`;
+  const regexp = new RegExp(`^[0-9A-Fa-f]${range}$`, "m");
+  return regexp.test(input);
+}
+function isNotHex(input, min, max) {
+  return !isHex(input, min, max);
+}
+function log(...args2) {
+  if (process?.env?.NANO_POW_DEBUG) {
+    const entry = `${new Date(Date.now()).toLocaleString(Intl.DateTimeFormat().resolvedOptions().locale ?? "en-US", { hour12: false, dateStyle: "medium", timeStyle: "medium" })} NanoPow[${process.pid}]: ${args2}`;
+    console.log(entry);
+    process.send?.({ type: "console", message: entry });
+  }
+}
+
+// src/bin/cli.ts
+//! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
+//! SPDX-License-Identifier: GPL-3.0-or-later
 process.title = "NanoPow CLI";
 delete process.env.NANO_POW_DEBUG;
 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);
-}
-const hashes = [];
-const stdinErrors = [];
+var hashes = [];
+var stdinErrors = [];
 if (!process.stdin.isTTY) {
   const stdin = createInterface({
     input: process.stdin
@@ -20,14 +80,14 @@ if (!process.stdin.isTTY) {
   let i = 0;
   for await (const line of stdin) {
     i++;
-    if (/^[0-9A-Fa-f]{64}$/.test(line)) {
+    if (isHex(line, 64)) {
       hashes.push(line);
     } else {
       stdinErrors.push(`Skipping invalid stdin input line ${i}`);
     }
   }
 }
-const args = process.argv.slice(2);
+var args = process.argv.slice(2);
 if (hashes.length === 0 && args.length === 0 || args.some((v) => v === "--help" || v === "-h")) {
   console.log(
     `Usage: nano-pow [OPTION]... BLOCKHASH...
@@ -47,7 +107,7 @@ If using --validate, results will also include validity properties.
 
 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.
+Difficulty must be a hexadecimal string between 0-FFFFFFFFFFFFFFFF.
 
 Report bugs: <bug-nano-pow@zoso.dev>
 Full documentation: <https://www.npmjs.com/package/nano-pow>
@@ -55,48 +115,53 @@ Full documentation: <https://www.npmjs.com/package/nano-pow>
   );
   process.exit(0);
 }
-const inArgs = [];
-while (/^[0-9A-Fa-f]{64}$/.test(args[args.length - 1] ?? "")) {
+var inArgs = [];
+while (isHex(args[args.length - 1], 64)) {
   inArgs.unshift(args.pop());
 }
 hashes.push(...inArgs);
-let isBatch = false;
-let isBenchmark = false;
-const body = {
+var isBatch = false;
+var isBenchmark = false;
+var body = {
   action: "work_generate"
 };
 for (let i = 0; i < args.length; i++) {
   switch (args[i]) {
     case "--validate":
     case "-v": {
-      if (args[i + 1] == null) throw new Error("Missing argument for work validation");
-      if (!/^[0-9A-Fa-f]{16}$/.test(args[i + 1])) throw new Error("Invalid work to validate");
+      const v = args[i + 1];
+      if (v == null) throw new Error("Missing argument for work validation");
+      if (isNotHex(v, 16)) throw new Error("Invalid work to validate");
+      if (hashes.length !== 1) throw new Error("Validate accepts exactly one hash");
       body.action = "work_validate";
-      body.work = args[i + 1];
+      body.work = v;
       break;
     }
     case "--difficulty":
     case "-d": {
-      if (args[i + 1] == null) throw new Error("Missing argument for difficulty");
-      if (!/^[0-9A-Fa-f][0-9A-Fa-f]{0,15}$/.test(args[i + 1])) throw new Error("Invalid difficulty");
-      body.difficulty = args[i + 1];
+      const d = args[i + 1];
+      if (d == null) throw new Error("Missing argument for difficulty");
+      if (isNotHex(d, 1, 16)) throw new Error("Invalid difficulty");
+      body.difficulty = d;
       break;
     }
     case "--effort":
     case "-e": {
-      if (args[i + 1] == null) throw new Error("Missing argument for effort");
-      if (!/^[0-9]{0,2}$/.test(args[i + 1])) throw new Error("Invalid effort");
-      process.env.NANO_POW_EFFORT = args[i + 1];
+      const e = args[i + 1];
+      if (e == null) throw new Error("Missing argument for effort");
+      if (parseInt(e) < 1 || parseInt(e) > 32) throw new Error("Invalid effort");
+      process.env.NANO_POW_EFFORT = e;
       break;
     }
     case "--benchmark": {
-      if (args[i + 1] == null) throw new Error("Missing argument for benchmark");
-      if (!(+args[i + 1] > 0)) throw new Error("Invalid benchmark count");
+      const b = args[i + 1];
+      if (b == null) throw new Error("Missing argument for benchmark");
+      const count = +b;
+      if (count < 1) throw new Error("Invalid benchmark count");
       const random = new Uint8Array(32);
-      while (hashes.length < +args[i + 1]) {
+      while (hashes.length < count) {
         getRandomValues(random);
-        const byteArray = [...random].map((byte) => byte.toString(16).padStart(2, "0"));
-        hashes.push(byteArray.join(""));
+        hashes.push(Buffer.from(random).toString("hex"));
       }
       isBenchmark = true;
       break;
@@ -121,53 +186,66 @@ for (const stdinErr of stdinErrors) {
   log(stdinErr);
 }
 log("Starting NanoPow CLI");
-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 === "console") {
-      log(msg.text);
-    }
-    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");
-      }
-    }
-  });
+var server = spawn(
+  process.execPath,
+  [new URL(import.meta.resolve("./server.js")).pathname],
+  { stdio: ["pipe", "pipe", "pipe", "ipc"] }
+);
+server.once("error", (err) => {
+  log(err);
+  process.exit(1);
 });
-const results = [];
-const aborter = new AbortController();
-if (isBenchmark) console.log("Starting benchmark...");
-const start = performance.now();
-for (const hash of hashes) {
-  try {
-    body.hash = hash;
-    const kill = setTimeout(() => aborter.abort(), 6e4);
-    const response = await fetch(`http://localhost:${port}`, {
-      method: "POST",
-      body: JSON.stringify(body),
-      signal: aborter.signal
-    });
-    clearTimeout(kill);
-    const result = await response.json();
-    if (isBatch || isBenchmark) {
-      results.push(result);
+server.on("message", async (msg) => {
+  if (msg.type === "console") {
+    log(msg.message);
+  }
+  if (msg.type === "listening") {
+    const port = +msg.message;
+    if (port > -1) {
+      log(`CLI server listening on port ${port}`);
+      try {
+        await execute(port);
+      } catch {
+        log(`Error executing ${body.action}`);
+      }
     } else {
-      console.log(result);
+      log("Server failed to provide port");
     }
-  } catch (err) {
-    log(err);
   }
-}
-const end = performance.now();
-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");
-}
+});
 server.on("close", (code) => {
   log(`Server closed with exit code ${code}`);
   process.exit(code);
 });
-server.kill();
+async function execute(port) {
+  const results = [];
+  if (isBenchmark) console.log("Running benchmark...");
+  let start = 0;
+  const times = [];
+  for (const hash of hashes) {
+    try {
+      const aborter = new AbortController();
+      const kill = setTimeout(() => aborter.abort(), 6e4);
+      body.hash = hash;
+      start = performance.now();
+      const response = await fetch(`http://localhost:${port}`, {
+        method: "POST",
+        body: JSON.stringify(body),
+        signal: aborter.signal
+      });
+      clearTimeout(kill);
+      const result = await response.json();
+      if (isBatch || isBenchmark) {
+        results.push(result);
+        times.push(performance.now() - start);
+      } else {
+        console.log(result);
+      }
+    } catch (err) {
+      log(err);
+    }
+  }
+  if (isBatch && !isBenchmark) console.log(results);
+  if (process.env.NANO_POW_DEBUG || isBenchmark) console.log(average(times));
+  server.kill();
+}

package/dist/bin/nano-pow.sh

@@ -10,11 +10,11 @@ NANO_POW_LOGS="$NANO_POW_HOME"/logs;
 mkdir -p "$NANO_POW_LOGS";
 if [ "$1" = '--server' ]; then
 	shift;
-	node "$SCRIPT_DIR"/server.js --max-http-header-size=1024 >> "$NANO_POW_LOGS"/nano-pow-server-$(date -I).log 2>&1 & echo "$!" > "$NANO_POW_HOME"/server.pid;
+	node "$SCRIPT_DIR"/server.js --max-http-header-size=1024 --max-old-space-size=256 >> "$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);
 	fi;
 else
-	node "$SCRIPT_DIR"/cli.js "$@";
+	node "$SCRIPT_DIR"/cli.js --max-old-space-size=256 "$@";
 fi;