virtual-machine 0.1.15 → 0.2.1

package/native/index.d.ts

@@ -59,4 +59,3 @@ export declare class WebTransportClient {
   /** Shut down the connection and cleanup. */
   shutdown(): void
 }
-

package/native/index.js

@@ -2,21 +2,7 @@
 /* eslint-disable */
 /* prettier-ignore */
 
-/**
- * Native bindings loader for riscv-vm
- * 
- * This module detects the current platform and loads the appropriate
- * pre-built native binary. All binaries are bundled in this package.
- * 
- * Supported platforms:
- * - darwin-x64 (macOS Intel)
- * - darwin-arm64 (macOS Apple Silicon)
- * - linux-x64-gnu (Linux x64 glibc)
- * - linux-x64-musl (Linux x64 musl/Alpine)
- * - linux-arm64-gnu (Linux ARM64 glibc)
- * - linux-arm64-musl (Linux ARM64 musl/Alpine)
- * - win32-x64-msvc (Windows x64)
- */
+/* auto-generated by NAPI-RS */
 
 const { existsSync, readFileSync } = require('fs')
 const { join } = require('path')
@@ -24,12 +10,11 @@ const { join } = require('path')
 const { platform, arch } = process
 
 let nativeBinding = null
+let localFileExisted = false
 let loadError = null
 
