fix node === node in html dom

Author: andrieshiemstra

src/modules/htmldom/mod.rs

@@ -31,6 +31,8 @@ use quickjs_runtime::jsutils::JsError;
 use quickjs_runtime::quickjsrealmadapter::QuickJsRealmAdapter;
 use quickjs_runtime::quickjsvalueadapter::QuickJsValueAdapter;
 use std::cell::RefCell;
+use std::collections::HashMap;
+use std::hash::{Hash, Hasher};
 
 // https://developer.mozilla.org/en-US/docs/Web/API/DOMParser
 // https://developer.mozilla.org/en-US/docs/Web/API/Element
@@ -216,8 +218,35 @@ struct StyleObj {
     element: NodeRef,
 }
 
+#[derive(Clone)]
+struct NodeRefWrapper(NodeRef);
+
+impl Hash for NodeRefWrapper {
+    fn hash<H: Hasher>(&self, state: &mut H) {
+        let ptr = std::rc::Rc::as_ptr(&self.0 .0);
+        ptr.hash(state);
+    }
+}
+
+impl PartialEq for NodeRefWrapper {
+    fn eq(&self, other: &Self) -> bool {
+        let one: &NodeRef = &self.0;
+        let two: &NodeRef = &other.0;
+        one.eq(two)
+    }
+}
+
+impl Eq for NodeRefWrapper {}
+
+impl NodeRefWrapper {
+    fn clone_node(&self) -> NodeRef {
+        self.0.clone()
+    }
+}
+
 thread_local! {
     static NODES: RefCell<AutoIdMap<NodeRef>> = RefCell::new(AutoIdMap::new());
+    static NODE_VALUE_BY_NODEREF: RefCell<HashMap<NodeRefWrapper, QuickJsValueAdapter>> = RefCell::new(HashMap::new());
     static NODELISTS: RefCell<AutoIdMap<NodeList>> = RefCell::new(AutoIdMap::new());
     static ELEMENTLISTS: RefCell<AutoIdMap<ElementList>> = RefCell::new(AutoIdMap::new());
     static SELECTELEMENTLISTS: RefCell<AutoIdMap<SelectElementList >> = RefCell::new(AutoIdMap::new());
@@ -285,11 +314,34 @@ fn register_node(
     // remove on finalize (dont decrement refcount :))
     // reuse here to create a new JsValueAdapter (and then increment refcount)
 
-    let id = NODES.with(|rc| {
-        let map = &mut *rc.borrow_mut();
-        map.insert(node)
-    });
-    realm.instantiate_proxy_with_id(&["greco", "htmldom"], "Node", id)
+    let node_ref_wrapper = NodeRefWrapper(node);
+
+    NODE_VALUE_BY_NODEREF.with(|rc| {
+        let node_ref_map = &mut *rc.borrow_mut();
+        if let Some(value) = node_ref_map.get(&node_ref_wrapper) {
+            Ok(value.clone())
+        } else {
+            let id = NODES.with(|rc| {
+                let map = &mut *rc.borrow_mut();
+                map.insert(node_ref_wrapper.clone_node())
+            });
+
+            let mut node_value_adapter =
+                realm.instantiate_proxy_with_id(&["greco", "htmldom"], "Node", id)?;
+
+            let value_without_incr = QuickJsValueAdapter::new(
+                realm.context,
+                *node_value_adapter.borrow_value_mut(),
+                false,
+                false,
+                "register_node clone",
+            );
+
+            node_ref_map.insert(node_ref_wrapper, value_without_incr);
+
+            Ok(node_value_adapter)
+        }
+    })
 }
 
 fn register_node_list(
@@ -406,10 +458,15 @@ fn init_node_proxy(realm: &QuickJsRealmAdapter) -> Result<QuickJsValueAdapter, J
         .name("Node")
         .event_target()
         .finalizer(|_rt, _realm, id| {
-            NODES.with(|rc| {
+            let node = NODES.with(|rc| {
                 let map = &mut rc.borrow_mut();
-                map.remove(&id);
-            })
+                map.remove(&id)
+            });
+            let node_ref_wrapper = NodeRefWrapper(node);
+            NODE_VALUE_BY_NODEREF.with(|rc| {
+                let map = &mut *rc.borrow_mut();
+                map.remove(&node_ref_wrapper);
+            });
         })
         .getter("dataset", |_rt, realm, id| {
             with_node(id, |node| {
@@ -1557,26 +1614,25 @@ pub mod tests {
     use crate::init_greco_rt;
     use futures::executor::block_on;
     use quickjs_runtime::builder::QuickJsRuntimeBuilder;
+    use std::collections::HashMap;
 
     use quickjs_runtime::jsutils::Script;
     use quickjs_runtime::values::JsValueFacade;
 
     #[test]
     fn test() {
-        /*
-                panic::set_hook(Box::new(|panic_info| {
-                    let backtrace = Backtrace::new();
-                    log::error!(
-                        "thread panic occurred: {}\nbacktrace: {:?}",
-                        panic_info,
-                        backtrace
-                    );
-                }));
-
-                simple_logging::log_to_file("grecort.log", LevelFilter::max())
-                    .ok()
-                    .expect("could not init logger");
-        */
+        std::panic::set_hook(Box::new(|panic_info| {
+            let backtrace = backtrace::Backtrace::new();
+            log::error!(
+                "thread panic occurred: {}\nbacktrace: {:?}",
+                panic_info,
+                backtrace
+            );
+        }));
+
+        simple_logging::log_to_file("grecort.log", log::LevelFilter::max())
+            .ok()
+            .expect("could not init logger");
 
         let rtb = QuickJsRuntimeBuilder::new();
         let rt = init_greco_rt(rtb).build();
@@ -1590,6 +1646,10 @@ pub mod tests {
             let res = "";
             
             let helloNode = doc.getElementById("helloId");
+            let helloNode2 = doc.getElementById("helloId").firstChild.parentElement;
+            
+            console.log("i want true! ", helloNode === helloNode2);
+            
             helloNode.textContent = "hi there";
             
             const svg = doc.createElementNS("http://www.w3.org/2000/svg", "svg");
@@ -1679,5 +1739,17 @@ pub mod tests {
                 }
             }
         }
+
+        let l = crate::modules::htmldom::NODE_VALUE_BY_NODEREF.with(|rc| {
+            let map = &*rc.borrow();
+            map.len()
+        });
+        assert_eq!(l, 0);
+
+        let l = crate::modules::htmldom::NODES.with(|rc| {
+            let map = &*rc.borrow();
+            map.len()
+        });
+        assert_eq!(l, 0);
     }
 }