feat: Event 体系内核接线九 P 字段加 BuiltinId 加脏位加 ProtoKind

2026-10-24 18:51:13 +08:00 · 2026-10-10 08:02:05 +00:00
parent ab16e9ce79
commit 9ecd573526
11 changed files with 224 additions and 28 deletions
@@ -514,6 +514,20 @@ impl BuiltinWorld {
        let broadcast_channel_proto = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
        let broadcast_channel_constructor = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));

+        // Event 体系九个内核接线占位（空对象）：Event / MessageEvent /
+        // ErrorEvent / CustomEvent 四枚原型与构造器对加 EventTarget 原型，
+        // 真实本体与原型链连线由绑定层后续任务填充，本处只预留槽位使快照/
+        // 脏检查/收尾枚举覆盖到这九枚 P 字段。
+        let event_proto = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let event_constructor = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let message_event_proto = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let message_event_constructor = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let error_event_proto = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let error_event_constructor = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let custom_event_proto = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let custom_event_constructor = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+        let event_target_proto = P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null()));
+
        let (date_proto, date_constructor) = make_named_pair(string_forge, shape_forge, labels, "Date");
        let (set_proto, set_constructor) = make_named_pair(string_forge, shape_forge, labels, "Set");
        let (map_proto, map_constructor) = make_named_pair(string_forge, shape_forge, labels, "Map");
@@ -665,6 +679,15 @@ impl BuiltinWorld {
            message_channel_constructor,
            broadcast_channel_proto,
            broadcast_channel_constructor,
+            event_proto,
+            event_constructor,
+            message_event_proto,
+            message_event_constructor,
+            error_event_proto,
+            error_event_constructor,
+            custom_event_proto,
+            custom_event_constructor,
+            event_target_proto,
            leaked_objects: std::cell::RefCell::new(Vec::new()),
        };
        wire_builtin_world_links(&world);
@@ -418,6 +418,43 @@ impl BuiltinWorld {
            (current.broadcast_channel_proto.clone(), current.broadcast_channel_constructor.clone())
        };

