mirror of
https://github.com/electron/electron.git
synced 2026-05-02 03:00:22 -04:00
* build: add oxfmt for code formatting and import sorting
Adds oxfmt as a devDependency alongside oxlint and wires it into the
lint pipeline. The .oxfmtrc.json config matches Electron's current JS
style (single quotes, semicolons, 2-space indent, trailing commas off,
printWidth 100) and configures sortImports with custom groups that
mirror the import/order pathGroups previously enforced by ESLint:
@electron/internal, @electron/*, and {electron,electron/**} each get
their own ordered group ahead of external modules.
- `yarn lint:fmt` runs `oxfmt --check` over JS/TS sources and is
chained into `yarn lint` so CI enforces it automatically.
- `yarn format` runs `oxfmt --write` for local fix-up.
- lint-staged invokes `oxfmt --write` on staged .js/.ts/.mjs/.cjs
files before oxlint, so formatting is applied at commit time.
The next commit applies the formatter to the existing codebase so the
check actually passes.
* chore: apply oxfmt formatting to JS and TS sources
Runs `yarn format` across lib/, spec/, script/, build/, default_app/,
and npm/ to bring the codebase in line with the .oxfmtrc.json settings
added in the previous commit. This is a pure formatting pass: import
statements are sorted into the groups defined by the config, method
chains longer than printWidth are broken, single-quoted strings
containing apostrophes are switched to double quotes, and a handful of
single-statement `if` bodies are re-wrapped and get braces added by
`oxlint --fix` to satisfy the `curly: multi-line` rule.
No behavior changes.
477 lines
17 KiB
TypeScript
477 lines
17 KiB
TypeScript
import { BrowserWindow, session, desktopCapturer } from 'electron/main';
|
|
|
|
import { expect } from 'chai';
|
|
|
|
import * as http from 'node:http';
|
|
|
|
import { ifit, listen } from './lib/spec-helpers';
|
|
import { closeAllWindows } from './lib/window-helpers';
|
|
|
|
describe('setDisplayMediaRequestHandler', () => {
|
|
afterEach(closeAllWindows);
|
|
// These tests are done on an http server because navigator.userAgentData
|
|
// requires a secure context.
|
|
let server: http.Server;
|
|
let serverUrl: string;
|
|
before(async () => {
|
|
server = http.createServer((req, res) => {
|
|
res.setHeader('Content-Type', 'text/html');
|
|
res.end('');
|
|
});
|
|
serverUrl = (await listen(server)).url;
|
|
});
|
|
after(() => {
|
|
server.close();
|
|
});
|
|
|
|
ifit(process.platform !== 'darwin')('works when calling getDisplayMedia', async function () {
|
|
if ((await desktopCapturer.getSources({ types: ['screen'] })).length === 0) {
|
|
return this.skip();
|
|
}
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
let mediaRequest: any = null;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
mediaRequest = request;
|
|
desktopCapturer.getSources({ types: ['screen'] }).then((sources) => {
|
|
// Grant access to the first screen found.
|
|
const { id, name } = sources[0];
|
|
callback({
|
|
video: { id, name }
|
|
// TODO: 'loopback' and 'loopbackWithMute' are currently only supported on Windows.
|
|
// audio: { id: 'loopback', name: 'System Audio' }
|
|
});
|
|
});
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: false,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(mediaRequest.videoRequested).to.be.true();
|
|
expect(mediaRequest.audioRequested).to.be.false();
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('does not crash when using a bogus ID', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
callback({
|
|
video: { id: 'bogus', name: 'whatever' }
|
|
});
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.false();
|
|
expect(message).to.equal('Could not start video source');
|
|
});
|
|
|
|
it('successfully returns a capture handle', async () => {
|
|
let w: BrowserWindow | null = null;
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
let mediaRequest: any = null;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
mediaRequest = request;
|
|
callback({ video: w?.webContents.mainFrame });
|
|
});
|
|
|
|
w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
|
|
const { ok, handleID, captureHandle, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
const handleID = crypto.randomUUID();
|
|
navigator.mediaDevices.setCaptureHandleConfig({
|
|
handle: handleID,
|
|
exposeOrigin: true,
|
|
permittedOrigins: ["*"],
|
|
});
|
|
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: false
|
|
}).then(stream => {
|
|
const [videoTrack] = stream.getVideoTracks();
|
|
const captureHandle = videoTrack.getCaptureHandle();
|
|
return { ok: true, handleID, captureHandle, message: null }
|
|
}, e => ({ ok: false, message: e.message }))
|
|
`,
|
|
true
|
|
);
|
|
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(mediaRequest.videoRequested).to.be.true();
|
|
expect(mediaRequest.audioRequested).to.be.false();
|
|
expect(ok).to.be.true();
|
|
expect(captureHandle.handle).to.be.a('string');
|
|
expect(handleID).to.eq(captureHandle.handle);
|
|
expect(message).to.be.null();
|
|
});
|
|
|
|
it('does not crash when providing only audio for a video request', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
let callbackError: any;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
try {
|
|
callback({
|
|
audio: 'loopback'
|
|
});
|
|
} catch (e) {
|
|
callbackError = e;
|
|
}
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.false();
|
|
expect(callbackError?.message).to.equal('Video was requested, but no video stream was provided');
|
|
});
|
|
|
|
it('does not crash when providing only an audio stream for an audio+video request', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
let callbackError: any;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
try {
|
|
callback({
|
|
audio: 'loopback'
|
|
});
|
|
} catch (e) {
|
|
callbackError = e;
|
|
}
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.false();
|
|
expect(callbackError?.message).to.equal('Video was requested, but no video stream was provided');
|
|
});
|
|
|
|
it('does not crash when providing a non-loopback audio stream', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
callback({
|
|
video: w.webContents.mainFrame,
|
|
audio: 'default' as any
|
|
});
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.true();
|
|
});
|
|
|
|
it('does not crash when providing no streams', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
let callbackError: any;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
try {
|
|
callback({});
|
|
} catch (e) {
|
|
callbackError = e;
|
|
}
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.false();
|
|
expect(callbackError.message).to.equal('Video was requested, but no video stream was provided');
|
|
});
|
|
|
|
it('does not crash when using a bogus web-contents-media-stream:// ID', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
callback({
|
|
video: { id: 'web-contents-media-stream://9999:9999', name: 'whatever' }
|
|
});
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.false();
|
|
expect(message).to.equal('Could not start video source');
|
|
});
|
|
|
|
it('is not called when calling getUserMedia', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
ses.setDisplayMediaRequestHandler(() => {
|
|
throw new Error('bad');
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(`
|
|
navigator.mediaDevices.getUserMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`);
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('works when calling getDisplayMedia with preferCurrentTab', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
callback({ video: w.webContents.mainFrame });
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
preferCurrentTab: true,
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('returns a MediaStream with BrowserCaptureMediaStreamTrack when the current tab is selected', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler((request, callback) => {
|
|
requestHandlerCalled = true;
|
|
callback({ video: w.webContents.mainFrame });
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
preferCurrentTab: true,
|
|
video: true,
|
|
audio: false,
|
|
}).then(stream => {
|
|
const [videoTrack] = stream.getVideoTracks();
|
|
return { ok: videoTrack instanceof BrowserCaptureMediaStreamTrack, message: null };
|
|
}, e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
ifit(process.platform !== 'darwin')('can supply a screen response to preferCurrentTab', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler(async (request, callback) => {
|
|
requestHandlerCalled = true;
|
|
const sources = await desktopCapturer.getSources({ types: ['screen'] });
|
|
callback({ video: sources[0] });
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
preferCurrentTab: true,
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('can supply a frame response', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
let requestHandlerCalled = false;
|
|
ses.setDisplayMediaRequestHandler(async (request, callback) => {
|
|
requestHandlerCalled = true;
|
|
callback({ video: w.webContents.mainFrame });
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(requestHandlerCalled).to.be.true();
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('is not called when calling legacy getUserMedia', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
ses.setDisplayMediaRequestHandler(() => {
|
|
throw new Error('bad');
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(`
|
|
new Promise((resolve, reject) => navigator.getUserMedia({
|
|
video: true,
|
|
audio: true,
|
|
}, x => resolve({ok: x instanceof MediaStream}), e => reject({ok: false, message: e.message})))
|
|
`);
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('is not called when calling legacy getUserMedia with desktop capture constraint', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
ses.setDisplayMediaRequestHandler(() => {
|
|
throw new Error('bad');
|
|
});
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(`
|
|
new Promise((resolve, reject) => navigator.getUserMedia({
|
|
video: {
|
|
mandatory: {
|
|
chromeMediaSource: 'desktop'
|
|
}
|
|
},
|
|
}, x => resolve({ok: x instanceof MediaStream}), e => reject({ok: false, message: e.message})))
|
|
`);
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('works when calling getUserMedia without a media request handler', async () => {
|
|
const w = new BrowserWindow({ show: false });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(`
|
|
navigator.mediaDevices.getUserMedia({
|
|
video: true,
|
|
audio: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`);
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('works when calling legacy getUserMedia without a media request handler', async () => {
|
|
const w = new BrowserWindow({ show: false });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(`
|
|
new Promise((resolve, reject) => navigator.getUserMedia({
|
|
video: true,
|
|
audio: true,
|
|
}, x => resolve({ok: x instanceof MediaStream}), e => reject({ok: false, message: e.message})))
|
|
`);
|
|
expect(ok).to.be.true(message);
|
|
});
|
|
|
|
it('throws an error when calling legacy getUserMedia with invalid chromeMediaSourceId', async () => {
|
|
const w = new BrowserWindow({ show: false });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(`
|
|
new Promise((resolve, reject) => navigator.getUserMedia({
|
|
video: {
|
|
mandatory: {
|
|
chromeMediaSource: 'desktop',
|
|
chromeMediaSourceId: undefined,
|
|
},
|
|
},
|
|
}, x => resolve({ok: x instanceof MediaStream}), e => resolve({ ok: false, message: e.message })))
|
|
`);
|
|
expect(ok).to.be.false();
|
|
expect(message).to.equal('Invalid state');
|
|
});
|
|
|
|
it('can remove a displayMediaRequestHandler', async () => {
|
|
const ses = session.fromPartition('' + Math.random());
|
|
|
|
ses.setDisplayMediaRequestHandler(() => {
|
|
throw new Error('bad');
|
|
});
|
|
ses.setDisplayMediaRequestHandler(null);
|
|
const w = new BrowserWindow({ show: false, webPreferences: { session: ses } });
|
|
await w.loadURL(serverUrl);
|
|
const { ok, message } = await w.webContents.executeJavaScript(
|
|
`
|
|
navigator.mediaDevices.getDisplayMedia({
|
|
video: true,
|
|
}).then(x => ({ok: x instanceof MediaStream}), e => ({ok: false, message: e.message}))
|
|
`,
|
|
true
|
|
);
|
|
expect(ok).to.be.false();
|
|
expect(message).to.equal('Not supported');
|
|
});
|
|
});
|