fix(wasm): export error constants from rust to ensure consistency with js polyfill

Author: xusd320

Cargo.lock

@@ -44,7 +44,7 @@ serde_path_to_error = "0.1.16"
 simd-json           = "0.17.0"
 thiserror           = "1.0"
 tokio               = { version = "1.47.1" }
-tokio-fs-ext        = "0.7.4"
+tokio-fs-ext        = "0.7.5"
 toml                = "0.8"
 tracing             = "0.1.41"
 tracing-subscriber  = { version = "0.3.19", features = ["env-filter", "fmt"] }

Cargo.toml

@@ -1,8 +1,55 @@
+use std::io;
 use wasm_bindgen::prelude::*;
 
+// Helper macro to define constants and their JS getters (exported as functions)
+macro_rules! define_error_consts {
+    ($($name:ident, $fn_name:ident = $val:expr),* $(,)?) => {
+        $(
+            // Internal Rust constant
+            pub const $name: &str = $val;
+
+            // Exported JS function returning the string
+            #[wasm_bindgen(js_name = $name)]
+            pub fn $fn_name() -> String {
+                $name.to_string()
+            }
+        )*
+    };
+}
+
+define_error_consts! {
+    ERR_NOT_FOUND, err_not_found = "NotFoundError",
+    ERR_KEY_ALREADY_EXISTS, err_key_already_exists = "NoModificationAllowedError",
+    ERR_NOT_ALLOWED, err_not_allowed = "NotAllowedError",
+    ERR_NO_MODIFICATION_ALLOWED, err_no_modification_allowed = "NoModificationAllowedError",
+    ERR_TYPE_MISMATCH, err_type_mismatch = "TypeMismatchError",
+    ERR_QUOTA_EXCEEDED, err_quota_exceeded = "QuotaExceededError",
+    ERR_INVALID_STATE, err_invalid_state = "InvalidStateError",
+    ERR_ABORT, err_abort = "AbortError",
+}
+
 pub fn to_js_error<E>(e: E) -> JsError
 where
     E: Into<anyhow::Error>,
 {
-    JsError::new(&format!("{:#?}", e.into()))
+    let err = e.into();
+
+    if let Some(io_err) = err.downcast_ref::<io::Error>() {
+        let prefix = match io_err.kind() {
+            io::ErrorKind::NotFound => ERR_NOT_FOUND,
+            io::ErrorKind::PermissionDenied => ERR_NOT_ALLOWED,
+            io::ErrorKind::WouldBlock => ERR_NO_MODIFICATION_ALLOWED,
+            io::ErrorKind::InvalidData => ERR_TYPE_MISMATCH,
+            io::ErrorKind::StorageFull => ERR_QUOTA_EXCEEDED,
+            io::ErrorKind::InvalidInput => ERR_INVALID_STATE,
+            io::ErrorKind::Interrupted => ERR_ABORT,
+            _ => "",
+        };
+
+        if !prefix.is_empty() {
+            return JsError::new(&format!("{}: {}", prefix, io_err));
+        }
+    }
+
+    JsError::new(&format!("{:#?}", err))
 }

crates/utoo-wasm/src/errors.rs

@@ -25,6 +25,22 @@ export class DirEntry {
     type: DirEntryType;
 }
 
