nodejs_chromium 1.0.4 → 1.0.6

package/index.js

@@ -1,23 +1,34 @@
 require('nodejs_patch');
 const puppeteer = require("puppeteer");
 const chrome = require("./src/chrome.js");
+global.__UA__ = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36';
 
 async function newChrome(params) {
-	const ua = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/122.0.0.0 Safari/537.36';
-	let { id, view, width, height, scale, mobile, dumpio, debug, incognito, path } = params;
-	if (!width) width = 1024;
-	if (!height) height = 768;
-	if (!scale) scale = 1;
-	if (!id) id = (Date.now() / 1000) + '';
+	let {
+		id = 'myChrome',
+			view = false,
+			width = 1024,
+			height = 768,
+			scale = 1,
+			mobile = false,
+			dumpio = false,
+			debug = false,
+			incognito = true,
+			path = void 0,
+			slowMo = 1,
+			ua = void 0
+	} = params;
 
 	let option = {
 		userDataDir: `runtime/template/${id}`,
 		// timeout: 500,//最大允许超时间，默认为3000，最小215，一般不要设置
-		slowMo: 2, //将 Puppeteer 操作减少指定的毫秒数，每一步停留时间，不能太大，否则会太慢。这样你就可以看清发生了什么，这很有用。
+		slowMo, //每一步停留时间，不能太大，否则会太慢，特别是在类似写入很多Cookies时，每写入一个都要等一下。
 		headless: view ? false : 'new', //'new',设置是否在无头模式下运行浏览器,false=会启动浏览器，true=无界面
 		devtools: !!debug, //打开调试
 		ignoreHTTPSErrors: true, //忽略 HTTPS 错误。屏蔽跳转不同域名的报错
-		ignoreDefaultArgs: ["--enable-automation"], //忽略默认的 --enable-automation 参数，这有助于防止某些网站检测到自动化行为。
+		ignoreDefaultArgs: [
+			"--enable-automation", //忽略默认的 --enable-automation 参数，这有助于防止某些网站检测到自动化行为。
+		],
 		dumpio: !!dumpio, //是否将浏览器的标准输入/输出流（stdio）的内容输出到 Node.js 的 stdout 和 stderr。
 		defaultViewport: {
 			width,
@@ -26,6 +37,7 @@ async function newChrome(params) {
 			isMobile: !!mobile,
 		},
 		args: [
+			'--enable-chrome-browser-cloud-management', //Cloud Browser Client Management (CBCM)
 			'--disable-web-security', //禁用浏览器的同源策略（Same-Origin Policy）和跨站请求伪造（CSRF）保护
 			`--window-size=${width},${height}`,
 			'--no-sandbox', //禁用沙箱模式
@@ -35,6 +47,8 @@ async function newChrome(params) {
 			'--disable-blink-features=AutomationControlled', //禁用 blink 引擎的自动化控制特性，防止网站通过检测 blink 引擎的特性来判断浏览器是否处于自动化控制状态。
 			// 在自动化测试或爬虫等场景中，这个参数可以帮助隐藏浏览器的自动化痕迹，使得浏览器行为更接近于真实用户操作
 			'--lang=zh-CN', //设置中文环境
+			'--disable-extensions', //禁止启动扩展
+			'--disable-dev-shm-usage', //Linux系统中使用普通的文件系统缓存避免因为/dev/shm大小不足而导致的问题
 		]
 	}
 
@@ -46,8 +60,9 @@ async function newChrome(params) {
 
 	const browser = await puppeteer.launch(option);
 	const page = (await browser.pages())[0];
+	// const page = await browser.newPage();
 	await page.setRequestInterception(true); //允许拦截
-	await page.setUserAgent(params.ua || ua);
+	if (ua) await page.setUserAgent(ua);
 	await page.evaluateOnNewDocument(() => {
 		const newProto = navigator.__proto__;
 		delete newProto.webdriver; //删除 navigator.webdriver字段

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodejs_chromium",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/chrome.js

@@ -1,89 +1,342 @@
-const { writeFileSync: saveFile } = require("fs");
+const fs = require("fs");
 const { parse: parseUrl } = require("url");
 
+
+/**
+ *
+ * class CdpFrame extends _classSuper
+ * \node_modules\nodejs_chromium\node_modules\puppeteer-core\lib\cjs\puppeteer\cdp\Frame.js
+ * \node_modules\nodejs_chromium\node_modules\puppeteer-core\lib\cjs\puppeteer\cdp\Page.js
+ * \node_modules\puppeteer-core\src\api\Page.ts
+ *
+ * @type {exports}
+ */
 module.exports = class {
 	browser = null;
 	page = null;
 	responseCall = null;
+	requestCall = null;
+	isFrame = false;
+	visible = false;
+	params = {};
 
-	constructor(browser, page, params) {
+	constructor(browser, page, params, isFrame = false) {
 		this.browser = browser;
 		this.page = page;
+		this.params = params;
+		this.visible = !!params.view;
+		this.isFrame = !!isFrame;
+		this.doListening(params);
+	}
 
-		page.on('request', (request) => {
-			const { abort_img, no_cache, append_headers } = params;
-			if (abort_img && /\.(?:png|jpg|jpeg|svg|gif)$/i.test(request.url())) {
-				request.abort();
-				return;
-			}
+	request(call) {
+		this.requestCall = call;
+		return this;
+	}
 
-			const headers = request.headers();
-			if (typeof append_headers === 'object') Object.assign(headers, append_headers);
+	response(call) {
+		this.responseCall = call;
+		return this;
+	}
 
-			headers['Access-Control-Allow-Origin'] = '*'; // 设置允许跨源访问的域名，可以根据需求修改
-			headers['Access-Control-Allow-Methods'] = '*'; //'GET, POST, PUT, OPTIONS';
-			// headers['Access-Control-Allow-Headers'] = 'Content-Type';
+	/**
+	 * 重新在当前浏览器创建新窗口
+	 */
+	async clone() {
+		try {
+			const page = await this.browser.newPage();
+			await page.setRequestInterception(true); //允许拦截
+			// await page.setUserAgent(this.params.ua);
+			await page.evaluateOnNewDocument(() => {
+				const newProto = navigator.__proto__;
+				delete newProto.webdriver; //删除 navigator.webdriver字段
+				navigator.__proto__ = newProto; //在每次新文档加载时，删除 navigator.webdriver 字段，这有助于防止某些网站检测到自动化行为。
+			});
+			return new module.exports(this.browser, page, this.params, false); //new 自身
+		}
+		catch (e) {
+			console.log('[chrome.iframe.Error]', e.message);
+		}
+	}
 
-			if (no_cache) {
-				const rType = request.resourceType();
-				if (rType === 'script' || rType === 'stylesheet') {
-					headers['Cache-Control'] = 'no-store'; // 禁用缓存
-				}
-			}
+	/**
+	 * page.on方法
+	 */
+	on(key, call) {
+		try {
+			this.page.on(key, call);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.on.Error]', e.message);
+		}
+	}
 
-			request.continue({ headers });
-		});
+	once(key, call) {
+		try {
+			this.page.once(key, call);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.on.Error]', e.message);
+		}
+	}
 
-		page.on('response', async res => {
-			if (!this.responseCall) return;
-			let json = await this.parseResponse(res);
-			this.responseCall(json);
-		});
+	off(key, call) {
+		try {
+			this.page.off(key, call);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.on.Error]', e.message);
+		}
 	}
 
-	response(call) {
-		this.responseCall = call;
+	emit(key, value) {
+		try {
+			this.page.emit(key, value);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.on.Error]', e.message);
+		}
 	}
 
-	async waiting(time) {
-		if (time < 100) time = time * 1000;
-		return await new Promise(res => setTimeout(res, time));
+	/**
+	 * 这必须放在已经打开过这个URL之后
+	 */
+	waitForFrame() {
+		try {
+			this.page.waitForFrame(async frame => {
+				return frame.name() === 'Test';
+			});
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.waitForFrame.Error]', e.message);
+		}
+	}
+
+
+	/**
+	 * 等待框架URL包含指定字串
+	 */
+	async waitFrame(urlKey, timeout = 5000) {
+		try {
+			return await this.page.waitForFrame(async frame => {
+				return frame.url().indexOf(urlKey) > 0;
+			}, { timeout });
+		}
+		catch (e) {
+			console.log('[chrome.waitFrame.Error]', e.message);
+		}
 	}
 
-	async open(url) {
-		await this.page.goto(url, { waitUntil: 'load' });
+	async iframe(tag) {
+		try {
+			const frame = await (await this.page.$(tag)).contentFrame();
+			// return new iframe(this.browser, frame, this.params);
+			return new module.exports(this.browser, frame, this.params, true); //new 自身
+		}
+		catch (e) {
+			console.log('[chrome.iframe.Error]', e.message);
+		}
 	}
 
 	/**
-	 * 根据目标要求格式提交
-	 *
-	 * @param url
-	 * @param data
+	 * 关闭
 	 */
-	async post(url, data) {
-		//JSON.stringify(data)
-		await this.page.goto(url, { method: 'POST', body: data, waitUntil: 'load' });
+	async close(act = 3) {
+
+		try {
+			if (act & 1) await this.page.close();
+			if (act & 2) await this.browser.close();
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.close.Error]', e.message);
+		}
 	}
 
-	async input(el, value) {
-		await this.page.type(el, value);
+	/**
+	 * 断开进程与浏览器
+	 */
+	async disconnect() {
+		try {
+			await this.browser.disconnect();
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.disconnect.Error]', e.message);
+		}
+	}
+
+	url() {
+		return this.page.url();
 	}
 
-	async click(el) {
-		await this.page.click(el);
+
+	async size(width = 1024, height = 768) {
+		await this.page.setViewport({ width, height });
+		return this;
 	}
 
 	/**
-	 * page.on方法
+	 * @param {Object} url
+	 * @param {Object} option
+	 * timeout:
+	 * referer:
+	 * referrerPolicy:
+	 * waitUntil：默认
+	 *        load=*等待“加载”事件。,默认
+	 *        domcontentloaded    *等待“DOMContentLoaded”事件。
+	 *        networkidle0:Waits till there are no more than 0 network connections for at least `500`ms
+	 *        networkidle2:Waits till there are no more than 2 network connections for at least `500`ms
 	 */
-	async on(key, call) {
-		await this.page.on(key, call);
+	async goto(url, option = {}) {
+		try {
+			let { timeout = 0, referer, waitUntil = 'load' } = option;
+			if (typeof url === 'number') {
+				if (url < 0) {
+					await this.page.goBack({ timeout, referer, waitUntil });
+				}
+				else {
+					await this.page.goForward({ timeout, referer, waitUntil });
+				}
+			}
+			else {
+				await this.page.goto(url, { timeout, referer, waitUntil });
+			}
+			await this.page.goto(url, { timeout, referer, waitUntil });
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.open.Error]', e.message);
+		}
 	}
 
-	async disconnect() {
-		await this.browser.disconnect();
+	async open(url, option = {}) {
+		return await this.goto(url, option);
+	}
+
+	/**
+	 * 直接获取网页全部信息，或设置
+	 */
+	async content(html, option = {}) {
+		try {
+			if (html === undefined) return await this.page.content();
+			let { timeout = 0, waitUntil = 'load' } = option;
+			if (this.isFrame) {
+				await this.page.setFrameContent(html);
+			}
+			else {
+				await this.page.setContent(html, { timeout, waitUntil });
+			}
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.content.Error]', e.message);
+		}
 	}
 
+	/**
+	 * 获取部分或全部HTML
+	 * @param {Object} obj
+	 */
+	async html(obj) {
+		try {
+			if (obj) {
+				return await this.page.evaluate(ele => ele.innerHTML, obj);
+			}
+			return await this.page.evaluate(() => {
+				return document.documentElement.innerHTML;
+			});
+		}
+		catch (e) {
+			console.log('[chrome.html.Error]', e.message);
+		}
+	}
+
+	async text(obj) {
+		try {
+			if (obj) {
+				return await this.page.evaluate(ele => ele.textContent, obj);
+			}
+			return await this.page.evaluate(() => {
+				return document.documentElement.textContent;
+			});
+		}
+		catch (e) {
+			console.log('[chrome.text.Error]', e.message);
+		}
+	}
+
+	/**
+	 * 显示或隐藏某个标签
+	 *
+	 * @param {Object} tag
+	 * @param {Object} show 默认显示
+	 */
+	async display(tag, show) {
+		try {
+			// const element = await this.page.querySelector(tag);
+			// element.style.display = (!!show) ? '' : 'none';
+			(await this.page.querySelector(tag)).style.display = (!!show) ? '' : 'none';
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.text.Error]', e.message);
+		}
+	}
+
+
+	/**
+	 * 遍历tag1里的tag2
+	 *
+	 * @param {Object} tag1
+	 * @param {Object} tag2
+	 * @param {Object} call
+	 */
+	async elements(tag1, tag2, call) {
+		try {
+			const div = await this.page.$(tag1);
+			if (!div) {
+				throw new Error(`${tag1} not exists`);
+			}
+			for (const elm of (await div.$$(tag2))) {
+				call(elm, (await elm.evaluate(node => node.innerHTML)));
+			}
+		}
+		catch (e) {
+			console.log('[chrome.elements.Error]', e.message)
+		}
+	}
+
+
+	/**
+	 * 支持css普通选择器方式和伪类方式
+	 * div.body
+	 * div#body
+	 * div[name=abc]
+	 * iframe:first-child
+	 * div>ul>li:nth-child(4)>a
+	 *
+	 * @param {Object} tag
+	 */
+	async element(tag) {
+		try {
+			return await this.page.$(tag);
+		}
+		catch (e) {
+			console.log('[chrome.element.Error]', e.message);
+			return null;
+		}
+	}
+
+
+	/**
+	 * 等待浏览器跳转
+	 */
 	async navigation(timeout = 0, tryCount = 0) {
 		if (timeout < 200) timeout = timeout * 1000;
 		try {
@@ -92,12 +345,15 @@ module.exports = class {
 		}
 		catch (e) {
 			if (tryCount > 0) {
-				return await this.navigation(ele, timeout, --tryCount)
+				return await this.navigation(timeout, --tryCount)
 			}
 			return false;
 		}
 	}
 
+	/**
+	 * 等待某个元素出现
+	 */
 	async wait(ele, timeout = 0, tryCount = 0) {
 		if (timeout < 200) timeout = timeout * 1000;
 		try {
@@ -112,53 +368,239 @@ module.exports = class {
 		}
 	}
 
+
+	/**
+	 * 等待x秒
+	 * @param {Object} time
+	 */
+	async waiting(time) {
+		return await this.sleep(time);
+	}
+
+	async sleep(time) {
+		if (time < 100) time = time * 1000;
+		try {
+			await new Promise(res => setTimeout(res, time));
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.sleep.Error]', e.message);
+		}
+	}
+
+	/**
+	 * delay=每键入一个字符延迟毫秒
+	 */
+	async input(el, value, delay = 1) {
+		try {
+			await this.page.type(el, value, { delay });
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.input.Error]', e.message);
+		}
+	}
+
+	/**
+	 * \node_modules\nodejs_chromium\node_modules\puppeteer-core\lib\cjs\puppeteer\api\Page.js
+	 * @param {Object} el
+	 *
+	 * option:
+	 * delay    =鼠标按下后延迟释放鼠标的时间（以毫秒为单位）。
+	 * count    =次数，默认1
+	 * offset    ={x,y}可单击点相对于边框左上角的偏移。
+	 *
+	 */
+	async click(el, option = {}) {
+		try {
+			let { delay = 100, count = 1, x = 6, y = 3 } = option;
+			await this.page.click(el, { delay, count, offset: { x, y } });
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.click.Error]', e.message);
+		}
+	}
+
+	async tap(el) {
+		try {
+			await this.page.tap(el);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.hover.Error]', e.message);
+		}
+	}
+
+	async focus(el) {
+		try {
+			await this.page.focus(el);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.focus.Error]', e.message);
+		}
+	}
+
+	async hover(el) {
+		try {
+			await this.page.hover(el);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.hover.Error]', e.message);
+		}
+	}
+
+
+	/**
+	 * 根据目标要求格式提交
+	 *
+	 * @param url
+	 * @param data
+	 */
+	async post(url, data) {
+		//JSON.stringify(data)
+		try {
+			await this.page.goto(url, { method: 'POST', body: data, waitUntil: 'load' });
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.post.Error]', e.message);
+		}
+	}
+
+
+	/**
+	 * 保存HTML
+	 * @param {Object} file
+	 */
 	async saveHtml(file) {
 		try {
 			await this.improveUrls(); //修正js/css的域名
 			const body = await this.page.evaluate(() => {
 				return document.documentElement.innerHTML;
 			});
-			await saveFile(file, body);
+			await fs.writeFileSync(file, body);
+			return this;
 		}
 		catch (e) {
-			console.log('saveHtml Error:', e.parse());
+			console.log('[chrome.saveHtml.Error]', e.parse());
 		}
 	}
 
-	async setCookie(cookies) {
-		await this.page.setCookie(...cookies);
+
+	jsonArray(cookiesVal, host) {
+		if (!cookiesVal) return [];
+		return JSON.parse(cookiesVal).map(cook => {
+			let { name, value, domain } = cook;
+			if (!domain) domain = host;
+			return { name, value, domain };
+		});
+	}
+
+	/**
+
+	 // const url = parseUrl(this.page.url());
+	 // const host = '.' + url.host.split('.').slice(-2).join('.');
+	 // let cookiesVal = read(file, 'utf8');
+	 // cookiesVal = this.jsonArray(cookiesVal, host);
+
+	 */
+
+	/**
+	 * 合并两个Cookies，并以后面的值为准
+	 *
+	 * @param {Object} oldCookies
+	 * @param {Object} newCookies
+	 */
+	async mergeNewCookies(oldCookies, newCookies) {
+		if (newCookies.length === 0) return oldCookies;
+		// let aMap = new Map(oldCookies.map(obj => [obj.name, obj]));//浅拷贝
+		let aMap = JSON.parse(JSON.stringify(this.cookies)); //深拷贝
+		newCookies.map(obj => {
+			aMap.set(obj.name, obj)
+		});
+		return await Array.from(aMap.values());
 	}
 
-	async getCookie() {
-		return await this.page.cookies();
+
+	/**
+	 * 获取当前页面的Cookies
+	 */
+	async getCookies() {
+		try {
+			return await this.page.cookies();
+		}
+		catch (e) {
+			console.log('[chrome.getCookies.Error]', e.message);
+			return [];
+		}
 	}
 
-	async saveCookies(file) {
+	/**
+	 * 设置Cookies
+	 * @param {Object} cookies
+	 */
+	async setCookies(cookies) {
 		try {
-			const cookies = await this.page.cookies();
-			await saveFile(file, JSON.stringify(cookies, null, 2));
+			await this.page.setCookie(...cookies);
+			return this;
 		}
 		catch (e) {
-			console.log('saveHtml Error:', e.parse());
+			console.log('[chrome.setCookies.Error]', e.message);
 		}
 	}
 
+	/**
+	 * 保存当前页面中的Cookies
+	 * @param {Object} file
+	 */
+	async saveCookies(file, append = true) {
+		try {
+			let cookies = await this.page.cookies();
+
+			if (append && fs.existsSync(file)) {
+				let dbCookies = JSON.parse(fs.readFileSync(file, 'utf8'));
+				cookies = this.mergeNewCookies(dbCookies, cookies);
+			}
+
+			await fs.writeFileSync(file, JSON.stringify(cookies, null, 2));
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.saveCookies.Error]', e.parse());
+		}
+	}
+
+	/**
+	 * 加水印，这里实际上是在网页加个DIV并显示时间
+	 * @param {Object} conf
+	 */
 	async watermark(conf) {
-		await this.page.evaluate((conf) => {
-			const wmDiv = document.createElement('div#watermark');
-			wmDiv.style.position = 'fixed';
-			wmDiv.style.top = `50%`;
-			wmDiv.style.left = `50%`;
-			wmDiv.style.transform = 'translate(-50%, -50%)';
-			wmDiv.style.fontSize = `36px`;
-			wmDiv.style.zIndex = '10000';
-			// wmDiv.style.color = color;
-			wmDiv.style.color = 'rgba(0, 0, 0, 0.9)';
-			wmDiv.style.pointerEvents = 'none';
-			wmDiv.innerText = conf.text;
-			document.body.appendChild(wmDiv);
-		}, conf);
-		await this.page.waitForSelector('div#watermark', { timeout: 1000 });
+		try {
+			const tmpID = 'watermark' + Date.now();
+			await this.page.evaluate((conf, tmpID) => {
+				const wmDiv = document.createElement('div');
+				wmDiv.id = tmpID;
+				wmDiv.style.position = 'fixed';
+				wmDiv.style.top = `50%`;
+				wmDiv.style.left = `50%`;
+				wmDiv.style.transform = 'translate(-50%, -50%)';
+				wmDiv.style.fontSize = `36px`;
+				wmDiv.style.zIndex = '10000';
+				// wmDiv.style.color = color;
+				wmDiv.style.color = 'rgba(0, 0, 0, 0.9)';
+				wmDiv.style.pointerEvents = 'none';
+				wmDiv.innerText = conf.text;
+				document.body.appendChild(wmDiv);
+			}, conf, tmpID);
+			await this.page.waitForSelector(`div#${tmpID}`, { timeout: 1000 });
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.watermark.Error]', e.message);
+		}
 	}
 
 
@@ -168,14 +610,20 @@ module.exports = class {
 	 * @param quality
 	 */
 	async photograph(file, quality = 50) {
-		await this.page.screenshot({
-			path: file,
-			fullPage: true, //全屏
-			type: 'jpeg',
-			quality: quality,
-			omitBackground: true, //显示背景
-		});
-		// console.log('photograph=', file);
+		try {
+			await this.page.screenshot({
+				path: file,
+				fullPage: true, //全屏
+				type: 'jpeg',
+				quality: quality,
+				omitBackground: true, //显示背景
+			});
+			// console.log('photograph=', file);
+			return this;
+		}
+		catch (e) {
+			console.log('[chrome.photograph.Error]', e.message);
+		}
 	}
 
 	/**
@@ -185,17 +633,56 @@ module.exports = class {
 		const url = parseUrl(this.page.url());
 		const domain = url.protocol + '//' + url.host;
 		await this.page.evaluate((domain) => {
-			const elements = document.querySelectorAll('script[src], link[href], iframe[src]');
-			elements.forEach((element) => {
-				const src = element.getAttribute('src');
-				const href = element.getAttribute('href');
-				if (src && src.startsWith('/')) element.src = domain + src;
-				if (href && href.startsWith('/')) element.href = domain + href;
-			});
+			try {
+				const tags = document.querySelectorAll('script[src], link[href], iframe[src]');
+				tags.forEach((ele) => {
+					const src = ele.getAttribute('src');
+					const href = ele.getAttribute('href');
+					if (src && src.startsWith('/')) ele.src = domain + src;
+					if (href && href.startsWith('/')) ele.href = domain + href;
+				});
+			}
+			catch (e) {
+				console.log('[chrome.improveUrls.Error]', e.message);
+			}
 		}, domain);
 	}
 
 
+	/**
+	 * 解析网页set-cookies的值
+	 *
+	 * @param {Object} strCookies
+	 */
+	async parseCookies(strCookies) {
+		return await strCookies.split("\n").map((ls, i) => {
+			let value = {};
+			ls.split(';').map((ln, j) => {
+				// console.log(ln);
+				const arr = ln.split('=');
+				const Key = (arr[0]).trim();
+				if (!Key) return;
+
+				if (j === 0) {
+					value.name = Key;
+					value.value = arr[1];
+				}
+				else if (Key === 'Max-Age') {
+					value.expire = parseInt(arr[1]) + (Date.now() / 1000);
+				}
+				else if (Key === 'Secure') {
+					value.source = true;
+					value.sourceScheme = 'Secure';
+				}
+				else {
+					value[Key[0].toLowerCase() + Key.substring(1)] = arr[1] || true;
+				}
+			})
+			return value;
+		})
+	}
+
+
 	async parseResponse(response) {
 		// const response = await this.page.waitForResponse(res => res);
 
@@ -217,7 +704,7 @@ module.exports = class {
 		value.datetime = (new Date(headers['date'])).date('yyyy-mm-dd hh:ii:ss');
 		// value.headers = headers;
 		if (headers['server']) value.server = headers['server'];
-		if (headers['set-cookie']) value.cookies = headers['set-cookie'];
+		if (headers['set-cookie']) value.cookies = await this.parseCookies(headers['set-cookie']);
 		value.remote = await response.remoteAddress(); //目标服务器
 		if (value.status === 301 || value.status === 302) return value;
 		if (['image', 'font', 'other', 'script', 'stylesheet', 'document', 'ping', 'fetch'].has(value.type)) return value;
@@ -231,20 +718,58 @@ module.exports = class {
 		if (value.post) value.post = value.post.toString();
 
 		try {
-			value.response = await response.buffer();
-			value.response = value.response.toString();
+			value.buffer = await response.buffer();
+			value.response = value.buffer.toString();
+			value.json = JSON.parse(value.response);
 		}
 		catch (e) {
-			value.response = e.parse();
+			value.json = e.parse();
 		}
 
 		return value;
 	}
 
 
+	doListening(params) {
+
+		this.page.on('request', async (request) => {
+			if (this.requestCall) {
+				const run = await this.requestCall(request);
+				if (run === false) {
+					request.abort();
+					return;
+				}
+			}
+
+			const { abort_img = false, no_cache = true, append_headers = {} } = params;
+			if (abort_img && /\.(?:png|jpg|jpeg|svg|gif)$/i.test(request.url())) {
+				request.abort();
+				return;
+			}
+
+			const headers = request.headers();
+			if (append_headers !== {}) Object.assign(headers, append_headers);
+
+			headers['Access-Control-Allow-Origin'] = '*'; // 设置允许跨源访问的域名，可以根据需求修改
+			headers['Access-Control-Allow-Methods'] = '*'; //'GET, POST, PUT, OPTIONS';
+			// headers['Access-Control-Allow-Headers'] = 'Content-Type';
 
+			if (no_cache) {
+				const rType = request.resourceType();
+				if (rType === 'script' || rType === 'stylesheet') {
+					headers['Cache-Control'] = 'no-store'; // 禁用缓存
+				}
+			}
 
+			request.continue({ headers });
+		});
 
+		this.page.on('response', async res => {
+			if (!this.responseCall) return;
+			let json = await this.parseResponse(res);
+			await this.responseCall(json);
+		});
+	}
 
 
 }