remove finally() since it is not supported in older browsers

bitwarden · Mar 5, 2019 · 965e356 · 965e356 · kspearrin · Mar 5, 2019
1 parent cc27f98
commit 965e356
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/misc/sequentialize.ts b/src/misc/sequentialize.ts
@@ -32,11 +32,18 @@ export function sequentialize(cacheKey: (args: any[]) => string) {
                     return response;
                 }
 
-                response = originalMethod.apply(this, args).finally(() => {
+                const onFinally = () => {
                     cache.delete(argsCacheKey);
                     if (cache.size === 0) {
                         caches.delete(this);
                     }
+                };
+                response = originalMethod.apply(this, args).then((val: any) => {
+                    onFinally();
+                    return val;
+                }).catch((err: any) => {
+                    onFinally();
+                    throw err;
                 });
 
                 cache.set(argsCacheKey, response);

diff --git a/src/misc/throttle.ts b/src/misc/throttle.ts
@@ -32,7 +32,7 @@ export function throttle(limit: number, throttleKey: (args: any[]) => string) {
 
                 return new Promise<T>((resolve, reject) => {
                     const exec = () => {
-                        originalMethod.apply(this, args).finally(() => {
+                        const onFinally = () => {
                             queue.splice(queue.indexOf(exec), 1);
                             if (queue.length >= limit) {
                                 queue[limit - 1]();
@@ -42,6 +42,13 @@ export function throttle(limit: number, throttleKey: (args: any[]) => string) {
                                     allThrottles.delete(this);
                                 }
                             }
+                        };
+                        originalMethod.apply(this, args).then((val: any) => {
+                            onFinally();
+                            return val;
+                        }).catch((err: any) => {
+                            onFinally();
+                            throw err;
                         }).then(resolve, reject);
                     };
                     queue.push(exec);