-
-
Notifications
You must be signed in to change notification settings - Fork 245
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
支持 cookie 导入功能，修复 proxy 导入带下划线 _ 用户名失败 bug
- Loading branch information
1 parent
7c8d517
commit 70194ff
Showing
16 changed files
with
309 additions
and
65 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| { | ||
| "name": "chrome-power", | ||
| "description": "The first open source fingerprint browser.", | ||
| "version": "1.1.1", | ||
| "version": "1.1.3", | ||
| "private": true, | ||
| "author": { | ||
| "email": "[email protected]", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,167 @@ | ||
| import type {Browser, Page} from 'puppeteer'; | ||
| import type {ICookie} from '../types/cookie'; | ||
| import {WindowDB} from '../db/window'; | ||
| import type {IP} from '../../../shared/types/ip'; | ||
| import {bridgeMessageToUI} from '../mainWindow'; | ||
|
|
||
| type CookieDomain = string; | ||
|
|
||
| const cookieMap: Map<number, Map<CookieDomain, ICookie[]>> = new Map(); | ||
|
|
||
| // const cookieToMap = (windowId: number, cookies: ICookie[]) => { | ||
| // const map = new Map<CookieDomain, ICookie[]>(); | ||
| // cookies.forEach(cookie => { | ||
| // console.log(cookie.domain); | ||
| // let domain; | ||
| // if (cookie.domain?.startsWith('.')) { | ||
| // domain = cookie.domain.slice(1); | ||
| // } | ||
| // if (!map.get(domain!)) { | ||
| // map.set(domain!, [cookie]); | ||
| // } else { | ||
| // const domainCookies = map.get(domain!); | ||
| // domainCookies?.push(cookie); | ||
| // map.set(domain!, domainCookies!); | ||
| // } | ||
| // }); | ||
| // cookieMap.set(windowId, map); | ||
| // }; | ||
|
|
||
| const getCookie = (windowId: number, domain: CookieDomain) => { | ||
| const map = cookieMap.get(windowId); | ||
| if (map) { | ||
| return map.get(domain); | ||
| } | ||
| return null; | ||
| }; | ||
|
|
||
| const parseCookie = (cookie: string) => { | ||
| // const correctedCookie = cookie.replace(/(\w+)(?=:)/g, '"$1"'); | ||
| try { | ||
| const jsonArray = JSON.parse(cookie); | ||
| return jsonArray; | ||
| } catch (error) { | ||
| console.error('解析错误:', error); | ||
| bridgeMessageToUI({ | ||
| type: 'error', | ||
| text: 'Cookie JSON 解析错误', | ||
| }); | ||
| } | ||
| }; | ||
|
|
||
| export const setCookieToPage = async (windowId: number, page: Page) => { | ||
| const url = page.url(); | ||
| const urlObj = new URL(url); | ||
| const domain = urlObj.hostname; | ||
| const cookie = getCookie(windowId, domain); | ||
| const pageCookies = await page.cookies(); | ||
| console.log(domain, typeof pageCookies, pageCookies.length, cookie?.length); | ||
| if (!pageCookies.length) { | ||
| if (cookie?.length) { | ||
| console.log('set cookie:', cookie); | ||
| await page.setCookie(...cookie); | ||
| } | ||
| } | ||
| }; | ||
|
|
||
| // 限流函数，限制同时执行的任务数 | ||
| // function limitConcurrency(maxConcurrentTasks: number) { | ||
| // let activeTasks = 0; | ||
| // const taskQueue: (() => Promise<void>)[] = []; | ||
|
|
||
| // function next() { | ||
| // if (activeTasks < maxConcurrentTasks && taskQueue.length > 0) { | ||
| // activeTasks++; | ||
| // const task = taskQueue.shift(); | ||
| // task!().finally(() => { | ||
| // activeTasks--; | ||
| // next(); | ||
| // }); | ||
| // } | ||
| // } | ||
|
|
||
| // return (task: () => Promise<void>) => { | ||
| // taskQueue.push(task); | ||
| // next(); | ||
| // }; | ||
| // } | ||
|
|
||
| export const presetCookie = async (windowId: number, browser: Browser) => { | ||
| const window = await WindowDB.getById(windowId); | ||
| if (window?.cookie) { | ||
| if (typeof window.cookie === 'string') { | ||
| const correctedCookie = parseCookie(window.cookie); | ||
| const page = await browser.newPage(); | ||
| const client = await page.target().createCDPSession(); | ||
| await client.send('Network.enable'); | ||
| await client.send('Network.setCookies', { | ||
| cookies: correctedCookie, | ||
| }); | ||
| await page.close(); | ||
| // cookieToMap(windowId, correctedCookie || []); | ||
| // const runTask = limitConcurrency(10); // 最多同时执行 10 个任务 | ||
|
|
||
| // const cookieTasks: Promise<void>[] = []; | ||
| // const cookiesMap = cookieMap.get(windowId); | ||
|
|
||
| // if (cookiesMap) { | ||
| // cookiesMap.forEach((cookies, domain) => { | ||
| // cookieTasks.push( | ||
| // new Promise<void>(resolve => { | ||
| // runTask(async () => { | ||
| // const page = await browser.newPage(); | ||
| // // 获取 CDP 会话 | ||
| // const client = await page.target().createCDPSession(); | ||
| // try { | ||
| // await client.send('Network.enable'); | ||
| // await client.send('Network.setCookies', { | ||
| // cookies: cookies, | ||
| // }); | ||
| // } catch (error) { | ||
| // console.log(domain, 'set cookie error:', error); | ||
| // } finally { | ||
| // await page.close(); | ||
| // } | ||
| // resolve(); | ||
| // }); | ||
| // }), | ||
| // ); | ||
| // }); | ||
| // } | ||
|
|
||
| // await Promise.all(cookieTasks); | ||
| // } | ||
| } | ||
| } | ||
| return true; | ||
| }; | ||
|
|
||
| // export const pageRequestInterceptor = async (windowId: number, page: Page) => { | ||
| // const url = page.url(); | ||
| // const urlObj = new URL(url); | ||
| // page.on('request', async request => { | ||
|
|
||
| // request.continue(); | ||
| // }); | ||
| // }; | ||
|
|
||
| export const modifyPageInfo = async (windowId: number, page: Page, ipInfo: IP) => { | ||
| page.on('framenavigated', async _msg => { | ||
| try { | ||
| const title = await page.title(); | ||
| if (!title.includes('By ChromePower')) { | ||
| await page.evaluate(title => { | ||
| document.title = title + ' By ChromePower'; | ||
| }, title); | ||
| } | ||
|
|
||
| await page.setGeolocation({latitude: ipInfo.ll?.[0], longitude: ipInfo.ll?.[1]}); | ||
| await page.emulateTimezone(ipInfo.timeZone); | ||
| } catch (error) { | ||
| console.error(error); | ||
| } | ||
| }); | ||
| await page.evaluateOnNewDocument( | ||
| 'navigator.mediaDevices.getUserMedia = navigator.webkitGetUserMedia = navigator.mozGetUserMedia = navigator.getUserMedia = webkitRTCPeerConnection = RTCPeerConnection = MediaStreamTrack = undefined;', | ||
| ); | ||
| }; |
Empty file.
Empty file.
Oops, something went wrong.