V1 of vhosts

This is not currently backwards compatible for users who imports logs
via combined-vhosts or something similar, it will differentiate between
paths/hits from before this patch & migration as different from
paths/hits after this change if vhost is sent on log imports.

Maybe we default to domainlink vhost if none is found?
This makes things less backwards compatible too, then makes all new
imports be different hitcounts than old ones.

Maybe we retroactively patch paths that match to have a new vhost?

What this doesn't do/doesn't do yet:
- send vhost with the javascript or tracking pixel
- migrate existing hitcounts/paths to tag the domainlink as host
- allow specifying multiple domainlinks to special-case referrers

Author: mjsir911

cmd/goatcounter/import.go

@@ -163,6 +163,7 @@ List of format specifiers:
     status         Status code sent to the client.
     http           HTTP request protocol (i.e. HTTP/1.1).
     path           Path (e.g. "/mypage.html"). May contain the query string.
+    host           Server name of the server serving the request.
     url            Full URL (e.g. "https://example.com/mypage.html"). Takes
                    precedence over $host and $path.
     query          Query string; only needed if not included in $path or $url.
@@ -171,7 +172,6 @@ List of format specifiers:
 
 Some format specifiers that are not (yet) used anywhere:
 
-    host           Server name of the server serving the request.
     content_type   Content-Type header of the response.
     timing_sec     Time to serve the request in seconds, with possible decimal.
     timing_milli   Time to serve the request in milliseconds.
@@ -388,6 +388,7 @@ func importLog(
 			Ref:       line.Referrer(),
 			Query:     line.Query(),
 			UserAgent: line.UserAgent(),
+			Host:      line.Host(),
 		}
 
 		hit.CreatedAt, err = scan.Datetime(line)

db/migrate/2025-08-08-01-paths-host-sqlite.sql

@@ -0,0 +1 @@
+alter table paths add column host varchar not null default '';

db/query/hit_list.List-counts.sql

@@ -9,6 +9,6 @@ with x as (
 	order by total desc, path_id desc
 	limit :limit
 )
-select path_id, paths.path, paths.title, paths.event from x
+select path_id, paths.path, paths.title, paths.host, paths.event from x
 join paths using (path_id)
 order by total desc, path_id desc

handlers/api.go

@@ -488,7 +488,7 @@ type APICountRequestHit struct {
 	Session string `json:"session"`
 
 	// {omitdoc}
-	Host string `json:"-"`
+	Host string `json:"host" query:"h"`
 
 	// {omitdoc} Line when importing, for displaying errors.
 	Line string `json:"-"`
@@ -574,6 +574,7 @@ func (h api) count(w http.ResponseWriter, r *http.Request) error {
 			UserAgentHeader: a.UserAgent,
 			Location:        a.Location,
 			RemoteAddr:      a.IP,
+			Host:            a.Host,
 		}
 
 		if a.UserAgent != "" {

hit.go

@@ -26,6 +26,7 @@ type Hit struct {
 	Session    zint.Uint128 `db:"session" json:"-"`
 
 	Path  string     `db:"-" json:"p,omitempty"`
+	Host  string     `db:"-" json:"h,omitempty"`
 	Title string     `db:"-" json:"t,omitempty"`
 	Ref   string     `db:"-" json:"r,omitempty"`
 	Event zbool.Bool `db:"-" json:"e,omitempty"`
@@ -252,7 +253,7 @@ func (h *Hit) Defaults(ctx context.Context, initial bool) error {
 	}
 
 	// Get or insert path.
-	path := Path{Path: h.Path, Title: h.Title, Event: h.Event}
+	path := Path{Path: h.Path, Host: h.Host, Title: h.Title, Event: h.Event}
 	err := path.GetOrInsert(ctx)
 	if err != nil {
 		return errors.Wrap(err, "Hit.Defaults")

hit_list.go

@@ -21,6 +21,8 @@ type HitList struct {
 	// Path ID
 	PathID int64 `db:"path_id" json:"path_id"`
 
+	Host string `db:"host" json:"host"`
+
 	// Path name (e.g. /hello.html).
 	Path string `db:"path" json:"path"`
 

path.go

@@ -19,6 +19,7 @@ type Path struct {
 	ID    int64      `db:"path_id" json:"id"` // Path ID
 	Site  int64      `db:"site_id" json:"-"`
 	Path  string     `db:"path" json:"path"`   // Path name
+	Host  string     `db:"host" json:"host"`
 	Title string     `db:"title" json:"title"` // Page title
 	Event zbool.Bool `db:"event" json:"event"` // Is this an event?
 }
@@ -82,8 +83,8 @@ func (p *Path) GetOrInsert(ctx context.Context) error {
 
 	// Insert new row.
 	p.ID, err = zdb.InsertID(ctx, "path_id",
-		`insert into paths (site_id, path, title, event) values (?, ?, ?, ?)`,
-		site.ID, p.Path, p.Title, p.Event)
+		`insert into paths (site_id, path, title, event, host) values (?, ?, ?, ?, ?)`,
+		site.ID, p.Path, p.Title, p.Event, p.Host)
 	if err != nil {
 		return errors.Wrap(err, "Path.GetOrInsert insert")
 	}

tpl/_dashboard_pages_rows.gohtml

@@ -20,20 +20,25 @@
 			</td>
 		{{end}}
 		<td class="col-path hide-mobile">
-			<a class="load-refs rlink" title="{{$h.Path}}" href="#">{{$h.Path}}</a><br>
+			<a class="load-refs rlink" title="{{$h.Host}}{{$h.Path}}" href="#">{{$h.Host}}{{$h.Path}}</a><br>
 			<small class="page-title {{if not $h.Title}}no-title{{end}}">{{if $h.Title}}{{$h.Title}}{{else}}<em>({{t $.Context "no-title|no title"}})</em>{{end}}</small>
 			{{if $h.Event}}
 				<sup class="label-event">{{t $.Context "event|event"}}</sup>
+			{{else if $h.Host}}
+				<br><small class="go"><a target="_blank" rel="noopener" href="http://{{$h.Host}}{{$h.Path}}">{{t $.Context "link/goto-path|Go to %(path)" (printf `%s%s` $h.Host $h.Path)}}</a></small>
 			{{else if $.Site.LinkDomain}}
 				<br><small class="go"><a target="_blank" rel="noopener" href="{{$.Site.LinkDomainURL true $h.Path}}">{{t $.Context "link/goto-path|Go to %(path)" ($.Site.LinkDomainURL false $h.Path)}}</a></small>
 			{{end}}
+
 		</td>
 		<td>
 			<div class="show-mobile">
 				<a class="load-refs rlink" title="{{$h.Path}}" href="#">{{$h.Path}}</a>
 				<small class="page-title {{if not $h.Title}}no-title{{end}}">| {{if $h.Title}}{{$h.Title}}{{else}}<em>(no title)</em>{{end}}</small>
 				{{if $h.Event}}
 					<sup class="label-event">{{t $.Context "event|event"}}</sup>
+				{{else if $h.Host}}
+					<br><small class="go"><a target="_blank" rel="noopener" href="http://{{$h.Host}}{{$h.Path}}">{{t $.Context "link/goto-path|Go to %(path)" $h.Path}}</a></small>
 				{{else if $.Site.LinkDomain}}
 					<br><small class="go"><a target="_blank" rel="noopener" href="{{$.Site.LinkDomainURL true $h.Path}}">{{t $.Context "link/goto-path|Go to %(path)" ($.Site.LinkDomainURL false $h.Path)}}</a></small>
 				{{end}}