feat(perf_hooks): Improve performance interface compatibility (#1256)

Author: nabetti1720

Cargo.lock

@@ -12,6 +12,7 @@ name = "llrt_perf_hooks"
 path = "src/lib.rs"
 
 [dependencies]
+llrt_events = { version = "0.7.0-beta", path = "../llrt_events" }
 llrt_utils = { version = "0.7.0-beta", path = "../../libs/llrt_utils", default-features = false }
 rquickjs = { git = "https://github.com/DelSkayn/rquickjs.git", version = "0.10.0", default-features = false }
 

modules/llrt_perf_hooks/Cargo.toml

@@ -1,59 +1,15 @@
 // Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
 // SPDX-License-Identifier: Apache-2.0
-use llrt_utils::{
-    module::{export_default, ModuleInfo},
-    time,
-};
+use llrt_events::Emitter;
+use llrt_utils::module::{export_default, ModuleInfo};
 use rquickjs::{
-    atom::PredefinedAtom,
     module::{Declarations, Exports, ModuleDef},
-    prelude::Func,
-    Ctx, JsLifetime, Object, Result,
+    Class, Ctx, Object, Result,
 };
 
-fn get_time_origin() -> f64 {
-    let time_origin = time::origin_nanos() as f64;
-
-    time_origin / 1e6
-}
-
-fn now() -> f64 {
-    let now = time::now_nanos();
-    let started = time::origin_nanos();
-    let elapsed = now.checked_sub(started).unwrap_or_default();
-
-    (elapsed as f64) / 1e6
-}
-
-fn to_json(ctx: Ctx<'_>) -> Result<Object<'_>> {
-    let obj = Object::new(ctx.clone())?;
-
-    obj.set("timeOrigin", get_time_origin())?;
-
-    Ok(obj)
-}
+use crate::performance::Performance;
 
-struct PerfInitedUserData;
-
-unsafe impl JsLifetime<'_> for PerfInitedUserData {
-    type Changed<'to> = PerfInitedUserData;
-}
-
-fn new_performance(ctx: Ctx<'_>) -> Result<Object<'_>> {
-    let global = ctx.globals();
-
-    let inited = ctx.userdata::<PerfInitedUserData>().is_some();
-    if !inited {
-        ctx.store_userdata(PerfInitedUserData)?;
-        let performance = Object::new(ctx)?;
-        performance.set("timeOrigin", get_time_origin())?;
-        performance.set("now", Func::from(now))?;
-        performance.set(PredefinedAtom::ToJSON, Func::from(to_json))?;
-        global.set("performance", performance.clone())?;
-        return Ok(performance);
-    }
-    global.get("performance")
-}
+mod performance;
 
 pub struct PerfHooksModule;
 
@@ -66,8 +22,11 @@ impl ModuleDef for PerfHooksModule {
 
     fn evaluate<'js>(ctx: &Ctx<'js>, exports: &Exports<'js>) -> Result<()> {
         export_default(ctx, exports, |default| {
-            let performance = new_performance(ctx.clone())?;
+            let globals = ctx.globals();
+
+            let performance: Object = globals.get("performance")?;
             default.set("performance", performance)?;
+
             Ok(())
         })
     }
@@ -83,7 +42,12 @@ impl From<PerfHooksModule> for ModuleInfo<PerfHooksModule> {
 }
 
 pub fn init(ctx: &Ctx<'_>) -> Result<()> {
-    new_performance(ctx.clone())?;
+    let globals = ctx.globals();
+
+    let instance = Class::instance(ctx.clone(), Performance::new())?;
+    Performance::add_event_target_prototype(ctx)?;
+
+    globals.set("performance", instance)?;
     Ok(())
 }
 

modules/llrt_perf_hooks/src/lib.rs

@@ -0,0 +1,73 @@
+// Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+// SPDX-License-Identifier: Apache-2.0
+use std::sync::{Arc, RwLock};
+
+use llrt_events::{Emitter, EventList, Events};
+use llrt_utils::time;
+use rquickjs::{
+    atom::PredefinedAtom,
+    class::{Trace, Tracer},
+    Ctx, JsLifetime, Object, Result,
+};
+
+#[rquickjs::class]
+#[derive(Clone)]
+pub struct Performance<'js> {
+    pub events: Events<'js>,
+}
+
+unsafe impl<'js> JsLifetime<'js> for Performance<'js> {
+    type Changed<'to> = Performance<'to>;
+}
+
+impl<'js> Emitter<'js> for Performance<'js> {
+    fn get_event_list(&self) -> Arc<RwLock<EventList<'js>>> {
+        self.events.clone()
+    }
+}
+
+impl<'js> Trace<'js> for Performance<'js> {
+    fn trace<'a>(&self, tracer: Tracer<'a, 'js>) {
+        self.trace_event_emitter(tracer);
+    }
+}
+
+impl<'js> Default for Performance<'js> {
+    fn default() -> Self {
+        Self::new()
+    }
+}
+
+#[rquickjs::methods(rename_all = "camelCase")]
+impl<'js> Performance<'js> {
+    #[qjs(constructor)]
+    pub fn new() -> Self {
+        Self {
+            #[allow(clippy::arc_with_non_send_sync)]
+            events: Arc::new(RwLock::new(Vec::new())),
+        }
+    }
+
+    #[qjs(get)]
+    fn time_origin() -> f64 {
+        let time_origin = time::origin_nanos() as f64;
+
+        time_origin / 1e6
+    }
+
+    fn now() -> f64 {
+        let now = time::now_nanos();
+        let started = time::origin_nanos();
+        let elapsed = now.checked_sub(started).unwrap_or_default();
+
+        (elapsed as f64) / 1e6
+    }
+
+    #[qjs(rename = PredefinedAtom::ToJSON)]
+    fn to_json(ctx: Ctx<'_>) -> Result<Object<'_>> {
+        let obj = Object::new(ctx.clone())?;
+        obj.set("timeOrigin", Self::time_origin())?;
+
+        Ok(obj)
+    }
+}

modules/llrt_perf_hooks/src/performance.rs

@@ -265,11 +265,6 @@ fetch/api/response > should pass response-stream-with-broken-then.any.js tests
 Error: [Attempt to inject {done: false, value: bye} via Object.prototype.then.] assert_equals: The value should be "hello". expected "hello" but got "[object Object]"
 
 
-🧪/wpt/hr-time.test.js 
-hr-time > should pass basic.any.js tests
-Error: [Performance interface extends EventTarget.] not a function
-
-
 🧪/wpt/streams.readable-byte-streams.test.js 
 streams/readable-byte-streams > should pass patched-global.any.js tests
 Error: [Patched then() sees byobRequest after filling all pending pull-into descriptors] Error borrowing class: can't borrow a value as it is already borrowed