appium-remote-debugger 11.5.9 → 12.0.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 +45 -0
- package/build/lib/mixins/connect.d.ts +31 -30
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +55 -45
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/cookies.d.ts +8 -4
- package/build/lib/mixins/cookies.d.ts.map +1 -1
- package/build/lib/mixins/cookies.js +12 -7
- package/build/lib/mixins/cookies.js.map +1 -1
- package/build/lib/mixins/events.d.ts +32 -4
- package/build/lib/mixins/events.d.ts.map +1 -1
- package/build/lib/mixins/events.js +46 -2
- package/build/lib/mixins/events.js.map +1 -1
- package/build/lib/mixins/execute.d.ts +16 -5
- package/build/lib/mixins/execute.d.ts.map +1 -1
- package/build/lib/mixins/execute.js +21 -13
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/message-handlers.d.ts +25 -16
- package/build/lib/mixins/message-handlers.d.ts.map +1 -1
- package/build/lib/mixins/message-handlers.js +34 -24
- package/build/lib/mixins/message-handlers.js.map +1 -1
- package/build/lib/mixins/misc.d.ts +11 -29
- package/build/lib/mixins/misc.d.ts.map +1 -1
- package/build/lib/mixins/misc.js +16 -51
- package/build/lib/mixins/misc.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts +29 -15
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +40 -28
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/mixins/screenshot.d.ts +10 -2
- package/build/lib/mixins/screenshot.d.ts.map +1 -1
- package/build/lib/mixins/screenshot.js +9 -3
- package/build/lib/mixins/screenshot.js.map +1 -1
- package/build/lib/remote-debugger-real-device.d.ts +7 -19
- package/build/lib/remote-debugger-real-device.d.ts.map +1 -1
- package/build/lib/remote-debugger-real-device.js +12 -20
- package/build/lib/remote-debugger-real-device.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +60 -167
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +62 -119
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/types.d.ts +41 -1
- package/build/lib/types.d.ts.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/mixins/connect.js +65 -51
- package/lib/mixins/cookies.js +13 -7
- package/lib/mixins/events.js +47 -2
- package/lib/mixins/execute.js +22 -13
- package/lib/mixins/message-handlers.js +35 -24
- package/lib/mixins/misc.js +17 -51
- package/lib/mixins/navigate.js +41 -28
- package/lib/mixins/screenshot.js +10 -3
- package/lib/remote-debugger-real-device.ts +28 -0
- package/lib/remote-debugger.ts +251 -0
- package/lib/types.ts +44 -1
- package/package.json +1 -1
- package/lib/remote-debugger-real-device.js +0 -39
- package/lib/remote-debugger.js +0 -299
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,48 @@
|
|
|
1
|
+
## [12.0.0](https://github.com/appium/appium-remote-debugger/compare/v11.5.9...v12.0.0) (2024-08-04)
|
|
2
|
+
|
|
3
|
+
### ⚠ BREAKING CHANGES
|
|
4
|
+
|
|
5
|
+
* The following class properties have been renamed (got a leading underscore) and made protected:
|
|
6
|
+
skippedApps
|
|
7
|
+
clientEventListeners
|
|
8
|
+
appDict
|
|
9
|
+
appIdKey
|
|
10
|
+
pageIdKey
|
|
11
|
+
connectedDrivers
|
|
12
|
+
currentState
|
|
13
|
+
pageLoadDelay
|
|
14
|
+
rpcClient
|
|
15
|
+
pageLoading
|
|
16
|
+
navigatingToPage
|
|
17
|
+
pageLoadStrategy
|
|
18
|
+
bundleId
|
|
19
|
+
additionalBundleIds
|
|
20
|
+
platformVersion
|
|
21
|
+
isSafari
|
|
22
|
+
includeSafari
|
|
23
|
+
useNewSafari
|
|
24
|
+
pageLoadMs
|
|
25
|
+
garbageCollectOnExecute
|
|
26
|
+
host
|
|
27
|
+
port
|
|
28
|
+
socketPath
|
|
29
|
+
remoteDebugProxy
|
|
30
|
+
pageReadyTimeout
|
|
31
|
+
logAllCommunication
|
|
32
|
+
logAllCommunicationHexDump
|
|
33
|
+
socketChunkSize
|
|
34
|
+
webInspectorMaxFrameLength
|
|
35
|
+
fullPageInitialization
|
|
36
|
+
udid
|
|
37
|
+
* The following class methods have been made private:
|
|
38
|
+
searchForApp
|
|
39
|
+
searchForPage
|
|
40
|
+
* Remove the unused RPC_RESPONSE_TIMEOUT_MS export
|
|
41
|
+
|
|
42
|
+
### Features
|
|
43
|
+
|
|
44
|
+
* Rewrite the RemoteDebugger class into typescript ([#400](https://github.com/appium/appium-remote-debugger/issues/400)) ([ef277b3](https://github.com/appium/appium-remote-debugger/commit/ef277b3991c57ed34740d946bab1c3505674adec))
|
|
45
|
+
|
|
1
46
|
## [11.5.9](https://github.com/appium/appium-remote-debugger/compare/v11.5.8...v11.5.9) (2024-08-02)
|
|
2
47
|
|
|
3
48
|
### Miscellaneous Chores
|
|
@@ -3,20 +3,20 @@
|
|
|
3
3
|
* @this {RemoteDebugger}
|
|
4
4
|
* @returns {Promise<void>}
|
|
5
5
|
*/
|
|
6
|
-
export function setConnectionKey(this:
|
|
6
|
+
export function setConnectionKey(this: RemoteDebugger): Promise<void>;
|
|
7
7
|
/**
|
|
8
8
|
*
|
|
9
9
|
* @this {RemoteDebugger}
|
|
10
10
|
* @param {number} [timeout=APP_CONNECT_TIMEOUT_MS]
|
|
11
11
|
* @returns {Promise<import('@appium/types').StringRecord>}
|
|
12
12
|
*/
|
|
13
|
-
export function connect(this:
|
|
13
|
+
export function connect(this: RemoteDebugger, timeout?: number | undefined): Promise<import("@appium/types").StringRecord>;
|
|
14
14
|
/**
|
|
15
15
|
*
|
|
16
16
|
* @this {RemoteDebugger}
|
|
17
17
|
* @returns {Promise<void>}
|
|
18
18
|
*/
|
|
19
|
-
export function disconnect(this:
|
|
19
|
+
export function disconnect(this: RemoteDebugger): Promise<void>;
|
|
20
20
|
/**
|
|
21
21
|
*
|
|
22
22
|
* @this {RemoteDebugger}
|
|
@@ -25,7 +25,7 @@ export function disconnect(this: import("../remote-debugger").RemoteDebugger): P
|
|
|
25
25
|
* @param {boolean} [ignoreAboutBlankUrl=false]
|
|
26
26
|
* @returns {Promise<import('../types').Page[]>}
|
|
27
27
|
*/
|
|
28
|
-
export function selectApp(this:
|
|
28
|
+
export function selectApp(this: RemoteDebugger, currentUrl?: string | null | undefined, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined): Promise<import("../types").Page[]>;
|
|
29
29
|
export class selectApp {
|
|
30
30
|
/**
|
|
31
31
|
*
|
|
@@ -35,27 +35,9 @@ export class selectApp {
|
|
|
35
35
|
* @param {boolean} [ignoreAboutBlankUrl=false]
|
|
36
36
|
* @returns {Promise<import('../types').Page[]>}
|
|
37
37
|
*/
|
|
38
|
-
constructor(this:
|
|
39
|
-
|
|
38
|
+
constructor(this: RemoteDebugger, currentUrl?: string | null | undefined, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined);
|
|
39
|
+
_appIdKey: any;
|
|
40
40
|
}
|
|
41
|
-
/**
|
|
42
|
-
*
|
|
43
|
-
* @this {RemoteDebugger}
|
|
44
|
-
* @param {string?} currentUrl
|
|
45
|
-
* @param {number} maxTries
|
|
46
|
-
* @param {boolean} ignoreAboutBlankUrl
|
|
47
|
-
* @returns {Promise<import('../types').AppPage>}
|
|
48
|
-
*/
|
|
49
|
-
export function searchForApp(this: import("../remote-debugger").RemoteDebugger, currentUrl: string | null, maxTries: number, ignoreAboutBlankUrl: boolean): Promise<import("../types").AppPage>;
|
|
50
|
-
/**
|
|
51
|
-
*
|
|
52
|
-
* @this {RemoteDebugger}
|
|
53
|
-
* @param {Record<string, import('../types').AppInfo>} appsDict
|
|
54
|
-
* @param {string?} currentUrl
|
|
55
|
-
* @param {boolean} [ignoreAboutBlankUrl]
|
|
56
|
-
* @returns {import('../types').AppPage?}
|
|
57
|
-
*/
|
|
58
|
-
export function searchForPage(this: import("../remote-debugger").RemoteDebugger, appsDict: Record<string, import("../types").AppInfo>, currentUrl?: string | null, ignoreAboutBlankUrl?: boolean | undefined): import("../types").AppPage | null;
|
|
59
41
|
/**
|
|
60
42
|
*
|
|
61
43
|
* @this {RemoteDebugger}
|
|
@@ -64,7 +46,7 @@ export function searchForPage(this: import("../remote-debugger").RemoteDebugger,
|
|
|
64
46
|
* @param {boolean} [skipReadyCheck]
|
|
65
47
|
* @returns {Promise<void>}
|
|
66
48
|
*/
|
|
67
|
-
export function selectPage(this:
|
|
49
|
+
export function selectPage(this: RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined): Promise<void>;
|
|
68
50
|
export class selectPage {
|
|
69
51
|
/**
|
|
70
52
|
*
|
|
@@ -74,9 +56,9 @@ export class selectPage {
|
|
|
74
56
|
* @param {boolean} [skipReadyCheck]
|
|
75
57
|
* @returns {Promise<void>}
|
|
76
58
|
*/
|
|
77
|
-
constructor(this:
|
|
78
|
-
|
|
79
|
-
|
|
59
|
+
constructor(this: RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined);
|
|
60
|
+
_appIdKey: string;
|
|
61
|
+
_pageIdKey: string | number;
|
|
80
62
|
}
|
|
81
63
|
/**
|
|
82
64
|
* Find app keys based on assigned bundleIds from appDict
|
|
@@ -86,6 +68,25 @@ export class selectPage {
|
|
|
86
68
|
* @param {string[]} bundleIds
|
|
87
69
|
* @returns {string[]}
|
|
88
70
|
*/
|
|
89
|
-
export function getPossibleDebuggerAppKeys(this:
|
|
90
|
-
export type
|
|
71
|
+
export function getPossibleDebuggerAppKeys(this: RemoteDebugger, bundleIds: string[]): string[];
|
|
72
|
+
export type HasConnectionRelatedProperties = {
|
|
73
|
+
_appIdKey: string | null | undefined;
|
|
74
|
+
_pageIdKey: string | number | null | undefined;
|
|
75
|
+
_appDict: import("../types").AppDict;
|
|
76
|
+
_bundleId: string | undefined;
|
|
77
|
+
_rpcClient: import("../rpc/rpc-client").RpcClient | undefined;
|
|
78
|
+
_includeSafari: boolean;
|
|
79
|
+
_isSafari: boolean;
|
|
80
|
+
_additionalBundleIds: string[];
|
|
81
|
+
/**
|
|
82
|
+
* :
|
|
83
|
+
*/
|
|
84
|
+
checkPageIsReady: (this: RemoteDebugger, timeoutMs?: number | undefined) => Promise<boolean>;
|
|
85
|
+
/**
|
|
86
|
+
* :
|
|
87
|
+
*/
|
|
88
|
+
waitForDom: (this: RemoteDebugger, startPageLoadTimer?: timing.Timer | null | undefined) => Promise<void>;
|
|
89
|
+
};
|
|
90
|
+
export type RemoteDebugger = import("../remote-debugger").RemoteDebugger & HasConnectionRelatedProperties;
|
|
91
|
+
import { timing } from '@appium/support';
|
|
91
92
|
//# sourceMappingURL=connect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH,
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"AAqBA;;;;GAIG;AACH,wDAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,6EAFa,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAgDzD;AAED;;;;GAIG;AACH,kDAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AACH,mKAFa,OAAO,CAAC,OAAO,UAAU,EAAE,IAAI,EAAE,CAAC,CA8C9C;;IApDD;;;;;;;OAOG;IACH,oJA4CC;IA5BK,eAAyB;;AA8B/B;;;;;;;GAOG;AACH,2DALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,yCAEX,OAAO,CAAC,IAAI,CAAC,CAiBzB;;IAvBD;;;;;;;OAOG;IACH,4CALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,wCAmBvB;IAdC,kBAAwF;IACxF,4BAA2B;;AAqI7B;;;;;;;GAOG;AACH,4EAHW,MAAM,EAAE,GACN,MAAM,EAAE,CAsCpB;;eAIa,MAAM,GAAG,IAAI,GAAG,SAAS;gBACzB,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;cAClC,OAAO,UAAU,EAAE,OAAO;eAC1B,MAAM,GAAG,SAAS;gBAClB,OAAO,mBAAmB,EAAE,SAAS,GAAG,SAAS;oBACjD,OAAO;eACP,OAAO;0BACP,MAAM,EAAE;;;;sBACR,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,SAAS,KAAK,OAAO,CAAC,OAAO,CAAC;;;;gBAC1E,CAAC,IAAI,EAAE,cAAc,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,KAAK,GAAG,IAAI,GAAG,SAAS,KAAK,OAAO,CAAC,IAAI,CAAC;;6BAI9F,OAAO,oBAAoB,EAAE,cAAc,GAAG,8BAA8B;uBAjW5D,iBAAiB"}
|
|
@@ -7,8 +7,6 @@ exports.setConnectionKey = setConnectionKey;
|
|
|
7
7
|
exports.connect = connect;
|
|
8
8
|
exports.disconnect = disconnect;
|
|
9
9
|
exports.selectApp = selectApp;
|
|
10
|
-
exports.searchForApp = searchForApp;
|
|
11
|
-
exports.searchForPage = searchForPage;
|
|
12
10
|
exports.selectPage = selectPage;
|
|
13
11
|
exports.getPossibleDebuggerAppKeys = getPossibleDebuggerAppKeys;
|
|
14
12
|
const utils_1 = require("../utils");
|
|
@@ -66,18 +64,18 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
|
|
|
66
64
|
const timer = new support_1.timing.Timer().start();
|
|
67
65
|
this.log.debug(`Waiting up to ${timeout}ms for applications to be reported`);
|
|
68
66
|
try {
|
|
69
|
-
await (0, asyncbox_1.waitForCondition)(() => !lodash_1.default.isEmpty(this.
|
|
67
|
+
await (0, asyncbox_1.waitForCondition)(() => !lodash_1.default.isEmpty(this._appDict), {
|
|
70
68
|
waitMs: timeout,
|
|
71
69
|
intervalMs: APP_CONNECT_INTERVAL_MS,
|
|
72
70
|
});
|
|
73
|
-
this.log.debug(`Retrieved ${support_1.util.pluralize('application', lodash_1.default.size(this.
|
|
71
|
+
this.log.debug(`Retrieved ${support_1.util.pluralize('application', lodash_1.default.size(this._appDict), true)} ` +
|
|
74
72
|
`within ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
75
73
|
}
|
|
76
74
|
catch (err) {
|
|
77
75
|
this.log.debug(`Timed out waiting for applications to be reported`);
|
|
78
76
|
}
|
|
79
77
|
}
|
|
80
|
-
return this.
|
|
78
|
+
return this._appDict || {};
|
|
81
79
|
}
|
|
82
80
|
catch (err) {
|
|
83
81
|
this.log.error(`Error setting connection key: ${err.message}`);
|
|
@@ -91,8 +89,8 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
|
|
|
91
89
|
* @returns {Promise<void>}
|
|
92
90
|
*/
|
|
93
91
|
async function disconnect() {
|
|
94
|
-
if (this.
|
|
95
|
-
await this.
|
|
92
|
+
if (this._rpcClient) {
|
|
93
|
+
await this._rpcClient.disconnect();
|
|
96
94
|
}
|
|
97
95
|
this.emit(events_1.default.EVENT_DISCONNECT, true);
|
|
98
96
|
this.teardown();
|
|
@@ -112,21 +110,21 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
|
|
|
112
110
|
rpcClient.shouldCheckForTarget = false;
|
|
113
111
|
try {
|
|
114
112
|
const timer = new support_1.timing.Timer().start();
|
|
115
|
-
if (!this.
|
|
113
|
+
if (!this._appDict || lodash_1.default.isEmpty(this._appDict)) {
|
|
116
114
|
this.log.debug('No applications currently connected.');
|
|
117
115
|
return [];
|
|
118
116
|
}
|
|
119
|
-
const { appIdKey } = await
|
|
120
|
-
if (this.
|
|
121
|
-
this.log.debug(`Received altered app id, updating from '${this.
|
|
122
|
-
this.
|
|
117
|
+
const { appIdKey } = await searchForApp.bind(this)(currentUrl, maxTries, ignoreAboutBlankUrl);
|
|
118
|
+
if (this._appIdKey !== appIdKey) {
|
|
119
|
+
this.log.debug(`Received altered app id, updating from '${this._appIdKey}' to '${appIdKey}'`);
|
|
120
|
+
this._appIdKey = appIdKey;
|
|
123
121
|
}
|
|
124
122
|
logApplicationDictionary.bind(this)();
|
|
125
123
|
// translate the dictionary into a useful form, and return to sender
|
|
126
|
-
this.log.debug(`Finally selecting app ${this.
|
|
124
|
+
this.log.debug(`Finally selecting app ${this._appIdKey}`);
|
|
127
125
|
/** @type {import('../types').Page[]} */
|
|
128
126
|
const fullPageArray = [];
|
|
129
|
-
for (const [app, info] of lodash_1.default.toPairs(this.
|
|
127
|
+
for (const [app, info] of lodash_1.default.toPairs(this._appDict)) {
|
|
130
128
|
if (!lodash_1.default.isArray(info.pageArray) || !info.isActive) {
|
|
131
129
|
continue;
|
|
132
130
|
}
|
|
@@ -147,6 +145,25 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
|
|
|
147
145
|
rpcClient.shouldCheckForTarget = shouldCheckForTarget;
|
|
148
146
|
}
|
|
149
147
|
}
|
|
148
|
+
/**
|
|
149
|
+
*
|
|
150
|
+
* @this {RemoteDebugger}
|
|
151
|
+
* @param {string|number} appIdKey
|
|
152
|
+
* @param {string|number} pageIdKey
|
|
153
|
+
* @param {boolean} [skipReadyCheck]
|
|
154
|
+
* @returns {Promise<void>}
|
|
155
|
+
*/
|
|
156
|
+
async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
157
|
+
this._appIdKey = lodash_1.default.startsWith(`${appIdKey}`, 'PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
|
|
158
|
+
this._pageIdKey = pageIdKey;
|
|
159
|
+
this.log.debug(`Selecting page '${pageIdKey}' on app '${this._appIdKey}' and forwarding socket setup`);
|
|
160
|
+
const timer = new support_1.timing.Timer().start();
|
|
161
|
+
await this.requireRpcClient().selectPage(this._appIdKey, pageIdKey);
|
|
162
|
+
if (!skipReadyCheck && !await this.checkPageIsReady()) {
|
|
163
|
+
await this.waitForDom();
|
|
164
|
+
}
|
|
165
|
+
this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
166
|
+
}
|
|
150
167
|
/**
|
|
151
168
|
*
|
|
152
169
|
* @this {RemoteDebugger}
|
|
@@ -156,9 +173,9 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
|
|
|
156
173
|
* @returns {Promise<import('../types').AppPage>}
|
|
157
174
|
*/
|
|
158
175
|
async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
159
|
-
const bundleIds = this.
|
|
160
|
-
? [this.
|
|
161
|
-
: [this.
|
|
176
|
+
const bundleIds = this._includeSafari && !this._isSafari
|
|
177
|
+
? [this._bundleId, ...this._additionalBundleIds, SAFARI_BUNDLE_ID]
|
|
178
|
+
: [this._bundleId, ...this._additionalBundleIds];
|
|
162
179
|
let retryCount = 0;
|
|
163
180
|
return /** @type {import('../types').AppPage} */ (await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async () => {
|
|
164
181
|
logApplicationDictionary.bind(this)();
|
|
@@ -166,7 +183,7 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
166
183
|
this.log.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
|
|
167
184
|
for (const attemptedAppIdKey of possibleAppIds) {
|
|
168
185
|
try {
|
|
169
|
-
if (!this.
|
|
186
|
+
if (!this._appDict[attemptedAppIdKey].isActive) {
|
|
170
187
|
this.log.debug(`Skipping app '${attemptedAppIdKey}' because it is not active`);
|
|
171
188
|
continue;
|
|
172
189
|
}
|
|
@@ -183,11 +200,11 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
183
200
|
continue;
|
|
184
201
|
}
|
|
185
202
|
// save the page array for this app
|
|
186
|
-
this.
|
|
203
|
+
this._appDict[appIdKey].pageArray = (0, utils_1.pageArrayFromDict)(pageDict);
|
|
187
204
|
// if we are looking for a particular url, make sure we
|
|
188
205
|
// have the right page. Ignore empty or undefined urls.
|
|
189
206
|
// Ignore about:blank if requested.
|
|
190
|
-
const result =
|
|
207
|
+
const result = searchForPage.bind(this)(this._appDict, currentUrl, ignoreAboutBlankUrl);
|
|
191
208
|
if (result) {
|
|
192
209
|
return result;
|
|
193
210
|
}
|
|
@@ -232,33 +249,13 @@ function searchForPage(appsDict, currentUrl = null, ignoreAboutBlankUrl = false)
|
|
|
232
249
|
}
|
|
233
250
|
return null;
|
|
234
251
|
}
|
|
235
|
-
/**
|
|
236
|
-
*
|
|
237
|
-
* @this {RemoteDebugger}
|
|
238
|
-
* @param {string|number} appIdKey
|
|
239
|
-
* @param {string|number} pageIdKey
|
|
240
|
-
* @param {boolean} [skipReadyCheck]
|
|
241
|
-
* @returns {Promise<void>}
|
|
242
|
-
*/
|
|
243
|
-
async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
244
|
-
this.appIdKey = lodash_1.default.startsWith(`${appIdKey}`, 'PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
|
|
245
|
-
this.pageIdKey = pageIdKey;
|
|
246
|
-
this.log.debug(`Selecting page '${pageIdKey}' on app '${this.appIdKey}' and forwarding socket setup`);
|
|
247
|
-
const timer = new support_1.timing.Timer().start();
|
|
248
|
-
await this.requireRpcClient().selectPage(this.appIdKey, pageIdKey);
|
|
249
|
-
// make sure everything is ready to go
|
|
250
|
-
if (!skipReadyCheck && !await this.checkPageIsReady()) {
|
|
251
|
-
await this.waitForDom();
|
|
252
|
-
}
|
|
253
|
-
this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
254
|
-
}
|
|
255
252
|
/**
|
|
256
253
|
* @this {RemoteDebugger}
|
|
257
254
|
* @returns {void}
|
|
258
255
|
*/
|
|
259
256
|
function logApplicationDictionary() {
|
|
260
257
|
this.log.debug('Current applications available:');
|
|
261
|
-
for (const [app, info] of lodash_1.default.toPairs(this.
|
|
258
|
+
for (const [app, info] of lodash_1.default.toPairs(this._appDict)) {
|
|
262
259
|
this.log.debug(` Application: "${app}"`);
|
|
263
260
|
for (const [key, value] of lodash_1.default.toPairs(info)) {
|
|
264
261
|
if (key === 'pageArray' && Array.isArray(value) && value.length) {
|
|
@@ -289,7 +286,7 @@ function logApplicationDictionary() {
|
|
|
289
286
|
function getPossibleDebuggerAppKeys(bundleIds) {
|
|
290
287
|
if (bundleIds.includes(WILDCARD_BUNDLE_ID)) {
|
|
291
288
|
this.log.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
|
|
292
|
-
return lodash_1.default.uniq(Object.keys(this.
|
|
289
|
+
return lodash_1.default.uniq(Object.keys(this._appDict));
|
|
293
290
|
}
|
|
294
291
|
// go through the possible bundle identifiers
|
|
295
292
|
const possibleBundleIds = lodash_1.default.uniq([
|
|
@@ -305,10 +302,10 @@ function getPossibleDebuggerAppKeys(bundleIds) {
|
|
|
305
302
|
const proxiedAppIds = new Set();
|
|
306
303
|
for (const bundleId of possibleBundleIds) {
|
|
307
304
|
// now we need to determine if we should pick a proxy for this instead
|
|
308
|
-
for (const appId of (0, utils_1.appIdsForBundle)(bundleId, this.
|
|
305
|
+
for (const appId of (0, utils_1.appIdsForBundle)(bundleId, this._appDict)) {
|
|
309
306
|
proxiedAppIds.add(appId);
|
|
310
307
|
this.log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
|
|
311
|
-
for (const [key, data] of lodash_1.default.toPairs(this.
|
|
308
|
+
for (const [key, data] of lodash_1.default.toPairs(this._appDict)) {
|
|
312
309
|
if (data.isProxy && data.hostId === appId) {
|
|
313
310
|
this.log.debug(`Found separate bundleId '${data.bundleId}' ` +
|
|
314
311
|
`acting as proxy for '${bundleId}', with app id '${key}'`);
|
|
@@ -320,6 +317,19 @@ function getPossibleDebuggerAppKeys(bundleIds) {
|
|
|
320
317
|
return Array.from(proxiedAppIds);
|
|
321
318
|
}
|
|
322
319
|
/**
|
|
323
|
-
* @typedef {
|
|
320
|
+
* @typedef {Object} HasConnectionRelatedProperties
|
|
321
|
+
* @property {string | null | undefined} _appIdKey
|
|
322
|
+
* @property {string | number | null | undefined} _pageIdKey
|
|
323
|
+
* @property {import('../types').AppDict} _appDict
|
|
324
|
+
* @property {string | undefined} _bundleId
|
|
325
|
+
* @property {import('../rpc/rpc-client').RpcClient | undefined} _rpcClient
|
|
326
|
+
* @property {boolean} _includeSafari
|
|
327
|
+
* @property {boolean} _isSafari
|
|
328
|
+
* @property {string[]} _additionalBundleIds
|
|
329
|
+
* @property {(this: RemoteDebugger, timeoutMs?: number | undefined) => Promise<boolean>} checkPageIsReady:
|
|
330
|
+
* @property {(this: RemoteDebugger, startPageLoadTimer?: timing.Timer | null | undefined) => Promise<void>} waitForDom:
|
|
331
|
+
*/
|
|
332
|
+
/**
|
|
333
|
+
* @typedef {import('../remote-debugger').RemoteDebugger & HasConnectionRelatedProperties} RemoteDebugger
|
|
324
334
|
*/
|
|
325
335
|
//# sourceMappingURL=connect.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,14 @@
|
|
|
3
3
|
* @this {RemoteDebugger}
|
|
4
4
|
* @returns {Promise<import('@appium/types').StringRecord>}
|
|
5
5
|
*/
|
|
6
|
-
export function getCookies(this:
|
|
6
|
+
export function getCookies(this: RemoteDebugger): Promise<import("@appium/types").StringRecord>;
|
|
7
7
|
/**
|
|
8
8
|
*
|
|
9
9
|
* @this {RemoteDebugger}
|
|
10
10
|
* @param {import('@appium/types').StringRecord} cookie
|
|
11
11
|
* @returns {Promise<any>}
|
|
12
12
|
*/
|
|
13
|
-
export function setCookie(this:
|
|
13
|
+
export function setCookie(this: RemoteDebugger, cookie: import("@appium/types").StringRecord): Promise<any>;
|
|
14
14
|
/**
|
|
15
15
|
*
|
|
16
16
|
* @this {RemoteDebugger}
|
|
@@ -18,6 +18,10 @@ export function setCookie(this: import("../remote-debugger").RemoteDebugger, coo
|
|
|
18
18
|
* @param {string} url
|
|
19
19
|
* @returns {Promise<any>}
|
|
20
20
|
*/
|
|
21
|
-
export function deleteCookie(this:
|
|
22
|
-
export type
|
|
21
|
+
export function deleteCookie(this: RemoteDebugger, cookieName: string, url: string): Promise<any>;
|
|
22
|
+
export type HasCookiesRelatedProperties = {
|
|
23
|
+
_appIdKey: string | null | undefined;
|
|
24
|
+
_pageIdKey: string | number | null | undefined;
|
|
25
|
+
};
|
|
26
|
+
export type RemoteDebugger = import("../remote-debugger").RemoteDebugger & HasCookiesRelatedProperties;
|
|
23
27
|
//# sourceMappingURL=cookies.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":"AACA;;;;GAIG;AACH
|
|
1
|
+
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":"AACA;;;;GAIG;AACH,kDAFa,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CAQzD;AAED;;;;;GAKG;AACH,wDAHW,OAAO,eAAe,EAAE,YAAY,GAClC,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;;;GAMG;AACH,+DAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAUxB;;eAIa,MAAM,GAAG,IAAI,GAAG,SAAS;gBACzB,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,SAAS;;6BAInC,OAAO,oBAAoB,EAAE,cAAc,GAAG,2BAA2B"}
|
|
@@ -11,8 +11,8 @@ exports.deleteCookie = deleteCookie;
|
|
|
11
11
|
async function getCookies() {
|
|
12
12
|
this.log.debug('Getting cookies');
|
|
13
13
|
return await this.requireRpcClient().send('Page.getCookies', {
|
|
14
|
-
appIdKey: this.
|
|
15
|
-
pageIdKey: this.
|
|
14
|
+
appIdKey: this._appIdKey,
|
|
15
|
+
pageIdKey: this._pageIdKey
|
|
16
16
|
});
|
|
17
17
|
}
|
|
18
18
|
/**
|
|
@@ -24,8 +24,8 @@ async function getCookies() {
|
|
|
24
24
|
async function setCookie(cookie) {
|
|
25
25
|
this.log.debug('Setting cookie');
|
|
26
26
|
return await this.requireRpcClient().send('Page.setCookie', {
|
|
27
|
-
appIdKey: this.
|
|
28
|
-
pageIdKey: this.
|
|
27
|
+
appIdKey: this._appIdKey,
|
|
28
|
+
pageIdKey: this._pageIdKey,
|
|
29
29
|
cookie
|
|
30
30
|
});
|
|
31
31
|
}
|
|
@@ -39,13 +39,18 @@ async function setCookie(cookie) {
|
|
|
39
39
|
async function deleteCookie(cookieName, url) {
|
|
40
40
|
this.log.debug(`Deleting cookie '${cookieName}' on '${url}'`);
|
|
41
41
|
return await this.requireRpcClient().send('Page.deleteCookie', {
|
|
42
|
-
appIdKey: this.
|
|
43
|
-
pageIdKey: this.
|
|
42
|
+
appIdKey: this._appIdKey,
|
|
43
|
+
pageIdKey: this._pageIdKey,
|
|
44
44
|
cookieName,
|
|
45
45
|
url,
|
|
46
46
|
});
|
|
47
47
|
}
|
|
48
48
|
/**
|
|
49
|
-
* @typedef {
|
|
49
|
+
* @typedef {Object} HasCookiesRelatedProperties
|
|
50
|
+
* @property {string | null | undefined} _appIdKey
|
|
51
|
+
* @property {string | number | null | undefined} _pageIdKey
|
|
52
|
+
*/
|
|
53
|
+
/**
|
|
54
|
+
* @typedef {import('../remote-debugger').RemoteDebugger & HasCookiesRelatedProperties} RemoteDebugger
|
|
50
55
|
*/
|
|
51
56
|
//# sourceMappingURL=cookies.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":";;AAMA,gCAMC;AAQD,8BAOC;AASD,oCAQC;AA3CD;;;;GAIG;AACI,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAClC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3D,QAAQ,EAAE,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"cookies.js","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":";;AAMA,gCAMC;AAQD,8BAOC;AASD,oCAQC;AA3CD;;;;GAIG;AACI,KAAK,UAAU,UAAU;IAC9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,CAAC,CAAC;IAClC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE;QAC3D,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,SAAS,EAAE,IAAI,CAAC,UAAU;KAC3B,CAAC,CAAC;AACL,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,SAAS,CAAE,MAAM;IACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IACjC,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,gBAAgB,EAAE;QAC1D,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,SAAS,EAAE,IAAI,CAAC,UAAU;QAC1B,MAAM;KACP,CAAC,CAAC;AACL,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,YAAY,CAAE,UAAU,EAAE,GAAG;IACjD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oBAAoB,UAAU,SAAS,GAAG,GAAG,CAAC,CAAC;IAC9D,OAAO,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,mBAAmB,EAAE;QAC7D,QAAQ,EAAE,IAAI,CAAC,SAAS;QACxB,SAAS,EAAE,IAAI,CAAC,UAAU;QAC1B,UAAU;QACV,GAAG;KACJ,CAAC,CAAC;AACL,CAAC;AAED;;;;GAIG;AAEH;;GAEG"}
|
|
@@ -3,21 +3,49 @@
|
|
|
3
3
|
*
|
|
4
4
|
* @this {RemoteDebugger}
|
|
5
5
|
* @param {string} eventName
|
|
6
|
-
* @param {
|
|
6
|
+
* @param {import('../types').EventListener} listener
|
|
7
7
|
* @returns {void}
|
|
8
8
|
*/
|
|
9
|
-
export function addClientEventListener(this:
|
|
9
|
+
export function addClientEventListener(this: RemoteDebugger, eventName: string, listener: import("../types").EventListener): void;
|
|
10
10
|
/**
|
|
11
11
|
* @this {RemoteDebugger}
|
|
12
12
|
* @param {string} eventName
|
|
13
13
|
* @returns {void}
|
|
14
14
|
*/
|
|
15
|
-
export function removeClientEventListener(this:
|
|
15
|
+
export function removeClientEventListener(this: RemoteDebugger, eventName: string): void;
|
|
16
|
+
/**
|
|
17
|
+
* @this {RemoteDebugger}
|
|
18
|
+
* @param {import('../types').EventListener} listener
|
|
19
|
+
* @returns {void}
|
|
20
|
+
*/
|
|
21
|
+
export function startConsole(this: RemoteDebugger, listener: import("../types").EventListener): void;
|
|
22
|
+
/**
|
|
23
|
+
* @this {RemoteDebugger}
|
|
24
|
+
* @returns {void}
|
|
25
|
+
*/
|
|
26
|
+
export function stopConsole(this: RemoteDebugger): void;
|
|
27
|
+
/**
|
|
28
|
+
* @this {RemoteDebugger}
|
|
29
|
+
* @param {import('../types').EventListener} listener
|
|
30
|
+
* @returns {void}
|
|
31
|
+
*/
|
|
32
|
+
export function startNetwork(this: RemoteDebugger, listener: import("../types").EventListener): void;
|
|
33
|
+
/**
|
|
34
|
+
* @this {RemoteDebugger}
|
|
35
|
+
* @returns {void}
|
|
36
|
+
*/
|
|
37
|
+
export function stopNetwork(this: RemoteDebugger): void;
|
|
16
38
|
export namespace events {
|
|
17
39
|
let EVENT_PAGE_CHANGE: string;
|
|
18
40
|
let EVENT_FRAMES_DETACHED: string;
|
|
19
41
|
let EVENT_DISCONNECT: string;
|
|
20
42
|
}
|
|
21
43
|
export default events;
|
|
22
|
-
export type
|
|
44
|
+
export type HasEventsRelatedProperties = {
|
|
45
|
+
/**
|
|
46
|
+
* :
|
|
47
|
+
*/
|
|
48
|
+
_clientEventListeners: import("@appium/types").StringRecord<import("../types").EventListener[]>;
|
|
49
|
+
};
|
|
50
|
+
export type RemoteDebugger = import("../remote-debugger").RemoteDebugger & HasEventsRelatedProperties;
|
|
23
51
|
//# sourceMappingURL=events.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,
|
|
1
|
+
{"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,wEAJW,MAAM,YACN,OAAO,UAAU,EAAE,aAAa,GAC9B,IAAI,CAMhB;AAED;;;;GAIG;AACH,2EAHW,MAAM,GACJ,IAAI,CAMhB;AAED;;;;GAIG;AACH,6DAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,IAAI,CAMhB;AAED;;;GAGG;AACH,mDAFa,IAAI,CAMhB;AAED;;;;GAIG;AACH,6DAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,IAAI,CAKhB;AAED;;;GAGG;AACH,mDAFa,IAAI,CAKhB;;;;;;;;;;;2BAMa,OAAO,eAAe,EAAE,YAAY,CAAC,OAAO,UAAU,EAAE,aAAa,EAAE,CAAC;;6BAIzE,OAAO,oBAAoB,EAAE,cAAc,GAAG,0BAA0B"}
|
|
@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.events = void 0;
|
|
4
4
|
exports.addClientEventListener = addClientEventListener;
|
|
5
5
|
exports.removeClientEventListener = removeClientEventListener;
|
|
6
|
+
exports.startConsole = startConsole;
|
|
7
|
+
exports.stopConsole = stopConsole;
|
|
8
|
+
exports.startNetwork = startNetwork;
|
|
9
|
+
exports.stopNetwork = stopNetwork;
|
|
6
10
|
// event emitted publically
|
|
7
11
|
exports.events = {
|
|
8
12
|
EVENT_PAGE_CHANGE: 'remote_debugger_page_change',
|
|
@@ -14,7 +18,7 @@ exports.events = {
|
|
|
14
18
|
*
|
|
15
19
|
* @this {RemoteDebugger}
|
|
16
20
|
* @param {string} eventName
|
|
17
|
-
* @param {
|
|
21
|
+
* @param {import('../types').EventListener} listener
|
|
18
22
|
* @returns {void}
|
|
19
23
|
*/
|
|
20
24
|
function addClientEventListener(eventName, listener) {
|
|
@@ -33,8 +37,48 @@ function removeClientEventListener(eventName) {
|
|
|
33
37
|
this.requireRpcClient().off(eventName, listener);
|
|
34
38
|
}
|
|
35
39
|
}
|
|
40
|
+
/**
|
|
41
|
+
* @this {RemoteDebugger}
|
|
42
|
+
* @param {import('../types').EventListener} listener
|
|
43
|
+
* @returns {void}
|
|
44
|
+
*/
|
|
45
|
+
function startConsole(listener) {
|
|
46
|
+
this.log.debug('Starting to listen for JavaScript console');
|
|
47
|
+
this.addClientEventListener('Console.messageAdded', listener);
|
|
48
|
+
this.addClientEventListener('Console.messageRepeatCountUpdated', listener);
|
|
49
|
+
}
|
|
50
|
+
/**
|
|
51
|
+
* @this {RemoteDebugger}
|
|
52
|
+
* @returns {void}
|
|
53
|
+
*/
|
|
54
|
+
function stopConsole() {
|
|
55
|
+
this.log.debug('Stopping to listen for JavaScript console');
|
|
56
|
+
this.removeClientEventListener('Console.messageAdded');
|
|
57
|
+
this.removeClientEventListener('Console.messageRepeatCountUpdated');
|
|
58
|
+
}
|
|
59
|
+
/**
|
|
60
|
+
* @this {RemoteDebugger}
|
|
61
|
+
* @param {import('../types').EventListener} listener
|
|
62
|
+
* @returns {void}
|
|
63
|
+
*/
|
|
64
|
+
function startNetwork(listener) {
|
|
65
|
+
this.log.debug('Starting to listen for network events');
|
|
66
|
+
this.addClientEventListener('NetworkEvent', listener);
|
|
67
|
+
}
|
|
68
|
+
/**
|
|
69
|
+
* @this {RemoteDebugger}
|
|
70
|
+
* @returns {void}
|
|
71
|
+
*/
|
|
72
|
+
function stopNetwork() {
|
|
73
|
+
this.log.debug('Stopping to listen for network events');
|
|
74
|
+
this.removeClientEventListener('NetworkEvent');
|
|
75
|
+
}
|
|
36
76
|
exports.default = exports.events;
|
|
37
77
|
/**
|
|
38
|
-
* @typedef {
|
|
78
|
+
* @typedef {Object} HasEventsRelatedProperties
|
|
79
|
+
* @property {import('@appium/types').StringRecord<import('../types').EventListener[]>} _clientEventListeners:
|
|
80
|
+
*/
|
|
81
|
+
/**
|
|
82
|
+
* @typedef {import('../remote-debugger').RemoteDebugger & HasEventsRelatedProperties} RemoteDebugger
|
|
39
83
|
*/
|
|
40
84
|
//# sourceMappingURL=events.js.map
|