diff --git a/src/launcher/start.js b/src/launcher/start.js index f130630..8ede17d 100644 --- a/src/launcher/start.js +++ b/src/launcher/start.js @@ -33,5 +33,5 @@ export default async (browserPath, args, transport, extra) => { break; } - return await InjectInto(CDP, proc, transport === 'stdio' ? 'browser' : 'target', extra); + return await InjectInto(CDP, proc, 'browser', extra); }; \ No newline at end of file diff --git a/src/lib/cdp.js b/src/lib/cdp.js index c9ad4cf..a63514b 100644 --- a/src/lib/cdp.js +++ b/src/lib/cdp.js @@ -69,22 +69,20 @@ export default async ({ pipe: { pipeWrite, pipeRead } = {}, port }) => { attempt(); }); - const targets = await continualTrying(() => new Promise((resolve, reject) => get(`http://127.0.0.1:${port}/json/list`, res => { + const target = await continualTrying(() => new Promise((resolve, reject) => get(`http://127.0.0.1:${port}/json/list`, res => { let body = ''; res.on('data', chunk => body += chunk.toString()); res.on('end', () => { try { - resolve(JSON.parse(body)) + const targets = JSON.parse(body); + const target = targets.find(x => x.type === 'browser'); + return target ? resolve(target) : reject(); } catch { reject(); } }); }).on('error', reject))); - console.log(); - - const target = targets[0]; - log('got target', target); const ws = new WebSocket(target.webSocketDebuggerUrl);