+        // Event 体系九个占位：脏则换新空对象（与全量构造同形），未脏沿用旧指针。
+        let (
+            event_proto,
+            event_constructor,
+            message_event_proto,
+            message_event_constructor,
+            error_event_proto,
+            error_event_constructor,
+            custom_event_proto,
+            custom_event_constructor,
+            event_target_proto,
+        ) = if dirty.event {
+            (
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+                P::new(JsObject::new_empty(EMPTY_SHAPE_ID, JsValue::null())),
+            )
+        } else {
+            (
+                current.event_proto.clone(),
+                current.event_constructor.clone(),
+                current.message_event_proto.clone(),
+                current.message_event_constructor.clone(),
+                current.error_event_proto.clone(),
+                current.error_event_constructor.clone(),
+                current.custom_event_proto.clone(),
+                current.custom_event_constructor.clone(),
+                current.event_target_proto.clone(),
+            )
+        };
+
        // 迭代器原型与资源栈原型依赖 Object.prototype（链到其上）：object 家族重建时
        // 一并重建，否则旧原型链指向已释放的 object_proto。
        let (
@@ -572,6 +609,15 @@ impl BuiltinWorld {
            message_channel_constructor,
            broadcast_channel_proto,
            broadcast_channel_constructor,
+            event_proto,
+            event_constructor,
+            message_event_proto,
+            message_event_constructor,
+            error_event_proto,
+            error_event_constructor,
+            custom_event_proto,
+            custom_event_constructor,
+            event_target_proto,
            leaked_objects: std::cell::RefCell::new(Vec::new()),
        };
        wire_builtin_world_links(&world);
@@ -1,5 +1,5 @@
-//! 注册表职责：BuiltinWorld 结构（99 固定 P 字段 + stub 族 + Box::into_raw
-//! 登记表）、get_by_id 派发、all_p_fields 99 元组枚举（新增 P 字段四处同步
+//! 注册表职责：BuiltinWorld 结构（108 固定 P 字段 + stub 族 + Box::into_raw
+//! 登记表）、get_by_id 派发、all_p_fields 108 元组枚举（新增 P 字段四处同步
 //! 约束载体）与登记表 track/find/inherit/teardown。

 use oxide_types::mem::P;
@@ -150,6 +150,33 @@ pub struct BuiltinWorld {
    /// `BroadcastChannel` 构造器槽位：纯内核接线占位（空对象），真实构造器
    /// 本体由绑定层后续任务填充。
    pub broadcast_channel_constructor: P<JsObject>,
+    /// `Event.prototype` 槽位：纯内核接线占位（空对象），真实原型本体
+    /// 与构造器对由绑定层后续任务填充；脏家族位为 `event`。
+    pub event_proto: P<JsObject>,
+    /// `Event` 构造器槽位：纯内核接线占位（空对象），真实构造器本体由
+    /// 绑定层后续任务填充。
+    pub event_constructor: P<JsObject>,
+    /// `MessageEvent.prototype` 槽位：纯内核接线占位（空对象），真实原型
+    /// 本体与构造器对由绑定层后续任务填充。
+    pub message_event_proto: P<JsObject>,
+    /// `MessageEvent` 构造器槽位：纯内核接线占位（空对象），真实构造器
+    /// 本体由绑定层后续任务填充。
+    pub message_event_constructor: P<JsObject>,
+    /// `ErrorEvent.prototype` 槽位：纯内核接线占位（空对象），真实原型
+    /// 本体与构造器对由绑定层后续任务填充。
+    pub error_event_proto: P<JsObject>,
+    /// `ErrorEvent` 构造器槽位：纯内核接线占位（空对象），真实构造器
+    /// 本体由绑定层后续任务填充。
+    pub error_event_constructor: P<JsObject>,
+    /// `CustomEvent.prototype` 槽位：纯内核接线占位（空对象），真实原型
+    /// 本体与构造器对由绑定层后续任务填充。
+    pub custom_event_proto: P<JsObject>,
+    /// `CustomEvent` 构造器槽位：纯内核接线占位（空对象），真实构造器
+    /// 本体由绑定层后续任务填充。
+    pub custom_event_constructor: P<JsObject>,
+    /// `EventTarget.prototype` 槽位：纯内核接线占位（空对象），真实原型
+    /// 本体由绑定层后续任务填充（EventTarget 无构造器，仅暴露原型）。
+    pub event_target_proto: P<JsObject>,
    /// 释放登记表（`Box::into_raw` 对象的清单，session 收尾统一释放，非内存泄漏）：
    /// 绑定层经 `Box::into_raw` 持有的函数/宿主对象（方法 wrapper、访问器、
    /// 错误构造器、Reflect/Iterator、内建原型构造器、`$262` 宿主等）。
@@ -380,7 +407,7 @@ impl BuiltinWorld {
    /// session 收尾（`teardown_heap_data`）与选择性重建收尾（`retire_replaced`）
    /// 的 P 字段枚举唯一入口：`BuiltinWorld` 新增 P 字段须在此同步补一行，否则
    /// 收尾时该字段属性区无法释放、重建原型槽改写/释放漏掉该字段。
-    pub(crate) fn all_p_fields(&self) -> [&P<JsObject>; 99] {
+    pub(crate) fn all_p_fields(&self) -> [&P<JsObject>; 108] {
        [
            &self.object_proto,
            &self.array_proto,
@@ -481,6 +508,15 @@ impl BuiltinWorld {
            &self.message_channel_constructor,
            &self.broadcast_channel_proto,
            &self.broadcast_channel_constructor,
+            &self.event_proto,
+            &self.event_constructor,
+            &self.message_event_proto,
+            &self.message_event_constructor,
+            &self.error_event_proto,
+            &self.error_event_constructor,
+            &self.custom_event_proto,
+            &self.custom_event_constructor,
+            &self.event_target_proto,
        ]
    }

@@ -618,6 +654,15 @@ impl BuiltinWorld {
            BuiltinId::MessageChannelCtor => &self.message_channel_constructor,
            BuiltinId::BroadcastChannelProto => &self.broadcast_channel_proto,
            BuiltinId::BroadcastChannelCtor => &self.broadcast_channel_constructor,
+            BuiltinId::EventProto => &self.event_proto,
+            BuiltinId::EventCtor => &self.event_constructor,
+            BuiltinId::MessageEventProto => &self.message_event_proto,
+            BuiltinId::MessageEventCtor => &self.message_event_constructor,
+            BuiltinId::ErrorEventProto => &self.error_event_proto,
+            BuiltinId::ErrorEventCtor => &self.error_event_constructor,
+            BuiltinId::CustomEventProto => &self.custom_event_proto,
+            BuiltinId::CustomEventCtor => &self.custom_event_constructor,
+            BuiltinId::EventTargetProto => &self.event_target_proto,
        }
    }
 }
@@ -1,4 +1,4 @@
-//! 内置对象 id 枚举（`BuiltinId` 89 变体 + `ALL` 顺序钉表）、世代快照
+//! 内置对象 id 枚举（`BuiltinId` 98 变体 + `ALL` 顺序钉表）、世代快照
 //! （`BuiltinSnapshot`）与按家族划分的脏标记位集（`BuiltinDirtySet`）；
 //! `NUM_BUILTINS` 文档承载"新增 BuiltinWorld 字段须同步"四处约束注记。

@@ -11,7 +11,7 @@ use crate::builtin::BuiltinWorld;
 /// 维护注意：每个新增的 `BuiltinWorld` 对象字段都必须加到这里以及
 /// `KernelSession::dirty_since_snapshot()`，以便选择性重置重建正确的
 /// builtin 家族。
-pub const NUM_BUILTINS: usize = 89;
+pub const NUM_BUILTINS: usize = 98;

 /// 内置对象枚举 id，与 `BuiltinWorld` 中的存储槽一一对应。
 ///
@@ -109,6 +109,15 @@ pub enum BuiltinId {
    MessageChannelCtor = 86,
    BroadcastChannelProto = 87,
    BroadcastChannelCtor = 88,
+    EventProto = 89,
+    EventCtor = 90,
+    MessageEventProto = 91,
+    MessageEventCtor = 92,
+    ErrorEventProto = 93,
+    ErrorEventCtor = 94,
+    CustomEventProto = 95,
+    CustomEventCtor = 96,
+    EventTargetProto = 97,
 }

 impl BuiltinId {
@@ -205,6 +214,15 @@ impl BuiltinId {
        BuiltinId::MessageChannelCtor,
        BuiltinId::BroadcastChannelProto,
        BuiltinId::BroadcastChannelCtor,
+        BuiltinId::EventProto,
+        BuiltinId::EventCtor,
+        BuiltinId::MessageEventProto,
+        BuiltinId::MessageEventCtor,
+        BuiltinId::ErrorEventProto,
+        BuiltinId::ErrorEventCtor,
+        BuiltinId::CustomEventProto,
+        BuiltinId::CustomEventCtor,
+        BuiltinId::EventTargetProto,
    ];
 }

@@ -282,6 +300,7 @@ pub struct BuiltinDirtySet {
    pub console: bool,
    pub message_channel: bool,
    pub broadcast_channel: bool,
+    pub event: bool,
 }

 impl BuiltinDirtySet {
@@ -317,6 +336,7 @@ impl BuiltinDirtySet {
            console: true,
            message_channel: true,
            broadcast_channel: true,
+            event: true,
        }
    }

@@ -346,6 +366,7 @@ impl BuiltinDirtySet {
            || self.console
            || self.message_channel
            || self.broadcast_channel
+            || self.event
    }

    /// 是否存在任何污染（builtin world 或 global object）。
@@ -358,13 +379,13 @@ impl BuiltinDirtySet {
 mod tests {
    use super::*;

-    /// 槽对齐面：ALL 表与判别值 0..88 严格同序，快照数组随 NUM_BUILTINS
+    /// 槽对齐面：ALL 表与判别值 0..97 严格同序，快照数组随 NUM_BUILTINS
    /// 自动扩维、逐槽对齐。
    #[test]
    fn builtin_snapshot_all_slots_aligned() {
-        assert_eq!(NUM_BUILTINS, 89);
+        assert_eq!(NUM_BUILTINS, 98);
        assert_eq!(BuiltinId::ALL.len(), NUM_BUILTINS);
-        for i in 0..88usize {
+        for i in 0..97usize {
            assert_eq!(BuiltinId::ALL[i] as usize, i);
        }
        assert_eq!(BuiltinId::ALL[81], BuiltinId::SharedArrayBufferProto);
@@ -375,6 +396,15 @@ mod tests {
        assert_eq!(BuiltinId::ALL[86], BuiltinId::MessageChannelCtor);
        assert_eq!(BuiltinId::ALL[87], BuiltinId::BroadcastChannelProto);
        assert_eq!(BuiltinId::ALL[88], BuiltinId::BroadcastChannelCtor);
+        assert_eq!(BuiltinId::ALL[89], BuiltinId::EventProto);
+        assert_eq!(BuiltinId::ALL[90], BuiltinId::EventCtor);
+        assert_eq!(BuiltinId::ALL[91], BuiltinId::MessageEventProto);
+        assert_eq!(BuiltinId::ALL[92], BuiltinId::MessageEventCtor);
+        assert_eq!(BuiltinId::ALL[93], BuiltinId::ErrorEventProto);
+        assert_eq!(BuiltinId::ALL[94], BuiltinId::ErrorEventCtor);
+        assert_eq!(BuiltinId::ALL[95], BuiltinId::CustomEventProto);
+        assert_eq!(BuiltinId::ALL[96], BuiltinId::CustomEventCtor);
+        assert_eq!(BuiltinId::ALL[97], BuiltinId::EventTargetProto);

        // 快照经 session 全量构造路径采集，generations 数组维度 = 槽数。
        use crate::kernel::{KernelConfig, KernelCore, KernelSession};
@@ -200,6 +200,15 @@ impl KernelSession {
                || gen(BuiltinId::MessageChannelCtor) != snap(BuiltinId::MessageChannelCtor),
            broadcast_channel: gen(BuiltinId::BroadcastChannelProto) != snap(BuiltinId::BroadcastChannelProto)
                || gen(BuiltinId::BroadcastChannelCtor) != snap(BuiltinId::BroadcastChannelCtor),
+            event: gen(BuiltinId::EventProto) != snap(BuiltinId::EventProto)
+                || gen(BuiltinId::EventCtor) != snap(BuiltinId::EventCtor)
+                || gen(BuiltinId::MessageEventProto) != snap(BuiltinId::MessageEventProto)
+                || gen(BuiltinId::MessageEventCtor) != snap(BuiltinId::MessageEventCtor)
+                || gen(BuiltinId::ErrorEventProto) != snap(BuiltinId::ErrorEventProto)
+                || gen(BuiltinId::ErrorEventCtor) != snap(BuiltinId::ErrorEventCtor)
+                || gen(BuiltinId::CustomEventProto) != snap(BuiltinId::CustomEventProto)
+                || gen(BuiltinId::CustomEventCtor) != snap(BuiltinId::CustomEventCtor)
+                || gen(BuiltinId::EventTargetProto) != snap(BuiltinId::EventTargetProto),
        };
        // wrapper 本体被写不落在任何家族位上（写的是 wrapper 自身而非所属 P
        // 对象）：收缩为全脏，强制重建全部家族与 global，使被写的可复用