appium-remote-debugger 11.4.2 → 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.
Files changed (68) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/build/lib/mixins/connect.d.ts +30 -56
  3. package/build/lib/mixins/connect.d.ts.map +1 -1
  4. package/build/lib/mixins/connect.js +57 -90
  5. package/build/lib/mixins/connect.js.map +1 -1
  6. package/build/lib/mixins/cookies.d.ts +22 -0
  7. package/build/lib/mixins/cookies.d.ts.map +1 -0
  8. package/build/lib/mixins/cookies.js +48 -0
  9. package/build/lib/mixins/cookies.js.map +1 -0
  10. package/build/lib/mixins/events.d.ts +17 -2
  11. package/build/lib/mixins/events.d.ts.map +1 -1
  12. package/build/lib/mixins/events.js +29 -2
  13. package/build/lib/mixins/events.js.map +1 -1
  14. package/build/lib/mixins/execute.d.ts +5 -12
  15. package/build/lib/mixins/execute.d.ts.map +1 -1
  16. package/build/lib/mixins/execute.js +18 -30
  17. package/build/lib/mixins/execute.js.map +1 -1
  18. package/build/lib/mixins/message-handlers.d.ts +13 -23
  19. package/build/lib/mixins/message-handlers.d.ts.map +1 -1
  20. package/build/lib/mixins/message-handlers.js +56 -27
  21. package/build/lib/mixins/message-handlers.js.map +1 -1
  22. package/build/lib/mixins/misc.d.ts +51 -0
  23. package/build/lib/mixins/misc.d.ts.map +1 -0
  24. package/build/lib/mixins/misc.js +132 -0
  25. package/build/lib/mixins/misc.js.map +1 -0
  26. package/build/lib/mixins/navigate.d.ts +20 -29
  27. package/build/lib/mixins/navigate.d.ts.map +1 -1
  28. package/build/lib/mixins/navigate.js +25 -23
  29. package/build/lib/mixins/navigate.js.map +1 -1
  30. package/build/lib/mixins/screenshot.d.ts +13 -0
  31. package/build/lib/mixins/screenshot.d.ts.map +1 -0
  32. package/build/lib/mixins/screenshot.js +31 -0
  33. package/build/lib/mixins/screenshot.js.map +1 -0
  34. package/build/lib/remote-debugger-real-device.d.ts +16 -2
  35. package/build/lib/remote-debugger-real-device.d.ts.map +1 -1
  36. package/build/lib/remote-debugger-real-device.js +11 -1
  37. package/build/lib/remote-debugger-real-device.js.map +1 -1
  38. package/build/lib/remote-debugger.d.ts +153 -174
  39. package/build/lib/remote-debugger.d.ts.map +1 -1
  40. package/build/lib/remote-debugger.js +147 -213
  41. package/build/lib/remote-debugger.js.map +1 -1
  42. package/build/lib/rpc/rpc-client.d.ts +2 -1
  43. package/build/lib/rpc/rpc-client.d.ts.map +1 -1
  44. package/build/lib/rpc/rpc-client.js +2 -0
  45. package/build/lib/rpc/rpc-client.js.map +1 -1
  46. package/build/lib/utils.d.ts +20 -16
  47. package/build/lib/utils.d.ts.map +1 -1
  48. package/build/lib/utils.js +33 -25
  49. package/build/lib/utils.js.map +1 -1
  50. package/build/tsconfig.tsbuildinfo +1 -1
  51. package/lib/mixins/connect.js +61 -105
  52. package/lib/mixins/cookies.js +45 -0
  53. package/lib/mixins/events.js +25 -1
  54. package/lib/mixins/execute.js +18 -39
  55. package/lib/mixins/message-handlers.js +67 -36
  56. package/lib/mixins/misc.js +128 -0
  57. package/lib/mixins/navigate.js +26 -30
  58. package/lib/mixins/screenshot.js +34 -0
  59. package/lib/remote-debugger-real-device.js +14 -1
  60. package/lib/remote-debugger.js +133 -305
  61. package/lib/rpc/rpc-client.js +3 -1
  62. package/lib/utils.js +42 -38
  63. package/package.json +1 -1
  64. package/build/lib/mixins/index.d.ts +0 -5
  65. package/build/lib/mixins/index.d.ts.map +0 -1
  66. package/build/lib/mixins/index.js +0 -16
  67. package/build/lib/mixins/index.js.map +0 -1
  68. package/lib/mixins/index.js +0 -14
