@util.js/node-http 0.41.4 → 0.41.5

package/lib/Urls.js

@@ -61,8 +61,8 @@ class Urls {
     const port = parsedUrl.port
       ? parsedUrl.port
       : parsedUrl.protocol === "https:"
-      ? 443
-      : 80;
+        ? 443
+        : 80;
 
     let options = Object.assign(
       {},
@@ -70,7 +70,7 @@ class Urls {
         ? typeof callbackOrOptions === "function"
           ? {}
           : callbackOrOptions
-        : {}
+        : {},
     );
     options = Object.assign(options, {
       host: parsedUrl.host,
@@ -78,22 +78,32 @@ class Urls {
       path: parsedUrl.path,
       port,
     });
+    let cbCalled = false;
     const request = getProtocolObject(parsedUrl.protocol)
-      .request(options, (res) => cb(null, res.headers))
-      .on("error", (error) => {
-        cb(error);
+      .request(options, (res) => {
+        res.destroy();
+        if (!cbCalled) {
+          cbCalled = true;
+          cb(null, res.headers);
+        }
       })
-      .end();
+      .on("error", (error) => {
+        if (!cbCalled) {
+          cbCalled = true;
+          cb(error);
+        }
+      });
     const timeout = determineTimeout(callbackOrOptions);
     if (timeout !== -1) {
       // https://stackoverflow.com/a/12783062
       request.on("socket", (socket) => {
         socket.setTimeout(timeout);
         socket.on("timeout", () => {
-          request.abort();
+          request.destroy(new Error("The request timed out."));
         });
       });
     }
+    request.end();
   }
 }
 
@@ -138,7 +148,7 @@ function getProtocolObject(protocolStr) {
       return http();
     default:
       throw new TypeError(
-        'The protocol must be "https:" or "http:", not "' + protocolStr + '"'
+        'The protocol must be "https:" or "http:", not "' + protocolStr + '"',
       );
   }
 }

package/package.json

@@ -1,8 +1,8 @@
 {
   "author": "Chris Topher <c@creemama.com>",
   "dependencies": {
-    "@util.js/node-files": "0.41.4",
-    "@util.js/promises": "0.41.4"
+    "@util.js/node-files": "0.41.5",
+    "@util.js/promises": "0.41.5"
   },
   "description": "JavaScript utility methods for URLs",
   "keywords": [
@@ -27,6 +27,5 @@
     "type": "git",
     "url": "https://github.com/creemama/utiljs/tree/master/packages/utiljs-node-http"
   },
-  "version": "0.41.4",
-  "gitHead": "2119863a175cf7095ca3a2417e61af32974add15"
+  "version": "0.41.5"
 }

package/test/UrlsTest.js

@@ -43,7 +43,7 @@ describe("Urls", () => {
         },
         (error) => {
           expect(error).to.be.an.instanceof(TypeError);
-        }
+        },
       ));
     it("should throw an error if there is no protocol", () =>
       downloadUrlDestination("www.google.com").then(
@@ -52,7 +52,7 @@ describe("Urls", () => {
         },
         (error) => {
           expect(error).to.be.an.instanceof(TypeError);
-        }
+        },
       ));
     it("handles HTTP errors", () =>
       downloadUrlDestination("http://doesnotexist:8080", {
@@ -64,7 +64,7 @@ describe("Urls", () => {
         (error) => {
           if (!error) throw new Error("Unexpected");
           /* expected */
-        }
+        },
       ));
     it("handles HTTPS errors", () =>
       downloadUrlDestination("https://doesnotexist:8443", {
@@ -76,7 +76,7 @@ describe("Urls", () => {
         (error) => {
           if (!error) throw new Error("Unexpected");
           /* expected */
-        }
+        },
       ));
   });
 
@@ -92,7 +92,7 @@ describe("Urls", () => {
         (error) => {
           if (error) return callback();
           callback(new Error("Unexpected success"));
-        }
+        },
       ));
     it("handles HTTPS errors", (callback) =>
       downloadUrlDestinationCallback(
@@ -101,7 +101,7 @@ describe("Urls", () => {
         (error) => {
           if (error) return callback();
           callback(new Error("Unexpected success"));
-        }
+        },
       ));
   });
 
@@ -118,6 +118,14 @@ describe("Urls", () => {
       urls.headers("https://www.google.com", null).then((headers) => {
         expect(headers["content-type"].startsWith("text/html")).to.be.true;
       }));
+    it("handles HTTP requests with explicit port", () =>
+      urls.headers("http://www.google.com:80").then((headers) => {
+        expect(headers["content-type"].startsWith("text/html")).to.be.true;
+      }));
+    it("handles HTTP requests with empty options object", () =>
+      urls.headers("http://www.google.com", {}).then((headers) => {
+        expect(headers["content-type"].startsWith("text/html")).to.be.true;
+      }));
     it("handles HTTP errors", () =>
       urls.headers("http://doesnotexist:8080", { timeout: 50 }).then(
         (value) => {
@@ -126,7 +134,7 @@ describe("Urls", () => {
         (error) => {
           if (!error) throw new Error("Unexpected");
           /* expected */
-        }
+        },
       ));
     it("handles HTTPS errors", () =>
       urls.headers("https://doesnotexist:8443", { timeout: 50 }).then(
@@ -136,7 +144,16 @@ describe("Urls", () => {
         (error) => {
           if (!error) throw new Error("Unexpected");
           /* expected */
-        }
+        },
+      ));
+    it("handles request timeouts", () =>
+      urls.headers("http://10.255.255.1", { timeout: 10 }).then(
+        (value) => {
+          throw new Error("Unexpected success");
+        },
+        (error) => {
+          expect(error).to.be.an.instanceof(Error);
+        },
       ));
   });
 
@@ -151,6 +168,11 @@ describe("Urls", () => {
         expect(headers["content-type"].startsWith("text/html")).to.be.true;
         callback(error);
       }));
+    it("handles HTTP requests with empty options object", (callback) =>
+      urls.headers("http://www.google.com", {}, (error, headers) => {
+        expect(headers["content-type"].startsWith("text/html")).to.be.true;
+        callback(error);
+      }));
     it("handles HTTP errors", (callback) =>
       urls.headers("http://doesnotexist:8080", { timeout: 50 }, (error) => {
         if (error) return callback();
@@ -161,6 +183,11 @@ describe("Urls", () => {
         if (error) return callback();
         callback(new Error("Unexpected success"));
       }));
+    it("handles request timeouts", (callback) =>
+      urls.headers("http://10.255.255.1", { timeout: 10 }, (error) => {
+        if (error) return callback();
+        callback(new Error("Unexpected success"));
+      }));
   });
 });
 
@@ -171,7 +198,7 @@ async function downloadUrlDestination(url, options) {
     "/" +
     files.sanitizeFilename(
       fileNum++ + ".downloadUrlDestination." + url + ".html",
-      { replacement: "_" }
+      { replacement: "_" },
     );
 
   const readFile = (_) => files.readFile(destination, "utf8");
@@ -197,7 +224,7 @@ function downloadUrlDestinationCallback() {
 async function asyncDownloadUrlDestinationCallback(
   url,
   callbackOrOptions,
-  callback
+  callback,
 ) {
   await files.mkdirp(targetDir);
   const cb = arguments[arguments.length - 1];
@@ -206,7 +233,7 @@ async function asyncDownloadUrlDestinationCallback(
     "/" +
     files.sanitizeFilename(
       fileNum++ + ".asyncDownloadUrlDestinationCallback." + url + ".html",
-      { replacement: "_" }
+      { replacement: "_" },
     );
   const options = callbackOrOptions
     ? typeof callbackOrOptions === "function"