util: improve text-decoder performance

nodejs · Nov 7, 2022 · 8349faa · 8349faa
1 parent 79e26b5
commit 8349faa
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 17 deletions.
diff --git a/lib/internal/encoding.js b/lib/internal/encoding.js
@@ -411,15 +411,7 @@ function makeTextDecoderICU() {
 
     decode(input = empty, options = kEmptyObject) {
       validateDecoder(this);
-      if (isAnyArrayBuffer(input)) {
-        try {
-          input = lazyBuffer().from(input);
-        } catch {
-          // If the buffer is detached,
-          // use an empty Uint8Array to avoid TypeError
-          input = empty;
-        }
-      } else if (!isArrayBufferView(input)) {
+      if (!isAnyArrayBuffer(input) && !isArrayBufferView(input)) {
         throw new ERR_INVALID_ARG_TYPE('input',
                                        ['ArrayBuffer', 'ArrayBufferView'],
                                        input);

diff --git a/src/node_i18n.cc b/src/node_i18n.cc
@@ -46,6 +46,7 @@
 #if defined(NODE_HAVE_I18N_SUPPORT)
 
 #include "base_object-inl.h"
+#include "crypto/crypto_util.h"
 #include "node.h"
 #include "node_buffer.h"
 #include "node_errors.h"
@@ -440,7 +441,7 @@ void ConverterObject::Decode(const FunctionCallbackInfo<Value>& args) {
 
   ConverterObject* converter;
   ASSIGN_OR_RETURN_UNWRAP(&converter, args[0].As<Object>());
-  ArrayBufferViewContents<char> input(args[1]);
+  crypto::ArrayBufferOrViewContents<char> input(args[1]);
   int flags = args[2]->Uint32Value(env->context()).ToChecked();
 
   UErrorCode status = U_ZERO_ERROR;
@@ -453,12 +454,10 @@ void ConverterObject::Decode(const FunctionCallbackInfo<Value>& args) {
   // characters times the min char size, multiplied by 2 as unicode may
   // take up to 2 UChars to encode a character
   size_t limit = 2 * converter->min_char_size() *
-      (!flush ?
-          input.length() :
-          std::max(
-              input.length(),
-              static_cast<size_t>(
-                  ucnv_toUCountPending(converter->conv(), &status))));
+                 (!flush ? input.size()
+                         : std::max(input.size(),
+                                    static_cast<size_t>(ucnv_toUCountPending(
+                                        converter->conv(), &status))));
   status = U_ZERO_ERROR;
 
   if (limit > 0)
@@ -473,7 +472,7 @@ void ConverterObject::Decode(const FunctionCallbackInfo<Value>& args) {
   });
 
   const char* source = input.data();
-  size_t source_length = input.length();
+  size_t source_length = input.size();
 
   UChar* target = *result;
   ucnv_toUnicode(converter->conv(),