appium-remote-debugger 12.2.10 → 13.1.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 +16 -0
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +32 -37
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/execute.d.ts.map +1 -1
- package/build/lib/mixins/execute.js +14 -12
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/misc.d.ts +7 -0
- package/build/lib/mixins/misc.d.ts.map +1 -1
- package/build/lib/mixins/misc.js +21 -0
- package/build/lib/mixins/misc.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +9 -96
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/protocol/index.d.ts +3 -1
- package/build/lib/protocol/index.d.ts.map +1 -1
- package/build/lib/protocol/index.js +22 -23
- package/build/lib/protocol/index.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +1 -0
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +1 -0
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/index.d.ts +1 -2
- package/build/lib/rpc/index.d.ts.map +1 -1
- package/build/lib/rpc/index.js +1 -36
- package/build/lib/rpc/index.js.map +1 -1
- package/build/lib/rpc/remote-messages.d.ts +24 -18
- package/build/lib/rpc/remote-messages.d.ts.map +1 -1
- package/build/lib/rpc/remote-messages.js +24 -11
- package/build/lib/rpc/remote-messages.js.map +1 -1
- package/build/lib/rpc/rpc-client-real-device.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-real-device.js +1 -3
- package/build/lib/rpc/rpc-client-real-device.js.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.js +1 -3
- package/build/lib/rpc/rpc-client-simulator.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts +63 -44
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +209 -122
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/lib/rpc/rpc-message-handler.d.ts +8 -5
- package/build/lib/rpc/rpc-message-handler.d.ts.map +1 -1
- package/build/lib/rpc/rpc-message-handler.js +61 -75
- package/build/lib/rpc/rpc-message-handler.js.map +1 -1
- package/build/lib/types.d.ts +28 -3
- package/build/lib/types.d.ts.map +1 -1
- package/build/lib/utils.d.ts +4 -3
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +4 -2
- package/build/lib/utils.js.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/mixins/connect.js +34 -38
- package/lib/mixins/execute.js +15 -12
- package/lib/mixins/misc.js +22 -0
- package/lib/mixins/navigate.js +11 -99
- package/lib/protocol/index.js +22 -24
- package/lib/remote-debugger.ts +1 -0
- package/lib/rpc/index.js +1 -3
- package/lib/rpc/remote-messages.js +28 -11
- package/lib/rpc/rpc-client-real-device.js +1 -3
- package/lib/rpc/rpc-client-simulator.js +1 -3
- package/lib/rpc/rpc-client.js +244 -133
- package/lib/rpc/rpc-message-handler.js +62 -74
- package/lib/types.ts +33 -3
- package/lib/utils.js +4 -2
- package/package.json +2 -1
- package/build/lib/rpc/constants.d.ts +0 -2
- package/build/lib/rpc/constants.d.ts.map +0 -1
- package/build/lib/rpc/constants.js +0 -5
- package/build/lib/rpc/constants.js.map +0 -1
- package/lib/rpc/constants.js +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,19 @@
|
|
|
1
|
+
## [13.1.0](https://github.com/appium/appium-remote-debugger/compare/v13.0.0...v13.1.0) (2025-07-12)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Add a helper method to verify if javascript execution is blocked ([#431](https://github.com/appium/appium-remote-debugger/issues/431)) ([5c9ea37](https://github.com/appium/appium-remote-debugger/commit/5c9ea3710b186f258759e4e8c38f6a2183316b78))
|
|
6
|
+
|
|
7
|
+
## [13.0.0](https://github.com/appium/appium-remote-debugger/compare/v12.2.10...v13.0.0) (2025-07-10)
|
|
8
|
+
|
|
9
|
+
### ⚠ BREAKING CHANGES
|
|
10
|
+
|
|
11
|
+
* Removed the obsolete ON_TARGET_PROVISIONED_EVENT exported constant
|
|
12
|
+
|
|
13
|
+
### Code Refactoring
|
|
14
|
+
|
|
15
|
+
* Introduce pauseOnStart for targets creation ([#430](https://github.com/appium/appium-remote-debugger/issues/430)) ([92668b4](https://github.com/appium/appium-remote-debugger/commit/92668b4f288991e624efa4a479f2f25bdec2c7f9))
|
|
16
|
+
|
|
1
17
|
## [12.2.10](https://github.com/appium/appium-remote-debugger/compare/v12.2.9...v12.2.10) (2025-07-05)
|
|
2
18
|
|
|
3
19
|
### Bug Fixes
|
|
@@ -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":"AAiCA;;;;GAIG;AACH,qFAFa,OAAO,CAAC,IAAI,CAAC,CAQzB;AAED;;;;;GAKG;AACH,qFAHW,MAAM,GACJ,OAAO,CAAC,OAAO,UAAU,EAAE,OAAO,CAAC,CAgD/C;AAED;;;;GAIG;AACH,+EAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;;;;GAOG;AACH,0FALW,MAAM,OAAC,aACP,MAAM,wBACN,OAAO,GACL,OAAO,CAAC,OAAO,UAAU,EAAE,IAAI,EAAE,CAAC,CAuC9C;AAED;;;;;;;GAOG;AACH,wFALW,OAAO,UAAU,EAAE,QAAQ,aAC3B,OAAO,UAAU,EAAE,SAAS,mBAC5B,OAAO,GACL,OAAO,CAAC,IAAI,CAAC,CAkBzB;AA2HD;;;;;;;GAOG;AACH,yGAHW,MAAM,EAAE,GACN,MAAM,EAAE,CAoDpB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
|
|
@@ -15,6 +15,7 @@ const support_1 = require("@appium/support");
|
|
|
15
15
|
const asyncbox_1 = require("asyncbox");
|
|
16
16
|
const lodash_1 = __importDefault(require("lodash"));
|
|
17
17
|
const property_accessors_1 = require("./property-accessors");
|
|
18
|
+
const rpc_client_1 = require("../rpc/rpc-client");
|
|
18
19
|
const APP_CONNECT_TIMEOUT_MS = 0;
|
|
19
20
|
const APP_CONNECT_INTERVAL_MS = 100;
|
|
20
21
|
const SELECT_APP_RETRIES = 20;
|
|
@@ -104,45 +105,37 @@ async function disconnect() {
|
|
|
104
105
|
*/
|
|
105
106
|
async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignoreAboutBlankUrl = false) {
|
|
106
107
|
this.log.debug('Selecting application');
|
|
107
|
-
const
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
108
|
+
const timer = new support_1.timing.Timer().start();
|
|
109
|
+
if (lodash_1.default.isEmpty((0, property_accessors_1.getAppDict)(this))) {
|
|
110
|
+
this.log.debug('No applications currently connected.');
|
|
111
|
+
return [];
|
|
112
|
+
}
|
|
113
|
+
const { appIdKey } = await searchForApp.bind(this)(currentUrl, maxTries, ignoreAboutBlankUrl);
|
|
114
|
+
if ((0, property_accessors_1.getAppIdKey)(this) !== appIdKey) {
|
|
115
|
+
this.log.debug(`Received altered app id, updating from '${(0, property_accessors_1.getAppIdKey)(this)}' to '${appIdKey}'`);
|
|
116
|
+
(0, property_accessors_1.setAppIdKey)(this, appIdKey);
|
|
117
|
+
}
|
|
118
|
+
logApplicationDictionary.bind(this)();
|
|
119
|
+
// translate the dictionary into a useful form, and return to sender
|
|
120
|
+
this.log.debug(`Finally selecting app ${(0, property_accessors_1.getAppIdKey)(this)}`);
|
|
121
|
+
/** @type {import('../types').Page[]} */
|
|
122
|
+
const fullPageArray = [];
|
|
123
|
+
for (const [app, info] of lodash_1.default.toPairs((0, property_accessors_1.getAppDict)(this))) {
|
|
124
|
+
if (!lodash_1.default.isArray(info.pageArray) || !info.isActive) {
|
|
125
|
+
continue;
|
|
120
126
|
}
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
continue;
|
|
129
|
-
}
|
|
130
|
-
const id = app.replace('PID:', '');
|
|
131
|
-
for (const page of info.pageArray) {
|
|
132
|
-
if (!(ignoreAboutBlankUrl && page.url === BLANK_PAGE_URL)) {
|
|
133
|
-
const pageDict = lodash_1.default.clone(page);
|
|
134
|
-
pageDict.id = `${id}.${pageDict.id}`;
|
|
135
|
-
pageDict.bundleId = info.bundleId;
|
|
136
|
-
fullPageArray.push(pageDict);
|
|
137
|
-
}
|
|
127
|
+
const id = app.replace('PID:', '');
|
|
128
|
+
for (const page of info.pageArray) {
|
|
129
|
+
if (!(ignoreAboutBlankUrl && page.url === BLANK_PAGE_URL)) {
|
|
130
|
+
const pageDict = lodash_1.default.clone(page);
|
|
131
|
+
pageDict.id = `${id}.${pageDict.id}`;
|
|
132
|
+
pageDict.bundleId = info.bundleId;
|
|
133
|
+
fullPageArray.push(pageDict);
|
|
138
134
|
}
|
|
139
135
|
}
|
|
140
|
-
this.log.debug(`Selected app after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
141
|
-
return fullPageArray;
|
|
142
|
-
}
|
|
143
|
-
finally {
|
|
144
|
-
rpcClient.shouldCheckForTarget = shouldCheckForTarget;
|
|
145
136
|
}
|
|
137
|
+
this.log.debug(`Selected app after ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
138
|
+
return fullPageArray;
|
|
146
139
|
}
|
|
147
140
|
/**
|
|
148
141
|
*
|
|
@@ -213,8 +206,10 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
213
206
|
}
|
|
214
207
|
}
|
|
215
208
|
catch (err) {
|
|
216
|
-
|
|
217
|
-
|
|
209
|
+
if (![rpc_client_1.NEW_APP_CONNECTED_ERROR, rpc_client_1.EMPTY_PAGE_DICTIONARY_ERROR].some((msg) => msg === err.message)) {
|
|
210
|
+
this.log.debug(err.stack);
|
|
211
|
+
}
|
|
212
|
+
this.log.warn(`The application ${attemptedAppIdKey} is not connectable yet: ${err.message}`);
|
|
218
213
|
}
|
|
219
214
|
}
|
|
220
215
|
retryCount++;
|
|
@@ -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":";;;;;AAsCA,4CAMC;AAQD,0BA8CC;AAOD,gCAIC;AAUD,8BAqCC;AAUD,gCAgBC;AAmID,gEAkDC;AA3WD,oCAIkB;AAClB,qCAAkC;AAClC,6CAA+C;AAC/C,uCAA2D;AAC3D,oDAAuB;AACvB,6DAU8B;AAC9B,kDAAyF;AAEzF,MAAM,sBAAsB,GAAG,CAAC,CAAC;AACjC,MAAM,uBAAuB,GAAG,GAAG,CAAC;AACpC,MAAM,kBAAkB,GAAG,EAAE,CAAC;AAC9B,MAAM,yBAAyB,GAAG,GAAG,CAAC;AACtC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAClD,MAAM,cAAc,GAAG,aAAa,CAAC;AACrC,MAAM,6BAA6B,GAAG,qCAAqC,CAAC;AAC5E,MAAM,6BAA6B,GAAG,2BAA2B,CAAC;AAClE,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAC5D,MAAM,kBAAkB,GAAG,GAAG,CAAC;AAE/B;;;;GAIG;AACI,KAAK,UAAU,gBAAgB;IACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,CAAC,CAAC;IAEjD,oDAAoD;IACpD,sDAAsD;IACtD,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,EAAE,EAAE,KAAK,CAAC,CAAC;AACpE,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,OAAO,CAAE,OAAO,GAAG,sBAAsB;IAC7D,IAAI,CAAC,KAAK,EAAE,CAAC;IAEb,4BAA4B;IAC5B,IAAI,CAAC,aAAa,EAAE,CAAC;IAErB,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,EAAE,CAAC;IAE1C,yCAAyC;IACzC,SAAS,CAAC,EAAE,CAAC,mBAAmB,EAAE,gBAAC,CAAC,IAAI,CAAC,CAAC;IAC1C,SAAS,CAAC,EAAE,CAAC,yBAAyB,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACtE,SAAS,CAAC,EAAE,CAAC,sCAAsC,EAAE,IAAI,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACjG,SAAS,CAAC,EAAE,CAAC,4BAA4B,EAAE,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACzE,SAAS,CAAC,EAAE,CAAC,+BAA+B,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAC/E,SAAS,CAAC,EAAE,CAAC,0BAA0B,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACtE,SAAS,CAAC,EAAE,CAAC,iCAAiC,EAAE,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACvF,SAAS,CAAC,EAAE,CAAC,0BAA0B,EAAE,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IACzE,SAAS,CAAC,EAAE,CAAC,oBAAoB,EAAE,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;IAElE,MAAM,SAAS,CAAC,OAAO,EAAE,CAAC;IAE1B,+CAA+C;IAC/C,IAAI,CAAC;QACH,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC9B,IAAI,OAAO,EAAE,CAAC;YACZ,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;YACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,OAAO,oCAAoC,CAAC,CAAC;YAC7E,IAAI,CAAC;gBACH,MAAM,IAAA,2BAAgB,EAAC,GAAG,EAAE,CAAC,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE;oBACzD,MAAM,EAAE,OAAO;oBACf,UAAU,EAAE,uBAAuB;iBACpC,CAAC,CAAC;gBACH,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,aAAa,cAAI,CAAC,SAAS,CAAC,aAAa,EAAE,gBAAC,CAAC,IAAI,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,IAAI,CAAC,GAAG;oBAC7E,UAAU,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAC5D,CAAC;YACJ,CAAC;YAAC,MAAM,CAAC;gBACP,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mDAAmD,CAAC,CAAC;YACtE,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;QAC/D,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QACxB,MAAM,GAAG,CAAC;IACZ,CAAC;AACH,CAAC;AAED;;;;GAIG;AACI,KAAK,UAAU,UAAU;IAC9B,MAAM,IAAA,iCAAY,EAAC,IAAI,CAAC,EAAE,UAAU,EAAE,CAAC;IACvC,IAAI,CAAC,IAAI,CAAC,eAAM,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;IACzC,IAAI,CAAC,QAAQ,EAAE,CAAC;AAClB,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,SAAS,CAAE,UAAU,GAAG,IAAI,EAAE,QAAQ,GAAG,kBAAkB,EAAE,mBAAmB,GAAG,KAAK;IAC5G,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;IAExC,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;IACzC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAChC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sCAAsC,CAAC,CAAC;QACvD,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IAC9F,IAAI,IAAA,gCAAW,EAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,IAAA,gCAAW,EAAC,IAAI,CAAC,SAAS,QAAQ,GAAG,CAAC,CAAC;QACjG,IAAA,gCAAW,EAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IAC9B,CAAC;IACD,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACtC,oEAAoE;IACpE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,yBAAyB,IAAA,gCAAW,EAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAE7D,wCAAwC;IACxC,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACjD,SAAS;QACX,CAAC;QACD,MAAM,EAAE,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC;QACnC,KAAK,MAAM,IAAI,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;YAClC,IAAI,CAAC,CAAC,mBAAmB,IAAI,IAAI,CAAC,GAAG,KAAK,cAAc,CAAC,EAAE,CAAC;gBAC1D,MAAM,QAAQ,GAAG,gBAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBAC/B,QAAQ,CAAC,EAAE,GAAG,GAAG,EAAE,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACrC,QAAQ,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;gBAClC,aAAa,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YAC/B,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,sBAAsB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;IACxF,OAAO,aAAa,CAAC;AACvB,CAAC;AAED;;;;;;;GAOG;AACI,KAAK,UAAU,UAAU,CAAE,QAAQ,EAAE,SAAS,EAAE,cAAc,GAAG,KAAK;IAC3E,MAAM,YAAY,GAAG,gBAAC,CAAC,UAAU,CAAC,GAAG,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,QAAQ,EAAE,CAAC,CAAC,CAAC,OAAO,QAAQ,EAAE,CAAC;IAC7F,IAAA,gCAAW,EAAC,IAAI,EAAE,YAAY,CAAC,CAAC;IAChC,IAAA,iCAAY,EAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAE9B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,SAAS,aAAa,YAAY,+BAA+B,CAAC,CAAC;IAErG,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;IAEzC,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,SAAS,CAAC,CAAC;IAElE,IAAI,CAAC,cAAc,IAAI,CAAC,MAAM,IAAI,CAAC,gBAAgB,EAAE,EAAE,CAAC;QACtD,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IAC1B,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3F,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,YAAY,CAAE,UAAU,EAAE,QAAQ,EAAE,mBAAmB;IACpE,uBAAuB;IACvB,MAAM,SAAS,GAAG,gBAAC,CAAC,OAAO,CACzB;QACE,IAAA,gCAAW,EAAC,IAAI,CAAC;QACjB,GAAG,CAAC,IAAA,2CAAsB,EAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACvC,GAAG,CAAC,IAAA,qCAAgB,EAAC,IAAI,CAAC,IAAI,CAAC,IAAA,gCAAW,EAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;KAC5E,CACF,CAAC;IACF,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO,yCAAyC,CAAC,CAAC,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,yBAAyB,EAAE,KAAK,IAAI,EAAE;QACpH,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,uBAAuB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;QAClG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,UAAU,GAAG,CAAC,OAAO,QAAQ,GAAG,CAAC,CAAC;QACxH,KAAK,MAAM,iBAAiB,IAAI,cAAc,EAAE,CAAC;YAC/C,MAAM,OAAO,GAAG,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,iBAAiB,CAAC,CAAC;YACpD,IAAI,CAAC,OAAO,EAAE,CAAC;gBACb,SAAS;YACX,CAAC;YACD,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,CAAC,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,QAAQ,KAAK,gBAAgB,CAAC,EAAE,CAAC;gBACjG,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,iBAAiB,iBAAiB,uBAAuB,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,EAAE,CACnG,CAAC;gBACF,SAAS;YACX,CAAC;YAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,iBAAiB,GAAG,CAAC,CAAC;YACxD,IAAI,CAAC;gBACH,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;gBAExF,mCAAmC;gBACnC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,SAAS,GAAG,IAAA,yBAAiB,EAAC,QAAQ,CAAC,CAAC;gBAEnE,uDAAuD;gBACvD,uDAAuD;gBACvD,mCAAmC;gBACnC,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,EAAE,UAAU,EAAE,mBAAmB,CAAC,CAAC;gBAC3F,IAAI,MAAM,EAAE,CAAC;oBACX,OAAO,MAAM,CAAC;gBAChB,CAAC;gBAED,IAAI,UAAU,EAAE,CAAC;oBACf,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,oCAAoC,UAAU,iCAAiC,CAAC,CAAC;gBAClG,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,CAAC,oCAAuB,EAAE,wCAA2B,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;oBAC/F,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,mBAAmB,iBAAiB,4BAA4B,GAAG,CAAC,OAAO,EAAE,CAAC,CAAC;YAC/F,CAAC;QACH,CAAC;QACD,UAAU,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;IACJ,CAAC,CAAC,CAAC,CAAC;AACN,CAAC;AAED;;;;;;;GAOG;AACH,SAAS,aAAa,CAAE,QAAQ,EAAE,UAAU,GAAG,IAAI,EAAE,mBAAmB,GAAG,KAAK;IAC9E,KAAK,MAAM,OAAO,IAAI,gBAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC;QACzC,IAAI,CAAC,OAAO,IAAI,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,OAAO,CAAC,SAAS,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;YACxF,SAAS;QACX,CAAC;QAED,KAAK,MAAM,IAAI,IAAI,OAAO,CAAC,SAAS,EAAE,CAAC;YACrC,IAAI,CAAC,CAAC,mBAAmB,IAAI,IAAI,CAAC,GAAG,KAAK,cAAc,CAAC;gBACrD,CAAC,CAAC,UAAU,IAAI,IAAI,CAAC,GAAG,KAAK,UAAU,IAAI,IAAI,CAAC,GAAG,KAAK,GAAG,UAAU,GAAG,CAAC,EAAE,CAAC;gBAC9E,OAAO;oBACL,QAAQ,EAAE,OAAO,CAAC,EAAE;oBACpB,QAAQ,EAAE,IAAI;iBACf,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED;;;GAGG;AACH,SAAS,wBAAwB;IAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;IAClD,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QACtD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,GAAG,GAAG,CAAC,CAAC;QAC5C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;YAC3C,IAAI,GAAG,KAAK,WAAW,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBAChE,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,GAAG,CAAC,CAAC;gBAClC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;oBACzB,IAAI,MAAM,GAAG,IAAI,CAAC;oBAClB,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC;wBACrC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,aAAa,MAAM,GAAG,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;wBAChE,MAAM,GAAG,IAAI,CAAC;oBAChB,CAAC;gBACH,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,WAAW,GAAG,gBAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;gBAC/E,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,WAAW,GAAG,KAAK,WAAW,EAAE,CAAC,CAAC;YACnD,CAAC;QACH,CAAC;IACH,CAAC;AACH,CAAC;AAED;;;;;;;GAOG;AACH,SAAgB,0BAA0B,CAAC,SAAS;IAClD,MAAM,OAAO,GAAG,IAAA,+BAAU,EAAC,IAAI,CAAC,CAAC;IAEjC,IAAI,SAAS,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE,CAAC;QAC3C,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,wFAAwF,CACzF,CAAC;QACF,OAAO,gBAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACzB,CAAC;IAED,6CAA6C;IAC7C,MAAM,iBAAiB,GAAG,gBAAC,CAAC,IAAI,CAAC;QAC/B,6BAAqB;QACrB,6BAA6B;QAC7B,6BAA6B;QAC7B,qBAAqB;QACrB,GAAG,SAAS;KACb,CAAC,CAAC;IACH,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,uDAAuD,iBAAiB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CACtF,CAAC;IACF,uBAAuB;IACvB,MAAM,aAAa,GAAG,EAAE,CAAC;IACzB,KAAK,MAAM,QAAQ,IAAI,iBAAiB,EAAE,CAAC;QACzC,sEAAsE;QACtE,KAAK,MAAM,KAAK,IAAI,IAAA,uBAAe,EAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;YACvD,IAAI,aAAa,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;gBAClC,SAAS;YACX,CAAC;YAED,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;YAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qBAAqB,KAAK,iBAAiB,QAAQ,GAAG,CAAC,CAAC;YACvE,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,gBAAC,CAAC,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC7C,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;oBAC1E,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,4BAA4B,IAAI,CAAC,QAAQ,IAAI;wBAC7C,wBAAwB,QAAQ,mBAAmB,GAAG,GAAG,CAC1D,CAAC;oBACF,aAAa,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC1B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,8EAA8E;QAC9E,iFAAiF,CAClF,CAAC;IAEF,OAAO,gBAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED;;GAEG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"AAqBA;;;;;;;;GAQG;AACH,qFALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAQxB;AAED;;;;;;GAMG;AACH,0FALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAoFxB;AAED;;;;;GAKG;AACH,oFAJW,MAAM,aACN,OAAO,GACL,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"AAqBA;;;;;;;;GAQG;AACH,qFALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAQxB;AAED;;;;;;GAMG;AACH,0FALW,MAAM,SACN,GAAG,EAAE,WACL,MAAM,EAAE,GACN,OAAO,CAAC,GAAG,CAAC,CAoFxB;AAED;;;;;GAKG;AACH,oFAJW,MAAM,aACN,OAAO,GACL,OAAO,CAAC,GAAG,CAAC,CA+BxB;AAED;;;;;GAKG;AACH,0FAJW,MAAM,MACN,GAAG,SACH,GAAG,EAAE,gBAuBf;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
|
|
@@ -130,21 +130,23 @@ async function execute(command, override) {
|
|
|
130
130
|
this.log.debug('Trying to execute but page is not loaded.');
|
|
131
131
|
await this.waitForDom();
|
|
132
132
|
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
throw new Error('Missing parameter: pageIdKey. Is the target web page still alive?');
|
|
138
|
-
}
|
|
133
|
+
const { appIdKey, pageIdKey } = (0, utils_1.checkParams)({
|
|
134
|
+
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
135
|
+
pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
|
|
136
|
+
});
|
|
139
137
|
if ((0, property_accessors_1.getGarbageCollectOnExecute)(this)) {
|
|
140
138
|
await this.garbageCollect();
|
|
141
139
|
}
|
|
140
|
+
const rpcClient = this.requireRpcClient(true);
|
|
141
|
+
await rpcClient.waitForPageInitialization(
|
|
142
|
+
/** @type {import('../types').AppIdKey} */ (appIdKey),
|
|
143
|
+
/** @type {import('../types').PageIdKey} */ (pageIdKey));
|
|
142
144
|
this.log.debug(`Sending javascript command: '${lodash_1.default.truncate(command, { length: 50 })}'`);
|
|
143
|
-
const res = await
|
|
145
|
+
const res = await rpcClient.send('Runtime.evaluate', {
|
|
144
146
|
expression: command,
|
|
145
147
|
returnByValue: true,
|
|
146
|
-
appIdKey
|
|
147
|
-
pageIdKey
|
|
148
|
+
appIdKey,
|
|
149
|
+
pageIdKey,
|
|
148
150
|
});
|
|
149
151
|
return (0, utils_1.convertResult)(res);
|
|
150
152
|
}
|
|
@@ -155,7 +157,7 @@ async function execute(command, override) {
|
|
|
155
157
|
* @param {any[]} [args]
|
|
156
158
|
*/
|
|
157
159
|
async function callFunction(objectId, fn, args) {
|
|
158
|
-
(0, utils_1.checkParams)({
|
|
160
|
+
const { appIdKey, pageIdKey } = (0, utils_1.checkParams)({
|
|
159
161
|
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
160
162
|
pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
|
|
161
163
|
});
|
|
@@ -168,8 +170,8 @@ async function callFunction(objectId, fn, args) {
|
|
|
168
170
|
functionDeclaration: fn,
|
|
169
171
|
arguments: args,
|
|
170
172
|
returnByValue: true,
|
|
171
|
-
appIdKey
|
|
172
|
-
pageIdKey
|
|
173
|
+
appIdKey,
|
|
174
|
+
pageIdKey,
|
|
173
175
|
});
|
|
174
176
|
return (0, utils_1.convertResult)(res);
|
|
175
177
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":";;;;;AA8BA,kCAMC;AASD,4CAkFC;AAQD,
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"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"}
|
|
@@ -20,6 +20,13 @@ export function stopTimeline(this: import("../remote-debugger").RemoteDebugger):
|
|
|
20
20
|
* @returns {Promise<any>}
|
|
21
21
|
*/
|
|
22
22
|
export function overrideUserAgent(this: import("../remote-debugger").RemoteDebugger, value: string): Promise<any>;
|
|
23
|
+
/**
|
|
24
|
+
* @this {RemoteDebugger}
|
|
25
|
+
* @param {number} [timeoutMs=1000] The maximum amount of milliseconds to wait for
|
|
26
|
+
* a javascript command response
|
|
27
|
+
* @returns {Promise<boolean>} Whether the current page responds to javascript commands
|
|
28
|
+
*/
|
|
29
|
+
export function isJavascriptExecutionBlocked(this: import("../remote-debugger").RemoteDebugger, timeoutMs?: number): Promise<boolean>;
|
|
23
30
|
/**
|
|
24
31
|
* @this {RemoteDebugger}
|
|
25
32
|
* @param {number} [timeoutMs=GARBAGE_COLLECT_TIMEOUT_MS]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/mixins/misc.js"],"names":[],"mappings":"AAUA;;;GAGG;AACH,iFAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;GAIG;AACH,qFAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,GAAG,CAAC,CAQxB;AAGD;;;;GAIG;AACH,4FAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;GAIG;AACH,8FAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CA8BzB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/mixins/misc.js"],"names":[],"mappings":"AAUA;;;GAGG;AACH,iFAFa,OAAO,CAAC,IAAI,CAAC,CAMzB;AAED;;;;GAIG;AACH,qFAHW,OAAO,UAAU,EAAE,aAAa,GAC9B,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;GAGG;AACH,iFAFa,OAAO,CAAC,GAAG,CAAC,CAQxB;AAGD;;;;GAIG;AACH,4FAHW,MAAM,GACJ,OAAO,CAAC,GAAG,CAAC,CASxB;AAED;;;;;GAKG;AACH,4GAJW,MAAM,GAEJ,OAAO,CAAC,OAAO,CAAC,CAgB5B;AAED;;;;GAIG;AACH,8FAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CA8BzB;6BAGY,OAAO,oBAAoB,EAAE,cAAc"}
|
package/build/lib/mixins/misc.js
CHANGED
|
@@ -37,6 +37,7 @@ exports.launchSafari = launchSafari;
|
|
|
37
37
|
exports.startTimeline = startTimeline;
|
|
38
38
|
exports.stopTimeline = stopTimeline;
|
|
39
39
|
exports.overrideUserAgent = overrideUserAgent;
|
|
40
|
+
exports.isJavascriptExecutionBlocked = isJavascriptExecutionBlocked;
|
|
40
41
|
exports.garbageCollect = garbageCollect;
|
|
41
42
|
const utils_1 = require("../utils");
|
|
42
43
|
const bluebird_1 = __importStar(require("bluebird"));
|
|
@@ -90,6 +91,26 @@ async function overrideUserAgent(value) {
|
|
|
90
91
|
value,
|
|
91
92
|
});
|
|
92
93
|
}
|
|
94
|
+
/**
|
|
95
|
+
* @this {RemoteDebugger}
|
|
96
|
+
* @param {number} [timeoutMs=1000] The maximum amount of milliseconds to wait for
|
|
97
|
+
* a javascript command response
|
|
98
|
+
* @returns {Promise<boolean>} Whether the current page responds to javascript commands
|
|
99
|
+
*/
|
|
100
|
+
async function isJavascriptExecutionBlocked(timeoutMs = 1000) {
|
|
101
|
+
try {
|
|
102
|
+
await bluebird_1.default.resolve(this.requireRpcClient().send('Runtime.evaluate', {
|
|
103
|
+
expression: '1+1;',
|
|
104
|
+
returnByValue: true,
|
|
105
|
+
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
106
|
+
pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
|
|
107
|
+
})).timeout(timeoutMs);
|
|
108
|
+
return false;
|
|
109
|
+
}
|
|
110
|
+
catch {
|
|
111
|
+
return true;
|
|
112
|
+
}
|
|
113
|
+
}
|
|
93
114
|
/**
|
|
94
115
|
* @this {RemoteDebugger}
|
|
95
116
|
* @param {number} [timeoutMs=GARBAGE_COLLECT_TIMEOUT_MS]
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../lib/mixins/misc.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAcA,oCAIC;AAOD,sCAOC;AAMD,oCAMC;AAQD,8CAOC;AAOD,wCA4BC;
|
|
1
|
+
{"version":3,"file":"misc.js","sourceRoot":"","sources":["../../../lib/mixins/misc.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"navigate.d.ts","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"AA4BA;;;GAGG;AACH,kFAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,mFAFa,IAAI,CAMhB;AAED;;;;;;;GAOG;AACH,sGAHW,MAAM,GACJ,OAAO,CAenB;AAED;;;;GAIG;AACH,mGAHW,MAAM,CAAC,KAAK,OAAC,GACX,OAAO,CAAC,IAAI,CAAC,CAgEzB;AAED;;;;GAIG;AACH,gGAHW,MAAM,GACJ,OAAO,CAAC,OAAO,CAAC,CAkB5B;AAED;;;;GAIG;AACH,iFAHW,MAAM,GACJ,OAAO,CAAC,IAAI,CAAC,CAwFzB;AA5OD,uDAA2D;6BA+O9C,OAAO,oBAAoB,EAAE,cAAc;uBA7P3B,iBAAiB"}
|
|
@@ -48,13 +48,9 @@ const events_1 = require("./events");
|
|
|
48
48
|
const support_1 = require("@appium/support");
|
|
49
49
|
const lodash_1 = __importDefault(require("lodash"));
|
|
50
50
|
const bluebird_1 = __importStar(require("bluebird"));
|
|
51
|
-
const base_driver_1 = require("@appium/base-driver");
|
|
52
|
-
const rpc_1 = require("../rpc");
|
|
53
51
|
const property_accessors_1 = require("./property-accessors");
|
|
54
52
|
exports.DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
|
|
55
53
|
const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
56
|
-
const PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS = 1000;
|
|
57
|
-
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
|
|
58
54
|
/**
|
|
59
55
|
* pageLoadStrategy in WebDriver definitions.
|
|
60
56
|
*/
|
|
@@ -169,9 +165,6 @@ async function waitForDom(startPageLoadTimer) {
|
|
|
169
165
|
* @returns {Promise<boolean>}
|
|
170
166
|
*/
|
|
171
167
|
async function checkPageIsReady(timeoutMs) {
|
|
172
|
-
(0, utils_1.checkParams)({
|
|
173
|
-
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
174
|
-
});
|
|
175
168
|
const readyCmd = 'document.readyState;';
|
|
176
169
|
const actualTimeoutMs = timeoutMs ?? (0, property_accessors_1.getPageReadyTimeout)(this);
|
|
177
170
|
try {
|
|
@@ -195,9 +188,10 @@ async function checkPageIsReady(timeoutMs) {
|
|
|
195
188
|
* @returns {Promise<void>}
|
|
196
189
|
*/
|
|
197
190
|
async function navToUrl(url) {
|
|
198
|
-
const appIdKey = (0,
|
|
199
|
-
|
|
200
|
-
|
|
191
|
+
const { appIdKey, pageIdKey } = (0, utils_1.checkParams)({
|
|
192
|
+
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
193
|
+
pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
|
|
194
|
+
});
|
|
201
195
|
const rpcClient = this.requireRpcClient();
|
|
202
196
|
try {
|
|
203
197
|
new URL(url);
|
|
@@ -205,42 +199,23 @@ async function navToUrl(url) {
|
|
|
205
199
|
catch {
|
|
206
200
|
throw new TypeError(`'${url}' is not a valid URL`);
|
|
207
201
|
}
|
|
208
|
-
(0, property_accessors_1.setNavigatingToPage)(this, true);
|
|
209
202
|
this.log.debug(`Navigating to new URL: '${url}'`);
|
|
203
|
+
(0, property_accessors_1.setNavigatingToPage)(this, true);
|
|
204
|
+
await rpcClient.waitForPageInitialization(
|
|
205
|
+
/** @type {import('../types').AppIdKey} */ (appIdKey),
|
|
206
|
+
/** @type {import('../types').PageIdKey} */ (pageIdKey));
|
|
210
207
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
211
208
|
/** @type {(() => void)|undefined} */
|
|
212
209
|
let onPageLoaded;
|
|
213
|
-
/** @type {(() => void)|undefined} */
|
|
214
|
-
let onPageChanged;
|
|
215
|
-
/** @type {(() => void)|undefined} */
|
|
216
|
-
let onTargetProvisioned;
|
|
217
210
|
/** @type {NodeJS.Timeout|undefined|null} */
|
|
218
211
|
let onPageLoadedTimeout;
|
|
219
212
|
(0, property_accessors_1.setPageLoadDelay)(this, support_1.util.cancellableDelay(readinessTimeoutMs));
|
|
220
213
|
(0, property_accessors_1.setPageLoading)(this, true);
|
|
221
214
|
let isPageLoading = true;
|
|
222
|
-
|
|
223
|
-
/** @type {Promise<void>|null} */
|
|
224
|
-
let pageReadinessCheckPromise = null;
|
|
215
|
+
// /** @type {Promise<void>|null} */
|
|
225
216
|
const start = new support_1.timing.Timer().start();
|
|
226
217
|
/** @type {B<void>} */
|
|
227
218
|
const pageReadinessPromise = new bluebird_1.default((resolve) => {
|
|
228
|
-
const performPageReadinessCheck = async () => {
|
|
229
|
-
while (isPageLoading) {
|
|
230
|
-
const pageReadyCheckStart = new support_1.timing.Timer().start();
|
|
231
|
-
try {
|
|
232
|
-
const isReady = await this.checkPageIsReady(PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS);
|
|
233
|
-
if (isReady && isPageLoading && onPageLoaded) {
|
|
234
|
-
return onPageLoaded();
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
catch { }
|
|
238
|
-
const msLeft = PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS - pageReadyCheckStart.getDuration().asMilliSeconds;
|
|
239
|
-
if (msLeft > 0 && isPageLoading) {
|
|
240
|
-
await bluebird_1.default.delay(msLeft);
|
|
241
|
-
}
|
|
242
|
-
}
|
|
243
|
-
};
|
|
244
219
|
onPageLoadedTimeout = setTimeout(() => {
|
|
245
220
|
if (isPageLoading) {
|
|
246
221
|
isPageLoading = false;
|
|
@@ -258,51 +233,10 @@ async function navToUrl(url) {
|
|
|
258
233
|
clearTimeout(onPageLoadedTimeout);
|
|
259
234
|
onPageLoadedTimeout = null;
|
|
260
235
|
}
|
|
261
|
-
didPageFinishLoad = true;
|
|
262
236
|
return resolve();
|
|
263
237
|
};
|
|
264
|
-
// Sometimes it could be observed that we do not receive
|
|
265
|
-
// any events for target provisioning while navigating to a new page,
|
|
266
|
-
// but only events related to the page change.
|
|
267
|
-
// So lets just start the monitoring loop as soon as any of these events arrives
|
|
268
|
-
// for the target page.
|
|
269
|
-
onPageChanged = async (
|
|
270
|
-
/** @type {Error|null} */ err,
|
|
271
|
-
/** @type {string} */ _appIdKey,
|
|
272
|
-
/** @type {import("@appium/types").StringRecord} */ pageDict) => {
|
|
273
|
-
if (_appIdKey !== appIdKey) {
|
|
274
|
-
return;
|
|
275
|
-
}
|
|
276
|
-
/** @type {import('../types').Page|undefined} */
|
|
277
|
-
const targetPage = (0, utils_1.pageArrayFromDict)(pageDict)
|
|
278
|
-
.find(({ id }) => parseInt(`${id}`, 10) === parseInt(`${pageIdKey}`, 10));
|
|
279
|
-
if (targetPage?.url === url) {
|
|
280
|
-
this.log.debug(`The page ${targetPage.id} has the expected URL ${url}`);
|
|
281
|
-
if (pageReadinessCheckPromise) {
|
|
282
|
-
this.log.debug('Page readiness monitoring is already running');
|
|
283
|
-
}
|
|
284
|
-
else {
|
|
285
|
-
this.log.debug('Monitoring page readiness');
|
|
286
|
-
pageReadinessCheckPromise = performPageReadinessCheck();
|
|
287
|
-
await pageReadinessCheckPromise;
|
|
288
|
-
}
|
|
289
|
-
}
|
|
290
|
-
};
|
|
291
|
-
rpcClient.on('_rpc_forwardGetListing:', onPageChanged);
|
|
292
238
|
// https://chromedevtools.github.io/devtools-protocol/tot/Page/#event-loadEventFired
|
|
293
239
|
rpcClient.once('Page.loadEventFired', onPageLoaded);
|
|
294
|
-
onTargetProvisioned = async () => {
|
|
295
|
-
this.log.debug('The page target has been provisioned');
|
|
296
|
-
if (pageReadinessCheckPromise) {
|
|
297
|
-
this.log.debug('Page readiness monitoring is already running');
|
|
298
|
-
}
|
|
299
|
-
else {
|
|
300
|
-
this.log.debug('Monitoring page readiness');
|
|
301
|
-
pageReadinessCheckPromise = performPageReadinessCheck();
|
|
302
|
-
await pageReadinessCheckPromise;
|
|
303
|
-
}
|
|
304
|
-
};
|
|
305
|
-
rpcClient.targetSubscriptions.once(rpc_1.rpcConstants.ON_TARGET_PROVISIONED_EVENT, onTargetProvisioned);
|
|
306
240
|
rpcClient.send('Page.navigate', {
|
|
307
241
|
url,
|
|
308
242
|
appIdKey,
|
|
@@ -328,30 +262,9 @@ async function navToUrl(url) {
|
|
|
328
262
|
clearTimeout(onPageLoadedTimeout);
|
|
329
263
|
onPageLoadedTimeout = null;
|
|
330
264
|
}
|
|
331
|
-
if (onTargetProvisioned) {
|
|
332
|
-
rpcClient.targetSubscriptions.off(rpc_1.rpcConstants.ON_TARGET_PROVISIONED_EVENT, onTargetProvisioned);
|
|
333
|
-
}
|
|
334
265
|
if (onPageLoaded) {
|
|
335
266
|
rpcClient.off('Page.loadEventFired', onPageLoaded);
|
|
336
267
|
}
|
|
337
|
-
if (onPageChanged) {
|
|
338
|
-
rpcClient.off('_rpc_forwardGetListing:', onPageChanged);
|
|
339
|
-
}
|
|
340
|
-
}
|
|
341
|
-
// enable console logging, so we get the events (otherwise we only
|
|
342
|
-
// get notified when navigating to a local page
|
|
343
|
-
try {
|
|
344
|
-
await bluebird_1.default.resolve(rpcClient.send('Console.enable', {
|
|
345
|
-
appIdKey: (0, property_accessors_1.getAppIdKey)(this),
|
|
346
|
-
pageIdKey: (0, property_accessors_1.getPageIdKey)(this),
|
|
347
|
-
}, didPageFinishLoad)).timeout(CONSOLE_ENABLEMENT_TIMEOUT_MS);
|
|
348
|
-
}
|
|
349
|
-
catch (err) {
|
|
350
|
-
if (err instanceof bluebird_1.TimeoutError) {
|
|
351
|
-
throw new base_driver_1.errors.TimeoutError(`Could not enable console events after the page load within ` +
|
|
352
|
-
`${CONSOLE_ENABLEMENT_TIMEOUT_MS}ms. The Web Inspector/Safari may need to be restarted.`);
|
|
353
|
-
}
|
|
354
|
-
throw err;
|
|
355
268
|
}
|
|
356
269
|
}
|
|
357
270
|
/**
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,10 @@
|
|
|
3
3
|
* @param {string} id
|
|
4
4
|
* @param {string} method
|
|
5
5
|
* @param {import('../types').RemoteCommandOpts} opts
|
|
6
|
+
* @param {boolean} [direct=false] - if set to false then the resulting command params
|
|
7
|
+
* will be patched with default values
|
|
6
8
|
* @returns {import('../types').ProtocolCommandOpts}
|
|
7
9
|
*/
|
|
8
|
-
export function getProtocolCommand(id: string, method: string, opts: import("../types").RemoteCommandOpts): import("../types").ProtocolCommandOpts;
|
|
10
|
+
export function getProtocolCommand(id: string, method: string, opts: import("../types").RemoteCommandOpts, direct?: boolean): import("../types").ProtocolCommandOpts;
|
|
9
11
|
export default getProtocolCommand;
|
|
10
12
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/protocol/index.js"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../lib/protocol/index.js"],"names":[],"mappings":"AAwMA;;;;;;;;GAQG;AACH,uCAPW,MAAM,UACN,MAAM,QACN,OAAO,UAAU,EAAE,iBAAiB,WACpC,OAAO,GAEL,OAAO,UAAU,EAAE,mBAAmB,CA6BlD"}
|