wip, v16 using bellard 2025-09-13

Author: andrieshiemstra

CHANGELOG.md

@@ -1,3 +1,9 @@
+# 0.16.0
+
+* update to bellard 2025-09-13
+* removed atom.to_str as it was badly implemented
+* removed string.to_str as it was badly implemented
+
 # 0.15.7
 
 * updated error handling / toString (include cause and such)

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quickjs_runtime"
-version = "0.15.7"
+version = "0.16.0"
 authors = ["Andries Hiemstra <[email protected]>"]
 edition = "2021"
 description = "Wrapper API and utils for the QuickJS JavaScript engine with support for Promise, Modules, Async/await"
@@ -31,7 +31,7 @@ backtrace = "0.3"
 
 #libquickjs-sys = {package="hirofa-quickjs-sys", git='https://github.com/HiRoFa/quickjs-sys'}
 #libquickjs-sys = { package = "hirofa-quickjs-sys", path = '../quickjs-sys', default-features = false }
-libquickjs-sys = { package = "hirofa-quickjs-sys", version = "0.10.0", default-features = false }
+libquickjs-sys = { package = "hirofa-quickjs-sys", version = "0.11", default-features = false }
 lazy_static = "1.5.0"
 log = "0.4"
 num_cpus = "1"

src/facades.rs