package/CHANGELOG.md CHANGED
@@ -1,3 +1,9 @@
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
+
1
7
  ## [11.4.2](https://github.com/appium/appium-remote-debugger/compare/v11.4.1...v11.4.2) (2024-07-24)
2
8
 
3
9
  ### Miscellaneous Chores
@@ -1,29 +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
- export type Page = {
21
- url: string;
22
- title: string;
23
- id: number;
24
- isKey: boolean;
25
- bundleId?: string | undefined;
26
- };
27
1
  /**
28
2
  * @typedef {Object} AppPages
29
3
  * @property {string} appIdKey
@@ -37,19 +11,22 @@ export type Page = {
37
11
  /**
38
12
  *
39
13
  * @this {import('../remote-debugger').RemoteDebugger}
14
+ * @returns {Promise<void>}
40
15
  */
41
- declare function setConnectionKey(this: import("../remote-debugger").default): Promise<void>;
16
+ export function setConnectionKey(this: import("../remote-debugger").RemoteDebugger): Promise<void>;
42
17
  /**
43
18
  *
44
19
  * @this {import('../remote-debugger').RemoteDebugger}
20
+ * @param {number} [timeout=APP_CONNECT_TIMEOUT_MS]
21
+ * @returns {Promise<import('@appium/types').StringRecord>}
45
22
  */
46
- declare function connect(this: import("../remote-debugger").default, timeout?: number): Promise<Record<string, any>>;
23
+ export function connect(this: import("../remote-debugger").RemoteDebugger, timeout?: number | undefined): Promise<import("@appium/types").StringRecord>;
47
24
  /**
48
25
  *
49
26
  * @this {import('../remote-debugger').RemoteDebugger}
50
27
  * @returns {Promise<void>}
51
28
  */
52
- declare function disconnect(this: import("../remote-debugger").default): Promise<void>;
29
+ export function disconnect(this: import("../remote-debugger").RemoteDebugger): Promise<void>;
53
30
  /**
54
31
  * @typedef {Object} Page
55
32
  * @property {string} url
@@ -66,8 +43,8 @@ declare function disconnect(this: import("../remote-debugger").default): Promise
66
43
  * @param {boolean} [ignoreAboutBlankUrl]
67
44
  * @returns {Promise<Page[]>}
68
45
  */
