appium-remote-debugger 10.1.6 → 10.2.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 CHANGED
@@ -1,3 +1,17 @@
1
+ ## [10.2.0](https://github.com/appium/appium-remote-debugger/compare/v10.1.7...v10.2.0) (2023-11-17)
2
+
3
+
4
+ ### Features
5
+
6
+ * introduce a wildcard usage for additionalWebviewBundleIds to get webview contexts of other apps ([#346](https://github.com/appium/appium-remote-debugger/issues/346)) ([72ee224](https://github.com/appium/appium-remote-debugger/commit/72ee224ec2542e8e93354c6f533986223f2e84c7))
7
+
8
+ ## [10.1.7](https://github.com/appium/appium-remote-debugger/compare/v10.1.6...v10.1.7) (2023-11-06)
9
+
10
+
11
+ ### Miscellaneous Chores
12
+
13
+ * **deps-dev:** bump @types/sinon from 10.0.20 to 17.0.0 ([#345](https://github.com/appium/appium-remote-debugger/issues/345)) ([4d7a9b9](https://github.com/appium/appium-remote-debugger/commit/4d7a9b9fae324c6cad351344de4d43883272c929))
14
+
1
15
  ## [10.1.6](https://github.com/appium/appium-remote-debugger/compare/v10.1.5...v10.1.6) (2023-11-01)
2
16
 
3
17
 
@@ -39,8 +39,22 @@ export type AppInfo = {
39
39
  */
40
40
  export function appInfoFromDict(dict: Record<string, any>): [string, AppInfo];
41
41
  export function pageArrayFromDict(pageDict: any): any[];
42
- export function getDebuggerAppKey(bundleId: any, appDict: any): string | undefined;
43
- export function getPossibleDebuggerAppKeys(bundleIds: any, appDict: any): string[];
42
+ /**
43
+ * Given a bundle id, finds the correct remote debugger app that is
44
+ * connected.
45
+ * @param {string} bundleId
46
+ * @param {Record<string, any>} appDict
47
+ * @returns {string|undefined}
48
+ */
49
+ export function getDebuggerAppKey(bundleId: string, appDict: Record<string, any>): string | undefined;
50
+ /**
51
+ * Find app keys based on assigned bundleIds from appDict
52
+ * When bundleIds includes a wildcard ('*'), returns all appKeys in appDict.
53
+ * @param {string[]} bundleIds
54
+ * @param {Record<string, any>} appDict
55
+ * @returns {string[]}
56
+ */
57
+ export function getPossibleDebuggerAppKeys(bundleIds: string[], appDict: Record<string, any>): string[];
44
58
  export function checkParams(params: any): void;
45
59
  export function simpleStringify(value: any, multiline?: boolean): string;
46
60
  /**
@@ -1 +1 @@
1
- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";aA2Bc,EAAE,GAAG,CAAC;uBACI,GAAG,EAAE,KAAK,IAAI;mBACjB,KAAK,KAAK,IAAI;;;QAKrB,MAAM;aACN,OAAO;UACP,MAAM;cACN,MAAM;YACN,MAAM;cACN,OAAO;yBACP,OAAO,GAAC,MAAM;gBACd,GAAG,EAAE,GAAC,SAAS,GAAC,eAAe;;AAhB7C;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH,sCAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,CAAC,MAAM,EAAE,OAAO,CAAC,CAgC7B;AAMD,wDAkBC;AAMD,mFA2BC;AAmBD,mFA+BC;AAED,+CAQC;AAED,yEAYC;AAED;;GAEG;AACH,mCAFa,eAAe,CAmB3B;AAED,6CA8BC;AAnPD,sCAAgC;AAqPhC;;;;;GAKG;AACH,gEAMG;cAtRW,UAAU;cADV,QAAQ"}
1
+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";aA2Bc,EAAE,GAAG,CAAC;uBACI,GAAG,EAAE,KAAK,IAAI;mBACjB,KAAK,KAAK,IAAI;;;QAKrB,MAAM;aACN,OAAO;UACP,MAAM;cACN,MAAM;YACN,MAAM;cACN,OAAO;yBACP,OAAO,GAAC,MAAM;gBACd,GAAG,EAAE,GAAC,SAAS,GAAC,eAAe;;AAhB7C;;;;;GAKG;AAEH;;;;;;;;;;GAUG;AAEH;;;;;;GAMG;AACH,sCAHW,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,CAAC,MAAM,EAAE,OAAO,CAAC,CAgC7B;AAMD,wDAkBC;AAED;;;;;;GAMG;AACH,4CAJW,MAAM,WACN,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,MAAM,GAAC,SAAS,CA6B5B;AAyBD;;;;;;GAMG;AACH,sDAJW,MAAM,EAAE,WACR,OAAO,MAAM,EAAE,GAAG,CAAC,GACjB,MAAM,EAAE,CAqCpB;AAED,+CAQC;AAED,yEAYC;AAED;;GAEG;AACH,mCAFa,eAAe,CAmB3B;AAED,6CA8BC;AAvQD,sCAAgC;AAyQhC;;;;;GAKG;AACH,gEAMG;cA1SW,UAAU;cADV,QAAQ"}
@@ -104,9 +104,12 @@ function pageArrayFromDict(pageDict) {
104
104
  return newPageArray;
105
105
  }
106
106
  exports.pageArrayFromDict = pageArrayFromDict;
107
- /*
107
+ /**
108
108
  * Given a bundle id, finds the correct remote debugger app that is
109
109
  * connected.
110
+ * @param {string} bundleId
111
+ * @param {Record<string, any>} appDict
112
+ * @returns {string|undefined}
110
113
  */
111
114
  function getDebuggerAppKey(bundleId, appDict) {
112
115
  let appId;
@@ -136,6 +139,12 @@ function getDebuggerAppKey(bundleId, appDict) {
136
139
  return appId;
137
140
  }
138
141
  exports.getDebuggerAppKey = getDebuggerAppKey;
142
+ /**
143
+ *
144
+ * @param {string} bundleId
145
+ * @param {Record<string, any>} appDict
146
+ * @returns {string|undefined}
147
+ */
139
148
  function appIdForBundle(bundleId, appDict) {
140
149
  let appId;
141
150
  for (const [key, data] of lodash_1.default.toPairs(appDict)) {
@@ -150,7 +159,18 @@ function appIdForBundle(bundleId, appDict) {
150
159
  }
151
160
  return appId;
152
161
  }
162
+ /**
163
+ * Find app keys based on assigned bundleIds from appDict
164
+ * When bundleIds includes a wildcard ('*'), returns all appKeys in appDict.
165
+ * @param {string[]} bundleIds
166
+ * @param {Record<string, any>} appDict
167
+ * @returns {string[]}
168
+ */
153
169
  function getPossibleDebuggerAppKeys(bundleIds, appDict) {
170
+ if (bundleIds.includes(WILDCARD_BUNDLE_ID)) {
171
+ logger_1.default.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
172
+ return lodash_1.default.uniq(Object.keys(appDict));
173
+ }
154
174
  let proxiedAppIds = [];
155
175
  // go through the possible bundle identifiers
156
176
  const possibleBundleIds = lodash_1.default.uniq([
@@ -1 +1 @@
1
- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
package/lib/utils.js CHANGED
@@ -105,9 +105,12 @@ function pageArrayFromDict (pageDict) {
105
105
  return newPageArray;
106
106
  }
107
107
 
108
- /*
108
+ /**
109
109
  * Given a bundle id, finds the correct remote debugger app that is
110
110
  * connected.
111
+ * @param {string} bundleId
112
+ * @param {Record<string, any>} appDict
113
+ * @returns {string|undefined}
111
114
  */
112
115
  function getDebuggerAppKey (bundleId, appDict) {
113
116
  let appId;
@@ -138,6 +141,12 @@ function getDebuggerAppKey (bundleId, appDict) {
138
141
  return appId;
139
142
  }
140
143
 
144
+ /**
145
+ *
146
+ * @param {string} bundleId
147
+ * @param {Record<string, any>} appDict
148
+ * @returns {string|undefined}
149
+ */
141
150
  function appIdForBundle (bundleId, appDict) {
142
151
  let appId;
143
152
  for (const [key, data] of _.toPairs(appDict)) {
@@ -155,7 +164,18 @@ function appIdForBundle (bundleId, appDict) {
155
164
  return appId;
156
165
  }
157
166
 
158
- function getPossibleDebuggerAppKeys (bundleIds, appDict) {
167
+ /**
168
+ * Find app keys based on assigned bundleIds from appDict
169
+ * When bundleIds includes a wildcard ('*'), returns all appKeys in appDict.
170
+ * @param {string[]} bundleIds
171
+ * @param {Record<string, any>} appDict
172
+ * @returns {string[]}
173
+ */
174
+ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
175
+ if (bundleIds.includes(WILDCARD_BUNDLE_ID)) {
176
+ log.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
177
+ return _.uniq(Object.keys(appDict));
178
+ }
159
179
  let proxiedAppIds = [];
160
180
 
161
181
  // go through the possible bundle identifiers
package/package.json CHANGED
@@ -4,7 +4,7 @@
4
4
  "keywords": [
5
5
  "appium"
6
6
  ],
7
- "version": "10.1.6",
7
+ "version": "10.2.0",
8
8
  "author": "Appium Contributors",
9
9
  "license": "Apache-2.0",
10
10
  "repository": {
@@ -89,7 +89,7 @@
89
89
  "@types/lodash": "^4.14.196",
90
90
  "@types/mocha": "^10.0.1",
91
91
  "@types/node": "^20.4.7",
92
- "@types/sinon": "^10.0.16",
92
+ "@types/sinon": "^17.0.0",
93
93
  "@types/sinon-chai": "^3.2.9",
94
94
  "@types/teen_process": "^2.0.0",
95
95
  "@typescript-eslint/eslint-plugin": "^6.9.0",