Better handling of ipv6

Author: aorith

go.mod

@@ -5,7 +5,7 @@ go 1.25.3
 require (
 	github.com/alecthomas/chroma/v2 v2.21.1
 	github.com/aorith/svg-sequence v0.0.16
-	github.com/aorith/svg-timeline v0.2.1
+	github.com/aorith/svg-timeline v0.2.2
 )
 
 require github.com/dlclark/regexp2 v1.11.5 // indirect

go.sum

@@ -10,6 +10,8 @@ github.com/aorith/svg-sequence v0.0.16 h1:nqKkFY8w9Opg/U85BFicSTU7YeEqwNF1QzekrY
 github.com/aorith/svg-sequence v0.0.16/go.mod h1:8PeIQFIE65/ZgSbPwUvv5lfuaiv80V9x2t4NNRhI2jQ=
 github.com/aorith/svg-timeline v0.2.1 h1:BKog2X8drlpTeIXZXa89OnxVaFr4IUhVA4/9q3BUsHE=
 github.com/aorith/svg-timeline v0.2.1/go.mod h1:haohFRiwc0+Po6714AgYlsoeolDqRTNkI+d62k51qjo=
+github.com/aorith/svg-timeline v0.2.2 h1:nQ5zn9mAPy+insAIsY3M9gNlrjluRHaQJdDJpI9Es9Y=
+github.com/aorith/svg-timeline v0.2.2/go.mod h1:haohFRiwc0+Po6714AgYlsoeolDqRTNkI+d62k51qjo=
 github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
 github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM=

render/sequence.go

@@ -220,12 +220,11 @@ func addTransactionLogs(s *svgsequence.Sequence, ts vsl.TransactionSet, tx *vsl.
 			s.AddStep(svgsequence.Step{
 				Source: B, Target: B,
 				Text: fmt.Sprintf(
-					"%s\n%s\n%s %s:%d",
+					"%s\n%s\n%s %s",
 					record.GetTag(),
 					truncateStrMiddle(record.Name, truncateLen),
 					record.Reason,
-					record.RemoteAddr.String(),
-					record.RemotePort,
+					record.ConnStr(),
 				),
 			})
 

vsl/records.go

@@ -72,9 +72,8 @@ func NewBaseRecord(rawLog string) (BaseRecord, error) {
 	}
 
 	tag := fields[1] // e.g: Begin
-	firstIndex := strings.Index(rawLog, tag)
-	value := rawLog[firstIndex+len(tag):]
-	value = strings.TrimLeft(value, " \t")
+	_, after, _ := strings.Cut(rawLog, tag)
+	value := strings.TrimLeft(after, " \t")
 
 	return BaseRecord{Tag: tag, RawValue: value, rawLog: rawLog}, nil
 }
@@ -239,8 +238,12 @@ type BackendOpenRecord struct {
 	Reason         string // connect or reuse
 }
 
