appium-remote-debugger 15.0.1 → 15.0.2
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 +6 -0
- package/build/lib/mixins/events.js +1 -2
- package/build/lib/mixins/events.js.map +1 -1
- package/build/lib/mixins/execute.js +1 -1
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/navigate.js +1 -1
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/remote-debugger-real-device.js +1 -0
- package/build/lib/remote-debugger-real-device.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +0 -1
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +75 -42
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.js +10 -0
- package/build/lib/rpc/rpc-client-simulator.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts +4 -1
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +112 -20
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/lib/types.d.ts +1 -1
- package/build/lib/types.d.ts.map +1 -1
- package/build/tsconfig.tsbuildinfo +1 -1
- package/lib/mixins/execute.js +1 -1
- package/lib/mixins/navigate.js +1 -1
- package/lib/remote-debugger.ts +0 -4
- package/lib/rpc/rpc-client.js +82 -20
- package/lib/types.ts +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [15.0.2](https://github.com/appium/appium-remote-debugger/compare/v15.0.1...v15.0.2) (2025-09-16)
|
|
2
|
+
|
|
3
|
+
### Bug Fixes
|
|
4
|
+
|
|
5
|
+
* Introduce locking upon page selection ([#442](https://github.com/appium/appium-remote-debugger/issues/442)) ([88ca6ec](https://github.com/appium/appium-remote-debugger/commit/88ca6ecacfbe48eb0e4be594644c122ec466ca67))
|
|
6
|
+
|
|
1
7
|
## [15.0.1](https://github.com/appium/appium-remote-debugger/compare/v15.0.0...v15.0.1) (2025-09-07)
|
|
2
8
|
|
|
3
9
|
### Bug Fixes
|
|
@@ -23,8 +23,7 @@ exports.events = ({
|
|
|
23
23
|
* @returns {void}
|
|
24
24
|
*/
|
|
25
25
|
function addClientEventListener(eventName, listener) {
|
|
26
|
-
|
|
27
|
-
(_a = (0, property_accessors_1.getClientEventListeners)(this))[eventName] ?? (_a[eventName] = []);
|
|
26
|
+
(0, property_accessors_1.getClientEventListeners)(this)[eventName] ??= [];
|
|
28
27
|
(0, property_accessors_1.getClientEventListeners)(this)[eventName].push(listener);
|
|
29
28
|
this.requireRpcClient().on(eventName, listener);
|
|
30
29
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":";;;AAmBA,wDAIC;AAOD,8DAIC;AAOD,oCAIC;AAMD,kCAIC;AAOD,oCAGC;AAMD,kCAGC;AA1ED,6DAE8B;AAE9B,2BAA2B;AACd,QAAA,MAAM,GAAwB,CAAC;IAC1C,iBAAiB,EAAE,6BAA6B;IAChD,qBAAqB,EAAE,iCAAiC;IACxD,gBAAgB,EAAE,4BAA4B;CAC/C,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,SAAgB,sBAAsB,CAAE,SAAS,EAAE,QAAQ
|
|
1
|
+
{"version":3,"file":"events.js","sourceRoot":"","sources":["../../../lib/mixins/events.js"],"names":[],"mappings":";;;AAmBA,wDAIC;AAOD,8DAIC;AAOD,oCAIC;AAMD,kCAIC;AAOD,oCAGC;AAMD,kCAGC;AA1ED,6DAE8B;AAE9B,2BAA2B;AACd,QAAA,MAAM,GAAwB,CAAC;IAC1C,iBAAiB,EAAE,6BAA6B;IAChD,qBAAqB,EAAE,iCAAiC;IACxD,gBAAgB,EAAE,4BAA4B;CAC/C,CAAC,CAAC;AAEH;;;;;;;GAOG;AACH,SAAgB,sBAAsB,CAAE,SAAS,EAAE,QAAQ;IACzD,IAAA,4CAAuB,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;IAChD,IAAA,4CAAuB,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IACxD,IAAI,CAAC,gBAAgB,EAAE,CAAC,EAAE,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;AAClD,CAAC;AAED;;;;GAIG;AACH,SAAgB,yBAAyB,CAAE,SAAS;IAClD,KAAK,MAAM,QAAQ,IAAI,CAAC,IAAA,4CAAuB,EAAC,IAAI,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC;QACxE,IAAI,CAAC,gBAAgB,EAAE,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;IACnD,CAAC;AACH,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAE,QAAQ;IACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC5D,IAAI,CAAC,sBAAsB,CAAC,sBAAsB,EAAE,QAAQ,CAAC,CAAC;IAC9D,IAAI,CAAC,sBAAsB,CAAC,mCAAmC,EAAE,QAAQ,CAAC,CAAC;AAC7E,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW;IACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC5D,IAAI,CAAC,yBAAyB,CAAC,sBAAsB,CAAC,CAAC;IACvD,IAAI,CAAC,yBAAyB,CAAC,mCAAmC,CAAC,CAAC;AACtE,CAAC;AAED;;;;GAIG;AACH,SAAgB,YAAY,CAAE,QAAQ;IACpC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACxD,IAAI,CAAC,sBAAsB,CAAC,cAAc,EAAE,QAAQ,CAAC,CAAC;AACxD,CAAC;AAED;;;GAGG;AACH,SAAgB,WAAW;IACzB,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uCAAuC,CAAC,CAAC;IACxD,IAAI,CAAC,yBAAyB,CAAC,cAAc,CAAC,CAAC;AACjD,CAAC;AAED,kBAAe,cAAM,CAAC;AAEtB;;GAEG"}
|
|
@@ -134,7 +134,7 @@ async function execute(command, override) {
|
|
|
134
134
|
await this.garbageCollect();
|
|
135
135
|
}
|
|
136
136
|
const rpcClient = this.requireRpcClient(true);
|
|
137
|
-
await rpcClient.
|
|
137
|
+
await rpcClient.waitForPage(
|
|
138
138
|
/** @type {import('../types').AppIdKey} */ (appIdKey),
|
|
139
139
|
/** @type {import('../types').PageIdKey} */ (pageIdKey));
|
|
140
140
|
this.log.debug(`Sending javascript command: '${lodash_1.default.truncate(command, { length: 50 })}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.js"],"names":[],"mappings":";;;;;AA6BA,kCAMC;AASD,4CAkFC;AASD,0BAuBC;AAQD,oCAqBC;AA3LD,qDAA6C;AAC7C,oCAKkB;AAClB,oCAA4C;AAC5C,6CAA+C;AAC/C,uCAAyC;AACzC,oDAAuB;AACvB,6DAI8B;AAE9B,qFAAqF;AACrF,MAAM,uBAAuB,GAAG,IAAI,CAAC;AAErC;;;;;;;;GAQG;AACI,KAAK,UAAU,WAAW,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE;IAC7D,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,mBAAmB,IAAI,gBAAgB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,MAAM,GAAG,CAAC,CAAC;IACjG,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,IAAI,gBAAgB,gBAAC,CAAC,QAAQ,CAAC,IAAA,uBAAe,EAAC,KAAK,CAAC,EAAE,EAAC,MAAM,EAAE,2BAAmB,EAAC,CAAC,EAAE,CAAC,CAAC;IACrI,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACI,KAAK,UAAU,gBAAgB,CAAE,IAAI,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,GAAG,EAAE;IAClE,+CAA+C;IAC/C,MAAM,QAAQ,GAAG,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC;QACpG,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;QAC7B,aAAa,EAAE,KAAK;KACrB,EAAE,IAAI,CAAC,CAAC,CAAC;IAEV,0EAA0E;IAC1E,gBAAgB;IAChB,MAAM,WAAW,GAAG,4BAA4B,cAAI,CAAC,MAAM,EAAE,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,CAAC,EAAE,CAAC;IAClF,MAAM,MAAM,GACV;aACS,WAAW;;;;aAIX,WAAW;aACX,WAAW;aACX,WAAW,GAAG,CAAC;IAC1B,MAAM,GAAG,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE;QAC7C,UAAU,EAAE,MAAM;KACnB,CAAC,CAAC;IACH,MAAM,eAAe,GAAG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC;IAE5C,yDAAyD;IACzD,MAAM,aAAa,GACjB;eACW,WAAW;eACX,WAAW;MACpB,CAAC;IACL,MAAM,IAAI,CAAC,OAAO,CAAC,MAAM,IAAA,wBAAgB,EAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IAE9E,sCAAsC;IACtC,IAAI,GAAG,CAAC;IACR,MAAM,iBAAiB,GAAG,IAAI,CAAC,CAAC,iCAAiC;IACjE,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,QAAQ,CAAC,sBAAsB,EAAE;YAC3C,eAAe;YACf,aAAa,EAAE,IAAI;YACnB,eAAe,EAAE,IAAI;YACrB,UAAU,EAAE,IAAI;SACjB,CAAC,CAAC;IACL,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,sCAAsC,CAAC,EAAE,CAAC;YAClE,MAAM,GAAG,CAAC;QACZ,CAAC;QACD,iEAAiE;QACjE,MAAM,SAAS,GAAG,GAAG,CAAC;QACtB,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB,CAAC;QACvE,oEAAoE;QACpE,MAAM,OAAO,GAAG,QAAQ,CAAC,GAAG,OAAO,GAAG,SAAS,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,CAAC;QAC5D,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;QACzC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,iBAAiB,OAAO,gCAAgC,CAAC,CAAC;QACzE,GAAG,GAAG,MAAM,IAAA,wBAAa,EAAC,OAAO,EAAE,SAAS,EAAE,KAAK,IAAI,EAAE;YACvD,iEAAiE;YACjE,4BAA4B;YAC5B,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,kBAAkB,EAAE;gBAClD,UAAU,EAAE,0BAA0B,WAAW,UAAU;gBAC3D,aAAa,EAAE,IAAI;aACpB,CAAC,CAAC;YACH,IAAI,QAAQ,EAAE,CAAC;gBACb,oEAAoE;gBACpE,wCAAwC;gBACxC,OAAO,MAAM,QAAQ,CAAC,kBAAkB,EAAE;oBACxC,UAAU,EAAE,UAAU,WAAW,QAAQ;oBACzC,aAAa,EAAE,IAAI;iBACpB,CAAC,CAAC;YACL,CAAC;YACD,oEAAoE;YACpE,MAAM,IAAI,oBAAM,CAAC,YAAY,CAAC,4CAA4C;gBAC5C,gBAAgB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC;QACvG,CAAC,CAAC,CAAC;IACL,CAAC;YAAS,CAAC;QACT,IAAI,CAAC;YACH,gCAAgC;YAChC,MAAM,IAAI,CAAC,WAAW,CACpB,gBAAgB,EAAE,CAAC,iBAAiB,WAAW,GAAG,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,iBAAiB,CAAC,EAAE,MAAM,CAC7F,CAAC;QACJ,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IACD,OAAO,IAAA,yCAAiC,EAAC,GAAG,CAAC,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACH,6DAA6D;AACtD,KAAK,UAAU,OAAO,CAAE,OAAO,EAAE,QAAQ;IAC9C,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAC,GAAG,IAAA,mBAAW,EAAC;QACxC,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;IAEH,IAAI,IAAA,+CAA0B,EAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC;IAC9C,MAAM,SAAS,CAAC,WAAW;IACzB,0CAA0C,CAAC,CAAC,QAAQ,CAAC;IACrD,2CAA2C,CAAC,CAAC,SAAS,CAAC,CACxD,CAAC;IACF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,gCAAgC,gBAAC,CAAC,QAAQ,CAAC,OAAO,EAAE,EAAC,MAAM,EAAE,EAAE,EAAC,CAAC,GAAG,CAAC,CAAC;IACrF,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,IAAI,CAAC,kBAAkB,EAAE;QACnD,UAAU,EAAE,OAAO;QACnB,aAAa,EAAE,IAAI;QACnB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IACH,OAAO,IAAA,yCAAiC,EAAC,GAAG,CAAC,CAAC;AAChD,CAAC;AAED;;;;;GAKG;AACI,KAAK,UAAU,YAAY,CAAE,QAAQ,EAAE,EAAE,EAAE,IAAI;IACpD,MAAM,EAAC,QAAQ,EAAE,SAAS,EAAC,GAAG,IAAA,mBAAW,EAAC;QACxC,QAAQ,EAAE,IAAA,gCAAW,EAAC,IAAI,CAAC;QAC3B,SAAS,EAAE,IAAA,iCAAY,EAAC,IAAI,CAAC;KAC9B,CAAC,CAAC;IAEH,IAAI,IAAA,+CAA0B,EAAC,IAAI,CAAC,EAAE,CAAC;QACrC,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;IAC9B,CAAC;IAED,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC9C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,wBAAwB,EAAE;QAC3E,QAAQ;QACR,mBAAmB,EAAE,EAAE;QACvB,SAAS,EAAE,IAAI;QACf,aAAa,EAAE,IAAI;QACnB,QAAQ;QACR,SAAS;KACV,CAAC,CAAC;IAEH,OAAO,IAAA,yCAAiC,EAAC,GAAG,CAAC,CAAC;AAChD,CAAC;AAED;;GAEG"}
|
|
@@ -203,7 +203,7 @@ async function navToUrl(url) {
|
|
|
203
203
|
}
|
|
204
204
|
this.log.debug(`Navigating to new URL: '${url}'`);
|
|
205
205
|
(0, property_accessors_1.setNavigatingToPage)(this, true);
|
|
206
|
-
await rpcClient.
|
|
206
|
+
await rpcClient.waitForPage(
|
|
207
207
|
/** @type {import('../types').AppIdKey} */ (appIdKey),
|
|
208
208
|
/** @type {import('../types').PageIdKey} */ (pageIdKey));
|
|
209
209
|
const readinessTimeoutMs = this.pageLoadMs;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"navigate.js","sourceRoot":"","sources":["../../../lib/mixins/navigate.js"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.RemoteDebuggerRealDevice = void 0;
|
|
|
4
4
|
const remote_debugger_1 = require("./remote-debugger");
|
|
5
5
|
const rpc_1 = require("./rpc");
|
|
6
6
|
class RemoteDebuggerRealDevice extends remote_debugger_1.RemoteDebugger {
|
|
7
|
+
_udid;
|
|
7
8
|
constructor(opts) {
|
|
8
9
|
super(opts);
|
|
9
10
|
this._udid = opts.udid;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger-real-device.js","sourceRoot":"","sources":["../../lib/remote-debugger-real-device.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,+BAA4C;AAG5C,MAAa,wBAAyB,SAAQ,gCAAc;
|
|
1
|
+
{"version":3,"file":"remote-debugger-real-device.js","sourceRoot":"","sources":["../../lib/remote-debugger-real-device.ts"],"names":[],"mappings":";;;AAAA,uDAAmD;AACnD,+BAA4C;AAG5C,MAAa,wBAAyB,SAAQ,gCAAc;IACzC,KAAK,CAAS;IAE/B,YAAa,IAAqC;QAChD,KAAK,CAAC,IAAI,CAAC,CAAC;QACZ,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,CAAC,WAAW,CAAC,CAAC;IACpC,CAAC;IAEQ,aAAa;QACpB,IAAI,CAAC,UAAU,GAAG,IAAI,yBAAmB,CAAC;YACxC,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,QAAQ,EAAE,IAAI,CAAC,SAAS;YACxB,mBAAmB,EAAE,IAAI,CAAC,oBAAoB;YAC9C,0BAA0B,EAAE,IAAI,CAAC,2BAA2B;YAC5D,eAAe,EAAE,IAAI,CAAC,gBAAgB;YACtC,0BAA0B,EAAE,IAAI,CAAC,2BAA2B;YAC5D,IAAI,EAAE,IAAI,CAAC,KAAK;YAChB,iBAAiB,EAAE,IAAI,CAAC,WAAW;SACpC,CAAC,CAAC;IACL,CAAC;CACF;AAtBD,4DAsBC;AAED,kBAAe,wBAAwB,CAAC"}
|
|
@@ -33,7 +33,6 @@ export declare class RemoteDebugger extends EventEmitter {
|
|
|
33
33
|
protected readonly _platformVersion?: string;
|
|
34
34
|
protected readonly _isSafari: boolean;
|
|
35
35
|
protected readonly _includeSafari: boolean;
|
|
36
|
-
protected readonly _useNewSafari: boolean;
|
|
37
36
|
protected readonly _garbageCollectOnExecute: boolean;
|
|
38
37
|
protected readonly _host?: string;
|
|
39
38
|
protected readonly _port?: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AAItC,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,aAAa,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,oBAAoB,MAAM,2BAA2B,CAAC;AAClE,OAAO,KAAK,gBAAgB,MAAM,mBAAmB,CAAC;AACtD,OAAO,KAAK,YAAY,MAAM,kBAAkB,CAAC;AACjD,OAAO,KAAK,gBAAgB,MAAM,qBAAqB,CAAC;AACxD,OAAO,KAAK,WAAW,MAAM,iBAAiB,CAAC;AAC/C,OAAO,KAAK,mBAAmB,MAAM,eAAe,CAAC;AAErD,OAAO,KAAK,EACV,qBAAqB,EACrB,OAAO,EACP,aAAa,EACb,SAAS,EACT,QAAQ,EACT,MAAM,SAAS,CAAC;AACjB,OAAO,KAAK,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAChE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,KAAK,CAAC,MAAM,UAAU,CAAC;AAG9B,eAAO,MAAM,oBAAoB,QAAQ,CAAC;AAK1C,qBAAa,cAAe,SAAQ,YAAY;IAC9C,SAAS,CAAC,YAAY,EAAE,MAAM,EAAE,CAAC;IACjC,SAAS,CAAC,qBAAqB,EAAE,YAAY,CAAC,aAAa,EAAE,CAAC,CAAC;IAC/D,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC5B,SAAS,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC;IAC/B,SAAS,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC;IACjC,SAAS,CAAC,iBAAiB,CAAC,EAAE,YAAY,EAAE,CAAC;IAC7C,SAAS,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC;IACjC,SAAS,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IACnC,SAAS,CAAC,UAAU,EAAE,SAAS,GAAG,IAAI,CAAC;IACvC,SAAS,CAAC,YAAY,EAAE,OAAO,CAAC;IAChC,SAAS,CAAC,iBAAiB,EAAE,OAAO,CAAC;IACrC,SAAS,CAAC,6BAA6B,EAAE,OAAO,CAAC;IACjD,SAAS,CAAC,WAAW,CAAC,EAAE,MAAM,CAAC;IAC/B,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC9C,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,YAAY,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,oBAAoB,CAAC,EAAE,MAAM,EAAE,CAAC;IACnD,SAAS,CAAC,QAAQ,CAAC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC7C,SAAS,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IACtC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,OAAO,CAAC;IAC3C,SAAS,CAAC,QAAQ,CAAC,
|
|
1
|
+
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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"}
|
|
@@ -54,59 +54,92 @@ exports.REMOTE_DEBUGGER_PORT = 27753;
|
|
|
54
54
|
const PAGE_READY_TIMEOUT_MS = 5000;
|
|
55
55
|
const { version: MODULE_VERSION } = (0, utils_1.getModuleProperties)();
|
|
56
56
|
class RemoteDebugger extends events_1.EventEmitter {
|
|
57
|
+
_skippedApps;
|
|
58
|
+
_clientEventListeners;
|
|
59
|
+
_appDict;
|
|
60
|
+
_appIdKey;
|
|
61
|
+
_pageIdKey;
|
|
62
|
+
_connectedDrivers;
|
|
63
|
+
_currentState;
|
|
64
|
+
_pageLoadDelay;
|
|
65
|
+
_rpcClient;
|
|
66
|
+
_pageLoading;
|
|
67
|
+
_navigatingToPage;
|
|
68
|
+
_allowNavigationWithoutReload;
|
|
69
|
+
_pageLoadMs;
|
|
70
|
+
_pageLoadStrategy;
|
|
71
|
+
_log;
|
|
72
|
+
_bundleId;
|
|
73
|
+
_additionalBundleIds;
|
|
74
|
+
_platformVersion;
|
|
75
|
+
_isSafari;
|
|
76
|
+
_includeSafari;
|
|
77
|
+
_garbageCollectOnExecute;
|
|
78
|
+
_host;
|
|
79
|
+
_port;
|
|
80
|
+
_socketPath;
|
|
81
|
+
_remoteDebugProxy;
|
|
82
|
+
_pageReadyTimeout;
|
|
83
|
+
_logAllCommunication;
|
|
84
|
+
_logAllCommunicationHexDump;
|
|
85
|
+
_socketChunkSize;
|
|
86
|
+
_webInspectorMaxFrameLength;
|
|
87
|
+
_fullPageInitialization;
|
|
88
|
+
// events
|
|
89
|
+
static EVENT_PAGE_CHANGE;
|
|
90
|
+
static EVENT_DISCONNECT;
|
|
91
|
+
static EVENT_FRAMES_DETACHED;
|
|
92
|
+
// methods
|
|
93
|
+
setConnectionKey = connectMixins.setConnectionKey;
|
|
94
|
+
disconnect = connectMixins.disconnect;
|
|
95
|
+
checkPageIsReady = navigationMixins.checkPageIsReady;
|
|
96
|
+
cancelPageLoad = navigationMixins.cancelPageLoad;
|
|
97
|
+
waitForDom = navigationMixins.waitForDom;
|
|
98
|
+
execute = executeMixins.execute;
|
|
99
|
+
executeAtom = executeMixins.executeAtom;
|
|
100
|
+
executeAtomAsync = executeMixins.executeAtomAsync;
|
|
101
|
+
isPageLoadingCompleted = navigationMixins.isPageLoadingCompleted;
|
|
102
|
+
selectApp = connectMixins.selectApp;
|
|
103
|
+
connect = connectMixins.connect;
|
|
104
|
+
selectPage = connectMixins.selectPage;
|
|
105
|
+
navToUrl = navigationMixins.navToUrl;
|
|
106
|
+
getCookies = cookieMixins.getCookies;
|
|
107
|
+
setCookie = cookieMixins.setCookie;
|
|
108
|
+
deleteCookie = cookieMixins.deleteCookie;
|
|
109
|
+
captureScreenshot = screenshotMixins.captureScreenshot;
|
|
110
|
+
addClientEventListener = eventMixins.addClientEventListener;
|
|
111
|
+
removeClientEventListener = eventMixins.removeClientEventListener;
|
|
112
|
+
startConsole = eventMixins.startConsole;
|
|
113
|
+
stopConsole = eventMixins.stopConsole;
|
|
114
|
+
startNetwork = eventMixins.startNetwork;
|
|
115
|
+
stopNetwork = eventMixins.stopNetwork;
|
|
116
|
+
launchSafari = miscellaneousMixins.launchSafari;
|
|
117
|
+
startTimeline = miscellaneousMixins.startTimeline;
|
|
118
|
+
stopTimeline = miscellaneousMixins.stopTimeline;
|
|
119
|
+
overrideUserAgent = miscellaneousMixins.overrideUserAgent;
|
|
120
|
+
garbageCollect = miscellaneousMixins.garbageCollect;
|
|
121
|
+
isJavascriptExecutionBlocked = miscellaneousMixins.isJavascriptExecutionBlocked;
|
|
122
|
+
// Callbacks
|
|
123
|
+
onPageChange = messageHandlerMixins.onPageChange;
|
|
124
|
+
onConnectedApplicationList = messageHandlerMixins.onConnectedApplicationList;
|
|
125
|
+
onAppConnect = messageHandlerMixins.onAppConnect;
|
|
126
|
+
onAppDisconnect = messageHandlerMixins.onAppDisconnect;
|
|
127
|
+
onAppUpdate = messageHandlerMixins.onAppUpdate;
|
|
128
|
+
onConnectedDriverList = messageHandlerMixins.onConnectedDriverList;
|
|
129
|
+
onCurrentState = messageHandlerMixins.onCurrentState;
|
|
130
|
+
frameDetached = navigationMixins.frameDetached;
|
|
57
131
|
constructor(opts = {}) {
|
|
58
132
|
super();
|
|
59
|
-
// methods
|
|
60
|
-
this.setConnectionKey = connectMixins.setConnectionKey;
|
|
61
|
-
this.disconnect = connectMixins.disconnect;
|
|
62
|
-
this.checkPageIsReady = navigationMixins.checkPageIsReady;
|
|
63
|
-
this.cancelPageLoad = navigationMixins.cancelPageLoad;
|
|
64
|
-
this.waitForDom = navigationMixins.waitForDom;
|
|
65
|
-
this.execute = executeMixins.execute;
|
|
66
|
-
this.executeAtom = executeMixins.executeAtom;
|
|
67
|
-
this.executeAtomAsync = executeMixins.executeAtomAsync;
|
|
68
|
-
this.isPageLoadingCompleted = navigationMixins.isPageLoadingCompleted;
|
|
69
|
-
this.selectApp = connectMixins.selectApp;
|
|
70
|
-
this.connect = connectMixins.connect;
|
|
71
|
-
this.selectPage = connectMixins.selectPage;
|
|
72
|
-
this.navToUrl = navigationMixins.navToUrl;
|
|
73
|
-
this.getCookies = cookieMixins.getCookies;
|
|
74
|
-
this.setCookie = cookieMixins.setCookie;
|
|
75
|
-
this.deleteCookie = cookieMixins.deleteCookie;
|
|
76
|
-
this.captureScreenshot = screenshotMixins.captureScreenshot;
|
|
77
|
-
this.addClientEventListener = eventMixins.addClientEventListener;
|
|
78
|
-
this.removeClientEventListener = eventMixins.removeClientEventListener;
|
|
79
|
-
this.startConsole = eventMixins.startConsole;
|
|
80
|
-
this.stopConsole = eventMixins.stopConsole;
|
|
81
|
-
this.startNetwork = eventMixins.startNetwork;
|
|
82
|
-
this.stopNetwork = eventMixins.stopNetwork;
|
|
83
|
-
this.launchSafari = miscellaneousMixins.launchSafari;
|
|
84
|
-
this.startTimeline = miscellaneousMixins.startTimeline;
|
|
85
|
-
this.stopTimeline = miscellaneousMixins.stopTimeline;
|
|
86
|
-
this.overrideUserAgent = miscellaneousMixins.overrideUserAgent;
|
|
87
|
-
this.garbageCollect = miscellaneousMixins.garbageCollect;
|
|
88
|
-
this.isJavascriptExecutionBlocked = miscellaneousMixins.isJavascriptExecutionBlocked;
|
|
89
|
-
// Callbacks
|
|
90
|
-
this.onPageChange = messageHandlerMixins.onPageChange;
|
|
91
|
-
this.onConnectedApplicationList = messageHandlerMixins.onConnectedApplicationList;
|
|
92
|
-
this.onAppConnect = messageHandlerMixins.onAppConnect;
|
|
93
|
-
this.onAppDisconnect = messageHandlerMixins.onAppDisconnect;
|
|
94
|
-
this.onAppUpdate = messageHandlerMixins.onAppUpdate;
|
|
95
|
-
this.onConnectedDriverList = messageHandlerMixins.onConnectedDriverList;
|
|
96
|
-
this.onCurrentState = messageHandlerMixins.onCurrentState;
|
|
97
|
-
this.frameDetached = navigationMixins.frameDetached;
|
|
98
133
|
this._log = opts.log ?? logger_1.default;
|
|
99
134
|
this.log.info(`Remote Debugger version ${MODULE_VERSION}`);
|
|
100
|
-
const { bundleId, additionalBundleIds = [], platformVersion, isSafari = true, includeSafari = false,
|
|
135
|
+
const { bundleId, additionalBundleIds = [], platformVersion, isSafari = true, includeSafari = false, pageLoadMs, host, port = exports.REMOTE_DEBUGGER_PORT, socketPath, pageReadyTimeout = PAGE_READY_TIMEOUT_MS, remoteDebugProxy, garbageCollectOnExecute = false, logFullResponse = false, logAllCommunication = false, logAllCommunicationHexDump = false, webInspectorMaxFrameLength, socketChunkSize, fullPageInitialization, pageLoadStrategy, } = opts;
|
|
101
136
|
this._bundleId = bundleId;
|
|
102
137
|
this._additionalBundleIds = additionalBundleIds;
|
|
103
138
|
this._platformVersion = platformVersion;
|
|
104
139
|
this._isSafari = isSafari;
|
|
105
140
|
this._includeSafari = includeSafari;
|
|
106
|
-
this._useNewSafari = useNewSafari;
|
|
107
141
|
this._pageLoadMs = pageLoadMs;
|
|
108
142
|
this._allowNavigationWithoutReload = false;
|
|
109
|
-
this.log.debug(`useNewSafari --> ${this._useNewSafari}`);
|
|
110
143
|
this._garbageCollectOnExecute = garbageCollectOnExecute;
|
|
111
144
|
this._host = host;
|
|
112
145
|
this._port = port;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,mCAAsC;AACtC,sDAAkC;AAClC,+BAA2C;AAC3C,mCAA8C;AAC9C,gEAAkD;AAClD,gEAAkD;AAClD,gFAAkE;AAClE,oEAAsD;AACtD,+DAAiD;AACjD,sEAAwD;AACxD,6DAA+C;AAC/C,mEAAqD;AACrD,oDAAuB;AAaV,QAAA,oBAAoB,GAAG,KAAK,CAAC;AAC1C,MAAM,qBAAqB,GAAG,IAAI,CAAC;AACnC,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,IAAA,2BAAmB,GAAE,CAAC;AAG1D,MAAa,cAAe,SAAQ,qBAAY;
|
|
1
|
+
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,6 +11,16 @@ const net_1 = __importDefault(require("net"));
|
|
|
11
11
|
const rpc_client_1 = require("./rpc-client");
|
|
12
12
|
const appium_ios_device_1 = require("appium-ios-device");
|
|
13
13
|
class RpcClientSimulator extends rpc_client_1.RpcClient {
|
|
14
|
+
/** @type {string|undefined} */
|
|
15
|
+
host;
|
|
16
|
+
/** @type {number|undefined} */
|
|
17
|
+
port;
|
|
18
|
+
/** @type {any} */
|
|
19
|
+
messageProxy;
|
|
20
|
+
/** @type {import('node:net').Socket|null} */
|
|
21
|
+
socket;
|
|
22
|
+
/** @type {string|undefined} */
|
|
23
|
+
socketPath;
|
|
14
24
|
/**
|
|
15
25
|
* @param {import('./rpc-client').RpcClientOptions & RpcClientSimulatorOptions} [opts={}]
|
|
16
26
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":";;;;;;AAAA,uDAA4B;AAC5B,oDAAuB;AACvB,wDAAyB;AACzB,8CAAsB;AACtB,6CAAyC;AACzC,yDAA6C;AAE7C,MAAa,kBAAmB,SAAQ,sBAAS;
|
|
1
|
+
{"version":3,"file":"rpc-client-simulator.js","sourceRoot":"","sources":["../../../lib/rpc/rpc-client-simulator.js"],"names":[],"mappings":"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"}
|
|
@@ -55,6 +55,8 @@ export class RpcClient {
|
|
|
55
55
|
*/
|
|
56
56
|
get isConnected(): boolean;
|
|
57
57
|
_provisionedPages: Set<any>;
|
|
58
|
+
_pageSelectionLock: any;
|
|
59
|
+
_pageSelectionMonitor: EventEmitter<[never]>;
|
|
58
60
|
/**
|
|
59
61
|
* @returns {string[]}
|
|
60
62
|
*/
|
|
@@ -213,8 +215,9 @@ export class RpcClient {
|
|
|
213
215
|
*
|
|
214
216
|
* @param {import('../types').AppIdKey} appIdKey
|
|
215
217
|
* @param {import('../types').PageIdKey} pageIdKey
|
|
218
|
+
* @returns {Promise<void>}
|
|
216
219
|
*/
|
|
217
|
-
|
|
220
|
+
waitForPage(appIdKey: import("../types").AppIdKey, pageIdKey: import("../types").PageIdKey): Promise<void>;
|
|
218
221
|
}
|
|
219
222
|
export default RpcClient;
|
|
220
223
|
export type RpcClientOptions = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"AAwBA,sCAAuC,+BAA+B,CAAC;AACvE,0CAA2C,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"rpc-client.d.ts","sourceRoot":"","sources":["../../../lib/rpc/rpc-client.js"],"names":[],"mappings":"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"}
|
|
@@ -29,7 +29,48 @@ const NO_TARGET_PRESENT_YET_ERRORS = [
|
|
|
29
29
|
];
|
|
30
30
|
exports.NEW_APP_CONNECTED_ERROR = 'New application has connected';
|
|
31
31
|
exports.EMPTY_PAGE_DICTIONARY_ERROR = 'Empty page dictionary received';
|
|
32
|
+
const ON_PAGE_INITIALIZED_EVENT = 'onPageInitialized';
|
|
32
33
|
class RpcClient {
|
|
34
|
+
/** @type {RpcMessageHandler|undefined} */
|
|
35
|
+
messageHandler;
|
|
36
|
+
/** @type {RemoteMessages|undefined} */
|
|
37
|
+
remoteMessages;
|
|
38
|
+
/** @type {boolean} */
|
|
39
|
+
connected;
|
|
40
|
+
/** @type {boolean} */
|
|
41
|
+
isSafari;
|
|
42
|
+
/** @type {string} */
|
|
43
|
+
connId;
|
|
44
|
+
/** @type {string} */
|
|
45
|
+
senderId;
|
|
46
|
+
/** @type {number} */
|
|
47
|
+
msgId;
|
|
48
|
+
/** @type {string|undefined} */
|
|
49
|
+
udid;
|
|
50
|
+
/** @type {boolean|undefined} */
|
|
51
|
+
logAllCommunication;
|
|
52
|
+
/** @type {boolean|undefined} */
|
|
53
|
+
logAllCommunicationHexDump;
|
|
54
|
+
/** @type {number|undefined} */
|
|
55
|
+
socketChunkSize;
|
|
56
|
+
/** @type {number|undefined} */
|
|
57
|
+
webInspectorMaxFrameLength;
|
|
58
|
+
/** @type {boolean|undefined} */
|
|
59
|
+
fullPageInitialization;
|
|
60
|
+
/** @type {string|undefined} */
|
|
61
|
+
bundleId;
|
|
62
|
+
/** @type {number | undefined} */
|
|
63
|
+
pageLoadTimeoutMs;
|
|
64
|
+
/** @type {string} */
|
|
65
|
+
platformVersion;
|
|
66
|
+
/** @type {string[]} */
|
|
67
|
+
_contexts;
|
|
68
|
+
/** @type {AppToTargetsMap} */
|
|
69
|
+
_targets;
|
|
70
|
+
/** @type {EventEmitter} */
|
|
71
|
+
_targetSubscriptions;
|
|
72
|
+
/** @type {PendingTargetNotification | undefined} */
|
|
73
|
+
_pendingTargetNotification;
|
|
33
74
|
/**
|
|
34
75
|
*
|
|
35
76
|
* @param {RpcClientOptions} [opts={}]
|
|
@@ -54,6 +95,8 @@ class RpcClient {
|
|
|
54
95
|
this._targets = {};
|
|
55
96
|
this._targetSubscriptions = new node_events_1.EventEmitter();
|
|
56
97
|
this._provisionedPages = new Set();
|
|
98
|
+
this._pageSelectionLock = new async_lock_1.default();
|
|
99
|
+
this._pageSelectionMonitor = new node_events_1.EventEmitter();
|
|
57
100
|
this.remoteMessages = new remote_messages_1.RemoteMessages();
|
|
58
101
|
this.messageHandler = new rpc_message_handler_1.default();
|
|
59
102
|
// add handlers for internal events
|
|
@@ -444,6 +487,12 @@ class RpcClient {
|
|
|
444
487
|
catch (e) {
|
|
445
488
|
logger_1.default.warn(e.message);
|
|
446
489
|
}
|
|
490
|
+
finally {
|
|
491
|
+
// Target creation is happening after provisioning,
|
|
492
|
+
// which means the above lock would be already released
|
|
493
|
+
// after provisioning is completed.
|
|
494
|
+
this._pageSelectionMonitor.emit(ON_PAGE_INITIALIZED_EVENT, appIdKey, pageIdKey);
|
|
495
|
+
}
|
|
447
496
|
}
|
|
448
497
|
/**
|
|
449
498
|
*
|
|
@@ -524,24 +573,54 @@ class RpcClient {
|
|
|
524
573
|
* @returns {Promise<void>}
|
|
525
574
|
*/
|
|
526
575
|
async selectPage(appIdKey, pageIdKey, pageReadinessDetector) {
|
|
527
|
-
this.
|
|
528
|
-
|
|
529
|
-
|
|
530
|
-
|
|
531
|
-
|
|
532
|
-
|
|
533
|
-
|
|
534
|
-
|
|
535
|
-
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
576
|
+
await this._pageSelectionLock.acquire(toPageSelectionKey(appIdKey, pageIdKey), async () => {
|
|
577
|
+
this._pendingTargetNotification = [appIdKey, pageIdKey, pageReadinessDetector];
|
|
578
|
+
this._provisionedPages.clear();
|
|
579
|
+
// go through the steps that the Desktop Safari system
|
|
580
|
+
// goes through to initialize the Web Inspector session
|
|
581
|
+
const sendOpts = {
|
|
582
|
+
appIdKey,
|
|
583
|
+
pageIdKey,
|
|
584
|
+
};
|
|
585
|
+
const timeoutMs = Math.trunc(Math.max(this.pageLoadTimeoutMs ?? 0, PAGE_INIT_TIMEOUT_MS) * 1.2);
|
|
586
|
+
const timer = new support_1.timing.Timer().start();
|
|
587
|
+
const setupWebview = async () => {
|
|
588
|
+
// highlight and then un-highlight the webview
|
|
589
|
+
for (const enabled of [true, false]) {
|
|
590
|
+
await this.send('indicateWebView', Object.assign({
|
|
591
|
+
enabled,
|
|
592
|
+
}, sendOpts), false);
|
|
593
|
+
}
|
|
594
|
+
await this.send('setSenderKey', sendOpts);
|
|
595
|
+
};
|
|
596
|
+
await bluebird_1.default.resolve(setupWebview())
|
|
597
|
+
.timeout(timeoutMs, `Cannot set up page '${pageIdKey}' for app '${appIdKey}' within ${timeoutMs}ms`);
|
|
598
|
+
const msLeft = Math.max(timeoutMs - Math.trunc(timer.getDuration().asMilliSeconds), 1000);
|
|
599
|
+
logger_1.default.debug(`Waiting up to ${msLeft}ms for page '${pageIdKey}' of app '${appIdKey}' to be selected`);
|
|
600
|
+
await new Promise((resolve) => {
|
|
601
|
+
const onPageInitialized = (
|
|
602
|
+
/** @type {import("../types").AppIdKey} */ notifiedAppIdKey,
|
|
603
|
+
/** @type {import("../types").PageIdKey} */ notifiedPageIdKey) => {
|
|
604
|
+
const timeoutHandler = setTimeout(() => {
|
|
605
|
+
this._pageSelectionMonitor.off(ON_PAGE_INITIALIZED_EVENT, onPageInitialized);
|
|
606
|
+
logger_1.default.warn(`Page '${pageIdKey}' for app '${appIdKey}' has not been selected ` +
|
|
607
|
+
`within ${timer.getDuration().asMilliSeconds}ms. Continuing anyway`);
|
|
608
|
+
resolve(false);
|
|
609
|
+
}, msLeft);
|
|
610
|
+
if (notifiedAppIdKey === appIdKey && notifiedPageIdKey === pageIdKey) {
|
|
611
|
+
clearTimeout(timeoutHandler);
|
|
612
|
+
this._pageSelectionMonitor.off(ON_PAGE_INITIALIZED_EVENT, onPageInitialized);
|
|
613
|
+
logger_1.default.debug(`Selected the page ${pageIdKey}@${appIdKey} after ${timer.getDuration().asMilliSeconds}ms`);
|
|
614
|
+
resolve(true);
|
|
615
|
+
}
|
|
616
|
+
else {
|
|
617
|
+
logger_1.default.debug(`Got notified that page ${notifiedPageIdKey}@${notifiedAppIdKey} is initialized, ` +
|
|
618
|
+
`but we are waiting for ${pageIdKey}@${appIdKey}. Continuing to wait`);
|
|
619
|
+
}
|
|
620
|
+
};
|
|
621
|
+
this._pageSelectionMonitor.on(ON_PAGE_INITIALIZED_EVENT, onPageInitialized);
|
|
622
|
+
});
|
|
623
|
+
});
|
|
545
624
|
}
|
|
546
625
|
/**
|
|
547
626
|
* Mimic every step that Desktop Safari Develop tools uses to initialize a
|
|
@@ -815,15 +894,19 @@ class RpcClient {
|
|
|
815
894
|
*
|
|
816
895
|
* @param {import('../types').AppIdKey} appIdKey
|
|
817
896
|
* @param {import('../types').PageIdKey} pageIdKey
|
|
897
|
+
* @returns {Promise<void>}
|
|
818
898
|
*/
|
|
819
|
-
async
|
|
899
|
+
async waitForPage(appIdKey, pageIdKey) {
|
|
820
900
|
const appTargetsMap = this.targets[appIdKey];
|
|
821
901
|
if (!appTargetsMap) {
|
|
822
902
|
throw new Error(`No targets found for app '${appIdKey}'`);
|
|
823
903
|
}
|
|
824
904
|
const lock = appTargetsMap.lock;
|
|
825
905
|
const timer = new support_1.timing.Timer().start();
|
|
826
|
-
await
|
|
906
|
+
await Promise.all([
|
|
907
|
+
lock.acquire(pageIdKey, async () => await bluebird_1.default.delay(0)),
|
|
908
|
+
this._pageSelectionLock.acquire(toPageSelectionKey(appIdKey, pageIdKey), async () => await bluebird_1.default.delay(0))
|
|
909
|
+
]);
|
|
827
910
|
const durationMs = timer.getDuration().asMilliSeconds;
|
|
828
911
|
if (durationMs > 10) {
|
|
829
912
|
logger_1.default.debug(`Waited ${durationMs}ms until the page ${pageIdKey}@${appIdKey} is initialized`);
|
|
@@ -831,6 +914,15 @@ class RpcClient {
|
|
|
831
914
|
}
|
|
832
915
|
}
|
|
833
916
|
exports.RpcClient = RpcClient;
|
|
917
|
+
/**
|
|
918
|
+
*
|
|
919
|
+
* @param {import('../types').AppIdKey} appIdKey
|
|
920
|
+
* @param {import('../types').PageIdKey} pageIdKey
|
|
921
|
+
* @returns {string}
|
|
922
|
+
*/
|
|
923
|
+
function toPageSelectionKey(appIdKey, pageIdKey) {
|
|
924
|
+
return `${appIdKey}:${pageIdKey}`;
|
|
925
|
+
}
|
|
834
926
|
exports.default = RpcClient;
|
|
835
927
|
/**
|
|
836
928
|
* @typedef {Object} RpcClientOptions
|