@opentermsarchive/engine 10.2.0 → 10.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opentermsarchive/engine",
-  "version": "10.2.0",
+  "version": "10.3.1",
   "description": "Tracks and makes visible changes to the terms of online services",
   "homepage": "https://opentermsarchive.org",
   "bugs": {

package/src/archivist/fetcher/fullDomFetcher.js

@@ -3,12 +3,14 @@ import stealthPlugin from 'puppeteer-extra-plugin-stealth';
 
 import { resolveProxyConfiguration, extractProxyCredentials } from './proxyUtils.js';
 
-puppeteer.use(stealthPlugin());
-
 let browser;
 
 export default async function fetch(url, cssSelectors, config) {
+  puppeteer.use(stealthPlugin({ locale: config.language }));
+
+  let context;
   let page;
+  let client;
   let response;
   const selectors = [].concat(cssSelectors);
 
@@ -17,15 +19,20 @@ export default async function fetch(url, cssSelectors, config) {
   }
 
   try {
-    page = await browser.newPage();
+    context = await browser.createBrowserContext(); // Create an isolated browser context to ensure complete isolation between fetches (cookies, localStorage, sessionStorage, IndexedDB, cache)
+    page = await context.newPage();
 
+    await page.setViewport({ width: 1920, height: 1080 }); // Set a realistic viewport size to avoid detection based on default Puppeteer dimensions (800x600)
     await page.setDefaultNavigationTimeout(config.navigationTimeout);
     await page.setExtraHTTPHeaders({ 'Accept-Language': config.language });
 
-    await page.setCacheEnabled(false); // Disable cache to ensure fresh content on each fetch and prevent stale data from previous requests
-    const client = await page.target().createCDPSession();
+    // Use CDP to ensure the browser language is set correctly (most reliable method, see https://zirkelc.dev/posts/puppeteer-language-experiment)
+    client = await page.createCDPSession();
 
-    await client.send('Network.clearBrowserCookies'); // Clear cookies to ensure clean state between fetches and prevent session persistence across different URLs
+    await client.send('Network.setUserAgentOverride', {
+      userAgent: await browser.userAgent(),
+      acceptLanguage: config.language,
+    });
 
     if (browser.proxyCredentials?.username && browser.proxyCredentials?.password) {
       await page.authenticate(browser.proxyCredentials);
@@ -75,9 +82,15 @@ export default async function fetch(url, cssSelectors, config) {
     }
     throw new Error(error.message);
   } finally {
+    if (client) {
+      await client.detach();
+    }
     if (page) {
       await page.close();
     }
+    if (context) {
+      await context.close(); // Close the isolated context to free resources and ensure complete cleanup
+    }
   }
 }