appium-remote-debugger 15.8.1 → 15.9.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +2 -2
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +2 -2
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/utils.d.ts +16 -0
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +35 -1
- package/build/lib/utils.js.map +1 -1
- package/lib/mixins/navigate.ts +4 -4
- package/lib/remote-debugger.ts +2 -2
- package/lib/utils.ts +41 -0
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [15.9.0](https://github.com/appium/appium-remote-debugger/compare/v15.8.1...v15.9.0) (2026-04-30)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Use cancellable delay built using native promises ([#492](https://github.com/appium/appium-remote-debugger/issues/492)) ([84b9aa9](https://github.com/appium/appium-remote-debugger/commit/84b9aa9b26aaa63e8668cdb16e55362e08059b66))
|
|
6
|
+
|
|
1
7
|
## [15.8.1](https://github.com/appium/appium-remote-debugger/compare/v15.8.0...v15.8.1) (2026-04-29)
|
|
2
8
|
|
|
3
9
|
### Bug Fixes
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,MAAM,EAAC,MAAM,iBAAiB,CAAC;AAWvC,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAGvD,eAAO,MAAM,iCAAiC,QAAY,CAAC;AAY3D;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAExD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAIzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAYxF;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,cAAc,EACpB,kBAAkB,CAAC,EAAE,MAAM,CAAC,KAAK,GAChC,OAAO,CAAC,IAAI,CAAC,CA2Df;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAoBjG;AAED;;;;;;;;GAQG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAqF/E"}
|
|
@@ -74,7 +74,7 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
74
74
|
const timer = startPageLoadTimer ?? new support_1.timing.Timer().start();
|
|
75
75
|
let isPageLoading = true;
|
|
76
76
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
77
|
-
(0, property_accessors_1.setPageLoadDelay)(this,
|
|
77
|
+
(0, property_accessors_1.setPageLoadDelay)(this, (0, utils_1.cancellableDelay)(readinessTimeoutMs));
|
|
78
78
|
const pageReadinessPromise = (async () => {
|
|
79
79
|
let retry = 0;
|
|
80
80
|
while (isPageLoading) {
|
|
@@ -179,7 +179,7 @@ async function navToUrl(url) {
|
|
|
179
179
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
180
180
|
let onPageLoaded;
|
|
181
181
|
let onPageLoadedTimeout;
|
|
182
|
-
(0, property_accessors_1.setPageLoadDelay)(this,
|
|
182
|
+
(0, property_accessors_1.setPageLoadDelay)(this, (0, utils_1.cancellableDelay)(readinessTimeoutMs));
|
|
183
183
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
184
184
|
let isPageLoading = true;
|
|
185
185
|
const start = new support_1.timing.Timer().start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":";;;AAgCA,sCAEC;AAMD,wCAIC;AAYD,wDAYC;AAUD,gCA8DC;AAWD,4CAoBC;AAWD,4BAqFC;AA3QD,
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ import * as cookieMixins from './mixins/cookies';
|
|
|
7
7
|
import * as screenshotMixins from './mixins/screenshot';
|
|
8
8
|
import * as eventMixins from './mixins/events';
|
|
9
9
|
import * as miscellaneousMixins from './mixins/misc';
|
|
10
|
-
import {
|
|
10
|
+
import type { CancellableDelay } from './utils';
|
|
11
11
|
import type { RemoteDebuggerOptions, AppDict, EventListener, PageIdKey, AppIdKey } from './types';
|
|
12
12
|
import type { AppiumLogger, StringRecord } from '@appium/types';
|
|
13
13
|
import type { RpcClient } from './rpc/rpc-client';
|
|
@@ -60,7 +60,7 @@ export declare class RemoteDebugger extends EventEmitter {
|
|
|
60
60
|
protected _pageIdKey?: PageIdKey;
|
|
61
61
|
protected _connectedDrivers?: StringRecord[];
|
|
62
62
|
protected _currentState?: string;
|
|
63
|
-
protected _pageLoadDelay?:
|
|
63
|
+
protected _pageLoadDelay?: CancellableDelay;
|
|
64
64
|
protected _rpcClient: RpcClient | null;
|
|
65
65
|
protected _pageLoading: boolean;
|
|
66
66
|
protected _navigatingToPage: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,YAAY,EAAC,MAAM,aAAa,CAAC;AAIzC,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,gBAAgB,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,mBAAmB,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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"}
|
package/build/lib/utils.d.ts
CHANGED
|
@@ -2,6 +2,15 @@ import type { StringRecord } from '@appium/types';
|
|
|
2
2
|
import type { AppInfo, AppDict, Page } from './types';
|
|
3
3
|
export declare const WEB_CONTENT_BUNDLE_ID = "com.apple.WebKit.WebContent";
|
|
4
4
|
export declare const RESPONSE_LOG_LENGTH = 100;
|
|
5
|
+
export type CancellableDelay = Promise<void> & {
|
|
6
|
+
cancel: () => void;
|
|
7
|
+
};
|
|
8
|
+
/**
|
|
9
|
+
* Thrown when a cancellable delay is cancelled.
|
|
10
|
+
*/
|
|
11
|
+
export declare class DelayCancellation extends Error {
|
|
12
|
+
constructor(message?: string);
|
|
13
|
+
}
|
|
5
14
|
/**
|
|
6
15
|
* Error thrown when an async operation exceeds the configured timeout.
|
|
7
16
|
*/
|
|
@@ -61,6 +70,13 @@ export declare function deepEqual(a: unknown, b: unknown): boolean;
|
|
|
61
70
|
* @returns A promise that resolves when the delay expires.
|
|
62
71
|
*/
|
|
63
72
|
export declare function delay(ms: number): Promise<void>;
|
|
73
|
+
/**
|
|
74
|
+
* Returns a delay promise with a `cancel` method that rejects the promise.
|
|
75
|
+
*
|
|
76
|
+
* @param ms - Delay in milliseconds.
|
|
77
|
+
* @returns A cancellable delay promise.
|
|
78
|
+
*/
|
|
79
|
+
export declare function cancellableDelay(ms: number): CancellableDelay;
|
|
64
80
|
/**
|
|
65
81
|
* Wraps a promise with a timeout.
|
|
66
82
|
*
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAC,MAAM,SAAS,CAAC;AAGpD,eAAO,MAAM,qBAAqB,gCAAgC,CAAC;AAQnE,eAAO,MAAM,mBAAmB,MAAM,CAAC;AAEvC;;GAEG;AACH,qBAAa,YAAa,SAAQ,KAAK;gBACzB,OAAO,GAAE,MAA8B;CAIpD;AAED;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,MAAM,CAKpE;AAED;;;;;;;GAOG;AACH,wBAAgB,QAAQ,CAAC,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC,SAAS,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EACnF,MAAM,EAAE,CAAC,EACT,WAAW,EAAE,CAAC,GACb,CAAC,GAAG,CAAC,CAQP;AAED;;;;;GAKG;AACH,wBAAgB,aAAa,CAAC,KAAK,EAAE,OAAO,GAAG,KAAK,IAAI,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAM1E;AAED;;;;;GAKG;AACH,wBAAgB,OAAO,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAc/C;AAED;;;;;GAKG;AACH,wBAAgB,IAAI,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAEvC;AAED;;;;;;GAMG;AACH,wBAAgB,SAAS,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,EAAE,OAAO,GAAG,OAAO,CAEzD;AAED;;;;;GAKG;AACH,wBAAgB,KAAK,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE/C;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAAC,CAAC,EACjC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAC,EACnB,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,CAAC,CAAC,CAiBZ;AAED;;;;;;GAMG;AACH,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CA+B5E;AAED;;;;;;GAMG;AACH,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,YAAY,GAAG,IAAI,EAAE,CAchE;AAED;;;;;;;;GAQG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,GAAG,MAAM,EAAE,CAW5E;AAED;;;;;;;;GAQG;AACH,wBAAgB,WAAW,CAAC,CAAC,SAAS,YAAY,EAAE,MAAM,EAAE,CAAC,GAAG,CAAC,CAShE;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,SAAS,GAAE,OAAe,GAAG,MAAM,CAyB9E;AAED;;;;;;;;;GASG;AACH,wBAAgB,iCAAiC,CAAC,GAAG,EAAE,GAAG,GAAG,GAAG,CAyB/D;AAUD;;;;;GAKG;AACH,wBAAgB,aAAa,IAAI,MAAM,CAUtC;AAED;;;;GAIG;AACH,wBAAgB,mBAAmB,IAAI,YAAY,CAGlD;AAED;;;;GAIG;AACH,wBAAgB,sBAAsB,CAAC,eAAe,EAAE,MAAM,GAAG,OAAO,CAEvE"}
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
|
package/build/lib/utils.js
CHANGED
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.TimeoutError = exports.RESPONSE_LOG_LENGTH = exports.WEB_CONTENT_BUNDLE_ID = void 0;
|
|
6
|
+
exports.TimeoutError = exports.DelayCancellation = exports.RESPONSE_LOG_LENGTH = exports.WEB_CONTENT_BUNDLE_ID = void 0;
|
|
7
7
|
exports.truncateString = truncateString;
|
|
8
8
|
exports.defaults = defaults;
|
|
9
9
|
exports.isPlainObject = isPlainObject;
|
|
@@ -11,6 +11,7 @@ exports.isEmpty = isEmpty;
|
|
|
11
11
|
exports.uniq = uniq;
|
|
12
12
|
exports.deepEqual = deepEqual;
|
|
13
13
|
exports.delay = delay;
|
|
14
|
+
exports.cancellableDelay = cancellableDelay;
|
|
14
15
|
exports.withTimeout = withTimeout;
|
|
15
16
|
exports.appInfoFromDict = appInfoFromDict;
|
|
16
17
|
exports.pageArrayFromDict = pageArrayFromDict;
|
|
@@ -36,6 +37,16 @@ const ACCEPTED_PAGE_TYPES = [
|
|
|
36
37
|
'WIRTypePage', // iOS 11.4 webview
|
|
37
38
|
];
|
|
38
39
|
exports.RESPONSE_LOG_LENGTH = 100;
|
|
40
|
+
/**
|
|
41
|
+
* Thrown when a cancellable delay is cancelled.
|
|
42
|
+
*/
|
|
43
|
+
class DelayCancellation extends Error {
|
|
44
|
+
constructor(message = 'Delay cancelled') {
|
|
45
|
+
super(message);
|
|
46
|
+
this.name = 'DelayCancellation';
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
exports.DelayCancellation = DelayCancellation;
|
|
39
50
|
/**
|
|
40
51
|
* Error thrown when an async operation exceeds the configured timeout.
|
|
41
52
|
*/
|
|
@@ -138,6 +149,29 @@ function deepEqual(a, b) {
|
|
|
138
149
|
function delay(ms) {
|
|
139
150
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
140
151
|
}
|
|
152
|
+
/**
|
|
153
|
+
* Returns a delay promise with a `cancel` method that rejects the promise.
|
|
154
|
+
*
|
|
155
|
+
* @param ms - Delay in milliseconds.
|
|
156
|
+
* @returns A cancellable delay promise.
|
|
157
|
+
*/
|
|
158
|
+
function cancellableDelay(ms) {
|
|
159
|
+
let timeoutId;
|
|
160
|
+
let rejectFn;
|
|
161
|
+
const promise = new Promise((resolve, reject) => {
|
|
162
|
+
rejectFn = reject;
|
|
163
|
+
timeoutId = setTimeout(resolve, ms);
|
|
164
|
+
});
|
|
165
|
+
promise.cancel = () => {
|
|
166
|
+
if (timeoutId) {
|
|
167
|
+
clearTimeout(timeoutId);
|
|
168
|
+
timeoutId = undefined;
|
|
169
|
+
}
|
|
170
|
+
rejectFn?.(new DelayCancellation());
|
|
171
|
+
rejectFn = undefined;
|
|
172
|
+
};
|
|
173
|
+
return promise;
|
|
174
|
+
}
|
|
141
175
|
/**
|
|
142
176
|
* Wraps a promise with a timeout.
|
|
143
177
|
*
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/mixins/navigate.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import {checkParams, delay, TimeoutError, withTimeout} from '../utils';
|
|
1
|
+
import {cancellableDelay, checkParams, delay, TimeoutError, withTimeout} from '../utils';
|
|
2
2
|
import {events} from './events';
|
|
3
|
-
import {timing
|
|
3
|
+
import {timing} from '@appium/support';
|
|
4
4
|
import {
|
|
5
5
|
getAppIdKey,
|
|
6
6
|
setPageLoading,
|
|
@@ -86,7 +86,7 @@ export async function waitForDom(
|
|
|
86
86
|
|
|
87
87
|
let isPageLoading = true;
|
|
88
88
|
setPageLoading(this, true);
|
|
89
|
-
setPageLoadDelay(this,
|
|
89
|
+
setPageLoadDelay(this, cancellableDelay(readinessTimeoutMs));
|
|
90
90
|
const pageReadinessPromise = (async () => {
|
|
91
91
|
let retry = 0;
|
|
92
92
|
while (isPageLoading) {
|
|
@@ -199,7 +199,7 @@ export async function navToUrl(this: RemoteDebugger, url: string): Promise<void>
|
|
|
199
199
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
200
200
|
let onPageLoaded: (() => void) | undefined;
|
|
201
201
|
let onPageLoadedTimeout: NodeJS.Timeout | undefined | null;
|
|
202
|
-
setPageLoadDelay(this,
|
|
202
|
+
setPageLoadDelay(this, cancellableDelay(readinessTimeoutMs));
|
|
203
203
|
setPageLoading(this, true);
|
|
204
204
|
let isPageLoading = true;
|
|
205
205
|
const start = new timing.Timer().start();
|
package/lib/remote-debugger.ts
CHANGED
|
@@ -10,7 +10,7 @@ import * as cookieMixins from './mixins/cookies';
|
|
|
10
10
|
import * as screenshotMixins from './mixins/screenshot';
|
|
11
11
|
import * as eventMixins from './mixins/events';
|
|
12
12
|
import * as miscellaneousMixins from './mixins/misc';
|
|
13
|
-
import {
|
|
13
|
+
import type {CancellableDelay} from './utils';
|
|
14
14
|
import type {RemoteDebuggerOptions, AppDict, EventListener, PageIdKey, AppIdKey} from './types';
|
|
15
15
|
import type {AppiumLogger, StringRecord} from '@appium/types';
|
|
16
16
|
import type {RpcClient} from './rpc/rpc-client';
|
|
@@ -73,7 +73,7 @@ export class RemoteDebugger extends EventEmitter {
|
|
|
73
73
|
protected _pageIdKey?: PageIdKey;
|
|
74
74
|
protected _connectedDrivers?: StringRecord[];
|
|
75
75
|
protected _currentState?: string;
|
|
76
|
-
protected _pageLoadDelay?:
|
|
76
|
+
protected _pageLoadDelay?: CancellableDelay;
|
|
77
77
|
protected _rpcClient: RpcClient | null;
|
|
78
78
|
protected _pageLoading: boolean;
|
|
79
79
|
protected _navigatingToPage: boolean;
|
package/lib/utils.ts
CHANGED
|
@@ -17,6 +17,20 @@ const ACCEPTED_PAGE_TYPES = [
|
|
|
17
17
|
];
|
|
18
18
|
export const RESPONSE_LOG_LENGTH = 100;
|
|
19
19
|
|
|
20
|
+
export type CancellableDelay = Promise<void> & {
|
|
21
|
+
cancel: () => void;
|
|
22
|
+
};
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* Thrown when a cancellable delay is cancelled.
|
|
26
|
+
*/
|
|
27
|
+
export class DelayCancellation extends Error {
|
|
28
|
+
constructor(message: string = 'Delay cancelled') {
|
|
29
|
+
super(message);
|
|
30
|
+
this.name = 'DelayCancellation';
|
|
31
|
+
}
|
|
32
|
+
}
|
|
33
|
+
|
|
20
34
|
/**
|
|
21
35
|
* Error thrown when an async operation exceeds the configured timeout.
|
|
22
36
|
*/
|
|
@@ -129,6 +143,33 @@ export function delay(ms: number): Promise<void> {
|
|
|
129
143
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
130
144
|
}
|
|
131
145
|
|
|
146
|
+
/**
|
|
147
|
+
* Returns a delay promise with a `cancel` method that rejects the promise.
|
|
148
|
+
*
|
|
149
|
+
* @param ms - Delay in milliseconds.
|
|
150
|
+
* @returns A cancellable delay promise.
|
|
151
|
+
*/
|
|
152
|
+
export function cancellableDelay(ms: number): CancellableDelay {
|
|
153
|
+
let timeoutId: NodeJS.Timeout | undefined;
|
|
154
|
+
let rejectFn: ((error: Error) => void) | undefined;
|
|
155
|
+
|
|
156
|
+
const promise = new Promise<void>((resolve, reject) => {
|
|
157
|
+
rejectFn = reject;
|
|
158
|
+
timeoutId = setTimeout(resolve, ms);
|
|
159
|
+
}) as CancellableDelay;
|
|
160
|
+
|
|
161
|
+
promise.cancel = () => {
|
|
162
|
+
if (timeoutId) {
|
|
163
|
+
clearTimeout(timeoutId);
|
|
164
|
+
timeoutId = undefined;
|
|
165
|
+
}
|
|
166
|
+
rejectFn?.(new DelayCancellation());
|
|
167
|
+
rejectFn = undefined;
|
|
168
|
+
};
|
|
169
|
+
|
|
170
|
+
return promise;
|
|
171
|
+
}
|
|
172
|
+
|
|
132
173
|
/**
|
|
133
174
|
* Wraps a promise with a timeout.
|
|
134
175
|
*
|