add Linux support

Juby210 · Juby210 · commit 719dd0ec29bf · 2023-05-24T18:08:35.000+02:00
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -52,11 +52,65 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: build
+          name: win
           path: httptoolkit-desktop-go.exe
+
+  build-linux:
+    runs-on: ubuntu-22.04
+
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v3
+        with:
+          go-version: "1.20.4"
+        
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - uses: actions/cache@v3
+        with:
+          path: |
+            ~/.cache/go-build
+            ~/go/pkg/mod
+          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          restore-keys: |
+            ${{ runner.os }}-go-
+
+      - name: Install Linux dependencies
+        run: |
+          sudo apt update
+          sudo apt install libgtk-3-dev libwebkit2gtk-4.0-dev
+      
+      - name: Build
+        run: |
+          go build -v -ldflags "-s -w" -o httptoolkit-desktop-go .
+          chmod +x httptoolkit-desktop-go
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v3
+        with:
+          name: linux
+          path: httptoolkit-desktop-go
+
+  release:
+    runs-on: ubuntu-latest
+    needs: [build-windows, build-linux]
+
+    steps:
+      - uses: actions/download-artifact@v3
+        with:
+          name: win
+          path: win
         
+      - uses: actions/download-artifact@v3
+        with:
+          name: linux
+          path: linux
+
       - name: Release
         uses: softprops/action-gh-release@1e07f4398721186383de40550babbdf2b84acfc5 # v1
         with:
           name: ${{ github.ref_name }}
-          files: httptoolkit-desktop-go.exe
+          files: |
+            win/httptoolkit-desktop-go.exe
+            linux/httptoolkit-desktop-go
diff --git a/README.md b/README.md
@@ -1,4 +1,8 @@
 # HTTP Toolkit Desktop Go
 Unofficial desktop app for HTTP Toolkit in Go.
 
