Implement Android debugging with unix sockets redirection #1373
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
teobugslayer
force-pushed
the
totev/android-debugger-unixsockets
branch
2 times, most recently
from
b0971a1 to
a289bee
Compare
| let forwardsResult = this.device.adb.executeCommand(["forward", "--list"]).wait(); | ||
|
|
||
| //matches 123a188909e6czzc tcp:40001 localabstract:org.nativescript.testUnixSockets-debug | ||
| let regexp = new RegExp(`(${deviceId} tcp:)([\\d])+(?= localabstract:${packageName}-debug)`, "g"); |
There was a problem hiding this comment.
I believe that this RegExp could be rewritten as follows:
new RegExp(`(?:${deviceId} tcp:)([\\d]+)(?= localabstract:${packageName}-debug)`, "g");The benefits would be that you could execute regexp.exec(forwardsResult) on the line below instead of forwardsResult.match(regexp). That way the result port would simply be match[1] instead of parseInt(match[0].substring(match[0].length - 5));
Example:
let deviceId = "123a188909e6czzc";
let packageName = "org.nativescript.testUnixSockets";
let forwardsResult = "123a188909e6czzc tcp:40001 localabstract:org.nativescript.testUnixSockets-debug";
let regexp = new RegExp(`(?:${deviceId} tcp:)([\\d]+)(?= localabstract:${packageName}-debug)`, "g");
let match = regexp.exec(forwardsResult);
console.log(match);
// output
/* [ '123a188909e6czzc tcp:40001',
'40001',
index: 0,
input: '123a188909e6czzc tcp:40001 localabstract:org.nativescript.testUnixSockets-debug' ]
*/
There was a problem hiding this comment.
good one.
the best way should have been with a negative lookbehind... Not sure if exec is the optimal way thus I have done this with substring, which is ugly.
I leave it to you guys to decide.
|
Overall great work! |
teobugslayer
force-pushed
the
totev/android-debugger-unixsockets
branch
from
a289bee to
e743e9c
Compare
| let regexp = new RegExp(`(?:${deviceId} tcp:)([\\d]+)(?= localabstract:${packageName}-debug)`, "g"); | ||
| let match = regexp.exec(forwardsResult); | ||
| if (match) { | ||
| port = parseInt(match[0].substring(match[0].length - 5)); |
There was a problem hiding this comment.
port=match[1];
Because the regex is now exec-ed instead of match-ed
teobugslayer
force-pushed
the
totev/android-debugger-unixsockets
branch
from
e743e9c to
182660a
Compare
teobugslayer
added a commit
that referenced
this pull request
Jan 6, 2016
…xsockets Implement Android debugging with unix sockets redirection
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is cleaned-up version of #1227
To test it, you need this runtime.
This pull request is releated to the changes here.
The android debugger now uses named sockets instead of ports hence the code rewrite in adndroid-debug-service to accommodate for that.
Contact @blagoev directly in order to merge this successfully into the respected main branches.