bare-http1 3.6.2 → 3.7.0

package/lib/client-connection.js

@@ -27,6 +27,7 @@ module.exports = class HTTPClientConnection {
     this._onend = this._onend.bind(this)
     this._ondata = this._ondata.bind(this)
     this._ondrain = this._ondrain.bind(this)
+    this._ontimeout = this._ontimeout.bind(this)
 
     socket
       .on('error', this._onerror)
@@ -34,6 +35,7 @@ module.exports = class HTTPClientConnection {
       .on('end', this._onend)
       .on('data', this._ondata)
       .on('drain', this._ondrain)
+      .on('timeout', this._ontimeout)
   }
 
   _onerror (err) {
@@ -185,6 +187,7 @@ module.exports = class HTTPClientConnection {
       .off('end', this._onend)
       .off('data', this._ondata)
       .off('drain', this._ondrain)
+      .off('timeout', this._ontimeout)
 
     const req = this.req
 
@@ -196,6 +199,10 @@ module.exports = class HTTPClientConnection {
     this.socket.destroy()
   }
 
+  _ontimeout () {
+    if (this.req) this.req.emit('timeout')
+  }
+
   _onfinished () {
     if (this.res) this.res.push(null)
     if (this.req) this.req._continueFinal()

package/lib/client-request.js

@@ -30,7 +30,7 @@ module.exports = class HTTPClientRequest extends HTTPOutgoingMessage {
     this.headers = { host: host + ':' + port, ...opts.headers }
 
     this._connection = connection
-    this._chunked = true
+    this._chunked = method !== 'GET' && method !== 'HEAD'
 
     this._pendingFinal = null
 

package/lib/constants.js

@@ -6,6 +6,17 @@ module.exports = {
     BEFORE_CHUNK: 4,
     IN_CHUNK: 5
   },
+  method: {
+    GET: 'GET',
+    HEAD: 'HEAD',
+    POST: 'POST',
+    PUT: 'PUT',
+    DELETE: 'DELETE',
+    CONNECT: 'CONNECT',
+    OPTIONS: 'OPTIONS',
+    TRACE: 'TRACE',
+    PATCH: 'PATCH'
+  },
   status: {
     100: 'Continue',
     101: 'Switching Protocols',

package/lib/incoming-message.js

@@ -33,6 +33,14 @@ module.exports = class HTTPIncomingMessage extends Readable {
     return name.toLowerCase() in this.headers
   }
 
+  setTimeout (ms, ontimeout) {
+    if (ontimeout) this.once('timeout', ontimeout)
+
+    this.socket.setTimeout(ms)
+
+    return this
+  }
+
   _predestroy () {
     if (this.upgrade === false && this.socket !== null) this.socket.destroy()
   }

package/lib/outgoing-message.js

@@ -34,6 +34,14 @@ module.exports = class HTTPOutgoingMessage extends Writable {
     this.headersSent = true
   }
 
+  setTimeout (ms, ontimeout) {
+    if (ontimeout) this.once('timeout', ontimeout)
+
+    this.socket.setTimeout(ms)
+
+    return this
+  }
+
   _header () {
     throw errors.NOT_IMPLEMENTED()
   }

package/lib/server-connection.js

@@ -28,11 +28,15 @@ module.exports = class HTTPServerConnection {
     this._onerror = this._onerror.bind(this)
     this._ondata = this._ondata.bind(this)
     this._ondrain = this._ondrain.bind(this)
+    this._ontimeout = this._ontimeout.bind(this)
 
     socket
       .on('error', this._onerror)
       .on('data', this._ondata)
       .on('drain', this._ondrain)
+      .on('timeout', this._ontimeout)
+
+    if (this.server.timeout) socket.setTimeout(this.server.timeout)
   }
 
   _onerror (err) {
@@ -176,6 +180,7 @@ module.exports = class HTTPServerConnection {
       .off('error', this._onerror)
       .off('data', this._ondata)
       .off('drain', this._ondrain)
+      .off('timeout', this._ontimeout)
 
     const req = this.req
 
@@ -185,6 +190,14 @@ module.exports = class HTTPServerConnection {
     this.server.emit('upgrade', req, this.socket, head || empty)
   }
 
+  _ontimeout () {
+    const reqTimeout = this.req && this.req.emit('timeout')
+    const resTimeout = this.res && this.res.emit('timeout')
+    const serverTimeout = this.server.emit('timeout', this.socket)
+
+    if (!reqTimeout && !resTimeout && !serverTimeout) this.socket.destroy()
+  }
+
   _onfinished () {
     if (this.req) this.req.push(null)
   }

package/lib/server.js

@@ -10,8 +10,22 @@ module.exports = class HTTPServer extends TCPServer {
 
     super({ allowHalfOpen: false })
 
+    this._timeout = 0
+
     this.on('connection', (socket) => new HTTPServerConnection(this, socket, opts))
 
     if (onrequest) this.on('request', onrequest)
   }
+
+  get timeout () {
+    return this._timeout || undefined // For Node.js compatibility
+  }
+
+  setTimeout (ms = 0, ontimeout) {
+    if (ontimeout) this.on('timeout', ontimeout)
+
+    this._timeout = ms
+
+    return this
+  }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bare-http1",
-  "version": "3.6.2",
+  "version": "3.7.0",
   "description": "Native HTTP/1 library for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -27,7 +27,7 @@
   "dependencies": {
     "bare-events": "^2.0.0",
     "bare-stream": "^2.0.0",
-    "bare-tcp": "^1.1.2"
+    "bare-tcp": "^1.8.0"
   },
   "devDependencies": {
     "brittle": "^3.3.0",