appium-remote-debugger 11.2.0 → 11.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +12 -0
- package/build/lib/mixins/connect.d.ts.map +1 -1
- package/build/lib/mixins/connect.js +2 -2
- package/build/lib/mixins/connect.js.map +1 -1
- package/build/lib/mixins/message-handlers.d.ts.map +1 -1
- package/build/lib/mixins/message-handlers.js +1 -1
- package/build/lib/mixins/message-handlers.js.map +1 -1
- package/build/lib/mixins/navigate.d.ts +9 -0
- package/build/lib/mixins/navigate.d.ts.map +1 -1
- package/build/lib/mixins/navigate.js +31 -3
- package/build/lib/mixins/navigate.js.map +1 -1
- package/build/lib/remote-debugger-real-device.d.ts +1 -0
- package/build/lib/remote-debugger-real-device.d.ts.map +1 -1
- package/build/lib/remote-debugger.d.ts +110 -18
- package/build/lib/remote-debugger.d.ts.map +1 -1
- package/build/lib/remote-debugger.js +30 -16
- package/build/lib/remote-debugger.js.map +1 -1
- package/lib/mixins/connect.js +2 -2
- package/lib/mixins/message-handlers.js +1 -1
- package/lib/mixins/navigate.js +35 -3
- package/lib/remote-debugger.js +38 -15
- package/package.json +3 -7
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,15 @@
|
|
|
1
|
+
## [11.3.1](https://github.com/appium/appium-remote-debugger/compare/v11.3.0...v11.3.1) (2024-06-20)
|
|
2
|
+
|
|
3
|
+
### Miscellaneous Chores
|
|
4
|
+
|
|
5
|
+
* Bump chai and chai-as-promised ([#387](https://github.com/appium/appium-remote-debugger/issues/387)) ([3a361e2](https://github.com/appium/appium-remote-debugger/commit/3a361e286168902c957a3bd586ece8c576efee9b))
|
|
6
|
+
|
|
7
|
+
## [11.3.0](https://github.com/appium/appium-remote-debugger/compare/v11.2.0...v11.3.0) (2024-06-19)
|
|
8
|
+
|
|
9
|
+
### Features
|
|
10
|
+
|
|
11
|
+
* support pageLoadStrategy in readState check ([#385](https://github.com/appium/appium-remote-debugger/issues/385)) ([d20ba70](https://github.com/appium/appium-remote-debugger/commit/d20ba70ab2d6dd351ee98e25f09b5d7e4226210e))
|
|
12
|
+
|
|
1
13
|
## [11.2.0](https://github.com/appium/appium-remote-debugger/compare/v11.1.5...v11.2.0) (2024-06-19)
|
|
2
14
|
|
|
3
15
|
### Features
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":";;;;;;;;;;;;cAoBc,MAAM;cACN,OAAO,MAAM,EAAE,GAAG,CAAC;;;QAKnB,MAAM;cACN,MAAM;;AATpB;;;;GAIG;AAEH;;;;GAIG;AAGH;;;GAGG;AACH,6FASC;AAED;;;GAGG;AACH,qHA2CC;AAED;;;;GAIG;AACH,yEAFa,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AACH,oFALW,MAAM,oFAGJ,QAAQ,QAAQ,EAAE,CAAC,CA0D/B;;IAhED;;;;;;;OAOG;IACH,qEALW,MAAM,mFA6DhB;IAhCK,cAAwB;;AAkC9B;;;;;;;GAOG;AACH,sFALW,MAAM,mBACN,MAAM,uBACN,OAAO,GACL,QAAQ,QAAQ,QAAE,CA0D9B;AAED;;;;;;;GAOG;AACH,qFALW,OAAO,MAAM,EAAE,GAAG,CAAC,eACnB,MAAM,qDAEJ,QAAQ,QAgBpB;AAED;;;;;;;GAOG;AACH,kFALW,MAAM,aACN,MAAM,yCAEJ,QAAQ,IAAI,CAAC,CAqBzB;;IA3BD;;;;;;;OAOG;IACH,kEALW,MAAM,aACN,MAAM,wCAuBhB;IAlBC,iBAAiC;IACjC,kBAA0B;;AAyD5B;;;;;GAKG;AACH,sFAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAsBhB;;IA1BD;;;;;OAKG;IACH,8DAHW,OAAO,MAAM,EAAE,GAAG,CAAC,EAuB7B;IAjBC,6BAAiC;IAe/B,
|
|
1
|
+
{"version":3,"file":"connect.d.ts","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":";;;;;;;;;;;;cAoBc,MAAM;cACN,OAAO,MAAM,EAAE,GAAG,CAAC;;;QAKnB,MAAM;cACN,MAAM;;AATpB;;;;GAIG;AAEH;;;;GAIG;AAGH;;;GAGG;AACH,6FASC;AAED;;;GAGG;AACH,qHA2CC;AAED;;;;GAIG;AACH,yEAFa,QAAQ,IAAI,CAAC,CAQzB;AAED;;;;;;;GAOG;AACH,oFALW,MAAM,oFAGJ,QAAQ,QAAQ,EAAE,CAAC,CA0D/B;;IAhED;;;;;;;OAOG;IACH,qEALW,MAAM,mFA6DhB;IAhCK,cAAwB;;AAkC9B;;;;;;;GAOG;AACH,sFALW,MAAM,mBACN,MAAM,uBACN,OAAO,GACL,QAAQ,QAAQ,QAAE,CA0D9B;AAED;;;;;;;GAOG;AACH,qFALW,OAAO,MAAM,EAAE,GAAG,CAAC,eACnB,MAAM,qDAEJ,QAAQ,QAgBpB;AAED;;;;;;;GAOG;AACH,kFALW,MAAM,aACN,MAAM,yCAEJ,QAAQ,IAAI,CAAC,CAqBzB;;IA3BD;;;;;;;OAOG;IACH,kEALW,MAAM,aACN,MAAM,wCAuBhB;IAlBC,iBAAiC;IACjC,kBAA0B;;AAyD5B;;;;;GAKG;AACH,sFAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAsBhB;;IA1BD;;;;;OAKG;IACH,8DAHW,OAAO,MAAM,EAAE,GAAG,CAAC,EAuB7B;IAjBC,6BAAiC;IAe/B,6BAAsF"}
|
|
@@ -172,7 +172,7 @@ async function searchForApp(currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
172
172
|
throw new Error('rpcClient is undefined. Is the debugger connected?');
|
|
173
173
|
}
|
|
174
174
|
logApplicationDictionary(this.appDict);
|
|
175
|
-
const possibleAppIds = (0, utils_1.getPossibleDebuggerAppKeys)(bundleIds, this.appDict);
|
|
175
|
+
const possibleAppIds = (0, utils_1.getPossibleDebuggerAppKeys)(/** @type {string[]} */ (bundleIds), this.appDict);
|
|
176
176
|
logger_1.default.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
|
|
177
177
|
for (const attemptedAppIdKey of possibleAppIds) {
|
|
178
178
|
try {
|
|
@@ -320,7 +320,7 @@ function updateAppsWithDict(dict) {
|
|
|
320
320
|
}
|
|
321
321
|
// try to get the app id from our connected apps
|
|
322
322
|
if (!this.appIdKey) {
|
|
323
|
-
this.appIdKey = (0, utils_1.getDebuggerAppKey)(this.bundleId, this.appDict);
|
|
323
|
+
this.appIdKey = (0, utils_1.getDebuggerAppKey)(/** @type {string} */ (this.bundleId), this.appDict);
|
|
324
324
|
}
|
|
325
325
|
}
|
|
326
326
|
exports.default = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"connect.js","sourceRoot":"","sources":["../../../lib/mixins/connect.js"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handlers.d.ts","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.js"],"names":[],"mappings":";;;;;;;;;;AAWA;;;;;;GAMG;AACH,+EALW,KAAK,mBACL,MAAM,YACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,QAAQ,IAAI,CAAC,CA6CzB;AAED;;;;;GAKG;AACH,+EAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,QAAQ,IAAI,CAAC,CAYzB;AAED;;;;;GAKG;AACH,kFAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAuBhB;;IA3BD;;;;;OAKG;IACH,6DAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,EAwB7B;IATG,
|
|
1
|
+
{"version":3,"file":"message-handlers.d.ts","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.js"],"names":[],"mappings":";;;;;;;;;;AAWA;;;;;;GAMG;AACH,+EALW,KAAK,mBACL,MAAM,YACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,QAAQ,IAAI,CAAC,CA6CzB;AAED;;;;;GAKG;AACH,+EAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,QAAQ,IAAI,CAAC,CAYzB;AAED;;;;;GAKG;AACH,kFAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAuBhB;;IA3BD;;;;;OAKG;IACH,6DAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,EAwB7B;IATG,6BAAsF;IAMtF,+BAAsB;;AAK1B;;;;;GAKG;AACH,8EAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,QAAQ,IAAI,CAAC,CAUzB;AAED;;;;;GAKG;AACH,wFAJW,KAAK,kBACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAKhB;;IATD;;;;;OAKG;IACH,6DAJW,KAAK,kBACL,OAAO,MAAM,EAAE,GAAG,CAAC,EAM7B;IAFC,sBAAsD;;AAIxD;;;;;GAKG;AACH,iFAJW,KAAK,gBACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,IAAI,CAOhB;;IAXD;;;;;OAKG;IACH,6DAJW,KAAK,gBACL,OAAO,MAAM,EAAE,GAAG,CAAC,EAQ7B;IAJC,kBAAsD;;AAMxD;;;;;GAKG;AACH,6FAJW,KAAK,eACL,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,QAAQ,IAAI,CAAC,CAuBzB"}
|
|
@@ -93,7 +93,7 @@ function onAppDisconnect(err, dict) {
|
|
|
93
93
|
// if the disconnected app is the one we are connected to, try to find another
|
|
94
94
|
if (this.appIdKey === appIdKey) {
|
|
95
95
|
logger_1.default.debug(`No longer have app id. Attempting to find new one.`);
|
|
96
|
-
this.appIdKey = (0, utils_1.getDebuggerAppKey)(this.bundleId, this.appDict);
|
|
96
|
+
this.appIdKey = (0, utils_1.getDebuggerAppKey)(/** @type {string} */ (this.bundleId), this.appDict);
|
|
97
97
|
}
|
|
98
98
|
if (!this.appDict) {
|
|
99
99
|
// this means we no longer have any apps. what the what?
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"message-handlers.js","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.js"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"message-handlers.js","sourceRoot":"","sources":["../../../lib/mixins/message-handlers.js"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ declare namespace _default {
|
|
|
4
4
|
export { waitForDom };
|
|
5
5
|
export { checkPageIsReady };
|
|
6
6
|
export { navToUrl };
|
|
7
|
+
export { isPageLoadingCompleted };
|
|
7
8
|
}
|
|
8
9
|
export default _default;
|
|
9
10
|
/**
|
|
@@ -58,6 +59,14 @@ declare class navToUrl {
|
|
|
58
59
|
pageLoadDelay: B<void>;
|
|
59
60
|
pageLoading: boolean;
|
|
60
61
|
}
|
|
62
|
+
/**
|
|
63
|
+
* Return if current readState can be handles as page load completes
|
|
64
|
+
* for the given page load strategy.
|
|
65
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
66
|
+
* @param {string} readyState
|
|
67
|
+
* @returns {boolean}
|
|
68
|
+
*/
|
|
69
|
+
declare function isPageLoadingCompleted(this: import("../remote-debugger").default, readyState: string): boolean;
|
|
61
70
|
import { timing } from '@appium/support';
|
|
62
71
|
import B from 'bluebird';
|
|
63
72
|
//# sourceMappingURL=navigate.d.ts.map
|
|
@@ -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":";;;;;;;;;AAuBA;;;GAGG;AACH,4EAFa,IAAI,CAIhB;AAED;;;GAGG;AACH,6EAFa,IAAI,CAQhB;;IAJC,qBAAwB;;AA4B1B;;;;GAIG;AACH,4FAHW,OAAO,KAAK,GAAC,IAAI,GAAC,SAAS,GACzB,QAAQ,IAAI,CAAC,CAgEzB;;IAnED;;;;OAIG;IACH,4EAHW,OAAO,KAAK,GAAC,IAAI,GAAC,SAAS,EAiErC;IArDC,qBAAuB;IACvB,uBAA8D;;AAsDhE;;;;GAIG;AACH,+GAFa,QAAQ,OAAO,CAAC,CAmB5B;AAED;;;;GAIG;AACH,2EAHW,MAAM,GACJ,QAAQ,IAAI,CAAC,CA0HzB;;IA7HD;;;;OAIG;IACH,6DAHW,MAAM,EA2HhB;IA7GC,2BAA6B;IAS7B,uBAA8D;IAC9D,qBAAuB;;AA7IzB;;;;;;GAMG;AACH,gGAHW,MAAM,GACJ,OAAO,CAenB;uBA5D4B,iBAAiB;cAEhC,UAAU"}
|
|
@@ -15,6 +15,14 @@ const DEFAULT_PAGE_READINESS_TIMEOUT_MS = 20 * 1000;
|
|
|
15
15
|
const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
16
16
|
const PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS = 1000;
|
|
17
17
|
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
|
|
18
|
+
/**
|
|
19
|
+
* pageLoadStrategy in WebDriver definitions.
|
|
20
|
+
*/
|
|
21
|
+
const PAGE_LOAD_STRATEGY = {
|
|
22
|
+
EAGER: 'eager',
|
|
23
|
+
NONE: 'none',
|
|
24
|
+
NORMAL: 'normal'
|
|
25
|
+
};
|
|
18
26
|
/**
|
|
19
27
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
20
28
|
* @returns {void}
|
|
@@ -33,6 +41,25 @@ function cancelPageLoad() {
|
|
|
33
41
|
this.pageLoadDelay.cancel();
|
|
34
42
|
}
|
|
35
43
|
}
|
|
44
|
+
/**
|
|
45
|
+
* Return if current readState can be handles as page load completes
|
|
46
|
+
* for the given page load strategy.
|
|
47
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
48
|
+
* @param {string} readyState
|
|
49
|
+
* @returns {boolean}
|
|
50
|
+
*/
|
|
51
|
+
function isPageLoadingCompleted(readyState) {
|
|
52
|
+
const _pageLoadStrategy = lodash_1.default.toLower(this.pageLoadStrategy);
|
|
53
|
+
if (_pageLoadStrategy === PAGE_LOAD_STRATEGY.NONE) {
|
|
54
|
+
return true;
|
|
55
|
+
}
|
|
56
|
+
if (_pageLoadStrategy === PAGE_LOAD_STRATEGY.EAGER) {
|
|
57
|
+
// This could include 'interactive' or 'complete'
|
|
58
|
+
return readyState !== 'loading';
|
|
59
|
+
}
|
|
60
|
+
// Default behavior. It includes pageLoadStrategy is 'normal' as well.
|
|
61
|
+
return readyState === 'complete';
|
|
62
|
+
}
|
|
36
63
|
/**
|
|
37
64
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
38
65
|
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
@@ -108,8 +135,9 @@ async function checkPageIsReady(timeoutMs) {
|
|
|
108
135
|
try {
|
|
109
136
|
const readyState = await bluebird_1.default.resolve(this.execute(readyCmd, true))
|
|
110
137
|
.timeout(timeoutMs ?? this.pageReadyTimeout);
|
|
111
|
-
logger_1.default.debug(`Document readyState is '${readyState}'`
|
|
112
|
-
|
|
138
|
+
logger_1.default.debug(`Document readyState is '${readyState}'. ` +
|
|
139
|
+
`The pageLoadStrategy is '${this.pageLoadStrategy || PAGE_LOAD_STRATEGY.NORMAL}'`);
|
|
140
|
+
return this.isPageLoadingCompleted(readyState);
|
|
113
141
|
}
|
|
114
142
|
catch (err) {
|
|
115
143
|
if (!(err instanceof bluebird_1.default.TimeoutError)) {
|
|
@@ -242,5 +270,5 @@ async function navToUrl(url) {
|
|
|
242
270
|
throw err;
|
|
243
271
|
}
|
|
244
272
|
}
|
|
245
|
-
exports.default = { frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl };
|
|
273
|
+
exports.default = { frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl, isPageLoadingCompleted };
|
|
246
274
|
//# sourceMappingURL=navigate.js.map
|
|
@@ -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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger-real-device.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger-real-device.js"],"names":[],"mappings":"AAIA;
|
|
1
|
+
{"version":3,"file":"remote-debugger-real-device.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger-real-device.js"],"names":[],"mappings":"AAIA;IACE,uBAMC;IAHC,UAAqB;IAErB,uBAAiC;CAmBpC;2BA7B0B,mBAAmB"}
|
|
@@ -4,7 +4,95 @@ export class RemoteDebugger extends EventEmitter<[never]> {
|
|
|
4
4
|
static EVENT_PAGE_CHANGE: string;
|
|
5
5
|
/** @type {string} */
|
|
6
6
|
static EVENT_DISCONNECT: string;
|
|
7
|
-
|
|
7
|
+
/** @type {string} */
|
|
8
|
+
static EVENT_FRAMES_DETACHED: string;
|
|
9
|
+
/**
|
|
10
|
+
* @typedef {Object} RemoteDebuggerOptions
|
|
11
|
+
* @property {string} [bundleId] id of the app being connected to
|
|
12
|
+
* @property {string[]} [additionalBundleIds=[]] array of possible bundle
|
|
13
|
+
* ids that the inspector could return
|
|
14
|
+
* @property {string} [platformVersion] version of iOS
|
|
15
|
+
* @property {boolean} [isSafari=true]
|
|
16
|
+
* @property {boolean} [includeSafari=false]
|
|
17
|
+
* @property {boolean} [useNewSafari=false] for web inspector, whether this is a new Safari instance
|
|
18
|
+
* @property {number} [pageLoadMs] the time, in ms, that should be waited for page loading
|
|
19
|
+
* @property {string} [host] the remote debugger's host address
|
|
20
|
+
* @property {number} [port=REMOTE_DEBUGGER_PORT] the remote debugger port through which to communicate
|
|
21
|
+
* @property {string} [socketPath]
|
|
22
|
+
* @property {number} [pageReadyTimeout=PAGE_READY_TIMEOUT]
|
|
23
|
+
* @property {string} [remoteDebugProxy]
|
|
24
|
+
* @property {boolean} [garbageCollectOnExecute=false]
|
|
25
|
+
* @property {boolean} [logFullResponse=false]
|
|
26
|
+
* @property {boolean} [logAllCommunication=false] log plists sent and received from Web Inspector
|
|
27
|
+
* @property {boolean} [logAllCommunicationHexDump=false] log communication from Web Inspector as hex dump
|
|
28
|
+
* @property {number} [webInspectorMaxFrameLength] The maximum size in bytes of a single data
|
|
29
|
+
* frame in the device communication protocol
|
|
30
|
+
* @property {number} [socketChunkSize] size, in bytes, of chunks of data sent to
|
|
31
|
+
* Web Inspector (real device only)
|
|
32
|
+
* @property {boolean} [fullPageInitialization]
|
|
33
|
+
* @property {string} [pageLoadStrategy]
|
|
34
|
+
*/
|
|
35
|
+
/**
|
|
36
|
+
* @param {RemoteDebuggerOptions} opts
|
|
37
|
+
*/
|
|
38
|
+
constructor(opts?: {
|
|
39
|
+
/**
|
|
40
|
+
* id of the app being connected to
|
|
41
|
+
*/
|
|
42
|
+
bundleId?: string | undefined;
|
|
43
|
+
/**
|
|
44
|
+
* array of possible bundle
|
|
45
|
+
* ids that the inspector could return
|
|
46
|
+
*/
|
|
47
|
+
additionalBundleIds?: string[] | undefined;
|
|
48
|
+
/**
|
|
49
|
+
* version of iOS
|
|
50
|
+
*/
|
|
51
|
+
platformVersion?: string | undefined;
|
|
52
|
+
isSafari?: boolean | undefined;
|
|
53
|
+
includeSafari?: boolean | undefined;
|
|
54
|
+
/**
|
|
55
|
+
* for web inspector, whether this is a new Safari instance
|
|
56
|
+
*/
|
|
57
|
+
useNewSafari?: boolean | undefined;
|
|
58
|
+
/**
|
|
59
|
+
* the time, in ms, that should be waited for page loading
|
|
60
|
+
*/
|
|
61
|
+
pageLoadMs?: number | undefined;
|
|
62
|
+
/**
|
|
63
|
+
* the remote debugger's host address
|
|
64
|
+
*/
|
|
65
|
+
host?: string | undefined;
|
|
66
|
+
/**
|
|
67
|
+
* the remote debugger port through which to communicate
|
|
68
|
+
*/
|
|
69
|
+
port?: number | undefined;
|
|
70
|
+
socketPath?: string | undefined;
|
|
71
|
+
pageReadyTimeout?: number | undefined;
|
|
72
|
+
remoteDebugProxy?: string | undefined;
|
|
73
|
+
garbageCollectOnExecute?: boolean | undefined;
|
|
74
|
+
logFullResponse?: boolean | undefined;
|
|
75
|
+
/**
|
|
76
|
+
* log plists sent and received from Web Inspector
|
|
77
|
+
*/
|
|
78
|
+
logAllCommunication?: boolean | undefined;
|
|
79
|
+
/**
|
|
80
|
+
* log communication from Web Inspector as hex dump
|
|
81
|
+
*/
|
|
82
|
+
logAllCommunicationHexDump?: boolean | undefined;
|
|
83
|
+
/**
|
|
84
|
+
* The maximum size in bytes of a single data
|
|
85
|
+
* frame in the device communication protocol
|
|
86
|
+
*/
|
|
87
|
+
webInspectorMaxFrameLength?: number | undefined;
|
|
88
|
+
/**
|
|
89
|
+
* size, in bytes, of chunks of data sent to
|
|
90
|
+
* Web Inspector (real device only)
|
|
91
|
+
*/
|
|
92
|
+
socketChunkSize?: number | undefined;
|
|
93
|
+
fullPageInitialization?: boolean | undefined;
|
|
94
|
+
pageLoadStrategy?: string | undefined;
|
|
95
|
+
});
|
|
8
96
|
/** @type {any[]|undefined} */
|
|
9
97
|
_skippedApps: any[] | undefined;
|
|
10
98
|
/** @type {Record<string, any>} */
|
|
@@ -23,6 +111,8 @@ export class RemoteDebugger extends EventEmitter<[never]> {
|
|
|
23
111
|
navigationDelay: B<void>;
|
|
24
112
|
/** @type {import('./rpc/rpc-client').default?} */
|
|
25
113
|
rpcClient: import('./rpc/rpc-client').default | null;
|
|
114
|
+
/** @type {string|undefined} */
|
|
115
|
+
pageLoadStrategy: string | undefined;
|
|
26
116
|
/** @type {() => Promise<void>} */
|
|
27
117
|
setConnectionKey: () => Promise<void>;
|
|
28
118
|
/** @type {() => Promise<void>} */
|
|
@@ -41,6 +131,8 @@ export class RemoteDebugger extends EventEmitter<[never]> {
|
|
|
41
131
|
execute: (command: string, override?: boolean) => Promise<any>;
|
|
42
132
|
/** @type {(command: string, args?: any[], frames?: string[]) => Promise<any>} */
|
|
43
133
|
executeAtom: (command: string, args?: any[], frames?: string[]) => Promise<any>;
|
|
134
|
+
/** @type {(readyState: string) => boolean} */
|
|
135
|
+
isPageLoadingCompleted: (readyState: string) => boolean;
|
|
44
136
|
/** @type {(err: Error?, appIdKey: string, pageDict: Record<string, any>) => Promise<void>} */
|
|
45
137
|
onPageChange: (err: Error | null, appIdKey: string, pageDict: Record<string, any>) => Promise<void>;
|
|
46
138
|
/** @type {(err: Error?, apps: Record<string, any>) => Promise<void>} */
|
|
@@ -57,24 +149,24 @@ export class RemoteDebugger extends EventEmitter<[never]> {
|
|
|
57
149
|
onCurrentState: (err: Error | null, state: Record<string, any>) => void;
|
|
58
150
|
/** @type {(err: Error?, state: Record<string, any>) => void} */
|
|
59
151
|
frameDetached: (err: Error | null, state: Record<string, any>) => void;
|
|
60
|
-
bundleId:
|
|
61
|
-
additionalBundleIds:
|
|
62
|
-
platformVersion:
|
|
63
|
-
isSafari:
|
|
64
|
-
includeSafari:
|
|
65
|
-
useNewSafari:
|
|
66
|
-
pageLoadMs:
|
|
67
|
-
garbageCollectOnExecute:
|
|
68
|
-
host:
|
|
69
|
-
port:
|
|
70
|
-
socketPath:
|
|
71
|
-
remoteDebugProxy:
|
|
72
|
-
pageReadyTimeout:
|
|
152
|
+
bundleId: string | undefined;
|
|
153
|
+
additionalBundleIds: string[];
|
|
154
|
+
platformVersion: string | undefined;
|
|
155
|
+
isSafari: boolean;
|
|
156
|
+
includeSafari: boolean;
|
|
157
|
+
useNewSafari: boolean;
|
|
158
|
+
pageLoadMs: number | undefined;
|
|
159
|
+
garbageCollectOnExecute: boolean;
|
|
160
|
+
host: string | undefined;
|
|
161
|
+
port: number;
|
|
162
|
+
socketPath: string | undefined;
|
|
163
|
+
remoteDebugProxy: string | undefined;
|
|
164
|
+
pageReadyTimeout: number;
|
|
73
165
|
logAllCommunication: boolean;
|
|
74
|
-
logAllCommunicationHexDump:
|
|
75
|
-
socketChunkSize:
|
|
76
|
-
webInspectorMaxFrameLength:
|
|
77
|
-
fullPageInitialization:
|
|
166
|
+
logAllCommunicationHexDump: boolean;
|
|
167
|
+
socketChunkSize: number | undefined;
|
|
168
|
+
webInspectorMaxFrameLength: number | undefined;
|
|
169
|
+
fullPageInitialization: boolean | undefined;
|
|
78
170
|
_lock: AsyncLock;
|
|
79
171
|
setup(): void;
|
|
80
172
|
appIdKey: any;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":";AAqBA;
|
|
1
|
+
{"version":3,"file":"remote-debugger.d.ts","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":"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"}
|
|
@@ -22,27 +22,40 @@ exports.RPC_RESPONSE_TIMEOUT_MS = RPC_RESPONSE_TIMEOUT_MS;
|
|
|
22
22
|
const PAGE_READY_TIMEOUT = 5000;
|
|
23
23
|
const GARBAGE_COLLECT_TIMEOUT = 5000;
|
|
24
24
|
class RemoteDebugger extends events_1.EventEmitter {
|
|
25
|
-
|
|
26
|
-
*
|
|
27
|
-
*
|
|
28
|
-
*
|
|
29
|
-
*
|
|
30
|
-
*
|
|
31
|
-
*
|
|
32
|
-
*
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
39
|
-
*
|
|
25
|
+
/**
|
|
26
|
+
* @typedef {Object} RemoteDebuggerOptions
|
|
27
|
+
* @property {string} [bundleId] id of the app being connected to
|
|
28
|
+
* @property {string[]} [additionalBundleIds=[]] array of possible bundle
|
|
29
|
+
* ids that the inspector could return
|
|
30
|
+
* @property {string} [platformVersion] version of iOS
|
|
31
|
+
* @property {boolean} [isSafari=true]
|
|
32
|
+
* @property {boolean} [includeSafari=false]
|
|
33
|
+
* @property {boolean} [useNewSafari=false] for web inspector, whether this is a new Safari instance
|
|
34
|
+
* @property {number} [pageLoadMs] the time, in ms, that should be waited for page loading
|
|
35
|
+
* @property {string} [host] the remote debugger's host address
|
|
36
|
+
* @property {number} [port=REMOTE_DEBUGGER_PORT] the remote debugger port through which to communicate
|
|
37
|
+
* @property {string} [socketPath]
|
|
38
|
+
* @property {number} [pageReadyTimeout=PAGE_READY_TIMEOUT]
|
|
39
|
+
* @property {string} [remoteDebugProxy]
|
|
40
|
+
* @property {boolean} [garbageCollectOnExecute=false]
|
|
41
|
+
* @property {boolean} [logFullResponse=false]
|
|
42
|
+
* @property {boolean} [logAllCommunication=false] log plists sent and received from Web Inspector
|
|
43
|
+
* @property {boolean} [logAllCommunicationHexDump=false] log communication from Web Inspector as hex dump
|
|
44
|
+
* @property {number} [webInspectorMaxFrameLength] The maximum size in bytes of a single data
|
|
45
|
+
* frame in the device communication protocol
|
|
46
|
+
* @property {number} [socketChunkSize] size, in bytes, of chunks of data sent to
|
|
47
|
+
* Web Inspector (real device only)
|
|
48
|
+
* @property {boolean} [fullPageInitialization]
|
|
49
|
+
* @property {string} [pageLoadStrategy]
|
|
50
|
+
*/
|
|
51
|
+
/**
|
|
52
|
+
* @param {RemoteDebuggerOptions} opts
|
|
40
53
|
*/
|
|
41
54
|
constructor(opts = {}) {
|
|
42
55
|
super();
|
|
43
56
|
// eslint-disable-next-line @typescript-eslint/no-var-requires
|
|
44
57
|
logger_1.default.info(`Remote Debugger version ${require(path_1.default.resolve((0, utils_1.getModuleRoot)(), 'package.json')).version}`);
|
|
45
|
-
const { bundleId, additionalBundleIds = [], platformVersion, isSafari = true, includeSafari = false, useNewSafari = false, pageLoadMs, host, port = REMOTE_DEBUGGER_PORT, socketPath, pageReadyTimeout = PAGE_READY_TIMEOUT, remoteDebugProxy, garbageCollectOnExecute = false, logFullResponse = false, logAllCommunication = false, logAllCommunicationHexDump = false, webInspectorMaxFrameLength, socketChunkSize, fullPageInitialization, } = opts;
|
|
58
|
+
const { bundleId, additionalBundleIds = [], platformVersion, isSafari = true, includeSafari = false, useNewSafari = false, pageLoadMs, host, port = REMOTE_DEBUGGER_PORT, socketPath, pageReadyTimeout = PAGE_READY_TIMEOUT, remoteDebugProxy, garbageCollectOnExecute = false, logFullResponse = false, logAllCommunication = false, logAllCommunicationHexDump = false, webInspectorMaxFrameLength, socketChunkSize, fullPageInitialization, pageLoadStrategy } = opts;
|
|
46
59
|
this.bundleId = bundleId;
|
|
47
60
|
this.additionalBundleIds = additionalBundleIds;
|
|
48
61
|
this.platformVersion = platformVersion;
|
|
@@ -64,6 +77,7 @@ class RemoteDebugger extends events_1.EventEmitter {
|
|
|
64
77
|
this.webInspectorMaxFrameLength = webInspectorMaxFrameLength;
|
|
65
78
|
}
|
|
66
79
|
this.fullPageInitialization = fullPageInitialization;
|
|
80
|
+
this.pageLoadStrategy = pageLoadStrategy;
|
|
67
81
|
this._lock = new async_lock_1.default();
|
|
68
82
|
}
|
|
69
83
|
setup() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":";;;;;;AAAA,mCAAsC;AACtC,sDAA2B;AAC3B,+BAA2C;AAC3C,mCAAqD;AACrD,qCAA0C;AAC1C,oDAAuB;AACvB,wDAAyB;AACzB,gDAAwB;AACxB,4DAAmC;AAEnC,MAAM,oBAAoB,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"remote-debugger.js","sourceRoot":"","sources":["../../lib/remote-debugger.js"],"names":[],"mappings":"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"}
|
package/lib/mixins/connect.js
CHANGED
|
@@ -192,7 +192,7 @@ async function searchForApp (currentUrl, maxTries, ignoreAboutBlankUrl) {
|
|
|
192
192
|
}
|
|
193
193
|
|
|
194
194
|
logApplicationDictionary(this.appDict);
|
|
195
|
-
const possibleAppIds = getPossibleDebuggerAppKeys(bundleIds, this.appDict);
|
|
195
|
+
const possibleAppIds = getPossibleDebuggerAppKeys(/** @type {string[]} */ (bundleIds), this.appDict);
|
|
196
196
|
log.debug(`Trying out the possible app ids: ${possibleAppIds.join(', ')} (try #${retryCount + 1} of ${maxTries})`);
|
|
197
197
|
for (const attemptedAppIdKey of possibleAppIds) {
|
|
198
198
|
try {
|
|
@@ -353,7 +353,7 @@ function updateAppsWithDict (dict) {
|
|
|
353
353
|
|
|
354
354
|
// try to get the app id from our connected apps
|
|
355
355
|
if (!this.appIdKey) {
|
|
356
|
-
this.appIdKey = getDebuggerAppKey(this.bundleId, this.appDict);
|
|
356
|
+
this.appIdKey = getDebuggerAppKey(/** @type {string} */ (this.bundleId), this.appDict);
|
|
357
357
|
}
|
|
358
358
|
}
|
|
359
359
|
|
|
@@ -97,7 +97,7 @@ function onAppDisconnect (err, dict) {
|
|
|
97
97
|
// if the disconnected app is the one we are connected to, try to find another
|
|
98
98
|
if (this.appIdKey === appIdKey) {
|
|
99
99
|
log.debug(`No longer have app id. Attempting to find new one.`);
|
|
100
|
-
this.appIdKey = getDebuggerAppKey(this.bundleId, this.appDict);
|
|
100
|
+
this.appIdKey = getDebuggerAppKey(/** @type {string} */ (this.bundleId), this.appDict);
|
|
101
101
|
}
|
|
102
102
|
|
|
103
103
|
if (!this.appDict) {
|
package/lib/mixins/navigate.js
CHANGED
|
@@ -12,6 +12,15 @@ const PAGE_READINESS_CHECK_INTERVAL_MS = 50;
|
|
|
12
12
|
const PAGE_READINESS_JS_MIN_CHECK_INTERVAL_MS = 1000;
|
|
13
13
|
const CONSOLE_ENABLEMENT_TIMEOUT_MS = 20 * 1000;
|
|
14
14
|
|
|
15
|
+
/**
|
|
16
|
+
* pageLoadStrategy in WebDriver definitions.
|
|
17
|
+
*/
|
|
18
|
+
const PAGE_LOAD_STRATEGY = {
|
|
19
|
+
EAGER: 'eager',
|
|
20
|
+
NONE: 'none',
|
|
21
|
+
NORMAL: 'normal'
|
|
22
|
+
};
|
|
23
|
+
|
|
15
24
|
/**
|
|
16
25
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
17
26
|
* @returns {void}
|
|
@@ -32,6 +41,28 @@ function cancelPageLoad () {
|
|
|
32
41
|
}
|
|
33
42
|
}
|
|
34
43
|
|
|
44
|
+
/**
|
|
45
|
+
* Return if current readState can be handles as page load completes
|
|
46
|
+
* for the given page load strategy.
|
|
47
|
+
* @this {import('../remote-debugger').RemoteDebugger}
|
|
48
|
+
* @param {string} readyState
|
|
49
|
+
* @returns {boolean}
|
|
50
|
+
*/
|
|
51
|
+
function isPageLoadingCompleted (readyState) {
|
|
52
|
+
const _pageLoadStrategy = _.toLower(this.pageLoadStrategy);
|
|
53
|
+
if (_pageLoadStrategy === PAGE_LOAD_STRATEGY.NONE) {
|
|
54
|
+
return true;
|
|
55
|
+
}
|
|
56
|
+
|
|
57
|
+
if (_pageLoadStrategy === PAGE_LOAD_STRATEGY.EAGER) {
|
|
58
|
+
// This could include 'interactive' or 'complete'
|
|
59
|
+
return readyState !== 'loading';
|
|
60
|
+
}
|
|
61
|
+
|
|
62
|
+
// Default behavior. It includes pageLoadStrategy is 'normal' as well.
|
|
63
|
+
return readyState === 'complete';
|
|
64
|
+
}
|
|
65
|
+
|
|
35
66
|
/**
|
|
36
67
|
* @this {import('../remote-debugger').RemoteDebugger}
|
|
37
68
|
* @param {timing.Timer|null|undefined} startPageLoadTimer
|
|
@@ -113,8 +144,9 @@ async function checkPageIsReady (timeoutMs) {
|
|
|
113
144
|
try {
|
|
114
145
|
const readyState = await B.resolve(this.execute(readyCmd, true))
|
|
115
146
|
.timeout(timeoutMs ?? this.pageReadyTimeout);
|
|
116
|
-
log.debug(`Document readyState is '${readyState}'`
|
|
117
|
-
|
|
147
|
+
log.debug(`Document readyState is '${readyState}'. ` +
|
|
148
|
+
`The pageLoadStrategy is '${this.pageLoadStrategy || PAGE_LOAD_STRATEGY.NORMAL}'`);
|
|
149
|
+
return this.isPageLoadingCompleted(readyState);
|
|
118
150
|
} catch (err) {
|
|
119
151
|
if (!(err instanceof B.TimeoutError)) {
|
|
120
152
|
throw err;
|
|
@@ -251,4 +283,4 @@ async function navToUrl (url) {
|
|
|
251
283
|
}
|
|
252
284
|
}
|
|
253
285
|
|
|
254
|
-
export default {frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl};
|
|
286
|
+
export default {frameDetached, cancelPageLoad, waitForDom, checkPageIsReady, navToUrl, isPageLoadingCompleted};
|
package/lib/remote-debugger.js
CHANGED
|
@@ -39,12 +39,16 @@ class RemoteDebugger extends EventEmitter {
|
|
|
39
39
|
navigationDelay;
|
|
40
40
|
/** @type {import('./rpc/rpc-client').default?} */
|
|
41
41
|
rpcClient;
|
|
42
|
+
/** @type {string|undefined} */
|
|
43
|
+
pageLoadStrategy;
|
|
42
44
|
|
|
43
45
|
// events
|
|
44
46
|
/** @type {string} */
|
|
45
47
|
static EVENT_PAGE_CHANGE;
|
|
46
48
|
/** @type {string} */
|
|
47
49
|
static EVENT_DISCONNECT;
|
|
50
|
+
/** @type {string} */
|
|
51
|
+
static EVENT_FRAMES_DETACHED;
|
|
48
52
|
|
|
49
53
|
// methods
|
|
50
54
|
/** @type {() => Promise<void>} */
|
|
@@ -65,6 +69,8 @@ class RemoteDebugger extends EventEmitter {
|
|
|
65
69
|
execute;
|
|
66
70
|
/** @type {(command: string, args?: any[], frames?: string[]) => Promise<any>} */
|
|
67
71
|
executeAtom;
|
|
72
|
+
/** @type {(readyState: string) => boolean} */
|
|
73
|
+
isPageLoadingCompleted;
|
|
68
74
|
|
|
69
75
|
// Callbacks
|
|
70
76
|
/** @type {(err: Error?, appIdKey: string, pageDict: Record<string, any>) => Promise<void>} */
|
|
@@ -84,21 +90,35 @@ class RemoteDebugger extends EventEmitter {
|
|
|
84
90
|
/** @type {(err: Error?, state: Record<string, any>) => void} */
|
|
85
91
|
frameDetached;
|
|
86
92
|
|
|
87
|
-
|
|
88
|
-
*
|
|
89
|
-
*
|
|
90
|
-
*
|
|
91
|
-
*
|
|
92
|
-
*
|
|
93
|
-
*
|
|
94
|
-
*
|
|
95
|
-
*
|
|
96
|
-
*
|
|
97
|
-
*
|
|
98
|
-
*
|
|
99
|
-
*
|
|
100
|
-
*
|
|
101
|
-
*
|
|
93
|
+
/**
|
|
94
|
+
* @typedef {Object} RemoteDebuggerOptions
|
|
95
|
+
* @property {string} [bundleId] id of the app being connected to
|
|
96
|
+
* @property {string[]} [additionalBundleIds=[]] array of possible bundle
|
|
97
|
+
* ids that the inspector could return
|
|
98
|
+
* @property {string} [platformVersion] version of iOS
|
|
99
|
+
* @property {boolean} [isSafari=true]
|
|
100
|
+
* @property {boolean} [includeSafari=false]
|
|
101
|
+
* @property {boolean} [useNewSafari=false] for web inspector, whether this is a new Safari instance
|
|
102
|
+
* @property {number} [pageLoadMs] the time, in ms, that should be waited for page loading
|
|
103
|
+
* @property {string} [host] the remote debugger's host address
|
|
104
|
+
* @property {number} [port=REMOTE_DEBUGGER_PORT] the remote debugger port through which to communicate
|
|
105
|
+
* @property {string} [socketPath]
|
|
106
|
+
* @property {number} [pageReadyTimeout=PAGE_READY_TIMEOUT]
|
|
107
|
+
* @property {string} [remoteDebugProxy]
|
|
108
|
+
* @property {boolean} [garbageCollectOnExecute=false]
|
|
109
|
+
* @property {boolean} [logFullResponse=false]
|
|
110
|
+
* @property {boolean} [logAllCommunication=false] log plists sent and received from Web Inspector
|
|
111
|
+
* @property {boolean} [logAllCommunicationHexDump=false] log communication from Web Inspector as hex dump
|
|
112
|
+
* @property {number} [webInspectorMaxFrameLength] The maximum size in bytes of a single data
|
|
113
|
+
* frame in the device communication protocol
|
|
114
|
+
* @property {number} [socketChunkSize] size, in bytes, of chunks of data sent to
|
|
115
|
+
* Web Inspector (real device only)
|
|
116
|
+
* @property {boolean} [fullPageInitialization]
|
|
117
|
+
* @property {string} [pageLoadStrategy]
|
|
118
|
+
*/
|
|
119
|
+
|
|
120
|
+
/**
|
|
121
|
+
* @param {RemoteDebuggerOptions} opts
|
|
102
122
|
*/
|
|
103
123
|
constructor (opts = {}) {
|
|
104
124
|
super();
|
|
@@ -126,6 +146,7 @@ class RemoteDebugger extends EventEmitter {
|
|
|
126
146
|
webInspectorMaxFrameLength,
|
|
127
147
|
socketChunkSize,
|
|
128
148
|
fullPageInitialization,
|
|
149
|
+
pageLoadStrategy
|
|
129
150
|
} = opts;
|
|
130
151
|
|
|
131
152
|
this.bundleId = bundleId;
|
|
@@ -155,6 +176,8 @@ class RemoteDebugger extends EventEmitter {
|
|
|
155
176
|
|
|
156
177
|
this.fullPageInitialization = fullPageInitialization;
|
|
157
178
|
|
|
179
|
+
this.pageLoadStrategy = pageLoadStrategy;
|
|
180
|
+
|
|
158
181
|
this._lock = new AsyncLock();
|
|
159
182
|
}
|
|
160
183
|
|
package/package.json
CHANGED
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
"keywords": [
|
|
5
5
|
"appium"
|
|
6
6
|
],
|
|
7
|
-
"version": "11.
|
|
7
|
+
"version": "11.3.1",
|
|
8
8
|
"author": "Appium Contributors",
|
|
9
9
|
"license": "Apache-2.0",
|
|
10
10
|
"repository": {
|
|
@@ -73,17 +73,13 @@
|
|
|
73
73
|
"@semantic-release/changelog": "^6.0.1",
|
|
74
74
|
"@semantic-release/git": "^10.0.1",
|
|
75
75
|
"@types/bluebird": "^3.5.38",
|
|
76
|
-
"@types/chai": "^4.3.5",
|
|
77
|
-
"@types/chai-as-promised": "^7.1.5",
|
|
78
76
|
"@types/lodash": "^4.14.196",
|
|
79
77
|
"@types/mocha": "^10.0.1",
|
|
80
78
|
"@types/node": "^20.4.7",
|
|
81
|
-
"@types/sinon": "^17.0.0",
|
|
82
|
-
"@types/sinon-chai": "^3.2.9",
|
|
83
79
|
"@types/teen_process": "^2.0.0",
|
|
84
80
|
"appium-ios-simulator": "^6.1.2",
|
|
85
|
-
"chai": "^
|
|
86
|
-
"chai-as-promised": "^
|
|
81
|
+
"chai": "^5.1.1",
|
|
82
|
+
"chai-as-promised": "^8.0.0",
|
|
87
83
|
"conventional-changelog-conventionalcommits": "^8.0.0",
|
|
88
84
|
"mocha": "^10.0.0",
|
|
89
85
|
"mocha-junit-reporter": "^2.0.0",
|