support share in local

codeskyblue · codeskyblue · commit 2d3c0e99b3f7 · 2019-01-11T13:44:45.000+08:00
diff --git a/README.md b/README.md
@@ -4,6 +4,8 @@
 
 `fa` is a command line tool that wraps `adb` in order to extend it with extra features and commands that make working with Android easier.
 
+This project is still in developing, please be careful when use in production.
+
 ## Features
 - [x] show device selection when multi device connected
 - [x] screenshot
@@ -132,18 +134,27 @@ $ adb shell /data/local/tmp/busybox ls
 Share local device
 
 ```bash
+# share in localnet
 $ fa share
-# here will print a address, eg: tcp://max.labstack.me:8000
+Connect with: adb connect 10.0.0.1:6174
+
+# share to public ip
+$ fa share --tunnel
+______                   __
+/_  __/_ _____  ___  ___ / /
+ / / / // / _ \/ _ \/ -_) /
+/_/  \_,_/_//_/_//_/\__/_/ v0.2.11
+
+Expose local servers to internet securely
+https://labstack.com/docs/tunnel
+________________________________O/_______
+                                O\
+⇨ routing traffic from tcp://leo.labstack.me:10081
 ```
 
-In another machine use `adb connect`, for example the share addr is `max.labstack.me:8000`
+When use tunnel, you should use `adb connect leo.labstack.me:10081`
 
-```bash
-$ adb connect max.labstack.me:8000
-device connected
-$ adb -s max.labstack.me:8000 shell pwd
-/
-```
+Then you can use adb to do anything just like device plugged in your computer.
 
 ### Pidcat (logcat)
 Current implementation is wrapper of [pidcat.py](https://github.com/JakeWharton/pidcat)
diff --git a/main.go b/main.go
@@ -14,6 +14,7 @@ import (
 	"path/filepath"
 	"regexp"
 	"runtime"
+	"strconv"
 	"strings"
 	"syscall"
 	"time"
@@ -451,7 +452,18 @@ func main() {
 		},
 		{
 			Name:  "share",
-			Usage: "share device as address for adb connect",
+			Usage: "provides an USB device over TCP using a translating proxy",
+			Flags: []cli.Flag{
+				cli.BoolFlag{
+					Name:  "tunnel",
+					Usage: "share device to public net, using labstack.me tunnel service",
+				},
+				cli.IntFlag{
+					Name:  "port",
+					Usage: "listen port",
+					Value: 6174,
+				},
+			},
 			Action: func(ctx *cli.Context) error {
 				serial, err := chooseOne()
 				if err != nil {
@@ -460,10 +472,17 @@ func main() {
 				client := adb.NewClient(fmt.Sprintf("%s:%d", defaultHost, defaultPort))
 				device := client.DeviceWithSerial(serial)
 
+				if !ctx.Bool("tunnel") {
+					adbd := adb.NewADBDaemon(device)
+					fmt.Printf("Connect with: adb connect %s:%d\n", GetLocalIP(), ctx.Int("port"))
+					return adbd.ListenAndServe(":" + strconv.Itoa(ctx.Int("port")))
+				}
+
+				rand.Seed(time.Now().Unix())
 				c := &tunnel.Configuration{
 					Host:       "labstack.me:22",
 					RemoteHost: "0.0.0.0",
-					RemotePort: 10000 + rand.Intn(1000),
+					RemotePort: 10000 + rand.Intn(2000),
 					Channel:    make(chan int),
 					InBoundConnectionHook: func(in net.Conn) error {
 						log.Println("Accept new connection", in.RemoteAddr().String())
diff --git a/utils.go b/utils.go
@@ -0,0 +1,19 @@
+package main
+
+import "net"
+
+func GetLocalIP() string {
+	addrs, err := net.InterfaceAddrs()
+	if err != nil {
+		return "localhost"
+	}
+	for _, address := range addrs {
+		// check the address type and if it is not a loopback the display it
+		if ipnet, ok := address.(*net.IPNet); ok && !ipnet.IP.IsLoopback() {
+			if ipnet.IP.To4() != nil {
+				return ipnet.IP.String()
+			}
+		}
+	}
+	return "localhost"
+}
