ZDDC
8edbb81958
Two users editing the same file online could silently clobber each other:
the editor's save did a bare PUT with no precondition, even though the master
already enforces optimistic concurrency (fileapi.go checkIfMatch → 412). Now
the editor sends a precondition and surfaces a conflict UI instead of
overwriting.
- util.js: saveFile(node, content, contentType, opts) sends `If-Match: <etag>`
(or `If-Unmodified-Since` fallback) unless opts.force; returns {etag} from
the PUT response (so save→edit→save adopts the new version and doesn't
false-conflict); throws ConflictError (.status===412) on a precondition
failure so callers branch cleanly. New saveCopy() parks a conflicting edit
as `<stem>-conflict-<ts>.<ext>` (collision-probed) without losing either side.
- preview.js: getContentWithVersion(node) → {buf, etag, lastModified} captured
from the content GET (the listing JSON carries no per-file etag); threaded
into the editor ctx and exported. getArrayBuffer left untouched.
- conflict.js (new): shared, callback-driven dialog — mine-vs-theirs diff
(reuses zddc.diff + css/history.css) + Overwrite / Reload-theirs /
Save-a-copy / Cancel. Never calls saveFile/showFilePreview itself, so the
deferred Phase 5 cache-outbox conflict UI can reuse it with its own callbacks.
- preview-markdown.js / preview-yaml.js: capture + forward the version token,
adopt the returned etag on success, and on 412 open the dialog (Overwrite
re-fetches the current etag then re-saves — re-conflicts on a third writer
rather than blind-forcing; Reload clears dirty first so the renderInline
guard skips its confirm). FS-Access mode sends no precondition (no
concurrency) and never conflicts.
- build.sh: concat conflict.js after util.js.
- tests/conflict.spec.js (+ playwright project): If-Match sent, ConflictError
on 412, new-etag returned, force omits the precondition, dialog renders the
diff and each action resolves via its callback. Drives the fresh dist build
over file:// with a stubbed fetch (the test binary embeds the committed
browse.html, not dist, so a server-mode E2E would run stale code).
All browse + diff + conflict specs pass (18).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
125 lines
3.1 KiB
JavaScript
125 lines
3.1 KiB
JavaScript
import { defineConfig } from '@playwright/test';
|
|
|
|
export default defineConfig({
|
|
testDir: './tests',
|
|
// tokens.spec.js builds the Go binary on first run via podman + waits
|
|
// for the spawned master to listen — both can take longer than the
|
|
// default 30s on a cold cache. Other specs are file:// driven and
|
|
// unaffected by this bump.
|
|
timeout: 60000,
|
|
retries: 0,
|
|
reporter: [['line'], ['html', { open: 'never' }]],
|
|
|
|
use: {
|
|
// Chromium only -- File System Access API requires it,
|
|
// and the ZDDC tools target "any modern Chromium-based browser"
|
|
browserName: 'chromium',
|
|
screenshot: 'only-on-failure',
|
|
trace: 'retain-on-failure',
|
|
},
|
|
|
|
projects: [
|
|
{
|
|
name: 'archive',
|
|
testMatch: 'archive.spec.js',
|
|
},
|
|
{
|
|
name: 'archive-cascade',
|
|
testMatch: 'archive-cascade.spec.js',
|
|
},
|
|
{
|
|
name: 'landing',
|
|
testMatch: 'landing.spec.js',
|
|
},
|
|
{
|
|
name: 'transmittal',
|
|
testMatch: 'transmittal.spec.js',
|
|
},
|
|
{
|
|
name: 'transmittal-init',
|
|
testMatch: 'transmittal-init-check.spec.js',
|
|
},
|
|
{
|
|
name: 'transmittal-drag-drop',
|
|
testMatch: 'transmittal-drag-drop.spec.js',
|
|
},
|
|
{
|
|
name: 'transmittal-validation',
|
|
testMatch: 'transmittal-validation.spec.js',
|
|
},
|
|
{
|
|
name: 'classifier',
|
|
testMatch: 'classifier.spec.js',
|
|
},
|
|
{
|
|
name: 'browse',
|
|
testMatch: 'browse.spec.js',
|
|
},
|
|
{
|
|
name: 'conflict',
|
|
testMatch: 'conflict.spec.js',
|
|
},
|
|
{
|
|
name: 'zddc-source',
|
|
testMatch: 'zddc-source.spec.js',
|
|
},
|
|
{
|
|
name: 'toast',
|
|
testMatch: 'toast.spec.js',
|
|
},
|
|
{
|
|
name: 'nav',
|
|
testMatch: 'nav.spec.js',
|
|
},
|
|
{
|
|
name: 'logo',
|
|
testMatch: 'logo.spec.js',
|
|
},
|
|
{
|
|
name: 'zddc',
|
|
testMatch: 'zddc.spec.js',
|
|
},
|
|
{
|
|
name: 'diff',
|
|
testMatch: 'diff.spec.js',
|
|
},
|
|
{
|
|
name: 'form-safety',
|
|
testMatch: 'form-safety.spec.js',
|
|
},
|
|
{
|
|
name: 'tables',
|
|
testMatch: 'tables.spec.js',
|
|
},
|
|
{
|
|
name: 'zddc-filter',
|
|
testMatch: 'zddc-filter.spec.js',
|
|
},
|
|
{
|
|
name: 'build-label',
|
|
testMatch: 'build-label.spec.js',
|
|
},
|
|
{
|
|
name: 'schema',
|
|
testMatch: 'schema.spec.js',
|
|
},
|
|
{
|
|
// Server-backed: starts a real zddc-server master via
|
|
// tests/lib/server.mjs (which builds the binary on first run
|
|
// through the canonical podman/zddc-go:1.24 invocation), drives
|
|
// Chromium against http://127.0.0.1:<port>/.tokens, exercises
|
|
// create/list/revoke + bearer round-trip + cross-user 404 +
|
|
// XSS-guard. The binary build is cached at zddc/dist/zddc-server-
|
|
// test and invalidated by a hash of cmd/+internal/+go.{mod,sum}
|
|
// so a second run only takes the master-startup time (~1s).
|
|
// First run takes ~30s for the build.
|
|
//
|
|
// The lifecycle is per-spec via beforeAll/afterAll — Playwright's
|
|
// top-level webServer hook would fire for every project, including
|
|
// the file://-driven tool tests that don't need the server.
|
|
name: 'tokens',
|
|
testMatch: 'tokens.spec.js',
|
|
},
|
|
],
|
|
});
|
|
|