@@ -3,10 +3,16 @@ package adb
33import (
44 "fmt"
55 "io"
6+ "io/ioutil"
7+ "log"
68 "net"
79 "os"
10+ "os/exec"
811 "strings"
912 "time"
13+
14+ shellquote "github.com/kballard/go-shellquote"
15+ "github.com/pkg/errors"
1016)
1117
1218type Client struct {
@@ -19,26 +25,40 @@ func NewClient(addr string) *Client {
1925 }
2026}
2127
22- func (c * Client ) roundTrip (data string ) (conn net.Conn , rw * ADBConn , err error ) {
23- conn , err = net .Dial ("tcp" , c .Addr )
28+ func (c * Client ) dial () (conn * ADBConn , err error ) {
29+ nc , err := net .DialTimeout ("tcp" , c .Addr , 2 * time .Second )
30+ log .Println ("dial" )
31+ if err != nil {
32+ if err = c .StartServer (); err != nil {
33+ err = errors .Wrap (err , "adb start-server" )
34+ return
35+ }
36+ nc , err = net .DialTimeout ("tcp" , c .Addr , 2 * time .Second )
37+ }
38+ return NewADBConn (nc ), err
39+ }
40+
41+ func (c * Client ) roundTrip (data string ) (conn * ADBConn , err error ) {
42+ conn , err = c .dial ()
2443 if err != nil {
2544 return
2645 }
27- rw = NewADBConn (conn )
28- err = rw .Encode ([]byte (data ))
46+ if len (data ) > 0 {
47+ err = conn .Encode ([]byte (data ))
48+ }
2949 return
3050}
3151
3252func (c * Client ) roundTripSingleResponse (data string ) (string , error ) {
33- conn , rw , err := c .roundTrip (data )
53+ conn , err := c .roundTrip (data )
3454 if err != nil {
3555 return "" , err
3656 }
3757 defer conn .Close ()
38- if err := rw . respCheck (); err != nil {
58+ if err := conn . Check (); err != nil {
3959 return "" , err
4060 }
41- return rw .DecodeString ()
61+ return conn .DecodeString ()
4262}
4363
4464// ServerVersion returns int. 39 means 1.0.39
@@ -78,17 +98,22 @@ func (c *Client) ListDevices() (devs []*Device, err error) {
7898 return
7999}
80100
101+ func (c * Client ) StartServer () (err error ) {
102+ cmd := exec .Command ("adb" , "start-server" )
103+ return cmd .Run ()
104+ }
105+
81106// KillServer tells the server to quit immediately
82107func (c * Client ) KillServer () error {
83- conn , rw , err := c .roundTrip ("host:kill" )
108+ conn , err := c .roundTrip ("host:kill" )
84109 if err != nil {
85110 if _ , ok := err .(net.Error ); ok { // adb is already stopped if connection refused
86111 return nil
87112 }
88113 return err
89114 }
90115 defer conn .Close ()
91- return rw . respCheck ()
116+ return conn . Check ()
92117}
93118
94119func (c * Client ) Device (descriptor DeviceDescriptor ) * Device {
@@ -104,9 +129,6 @@ func (c *Client) DeviceWithSerial(serial string) *Device {
104129
105130// Device
106131type Device struct {
107- // serial string // always set
108- // State DeviceState
109-
110132 descriptor DeviceDescriptor
111133 client * Client
112134}
@@ -116,10 +138,42 @@ func (d *Device) String() string {
116138 // return fmt.Sprintf("%s:%v", ad.serial, ad.State)
117139}
118140
119- func (d * Device ) OpenShell ( cmd string ) (rwc io. ReadWriteCloser , err error ) {
141+ func (d * Device ) Serial ( ) (serial string , err error ) {
120142 return
121143}
122144
145+ func (d * Device ) OpenTransport () (conn * ADBConn , err error ) {
146+ return
147+ }
148+
149+ func (d * Device ) OpenShell (cmd string ) (rwc io.ReadWriteCloser , err error ) {
150+ req := "host:" + d .descriptor .getTransportDescriptor ()
151+ conn , err := d .client .roundTrip (req )
152+ if err != nil {
153+ return
154+ }
155+ conn .Check ()
156+ conn .EncodeString ("shell:" + cmd )
157+ conn .Check ()
158+ if conn .Err () != nil {
159+ conn .Close ()
160+ }
161+ return conn , conn .Err ()
162+ }
163+
164+ func (d * Device ) RunCommand (args ... string ) (output string , err error ) {
165+ cmd := shellquote .Join (args ... )
166+ rwc , err := d .OpenShell (cmd )
167+ if err != nil {
168+ return
169+ }
170+ data , err := ioutil .ReadAll (rwc )
171+ if err != nil {
172+ return
173+ }
174+ return string (data ), err
175+ }
176+
123177type adbFileInfo struct {
124178 name string
125179 mode os.FileMode
@@ -152,28 +206,28 @@ func (f *adbFileInfo) Sys() interface{} {
152206
153207func (d * Device ) Stat (path string ) (info os.FileInfo , err error ) {
154208 req := "host:" + d .descriptor .getTransportDescriptor ()
155- conn , rw , err := d .client .roundTrip (req )
209+ conn , err := d .client .roundTrip (req )
156210 if err != nil {
157211 return
158212 }
159213 defer conn .Close ()
160- if err = rw . respCheck (); err != nil {
214+ if err = conn . Check (); err != nil {
161215 return
162216 }
163- rw .EncodeString ("sync:" )
164- rw . respCheck ()
165- rw .WriteObjects ("STAT" , uint32 (len (path )), path )
217+ conn .EncodeString ("sync:" )
218+ conn . Check ()
219+ conn .WriteObjects ("STAT" , uint32 (len (path )), path )
166220
167- id , err := rw .ReadNString (4 )
221+ id , err := conn .ReadNString (4 )
168222 if err != nil {
169223 return
170224 }
171225 if id != "STAT" {
172226 return nil , fmt .Errorf ("Invalid status: %q" , id )
173227 }
174- adbMode , _ := rw .ReadUint32 ()
175- size , _ := rw .ReadUint32 ()
176- seconds , err := rw .ReadUint32 ()
228+ adbMode , _ := conn .ReadUint32 ()
229+ size , _ := conn .ReadUint32 ()
230+ seconds , err := conn .ReadUint32 ()
177231 if err != nil {
178232 return nil , err
179233 }
0 commit comments