@@ -1196,7 +1196,7 @@ pub mod tests {
             let q_ctx = q_js_rt.get_main_realm();
             let r = q_ctx.eval(Script::new(
                 "test_async.es",
-                "let f = async function(){let p = new Promise((resolve, reject) => {resolve(12345);}); const p2 = await p; return p2}; f();",
+                "let f = async function(){let p = new Promise((resolve, reject) => {resolve(12345);}); const p2 = await p; return p2}; f()",
             )).ok().unwrap();
             log::trace!("tag = {}", r.get_tag());
             //std::thread::sleep(Duration::from_secs(1));

src/quickjs_utils/atoms.rs

@@ -4,7 +4,7 @@ use crate::quickjs_utils::primitives;
 use crate::quickjsrealmadapter::QuickJsRealmAdapter;
 use crate::quickjsvalueadapter::QuickJsValueAdapter;
 use libquickjs_sys as q;
-use std::ffi::{CStr, CString};
+use std::ffi::CString;
 
 #[allow(clippy::upper_case_acronyms)]
 pub struct JSAtomRef {
@@ -62,16 +62,6 @@ pub unsafe fn to_string2(context: *mut q::JSContext, atom: &q::JSAtom) -> Result
     primitives::to_string(context, &val_ref)
 }
 
-/// # Safety
-/// When passing a context pointer please make sure the corresponding QuickJsContext is still valid
-pub unsafe fn to_str(context: *mut q::JSContext, atom: &q::JSAtom) -> Result<&str, JsError> {
-    let c_string = q::JS_AtomToCString(context, *atom);
-    let c_str = CStr::from_ptr(c_string);
-    c_str
-        .to_str()
-        .map_err(|e| JsError::new_string(format!("{e}")))
-}
-
 pub fn from_string_q(q_ctx: &QuickJsRealmAdapter, string: &str) -> Result<JSAtomRef, JsError> {
     unsafe { from_string(q_ctx.context, string) }
 }

src/quickjs_utils/mod.rs

@@ -33,33 +33,34 @@ pub mod class_ids {
     pub const JS_CLASS_UINT32_ARRAY: u32 = 27;
     pub const JS_CLASS_BIG_INT64_ARRAY: u32 = 28;
     pub const JS_CLASS_BIG_UINT64_ARRAY: u32 = 29;
-    pub const JS_CLASS_FLOAT32_ARRAY: u32 = 30;
-    pub const JS_CLASS_FLOAT64_ARRAY: u32 = 31;
-    pub const JS_CLASS_DATAVIEW: u32 = 32;
-    pub const JS_CLASS_BIG_INT: u32 = 33;
-    pub const JS_CLASS_MAP: u32 = 34;
-    pub const JS_CLASS_SET: u32 = 35;
-    pub const JS_CLASS_WEAKMAP: u32 = 36;
-    pub const JS_CLASS_WEAKSET: u32 = 37;
-    pub const JS_CLASS_MAP_ITERATOR: u32 = 38;
-    pub const JS_CLASS_SET_ITERATOR: u32 = 39;
-    pub const JS_CLASS_ARRAY_ITERATOR: u32 = 40;
-    pub const JS_CLASS_STRING_ITERATOR: u32 = 41;
-    pub const JS_CLASS_REGEXP_STRING_ITERATOR: u32 = 42;
-    pub const JS_CLASS_GENERATOR: u32 = 43;
-    pub const JS_CLASS_PROXY: u32 = 44;
-    pub const JS_CLASS_PROMISE: u32 = 45;
-    pub const JS_CLASS_PROMISE_RESOLVE_FUNCTION: u32 = 46;
-    pub const JS_CLASS_PROMISE_REJECT_FUNCTION: u32 = 47;
-    pub const JS_CLASS_ASYNC_FUNCTION: u32 = 48;
-    pub const JS_CLASS_ASYNC_FUNCTION_RESOLVE: u32 = 49;
-    pub const JS_CLASS_ASYNC_FUNCTION_REJECT: u32 = 50;
-    pub const JS_CLASS_ASYNC_FROM_SYNC_ITERATOR: u32 = 51;
-    pub const JS_CLASS_ASYNC_GENERATOR_FUNCTION: u32 = 52;
-    pub const JS_CLASS_ASYNC_GENERATOR: u32 = 53;
-    pub const JS_CLASS_WEAK_REF: u32 = 54;
-    pub const JS_CLASS_FINALIZATION_REGISTRY: u32 = 55;
-    pub const JS_CLASS_INIT_COUNT: u32 = 56;
+    pub const JS_CLASS_FLOAT16_ARRAY: u32 = 30;
+    pub const JS_CLASS_FLOAT32_ARRAY: u32 = 31;
+    pub const JS_CLASS_FLOAT64_ARRAY: u32 = 32;
+    pub const JS_CLASS_DATAVIEW: u32 = 33;
+    pub const JS_CLASS_BIG_INT: u32 = 34;
+    pub const JS_CLASS_MAP: u32 = 35;
+    pub const JS_CLASS_SET: u32 = 36;
+    pub const JS_CLASS_WEAKMAP: u32 = 37;
+    pub const JS_CLASS_WEAKSET: u32 = 38;
+    pub const JS_CLASS_MAP_ITERATOR: u32 = 39;
+    pub const JS_CLASS_SET_ITERATOR: u32 = 40;
+    pub const JS_CLASS_ARRAY_ITERATOR: u32 = 41;
+    pub const JS_CLASS_STRING_ITERATOR: u32 = 42;
+    pub const JS_CLASS_REGEXP_STRING_ITERATOR: u32 = 43;
+    pub const JS_CLASS_GENERATOR: u32 = 44;
+    pub const JS_CLASS_PROXY: u32 = 45;
+    pub const JS_CLASS_PROMISE: u32 = 46;
+    pub const JS_CLASS_PROMISE_RESOLVE_FUNCTION: u32 = 47;
+    pub const JS_CLASS_PROMISE_REJECT_FUNCTION: u32 = 48;
+    pub const JS_CLASS_ASYNC_FUNCTION: u32 = 49;
+    pub const JS_CLASS_ASYNC_FUNCTION_RESOLVE: u32 = 50;
+    pub const JS_CLASS_ASYNC_FUNCTION_REJECT: u32 = 51;
+    pub const JS_CLASS_ASYNC_FROM_SYNC_ITERATOR: u32 = 52;
+    pub const JS_CLASS_ASYNC_GENERATOR_FUNCTION: u32 = 53;
+    pub const JS_CLASS_ASYNC_GENERATOR: u32 = 54;
+    pub const JS_CLASS_WEAK_REF: u32 = 55;
+    pub const JS_CLASS_FINALIZATION_REGISTRY: u32 = 56;
+    pub const JS_CLASS_INIT_COUNT: u32 = 57;
 }
 #[cfg(feature = "quickjs-ng")]
 pub mod class_ids {

src/quickjs_utils/objects.rs

@@ -467,7 +467,7 @@ where
 
     for index in 0..enum_ref.len() {
         let atom = enum_ref.get_atom_raw(index) as q::JSAtom;
-        let prop_name = atoms::to_str(context, &atom)?;
+        let prop_name = atoms::to_string2(context, &atom)?;
 
         #[cfg(feature = "bellard")]
         let raw_value = q::JS_GetPropertyInternal(
@@ -491,7 +491,7 @@ where
             return Err(JsError::new_str("Could not get object property"));
         }
 
-        let r = visitor(prop_name, &prop_val_ref)?;
+        let r = visitor(prop_name.as_str(), &prop_val_ref)?;
 
         result.push(r);
     }
@@ -513,7 +513,7 @@ where
 
     for index in 0..enum_ref.len() {
         let atom = enum_ref.get_atom_raw(index) as q::JSAtom;
-        let prop_name = atoms::to_str(context, &atom)?;
+        let prop_name = atoms::to_string2(context, &atom)?;
 
         #[cfg(feature = "bellard")]
         let raw_value = q::JS_GetPropertyInternal(
@@ -537,7 +537,7 @@ where
             return Err(JsError::new_str("Could not get object property"));
         }
 
-        visitor(prop_name, &prop_val_ref)?;
+        visitor(prop_name.as_str(), &prop_val_ref)?;
     }
 
     Ok(())

src/quickjs_utils/primitives.rs

@@ -90,56 +90,17 @@ pub unsafe fn to_string(
         ));
     }
 
