feat: show more device info when install

bitxeno · Sep 18, 2024 · 9ca478d · 9ca478d
1 parent da65c4e
commit 9ca478d
Show file tree

Hide file tree

Showing 7 changed files with 116 additions and 11 deletions.
diff --git a/internal/manager/device_manager.go b/internal/manager/device_manager.go
@@ -1,6 +1,7 @@
 package manager
 
 import (
+	"context"
 	"fmt"
 	"os/exec"
 	"strings"
@@ -52,6 +53,38 @@ func (dm *DeviceManager) GetDeviceByUDID(udid string) (*model.Device, bool) {
 	return nil, false
 }
 
+func (dm *DeviceManager) AppendProductInfo(dev *model.Device) {
+	timeout := 10 * time.Second
+	ctx, _ := context.WithTimeout(context.Background(), timeout)
+	cmd := exec.CommandContext(ctx, "ideviceinfo", "-u", dev.UDID, "-n")
+	cmd.Dir = app.Config.Server.DataDir
+	output, err := cmd.CombinedOutput()
+	if err != nil {
+		log.Err(err).Msgf("Error execute ideviceinfo: %s", dev.UDID)
+		return
+	}
+	lines := strings.Split(string(output), "\n")
+
+	for _, line := range lines {
+		var parts = strings.Split(line, ":")
+		if len(parts) != 2 {
+			continue
+		}
+		key := strings.TrimSpace(parts[0])
+		value := strings.TrimSpace(parts[1])
+		switch key {
+		case "ProductType":
+			dev.ProductType = value
+		case "ProductVersion":
+			dev.ProductVersion = value
+		case "DeviceClass":
+			dev.ProductClass = value
+		case "DeviceName":
+			dev.Name = value
+		}
+	}
+}
+
 func (dm *DeviceManager) ReloadDevices() {
 	dm.devices.Range(func(k, v interface{}) bool {
 		dev := v.(model.Device)
@@ -178,6 +211,22 @@ func (dm *DeviceManager) CheckAfcServiceStatus(udid string) error {
 	return nil
 }
 
+func (dm *DeviceManager) CheckDeveloperMode(udid string) (bool, error) {
+	cmd := exec.Command("idevicedevmodectl", "list", "-u", udid, "-n")
+
+	data, err := cmd.CombinedOutput()
+	if err != nil {
+		return false, fmt.Errorf("%s%s", string(data), err.Error())
+	}
+
+	output := string(data)
+	if strings.Contains(output, "enabled") {
+		return true, nil
+	}
+
+	return false, nil
+}
+
 func (dm *DeviceManager) RestartUsbmuxd() error {
 	cmd := exec.Command("/etc/init.d/usbmuxd", "restart")
 	data, err := cmd.CombinedOutput()

diff --git a/internal/manager/manager.go b/internal/manager/manager.go
@@ -14,6 +14,10 @@ func GetDeviceByID(id string) (*model.Device, bool) {
 	return deviceManager.GetDeviceByID(id)
 }
 
+func AppendDeviceProductInfo(dev *model.Device) {
+	deviceManager.AppendProductInfo(dev)
+}
+
 func GetDeviceMountImageInfo(udid string) (*model.UsbmuxdImage, error) {
 	return deviceManager.GetMountImageInfo(udid)
 }
@@ -26,10 +30,18 @@ func ScanDevices() {
 	deviceManager.Scan()
 }
 
+func CheckDeveloperMode(udid string) (bool, error) {
+	return deviceManager.CheckDeveloperMode(udid)
+}
+
 func CheckAfcServiceStatus(udid string) error {
 	return deviceManager.CheckAfcServiceStatus(udid)
 }
 
+func CheckDeviceStatus(udid string) error {
+	return nil
+}
+
 func RestartUsbmuxd() error {
 	return deviceManager.RestartUsbmuxd()
 }
diff --git a/internal/model/device.go b/internal/model/device.go
@@ -1,15 +1,18 @@
 package model
 
 type Device struct {
-	ID          string       `json:"id"`
-	Name        string       `json:"name"`
-	ServiceName string       `json:"service_name"`
-	IP          string       `json:"ip"`
-	MacAddr     string       `json:"mac_addr"`
-	UDID        string       `json:"udid"`
-	Status      DeviceStatus `json:"status"`
-	Enable      bool         `json:"enable"`
-	Message     string       `json:"message"`
+	ID             string       `json:"id"`
+	Name           string       `json:"name"`
+	ServiceName    string       `json:"service_name"`
+	IP             string       `json:"ip"`
+	MacAddr        string       `json:"mac_addr"`
+	UDID           string       `json:"udid"`
+	Status         DeviceStatus `json:"status"`
+	Enable         bool         `json:"enable"`
+	Message        string       `json:"message"`
+	ProductClass   string       `json:"product_class"`
+	ProductType    string       `json:"product_type"`
+	ProductVersion string       `json:"product_version"`
 }
 
 const (

diff --git a/internal/service/service.go b/internal/service/service.go
@@ -97,6 +97,15 @@ func MountDeveloperDiskImage(ctx context.Context, id string) error {
 	return nil
 }
 
+func CheckDeveloperMode(ctx context.Context, id string) (bool, error) {
+	device, ok := manager.GetDeviceByID(id)
+	if !ok {
+		return false, fmt.Errorf("device not found: %s", id)
+	}
+
+	return manager.CheckDeveloperMode(device.UDID)
+}
+
 func CheckAfcService(ctx context.Context, id string) error {
 	device, ok := manager.GetDeviceByID(id)
 	if !ok {

diff --git a/web/router.go b/web/router.go
@@ -128,6 +128,7 @@ func route(fi *fiber.App) {
 	api.Get("/devices/:id", func(c *fiber.Ctx) error {
 		id := c.Params("id")
 		if device, ok := manager.GetDeviceByID(id); ok {
+			manager.AppendDeviceProductInfo(device)
 			return c.Status(http.StatusOK).JSON(apiSuccess(device))
 		}
 
@@ -144,6 +145,16 @@ func route(fi *fiber.App) {
 		}
 	})
 
+	api.Post("/devices/:id/check/devmode", func(c *fiber.Ctx) error {
+		id := c.Params("id")
+
+		enabled, err := service.CheckDeveloperMode(c.Context(), id)
+		if err != nil {
+			return c.Status(http.StatusOK).JSON(apiSuccess(err.Error()))
+		}
+		return c.Status(http.StatusOK).JSON(apiSuccess(enabled))
+	})
+
 	api.Post("/devices/:id/check/afc", func(c *fiber.Ctx) error {
 		id := c.Params("id")
 

diff --git a/web/static/src/api/api.js b/web/static/src/api/api.js
@@ -44,6 +44,22 @@ export default {
         });
     });
   },
+  checkDeveloperMode: (id) => {
+    return new Promise((resolve, reject) => {
+      request({
+        url: `/api/devices/${id}/check/devmode`,
+        timeout: 30000,
+        method: "Post",
+      })
+        .then((res) => {
+          resolve(res.data ? "enabled" : "disabled");
+        })
+        .catch((err) => {
+          console.log(err);
+          resolve("-");
+        });
+    });
+  },
   getDevices: (params) => {
     return request({
       url: "/api/devices",

diff --git a/web/static/src/page/install/index.vue b/web/static/src/page/install/index.vue
@@ -186,10 +186,15 @@ export default {
 
       _this.stopUpdateLog();
       _this.startUpdateLog();
-      _this.log.output += "checking afc service status...\n";
+      _this.log.output += "checking device status...\n";
       try {
+        _this.log.output += `product type: ${_this.device.product_type}\n`;
+        _this.log.output += `product version: ${_this.device.product_version}\n`;
+        let devmode = await api.checkDeveloperMode(_this.id);
+        _this.log.output += `developer mode: ${devmode}\n`;
+
         await api.checkAfcService(_this.id);
-        _this.log.output += "afc service OK!\n";
+        _this.log.output += "afc service: OK!\n";
 
         let formData = new FormData();
         for (let i = 0; i < _this.files.length; i++) {