chore(helpers) drop custom createDeferred() for Promise.withResolvers()

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/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/media/reducer.ts

@@ -3,7 +3,6 @@ import { AnyAction, combineReducers } from 'redux';
 import { CONFERENCE_FAILED, CONFERENCE_LEFT } from '../conference/actionTypes';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { TRACK_REMOVED } from '../tracks/actionTypes';
-import { DefferedPromise, createDeferred } from '../util/helpers';
 
 import {
     GUM_PENDING,
@@ -93,7 +92,7 @@ function _audio(state: IAudioState = _AUDIO_INITIAL_MEDIA_STATE, action: AnyActi
 // initial track creation haven't been started we would wait for it to finish before starting to join the room.
 // NOTE: The previous implementation was using the GUM promise from conference.init. But it turned out that connect
 // may finish even before conference.init is executed.
-const DEFAULT_INITIAL_PROMISE_STATE = createDeferred<IInitialGUMPromiseResult>();
+const DEFAULT_INITIAL_PROMISE_STATE = Promise.withResolvers<IInitialGUMPromiseResult>();
 
 /**
  * Reducer for the common properties in media state.
@@ -103,7 +102,7 @@ const DEFAULT_INITIAL_PROMISE_STATE = createDeferred<IInitialGUMPromiseResult>()
  * @param {string} action.type - Type of action.
  * @returns {ICommonState}
  */
-function _initialGUMPromise(state: DefferedPromise<IInitialGUMPromiseResult> | null = DEFAULT_INITIAL_PROMISE_STATE,
+function _initialGUMPromise(state: PromiseWithResolvers<IInitialGUMPromiseResult> | null = DEFAULT_INITIAL_PROMISE_STATE,
         action: AnyAction) {
     if (action.type === SET_INITIAL_GUM_PROMISE) {
         return action.promise ?? null;
@@ -294,7 +293,7 @@ interface IVideoState {
 
 export interface IMediaState {
     audio: IAudioState;
-    initialGUMPromise: DefferedPromise<IInitialGUMPromiseResult> | null;
+    initialGUMPromise: PromiseWithResolvers<IInitialGUMPromiseResult> | null;
     screenshare: IScreenshareState;
     video: IVideoState;
 }

react/features/base/participants/functions.ts

@@ -15,7 +15,6 @@ import i18next from '../i18n/i18next';
 import { MEDIA_TYPE, MediaType, VIDEO_TYPE } from '../media/constants';
 import { toState } from '../redux/functions';
 import { getScreenShareTrack, isLocalTrackMuted } from '../tracks/functions.any';
-import { createDeferred } from '../util/helpers';
 
 import {
     JIGASI_PARTICIPANT_ICON,
@@ -127,7 +126,7 @@ export function getActiveSpeakersToBeDisplayed(stateful: IStateful) {
  * @returns {Promise}
  */
 export function getFirstLoadableAvatarUrl(participant: IParticipant, store: IStore) {
-    const deferred: any = createDeferred();
+    const deferred: any = Promise.withResolvers();
     const fullPromise = deferred.promise
         .then(() => _getFirstLoadableAvatarUrl(participant, store))
         .then((result: any) => {

react/features/base/util/helpers.ts

@@ -22,27 +22,6 @@ export function assignIfDefined(target: Object, source: Object) {
     return to;
 }
 
-export type DefferedPromise<T> = {
-    promise: Promise<T>;
-    reject: (reason?: any) => void;
-    resolve: (value: T) => void;
-};
-
-/**
- * Creates a deferred object.
- *
- * @returns {{promise, resolve, reject}}
- */
-export function createDeferred<T>() {
-    const deferred = {} as DefferedPromise<T>;
-
-    deferred.promise = new Promise<T>((resolve, reject) => {
-        deferred.resolve = resolve;
-        deferred.reject = reject;
-    });
-
-    return deferred;
-}
 
 const MATCH_OPERATOR_REGEXP = /[|\\{}()[\]^$+*?.-]/g;
 

react/features/calendar-sync/web/microsoftCalendar.ts

@@ -5,8 +5,6 @@ import { v4 as uuidV4 } from 'uuid';
 import { findWindows } from 'windows-iana';
 import { IanaName } from 'windows-iana/dist/enums';
 
-// @ts-expect-error
-import { createDeferred } from '../../../../modules/util/helpers';
 import { IStore } from '../../app/types';
 import { parseURLParams } from '../../base/util/parseURLParams';
 import { parseStandardURIString } from '../../base/util/uri';
@@ -153,8 +151,7 @@ export const microsoftCalendarApi = {
                 return Promise.reject('Sign in already in progress.');
             }
 
-            const signInDeferred = createDeferred();
-
+            const signInDeferred = Promise.withResolvers();
             const guids = {
                 authState: uuidV4(),
                 authNonce: uuidV4()
@@ -229,7 +226,7 @@ export const microsoftCalendarApi = {
                     userSigninName: tokenParts.userSigninName
                 }));
 
-                signInDeferred.resolve();
+                signInDeferred.resolve(undefined);
             }
 
             window.addEventListener('message', handleAuth);

react/features/mobile/polyfills/browser.js

@@ -5,6 +5,7 @@ import BackgroundTimer from 'react-native-background-timer';
 import { TextDecoder, TextEncoder } from 'text-encoding';
 
 import 'promise.allsettled/auto'; // Promise.allSettled.
+import 'promise.withresolvers/auto'; // Promise.withResolvers.
 import 'react-native-url-polyfill/auto'; // Complete URL polyfill.
 
 import Storage from './Storage';