bare-http1 3.3.1 → 3.5.0

package/README.md

@@ -6,9 +6,9 @@ HTTP/1 library for JavaScript.
 npm i bare-http1
 ```
 
-Currently HTTP servers does NOT support server request bodies, but supports most other HTTP features (keep-alive, chunked encoding, etc.) and streaming server responses.
+`http.Server` supports most HTTP features, e.g. keep-alive, chunked encoding, and streaming responses.
 
-Basic HTTP client is supported, but currently it does NOT support keep-alive and protocol negotiation.
+Basic `http.ClientRequest` is implemented, temporarily it does NOT support keep-alive and protocol negotiation.
 
 ## Usage
 

package/lib/client-connection.js

@@ -20,12 +20,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 +112,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 +122,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 +176,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)) return
+
+    this.socket.destroy()
+  }
+
   _onfinished () {
     if (this.res) this.res.push(null)
     if (this.req) this.req._continueFinal()
@@ -178,6 +209,6 @@ module.exports = class HTTPClientConnection {
   }
 
   _ondrain () {
-    if (this.res) this.res._continueWrite()
+    if (this.req) this.req._continueWrite()
   }
 }

package/lib/client-request.js

@@ -22,9 +22,10 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     const host = opts.host || 'localhost'
     const port = opts.port || 80
 
-    this.headers = { host: host + ':' + port }
+    this.headers = { host: host + ':' + port, ...opts.headers }
 
     this._connection = connection
+    this._chunked = true
 
     this._pendingFinal = null
 
@@ -34,24 +35,63 @@ 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'
 
     return h
   }
 
+  _write (data, cb) {
+    if (this.headersSent === false) this.flushHeaders()
+
+    if (this._chunked) {
+      data = Buffer.concat([
+        Buffer.from('' + data.byteLength.toString(16) + '\r\n'),
+        data,
+        Buffer.from('\r\n')
+      ])
+    }
+
+    if (this.socket.write(data)) cb(null)
+    else this._pendingWrite = cb
+  }
+
   _final (cb) {
     if (this.headersSent === false) this.flushHeaders()
 
+    if (this._chunked) this.socket.write(Buffer.from('0\r\n\r\n'))
+
     this._pendingFinal = cb
   }
 
+  _predestroy () {
+    if (this.upgrade) return this._continueFinal()
+
+    this.socket.destroy()
+  }
+
+  _continueWrite () {
+    if (this._pendingWrite === null) return
+    const cb = this._pendingWrite
+    this._pendingWrite = null
+    cb(null)
+  }
+
   _continueFinal () {
     if (this._pendingFinal === null) return
     const cb = this._pendingFinal

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

@@ -23,10 +23,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) {
@@ -34,6 +38,8 @@ module.exports = class HTTPServerConnection {
   }
 
   _ondata (data) {
+    if (this._state === constants.state.IN_BODY) return this._onbody(data)
+
     if (this._buffer !== null) {
       this._buffer = Buffer.concat([this._buffer, data])
     } else {
@@ -49,6 +55,30 @@ module.exports = class HTTPServerConnection {
         hits++
       } else if (hits === 1 && b === 10) {
         hits++
+
+        if (this._state === constants.state.BEFORE_CHUNK) {
+          const head = this._buffer.subarray(0, i - 1)
+          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          i = 0
+          hits = 0
+          this._onchunklength(head)
+
+          if (this._buffer === null) break
+        } else if (this._state === constants.state.IN_CHUNK) {
+          const chunk = this._buffer.subarray(0, i - 1)
+
+          if (chunk.byteLength !== this._length) {
+            hits = 0
+            continue
+          }
+
+          this._buffer = i + 1 === this._buffer.byteLength ? null : this._buffer.subarray(i + 1)
+          i = 0
+          hits = 0
+          this._onchunk(chunk)
+
+          if (this._buffer === null) break
+        }
       } else if (hits === 2 && b === 13) {
         hits++
       } else if (hits === 3 && b === 10) {
@@ -84,14 +114,77 @@ module.exports = class HTTPServerConnection {
     }
 
     this.req = new this._IncomingMessage(this.socket, headers, { method, url })
-    this.res = new this._ServerResponse(this.socket, this.req, headers.connection === 'close')
 
-    this.req.on('close', () => { this.req = null })
-    this.res.on('close', () => { this.res = null; this._onreset() })
+    this.req.on('close', () => { this.req = null; this._onreset() })
 
-    this.req.push(null)
+    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.server.emit('request', this.req, this.res)
+
+    if (headers['transfer-encoding'] === 'chunked') {
+      this._state = constants.state.BEFORE_CHUNK
+    } else {
+      this._length = parseInt(headers['content-length'], 10) || 0
+
+      if (this._length === 0) return this._onfinished()
+
+      this._state = constants.state.IN_BODY
+
+      if (this._buffer) {
+        const body = this._buffer
+        this._buffer = null
+        this._onbody(body)
+      }
+    }
+  }
+
+  _onchunklength (data) {
+    this._length = parseInt(data.toString(), 16)
+
+    if (this._length === 0) this._onfinished()
+    else this._state = constants.state.IN_CHUNK
+  }
+
+  _onchunk (data) {
+    this._read += data.byteLength
+
+    this.req.push(data)
+
+    this._state = constants.state.BEFORE_CHUNK
+  }
+
+  _onbody (data) {
+    this._read += data.byteLength
+
+    this.req.push(data)
+
+    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)
+  }
+
+  _onfinished () {
+    if (this.req) this.req.push(null)
   }
 
   _onreset () {

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.3.1",
+  "version": "3.5.0",
   "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"
   }
 }