appium-remote-debugger 11.0.4 → 11.0.5
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 +7 -0
- package/build/lib/utils.d.ts.map +1 -1
- package/build/lib/utils.js +14 -14
- package/build/lib/utils.js.map +1 -1
- package/lib/utils.js +14 -15
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,10 @@
|
|
|
1
|
+
## [11.0.5](https://github.com/appium/appium-remote-debugger/compare/v11.0.4...v11.0.5) (2024-03-22)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Select all available app ids for the given bundle name ([#368](https://github.com/appium/appium-remote-debugger/issues/368)) ([c4f02b7](https://github.com/appium/appium-remote-debugger/commit/c4f02b7e98477adfd4b426c7e5cc4973dbc9e73f))
|
|
7
|
+
|
|
1
8
|
## [11.0.4](https://github.com/appium/appium-remote-debugger/compare/v11.0.3...v11.0.4) (2024-03-07)
|
|
2
9
|
|
|
3
10
|
|
package/build/lib/utils.d.ts.map
CHANGED
|
@@ -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;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,
|
|
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,CAoCpB;AAED,+CAQC;AAED,yEAYC;AAED;;GAEG;AACH,mCAFa,eAAe,CAmB3B;AAED,6CA8BC;AAtQD,sCAAgC;AAwQhC;;;;;GAKG;AACH,gEAMG;cAzSW,UAAU;cADV,QAAQ"}
|
package/build/lib/utils.js
CHANGED
|
@@ -143,21 +143,21 @@ exports.getDebuggerAppKey = getDebuggerAppKey;
|
|
|
143
143
|
*
|
|
144
144
|
* @param {string} bundleId
|
|
145
145
|
* @param {Record<string, any>} appDict
|
|
146
|
-
* @returns {string
|
|
146
|
+
* @returns {string[]}
|
|
147
147
|
*/
|
|
148
|
-
function
|
|
149
|
-
|
|
148
|
+
function appIdsForBundle(bundleId, appDict) {
|
|
149
|
+
/** @type {Set<string>} */
|
|
150
|
+
const appIds = new Set();
|
|
150
151
|
for (const [key, data] of lodash_1.default.toPairs(appDict)) {
|
|
151
152
|
if (data.bundleId.endsWith(bundleId)) {
|
|
152
|
-
|
|
153
|
-
break;
|
|
153
|
+
appIds.add(key);
|
|
154
154
|
}
|
|
155
155
|
}
|
|
156
156
|
// if nothing is found, try to get the generic app
|
|
157
|
-
if (
|
|
158
|
-
return
|
|
157
|
+
if (appIds.size === 0 && bundleId !== WEB_CONTENT_BUNDLE_ID) {
|
|
158
|
+
return appIdsForBundle(WEB_CONTENT_BUNDLE_ID, appDict);
|
|
159
159
|
}
|
|
160
|
-
return
|
|
160
|
+
return Array.from(appIds);
|
|
161
161
|
}
|
|
162
162
|
/**
|
|
163
163
|
* Find app keys based on assigned bundleIds from appDict
|
|
@@ -171,7 +171,6 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
|
|
|
171
171
|
logger_1.default.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
|
|
172
172
|
return lodash_1.default.uniq(Object.keys(appDict));
|
|
173
173
|
}
|
|
174
|
-
let proxiedAppIds = [];
|
|
175
174
|
// go through the possible bundle identifiers
|
|
176
175
|
const possibleBundleIds = lodash_1.default.uniq([
|
|
177
176
|
WEB_CONTENT_BUNDLE_ID,
|
|
@@ -182,22 +181,23 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
|
|
|
182
181
|
...bundleIds,
|
|
183
182
|
]);
|
|
184
183
|
logger_1.default.debug(`Checking for bundle identifiers: ${possibleBundleIds.join(', ')}`);
|
|
184
|
+
/** @type {Set<string>} */
|
|
185
|
+
const proxiedAppIds = new Set();
|
|
185
186
|
for (const bundleId of possibleBundleIds) {
|
|
186
|
-
const appId = appIdForBundle(bundleId, appDict);
|
|
187
187
|
// now we need to determine if we should pick a proxy for this instead
|
|
188
|
-
|
|
189
|
-
proxiedAppIds.
|
|
188
|
+
for (const appId of appIdsForBundle(bundleId, appDict)) {
|
|
189
|
+
proxiedAppIds.add(appId);
|
|
190
190
|
logger_1.default.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
|
|
191
191
|
for (const [key, data] of lodash_1.default.toPairs(appDict)) {
|
|
192
192
|
if (data.isProxy && data.hostId === appId) {
|
|
193
193
|
logger_1.default.debug(`Found separate bundleId '${data.bundleId}' ` +
|
|
194
194
|
`acting as proxy for '${bundleId}', with app id '${key}'`);
|
|
195
|
-
proxiedAppIds.
|
|
195
|
+
proxiedAppIds.add(key);
|
|
196
196
|
}
|
|
197
197
|
}
|
|
198
198
|
}
|
|
199
199
|
}
|
|
200
|
-
return
|
|
200
|
+
return Array.from(proxiedAppIds);
|
|
201
201
|
}
|
|
202
202
|
exports.getPossibleDebuggerAppKeys = getPossibleDebuggerAppKeys;
|
|
203
203
|
function checkParams(params) {
|
package/build/lib/utils.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":";;;;;;AAAA,sDAA2B;AAC3B,oDAAuB;AACvB,wDAAyB;AACzB,qDAAiE;AACjE,6CAA6C;AAE7C,MAAM,WAAW,GAAG,wBAAwB,CAAC;AAE7C,MAAM,qBAAqB,GAAG,6BAA6B,CAAC;AAC5D,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,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAE5B,yCAAyC;AACzC,MAAM,mBAAmB,GAAG;IAC1B,YAAY,EAAE,iBAAiB;IAC/B,gBAAgB,EAAE,WAAW;IAC7B,aAAa,EAAE,mBAAmB;CACnC,CAAC;AAEF,MAAM,mBAAmB,GAAG,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../lib/utils.js"],"names":[],"mappings":"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"}
|
package/lib/utils.js
CHANGED
|
@@ -145,23 +145,23 @@ function getDebuggerAppKey (bundleId, appDict) {
|
|
|
145
145
|
*
|
|
146
146
|
* @param {string} bundleId
|
|
147
147
|
* @param {Record<string, any>} appDict
|
|
148
|
-
* @returns {string
|
|
148
|
+
* @returns {string[]}
|
|
149
149
|
*/
|
|
150
|
-
function
|
|
151
|
-
|
|
150
|
+
function appIdsForBundle (bundleId, appDict) {
|
|
151
|
+
/** @type {Set<string>} */
|
|
152
|
+
const appIds = new Set();
|
|
152
153
|
for (const [key, data] of _.toPairs(appDict)) {
|
|
153
154
|
if (data.bundleId.endsWith(bundleId)) {
|
|
154
|
-
|
|
155
|
-
break;
|
|
155
|
+
appIds.add(key);
|
|
156
156
|
}
|
|
157
157
|
}
|
|
158
158
|
|
|
159
159
|
// if nothing is found, try to get the generic app
|
|
160
|
-
if (
|
|
161
|
-
return
|
|
160
|
+
if (appIds.size === 0 && bundleId !== WEB_CONTENT_BUNDLE_ID) {
|
|
161
|
+
return appIdsForBundle(WEB_CONTENT_BUNDLE_ID, appDict);
|
|
162
162
|
}
|
|
163
163
|
|
|
164
|
-
return
|
|
164
|
+
return Array.from(appIds);
|
|
165
165
|
}
|
|
166
166
|
|
|
167
167
|
/**
|
|
@@ -176,7 +176,6 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
|
|
|
176
176
|
log.debug('Skip checking bundle identifiers because the bundleIds includes a wildcard');
|
|
177
177
|
return _.uniq(Object.keys(appDict));
|
|
178
178
|
}
|
|
179
|
-
let proxiedAppIds = [];
|
|
180
179
|
|
|
181
180
|
// go through the possible bundle identifiers
|
|
182
181
|
const possibleBundleIds = _.uniq([
|
|
@@ -188,24 +187,24 @@ function getPossibleDebuggerAppKeys(bundleIds, appDict) {
|
|
|
188
187
|
...bundleIds,
|
|
189
188
|
]);
|
|
190
189
|
log.debug(`Checking for bundle identifiers: ${possibleBundleIds.join(', ')}`);
|
|
190
|
+
/** @type {Set<string>} */
|
|
191
|
+
const proxiedAppIds = new Set();
|
|
191
192
|
for (const bundleId of possibleBundleIds) {
|
|
192
|
-
const appId = appIdForBundle(bundleId, appDict);
|
|
193
|
-
|
|
194
193
|
// now we need to determine if we should pick a proxy for this instead
|
|
195
|
-
|
|
196
|
-
proxiedAppIds.
|
|
194
|
+
for (const appId of appIdsForBundle(bundleId, appDict)) {
|
|
195
|
+
proxiedAppIds.add(appId);
|
|
197
196
|
log.debug(`Found app id key '${appId}' for bundle '${bundleId}'`);
|
|
198
197
|
for (const [key, data] of _.toPairs(appDict)) {
|
|
199
198
|
if (data.isProxy && data.hostId === appId) {
|
|
200
199
|
log.debug(`Found separate bundleId '${data.bundleId}' ` +
|
|
201
200
|
`acting as proxy for '${bundleId}', with app id '${key}'`);
|
|
202
|
-
proxiedAppIds.
|
|
201
|
+
proxiedAppIds.add(key);
|
|
203
202
|
}
|
|
204
203
|
}
|
|
205
204
|
}
|
|
206
205
|
}
|
|
207
206
|
|
|
208
|
-
return
|
|
207
|
+
return Array.from(proxiedAppIds);
|
|
209
208
|
}
|
|
210
209
|
|
|
211
210
|
function checkParams (params) {
|