http2: refactor to use more primordials

PR-URL: #36142 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Stephen Belanger <[email protected]> Reviewed-By: Ricky Zhou <[email protected]> Reviewed-By: Rich Trott <[email protected]>
nodejs · Nov 20, 2020 · 514f464 · 514f464
1 parent 700612f
commit 514f464
Show file tree

Hide file tree

Showing 3 changed files with 103 additions and 66 deletions.
diff --git a/lib/internal/http2/compat.js b/lib/internal/http2/compat.js
@@ -2,12 +2,17 @@
 
 const {
   ArrayIsArray,
+  ArrayPrototypePush,
   Boolean,
+  FunctionPrototypeBind,
   ObjectAssign,
   ObjectCreate,
   ObjectKeys,
   ObjectPrototypeHasOwnProperty,
+  ReflectApply,
   ReflectGetPrototypeOf,
+  StringPrototypeToLowerCase,
+  StringPrototypeTrim,
   Symbol,
 } = primordials;
 
@@ -138,7 +143,7 @@ function onStreamTrailers(trailers, flags, rawTrailers) {
   const request = this[kRequest];
   if (request !== undefined) {
     ObjectAssign(request[kTrailers], trailers);
-    request[kRawTrailers].push(...rawTrailers);
+    ArrayPrototypePush(request[kRawTrailers], ...rawTrailers);
   }
 }
 
@@ -200,7 +205,7 @@ const proxySocketHandler = {
       case 'end':
       case 'emit':
       case 'destroy':
-        return stream[prop].bind(stream);
+        return FunctionPrototypeBind(stream[prop], stream);
       case 'writable':
       case 'destroyed':
         return stream[prop];
@@ -212,8 +217,8 @@ const proxySocketHandler = {
       case 'setTimeout':
         const session = stream.session;
         if (session !== undefined)
-          return session.setTimeout.bind(session);
-        return stream.setTimeout.bind(stream);
+          return FunctionPrototypeBind(session.setTimeout, session);
+        return FunctionPrototypeBind(stream.setTimeout, stream);
       case 'write':
       case 'read':
       case 'pause':
@@ -223,7 +228,9 @@ const proxySocketHandler = {
         const ref = stream.session !== undefined ?
           stream.session[kSocket] : stream;
         const value = ref[prop];
-        return typeof value === 'function' ? value.bind(ref) : value;
+        return typeof value === 'function' ?
+          FunctionPrototypeBind(value, ref) :
+          value;
     }
   },
   getPrototypeOf(stream) {
@@ -394,7 +401,7 @@ class Http2ServerRequest extends Readable {
 
   set method(method) {
     validateString(method, 'method');
-    if (method.trim() === '')
+    if (StringPrototypeTrim(method) === '')
       throw new ERR_INVALID_ARG_VALUE('method', method);
 
     this[kHeaders][HTTP2_HEADER_METHOD] = method;
@@ -554,7 +561,7 @@ class Http2ServerResponse extends Stream {
 
   setTrailer(name, value) {
     validateString(name, 'name');
-    name = name.trim().toLowerCase();
+    name = StringPrototypeToLowerCase(StringPrototypeTrim(name));
     assertValidHeader(name, value);
     this[kTrailers][name] = value;
   }
@@ -570,7 +577,7 @@ class Http2ServerResponse extends Stream {
 
   getHeader(name) {
     validateString(name, 'name');
-    name = name.trim().toLowerCase();
+    name = StringPrototypeToLowerCase(StringPrototypeTrim(name));
     return this[kHeaders][name];
   }
 
@@ -585,7 +592,7 @@ class Http2ServerResponse extends Stream {
 
   hasHeader(name) {
     validateString(name, 'name');
-    name = name.trim().toLowerCase();
+    name = StringPrototypeToLowerCase(StringPrototypeTrim(name));
     return ObjectPrototypeHasOwnProperty(this[kHeaders], name);
   }
 
@@ -594,7 +601,7 @@ class Http2ServerResponse extends Stream {
     if (this[kStream].headersSent)
       throw new ERR_HTTP2_HEADERS_SENT();
 
-    name = name.trim().toLowerCase();
+    name = StringPrototypeToLowerCase(StringPrototypeTrim(name));
 
     if (name === 'date') {
       this[kState].sendDate = false;
@@ -614,7 +621,7 @@ class Http2ServerResponse extends Stream {
   }
 
   [kSetHeader](name, value) {
-    name = name.trim().toLowerCase();
+    name = StringPrototypeToLowerCase(StringPrototypeTrim(name));
     assertValidHeader(name, value);
 
     if (!isConnectionHeaderAllowed(name, value)) {
@@ -755,7 +762,7 @@ class Http2ServerResponse extends Stream {
       this.writeHead(this[kState].statusCode);
 
     if (this[kState].closed || stream.destroyed)
-      onStreamCloseResponse.call(stream);
+      ReflectApply(onStreamCloseResponse, stream, []);
     else
       stream.end();