Re-vendor the shared files from sneak/prompts at dd4027b (closes #504)

Fetches the shared files unchanged from sneak/prompts commit dd4027b and
adds .prettierignore; .dockerignore keeps this repository's anchored host
artifacts at its end.

Linting moves into the Dockerfile's lint phase on the golangci-lint
v2.14.0 image, which also runs the js-lint stage, and Dockerfile.lint is
gone. Tests move into a test phase on the golang bookworm image.
script/lint, test, docker and cibuild are the model scripts, every docker
build in script/ passes --no-cache, and the .ci-fingerprint barrier is
gone. The workflow no longer calls script/ci-mark-superseded, so it and
its tests are removed. make build passes -trimpath and -s -w.

Model: opus-5-5

.dockerignore

@@ -72,13 +72,8 @@
 **/*.sublime-*
 
 # This repository's own host-built artifacts: the binary `make build`
-# writes, and the Alpine.js file `make assets` extracts from 3p/ (the
-# build extracts its own).
+# writes, the Alpine.js file `make assets` extracts from 3p/ (the build
+# extracts its own), and the databases of a `DATA_DIR=./data make dev` run.
 /bin
 /static/js/alpine.min.js
-
-# SQLite databases, which hold the session key and webhook payloads, at
-# any depth.
-**/*.db
-**/*.sqlite
-**/*.sqlite3
+/data

.editorconfig

@@ -10,6 +10,3 @@ insert_final_newline = true
 
 [Makefile]
 indent_style = tab
-
-[*.go]
-indent_style = tab

.gitignore

@@ -45,39 +45,3 @@ node_modules/
 [iI][dD]_[eE][cC][dD][sS][aA]_[sS][kK]
 [iI][dD]_[eE][dD]25519
 [iI][dD]_[eE][dD]25519_[sS][kK]
-
-# This repository's own entries, after the shared content above.
-
-# Binaries
-*.exe
-*.dll
-*.so
-*.dylib
-bin/
-/webhooker
-
-# Test binary, built with `go test -c`
-*.test
-
-# Output of the go coverage tool
-*.out
-
-# Go vendor directory
-vendor/
-
-# Data directory (SQLite databases)
-data/
-*.db
-*.sqlite
-*.sqlite3
-
-# Log files
-*.log
-
-# Temporary files
-tmp/
-temp/
-
-# Alpine.js, extracted by `make assets` from its tarball in 3p/, which is
-# what is committed.
-/static/js/alpine.min.js

Dockerfile

@@ -147,16 +147,9 @@ RUN script/assets
 # shown in full, so there is nothing to rerun. The step fails after the rerun
 # whatever its result: the first run already showed the suite is broken.
 #
-# TMPDIR, where the tests keep their SQLite databases, is a tmpfs: SQLite
-# waits for the disk at every commit, and on a busy host that waiting was
-# about 40% of the slowest package's run time. GOTMPDIR keeps go's own
-# build files, the test binaries among them, on disk.
-#
 # bash with pipefail, so that the first run's status is go test's, not tee's.
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-RUN --mount=type=tmpfs,target=/tmp/tests,size=512m \
-    export TMPDIR=/tmp/tests GOTMPDIR=/tmp; \
-    go test -race -cover -p 4 -parallel 8 -timeout 90s ./... 2>&1 | tee /tmp/go-test.log && exit 0; \
+RUN go test -race -cover -p 4 -parallel 8 -timeout 90s ./... 2>&1 | tee /tmp/go-test.log && exit 0; \
     tests="$(awk '/^--- FAIL: / { print $3 }' /tmp/go-test.log | paste -s -d '|' -)"; \
     packages="$(awk '/^FAIL\t/ { print $2 }' /tmp/go-test.log)"; \
     if [ -n "$tests" ]; then \

README.md

@@ -43,9 +43,8 @@ make check
 
 # Run the server from the clone. DATA_DIR defaults to
 # /var/lib/webhooker in every environment, so set it (in .env or the
-# shell) to a writable directory outside the clone: the databases hold
-# the session key.
-DATA_DIR=../webhooker-data make dev
+# shell) to a writable directory.
+DATA_DIR=./data make dev
 
 # Build Docker image
 make docker

go.mod

@@ -22,6 +22,7 @@ require (
 	github.com/stretchr/testify v1.11.1
 	go.uber.org/fx v1.24.0
 	golang.org/x/crypto v0.38.0
+	gopkg.in/yaml.v3 v3.0.1
 	gorm.io/driver/sqlite v1.5.4
 	gorm.io/gorm v1.25.5
 	modernc.org/sqlite v1.28.0
@@ -58,7 +59,6 @@ require (
 	golang.org/x/text v0.25.0 // indirect
 	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/protobuf v1.31.0 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	lukechampine.com/uint128 v1.2.0 // indirect
 	modernc.org/cc/v3 v3.40.0 // indirect
 	modernc.org/ccgo/v3 v3.16.13 // indirect

internal/delivery/inflight_test.go

@@ -48,9 +48,8 @@ func fSweepSetup(
 //
 // Every caller drives the dispatch paths synchronously and has already
 // waited for them to return, so anything they queued is in the channel
-// by now, and nothing is waited for. A timer here would race the queued
-// tasks: on a busy host it can be due by the time select looks, and
-// select picks at random among the cases that are ready.
+// by now. The short grace covers nothing but scheduler jitter, and is
+// kept small because one of these tests runs the drain forty times.
 func fDrain(e *delivery.Engine) []delivery.Task {
 	var out []delivery.Task
 
@@ -60,7 +59,7 @@ func fDrain(e *delivery.Engine) []delivery.Task {
 			out = append(out, task)
 		case task := <-e.ExportRetryCh():
 			out = append(out, task)
-		default:
+		case <-time.After(25 * time.Millisecond):
 			return out
 		}
 	}

internal/delivery/target_database_export_test.go

@@ -460,13 +460,8 @@ func TestArchiveExport_OneFileOpenAtATime(t *testing.T) {
 }
 
 // heapPeak is an io.Writer that discards what it is given and records
-// the largest heap it saw at a write. It collects garbage twice before
-// each reading, so the heap it reads is what is still held. Once is not
-// enough: the libraries the export calls (regexp, under GORM's table
-// names, and encoding/json among them) cache buffers in a sync.Pool,
-// which keeps them through one collection, so after one the reading
-// counts however many happen to be cached. That varies from run to run
-// by about as much as the limit in TestArchiveExport_Streams.
+// the largest heap it saw at a write. It collects garbage before each
+// reading, so the heap it reads is what is still held.
 type heapPeak struct {
 	max uint64
 }
@@ -474,7 +469,6 @@ type heapPeak struct {
 func (p *heapPeak) Write(b []byte) (int, error) {
 	var m runtime.MemStats
 
-	runtime.GC()
 	runtime.GC()
 	runtime.ReadMemStats(&m)
 	p.max = max(p.max, m.HeapAlloc)
@@ -504,8 +498,6 @@ func exportHeapGrowth(t *testing.T, rows, bodySize int) uint64 {
 
 	export := listExport(t, path)
 
-	// Twice, for the reason heapPeak gives.
-	runtime.GC()
 	runtime.GC()
 
 	var start runtime.MemStats

internal/server/alpine_browser_test.go

@@ -280,23 +280,6 @@ func click(ctx context.Context, t *testing.T, xpath string) {
 	))
 }
 
-// clickAndLoad clicks the link or button matching an XPath expression
-// and waits, as loadPage does, for the page the click opens to load and
-// for Alpine.js to start on it. Reading earlier, a check can find an
-// element of the page being left, gone by the time its value is read;
-// and the wait in shown is too short for a page load on a busy host.
-func clickAndLoad(ctx context.Context, t *testing.T, xpath string) {
-	t.Helper()
-
-	_, err := chromedp.RunResponse(
-		ctx, chromedp.Click(xpath, chromedp.BySearch),
-	)
-	require.NoError(t, err)
-	require.NoError(t, chromedp.Run(
-		ctx, chromedp.WaitNotPresent("[x-cloak]", chromedp.ByQuery),
-	))
-}
-
 // checkAddEntrypoint loads a webhook page and checks that the add
 // entrypoint form stays hidden until the Add button beside its heading
 // is clicked. The click looks for a button element there, so it also
@@ -439,7 +422,7 @@ func checkAddTarget(
 		)))
 	}
 
-	clickAndLoad(ctx, t, saveButton)
+	click(ctx, t, saveButton)
 	assert.Truef(t, shown(ctx, `//span[text()="`+name+
 		`"]/following-sibling::div/span[text()="`+badge+`"]`),
 		"%s: the added target is not listed as %s", targetType, badge)
@@ -502,9 +485,10 @@ func checkArchiveChoices(ctx context.Context, t *testing.T, url string) {
 		`/following-sibling::span[text()="daily"]`),
 		"a database target added with daily is not listed as daily")
 
-	clickAndLoad(ctx, t, row+`//a[text()="Edit"]`)
+	click(ctx, t, row+`//a[text()="Edit"]`)
 	require.NoError(t, chromedp.Run(
 		ctx,
+		chromedp.WaitReady("#expiry", chromedp.ByQuery),
 		chromedp.Value("#expiry", &editedExpiry, chromedp.ByQuery),
 		chromedp.Value("#rotation", &editedRotation, chromedp.ByQuery),
 	))
@@ -539,7 +523,7 @@ func checkRefusedTarget(ctx context.Context, t *testing.T, url string) {
 		chromedp.Click(forwardQuery, chromedp.ByQuery),
 	))
 
