feat: make downloading other resources

Author: nowaylifer

__tests__/page-loader.test.js

@@ -28,7 +28,7 @@ describe('downloads html', () => {
     html = await readFile('just.html').then(trimHtml);
   });
 
-  beforeEach(() => {
+  beforeEach(async () => {
     nock(/ru\.hexlet\.io/)
       .get(/\/courses/)
       .reply(200, html);
@@ -46,7 +46,8 @@ describe('downloads html', () => {
   });
 
   test('to the current working directory, if the destFolder parameter is not defined', async () => {
-    process.cwd = jest.fn(() => tmpFolder);
+    const cwdMock = jest.spyOn(process, 'cwd');
+    cwdMock.mockImplementation(() => tmpFolder);
 
     const returnValue = await loadPage('https://ru.hexlet.io/courses');
 
@@ -56,6 +57,8 @@ describe('downloads html', () => {
 
     expect(trimHtml(actualContent)).toBe(trimHtml(html));
     expect(returnValue.filepath).toBe(expectedFilePath);
+
+    cwdMock.mockRestore();
   });
 });
 
@@ -119,7 +122,7 @@ describe('downloads local resources', () => {
     const cssPath = path.join(
       tmpFolder,
       'ru-hexlet-io-courses_files',
-      'ru-hexlet-io-courses_files/ru-hexlet-io-assets-application.css',
+      'ru-hexlet-io-assets-application.css',
     );
 
     const actualCss = await fs.readFile(cssPath, 'utf-8');
@@ -131,7 +134,7 @@ describe('downloads local resources', () => {
     const scriptPath = path.join(
       tmpFolder,
       'ru-hexlet-io-courses_files',
-      'ru-hexlet-io-courses_files/ru-hexlet-io-packs-js-runtime.js',
+      'ru-hexlet-io-packs-js-runtime.js',
     );
 
     const actualScript = await fs.readFile(scriptPath, 'utf-8');

cli.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { loadPage } from './page-loader';
+import { loadPage } from './page-loader.js';
 import { program } from 'commander';
 
 program.option('-o, --output <path>', 'output path');

page-loader.js

@@ -8,7 +8,7 @@ import { createWriteStream } from 'fs';
 
 let $;
 
-class PageLoader {
+export class PageLoader {
   #url;
   #destFolder;
   #resourceDist;
@@ -24,7 +24,8 @@ class PageLoader {
     $ = cheerio.load(html);
 
     await this.#createResourceDir();
-    await this.#loadImages();
+    await this.#loadResources();
+    // await this.#loadImages();
 
     await fsc.writeFile(filepath, $);
 
@@ -50,11 +51,23 @@ class PageLoader {
     return { filepath, html };
   }
 
-  async #loadImages() {
+  async #loadResources() {
+    const $links = $('link');
     const $images = $('img');
-    await Promise.allSettled($images.map((_, img) => this.#loadResource(img)));
+    const $scripts = $('script');
+
+    const promises = [$links, $images, $scripts].flatMap(($elements) =>
+      $elements.toArray().map((el) => this.#loadResource(el)),
+    );
+
+    await Promise.allSettled(promises);
   }
 
+  // async #loadImages() {
+  //   const $images = $('img');
+  //   await Promise.allSettled($images.map((_, img) => this.#loadResource(img)));
+  // }
+
   #getUrlAttr(element) {
     return element.name === 'link' ? 'href' : 'src';
   }
@@ -68,7 +81,7 @@ class PageLoader {
     const resourceUrl = new URL(element.attribs[urlAttr], this.#url.href);
 
     if (!this.#isResourceLocal(resourceUrl)) {
-      return;
+      return Promise.resolve();
     }
 
     let resp;
@@ -115,11 +128,6 @@ class PageLoader {
   }
 }
 
-const loadPage = (url, destFolder) => {
+export const loadPage = (url, destFolder) => {
   return new PageLoader(url, destFolder).load();
 };
-
-module.exports = {
-  PageLoader,
-  loadPage,
-};