bare-http1 3.5.1 → 3.6.0

package/README.md

@@ -6,29 +6,23 @@ HTTP/1 library for JavaScript.
 npm i bare-http1
 ```
 
-`http.Server` supports most HTTP features, e.g. keep-alive, chunked encoding, and streaming responses.
-
-Basic `http.ClientRequest` is implemented, temporarily it does NOT support keep-alive and protocol negotiation.
-
 ## Usage
 
-``` js
+```js
 const http = require('bare-http1')
 
-// Same API as Node.js
-
-const server = http.createServer(function (req, res) {
+const server = http.createServer((req, res) => {
   res.statusCode = 200
   res.setHeader('Content-Length', 10)
   res.write('hello world!')
   res.end()
 })
 
-server.listen(0, function () {
+server.listen(0, () => {
   const { port } = server.address()
   console.log('server is bound on', port)
 
-  const client = http.request({ port }, res => {
+  const client = http.request({ port }, (res) => {
     res.on('data', (data) => console.log(data.toString()))
   })
   client.end()

package/index.js

@@ -1,6 +1,9 @@
 exports.IncomingMessage = require('./lib/incoming-message')
 exports.OutgoingMessage = require('./lib/outgoing-message')
 
+const Agent = exports.Agent = require('./lib/agent')
+exports.globalAgent = Agent.global
+
 const Server = exports.Server = require('./lib/server')
 exports.ServerResponse = require('./lib/server-response')
 exports.ServerConnection = require('./lib/server-connection')

package/lib/agent.js

@@ -0,0 +1,34 @@
+const tcp = require('bare-tcp')
+
+module.exports = class HTTPAgent {
+  constructor (opts = {}) {
+    const {
+      keepAlive = false,
+      keepAliveMsecs = 1000,
+      maxSockets = Infinity,
+      maxTotalSockets = Infinity,
+      maxFreeSockets = 256,
+      timeout = -1
+    } = opts
+
+    this._keepAlive = typeof keepAlive === 'number' ? keepAlive : keepAlive ? keepAliveMsecs : -1
+    this._maxSockets = maxSockets
+    this._maxTotalSockets = maxTotalSockets
+    this._maxFreeSockets = maxFreeSockets
+    this._timeout = timeout
+  }
+
+  createConnection (opts) {
+    return tcp.createConnection(opts)
+  }
+
+  reuseSocket (socket, req) {
+    socket.ref()
+  }
+
+  keepSocketAlive (socket) {
+    return false
+  }
+
+  static global = new this({ keepAlive: 1000, timeout: 5000 })
+}

package/lib/client-request.js

@@ -1,4 +1,4 @@
-const tcp = require('bare-tcp')
+const HTTPAgent = require('./agent')
 const HTTPOutgoingMessage = require('./outgoing-message')
 const HTTPClientConnection = require('./client-connection')
 
@@ -9,8 +9,10 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
       opts = {}
     }
 
+    const agent = opts.agent === false ? new HTTPAgent() : opts.agent || HTTPAgent.global
+
     const {
-      connection = new HTTPClientConnection(tcp.createConnection(opts))
+      connection = new HTTPClientConnection(agent.createConnection(opts), opts)
     } = opts
 
     super(connection.socket)
@@ -56,7 +58,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     return h
   }
 
-  _write (data, cb) {
+  _write (data, encoding, cb) {
     if (this.headersSent === false) this.flushHeaders()
 
     if (this._chunked) {

package/lib/incoming-message.js

@@ -1,20 +1,20 @@
 const { Readable } = require('bare-stream')
 
 module.exports = class HTTPIncomingMessage extends Readable {
-  constructor (socket, headers, args = {}) {
+  constructor (socket = null, headers = {}, opts = {}) {
     super()
 
     this.socket = socket
     this.headers = headers
     this.upgrade = false
 
-    // Server arguments
-    this.method = args.method || ''
-    this.url = args.url || ''
+    // Server options
+    this.method = opts.method || ''
+    this.url = opts.url || ''
 
-    // Client arguments
-    this.statusCode = args.statusCode || 0
-    this.statusMessage = args.statusMessage || ''
+    // Client options
+    this.statusCode = opts.statusCode || 0
+    this.statusMessage = opts.statusMessage || ''
   }
 
   get httpVersion () {
@@ -34,6 +34,6 @@ module.exports = class HTTPIncomingMessage extends Readable {
   }
 
   _predestroy () {
-    if (this.upgrade === false) this.socket.destroy()
+    if (this.upgrade === false && this.socket !== null) this.socket.destroy()
   }
 }

package/lib/outgoing-message.js

@@ -2,8 +2,8 @@ const { Writable } = require('bare-stream')
 const errors = require('./errors')
 
 module.exports = class HTTPOutgoingMessage extends Writable {
-  constructor (socket) {
-    super({ mapWritable })
+  constructor (socket = null) {
+    super()
 
     this.socket = socket
     this.headers = {}
@@ -28,7 +28,7 @@ module.exports = class HTTPOutgoingMessage extends Writable {
   }
 
   flushHeaders () {
-    if (this.headersSent === true) return
+    if (this.headersSent === true || this.socket === null) return
 
     this.socket.write(Buffer.from(this._header()))
     this.headersSent = true
@@ -39,10 +39,6 @@ module.exports = class HTTPOutgoingMessage extends Writable {
   }
 
   _predestroy () {
-    if (this.upgrade === false) this.socket.destroy()
+    if (this.upgrade === false && this.socket !== null) this.socket.destroy()
   }
 }
-
-function mapWritable (data) {
-  return typeof data === 'string' ? Buffer.from(data) : data
-}

package/lib/server-response.js

@@ -54,7 +54,7 @@ module.exports = class HTTPServerResponse extends HTTPOutgoingMessage {
     return h
   }
 
-  _write (data, cb) {
+  _write (data, encoding, cb) {
     if (this.headersSent === false) {
       if (this._finishing) {
         this.setHeader('Content-Length', (data.byteLength + this._writableState.buffered).toString())

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "3.5.1",
+  "version": "3.6.0",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -26,7 +26,7 @@
   "homepage": "https://github.com/holepunchto/bare-http1#readme",
   "dependencies": {
     "bare-events": "^2.0.0",
-    "bare-stream": "^1.0.0",
+    "bare-stream": "^2.0.0",
     "bare-tcp": "^1.1.2"
   },
   "devDependencies": {