-	clickAndLoad(ctx, t, saveButton)
+	click(ctx, t, saveButton)
 
 	assert.True(t, shown(ctx, reason),
 		"a refused target does not show the reason")
@@ -652,7 +636,7 @@ func checkRefusedEdits(
 			))
 		}
 
-		clickAndLoad(ctx, t, `//button[text()="Save Changes"]`)
+		click(ctx, t, `//button[text()="Save Changes"]`)
 
 		assert.Truef(t, shown(ctx, reason),
 			"%s: a refused save does not show the reason", edit.url)
@@ -776,7 +760,7 @@ func checkEntrypointEdit(
 	require.NoError(t, chromedp.Run(
 		ctx, chromedp.SendKeys(input, "Billing sender", chromedp.ByQuery),
 	))
-	clickAndLoad(ctx, t, saveEdit)
+	click(ctx, t, saveEdit)
 
 	assert.True(t, shown(ctx, `//span[text()="Billing sender"]`),
 		"saving the edit form does not change the description")
@@ -814,7 +798,7 @@ func checkRecentEvents(ctx context.Context, t *testing.T, url string) {
 		"clicking the newest event does not collapse it")
 
 	require.NoError(t, chromedp.Run(ctx, loadPage(url)))
-	clickAndLoad(ctx, t, newest+`/ancestor::div[@x-data][1]//a[text()="Open"]`)
+	click(ctx, t, newest+`/ancestor::div[@x-data][1]//a[text()="Open"]`)
 
 	assert.True(t, shown(ctx, `//h2[text()="Body"]`),
 		"Open does not lead to the event's own page")
@@ -1215,7 +1199,7 @@ func checkNewWebhookTargets(
 					`","rotation":"none"}`
 			}
 
-			clickAndLoad(ctx, t, createButton)
+			click(ctx, t, createButton)
 			require.Truef(t, shown(ctx, `//h1[text()="`+name+`"]`),
 				"%s: the new webhook's page does not open", name)
 
@@ -1276,7 +1260,7 @@ func checkRefusedNewWebhook(ctx context.Context, t *testing.T, url string) {
 		chromedp.SetValue(pruningChoice, "2160h", chromedp.BySearch),
 		chromedp.SetValue("#archive_rotation", "monthly", chromedp.ByQuery),
 	))
-	clickAndLoad(ctx, t, createButton)
+	click(ctx, t, createButton)
 
 	assert.True(t, shown(ctx, `//div[@class="alert-error"]`),
 		"a refused webhook does not show the reason")

script/bootstrap

@@ -11,7 +11,6 @@ ROOT="$(cd "$(dirname "$0")/.." && pwd -P)"
 
 PKGMGR=""
 SUDO=""
-APT_UPDATED=""
 
 detect_pkgmgr() {
     [ -n "$PKGMGR" ] && return 0
@@ -40,14 +39,7 @@ pkg_install() {
     detect_pkgmgr
     case "$PKGMGR" in
         nix) nix-env -iA "nixpkgs.$1" ;;
-        apt)
-            # Package lists may be empty (fresh images); refresh once per run.
-            if [ -z "$APT_UPDATED" ]; then
-                $SUDO env DEBIAN_FRONTEND=noninteractive apt-get update
-                APT_UPDATED=1
-            fi
-            $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y "$2"
-            ;;
+        apt) $SUDO env DEBIAN_FRONTEND=noninteractive apt-get install -y "$2" ;;
         brew) brew install "$3" ;;
         apk) apk add --no-cache "$4" ;;
     esac