feat(swiftui): wait and show client error message after the client is…

… started

After th swiftui client is started, we call Go API `WaitClientWrapper` to wait error and show error
message dialog if there is some error while running.

extra/go-api/wssocks_client_wrapper.go

@@ -50,6 +50,15 @@ func StartClientWrapper(handlesPtr uintptr, localAddr, remoteAddr, httpLocalAddr
 	return C.CString("")
 }
 
+//export WaitClientWrapper
+func WaitClientWrapper(handlesPtr uintptr) *C.char {
+	var hp = (*extra.TaskHandles)(unsafe.Pointer(handlesPtr))
+	if err := hp.Wait(); err != nil {
+		return C.CString(err.Error())
+	}
+	return C.CString("")
+}
+
 //export StopClientWrapper
 func StopClientWrapper(handlesPtr uintptr) *C.char {
 	var hp = (*extra.TaskHandles)(unsafe.Pointer(handlesPtr))

swiftui-client/wssocks-ustb-client/menu/MenuBarView.swift

@@ -18,7 +18,8 @@ struct MenuBarView: View {
 
     var statusItem: NSStatusItem! // ref of status item
     var configsInView: Configs! // ref of config values in ContentView
-
+
+    @State var ignoreWaitErr = true
     private let defaults = UserDefaults.standard
     @State var wssocksStatus = 0
     var client = WssocksClient()
@@ -210,10 +211,26 @@ end tell
                         self.setWssocksStatusUI(status: 1)
                     }
                 }
+                if msg != "" { // starting has error, skip waiting
+                    return
+                }
+
+                self.ignoreWaitErr = false // now we can accept wait error
+                let errorMsg = self.client.waitClient() ?? ""
+                DispatchQueue.main.sync {
+                    // we only log error when it task is finished with error (not button clicking by user).
+                    if errorMsg != "" && !ignoreWaitErr {
+                        self.noticeFailed(message: errorMsg)
+                    }
+                    // waiting finished, set the status as "stopped".
+                    self.setWssocksStatusUI(status: 0)
+                    self.ignoreWaitErr = true
+                }
             }
         } else {
             statusDesc = "正在停止wssocks..."
             btnInProgress = true
+            self.ignoreWaitErr = true
             DispatchQueue.global().async {
                 let msg = self.client.stopClient() ?? ""
                 DispatchQueue.main.sync {

swiftui-client/wssocks-ustb-client/wssocksClientApi.swift

@@ -42,6 +42,11 @@ struct WssocksClient {
         return String(bytesNoCopy: v, length: strlen(v), encoding: .utf8, freeWhenDone: true)
     }
 
+    public func waitClient() -> String? {
+        guard let v = WaitClientWrapper(self.handle) else { return nil }
+        return String(bytesNoCopy: v, length: strlen(v), encoding: .utf8, freeWhenDone: true)
+    }
+
     public func stopClient() -> String? {
         guard let v = StopClientWrapper(self.handle) else { return nil }
         return String(bytesNoCopy: v, length: strlen(v), encoding: .utf8, freeWhenDone: true)