honkit 4.0.3 → 4.0.5

package/lib/output/modifiers/__tests__/fetchRemoteImages.js

@@ -30,26 +30,38 @@ const cheerio = __importStar(require("cheerio"));
 const tmp_1 = __importDefault(require("tmp"));
 const path_1 = __importDefault(require("path"));
 const fetchRemoteImages_1 = __importDefault(require("../fetchRemoteImages"));
+const promises_1 = __importDefault(require("fs/promises"));
+const assert_1 = __importDefault(require("assert"));
+const constants = __importStar(require("constants"));
 const URL = "https://upload.wikimedia.org/wikipedia/commons/thumb/4/47/PNG_transparency_demonstration_1.png/280px-PNG_transparency_demonstration_1.png";
-describe.skip("fetchRemoteImages", () => {
+describe("fetchRemoteImages", () => {
     let dir;
     beforeEach(() => {
         dir = tmp_1.default.dirSync();
+        return promises_1.default.rm(dir.name, { recursive: true, force: true });
     });
-    test("should download image file", () => {
+    afterEach(() => {
+        // remove tmp `dir`
+        return promises_1.default.rm(dir.name, { recursive: true, force: true });
+    });
+    it("should download image file", async () => {
         const $ = cheerio.load(`<img src="${URL}" />`, { _useHtmlParser2: true });
-        return (0, fetchRemoteImages_1.default)(dir.name, "index.html", $).then(() => {
-            const $img = $("img");
-            const src = $img.attr("src");
-            expect(dir.name).toHaveFile(src);
+        await (0, fetchRemoteImages_1.default)(dir.name, "index.html", $);
+        const $img = $("img");
+        const src = $img.attr("src");
+        const expected = path_1.default.join(dir.name, src);
+        await assert_1.default.doesNotReject(() => {
+            return promises_1.default.access(expected, constants.F_OK);
         });
     });
-    test("should download image file and replace with relative path", () => {
+    it("should download image file and replace with relative path", async () => {
         const $ = cheerio.load(`<img src="${URL}" />`, { _useHtmlParser2: true });
-        return (0, fetchRemoteImages_1.default)(dir.name, "test/index.html", $).then(() => {
-            const $img = $("img");
-            const src = $img.attr("src");
-            expect(dir.name).toHaveFile(path_1.default.join("test", src));
+        await (0, fetchRemoteImages_1.default)(dir.name, "test/index.html", $);
+        const $img = $("img");
+        const src = $img.attr("src");
+        const expected = path_1.default.join(dir.name, "test/" + src);
+        await assert_1.default.doesNotReject(() => {
+            return promises_1.default.access(expected, constants.F_OK);
         });
     });
 });

package/lib/output/modifiers/fetchRemoteImages.js

@@ -10,11 +10,6 @@ const fs_1 = __importDefault(require("../../utils/fs"));
 const location_1 = __importDefault(require("../../utils/location"));
 /**
  Fetch all remote images
-
- @param {string} rootFolder
- @param {string} currentFile
- @param {HTMLDom} $
- @return {Promise}
  */
 function fetchRemoteImages(rootFolder, currentFile, $) {
     const currentDirectory = path_1.default.dirname(currentFile);

package/lib/utils/fs.js

@@ -7,11 +7,12 @@ const fs_1 = __importDefault(require("fs"));
 const mkdirp_1 = __importDefault(require("mkdirp"));
 const destroy_1 = __importDefault(require("destroy"));
 const tmp_1 = __importDefault(require("tmp"));
-const request_1 = __importDefault(require("request"));
 const path_1 = __importDefault(require("path"));
 const cp_1 = __importDefault(require("cp"));
 const cpr_1 = __importDefault(require("cpr"));
 const promise_1 = __importDefault(require("./promise"));
+const http_1 = __importDefault(require("http"));
+const https_1 = __importDefault(require("https"));
 // Write a stream to a file
 function writeStream(filename, st) {
     const d = promise_1.default.defer();
@@ -56,9 +57,42 @@ function genTmpFile(opts) {
 function genTmpDir(opts) {
     return promise_1.default.nfcall(tmp_1.default.dir, opts).get(0);
 }
+// https://stackoverflow.com/questions/11944932/how-to-download-a-file-with-node-js-without-using-third-party-libraries
+const downloadStream = (url, dest, cb) => {
+    const file = fs_1.default.createWriteStream(dest);
+    const protocol = url.startsWith("https") ? https_1.default : http_1.default;
+    const request = protocol.get(url, (response) => {
+        // check if response is success
+        if (response.statusCode < 200 && response.statusCode > 300) {
+            return cb(new Error("Response status was " + response.statusCode));
+        }
+        response.pipe(file);
+    });
+    // close() is async, call cb after close completes
+    file.on("finish", () => file.close(() => cb(null)));
+    // check for request error too
+    request.on("error", (err) => {
+        fs_1.default.unlink(dest, () => cb(err)); // delete the (partial) file and then return the error
+    });
+    file.on("error", (err) => {
+        fs_1.default.unlink(dest, () => cb(err)); // delete the (partial) file and then return the error
+    });
+};
 // Download an image
-function download(uri, dest) {
-    return writeStream(dest, (0, request_1.default)(uri));
+async function download(uri, destFilePath) {
+    // create dest dir if not exists
+    const destDir = path_1.default.dirname(destFilePath);
+    await fs_1.default.promises.mkdir(destDir, { recursive: true });
+    const d = promise_1.default.defer();
+    downloadStream(uri, destFilePath, (err) => {
+        if (err) {
+            d.reject(err);
+        }
+        else {
+            d.resolve();
+        }
+    });
+    return d.promise;
 }
 // Find a filename available in a folder
 function uniqueFilename(base, filename) {
@@ -80,8 +114,8 @@ function ensureFile(filename) {
 }
 // Remove a folder
 function rmDir(base) {
-    return promise_1.default.nfcall(fs_1.default.rmdir, base, {
-        recursive: true,
+    return promise_1.default.nfcall(fs_1.default.rm, base, {
+        recursive: true
     });
 }
 /**
@@ -159,5 +193,5 @@ exports.default = {
     uniqueFilename: uniqueFilename,
     ensureFile: ensureFile,
     ensureFolder: ensureFolder,
-    rmDir: rmDir,
+    rmDir: rmDir
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "honkit",
-  "version": "4.0.3",
+  "version": "4.0.5",
   "description": "HonKit is building beautiful books using Markdown.",
   "keywords": [
     "git",
@@ -81,7 +81,6 @@
     "open": "^7.0.0",
     "q": "^1.5.1",
     "read-installed": "^4.0.3",
-    "request": "^2.88.0",
     "resolve": "^1.17.0",
     "semver": "^5.1.0",
     "send": "^0.17.1",
@@ -100,5 +99,5 @@
     "rimraf": "^3.0.2",
     "typescript": "^4.1.3"
   },
-  "gitHead": "db50f04e29a408d222009522a862d91dd495fcdb"
+  "gitHead": "ef44431f9080787093547712e544ba1b5650c58f"
 }