feat: reorganize codebase

Author: aorith

README.md

@@ -1,16 +1,11 @@
 <!-- templates/partials/reqbuild_partial.html -->
 
 <div class="fade-me-in">
-	{{ $scheme := .ReqBuild.Scheme }}
-	{{ $connectTo := .ReqBuild.ConnectTo }}
-	{{ $backend := .ReqBuild.Backend }}
-	{{ $custom := .ReqBuild.ConnectCustom }}
-	{{ $received := .ReqBuild.ReceivedHeaders }}
-	{{ $excluded := .ReqBuild.ExcludedHeaders }}
+	{{ $data := . }}
 	{{- range .Transactions.Set.Transactions }}
 	{{ if isTxTypeSession . }}{{ continue }}{{ end }}
 	<h3>{{ .TXID }}</h3>
-	<pre><code class="language-bash">{{- curlCommand . $scheme $connectTo $backend $custom $received $excluded -}}</code></pre>
+	<pre><code class="language-bash">{{- curlCommand . $data -}}</code></pre>
 	{{- end }}
 </div>
 

assets/templates/partials/reqbuild_partial.html

@@ -8,7 +8,7 @@ import (
 	"log/slog"
 	"os"
 
-	"github.com/aorith/varnishlog-parser/pkg/server"
+	"github.com/aorith/varnishlog-parser/internal/server"
 )
 
 var version string = "dev"

cmd/server/varnishlog-parser.go

@@ -0,0 +1,73 @@
+// SPDX-License-Identifier: MIT
+
+package html
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/aorith/varnishlog-parser/render"
+	"github.com/aorith/varnishlog-parser/vsl"
+)
+
+func processReqBuildForm(tx *vsl.Transaction, cfg PageData) (*render.HTTPRequest, *render.Backend, error) {
+	var backend *render.Backend
+
+	c := cfg.ReqBuild
+	switch c.ConnectTo {
+	case "backend":
+		switch c.Backend {
+		case "none":
+			backend = nil
+
+		case "auto":
+			if tx.TXType == vsl.TxTypeBereq {
+				host, port, err := render.ParseBackend(tx.GetBackendConnStr())
+				if err != nil {
+					return nil, nil, fmt.Errorf("parsing backend failed: %q", err)
+				}
+				backend = render.NewBackend(host, port)
+			}
+
+		default:
+			host, port, err := render.ParseBackend(c.Backend)
+			if err != nil {
+				return nil, nil, fmt.Errorf("failure parsing backend string: %q", err)
+			}
+			backend = render.NewBackend(host, port)
+		}
+
+	case "custom":
+		if c.ConnectCustom == "" {
+			return nil, nil, fmt.Errorf("parameter ConnectCustom is empty")
+		}
+		host, port, err := render.ParseBackend(c.ConnectCustom)
+		if err != nil {
+			return nil, nil, fmt.Errorf("error parsing backend: %q", err)
+		}
+		backend = render.NewBackend(host, port)
+
+	default:
+		return nil, nil, fmt.Errorf("ConnectTo has an incorrect value: %s", c.ConnectTo)
+	}
+
+	excludedHeaders := strings.Split(c.ExcludedHeaders, ",")
+	for i, n := range excludedHeaders {
+		excludedHeaders[i] = strings.TrimSpace(n)
+	}
+
+	httpReq, err := render.NewHTTPRequest(tx, c.ReceivedHeaders, excludedHeaders)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failure creating HTTPRequest object: %q", err)
+	}
+
+	return httpReq, backend, nil
+}
+
+func curlCommand(tx *vsl.Transaction, cfg PageData) string {
+	httpReq, backend, err := processReqBuildForm(tx, cfg)
+	if err != nil {
+		return err.Error()
+	}
+	return httpReq.CurlCommand(cfg.ReqBuild.Scheme, backend)
+}

internal/server/html/helpers.go

@@ -11,7 +11,7 @@ import (
 	"text/template"
 
 	"github.com/aorith/varnishlog-parser/assets"
-	"github.com/aorith/varnishlog-parser/pkg/render"
+	"github.com/aorith/varnishlog-parser/render"
 	"github.com/aorith/varnishlog-parser/vsl"
 	"github.com/aorith/varnishlog-parser/vsl/summary"
 )
