Skip to content

Commit 1b55d07

Browse files
pilafmonpilafmon
committed
Release v0.4.7
1 parent 6a6b86a commit 1b55d07

File tree

4 files changed

+72
-44
lines changed

4 files changed

+72
-44
lines changed

‎dist/puppeteer-browser-ready.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//! puppeteer-browser-ready v0.4.6 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
1+
//! puppeteer-browser-ready v0.4.7 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
22

33
/// <reference types="cheerio" />
44
import httpTerminator from 'http-terminator';

‎dist/puppeteer-browser-ready.js‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
//! puppeteer-browser-ready v0.4.6 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
1+
//! puppeteer-browser-ready v0.4.7 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
22

3+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
5+
return new (P || (P = Promise))(function (resolve, reject) {
6+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
7+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
8+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
9+
step((generator = generator.apply(thisArg, _arguments || [])).next());
10+
});
11+
};
312
// Imports
413
import cheerio from 'cheerio';
514
import express from 'express';
@@ -12,7 +21,7 @@ const browserReady = {
1221
},
1322
startWebServer(options) {
1423
const defaults = { folder: '.', port: 0, verbose: true, autoCleanup: true };
15-
const settings = { ...defaults, ...options };
24+
const settings = Object.assign(Object.assign({}, defaults), options);
1625
const server = express().use(express.static(settings.folder)).listen(settings.port);
1726
const terminator = httpTerminator.createHttpTerminator({ server });
1827
const port = () => server.address().port;
@@ -44,23 +53,26 @@ const browserReady = {
4453
},
4554
goto(url, options) {
4655
const defaults = { addCheerio: true, debugMode: false };
47-
const settings = { ...defaults, ...options };
48-
const log = (item, msg) => settings.debugMode &&
49-
console.log(' ', Date.now() % 100000, item?.constructor?.name, '-', msg ?? typeof item);
50-
const web = async (browser) => {
56+
const settings = Object.assign(Object.assign({}, defaults), options);
57+
const log = (label, msg) => settings.debugMode &&
58+
console.log(' ', Date.now() % 100000, label + ':', msg);
59+
const web = (browser) => __awaiter(this, void 0, void 0, function* () {
60+
log('Connected', browser.isConnected());
5161
try {
52-
const page = await browser.newPage();
53-
log(page, url);
54-
const response = await page.goto(url);
55-
log(response, response.url());
62+
const page = yield browser.newPage();
63+
log('Page....', url);
64+
const response = yield page.goto(url);
65+
log('Response', response.url());
5666
const status = response && response.status();
57-
const location = await page.evaluate(() => globalThis.location);
58-
log(location, location.host);
59-
const title = response && await page.title();
60-
log(title, title);
61-
const html = response && await response.text();
67+
log('Status', status);
68+
const location = yield page.evaluate(() => globalThis.location);
69+
log('Host', location.host);
70+
const title = response && (yield page.title());
71+
log('Title', title);
72+
const html = response && (yield response.text());
73+
log('Bytes', html.length);
6274
const $ = html && settings.addCheerio ? cheerio.load(html) : null;
63-
log($ && $['fn']);
75+
log('$', $ && $['fn'].constructor.name);
6476
return { browser, page, response, status, location, title, html, $ };
6577
}
6678
catch (error) {
@@ -69,13 +81,15 @@ const browserReady = {
6981
console.log(error);
7082
throw error;
7183
}
72-
};
84+
});
7385
return web;
7486
},
75-
async close(web) {
76-
if (web && web.browser)
77-
await web.browser.close();
78-
return web;
87+
close(web) {
88+
return __awaiter(this, void 0, void 0, function* () {
89+
if (web && web.browser)
90+
yield web.browser.close();
91+
return web;
92+
});
7993
},
8094
};
8195
export { browserReady };

‎dist/puppeteer-browser-ready.umd.cjs‎

Lines changed: 35 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
1-
//! puppeteer-browser-ready v0.4.6 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
1+
//! puppeteer-browser-ready v0.4.7 ~~ https://github.com/center-key/puppeteer-browser-ready ~~ MIT License
22

3+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
4+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
5+
return new (P || (P = Promise))(function (resolve, reject) {
6+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
7+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
8+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
9+
step((generator = generator.apply(thisArg, _arguments || [])).next());
10+
});
11+
};
312
var __importDefault = (this && this.__importDefault) || function (mod) {
413
return (mod && mod.__esModule) ? mod : { "default": mod };
514
};
@@ -27,7 +36,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
2736
},
2837
startWebServer(options) {
2938
const defaults = { folder: '.', port: 0, verbose: true, autoCleanup: true };
30-
const settings = { ...defaults, ...options };
39+
const settings = Object.assign(Object.assign({}, defaults), options);
3140
const server = (0, express_1.default)().use(express_1.default.static(settings.folder)).listen(settings.port);
3241
const terminator = http_terminator_1.default.createHttpTerminator({ server });
3342
const port = () => server.address().port;
@@ -59,23 +68,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
5968
},
6069
goto(url, options) {
6170
const defaults = { addCheerio: true, debugMode: false };
62-
const settings = { ...defaults, ...options };
63-
const log = (item, msg) => settings.debugMode &&
64-
console.log(' ', Date.now() % 100000, item?.constructor?.name, '-', msg ?? typeof item);
65-
const web = async (browser) => {
71+
const settings = Object.assign(Object.assign({}, defaults), options);
72+
const log = (label, msg) => settings.debugMode &&
73+
console.log(' ', Date.now() % 100000, label + ':', msg);
74+
const web = (browser) => __awaiter(this, void 0, void 0, function* () {
75+
log('Connected', browser.isConnected());
6676
try {
67-
const page = await browser.newPage();
68-
log(page, url);
69-
const response = await page.goto(url);
70-
log(response, response.url());
77+
const page = yield browser.newPage();
78+
log('Page....', url);
79+
const response = yield page.goto(url);
80+
log('Response', response.url());
7181
const status = response && response.status();
72-
const location = await page.evaluate(() => globalThis.location);
73-
log(location, location.host);
74-
const title = response && await page.title();
75-
log(title, title);
76-
const html = response && await response.text();
82+
log('Status', status);
83+
const location = yield page.evaluate(() => globalThis.location);
84+
log('Host', location.host);
85+
const title = response && (yield page.title());
86+
log('Title', title);
87+
const html = response && (yield response.text());
88+
log('Bytes', html.length);
7789
const $ = html && settings.addCheerio ? cheerio_1.default.load(html) : null;
78-
log($ && $['fn']);
90+
log('$', $ && $['fn'].constructor.name);
7991
return { browser, page, response, status, location, title, html, $ };
8092
}
8193
catch (error) {
@@ -84,13 +96,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
8496
console.log(error);
8597
throw error;
8698
}
87-
};
99+
});
88100
return web;
89101
},
90-
async close(web) {
91-
if (web && web.browser)
92-
await web.browser.close();
93-
return web;
102+
close(web) {
103+
return __awaiter(this, void 0, void 0, function* () {
104+
if (web && web.browser)
105+
yield web.browser.close();
106+
return web;
107+
});
94108
},
95109
};
96110
exports.browserReady = browserReady;

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "puppeteer-browser-ready",
3-
"version": "0.4.6",
3+
"version": "0.4.7",
44
"description": "Simple utility to go to a URL and wait for the HTTP response (written in TypeScript)",
55
"license": "MIT",
66
"type": "module",

0 commit comments

Comments
 (0)