appium-remote-debugger 15.2.8 → 15.2.10
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 +47 -31
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +105 -86
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/message-handlers.d.ts +63 -43
- package/build/lib/mixins/message-handlers.d.ts.map +1 -1
- package/build/lib/mixins/message-handlers.js +74 -57
- package/build/lib/mixins/message-handlers.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts +39 -27
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +31 -31
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/mixins/{connect.js → connect.ts} +153 -113
- package/lib/mixins/message-handlers.ts +272 -0
- package/lib/mixins/{navigate.js → navigate.ts} +44 -41
- package/package.json +2 -2
- package/lib/mixins/message-handlers.js +0 -224
|
@@ -20,11 +20,13 @@ const property_accessors_1 = require("./property-accessors");
|
|
|
20
20
|
* These will be added to the prototype.
|
|
21
21
|
*/
|
|
22
22
|
/**
|
|
23
|
-
*
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
27
|
-
* @
|
|
23
|
+
* Handles page change notifications from the remote debugger.
|
|
24
|
+
* Updates the page array for the specified application and emits a page change
|
|
25
|
+
* event if the pages have actually changed and navigation is not in progress.
|
|
26
|
+
*
|
|
27
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
28
|
+
* @param appIdKey - The application identifier key for which pages have changed.
|
|
29
|
+
* @param pageDict - Dictionary containing the new page information.
|
|
28
30
|
*/
|
|
29
31
|
async function onPageChange(err, appIdKey, pageDict) {
|
|
30
32
|
if (lodash_1.default.isEmpty(pageDict)) {
|
|
@@ -54,10 +56,12 @@ async function onPageChange(err, appIdKey, pageDict) {
|
|
|
54
56
|
});
|
|
55
57
|
}
|
|
56
58
|
/**
|
|
57
|
-
*
|
|
58
|
-
*
|
|
59
|
-
*
|
|
60
|
-
* @
|
|
59
|
+
* Handles notifications when a new application connects to the remote debugger.
|
|
60
|
+
* Updates the application dictionary with the new application information.
|
|
61
|
+
*
|
|
62
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
63
|
+
* @param dict - Dictionary containing the new application information including
|
|
64
|
+
* the WIRApplicationIdentifierKey.
|
|
61
65
|
*/
|
|
62
66
|
async function onAppConnect(err, dict) {
|
|
63
67
|
const appIdKey = dict.WIRApplicationIdentifierKey;
|
|
@@ -65,10 +69,14 @@ async function onAppConnect(err, dict) {
|
|
|
65
69
|
updateAppsWithDict.bind(this)(dict);
|
|
66
70
|
}
|
|
67
71
|
/**
|
|
68
|
-
*
|
|
69
|
-
*
|
|
70
|
-
*
|
|
71
|
-
*
|
|
72
|
+
* Handles notifications when an application disconnects from the remote debugger.
|
|
73
|
+
* Removes the application from the dictionary and attempts to find a replacement
|
|
74
|
+
* if the disconnected app was the currently selected one. Emits a disconnect event
|
|
75
|
+
* if no applications remain.
|
|
76
|
+
*
|
|
77
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
78
|
+
* @param dict - Dictionary containing the disconnected application information
|
|
79
|
+
* including the WIRApplicationIdentifierKey.
|
|
72
80
|
*/
|
|
73
81
|
function onAppDisconnect(err, dict) {
|
|
74
82
|
const appIdKey = dict.WIRApplicationIdentifierKey;
|
|
@@ -80,7 +88,7 @@ function onAppDisconnect(err, dict) {
|
|
|
80
88
|
// if the disconnected app is the one we are connected to, try to find another
|
|
81
89
|
if ((0, property_accessors_1.getAppIdKey)(this) === appIdKey) {
|
|
82
90
|
this.log.debug(`No longer have app id. Attempting to find new one.`);
|
|
83
|
-
(0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)(
|
|
91
|
+
(0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)((0, property_accessors_1.getBundleId)(this)));
|
|
84
92
|
}
|
|
85
93
|
if (lodash_1.default.isEmpty((0, property_accessors_1.getAppDict)(this))) {
|
|
86
94
|
// this means we no longer have any apps. what the what?
|
|
@@ -89,30 +97,38 @@ function onAppDisconnect(err, dict) {
|
|
|
89
97
|
}
|
|
90
98
|
}
|
|
91
99
|
/**
|
|
92
|
-
*
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
100
|
+
* Handles notifications when an application's information is updated.
|
|
101
|
+
* Updates the application dictionary with the new information while preserving
|
|
102
|
+
* any existing page array data.
|
|
103
|
+
*
|
|
104
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
105
|
+
* @param dict - Dictionary containing the updated application information.
|
|
96
106
|
*/
|
|
97
107
|
async function onAppUpdate(err, dict) {
|
|
98
108
|
this.log.debug(`Notified that an application has been updated`);
|
|
99
109
|
updateAppsWithDict.bind(this)(dict);
|
|
100
110
|
}
|
|
101
111
|
/**
|
|
102
|
-
*
|
|
103
|
-
*
|
|
104
|
-
*
|
|
105
|
-
* @
|
|
112
|
+
* Handles notifications containing the list of connected drivers.
|
|
113
|
+
* Updates the internal connected drivers list with the received information.
|
|
114
|
+
*
|
|
115
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
116
|
+
* @param drivers - Dictionary containing the connected driver list with
|
|
117
|
+
* WIRDriverDictionaryKey.
|
|
106
118
|
*/
|
|
107
119
|
function onConnectedDriverList(err, drivers) {
|
|
108
120
|
(0, property_accessors_1.setConnectedDrivers)(this, drivers.WIRDriverDictionaryKey);
|
|
109
121
|
this.log.debug(`Received connected driver list: ${JSON.stringify(this.connectedDrivers)}`);
|
|
110
122
|
}
|
|
111
123
|
/**
|
|
112
|
-
*
|
|
113
|
-
*
|
|
114
|
-
*
|
|
115
|
-
*
|
|
124
|
+
* Handles notifications about the current automation availability state.
|
|
125
|
+
* This state changes when 'Remote Automation' setting in Safari's advanced settings
|
|
126
|
+
* is toggled. The state can be either WIRAutomationAvailabilityAvailable or
|
|
127
|
+
* WIRAutomationAvailabilityNotAvailable.
|
|
128
|
+
*
|
|
129
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
130
|
+
* @param state - Dictionary containing the automation availability state with
|
|
131
|
+
* WIRAutomationAvailabilityKey.
|
|
116
132
|
*/
|
|
117
133
|
function onCurrentState(err, state) {
|
|
118
134
|
(0, property_accessors_1.setCurrentState)(this, state.WIRAutomationAvailabilityKey);
|
|
@@ -121,16 +137,18 @@ function onCurrentState(err, state) {
|
|
|
121
137
|
this.log.debug(`Received connected automation availability state: ${JSON.stringify(this.currentState)}`);
|
|
122
138
|
}
|
|
123
139
|
/**
|
|
124
|
-
*
|
|
125
|
-
*
|
|
126
|
-
*
|
|
127
|
-
*
|
|
140
|
+
* Handles notifications containing the list of connected applications.
|
|
141
|
+
* Translates the received information into the application dictionary format,
|
|
142
|
+
* filtering out any applications that are in the skipped apps list.
|
|
143
|
+
*
|
|
144
|
+
* @param err - Error object if an error occurred, null or undefined otherwise.
|
|
145
|
+
* @param apps - Dictionary containing the connected applications list.
|
|
128
146
|
*/
|
|
129
147
|
async function onConnectedApplicationList(err, apps) {
|
|
130
148
|
this.log.debug(`Received connected applications list: ${lodash_1.default.keys(apps).join(', ')}`);
|
|
131
149
|
// translate the received information into an easier-to-manage
|
|
132
150
|
// hash with app id as key, and app info as value
|
|
133
|
-
|
|
151
|
+
const newDict = {};
|
|
134
152
|
for (const dict of lodash_1.default.values(apps)) {
|
|
135
153
|
const [id, entry] = (0, utils_1.appInfoFromDict)(dict);
|
|
136
154
|
if ((0, property_accessors_1.getSkippedApps)(this).includes(entry.name)) {
|
|
@@ -142,32 +160,13 @@ async function onConnectedApplicationList(err, apps) {
|
|
|
142
160
|
lodash_1.default.defaults((0, property_accessors_1.getAppDict)(this), newDict);
|
|
143
161
|
}
|
|
144
162
|
/**
|
|
163
|
+
* Given a bundle ID, finds the correct remote debugger app identifier key
|
|
164
|
+
* that is currently connected. Also handles proxy applications that may act
|
|
165
|
+
* on behalf of the requested bundle ID.
|
|
145
166
|
*
|
|
146
|
-
* @
|
|
147
|
-
* @
|
|
148
|
-
*
|
|
149
|
-
*/
|
|
150
|
-
function updateAppsWithDict(dict) {
|
|
151
|
-
// get the dictionary entry into a nice form, and add it to the
|
|
152
|
-
// application dictionary
|
|
153
|
-
const [id, entry] = (0, utils_1.appInfoFromDict)(dict);
|
|
154
|
-
if ((0, property_accessors_1.getAppDict)(this)[id]?.pageArray) {
|
|
155
|
-
// preserve the page dictionary for this entry
|
|
156
|
-
entry.pageArray = (0, property_accessors_1.getAppDict)(this)[id].pageArray;
|
|
157
|
-
}
|
|
158
|
-
(0, property_accessors_1.getAppDict)(this)[id] = entry;
|
|
159
|
-
// try to get the app id from our connected apps
|
|
160
|
-
if (!(0, property_accessors_1.getAppIdKey)(this)) {
|
|
161
|
-
(0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)(/** @type {string} */ ((0, property_accessors_1.getBundleId)(this))));
|
|
162
|
-
}
|
|
163
|
-
}
|
|
164
|
-
/**
|
|
165
|
-
* Given a bundle id, finds the correct remote debugger app that is
|
|
166
|
-
* connected.
|
|
167
|
-
*
|
|
168
|
-
* @this {RemoteDebugger}
|
|
169
|
-
* @param {string} bundleId
|
|
170
|
-
* @returns {string|undefined}
|
|
167
|
+
* @param bundleId - The bundle identifier to search for.
|
|
168
|
+
* @returns The application identifier key if found, undefined otherwise.
|
|
169
|
+
* If a proxy application is found, returns the proxy's app ID instead.
|
|
171
170
|
*/
|
|
172
171
|
function getDebuggerAppKey(bundleId) {
|
|
173
172
|
let appId;
|
|
@@ -197,6 +196,24 @@ function getDebuggerAppKey(bundleId) {
|
|
|
197
196
|
return appId;
|
|
198
197
|
}
|
|
199
198
|
/**
|
|
200
|
-
*
|
|
199
|
+
* Updates the application dictionary with information from the provided dictionary.
|
|
200
|
+
* Preserves existing page array data if the application already exists in the dictionary.
|
|
201
|
+
* Attempts to set the app ID key if one is not currently set.
|
|
202
|
+
*
|
|
203
|
+
* @param dict - Dictionary containing application information to add or update.
|
|
201
204
|
*/
|
|
205
|
+
function updateAppsWithDict(dict) {
|
|
206
|
+
// get the dictionary entry into a nice form, and add it to the
|
|
207
|
+
// application dictionary
|
|
208
|
+
const [id, entry] = (0, utils_1.appInfoFromDict)(dict);
|
|
209
|
+
if ((0, property_accessors_1.getAppDict)(this)[id]?.pageArray) {
|
|
210
|
+
// preserve the page dictionary for this entry
|
|
211
|
+
entry.pageArray = (0, property_accessors_1.getAppDict)(this)[id].pageArray;
|
|
212
|
+
}
|
|
213
|
+
(0, property_accessors_1.getAppDict)(this)[id] = entry;
|
|
214
|
+
// try to get the app id from our connected apps
|
|
215
|
+
if (!(0, property_accessors_1.getAppIdKey)(this)) {
|
|
216
|
+
(0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)((0, property_accessors_1.getBundleId)(this)));
|
|
217
|
+
}
|
|
218
|
+
}
|
|
202
219
|
//# sourceMappingURL=message-handlers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handlers.js","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.
|
|
1
|
+
{"version":3,"file":"message-handlers.js","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.ts"],"names":[],"mappings":";;;;;AAkCA,oCAsCC;AAUD,oCAQC;AAYD,0CAwBC;AAUD,kCAOC;AAUD,sDAOC;AAYD,wCASC;AAUD,gEAmBC;AAWD,8CA2BC;AAxPD,qCAAkC;AAClC,oCAGkB;AAClB,oDAAuB;AACvB,6DAS8B;AAK9B;;;GAGG;AAEH;;;;;;;;GAQG;AACI,KAAK,UAAU,YAAY,CAEhC,GAA6B,EAC7B,QAAgB,EAChB,QAAsB;IAEtB,IAAI,gBAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACxB,OAAO;IACT,CAAC;IAED,MAAM,YAAY,GAAG,IAAA,yBAAiB,EAAC,QAAQ,CAAC,CAAC;IACjD,kCAAkC;IAClC,IAAI,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;QAC3D,kCAAkC;QAClC,IAAI,aAAa,IAAI,gBAAC,CAAC,OAAO,CAAC,aAAa,EAAE,YAAY,CAAC,EAAE,CAAC;YAC5D,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,wCAAwC,QAAQ,IAAI;gBACpD,4CAA4C,CAC7C,CAAC;YACF,OAAO;QACT,CAAC;QACD,oCAAoC;QACpC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,SAAS,GAAG,YAAY,CAAC;QACpD,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,qBAAqB,QAAQ,KAAK,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,CAAC,EAAE,CACrG,CAAC;IACJ,CAAC;IAED,IAAI,IAAA,wCAAmB,EAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,8EAA8E;QAC9E,OAAO;IACT,CAAC;IAED,IAAI,CAAC,IAAI,CAAC,eAAM,CAAC,iBAAiB,EAAE;QAClC,QAAQ,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC;QACtC,SAAS,EAAE,YAAY;KACxB,CAAC,CAAC;AACL,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,YAAY,CAEhC,GAA6B,EAC7B,IAAkB;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,2BAA2B,CAAC;IAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kCAAkC,QAAQ,iBAAiB,CAAC,CAAC;IAC5E,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,eAAe,CAE7B,GAA6B,EAC7B,IAAkB;IAElB,MAAM,QAAQ,GAAG,IAAI,CAAC,2BAA2B,CAAC;IAClD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,QAAQ,+CAA+C,CAAC,CAAC;IACxF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAA,gCAAW,EAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAExD,8CAA8C;IAC9C,kCAAkC;IAClC,OAAO,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC;IAElC,8EAA8E;IAC9E,IAAI,IAAA,gCAAW,EAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACrE,IAAA,gCAAW,EAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAA,gCAAW,EAAC,IAAI,CAAW,CAAC,CAAC,CAAC;IAC/E,CAAC;IAED,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAChC,wDAAwD;QACxD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,kDAAkD,CAAC,CAAC;QACnE,IAAI,CAAC,IAAI,CAAC,eAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IAC3C,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,WAAW,CAE/B,GAA6B,EAC7B,IAAkB;IAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,+CAA+C,CAAC,CAAC;IAChE,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,qBAAqB,CAEnC,GAA6B,EAC7B,OAAqB;IAErB,IAAA,wCAAmB,EAAC,IAAI,EAAE,OAAO,CAAC,sBAAsB,CAAC,CAAC;IAC1D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAC;AAC7F,CAAC;AAED;;;;;;;;;GASG;AACH,SAAgB,cAAc,CAE5B,GAA6B,EAC7B,KAAmB;IAEnB,IAAA,oCAAe,EAAC,IAAI,EAAE,KAAK,CAAC,4BAA4B,CAAC,CAAC;IAC1D,sHAAsH;IACtH,8EAA8E;IAC9E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qDAAqD,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC;AAC3G,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,0BAA0B,CAE9C,GAA6B,EAC7B,IAAkB;IAElB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yCAAyC,gBAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEnF,8DAA8D;IAC9D,iDAAiD;IACjD,MAAM,OAAO,GAAY,EAAE,CAAC;IAC5B,KAAK,MAAM,IAAI,IAAI,gBAAC,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,CAAC;QAC1C,IAAI,IAAA,mCAAc,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9C,SAAS;QACX,CAAC;QACD,OAAO,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;IACtB,CAAC;IACD,mCAAmC;IACnC,gBAAC,CAAC,QAAQ,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,EAAE,OAAO,CAAC,CAAC;AACxC,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,iBAAiB,CAAuB,QAAgB;IACtE,IAAI,KAAyB,CAAC;IAC9B,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtD,IAAI,IAAI,CAAC,QAAQ,KAAK,QAAQ,EAAE,CAAC;YAC/B,KAAK,GAAG,GAAG,CAAC;YACZ,MAAM;QACR,CAAC;IACH,CAAC;IACD,sEAAsE;IACtE,IAAI,KAAK,EAAE,CAAC;QACV,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,KAAK,iBAAiB,QAAQ,GAAG,CAAC,CAAC;QACvE,IAAI,UAA8B,CAAC;QACnC,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACtD,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,EAAE,CAAC;gBAC1C,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,4BAA4B,IAAI,CAAC,QAAQ,IAAI;oBAClD,wBAAwB,QAAQ,mBAAmB,GAAG,GAAG,CAAC,CAAC;gBACrE,yEAAyE;gBACzE,UAAU,GAAG,GAAG,CAAC;YACnB,CAAC;QACH,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,KAAK,GAAG,UAAU,CAAC;YACnB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,KAAK,GAAG,CAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAS,kBAAkB,CAAuB,IAAkB;IAClE,+DAA+D;IAC/D,yBAAyB;IACzB,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,GAAG,IAAA,uBAAe,EAAC,IAAI,CAAC,CAAC;IAC1C,IAAI,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC;QACpC,8CAA8C;QAC9C,KAAK,CAAC,SAAS,GAAG,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,SAAS,CAAC;IACnD,CAAC;IACD,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC;IAE7B,gDAAgD;IAChD,IAAI,CAAC,IAAA,gCAAW,EAAC,IAAI,CAAC,EAAE,CAAC;QACvB,IAAA,gCAAW,EAAC,IAAI,EAAE,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAA,gCAAW,EAAC,IAAI,CAAW,CAAC,CAAC,CAAC;IAC/E,CAAC;AACH,CAAC"}
|
|
@@ -1,41 +1,53 @@
|
|
|
1
|
+
import { timing } from '@appium/support';
|
|
2
|
+
import type { RemoteDebugger } from '../remote-debugger';
|
|
3
|
+
export declare const DEFAULT_PAGE_READINESS_TIMEOUT_MS: number;
|
|
1
4
|
/**
|
|
2
|
-
*
|
|
3
|
-
*
|
|
5
|
+
* Emits a frame detached event when a frame is detached from the page.
|
|
6
|
+
* This is typically called by the RPC client when receiving a Page.frameDetached event.
|
|
4
7
|
*/
|
|
5
|
-
export function frameDetached(this:
|
|
8
|
+
export declare function frameDetached(this: RemoteDebugger): void;
|
|
6
9
|
/**
|
|
7
|
-
*
|
|
8
|
-
*
|
|
10
|
+
* Cancels the current page load operation by unregistering from page readiness
|
|
11
|
+
* notifications and canceling any pending page load delay.
|
|
9
12
|
*/
|
|
10
|
-
export function cancelPageLoad(this:
|
|
13
|
+
export declare function cancelPageLoad(this: RemoteDebugger): void;
|
|
11
14
|
/**
|
|
12
|
-
*
|
|
13
|
-
*
|
|
15
|
+
* Determines if the current readyState indicates that page loading is completed
|
|
16
|
+
* based on the configured page load strategy.
|
|
14
17
|
*
|
|
15
|
-
* @
|
|
16
|
-
* @
|
|
17
|
-
*
|
|
18
|
+
* @param readyState - The document readyState value ('loading', 'interactive', or 'complete').
|
|
19
|
+
* @returns True if the page load is considered complete for the current strategy:
|
|
20
|
+
* - 'eager': returns true when readyState is not 'loading'
|
|
21
|
+
* - 'none': always returns true
|
|
22
|
+
* - 'normal' (default): returns true only when readyState is 'complete'
|
|
18
23
|
*/
|
|
19
|
-
export function isPageLoadingCompleted(this:
|
|
24
|
+
export declare function isPageLoadingCompleted(this: RemoteDebugger, readyState: string): boolean;
|
|
20
25
|
/**
|
|
21
|
-
*
|
|
22
|
-
*
|
|
23
|
-
*
|
|
26
|
+
* Waits for the DOM to be ready by periodically checking the page readiness state.
|
|
27
|
+
* Uses exponential backoff for retry intervals and respects the configured page load
|
|
28
|
+
* strategy and timeout settings.
|
|
29
|
+
*
|
|
30
|
+
* @param startPageLoadTimer - Optional timer instance to use for tracking elapsed time.
|
|
31
|
+
* If not provided, a new timer will be created and started.
|
|
24
32
|
*/
|
|
25
|
-
export function waitForDom(this:
|
|
33
|
+
export declare function waitForDom(this: RemoteDebugger, startPageLoadTimer?: timing.Timer): Promise<void>;
|
|
26
34
|
/**
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
35
|
+
* Checks if the current page is ready by executing a JavaScript command to
|
|
36
|
+
* retrieve the document readyState and evaluating it against the page load strategy.
|
|
37
|
+
*
|
|
38
|
+
* @param timeoutMs - Optional timeout in milliseconds for the readyState check.
|
|
39
|
+
* If not provided, uses the configured page ready timeout.
|
|
40
|
+
* @returns A promise that resolves to true if the page is ready according to
|
|
41
|
+
* the page load strategy, false otherwise or if the check times out.
|
|
30
42
|
*/
|
|
31
|
-
export function checkPageIsReady(this:
|
|
43
|
+
export declare function checkPageIsReady(this: RemoteDebugger, timeoutMs?: number): Promise<boolean>;
|
|
32
44
|
/**
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
45
|
+
* Navigates to a new URL and waits for the page to be ready.
|
|
46
|
+
* Validates the URL format, waits for the page to be available, sends the navigation
|
|
47
|
+
* command, and monitors for the Page.loadEventFired event or timeout.
|
|
48
|
+
*
|
|
49
|
+
* @param url - The URL to navigate to. Must be a valid URL format.
|
|
50
|
+
* @throws TypeError if the provided URL is not a valid URL format.
|
|
36
51
|
*/
|
|
37
|
-
export function navToUrl(this:
|
|
38
|
-
export const DEFAULT_PAGE_READINESS_TIMEOUT_MS: number;
|
|
39
|
-
export type RemoteDebugger = import("../remote-debugger").RemoteDebugger;
|
|
40
|
-
import { timing } from '@appium/support';
|
|
52
|
+
export declare function navToUrl(this: RemoteDebugger, url: string): Promise<void>;
|
|
41
53
|
//# sourceMappingURL=navigate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAQ,MAAM,iBAAiB,CAAC;AAa/C,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AAGzD,eAAO,MAAM,iCAAiC,QAAY,CAAC;AAY3D;;;GAGG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAExD;AAED;;;GAGG;AACH,wBAAgB,cAAc,CAAC,IAAI,EAAE,cAAc,GAAG,IAAI,CAIzD;AAED;;;;;;;;;GASG;AACH,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAYxF;AAED;;;;;;;GAOG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,EAAE,kBAAkB,CAAC,EAAE,MAAM,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CA2DvG;AAED;;;;;;;;GAQG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAqBjG;AAED;;;;;;;GAOG;AACH,wBAAsB,QAAQ,CAAC,IAAI,EAAE,cAAc,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAiF/E"}
|
|
@@ -60,15 +60,15 @@ const PAGE_LOAD_STRATEGY = Object.freeze({
|
|
|
60
60
|
NORMAL: 'normal'
|
|
61
61
|
});
|
|
62
62
|
/**
|
|
63
|
-
*
|
|
64
|
-
*
|
|
63
|
+
* Emits a frame detached event when a frame is detached from the page.
|
|
64
|
+
* This is typically called by the RPC client when receiving a Page.frameDetached event.
|
|
65
65
|
*/
|
|
66
66
|
function frameDetached() {
|
|
67
67
|
this.emit(events_1.events.EVENT_FRAMES_DETACHED);
|
|
68
68
|
}
|
|
69
69
|
/**
|
|
70
|
-
*
|
|
71
|
-
*
|
|
70
|
+
* Cancels the current page load operation by unregistering from page readiness
|
|
71
|
+
* notifications and canceling any pending page load delay.
|
|
72
72
|
*/
|
|
73
73
|
function cancelPageLoad() {
|
|
74
74
|
this.log.debug('Unregistering from page readiness notifications');
|
|
@@ -76,12 +76,14 @@ function cancelPageLoad() {
|
|
|
76
76
|
(0, property_accessors_1.getPageLoadDelay)(this)?.cancel();
|
|
77
77
|
}
|
|
78
78
|
/**
|
|
79
|
-
*
|
|
80
|
-
*
|
|
79
|
+
* Determines if the current readyState indicates that page loading is completed
|
|
80
|
+
* based on the configured page load strategy.
|
|
81
81
|
*
|
|
82
|
-
* @
|
|
83
|
-
* @
|
|
84
|
-
*
|
|
82
|
+
* @param readyState - The document readyState value ('loading', 'interactive', or 'complete').
|
|
83
|
+
* @returns True if the page load is considered complete for the current strategy:
|
|
84
|
+
* - 'eager': returns true when readyState is not 'loading'
|
|
85
|
+
* - 'none': always returns true
|
|
86
|
+
* - 'normal' (default): returns true only when readyState is 'complete'
|
|
85
87
|
*/
|
|
86
88
|
function isPageLoadingCompleted(readyState) {
|
|
87
89
|
const pageLoadStrategy = lodash_1.default.toLower((0, property_accessors_1.getPageLoadStartegy)(this));
|
|
@@ -97,9 +99,12 @@ function isPageLoadingCompleted(readyState) {
|
|
|
97
99
|
}
|
|
98
100
|
}
|
|
99
101
|
/**
|
|
100
|
-
*
|
|
101
|
-
*
|
|
102
|
-
*
|
|
102
|
+
* Waits for the DOM to be ready by periodically checking the page readiness state.
|
|
103
|
+
* Uses exponential backoff for retry intervals and respects the configured page load
|
|
104
|
+
* strategy and timeout settings.
|
|
105
|
+
*
|
|
106
|
+
* @param startPageLoadTimer - Optional timer instance to use for tracking elapsed time.
|
|
107
|
+
* If not provided, a new timer will be created and started.
|
|
103
108
|
*/
|
|
104
109
|
async function waitForDom(startPageLoadTimer) {
|
|
105
110
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
@@ -108,7 +113,6 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
108
113
|
let isPageLoading = true;
|
|
109
114
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
110
115
|
(0, property_accessors_1.setPageLoadDelay)(this, support_1.util.cancellableDelay(readinessTimeoutMs));
|
|
111
|
-
/** @type {B<void>} */
|
|
112
116
|
const pageReadinessPromise = bluebird_1.default.resolve((async () => {
|
|
113
117
|
let retry = 0;
|
|
114
118
|
while (isPageLoading) {
|
|
@@ -141,7 +145,6 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
141
145
|
retry++;
|
|
142
146
|
}
|
|
143
147
|
})());
|
|
144
|
-
/** @type {B<void>} */
|
|
145
148
|
const cancellationPromise = bluebird_1.default.resolve((async () => {
|
|
146
149
|
try {
|
|
147
150
|
await (0, property_accessors_1.getPageLoadDelay)(this);
|
|
@@ -158,9 +161,13 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
158
161
|
}
|
|
159
162
|
}
|
|
160
163
|
/**
|
|
161
|
-
*
|
|
162
|
-
*
|
|
163
|
-
*
|
|
164
|
+
* Checks if the current page is ready by executing a JavaScript command to
|
|
165
|
+
* retrieve the document readyState and evaluating it against the page load strategy.
|
|
166
|
+
*
|
|
167
|
+
* @param timeoutMs - Optional timeout in milliseconds for the readyState check.
|
|
168
|
+
* If not provided, uses the configured page ready timeout.
|
|
169
|
+
* @returns A promise that resolves to true if the page is ready according to
|
|
170
|
+
* the page load strategy, false otherwise or if the check times out.
|
|
164
171
|
*/
|
|
165
172
|
async function checkPageIsReady(timeoutMs) {
|
|
166
173
|
const readyCmd = 'document.readyState;';
|
|
@@ -185,9 +192,12 @@ async function checkPageIsReady(timeoutMs) {
|
|
|
185
192
|
}
|
|
186
193
|
}
|
|
187
194
|
/**
|
|
188
|
-
*
|
|
189
|
-
*
|
|
190
|
-
*
|
|
195
|
+
* Navigates to a new URL and waits for the page to be ready.
|
|
196
|
+
* Validates the URL format, waits for the page to be available, sends the navigation
|
|
197
|
+
* command, and monitors for the Page.loadEventFired event or timeout.
|
|
198
|
+
*
|
|
199
|
+
* @param url - The URL to navigate to. Must be a valid URL format.
|
|
200
|
+
* @throws TypeError if the provided URL is not a valid URL format.
|
|
191
201
|
*/
|
|
192
202
|
async function navToUrl(url) {
|
|
193
203
|
const { appIdKey, pageIdKey } = (0, utils_1.checkParams)({
|
|
@@ -203,20 +213,14 @@ async function navToUrl(url) {
|
|
|
203
213
|
}
|
|
204
214
|
this.log.debug(`Navigating to new URL: '${url}'`);
|
|
205
215
|
(0, property_accessors_1.setNavigatingToPage)(this, true);
|
|
206
|
-
await rpcClient.waitForPage(
|
|
207
|
-
/** @type {import('../types').AppIdKey} */ (appIdKey),
|
|
208
|
-
/** @type {import('../types').PageIdKey} */ (pageIdKey));
|
|
216
|
+
await rpcClient.waitForPage(appIdKey, pageIdKey);
|
|
209
217
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
210
|
-
/** @type {(() => void)|undefined} */
|
|
211
218
|
let onPageLoaded;
|
|
212
|
-
/** @type {NodeJS.Timeout|undefined|null} */
|
|
213
219
|
let onPageLoadedTimeout;
|
|
214
220
|
(0, property_accessors_1.setPageLoadDelay)(this, support_1.util.cancellableDelay(readinessTimeoutMs));
|
|
215
221
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
216
222
|
let isPageLoading = true;
|
|
217
|
-
// /** @type {Promise<void>|null} */
|
|
218
223
|
const start = new support_1.timing.Timer().start();
|
|
219
|
-
/** @type {B<void>} */
|
|
220
224
|
const pageReadinessPromise = new bluebird_1.default((resolve) => {
|
|
221
225
|
onPageLoadedTimeout = setTimeout(() => {
|
|
222
226
|
if (isPageLoading) {
|
|
@@ -245,7 +249,6 @@ async function navToUrl(url) {
|
|
|
245
249
|
pageIdKey,
|
|
246
250
|
});
|
|
247
251
|
});
|
|
248
|
-
/** @type {B<void>} */
|
|
249
252
|
const cancellationPromise = bluebird_1.default.resolve((async () => {
|
|
250
253
|
try {
|
|
251
254
|
await (0, property_accessors_1.getPageLoadDelay)(this);
|
|
@@ -269,7 +272,4 @@ async function navToUrl(url) {
|
|
|
269
272
|
}
|
|
270
273
|
}
|
|
271
274
|
}
|
|
272
|
-
/**
|
|
273
|
-
* @typedef {import('../remote-debugger').RemoteDebugger} RemoteDebugger
|
|
274
|
-
*/
|
|
275
275
|
//# sourceMappingURL=navigate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.ts"],"names":[],"mappings":"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"}
|