@@ -50,7 +50,7 @@ type PageData struct {
 }
 
 var funcMap = template.FuncMap{
-	"headersView":            render.HeadersView,
+	"headersView":            render.HTMLHeadersTable,
 	"renderTXLogTree":        render.TxTreeHTML,
 	"isTxTypeSession":        func(tx *vsl.Transaction) bool { return tx.TXType == vsl.TxTypeSession },
 	"curlCommand":            curlCommand,
@@ -152,56 +152,3 @@ func executeTemplate(w io.Writer, tmpl *template.Template, name string, data any
 	}
 	return err
 }
-
-func curlCommand(tx *vsl.Transaction, scheme, connectTo, backendStr, custom string, received bool, excluded string) string {
-	var backend *render.Backend
-
-	switch connectTo {
-	case "backend":
-		switch backendStr {
-		case "none":
-			backend = nil
-
-		case "auto":
-			if tx.TXType == vsl.TxTypeBereq {
-				host, port, err := render.ParseBackend(tx.GetBackendConnStr())
-				if err != nil {
-					return "error parsing backend: " + err.Error()
-				}
-				backend = render.NewBackend(host, port)
-			}
-
-		default:
-			host, port, err := render.ParseBackend(backendStr)
-			if err != nil {
-				return "error parsing backend: " + err.Error()
-			}
-			backend = render.NewBackend(host, port)
-		}
-
-	case "custom":
-		if custom == "" {
-			return "no value provided for the custom backend"
-		}
-		host, port, err := render.ParseBackend(custom)
-		if err != nil {
-			return "error parsing backend: " + err.Error()
-		}
-		backend = render.NewBackend(host, port)
-
-	default:
-		return "unknown value for connectTo: " + connectTo
-	}
-
-	excludedHeaders := strings.Split(excluded, ",")
-	for i, n := range excludedHeaders {
-		excludedHeaders[i] = strings.TrimSpace(n)
-	}
-
-	httpReq, err := render.NewHTTPRequest(tx, received, excludedHeaders)
-	if err != nil {
-		return "error generating curl command: " + err.Error()
-	}
-
-	return httpReq.CurlCommand(scheme, backend)
-}

pkg/server/html/html.go internal/server/html/html.gopkg/server/html/html.go renamed to internal/server/html/html.go

@@ -8,7 +8,7 @@ import (
 	"strconv"
 
 	"github.com/aorith/varnishlog-parser/assets"
-	"github.com/aorith/varnishlog-parser/pkg/server/html"
+	"github.com/aorith/varnishlog-parser/internal/server/html"
 )
 
 func indexHandler(version string) func(http.ResponseWriter, *http.Request) {

pkg/server/routes.go internal/server/routes.gopkg/server/routes.go renamed to internal/server/routes.go

@@ -10,7 +10,8 @@ import (
 	"github.com/aorith/varnishlog-parser/vsl"
 )
 
-func HeadersView(ts vsl.TransactionSet, tx *vsl.Transaction) []string {
+// HTMLHeadersTable returns an HTML table with HTTP header states
+func HTMLHeadersTable(ts vsl.TransactionSet, tx *vsl.Transaction) []string {
 	visited := make(map[vsl.VXID]bool)
 	return headersView(ts, tx, visited)
 }

pkg/server/server.go internal/server/server.gopkg/server/server.go renamed to internal/server/server.go

@@ -11,16 +11,8 @@ import (
 	"github.com/aorith/varnishlog-parser/vsl"
 )
 
-type CustomBuilder struct {
-	strings.Builder
-}
-
-// PadAdd is a helper function to append a fixed padding to the string
-func (b *CustomBuilder) PadAdd(s string) {
-	b.WriteString("    " + s + "\n")
-}
-
 // ParseBackend parses "<HOST/IP>:<PORT>" where HOST may be a hostname,
+//
 // IPv4, or IPv6 (possibly unbracketed). Returns host and port separately.
 func ParseBackend(s string) (host, port string, err error) {
 	// Try the standard parser first (works for "host:port" and "[v6]:port").