cmd/htpacker/go.mod

@@ -1,24 +1,27 @@
 module src.lwithers.me.uk/go/htpack/cmd/htpacker
 
-go 1.22
+go 1.19
 
 require (
-	github.com/andybalholm/brotli v1.1.0
+	github.com/andybalholm/brotli v1.0.4
 	github.com/foobaz/go-zopfli v0.0.0-20140122214029-7432051485e2
-	github.com/gosuri/uiprogress v0.0.1
+	github.com/logrusorgru/aurora/v4 v4.0.0
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.6.1
-	golang.org/x/sys v0.22.0
+	github.com/vbauerster/mpb/v4 v4.12.2
+	golang.org/x/sys v0.2.0
 	gopkg.in/yaml.v2 v2.4.0
-	src.lwithers.me.uk/go/htpack v1.3.3
+	src.lwithers.me.uk/go/htpack v1.3.2
 	src.lwithers.me.uk/go/writefile v1.0.1
 )
 
 require (
+	github.com/VividCortex/ewma v1.2.0 // indirect
+	github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/gosuri/uilive v0.0.4 // indirect
+	github.com/inconshreveable/mousetrap v1.0.1 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
 	github.com/kr/pretty v0.1.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
+	golang.org/x/crypto v0.3.0 // indirect
+	golang.org/x/term v0.2.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
 )

cmd/htpacker/go.sum

@@ -1,16 +1,18 @@
-github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
+github.com/VividCortex/ewma v1.1.1/go.mod h1:2Tkkvm3sRDVXaiyucHiACn4cqf7DpdyLvmxzcbUokwA=
-github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
+github.com/VividCortex/ewma v1.2.0 h1:f58SaIzcDXrSy3kWaHNvuJgJ3Nmz59Zji6XoJR/q1ow=
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/VividCortex/ewma v1.2.0/go.mod h1:nz4BbCtbLyFDeC9SUHbtcT5644juEuWfUAUnGx7j5l4=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d h1:licZJFw2RwpHMqeKTCYkitsPqHNxTmd4SNR5r94FGM8=
+github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat636LX7Bqt5lYEZ27JNDcqxfjdBQuJ/MM4CN/Lzo=
+github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
+github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/foobaz/go-zopfli v0.0.0-20140122214029-7432051485e2 h1:VA6jElpcJ+wkwEBufbnVkSBCA2TEnxdRppjRT5Kvh0A=
 github.com/foobaz/go-zopfli v0.0.0-20140122214029-7432051485e2/go.mod h1:Yi95+RbwKz7uGndSuUhoq7LJKh8qH8DT9fnL4ewU30k=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/gosuri/uilive v0.0.4 h1:hUEBpQDj8D8jXgtCdBu7sWsy5sbW/5GhuO8KBwJ2jyY=
