Add JSON export

The old CSV export works only if you have collection of individual
pageviews enabled in the settings, which is disabled by default now.

So directly export the data and stats tables, and insert them directly.

TODO: kind of works, but needs some work to not be ugly and fragile.
Ideally a lot of this can/should be merged with how cron works.

Author: arp242

e.go

@@ -0,0 +1,68 @@
+package goatcounter
+
+import (
+	"time"
+
+	"zgo.at/json"
+)
+
+type (
+	ExportInfo struct {
+		CreatedAt time.Time `json:"created_at"`
+		Version   int       `json:"version"`
+		Site      string    `json:"site"`
+	}
+	ExportLanguage struct {
+		ISO6393 string `db:"iso_639_3" json:"iso_639_3"`
+		Name    string `db:"name" json:"name"`
+	}
+	ExportBrowserStat struct {
+		Day       string    `db:"day" json:"day"`
+		PathID    PathID    `db:"path_id" json:"path_id"`
+		BrowserID BrowserID `db:"browser_id" json:"browser_id"`
+		Count     int       `db:"count" json:"count"`
+	}
+	ExportSystemStat struct {
+		Day      string   `db:"day" json:"day"`
+		PathID   PathID   `db:"path_id" json:"path_id"`
+		SystemID SystemID `db:"system_id" json:"system_id"`
+		Count    int      `db:"count" json:"count"`
+	}
+	ExportLocationStat struct {
+		Day      string `db:"day" json:"day"`
+		PathID   PathID `db:"path_id" json:"path_id"`
+		Location string `db:"location" json:"location"`
+		Count    int    `db:"count" json:"count"`
+	}
+	ExportSizeStat struct {
+		Day    string `db:"day" json:"day"`
+		PathID PathID `db:"path_id" json:"path_id"`
+		Width  int    `db:"width" json:"width"`
+		Count  int    `db:"count" json:"count"`
+	}
+	ExportLanguageStat struct {
+		Day      string `db:"day" json:"day"`
+		PathID   PathID `db:"path_id" json:"path_id"`
+		Language string `db:"language" json:"language"`
+		Count    int    `db:"count" json:"count"`
+	}
+	ExportCampaignStat struct {
+		Day        string     `db:"day" json:"day"`
+		PathID     PathID     `db:"path_id" json:"path_id"`
+		CampaignID CampaignID `db:"campaign_id" json:"campaign_id"`
+		Ref        string     `db:"ref" json:"ref"`
+		Count      int        `db:"count" json:"count"`
+	}
+	ExportHitStat struct {
+		Day    string `db:"day" json:"day"`
+		PathID PathID `db:"path_id" json:"path_id"`
+		//Stats  Stat   `db:"stats" json:"stats"`
+		Stats json.RawMessage `db:"stats" json:"stats"`
+	}
+	ExportRefStat struct {
+		Hour   string `db:"hour" json:"hour"`
+		PathID PathID `db:"path_id" json:"path_id"`
+		RefID  RefID  `db:"ref_id" json:"ref_id"`
+		Count  int    `db:"total" json:"count"`
+	}
+)

export.go

@@ -49,7 +49,6 @@ func (e Export) Exists() bool {
 	if e.Path == "" {
 		return false
 	}
-
 	_, err := os.Stat(e.Path)
 	return err == nil
 }

exportcsv.go

@@ -42,21 +42,23 @@ func (e *Export) CreateCSV(ctx context.Context, startFrom HitID) (*os.File, erro
 		`insert into exports (site_id, path, created_at, start_from_hit_id) values (?, ?, ?, ?)`,
 		e.SiteID, e.Path, e.CreatedAt, e.StartFromHitID)
 	if err != nil {
-		return nil, errors.Wrap(err, "Export.Create")
+		return nil, errors.Wrap(err, "Export.CreateCSV")
 	}
 
 	fp, err := os.Create(e.Path)
-	return fp, errors.Wrap(err, "Export.Create")
+	return fp, errors.Wrap(err, "Export.CreateCSV")
 }
 
 // Export all data to a CSV file.
 func (e *Export) RunCSV(ctx context.Context, fp *os.File, mailUser bool) {
 	l := log.Module("export").With("id", e.ID)
-	l.Info(ctx, "export started")
+	l.Info(ctx, "CSV export started")
 
 	gzfp := gzip.NewWriter(fp)
-	defer fp.Close() // No need to error-check; just for safety.
-	defer gzfp.Close()
+	defer func() {
+		gzfp.Close()
+		fp.Close()
+	}()
 
 	c := csv.NewWriter(gzfp)
 	c.Write([]string{ExportCSVVersion + "Path", "Title", "Event", "UserAgent",
@@ -104,11 +106,10 @@ func (e *Export) RunCSV(ctx context.Context, fp *os.File, mailUser bool) {
 
 	if exportErr != nil {
 		l.Error(ctx, exportErr, "export", e)
-		err := zdb.Exec(ctx,
-			`update exports set error=$1 where export_id=$2`,
+		err := zdb.Exec(ctx, `update exports set error=$1 where export_id=$2`,
 			exportErr.Error(), e.ID)
 		if err != nil {
-			log.Error(ctx, err)
+			l.Error(ctx, err)
 		}
 
 		_ = gzfp.Close()
@@ -122,12 +123,12 @@ func (e *Export) RunCSV(ctx context.Context, fp *os.File, mailUser bool) {
 		l.Error(ctx, err)
 		return
 	}
+
 	err = fp.Sync() // Ensure stat is correct.
 	if err != nil {
 		l.Error(ctx, err)
 		return
 	}
-
 	stat, err := fp.Stat()
 	size := "0"
 	if err == nil {
@@ -157,7 +158,7 @@ func (e *Export) RunCSV(ctx context.Context, fp *os.File, mailUser bool) {
 		where export_id=$6`,
 		&now, e.NumRows, e.Size, e.Hash, e.LastHitID, e.ID)
 	if err != nil {
-		log.Error(ctx, err)
+		l.Error(ctx, err)
 	}
 
 	if mailUser {