Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Improve visibility of message to enable "Remote Debugging via USB" with web-ext run -t firefox-android #2038

Merged
merged 33 commits into from
Oct 9, 2020
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
7d20b04
Remote debugging message shown repeatedly
sonalprabhu Oct 2, 2020
42a2098
Looped the error message with different color
sonalprabhu Oct 2, 2020
3b3dd58
Removed trailing spaces
sonalprabhu Oct 2, 2020
702abc2
Corrected the errors
sonalprabhu Oct 2, 2020
2ad9a9e
Removed yellow color from warning
sonalprabhu Oct 2, 2020
5b785b0
Added tests for enable Remote Debugging warning
sonalprabhu Oct 8, 2020
39fabad
Merge branch 'master' into loop-warning
sonalprabhu Oct 8, 2020
0c95147
Remote debugging message shown repeatedly
sonalprabhu Oct 2, 2020
a3f8086
Looped the error message with different color
sonalprabhu Oct 2, 2020
bafc597
Removed trailing spaces
sonalprabhu Oct 2, 2020
e149055
Corrected the errors
sonalprabhu Oct 2, 2020
7673b0d
Removed yellow color from warning
sonalprabhu Oct 2, 2020
a7fc6ba
Added tests for enable Remote Debugging warning
sonalprabhu Oct 8, 2020
2cfcebe
chore(deps): update dependency eslint to v7.10.0 (#2033)
renovate[bot] Oct 1, 2020
15493db
chore(deps): update dependency eslint-plugin-import to v2.22.1 (#2034)
renovate[bot] Oct 1, 2020
aae0728
chore(deps): update dependency sinon to v9.1.0 (#2037)
renovate[bot] Oct 1, 2020
79f9a4b
fix(deps): update dependency firefox-profile to v4 (#2030)
renovate[bot] Oct 1, 2020
42ac6c8
fix(deps): update dependency addons-linter to v2.7.0 (#2032)
renovate[bot] Oct 1, 2020
dd3bfa9
fix(deps): update dependency open to v7.3.0 (#2004)
renovate[bot] Oct 1, 2020
abbbb15
chore(deps): update dependency git-rev-sync to v3 (#2013)
renovate[bot] Oct 1, 2020
e87f6d7
fix(deps): update dependency update-notifier to v5 (#2036)
renovate[bot] Oct 1, 2020
cf0f9ea
fix(deps): Switch from adbkit to @devicefarmer/adbkit npm package (#2…
rpl Oct 5, 2020
cc18128
chore: Bump package version for release 5.2.0
rpl Oct 5, 2020
c8dc6dd
New test case
sonalprabhu Oct 8, 2020
dedb126
Update flow.js
sonalprabhu Oct 8, 2020
2e5c510
Update test.adb.js
sonalprabhu Oct 9, 2020
ae36534
Update firefox-android.js
sonalprabhu Oct 9, 2020
2d5cc48
Update test.firefox-android.js
sonalprabhu Oct 9, 2020
de16ffb
Merge branch 'master' into loop-warning
sonalprabhu Oct 9, 2020
a0a8814
Made all the requested changes
sonalprabhu Oct 9, 2020
6821b86
Merge branch 'loop-warning' of https://github.com/sonalprabhu/web-ext…
sonalprabhu Oct 9, 2020
aaa26f5
Made the requested changes
sonalprabhu Oct 9, 2020
3b5e1ca
Update test.adb.js
sonalprabhu Oct 9, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/extension-runners/firefox-android.js
Original file line number Diff line number Diff line change
Expand Up @@ -593,7 +593,7 @@ export class FirefoxAndroidExtensionRunner {
// Got a debugger socket file to connect.
this.selectedRDPSocketFile = (
await adbUtils.discoverRDPUnixSocket(
selectedAdbDevice, selectedFirefoxApk, {
selectedAdbDevice, selectedFirefoxApk, msg, {
rpl marked this conversation as resolved.
Show resolved Hide resolved
maxDiscoveryTime: unixSocketDiscoveryMaxTime,
retryInterval: unixSocketDiscoveryRetryInterval,
}
Expand Down
4 changes: 3 additions & 1 deletion src/util/adb.js
Original file line number Diff line number Diff line change
Expand Up @@ -347,14 +347,16 @@ export default class ADBUtils {
}

async discoverRDPUnixSocket(
deviceId: string, apk: string,
deviceId: string, apk: string, msg: string,
{maxDiscoveryTime, retryInterval}: DiscoveryParams = {}
): Promise<string> {
let rdpUnixSockets = [];

const discoveryStartedAt = Date.now();

while (rdpUnixSockets.length === 0) {
log.info(`\n\x1b[93m${msg}\x1b[39m\n`);
rpl marked this conversation as resolved.
Show resolved Hide resolved
rpl marked this conversation as resolved.
Show resolved Hide resolved

if (this.userAbortDiscovery) {
throw new UsageError(
'Exiting Firefox Remote Debugging socket discovery on user request'
Expand Down