+func (r BackendOpenRecord) ConnStr() string {
+	return net.JoinHostPort(r.RemoteAddr.String(), fmt.Sprintf("%d", r.RemotePort))
+}
+
 func (r BackendOpenRecord) String() string {
-	return fmt.Sprintf("%s (%s:%d) %s", r.Name, r.RemoteAddr.String(), r.RemotePort, r.Reason)
+	return fmt.Sprintf("%s (%s) %s", r.Name, r.ConnStr(), r.Reason)
 }
 
 func NewBackendOpenRecord(blr BaseRecord) (BackendOpenRecord, error) {
@@ -254,7 +257,7 @@ func NewBackendOpenRecord(blr BaseRecord) (BackendOpenRecord, error) {
 		return BackendOpenRecord{}, fmt.Errorf("conversion to BackendOpenRecord failed, bad file descriptor on line %q", blr.GetRawLog())
 	}
 
-	remoteAddr := net.ParseIP(parts[2])
+	remoteAddr := net.ParseIP(strings.Trim(parts[2], "[]"))
 	if remoteAddr == nil {
 		return BackendOpenRecord{}, fmt.Errorf("conversion to BackendOpenRecord failed, bad remoteAddr on line %q", blr.GetRawLog())
 	}
@@ -264,7 +267,7 @@ func NewBackendOpenRecord(blr BaseRecord) (BackendOpenRecord, error) {
 		return BackendOpenRecord{}, fmt.Errorf("conversion to BackendOpenRecord failed, bad remotePort on line %q", blr.GetRawLog())
 	}
 
-	localAddr := net.ParseIP(parts[4])
+	localAddr := net.ParseIP(strings.Trim(parts[4], "[]"))
 	if localAddr == nil {
 		return BackendOpenRecord{}, fmt.Errorf("conversion to BackendOpenRecord failed, bad localAddr on line %q", blr.GetRawLog())
 	}
@@ -298,13 +301,21 @@ type BackendStartRecord struct {
 	RemotePort int    // Remote port
 }
 
+func (r BackendStartRecord) ConnStr() string {
+	return net.JoinHostPort(r.RemoteAddr.String(), fmt.Sprintf("%d", r.RemotePort))
+}
+
+func (r BackendStartRecord) String() string {
+	return r.ConnStr()
+}
+
 func NewBackendStartRecord(blr BaseRecord) (BackendStartRecord, error) {
 	parts := strings.Fields(blr.GetRawValue())
 	if len(parts) < 2 {
 		return BackendStartRecord{}, fmt.Errorf("conversion to BackendStartRecord failed, incorrect len on line %q", blr.GetRawLog())
 	}
 
-	remoteAddr := net.ParseIP(parts[0])
+	remoteAddr := net.ParseIP(strings.Trim(parts[2], "[]"))
 	if remoteAddr == nil {
 		return BackendStartRecord{}, fmt.Errorf("conversion to BackendStartRecord failed, bad remoteAddr on line %q", blr.GetRawLog())
 	}
@@ -536,13 +547,21 @@ type ReqStartRecord struct {
 	Listener   string // Listener name (from -a)
 }
 
+func (r ReqStartRecord) ConnStr() string {
+	return net.JoinHostPort(r.ClientIP.String(), fmt.Sprintf("%d", r.ClientPort))
+}
+
+func (r ReqStartRecord) String() string {
+	return r.ConnStr() + " " + r.Listener
+}
+
 func NewReqStartRecord(blr BaseRecord) (ReqStartRecord, error) {
 	parts := strings.Fields(blr.GetRawValue())
 	if len(parts) != 3 {
 		return ReqStartRecord{}, fmt.Errorf("conversion to ReqStartRecord failed, incorrect len on line %q", blr.GetRawLog())
 	}
 
-	clientIP := net.ParseIP(parts[0])
+	clientIP := net.ParseIP(strings.Trim(parts[0], "[]"))
 	if clientIP == nil {
 		return ReqStartRecord{}, fmt.Errorf("conversion to BackendOpenRecord failed, bad clientAddr on line %q", blr.GetRawLog())
 	}
@@ -982,11 +1001,14 @@ type SessOpenRecord struct {
 	FileDescriptor int       // File descriptor number
 }
 
+func (r SessOpenRecord) ConnStr() string {
+	return net.JoinHostPort(r.RemoteAddr.String(), fmt.Sprintf("%d", r.RemotePort))
+}
+
 func (r SessOpenRecord) String() string {
 	return fmt.Sprintf(
-		"%s:%d %s %s:%d (%s) %d",
-		r.RemoteAddr,
-		r.RemotePort,
+		"%s %s %s:%d (%s) %d",
+		r.ConnStr(),
 		r.SocketName,
 		r.LocalAddr,
 		r.LocalPort,
@@ -1001,7 +1023,7 @@ func NewSessOpenRecord(blr BaseRecord) (SessOpenRecord, error) {
 		return SessOpenRecord{}, fmt.Errorf("conversion to SessOpenRecord failed, incorrect len on line %q", blr.GetRawLog())
 	}
 
-	remoteAddr := net.ParseIP(parts[0])
+	remoteAddr := net.ParseIP(strings.Trim(parts[0], "[]"))
 	if remoteAddr == nil {
 		return SessOpenRecord{}, fmt.Errorf("conversion to SessOpenRecord failed, bad remoteAddr on line %q", blr.GetRawLog())
 	}
@@ -1011,7 +1033,7 @@ func NewSessOpenRecord(blr BaseRecord) (SessOpenRecord, error) {
 		return SessOpenRecord{}, fmt.Errorf("conversion to SessOpenRecord failed, bad remotePort on line %q", blr.GetRawLog())
 	}
 
-	localAddr := net.ParseIP(parts[3])
+	localAddr := net.ParseIP(strings.Trim(parts[3], "[]"))
 	if localAddr == nil {
 		return SessOpenRecord{}, fmt.Errorf("conversion to SessOpenRecord failed, bad localAddr on line %q", blr.GetRawLog())
 	}