Release v1.2.2

Author: pilafmon

dist/puppeteer-browser-ready.d.ts

@@ -1,7 +1,8 @@
-//! puppeteer-browser-ready v1.2.1 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
+//! puppeteer-browser-ready v1.2.2 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
 
 /// <reference types="cheerio" />
 import { Browser, HTTPResponse, Page } from 'puppeteer';
+import { HTMLElement } from 'node-html-parser';
 import { Server } from 'http';
 import { SuiteFunction } from 'mocha';
 import httpTerminator from 'http-terminator';
@@ -29,9 +30,11 @@ export type Web = {
     title: string | null;
     html: string | null;
     $: cheerio.Root | null;
+    root: HTMLElement | null;
 };
 export type BrowserReadySettings = {
     addCheerio: boolean;
+    parseHtml: boolean;
     verbose: boolean;
 };
 export type BrowserReadyOptions = Partial<BrowserReadySettings>;

dist/puppeteer-browser-ready.js

@@ -1,5 +1,6 @@
-//! puppeteer-browser-ready v1.2.1 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
+//! puppeteer-browser-ready v1.2.2 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
 
+import { parse } from 'node-html-parser';
 import cheerio from 'cheerio';
 import express from 'express';
 import httpTerminator from 'http-terminator';
@@ -42,10 +43,13 @@ const browserReady = {
         return http.terminator.terminate();
     },
     goto(url, options) {
-        const defaults = { addCheerio: true, verbose: false };
+        const defaults = { addCheerio: true, parseHtml: true, verbose: false };
         const settings = { ...defaults, ...options };
+        if (options?.addCheerio)
+            console.log('puppeteer-browser-ready: Option "addCheerio" is deprecated, use "parseHtml" instead.');
         const log = (label, msg) => settings.verbose &&
             console.log('   ', Date.now() % 100000, label + ':', msg);
+        const rootInfo = (root) => root.constructor.name + '/' + root.firstChild.toString();
         const web = async (browser) => {
             log('Connected', browser.isConnected());
             try {
@@ -61,9 +65,10 @@ const browserReady = {
                 log('Title', title);
                 const html = response && await response.text();
                 log('Bytes', html?.length);
-                const $ = html && settings.addCheerio ? cheerio.load(html) : null;
-                log('$', $ && $['fn'].constructor.name);
-                return { browser, page, response, status, location, title, html, $ };
+                const $ = html && settings.addCheerio ? cheerio.load(html) : null; //deprecated
+                const root = html && settings.parseHtml ? parse(html) : null;
+                log('DOM root', root ? rootInfo(root) : null);
+                return { browser, page, response, status, location, title, html, $, root };
             }
             catch (error) {
                 const status = browser.isConnected() ? 'connected' : 'not connected';

hello-world/package.json

@@ -15,7 +15,7 @@
    },
    "dependencies": {
       "jshint": "~2.13",
-      "puppeteer": "~21.1",
+      "puppeteer": "~21.2",
       "puppeteer-browser-ready": "~1.2"
    }
 }

package.json

@@ -1,6 +1,6 @@
 {
    "name": "puppeteer-browser-ready",
-   "version": "1.2.1",
+   "version": "1.2.2",
    "description": "Simple utility to go to a URL and wait for the HTTP response",
    "license": "MIT",
    "type": "module",