69
- declare function selectApp(this: import("../remote-debugger").default, currentUrl?: string | null, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined): Promise<Page[]>;
70
- declare class selectApp {
46
+ export function selectApp(this: import("../remote-debugger").RemoteDebugger, currentUrl?: string | null, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined): Promise<Page[]>;
47
+ export class selectApp {
71
48
  /**
72
49
  * @typedef {Object} Page
73
50
  * @property {string} url
@@ -84,8 +61,8 @@ declare class selectApp {
84
61
  * @param {boolean} [ignoreAboutBlankUrl]
85
62
  * @returns {Promise<Page[]>}
86
63
  */
87
- constructor(this: import("../remote-debugger").default, currentUrl?: string | null, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined);
88
- appIdKey: any;
64
+ constructor(this: import("../remote-debugger").RemoteDebugger, currentUrl?: string | null, maxTries?: number | undefined, ignoreAboutBlankUrl?: boolean | undefined);
65
+ appIdKey: string | undefined;
89
66
  }
90
67
  /**
91
68
  *
@@ -95,7 +72,7 @@ declare class selectApp {
95
72
  * @param {boolean} ignoreAboutBlankUrl
96
73
  * @returns {Promise<AppPages?>}
97
74
  */
98
- declare function searchForApp(this: import("../remote-debugger").default, currentUrl: string | null, maxTries: number, ignoreAboutBlankUrl: boolean): Promise<AppPages | null>;
75
+ export function searchForApp(this: import("../remote-debugger").RemoteDebugger, currentUrl: string | null, maxTries: number, ignoreAboutBlankUrl: boolean): Promise<AppPages | null>;
99
76
  /**
100
77
  *
101
78
  * @this {import('../remote-debugger').RemoteDebugger}
@@ -104,7 +81,7 @@ declare function searchForApp(this: import("../remote-debugger").default, curren
104
81
  * @param {boolean} [ignoreAboutBlankUrl]
105
82
  * @returns {AppPages?}
106
83
  */
107
- declare function searchForPage(this: import("../remote-debugger").default, appsDict: Record<string, any>, currentUrl?: string | null, ignoreAboutBlankUrl?: boolean | undefined): AppPages | null;
84
+ export function searchForPage(this: import("../remote-debugger").RemoteDebugger, appsDict: Record<string, any>, currentUrl?: string | null, ignoreAboutBlankUrl?: boolean | undefined): AppPages | null;
108
85
  /**
109
86
  *
110
87
  * @this {import('../remote-debugger').RemoteDebugger}
@@ -113,8 +90,8 @@ declare function searchForPage(this: import("../remote-debugger").default, appsD
113
90
  * @param {boolean} [skipReadyCheck]
114
91
  * @returns {Promise<void>}
115
92
  */
116
- declare function selectPage(this: import("../remote-debugger").default, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined): Promise<void>;
117
- declare class selectPage {
93
+ export function selectPage(this: import("../remote-debugger").RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined): Promise<void>;
94
+ export class selectPage {
118
95
  /**
119
96
  *
120
97
  * @this {import('../remote-debugger').RemoteDebugger}
@@ -123,26 +100,23 @@ declare class selectPage {
123
100
  * @param {boolean} [skipReadyCheck]
124
101
  * @returns {Promise<void>}
125
102
  */
126
- constructor(this: import("../remote-debugger").default, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined);
103
+ constructor(this: import("../remote-debugger").RemoteDebugger, appIdKey: string | number, pageIdKey: string | number, skipReadyCheck?: boolean | undefined);
127
104
  appIdKey: string;
128
105
  pageIdKey: string | number;
129
106
  }
130
- /**
131
- *
132
- * @this {import('../remote-debugger').RemoteDebugger}
133
- * @param {Record<string, any>} dict
134
- * @returns {void}
135
- */
136
- declare function updateAppsWithDict(this: import("../remote-debugger").default, dict: Record<string, any>): void;
137
- declare class updateAppsWithDict {
138
- /**
139
- *
140
- * @this {import('../remote-debugger').RemoteDebugger}
141
- * @param {Record<string, any>} dict
142
- * @returns {void}
143
- */
144
- constructor(this: import("../remote-debugger").default, dict: Record<string, any>);
145
- appDict: Record<string, any>;
146
- appIdKey: string | undefined;
147
- }
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
+ };
148
122
  //# sourceMappingURL=connect.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":";;;;;;;;;;;;cAoBc,MAAM;cACN,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC;;;QAKnB,MAAM;cACN,MAAM;;;SAmFN,MAAM;WACN,MAAM;QACN,MAAM;WACN,OAAO;;;AA/FrB;;;;GAIG;AAEH;;;;GAIG;AAGH;;;GAGG;AACH,6FASC;AAED;;;GAGG;AACH,qHA2CC;AAED;;;;GAIG;AACH,yEAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AAEH;;;;;;;GAOG;AACH,oFALW,MAAM,OAAC,6EAGL,OAAO,CAAC,IAAI,EAAE,CAAC,CA2D3B;;IA1ED;;;;;;;OAOG;IAEH;;;;;;;OAOG;IACH,qEALW,MAAM,OAAC,4EA8DjB;IAjCK,cAAwB;;AAmC9B;;;;;;;GAOG;AACH,sFALW,MAAM,OAAC,YACP,MAAM,uBACN,OAAO,GACL,OAAO,CAAC,QAAQ,OAAC,CAAC,CA0D9B;AAED;;;;;;;GAOG;AACH,qFALW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,eACnB,MAAM,OAAC,8CAEL,QAAQ,OAAC,CAgBrB;AAED;;;;;;;GAOG;AACH,kFALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,yCAEX,OAAO,CAAC,IAAI,CAAC,CAqBzB;;IA3BD;;;;;;;OAOG;IACH,kEALW,MAAM,GAAC,MAAM,aACb,MAAM,GAAC,MAAM,wCAuBvB;IAlBC,iBAAuF;IACvF,2BAA0B;;AAyD5B;;;;;GAKG;AACH,sFAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAsBhB;;IA1BD;;;;;OAKG;IACH,8DAHW,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAuB7B;IAjBC,6BAAiC;IAe/B,6BAAsF"}
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
- const logger_1 = __importDefault(require("../logger"));
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
- logger_1.default.debug('Sending connection key request');
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.rpcClient.send('setConnectionKey', {}, false);
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
- if (!this.rpcClient) {
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
- this.rpcClient.on('_rpc_reportSetup:', lodash_1.default.noop);
54
- this.rpcClient.on('_rpc_forwardGetListing:', this.onPageChange.bind(this));
55
- this.rpcClient.on('_rpc_reportConnectedApplicationList:', this.onConnectedApplicationList.bind(this));
56
- this.rpcClient.on('_rpc_applicationConnected:', this.onAppConnect.bind(this));
57
- this.rpcClient.on('_rpc_applicationDisconnected:', this.onAppDisconnect.bind(this));
58
- this.rpcClient.on('_rpc_applicationUpdated:', this.onAppUpdate.bind(this));
59
- this.rpcClient.on('_rpc_reportConnectedDriverList:', this.onConnectedDriverList.bind(this));
60
- this.rpcClient.on('_rpc_reportCurrentState:', this.onCurrentState.bind(this));
61
- this.rpcClient.on('Page.frameDetached', this.frameDetached.bind(this));
62
- await this.rpcClient.connect();
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
- logger_1.default.debug(`Waiting up to ${timeout}ms for applications to be reported`);
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
- logger_1.default.debug(`Timed out waiting for applications to be reported`);
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
- logger_1.default.error(`Error setting connection key: ${err.message}`);
85
+ this.log.error(`Error setting connection key: ${err.message}`);
82
86
  await this.disconnect();
83
87
  throw err;
84
88
  }
@@ -112,33 +116,31 @@ async function disconnect() {
112
116
  * @returns {Promise<Page[]>}
113
117
  */
114
118
  async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignoreAboutBlankUrl = false) {
115
- logger_1.default.debug('Selecting application');
116
- if (!this.rpcClient) {
117
- throw new Error('rpcClient is undefined. Is the debugger connected?');
118
- }
119
- const shouldCheckForTarget = this.rpcClient.shouldCheckForTarget;
120
- this.rpcClient.shouldCheckForTarget = false;
119
+ this.log.debug('Selecting application');
120
+ const rpcClient = this.requireRpcClient();
121
+ const shouldCheckForTarget = rpcClient.shouldCheckForTarget;
122
+ rpcClient.shouldCheckForTarget = false;
121
123
  try {
122
124
  const timer = new support_1.timing.Timer().start();
123
125
  if (!this.appDict || lodash_1.default.isEmpty(this.appDict)) {
124
- logger_1.default.debug('No applications currently connected.');
126
+ this.log.debug('No applications currently connected.');
125
127
  return [];
126
128
  }
127
- const { appIdKey, pageDict } = await this.searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl);
129
+ const { appIdKey, pageDict } = await this.searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) ?? {};
128
130
  // if, after all this, we have no dictionary, we have failed
129
131
  if (!appIdKey || !pageDict) {
130
- logger_1.default.errorAndThrow(`Could not connect to a valid app after ${maxTries} tries.`);
132
+ throw this.log.errorWithException(`Could not connect to a valid app after ${maxTries} tries.`);
131
133
  }
132
134
  if (this.appIdKey !== appIdKey) {
133
- logger_1.default.debug(`Received altered app id, updating from '${this.appIdKey}' to '${appIdKey}'`);
135
+ this.log.debug(`Received altered app id, updating from '${this.appIdKey}' to '${appIdKey}'`);
134
136
  this.appIdKey = appIdKey;
135
137
  }
136
- logApplicationDictionary(this.appDict);
138
+ logApplicationDictionary.bind(this)(this.appDict);
137
139
  // translate the dictionary into a useful form, and return to sender
138
140
  const pageArray = lodash_1.default.isEmpty(this.appDict[appIdKey].pageArray)
139
141
  ? (0, utils_1.pageArrayFromDict)(pageDict)
140
142
  : this.appDict[appIdKey].pageArray;
141
- logger_1.default.debug(`Finally selecting app ${this.appIdKey}: ${(0, utils_1.simpleStringify)(pageArray)}`);
143
+ this.log.debug(`Finally selecting app ${this.appIdKey}: ${(0, utils_1.simpleStringify)(pageArray)}`);
142
144
  /** @type {Page[]} */
143
145
  const fullPageArray = [];
144
146
  for (const [app, info] of lodash_1.default.toPairs(this.appDict)) {
@@ -155,11 +157,11 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
155
157
  }
156
158
  }
