bare-http1 4.0.3 → 4.1.0

package/index.d.ts

@@ -24,6 +24,7 @@ export {
   HTTPError as errors
 }
 
+export const METHODS: HTTPMethod[]
 export const STATUS_CODES: typeof constants.status
 
 export interface HTTPIncomingMessageEvents extends ReadableEvents {

package/index.js

@@ -14,6 +14,7 @@ exports.ClientConnection = require('./lib/client-connection')
 exports.constants = require('./lib/constants')
 exports.errors = require('./lib/errors')
 
+exports.METHODS = Object.values(exports.constants.method) // For Node.js compatibility
 exports.STATUS_CODES = exports.constants.status // For Node.js compatibility
 
 exports.createServer = function createServer(opts, onrequest) {

package/lib/client-connection.js

@@ -143,12 +143,13 @@ module.exports = class HTTPClientConnection {
     if (r.length === 0) return this.socket.destroy()
 
     const [, statusCode, ...statusMessage] = r[0].split(' ')
-    if (!statusCode || !statusMessage) return this.socket.destroy()
+    if (!statusCode || !statusMessage.length) return this.socket.destroy()
 
     const headers = {}
 
     for (let i = 1; i < r.length; i++) {
-      const [name, value] = r[i].split(': ')
+      const [name, value] = splitHeader(r[i])
+      if (name === null) return this.socket.destroy()
       headers[name.toLowerCase()] = value
     }
 
@@ -262,3 +263,9 @@ module.exports = class HTTPClientConnection {
     HTTPClientConnection._connections.delete(this.socket)
   }
 }
+
+function splitHeader(s) {
+  const i = s.indexOf(': ')
+  if (i === -1) return [null, null]
+  return [s.slice(0, i), s.slice(i + 2)]
+}

package/lib/client-request.js

@@ -1,6 +1,9 @@
 const HTTPAgent = require('./agent')
 const HTTPOutgoingMessage = require('./outgoing-message')
 
+const CHUNK_DELIMITER = Buffer.from('\r\n')
+const CHUNK_TERMINATOR = Buffer.from('0\r\n\r\n')
+
 module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
   constructor(opts = {}, onresponse = null) {
     if (typeof opts === 'function') {
@@ -62,9 +65,10 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
 
     if (this._chunked) {
       data = Buffer.concat([
-        Buffer.from('' + data.byteLength.toString(16) + '\r\n'),
+        Buffer.from(data.byteLength.toString(16)),
+        CHUNK_DELIMITER,
         data,
-        Buffer.from('\r\n')
+        CHUNK_DELIMITER
       ])
     }
 
@@ -75,7 +79,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
   _final(cb) {
     if (this.headersSent === false) this.flushHeaders()
 
-    if (this._chunked) this.socket.write(Buffer.from('0\r\n\r\n'))
+    if (this._chunked) this.socket.write(CHUNK_TERMINATOR)
 
     this._pendingFinal = cb
   }

package/lib/server-connection.js

@@ -145,7 +145,8 @@ module.exports = class HTTPServerConnection {
     const headers = {}
 
     for (let i = 1; i < r.length; i++) {
-      const [name, value] = r[i].split(': ')
+      const [name, value] = splitHeader(r[i])
+      if (name === null) return this.socket.destroy()
       headers[name.toLowerCase()] = value
     }
 
@@ -270,3 +271,9 @@ module.exports = class HTTPServerConnection {
 }
 
 function noop() {}
+
+function splitHeader(s) {
+  const i = s.indexOf(': ')
+  if (i === -1) return [null, null]
+  return [s.slice(0, i), s.slice(i + 2)]
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "4.0.3",
+  "version": "4.1.0",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     "./package": "./package.json",