0.8

Author: andrieshiemstra

CHANGELOG.md

@@ -1,6 +1,9 @@
-# 0.8 (WiP)
+# 0.9 (WiP)
 
-* 
+# 0.8.0
+
+* impld realm init hook
+* proxy info functions (see if obj is an instance of a proxy class)
 
 # 0.7.2 
 

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "quickjs_runtime"
-version = "0.7.2"
+version = "0.8.0"
 authors = ["Andries Hiemstra <info@hirofa.com>"]
 edition = "2018"
 description = "Wrapper API and utils for the QuickJS JavaScript engine with support for Promise, Module, Async/await"
@@ -22,7 +22,7 @@ setimmediate = []
 
 
 [dependencies]
-hirofa_utils = "0.4"
+hirofa_utils = "0.5"
 #hirofa_utils = {path="../utils"}
 #hirofa_utils = {git="https://github.com/HiRoFa/utils"}
 backtrace = "0.3.56"

README.md

@@ -83,8 +83,8 @@ Cargo.toml
 
 ```toml
 [dependencies]
-hirofa_utils = "0.4"
-quickjs_runtime = "0.7"
+hirofa_utils = "0.5"
+quickjs_runtime = "0.8"
 log = "0.4"
 simple-logging = "2.0"
 ```

src/builder.rs

@@ -222,12 +222,30 @@ impl JsRuntimeBuilder for QuickJsRuntimeBuilder {
         self
     }
 
-    fn js_realm_adapter_init_hook<H: FnOnce(&<<Self as JsRuntimeBuilder>::JsRuntimeFacadeType as JsRuntimeFacade>::JsRuntimeAdapterType, &<<<Self as JsRuntimeBuilder>::JsRuntimeFacadeType as JsRuntimeFacade>::JsRuntimeAdapterType as JsRuntimeAdapter>::JsRealmAdapterType) -> Result<(), JsError> + Send + 'static>(self, _hook: H) -> Self{
-        todo!()
+    fn js_realm_adapter_init_hook<
+        H: Fn(&QuickJsRuntimeAdapter, &QuickJsRealmAdapter) -> Result<(), JsError> + Send + 'static,
+    >(
+        self,
+        hook: H,
+    ) -> Self {
+        self.js_runtime_adapter_init_hook(move |rt| {
+            rt.add_context_init_hook(hook)?;
+            Ok(())
+        })
     }
 
-    fn js_runtime_adapter_init_hook<H: FnOnce(&<<Self as JsRuntimeBuilder>::JsRuntimeFacadeType as JsRuntimeFacade>::JsRuntimeAdapterType) -> Result<(), JsError> + Send + 'static>(self, _hook: H) -> Self{
-        todo!()
+    fn js_runtime_adapter_init_hook<
+        H: FnOnce(&QuickJsRuntimeAdapter) -> Result<(), JsError> + Send + 'static,
+    >(
+        self,
+        hook: H,
+    ) -> Self {
+        self.runtime_init_hook(|rt| {
+            rt.exe_rt_task_in_event_loop(|rt| {
+                let _ = hook(rt);
+            });
+            Ok(())
+        })
     }
 
     fn js_script_pre_processor<S: ScriptPreProcessor + Send + 'static>(

src/quickjsrealmadapter.rs

@@ -871,6 +871,22 @@ impl JsRealmAdapter for QuickJsRealmAdapter {
         let abuf = get_array_buffer_q(self, array)?;
         get_array_buffer_buffer_copy_q(self, &abuf)
     }
+
+    fn js_proxy_instance_get_info(
+        &self,
+        obj: &Self::JsValueAdapterType,
+    ) -> Result<(String, JsProxyInstanceId), JsError>
+    where
+        Self: Sized,
+    {
+        if let Some((p, i)) =
+            crate::reflection::get_proxy_instance_proxy_and_instance_id_q(self, obj)
+        {
+            Ok((p.get_class_name(), i))
+        } else {
+            Err(JsError::new_str("not a proxy instance"))
+        }
+    }
 }
 
 #[cfg(test)]

src/reflection/mod.rs

@@ -542,6 +542,38 @@ impl Proxy {
     }
 }
 
