nano-pow 4.1.0 → 4.1.2

package/dist/bin/cli.js

@@ -4,7 +4,7 @@
 import { getRandomValues } from "node:crypto";
 import { createInterface } from "node:readline/promises";
 process.title = "NanoPow CLI";
-process.env.NANO_POW_DEBUG = "";
+delete process.env.NANO_POW_DEBUG;
 process.env.NANO_POW_EFFORT = "";
 process.env.NANO_POW_PORT = "5041";
 function log(...args2) {
@@ -38,9 +38,9 @@ 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
+      --benchmark <value>     generate work for specified number of random hashes
 
-	-b, --batch                 process all data before returning final results as array
+  -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
@@ -129,7 +129,7 @@ const start = performance.now();
 for (const hash of hashes) {
   try {
     body.hash = hash;
-    const kill = setTimeout(aborter.abort, 5e3);
+    const kill = setTimeout(() => aborter.abort(), 6e4);
     const response = await fetch(`http://localhost:${process.env.NANO_POW_PORT}`, {
       method: "POST",
       body: JSON.stringify(body),

package/dist/bin/nano-pow.sh

@@ -11,6 +11,10 @@ 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;
+	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 "$@";
 fi;

package/dist/bin/server.js

@@ -6,19 +6,40 @@ 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 { hostname } from "node:os";
+import { homedir, hostname } from "node:os";
 import { join } from "node:path";
 process.title = "NanoPow Server";
 const MAX_REQUEST_SIZE = 1024;
 const MAX_BODY_SIZE = 158;
-const DEBUG = !!(process.env.NANO_POW_DEBUG || false);
-const EFFORT = +(process.env.NANO_POW_EFFORT || 8);
-const PORT = +(process.env.NANO_POW_PORT || 5040);
+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);
 }
+async function loadConfig() {
+  const contents = await readFile(join(homedir(), ".nano-pow", "config"), "utf-8");
+  if (typeof contents === "string") {
+    const config = contents.split("\n");
+    for (const line of config) {
+      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;
+      }
+      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);
+      }
+      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);
+      }
+    }
+  }
+}
+await loadConfig();
 async function respond(res, data) {
   let statusCode = 500;
   let headers = { "Content-Type": "application/json" };

package/dist/main.min.js

@@ -227,6 +227,7 @@ var NanoPowGl = class _NanoPowGl {
     _NanoPowGl.#drawProgram = null;
     _NanoPowGl.#gl = null;
     _NanoPowGl.#busy = false;
+    _NanoPowGl.#isInitialized = false;
     _NanoPowGl.init();
   }
   static #logAverages(times) {
@@ -353,7 +354,7 @@ var NanoPowGl = class _NanoPowGl {
         setTimeout(async () => {
           const result2 = this.work_generate(hash, options);
           resolve(result2);
-        }, 100);
+        }, 500);
       });
     }
     if (this.#isInitialized === false) this.init();
@@ -438,7 +439,7 @@ var NanoPowGl = class _NanoPowGl {
         setTimeout(async () => {
           const result2 = this.work_validate(work, hash, options);
           resolve(result2);
-        }, 100);
+        }, 500);
       });
     }
     if (this.#isInitialized === false) this.init();
@@ -604,6 +605,7 @@ var NanoPowGpu = class _NanoPowGpu {
     _NanoPowGpu.#gpuBuffer?.destroy();
     _NanoPowGpu.#uboBuffer?.destroy();
     _NanoPowGpu.#busy = false;
+    _NanoPowGpu.#isInitialized = false;
     _NanoPowGpu.init();
   }
   static #logAverages(times) {
@@ -683,7 +685,8 @@ var NanoPowGpu = class _NanoPowGpu {
       this.#cpuBuffer.unmap();
     } catch (err) {
       console.warn(`Error getting data from GPU. ${err}`);
-      return this.#dispatch(pipeline, seed, hash, difficulty, passes);
+      this.#cpuBuffer.unmap();
+      this.reset();
     }
     if (this.#debug) console.log("gpuBuffer data", data);
     if (data == null) throw new Error(`Failed to get data from buffer.`);
@@ -703,7 +706,7 @@ var NanoPowGpu = class _NanoPowGpu {
         setTimeout(async () => {
           const result2 = this.work_generate(hash, options);
           resolve(result2);
-        }, 100);
+        }, 500);
       });
     }
     if (this.#isInitialized === false) this.init();
@@ -773,7 +776,7 @@ var NanoPowGpu = class _NanoPowGpu {
         setTimeout(async () => {
           const result2 = this.work_validate(work, hash, options);
           resolve(result2);
-        }, 100);
+        }, 500);
       });
     }
     if (this.#isInitialized === false) this.init();

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nano-pow",
-	"version": "4.1.0",
+	"version": "4.1.2",
 	"description": "Proof-of-work generation and validation with WebGPU/WebGL for Nano cryptocurrency.",
 	"keywords": [
 		"nemo",