Home Explore 引导页 在线工具 Blog
Register Sign In
Pchen0
/
electron
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Tree: 9469efb4c9
Branches Tags
electron
/
patches
/
node
/
fix_assert_module_in_the_renderer_process.patch

fix_assert_module_in_the_renderer_process.patch 3.6 KB
History Raw

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081 
  1. From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
    2. 

  2. From: Shelley Vohr <[email protected]>
    3. 

  3. Date: Wed, 16 Aug 2023 19:15:29 +0200
    4. 

  4. Subject: fix: assert module in the renderer process
    5. 

  5. 

  6. When creating a Node.js Environment, embedders have the option to disable Node.js'
    7. 

  7. default overriding of Error.prepareStackTrace. However, the assert module depends on
    8. 

  8. a WeakMap that is populated with the error stacktraces in the overridden function.
    9. 

  9. 

  10. This adds handling to fall back to the default implementation if Error.prepareStackTrace
    11. 

  11. if the override has been disabled.
    12. 

  12. 

  13. This will be upstreamed.
    14. 

  14. 

  15. diff --git a/lib/internal/assert/utils.js b/lib/internal/assert/utils.js
    16. 

  16. index 59b5a16f1309a5e4055bccfdb7a529045ad30402..bfdaf6211466a01b64b7942f7b16c480283278ff 100644
    17. 

  17. --- a/lib/internal/assert/utils.js
    18. 

  18. +++ b/lib/internal/assert/utils.js
    19. 

  19. @@ -25,6 +25,7 @@ const AssertionError = require('internal/assert/assertion_error');
    20. 

  20.  const { openSync, closeSync, readSync } = require('fs');
    21. 

  21.  const { EOL } = require('internal/constants');
    22. 

  22.  const { BuiltinModule } = require('internal/bootstrap/realm');
    23. 

  23. +const { getEmbedderOptions } = require('internal/options');
    24. 

  24.  const { isError } = require('internal/util');
    25. 

  25.  
    26. 

  26.  const errorCache = new SafeMap();
    27. 

  27. @@ -167,8 +168,16 @@ function getErrMessage(message, fn) {
    28. 

  28.    ErrorCaptureStackTrace(err, fn);
    29. 

  29.    if (errorStackTraceLimitIsWritable) Error.stackTraceLimit = tmpLimit;
    30. 

  30.  
    31. 

  31. -  overrideStackTrace.set(err, (_, stack) => stack);
    32. 

  32. -  const call = err.stack[0];
    33. 

  33. +  let call;
    34. 

  34. +  if (getEmbedderOptions().hasPrepareStackTraceCallback) {
    35. 

  35. +    overrideStackTrace.set(err, (_, stack) => stack);
    36. 

  36. +    call = err.stack[0];
    37. 

  37. +  } else {
    38. 

  38. +    const tmpPrepare = Error.prepareStackTrace;
    39. 

  39. +    Error.prepareStackTrace = (_, stack) => stack;
    40. 

  40. +    call = err.stack[0];
    41. 

  41. +    Error.prepareStackTrace = tmpPrepare;
    42. 

  42. +  }
    43. 

  43.  
    44. 

  44.    let filename = call.getFileName();
    45. 

  45.    const line = call.getLineNumber() - 1;
    46. 

  46. diff --git a/src/api/environment.cc b/src/api/environment.cc
    47. 

  47. index b9098d102b40adad7fafcc331ac62870617019b9..cb9269a31e073caf86164aa39c0640370ade60fd 100644
    48. 

  48. --- a/src/api/environment.cc
    49. 

  49. +++ b/src/api/environment.cc
    50. 

  50. @@ -244,6 +244,9 @@ void SetIsolateErrorHandlers(v8::Isolate* isolate, const IsolateSettings& s) {
    51. 

  51.      auto* prepare_stack_trace_cb = s.prepare_stack_trace_callback ?
    52. 

  52.          s.prepare_stack_trace_callback : PrepareStackTraceCallback;
    53. 

  53.      isolate->SetPrepareStackTraceCallback(prepare_stack_trace_cb);
    54. 

  54. +  } else {
    55. 

  55. +    auto env = Environment::GetCurrent(isolate);
    56. 

  56. +    env->set_prepare_stack_trace_callback(Local<Function>());
    57. 

  57.    }
    58. 

  58.  }
    59. 

  59.  
    60. 

  60. diff --git a/src/node_options.cc b/src/node_options.cc
    61. 

  61. index 818baf611fcab7838a339f3ea137467653e270d0..4e3c82e9528b04fd1a0cc99d30fb885e4b224bc9 100644
    62. 

  62. --- a/src/node_options.cc
    63. 

  63. +++ b/src/node_options.cc
    64. 

  64. @@ -1405,14 +1405,16 @@ void GetEmbedderOptions(const FunctionCallbackInfo<Value>& args) {
    65. 

  65.    }
    66. 

  66.    Isolate* isolate = args.GetIsolate();
    67. 

  67.  
    68. 

  68. -  constexpr size_t kOptionsSize = 4;
    69. 

  69. +  constexpr size_t kOptionsSize = 5;
    70. 

  70.    std::array<Local<Name>, kOptionsSize> names = {
    71. 

  71. +      FIXED_ONE_BYTE_STRING(env->isolate(), "hasPrepareStackTraceCallback"),
    72. 

  72.        FIXED_ONE_BYTE_STRING(env->isolate(), "shouldNotRegisterESMLoader"),
    73. 

  73.        FIXED_ONE_BYTE_STRING(env->isolate(), "noGlobalSearchPaths"),
    74. 

  74.        FIXED_ONE_BYTE_STRING(env->isolate(), "noBrowserGlobals"),
    75. 

  75.        FIXED_ONE_BYTE_STRING(env->isolate(), "hasEmbedderPreload")};
    76. 

  76.  
    77. 

  77.    std::array<Local<Value>, kOptionsSize> values = {
    78. 

  78. +      Boolean::New(isolate, env->prepare_stack_trace_callback().IsEmpty()),
    79. 

  79.        Boolean::New(isolate, env->should_not_register_esm_loader()),
    80. 

  80.        Boolean::New(isolate, env->no_global_search_paths()),
    81. 

  81.        Boolean::New(isolate, env->no_browser_globals()),
    82.