+github.com/inconshreveable/mousetrap v1.0.1 h1:U3uMjPSQEBMNp1lFxmllqCPM6P5u/Xq7Pgzkat/bFNc=
-github.com/gosuri/uilive v0.0.4/go.mod h1:V/epo5LjjlDE5RJUcqx8dbw+zc93y5Ya3yg8tfZ74VI=
+github.com/inconshreveable/mousetrap v1.0.1/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/gosuri/uiprogress v0.0.1 h1:0kpv/XY/qTmFWl/SkaJykZXrBBzwwadmW8fRb7RJSxw=
-github.com/gosuri/uiprogress v0.0.1/go.mod h1:C1RTYn4Sc7iEyf6j8ft5dyoZ4212h8G1ol9QQluh5+0=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
@@ -18,18 +20,25 @@ github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORN
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
+github.com/logrusorgru/aurora/v4 v4.0.0 h1:sRjfPpun/63iADiSvGGjgA1cAYegEWMPCJdUpJYn9JA=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+github.com/logrusorgru/aurora/v4 v4.0.0/go.mod h1:lP0iIa2nrnT/qoFXcOZSrZQpJ1o6n2CUf/hyHi2Q4ZQ=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
+github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk=
+github.com/vbauerster/mpb/v4 v4.12.2 h1:TsBs1nWRYF0m8cUH13pxNhOUqY6yKcOr2PeSYxp2L3I=
+github.com/vbauerster/mpb/v4 v4.12.2/go.mod h1:LVRGvMch8T4HQO3eg2pFPsACH9kO/O6fT/7vhGje3QE=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20200214034016-1d94cc7ab1c6/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
+golang.org/x/crypto v0.3.0 h1:a06MkbcxBrEFc0w0QIZWXrH/9cCX6KJyWbBOIwAn+7A=
+golang.org/x/crypto v0.3.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
@@ -42,10 +51,12 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20200217220822-9197077df867/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/term v0.2.0 h1:z85xZCsEl7bi/KwbNADeBYoOP0++7W1ipu+aGnpwzRM=
+golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -61,8 +72,9 @@ gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
-src.lwithers.me.uk/go/htpack v1.3.3 h1:Xvl6qR9HfSblmCgPyu+ACQ9o3aLQSIy3l8CrMbzj/jc=
+src.lwithers.me.uk/go/htpack v1.3.2 h1:WyJs0F1lHKMoDTY+HgDUS0mTcdFMGbq2CykJwgm5rkI=
-src.lwithers.me.uk/go/htpack v1.3.3/go.mod h1:qKgCBgZ6iiiuYOxZkYOPVpXLBzp6gXEd4A0ksxgR6Nk=
+src.lwithers.me.uk/go/htpack v1.3.2/go.mod h1:rslOJzSAJTKf0fz+iULoYF+jXrffRJK5PwUNu1wADOk=
 src.lwithers.me.uk/go/writefile v1.0.1 h1:bwBGtvyZfCxFIM14e1aYgJWlZuowKkwJx53OJlUPd0s=
 src.lwithers.me.uk/go/writefile v1.0.1/go.mod h1:NahlmRCtB7kg4ai+zHZgxXdUs+MR8VqWG8mql35TsxA=

cmd/htpacker/pack.go

