device add udid, terminal page add favicon

assets/index.html

@@ -5,6 +5,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
+  <link rel="icon" href="/assets/terminal.ico?v=1">
   <title>atx-agent terminal</title>
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/xterm.min.css">
   <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/[email protected]/dist/addons/fullscreen/fullscreen.min.css">

main.go

@@ -579,8 +579,8 @@ func ServeHTTP(port int) error {
 			http.ServeFile(w, r, imagePath)
 		}
 	})
-	http.Handle("/assets/", http.FileServer(Assets))
 	http.Handle("/", m)
+	http.Handle("/assets/", http.StripPrefix("/assets", http.FileServer(Assets)))
 	httpServer = &http.Server{
 		Addr: ":" + strconv.Itoa(port),
 	}

tunnelproxy.go

@@ -43,6 +43,11 @@ func unsafeRunTunnelProxy(serverAddr string) error {
 		AgentVersion: version,
 	}
 	devInfo.HWAddr, _ = androidutils.HWAddrWLAN()
+
+	// Udid is ${Serial}-${MacAddress}-${model}
+	udid := props["ro.serialno"] + "-" + devInfo.HWAddr + "-" + props["ro.product.model"]
+	devInfo.Udid = udid
+
 	ws.WriteJSON(proto.CommonMessage{
 		Type: proto.DeviceInfoMessage,
 		Data: devInfo,
@@ -53,11 +58,9 @@ func unsafeRunTunnelProxy(serverAddr string) error {
 		return nil
 	})
 	for {
-		_, data, err := ws.ReadMessage()
+		_, _, err := ws.ReadMessage()
 		if err != nil {
 			return err
 		}
-		_ = data
-		// log.Printf("Websocket receive message: %v", string(data))
 	}
 }