This repository has been archived by the owner on Dec 31, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 133
Create funcion shell interactive #118
Open
mgpx
wants to merge
3
commits into
quamotion:master
Choose a base branch
from
mgpx:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
using SharpAdbClient.Exceptions; | ||
using SharpAdbClient.Logs; | ||
using System; | ||
using System.Collections.Generic; | ||
using System.IO; | ||
using System.Text; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
|
||
namespace SharpAdbClient.InteractiveShell | ||
{ | ||
public delegate Boolean ShellResponseEventHandler(String adbResponse, ShellResponseEventArgs args); | ||
|
||
public class Shell | ||
{ | ||
public event ShellResponseEventHandler ResponseAdb = null; | ||
|
||
public AdbClient AdbClient { get; set;} | ||
|
||
public Shell(AdbClient adbClient) | ||
{ | ||
this.AdbClient = adbClient; | ||
} | ||
|
||
public async Task ExecuteRemoteCommandAsync(string command, DeviceData device, CancellationToken cancellationToken, int maxTimeToOutputResponse) | ||
{ | ||
using (AdbSocket adbSocket = new AdbSocket(this.AdbClient.EndPoint)) | ||
{ | ||
cancellationToken.Register(() => adbSocket.Dispose()); | ||
this.AdbClient.SetDevice(adbSocket, device); | ||
adbSocket.SendAdbRequest($"shell:{command}"); | ||
var response = adbSocket.ReadAdbResponse(); | ||
|
||
ShellResponseEventArgs shellResponseEventArgs = new ShellResponseEventArgs(this); | ||
shellResponseEventArgs.LastCommand = command; | ||
|
||
try | ||
{ | ||
var shellStream = (adbSocket.GetShellStream() as ShellStream); | ||
|
||
using (StreamReader reader = new StreamReader(shellStream.Inner, AdbClient.Encoding)) | ||
{ | ||
while (!cancellationToken.IsCancellationRequested && shellResponseEventArgs.CloseShell == false) | ||
{ | ||
var line = await reader.ReadLineAsync().ConfigureAwait(false); | ||
|
||
if (ResponseAdb(line, shellResponseEventArgs)) | ||
{ | ||
if (String.IsNullOrEmpty(shellResponseEventArgs.NextCommand) == false) | ||
{ | ||
byte[] bytes = FormAdbNextRequest(shellResponseEventArgs.NextCommand); | ||
|
||
(shellStream.Inner as System.Net.Sockets.NetworkStream).Write(bytes, 0, bytes.Length); | ||
(shellStream.Inner as System.Net.Sockets.NetworkStream).Flush(); | ||
shellResponseEventArgs.LastCommand = shellResponseEventArgs.NextCommand; | ||
shellResponseEventArgs.NextCommand = null; | ||
} | ||
} | ||
|
||
|
||
} | ||
} | ||
} | ||
catch (Exception e) | ||
{ | ||
if (!cancellationToken.IsCancellationRequested) | ||
{ | ||
throw new ShellCommandUnresponsiveException(e); | ||
} | ||
} | ||
finally | ||
{ | ||
|
||
} | ||
} | ||
|
||
} | ||
|
||
public static byte[] FormAdbNextRequest(string req) | ||
{ | ||
byte[] result = AdbClient.Encoding.GetBytes(req + "\n"); | ||
return result; | ||
} | ||
} | ||
|
||
|
||
public class ShellResponseEventArgs : EventArgs | ||
{ | ||
public Shell Shell { get; private set; } | ||
public String LastCommand { get; internal set; } | ||
public String NextCommand { get; set; } | ||
public Boolean CloseShell { get; set; } = false; | ||
|
||
public ShellResponseEventArgs(Shell shell) | ||
{ | ||
this.Shell = shell; | ||
} | ||
} | ||
} | ||
|
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't think you're actually using this method, right? So can we keep it
protected
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, you're right, I called this function, but I switched to
I'll correct it, thank you.