update according to code review

Jigsaw-Code · Sep 12, 2024 · f4fb5b3 · f4fb5b3
1 parent 18cac49
commit f4fb5b3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/client/electron/go_vpn_tunnel.ts b/client/electron/go_vpn_tunnel.ts
@@ -292,7 +292,7 @@ class GoTun2socks {
       this.monitorStarted().then(() => (restarting = true));
       try {
         lastError = null;
-        await this.process.launch(args, true);
+        await this.process.launch(args, false);
         console.info('[tun2socks] - exited with no errors');
       } catch (e) {
         console.error('[tun2socks] - terminated due to:', e);
@@ -340,10 +340,10 @@ async function checkConnectivity(tun2socks: GoTun2socks) {
   const output = await tun2socks.checkConnectivity();
   // Only parse the first line, because sometimes Windows Crypto API adds warnings to stdout.
   const outObj = JSON.parse(output.split('\n')[0]);
-  if ('tcpErrorJson' in outObj && outObj.tcpErrorJson) {
-    throw new Error(outObj.tcpErrorJson);
+  if ('tcp' in outObj && outObj.tcp) {
+    throw new Error(outObj.tcp);
   }
-  if ('udpErrorJson' in outObj && outObj.udpErrorJson) {
+  if ('udp' in outObj && outObj.udp) {
     return false;
   }
   return true;

diff --git a/client/electron/process.ts b/client/electron/process.ts
@@ -70,7 +70,7 @@ export class ChildProcessHelper {
    *
    * @param args The args for the process
    */
-  async launch(args: string[], ignoreStdOut: boolean = false): Promise<string> {
+  async launch(args: string[], returnStdOut: boolean = true): Promise<string> {
     if (this.childProcess) {
       throw new Error(
         `subprocess ${this.processName} has already been launched`
@@ -102,7 +102,7 @@ export class ChildProcessHelper {
 
       this.childProcess?.stdout?.on('data', data => {
         this.stdOutListener?.(data);
-        if (!ignoreStdOut) {
+        if (returnStdOut) {
           stdOutStr += data?.toString() ?? '';
         }
       });

diff --git a/client/go/outline/electron/main.go b/client/go/outline/electron/main.go
@@ -52,8 +52,8 @@ var logger = slog.New(slog.NewTextHandler(os.Stdout, nil))
 
 // The result JSON containing two error strings when "--checkConnectivity".
 type CheckConnectivityResult struct {
-	TCPErrorJson string `json:"tcpErrorJson,omitempty"`
-	UDPErrorJson string `json:"udpErrorJson,omitempty"`
+	TCPErrorJson string `json:"tcp"`
+	UDPErrorJson string `json:"udp"`
 }
 
 var args struct {