Replace rest of defer usages using small shim. Add homebrew promise utils
This commit is contained in:
parent
44401d73b4
commit
6850c14739
4 changed files with 53 additions and 4 deletions
|
@ -24,6 +24,7 @@ import {_t} from "../languageHandler";
|
|||
import sdk from "../index";
|
||||
import Modal from "../Modal";
|
||||
import SettingsStore from "../settings/SettingsStore";
|
||||
import {defer} from "./promise";
|
||||
|
||||
/**
|
||||
* Invites multiple addresses to a room or group, handling rate limiting from the server
|
||||
|
@ -71,7 +72,7 @@ export default class MultiInviter {
|
|||
};
|
||||
}
|
||||
}
|
||||
this.deferred = Promise.defer();
|
||||
this.deferred = defer();
|
||||
this._inviteMore(0);
|
||||
|
||||
return this.deferred.promise;
|
||||
|
|
46
src/utils/promise.js
Normal file
46
src/utils/promise.js
Normal file
|
@ -0,0 +1,46 @@
|
|||
/*
|
||||
Copyright 2019 The Matrix.org Foundation C.I.C.
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
*/
|
||||
|
||||
// @flow
|
||||
|
||||
// Returns a promise which resolves with a given value after the given number of ms
|
||||
export const sleep = (ms: number, value: any): Promise => new Promise((resolve => { setTimeout(resolve, ms, value); }));
|
||||
|
||||
// Returns a promise which resolves when the input promise resolves with its value
|
||||
// or when the timeout of ms is reached with the value of given timeoutValue
|
||||
export async function timeout(promise: Promise, timeoutValue: any, ms: number): Promise {
|
||||
const timeoutPromise = new Promise((resolve) => {
|
||||
const timeoutId = setTimeout(resolve, ms, timeoutValue);
|
||||
promise.then(() => {
|
||||
clearTimeout(timeoutId);
|
||||
});
|
||||
});
|
||||
|
||||
return Promise.race([promise, timeoutPromise]);
|
||||
}
|
||||
|
||||
// Returns a Deferred
|
||||
export function defer(): {resolve: () => {}, reject: () => {}, promise: Promise} {
|
||||
let resolve;
|
||||
let reject;
|
||||
|
||||
const promise = new Promise((_resolve, _reject) => {
|
||||
resolve = _resolve;
|
||||
reject = _reject;
|
||||
});
|
||||
|
||||
return {resolve, reject, promise};
|
||||
}
|
Loading…
Add table
Add a link
Reference in a new issue