From 1db475bf7e0ff3207ec7fdf9231de61d341cf84c Mon Sep 17 00:00:00 2001 From: Rigidity Date: Mon, 26 Feb 2024 19:39:53 -0500 Subject: [PATCH 1/2] Fix index.js --- index.js | 296 +++++++++++++++++++++++++++++-------------------------- 1 file changed, 155 insertions(+), 141 deletions(-) diff --git a/index.js b/index.js index 33840fe..8148e8b 100644 --- a/index.js +++ b/index.js @@ -5,301 +5,315 @@ /* auto-generated by NAPI-RS */ const { existsSync, readFileSync } = require('fs') -const { join } = require('path') +const { join } = require("path"); -const { platform, arch } = process +const { platform, arch } = process; -let nativeBinding = null -let localFileExisted = false -let loadError = null +let nativeBinding = null; +let localFileExisted = false; +let loadError = null; function isMusl() { // For Node 10 - if (!process.report || typeof process.report.getReport !== 'function') { + if (!process.report || typeof process.report.getReport !== "function") { try { - const lddPath = require('child_process').execSync('which ldd').toString().trim() - return readFileSync(lddPath, 'utf8').includes('musl') + const lddPath = require("child_process") + .execSync("which ldd") + .toString() + .trim(); + return readFileSync(lddPath, "utf8").includes("musl"); } catch (e) { - return true + return true; } } else { - const { glibcVersionRuntime } = process.report.getReport().header - return !glibcVersionRuntime + const { glibcVersionRuntime } = process.report.getReport().header; + return !glibcVersionRuntime; } } switch (platform) { - case 'android': + case "android": switch (arch) { - case 'arm64': - localFileExisted = existsSync(join(__dirname, 'server-coin.android-arm64.node')) + case "arm64": + localFileExisted = existsSync( + join(__dirname, "server-coin.android-arm64.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.android-arm64.node') + nativeBinding = require("./server-coin.android-arm64.node"); } else { - nativeBinding = require('chia-server-coin-android-arm64') + nativeBinding = require("server-coin-android-arm64"); } } catch (e) { - loadError = e + loadError = e; } - break - case 'arm': - localFileExisted = existsSync(join(__dirname, 'server-coin.android-arm-eabi.node')) + break; + case "arm": + localFileExisted = existsSync( + join(__dirname, "server-coin.android-arm-eabi.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.android-arm-eabi.node') + nativeBinding = require("./server-coin.android-arm-eabi.node"); } else { - nativeBinding = require('chia-server-coin-android-arm-eabi') + nativeBinding = require("server-coin-android-arm-eabi"); } } catch (e) { - loadError = e + loadError = e; } - break + break; default: - throw new Error(`Unsupported architecture on Android ${arch}`) + throw new Error(`Unsupported architecture on Android ${arch}`); } - break - case 'win32': + break; + case "win32": switch (arch) { - case 'x64': + case "x64": localFileExisted = existsSync( - join(__dirname, 'server-coin.win32-x64-msvc.node') - ) + join(__dirname, "server-coin.win32-x64-msvc.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.win32-x64-msvc.node') + nativeBinding = require("./server-coin.win32-x64-msvc.node"); } else { - nativeBinding = require('chia-server-coin-win32-x64-msvc') + nativeBinding = require("server-coin-win32-x64-msvc"); } } catch (e) { - loadError = e + loadError = e; } - break - case 'ia32': + break; + case "ia32": localFileExisted = existsSync( - join(__dirname, 'server-coin.win32-ia32-msvc.node') - ) + join(__dirname, "server-coin.win32-ia32-msvc.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.win32-ia32-msvc.node') + nativeBinding = require("./server-coin.win32-ia32-msvc.node"); } else { - nativeBinding = require('chia-server-coin-win32-ia32-msvc') + nativeBinding = require("server-coin-win32-ia32-msvc"); } } catch (e) { - loadError = e + loadError = e; } - break - case 'arm64': + break; + case "arm64": localFileExisted = existsSync( - join(__dirname, 'server-coin.win32-arm64-msvc.node') - ) + join(__dirname, "server-coin.win32-arm64-msvc.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.win32-arm64-msvc.node') + nativeBinding = require("./server-coin.win32-arm64-msvc.node"); } else { - nativeBinding = require('chia-server-coin-win32-arm64-msvc') + nativeBinding = require("server-coin-win32-arm64-msvc"); } } catch (e) { - loadError = e + loadError = e; } - break + break; default: - throw new Error(`Unsupported architecture on Windows: ${arch}`) + throw new Error(`Unsupported architecture on Windows: ${arch}`); } - break - case 'darwin': - localFileExisted = existsSync(join(__dirname, 'server-coin.darwin-universal.node')) + break; + case "darwin": + localFileExisted = existsSync( + join(__dirname, "server-coin.darwin-universal.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.darwin-universal.node') + nativeBinding = require("./server-coin.darwin-universal.node"); } else { - nativeBinding = require('chia-server-coin-darwin-universal') + nativeBinding = require("server-coin-darwin-universal"); } - break + break; } catch {} switch (arch) { - case 'x64': - localFileExisted = existsSync(join(__dirname, 'server-coin.darwin-x64.node')) + case "x64": + localFileExisted = existsSync( + join(__dirname, "server-coin.darwin-x64.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.darwin-x64.node') + nativeBinding = require("./server-coin.darwin-x64.node"); } else { - nativeBinding = require('chia-server-coin-darwin-x64') + nativeBinding = require("server-coin-darwin-x64"); } } catch (e) { - loadError = e + loadError = e; } - break - case 'arm64': + break; + case "arm64": localFileExisted = existsSync( - join(__dirname, 'server-coin.darwin-arm64.node') - ) + join(__dirname, "server-coin.darwin-arm64.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.darwin-arm64.node') + nativeBinding = require("./server-coin.darwin-arm64.node"); } else { - nativeBinding = require('chia-server-coin-darwin-arm64') + nativeBinding = require("server-coin-darwin-arm64"); } } catch (e) { - loadError = e + loadError = e; } - break + break; default: - throw new Error(`Unsupported architecture on macOS: ${arch}`) + throw new Error(`Unsupported architecture on macOS: ${arch}`); } - break - case 'freebsd': - if (arch !== 'x64') { - throw new Error(`Unsupported architecture on FreeBSD: ${arch}`) + break; + case "freebsd": + if (arch !== "x64") { + throw new Error(`Unsupported architecture on FreeBSD: ${arch}`); } - localFileExisted = existsSync(join(__dirname, 'server-coin.freebsd-x64.node')) + localFileExisted = existsSync( + join(__dirname, "server-coin.freebsd-x64.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.freebsd-x64.node') + nativeBinding = require("./server-coin.freebsd-x64.node"); } else { - nativeBinding = require('chia-server-coin-freebsd-x64') + nativeBinding = require("server-coin-freebsd-x64"); } } catch (e) { - loadError = e + loadError = e; } - break - case 'linux': + break; + case "linux": switch (arch) { - case 'x64': + case "x64": if (isMusl()) { localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-x64-musl.node') - ) + join(__dirname, "server-coin.linux-x64-musl.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-x64-musl.node') + nativeBinding = require("./server-coin.linux-x64-musl.node"); } else { - nativeBinding = require('chia-server-coin-linux-x64-musl') + nativeBinding = require("server-coin-linux-x64-musl"); } } catch (e) { - loadError = e + loadError = e; } } else { localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-x64-gnu.node') - ) + join(__dirname, "server-coin.linux-x64-gnu.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-x64-gnu.node') + nativeBinding = require("./server-coin.linux-x64-gnu.node"); } else { - nativeBinding = require('chia-server-coin-linux-x64-gnu') + nativeBinding = require("server-coin-linux-x64-gnu"); } } catch (e) { - loadError = e + loadError = e; } } - break - case 'arm64': + break; + case "arm64": if (isMusl()) { localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-arm64-musl.node') - ) + join(__dirname, "server-coin.linux-arm64-musl.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-arm64-musl.node') + nativeBinding = require("./server-coin.linux-arm64-musl.node"); } else { - nativeBinding = require('chia-server-coin-linux-arm64-musl') + nativeBinding = require("server-coin-linux-arm64-musl"); } } catch (e) { - loadError = e + loadError = e; } } else { localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-arm64-gnu.node') - ) + join(__dirname, "server-coin.linux-arm64-gnu.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-arm64-gnu.node') + nativeBinding = require("./server-coin.linux-arm64-gnu.node"); } else { - nativeBinding = require('chia-server-coin-linux-arm64-gnu') + nativeBinding = require("server-coin-linux-arm64-gnu"); } } catch (e) { - loadError = e + loadError = e; } } - break - case 'arm': + break; + case "arm": localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-arm-gnueabihf.node') - ) + join(__dirname, "server-coin.linux-arm-gnueabihf.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-arm-gnueabihf.node') + nativeBinding = require("./server-coin.linux-arm-gnueabihf.node"); } else { - nativeBinding = require('chia-server-coin-linux-arm-gnueabihf') + nativeBinding = require("server-coin-linux-arm-gnueabihf"); } } catch (e) { - loadError = e + loadError = e; } - break - case 'riscv64': + break; + case "riscv64": if (isMusl()) { localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-riscv64-musl.node') - ) + join(__dirname, "server-coin.linux-riscv64-musl.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-riscv64-musl.node') + nativeBinding = require("./server-coin.linux-riscv64-musl.node"); } else { - nativeBinding = require('chia-server-coin-linux-riscv64-musl') + nativeBinding = require("server-coin-linux-riscv64-musl"); } } catch (e) { - loadError = e + loadError = e; } } else { localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-riscv64-gnu.node') - ) + join(__dirname, "server-coin.linux-riscv64-gnu.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-riscv64-gnu.node') + nativeBinding = require("./server-coin.linux-riscv64-gnu.node"); } else { - nativeBinding = require('chia-server-coin-linux-riscv64-gnu') + nativeBinding = require("server-coin-linux-riscv64-gnu"); } } catch (e) { - loadError = e + loadError = e; } } - break - case 's390x': + break; + case "s390x": localFileExisted = existsSync( - join(__dirname, 'server-coin.linux-s390x-gnu.node') - ) + join(__dirname, "server-coin.linux-s390x-gnu.node"), + ); try { if (localFileExisted) { - nativeBinding = require('./server-coin.linux-s390x-gnu.node') + nativeBinding = require("./server-coin.linux-s390x-gnu.node"); } else { - nativeBinding = require('chia-server-coin-linux-s390x-gnu') + nativeBinding = require("server-coin-linux-s390x-gnu"); } } catch (e) { - loadError = e + loadError = e; } - break + break; default: - throw new Error(`Unsupported architecture on Linux: ${arch}`) + throw new Error(`Unsupported architecture on Linux: ${arch}`); } - break + break; default: - throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`) + throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`); } if (!nativeBinding) { if (loadError) { - throw loadError + throw loadError; } - throw new Error(`Failed to load native binding`) + throw new Error(`Failed to load native binding`); } -const { Tls, Peer, ServerCoinIterator, Wallet, toCoinId, bytesEqual } = nativeBinding +const { Tls, Peer, ServerCoinIterator, Wallet, toCoinId, bytesEqual } = + nativeBinding; -module.exports.Tls = Tls -module.exports.Peer = Peer -module.exports.ServerCoinIterator = ServerCoinIterator -module.exports.Wallet = Wallet -module.exports.toCoinId = toCoinId -module.exports.bytesEqual = bytesEqual +module.exports.Tls = Tls; +module.exports.Peer = Peer; +module.exports.ServerCoinIterator = ServerCoinIterator; +module.exports.Wallet = Wallet; +module.exports.toCoinId = toCoinId; +module.exports.bytesEqual = bytesEqual; From 2fb5b178eb22649cd90645a58f8401f2088aa1a6 Mon Sep 17 00:00:00 2001 From: Rigidity Date: Mon, 26 Feb 2024 19:46:58 -0500 Subject: [PATCH 2/2] Bump versions --- npm/darwin-arm64/package.json | 2 +- npm/darwin-universal/package.json | 2 +- npm/darwin-x64/package.json | 2 +- npm/linux-arm64-gnu/package.json | 2 +- npm/linux-arm64-musl/package.json | 2 +- npm/linux-x64-gnu/package.json | 2 +- npm/linux-x64-musl/package.json | 2 +- npm/win32-x64-msvc/package.json | 2 +- package.json | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/npm/darwin-arm64/package.json b/npm/darwin-arm64/package.json index fd2266b..0342c1c 100644 --- a/npm/darwin-arm64/package.json +++ b/npm/darwin-arm64/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-darwin-arm64", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/darwin-universal/package.json b/npm/darwin-universal/package.json index 4000055..5b3edfb 100644 --- a/npm/darwin-universal/package.json +++ b/npm/darwin-universal/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-darwin-universal", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/darwin-x64/package.json b/npm/darwin-x64/package.json index 9845139..ebca7a0 100644 --- a/npm/darwin-x64/package.json +++ b/npm/darwin-x64/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-darwin-x64", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/linux-arm64-gnu/package.json b/npm/linux-arm64-gnu/package.json index 0d19bd8..af1443a 100644 --- a/npm/linux-arm64-gnu/package.json +++ b/npm/linux-arm64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-linux-arm64-gnu", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/linux-arm64-musl/package.json b/npm/linux-arm64-musl/package.json index 048feb6..d4cc0ba 100644 --- a/npm/linux-arm64-musl/package.json +++ b/npm/linux-arm64-musl/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-linux-arm64-musl", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/linux-x64-gnu/package.json b/npm/linux-x64-gnu/package.json index a81910d..c594db5 100644 --- a/npm/linux-x64-gnu/package.json +++ b/npm/linux-x64-gnu/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-linux-x64-gnu", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/linux-x64-musl/package.json b/npm/linux-x64-musl/package.json index 06d3ca4..4c019e9 100644 --- a/npm/linux-x64-musl/package.json +++ b/npm/linux-x64-musl/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-linux-x64-musl", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/npm/win32-x64-msvc/package.json b/npm/win32-x64-msvc/package.json index 1b3fc7f..8151b64 100644 --- a/npm/win32-x64-msvc/package.json +++ b/npm/win32-x64-msvc/package.json @@ -1,6 +1,6 @@ { "name": "server-coin-win32-x64-msvc", - "version": "0.0.1", + "version": "0.0.2", "repository": { "type": "git", "url": "https://github.com/Datalayer-Storage/server-coin" diff --git a/package.json b/package.json index b27fca6..efa127d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "chia-server-coin", - "version": "0.0.1", + "version": "0.0.2", "main": "index.js", "types": "index.d.ts", "repository": {