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

launcher/inject: get browser info first, and always await

Browse Source
This commit is contained in:
Oj 2023-01-05 15:59:16 +00:00
parent 8f0379355e
commit 7c54ef0895
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/launcher/inject.js
View File

@ -8,27 +8,21 @@ export default async (CDP, proc, injectionType = 'browser', { browserName } = {
if (msg.method === 'Runtime.executionContextCreated') injectIPC(); // ensure IPC injection again if (msg.method === 'Runtime.executionContextCreated') injectIPC(); // ensure IPC injection again
}); });
const browserInfo = await CDP.sendMessage('Browser.getVersion');
log('browser:', browserInfo.product);
let browserInfo, sessionId; const browserEngine = browserInfo.jsVersion.startsWith('1.') ? 'firefox' : 'chromium';
let sessionId;
if (injectionType === 'browser') { // connected to browser itself, need to get and attach to a target if (injectionType === 'browser') { // connected to browser itself, need to get and attach to a target
CDP.sendMessage('Browser.getVersion').then(x => { // get browser info async as we have time while attaching
browserInfo = x;
log('browser:', x.product);
});
const target = (await CDP.sendMessage('Target.getTargets')).targetInfos[0]; const target = (await CDP.sendMessage('Target.getTargets')).targetInfos[0];
sessionId = (await CDP.sendMessage('Target.attachToTarget', { sessionId = (await CDP.sendMessage('Target.attachToTarget', {
targetId: target.targetId, targetId: target.targetId,
flatten: true flatten: true
})).sessionId; })).sessionId;
} else { // already attached to target
browserInfo = await CDP.sendMessage('Browser.getVersion');
log('browser:', browserInfo.product);
} }
const browserEngine = browserInfo.jsVersion.startsWith('1.') ? 'firefox' : 'chromium';
CDP.sendMessage('Runtime.enable', {}, sessionId); // enable runtime API CDP.sendMessage('Runtime.enable', {}, sessionId); // enable runtime API