appium-remote-debugger 15.10.0 → 15.10.2
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 +12 -0
- 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/rpc/rpc-client-real-device-shim.d.ts +1 -2
- package/build/lib/rpc/rpc-client-real-device-shim.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-real-device-shim.js +1 -8
- package/build/lib/rpc/rpc-client-real-device-shim.js.map +1 -1
- package/build/lib/utils/index.d.ts +0 -2
- package/build/lib/utils/index.d.ts.map +1 -1
- package/build/lib/utils/index.js +1 -3
- package/build/lib/utils/index.js.map +1 -1
- package/lib/mixins/navigate.ts +3 -3
- package/lib/remote-debugger.ts +2 -2
- package/lib/rpc/rpc-client-real-device-shim.ts +2 -10
- package/lib/utils/index.ts +0 -2
- package/package.json +3 -3
- package/build/lib/utils/async.d.ts +0 -11
- package/build/lib/utils/async.d.ts.map +0 -1
- package/build/lib/utils/async.js +0 -28
- package/build/lib/utils/async.js.map +0 -1
- package/lib/utils/async.ts +0 -32
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [15.10.2](https://github.com/appium/appium-remote-debugger/compare/v15.10.1...v15.10.2) (2026-05-21)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* **deps:** bump appium-ios-remotexpc from 1.1.13 to 2.0.0 ([#496](https://github.com/appium/appium-remote-debugger/issues/496)) ([304a173](https://github.com/appium/appium-remote-debugger/commit/304a1738dce1165057b187c4a680c000d1c4801b))
|
|
6
|
+
|
|
7
|
+
## [15.10.1](https://github.com/appium/appium-remote-debugger/compare/v15.10.0...v15.10.1) (2026-05-11)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* Use cancellable sleep from asyncbox ([#495](https://github.com/appium/appium-remote-debugger/issues/495)) ([f33d1db](https://github.com/appium/appium-remote-debugger/commit/f33d1db34948799cca5159a700a6ea4f8b57cb4c))
|
|
12
|
+
|
|
1
13
|
## [15.10.0](https://github.com/appium/appium-remote-debugger/compare/v15.9.1...v15.10.0) (2026-05-10)
|
|
2
14
|
|
|
3
15
|
### Features
|
|
@@ -75,7 +75,7 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
75
75
|
const timer = startPageLoadTimer ?? new support_1.timing.Timer().start();
|
|
76
76
|
let isPageLoading = true;
|
|
77
77
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
78
|
-
(0, property_accessors_1.setPageLoadDelay)(this, (0,
|
|
78
|
+
(0, property_accessors_1.setPageLoadDelay)(this, (0, asyncbox_1.sleep)({ ms: readinessTimeoutMs, cancelError: new utils_1.DelayCancellation() }));
|
|
79
79
|
const pageReadinessPromise = (async () => {
|
|
80
80
|
let retry = 0;
|
|
81
81
|
while (isPageLoading) {
|
|
@@ -180,7 +180,7 @@ async function navToUrl(url) {
|
|
|
180
180
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
181
181
|
let onPageLoaded;
|
|
182
182
|
let onPageLoadedTimeout;
|
|
183
|
-
(0, property_accessors_1.setPageLoadDelay)(this, (0,
|
|
183
|
+
(0, property_accessors_1.setPageLoadDelay)(this, (0, asyncbox_1.sleep)({ ms: readinessTimeoutMs, cancelError: new utils_1.DelayCancellation() }));
|
|
184
184
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
185
185
|
let isPageLoading = true;
|
|
186
186
|
const start = new support_1.timing.Timer().start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":";;;AAiCA,sCAEC;AAMD,wCAIC;AAYD,wDAYC;AAUD,gCA8DC;AAWD,4CAwBC;AAWD,4BAqFC;AAhRD,uCAA4C;AAC5C,
|
|
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 type {
|
|
10
|
+
import type { CancellablePromise } from 'asyncbox';
|
|
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?: CancellablePromise<void>;
|
|
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,KAAK,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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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { RpcClient } from './rpc-client';
|
|
2
2
|
import type { RemoteCommand, RpcClientOptions } from '../types';
|
|
3
|
-
import type { WebInspectorService
|
|
3
|
+
import type { WebInspectorService } from 'appium-ios-remotexpc';
|
|
4
4
|
/**
|
|
5
5
|
* Options specific to RpcClientRealDeviceShim.
|
|
6
6
|
*/
|
|
@@ -19,7 +19,6 @@ export interface RpcClientRealDeviceShimOptions extends RpcClientOptions {
|
|
|
19
19
|
*/
|
|
20
20
|
export declare class RpcClientRealDeviceShim extends RpcClient {
|
|
21
21
|
protected webInspectorService?: WebInspectorService;
|
|
22
|
-
protected remoteXPC?: RemoteXpcConnection;
|
|
23
22
|
protected messageListenerTask?: Promise<void>;
|
|
24
23
|
protected isListening: boolean;
|
|
25
24
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-real-device-shim.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAE9D,OAAO,KAAK,EAAC,mBAAmB,
|
|
1
|
+
{"version":3,"file":"rpc-client-real-device-shim.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,cAAc,CAAC;AACvC,OAAO,KAAK,EAAC,aAAa,EAAE,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAE9D,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,sBAAsB,CAAC;AAE9D;;GAEG;AACH,MAAM,WAAW,8BAA+B,SAAQ,gBAAgB;IACtE,qDAAqD;IACrD,IAAI,EAAE,MAAM,CAAC;CACd;AAUD;;;;;;;;GAQG;AACH,qBAAa,uBAAwB,SAAQ,SAAS;IACpD,SAAS,CAAC,mBAAmB,CAAC,EAAE,mBAAmB,CAAC;IACpD,SAAS,CAAC,mBAAmB,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC9C,SAAS,CAAC,WAAW,EAAE,OAAO,CAAS;IAEvC;;;;OAIG;gBACS,IAAI,EAAE,8BAA8B;IAIhD;;;;OAIG;IACY,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAcvC;;;OAGG;IACY,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAuC1C;;;;;OAKG;IACY,WAAW,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC;IAY7D;;;;;OAKG;IACY,OAAO,CAAC,IAAI,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAMhD;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IA6B5B;;;;;;OAMG;IACH,OAAO,CAAC,cAAc;IAqBtB;;;;;;OAMG;IACH,OAAO,CAAC,kBAAkB;CAY3B;AAED,eAAe,uBAAuB,CAAC"}
|
|
@@ -15,7 +15,6 @@ const rpc_client_1 = require("./rpc-client");
|
|
|
15
15
|
*/
|
|
16
16
|
class RpcClientRealDeviceShim extends rpc_client_1.RpcClient {
|
|
17
17
|
webInspectorService;
|
|
18
|
-
remoteXPC;
|
|
19
18
|
messageListenerTask;
|
|
20
19
|
isListening = false;
|
|
21
20
|
/**
|
|
@@ -37,9 +36,7 @@ class RpcClientRealDeviceShim extends rpc_client_1.RpcClient {
|
|
|
37
36
|
}
|
|
38
37
|
logger_1.log.debug(`Connecting to WebInspector shim service for device ${this.udid}`);
|
|
39
38
|
const { Services } = await import('appium-ios-remotexpc');
|
|
40
|
-
|
|
41
|
-
this.webInspectorService = result.webInspectorService;
|
|
42
|
-
this.remoteXPC = result.remoteXPC;
|
|
39
|
+
this.webInspectorService = await Services.startWebInspectorService(this.udid);
|
|
43
40
|
this.startMessageListener();
|
|
44
41
|
this.isConnected = true;
|
|
45
42
|
logger_1.log.debug('Successfully connected to WebInspector shim service');
|
|
@@ -80,10 +77,6 @@ class RpcClientRealDeviceShim extends rpc_client_1.RpcClient {
|
|
|
80
77
|
await this.webInspectorService.close();
|
|
81
78
|
this.webInspectorService = undefined;
|
|
82
79
|
}
|
|
83
|
-
if (this.remoteXPC) {
|
|
84
|
-
await this.remoteXPC.close();
|
|
85
|
-
this.remoteXPC = undefined;
|
|
86
|
-
}
|
|
87
80
|
this.isConnected = false;
|
|
88
81
|
logger_1.log.debug('Disconnected from WebInspector shim service');
|
|
89
82
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-real-device-shim.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":";;;AAAA,6CAAqC;AACrC,sCAA8B;AAC9B,6CAAuC;AAqBvC;;;;;;;;GAQG;AACH,MAAa,uBAAwB,SAAQ,sBAAS;IAC1C,mBAAmB,CAAuB;IAC1C,
|
|
1
|
+
{"version":3,"file":"rpc-client-real-device-shim.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-real-device-shim.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
export { DelayCancellation, TimeoutError } from './errors';
|
|
2
|
-
export type { CancellableDelay } from './async';
|
|
3
|
-
export { cancellableDelay } from './async';
|
|
4
2
|
export { defaults, deepEqual, checkParams } from './object';
|
|
5
3
|
export { WEB_CONTENT_BUNDLE_ID, appInfoFromDict, pageArrayFromDict, appIdsForBundle, } from './inspector';
|
|
6
4
|
export { RESPONSE_LOG_LENGTH, simpleStringify, convertJavascriptEvaluationResult, } from './javascript';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AACzD,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,iBAAiB,EAAE,YAAY,EAAC,MAAM,UAAU,CAAC;AACzD,OAAO,EAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,EAAC,MAAM,UAAU,CAAC;AAE1D,OAAO,EACL,qBAAqB,EACrB,eAAe,EACf,iBAAiB,EACjB,eAAe,GAChB,MAAM,aAAa,CAAC;AACrB,OAAO,EACL,mBAAmB,EACnB,eAAe,EACf,iCAAiC,GAClC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,aAAa,EAAE,mBAAmB,EAAC,MAAM,UAAU,CAAC;AAC5D,OAAO,EAAC,sBAAsB,EAAC,MAAM,YAAY,CAAC"}
|
package/build/lib/utils/index.js
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.canUseWebInspectorShim = exports.getModuleProperties = exports.getModuleRoot = exports.convertJavascriptEvaluationResult = exports.simpleStringify = exports.RESPONSE_LOG_LENGTH = exports.appIdsForBundle = exports.pageArrayFromDict = exports.appInfoFromDict = exports.WEB_CONTENT_BUNDLE_ID = exports.checkParams = exports.deepEqual = exports.defaults = exports.
|
|
3
|
+
exports.canUseWebInspectorShim = exports.getModuleProperties = exports.getModuleRoot = exports.convertJavascriptEvaluationResult = exports.simpleStringify = exports.RESPONSE_LOG_LENGTH = exports.appIdsForBundle = exports.pageArrayFromDict = exports.appInfoFromDict = exports.WEB_CONTENT_BUNDLE_ID = exports.checkParams = exports.deepEqual = exports.defaults = exports.TimeoutError = exports.DelayCancellation = void 0;
|
|
4
4
|
var errors_1 = require("./errors");
|
|
5
5
|
Object.defineProperty(exports, "DelayCancellation", { enumerable: true, get: function () { return errors_1.DelayCancellation; } });
|
|
6
6
|
Object.defineProperty(exports, "TimeoutError", { enumerable: true, get: function () { return errors_1.TimeoutError; } });
|
|
7
|
-
var async_1 = require("./async");
|
|
8
|
-
Object.defineProperty(exports, "cancellableDelay", { enumerable: true, get: function () { return async_1.cancellableDelay; } });
|
|
9
7
|
var object_1 = require("./object");
|
|
10
8
|
Object.defineProperty(exports, "defaults", { enumerable: true, get: function () { return object_1.defaults; } });
|
|
11
9
|
Object.defineProperty(exports, "deepEqual", { enumerable: true, get: function () { return object_1.deepEqual; } });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyD;AAAjD,2GAAA,iBAAiB,OAAA;AAAE,sGAAA,YAAY,OAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/utils/index.ts"],"names":[],"mappings":";;;AAAA,mCAAyD;AAAjD,2GAAA,iBAAiB,OAAA;AAAE,sGAAA,YAAY,OAAA;AACvC,mCAA0D;AAAlD,kGAAA,QAAQ,OAAA;AAAE,mGAAA,SAAS,OAAA;AAAE,qGAAA,WAAW,OAAA;AAExC,yCAKqB;AAJnB,kHAAA,qBAAqB,OAAA;AACrB,4GAAA,eAAe,OAAA;AACf,8GAAA,iBAAiB,OAAA;AACjB,4GAAA,eAAe,OAAA;AAEjB,2CAIsB;AAHpB,iHAAA,mBAAmB,OAAA;AACnB,6GAAA,eAAe,OAAA;AACf,+HAAA,iCAAiC,OAAA;AAEnC,mCAA4D;AAApD,uGAAA,aAAa,OAAA;AAAE,6GAAA,mBAAmB,OAAA;AAC1C,uCAAkD;AAA1C,kHAAA,sBAAsB,OAAA"}
|
package/lib/mixins/navigate.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import {sleep, withTimeout} from 'asyncbox';
|
|
2
|
-
import {
|
|
2
|
+
import {DelayCancellation, checkParams, TimeoutError} from '../utils';
|
|
3
3
|
import {events} from './events';
|
|
4
4
|
import {timing} from '@appium/support';
|
|
5
5
|
import {
|
|
@@ -87,7 +87,7 @@ export async function waitForDom(
|
|
|
87
87
|
|
|
88
88
|
let isPageLoading = true;
|
|
89
89
|
setPageLoading(this, true);
|
|
90
|
-
setPageLoadDelay(this,
|
|
90
|
+
setPageLoadDelay(this, sleep({ms: readinessTimeoutMs, cancelError: new DelayCancellation()}));
|
|
91
91
|
const pageReadinessPromise = (async () => {
|
|
92
92
|
let retry = 0;
|
|
93
93
|
while (isPageLoading) {
|
|
@@ -204,7 +204,7 @@ export async function navToUrl(this: RemoteDebugger, url: string): Promise<void>
|
|
|
204
204
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
205
205
|
let onPageLoaded: (() => void) | undefined;
|
|
206
206
|
let onPageLoadedTimeout: NodeJS.Timeout | undefined | null;
|
|
207
|
-
setPageLoadDelay(this,
|
|
207
|
+
setPageLoadDelay(this, sleep({ms: readinessTimeoutMs, cancelError: new DelayCancellation()}));
|
|
208
208
|
setPageLoading(this, true);
|
|
209
209
|
let isPageLoading = true;
|
|
210
210
|
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 type {
|
|
13
|
+
import type {CancellablePromise} from 'asyncbox';
|
|
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?: CancellablePromise<void>;
|
|
77
77
|
protected _rpcClient: RpcClient | null = null;
|
|
78
78
|
protected _pageLoading: boolean = false;
|
|
79
79
|
protected _navigatingToPage: boolean = false;
|
|
@@ -3,7 +3,7 @@ import {log} from '../logger';
|
|
|
3
3
|
import {RpcClient} from './rpc-client';
|
|
4
4
|
import type {RemoteCommand, RpcClientOptions} from '../types';
|
|
5
5
|
import type {StringRecord} from '@appium/types';
|
|
6
|
-
import type {WebInspectorService
|
|
6
|
+
import type {WebInspectorService} from 'appium-ios-remotexpc';
|
|
7
7
|
|
|
8
8
|
/**
|
|
9
9
|
* Options specific to RpcClientRealDeviceShim.
|
|
@@ -32,7 +32,6 @@ interface WebInspectorMessage {
|
|
|
32
32
|
*/
|
|
33
33
|
export class RpcClientRealDeviceShim extends RpcClient {
|
|
34
34
|
protected webInspectorService?: WebInspectorService;
|
|
35
|
-
protected remoteXPC?: RemoteXpcConnection;
|
|
36
35
|
protected messageListenerTask?: Promise<void>;
|
|
37
36
|
protected isListening: boolean = false;
|
|
38
37
|
|
|
@@ -57,9 +56,7 @@ export class RpcClientRealDeviceShim extends RpcClient {
|
|
|
57
56
|
log.debug(`Connecting to WebInspector shim service for device ${this.udid}`);
|
|
58
57
|
|
|
59
58
|
const {Services} = await import('appium-ios-remotexpc');
|
|
60
|
-
|
|
61
|
-
this.webInspectorService = result.webInspectorService;
|
|
62
|
-
this.remoteXPC = result.remoteXPC;
|
|
59
|
+
this.webInspectorService = await Services.startWebInspectorService(this.udid);
|
|
63
60
|
|
|
64
61
|
this.startMessageListener();
|
|
65
62
|
this.isConnected = true;
|
|
@@ -105,11 +102,6 @@ export class RpcClientRealDeviceShim extends RpcClient {
|
|
|
105
102
|
this.webInspectorService = undefined;
|
|
106
103
|
}
|
|
107
104
|
|
|
108
|
-
if (this.remoteXPC) {
|
|
109
|
-
await this.remoteXPC.close();
|
|
110
|
-
this.remoteXPC = undefined;
|
|
111
|
-
}
|
|
112
|
-
|
|
113
105
|
this.isConnected = false;
|
|
114
106
|
log.debug('Disconnected from WebInspector shim service');
|
|
115
107
|
}
|
package/lib/utils/index.ts
CHANGED
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"keywords": [
|
|
5
5
|
"appium"
|
|
6
6
|
],
|
|
7
|
-
"version": "15.10.
|
|
7
|
+
"version": "15.10.2",
|
|
8
8
|
"author": "Appium Contributors",
|
|
9
9
|
"license": "Apache-2.0",
|
|
10
10
|
"repository": {
|
|
@@ -36,12 +36,12 @@
|
|
|
36
36
|
"@appium/support": "^7.2.2",
|
|
37
37
|
"appium-ios-device": "^3.0.0",
|
|
38
38
|
"async-lock": "^1.4.1",
|
|
39
|
-
"asyncbox": "^6.
|
|
39
|
+
"asyncbox": "^6.3.0",
|
|
40
40
|
"glob": "^13.0.0",
|
|
41
41
|
"teen_process": "^4.0.4"
|
|
42
42
|
},
|
|
43
43
|
"optionalDependencies": {
|
|
44
|
-
"appium-ios-remotexpc": "^
|
|
44
|
+
"appium-ios-remotexpc": "^2.0.0"
|
|
45
45
|
},
|
|
46
46
|
"scripts": {
|
|
47
47
|
"build": "tsc -b",
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
export type CancellableDelay = Promise<void> & {
|
|
2
|
-
cancel: () => void;
|
|
3
|
-
};
|
|
4
|
-
/**
|
|
5
|
-
* Returns a delay promise with a `cancel` method that rejects the promise.
|
|
6
|
-
*
|
|
7
|
-
* @param ms - Delay in milliseconds.
|
|
8
|
-
* @returns A cancellable delay promise.
|
|
9
|
-
*/
|
|
10
|
-
export declare function cancellableDelay(ms: number): CancellableDelay;
|
|
11
|
-
//# sourceMappingURL=async.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"async.d.ts","sourceRoot":"","sources":["../../../lib/utils/async.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG;IAC7C,MAAM,EAAE,MAAM,IAAI,CAAC;CACpB,CAAC;AAEF;;;;;GAKG;AACH,wBAAgB,gBAAgB,CAAC,EAAE,EAAE,MAAM,GAAG,gBAAgB,CAmB7D"}
|
package/build/lib/utils/async.js
DELETED
|
@@ -1,28 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.cancellableDelay = cancellableDelay;
|
|
4
|
-
const errors_1 = require("./errors");
|
|
5
|
-
/**
|
|
6
|
-
* Returns a delay promise with a `cancel` method that rejects the promise.
|
|
7
|
-
*
|
|
8
|
-
* @param ms - Delay in milliseconds.
|
|
9
|
-
* @returns A cancellable delay promise.
|
|
10
|
-
*/
|
|
11
|
-
function cancellableDelay(ms) {
|
|
12
|
-
let timeoutId;
|
|
13
|
-
let rejectFn;
|
|
14
|
-
const promise = new Promise((resolve, reject) => {
|
|
15
|
-
rejectFn = reject;
|
|
16
|
-
timeoutId = setTimeout(resolve, ms);
|
|
17
|
-
});
|
|
18
|
-
promise.cancel = () => {
|
|
19
|
-
if (timeoutId) {
|
|
20
|
-
clearTimeout(timeoutId);
|
|
21
|
-
timeoutId = undefined;
|
|
22
|
-
}
|
|
23
|
-
rejectFn?.(new errors_1.DelayCancellation());
|
|
24
|
-
rejectFn = undefined;
|
|
25
|
-
};
|
|
26
|
-
return promise;
|
|
27
|
-
}
|
|
28
|
-
//# sourceMappingURL=async.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"async.js","sourceRoot":"","sources":["../../../lib/utils/async.ts"],"names":[],"mappings":";;AAYA,4CAmBC;AA/BD,qCAA2C;AAM3C;;;;;GAKG;AACH,SAAgB,gBAAgB,CAAC,EAAU;IACzC,IAAI,SAAqC,CAAC;IAC1C,IAAI,QAA8C,CAAC;IAEnD,MAAM,OAAO,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,QAAQ,GAAG,MAAM,CAAC;QAClB,SAAS,GAAG,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;IACtC,CAAC,CAAqB,CAAC;IAEvB,OAAO,CAAC,MAAM,GAAG,GAAG,EAAE;QACpB,IAAI,SAAS,EAAE,CAAC;YACd,YAAY,CAAC,SAAS,CAAC,CAAC;YACxB,SAAS,GAAG,SAAS,CAAC;QACxB,CAAC;QACD,QAAQ,EAAE,CAAC,IAAI,0BAAiB,EAAE,CAAC,CAAC;QACpC,QAAQ,GAAG,SAAS,CAAC;IACvB,CAAC,CAAC;IAEF,OAAO,OAAO,CAAC;AACjB,CAAC"}
|
package/lib/utils/async.ts
DELETED
|
@@ -1,32 +0,0 @@
|
|
|
1
|
-
import {DelayCancellation} from './errors';
|
|
2
|
-
|
|
3
|
-
export type CancellableDelay = Promise<void> & {
|
|
4
|
-
cancel: () => void;
|
|
5
|
-
};
|
|
6
|
-
|
|
7
|
-
/**
|
|
8
|
-
* Returns a delay promise with a `cancel` method that rejects the promise.
|
|
9
|
-
*
|
|
10
|
-
* @param ms - Delay in milliseconds.
|
|
11
|
-
* @returns A cancellable delay promise.
|
|
12
|
-
*/
|
|
13
|
-
export function cancellableDelay(ms: number): CancellableDelay {
|
|
14
|
-
let timeoutId: NodeJS.Timeout | undefined;
|
|
15
|
-
let rejectFn: ((error: Error) => void) | undefined;
|
|
16
|
-
|
|
17
|
-
const promise = new Promise<void>((resolve, reject) => {
|
|
18
|
-
rejectFn = reject;
|
|
19
|
-
timeoutId = setTimeout(resolve, ms);
|
|
20
|
-
}) as CancellableDelay;
|
|
21
|
-
|
|
22
|
-
promise.cancel = () => {
|
|
23
|
-
if (timeoutId) {
|
|
24
|
-
clearTimeout(timeoutId);
|
|
25
|
-
timeoutId = undefined;
|
|
26
|
-
}
|
|
27
|
-
rejectFn?.(new DelayCancellation());
|
|
28
|
-
rejectFn = undefined;
|
|
29
|
-
};
|
|
30
|
-
|
|
31
|
-
return promise;
|
|
32
|
-
}
|