2.9.1 patch: Improve handling of timeout for Node 10

ethan7g · Aug 9, 2018 · 35f5b21 · 35f5b21
1 parent 1e896b3
commit 35f5b21
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 11 deletions.
diff --git a/docs/global.html b/docs/global.html
@@ -1080,7 +1080,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Jan 05 2018 16:21:31 GMT-0800 (PST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Wed Aug 08 2018 22:35:52 GMT-0700 (Pacific Daylight Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/index.html b/docs/index.html
@@ -142,7 +142,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Jan 05 2018 16:21:31 GMT-0800 (PST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Wed Aug 08 2018 22:35:52 GMT-0700 (Pacific Daylight Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/docs/phin.js.html b/docs/phin.js.html
@@ -79,7 +79,6 @@ <h1 class="page-title">Source: phin.js</h1>
 		'method': 'GET',
 		'headers': {},
 		'auth': (addr.auth || null),
-		'timeout': null,
 		'parse': 'none',
 		'stream': false
 	}
@@ -89,6 +88,8 @@ <h1 class="page-title">Source: phin.js</h1>
 	}
 	options.port = Number(options.port)
 
+	if (options.hasOwnProperty('timeout')) delete options.timeout
+
 	if (options.compressed === true) {
 		options.headers['accept-encoding'] = 'gzip, deflate'
 	}
@@ -156,8 +157,8 @@ <h1 class="page-title">Source: phin.js</h1>
 			return
 	}
 
-	if (typeof options.timeout === 'number') {
-		req.setTimeout(options.timeout, () => {
+	if (typeof opts.timeout === 'number') {
+		req.setTimeout(opts.timeout, () => {
 			req.abort()
 
 			cb(new Error('Timeout has been reached.'), null)
@@ -228,7 +229,7 @@ <h2><a href="index.html">Home</a></h2><h3>Global</h3><ul><li><a href="global.htm
 <br class="clear">
 
 <footer>
-    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Fri Jan 05 2018 16:21:31 GMT-0800 (PST)
+    Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.5.5</a> on Wed Aug 08 2018 22:35:52 GMT-0700 (Pacific Daylight Time)
 </footer>
 
 <script> prettyPrint(); </script>

diff --git a/lib/phin.compiled.js b/lib/phin.compiled.js
diff --git a/lib/phin.js b/lib/phin.js
@@ -51,7 +51,6 @@ const phin = (opts, cb) => {
 		'method': 'GET',
 		'headers': {},
 		'auth': (addr.auth || null),
-		'timeout': null,
 		'parse': 'none',
 		'stream': false
 	}
@@ -61,6 +60,8 @@ const phin = (opts, cb) => {
 	}
 	options.port = Number(options.port)
 
+	if (options.hasOwnProperty('timeout')) delete options.timeout
+
 	if (options.compressed === true) {
 		options.headers['accept-encoding'] = 'gzip, deflate'
 	}
@@ -128,8 +129,8 @@ const phin = (opts, cb) => {
 			return
 	}
 
-	if (typeof options.timeout === 'number') {
-		req.setTimeout(options.timeout, () => {
+	if (typeof opts.timeout === 'number') {
+		req.setTimeout(opts.timeout, () => {
 			req.abort()
 
 			cb(new Error('Timeout has been reached.'), null)

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "phin",
-  "version": "2.9.0",
+  "version": "2.9.1",
   "description": "Ultra-simple, lightweight, dependency-free Node.JS HTTP request client",
   "main": "lib/phin.compiled.js",
   "scripts": {