Merge branch 'jitsi:master' into wilson-jitsi-meet-8

README.md

@@ -34,7 +34,7 @@ mobile apps:
 
 | Android | Android (F-Droid) | iOS |
 |:-:|:-:|:-:|
-| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/en/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |
+| [<img src="resources/img/google-play-badge.png" height="50">](https://play.google.com/store/apps/details?id=org.jitsi.meet) | [<img src="resources/img/f-droid-badge.png" height="50">](https://f-droid.org/packages/org.jitsi.meet/) | [<img src="resources/img/appstore-badge.png" height="50">](https://itunes.apple.com/us/app/jitsi-meet/id1165103905) |
 
 If you are feeling adventurous and want to get an early scoop of the features as they are being
 developed you can also sign up for our open beta testing here:

interface_config.js

@@ -227,7 +227,7 @@ var interfaceConfig = {
     /**
      * Specify custom URL for downloading f droid app.
      */
-    // MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/en/packages/org.jitsi.meet/',
+    // MOBILE_DOWNLOAD_LINK_F_DROID: 'https://f-droid.org/packages/org.jitsi.meet/',
 
     // Connection indicators (
     // CONNECTION_INDICATOR_AUTO_HIDE_ENABLED,

lang/main-zhCN.json

@@ -410,6 +410,7 @@
         "sendPrivateMessageTitle": "私信回复？",
         "serviceUnavailable": "服务不可用",
         "sessTerminated": "通话已结束",
+        "sessTerminatedReason": "会议已经结束",
         "sessionRestarted": "由于连接问题，呼叫重新启动。",
         "shareAudio": "继续",
         "shareAudioTitle": "如何分享音频",

lang/main.json

@@ -1083,7 +1083,7 @@
         "about": "You can add a $t(lockRoomPassword) to your meeting. Participants will need to provide the $t(lockRoomPassword) before they are allowed to join the meeting.",
         "aboutReadOnly": "Moderator participants can add a $t(lockRoomPassword) to the meeting. Participants will need to provide the $t(lockRoomPassword) before they are allowed to join the meeting.",
         "insecureRoomNameWarningNative": "The room name is unsafe. Unwanted participants may join your meeting. {{recommendAction}} Learn more about securing your meeting ",
-        "insecureRoomNameWarningWeb": "The room name is unsafe. Unwanted participants may join your meeting. {{recommendAction}} Learn more about securing you meeting <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">here</a>.",
+        "insecureRoomNameWarningWeb": "The room name is unsafe. Unwanted participants may join your meeting. {{recommendAction}} Learn more about securing your meeting <a href=\"{{securityUrl}}\" rel=\"security\" target=\"_blank\">here</a>.",
         "title": "Security Options",
         "unsafeRoomActions": {
             "meeting": "Consider securing your meeting using the security button.",

package.json

@@ -68,14 +68,15 @@
     "js-md5": "0.6.1",
     "js-sha512": "0.8.0",
     "jwt-decode": "2.2.0",
-    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1890.0.0+144b0cab/lib-jitsi-meet.tgz",
+    "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1895.0.0+7de7d9aa/lib-jitsi-meet.tgz",
     "lodash-es": "4.17.21",
     "moment": "2.29.4",
     "moment-duration-format": "2.2.2",
     "null-loader": "4.0.1",
     "optional-require": "1.0.3",
     "pixelmatch": "5.3.0",
     "promise.allsettled": "1.0.4",
+    "promise.withresolvers": "1.0.3",
     "punycode": "2.3.0",
     "react": "18.2.0",
     "react-dom": "18.2.0",
@@ -134,8 +135,9 @@
     "@babel/plugin-transform-private-methods": "7.25.9",
     "@babel/preset-env": "7.25.9",
     "@babel/preset-react": "7.25.9",
-    "@jitsi/eslint-config": "4.1.10",
+    "@jitsi/eslint-config": "5.0.9",
     "@react-native/metro-config": "0.75.4",
+    "@stylistic/eslint-plugin": "2.12.1",
     "@types/amplitude-js": "8.16.5",
     "@types/audioworklet": "0.0.29",
     "@types/dom-screen-wake-lock": "1.0.1",
@@ -161,8 +163,8 @@
     "@types/w3c-image-capture": "1.0.6",
     "@types/w3c-web-hid": "1.0.3",
     "@types/zxcvbn": "4.4.1",
-    "@typescript-eslint/eslint-plugin": "5.59.5",
-    "@typescript-eslint/parser": "5.59.5",
+    "@typescript-eslint/eslint-plugin": "8.19.1",
+    "@typescript-eslint/parser": "8.19.1",
     "@wdio/allure-reporter": "9.4.3",
     "@wdio/cli": "9.4.3",
     "@wdio/globals": "9.4.3",
@@ -174,12 +176,12 @@
     "circular-dependency-plugin": "5.2.0",
     "clean-css-cli": "4.3.0",
     "css-loader": "6.8.1",
-    "eslint": "8.40.0",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-jsdoc": "46.2.6",
-    "eslint-plugin-react": "7.32.2",
-    "eslint-plugin-react-native": "4.0.0",
-    "eslint-plugin-typescript-sort-keys": "2.3.0",
+    "eslint": "8.57.0",
+    "eslint-plugin-import": "2.31.0",
+    "eslint-plugin-jsdoc": "50.6.1",
+    "eslint-plugin-react": "7.37.3",
+    "eslint-plugin-react-native": "5.0.0",
+    "eslint-plugin-typescript-sort-keys": "3.3.0",
     "jetifier": "1.6.4",
     "jsonwebtoken": "9.0.2",
     "metro-react-native-babel-preset": "0.77.0",
@@ -221,9 +223,11 @@
     "tsc-test:native": "tsc --project tsconfig.native.json --listFilesOnly | grep -v node_modules | grep web",
     "start": "make dev",
     "test": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.conf.ts",
+    "test-single": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.conf.ts --spec",
     "test-ff": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.firefox.conf.ts",
     "test-dev": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.dev.conf.ts",
-    "test-grid": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.grid.conf.ts"
+    "test-grid": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.grid.conf.ts",
+    "test-grid-single": "DOTENV_CONFIG_PATH=tests/.env wdio run tests/wdio.grid.conf.ts --spec"
   },
   "resolutions": {
     "@types/react": "17.0.14",

react/.eslintrc.js

@@ -14,24 +14,14 @@ module.exports = {
                 project: [ './tsconfig.web.json', './tsconfig.native.json' ]
             },
             rules: {
-                '@typescript-eslint/naming-convention': [
-                    'error',
-                    {
-                        'selector': 'interface',
-                        'format': [ 'PascalCase' ],
-                        'custom': {
-                            'regex': '^I[A-Z]',
-                            'match': true
-                        }
-                    }
-                ]
+                // TODO: Remove these and fix the warnings
+                '@typescript-eslint/no-unsafe-function-type': 0,
+                '@typescript-eslint/no-wrapper-object-types': 0,
+
+                '@typescript-eslint/no-require-imports': 0
             }
         }
     ],
-    'rules': {
-        // XXX remove this eventually.
-        'react/jsx-indent-props': 0
-    },
     'settings': {
         'react': {
             'version': 'detect'

react/features/always-on-top/index.tsx

@@ -4,8 +4,10 @@ import ReactDOM from 'react-dom';
 import AlwaysOnTop from './AlwaysOnTop';
 
 // Render the main/root Component.
+/* eslint-disable-next-line react/no-deprecated */
 ReactDOM.render(<AlwaysOnTop />, document.getElementById('react'));
 
 window.addEventListener(
     'beforeunload',
+    /* eslint-disable-next-line react/no-deprecated */
     () => ReactDOM.unmountComponentAtNode(document.getElementById('react') ?? document.body));

react/features/analytics/AnalyticsEvents.ts

@@ -311,7 +311,7 @@ export function createInviteDialogEvent(
  * @returns {Object}
  */
 export function createNetworkInfoEvent({ isOnline, networkType, details }:
-    { details?: Object; isOnline: boolean; networkType?: string; }) {
+{ details?: Object; isOnline: boolean; networkType?: string; }) {
     const attributes: {
         details?: Object;
         isOnline: boolean;

react/features/analytics/functions.ts

@@ -154,6 +154,30 @@ export async function createHandlers({ getState }: IStore) {
     return handlers;
 }
 
+/**
+ * Checks whether a url is a data URL or not.
+ *
+ * @param {string} url - The URL to be checked.
+ * @returns {boolean}
+ */
+function isDataURL(url?: string): boolean {
+    if (typeof url !== 'string') { // The icon will be ignored
+        return false;
+    }
+
+    try {
+        const urlObject = new URL(url);
+
+        if (urlObject.protocol === 'data:') {
+            return false;
+        }
+    } catch {
+        return false;
+    }
+
+    return true;
+}
+
 /**
  * Inits JitsiMeetJS.analytics by setting permanent properties and setting the handlers from the loaded scripts.
  * NOTE: Has to be used after JitsiMeetJS.init. Otherwise analytics will be null.
@@ -186,6 +210,7 @@ export function initAnalytics(store: IStore, handlers: Array<Object>): boolean {
         isPromotedFromVisitor?: boolean;
         isVisitor?: boolean;
         overwritesCustomButtonsWithURL?: boolean;
+        overwritesCustomParticipantButtonsWithURL?: boolean;
         overwritesDefaultLogoUrl?: boolean;
         overwritesDeploymentUrls?: boolean;
         overwritesEtherpadBase?: boolean;
@@ -287,23 +312,12 @@ export function initAnalytics(store: IStore, handlers: Array<Object>): boolean {
     const customToolbarButtons = params['config.customToolbarButtons'] ?? [];
 
     permanentProperties.overwritesCustomButtonsWithURL = Boolean(
-        customToolbarButtons.find(({ icon }: { icon: string; }) => {
-            if (typeof icon !== 'string') { // The icon will be ignored
-                return false;
-            }
-
-            try {
-                const url = new URL(icon);
+        customToolbarButtons.find(({ icon }: { icon: string; }) => isDataURL(icon)));
 
-                if (url.protocol === 'data:') {
-                    return false;
-                }
-            } catch {
-                return false;
-            }
+    const customParticipantMenuButtons = params['config.customParticipantMenuButtons'] ?? [];
 
-            return true;
-        }));
+    permanentProperties.overwritesCustomParticipantButtonsWithURL = Boolean(
+        customParticipantMenuButtons.find(({ icon }: { icon: string; }) => isDataURL(icon)));
 
     // Optionally, include local deployment information based on the
     // contents of window.config.deploymentInfo.

react/features/app/actions.any.ts

@@ -158,4 +158,3 @@ export function maybeRedirectToTokenAuthUrl(
     return false;
 }
 
-

react/features/app/components/AbstractApp.ts

@@ -27,11 +27,9 @@ export interface IProps {
  */
 export class AbstractApp<P extends IProps = IProps> extends BaseApp<P> {
     /**
-     * The deferred for the initialisation {{promise, resolve, reject}}.
+     * The deferred for the initialization {{promise, resolve, reject}}.
      */
-    _init: {
-        promise: Promise<any>;
-    };
+    _init: PromiseWithResolvers<any>;
 
     /**
      * Initializes the app.

react/features/app/getRouteToRender.web.ts

@@ -140,10 +140,7 @@ function _getWebWelcomePageRoute(state: IReduxState) {
  *
  * @returns {Object}
  */
-function _getEmptyRoute(): {
-    component: React.ReactNode;
-    href?: string;
-    } {
+function _getEmptyRoute(): { component: React.ReactNode; href?: string; } {
     return {
         component: BlankPage,
         href: undefined

react/features/app/middleware.ts

@@ -113,8 +113,7 @@ function _isMaybeSplitBrainError(getState: IStore['getState'], action: AnyAction
     const { error } = action;
     const isShardChangedError = error
         && error.message === 'item-not-found'
-        && error.details
-        && error.details.shard_changed;
+        && error.details?.shard_changed;
 
     if (isShardChangedError) {
         const state = getState();

react/features/base/app/components/BaseApp.tsx

@@ -14,7 +14,6 @@ import PersistenceRegistry from '../../redux/PersistenceRegistry';
 import ReducerRegistry from '../../redux/ReducerRegistry';
 import StateListenerRegistry from '../../redux/StateListenerRegistry';
 import SoundCollection from '../../sounds/components/SoundCollection';
-import { createDeferred } from '../../util/helpers';
 import { appWillMount, appWillUnmount } from '../actions';
 import logger from '../logger';
 
@@ -46,9 +45,7 @@ export default class BaseApp<P> extends Component<P, IState> {
     /**
      * The deferred for the initialisation {{promise, resolve, reject}}.
      */
-    _init: {
-        promise: Promise<any>;
-    };
+    _init: PromiseWithResolvers<any>;
 
     /**
      * Initializes a new {@code BaseApp} instance.
@@ -79,7 +76,7 @@ export default class BaseApp<P> extends Component<P, IState> {
          * @see {@link #_initStorage}
          * @type {Promise}
          */
-        this._init = createDeferred<void>();
+        this._init = Promise.withResolvers();
 
         try {
             await this._initStorage();

react/features/base/conference/middleware.any.ts

@@ -248,8 +248,7 @@ function _conferenceFailed({ dispatch, getState }: IStore, next: Function, actio
     }
 
     !error.recoverable
-    && conference
-    && conference.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).catch((reason: Error) => {
+    && conference?.leave(CONFERENCE_LEAVE_REASONS.UNRECOVERABLE_ERROR).catch((reason: Error) => {
         // Even though we don't care too much about the failure, it may be
         // good to know that it happen, so log it (on the info level).
         logger.info('JitsiConference.leave() rejected with:', reason);
@@ -430,7 +429,7 @@ function _connectionFailed({ dispatch, getState }: IStore, next: Function, actio
         } as INotificationProps;
 
         const { locationURL = { href: '' } as URL } = getState()['features/base/connection'];
-        const { tenant } = parseURIString(locationURL.href) || {};
+        const { tenant = '' } = parseURIString(locationURL.href) || {};
 
         if (tenant.startsWith('-') || tenant.endsWith('-')) {
             notificationProps.descriptionKey = 'notify.invalidTenantHyphenDescription';
@@ -551,7 +550,7 @@ function _pinParticipant({ getState }: IStore, next: Function, action: AnyAction
     const actionName = id ? ACTION_PINNED : ACTION_UNPINNED;
     const local
         = participantById?.local
-            || (!id && pinnedParticipant && pinnedParticipant.local);
+            || (!id && pinnedParticipant?.local);
     let participantIdForEvent;
 
     if (local) {

react/features/base/conference/reducer.ts

@@ -495,7 +495,7 @@ function _conferenceJoined(state: IConferenceState, { conference }: { conference
  * reduction of the specified action.
  */
 function _conferenceLeftOrWillLeave(state: IConferenceState, { conference, type }:
-    { conference: IJitsiConference; type: string; }) {
+{ conference: IJitsiConference; type: string; }) {
     const nextState = { ...state };
 
     // The redux action CONFERENCE_LEFT is the last time that we should be

react/features/base/config/configWhitelist.ts

@@ -76,7 +76,6 @@ export default [
     'channelLastN',
     'connectionIndicators',
     'constraints',
-    'customToolbarButtons',
     'brandingRoomAlias',
     'debug',
     'debugAudioLevels',
@@ -149,7 +148,6 @@ export default [
     'enableNoisyMicDetection',
     'enableTcc',
     'enableAutomaticUrlCopy',
-    'etherpad_base',
     'faceLandmarks',
     'failICE',
     'feedbackPercentage',
@@ -172,7 +170,6 @@ export default [
     'hideAddRoomButton',
     'hideEmailInSettings',
     'hideLobbyButton',
-    'hosts',
     'iAmRecorder',
     'iAmSipGateway',
     'ignoreStartMuted',
@@ -195,6 +192,7 @@ export default [
     'p2p.enabled',
     'p2p.iceTransportPolicy',
     'p2p.mobileCodecPreferenceOrder',
+    'p2p.mobileScreenshareCodec',
     'participantMenuButtonsWithNotifyClick',
     'participantsPane',
     'pcStatsInterval',
@@ -236,7 +234,17 @@ export default [
     'useTurnUdp',
     'videoQuality',
     'visitors',
-    'watchRTCConfigParams',
+    'watchRTCConfigParams.console',
+    'watchRTCConfigParams.allowBrowserLogCollection',
+    'watchRTCConfigParams.collectionInterval',
+    'watchRTCConfigParams.debug',
+    'watchRTCConfigParams.keys',
+    'watchRTCConfigParams.logGetStats',
+    'watchRTCConfigParams.rtcApiKey',
+    'watchRTCConfigParams.rtcPeerId',
+    'watchRTCConfigParams.rtcRoomId',
+    'watchRTCConfigParams.rtcTags',
+    'watchRTCConfigParams.rtcToken',
     'webrtcIceTcpDisable',
     'webrtcIceUdpDisable',
     'whiteboard.enabled'

react/features/base/config/functions.web.ts

@@ -89,7 +89,7 @@ export function _setDeeplinkingDefaults(deeplinking: IDeeplinkingConfig) {
     android.downloadLink = android.downloadLink
         || 'https://play.google.com/store/apps/details?id=org.jitsi.meet';
     android.appPackage = android.appPackage || 'org.jitsi.meet';
-    android.fDroidUrl = android.fDroidUrl || 'https://f-droid.org/en/packages/org.jitsi.meet/';
+    android.fDroidUrl = android.fDroidUrl || 'https://f-droid.org/packages/org.jitsi.meet/';
     if (android.dynamicLink) {
         android.dynamicLink.apn = android.dynamicLink.apn || 'org.jitsi.meet';
         android.dynamicLink.appCode = android.dynamicLink.appCode || 'w2atb';

react/features/base/i18n/middleware.ts

@@ -23,7 +23,7 @@ MiddlewareRegistry.register(store => next => action => {
             ? action.value
             : store.getState()['features/dynamic-branding'];
 
-        if (language && labels && labels[language]) {
+        if (language && labels?.[language]) {
             changeLanguageBundle(language, labels[language])
             .catch(err => {
                 logger.log('Error setting dynamic language bundle', err);