add wasmbind feature

bdemann · bdemann · commit c4ecc0d92e70 · 2023-04-14T14:42:18.000-06:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/vm/Cargo.toml b/vm/Cargo.toml
@@ -22,6 +22,8 @@ ast = ["rustpython-ast"]
 codegen = ["rustpython-codegen", "ast"]
 parser = ["rustpython-parser", "ast"]
 serde = ["dep:serde"]
+wasmbind = ["chrono/wasmbind", "getrandom/js"]
+
 
 [dependencies]
 rustpython-compiler = { path = "../compiler", optional = true, version = "0.2.0" }
diff --git a/vm/src/stdlib/time.rs b/vm/src/stdlib/time.rs
@@ -91,15 +91,19 @@ mod time {
 
     #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
     fn _time(_vm: &VirtualMachine) -> PyResult<f64> {
-        // use wasm_bindgen::prelude::*;
-        // #[wasm_bindgen]
-        // extern "C" {
-        //     type Date;
-        //     #[wasm_bindgen(static_method_of = Date)]
-        //     fn now() -> f64;
-        // }
-        // Date.now returns unix time in milliseconds, we want it in seconds
-        Ok(ic_cdk::api::time() as f64 / 1_000_000_000 as f64)
+        #[cfg(feature = "wasmbind")]
+        {
+            use wasm_bindgen::prelude::*;
+            #[wasm_bindgen]
+            extern "C" {
+                type Date;
+                #[wasm_bindgen(static_method_of = Date)]
+                fn now() -> f64;
+            }
+            // Date.now returns unix time in milliseconds, we want it in seconds
+            return Ok(Date::now() / 1000.0);
+        }
+        panic!{"No date available"}
     }
 
     #[pyfunction]
diff --git a/vm/src/vm/vm_object.rs b/vm/src/vm/vm_object.rs
@@ -26,15 +26,18 @@ impl VirtualMachine {
         }
         #[cfg(all(target_arch = "wasm32", not(target_os = "wasi")))]
         {
-            // use wasm_bindgen::prelude::*;
-            // #[wasm_bindgen]
-            // extern "C" {
-            //     #[wasm_bindgen(js_namespace = console)]
-            //     fn error(s: &str);
-            // }
-            // let mut s = String::new();
-            // self.write_exception(&mut s, &exc).unwrap();
-            // error(&s);
+            #[cfg(feature = "wasmbind")]
+            {
+                use wasm_bindgen::prelude::*;
+                #[wasm_bindgen]
+                extern "C" {
+                    #[wasm_bindgen(js_namespace = console)]
+                    fn error(s: &str);
+                }
+                let mut s = String::new();
+                self.write_exception(&mut s, &exc).unwrap();
+                error(&s);
+            }
             panic!("{}; exception backtrace above", msg)
         }
     }
