nodejs_chromium 1.1.0 → 1.1.2

package/package.json

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

package/src/chrome.js

@@ -590,6 +590,7 @@ module.exports = class {
 		// value.redirect = await response.redirectURL();
 		if (value.type === 'xhr') value.type = 'AJAX';
 		value.url = await response.url();
+		value.headers = { request: request.headers(), response: headers };
 		value.domain = parseUrl(value.url)['host'];
 		value.content = headers['content-type'];
 		value.length = headers['content-length'];

package/src/cookies.js

@@ -1,179 +1,188 @@
-const fs = require("fs");
-const {parse: parseUrl} = require("url");
-
-
-module.exports = class {
-    page = void 0;
-    file = void 0;
-    cookies = [];
-
-    constructor(page, cookies) {
-        this.page = page;
-        if (cookies === false) return;
-
-        this.file = cookies;
-        if (!fs.existsSync(cookies)) return;
-        // console.log('cookies file:', cookies);
-        let cookiesVal = fs.readFileSync(cookies, 'utf8');
-        if (cookiesVal === '{}') cookiesVal = '[]';
-        this.cookies = JSON.parse(cookiesVal);
-        // this.set(this.cookies);
-    }
-
-    json(str, host) {
-        if (!str) return [];
-        return JSON.parse(str).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);
-
-     */
-    /**
-     * 解析网页set-cookies的值
-     *
-     * @param {Object} strCookies
-     */
-    async parse(strCookies) {
-        return await strCookies.split("\n").map((ls) => {
-            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);
-                    if (value.expire > 0) value.expire_date = (value.expire * 1000).date('Y-m-d H:i:s.SSS')
-                    //有可能存在expires
-                } else if (Key === 'Secure') {
-                    value.source = true;
-                    value.sourceScheme = 'Secure';
-                } else {
-                    value[Key[0].toLowerCase() + Key.substring(1)] = arr[1] || true;
-                }
-
-                if (value.expires && value.expires > 0) {
-                    value.expires_date = (value.expires * 1000).date('YYYY-mm-dd HH:ii:ss.SSS')
-                }
-
-            })
-            return value;
-        })
-    }
-
-
-    /**
-     * 获取当前页面的Cookies
-     */
-    async get(key) {
-        try {
-            await this.merge();
-            // const cookies = await this.page.cookies();
-            if (key === undefined) return this.cookies;
-            return (this.cookies.filter(c => c.name === key) || [{}])[0];
-        } catch (e) {
-            console.log('[chrome.cookies.get.Error]', e.message);
-            return [];
-        }
-    }
-
-    /**
-     * 设置Cookies
-     * @param {Object} cookies
-     */
-    async set(cookies) {
-        try {
-            if (cookies === undefined) cookies = this.cookies;
-            await this.page.setCookie(...cookies.map(ck => {
-                if (typeof ck.expires === 'string') ck.expires = new Date(ck.expires).getTime();
-                return ck;
-            }).filter(ck => (!!ck.domain || !!ck.url)));
-        } catch (e) {
-            console.log('[chrome.cookies.set.Error]', e.message);
-            console.log(JSON.stringify(cookies));
-        }
-    }
-
-    /**
-     * 保存当前页面中的Cookies
-     */
-    async save() {
-        try {
-            if (!this.file) return;
-            await this.merge();
-            await fs.writeFileSync(this.file, JSON.stringify(this.cookies, null, 2));
-        } catch (e) {
-            console.log('[chrome.cookies.save.Error]', e.message);
-        }
-    }
-
-    async merge() {
-        try {
-            let cookies = await this.page.cookies();
-            // console.log('merge>>>>', cookies, '<<<<<merge');
-            if (cookies.length === 0) return;
-
-            const newMap = new Map(this.cookies.map(obj => [obj.name, obj]));
-            cookies.map(obj => {
-                if (obj.expires && obj.expires > 0) obj.expires_date = (obj.expires * 1000).date('yyyy-mm-dd HH:ii:ss.SSS')
-                newMap.set(obj.name, obj)
-            });
-            this.cookies = await Array.from(newMap.values());
-
-        } catch (e) {
-            console.log('[chrome.cookies.merge.Error]', e.message);
-        }
-    }
-
-    /**
-     * 合并request时自动带上的cookies
-     *
-     * @param cookie
-     * @param domain
-     * @returns {*[]|*}
-     */
-    async request(cookie, domain) {
-        if (!cookie) return [];
-        const cookies = cookie.split(';').map(ck => {
-            const [name, value] = ck.trim().split('=');
-            return {name, value};
-        });
-        const newMap = new Map(this.cookies.map(obj => [obj.name, obj]));
-        cookies.map(obj => {
-            const {name, value} = obj;
-            if (!newMap.has(obj.name)) {
-                newMap.set(obj.name, {name, value, domain})
-                return;
-            }
-            const cookies = newMap.get(obj.name);
-            if (!cookies.domain) {
-                newMap.set(obj.name, {name, value, domain})
-                return;
-            }
-            if (cookies.value === value) return;
-
-            const host = '.' + cookies.domain.split('.').slice(-2).join('.');
-            if (host === domain) {
-                cookies.value = value;
-                newMap.set(obj.name, cookies)
-            }
-        });
-
-        this.cookies = await Array.from(newMap.values());
-    }
-
-
+const fs = require("fs");
+const { parse: parseUrl } = require("url");
+
+
+module.exports = class {
+	page = void 0;
+	file = void 0;
+	cookies = [];
+
+	constructor(page, cookies) {
+		this.page = page;
+		if (cookies === false) return;
+
+		this.file = cookies;
+		if (!fs.existsSync(cookies)) return;
+		// console.log('cookies file:', cookies);
+		let cookiesVal = fs.readFileSync(cookies, 'utf8');
+		if (cookiesVal === '{}') cookiesVal = '[]';
+		this.cookies = JSON.parse(cookiesVal);
+		// this.set(this.cookies);
+	}
+
+	json(str, host) {
+		if (!str) return [];
+		return JSON.parse(str).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);
+
+	 */
+	/**
+	 * 解析网页set-cookies的值
+	 *
+	 * @param {Object} strCookies
+	 */
+	async parse(strCookies) {
+		return await strCookies.split("\n").map((ls) => {
+			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);
+					if (value.expire > 0) value.expire_date = (value.expire * 1000).date('Y-m-d H:i:s.SSS')
+					//有可能存在expires
+				}
+				else if (Key === 'Secure') {
+					value.source = true;
+					value.sourceScheme = 'Secure';
+				}
+				else {
+					value[Key[0].toLowerCase() + Key.substring(1)] = arr[1] || true;
+				}
+
+				if (value.expires && value.expires > 0) {
+					value.expires_date = (value.expires * 1000).date('YYYY-mm-dd HH:ii:ss.SSS')
+				}
+
+			})
+			return value;
+		})
+	}
+
+
+	/**
+	 * 获取当前页面的Cookies
+	 */
+	async get(key) {
+		try {
+			await this.merge();
+			// const cookies = await this.page.cookies();
+			if (key === undefined) return this.cookies;
+			return (this.cookies.filter(c => c.name === key) || [{}])[0];
+		}
+		catch (e) {
+			console.log('[chrome.cookies.get.Error]', e.message);
+			return [];
+		}
+	}
+
+	/**
+	 * 设置Cookies
+	 * @param {Object} cookies
+	 */
+	async set(cookies) {
+		try {
+			if (cookies === undefined) cookies = this.cookies;
+			await this.page.setCookie(...cookies.map(ck => {
+				if (typeof ck.expires === 'string') ck.expires = new Date(ck.expires).getTime();
+				return ck;
+			}).filter(ck => (!!ck.domain || !!ck.url)));
+		}
+		catch (e) {
+			console.log('[chrome.cookies.set.Error]', e.message);
+			console.log(JSON.stringify(cookies));
+		}
+	}
+
+	/**
+	 * 保存当前页面中的Cookies
+	 */
+	async save() {
+		try {
+			if (!this.file) return [];
+			await this.merge();
+			await fs.writeFileSync(this.file, JSON.stringify(this.cookies, null, 2));
+			return this.cookies;
+		}
+		catch (e) {
+			console.log('[chrome.cookies.save.Error]', e.message);
+			return [];
+		}
+	}
+
+	async merge() {
+		try {
+			let cookies = await this.page.cookies();
+			// console.log('merge>>>>', cookies, '<<<<<merge');
+			if (cookies.length === 0) return;
+
+			const newMap = new Map(this.cookies.map(obj => [obj.name, obj]));
+			cookies.map(obj => {
+				if (obj.expires && obj.expires > 0) obj.expires_date = (obj.expires * 1000).date('yyyy-mm-dd HH:ii:ss.SSS')
+				newMap.set(obj.name, obj)
+			});
+			this.cookies = await Array.from(newMap.values());
+
+		}
+		catch (e) {
+			console.log('[chrome.cookies.merge.Error]', e.message);
+		}
+	}
+
+	/**
+	 * 合并request时自动带上的cookies
+	 *
+	 * @param cookie
+	 * @param domain
+	 * @returns {*[]|*}
+	 */
+	async request(cookie, domain) {
+		if (!cookie) return [];
+		const cookies = cookie.split(';').map(ck => {
+			const [name, value] = ck.trim().split('=');
+			return { name, value };
+		});
+		const newMap = new Map(this.cookies.map(obj => [obj.name, obj]));
+		cookies.map(obj => {
+			const { name, value } = obj;
+			if (!newMap.has(obj.name)) {
+				newMap.set(obj.name, { name, value, domain })
+				return;
+			}
+			const cookies = newMap.get(obj.name);
+			if (!cookies.domain) {
+				newMap.set(obj.name, { name, value, domain })
+				return;
+			}
+			if (cookies.value === value) return;
+
+			const host = '.' + cookies.domain.split('.').slice(-2).join('.');
+			if (host === domain) {
+				cookies.value = value;
+				newMap.set(obj.name, cookies)
+			}
+		});
+
+		this.cookies = await Array.from(newMap.values());
+	}
+
+
 }