Solve the problem of memory leaks

Signed-off-by: luckfox-eng29 <eng29@luckfox.com>

Author: luckfox-eng29

jsonrpc.go

@@ -266,6 +266,17 @@ func rpcSetDevChannelState(enabled bool) error {
 	return nil
 }
 
+func rpcGetLocalUpdateStatus() (*LocalMetadata, error) {
+	var localStatus LocalMetadata
+	systemVersionLocal, appVersionLocal, err := GetLocalVersion()
+	if err != nil {
+		return nil, fmt.Errorf("failed to get local version: %w", err)
+	}
+	localStatus.AppVersion = appVersionLocal.String()
+	localStatus.SystemVersion = systemVersionLocal.String()
+	return &localStatus, nil
+}
+
 func rpcGetUpdateStatus() (*UpdateStatus, error) {
 	includePreRelease := config.IncludePreRelease
 	updateStatus, err := GetUpdateStatus(context.Background(), GetDeviceID(), includePreRelease)
@@ -1004,6 +1015,7 @@ var rpcHandlers = map[string]RPCHandler{
 	"setEDID":                  {Func: rpcSetEDID, Params: []string{"edid"}},
 	"getDevChannelState":       {Func: rpcGetDevChannelState},
 	"setDevChannelState":       {Func: rpcSetDevChannelState, Params: []string{"enabled"}},
+	"getLocalUpdateStatus":     {Func: rpcGetLocalUpdateStatus},
 	"getUpdateStatus":          {Func: rpcGetUpdateStatus},
 	"tryUpdate":                {Func: rpcTryUpdate},
 	"getDevModeState":          {Func: rpcGetDevModeState},

ota.go

@@ -89,17 +89,8 @@ func fetchUpdateMetadata(ctx context.Context, deviceId string, includePreRelease
 	//if err != nil {
 	//	return nil, fmt.Errorf("failed to fetch GitHub releases: %w", err)
 	//}
+	//_ = cmd.Process.Release()
 
-	//var release struct {
-	//	TagName string `json:"tag_name"`
-	//	Assets  []struct {
-	//		BrowserDownloadURL string `json:"browser_download_url"`
-	//		Digest             string `json:"digest"`
-	//	} `json:"assets"`
-	//}
-	//if err := json.Unmarshal(output, &release); err != nil {
-	//	return nil, fmt.Errorf("failed to parse GitHub releases JSON: %w", err)
-	//}
 	resp, err := http.Get(UpdateMetadataUrl)
 	if err != nil {
 		return nil, fmt.Errorf("failed to fetch GitHub releases: %w", err)

serial.go

@@ -22,9 +22,69 @@ func initSerialPort() {
 	_ = reopenSerialPort()
 }
 
+//func reopenSerialPort() error {
+//	if port != nil {
+//		port.Close()
+//	}
+//	var err error
+//	port, err = serial.Open(serialPortPath, defaultMode)
+//	if err != nil {
+//		serialLogger.Error().
+//			Err(err).
+//			Str("path", serialPortPath).
+//			Interface("mode", defaultMode).
+//			Msg("Error opening serial port")
+//	}
+//	return nil
+//}
+//
+//func handleSerialChannel(d *webrtc.DataChannel) {
+//	scopedLogger := serialLogger.With().
+//		Uint16("data_channel_id", *d.ID()).Logger()
+//
+//	d.OnOpen(func() {
+//		go func() {
+//			buf := make([]byte, 1024)
+//			for {
+//				n, err := port.Read(buf)
+//				if err != nil {
+//					if err != io.EOF {
+//						scopedLogger.Warn().Err(err).Msg("Failed to read from serial port")
+//					}
+//					break
+//				}
+//				err = d.Send(buf[:n])
+//				if err != nil {
+//					scopedLogger.Warn().Err(err).Msg("Failed to send serial output")
+//					break
+//				}
+//			}
+//		}()
+//	})
+//
+//	d.OnMessage(func(msg webrtc.DataChannelMessage) {
+//		if port == nil {
+//			return
+//		}
+//		_, err := port.Write(msg.Data)
+//		if err != nil {
+//			scopedLogger.Warn().Err(err).Msg("Failed to write to serial")
+//		}
+//	})
+//
+//	d.OnError(func(err error) {
+//		scopedLogger.Warn().Err(err).Msg("Serial channel error")
+//	})
+//
+//	d.OnClose(func() {
+//		scopedLogger.Info().Msg("Serial channel closed")
+//	})
+//}
+
 func reopenSerialPort() error {
 	if port != nil {
 		port.Close()
+		port = nil
 	}
 	var err error
 	port, err = serial.Open(serialPortPath, defaultMode)
@@ -34,7 +94,12 @@ func reopenSerialPort() error {
 			Str("path", serialPortPath).
 			Interface("mode", defaultMode).
 			Msg("Error opening serial port")
+		return err
 	}
+	serialLogger.Info().
+		Str("path", serialPortPath).
+		Interface("mode", defaultMode).
+		Msg("Serial port opened successfully")
 	return nil
 }
 
@@ -43,6 +108,14 @@ func handleSerialChannel(d *webrtc.DataChannel) {
 		Uint16("data_channel_id", *d.ID()).Logger()
 
 	d.OnOpen(func() {
+		// 打开串口
+		if err := reopenSerialPort(); err != nil {
+			scopedLogger.Error().Err(err).Msg("Failed to open serial port")
+			d.Close()
+			return
+		}
+
+		// 串口读取协程
 		go func() {
 			buf := make([]byte, 1024)
 			for {
@@ -53,8 +126,7 @@ func handleSerialChannel(d *webrtc.DataChannel) {
 					}
 					break
 				}
-				err = d.Send(buf[:n])
-				if err != nil {
+				if err := d.Send(buf[:n]); err != nil {
 					scopedLogger.Warn().Err(err).Msg("Failed to send serial output")
 					break
 				}
@@ -77,6 +149,10 @@ func handleSerialChannel(d *webrtc.DataChannel) {
 	})
 
 	d.OnClose(func() {
+		if port != nil {
+			port.Close()
+			port = nil
+		}
 		scopedLogger.Info().Msg("Serial channel closed")
 	})
 }

ui/src/components/Terminal.tsx

@@ -30,7 +30,7 @@ const SOLARIZED_THEME = {
   cyan: "#2aa198", // Solarized cyan
   white: "#eee8d5", // Solarized base2
   brightBlack: "#002b36", // Solarized base03
-  brightRed: "#cb4b16", // Solarized blue
+  brightRed: "#cb4b16", // Solarized orange
   brightGreen: "#586e75", // Solarized base01
   brightYellow: "#657b83", // Solarized base00
   brightBlue: "#839496", // Solarized base0

ui/src/routes/devices.$id.settings.general.update.tsx

@@ -56,6 +56,12 @@ export interface SystemVersionInfo {
   error?: string;
 }
 
+export interface LocalVersionInfo {
+  appVersion: string; 
+  systemVersion: string;
+}
+
+
 export function Dialog({
   onClose,
   onConfirmUpdate,

ui/src/routes/devices.$id.tsx

@@ -54,7 +54,7 @@ import { FeatureFlagProvider } from "../providers/FeatureFlagProvider";
 import notifications from "../notifications";
 
 import { DeviceStatus } from "./welcome-local";
-import { SystemVersionInfo } from "./devices.$id.settings.general.update";
+import { SystemVersionInfo, LocalVersionInfo } from "./devices.$id.settings.general.update";
 
 import { useVpnStore } from "@/hooks/stores";
 
@@ -551,7 +551,7 @@ export default function KvmIdRoute() {
     }
   }
 
-  useInterval(updateVpnStates, 5000);
+  //useInterval(updateVpnStates, 5000);
 
   const setNetworkState = useNetworkStateStore(state => state.setNetworkState);
 
@@ -686,14 +686,20 @@ export default function KvmIdRoute() {
 
   useEffect(() => {
     if (!peerConnection) return;
-    if (!kvmTerminal) {
-      setKvmTerminal(peerConnection.createDataChannel("terminal"));
-    }
-
-    if (!serialConsole) {
-      setSerialConsole(peerConnection.createDataChannel("serial"));
-    }
-  }, [kvmTerminal, peerConnection, serialConsole]);
+    //if (!kvmTerminal) {
+    //  setKvmTerminal(peerConnection.createDataChannel("terminal"));
+    //}
+
+    //if (!serialConsole) {
+    //  setSerialConsole(peerConnection.createDataChannel("serial"));
+    //}
+    const terminalChannel = peerConnection.createDataChannel("terminal");
+    setKvmTerminal(terminalChannel);
+    const serialChannel = peerConnection.createDataChannel("serial");
+    setSerialConsole(serialChannel);
+
+  //}, [kvmTerminal, peerConnection, serialConsole]);
+  }, [peerConnection]);
 
   const outlet = useOutlet();
   const onModalClose = useCallback(() => {
@@ -707,19 +713,15 @@ export default function KvmIdRoute() {
   useEffect(() => {
     if (appVersion) return;
 
-    send("getUpdateStatus", {}, async resp => {
+    send("getLocalUpdateStatus", {}, async resp => {
       if ("error" in resp) {
         notifications.error(`Failed to get device version: ${resp.error}`);
         return 
       }
 
-      const result = resp.result as SystemVersionInfo;
-      if (result.error) {
-        notifications.error(`Failed to get device version: ${result.error}`);
-      }
-
-      setAppVersion(result.local.appVersion);
-      setSystemVersion(result.local.systemVersion);
+      const result = resp.result as LocalVersionInfo;
+      setAppVersion(result.appVersion);
+      setSystemVersion(result.systemVersion);
     });
   }, [appVersion, send, setAppVersion, setSystemVersion]);
 

vpn.go

@@ -203,7 +203,6 @@ func rpcLoginTailScale(xEdge bool) (TailScaleSettings, error) {
 	}
 
 	if currentState == TailScaleDisconnected || currentState == TailScaleConnecting {
-		fmt.Printf("[rpcLoginTailScale] currentState2: %v\n", currentState)
 		if xEdge {
 			cmd := exec.Command("tailscale", "up", "--login-server", "https://login.xedge.cc")
 			cmd.SysProcAttr = &syscall.SysProcAttr{Setsid: true}

web.go

@@ -77,6 +77,8 @@ func setupRouter() *gin.Engine {
 	))
 	staticFS, _ := fs.Sub(staticFiles, "static")
 
+	r.Any("/debug/pprof/*any", gin.WrapH(http.DefaultServeMux))
+
 	// Add a custom middleware to set cache headers for images
 	// This is crucial for optimizing the initial welcome screen load time
 	// By enabling caching, we ensure that pre-loaded images are stored in the browser cache

webrtc.go

@@ -104,8 +104,8 @@ func newSession(config SessionConfig) (*Session, error) {
 		case "disk":
 			session.DiskChannel = d
 			d.OnMessage(onDiskMessage)
-		//case "terminal":
-		//	handleTerminalChannel(d)
+		case "terminal":
+			handleTerminalChannel(d)
 		case "serial":
 			handleSerialChannel(d)
 		default: