|
2 | 2 |
|
3 | 3 | const PROMISE_TIMEOUT = 1000; |
4 | 4 |
|
5 | | -class Expirable extends Promise { |
| 5 | +class Expirable { |
6 | 6 | constructor(executor) { |
7 | | - super((resolve, reject) => { |
| 7 | + const promise = new Promise((resolve, reject) => { |
8 | 8 | executor(val => { |
9 | | - if (this.expired) { |
10 | | - reject(new Error('Expired')); |
11 | | - return; |
12 | | - } |
| 9 | + if (this.expired) return; |
13 | 10 | clearTimeout(this.timer); |
14 | 11 | resolve(val); |
15 | | - }, reject); |
| 12 | + }, err => { |
| 13 | + if (this.expired) return; |
| 14 | + clearTimeout(this.timer); |
| 15 | + reject(err); |
| 16 | + }); |
| 17 | + this.timer = setTimeout(() => { |
| 18 | + this.expired = true; |
| 19 | + reject(new Error('Expired')); |
| 20 | + }, PROMISE_TIMEOUT); |
16 | 21 | }); |
| 22 | + this.promise = promise; |
17 | 23 | this.expired = false; |
18 | | - this.timer = setTimeout(() => { |
19 | | - this.expired = true; |
20 | | - }, PROMISE_TIMEOUT); |
| 24 | + this.timer = null; |
| 25 | + return this.promise; |
21 | 26 | } |
22 | 27 | } |
23 | 28 |
|
24 | 29 | // Usage |
25 | 30 |
|
26 | 31 | new Expirable(resolve => { |
27 | | - setTimeout(resolve, 100); |
| 32 | + setTimeout(() => { |
| 33 | + resolve('Resolved before timeout'); |
| 34 | + }, 100); |
| 35 | +}).then(data => { |
| 36 | + console.dir({ data }); |
| 37 | +}).catch(error => { |
| 38 | + console.dir({ error: error.message }); |
| 39 | +}); |
| 40 | + |
| 41 | +new Expirable((resolve, reject) => { |
| 42 | + setTimeout(() => { |
| 43 | + reject(new Error('Something went wrong')); |
| 44 | + }, 100); |
28 | 45 | }).then(data => { |
29 | 46 | console.dir({ data }); |
30 | 47 | }).catch(error => { |
31 | | - console.dir({ error }); |
| 48 | + console.dir({ error: error.message }); |
32 | 49 | }); |
33 | 50 |
|
34 | 51 | new Expirable(resolve => { |
35 | | - setTimeout(resolve, 2000); |
| 52 | + setTimeout(() => { |
| 53 | + resolve('Never resolved before timeout'); |
| 54 | + }, 2000); |
| 55 | +}).then(data => { |
| 56 | + console.dir({ data }); |
| 57 | +}).catch(error => { |
| 58 | + console.dir({ error: error.message }); |
| 59 | +}); |
| 60 | + |
| 61 | +new Expirable((resolve, reject) => { |
| 62 | + setTimeout(() => { |
| 63 | + reject(new Error('Never rejected before timeout')); |
| 64 | + }, 2000); |
36 | 65 | }).then(data => { |
37 | 66 | console.dir({ data }); |
38 | 67 | }).catch(error => { |
39 | | - console.dir({ error }); |
| 68 | + console.dir({ error: error.message }); |
40 | 69 | }); |
0 commit comments