ZDDC
4eeb25c0ef
Replaces the URL/channel/version-fetching tool-HTML system with a
local-only override model. No network fetch, no Ed25519 signatures, no
channels/versions, no `apps:` .zddc key.
Tool HTML resolves, in precedence:
1. a real file on disk at the path (operator drops browse.html / archive.html
/ a new mytool.html) — served by the existing static handler;
2. an `<app>.html` member of the site-root <ZDDC_ROOT>/.zddc.zip bundle, read
server-side via internal/zipfs (local file, no fetch, no signature;
re-stat'd each request for free hot-reload);
3. the embedded //go:embed default.
Remove (complete unwire):
- internal/apps/{fetch,verify,cache,singleflight}.go and their tests; the
spec-parsing/cascade machinery in apps.go (ParseSpec/Resolve/PreviewLine/
SpecComponents/appsState, DefaultUpstream*/DefaultChannel/CacheDirName).
- --apps-pubkey / ZDDC_APPS_PUBKEY flag+env+Config field; the setupApps
cache/fetcher/pubkey wiring (now just apps.NewServer(root, version)).
- the `apps:` / `apps_pubkey:` .zddc keys: ZddcFile.Apps/AppsPubKey, the
walker merges, cascade-summary adds, validate.go apps validation
(ValidateAppSourceSpec/validateURLSpec/validateChannelOrVersion/
AppsDefaultKey/IsValidAppsKey), and the isZero/is-empty refs. A stale
apps:/apps_pubkey: in an existing .zddc is now silently ignored
(back-compat), not a parse error. Client .zddc validator (preview-yaml.js)
drops the apps/apps_pubkey keys + appsmap case.
Add:
- internal/apps/bundle.go — nil-safe Bundle over <root>/.zddc.zip with
stat-based hot-reload, size caps, corrupt-zip tolerance.
- handler.go: Server{Bundle}, resolveBytes (bundle→embedded), simplified
Serve; X-ZDDC-Source = bundle:<m> / embedded:<app>@<ver>.
- dispatch: GET /.zddc.zip is 404 for everyone (config, not content); the
server reads members from the filesystem internally.
Tests: new bundle_test.go (member hit/absent/no-file/hot-reload/corrupt);
handler_test.go rewritten for bundle-overrides-embedded, absent-member→
embedded, unknown-tool 503, conditional-GET for both sources; dispatch test
covers bundle override + /.zddc.zip 404 + availability rules. go build/vet/
test ./... all green; gofmt clean. Docs (AGENTS.md, ARCHITECTURE.md) updated.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
96 lines
2.7 KiB
Go
96 lines
2.7 KiB
Go
package apps
|
|
|
|
import (
|
|
"archive/zip"
|
|
"bytes"
|
|
"os"
|
|
"path/filepath"
|
|
"testing"
|
|
"time"
|
|
)
|
|
|
|
// writeTestBundle writes a <dir>/.zddc.zip containing the given members.
|
|
// Shared by bundle + handler precedence tests.
|
|
func writeTestBundle(t *testing.T, dir string, members map[string]string) string {
|
|
t.Helper()
|
|
var buf bytes.Buffer
|
|
zw := zip.NewWriter(&buf)
|
|
for name, body := range members {
|
|
w, err := zw.Create(name)
|
|
if err != nil {
|
|
t.Fatalf("zip create %s: %v", name, err)
|
|
}
|
|
if _, err := w.Write([]byte(body)); err != nil {
|
|
t.Fatalf("zip write %s: %v", name, err)
|
|
}
|
|
}
|
|
if err := zw.Close(); err != nil {
|
|
t.Fatalf("zip close: %v", err)
|
|
}
|
|
p := filepath.Join(dir, BundleName)
|
|
if err := os.WriteFile(p, buf.Bytes(), 0o644); err != nil {
|
|
t.Fatalf("write bundle: %v", err)
|
|
}
|
|
return p
|
|
}
|
|
|
|
func TestBundle_Member_Hit(t *testing.T) {
|
|
root := t.TempDir()
|
|
writeTestBundle(t, root, map[string]string{"browse.html": "BUNDLE browse"})
|
|
b := NewBundle(root, nil)
|
|
got, ok := b.Member("browse.html")
|
|
if !ok || string(got) != "BUNDLE browse" {
|
|
t.Fatalf("Member = (%q,%v), want (BUNDLE browse,true)", got, ok)
|
|
}
|
|
// Case-insensitive lookup (matches URL folding).
|
|
if _, ok := b.Member("BROWSE.HTML"); !ok {
|
|
t.Errorf("case-insensitive member lookup failed")
|
|
}
|
|
}
|
|
|
|
func TestBundle_Member_Absent(t *testing.T) {
|
|
root := t.TempDir()
|
|
writeTestBundle(t, root, map[string]string{"browse.html": "x"})
|
|
b := NewBundle(root, nil)
|
|
if _, ok := b.Member("archive.html"); ok {
|
|
t.Errorf("absent member reported present")
|
|
}
|
|
}
|
|
|
|
func TestBundle_NoFile(t *testing.T) {
|
|
b := NewBundle(t.TempDir(), nil)
|
|
if _, ok := b.Member("browse.html"); ok {
|
|
t.Errorf("no bundle file but member reported present")
|
|
}
|
|
// nil bundle is safe.
|
|
var nb *Bundle
|
|
if _, ok := nb.Member("browse.html"); ok {
|
|
t.Errorf("nil bundle reported a member")
|
|
}
|
|
}
|
|
|
|
func TestBundle_HotReload(t *testing.T) {
|
|
root := t.TempDir()
|
|
p := writeTestBundle(t, root, map[string]string{"browse.html": "v1"})
|
|
b := NewBundle(root, nil)
|
|
if got, _ := b.Member("browse.html"); string(got) != "v1" {
|
|
t.Fatalf("first read = %q, want v1", got)
|
|
}
|
|
// Rewrite with new bytes + a bumped mtime so the stat-based cache reparses.
|
|
writeTestBundle(t, root, map[string]string{"browse.html": "v2"})
|
|
_ = os.Chtimes(p, time.Now().Add(2*time.Second), time.Now().Add(2*time.Second))
|
|
if got, _ := b.Member("browse.html"); string(got) != "v2" {
|
|
t.Errorf("after reload = %q, want v2", got)
|
|
}
|
|
}
|
|
|
|
func TestBundle_CorruptZip(t *testing.T) {
|
|
root := t.TempDir()
|
|
if err := os.WriteFile(filepath.Join(root, BundleName), []byte("not a zip"), 0o644); err != nil {
|
|
t.Fatal(err)
|
|
}
|
|
b := NewBundle(root, nil)
|
|
if _, ok := b.Member("browse.html"); ok {
|
|
t.Errorf("corrupt zip should yield no members")
|
|
}
|
|
}
|