feat: buil factory

metcoder95 · Aug 18, 2023 · 31671c6 · 31671c6
1 parent 58fc027
commit 31671c6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/lib/client.js b/lib/client.js
@@ -76,7 +76,8 @@ const {
   kHTTP2Session,
   kHTTP2SessionState,
   kHTTP2BuildRequest,
-  kHTTP2CopyHeaders
+  kHTTP2CopyHeaders,
+  kHTTP1BuildRequest
 } = require('./core/symbols')
 const {
   constants: {
@@ -337,8 +338,8 @@ class Client extends DispatcherBase {
     const origin = opts.origin || this[kUrl].origin
 
     let request
-    if (this[kHTTP2Session]) request = Request[kHTTP2BuildRequest](origin, opts, handler)
-    else request = new Request(origin, opts, handler)
+    if (this[kHTTPConnVersion] === 'h2') request = Request[kHTTP2BuildRequest](origin, opts, handler)
+    else request = Request[kHTTP1BuildRequest](origin, opts, handler)
 
     this[kQueue].push(request)
     if (this[kResuming]) {
@@ -1234,10 +1235,10 @@ async function connect (client) {
       socket[kReset] = false
       socket[kBlocking] = false
       socket[kParser] = new Parser(client, socket, llhttpInstance)
-      socket[kCounter] = 0
-      socket[kMaxRequests] = client[kMaxRequests]
     }
 
+    socket[kCounter] = 0
+    socket[kMaxRequests] = client[kMaxRequests]
     socket[kClient] = client
     socket[kError] = null
 

diff --git a/lib/core/request.js b/lib/core/request.js
@@ -5,7 +5,7 @@ const {
   NotSupportedError
 } = require('./errors')
 const assert = require('assert')
-const { kHTTP2BuildRequest, kHTTP2CopyHeaders } = require('./symbols')
+const { kHTTP2BuildRequest, kHTTP2CopyHeaders, kHTTP1BuildRequest } = require('./symbols')
 const util = require('./util')
 
 // tokenRegExp and headerCharRegex have been lifted from
@@ -284,6 +284,12 @@ class Request {
     return this
   }
 
+  static [kHTTP1BuildRequest] (origin, opts, handler) {
+    // TODO: Migrate header parsing here, to make Requests
+    // HTTP agnostic
+    return new Request(origin, opts, handler)
+  }
+
   static [kHTTP2BuildRequest] (origin, opts, handler) {
     const headers = opts.headers
     opts = { ...opts, headers: null }

diff --git a/lib/core/symbols.js b/lib/core/symbols.js
@@ -55,6 +55,7 @@ module.exports = {
   kHTTP2Session: Symbol('http2Session'),
   kHTTP2SessionState: Symbol('http2Session state'),
   kHTTP2BuildRequest: Symbol('http2 build request'),
+  kHTTP1BuildRequest: Symbol('http1 build request'),
   kHTTP2CopyHeaders: Symbol('http2 copy headers'),
   kHTTPConnVersion: Symbol('http connection version')
 }