phantomas 2.10.0 → 2.12.0

package/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) {

package/extensions/devices/devices.js

@@ -5,8 +5,8 @@
 
 module.exports = function (phantomas) {
   const puppeteer = require("puppeteer"),
-    devices = puppeteer.devices,
-    // @see https://github.com/GoogleChrome/puppeteer/blob/master/DeviceDescriptors.js
+    devices = puppeteer.KnownDevices,
+    // @see https://github.com/puppeteer/puppeteer/blob/main/packages/puppeteer-core/src/common/Device.ts
     availableDevices = {
       phone: "Galaxy S5", // 360x640
       "phone-landscape": "Galaxy S5 landscape", // 640x360
@@ -14,7 +14,7 @@ module.exports = function (phantomas) {
       "tablet-landscape": "Kindle Fire HDX landscape", // 1280x800
     };
 
-  var device;
+  let device;
 
   // check if --phone or --tablet option was passed
   Object.keys(availableDevices).forEach(function (item) {

package/extensions/postLoadDelay/postLoadDelay.js

@@ -3,6 +3,8 @@
  */
 "use strict";
 
+const { setTimeout } = require("timers/promises");
+
 module.exports = function (phantomas) {
   // e.g. --post-load-delay 5
   var delay = parseInt(phantomas.getParam("post-load-delay"), 10);
@@ -14,9 +16,9 @@ module.exports = function (phantomas) {
   // https://github.com/GoogleChrome/puppeteer/blob/v1.11.0/docs/api.md#framewaitforselectororfunctionortimeout-options-args
   phantomas.log("Will wait %d second(s) after load", delay);
 
-  phantomas.on("beforeClose", (page) => {
+  phantomas.on("beforeClose", async () => {
     phantomas.log("Sleeping for %d seconds", delay);
 
-    return page.waitForTimeout(delay * 1000);
+    return setTimeout(delay * 1000);
   });
 };

package/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",

package/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");
       });
 

package/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "phantomas",
-  "version": "2.10.0",
+  "version": "2.12.0",
   "author": "macbre <maciej.brencz@gmail.com> (http://macbre.net)",
   "description": "Headless Chromium-based web performance metrics collector and monitoring tool",
   "main": "./lib/index.js",
@@ -27,14 +27,14 @@
     "node": ">=16.0"
   },
   "dependencies": {
-    "analyze-css": "^2.0.0",
+    "analyze-css": "^2.1.89",
     "analyze-image": "^1.0.0",
     "commander": "^9.0.0",
     "debug": "^4.1.1",
     "decamelize": "^5.0.0",
     "fast-stats": "0.0.6",
     "js-yaml": "^4.0.0",
-    "puppeteer": "^21.2.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
       }