-Supports only Windows, because of webkit/webview lib bug on Linux https://github.com/webview/webview/issues/241
+- On Windows uses [Microsoft Edge WebView2](https://developer.microsoft.com/en-us/microsoft-edge/webview2/)
+- On Linux uses [WebKitGTK](https://webkitgtk.org/)
+  - Debian-based: `libwebkit2gtk-4.0-37`
+  - Fedora-based: `webkit2gtk4.0`
+  - Arch: `webkit2gtk`
diff --git a/go.mod b/go.mod
@@ -3,11 +3,8 @@ module httptoolkit-desktop-go
 go 1.20
 
 require (
-	github.com/harry1453/go-common-file-dialog v1.2.0
+	github.com/sqweek/dialog v0.0.0-20220809060634-e981b270ebbf
 	github.com/webview/webview v0.0.0-20230415172654-8387ff8945fc
 )
 
-require (
-	github.com/go-ole/go-ole v1.2.4 // indirect
-	github.com/google/uuid v1.1.1 // indirect
-)
+require github.com/TheTitanrain/w32 v0.0.0-20180517000239-4f5cfb03fabf // indirect
diff --git a/go.sum b/go.sum
@@ -1,8 +1,6 @@
-github.com/go-ole/go-ole v1.2.4 h1:nNBDSCOigTSiarFpYE9J/KtEA1IOW4CNeqT9TQDqCxI=
-github.com/go-ole/go-ole v1.2.4/go.mod h1:XCwSNxSkXRo4vlyPy93sltvi/qJq0jqQhjqQNIwKuxM=
-github.com/google/uuid v1.1.1 h1:Gkbcsh/GbpXz7lPftLA3P6TYMwjCLYm83jiFQZF/3gY=
-github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
-github.com/harry1453/go-common-file-dialog v1.2.0 h1:nGr9ZIpXrKb7IUY9Or6jqt4nuPEd/I+5sH1JPMsKhaM=
-github.com/harry1453/go-common-file-dialog v1.2.0/go.mod h1:3zwmbo7fy+uYGyaec74mu+Z9DPg0aEt10fSjjPwfyiY=
+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/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=
diff --git a/main.go b/main.go
@@ -8,8 +8,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/harry1453/go-common-file-dialog/cfd"
-	"github.com/harry1453/go-common-file-dialog/cfdutil"
+	"github.com/sqweek/dialog"
 	"github.com/webview/webview"
 )
 
@@ -24,6 +23,7 @@ func main() {
 	w.SetTitle("HTTP Toolkit")
 	w.SetSize(1366, 768, webview.HintNone)
 	w.SetHtml("Setting up server..<script>window.onload=()=>_onload()</script>")
+	webkitFixes(w.Window())
 
 	w.Bind("_onload", func() {
 		go func() {
@@ -49,16 +49,13 @@ func main() {
 		}()
 	})
 
-	//goland:noinspection ALL
-	if platform == "win32" {
-		w.Bind("prompt", func(_ string) string {
-			result, err := cfdutil.ShowOpenFileDialog(cfd.DialogConfig{})
-			if err != cfd.ErrorCancelled {
-				fmt.Println(err)
-			}
-			return result
-		})
-	}
+	w.Bind("prompt", func(_ string) string {
+		result, err := dialog.File().Load()
+		if err != nil && err != dialog.ErrCancelled {
+			fmt.Println(err)
+		}
+		return result
+	})
 
 	w.Run()
 
diff --git a/setup_server.go b/setup_server.go
@@ -81,7 +81,7 @@ func extract(gzipStream io.Reader) error {
 				return fmt.Errorf("extract: Mkdir() failed: %w", err)
 			}
 		case tar.TypeReg:
-			outFile, err := os.Create(header.Name)
+			outFile, err := os.OpenFile(header.Name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0777)
 			if err != nil {
 				return fmt.Errorf("extract: Create() failed: %w", err)
 			}
diff --git a/utils.go b/utils.go
@@ -2,11 +2,34 @@
 
 package main
 
-import "runtime"
+/*
+#cgo pkg-config: gtk+-3.0 webkit2gtk-4.0
+
+#include <gtk/gtk.h>
+#include <webkit2/webkit2.h>
+
+void webkit_fixes(void *window) {
+	GtkWidget *wv = gtk_bin_get_child((GtkBin *) window);
+	WebKitWebContext *ctx = webkit_web_view_get_context(WEBKIT_WEB_VIEW(wv));
+	WebKitSecurityManager *sm = webkit_web_context_get_security_manager(ctx);
+	webkit_security_manager_register_uri_scheme_as_secure(sm, "http");
+	webkit_security_manager_register_uri_scheme_as_secure(sm, "ws");
+}
+*/
+import "C"
+
+import (
+	"runtime"
+	"unsafe"
+)
 
 const (
 	binPath  = "bin/httptoolkit-server"
 	platform = runtime.GOOS
 )
 
 func hideWindow() {}
+
+func webkitFixes(window unsafe.Pointer) {
+	C.webkit_fixes(window)
+}
diff --git a/utils_windows.go b/utils_windows.go
@@ -2,7 +2,10 @@
 
 package main
 
-import "syscall"
+import (
+	"syscall"
+	"unsafe"
+)
 
 const (
 	binPath  = "bin/httptoolkit-server.cmd"
@@ -12,3 +15,5 @@ const (
 func hideWindow() {
 	cmd.SysProcAttr = &syscall.SysProcAttr{HideWindow: true}
 }
+
+func webkitFixes(_ unsafe.Pointer) {}

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func extract(gzipStream io.Reader) error {`
`81`	`81`	`return fmt.Errorf("extract: Mkdir() failed: %w", err)`
`82`	`82`	`}`
`83`	`83`	`case tar.TypeReg:`
`84`		`- outFile, err := os.Create(header.Name)`
	`84`	`+ outFile, err := os.OpenFile(header.Name, os.O_RDWR\|os.O_CREATE\|os.O_TRUNC, 0777)`
`85`	`85`	`if err != nil {`
`86`	`86`	`return fmt.Errorf("extract: Create() failed: %w", err)`
`87`	`87`	`}`