bare-http1 3.4.0 → 3.5.1

package/lib/client-connection.js

@@ -2,6 +2,8 @@ const HTTPIncomingMessage = require('./incoming-message')
 const constants = require('./constants')
 const errors = require('./errors')
 
+const empty = Buffer.alloc(0)
+
 module.exports = class HTTPClientConnection {
   constructor (socket, opts = {}) {
     const {
@@ -20,12 +22,18 @@ module.exports = class HTTPClientConnection {
     this._read = 0
     this._buffer = null
 
+    this._onerror = this._onerror.bind(this)
+    this._onclose = this._onclose.bind(this)
+    this._onend = this._onend.bind(this)
+    this._ondata = this._ondata.bind(this)
+    this._ondrain = this._ondrain.bind(this)
+
     socket
-      .on('error', this._onerror.bind(this))
-      .on('close', this._onclose.bind(this))
-      .on('end', this._onend.bind(this))
-      .on('data', this._ondata.bind(this))
-      .on('drain', this._ondrain.bind(this))
+      .on('error', this._onerror)
+      .on('close', this._onclose)
+      .on('end', this._onend)
+      .on('data', this._ondata)
+      .on('drain', this._ondrain)
   }
 
   _onerror (err) {
@@ -106,7 +114,7 @@ module.exports = class HTTPClientConnection {
     const r = data.toString().split('\r\n')
     if (r.length === 0) return this.socket.destroy()
 
-    const [, statusCode, statusMessage] = r[0].split(' ')
+    const [, statusCode, ...statusMessage] = r[0].split(' ')
     if (!statusCode || !statusMessage) return this.socket.destroy()
 
     const headers = {}
@@ -116,11 +124,18 @@ module.exports = class HTTPClientConnection {
       headers[name.toLowerCase()] = value
     }
 
-    this.res = new this._IncomingMessage(this.socket, headers, { statusCode: parseInt(statusCode, 10), statusMessage })
-
     this.req.on('close', () => { this.req = null })
+
+    this.res = new this._IncomingMessage(this.socket, headers, { statusCode: parseInt(statusCode, 10), statusMessage: statusMessage.join(' ') })
+
     this.res.on('close', () => { this.res = null; this._onreset() })
 
+    if (headers.connection && headers.connection.toLowerCase() === 'upgrade') {
+      const head = this._buffer
+      this._buffer = null
+      return this._onupgrade(head)
+    }
+
     this.req.emit('response', this.res)
 
     if (headers['transfer-encoding'] === 'chunked') {
@@ -163,6 +178,24 @@ module.exports = class HTTPClientConnection {
     if (this._read === this._length) this._onfinished()
   }
 
+  _onupgrade (head) {
+    this.socket
+      .off('error', this._onerror)
+      .off('close', this._onclose)
+      .off('end', this._onend)
+      .off('data', this._ondata)
+      .off('drain', this._ondrain)
+
+    const req = this.req
+
+    req.upgrade = true
+    req.destroy()
+
+    if (req.emit('upgrade', this.res, this.socket, head || empty)) return
+
+    this.socket.destroy()
+  }
+
   _onfinished () {
     if (this.res) this.res.push(null)
     if (this.req) this.req._continueFinal()

package/lib/client-request.js

@@ -35,15 +35,20 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
   _header () {
     let h = `${this.method} ${this.path} HTTP/1.1\r\n`
 
+    let upgrade = false
+
     for (const name of Object.keys(this.headers)) {
       const n = name.toLowerCase()
       const v = this.headers[name]
 
       if (n === 'content-length') this._chunked = false
+      if (n === 'connection' && v && v.toLowerCase() === 'upgrade') upgrade = true
 
       h += `${httpCase(n)}: ${v}\r\n`
     }
 
+    if (upgrade) this._chunked = false
+
     if (this._chunked) h += 'Transfer-Encoding: chunked\r\n'
 
     h += '\r\n'
@@ -74,6 +79,12 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     this._pendingFinal = cb
   }
 
+  _predestroy () {
+    if (this.upgrade) return this._continueFinal()
+
+    this.socket.destroy()
+  }
+
   _continueWrite () {
     if (this._pendingWrite === null) return
     const cb = this._pendingWrite

package/lib/incoming-message.js

@@ -6,6 +6,7 @@ module.exports = class HTTPIncomingMessage extends Readable {
 
     this.socket = socket
     this.headers = headers
+    this.upgrade = false
 
     // Server arguments
     this.method = args.method || ''
@@ -33,6 +34,6 @@ module.exports = class HTTPIncomingMessage extends Readable {
   }
 
   _predestroy () {
-    this.socket.destroy()
+    if (this.upgrade === false) this.socket.destroy()
   }
 }

package/lib/outgoing-message.js

@@ -8,6 +8,7 @@ module.exports = class HTTPOutgoingMessage extends Writable {
     this.socket = socket
     this.headers = {}
     this.headersSent = false
+    this.upgrade = false
   }
 
   getHeader (name) {
@@ -38,7 +39,7 @@ module.exports = class HTTPOutgoingMessage extends Writable {
   }
 
   _predestroy () {
-    this.socket.destroy()
+    if (this.upgrade === false) this.socket.destroy()
   }
 }
 

package/lib/server-connection.js

@@ -2,6 +2,8 @@ const HTTPIncomingMessage = require('./incoming-message')
 const HTTPServerResponse = require('./server-response')
 const constants = require('./constants')
 
+const empty = Buffer.alloc(0)
+
 module.exports = class HTTPServerConnection {
   constructor (server, socket, opts = {}) {
     const {
@@ -23,10 +25,14 @@ module.exports = class HTTPServerConnection {
     this._read = 0
     this._buffer = null
 
+    this._onerror = this._onerror.bind(this)
+    this._ondata = this._ondata.bind(this)
+    this._ondrain = this._ondrain.bind(this)
+
     socket
-      .on('error', this._onerror.bind(this))
-      .on('data', this._ondata.bind(this))
-      .on('drain', this._ondrain.bind(this))
+      .on('error', this._onerror)
+      .on('data', this._ondata)
+      .on('drain', this._ondrain)
   }
 
   _onerror (err) {
@@ -110,10 +116,18 @@ module.exports = class HTTPServerConnection {
     }
 
     this.req = new this._IncomingMessage(this.socket, headers, { method, url })
+
+    this.req.on('close', () => { this.req = null; this._onreset() })
+
+    if (headers.connection && headers.connection.toLowerCase() === 'upgrade') {
+      const head = this._buffer
+      this._buffer = null
+      return this._onupgrade(head)
+    }
+
     this.res = new this._ServerResponse(this.socket, this.req, headers.connection === 'close')
 
     this.res.on('close', () => { this.res = null })
-    this.req.on('close', () => { this.req = null; this._onreset() })
 
     this.server.emit('request', this.req, this.res)
 
@@ -157,6 +171,20 @@ module.exports = class HTTPServerConnection {
     if (this._read === this._length) this._onfinished()
   }
 
+  _onupgrade (head) {
+    this.socket
+      .off('error', this._onerror)
+      .off('data', this._ondata)
+      .off('drain', this._ondrain)
+
+    const req = this.req
+
+    req.upgrade = true
+    req.destroy()
+
+    this.server.emit('upgrade', req, this.socket, head || empty)
+  }
+
   _onfinished () {
     if (this.req) this.req.push(null)
   }

package/lib/server-response.js

@@ -42,7 +42,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
       const v = this.headers[name]
 
       if (n === 'content-length') this._chunked = false
-      if (n === 'connection' && v === 'close') this._close = true
+      if (n === 'connection' && v && v.toLowerCase() === 'close') this._close = true
 
       h += httpCase(n) + ': ' + v + '\r\n'
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "3.4.0",
+  "version": "3.5.1",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -31,9 +31,6 @@
   },
   "devDependencies": {
     "brittle": "^3.3.0",
-    "mime-types": "^2.1.35",
-    "pump": "^3.0.0",
-    "range-parser": "^1.2.1",
     "standard": "^17.0.0"
   }
 }