bump deps and server version

Author: Juby210

go.mod

@@ -1,10 +1,12 @@
 module httptoolkit-desktop-go
 
-go 1.20
+go 1.21
 
 require (
 	github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf
-	github.com/webview/webview v0.0.0-20230415172654-8387ff8945fc
+	github.com/webview/webview_go v0.0.0
 )
 
 require github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf // indirect
+
+replace github.com/webview/webview_go => github.com/juby-httptoolkit/webview_go v0.0.0-20231002110549-60cb34aae999

go.sum

@@ -1,6 +1,6 @@
 github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf h1:FPsprx82rdrX2jiKyS17BH6IrTmUBYqZa/CXT4uvb+I=
 github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf/go.mod h1:peYoMncQljjNS6tZwI9WVyQB3qZS6u79/N3mBOcnd3I=
+github.com/juby-httptoolkit/webview_go v0.0.0-20231002110549-60cb34aae999 h1:U/aVWQQpndy9b1X0HDgZi+1iy11+O5DV1jaELPW5r+8=
+github.com/juby-httptoolkit/webview_go v0.0.0-20231002110549-60cb34aae999/go.mod h1:yE65LFCeWf4kyWD5re+h4XNvOHJEXOCOuJZ4v8l5sgk=
 github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf h1:pCxn3BCfu8n8VUhYl4zS1BftoZoYY0J4qVF3dqAQ4aU=
 github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf/go.mod h1:/qNPSY91qTz/8TgHEMioAUc6q7+3SOybeKczHMXFcXw=
-github.com/webview/webview v0.0.0-20230415172654-8387ff8945fc h1:3LWOLV/SbVjPYCARWGcRpOKP30U/I6EP1v8PSIoh1aU=
-github.com/webview/webview v0.0.0-20230415172654-8387ff8945fc/go.mod h1:rpXAuuHgyEJb6kXcXldlkOjU6y4x+YcASKKXJNUhh0Y=

main.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/sqweek/dialog"
-	"github.com/webview/webview"
+	"github.com/webview/webview_go"
 )
 
 var (

setup_server.go

@@ -3,20 +3,31 @@ package main
 import (
 	"archive/tar"
 	"compress/gzip"
+	"encoding/json"
 	"fmt"
 	"io"
 	"net/http"
 	"os"
 )
 
-const requiredVersion = "1.12.6"
+const requiredVersion = "1.14.3"
 
 func setupServer() error {
-	if _, err := os.Stat("httptoolkit-server/package.json"); err != nil {
-		if err = downloadServer(); err != nil {
-			return err
-		}
+	file, err := os.Open("httptoolkit-server/package.json")
+	if err != nil {
+		return downloadServer()
+	}
+	defer file.Close()
+
+	var pkg struct{ Version string }
+	if err = json.NewDecoder(file).Decode(&pkg); err != nil {
+		return downloadServer()
 	}
+
+	if pkg.Version != requiredVersion {
+		return downloadServer()
+	}
+
 	return nil
 }
 
@@ -77,8 +88,10 @@ func extract(gzipStream io.Reader) error {
 	for header, err = tarReader.Next(); err == nil; header, err = tarReader.Next() {
 		switch header.Typeflag {
 		case tar.TypeDir:
-			if err := os.Mkdir(header.Name, 0755); err != nil {
-				return fmt.Errorf("extract: Mkdir() failed: %w", err)
+			if _, err := os.Stat(header.Name); err != nil {
+				if err := os.Mkdir(header.Name, 0755); err != nil {
+					return fmt.Errorf("extract: Mkdir() failed: %w", err)
+				}
 			}
 		case tar.TypeReg:
 			outFile, err := os.OpenFile(header.Name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777)