fix: use object_id for repl internal

CyanChanges · CyanChanges · commit 5a4f9a5764bd · 2025-05-05T16:28:18.000+08:00
diff --git a/cli/tools/jupyter/server.rs b/cli/tools/jupyter/server.rs
@@ -36,7 +36,6 @@ use uuid::Uuid;
 
 use super::JupyterReplProxy;
 use crate::cdp;
-use crate::tools::repl;
 
 pub struct JupyterServer {
   execution_count: ExecutionCount,
@@ -322,11 +321,7 @@ impl JupyterServer {
             )
             .await
             .into_iter()
-            .filter(|n| {
-              !n.starts_with("Symbol(")
-                && n.starts_with(prop_name)
-                && n != &*repl::REPL_INTERNALS_NAME
-            })
+            .filter(|n| !n.starts_with("Symbol(") && n.starts_with(prop_name))
             .collect();
 
             if prop_name.len() > cursor_pos {
@@ -347,7 +342,7 @@ impl JupyterServer {
               get_global_lexical_scope_names(&mut self.repl_session_proxy)
                 .await,
             )
-            .filter(|n| n.starts_with(expr) && n != &*repl::REPL_INTERNALS_NAME)
+            .filter(|n| n.starts_with(expr))
             .collect::<Vec<_>>();
 
             // sort and remove duplicates
diff --git a/cli/tools/repl/editor.rs b/cli/tools/repl/editor.rs
@@ -38,7 +38,6 @@ use rustyline_derive::Helper;
 use rustyline_derive::Hinter;
 
 use super::channel::RustylineSyncMessageSender;
-use super::session::REPL_INTERNALS_NAME;
 use crate::cdp;
 use crate::colors;
 
@@ -209,11 +208,7 @@ impl Completer for EditorHelper {
       let candidates = self
         .get_expression_property_names(sub_expr)
         .into_iter()
-        .filter(|n| {
-          !n.starts_with("Symbol(")
-            && n.starts_with(prop_name)
-            && n != &*REPL_INTERNALS_NAME
-        })
+        .filter(|n| !n.starts_with("Symbol(") && n.starts_with(prop_name))
         .collect();
 
       Ok((pos - prop_name.len(), candidates))
@@ -223,7 +218,7 @@ impl Completer for EditorHelper {
         .get_expression_property_names("globalThis")
         .into_iter()
         .chain(self.get_global_lexical_scope_names())
-        .filter(|n| n.starts_with(expr) && n != &*REPL_INTERNALS_NAME)
+        .filter(|n| n.starts_with(expr))
         .collect::<Vec<_>>();
 
       // sort and remove duplicates
diff --git a/cli/tools/repl/mod.rs b/cli/tools/repl/mod.rs
@@ -35,7 +35,6 @@ use editor::ReplEditor;
 pub use session::EvaluationOutput;
 pub use session::ReplSession;
 pub use session::TsEvaluateResponse;
-pub use session::REPL_INTERNALS_NAME;
 
 use super::test::create_single_test_event_channel;
 
diff --git a/cli/tools/repl/session.rs b/cli/tools/repl/session.rs
@@ -1,5 +1,6 @@
 // Copyright 2018-2025 the Deno authors. MIT license.
 
+use std::cell::RefCell;
 use std::sync::Arc;
 
 use deno_ast::diagnostics::Diagnostic;
@@ -45,6 +46,7 @@ use tokio::sync::Mutex;
 use crate::args::deno_json::TsConfigResolver;
 use crate::args::CliOptions;
 use crate::cdp;
+use crate::cdp::RemoteObjectId;
 use crate::colors;
 use crate::lsp::ReplLanguageServer;
 use crate::npm::installer::NpmInstaller;
@@ -82,67 +84,59 @@ fn comment_source_to_position_range(
   }
 }
 
-/// We store functions used in the repl on this object because
-/// the user might modify the `Deno` global or delete it outright.
-pub static REPL_INTERNALS_NAME: Lazy<String> = Lazy::new(|| {
-  let now = std::time::SystemTime::now();
-  let seconds = now
-    .duration_since(std::time::SystemTime::UNIX_EPOCH)
-    .unwrap()
-    .as_secs();
-  // use a changing variable name to make it hard to depend on this
-  format!("__DENO_REPL_INTERNALS_{seconds}__")
-});
-
+thread_local! {
+  /// We store functions used in the repl on this object because
+  /// the user might modify the `Deno` global or delete it outright.
+  pub static REPL_INTERNAL_OBJECT_ID: RefCell<Option<RemoteObjectId>> = const { RefCell::new(None) };
+}
 fn get_prelude() -> String {
-  format!(
-    r#"
-Object.defineProperty(globalThis, "{0}", {{
-  enumerable: false,
-  writable: false,
-  value: {{
+  r#"
+const repl_internal = {
     lastEvalResult: undefined,
     lastThrownError: undefined,
     inspectArgs: Deno[Deno.internal].inspectArgs,
     noColor: Deno.noColor,
-    get closed() {{
-      return typeof globalThis.closed === 'undefined' ? false : globalThis.closed;
-    }}
-  }},
-}});
-Object.defineProperty(globalThis, "_", {{
+    get closed() {
+      try {
+        return typeof globalThis.closed === 'undefined' ? false : globalThis.closed;
+      } catch {
+        return false;
+      }
+    }
+  }
+Object.defineProperty(globalThis, "_", {
   configurable: true,
-  get: () => {0}.lastEvalResult,
-  set: (value) => {{
-   Object.defineProperty(globalThis, "_", {{
+  get: () => repl_internal.lastEvalResult,
+  set: (value) => {
+   Object.defineProperty(globalThis, "_", {
      value: value,
      writable: true,
      enumerable: true,
      configurable: true,
-   }});
+   });
    console.log("Last evaluation result is no longer saved to _.");
-  }},
-}});
+  },
+});
 
-Object.defineProperty(globalThis, "_error", {{
+Object.defineProperty(globalThis, "_error", {
   configurable: true,
-  get: () => {0}.lastThrownError,
-  set: (value) => {{
-   Object.defineProperty(globalThis, "_error", {{
+  get: () => repl_internal.lastThrownError,
+  set: (value) => {
+   Object.defineProperty(globalThis, "_error", {
      value: value,
      writable: true,
      enumerable: true,
      configurable: true,
-   }});
+   });
 
    console.log("Last thrown error is no longer saved to _error.");
-  }},
-}});
+  },
+});
 
 globalThis.clear = console.clear.bind(console);
-"#,
-    *REPL_INTERNALS_NAME
-  )
+
+repl_internal
+"#.to_string()
 }
 
 pub enum EvaluationOutput {
@@ -299,7 +293,8 @@ impl ReplSession {
     };
 
     // inject prelude
-    repl_session.evaluate_expression(&get_prelude()).await?;
+    let evaluated = repl_session.evaluate_expression(&get_prelude()).await?;
+    REPL_INTERNAL_OBJECT_ID.replace(evaluated.result.object_id);
 
     Ok(repl_session)
   }
@@ -312,8 +307,13 @@ impl ReplSession {
   }
 
   pub async fn closing(&mut self) -> Result<bool, AnyError> {
-    let expression = format!(r#"{}.closed"#, *REPL_INTERNALS_NAME);
-    let result = self.evaluate_expression(&expression).await?.result;
+    let result = self
+      .call_function_on_args_internal(
+        r#"function () { return this.closed; }"#.to_string(),
+        &[],
+      )
+      .await?
+      .result;
     let closed = result
       .value
       .ok_or_else(|| anyhow!(result.description.unwrap()))?
@@ -500,18 +500,18 @@ impl ReplSession {
       .post_message_with_event_loop(
         "Runtime.callFunctionOn",
         Some(cdp::CallFunctionOnArgs {
-          function_declaration: format!(
-            r#"function (object) {{ {}.lastThrownError = object; }}"#,
-            *REPL_INTERNALS_NAME
-          ),
-          object_id: None,
+          function_declaration:
+            r#"function (object) { this.lastThrownError = object; }"#
+              .to_string(),
+          object_id: REPL_INTERNAL_OBJECT_ID.with_borrow(Clone::clone),
           arguments: Some(vec![error.into()]),
           silent: None,
           return_by_value: None,
           generate_preview: None,
           user_gesture: None,
           await_promise: None,
-          execution_context_id: Some(self.context_id),
+          // execution_context_id: Some(self.context_id),
+          execution_context_id: None,
           object_group: None,
           throw_on_side_effect: None,
         }),
@@ -528,18 +528,16 @@ impl ReplSession {
       .post_message_with_event_loop(
         "Runtime.callFunctionOn",
         Some(cdp::CallFunctionOnArgs {
-          function_declaration: format!(
-            r#"function (object) {{ {}.lastEvalResult = object; }}"#,
-            *REPL_INTERNALS_NAME
-          ),
-          object_id: None,
+          function_declaration: r#"function (object) { this.lastEvalResult = object; }"#.to_string(),
+          object_id: REPL_INTERNAL_OBJECT_ID.with_borrow(Clone::clone),
           arguments: Some(vec![evaluate_result.into()]),
           silent: None,
           return_by_value: None,
           generate_preview: None,
           user_gesture: None,
           await_promise: None,
-          execution_context_id: Some(self.context_id),
+          // execution_context_id: Some(self.context_id),
+          execution_context_id: None,
           object_group: None,
           throw_on_side_effect: None,
         }),
@@ -583,6 +581,41 @@ impl ReplSession {
     Ok(response)
   }
 
+  pub async fn call_function_on_args_internal(
+    &mut self,
+    function_declaration: String,
+    args: &[cdp::RemoteObject],
+  ) -> Result<cdp::CallFunctionOnResponse, AnyError> {
+    let arguments: Option<Vec<cdp::CallArgument>> = if args.is_empty() {
+      None
+    } else {
+      Some(args.iter().map(|a| a.into()).collect())
+    };
+
+    let inspect_response = self
+      .post_message_with_event_loop(
+        "Runtime.callFunctionOn",
+        Some(cdp::CallFunctionOnArgs {
+          function_declaration,
+          object_id: REPL_INTERNAL_OBJECT_ID.with_borrow(Clone::clone),
+          arguments,
+          silent: None,
+          return_by_value: None,
+          generate_preview: None,
+          user_gesture: None,
+          await_promise: None,
+          execution_context_id: None,
+          object_group: None,
+          throw_on_side_effect: None,
+        }),
+      )
+      .await?;
+
+    let response: cdp::CallFunctionOnResponse =
+      serde_json::from_value(inspect_response)?;
+    Ok(response)
+  }
+
   pub async fn get_eval_value(
     &mut self,
     evaluate_result: &cdp::RemoteObject,
@@ -591,21 +624,22 @@ impl ReplSession {
     // consistent with the previous implementation we just get the preview result from
     // Deno.inspectArgs.
     let response = self
-      .call_function_on_args(
-        format!(
-          r#"function (object) {{
-          try {{
-            return {0}.inspectArgs(["%o", object], {{ colors: !{0}.noColor }});
-          }} catch (err) {{
-            return {0}.inspectArgs(["%o", err]);
-          }}
-        }}"#,
-          *REPL_INTERNALS_NAME
-        ),
+      .call_function_on_args_internal(
+        r#"function (object) {
+          try {
+            return this.inspectArgs(["%o", object], { colors: !this.noColor });
+          } catch (err) {
+            return this.inspectArgs(["%o", err]);
+          }
+        }"#
+          .to_string(),
         &[evaluate_result.clone()],
       )
       .await?;
-    let value = response.result.value.unwrap();
+    let value = response
+      .result
+      .value
+      .ok_or_else(|| anyhow!("failed to evaluate expression"))?;
     let s = value.as_str().unwrap();
 
     Ok(s.to_string())