-/**
- * Detect if running on musl libc (Alpine Linux, etc.)
- */
 function isMusl() {
+  // For Node 10
   if (!process.report || typeof process.report.getReport !== 'function') {
     try {
       const lddPath = require('child_process').execSync('which ldd').toString().trim()
@@ -43,82 +28,288 @@ function isMusl() {
   }
 }
 
-/**
- * Load a native binding from the native directory
- */
-function loadNativeBinding(filename) {
-  const filepath = join(__dirname, filename)
-  if (!existsSync(filepath)) {
-    throw new Error(
-      `Native binding not found: ${filename}\n` +
-      `Expected at: ${filepath}\n` +
-      `Platform: ${platform}, Architecture: ${arch}\n\n` +
-      `This platform may not be supported, or the package was not installed correctly.\n` +
-      `Try reinstalling the package: npm install virtual-machine`
-    )
-  }
-  return require(filepath)
-}
-
-/**
- * Determine the correct native binding filename for the current platform
- */
-function getNativeBindingFilename() {
-  switch (platform) {
-    case 'darwin':
-      switch (arch) {
-        case 'x64':
-          return 'riscv-vm-native.darwin-x64.node'
-        case 'arm64':
-          return 'riscv-vm-native.darwin-arm64.node'
-        default:
-          throw new Error(`Unsupported architecture on macOS: ${arch}`)
-      }
-
-    case 'linux':
-      const musl = isMusl()
-      switch (arch) {
-        case 'x64':
-          return musl 
-            ? 'riscv-vm-native.linux-x64-musl.node'
-            : 'riscv-vm-native.linux-x64-gnu.node'
-        case 'arm64':
-          return musl
-            ? 'riscv-vm-native.linux-arm64-musl.node'
-            : 'riscv-vm-native.linux-arm64-gnu.node'
-        default:
-          throw new Error(`Unsupported architecture on Linux: ${arch}`)
+switch (platform) {
+  case 'android':
+    switch (arch) {
+      case 'arm64':
+        localFileExisted = existsSync(join(__dirname, 'riscv-vm-native.android-arm64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.android-arm64.node')
+          } else {
+            nativeBinding = require('virtual-machine-android-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm':
+        localFileExisted = existsSync(join(__dirname, 'riscv-vm-native.android-arm-eabi.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.android-arm-eabi.node')
+          } else {
+            nativeBinding = require('virtual-machine-android-arm-eabi')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Android ${arch}`)
+    }
+    break
+  case 'win32':
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(
+          join(__dirname, 'riscv-vm-native.win32-x64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.win32-x64-msvc.node')
+          } else {
+            nativeBinding = require('virtual-machine-win32-x64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'ia32':
+        localFileExisted = existsSync(
+          join(__dirname, 'riscv-vm-native.win32-ia32-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.win32-ia32-msvc.node')
+          } else {
+            nativeBinding = require('virtual-machine-win32-ia32-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'riscv-vm-native.win32-arm64-msvc.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.win32-arm64-msvc.node')
+          } else {
+            nativeBinding = require('virtual-machine-win32-arm64-msvc')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Windows: ${arch}`)
+    }
+    break
+  case 'darwin':
+    localFileExisted = existsSync(join(__dirname, 'riscv-vm-native.darwin-universal.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./riscv-vm-native.darwin-universal.node')
+      } else {
+        nativeBinding = require('virtual-machine-darwin-universal')
       }
-
-    case 'win32':
-      switch (arch) {
-        case 'x64':
-          return 'riscv-vm-native.win32-x64-msvc.node'
-        default:
-          throw new Error(`Unsupported architecture on Windows: ${arch}`)
+      break
+    } catch {}
+    switch (arch) {
+      case 'x64':
+        localFileExisted = existsSync(join(__dirname, 'riscv-vm-native.darwin-x64.node'))
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.darwin-x64.node')
+          } else {
+            nativeBinding = require('virtual-machine-darwin-x64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      case 'arm64':
+        localFileExisted = existsSync(
+          join(__dirname, 'riscv-vm-native.darwin-arm64.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.darwin-arm64.node')
+          } else {
+            nativeBinding = require('virtual-machine-darwin-arm64')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on macOS: ${arch}`)
+    }
+    break
+  case 'freebsd':
+    if (arch !== 'x64') {
+      throw new Error(`Unsupported architecture on FreeBSD: ${arch}`)
+    }
+    localFileExisted = existsSync(join(__dirname, 'riscv-vm-native.freebsd-x64.node'))
+    try {
+      if (localFileExisted) {
+        nativeBinding = require('./riscv-vm-native.freebsd-x64.node')
+      } else {
+        nativeBinding = require('virtual-machine-freebsd-x64')
       }
-
-    default:
-      throw new Error(`Unsupported platform: ${platform}`)
-  }
-}
-
-// Load the native binding
-try {
-  const filename = getNativeBindingFilename()
-  nativeBinding = loadNativeBinding(filename)
-} catch (e) {
-  loadError = e
+    } catch (e) {
+      loadError = e
+    }
+    break
+  case 'linux':
+    switch (arch) {
+      case 'x64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-x64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-x64-musl.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-x64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-x64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-x64-gnu.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-x64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-arm64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-arm64-musl.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-arm64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-arm64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-arm64-gnu.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-arm64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'arm':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-arm-musleabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-arm-musleabihf.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-arm-musleabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-arm-gnueabihf.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-arm-gnueabihf.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-arm-gnueabihf')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 'riscv64':
+        if (isMusl()) {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-riscv64-musl.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-riscv64-musl.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-riscv64-musl')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        } else {
+          localFileExisted = existsSync(
+            join(__dirname, 'riscv-vm-native.linux-riscv64-gnu.node')
+          )
+          try {
+            if (localFileExisted) {
+              nativeBinding = require('./riscv-vm-native.linux-riscv64-gnu.node')
+            } else {
+              nativeBinding = require('virtual-machine-linux-riscv64-gnu')
+            }
+          } catch (e) {
+            loadError = e
+          }
+        }
+        break
+      case 's390x':
+        localFileExisted = existsSync(
+          join(__dirname, 'riscv-vm-native.linux-s390x-gnu.node')
+        )
+        try {
+          if (localFileExisted) {
+            nativeBinding = require('./riscv-vm-native.linux-s390x-gnu.node')
+          } else {
+            nativeBinding = require('virtual-machine-linux-s390x-gnu')
+          }
+        } catch (e) {
+          loadError = e
+        }
+        break
+      default:
+        throw new Error(`Unsupported architecture on Linux: ${arch}`)
+    }
+    break
+  default:
+    throw new Error(`Unsupported OS: ${platform}, architecture: ${arch}`)
 }
 
 if (!nativeBinding) {
   if (loadError) {
     throw loadError
   }
-  throw new Error('Failed to load native binding')
+  throw new Error(`Failed to load native binding`)
 }
 
-// Export the native binding APIs
 const { ConnectionStatus, WebTransportClient } = nativeBinding
 
 module.exports.ConnectionStatus = ConnectionStatus

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "virtual-machine",
-  "version": "0.1.15",
+  "version": "0.2.1",
   "description": "RISCV Virtual Machine with WASM and Node.js native support",
   "bin": "build/cli.js",
   "publishConfig": {