Merge pull request #1369 from macbre/puppeteer/22.10.0

bump puppeteer to v22.10.0 [HeadlessChrome/125.0.0.0]

core/scope.js

@@ -1,7 +1,7 @@
 /**
  * phantomas browser "scope" with helper code
  *
- * Code below is executed in page's "scope" (injected by lib/browser.js)
+ * Code below is executed in page's "scope" (injected by the scope.injectJs() helper)
  */
 /* istanbul ignore next */
 (function coreScope(scope) {

lib/browser.js

@@ -179,7 +179,7 @@ Browser.prototype.init = async (phantomasOptions) => {
     var meta = responses[data.requestId];
 
     /* istanbul ignore if */
-    if (typeof meta === "undefined") {
+    if (typeof meta?.response === "undefined") {
       // the browser sometimes looses trace of a request, let's ignore.
       networkDebug(
         "Can't find request id %d in previous requests",

lib/index.js

@@ -89,7 +89,10 @@ function phantomas(url, opts) {
           return page.$$(selector);
         },
 
-        // @see https://github.com/GoogleChrome/puppeteer/blob/v1.11.0/docs/api.md#pageevaluateonnewdocumentpagefunction-args
+        // @see https://pptr.dev/api/puppeteer.page.evaluateonnewdocument
+        // Adds a function which would be invoked in when:
+        //  - the child frame is attached or navigated
+        //  - the page is navigated
         injectJs: async (script) => {
           const debug = require("debug")("phantomas:injectJs");
 
@@ -98,7 +101,9 @@ function phantomas(url, opts) {
             suffix = "}";
 
           const preloadFile =
-            prefix + require("fs").readFileSync(script, "utf8") + suffix;
+            prefix +
+            (await require("fs/promises").readFile(script, "utf8")) +
+            suffix;
 
           await page.evaluateOnNewDocument(preloadFile);
 
@@ -117,8 +122,9 @@ function phantomas(url, opts) {
       // @see https://github.com/GoogleChrome/puppeteer/blob/v1.11.0/docs/api.md#pageexposefunctionname-puppeteerfunction
       await page.exposeFunction("__phantomas_emit", scope.emit);
 
-      // Inject helper code into the browser's scope
-      events.on("init", () => {
+      // Inject helper code into the browser's scope (but only once!)
+      events.once("init", () => {
+        debug("onInit: injecting the core/scope.js ...");
         scope.injectJs(__dirname + "/../core/scope.js");
       });
 

modules/domComplexity/scope.js

@@ -92,13 +92,17 @@
     })();
 
     // count <iframe> tags
-    document.querySelectorAll("iframe").forEach(function (iframe) {
-      phantomas.incrMetric("iframesCount"); // @desc number of iframe nodes
+    const iframes = document.querySelectorAll("iframe");
+    phantomas.setMetric("iframesCount", iframes.length); // @desc number of iframe nodes
+
+    for (const iframe of iframes) {
+      phantomas.log(`iframe: ${iframe.src}`);
+
       phantomas.addOffender("iframesCount", {
         element: phantomas.getDOMPath(iframe),
         url: iframe.src,
       });
-    });
+    }
 
     phantomas.spyEnabled(true);
   });

package.json

@@ -34,7 +34,7 @@
     "decamelize": "^5.0.0",
     "fast-stats": "0.0.6",
     "js-yaml": "^4.0.0",
-    "puppeteer": "^22.7.1"
+    "puppeteer": "^22.10.0"
   },
   "devDependencies": {
     "@jest/globals": "^28.0.0",
@@ -62,7 +62,7 @@
     "coverageThreshold": {
       "global": {
         "statements": 89,
-        "branches": 85,
+        "branches": 80,
         "functions": 89,
         "lines": 89
       }