修改当前连接设备方法

2025-10-29 18:31:18 +08:00
parent 180b51267d
commit a03d13613c
4 changed files with 821 additions and 1 deletions
--- a/adb/device.go
+++ b/adb/device.go
@@ -0,0 +1,303 @@
+package adb
+
+import (
+	"bufio"
+	"fmt"
+	"io"
+	"log"
+	"net"
+	"strings"
+	"time"
+)
+
+// DeviceInfo 包含从 adb server 列表和设备端 getprop 收集到的信息
+type DeviceInfo struct {
+	Serial      string
+	State       string
+	Product     string
+	Model       string
+	Device      string
+	TransportID string
+	Props       map[string]string
+}
+
+// listDevicesRaw: 请求 host:devices 并返回原始 payload
+func listDevicesRaw(addr string, timeout time.Duration) (string, error) {
+	conn, err := DialADB(addr, timeout)
+	if err != nil {
+		return "", err
+	}
+	defer conn.Close()
+
+	if err := WriteAdbCmd(conn, "host:devices-l"); err != nil {
+		return "", err
+	}
+	status, err := ReadStatus(conn)
+	if err != nil {
+		return "", err
+	}
+	if status == "FAIL" {
+		msg, _ := ReadLenFrame(conn)
+		return "", fmt.Errorf("adb FAIL: %s", string(msg))
+	}
+	if status != "OKAY" {
+		return "", fmt.Errorf("unexpected status: %s", status)
+	}
+
+	var parts []string
+	for {
+		data, err := ReadLenFrame(conn)
+		if err != nil {
+			// treat short read timeout as finish
+			if ne, ok := err.(net.Error); ok && ne.Timeout() {
+				break
+			}
+			if err == io.EOF {
+				break
+			}
+			return "", err
+		}
+		if len(data) == 0 {
+			break
+		}
+		parts = append(parts, string(data))
+	}
+	log.Println(parts)
+	return strings.Join(parts, ""), nil
+}
+
+// parseDevicesPayload: 解析 host:devices 返回的 payload，提取可能的 product/model/device/transport_id
+func parseDevicesPayload(payload string) []DeviceInfo {
+	out := []DeviceInfo{}
+	lines := strings.Split(payload, "\n")
+	for _, ln := range lines {
+		ln = strings.TrimSpace(ln)
+		if ln == "" || strings.HasPrefix(ln, "List of devices attached") {
+			continue
+		}
+		// adb -l 格式通常：serial <state> key:val key:val ...
+		fields := strings.Fields(ln)
+		if len(fields) < 2 {
+			continue
+		}
+		dev := DeviceInfo{
+			Serial: fields[0],
+			State:  fields[1],
+			Props:  map[string]string{},
+		}
+		// parse remaining key:val pairs
+		for _, kv := range fields[2:] {
+			if strings.Contains(kv, ":") {
+				parts := strings.SplitN(kv, ":", 2)
+				k := parts[0]
+				v := parts[1]
+				switch k {
+				case "product":
+					dev.Product = v
+				case "model":
+					dev.Model = v
+				case "device":
+					dev.Device = v
+				case "transport_id":
+					dev.TransportID = v
+				default:
+					// store any extra short fields into Props under prefixed key
+					dev.Props["short."+k] = v
+				}
+			}
+		}
+		out = append(out, dev)
+	}
+	return out
+}
+
+// getPropExecOut: 通过 exec-out:getprop 一次性获取设备所有 getprop 输出（返回原始字节）
+func getPropExecOut(addr, serial string, timeout time.Duration) ([]byte, error) {
+	// open a connection and switch transport for this connection
+	conn, err := DialADB(addr, timeout)
+	if err != nil {
+		return nil, err
+	}
+	// ensure close
+	defer conn.Close()
+
+	// transport
+	if err := WriteAdbCmd(conn, "host:transport:"+serial); err != nil {
+		return nil, err
+	}
+	status, err := ReadStatus(conn)
+	if err != nil {
+		return nil, err
+	}
+	if status == "FAIL" {
+		msg, _ := ReadLenFrame(conn)
+		return nil, fmt.Errorf("transport FAIL: %s", string(msg))
+	}
+	if status != "OKAY" {
+		return nil, fmt.Errorf("unexpected transport status: %s", status)
+	}
+
+	// send exec-out:getprop
+	if err := WriteAdbCmd(conn, "exec-out:getprop"); err != nil {
+		return nil, err
+	}
+	status, err = ReadStatus(conn)
+	if err != nil {
+		return nil, err
+	}
+	if status == "FAIL" {
+		msg, _ := ReadLenFrame(conn)
+		return nil, fmt.Errorf("exec-out FAIL: %s", string(msg))
+	}
+	if status != "OKAY" {
+		return nil, fmt.Errorf("unexpected exec-out status: %s", status)
+	}
+
+	// read frames until timeout/EOF and concatenate
+	var b []byte
+	for {
+		data, err := ReadLenFrame(conn)
+		if err != nil {
+			if ne, ok := err.(net.Error); ok && ne.Timeout() {
+				break
+			}
+			if err == io.EOF {
+				break
+			}
+			return nil, err
+		}
+		if len(data) == 0 {
+			break
+		}
+		b = append(b, data...)
+	}
+	return b, nil
+}
+
+// parseGetprop parses getprop output "key]: [value" lines into map
+func parseGetprop(raw []byte) map[string]string {
+	m := map[string]string{}
+	sc := bufio.NewScanner(strings.NewReader(string(raw)))
+	for sc.Scan() {
+		line := strings.TrimSpace(sc.Text())
+		// getprop lines are like: [ro.build.version.release]: [10]
+		if line == "" {
+			continue
+		}
+		// find first ']:' separator
+		// safe parse: extract between first '[' and first ']: [' pattern
+		// simpler: split by "]: [" into two parts after trimming surrounding brackets
+		parts := strings.SplitN(line, "]: [", 2)
+		if len(parts) == 2 {
+			k := strings.TrimPrefix(parts[0], "[")
+			v := strings.TrimSuffix(parts[1], "]")
+			m[k] = v
+		} else {
+			// fallback: try split by ": "
+			kv := strings.SplitN(line, ": ", 2)
+			if len(kv) == 2 {
+				m[strings.Trim(kv[0], "[]")] = strings.Trim(kv[1], "[]")
+			}
+		}
+	}
+	return m
+}
+
+// CollectAllDevices gathers DeviceInfo for all devices listed by adb server
+func CollectAllDevices(addr string, timeout time.Duration) ([]DeviceInfo, error) {
+	raw, err := listDevicesRaw(addr, timeout)
+	if err != nil {
+		return nil, err
+	}
+	devs := parseDevicesPayload(raw)
+	if len(devs) == 0 {
+		return devs, nil
+	}
+
+	// For each device, fetch getprop via exec-out (sequential; can be parallelized)
+	for i := range devs {
+		serial := devs[i].Serial
+		rawProps, err := getPropExecOut(addr, serial, timeout)
+		if err != nil {
+			// record error in Props under special key
+			devs[i].Props["__getprop_error"] = err.Error()
+			continue
+		}
+		props := parseGetprop(rawProps)
+		// merge into existing short props (from devices -l)
+		for k, v := range props {
+			devs[i].Props[k] = v
+		}
+	}
+	return devs, nil
+}
+
+func parseDevicesMap(payload string) (map[string]string, []string) {
+	m := make(map[string]string)
+	lines := strings.Split(payload, "\n")
+	for _, ln := range lines {
+		ln = strings.TrimSpace(ln)
+		if ln == "" || strings.HasPrefix(ln, "List of devices attached") {
+			continue
+		}
+		fields := strings.Fields(ln)
+		if len(fields) < 2 {
+			continue
+		}
+		serial := fields[0]
+		product := ""
+		for _, kv := range fields[2:] {
+			if strings.HasPrefix(kv, "product:") {
+				product = strings.TrimPrefix(kv, "product:")
+				break
+			}
+		}
+		m[serial] = product
+	}
+	return m, lines
+}
+
+// Find device serial by product value and return serial (first match)
+func FindSerialByProduct(addr, targetProduct string) (string, error) {
+	payload, err := listDevicesRaw(addr, 3*time.Second)
+	if err != nil {
+		return "", err
+	}
+	m, _ := parseDevicesMap(payload)
+	for serial, product := range m {
+		if product == targetProduct {
+			return serial, nil
+		}
+	}
+	// fallback: if no product fields in devices-l, try per-device getprop
+	payloadBasic, _ := listDevicesRaw(addr, 3*time.Second) // reuse; could be host:devices if preferred
+	lines := strings.Split(payloadBasic, "\n")
+	for _, ln := range lines {
+		ln = strings.TrimSpace(ln)
+		if ln == "" || strings.HasPrefix(ln, "List of devices attached") {
+			continue
+		}
+		fields := strings.Fields(ln)
+		if len(fields) < 1 {
+			continue
+		}
+		serial := fields[0]
+		// query getprop ro.product.model for this serial
+		conn, err := DialADB(addr, 2*time.Second)
+		if err != nil {
+			continue
+		}
+		// ensure close
+		defer conn.Close()
+		if err := TransportTo(conn, serial); err != nil {
+			continue
+		}
+		out, err := ExecOut(conn, "getprop ro.product.model")
+		if err == nil {
+			if strings.TrimSpace(string(out)) == targetProduct {
+				return serial, nil
+			}
+		}
+	}
+	return "", fmt.Errorf("no device with product=%s found", targetProduct)
+}