github/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

launcher: wait for frame load before all evals

Browse Source
This commit is contained in:
CanadaHonk 2023-02-08 19:02:59 +00:00
parent d144892468
commit 5a965bf40a
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/launcher/inject.js
View File

@ -29,7 +29,10 @@ const acquireTarget = async (CDP, filter = () => true) => {
export default async (CDP, proc, injectionType = 'browser', { dataPath, browserName, browserType, openingLocal, url, basePath, allowNavigation, localCSP, closeHandlers }) => { export default async (CDP, proc, injectionType = 'browser', { dataPath, browserName, browserType, openingLocal, url, basePath, allowNavigation, localCSP, closeHandlers }) => {
let pageLoadCallback, pageLoadPromise = new Promise(res => pageLoadCallback = res); let pageLoadCallback, pageLoadPromise = new Promise(res => pageLoadCallback = res);
let frameLoadCallback = () => {}, onWindowMessage = () => {}; let frameLoadCallback, frameLoadPromise = new Promise(res => frameLoadCallback = res);
let onWindowMessage = () => {};
CDP.onMessage(async msg => { CDP.onMessage(async msg => {
if (msg.method === 'Runtime.bindingCalled' && msg.params.name === '_gluonSend') onWindowMessage(JSON.parse(msg.params.payload)); if (msg.method === 'Runtime.bindingCalled' && msg.params.name === '_gluonSend') onWindowMessage(JSON.parse(msg.params.payload));
if (msg.method === 'Page.frameStoppedLoading') frameLoadCallback(msg.params); if (msg.method === 'Page.frameStoppedLoading') frameLoadCallback(msg.params);
@ -90,6 +93,7 @@ export default async (CDP, proc, injectionType = 'browser', { dataPath, browserN
}, sessionId); }, sessionId);
const evalInWindow = async func => { const evalInWindow = async func => {
await frameLoadPromise; // wait for page to load before eval, otherwise fail
const reply = await CDP.sendMessage(`Runtime.evaluate`, { const reply = await CDP.sendMessage(`Runtime.evaluate`, {
expression: typeof func === 'string' ? func : `(${func.toString()})()` expression: typeof func === 'string' ? func : `(${func.toString()})()`
}, sessionId); }, sessionId);
@ -105,8 +109,8 @@ export default async (CDP, proc, injectionType = 'browser', { dataPath, browserN
browserType browserType
}, { }, {
evalInWindow, evalInWindow,
evalOnNewDocument: source => CDP.sendMessage('Page.addScriptToEvaluateOnNewDocument', { source }, sessionId), frameLoadPromise,
pageLoadPromise: new Promise(res => frameLoadCallback = res) evalOnNewDocument: source => CDP.sendMessage('Page.addScriptToEvaluateOnNewDocument', { source }, sessionId)
}); });
onWindowMessage = ipcMessageCallback; onWindowMessage = ipcMessageCallback;