+export function ERR_ABORT(): string;
+
+export function ERR_INVALID_STATE(): string;
+
+export function ERR_KEY_ALREADY_EXISTS(): string;
+
+export function ERR_NOT_ALLOWED(): string;
+
+export function ERR_NOT_FOUND(): string;
+
+export function ERR_NO_MODIFICATION_ALLOWED(): string;
+
+export function ERR_QUOTA_EXCEEDED(): string;
+
+export function ERR_TYPE_MISMATCH(): string;
+
 export class Fs {
     private constructor();
     free(): void;
@@ -178,19 +194,8 @@ export function workerCreated(worker_id: number): void;
 export type InitInput = RequestInfo | URL | Response | BufferSource | WebAssembly.Module;
 
 export interface InitOutput {
-    readonly __wbg_project_free: (a: number, b: number) => void;
-    readonly project_build: () => any;
-    readonly project_cwd: () => [number, number];
-    readonly project_deps: (a: number, b: number, c: number) => any;
-    readonly project_entrypointsSubscribe: (a: any) => any;
-    readonly project_gzip: (a: any) => any;
-    readonly project_hmrEvents: (a: number, b: number, c: any) => any;
-    readonly project_init: (a: number, b: number) => void;
-    readonly project_install: (a: number, b: number, c: number) => any;
-    readonly project_setCwd: (a: number, b: number) => void;
-    readonly project_sigMd5: (a: any) => any;
-    readonly project_updateInfoSubscribe: (a: number, b: any) => void;
-    readonly project_writeAllToDisk: (a: any) => void;
+    readonly initLogFilter: (a: number, b: number) => void;
+    readonly init_pack: () => void;
     readonly __wbg_direntry_free: (a: number, b: number) => void;
     readonly __wbg_fs_free: (a: number, b: number) => void;
     readonly __wbg_get_direntry_name: (a: number) => [number, number];
@@ -222,13 +227,32 @@ export interface InitOutput {
     readonly fs_write: (a: number, b: number, c: any) => any;
     readonly fs_writeString: (a: number, b: number, c: number, d: number) => any;
     readonly fs_writeSync: (a: number, b: number, c: any) => [number, number];
-    readonly getWasmMemory: () => any;
-    readonly getWasmModule: () => any;
-    readonly initLogFilter: (a: number, b: number) => void;
-    readonly init_pack: () => void;
     readonly __wbg_roottask_free: (a: number, b: number) => void;
     readonly registerWorkerScheduler: (a: any, b: any) => void;
     readonly workerCreated: (a: number) => void;
+    readonly __wbg_project_free: (a: number, b: number) => void;
+    readonly project_build: () => any;
+    readonly project_cwd: () => [number, number];
+    readonly project_deps: (a: number, b: number, c: number) => any;
+    readonly project_entrypointsSubscribe: (a: any) => any;
+    readonly project_gzip: (a: any) => any;
+    readonly project_hmrEvents: (a: number, b: number, c: any) => any;
+    readonly project_init: (a: number, b: number) => void;
+    readonly project_install: (a: number, b: number, c: number) => any;
+    readonly project_setCwd: (a: number, b: number) => void;
+    readonly project_sigMd5: (a: any) => any;
+    readonly project_updateInfoSubscribe: (a: number, b: any) => void;
+    readonly project_writeAllToDisk: (a: any) => void;
+    readonly getWasmMemory: () => any;
+    readonly getWasmModule: () => any;
+    readonly ERR_ABORT: () => [number, number];
+    readonly ERR_INVALID_STATE: () => [number, number];
+    readonly ERR_KEY_ALREADY_EXISTS: () => [number, number];
+    readonly ERR_NOT_ALLOWED: () => [number, number];
+    readonly ERR_NOT_FOUND: () => [number, number];
+    readonly ERR_NO_MODIFICATION_ALLOWED: () => [number, number];
+    readonly ERR_QUOTA_EXCEEDED: () => [number, number];
+    readonly ERR_TYPE_MISMATCH: () => [number, number];
     readonly rust_mi_get_default_heap: () => number;
     readonly rust_mi_get_thread_id: () => number;
     readonly rust_mi_set_default_heap: (a: number) => void;
@@ -254,16 +278,16 @@ export interface InitOutput {
     readonly __wbg_createsyncaccesshandleoptions_free: (a: number, b: number) => void;
     readonly wasm_thread_entry_point: (a: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_core_97b1fb32719f2dc8___ops__function__FnMut_____Output_______: (a: number, b: number) => void;
+    readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_core_97b1fb32719f2dc8___ops__function__Fn__js_sys_8afca1662fec7f75___Array____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_core_97b1fb32719f2dc8___ops__function__FnMut__wasm_bindgen_4243f1f505d3e2fc___JsValue____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_core_97b1fb32719f2dc8___ops__function__FnMut__web_sys_95f4c484d1daab41___features__gen_MessageEvent__MessageEvent____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_core_97b1fb32719f2dc8___ops__function__FnMut_____Output________1_: (a: number, b: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_for__a__core_97b1fb32719f2dc8___ops__function__FnMut____a_web_sys_95f4c484d1daab41___features__gen_MessageEvent__MessageEvent____Output_______: (a: number, b: number) => void;
-    readonly wasm_bindgen_4243f1f505d3e2fc___closure__destroy___dyn_core_97b1fb32719f2dc8___ops__function__Fn__js_sys_8afca1662fec7f75___Array____Output_______: (a: number, b: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke___js_sys_8afca1662fec7f75___Function__js_sys_8afca1662fec7f75___Function_____: (a: number, b: number, c: any, d: any) => void;
+    readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke___js_sys_8afca1662fec7f75___Array_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke___wasm_bindgen_4243f1f505d3e2fc___JsValue_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke___web_sys_95f4c484d1daab41___features__gen_MessageEvent__MessageEvent_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures________invoke___web_sys_95f4c484d1daab41___features__gen_MessageEvent__MessageEvent_____: (a: number, b: number, c: any) => void;
-    readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke___js_sys_8afca1662fec7f75___Array_____: (a: number, b: number, c: any) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke______: (a: number, b: number) => void;
     readonly wasm_bindgen_4243f1f505d3e2fc___convert__closures_____invoke_______1_: (a: number, b: number) => void;
     readonly memory: WebAssembly.Memory;

next.js

@@ -1,4 +1,13 @@
 import path from "path";
+import {
+  ERR_ABORT,
+  ERR_INVALID_STATE,
+  ERR_NO_MODIFICATION_ALLOWED,
+  ERR_NOT_ALLOWED,
+  ERR_NOT_FOUND,
+  ERR_QUOTA_EXCEEDED,
+  ERR_TYPE_MISMATCH,
+} from "../../../utoo";
 import { workerData } from "../workerThreadsPolyfill";
 
 export function resolvePath(p: string): string {
@@ -17,11 +26,11 @@ export function getFs() {
 }
 
 export function translateError(error: any, path: string, syscall: string) {
-  const message = (error.message || String(error)).toLowerCase();
+  const message = error.message || String(error);
 
   // 1. NotFound (ENOENT)
   // Mapping "NotFoundError" from tokio-fs-ext
-  if (message.includes("notfounderror") || message.includes("notfound")) {
+  if (message.includes(ERR_NOT_FOUND())) {
     const e = new Error(
       `ENOENT: no such file or directory, ${syscall} '${path}'`,
     );
@@ -34,7 +43,7 @@ export function translateError(error: any, path: string, syscall: string) {
 
   // 2. Directory error (Mapped to EISDIR)
   // Mapping "TypeMismatchError" or "type mismatch" from tokio-fs-ext
-  if (message.includes("typemismatcherror") || message.includes("type mismatch")) {
+  if (message.includes(ERR_TYPE_MISMATCH())) {
     const e = new Error(
       `EISDIR: illegal operation on a directory, ${syscall} '${path}'`,
     );
@@ -47,10 +56,7 @@ export function translateError(error: any, path: string, syscall: string) {
 
   // 3. Locking/Concurrency (Mapped to EAGAIN/EBUSY)
   // Mapping "NoModificationAllowedError" from tokio-fs-ext
-  if (
-    message.includes("nomodificationallowederror") ||
-    message.includes("wouldblock")
-  ) {
+  if (message.includes(ERR_NO_MODIFICATION_ALLOWED())) {
     const e = new Error(
       `EAGAIN: resource temporarily unavailable, ${syscall} '${path}'`,
     );
@@ -62,8 +68,8 @@ export function translateError(error: any, path: string, syscall: string) {
   }
 
   // 4. Permission Denied (EACCES)
-  // Mapping "NotAllowedError" or "SecurityError" from tokio-fs-ext
-  if (message.includes("notallowederror") || message.includes("securityerror")) {
+  // Mapping "NotAllowedError" from tokio-fs-ext
+  if (message.includes(ERR_NOT_ALLOWED())) {
     const e = new Error(`EACCES: permission denied, ${syscall} '${path}'`);
     (e as any).errno = -13;
     (e as any).code = "EACCES";
@@ -74,14 +80,38 @@ export function translateError(error: any, path: string, syscall: string) {
 
   // 5. Storage Full (ENOSPC)
   // Mapping "QuotaExceededError" from tokio-fs-ext
-  if (message.includes("quotaexceedederror")) {
-    const e = new Error(`ENOSPC: no space left on device, ${syscall} '${path}'`);
+  if (message.includes(ERR_QUOTA_EXCEEDED())) {
+    const e = new Error(
+      `ENOSPC: no space left on device, ${syscall} '${path}'`,
+    );
     (e as any).errno = -28;
     (e as any).code = "ENOSPC";
     (e as any).syscall = syscall;
     (e as any).path = path;
     return e;
   }
 
+  // 6. Invalid Argument (EINVAL)
+  // Mapping "InvalidStateError" from tokio-fs-ext
+  if (message.includes(ERR_INVALID_STATE())) {
+    const e = new Error(`EINVAL: invalid argument, ${syscall} '${path}'`);
+    (e as any).errno = -22;
+    (e as any).code = "EINVAL";
+    (e as any).syscall = syscall;
+    (e as any).path = path;
+    return e;
+  }
+
+  // 7. Interrupted (EINTR)
+  // Mapping "AbortError" from tokio-fs-ext
+  if (message.includes(ERR_ABORT())) {
+    const e = new Error(`EINTR: interrupted system call, ${syscall} '${path}'`);
+    (e as any).errno = -4;
+    (e as any).code = "EINTR";
+    (e as any).syscall = syscall;
+    (e as any).path = path;
+    return e;
+  }
+
   return error;
 }