Add POST /collaboration/migrate/v1/docs/{id}, which replays every S3 version
of a document's legacy `{id}/file` object into one gc:false Yjs document and
stores it as a single row at clock 0, crediting each version with its own S3
timestamp. Nothing existing is deleted and nothing goes on the stream, so the
next compaction merges that row like any other. The clock-0 insert is ON
CONFLICT DO NOTHING and migrated ids are kept in a valkey set, so the endpoint
is idempotent without a lock. The activity api then reports the same timeline
as the backend's /documents/{id}/versions/, instead of the single
migration-time change the lazy soft migration leaves behind.
That lazy seed now writes no insertAt/deleteAt. Persisted contentmaps are
merged rather than de-duplicated, so a seed timestamp would survive next to
the real per-version one on the same ids and the activity api would report
whichever the unordered row scan put last. A seed is not an editing event and
has no honest time to report.
Upgrade yhub to 0.5.0, where error codes encode retry semantics (4xx
permanent, 5xx and 429 retryable) and auth plugins may throw apiError(503). A
temporarily unreachable Django backend, JWKS endpoint or legacy S3 store is
now reported as 503 rather than denied like a permission failure, so clients
retry instead of giving up.
The legacy-store code moves out of server.js into migration.js, with the
shared *_FILE secret helper in env.js.
Signed-off-by: Kevin Jahns <kevin.jahns@protonmail.com>
14 KiB
yhub-server
This directory contains the La Suite Docs-specific configuration for
yhub (@y/hub), the collaboration
server that synchronizes Yjs documents between editors in real time.
It is not a fork of yhub — it is a thin wrapper:
server.js— configuration, the auth plugin, and the custom REST endpoints,migration.js— everything that reads the legacy Django/S3 document store (both migrations described below),env.js— the*_FILEsecret indirection shared by the two.
server.js:
- starts a yhub instance (websocket sync on port 3002, backed by Redis/Valkey and PostgreSQL),
- plugs in an auth plugin that resolves users and per-document access rights
by calling the Docs Django backend (
/api/v1.0/users/me/and/api/v1.0/documents/{id}/), - serves every route under the
/collaboration/prefix (server.apiPrefix), including the websocket sync route/collaboration/ws/v1/{org}/{docid}, - exposes
POST /collaboration/reset-connections/v1/{org}/{docid}(optionalX-User-Idheader), for the Django backend to re-check the authorization of a document's connected clients when permissions change (backend wiring pending) — authenticated with an RS256 admin JWT issued by Django and verified against its JWKS (/api/v1.0/jwks); thereset-connectionspurpose is granted only to that admin token, never to regular users, - exposes
POST /collaboration/create-ydoc/v1/{org}/{docid}(optionalX-User-Idheader naming the user the initial content is attributed to), which seeds a document's initial Yjs state from a raw binary update (Y.encodeStateAsUpdate/ pycrdtget_update()output posted asapplication/octet-stream— no lib0 encoding, unlike yhub's built-inPATCH .../ydoc/), so the Django backend can create documents server-side. Strict create: 409 when the document already has content. Guarded by standard document write access (the admin JWT, or a user session with update ability), - exposes
POST /collaboration/migrate/v1/{org}/{docid}, which replays a document's full legacy version history out of the S3 media bucket (see "Full migration" below) — admin JWT only, likereset-connections, - mirrors the environment conventions used elsewhere in this repository
(
*_FILEsecret indirection,COLLABORATION_SERVER_ORIGINallowlist, …).
Public exposure: route the whole /collaboration/ prefix to this server —
the websocket and the built-in document APIs (ydoc, rollback, prune,
changeset, activity) are all guarded by the same cookie-based document
authorization and are meant to be reachable by browsers. The one exception
is /collaboration/reset-connections/ and /collaboration/migrate/, which are
backend-internal and should not be routed through the public ingress.
The Dockerfile builds the container image used by the yhub service in
compose.yml.
Soft migration (SOFT_MIGRATION=true)
Documents were historically stored by the Django backend in the S3 media
bucket, as UTF-8 text that is the base64 encoding of a raw Yjs update, at key
{document-uuid}/file. With SOFT_MIGRATION=true, this server migrates those
documents into yhub lazily, on first access:
-
After a user's document authorization succeeds, the auth plugin checks whether yhub already has content for the room — the migrated set written by the full migration (below), then a bare postgres
SELECT(persisted rows), then the valkey stream (uncompactedydoc:update:v1messages), then theSELECTagain to close the compaction race. Verdicts are cached in-process (existing docs 10 min, empty docs 60 s, failures 5 min). -
If the room is unknown, the legacy object is fetched from S3 (10 s timeout, 10 MiB decoded cap — the same limit as
create-ydoc), decoded, diffed through yhub's compute pool and appended to the room's stream — attributed to thesystemidentity with amigration=s3custom attribution. This completes before the websocket upgrade resolves, so the initial sync always includes the seeded content. First access to an unmigrated document is therefore slower by one S3 round-trip plus one compute pass.A seed carries no timestamp. Its contentmap has
insert/deleteandmigration=s3but deliberately noinsertAt/deleteAt: a lazy seed is not an editing event, and the only honest timestamps for legacy content are the S3 version times that the full migration writes. Stamping the seed too would put a secondinsertAton the same ids — persisted contentmaps are merged, not de-duplicated — andactivitywould report whichever the (unordered) row scan happened to put last. The practical consequence: seeded content produces noactivityentry and is skipped byfrom/to-filteredchangeset/rollback/prunequeries until the full migration supplies the real history. Unfiltered queries,by=systemandwithCustomAttributions=migration:s3still match it. -
Concurrent first-connections are collapsed: an in-process in-flight map, a per-room valkey lock (
{prefix}:softmigrate:*, 30 s TTL), and a cap of 20 concurrent seeds per replica (excess connections fail fast and retry).
Guarantees and failure behavior:
- Missing S3 object is not an error — that is the brand-new-document case (Django writes no object until the first content save); the room simply starts empty.
- Everything else fails closed, and says whether it is worth retrying
(yhub 0.5.0 error semantics): an oversized or corrupt legacy object will fail
the same way forever, so the connection is denied
403; network errors, timeouts and momentary seed backpressure answer503, which clients retry with backoff. Either way asoft-migrationerror is logged. A cached failure verdict prevents retry storms from hammering S3 — permanent failures (corrupt/oversized objects) for 5 minutes, transient ones (network errors, timeouts) for 15 seconds, and per-replica seed backpressure (more than 20 concurrent seeds) is denied without caching so the client's next retry goes through. - Seeding is idempotent: the legacy S3 snapshots are frozen (the frontend no longer PATCHes content snapshots to Django) and share one Yjs lineage with everything in yhub, so duplicate or concurrent seeds merge as CRDT no-ops. Losing valkey before compaction merely makes the next access re-seed from S3. Note that edits made after a document was migrated live only in yhub — a re-seed after total yhub data loss restores the pre-migration snapshot, nothing newer.
SOFT_MIGRATION=falsedoes not undo anything — migrated documents stay correct in yhub — but since the frontend's client-side seeding was removed along with the content GET/PATCH endpoints, an unmigrated legacy document then opens as an empty room. Keep the flag on until a backfill has migrated the full corpus.
Configuration: AWS_S3_ENDPOINT_URL, AWS_S3_ACCESS_KEY_ID,
AWS_S3_SECRET_ACCESS_KEY (both with *_FILE indirection), optional
AWS_S3_REGION_NAME, and AWS_STORAGE_BUCKET_NAME (defaults to Django's dev
default impress-media-storage; production uses a different bucket name and
must set it explicitly). The server refuses to boot when the flag is set
without endpoint and credentials. In development the values arrive via
env.d/development/common.
Operational notes:
- Use read-only, bucket-scoped S3 credentials in production — never the
backend's read-write keys; this process terminates untrusted traffic. On
AWS the credentials must include
s3:ListBucketon the bucket in addition tos3:GetObject: without it, S3 reports a missing object as403 AccessDeniedinstead of404 NoSuchKey, and every brand-new document would fail closed instead of starting empty. AWS_S3_ENDPOINT_URLmust not contain a path (the minio client cannot address a base path); the server refuses to boot otherwise.- After manually wiping a room's yhub state (postgres row + stream key), restart yhub so the in-process verdict cache cannot serve a stale "exists" and suppress the re-seed.
- Lazy migration never finishes on its own: documents that are never opened
stay in S3 forever, and they are only reachable through this flag now that
the frontend's client-side seeding is gone. Running
migrate(below) over the corpus is the intended completion path. Only after that backfill maySOFT_MIGRATIONbe turned off.
Full migration (POST /collaboration/migrate/v1/{org}/{docid})
The media bucket is versioned, so {docid}/file keeps every snapshot Django
ever wrote — that is the version history the backend exposes at
/documents/{id}/versions/. The lazy seed above replays only the newest one, so
a soft-migrated document lands in yhub as a single system change stamped with
the migration time and its past is gone.
migrate replays the whole history instead. It lists the object's versions and
applies them, oldest first, to a single Y.Doc({ gc: false }); after each one
it credits the ids that version introduced (and the ones it deleted) with
that version's own S3 timestamp. GET /collaboration/activity/v1/{org}/{docid}?group=false then reports one entry per
S3 version, at the same timestamps the backend's version listing reports as
last_modified — which is what lines the two up. (Pass group=false: the
default grouping merges changes by the same author less than a second apart,
which would fold versions saved in quick succession into one entry.)
gc: false is what preserves content that later versions deleted — most of
what makes a history worth keeping.
Since yhub 0.5.0 the built-in endpoints also speak JSON on request, so a
non-JavaScript caller can read that timeline without a lib0 decoder: send
Accept: application/json and activity/changeset answer
application/json (binary fields base64-encoded) instead of
application/x-lib0any.
The result lands as one new row in yhub_ydoc_v1 at clock 0, written
through yhub.persistence.store. Nothing is deleted and nothing goes on the
redis stream: the migration is purely additive. Clock 0 is what makes that
safe —
storeisON CONFLICT (org, docid, branch, t) DO NOTHING, so a repeated or concurrent call is a database no-op;retrieveDocderives the room'slastClockfrom the newest row, so a0row can never hide stream messages a live editor is writing;- the history genuinely is the oldest thing in the room.
The next compact task merges that row into the room's normal state and deletes it, like any other row — yhub needs no special case for it.
Called with the admin JWT (aud: "yhub"), doc-scoped, branch=main only (the
legacy store is branchless). Running it over the whole corpus — any 2xx means
done — is the backfill that finishes the migration.
Guarantees:
- Idempotent, twice over. The docid is recorded in the valkey set
{prefix}:migrated:v1and skipped on later calls; and even without that, thet = 0insert is a no-op. There is no lock: concurrent calls for the same document all succeed and the database keeps one row. - Never destructive. No existing row, stream message or attribution is removed, so a document's own yhub history — edits made after it was seeded — survives untouched alongside the imported one.
- Nothing usable, nothing touched, nothing remembered. A document with no
legacy object (
versions: 0) or with no readable version (applied: 0) is left exactly as it is and is not added to the set, so a later run can still pick it up. Both answer200 {"migrated": false}, so a backfill driver can treat every 2xx as done. - A corrupt version is skipped, not fatal (counted as
skipped, logged with its version id). Snapshots are decoded before they are applied, so a bad one can neither corrupt the accumulating document nor kill a compute worker. Later versions are full snapshots, so their content still arrives — only that one timeline entry is lost. - More than 500 versions: only the newest 500 are replayed and the rest fold
into the first replayed version, reported as
dropped.
Response (200): { migrated, versions, applied, skipped, dropped, bytes, durationMs }.
Caveats:
?force=truere-runs a document that is already in the set. Only safe while its clock-0 row is still there. Once compaction has folded that row away, a forced re-run inserts a second contentmap for ids that already carry one, bothinsertAtvalues survive the merge, and the activity timestamp for that content becomes whichever the unordered row scan puts last. To genuinely redo a document, wipe its yhub state first (rows, stream key, set member).- The replay runs on the server's main thread. yhub's compute pool only accepts its own fixed task types, so a very long history briefly blocks the event loop; that is what the 500-version cap bounds.
activityandchangesetresponses are cached for ~5s (yhub'sredis.cacheTtl). A call made right after a migration can still answer with the pre-migration timeline; it resolves itself.- Requires
SOFT_MIGRATION=true(that is what configures the S3 client); otherwise it answers503.
⚠️ License warning (AGPL)
This directory depends on @y/hub, which is licensed under the
GNU AGPL-3.0 (or a separate proprietary license from its author). Unlike
the rest of this repository (MIT), the code in this directory is loaded into
the same process as AGPL-licensed code. As a consequence:
- Any modification to the code in this directory (in particular
server.jsandmigration.js) must be released under an AGPL-compatible license if you run or distribute the resulting server, including making it available to users over a network (AGPL section 13). - See the LICENSE file in this directory for details.
The rest of La Suite Docs is not affected. The Django backend and the frontend never link against yhub; they communicate with it exclusively through network requests (REST/HTTP and WebSocket). They remain under the MIT license of the repository root.