157
159
  }
158
- logger_1.default.debug(`Selected app after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
160
+ this.log.debug(`Selected app after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
159
161
  return fullPageArray;
160
162
  }
161
163
  finally {
162
- this.rpcClient.shouldCheckForTarget = shouldCheckForTarget;
164
+ rpcClient.shouldCheckForTarget = shouldCheckForTarget;
163
165
  }
164
166
  }
165
167
  /**
@@ -177,24 +179,21 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
177
179
  let retryCount = 0;
178
180
  try {
179
181
  return await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async () => {
180
- if (!this.rpcClient) {
181
- throw new Error('rpcClient is undefined. Is the debugger connected?');
182
- }
183
- logApplicationDictionary(this.appDict);
182
+ logApplicationDictionary.bind(this)(this.appDict);
184
183
  const possibleAppIds = (0, utils_1.getPossibleDebuggerAppKeys)(/** @type {string[]} */ (bundleIds), this.appDict);
185
- logger_1.default.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
184
+ this.log.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
186
185
  for (const attemptedAppIdKey of possibleAppIds) {
187
186
  try {
188
187
  if (!this.appDict[attemptedAppIdKey].isActive) {
189
- logger_1.default.debug(`Skipping app '${attemptedAppIdKey}' because it is not active`);
188
+ this.log.debug(`Skipping app '${attemptedAppIdKey}' because it is not active`);
190
189
  continue;
191
190
  }
192
- logger_1.default.debug(`Attempting app '${attemptedAppIdKey}'`);
193
- const [appIdKey, pageDict] = await this.rpcClient.selectApp(attemptedAppIdKey);
191
+ this.log.debug(`Attempting app '${attemptedAppIdKey}'`);
192
+ const [appIdKey, pageDict] = await this.requireRpcClient().selectApp(attemptedAppIdKey);
194
193
  // in iOS 8.2 the connect logic happens, but with an empty dictionary
195
194
  // which leads to the remote debugger getting disconnected, and into a loop
196
195
  if (lodash_1.default.isEmpty(pageDict)) {
197
- logger_1.default.debug('Empty page dictionary received. Trying again.');
196
+ this.log.debug('Empty page dictionary received. Trying again.');
198
197
  continue;
199
198
  }
200
199
  // save the page array for this app
@@ -207,14 +206,14 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
207
206
  return result;
208
207
  }
209
208
  if (currentUrl) {
210
- logger_1.default.debug(`Received app, but expected url ('${currentUrl}') was not found. Trying again.`);
209
+ this.log.debug(`Received app, but expected url ('${currentUrl}') was not found. Trying again.`);
211
210
  }
212
211
  else {
213
- logger_1.default.debug('Received app, but no match was found. Trying again.');
212
+ this.log.debug('Received app, but no match was found. Trying again.');
214
213
  }
215
214
  }