-    let cstr = std::ffi::CStr::from_ptr(ptr);
+    let bytes = std::slice::from_raw_parts(ptr as *const u8, len);
 
-    let s = cstr.to_string_lossy().into_owned();
+    // Convert to String (validate UTF-8).
+    let s = String::from_utf8_lossy(bytes).into_owned();
 
     // Free the c string.
     q::JS_FreeCString(context, ptr);
 
     Ok(s)
 }
 
-/// # Safety
-/// When passing a context pointer please make sure the corresponding QuickJsContext is still valid
-pub unsafe fn to_str(
-    context: *mut q::JSContext,
-    value_ref: &QuickJsValueAdapter,
-) -> Result<&str, JsError> {
-    //log::trace!("primitives::to_str on {}", value_ref.borrow_value().tag);
-
-    assert!(value_ref.is_string());
-
-    let mut len = 0;
-
-    #[cfg(feature = "bellard")]
-    let ptr: *const c_char = q::JS_ToCStringLen2(context, &mut len, *value_ref.borrow_value(), 0);
-    #[cfg(feature = "quickjs-ng")]
-    let ptr: *const c_char =
-        q::JS_ToCStringLen2(context, &mut len, *value_ref.borrow_value(), false);
-    // Free the c string.
-    q::JS_FreeCString(context, ptr);
-    // ptr should still be valid as long as value_ref lives
-
-    if len == 0 {
-        return Ok("");
-    }
-
-    if ptr.is_null() {
-        return Err(JsError::new_str(
-            "Could not convert string: got a null pointer",
-        ));
-    }
-
-    let cstr = std::ffi::CStr::from_ptr(ptr);
-    cstr.to_str()
-        .map_err(|e| JsError::new_string(format!("utf8 error: {e}")))
-
-    //let s = cstr.to_string_lossy();
-
-    //Ok(s.as_ref())
-}
-
 pub fn from_string_q(q_ctx: &QuickJsRealmAdapter, s: &str) -> Result<QuickJsValueAdapter, JsError> {
     unsafe { from_string(q_ctx.context, s) }
 }
@@ -160,7 +121,6 @@ pub unsafe fn from_string(
 
 #[cfg(test)]
 pub mod tests {
-
     use crate::facades::tests::init_test_rt;
     use crate::jsutils::Script;
 

src/quickjs_utils/properties.rs

@@ -46,7 +46,7 @@ impl JSPropertyEnumRef {
     pub fn get_name(&self, index: u32) -> Result<String, JsError> {
         let atom: *mut q::JSAtom = unsafe { self.get_atom_raw(index) };
         let atom = atom as q::JSAtom;
-        unsafe { Ok(atoms::to_str(self.context, &atom)?.to_string()) }
+        unsafe { atoms::to_string2(self.context, &atom) }
     }
     pub fn is_enumerable(&self, index: u32) -> bool {
         if index >= self.length {

src/quickjsvalueadapter.rs

@@ -398,14 +398,6 @@ impl QuickJsValueAdapter {
             _ => unsafe { functions::call_to_string(self.context, self) },
         }
     }
-
-    pub fn to_str(&self) -> Result<&str, JsError> {
-        if self.get_js_type() == JsValueType::String {
-            unsafe { primitives::to_str(self.context, self) }
-        } else {
-            Err(JsError::new_str("this value is not a string"))
-        }
-    }
 }
 
 #[cfg(test)]
@@ -424,7 +416,7 @@ pub mod tests {
                 Ok(res) => {
                     log::info!("script ran ok: {:?}", res);
                     assert!(res.get_js_type() == JsValueType::String);
-                    assert_eq!(res.to_str().expect("str conv failed"), "hello world");
+                    assert_eq!(res.to_string().expect("str conv failed"), "hello world");
                 }
                 Err(e) => {
                     log::error!("script failed: {}", e);