nano-pow 3.2.1 → 3.2.2

package/dist/bin/cli.js

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 //! SPDX-FileCopyrightText: 2025 Chris Duncan <chris@zoso.dev>
 //! SPDX-License-Identifier: GPL-3.0-or-later
+import * as crypto from "node:crypto";
 import * as fs from "node:fs/promises";
 import * as readline from "node:readline/promises";
 import * as puppeteer from "puppeteer";
@@ -46,7 +47,7 @@ while (/^[0-9A-Fa-f]{64}$/.test(args[args.length - 1] ?? "")) {
   inArgs.unshift(args.pop());
 }
 hashes.push(...inArgs);
-let fn = "work_generate";
+let fn = "search";
 let work = "";
 let isJson = false;
 const options = {};
@@ -56,7 +57,7 @@ for (let i = 0; i < args.length; i++) {
     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");
-      fn = "work_validate";
+      fn = "validate";
       work = `'${args[i + 1]}', `;
       break;
     }
@@ -110,8 +111,9 @@ if (hashes.length === 0) {
     ]
   });
   const page = await browser.newPage();
-  const cliPage = `${import.meta.dirname}/cli.html`;
-  await fs.writeFile(cliPage, "");
+  const path = new URL(import.meta.url).pathname;
+  const dir = path.slice(0, path.lastIndexOf("/"));
+  await fs.writeFile(`${dir}/cli.html`, "");
   await page.goto(import.meta.resolve("./cli.html"));
   await page.waitForFunction(async () => {
     return await navigator.gpu.requestAdapter();
@@ -122,9 +124,9 @@ if (hashes.length === 0) {
 		const hashes = ["${hashes.join('","')}"]
 		for (const hash of hashes) {
 			try {
-				const result = await NanoPow.${fn}(${work}hash, ${JSON.stringify(options)})
-				window.results.push(result)
-				console.log(\`cli \${JSON.stringify(result, null, 4)}\`)
+				const work = await NanoPow.${fn}(${work}hash, ${JSON.stringify(options)})
+				window.results.push(work)
+				console.log(\`cli \${work}\`)
 			} catch (err) {
 				console.error(\`cli \${err}\`)
 			}
@@ -135,13 +137,19 @@ if (hashes.length === 0) {
   const src = `sha256-${Buffer.from(hash).toString("base64")}`;
   let start = performance.now();
   page.on("console", async (msg) => {
-    const output = msg.text().split(/^cli /);
+    const output = msg.text().split("/^cli /");
     if (output[0] === "") {
       if (output[1] === "exit") {
         if (isJson) {
           const results = await page.evaluate(() => {
             return window.results;
           });
+          for (let i = 0; i < results.length; i++) {
+            results[i] = {
+              blockhash: hashes[i],
+              work: results[i]
+            };
+          }
           console.log(JSON.stringify(results, null, 4));
         }
         const end = performance.now();
@@ -171,6 +179,6 @@ if (hashes.length === 0) {
 			</head>
 		</html>
 	`);
-  await fs.unlink(cliPage);
+  await fs.unlink(`${dir}/cli.html`);
   if (options["debug"]) console.log("Puppeteer initialized");
 })();

package/dist/main.min.js

@@ -43,6 +43,7 @@ layout(location=0)in vec4 position;void main(){gl_Position=position;}`;
 var NanoPowGl = class _NanoPowGl {
   static #SEND = 0xfffffff800000000n;
   static #RECEIVE = 0xfffffe0000000000n;
+  static #isInitialized = false;
   static #busy = false;
   static #debug = false;
   static #raf = 0;
@@ -187,12 +188,13 @@ var NanoPowGl = class _NanoPowGl {
       this.#gl.bindBuffer(this.#gl.UNIFORM_BUFFER, null);
       this.#query = this.#gl.createQuery();
       this.#pixels = new Uint32Array(this.size * 4);
-      console.log(`NanoPow WebGL initialized at ${this.#gl.drawingBufferWidth}x${this.#gl.drawingBufferHeight}. Maximum nonces checked per frame: ${this.size}`);
     } catch (err) {
       throw new Error("WebGL initialization failed.", { cause: err });
     } finally {
       this.#busy = false;
     }
+    this.#isInitialized = true;
+    console.log(`NanoPow WebGL initialized at ${this.#gl.drawingBufferWidth}x${this.#gl.drawingBufferHeight}. Maximum nonces checked per frame: ${this.size}`);
   }
   /**
   * On WebGL context loss, attempts to clear all program variables and then
@@ -361,6 +363,7 @@ var NanoPowGl = class _NanoPowGl {
   * @param {NanoPowOptions} options - Options used to configure search execution
   */
   static async work_generate(hash, options) {
+    if (!/^[A-Fa-f0-9]{64}$/.test(hash)) throw new Error(`Invalid hash ${hash}`);
     if (this.#busy) {
       console.log("NanoPowGl is busy. Retrying search...");
       return new Promise((resolve) => {
@@ -370,8 +373,8 @@ var NanoPowGl = class _NanoPowGl {
         }, 100);
       });
     }
+    if (this.#isInitialized === false) this.init();
     this.#busy = true;
-    if (!/^[A-Fa-f0-9]{64}$/.test(hash)) throw new Error(`Invalid hash ${hash}`);
     const threshold = typeof options?.threshold !== "bigint" || options.threshold < 1n || options.threshold > 0xffffffffffffffffn ? 0xfffffff800000000n : options.threshold;
     const effort = typeof options?.effort !== "number" || options.effort < 1 || options.effort > 32 ? this.#cores : options.effort;
     this.#debug = !!options?.debug;
@@ -451,6 +454,8 @@ var NanoPowGl = class _NanoPowGl {
   * @param {NanoPowOptions} options - Options used to configure search execution
   */
   static async work_validate(work, hash, options) {
+    if (!/^[A-Fa-f0-9]{16}$/.test(work)) throw new Error(`Invalid work ${work}`);
+    if (!/^[A-Fa-f0-9]{64}$/.test(hash)) throw new Error(`Invalid hash ${hash}`);
     if (this.#busy) {
       console.log("NanoPowGl is busy. Retrying validate...");
       return new Promise((resolve) => {
@@ -460,9 +465,8 @@ var NanoPowGl = class _NanoPowGl {
         }, 100);
       });
     }
+    if (this.#isInitialized === false) this.init();
     this.#busy = true;
-    if (!/^[A-Fa-f0-9]{16}$/.test(work)) throw new Error(`Invalid work ${work}`);
-    if (!/^[A-Fa-f0-9]{64}$/.test(hash)) throw new Error(`Invalid hash ${hash}`);
     const threshold = typeof options?.threshold !== "bigint" || options.threshold < 1n || options.threshold > 0xffffffffffffffffn ? 0xfffffff800000000n : options.threshold;
     this.#debug = !!options?.debug;
     if (this.#debug) console.log("NanoPowGl.validate()");
@@ -527,6 +531,7 @@ var NanoPowGpu = class _NanoPowGpu {
   static #SEND = 0xfffffff800000000n;
   static #RECEIVE = 0xfffffe0000000000n;
   // Initialize WebGPU
+  static #isInitialized = false;
   static #busy = false;
   static #debug = false;
   static #device = null;
@@ -556,6 +561,7 @@ var NanoPowGpu = class _NanoPowGpu {
     } finally {
       this.#busy = false;
     }
+    this.#isInitialized = true;
   }
   static setup() {
     if (this.#device == null) throw new Error(`WebGPU device failed to load.`);
@@ -730,6 +736,7 @@ var NanoPowGpu = class _NanoPowGpu {
         }, 100);
       });
     }
+    if (this.#isInitialized === false) this.init();
     this.#busy = true;
     const threshold = typeof options?.threshold !== "bigint" || options.threshold < 1n || options.threshold > 0xffffffffffffffffn ? 0xfffffff800000000n : options.threshold;
     const effort = typeof options?.effort !== "number" || options.effort < 1 || options.effort > 32 ? 2048 : options.effort * 256;
@@ -806,6 +813,7 @@ var NanoPowGpu = class _NanoPowGpu {
         }, 100);
       });
     }
+    if (this.#isInitialized === false) this.init();
     this.#busy = true;
     const threshold = typeof options?.threshold !== "bigint" || options.threshold < 1n || options.threshold > 0xffffffffffffffffn ? 0xfffffff800000000n : options.threshold;
     this.#debug = !!options?.debug;
@@ -850,15 +858,15 @@ var NanoPowGpu = class _NanoPowGpu {
 var isGlSupported;
 var isGpuSupported = false;
 try {
-  await NanoPowGpu.init();
-  isGpuSupported = true;
+  const adapter = await navigator?.gpu?.requestAdapter?.();
+  isGpuSupported = adapter instanceof GPUAdapter;
 } catch (err) {
   console.warn("WebGPU is not supported in this environment.\n", err);
   isGpuSupported = false;
 }
 try {
-  await NanoPowGl.init();
-  isGlSupported = true;
+  const gl = new OffscreenCanvas(0, 0)?.getContext?.("webgl2");
+  isGlSupported = gl instanceof WebGL2RenderingContext;
 } catch (err) {
   console.warn("WebGL is not supported in this environment.\n", err);
   isGlSupported = false;

package/dist/types.d.ts

@@ -105,7 +105,7 @@ export type NanoPowOptions = {
 export declare class NanoPowGl {
 	#private
 	/** Drawing buffer width in pixels. */
-	static get size (): number | undefined
+	static get size (): number
 	/**
 	* Constructs canvas, gets WebGL context, initializes buffers, and compiles
 	* shaders.

package/package.json

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