216
215
  catch (err) {
217
- logger_1.default.debug(`Error checking application: '${err.message}'. Retrying connection`);
216
+ this.log.debug(`Error checking application: '${err.message}'. Retrying connection`);
218
217
  }
219
218
  }
220
219
  retryCount++;
@@ -222,7 +221,7 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
222
221
  });
223
222
  }
224
223
  catch (ign) {
225
- logger_1.default.errorAndThrow(`Could not connect to a valid app after ${maxTries} tries.`);
224
+ this.log.errorAndThrow(`Could not connect to a valid app after ${maxTries} tries.`);
226
225
  }
227
226
  return null;
228
227
  }
@@ -259,20 +258,17 @@ function searchForPage(appsDict, currentUrl = null, ignoreAboutBlankUrl = false)
259
258
  async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
260
259
  this.appIdKey = lodash_1.default.startsWith(`${appIdKey}`, 'PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
261
260
  this.pageIdKey = pageIdKey;
262
- logger_1.default.debug(`Selecting page '${pageIdKey}' on app '${this.appIdKey}' and forwarding socket setup`);
263
- if (!this.rpcClient) {
264
- throw new Error('rpcClient is undefined. Is the debugger connected?');
265
- }
261
+ this.log.debug(`Selecting page '${pageIdKey}' on app '${this.appIdKey}' and forwarding socket setup`);
266
262
  const timer = new support_1.timing.Timer().start();
267
- await this.rpcClient.selectPage(this.appIdKey, pageIdKey);
263
+ await this.requireRpcClient().selectPage(this.appIdKey, pageIdKey);
268
264
  // make sure everything is ready to go
269
265
  if (!skipReadyCheck && !await this.checkPageIsReady()) {
270
266
  await this.waitForDom();
271
267
  }
272
- logger_1.default.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
268
+ this.log.debug(`Selected page after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
273
269
  }
274
270
  /**
275
- *
271
+ * @this {import('../remote-debugger').RemoteDebugger}
276
272
  * @param {Record<string, any>} apps
277
273
  * @returns {void}
278
274
  */
@@ -286,54 +282,25 @@ function logApplicationDictionary(apps) {
286
282
  }
287
283
  return JSON.stringify(value);
288
284
  }
289
- logger_1.default.debug('Current applications available:');
285
+ this.log.debug('Current applications available:');
290
286
  for (const [app, info] of lodash_1.default.toPairs(apps)) {
291
- logger_1.default.debug(` Application: "${app}"`);
287
+ this.log.debug(` Application: "${app}"`);
292
288
  for (const [key, value] of lodash_1.default.toPairs(info)) {
293
289
  if (key === 'pageArray' && Array.isArray(value) && value.length) {
294
- logger_1.default.debug(` ${key}:`);
290
+ this.log.debug(` ${key}:`);
295
291
  for (const page of value) {
296
292
  let prefix = '- ';
297
293
  for (const [k, v] of lodash_1.default.toPairs(page)) {
298
- logger_1.default.debug(` ${prefix}${k}: ${JSON.stringify(v)}`);
294
+ this.log.debug(` ${prefix}${k}: ${JSON.stringify(v)}`);
299
295
  prefix = ' ';
300
296
  }
301
297
  }
302
298
  }
303
299
  else {
304
300
  const valueString = getValueString(key, value);
305
- logger_1.default.debug(` ${key}: ${valueString}`);
301
+ this.log.debug(` ${key}: ${valueString}`);
306
302
  }
307
303
  }
308
304
  }
309
305
  }
310
- /**
311
- *
312
- * @this {import('../remote-debugger').RemoteDebugger}
313
- * @param {Record<string, any>} dict
314
- * @returns {void}
315
- */
316
- function updateAppsWithDict(dict) {
317
- // get the dictionary entry into a nice form, and add it to the
318
- // application dictionary
319
- this.appDict = this.appDict || {};
320
- let [id, entry] = (0, utils_1.appInfoFromDict)(dict);
321
- if (this.appDict[id]) {
322
- // preserve the page dictionary for this entry
323
- entry.pageArray = this.appDict[id].pageArray;
324
- }
325
- this.appDict[id] = entry;
326
- // add a promise to get the page dictionary
327
- if (lodash_1.default.isUndefined(entry.pageArray)) {
328
- entry.pageArray = (0, utils_1.deferredPromise)();
329
- }
330
- // try to get the app id from our connected apps
331
- if (!this.appIdKey) {
332
- this.appIdKey = (0, utils_1.getDebuggerAppKey)(/** @type {string} */ (this.bundleId), this.appDict);
333
- }
334
- }
335
- exports.default = {
336
- setConnectionKey, connect, disconnect, selectApp,
337
- searchForApp, searchForPage, selectPage, updateAppsWithDict
338
- };
339
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
@@ -0,0 +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,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;KAC1B,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,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,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,QAAQ;QACvB,SAAS,EAAE,IAAI,CAAC,SAAS;QACzB,UAAU;QACV,GAAG;KACJ,CAAC,CAAC;AACL,CAAC"}
@@ -1,7 +1,22 @@
1
- export default events;
2
- declare namespace events {
1
+ /**
2
+ * Keep track of the client event listeners so they can be removed
3
+ *
4
+ * @this {import('../remote-debugger').RemoteDebugger}
5
+ * @param {string} eventName
6
+ * @param {(event: import('@appium/types').StringRecord) => any} listener
7
+ * @returns {void}
8
+ */
9
+ export function addClientEventListener(this: import("../remote-debugger").RemoteDebugger, eventName: string, listener: (event: import("@appium/types").StringRecord) => any): void;
10
+ /**
11
+ * @this {import('../remote-debugger').RemoteDebugger}
12
+ * @param {string} eventName
13
+ * @returns {void}
14
+ */
15
+ export function removeClientEventListener(this: import("../remote-debugger").RemoteDebugger, eventName: string): void;
16
+ export namespace events {
3
17
  let EVENT_PAGE_CHANGE: string;
4
18
  let EVENT_FRAMES_DETACHED: string;
5
19
  let EVENT_DISCONNECT: string;
6
20
  }
21
+ export default events;
7
22
  //# sourceMappingURL=events.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":""}
1
+ {"version":3,"file":"events.d.ts","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,qGAJW,MAAM,YACN,CAAC,KAAK,EAAE,OAAO,eAAe,EAAE,YAAY,KAAK,GAAG,GAClD,IAAI,CAMhB;AAED;;;;GAIG;AACH,wGAHW,MAAM,GACJ,IAAI,CAMhB"}