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>
41 lines
1.4 KiB
TypeScript
41 lines
1.4 KiB
TypeScript
import { fetchWithSession } from '@electron/internal/browser/api/net-fetch';
|
|
import { net } from 'electron/main';
|
|
const { fromPartition, fromPath, Session } = process._linkedBinding('electron_browser_session');
|
|
const { isDisplayMediaSystemPickerAvailable } = process._linkedBinding('electron_browser_desktop_capturer');
|
|
|
|
// Fake video source that activates the native system picker
|
|
// This is used to get around the need for a screen/window
|
|
// id in Chrome's desktopCapturer.
|
|
let fakeVideoSourceId = -1;
|
|
const systemPickerVideoSource = Object.create(null);
|
|
Object.defineProperty(systemPickerVideoSource, 'id', {
|
|
get () {
|
|
return `window:${fakeVideoSourceId--}:0`;
|
|
}
|
|
});
|
|
systemPickerVideoSource.name = '';
|
|
Object.freeze(systemPickerVideoSource);
|
|
|
|
Session.prototype.fetch = function (input: RequestInfo, init?: RequestInit) {
|
|
return fetchWithSession(input, init, this, net.request);
|
|
};
|
|
|
|
Session.prototype.setDisplayMediaRequestHandler = function (handler, opts) {
|
|
if (!handler) return this._setDisplayMediaRequestHandler(handler, opts);
|
|
|
|
this._setDisplayMediaRequestHandler(async (req, callback) => {
|
|
if (opts && opts.useSystemPicker && isDisplayMediaSystemPickerAvailable()) {
|
|
return callback({ video: systemPickerVideoSource });
|
|
}
|
|
|
|
return handler(req, callback);
|
|
}, opts);
|
|
};
|
|
|
|
export default {
|
|
fromPartition,
|
|
fromPath,
|
|
get defaultSession () {
|
|
return fromPartition('');
|
|
}
|
|
};
|