2aa2611f76
* tmp Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * feat: add support for system picker in setDisplayMediaRequestHandler Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * oops Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * Apply suggestions from code review Co-authored-by: Erick Zhao <erick@hotmail.ca> Co-authored-by: Samuel Attard <sam@electronjs.org> * stuff Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * well... Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * seems legit Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> * chore: update patch to handle screenCapturer Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * feat: modify API to use useSystemPicker Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fix: gate ScreenCaptureKitPicker to macos 15 or higher Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fix: don't use native picker with legacy media selection Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: code review, boolean set & docs update Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * fix: add cancelCallback Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * docs: clarify session & desktopCapturer docs Co-authored-by: Keeley Hammond <khammond@slack-corp.com> * chore: update patches --------- Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Samuel Attard <marshallofsound@electronjs.org> Co-authored-by: Samuel Attard <sam@electronjs.org> Co-authored-by: Keeley Hammond <khammond@slack-corp.com>
92 lines
2.9 KiB
TypeScript
92 lines
2.9 KiB
TypeScript
import { BrowserWindow } from 'electron/main';
|
|
const { createDesktopCapturer, isDisplayMediaSystemPickerAvailable } = process._linkedBinding('electron_browser_desktop_capturer');
|
|
|
|
const deepEqual = (a: ElectronInternal.GetSourcesOptions, b: ElectronInternal.GetSourcesOptions) => JSON.stringify(a) === JSON.stringify(b);
|
|
|
|
let currentlyRunning: {
|
|
options: ElectronInternal.GetSourcesOptions;
|
|
getSources: Promise<ElectronInternal.GetSourcesResult[]>;
|
|
}[] = [];
|
|
|
|
// |options.types| can't be empty and must be an array
|
|
function isValid (options: Electron.SourcesOptions) {
|
|
return Array.isArray(options?.types);
|
|
}
|
|
|
|
export { isDisplayMediaSystemPickerAvailable };
|
|
|
|
export async function getSources (args: Electron.SourcesOptions) {
|
|
if (!isValid(args)) throw new Error('Invalid options');
|
|
|
|
const resizableValues = new Map();
|
|
if (process.platform === 'darwin') {
|
|
// Fix for bug in ScreenCaptureKit that modifies a window's styleMask the first time
|
|
// it captures a non-resizable window. We record each non-resizable window's styleMask,
|
|
// and we restore modified styleMasks later, after the screen capture.
|
|
for (const win of BrowserWindow.getAllWindows()) {
|
|
resizableValues.set([win.id], win.resizable);
|
|
}
|
|
}
|
|
|
|
const captureWindow = args.types.includes('window');
|
|
const captureScreen = args.types.includes('screen');
|
|
|
|
const { thumbnailSize = { width: 150, height: 150 } } = args;
|
|
const { fetchWindowIcons = false } = args;
|
|
|
|
const options = {
|
|
captureWindow,
|
|
captureScreen,
|
|
thumbnailSize,
|
|
fetchWindowIcons
|
|
};
|
|
|
|
for (const running of currentlyRunning) {
|
|
if (deepEqual(running.options, options)) {
|
|
// If a request is currently running for the same options
|
|
// return that promise
|
|
return running.getSources;
|
|
}
|
|
}
|
|
|
|
const getSources = new Promise<ElectronInternal.GetSourcesResult[]>((resolve, reject) => {
|
|
let capturer: ElectronInternal.DesktopCapturer | null = createDesktopCapturer();
|
|
|
|
const stopRunning = () => {
|
|
if (capturer) {
|
|
delete capturer._onerror;
|
|
delete capturer._onfinished;
|
|
capturer = null;
|
|
|
|
if (process.platform === 'darwin') {
|
|
for (const win of BrowserWindow.getAllWindows()) {
|
|
if (resizableValues.has(win.id)) {
|
|
win.resizable = resizableValues.get(win.id);
|
|
}
|
|
};
|
|
}
|
|
}
|
|
// Remove from currentlyRunning once we resolve or reject
|
|
currentlyRunning = currentlyRunning.filter(running => running.options !== options);
|
|
};
|
|
|
|
capturer._onerror = (error: string) => {
|
|
stopRunning();
|
|
reject(error);
|
|
};
|
|
|
|
capturer._onfinished = (sources: Electron.DesktopCapturerSource[]) => {
|
|
stopRunning();
|
|
resolve(sources);
|
|
};
|
|
|
|
capturer.startHandling(captureWindow, captureScreen, thumbnailSize, fetchWindowIcons);
|
|
});
|
|
|
|
currentlyRunning.push({
|
|
options,
|
|
getSources
|
|
});
|
|
|
|
return getSources;
|
|
}
|