apify-projects · Patai5 · Sep 22, 2024 · Sep 21, 2024 · Sep 22, 2024 · Sep 22, 2024
diff --git a/code/package-lock.json b/code/package-lock.json
diff --git a/code/package.json b/code/package.json
@@ -13,6 +13,7 @@
         "ajv-formats": "^2.1.1",
         "apify": "^3.1.16",
         "apify-client": "^2.9.3",
+        "cheerio": "^1.0.0",
         "crawlee": "^3.8.1",
         "gpt-3-encoder": "^1.1.4",
         "joplin-turndown-plugin-gfm": "^1.0.12",

diff --git a/code/src/processors.ts b/code/src/processors.ts
@@ -1,51 +1,33 @@
+import { load } from 'cheerio';
 import { encode } from 'gpt-3-encoder';
-import { Page } from 'playwright';
 
 import { htmlToMarkdownProcessor } from './markdown.js';
 
 const JSON_REGEX = /\{(?:[^{}]|())*\}/;
 
 /**
  * Shrinks HTML by removing css targeted elements and extra spaces
- * @param html
  */
 export const shrinkHtml = async (
     html: string,
-    page: Page,
     options: { removeLinkUrls: boolean; removeElementsCssSelector?: string },
 ) => {
     const { removeElementsCssSelector, removeLinkUrls } = options;
 
-    const stripped = await page.evaluate(
-        // eslint-disable-next-line @typescript-eslint/no-shadow
-        ([unstripped, removeSelector, removeLinkUrls]) => {
-            const doc = new DOMParser().parseFromString(unstripped, 'text/html');
-            if (removeSelector) {
-                const elements = doc.querySelectorAll(removeSelector);
-                for (const element of elements) {
-                    // there have been some cases when the page's own scripts cause errors and running this line
-                    // causes them to reemerge, so what in try/cartch
-                    try {
-                        element.remove();
-                    } catch (err) {
-                        /* ignore */
-                    }
-                }
-            }
+    const $ = load(html);
 
-            if (removeLinkUrls) {
-                const linkEls = doc.querySelectorAll('a');
-                for (const linkEl of linkEls) {
-                    linkEl.removeAttribute('href');
-                }
-            }
+    if (removeElementsCssSelector) {
+        $(removeElementsCssSelector).map((_, el) => $(el).remove());
+    }
+    if (removeLinkUrls) {
+        $('a').map((_, el) => $(el).removeAttr('href'));
+    }
 
-            return doc.documentElement.outerHTML;
-        },
-        [html, removeElementsCssSelector, removeLinkUrls] as const,
-    );
-    return stripped.replace(/\s{2,}/g, ' ') // remove extra spaces
-        .replace(/>\s+</g, '><'); // remove all spaces between tags
+    const stripped = $.html();
+    return stripped
+        .replace(/\s{2,}/g, ' ') // remove extra spaces
+        .replace(/>\s+</g, '><') // remove all spaces between tags
+        .replace(/^<!DOCTYPE[^>]*>/i, ''); // remove doctype
 };
 
 /**

diff --git a/code/src/routes/crawl-route.ts b/code/src/routes/crawl-route.ts
@@ -114,7 +114,7 @@ export const crawlRoute = async (context: PlaywrightCrawlingContext) => {
         originContentHtml = await page.content();
     }
 
-    const shrunkHtml = await shrinkHtml(originContentHtml, page, { removeLinkUrls, removeElementsCssSelector });
+    const shrunkHtml = await shrinkHtml(originContentHtml, { removeLinkUrls, removeElementsCssSelector });
     const originPageContent = pageFormat === PAGE_FORMAT.MARKDOWN ? htmlToMarkdown(shrunkHtml) : shrunkHtml;
 
     const instructionTokenLength = getNumberOfTextTokens(instructions);

diff --git a/code/test/unit/processors.test.ts b/code/test/unit/processors.test.ts
@@ -0,0 +1,35 @@
+import { describe, expect, test } from 'vitest';
+
+import { shrinkHtml } from '../../src/processors';
+
+describe('shrinkHtml', () => {
+    test('should shrink additional spaces', async () => {
+        const html = `<html>   <head>      <title>Title1     end</title> </head> <body> <p>text    1   </p> </body></html>`;
+        const result = await shrinkHtml(html, { removeLinkUrls: false });
+
+        expect(result).toBe(`<html><head><title>Title1 end</title></head><body><p>text 1 </p></body></html>`);
+    });
+
+    test('should ignore doctype', async () => {
+        const html = `<!DOCTYPE html><html><head></head><body><p>Test</p></body></html>`;
+        const result = await shrinkHtml(html, { removeLinkUrls: false });
+
+        expect(result).toBe(`<html><head></head><body><p>Test</p></body></html>`);
+    });
+
+    test('should remove link urls', async () => {
+        const html = `<html><a href="http://example.com">Link</a><p class="test">Test</p></html>`;
+        const result = await shrinkHtml(html, { removeLinkUrls: true });
+
+        expect(result).toBe(`<html><head></head><body><a>Link</a><p class="test">Test</p></body></html>`);
+    });
+
+    test('should remove elements by css selector', async () => {
+        const html = `<html><a href="http://example.com">Link</a><p class="not-remove">Test1</p><p class="remove">Test2</p></html>`;
+        const result = await shrinkHtml(html, { removeLinkUrls: false, removeElementsCssSelector: '.remove' });
+
+        expect(result).toBe(
+            `<html><head></head><body><a href="http://example.com">Link</a><p class="not-remove">Test1</p></body></html>`,
+        );
+    });
+});
diff --git a/shared/CHANGELOG.md b/shared/CHANGELOG.md
@@ -1,5 +1,9 @@
 This changelog tracks updates to both GTP Scraper and Extended GPT Scraper actors.
 
+# 2024-09-22
+*Fixes*
+- Fixed a bug where HTML minimization was failing on some specific websites.
+
 # 2024-08-12
 *Features*
 - Added support for GPT-4o-mini model. (Extended GPT scraper)