mirror of
https://github.com/geekgeekrun/geekgeekrun.git
synced 2026-09-06 07:57:06 +08:00
fix sameSite property in cookies not supported by newer puppeteer
This commit is contained in:
@@ -1676,6 +1676,9 @@ export async function mainLoop (hooks) {
|
|||||||
const bossLocalStorage = readStorageFile('boss-local-storage.json')
|
const bossLocalStorage = readStorageFile('boss-local-storage.json')
|
||||||
await hooks.cookieWillSet?.promise(bossCookies)
|
await hooks.cookieWillSet?.promise(bossCookies)
|
||||||
for(let i = 0; i < bossCookies.length; i++){
|
for(let i = 0; i < bossCookies.length; i++){
|
||||||
|
if (Object.hasOwn(bossCookies[i], 'sameSite')) {
|
||||||
|
bossCookies[i].sameSite = 'unspecified'
|
||||||
|
}
|
||||||
await page.setCookie(bossCookies[i]);
|
await page.setCookie(bossCookies[i]);
|
||||||
}
|
}
|
||||||
await setDomainLocalStorage(browser, localStoragePageUrl, bossLocalStorage)
|
await setDomainLocalStorage(browser, localStoragePageUrl, bossLocalStorage)
|
||||||
|
|||||||
@@ -374,6 +374,9 @@ export async function launchBossSite() {
|
|||||||
})
|
})
|
||||||
let [page] = await browser.pages()
|
let [page] = await browser.pages()
|
||||||
for (let i = 0; i < bossCookies.length; i++) {
|
for (let i = 0; i < bossCookies.length; i++) {
|
||||||
|
if (Object.hasOwn(bossCookies[i], 'sameSite')) {
|
||||||
|
bossCookies[i].sameSite = 'unspecified'
|
||||||
|
}
|
||||||
await page.setCookie(bossCookies[i])
|
await page.setCookie(bossCookies[i])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,9 @@ export async function launchBoss(browser: Browser) {
|
|||||||
const bossLocalStorage = readStorageFile('boss-local-storage.json')
|
const bossLocalStorage = readStorageFile('boss-local-storage.json')
|
||||||
//set cookies
|
//set cookies
|
||||||
for (let i = 0; i < bossCookies.length; i++) {
|
for (let i = 0; i < bossCookies.length; i++) {
|
||||||
|
if (Object.hasOwn(bossCookies[i], 'sameSite')) {
|
||||||
|
bossCookies[i].sameSite = 'unspecified'
|
||||||
|
}
|
||||||
await page.setCookie(bossCookies[i])
|
await page.setCookie(bossCookies[i])
|
||||||
}
|
}
|
||||||
await setDomainLocalStorage(browser, localStoragePageUrl, bossLocalStorage)
|
await setDomainLocalStorage(browser, localStoragePageUrl, bossLocalStorage)
|
||||||
|
|||||||
@@ -40,7 +40,9 @@ export function createBrowserAssistantWindow(
|
|||||||
},
|
},
|
||||||
...opt
|
...opt
|
||||||
})
|
})
|
||||||
|
browserAssistantWindow!.setAlwaysOnTop(true, 'normal')
|
||||||
|
browserAssistantWindow!.focus()
|
||||||
|
browserAssistantWindow!.setAlwaysOnTop(false)
|
||||||
browserAssistantWindow.on('ready-to-show', () => {
|
browserAssistantWindow.on('ready-to-show', () => {
|
||||||
browserAssistantWindow!.show()
|
browserAssistantWindow!.show()
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -27,7 +27,9 @@ export function createCookieAssistantWindow(
|
|||||||
},
|
},
|
||||||
...opt
|
...opt
|
||||||
})
|
})
|
||||||
|
cookieAssistantWindow!.setAlwaysOnTop(true, 'normal')
|
||||||
|
cookieAssistantWindow!.focus()
|
||||||
|
cookieAssistantWindow!.setAlwaysOnTop(false)
|
||||||
cookieAssistantWindow.on('ready-to-show', () => {
|
cookieAssistantWindow.on('ready-to-show', () => {
|
||||||
cookieAssistantWindow!.show()
|
cookieAssistantWindow!.show()
|
||||||
})
|
})
|
||||||
|
|||||||
Reference in New Issue
Block a user