chore: cleanup and route refactoring

Signed-off-by: allanice001 <allanice001@gmail.com>

internal/web/pgweb_embed.go

@@ -1,85 +0,0 @@
-package web
-
-import (
-	"crypto/sha256"
-	"embed"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-)
-
-//go:embed pgwebbin/*
-var pgwebFS embed.FS
-
-type pgwebAsset struct {
-	Path   string
-	SHA256 string
-}
-
-var pgwebIndex = map[string]pgwebAsset{
-	"linux/amd64":  {Path: "pgwebbin/pgweb-linux-amd64", SHA256: ""},
-	"linux/arm64":  {Path: "pgwebbin/pgweb-linux-arm64", SHA256: ""},
-	"darwin/amd64": {Path: "pgwebbin/pgweb-darwin-amd64", SHA256: ""},
-	"darwin/arm64": {Path: "pgwebbin/pgweb-darwin-arm64", SHA256: ""},
-}
-
-func ExtractPgweb() (string, error) {
-	key := runtime.GOOS + "/" + runtime.GOARCH
-	as, ok := pgwebIndex[key]
-	if !ok {
-		return "", fmt.Errorf("pgweb not embedded for %s", key)
-	}
-	f, err := pgwebFS.Open(as.Path)
-	if err != nil {
-		return "", fmt.Errorf("embedded pgweb missing: %w", err)
-	}
-	defer f.Close()
-
-	tmpDir, err := os.MkdirTemp("", "pgweb-*")
-	if err != nil {
-		return "", err
-	}
-
-	filename := "pgweb"
-	if runtime.GOOS == "windows" {
-		filename += ".exe"
-	}
-	outPath := filepath.Join(tmpDir, filename)
-
-	out, err := os.OpenFile(outPath, os.O_CREATE|os.O_WRONLY|os.O_TRUNC, 0o700)
-	if err != nil {
-		return "", err
-	}
-	defer out.Close()
-
-	h := sha256.New()
-	if _, err = io.Copy(io.MultiWriter(out, h), f); err != nil {
-		return "", err
-	}
-
-	if as.SHA256 != "" {
-		got := hex.EncodeToString(h.Sum(nil))
-		if got != as.SHA256 {
-			return "", fmt.Errorf("pgweb checksum mismatch: got=%s want=%s", got, as.SHA256)
-		}
-	}
-
-	// Make sure it’s executable on Unix; Windows ignores this.
-	_ = os.Chmod(outPath, 0o700)
-	return outPath, nil
-}
-
-func CleanupPgweb(pgwebPath string) error {
-	if pgwebPath == "" {
-		return nil
-	}
-	dir := filepath.Dir(pgwebPath)
-	if dir == "" || dir == "/" || dir == "." {
-		return errors.New("refusing to remove suspicious directory")
-	}
-	return os.RemoveAll(dir)
-}

internal/web/pgweb_proxy.go

@@ -1,107 +0,0 @@
-package web
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"os/exec"
-	"time"
-)
-
-type Pgweb struct {
-	cmd  *exec.Cmd
-	host string
-	port string
-	bin  string
-}
-
-func StartPgweb(dbURL, host, port string, readonly bool, user, pass string) (*Pgweb, error) {
-	// pick random port if 0/empty
-	if port == "" || port == "0" {
-		l, err := net.Listen("tcp", net.JoinHostPort(host, "0"))
-		if err != nil {
-			return nil, err
-		}
-		defer l.Close()
-		_, p, _ := net.SplitHostPort(l.Addr().String())
-		port = p
-	}
-
-	args := []string{
-		"--url", dbURL,
-		"--bind", host,
-		"--listen", port,
-		"--prefix", "db-studio",
-		"--skip-open",
-	}
-	if readonly {
-		args = append(args, "--readonly")
-	}
-	if user != "" && pass != "" {
-		args = append(args, "--auth-user", user, "--auth-pass", pass)
-	}
-
-	pgwebBinary, err := ExtractPgweb()
-	if err != nil {
-		return nil, fmt.Errorf("pgweb extract: %w", err)
-	}
-
-	cmd := exec.Command(pgwebBinary, args...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-
-	if err := cmd.Start(); err != nil {
-		return nil, err
-	}
-
-	// wait for port to be ready
-	deadline := time.Now().Add(4 * time.Second)
-	for time.Now().Before(deadline) {
-		c, err := net.DialTimeout("tcp", net.JoinHostPort(host, port), 200*time.Millisecond)
-		if err == nil {
-			_ = c.Close()
-			return &Pgweb{cmd: cmd, host: host, port: port}, nil
-		}
-		time.Sleep(120 * time.Millisecond)
-	}
-	// still return object so caller can Stop()
-	//return &Pgweb{cmd: cmd, host: host, port: port, bin: pgwebBinary}, nil
-	return nil, fmt.Errorf("pgweb did not become ready on %s:%s", host, port)
-}
-
-func (p *Pgweb) Proxy() http.HandlerFunc {
-	target, _ := url.Parse("http://" + net.JoinHostPort(p.host, p.port))
-	proxy := httputil.NewSingleHostReverseProxy(target)
-	proxy.FlushInterval = 100 * time.Millisecond
-	return func(w http.ResponseWriter, r *http.Request) {
-		r.Host = target.Host
-		// Let pgweb handle its paths; we mount it at a prefix.
-		proxy.ServeHTTP(w, r)
-	}
-}
-
-func (p *Pgweb) Stop(ctx context.Context) error {
-	if p == nil || p.cmd == nil || p.cmd.Process == nil {
-		return nil
-	}
-	_ = p.cmd.Process.Kill()
-	done := make(chan struct{})
-	go func() { _, _ = p.cmd.Process.Wait(); close(done) }()
-	select {
-	case <-done:
-		if p.bin != "" {
-			_ = CleanupPgweb(p.bin)
-		}
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-	return nil
-}
-
-func (p *Pgweb) Port() string {
-	return p.port
-}