fix(electron-screensharing): simplify the proccess

modules/API/API.js

@@ -67,7 +67,6 @@ import {
     toggleChat
 } from '../../react/features/chat/actions';
 import { openChat } from '../../react/features/chat/actions.web';
-import { setDesktopSources } from '../../react/features/desktop-picker/actions';
 import {
     processExternalDeviceRequest
 } from '../../react/features/device-selection/functions';
@@ -839,16 +838,6 @@ function initCommands() {
         },
         'toggle-whiteboard': () => {
             APP.store.dispatch(toggleWhiteboard());
-        },
-        '_request-desktop-sources-result': data => {
-            if (data.error) {
-                logger.error(`Error to retrieve desktop sources result, error data: ${data.error}`);
-
-                return;
-            }
-            if (data.success?.data?.sources) {
-                APP.store.dispatch(setDesktopSources(data.success.data.sources));
-            }
         }
     };
     transport.on('event', ({ data, name }) => {
@@ -1004,7 +993,13 @@ function initCommands() {
             callback(isP2pActive(APP.store.getState()));
             break;
         }
+        case '_is_electron_screensharing': {
+            callback(true);
+            break;
+        }
         default:
+            callback(null);
+
             return false;
         }
 
@@ -1296,8 +1291,8 @@ class API {
      * @param {Object} options - Object with the options for desktop sources.
      * @returns {void}
      */
-    notifyRequestDesktopSources(options) {
-        this._sendEvent({
+    requestDesktopSources(options) {
+        return transport.sendRequest({
             name: '_request-desktop-sources',
             options
         });

modules/API/external/external_api.js

@@ -91,8 +91,7 @@ const commands = {
     toggleTileView: 'toggle-tile-view',
     toggleVirtualBackgroundDialog: 'toggle-virtual-background',
     toggleVideo: 'toggle-video',
-    toggleWhiteboard: 'toggle-whiteboard',
-    _requestDesktopSourcesResult: '_request-desktop-sources-result'
+    toggleWhiteboard: 'toggle-whiteboard'
 };
 
 /**
@@ -160,7 +159,10 @@ const events = {
     'suspend-detected': 'suspendDetected',
     'tile-view-changed': 'tileViewChanged',
     'toolbar-button-clicked': 'toolbarButtonClicked',
-    'whiteboard-status-changed': 'whiteboardStatusChanged',
+    'whiteboard-status-changed': 'whiteboardStatusChanged'
+};
+
+const requests = {
     '_request-desktop-sources': '_requestDesktopSources'
 };
 
@@ -689,6 +691,18 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
 
             return false;
         });
+
+        this._transport.on('request', (request, callback) => {
+            const requestName = requests[request.name];
+            const data = {
+                ...request,
+                name: requestName
+            };
+
+            if (requestName) {
+                this.emit(requestName, data, callback);
+            }
+        });
     }
 
     /**
@@ -1260,6 +1274,17 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         });
     }
 
+    /**
+     * Returns the state of availability electron share screen via external api.
+     *
+     * @returns {Promise}
+     */
+    _isElectronScreensharing() {
+        return this._transport.sendRequest({
+            name: '_is_electron_screensharing'
+        });
+    }
+
     /**
      * Pins a participant's video on to the stage view.
      *
@@ -1313,17 +1338,6 @@ export default class JitsiMeetExternalAPI extends EventEmitter {
         }
     }
 
-    /**
-     * Send request to request desktop sources.
-     *
-     * @returns {Promise} - Result.
-     */
-    _requestDesktopSources() {
-        return this._transport.sendRequest({
-            name: '_request-desktop-sources'
-        });
-    }
-
     /**
      * Passes an event along to the local conference participant to establish
      * or update a direct peer connection. This is currently used for developing

react/features/app/reducers.web.ts

@@ -1,7 +1,6 @@
 import '../base/devices/reducer';
 import '../base/premeeting/reducer';
 import '../base/tooltip/reducer';
-import '../desktop-picker/reducer';
 import '../e2ee/reducer';
 import '../face-landmarks/reducer';
 import '../feedback/reducer';

react/features/app/types.ts

@@ -32,7 +32,6 @@ import { IBreakoutRoomsState } from '../breakout-rooms/reducer';
 import { ICalendarSyncState } from '../calendar-sync/reducer';
 import { IChatState } from '../chat/reducer';
 import { IDeepLinkingState } from '../deep-linking/reducer';
-import { IDesktopPicker } from '../desktop-picker/reducer';
 import { IDropboxState } from '../dropbox/reducer';
 import { IDynamicBrandingState } from '../dynamic-branding/reducer';
 import { IE2EEState } from '../e2ee/reducer';
@@ -124,7 +123,6 @@ export interface IReduxState {
     'features/call-integration': ICallIntegrationState;
     'features/chat': IChatState;
     'features/deep-linking': IDeepLinkingState;
-    'features/desktop-picker': IDesktopPicker;
     'features/dropbox': IDropboxState;
     'features/dynamic-branding': IDynamicBrandingState;
     'features/e2ee': IE2EEState;

react/features/desktop-picker/actions.ts

@@ -1,8 +1,6 @@
 import { openDialog } from '../base/dialog/actions';
 
-import { DELETE_DESKTOP_SOURCES, SET_DESKTOP_SOURCES } from './actionTypes';
 import DesktopPicker from './components/DesktopPicker';
-import { _separateSourcesByType } from './functions';
 
 /**
  * Signals to open a dialog with the DesktopPicker component.
@@ -20,27 +18,3 @@ export function showDesktopPicker(options: { desktopSharingSources?: any; } = {}
         onSourceChoose
     });
 }
-
-/**
- * Signals to open a dialog with the DesktopPicker component with screen sharing sources.
- *
- * @param {Array} sources - Desktop capturer sources.
- * @returns {Function}
- */
-export function setDesktopSources(sources: Array<any>) {
-    return {
-        type: SET_DESKTOP_SOURCES,
-        sources: _separateSourcesByType(sources ?? [])
-    };
-}
-
-/**
- * Action used to delete desktop sources.
- *
- * @returns {Object}
- */
-export function deleteDesktopSources() {
-    return {
-        type: DELETE_DESKTOP_SOURCES
-    };
-}

react/features/desktop-picker/components/DesktopPicker.tsx

@@ -1,21 +1,15 @@
-import _ from 'lodash';
 import React, { PureComponent } from 'react';
 import { WithTranslation } from 'react-i18next';
 import { connect } from 'react-redux';
 
-import { IReduxState, IStore } from '../../app/types';
+import { IStore } from '../../app/types';
 import { hideDialog } from '../../base/dialog/actions';
 import { translate } from '../../base/i18n/functions';
 import Dialog from '../../base/ui/components/web/Dialog';
 import Tabs from '../../base/ui/components/web/Tabs';
-import { deleteDesktopSources } from '../actions';
 import { THUMBNAIL_SIZE } from '../constants';
-import {
-    getDesktopPickerSources,
-    obtainDesktopSources,
-    oldJitsiMeetElectronUsage
-} from '../functions';
-import { IDesktopSources } from '../types';
+import { obtainDesktopSources } from '../functions';
+import logger from '../logger';
 
 import DesktopPickerPane from './DesktopPickerPane';
 
@@ -45,11 +39,6 @@ const VALID_TYPES = Object.keys(TAB_LABELS);
  */
 interface IProps extends WithTranslation {
 
-    /**
-     * An object containing all the DesktopCapturerSources.
-     */
-     _sources: IDesktopSources;
-
     /**
      * An array with desktop sharing sources to be displayed.
      */
@@ -185,28 +174,6 @@ class DesktopPicker extends PureComponent<IProps, IState> {
         this._stopPolling();
     }
 
-    /**
-     * Clean up component and DesktopCapturerSource store state.
-     *
-     * @inheritdoc
-     */
-    componentDidUpdate(prevProps: IProps) {
-        // skip logic if old jitsi meet electron used.
-        if (oldJitsiMeetElectronUsage()) {
-            return;
-        }
-
-        if (this.props._sources && !_.isEqual(this.props._sources, prevProps._sources)) {
-            const selectedSource = this._getSelectedSource(this.props._sources);
-
-            // update state with latest thumbnail desktop sources
-            this.setState({
-                sources: this.props._sources,
-                selectedSource
-            });
-        }
-    }
-
 
     /**
      * Implements React's {@link Component#render()}.
@@ -308,7 +275,6 @@ class DesktopPicker extends PureComponent<IProps, IState> {
     _onCloseModal(id = '', type?: string, screenShareAudio = false) {
         this.props.onSourceChoose(id, type, screenShareAudio);
         this.props.dispatch(hideDialog());
-        this.props.dispatch(deleteDesktopSources());
     }
 
     /**
@@ -432,14 +398,14 @@ class DesktopPicker extends PureComponent<IProps, IState> {
      */
     _updateSources() {
         const { types } = this.state;
+        const options = {
+            types,
+            thumbnailSize: THUMBNAIL_SIZE
+        };
 
-        if (oldJitsiMeetElectronUsage()) {
 
-            if (types.length > 0) {
-                obtainDesktopSources(
-                    this.state.types,
-                    { thumbnailSize: THUMBNAIL_SIZE }
-                )
+        if (types.length > 0) {
+            obtainDesktopSources(options)
                 .then((sources: any) => {
                     const selectedSource = this._getSelectedSource(sources);
 
@@ -448,29 +414,9 @@ class DesktopPicker extends PureComponent<IProps, IState> {
                         selectedSource
                     });
                 })
-                .catch(() => { /* ignore */ });
-            }
-        } else {
-            APP.API.notifyRequestDesktopSources({
-                types,
-                thumbnailSize: THUMBNAIL_SIZE
-            });
+                .catch((error: any) => logger.log(error));
         }
     }
 }
 
-/**
- * Maps (parts of) the redux state to the React props.
- *
- * @param {Object} state - The redux state.
- * @returns {{
-*     _sources: IDesktopPicker
-* }}
-*/
-function _mapStateToProps(state: IReduxState) {
-    return {
-        _sources: getDesktopPickerSources(state)
-    };
-}
-
-export default translate(connect(_mapStateToProps)(DesktopPicker));
+export default translate(connect()(DesktopPicker));