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

launcher: rewrite target acquiring

Browse Source
This commit is contained in:
CanadaHonk 2023-01-08 13:42:31 +00:00
parent acd4cdedcf
commit 84ee7dbfe8
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/launcher/inject.js
View File

@ -3,7 +3,26 @@ import IPCApi from '../lib/ipc.js';
import IdleApi from '../api/idle.js'; import IdleApi from '../api/idle.js';
import ControlsApi from '../api/controls.js'; import ControlsApi from '../api/controls.js';
export default async (CDP, proc, injectionType = 'browser', { browserName } = { browserName: 'unknown' }) => { const acquireTarget = async (CDP, filter = () => true) => {
let target;
log('acquiring target...');
while (!target) {
process.stdout.write('.');
target = (await CDP.sendMessage('Target.getTargets')).targetInfos.filter(x => x.type === 'page').filter(filter)[0];
if (!target) await new Promise(res => setTimeout(res, 200));
}
console.log();
return (await CDP.sendMessage('Target.attachToTarget', {
targetId: target.targetId,
flatten: true
})).sessionId;
};
export default async (CDP, proc, injectionType = 'browser', { browserName, openingLocal, localUrl, url, closeHandlers }) => {
let pageLoadCallback, pageLoadPromise = new Promise(res => pageLoadCallback = res); let pageLoadCallback, pageLoadPromise = new Promise(res => pageLoadCallback = res);
let frameLoadCallback = () => {}, onWindowMessage = () => {}; let frameLoadCallback = () => {}, onWindowMessage = () => {};
CDP.onMessage(msg => { CDP.onMessage(msg => {
@ -23,14 +42,7 @@ export default async (CDP, proc, injectionType = 'browser', { browserName } = {
const browserEngine = browserInfo.jsVersion.startsWith('1.') ? 'firefox' : 'chromium'; const browserEngine = browserInfo.jsVersion.startsWith('1.') ? 'firefox' : 'chromium';
let sessionId; let sessionId;
if (injectionType === 'browser') { // connected to browser itself, need to get and attach to a target if (injectionType === 'browser') sessionId = await acquireTarget(CDP, target => target.url !== 'about:blank');
const target = (await CDP.sendMessage('Target.getTargets')).targetInfos[0];
sessionId = (await CDP.sendMessage('Target.attachToTarget', {
targetId: target.targetId,
flatten: true
})).sessionId;
}
await CDP.sendMessage('Runtime.enable', {}, sessionId); // enable runtime API await CDP.sendMessage('Runtime.enable', {}, sessionId); // enable runtime API