appium-remote-debugger 15.7.3 → 15.8.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 +6 -0
- package/build/lib/atoms.d.ts.map +1 -1
- package/build/lib/atoms.js +27 -28
- package/build/lib/atoms.js.map +1 -1
- package/build/lib/index.d.ts.map +1 -1
- package/build/lib/index.js +7 -0
- package/build/lib/index.js.map +1 -1
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +21 -25
- 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 +2 -8
- package/build/lib/mixins/execute.js.map +1 -1
- package/build/lib/mixins/message-handlers.d.ts.map +1 -1
- package/build/lib/mixins/message-handlers.js +8 -12
- package/build/lib/mixins/message-handlers.js.map +1 -1
- package/build/lib/mixins/misc.d.ts.map +1 -1
- package/build/lib/mixins/misc.js +5 -39
- 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 +20 -55
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/mixins/property-accessors.d.ts +24 -0
- package/build/lib/mixins/property-accessors.d.ts.map +1 -1
- package/build/lib/mixins/property-accessors.js +24 -0
- package/build/lib/mixins/property-accessors.js.map +1 -1
- package/build/lib/remote-debugger.d.ts +38 -38
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +64 -69
- package/build/lib/remote-debugger.js.map +1 -1
- package/build/lib/rpc/remote-messages.d.ts.map +1 -1
- package/build/lib/rpc/remote-messages.js +7 -8
- package/build/lib/rpc/remote-messages.js.map +1 -1
- package/build/lib/rpc/rpc-client-real-device-shim.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-real-device-shim.js +3 -6
- package/build/lib/rpc/rpc-client-real-device-shim.js.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client-simulator.js +3 -5
- package/build/lib/rpc/rpc-client-simulator.js.map +1 -1
- package/build/lib/rpc/rpc-client.d.ts +27 -27
- package/build/lib/rpc/rpc-client.d.ts.map +1 -1
- package/build/lib/rpc/rpc-client.js +226 -224
- package/build/lib/rpc/rpc-client.js.map +1 -1
- package/build/lib/rpc/rpc-message-handler.js +7 -10
- package/build/lib/rpc/rpc-message-handler.js.map +1 -1
- package/build/lib/types.d.ts +19 -19
- package/build/lib/types.d.ts.map +1 -1
- package/build/lib/utils.d.ts +70 -4
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +171 -23
- package/build/lib/utils.js.map +1 -1
- package/lib/atoms.ts +31 -32
- package/lib/index.ts +7 -0
- package/lib/mixins/connect.ts +22 -23
- package/lib/mixins/execute.ts +3 -5
- package/lib/mixins/message-handlers.ts +9 -10
- package/lib/mixins/misc.ts +8 -7
- package/lib/mixins/navigate.ts +58 -63
- package/lib/mixins/property-accessors.ts +24 -0
- package/lib/remote-debugger.ts +74 -76
- package/lib/rpc/remote-messages.ts +10 -5
- package/lib/rpc/rpc-client-real-device-shim.ts +3 -3
- package/lib/rpc/rpc-client-simulator.ts +3 -5
- package/lib/rpc/rpc-client.ts +259 -247
- package/lib/rpc/rpc-message-handler.ts +7 -7
- package/lib/types.ts +24 -24
- package/lib/utils.ts +181 -23
- package/package.json +3 -7
- package/scripts/common.mjs +42 -37
- package/scripts/web_inspector_proxy.mjs +3 -5
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,9 @@
|
|
|
1
|
+
## [15.8.0](https://github.com/appium/appium-remote-debugger/compare/v15.7.3...v15.8.0) (2026-04-27)
|
|
2
|
+
|
|
3
|
+
### Features
|
|
4
|
+
|
|
5
|
+
* Ditch bluebird and lodash ([#490](https://github.com/appium/appium-remote-debugger/issues/490)) ([a0bb8b1](https://github.com/appium/appium-remote-debugger/commit/a0bb8b1349810d7e40405c0c5eb47198ab514029))
|
|
6
|
+
|
|
1
7
|
## [15.7.3](https://github.com/appium/appium-remote-debugger/compare/v15.7.2...v15.7.3) (2026-04-22)
|
|
2
8
|
|
|
3
9
|
### Miscellaneous Chores
|
package/build/lib/atoms.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atoms.d.ts","sourceRoot":"","sources":["../../lib/atoms.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"atoms.d.ts","sourceRoot":"","sources":["../../lib/atoms.ts"],"names":[],"mappings":"AAOA;;;;;;;GAOG;AACH,wBAAsB,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAY/D;AAED;;;;;;;;;;;GAWG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,GAAG,EAAO,EAChB,MAAM,GAAE,MAAM,EAAO,EACrB,aAAa,GAAE,MAAM,GAAG,IAAW,GAClC,OAAO,CAAC,MAAM,CAAC,CAsBjB"}
|
package/build/lib/atoms.js
CHANGED
|
@@ -7,22 +7,9 @@ exports.getAtom = getAtom;
|
|
|
7
7
|
exports.getScriptForAtom = getScriptForAtom;
|
|
8
8
|
const support_1 = require("@appium/support");
|
|
9
9
|
const node_path_1 = __importDefault(require("node:path"));
|
|
10
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
11
10
|
const logger_1 = require("./logger");
|
|
12
11
|
const utils_1 = require("./utils");
|
|
13
12
|
const ATOMS_CACHE = {};
|
|
14
|
-
/**
|
|
15
|
-
* Converts a value to a JSON string, handling undefined values specially.
|
|
16
|
-
*
|
|
17
|
-
* @param obj - The value to stringify.
|
|
18
|
-
* @returns A JSON string representation of the value, or 'undefined' if the value is undefined.
|
|
19
|
-
*/
|
|
20
|
-
function atomsStringify(obj) {
|
|
21
|
-
if (typeof obj === 'undefined') {
|
|
22
|
-
return 'undefined';
|
|
23
|
-
}
|
|
24
|
-
return JSON.stringify(obj);
|
|
25
|
-
}
|
|
26
13
|
/**
|
|
27
14
|
* Loads an atom script from the atoms directory and caches it.
|
|
28
15
|
* If the atom has been loaded before, returns the cached version.
|
|
@@ -33,7 +20,7 @@ function atomsStringify(obj) {
|
|
|
33
20
|
*/
|
|
34
21
|
async function getAtom(atomName) {
|
|
35
22
|
// check if we have already loaded and cached this atom
|
|
36
|
-
if (!
|
|
23
|
+
if (!Object.hasOwn(ATOMS_CACHE, atomName)) {
|
|
37
24
|
const atomFileName = node_path_1.default.resolve((0, utils_1.getModuleRoot)(), 'atoms', `${atomName}.js`);
|
|
38
25
|
try {
|
|
39
26
|
ATOMS_CACHE[atomName] = await support_1.fs.readFile(atomFileName);
|
|
@@ -44,20 +31,6 @@ async function getAtom(atomName) {
|
|
|
44
31
|
}
|
|
45
32
|
return ATOMS_CACHE[atomName];
|
|
46
33
|
}
|
|
47
|
-
/**
|
|
48
|
-
* Wraps a script to execute it within a specific frame context.
|
|
49
|
-
* Uses the get_element_from_cache atom to access the frame element.
|
|
50
|
-
*
|
|
51
|
-
* @param script - The script to wrap.
|
|
52
|
-
* @param frame - The frame identifier to execute the script in.
|
|
53
|
-
* @returns A promise that resolves to the wrapped script string.
|
|
54
|
-
*/
|
|
55
|
-
async function wrapScriptForFrame(script, frame) {
|
|
56
|
-
logger_1.log.debug(`Wrapping script for frame '${frame}'`);
|
|
57
|
-
const elFromCache = await getAtom('get_element_from_cache');
|
|
58
|
-
return (`(function (window) { var document = window.document; ` +
|
|
59
|
-
`return (${script}); })((${elFromCache.toString('utf8')})(${atomsStringify(frame)}))`);
|
|
60
|
-
}
|
|
61
34
|
/**
|
|
62
35
|
* Generates a complete script string for executing a Selenium atom.
|
|
63
36
|
* Handles frame contexts and optional async callbacks.
|
|
@@ -93,4 +66,30 @@ async function getScriptForAtom(atom, args = [], frames = [], asyncCallBack = nu
|
|
|
93
66
|
}
|
|
94
67
|
return script;
|
|
95
68
|
}
|
|
69
|
+
/**
|
|
70
|
+
* Converts a value to a JSON string, handling undefined values specially.
|
|
71
|
+
*
|
|
72
|
+
* @param obj - The value to stringify.
|
|
73
|
+
* @returns A JSON string representation of the value, or 'undefined' if the value is undefined.
|
|
74
|
+
*/
|
|
75
|
+
function atomsStringify(obj) {
|
|
76
|
+
if (typeof obj === 'undefined') {
|
|
77
|
+
return 'undefined';
|
|
78
|
+
}
|
|
79
|
+
return JSON.stringify(obj);
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Wraps a script to execute it within a specific frame context.
|
|
83
|
+
* Uses the get_element_from_cache atom to access the frame element.
|
|
84
|
+
*
|
|
85
|
+
* @param script - The script to wrap.
|
|
86
|
+
* @param frame - The frame identifier to execute the script in.
|
|
87
|
+
* @returns A promise that resolves to the wrapped script string.
|
|
88
|
+
*/
|
|
89
|
+
async function wrapScriptForFrame(script, frame) {
|
|
90
|
+
logger_1.log.debug(`Wrapping script for frame '${frame}'`);
|
|
91
|
+
const elFromCache = await getAtom('get_element_from_cache');
|
|
92
|
+
return (`(function (window) { var document = window.document; ` +
|
|
93
|
+
`return (${script}); })((${elFromCache.toString('utf8')})(${atomsStringify(frame)}))`);
|
|
94
|
+
}
|
|
96
95
|
//# sourceMappingURL=atoms.js.map
|
package/build/lib/atoms.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"atoms.js","sourceRoot":"","sources":["../../lib/atoms.ts"],"names":[],"mappings":";;;;;
|
|
1
|
+
{"version":3,"file":"atoms.js","sourceRoot":"","sources":["../../lib/atoms.ts"],"names":[],"mappings":";;;;;AAeA,0BAYC;AAcD,4CA2BC;AApED,6CAAmC;AACnC,0DAA6B;AAC7B,qCAA6B;AAC7B,mCAAsC;AAEtC,MAAM,WAAW,GAA2B,EAAE,CAAC;AAE/C;;;;;;;GAOG;AACI,KAAK,UAAU,OAAO,CAAC,QAAgB;IAC5C,uDAAuD;IACvD,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,EAAE,CAAC;QAC1C,MAAM,YAAY,GAAG,mBAAI,CAAC,OAAO,CAAC,IAAA,qBAAa,GAAE,EAAE,OAAO,EAAE,GAAG,QAAQ,KAAK,CAAC,CAAC;QAC9E,IAAI,CAAC;YACH,WAAW,CAAC,QAAQ,CAAC,GAAG,MAAM,YAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC;QAC1D,CAAC;QAAC,MAAM,CAAC;YACP,MAAM,IAAI,KAAK,CAAC,wBAAwB,QAAQ,gBAAgB,YAAY,GAAG,CAAC,CAAC;QACnF,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;GAWG;AACI,KAAK,UAAU,gBAAgB,CACpC,IAAY,EACZ,OAAc,EAAE,EAChB,SAAmB,EAAE,EACrB,gBAA+B,IAAI;IAEnC,MAAM,OAAO,GAAG,CAAC,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,MAAc,CAAC;IACnB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,MAAM,GAAG,OAAO,CAAC;QACjB,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;YAC3B,MAAM,GAAG,MAAM,kBAAkB,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;SAAM,CAAC;QACN,YAAG,CAAC,KAAK,CAAC,cAAc,IAAI,2BAA2B,CAAC,CAAC;QACzD,MAAM,GAAG,IAAI,OAAO,GAAG,CAAC;IAC1B,CAAC;IAED,gCAAgC;IAChC,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;IAChC,IAAI,aAAa,EAAE,CAAC;QAClB,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,aAAa,SAAS,CAAC;IAC1D,CAAC;SAAM,CAAC;QACN,MAAM,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC;IAClC,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;;;;GAKG;AACH,SAAS,cAAc,CAAC,GAAQ;IAC9B,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE,CAAC;QAC/B,OAAO,WAAW,CAAC;IACrB,CAAC;IACD,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;AAC7B,CAAC;AAED;;;;;;;GAOG;AACH,KAAK,UAAU,kBAAkB,CAAC,MAAc,EAAE,KAAa;IAC7D,YAAG,CAAC,KAAK,CAAC,8BAA8B,KAAK,GAAG,CAAC,CAAC;IAClD,MAAM,WAAW,GAAG,MAAM,OAAO,CAAC,wBAAwB,CAAC,CAAC;IAC5D,OAAO,CACL,uDAAuD;QACvD,WAAW,MAAM,UAAU,WAAW,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,cAAc,CAAC,KAAK,CAAC,IAAI,CACtF,CAAC;AACJ,CAAC"}
|
package/build/lib/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,oBAAoB,EAAC,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAC,+BAA+B,EAAE,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAEpF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,+BAA+B,EACrC,UAAU,EAAE,IAAI,GACf,wBAAwB,CAAC;AAC5B,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,KAAK,GAChB,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,cAAc,EAAE,oBAAoB,EAAC,MAAM,mBAAmB,CAAC;AACvE,OAAO,EAAC,wBAAwB,EAAC,MAAM,+BAA+B,CAAC;AACvE,OAAO,KAAK,EAAC,+BAA+B,EAAE,qBAAqB,EAAC,MAAM,SAAS,CAAC;AAEpF,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,+BAA+B,EACrC,UAAU,EAAE,IAAI,GACf,wBAAwB,CAAC;AAC5B,wBAAgB,oBAAoB,CAClC,IAAI,EAAE,qBAAqB,EAC3B,UAAU,EAAE,KAAK,GAChB,cAAc,CAAC;AAiBlB,OAAO,EAAC,cAAc,EAAE,wBAAwB,EAAE,oBAAoB,EAAC,CAAC;AACxE,YAAY,EAAC,+BAA+B,EAAE,qBAAqB,EAAC,CAAC"}
|
package/build/lib/index.js
CHANGED
|
@@ -7,6 +7,13 @@ Object.defineProperty(exports, "RemoteDebugger", { enumerable: true, get: functi
|
|
|
7
7
|
Object.defineProperty(exports, "REMOTE_DEBUGGER_PORT", { enumerable: true, get: function () { return remote_debugger_1.REMOTE_DEBUGGER_PORT; } });
|
|
8
8
|
const remote_debugger_real_device_1 = require("./remote-debugger-real-device");
|
|
9
9
|
Object.defineProperty(exports, "RemoteDebuggerRealDevice", { enumerable: true, get: function () { return remote_debugger_real_device_1.RemoteDebuggerRealDevice; } });
|
|
10
|
+
/**
|
|
11
|
+
* Creates a remote debugger instance for either simulator or real device flows.
|
|
12
|
+
*
|
|
13
|
+
* @param opts - Configuration options for the selected debugger type.
|
|
14
|
+
* @param realDevice - Whether to create the real-device debugger implementation.
|
|
15
|
+
* @returns The initialized debugger instance for the selected target type.
|
|
16
|
+
*/
|
|
10
17
|
function createRemoteDebugger(opts, realDevice) {
|
|
11
18
|
return realDevice
|
|
12
19
|
? new remote_debugger_real_device_1.RemoteDebuggerRealDevice(opts)
|
package/build/lib/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../lib/index.ts"],"names":[],"mappings":";;;AAmBA,oDAOC;AA1BD,uDAAuE;AA4B/D,+FA5BA,gCAAc,OA4BA;AAA4B,qGA5B1B,sCAAoB,OA4B0B;AA3BtE,+EAAuE;AA2B/C,yGA3BhB,sDAAwB,OA2BgB;AAhBhD;;;;;;GAMG;AACH,SAAgB,oBAAoB,CAClC,IAA6D,EAC7D,UAAmB;IAEnB,OAAO,UAAU;QACf,CAAC,CAAC,IAAI,sDAAwB,CAAC,IAAuC,CAAC;QACvE,CAAC,CAAC,IAAI,gCAAc,CAAC,IAA6B,CAAC,CAAC;AACxD,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.ts"],"names":[],"mappings":"AAiBA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAU,MAAM,UAAU,CAAC;AAa1E;;;;GAIG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAM1E;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,cAAc,EACpB,OAAO,GAAE,MAA+B,GACvC,OAAO,CAAC,OAAO,CAAC,CA8ClB;AAED;;;GAGG;AACH,wBAAsB,UAAU,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAIpE;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAsB,SAAS,CAC7B,IAAI,EAAE,cAAc,EACpB,UAAU,GAAE,MAAM,GAAG,IAAW,EAChC,QAAQ,GAAE,MAA2B,EACrC,mBAAmB,GAAE,OAAe,GACnC,OAAO,CAAC,IAAI,EAAE,CAAC,CA0CjB;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,UAAU,CAC9B,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,SAAS,EACpB,cAAc,GAAE,OAAe,GAC9B,OAAO,CAAC,IAAI,CAAC,CAoBf;AAED;;;;;;;;GAQG;AACH,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAiD9F"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.setConnectionKey = setConnectionKey;
|
|
7
4
|
exports.connect = connect;
|
|
@@ -13,7 +10,6 @@ const utils_1 = require("../utils");
|
|
|
13
10
|
const events_1 = require("./events");
|
|
14
11
|
const support_1 = require("@appium/support");
|
|
15
12
|
const asyncbox_1 = require("asyncbox");
|
|
16
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
17
13
|
const property_accessors_1 = require("./property-accessors");
|
|
18
14
|
const rpc_client_1 = require("../rpc/rpc-client");
|
|
19
15
|
const APP_CONNECT_TIMEOUT_MS = 0;
|
|
@@ -54,7 +50,7 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
|
|
|
54
50
|
await this.initRpcClient();
|
|
55
51
|
const rpcClient = this.requireRpcClient();
|
|
56
52
|
// listen for basic debugger-level events
|
|
57
|
-
rpcClient.on('_rpc_reportSetup:',
|
|
53
|
+
rpcClient.on('_rpc_reportSetup:', () => { });
|
|
58
54
|
rpcClient.on('_rpc_forwardGetListing:', this.onPageChange.bind(this));
|
|
59
55
|
rpcClient.on('_rpc_reportConnectedApplicationList:', this.onConnectedApplicationList.bind(this));
|
|
60
56
|
rpcClient.on('_rpc_applicationConnected:', this.onAppConnect.bind(this));
|
|
@@ -71,11 +67,11 @@ async function connect(timeout = APP_CONNECT_TIMEOUT_MS) {
|
|
|
71
67
|
const timer = new support_1.timing.Timer().start();
|
|
72
68
|
this.log.debug(`Waiting up to ${timeout}ms for applications to be reported`);
|
|
73
69
|
try {
|
|
74
|
-
await (0, asyncbox_1.waitForCondition)(() => !
|
|
70
|
+
await (0, asyncbox_1.waitForCondition)(() => !(0, utils_1.isEmpty)((0, property_accessors_1.getAppDict)(this)), {
|
|
75
71
|
waitMs: timeout,
|
|
76
72
|
intervalMs: APP_CONNECT_INTERVAL_MS,
|
|
77
73
|
});
|
|
78
|
-
this.log.debug(`Retrieved ${support_1.util.pluralize('application',
|
|
74
|
+
this.log.debug(`Retrieved ${support_1.util.pluralize('application', Object.keys((0, property_accessors_1.getAppDict)(this)).length, true)} ` +
|
|
79
75
|
`within ${timer.getDuration().asMilliSeconds.toFixed(0)}ms`);
|
|
80
76
|
}
|
|
81
77
|
catch {
|
|
@@ -117,7 +113,7 @@ async function disconnect() {
|
|
|
117
113
|
async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignoreAboutBlankUrl = false) {
|
|
118
114
|
this.log.debug('Selecting application');
|
|
119
115
|
const timer = new support_1.timing.Timer().start();
|
|
120
|
-
if (
|
|
116
|
+
if ((0, utils_1.isEmpty)((0, property_accessors_1.getAppDict)(this))) {
|
|
121
117
|
this.log.debug('No applications currently connected.');
|
|
122
118
|
return [];
|
|
123
119
|
}
|
|
@@ -133,14 +129,14 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
|
|
|
133
129
|
// translate the dictionary into a useful form, and return to sender
|
|
134
130
|
this.log.debug(`Finally selecting app ${(0, property_accessors_1.getAppIdKey)(this)}`);
|
|
135
131
|
const fullPageArray = [];
|
|
136
|
-
for (const [app, info] of
|
|
137
|
-
if (!
|
|
132
|
+
for (const [app, info] of Object.entries((0, property_accessors_1.getAppDict)(this))) {
|
|
133
|
+
if (!Array.isArray(info.pageArray) || !info.isActive) {
|
|
138
134
|
continue;
|
|
139
135
|
}
|
|
140
136
|
const id = app.replace('PID:', '');
|
|
141
137
|
for (const page of info.pageArray) {
|
|
142
138
|
if (!(ignoreAboutBlankUrl && page.url === BLANK_PAGE_URL)) {
|
|
143
|
-
const pageDict =
|
|
139
|
+
const pageDict = { ...page };
|
|
144
140
|
pageDict.id = `${id}.${pageDict.id}`;
|
|
145
141
|
pageDict.bundleId = info.bundleId;
|
|
146
142
|
fullPageArray.push(pageDict);
|
|
@@ -162,7 +158,7 @@ async function selectApp(currentUrl = null, maxTries = SELECT_APP_RETRIES, ignor
|
|
|
162
158
|
* according to the configured page load strategy.
|
|
163
159
|
*/
|
|
164
160
|
async function selectPage(appIdKey, pageIdKey, skipReadyCheck = false) {
|
|
165
|
-
const fullAppIdKey =
|
|
161
|
+
const fullAppIdKey = `${appIdKey}`.startsWith('PID:') ? `${appIdKey}` : `PID:${appIdKey}`;
|
|
166
162
|
(0, property_accessors_1.setAppIdKey)(this, fullAppIdKey);
|
|
167
163
|
(0, property_accessors_1.setPageIdKey)(this, pageIdKey);
|
|
168
164
|
this.log.debug(`Selecting page '${pageIdKey}' on app '${fullAppIdKey}' and forwarding socket setup`);
|
|
@@ -189,10 +185,10 @@ function getPossibleDebuggerAppKeys(bundleIds) {
|
|
|
189
185
|
const appDict = (0, property_accessors_1.getAppDict)(this);
|
|
190
186
|
if (bundleIds.includes(WILDCARD_BUNDLE_ID)) {
|
|
191
187
|
this.log.info('Returning all apps because the list of matching bundle identifiers includes a wildcard');
|
|
192
|
-
return
|
|
188
|
+
return Object.keys(appDict);
|
|
193
189
|
}
|
|
194
190
|
// go through the possible bundle identifiers
|
|
195
|
-
const possibleBundleIds =
|
|
191
|
+
const possibleBundleIds = (0, utils_1.uniq)([
|
|
196
192
|
utils_1.WEB_CONTENT_BUNDLE_ID,
|
|
197
193
|
WEB_CONTENT_PROCESS_BUNDLE_ID,
|
|
198
194
|
SAFARI_VIEW_PROCESS_BUNDLE_ID,
|
|
@@ -209,7 +205,7 @@ function getPossibleDebuggerAppKeys(bundleIds) {
|
|
|
209
205
|
}
|
|
210
206
|
proxiedAppIds.push(appId);
|
|
211
207
|
this.log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
|
|
212
|
-
for (const [key, data] of
|
|
208
|
+
for (const [key, data] of Object.entries(appDict)) {
|
|
213
209
|
if (data.isProxy && data.hostId === appId && !proxiedAppIds.includes(key)) {
|
|
214
210
|
this.log.debug(`Found separate bundleId '${data.bundleId}' ` +
|
|
215
211
|
`acting as proxy for '${bundleId}', with app id '${key}'`);
|
|
@@ -220,7 +216,7 @@ function getPossibleDebuggerAppKeys(bundleIds) {
|
|
|
220
216
|
}
|
|
221
217
|
this.log.debug(`You may also consider providing more values to 'additionalWebviewBundleIds' ` +
|
|
222
218
|
`capability to match other applications. Add a wildcard ('*') to match all apps.`);
|
|
223
|
-
return
|
|
219
|
+
return (0, utils_1.uniq)(proxiedAppIds);
|
|
224
220
|
}
|
|
225
221
|
/**
|
|
226
222
|
* Searches for an application matching the given criteria by retrying with
|
|
@@ -238,11 +234,11 @@ function getPossibleDebuggerAppKeys(bundleIds) {
|
|
|
238
234
|
* @throws Error if no valid webapp can be connected after all retry attempts.
|
|
239
235
|
*/
|
|
240
236
|
async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
241
|
-
const bundleIds =
|
|
237
|
+
const bundleIds = [
|
|
242
238
|
(0, property_accessors_1.getBundleId)(this),
|
|
243
239
|
...((0, property_accessors_1.getAdditionalBundleIds)(this) ?? []),
|
|
244
240
|
...((0, property_accessors_1.getIncludeSafari)(this) && !(0, property_accessors_1.getIsSafari)(this) ? [SAFARI_BUNDLE_ID] : []),
|
|
245
|
-
]);
|
|
241
|
+
].filter((bundleId) => !!bundleId);
|
|
246
242
|
let retryCount = 0;
|
|
247
243
|
return (await (0, asyncbox_1.retryInterval)(maxTries, SELECT_APP_RETRY_SLEEP_MS, async () => {
|
|
248
244
|
logApplicationDictionary.bind(this)();
|
|
@@ -299,8 +295,8 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
299
295
|
* @returns An AppPage object if a matching page is found, null otherwise.
|
|
300
296
|
*/
|
|
301
297
|
function searchForPage(appsDict, currentUrl = null, ignoreAboutBlankUrl = false) {
|
|
302
|
-
for (const appDict of
|
|
303
|
-
if (!appDict || !appDict.isActive || !appDict.pageArray ||
|
|
298
|
+
for (const appDict of Object.values(appsDict)) {
|
|
299
|
+
if (!appDict || !appDict.isActive || !appDict.pageArray || appDict.pageArray.length === 0) {
|
|
304
300
|
continue;
|
|
305
301
|
}
|
|
306
302
|
for (const page of appDict.pageArray) {
|
|
@@ -332,7 +328,7 @@ function isAppIgnored(instance) {
|
|
|
332
328
|
return false;
|
|
333
329
|
}
|
|
334
330
|
const ignoredSet = new Set(ignoredBundleIds);
|
|
335
|
-
const appBundleIds = new Set(
|
|
331
|
+
const appBundleIds = new Set(Object.values((0, property_accessors_1.getAppDict)(instance)).map((app) => app.bundleId));
|
|
336
332
|
if (appBundleIds.size === 0) {
|
|
337
333
|
return false;
|
|
338
334
|
}
|
|
@@ -356,21 +352,21 @@ function isAppIgnored(instance) {
|
|
|
356
352
|
*/
|
|
357
353
|
function logApplicationDictionary() {
|
|
358
354
|
this.log.debug('Current applications available:');
|
|
359
|
-
for (const [app, info] of
|
|
355
|
+
for (const [app, info] of Object.entries((0, property_accessors_1.getAppDict)(this))) {
|
|
360
356
|
this.log.debug(` Application: "${app}"`);
|
|
361
|
-
for (const [key, value] of
|
|
357
|
+
for (const [key, value] of Object.entries(info)) {
|
|
362
358
|
if (key === 'pageArray' && Array.isArray(value) && value.length) {
|
|
363
359
|
this.log.debug(` ${key}:`);
|
|
364
360
|
for (const page of value) {
|
|
365
361
|
let prefix = '- ';
|
|
366
|
-
for (const [k, v] of
|
|
362
|
+
for (const [k, v] of Object.entries(page)) {
|
|
367
363
|
this.log.debug(` ${prefix}${k}: ${JSON.stringify(v)}`);
|
|
368
364
|
prefix = ' ';
|
|
369
365
|
}
|
|
370
366
|
}
|
|
371
367
|
}
|
|
372
368
|
else {
|
|
373
|
-
const valueString =
|
|
369
|
+
const valueString = typeof value === 'function' ? '[Function]' : JSON.stringify(value);
|
|
374
370
|
this.log.debug(` ${key}: ${valueString}`);
|
|
375
371
|
}
|
|
376
372
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.ts"],"names":[],"mappings":";;;;;AAqCA,4CAMC;AAaD,0BAiDC;AAMD,gCAIC;AAiBD,8BA+CC;AAaD,gCAyBC;AAWD,gEAiDC;AArRD,oCAAmF;AACnF,qCAAgC;AAChC,6CAA6C;AAC7C,uCAAyD;AACzD,oDAAuB;AACvB,6DAW8B;AAC9B,kDAAuF;AAIvF,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;;;;;;;;;;GAUG;AACI,KAAK,UAAU,OAAO,CAE3B,UAAkB,sBAAsB;IAExC,IAAI,CAAC,KAAK,EAAE,CAAC;IAEb,4BAA4B;IAC5B,MAAM,IAAI,CAAC,aAAa,EAAE,CAAC;IAE3B,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;oBAC3E,UAAU,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAC9D,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,GAAQ,EAAE,CAAC;QAClB,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;;;GAGG;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;;;;;;;;;;;;;;GAcG;AACI,KAAK,UAAU,SAAS,CAE7B,aAA4B,IAAI,EAChC,WAAmB,kBAAkB,EACrC,sBAA+B,KAAK;IAEpC,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,IAAI,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC;QACvB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,EAAC,QAAQ,EAAC,GAAG,MAAM,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,UAAU,EAAE,QAAQ,EAAE,mBAAmB,CAAC,CAAC;IAC5F,IAAI,IAAA,gCAAW,EAAC,IAAI,CAAC,KAAK,QAAQ,EAAE,CAAC;QACnC,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,2CAA2C,IAAA,gCAAW,EAAC,IAAI,CAAC,SAAS,QAAQ,GAAG,CACjF,CAAC;QACF,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,MAAM,aAAa,GAAW,EAAE,CAAC;IACjC,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;;;;;;;;;;GAUG;AACI,KAAK,UAAU,UAAU,CAE9B,QAAkB,EAClB,SAAoB,EACpB,iBAA0B,KAAK;IAE/B,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,CACZ,mBAAmB,SAAS,aAAa,YAAY,+BAA+B,CACrF,CAAC;IAEF,MAAM,KAAK,GAAG,IAAI,gBAAM,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC;IAEzC,MAAM,qBAAqB,GAAG,cAAc;QAC1C,CAAC,CAAC,SAAS;QACX,CAAC,CAAC;YACE,SAAS,EAAE,IAAI,CAAC,UAAU;YAC1B,iBAAiB,EAAE,CAAC,UAAkB,EAAE,EAAE,CAAC,IAAI,CAAC,sBAAsB,CAAC,UAAU,CAAC;SACnF,CAAC;IACN,MAAM,IAAI,CAAC,gBAAgB,EAAE,CAAC,UAAU,CAAC,YAAY,EAAE,SAAS,EAAE,qBAAqB,CAAC,CAAC;IAEzF,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,uBAAuB,KAAK,CAAC,WAAW,EAAE,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;AAC3F,CAAC;AAED;;;;;;;;GAQG;AACH,SAAgB,0BAA0B,CAAuB,SAAmB;IAClF,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,MAAM,aAAa,GAAa,EAAE,CAAC;IACnC,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;wBAC3C,wBAAwB,QAAQ,mBAAmB,GAAG,GAAG,CAC5D,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;QAC5E,iFAAiF,CACpF,CAAC;IAEF,OAAO,gBAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;AAC/B,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,KAAK,UAAU,YAAY,CAEzB,UAAyB,EACzB,QAAgB,EAChB,mBAA4B;IAE5B,MAAM,SAAS,GAAa,gBAAC,CAAC,OAAO,CAAC;QACpC,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,CAAC,CAAC;IACH,IAAI,UAAU,GAAG,CAAC,CAAC;IACnB,OAAO,CAAC,MAAM,IAAA,wBAAa,EAAC,QAAQ,EAAE,yBAAyB,EAAE,KAAK,IAAI,EAAE;QAC1E,wBAAwB,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,0BAA0B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,SAAS,CAAC,CAAC;QACxE,IAAI,CAAC,GAAG,CAAC,KAAK,CACZ,oCAAoC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,UAAU,GAAG,CAAC,OAAO,QAAQ,GAAG,CACxG,CAAC;QACF,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,IACE,CAAC,OAAO,CAAC,QAAQ;gBACjB,CAAC,CAAC,OAAO,CAAC,mBAAmB,IAAI,OAAO,CAAC,QAAQ,KAAK,gBAAgB,CAAC,EACvE,CAAC;gBACD,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,CACZ,oCAAoC,UAAU,iCAAiC,CAChF,CAAC;gBACJ,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,qDAAqD,CAAC,CAAC;gBACxE,CAAC;YACH,CAAC;YAAC,OAAO,GAAQ,EAAE,CAAC;gBAClB,IACE,CAAC,CAAC,oCAAuB,EAAE,wCAA2B,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,KAAK,GAAG,CAAC,OAAO,CAAC,EAC1F,CAAC;oBACD,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;gBAC5B,CAAC;gBACD,IAAI,CAAC,GAAG,CAAC,IAAI,CACX,mBAAmB,iBAAiB,4BAA4B,GAAG,CAAC,OAAO,EAAE,CAC9E,CAAC;YACJ,CAAC;QACH,CAAC;QACD,UAAU,EAAE,CAAC;QACb,MAAM,IAAI,KAAK,CACb,mGAAmG,CACpG,CAAC;IACJ,CAAC,CAAC,CAAqB,CAAC;AAC1B,CAAC;AAED;;;;;;;;;GASG;AACH,SAAS,aAAa,CAEpB,QAAiB,EACjB,aAA4B,IAAI,EAChC,sBAA+B,KAAK;IAEpC,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,IACE,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,EACzE,CAAC;gBACD,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;;;;;;;;;;GAUG;AACH,SAAS,YAAY,CAAC,QAAwB;IAC5C,MAAM,gBAAgB,GAAG,IAAA,wCAAmB,EAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;IAC7D,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAClC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,gBAAgB,CAAC,CAAC;IAC7C,MAAM,YAAY,GAAG,IAAI,GAAG,CAAC,gBAAC,CAAC,MAAM,CAAC,IAAA,+BAAU,EAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC;IACxF,IAAI,YAAY,CAAC,IAAI,KAAK,CAAC,EAAE,CAAC;QAC5B,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,mBAAmB,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAClF,MAAM,kBAAkB,GAAG,CAAC,GAAG,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAChF,IAAI,mBAAmB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACrC,QAAQ,CAAC,GAAG,CAAC,IAAI,CACf,wEAAwE;YACtE,IAAI,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,6BAA6B,CACjE,CAAC;QACF,OAAO,IAAI,CAAC;IACd,CAAC;IACD,IAAI,kBAAkB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAClC,QAAQ,CAAC,GAAG,CAAC,KAAK,CAChB,kCAAkC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;YACjE,GAAG,cAAI,CAAC,SAAS,CAAC,KAAK,EAAE,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,6BAA6B,CAC1F,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;GAIG;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"}
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAMvD;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,GAAG,EAAO,EAChB,MAAM,GAAE,MAAM,EAAO,GACpB,OAAO,CAAC,GAAG,CAAC,
|
|
1
|
+
{"version":3,"file":"execute.d.ts","sourceRoot":"","sources":["../../../lib/mixins/execute.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAMvD;;;;;;;;GAQG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,GAAG,EAAO,EAChB,MAAM,GAAE,MAAM,EAAO,GACpB,OAAO,CAAC,GAAG,CAAC,CAQd;AAED;;;;;;;;;;GAUG;AACH,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,MAAM,EACZ,IAAI,GAAE,GAAG,EAAO,EAChB,MAAM,GAAE,MAAM,EAAO,GACpB,OAAO,CAAC,GAAG,CAAC,CA2Fd;AAED;;;;;;;;GAQG;AACH,wBAAsB,OAAO,CAC3B,IAAI,EAAE,cAAc,EACpB,OAAO,EAAE,MAAM,EAEf,QAAQ,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC,GAAG,CAAC,CAoBd;AAED;;;;;;;;;GASG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,cAAc,EACpB,QAAQ,EAAE,MAAM,EAChB,EAAE,EAAE,MAAM,EACV,IAAI,CAAC,EAAE,GAAG,EAAE,GACX,OAAO,CAAC,GAAG,CAAC,CAqBd"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.executeAtom = executeAtom;
|
|
7
4
|
exports.executeAtomAsync = executeAtomAsync;
|
|
@@ -12,7 +9,6 @@ const utils_1 = require("../utils");
|
|
|
12
9
|
const atoms_1 = require("../atoms");
|
|
13
10
|
const support_1 = require("@appium/support");
|
|
14
11
|
const asyncbox_1 = require("asyncbox");
|
|
15
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
16
12
|
const property_accessors_1 = require("./property-accessors");
|
|
17
13
|
/* How many milliseconds to wait for webkit to return a response before timing out */
|
|
18
14
|
const RPC_RESPONSE_TIMEOUT_MS = 5000;
|
|
@@ -29,9 +25,7 @@ async function executeAtom(atom, args = [], frames = []) {
|
|
|
29
25
|
this.log.debug(`Executing atom '${atom}' with 'args=${JSON.stringify(args)}; frames=${frames}'`);
|
|
30
26
|
const script = await (0, atoms_1.getScriptForAtom)(atom, args, frames);
|
|
31
27
|
const value = await this.execute(script);
|
|
32
|
-
this.log.debug(`Received result for atom '${atom}' execution: ${
|
|
33
|
-
length: utils_1.RESPONSE_LOG_LENGTH,
|
|
34
|
-
})}`);
|
|
28
|
+
this.log.debug(`Received result for atom '${atom}' execution: ${(0, utils_1.truncateString)((0, utils_1.simpleStringify)(value), utils_1.RESPONSE_LOG_LENGTH)}`);
|
|
35
29
|
return value;
|
|
36
30
|
}
|
|
37
31
|
/**
|
|
@@ -145,7 +139,7 @@ override) {
|
|
|
145
139
|
}
|
|
146
140
|
const rpcClient = this.requireRpcClient(true);
|
|
147
141
|
await rpcClient.waitForPage(appIdKey, pageIdKey);
|
|
148
|
-
this.log.debug(`Sending javascript command: '${
|
|
142
|
+
this.log.debug(`Sending javascript command: '${(0, utils_1.truncateString)(command, 50)}'`);
|
|
149
143
|
const res = await rpcClient.send('Runtime.evaluate', {
|
|
150
144
|
expression: command,
|
|
151
145
|
returnByValue: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"execute.js","sourceRoot":"","sources":["../../../lib/mixins/execute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handlers.d.ts","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"message-handlers.d.ts","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AACvD,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,eAAe,CAAC;AAQhD;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,YAAY,GACrB,OAAO,CAAC,IAAI,CAAC,CAiCf;AAED;;;;;;;GAOG;AACH,wBAAsB,YAAY,CAChC,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAIf;AAED;;;;;;;;;GASG;AACH,wBAAgB,eAAe,CAC7B,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,IAAI,EAAE,YAAY,GACjB,IAAI,CAoBN;AAED;;;;;;;GAOG;AACH,wBAAsB,WAAW,CAC/B,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAGf;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,OAAO,EAAE,YAAY,GACpB,IAAI,CAGN;AAED;;;;;;;;;GASG;AACH,wBAAgB,cAAc,CAC5B,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,KAAK,EAAE,YAAY,GAClB,IAAI,CAON;AAED;;;;;;;GAOG;AACH,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,cAAc,EACpB,GAAG,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,EAC7B,IAAI,EAAE,YAAY,GACjB,OAAO,CAAC,IAAI,CAAC,CAef;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CA6B5F"}
|
|
@@ -1,7 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
3
|
exports.onPageChange = onPageChange;
|
|
7
4
|
exports.onAppConnect = onAppConnect;
|
|
@@ -13,7 +10,6 @@ exports.onConnectedApplicationList = onConnectedApplicationList;
|
|
|
13
10
|
exports.getDebuggerAppKey = getDebuggerAppKey;
|
|
14
11
|
const events_1 = require("./events");
|
|
15
12
|
const utils_1 = require("../utils");
|
|
16
|
-
const lodash_1 = __importDefault(require("lodash"));
|
|
17
13
|
const property_accessors_1 = require("./property-accessors");
|
|
18
14
|
/*
|
|
19
15
|
* Generic callbacks used throughout the lifecycle of the Remote Debugger.
|
|
@@ -29,7 +25,7 @@ const property_accessors_1 = require("./property-accessors");
|
|
|
29
25
|
* @param pageDict - Dictionary containing the new page information.
|
|
30
26
|
*/
|
|
31
27
|
async function onPageChange(err, appIdKey, pageDict) {
|
|
32
|
-
if (
|
|
28
|
+
if ((0, utils_1.isEmpty)(pageDict)) {
|
|
33
29
|
return;
|
|
34
30
|
}
|
|
35
31
|
const currentPages = (0, utils_1.pageArrayFromDict)(pageDict);
|
|
@@ -37,7 +33,7 @@ async function onPageChange(err, appIdKey, pageDict) {
|
|
|
37
33
|
if ((0, property_accessors_1.getAppDict)(this)[appIdKey]) {
|
|
38
34
|
const previousPages = (0, property_accessors_1.getAppDict)(this)[appIdKey].pageArray;
|
|
39
35
|
// we have a pre-existing pageDict
|
|
40
|
-
if (previousPages &&
|
|
36
|
+
if (previousPages && (0, utils_1.deepEqual)(previousPages, currentPages)) {
|
|
41
37
|
this.log.debug(`Received page change notice for app '${appIdKey}' ` +
|
|
42
38
|
`but the listing has not changed. Ignoring.`);
|
|
43
39
|
return;
|
|
@@ -90,7 +86,7 @@ function onAppDisconnect(err, dict) {
|
|
|
90
86
|
this.log.debug(`No longer have app id. Attempting to find new one.`);
|
|
91
87
|
(0, property_accessors_1.setAppIdKey)(this, getDebuggerAppKey.bind(this)((0, property_accessors_1.getBundleId)(this)));
|
|
92
88
|
}
|
|
93
|
-
if (
|
|
89
|
+
if ((0, utils_1.isEmpty)((0, property_accessors_1.getAppDict)(this))) {
|
|
94
90
|
// this means we no longer have any apps. what the what?
|
|
95
91
|
this.log.debug('Main app disconnected. Disconnecting altogether.');
|
|
96
92
|
this.emit(events_1.events.EVENT_DISCONNECT, true);
|
|
@@ -145,11 +141,11 @@ function onCurrentState(err, state) {
|
|
|
145
141
|
* @param apps - Dictionary containing the connected applications list.
|
|
146
142
|
*/
|
|
147
143
|
async function onConnectedApplicationList(err, apps) {
|
|
148
|
-
this.log.debug(`Received connected applications list: ${
|
|
144
|
+
this.log.debug(`Received connected applications list: ${Object.keys(apps).join(', ')}`);
|
|
149
145
|
// translate the received information into an easier-to-manage
|
|
150
146
|
// hash with app id as key, and app info as value
|
|
151
147
|
const newDict = {};
|
|
152
|
-
for (const dict of
|
|
148
|
+
for (const dict of Object.values(apps)) {
|
|
153
149
|
const [id, entry] = (0, utils_1.appInfoFromDict)(dict);
|
|
154
150
|
if ((0, property_accessors_1.getSkippedApps)(this).includes(entry.name)) {
|
|
155
151
|
continue;
|
|
@@ -157,7 +153,7 @@ async function onConnectedApplicationList(err, apps) {
|
|
|
157
153
|
newDict[id] = entry;
|
|
158
154
|
}
|
|
159
155
|
// update the object's list of apps
|
|
160
|
-
|
|
156
|
+
Object.assign((0, property_accessors_1.getAppDict)(this), (0, utils_1.defaults)((0, property_accessors_1.getAppDict)(this), newDict));
|
|
161
157
|
}
|
|
162
158
|
/**
|
|
163
159
|
* Given a bundle ID, finds the correct remote debugger app identifier key
|
|
@@ -170,7 +166,7 @@ async function onConnectedApplicationList(err, apps) {
|
|
|
170
166
|
*/
|
|
171
167
|
function getDebuggerAppKey(bundleId) {
|
|
172
168
|
let appId;
|
|
173
|
-
for (const [key, data] of
|
|
169
|
+
for (const [key, data] of Object.entries((0, property_accessors_1.getAppDict)(this))) {
|
|
174
170
|
if (data.bundleId === bundleId) {
|
|
175
171
|
appId = key;
|
|
176
172
|
break;
|
|
@@ -180,7 +176,7 @@ function getDebuggerAppKey(bundleId) {
|
|
|
180
176
|
if (appId) {
|
|
181
177
|
this.log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
|
|
182
178
|
let proxyAppId;
|
|
183
|
-
for (const [key, data] of
|
|
179
|
+
for (const [key, data] of Object.entries((0, property_accessors_1.getAppDict)(this))) {
|
|
184
180
|
if (data.isProxy && data.hostId === appId) {
|
|
185
181
|
this.log.debug(`Found separate bundleId '${data.bundleId}' ` +
|
|
186
182
|
`acting as proxy for '${bundleId}', with app id '${key}'`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handlers.js","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"message-handlers.js","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/mixins/misc.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"misc.d.ts","sourceRoot":"","sources":["../../../lib/mixins/misc.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAKvD;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC,CAItE;AAED;;;;;;GAMG;AACH,wBAAsB,aAAa,CACjC,IAAI,EAAE,cAAc,EACpB,EAAE,EAAE,OAAO,UAAU,EAAE,aAAa,GACnC,OAAO,CAAC,GAAG,CAAC,CAOd;AAED;;;GAGG;AACH,wBAAsB,YAAY,CAAC,IAAI,EAAE,cAAc,GAAG,OAAO,CAAC,GAAG,CAAC,CAMrE;AAED;;;;;;GAMG;AACH,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAOzF;AAED;;;;;;;;GAQG;AACH,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,cAAc,EACpB,SAAS,GAAE,MAAa,GACvB,OAAO,CAAC,OAAO,CAAC,CAelB;AAED;;;;;;;GAOG;AACH,wBAAsB,cAAc,CAClC,IAAI,EAAE,cAAc,EACpB,SAAS,GAAE,MAAmC,GAC7C,OAAO,CAAC,IAAI,CAAC,CA6Bf"}
|