virtual-machine 0.0.1 → 0.0.3

package/build/riscv_vm-3CIEJ5K7.mjs

@@ -0,0 +1,12 @@
+import {
+  NetworkStatus,
+  WasmVm,
+  initSync,
+  riscv_vm_default
+} from "./chunk-GZ343GYI.mjs";
+export {
+  NetworkStatus,
+  WasmVm,
+  riscv_vm_default as default,
+  initSync
+};

package/build/riscv_vm-MHIWEZQY.mjs

@@ -0,0 +1,12 @@
+import {
+  NetworkStatus,
+  WasmVm,
+  initSync,
+  riscv_vm_default
+} from "./chunk-LJUNPJTY.mjs";
+export {
+  NetworkStatus,
+  WasmVm,
+  riscv_vm_default as default,
+  initSync
+};

package/build/riscv_vm-VNML57ES.mjs

@@ -0,0 +1,12 @@
+import {
+  NetworkStatus,
+  WasmVm,
+  initSync,
+  riscv_vm_default
+} from "./chunk-Q7TFYQ5G.mjs";
+export {
+  NetworkStatus,
+  WasmVm,
+  riscv_vm_default as default,
+  initSync
+};

package/build.sh

@@ -5,14 +5,21 @@ is_mac() {
   [[ "$OSTYPE" == "darwin"* ]]
 }
 
-
 PACKAGEJSON=./pkg/package.json
 IMPORTFILE=./pkg/riscv_vm.js
 
 echo "Building the rust library"
 RUSTFLAGS=--cfg=web_sys_unstable_apis npx wasm-pack build  --target web 
 
+if is_mac; then
+  sed -i '' 's/"module": "ridb_core.js",/"main": "ridb_core.js",/' $PACKAGEJSON
+  sed -i '' "/if (typeof module_or_path === 'undefined') {/,/}/d" $IMPORTFILE
+else
+  sed -i  's/"module": "ridb_core.js",/"main": "ridb_core.js",/' $PACKAGEJSON
+  sed -i "/if (typeof module_or_path === 'undefined') {/,/}/d" $IMPORTFILE
+fi
+
 npx tsup --config tsup/tsup.cli.ts
 npx tsup --config tsup/tsup.core.cjs.ts
 npx tsup --config tsup/tsup.core.esm.ts
-npx tsup --config tsup/tsup.core.cjs.ts --dts-only
+npx tsup --config tsup/tsup.core.cjs.ts --dts-only

package/cli.ts

@@ -38,9 +38,26 @@ async function createVm(
     certHash?: string;
   },
 ) {
-  const resolvedKernel = path.resolve(kernelPath);
-  const kernelBuf =  fs.readFileSync(resolvedKernel);
-  const kernelBytes = new Uint8Array(kernelBuf);
+  let kernelBytes: Uint8Array;
+
+  if (kernelPath.startsWith('http://') || kernelPath.startsWith('https://')) {
+    console.error(`[CLI] Downloading kernel from ${kernelPath}...`);
+    const response = await fetch(kernelPath);
+    if (!response.ok) {
+      throw new Error(
+        `Failed to fetch kernel from ${kernelPath}: ${response.statusText}`,
+      );
+    }
+    const arrayBuffer = await response.arrayBuffer();
+    kernelBytes = new Uint8Array(arrayBuffer);
+  } else {
+    const resolvedKernel = path.resolve(kernelPath);
+    if (!fs.existsSync(resolvedKernel)) {
+      throw new Error(`Kernel file not found at ${resolvedKernel}`);
+    }
+    const kernelBuf = fs.readFileSync(resolvedKernel);
+    kernelBytes = new Uint8Array(kernelBuf);
+  }
 
   const { WasmInternal } = await import('./');
   const wasm = await WasmInternal();

package/index.ts

@@ -13,4 +13,4 @@ export async function WasmInternal() {
 }
 
 
-export type * from "./pkg/riscv_vm";
+export  { NetworkStatus, WasmVm } from "./pkg/riscv_vm";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "virtual-machine",
-  "version": "0.0.1",
+  "version": "0.0.3",
   "description": "",
   "bin": "build/cli.js",
   "publishConfig": {

package/src/main.rs

@@ -13,9 +13,9 @@ use riscv_vm::console::Console;
 #[derive(Parser, Debug)]
 #[command(author, version, about, long_about = None)]
 struct Args {
-    /// Path to binary to load
+    /// Path or URL to binary to load
     #[arg(short, long)]
-    kernel: PathBuf,
+    kernel: String,
 
     /// Address to load kernel at (default 0x8000_0000)
     #[arg(long, default_value_t = 0x8000_0000)]
@@ -74,9 +74,19 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
     env_logger::init();
     let args = Args::parse();
 
-    let mut file = File::open(&args.kernel)?;
-    let mut buffer = Vec::new();
-    file.read_to_end(&mut buffer)?;
+    let buffer = if args.kernel.starts_with("http://") || args.kernel.starts_with("https://") {
+        println!("Downloading kernel from {}...", args.kernel);
+        let response = reqwest::blocking::get(&args.kernel)?;
+        if !response.status().is_success() {
+            return Err(format!("Failed to download kernel: {}", response.status()).into());
+        }
+        response.bytes()?.to_vec()
+    } else {
+        let mut file = File::open(&args.kernel)?;
+        let mut buffer = Vec::new();
+        file.read_to_end(&mut buffer)?;
+        buffer
+    };
 
     let dram_size_bytes = args
         .mem_mib

package/tsup/index.ts

@@ -73,7 +73,6 @@ export default function createConfig({
       "react-server-dom-webpack",
       "tsup",
       "react-server-dom-webpack/client.edge",
-      "@trust0/ridb/worker",
       ...(external ?? [])
     ],
   }));