@@ -144,7 +144,7 @@ func PackSpec(c *cobra.Command, spec, out string) error {
 }
 
 func doPack(ftp packer.FilesToPack, out string) error {
-	prog := newUiProgress(ftp)
+	prog := mpbProgress(ftp)
 	err := packer.Pack2(ftp, out, prog)
 	prog.Complete()
 

cmd/htpacker/pack_progress.go

@@ -0,0 +1,144 @@
+package main
+
+import (
+	"github.com/logrusorgru/aurora/v4"
+	"github.com/vbauerster/mpb/v4"
+	"github.com/vbauerster/mpb/v4/decor"
+	"src.lwithers.me.uk/go/htpack/cmd/htpacker/packer"
+)
+
+const mpbBarStyle = "[██░]"
+
+// mpbProgress returns a new progress object that keeps the user informed via
+// the visual mpb library.
+func mpbProgress(ftp packer.FilesToPack) *mpbProg {
+	mp := new(mpbProg)
+	mp.un.max = len(ftp)
+
+	for _, f := range ftp {
+		if !f.DisableCompression && !f.DisableGzip {
+			mp.gzip.max++
+		}
+		if !f.DisableCompression && !f.DisableBrotli {
+			mp.brotli.max++
+		}
+	}
+
+	mp.p = mpb.New()
+	mp.un.bar = mp.p.AddBar(int64(mp.un.max),
+		mpb.PrependDecorators(barName("uncompressed")),
+		mpb.BarStyle(mpbBarStyle),
+		mpb.AppendDecorators(&mp.un))
+	if mp.gzip.max > 0 {
+		mp.gzip.bar = mp.p.AddBar(int64(mp.gzip.max),
+			mpb.PrependDecorators(barName("gzip")),
+			mpb.BarStyle(mpbBarStyle),
+			mpb.AppendDecorators(&mp.gzip))
+	}
+	if mp.brotli.max > 0 {
+		mp.brotli.bar = mp.p.AddBar(int64(mp.brotli.max),
+			mpb.PrependDecorators(barName("brotli")),
+			mpb.BarStyle(mpbBarStyle),
+			mpb.AppendDecorators(&mp.brotli))
+	}
+
+	return mp
+}
+
+func barName(n string) decor.Decorator {
+	return decor.Name(aurora.Magenta(n).String(), decor.WCSyncWidth)
+}
+
+// mpbProg is the mpb progress tracker. It has one bar for each type of
+// compression, and its methods simply dispatch onto the type-specific
+// bars.
+type mpbProg struct {
+	un, gzip, brotli mpbProg1
+	p                *mpb.Progress
+}
+
+func (mp *mpbProg) Count(_ int) {
+}
+
+func (mp *mpbProg) Begin(filename, compression string) {
+	switch compression {
+	case "uncompressed":
+		mp.un.Begin(filename)
+	case "gzip":
+		mp.gzip.Begin(filename)
+	case "brotli":
+		mp.brotli.Begin(filename)
+	default:
+		return
+	}
+}
+
+func (mp *mpbProg) End(filename, compression string) {
+	switch compression {
+	case "uncompressed":
+		mp.un.End(filename)
+	case "gzip":
+		mp.gzip.End(filename)
+	case "brotli":
+		mp.brotli.End(filename)
+	default:
+		return
+	}
+}
+
+func (mp *mpbProg) Complete() {
+	mp.un.Complete()
+	mp.gzip.Complete()
+	mp.brotli.Complete()
+	mp.p.Wait()
+}
+
+// mpbProg1 is a type-specific progress bar. In addition to holding state and
+// methods for updating the bar, it also implements decor.Decor.
+type mpbProg1 struct {
+	max  int      // number of items we expect
+	done int      // number of items completed
+	cur  []string // list of currently-packing filenames
+	bar  *mpb.Bar
+
+	// embedding this type lets us implement decor.Decor
+	decor.WC
+}
+
+func (mp1 *mpbProg1) Decor(stat *decor.Statistics) string {
+	if stat.Completed {
+		return ""
+	}
+	switch len(mp1.cur) {
+	case 0:
+		return aurora.Gray(8, "(idle)").String()
+	case 1:
+		return aurora.Blue(mp1.cur[0]).String()
+	default:
+		return aurora.Sprintf(aurora.Green("%s + %d more"), aurora.Blue(mp1.cur[0]), len(mp1.cur)-1)
+	}
+}
+
+func (mp1 *mpbProg1) Begin(filename string) {
+	mp1.cur = append(mp1.cur, filename)
+}
+
+func (mp1 *mpbProg1) End(filename string) {
+	for i, v := range mp1.cur {
+		if v == filename {
+			mp1.cur[i] = mp1.cur[len(mp1.cur)-1]
+			mp1.cur = mp1.cur[:len(mp1.cur)-1]
+			break
+		}
+	}
+	mp1.done++
+	if mp1.bar != nil {
+		mp1.bar.SetCurrent(int64(mp1.done))
+	}
+}
+
+func (mp1 *mpbProg1) Complete() {
+	if mp1.bar != nil {
+		mp1.bar.SetTotal(int64(mp1.max), true)
+	}
+}

cmd/htpacker/packer/packer.go

@@ -64,11 +64,6 @@ func (ignoreProgress) Begin(_, _ string) {}
 func (ignoreProgress) End(_, _ string)   {}
 
 const (
-	// minCompressionFileSize is the minimum filesize we need before
-	// considering compression. Note this must be at least 2, to avoid
-	// known bugs in go-zopfli.
-	minCompressionFileSize = 128
-
 	// minCompressionSaving means we'll only use the compressed version of
 	// the file if it's at least this many bytes smaller than the original.
 	// Chosen somewhat arbitrarily; we have to add an HTTP header, and the
@@ -364,7 +359,7 @@ func (p *packer) packFile(path string, fileToPack FileToPack) {
 			defer p.progress.End(fileToPack.Filename, "gzip")
 			if err := p.Gzip(data, info); err != nil {
 				return fmt.Errorf("gzip compression of %s "+
-					"failed: %w", fileToPack.Filename, err)
+					"failed: %v", fileToPack.Filename, err)
 			}
 			return nil
 		})
@@ -375,7 +370,7 @@ func (p *packer) packFile(path string, fileToPack FileToPack) {
 			defer p.progress.End(fileToPack.Filename, "brotli")
 			if err := p.Brotli(data, info); err != nil {
 				return fmt.Errorf("brotli compression of %s "+
-					"failed: %w", fileToPack.Filename, err)
+					"failed: %v", fileToPack.Filename, err)
 			}
 			return nil
 		})