+pub fn get_proxy_instance_proxy_and_instance_id_q(
+    q_ctx: &QuickJsRealmAdapter,
+    obj: &JSValueRef,
+) -> Option<(Rc<Proxy>, usize)> {
+    if !is_proxy_instance_q(q_ctx, obj) {
+        None
+    } else {
+        let info = get_proxy_instance_info(obj.borrow_value());
+        let cn = info.class_name.as_str();
+        let registry = &*q_ctx.proxy_registry.borrow();
+        if let Some(proxy) = registry.get(cn).cloned() {
+            Some((proxy, info.id))
+        } else {
+            None
+        }
+    }
+}
+
+pub fn is_proxy_instance_q(q_ctx: &QuickJsRealmAdapter, obj: &JSValueRef) -> bool {
+    unsafe { is_proxy_instance(q_ctx.context, obj) }
+}
+
+pub unsafe fn is_proxy_instance(ctx: *mut q::JSContext, obj: &JSValueRef) -> bool {
+    if !obj.is_object() {
+        false
+    } else {
+        let class_id = PROXY_INSTANCE_CLASS_ID.with(|rc| *rc.borrow());
+        let proxy_class_proto: q::JSValue = q::JS_GetClassProto(ctx, class_id);
+        q::JS_IsInstanceOf(ctx, *obj.borrow_value(), proxy_class_proto) != 0
+    }
+}
+
 pub fn new_instance2(
     proxy: &Proxy,
     q_ctx: &QuickJsRealmAdapter,
@@ -686,8 +718,8 @@ unsafe extern "C" fn constructor(
 
 pub(crate) struct ProxyInstanceInfo {
     id: usize,
-    class_name: String, // todo use unsafe to make these &str?
-    context_id: String, // todo use unsafe to make these &str?
+    class_name: String, // todo, store all proxies in an autoidmap with a usize as key and store proxy_class_id here instead of string
+    context_id: String, // todo store all context ids in an autoidmap with a usize as key and store context_id here instead of string
 }
 
 fn get_proxy_instance_info(val: &q::JSValue) -> &ProxyInstanceInfo {
@@ -1219,7 +1251,9 @@ unsafe extern "C" fn proxy_instance_set_prop(
 pub mod tests {
     use crate::facades::tests::init_test_rt;
     use crate::quickjs_utils::{functions, primitives};
-    use crate::reflection::Proxy;
+    use crate::reflection::{
+        get_proxy_instance_proxy_and_instance_id_q, is_proxy_instance_q, Proxy,
+    };
     use hirofa_utils::js_utils::JsError;
     use hirofa_utils::js_utils::Script;
     use log::trace;
@@ -1278,6 +1312,33 @@ pub mod tests {
         assert!(err.contains("cant run"));
     }
 
+    #[test]
+    pub fn test_proxy_instanceof() {
+        log::info!("> test_proxy_instanceof");
+
+        let rt = init_test_rt();
+        rt.exe_rt_task_in_event_loop(|q_js_rt| {
+            q_js_rt.gc();
+            let q_ctx = q_js_rt.get_main_context();
+            let _ = Proxy::new()
+                .constructor(|_q_ctx, _id, _args| Ok(()))
+                .namespace(vec!["com", "company"])
+                .name("Test")
+                .install(q_ctx, true);
+            let res = q_ctx
+                .eval(Script::new("test_tostring.es", "new com.company.Test()"))
+                .ok()
+                .expect("script failed");
+            assert!(is_proxy_instance_q(q_ctx, &res));
+            let info = get_proxy_instance_proxy_and_instance_id_q(q_ctx, &res)
+                .expect("could not get info");
+            let id = info.1;
+            let p = info.0;
+            println!("id={}", id);
+            assert_eq!(p.get_class_name().as_str(), "com.company.Test");
+        });
+    }
+
     #[test]
     pub fn test_to_string() {
         log::info!("> test_proxy");

src/valueref.rs

@@ -3,6 +3,7 @@
 use crate::quickjs_utils::typedarrays::is_typed_array;
 use crate::quickjs_utils::{arrays, errors, functions, primitives, promises};
 use crate::quickjsruntimeadapter::QuickJsRuntimeAdapter;
+use crate::reflection::is_proxy_instance;
 use hirofa_utils::js_utils::adapters::JsValueAdapter;
 use hirofa_utils::js_utils::facades::JsValueType;
 use hirofa_utils::js_utils::JsError;
@@ -298,6 +299,10 @@ impl JsValueAdapter for JSValueRef {
         unsafe { is_typed_array(self.context, self) }
     }
 
+    fn js_is_proxy_instance(&self) -> bool {
+        unsafe { is_proxy_instance(self.context, self) }
+    }
+
     fn js_type_of(&self) -> &'static str {
         match self.get_tag() {
             TAG_BIG_INT => "bigint",