fix(ext/node): fix vm memory usage and context initialization (denola…

…nd#23976)

Fixes denoland#22441
Fixes denoland#23913
Fixes  denoland#23852
Fixes denoland#23917

.github/workflows/ci.generate.ts

@@ -5,7 +5,7 @@ import { stringify } from "jsr:@std/yaml@^0.221/stringify";
 // Bump this number when you want to purge the cache.
 // Note: the tools/release/01_bump_crate_versions.ts script will update this version
 // automatically via regex, so ensure that this line maintains this format.
-const cacheVersion = 95;
+const cacheVersion = 96;
 
 const ubuntuX86Runner = "ubuntu-22.04";
 const ubuntuX86XlRunner = "ubuntu-22.04-xl";
@@ -688,6 +688,16 @@ const ci = {
  ].join("\n"),
  env: { CARGO_PROFILE_DEV_DEBUG: 0 },
  },
+ // Uncomment for remote debugging
+ // {
+ // name: "Setup tmate session",
+ // if: [
+ // "(matrix.job == 'test' || matrix.job == 'bench') &&",
+ // "matrix.profile == 'release' && (matrix.use_sysroot ||",
+ // "github.repository == 'denoland/deno')",
+ // ].join("\n"),
+ // uses: "mxschmitt/action-tmate@v3",
+ // },
  {
  name: "Build release",
  if: [

.github/workflows/ci.yml

@@ -367,8 +367,8 @@ jobs:
  path: |-
  ~/.cargo/registry/index
  ~/.cargo/registry/cache
- key: '95-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
- restore-keys: '95-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
+ key: '96-cargo-home-${{ matrix.os }}-${{ matrix.arch }}-${{ hashFiles(''Cargo.lock'') }}'
+ restore-keys: '96-cargo-home-${{ matrix.os }}-${{ matrix.arch }}'
  if: '!(matrix.skip)'
  - name: Restore cache build output (PR)
  uses: actions/cache/restore@v4
@@ -380,7 +380,7 @@ jobs:
  !./target/*/*.zip
  !./target/*/*.tar.gz
  key: never_saved
- restore-keys: '95-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
+ restore-keys: '96-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-'
  - name: Apply and update mtime cache
  if: '!(matrix.skip) && (!startsWith(github.ref, ''refs/tags/''))'
  uses: ./.github/mtime_cache
@@ -669,7 +669,7 @@ jobs:
  !./target/*/gn_out
  !./target/*/*.zip
  !./target/*/*.tar.gz
- key: '95-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
+ key: '96-cargo-target-${{ matrix.os }}-${{ matrix.arch }}-${{ matrix.profile }}-${{ matrix.job }}-${{ github.sha }}'
  publish-canary:
  name: publish canary
  runs-on: ubuntu-22.04

ext/node/global.rs

@@ -275,7 +275,7 @@ fn current_mode(scope: &mut v8::HandleScope) -> Mode {
  };
  let mut buffer = [MaybeUninit::uninit(); 2048];
  let str = v8_string.to_rust_cow_lossy(scope, &mut buffer);
- if node_resolver.in_npm_package_with_cache(str) {
+ if str.starts_with("node:") || node_resolver.in_npm_package_with_cache(str) {
  Mode::Node
  } else {
  Mode::Deno

ext/node/lib.rs

@@ -35,6 +35,10 @@ mod resolution;
 pub use ops::ipc::ChildPipeFd;
 pub use ops::ipc::IpcJsonStreamResource;
 pub use ops::v8::VM_CONTEXT_INDEX;
+use ops::vm;
+pub use ops::vm::create_v8_context;
+pub use ops::vm::init_global_template;
+pub use ops::vm::ContextInitMode;
 pub use package_json::PackageJson;
 pub use path::PathClean;
 pub use polyfill::is_builtin_node_module;
@@ -641,7 +645,64 @@ deno_core::extension!(deno_node,
  global_template_middleware = global_template_middleware,
  global_object_middleware = global_object_middleware,
  customizer = |ext: &mut deno_core::Extension| {
- let mut external_references = Vec::with_capacity(7);
+ let mut external_references = Vec::with_capacity(14);
+
+ vm::GETTER_MAP_FN.with(|getter| {
+ external_references.push(ExternalReference {
+ named_getter: *getter,
+ });
+ });
+ vm::SETTER_MAP_FN.with(|setter| {
+ external_references.push(ExternalReference {
+ named_setter: *setter,
+ });
+ });
+ vm::DELETER_MAP_FN.with(|deleter| {
+ external_references.push(ExternalReference {
+ named_getter: *deleter,
+ },);
+ });
+ vm::ENUMERATOR_MAP_FN.with(|enumerator| {
+ external_references.push(ExternalReference {
+ enumerator: *enumerator,
+ });
+ });
+ vm::DEFINER_MAP_FN.with(|definer| {
+ external_references.push(ExternalReference {
+ named_definer: *definer,
+ });
+ });
+ vm::DESCRIPTOR_MAP_FN.with(|descriptor| {
+ external_references.push(ExternalReference {
+ named_getter: *descriptor,
+ });
+ });
+
+ vm::INDEXED_GETTER_MAP_FN.with(|getter| {
+ external_references.push(ExternalReference {
+ indexed_getter: *getter,
+ });
+ });
+ vm::INDEXED_SETTER_MAP_FN.with(|setter| {
+ external_references.push(ExternalReference {
+ indexed_setter: *setter,
+ });
+ });
+ vm::INDEXED_DELETER_MAP_FN.with(|deleter| {
+ external_references.push(ExternalReference {
+ indexed_getter: *deleter,
+ });
+ });
+ vm::INDEXED_DEFINER_MAP_FN.with(|definer| {
+ external_references.push(ExternalReference {
+ indexed_definer: *definer,
+ });
+ });
+ vm::INDEXED_DESCRIPTOR_MAP_FN.with(|descriptor| {
+ external_references.push(ExternalReference {
+ indexed_getter: *descriptor,
+ });
+ });
 
  global::GETTER_MAP_FN.with(|getter| {
  external_references.push(ExternalReference {

ext/node/ops/vm.rs

@@ -7,6 +7,23 @@ use deno_core::v8;
 
 use super::vm_internal as i;
 
+pub use i::create_v8_context;
+pub use i::init_global_template;
+pub use i::ContextInitMode;
+
+pub use i::DEFINER_MAP_FN;
+pub use i::DELETER_MAP_FN;
+pub use i::DESCRIPTOR_MAP_FN;
+pub use i::ENUMERATOR_MAP_FN;
+pub use i::GETTER_MAP_FN;
+pub use i::SETTER_MAP_FN;
+
+pub use i::INDEXED_DEFINER_MAP_FN;
+pub use i::INDEXED_DELETER_MAP_FN;
+pub use i::INDEXED_DESCRIPTOR_MAP_FN;
+pub use i::INDEXED_GETTER_MAP_FN;
+pub use i::INDEXED_SETTER_MAP_FN;
+
 pub struct Script {
  inner: i::ContextifyScript,
 }