@@ -438,10 +433,6 @@ func (p *packer) Uncompressed(srcPath string, dir *packed.File) error {
 // Gzip will gzip input data to a temporary file, and then append that to the
 // output file.
 func (p *packer) Gzip(data []byte, dir *packed.File) error {
-	if len(data) < minCompressionFileSize {
-		return nil
-	}
-
 	// write via temporary file
 	tmpfile, err := ioutil.TempFile("", "")
 	if err != nil {
@@ -483,9 +474,6 @@ func (p *packer) Gzip(data []byte, dir *packed.File) error {
 // Brotli will compress input data to a temporary file, and then append that to
 // the output file.
 func (p *packer) Brotli(data []byte, dir *packed.File) error {
-	if len(data) < minCompressionFileSize {
-		return nil
-	}
 	// write via temporary file
 	tmpfile, err := ioutil.TempFile("", "")
 	if err != nil {

cmd/htpacker/progress.go

@@ -1,131 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"slices"
-	"sync"
-
-	"github.com/gosuri/uiprogress"
-	"src.lwithers.me.uk/go/htpack/cmd/htpacker/packer"
-)
-
-type uiProgress struct {
-	p                          *uiprogress.Progress
-	uncompressed, gzip, brotli *uiProgressBar
-}
-
-func newUiProgress(ftp packer.FilesToPack) *uiProgress {
-	up := &uiProgress{
-		p: uiprogress.New(),
-	}
-
-	up.uncompressed = newUiProgressBar(up.p, len(ftp), "uncompressed")
-	var nGzip, nBrotli int
-	for _, f := range ftp {
-		if !f.DisableCompression && !f.DisableGzip {
-			nGzip++
-		}
-		if !f.DisableCompression && !f.DisableBrotli {
-			nBrotli++
-		}
-	}
-	if nGzip > 0 {
-		up.gzip = newUiProgressBar(up.p, nGzip, "gzip")
-	}
-	if nBrotli > 0 {
-		up.brotli = newUiProgressBar(up.p, nGzip, "brotli")
-	}
-
-	up.p.Start()
-	return up
-}
-
-func (up *uiProgress) Count(_ int) {
-}
-
-func (up *uiProgress) Begin(filename, compression string) {
-	up.bar(compression).begin(filename)
-}
-
-func (up *uiProgress) End(filename, compression string) {
-	up.bar(compression).end(filename)
-}
-
-func (up *uiProgress) bar(compression string) *uiProgressBar {
-	switch compression {
-	case "uncompressed":
-		return up.uncompressed
-	case "gzip":
-		return up.gzip
-	case "brotli":
-		return up.brotli
-	}
-	return nil
-}
-
-func (up *uiProgress) Complete() {
-	up.p.Stop()
-}
-
-type uiProgressBar struct {
-	bar      *uiprogress.Bar
-	lock     sync.Mutex
-	inflight []string
-}
-
-func newUiProgressBar(p *uiprogress.Progress, total int, compression string) *uiProgressBar {
-	bar := &uiProgressBar{
-		bar: p.AddBar(total).AppendCompleted(),
-	}
-
-	var buf bytes.Buffer
-	bar.bar.PrependFunc(func(*uiprogress.Bar) string {
-		bar.lock.Lock()
-		defer bar.lock.Unlock()
-		buf.Reset()
-		buf.WriteString(compression)
-		if len(bar.inflight) > 0 {
-			buf.WriteString(" (")
-			for i, f := range bar.inflight {
-				if i > 0 {
-					buf.WriteString(", ")
-				}
-				buf.WriteString(f)
-			}
-			buf.WriteRune(')')
-		}
-		if buf.Len() < 40 {
-			buf.WriteString("                                        ")
-			buf.Truncate(40)
-		} else if buf.Len() > 40 {
-			buf.Truncate(39)
-			buf.WriteString("…")
-		}
-		return buf.String()
-	})
-
-	return bar
-}
-
-func (bar *uiProgressBar) begin(filename string) {
-	if bar == nil {
-		return
-	}
-	bar.lock.Lock()
-	defer bar.lock.Unlock()
-
-	bar.inflight = append(bar.inflight, filename)
-}
-
-func (bar *uiProgressBar) end(filename string) {
-	if bar == nil {
-		return
-	}
-	bar.lock.Lock()
-	defer bar.lock.Unlock()
-
-	bar.bar.Incr()
-	if idx := slices.Index(bar.inflight, filename); idx != -1 {
-		bar.inflight = slices.Delete(bar.inflight, idx, idx+1)
-	}
-}

cmd/htpacker/yaml.go

@@ -150,7 +150,7 @@ func filesFromListR(prefix, arg string, ftp packer.FilesToPack) error {
 			case ".css":
 				ctype = "text/css"
 			case ".js":
-				ctype = "text/javascript"
+				ctype = "application/javascript"
 			case ".json":
 				ctype = "application/json"
 			case ".svg":

cmd/packserver/go.mod

@@ -1,15 +1,8 @@
 module src.lwithers.me.uk/go/htpack/cmd/packserver
 
-go 1.22
+go 1.13
 
 require (
-	github.com/spf13/cobra v1.8.1
+	github.com/spf13/cobra v1.5.0
-	src.lwithers.me.uk/go/htpack v1.3.3
+	src.lwithers.me.uk/go/htpack v1.3.1
-)
-
-require (
-	github.com/gogo/protobuf v1.3.2 // indirect
-	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/spf13/pflag v1.0.5 // indirect
-	golang.org/x/sys v0.22.0 // indirect
 )

cmd/packserver/go.sum

@@ -1,13 +1,13 @@
-github.com/cpuguy83/go-md2man/v2 v2.0.4/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
+github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
-github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
+github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
-github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
+github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/spf13/cobra v1.8.1 h1:e5/vxKd/rZsfSJMUX1agtjeTDf+qv1/JdBF8gg5k9ZM=
+github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU=
-github.com/spf13/cobra v1.8.1/go.mod h1:wHxEcudfqmLYa8iTfL+OuZPbBZkmvliBWKIezN3kD9Y=
+github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -27,8 +27,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e h1:CsOuNlbOuf0mzxJIefr6Q4uAUetRUwZE4qt7VfzP+xo=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.0.0-20220704084225-05e143d24a9e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
@@ -40,6 +40,6 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
-gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
-src.lwithers.me.uk/go/htpack v1.3.3 h1:Xvl6qR9HfSblmCgPyu+ACQ9o3aLQSIy3l8CrMbzj/jc=
+src.lwithers.me.uk/go/htpack v1.3.1 h1:JvCeyVnrOjUOL//D9N/ctTOwobf60AuNU828G6WXf2M=
-src.lwithers.me.uk/go/htpack v1.3.3/go.mod h1:qKgCBgZ6iiiuYOxZkYOPVpXLBzp6gXEd4A0ksxgR6Nk=
+src.lwithers.me.uk/go/htpack v1.3.1/go.mod h1:wpfOXweUh8oRPxYnVjUWDRNNwIXlAlsOrmGWc0fOls4=

cmd/packserver/main.go

@@ -5,18 +5,12 @@ package main
 
 import (
 	"bufio"
-	"context"
 	"errors"
 	"fmt"
 	"net/http"
 	"os"
-	"os/signal"
 	"path/filepath"
-	"sort"
 	"strings"
-	"sync/atomic"
-	"syscall"
-	"time"
 
 	"github.com/spf13/cobra"
 	"src.lwithers.me.uk/go/htpack"
@@ -59,8 +53,6 @@ func main() {
 		"Name of file to return if response would be 404 (spa.html or similar)")
 	rootCmd.Flags().String("frames", "sameorigin",
 		"Override X-Frame-Options header (can be sameorigin, deny, allow)")
-	rootCmd.Flags().Duration("graceful-shutdown-delay", 3*time.Second,
-		"Number of seconds to wait after receiving SIGTERM before initiating graceful shutdown")
 
 	if err := rootCmd.Execute(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
@@ -159,15 +151,6 @@ func run(c *cobra.Command, args []string) error {
 		return err
 	}
 
-	// graceful shutdown delay must be > 0
-	gracefulShutdownDelay, err := c.Flags().GetDuration("graceful-shutdown-delay")
-	if err != nil {
-		return err
-	}
-	if gracefulShutdownDelay <= 0 {
-		return errors.New("graceful shutdown delay must be > 0s")
-	}
-
 	// verify .htpack specifications
 	if len(args) == 0 {
 		return errors.New("must specify one or more .htpack files")
@@ -193,7 +176,6 @@ func run(c *cobra.Command, args []string) error {
 	}
 
 	// load packfiles, registering handlers as we go
-	router := &routerHandler{}
 	for prefix, packfile := range packPaths {
 		packHandler, err := htpack.New(packfile)
 		if err != nil {
@@ -208,59 +190,26 @@ func run(c *cobra.Command, args []string) error {
 		}
 		packHandler.SetHeader("X-Frame-Options", framesHeader)
 
-		var handler http.Handler = &addHeaders{
+		handler := &addHeaders{
 			extraHeaders: extraHeaders,
 			handler:      packHandler,
 		}
 
 		if prefix != "/" {
-			handler = http.StripPrefix(prefix, handler)
+			http.Handle(prefix+"/",
+				http.StripPrefix(prefix, handler))
+		} else {
+			http.Handle("/", handler)
 		}
-		router.AddRoute(prefix, handler)
 	}
 
-	// HTTP server object setup
-	sv := &http.Server{
-		Addr:    bindAddr,
-		Handler: router,
-	}
-
-	// register SIGINT, SIGTERM handler
-	sigch := make(chan os.Signal, 1)
-	signal.Notify(sigch, syscall.SIGINT, syscall.SIGTERM)
-	var (
-		// if we are shut down by a signal, then http.ListenAndServe()
-		// returns straight away, but we actually need to wait for
-		// Shutdown() to complete prior to returning / exiting
-		isSignalled atomic.Bool
-		signalDone  = make(chan struct{})
-	)
-	go func() {
-		<-sigch
-		time.Sleep(gracefulShutdownDelay)
-		isSignalled.Store(true)
-		shutctx, shutcancel := context.WithTimeout(context.Background(), gracefulShutdownDelay)
-		sv.Shutdown(shutctx)
-		shutcancel()
-		close(signalDone)
-	}()
-
 	// main server loop
 	if keyFile == "" {
-		err = sv.ListenAndServe()
+		err = http.ListenAndServe(bindAddr, nil)
 	} else {
-		err = sv.ListenAndServeTLS(certFile, keyFile)
+		err = http.ListenAndServeTLS(bindAddr, certFile, keyFile, nil)
 	}
-
+	if err != nil {
-	// if we were shut down by a signal, wait for Shutdown() to return
-	if isSignalled.Load() {
-		<-signalDone
-	}
-
-	switch err {
-	case nil, http.ErrServerClosed:
-		// OK
-	default:
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}
@@ -311,53 +260,3 @@ func (ah *addHeaders) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 	ah.handler.ServeHTTP(w, r)
 }
-
-// routeEntry is used within routerHandler to map a specific prefix to a
-// specific handler.
-type routeEntry struct {
-	// prefix is a path prefix with trailing "/" such as "/foo/".
-	prefix string
-
-	// handler for the request if prefix matches.
-	handler http.Handler
-}
-
-// routerHandler holds a list of routes sorted by longest-prefix-first.
-type routerHandler struct {
-	// entries are the list of prefixes, with longest prefix strings first.
-	// The sorting ensures we can iterate through from the start and match
-	// "/dir/subdir/" in preference to just "/dir/".
-	entries []routeEntry
-}
-
-// AddRoute adds a new entry into the handler. It is not concurrency safe; the
-// handler should not be in use.
-func (rh *routerHandler) AddRoute(prefix string, handler http.Handler) {
-	if !strings.HasSuffix(prefix, "/") {
-		prefix += "/"
-	}
-	rh.entries = append(rh.entries, routeEntry{
-		prefix:  prefix,
-		handler: handler,
-	})
-	sort.Slice(rh.entries, func(i, j int) bool {
-		l1, l2 := len(rh.entries[i].prefix), len(rh.entries[j].prefix)
-		if l1 > l2 {
-			return true
-		}
-		if l1 == l2 {
-			return rh.entries[i].prefix < rh.entries[j].prefix
-		}
-		return false
-	})
-}
-
-func (rh *routerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	for _, entry := range rh.entries {
-		if strings.HasPrefix(r.URL.Path, entry.prefix) {
-			entry.handler.ServeHTTP(w, r)
-			return
-		}
-	}
-	http.NotFound(w, r)
-}

go.mod

@@ -2,7 +2,7 @@ module src.lwithers.me.uk/go/htpack
 
 require (
 	github.com/gogo/protobuf v1.3.2
-	golang.org/x/sys v0.22.0
+	golang.org/x/sys v0.2.0
 )
 
-go 1.22
+go 1.19

go.sum

@@ -19,8 +19,8 @@ golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.22.0 h1:RI27ohtqKCnwULzJLqkv897zojh5/DwS/ENaMzUOaWI=
+golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
-golang.org/x/sys v0.22.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=