appium-remote-debugger 11.4.1 → 11.5.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 +12 -0
- package/build/lib/mixins/connect.d.ts +53 -56
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +72 -96
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/cookies.d.ts +22 -0
- package/build/lib/mixins/cookies.d.ts.map +1 -0
- package/build/lib/mixins/cookies.js +48 -0
- package/build/lib/mixins/cookies.js.map +1 -0
- package/build/lib/mixins/events.d.ts +17 -2
- package/build/lib/mixins/events.d.ts.map +1 -1
- package/build/lib/mixins/events.js +29 -2
- package/build/lib/mixins/events.js.map +1 -1
- package/build/lib/mixins/execute.d.ts +5 -12
- package/build/lib/mixins/execute.d.ts.map +1 -1
- package/build/lib/mixins/execute.js +18 -30
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/message-handlers.d.ts +13 -23
- package/build/lib/mixins/message-handlers.d.ts.map +1 -1
- package/build/lib/mixins/message-handlers.js +56 -27
- package/build/lib/mixins/message-handlers.js.map +1 -1
- package/build/lib/mixins/misc.d.ts +51 -0
- package/build/lib/mixins/misc.d.ts.map +1 -0
- package/build/lib/mixins/misc.js +132 -0
- package/build/lib/mixins/misc.js.map +1 -0
- package/build/lib/mixins/navigate.d.ts +20 -29
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +25 -23
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/mixins/screenshot.d.ts +13 -0
- package/build/lib/mixins/screenshot.d.ts.map +1 -0
- package/build/lib/mixins/screenshot.js +31 -0
- package/build/lib/mixins/screenshot.js.map +1 -0
- package/build/lib/remote-debugger-real-device.d.ts +16 -2
- package/build/lib/remote-debugger-real-device.d.ts.map +1 -1
- package/build/lib/remote-debugger-real-device.js +11 -1
- package/build/lib/remote-debugger-real-device.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +155 -174
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +149 -210
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts +14 -13
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +8 -6
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/lib/utils.d.ts +20 -16
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +33 -25
- package/build/lib/utils.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/mixins/connect.js +77 -111
- package/lib/mixins/cookies.js +45 -0
- package/lib/mixins/events.js +25 -1
- package/lib/mixins/execute.js +18 -39
- package/lib/mixins/message-handlers.js +67 -36
- package/lib/mixins/misc.js +128 -0
- package/lib/mixins/navigate.js +26 -30
- package/lib/mixins/screenshot.js +34 -0
- package/lib/remote-debugger-real-device.js +14 -1
- package/lib/remote-debugger.js +138 -302
- package/lib/rpc/rpc-client.js +9 -7
- package/lib/utils.js +42 -38
- package/package.json +1 -1
- package/build/lib/mixins/index.d.ts +0 -5
- package/build/lib/mixins/index.d.ts.map +0 -1
- package/build/lib/mixins/index.js +0 -16
- package/build/lib/mixins/index.js.map +0 -1
- package/lib/mixins/index.js +0 -14
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [11.5.0](https://github.com/appium/appium-remote-debugger/compare/v11.4.2...v11.5.0) (2024-07-25)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Refactor mixins and improve their typing ([#392](https://github.com/appium/appium-remote-debugger/issues/392)) ([d1fda80](https://github.com/appium/appium-remote-debugger/commit/d1fda8080afaafe4880c36e008bfd248d039965a))
|
|
6
|
+
|
|
7
|
+
## [11.4.2](https://github.com/appium/appium-remote-debugger/compare/v11.4.1...v11.4.2) (2024-07-24)
|
|
8
|
+
|
|
9
|
+
### Miscellaneous Chores
|
|
10
|
+
|
|
11
|
+
* More type fixes ([#391](https://github.com/appium/appium-remote-debugger/issues/391)) ([08aaf8a](https://github.com/appium/appium-remote-debugger/commit/08aaf8acc12f896d8a16dc96077c6576d477c77e))
|
|
12
|
+
|
|
1
13
|
## [11.4.1](https://github.com/appium/appium-remote-debugger/compare/v11.4.0...v11.4.1) (2024-07-24)
|
|
2
14
|
|
|
3
15
|
### Miscellaneous Chores
|
|
@@ -1,22 +1,3 @@
|
|
|
1
|
-
declare namespace _default {
|
|
2
|
-
export { setConnectionKey };
|
|
3
|
-
export { connect };
|
|
4
|
-
export { disconnect };
|
|
5
|
-
export { selectApp };
|
|
6
|
-
export { searchForApp };
|
|
7
|
-
export { searchForPage };
|
|
8
|
-
export { selectPage };
|
|
9
|
-
export { updateAppsWithDict };
|
|
10
|
-
}
|
|
11
|
-
export default _default;
|
|
12
|
-
export type AppPages = {
|
|
13
|
-
appIdKey: string;
|
|
14
|
-
pageDict: Record<string, any>;
|
|
15
|
-
};
|
|
16
|
-
export type App = {
|
|
17
|
-
id: string;
|
|
18
|
-
bundleId: string;
|
|
19
|
-
};
|
|
20
1
|
/**
|
|
21
2
|
* @typedef {Object} AppPages
|
|
22
3
|
* @property {string} appIdKey
|
|
@@ -30,39 +11,58 @@ export type App = {
|
|
|
30
11
|
/**
|
|
31
12
|
*
|
|
32
13
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
14
|
+
* @returns {Promise<void>}
|
|
33
15
|
*/
|
|
34
|
-
|
|
16
|
+
export function setConnectionKey(this: import("../remote-debugger").RemoteDebugger): Promise<void>;
|
|
35
17
|
/**
|
|
36
18
|
*
|
|
37
19
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
20
|
+
* @param {number} [timeout=APP_CONNECT_TIMEOUT_MS]
|
|
21
|
+
* @returns {Promise<import('@appium/types').StringRecord>}
|
|
38
22
|
*/
|
|
39
|
-
|
|
23
|
+
export function connect(this: import("../remote-debugger").RemoteDebugger, timeout?: number | undefined): Promise<import("@appium/types").StringRecord>;
|
|
40
24
|
/**
|
|
41
25
|
*
|
|
42
26
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
43
27
|
* @returns {Promise<void>}
|
|
44
28
|
*/
|
|
45
|
-
|
|
29
|
+
export function disconnect(this: import("../remote-debugger").RemoteDebugger): Promise<void>;
|
|
30
|
+
/**
|
|
31
|
+
* @typedef {Object} Page
|
|
32
|
+
* @property {string} url
|
|
33
|
+
* @property {string} title
|
|
34
|
+
* @property {number} id
|
|
35
|
+
* @property {boolean} isKey
|
|
36
|
+
* @property {string} [bundleId]
|
|
37
|
+
*/
|
|
46
38
|
/**
|
|
47
39
|
*
|
|
48
40
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
49
41
|
* @param {string?} currentUrl
|
|
50
42
|
* @param {number} [maxTries]
|
|
51
43
|
* @param {boolean} [ignoreAboutBlankUrl]
|
|
52
|
-
* @returns {Promise<
|
|
44
|
+
* @returns {Promise<Page[]>}
|
|
53
45
|
*/
|
|
54
|
-
|
|
55
|
-
|
|
46
|
+
export function selectApp(this: import("../remote-debugger").RemoteDebugger, currentUrl?: string | null, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined): Promise<Page[]>;
|
|
47
|
+
export class selectApp {
|
|
48
|
+
/**
|
|
49
|
+
* @typedef {Object} Page
|
|
50
|
+
* @property {string} url
|
|
51
|
+
* @property {string} title
|
|
52
|
+
* @property {number} id
|
|
53
|
+
* @property {boolean} isKey
|
|
54
|
+
* @property {string} [bundleId]
|
|
55
|
+
*/
|
|
56
56
|
/**
|
|
57
57
|
*
|
|
58
58
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
59
59
|
* @param {string?} currentUrl
|
|
60
60
|
* @param {number} [maxTries]
|
|
61
61
|
* @param {boolean} [ignoreAboutBlankUrl]
|
|
62
|
-
* @returns {Promise<
|
|
62
|
+
* @returns {Promise<Page[]>}
|
|
63
63
|
*/
|
|
64
|
-
constructor(this: import("../remote-debugger").
|
|
65
|
-
appIdKey:
|
|
64
|
+
constructor(this: import("../remote-debugger").RemoteDebugger, currentUrl?: string | null, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined);
|
|
65
|
+
appIdKey: string | undefined;
|
|
66
66
|
}
|
|
67
67
|
/**
|
|
68
68
|
*
|
|
@@ -72,7 +72,7 @@ declare class selectApp {
|
|
|
72
72
|
* @param {boolean} ignoreAboutBlankUrl
|
|
73
73
|
* @returns {Promise<AppPages?>}
|
|
74
74
|
*/
|
|
75
|
-
|
|
75
|
+
export function searchForApp(this: import("../remote-debugger").RemoteDebugger, currentUrl: string | null, maxTries: number, ignoreAboutBlankUrl: boolean): Promise<AppPages | null>;
|
|
76
76
|
/**
|
|
77
77
|
*
|
|
78
78
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
@@ -81,45 +81,42 @@ declare function searchForApp(this: import("../remote-debugger").default, curren
|
|
|
81
81
|
* @param {boolean} [ignoreAboutBlankUrl]
|
|
82
82
|
* @returns {AppPages?}
|
|
83
83
|
*/
|
|
84
|
-
|
|
84
|
+
export function searchForPage(this: import("../remote-debugger").RemoteDebugger, appsDict: Record<string, any>, currentUrl?: string | null, ignoreAboutBlankUrl?: boolean | undefined): AppPages | null;
|
|
85
85
|
/**
|
|
86
86
|
*
|
|
87
87
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
88
|
-
* @param {string} appIdKey
|
|
89
|
-
* @param {string} pageIdKey
|
|
88
|
+
* @param {string|number} appIdKey
|
|
89
|
+
* @param {string|number} pageIdKey
|
|
90
90
|
* @param {boolean} [skipReadyCheck]
|
|
91
91
|
* @returns {Promise<void>}
|
|
92
92
|
*/
|
|
93
|
-
|
|
94
|
-
|
|
93
|
+
export function selectPage(this: import("../remote-debugger").RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined): Promise<void>;
|
|
94
|
+
export class selectPage {
|
|
95
95
|
/**
|
|
96
96
|
*
|
|
97
97
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
98
|
-
* @param {string} appIdKey
|
|
99
|
-
* @param {string} pageIdKey
|
|
98
|
+
* @param {string|number} appIdKey
|
|
99
|
+
* @param {string|number} pageIdKey
|
|
100
100
|
* @param {boolean} [skipReadyCheck]
|
|
101
101
|
* @returns {Promise<void>}
|
|
102
102
|
*/
|
|
103
|
-
constructor(this: import("../remote-debugger").
|
|
103
|
+
constructor(this: import("../remote-debugger").RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined);
|
|
104
104
|
appIdKey: string;
|
|
105
|
-
pageIdKey: string;
|
|
106
|
-
}
|
|
107
|
-
/**
|
|
108
|
-
*
|
|
109
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
110
|
-
* @param {Record<string, any>} dict
|
|
111
|
-
* @returns {void}
|
|
112
|
-
*/
|
|
113
|
-
declare function updateAppsWithDict(this: import("../remote-debugger").default, dict: Record<string, any>): void;
|
|
114
|
-
declare class updateAppsWithDict {
|
|
115
|
-
/**
|
|
116
|
-
*
|
|
117
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
118
|
-
* @param {Record<string, any>} dict
|
|
119
|
-
* @returns {void}
|
|
120
|
-
*/
|
|
121
|
-
constructor(this: import("../remote-debugger").default, dict: Record<string, any>);
|
|
122
|
-
appDict: Record<string, any>;
|
|
123
|
-
appIdKey: string | undefined;
|
|
105
|
+
pageIdKey: string | number;
|
|
124
106
|
}
|
|
107
|
+
export type AppPages = {
|
|
108
|
+
appIdKey: string;
|
|
109
|
+
pageDict: Record<string, any>;
|
|
110
|
+
};
|
|
111
|
+
export type App = {
|
|
112
|
+
id: string;
|
|
113
|
+
bundleId: string;
|
|
114
|
+
};
|
|
115
|
+
export type Page = {
|
|
116
|
+
url: string;
|
|
117
|
+
title: string;
|
|
118
|
+
id: number;
|
|
119
|
+
isKey: boolean;
|
|
120
|
+
bundleId?: string | undefined;
|
|
121
|
+
};
|
|
125
122
|
//# sourceMappingURL=connect.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"AAkBA;;;;GAIG;AAEH;;;;GAIG;AAGH;;;;GAIG;AACH,qFAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,0GAFa,OAAO,CAAC,OAAO,eAAe,EAAE,YAAY,CAAC,CA2CzD;AAED;;;;GAIG;AACH,+EAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH,0FALW,MAAM,OAAC,6EAGL,OAAO,CAAC,IAAI,EAAE,CAAC,CAyD3B;;IAxED;;;;;;;OAOG;IAEH;;;;;;;OAOG;IACH,4EALW,MAAM,OAAC,4EA4DjB;IAjCK,6BAAwB;;AAmC9B;;;;;;;GAOG;AACH,4FALW,MAAM,OAAC,YACP,MAAM,uBACN,OAAO,GACL,OAAO,CAAC,QAAQ,OAAC,CAAC,CAsD9B;AAED;;;;;;;GAOG;AACH,2FALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,eACnB,MAAM,OAAC,8CAEL,QAAQ,OAAC,CAgBrB;AAED;;;;;;;GAOG;AACH,wFALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,yCAEX,OAAO,CAAC,IAAI,CAAC,CAkBzB;;IAxBD;;;;;;;OAOG;IACH,yEALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,wCAoBvB;IAfC,iBAAuF;IACvF,2BAA0B;;;cAhQd,MAAM;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;QAKnB,MAAM;cACN,MAAM;;;SAiFN,MAAM;WACN,MAAM;QACN,MAAM;WACN,OAAO"}
|
|
@@ -3,7 +3,13 @@ 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
|
-
|
|
6
|
+
exports.setConnectionKey = setConnectionKey;
|
|
7
|
+
exports.connect = connect;
|
|
8
|
+
exports.disconnect = disconnect;
|
|
9
|
+
exports.selectApp = selectApp;
|
|
10
|
+
exports.searchForApp = searchForApp;
|
|
11
|
+
exports.searchForPage = searchForPage;
|
|
12
|
+
exports.selectPage = selectPage;
|
|
7
13
|
const utils_1 = require("../utils");
|
|
8
14
|
const events_1 = __importDefault(require("./events"));
|
|
9
15
|
const support_1 = require("@appium/support");
|
|
@@ -28,43 +34,41 @@ const BLANK_PAGE_URL = 'about:blank';
|
|
|
28
34
|
/**
|
|
29
35
|
*
|
|
30
36
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
37
|
+
* @returns {Promise<void>}
|
|
31
38
|
*/
|
|
32
39
|
async function setConnectionKey() {
|
|
33
|
-
|
|
34
|
-
if (!this.rpcClient) {
|
|
35
|
-
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
36
|
-
}
|
|
40
|
+
this.log.debug('Sending connection key request');
|
|
37
41
|
// send but only wait to make sure the socket worked
|
|
38
42
|
// as response from Web Inspector can take a long time
|
|
39
|
-
await this.
|
|
43
|
+
await this.requireRpcClient().send('setConnectionKey', {}, false);
|
|
40
44
|
}
|
|
41
45
|
/**
|
|
42
46
|
*
|
|
43
47
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
48
|
+
* @param {number} [timeout=APP_CONNECT_TIMEOUT_MS]
|
|
49
|
+
* @returns {Promise<import('@appium/types').StringRecord>}
|
|
44
50
|
*/
|
|
45
51
|
async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
|
|
46
52
|
this.setup();
|
|
47
53
|
// initialize the rpc client
|
|
48
54
|
this.initRpcClient();
|
|
49
|
-
|
|
50
|
-
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
51
|
-
}
|
|
55
|
+
const rpcClient = this.requireRpcClient();
|
|
52
56
|
// listen for basic debugger-level events
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
await
|
|
57
|
+
rpcClient.on('_rpc_reportSetup:', lodash_1.default.noop);
|
|
58
|
+
rpcClient.on('_rpc_forwardGetListing:', this.onPageChange.bind(this));
|
|
59
|
+
rpcClient.on('_rpc_reportConnectedApplicationList:', this.onConnectedApplicationList.bind(this));
|
|
60
|
+
rpcClient.on('_rpc_applicationConnected:', this.onAppConnect.bind(this));
|
|
61
|
+
rpcClient.on('_rpc_applicationDisconnected:', this.onAppDisconnect.bind(this));
|
|
62
|
+
rpcClient.on('_rpc_applicationUpdated:', this.onAppUpdate.bind(this));
|
|
63
|
+
rpcClient.on('_rpc_reportConnectedDriverList:', this.onConnectedDriverList.bind(this));
|
|
64
|
+
rpcClient.on('_rpc_reportCurrentState:', this.onCurrentState.bind(this));
|
|
65
|
+
rpcClient.on('Page.frameDetached', this.frameDetached.bind(this));
|
|
66
|
+
await rpcClient.connect();
|
|
63
67
|
// get the connection information about the app
|
|
64
68
|
try {
|
|
65
69
|
this.setConnectionKey();
|
|
66
70
|
if (timeout) {
|
|
67
|
-
|
|
71
|
+
this.log.debug(`Waiting up to ${timeout}ms for applications to be reported`);
|
|
68
72
|
try {
|
|
69
73
|
await (0, asyncbox_1.waitForCondition)(() => !lodash_1.default.isEmpty(this.appDict), {
|
|
70
74
|
waitMs: timeout,
|
|
@@ -72,13 +76,13 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
|
|
|
72
76
|
});
|
|
73
77
|
}
|
|
74
78
|
catch (err) {
|
|
75
|
-
|
|
79
|
+
this.log.debug(`Timed out waiting for applications to be reported`);
|
|
76
80
|
}
|
|
77
81
|
}
|
|
78
82
|
return this.appDict || {};
|
|
79
83
|
}
|
|
80
84
|
catch (err) {
|
|
81
|
-
|
|
85
|
+
this.log.error(`Error setting connection key: ${err.message}`);
|
|
82
86
|
await this.disconnect();
|
|
83
87
|
throw err;
|
|
84
88
|
}
|
|
@@ -95,43 +99,50 @@ async function disconnect() {
|
|
|
95
99
|
this.emit(events_1.default.EVENT_DISCONNECT, true);
|
|
96
100
|
this.teardown();
|
|
97
101
|
}
|
|
102
|
+
/**
|
|
103
|
+
* @typedef {Object} Page
|
|
104
|
+
* @property {string} url
|
|
105
|
+
* @property {string} title
|
|
106
|
+
* @property {number} id
|
|
107
|
+
* @property {boolean} isKey
|
|
108
|
+
* @property {string} [bundleId]
|
|
109
|
+
*/
|
|
98
110
|
/**
|
|
99
111
|
*
|
|
100
112
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
101
113
|
* @param {string?} currentUrl
|
|
102
114
|
* @param {number} [maxTries]
|
|
103
115
|
* @param {boolean} [ignoreAboutBlankUrl]
|
|
104
|
-
* @returns {Promise<
|
|
116
|
+
* @returns {Promise<Page[]>}
|
|
105
117
|
*/
|
|
106
118
|
async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignoreAboutBlankUrl = false) {
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
const shouldCheckForTarget = this.rpcClient.shouldCheckForTarget;
|
|
112
|
-
this.rpcClient.shouldCheckForTarget = false;
|
|
119
|
+
this.log.debug('Selecting application');
|
|
120
|
+
const rpcClient = this.requireRpcClient();
|
|
121
|
+
const shouldCheckForTarget = rpcClient.shouldCheckForTarget;
|
|
122
|
+
rpcClient.shouldCheckForTarget = false;
|
|
113
123
|
try {
|
|
114
124
|
const timer = new support_1.timing.Timer().start();
|
|
115
125
|
if (!this.appDict || lodash_1.default.isEmpty(this.appDict)) {
|
|
116
|
-
|
|
126
|
+
this.log.debug('No applications currently connected.');
|
|
117
127
|
return [];
|
|
118
128
|
}
|
|
119
|
-
const { appIdKey, pageDict } = await this.searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl);
|
|
129
|
+
const { appIdKey, pageDict } = await this.searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) ?? {};
|
|
120
130
|
// if, after all this, we have no dictionary, we have failed
|
|
121
131
|
if (!appIdKey || !pageDict) {
|
|
122
|
-
|
|
132
|
+
throw this.log.errorWithException(`Could not connect to a valid app after ${maxTries} tries.`);
|
|
123
133
|
}
|
|
124
134
|
if (this.appIdKey !== appIdKey) {
|
|
125
|
-
|
|
135
|
+
this.log.debug(`Received altered app id, updating from '${this.appIdKey}' to '${appIdKey}'`);
|
|
126
136
|
this.appIdKey = appIdKey;
|
|
127
137
|
}
|
|
128
|
-
logApplicationDictionary(this.appDict);
|
|
138
|
+
logApplicationDictionary.bind(this)(this.appDict);
|
|
129
139
|
// translate the dictionary into a useful form, and return to sender
|
|
130
140
|
const pageArray = lodash_1.default.isEmpty(this.appDict[appIdKey].pageArray)
|
|
131
141
|
? (0, utils_1.pageArrayFromDict)(pageDict)
|
|
132
142
|
: this.appDict[appIdKey].pageArray;
|
|
133
|
-
|
|
134
|
-
|
|
143
|
+
this.log.debug(`Finally selecting app ${this.appIdKey}: ${(0, utils_1.simpleStringify)(pageArray)}`);
|
|
144
|
+
/** @type {Page[]} */
|
|
145
|
+
const fullPageArray = [];
|
|
135
146
|
for (const [app, info] of lodash_1.default.toPairs(this.appDict)) {
|
|
136
147
|
if (!lodash_1.default.isArray(info.pageArray) || !info.isActive) {
|
|
137
148
|
continue;
|
|
@@ -139,18 +150,18 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
|
|
|
139
150
|
const id = app.replace('PID:', '');
|
|
140
151
|
for (const page of info.pageArray) {
|
|
141
152
|
if (!(ignoreAboutBlankUrl && page.url === BLANK_PAGE_URL)) {
|
|
142
|
-
|
|
153
|
+
const pageDict = lodash_1.default.clone(page);
|
|
143
154
|
pageDict.id = `${id}.${pageDict.id}`;
|
|
144
155
|
pageDict.bundleId = info.bundleId;
|
|
145
156
|
fullPageArray.push(pageDict);
|
|
146
157
|
}
|
|
147
158
|
}
|
|
148
159
|
}
|
|
149
|
-
|
|
160
|
+
this.log.debug(`Selected app after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
150
161
|
return fullPageArray;
|
|
151
162
|
}
|
|
152
163
|
finally {
|
|
153
|
-
|
|
164
|
+
rpcClient.shouldCheckForTarget = shouldCheckForTarget;
|
|
154
165
|
}
|
|
155
166
|
}
|
|
156
167
|
/**
|
|
@@ -168,24 +179,21 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
168
179
|
let retryCount = 0;
|
|
169
180
|
try {
|
|
170
181
|
return await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async () => {
|
|
171
|
-
|
|
172
|
-
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
173
|
-
}
|
|
174
|
-
logApplicationDictionary(this.appDict);
|
|
182
|
+
logApplicationDictionary.bind(this)(this.appDict);
|
|
175
183
|
const possibleAppIds = (0, utils_1.getPossibleDebuggerAppKeys)(/** @type {string[]} */ (bundleIds), this.appDict);
|
|
176
|
-
|
|
184
|
+
this.log.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
|
|
177
185
|
for (const attemptedAppIdKey of possibleAppIds) {
|
|
178
186
|
try {
|
|
179
187
|
if (!this.appDict[attemptedAppIdKey].isActive) {
|
|
180
|
-
|
|
188
|
+
this.log.debug(`Skipping app '${attemptedAppIdKey}' because it is not active`);
|
|
181
189
|
continue;
|
|
182
190
|
}
|
|
183
|
-
|
|
184
|
-
const [appIdKey, pageDict] = await this.
|
|
191
|
+
this.log.debug(`Attempting app '${attemptedAppIdKey}'`);
|
|
192
|
+
const [appIdKey, pageDict] = await this.requireRpcClient().selectApp(attemptedAppIdKey);
|
|
185
193
|
// in iOS 8.2 the connect logic happens, but with an empty dictionary
|
|
186
194
|
// which leads to the remote debugger getting disconnected, and into a loop
|
|
187
195
|
if (lodash_1.default.isEmpty(pageDict)) {
|
|
188
|
-
|
|
196
|
+
this.log.debug('Empty page dictionary received. Trying again.');
|
|
189
197
|
continue;
|
|
190
198
|
}
|
|
191
199
|
// save the page array for this app
|
|
@@ -198,14 +206,14 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
198
206
|
return result;
|
|
199
207
|
}
|
|
200
208
|
if (currentUrl) {
|
|
201
|
-
|
|
209
|
+
this.log.debug(`Received app, but expected url ('${currentUrl}') was not found. Trying again.`);
|
|
202
210
|
}
|
|
203
211
|
else {
|
|
204
|
-
|
|
212
|
+
this.log.debug('Received app, but no match was found. Trying again.');
|
|
205
213
|
}
|
|
206
214
|
}
|
|
207
215
|
catch (err) {
|
|
208
|
-
|
|
216
|
+
this.log.debug(`Error checking application: '${err.message}'. Retrying connection`);
|
|
209
217
|
}
|
|
210
218
|
}
|
|
211
219
|
retryCount++;
|
|
@@ -213,7 +221,7 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
213
221
|
});
|
|
214
222
|
}
|
|
215
223
|
catch (ign) {
|
|
216
|
-
|
|
224
|
+
this.log.errorAndThrow(`Could not connect to a valid app after ${maxTries} tries.`);
|
|
217
225
|
}
|
|
218
226
|
return null;
|
|
219
227
|
}
|
|
@@ -242,28 +250,25 @@ function searchForPage(appsDict, currentUrl = null, ignoreAboutBlankUrl = false)
|
|
|
242
250
|
/**
|
|
243
251
|
*
|
|
244
252
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
245
|
-
* @param {string} appIdKey
|
|
246
|
-
* @param {string} pageIdKey
|
|
253
|
+
* @param {string|number} appIdKey
|
|
254
|
+
* @param {string|number} pageIdKey
|
|
247
255
|
* @param {boolean} [skipReadyCheck]
|
|
248
256
|
* @returns {Promise<void>}
|
|
249
257
|
*/
|
|
250
258
|
async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
251
|
-
this.appIdKey = `PID:${appIdKey}`;
|
|
259
|
+
this.appIdKey = lodash_1.default.startsWith(`${appIdKey}`, 'PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
|
|
252
260
|
this.pageIdKey = pageIdKey;
|
|
253
|
-
|
|
254
|
-
if (!this.rpcClient) {
|
|
255
|
-
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
256
|
-
}
|
|
261
|
+
this.log.debug(`Selecting page '${pageIdKey}' on app '${this.appIdKey}' and forwarding socket setup`);
|
|
257
262
|
const timer = new support_1.timing.Timer().start();
|
|
258
|
-
await this.
|
|
263
|
+
await this.requireRpcClient().selectPage(this.appIdKey, pageIdKey);
|
|
259
264
|
// make sure everything is ready to go
|
|
260
265
|
if (!skipReadyCheck && !await this.checkPageIsReady()) {
|
|
261
266
|
await this.waitForDom();
|
|
262
267
|
}
|
|
263
|
-
|
|
268
|
+
this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
264
269
|
}
|
|
265
270
|
/**
|
|
266
|
-
*
|
|
271
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
267
272
|
* @param {Record<string, any>} apps
|
|
268
273
|
* @returns {void}
|
|
269
274
|
*/
|
|
@@ -277,54 +282,25 @@ function logApplicationDictionary(apps) {
|
|
|
277
282
|
}
|
|
278
283
|
return JSON.stringify(value);
|
|
279
284
|
}
|
|
280
|
-
|
|
285
|
+
this.log.debug('Current applications available:');
|
|
281
286
|
for (const [app, info] of lodash_1.default.toPairs(apps)) {
|
|
282
|
-
|
|
287
|
+
this.log.debug(` Application: "${app}"`);
|
|
283
288
|
for (const [key, value] of lodash_1.default.toPairs(info)) {
|
|
284
289
|
if (key === 'pageArray' && Array.isArray(value) && value.length) {
|
|
285
|
-
|
|
290
|
+
this.log.debug(` ${key}:`);
|
|
286
291
|
for (const page of value) {
|
|
287
292
|
let prefix = '- ';
|
|
288
293
|
for (const [k, v] of lodash_1.default.toPairs(page)) {
|
|
289
|
-
|
|
294
|
+
this.log.debug(` ${prefix}${k}: ${JSON.stringify(v)}`);
|
|
290
295
|
prefix = ' ';
|
|
291
296
|
}
|
|
292
297
|
}
|
|
293
298
|
}
|
|
294
299
|
else {
|
|
295
300
|
const valueString = getValueString(key, value);
|
|
296
|
-
|
|
301
|
+
this.log.debug(` ${key}: ${valueString}`);
|
|
297
302
|
}
|
|
298
303
|
}
|
|
299
304
|
}
|
|
300
305
|
}
|
|
301
|
-
/**
|
|
302
|
-
*
|
|
303
|
-
* @this {import('../remote-debugger').RemoteDebugger}
|
|
304
|
-
* @param {Record<string, any>} dict
|
|
305
|
-
* @returns {void}
|
|
306
|
-
*/
|
|
307
|
-
function updateAppsWithDict(dict) {
|
|
308
|
-
// get the dictionary entry into a nice form, and add it to the
|
|
309
|
-
// application dictionary
|
|
310
|
-
this.appDict = this.appDict || {};
|
|
311
|
-
let [id, entry] = (0, utils_1.appInfoFromDict)(dict);
|
|
312
|
-
if (this.appDict[id]) {
|
|
313
|
-
// preserve the page dictionary for this entry
|
|
314
|
-
entry.pageArray = this.appDict[id].pageArray;
|
|
315
|
-
}
|
|
316
|
-
this.appDict[id] = entry;
|
|
317
|
-
// add a promise to get the page dictionary
|
|
318
|
-
if (lodash_1.default.isUndefined(entry.pageArray)) {
|
|
319
|
-
entry.pageArray = (0, utils_1.deferredPromise)();
|
|
320
|
-
}
|
|
321
|
-
// try to get the app id from our connected apps
|
|
322
|
-
if (!this.appIdKey) {
|
|
323
|
-
this.appIdKey = (0, utils_1.getDebuggerAppKey)(/** @type {string} */ (this.bundleId), this.appDict);
|
|
324
|
-
}
|
|
325
|
-
}
|
|
326
|
-
exports.default = {
|
|
327
|
-
setConnectionKey, connect, disconnect, selectApp,
|
|
328
|
-
searchForApp, searchForPage, selectPage, updateAppsWithDict
|
|
329
|
-
};
|
|
330
306
|
//# 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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"}
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
/**
|
|
2
|
+
*
|
|
3
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
4
|
+
* @returns {Promise<void>}
|
|
5
|
+
*/
|
|
6
|
+
export function getCookies(this: import("../remote-debugger").RemoteDebugger): Promise<void>;
|
|
7
|
+
/**
|
|
8
|
+
*
|
|
9
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
10
|
+
* @param {any} cookie
|
|
11
|
+
* @returns {Promise<any>}
|
|
12
|
+
*/
|
|
13
|
+
export function setCookie(this: import("../remote-debugger").RemoteDebugger, cookie: any): Promise<any>;
|
|
14
|
+
/**
|
|
15
|
+
*
|
|
16
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
17
|
+
* @param {string} cookieName
|
|
18
|
+
* @param {string} url
|
|
19
|
+
* @returns {Promise<any>}
|
|
20
|
+
*/
|
|
21
|
+
export function deleteCookie(this: import("../remote-debugger").RemoteDebugger, cookieName: string, url: string): Promise<any>;
|
|
22
|
+
//# sourceMappingURL=cookies.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cookies.d.ts","sourceRoot":"","sources":["../../../lib/mixins/cookies.js"],"names":[],"mappings":"AACA;;;;GAIG;AACH,+EAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,qFAHW,GAAG,GACD,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;;;GAMG;AACH,4FAJW,MAAM,OACN,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CAUxB"}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getCookies = getCookies;
|
|
4
|
+
exports.setCookie = setCookie;
|
|
5
|
+
exports.deleteCookie = deleteCookie;
|
|
6
|
+
/**
|
|
7
|
+
*
|
|
8
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
9
|
+
* @returns {Promise<void>}
|
|
10
|
+
*/
|
|
11
|
+
async function getCookies() {
|
|
12
|
+
this.log.debug('Getting cookies');
|
|
13
|
+
return await this.requireRpcClient().send('Page.getCookies', {
|
|
14
|
+
appIdKey: this.appIdKey,
|
|
15
|
+
pageIdKey: this.pageIdKey
|
|
16
|
+
});
|
|
17
|
+
}
|
|
18
|
+
/**
|
|
19
|
+
*
|
|
20
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
21
|
+
* @param {any} cookie
|
|
22
|
+
* @returns {Promise<any>}
|
|
23
|
+
*/
|
|
24
|
+
async function setCookie(cookie) {
|
|
25
|
+
this.log.debug('Setting cookie');
|
|
26
|
+
return await this.requireRpcClient().send('Page.setCookie', {
|
|
27
|
+
appIdKey: this.appIdKey,
|
|
28
|
+
pageIdKey: this.pageIdKey,
|
|
29
|
+
cookie
|
|
30
|
+
});
|
|
31
|
+
}
|
|
32
|
+
/**
|
|
33
|
+
*
|
|
34
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
35
|
+
* @param {string} cookieName
|
|
36
|
+
* @param {string} url
|
|
37
|
+
* @returns {Promise<any>}
|
|
38
|
+
*/
|
|
39
|
+
async function deleteCookie(cookieName, url) {
|
|
40
|
+
this.log.debug(`Deleting cookie '${cookieName}' on '${url}'`);
|
|
41
|
+
return await this.requireRpcClient().send('Page.deleteCookie', {
|
|
42
|
+
appIdKey: this.appIdKey,
|
|
43
|
+
pageIdKey: this.pageIdKey,
|
|
44
|
+
cookieName,
|
|
45
|
+
url,
|
|
46
|
+
});
|
|
47
|
+
}
|
|
48
|
+
//# sourceMappingURL=cookies.js.map
|