@vibes.diy/api-svc 9.2.0 → 9.3.0

package/public/seq-allocation.js

@@ -60,21 +60,40 @@ function buildAtomicInsert(p) {
     const { row, flavour } = p;
     const dataParam = flavour === "pg" ? sql `${row.data}` : sql `${JSON.stringify(row.data)}`;
     return sql `
-    INSERT INTO ${TABLE} ("userSlug","appSlug","dbName","docId","seq","userId","data","deleted","created")
+    INSERT INTO ${TABLE} ("userSlug","appSlug","dbName","docId","seq","userId","data","deleted","created","baseSeq")
     SELECT ${row.ownerHandle}, ${row.appSlug}, ${row.dbName}, ${row.docId},
-           COALESCE(MAX("seq"),0)+1, ${row.userId}, ${dataParam}, ${row.deleted}, ${row.created}
+           COALESCE(MAX("seq"),0)+1, ${row.userId}, ${dataParam}, ${row.deleted}, ${row.created}, ${row.baseSeq ?? null}
     FROM ${TABLE}
     WHERE "userSlug"=${row.ownerHandle} AND "appSlug"=${row.appSlug}
       AND "dbName"=${row.dbName} AND "docId"=${row.docId}
     RETURNING "seq"
   `;
 }
-function runReturning(db, flavour, stmt) {
+export function runReturning(db, flavour, stmt) {
     if (flavour === "pg") {
         return db.execute(stmt);
     }
     return db.run(stmt);
 }
+export async function runLockedAllocation(args) {
+    if (args.flavour === "pg") {
+        return asTxRunner(args.db).transaction(async (tx) => {
+            await tx.execute(sql `SELECT pg_advisory_xact_lock(hashtextextended(${args.lockKey}, 0))`);
+            return args.attempt(tx);
+        });
+    }
+    for (let i = 0; i < args.maxAttempts; i++) {
+        try {
+            return args.needsTxnOnSqlite ? await asTxRunner(args.db).transaction((tx) => args.attempt(tx)) : await args.attempt(args.db);
+        }
+        catch (err) {
+            if (!isRetryableConflict(err))
+                throw err;
+            await new Promise((r) => setTimeout(r, Math.floor(Math.random() * (8 << i))));
+        }
+    }
+    return args.onSqliteExhausted();
+}
 async function headSeqWith(exec, p) {
     const r = await exec
         .select({ maxSeq: sql `COALESCE(MAX(${p.table.seq}),0)` })
@@ -97,51 +116,26 @@ async function assertHeadSeq(exec, p) {
 function asTxRunner(db) {
     return db;
 }
-async function allocateSqlite(p) {
-    const attempts = p.maxAttempts ?? 3;
-    const needsTxn = p.skipIf !== undefined || p.ifHeadSeq !== undefined;
-    for (let i = 0; i < attempts; i++) {
-        try {
-            if (needsTxn) {
-                const skipIf = p.skipIf;
-                return await asTxRunner(p.db).transaction(async (tx) => {
-                    await assertHeadSeq(tx, p);
-                    if (skipIf && (await skipIf(tx)))
-                        return { seq: await headSeqWith(tx, p), inserted: false };
-                    const seq = extractReturnedSeq(await runReturning(tx, p.flavour, buildAtomicInsert(p)));
-                    if (p.sidecar)
-                        await p.sidecar(seq, tx);
-                    return { seq, inserted: true };
-                });
-            }
-            const seq = extractReturnedSeq(await runReturning(p.db, p.flavour, buildAtomicInsert(p)));
-            if (p.sidecar)
-                await p.sidecar(seq, p.db);
-            return { seq, inserted: true };
-        }
-        catch (err) {
-            if (!isRetryableConflict(err))
-                throw err;
-            await new Promise((r) => setTimeout(r, Math.floor(Math.random() * (8 << i))));
-        }
-    }
-    throw new SeqConflictError(await currentHeadSeq(p));
-}
-async function allocatePg(p) {
-    const key = docLockKey(p.row.ownerHandle, p.row.appSlug, p.row.dbName, p.row.docId);
-    return asTxRunner(p.db).transaction(async (tx) => {
-        await tx.execute(sql `SELECT pg_advisory_xact_lock(hashtextextended(${key}, 0))`);
-        await assertHeadSeq(tx, p);
-        if (p.skipIf && (await p.skipIf(tx))) {
-            return { seq: await headSeqWith(tx, p), inserted: false };
-        }
-        const seq = extractReturnedSeq(await runReturning(tx, "pg", buildAtomicInsert(p)));
+export async function allocateAndInsertRevision(p) {
+    const attempt = async (exec) => {
+        await assertHeadSeq(exec, p);
+        if (p.skipIf && (await p.skipIf(exec)))
+            return { seq: await headSeqWith(exec, p), inserted: false };
+        const seq = extractReturnedSeq(await runReturning(exec, p.flavour, buildAtomicInsert(p)));
         if (p.sidecar)
-            await p.sidecar(seq, tx);
+            await p.sidecar(seq, exec);
         return { seq, inserted: true };
+    };
+    return runLockedAllocation({
+        db: p.db,
+        flavour: p.flavour,
+        lockKey: docLockKey(p.row.ownerHandle, p.row.appSlug, p.row.dbName, p.row.docId),
+        needsTxnOnSqlite: p.skipIf !== undefined || p.ifHeadSeq !== undefined,
+        maxAttempts: p.maxAttempts ?? 3,
+        attempt,
+        onSqliteExhausted: async () => {
+            throw new SeqConflictError(await currentHeadSeq(p));
+        },
     });
 }
-export async function allocateAndInsertRevision(p) {
-    return p.flavour === "pg" ? allocatePg(p) : allocateSqlite(p);
-}
 //# sourceMappingURL=seq-allocation.js.map

package/public/seq-allocation.js.map

@@ -1 +1 @@
-{"version":3,"file":"seq-allocation.js","sourceRoot":"","sources":["../../jsr/public/seq-allocation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"seq-allocation.js","sourceRoot":"","sources":["../../jsr/public/seq-allocation.ts"],"names":[],"mappings":"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"}

package/public/sync-eventos.d.ts

@@ -0,0 +1,4 @@
+import { EventoHandler } from "@adviser/cement";
+import { MsgBase, ReqSyncPull, ResSyncPull, ReqSyncPush, ResSyncPush, VibesDiyError, W3CWebSocketEvent } from "@vibes.diy/api-types";
+export declare const syncPullEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqSyncPull>, ResSyncPull | VibesDiyError>;
+export declare const syncPushEvento: EventoHandler<W3CWebSocketEvent, MsgBase<ReqSyncPush>, ResSyncPush | VibesDiyError>;

package/public/sync-eventos.js

@@ -0,0 +1,480 @@
+import { Result, Option, EventoResult } from "@adviser/cement";
+import { reqSyncPull, reqSyncPush, isDirectChannel, } from "@vibes.diy/api-types";
+import { unwrapMsgBase } from "../unwrap-msg-base.js";
+import { optAuth } from "../check-auth.js";
+import { aliasedTable, and, eq, gt, inArray, max, or } from "drizzle-orm";
+import { type } from "arktype";
+import { checkDocAccess } from "./access-helpers.js";
+import { resolveDbAcl } from "./db-acl-resolver.js";
+import { resolveAccessBinding } from "./access-binding-resolver.js";
+import { mintFilesUrls } from "./files-url-mint.js";
+import { readAllowed, connectionAdminMode, clientWsSend } from "./app-documents-shared.js";
+import { normalizeChannels } from "./normalize-channels.js";
+import { audienceChannelsOf, hasInheritChannel, inheritChannelOf, INHERIT_CAPABILITY_CHANNEL } from "./audience-channels.js";
+import { decodeAccessOutputRows } from "./access-output-decoder.js";
+import { hasGrantBearingDescriptor, resolveViewerChannels } from "./viewer-channel-resolver.js";
+import { loadHeadDocs } from "./app-documents-head-query.js";
+import { resolveWriteAclVerdict, resolveWriterContext } from "./write-front-door.js";
+import { runPutAccessGate } from "../intern/put-access-gate.js";
+import { runDeleteAccessGate } from "../intern/delete-access-gate.js";
+import { persistPutRevision } from "./app-documents-put-persist.js";
+import { bestEffortAppendDelete, bestEffortChannelChange, channelSetOfDescriptor, loadDocChannels } from "./sync-feed.js";
+import { allocateAndInsertRevision, SeqConflictError } from "./seq-allocation.js";
+import { emitBackendOnChange } from "../intern/emit-backend-onchange.js";
+import { purgeRootHtmlCacheSameColo } from "../intern/swr-purge.js";
+import { notifyDocChangedFanOut, notifyViewerGrantsChangedFanOut, emitDmWriteEffects, emitCommentPostedEvent, } from "./app-documents-broadcast.js";
+import { notifyViewerGrantDeltaIfChanged } from "./app-documents-grant-delta.js";
+import { computeSyncPull } from "./sync-pull-core.js";
+const BARE_DB_CHANNEL = "*";
+export const syncPullEvento = {
+    hash: "sync-pull",
+    validate: unwrapMsgBase(async (msg) => {
+        const ret = reqSyncPull(msg.payload);
+        if (ret instanceof type.errors)
+            return Result.Ok(Option.None());
+        return Result.Ok(Option.Some({ ...msg, payload: ret }));
+    }),
+    handle: optAuth(async (ctx) => {
+        const req = ctx.validated.payload;
+        const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
+        const afbRow = await resolveAccessBinding(vctx, req.ownerHandle, req.appSlug, req.dbName);
+        const isDm = isDirectChannel(req.ownerHandle);
+        let access = "none";
+        if (!isDm) {
+            const reqAdmin = req.adminMode === true;
+            ({ access } = req._auth
+                ? await checkDocAccess(vctx, req._auth.verifiedAuth.claims.userId, req.appSlug, req.ownerHandle, connectionAdminMode(ctx) || reqAdmin)
+                : { access: "none" });
+            const rAcl = await resolveDbAcl({ vctx, ownerHandle: req.ownerHandle, appSlug: req.appSlug, dbName: req.dbName });
+            if (rAcl.isErr() ||
+                !(await readAllowed({ vctx, acl: rAcl.Ok(), access, appSlug: req.appSlug, ownerHandle: req.ownerHandle }))) {
+                await ctx.send.send(ctx, { type: "vibes.diy.res-error", error: { message: "Access denied" } });
+                return Result.Ok(EventoResult.Continue);
+            }
+        }
+        const feed = await loadFeed(vctx, req, req.cursors);
+        const tOutputs = vctx.sql.tables.accessFnOutputs;
+        const headRowsQuery = loadHeadDocs(vctx, { ownerHandle: req.ownerHandle, appSlug: req.appSlug, dbName: req.dbName });
+        const outputsQuery = afbRow?.accessFnCid
+            ? vctx.sql.db
+                .select({ docId: tOutputs.docId, output: tOutputs.output })
+                .from(tOutputs)
+                .where(and(eq(tOutputs.ownerHandle, req.ownerHandle), eq(tOutputs.appSlug, req.appSlug), eq(tOutputs.dbName, req.dbName)))
+            : Promise.resolve([]);
+        const [headRows, allOutputs] = await Promise.all([headRowsQuery, outputsQuery]);
+        const grantedChannels = [];
+        let liveDocs;
+        let adminOverride = false;
+        if (!afbRow?.accessFnCid) {
+            grantedChannels.push(BARE_DB_CHANNEL);
+            liveDocs = headRows.map((row) => ({
+                docId: row.docId,
+                seq: row.seq,
+                doc: mintDoc(vctx, req, row),
+                channels: [BARE_DB_CHANNEL],
+            }));
+        }
+        else {
+            const decodedOutputs = decodeAccessOutputRows(allOutputs);
+            const { effectiveChannels, publicChannels } = await resolveViewerChannels(vctx, {
+                ownerHandle: req.ownerHandle,
+                appSlug: req.appSlug,
+                userId: req._auth?.verifiedAuth.claims.userId ?? null,
+                isDm,
+                access,
+                decodedOutputs,
+            });
+            const docChannels = new Map();
+            for (const { row, descriptor } of decodedOutputs) {
+                const channels = channelSetOfDescriptor(descriptor);
+                if (channels.length > 0)
+                    docChannels.set(row.docId, channels);
+            }
+            const grantedSet = new Set([...effectiveChannels, ...publicChannels]);
+            grantedChannels.push(...grantedSet);
+            adminOverride = access === "override";
+            liveDocs = (adminOverride ? headRows : headRows.filter((row) => docChannels.has(row.docId))).map((row) => ({
+                docId: row.docId,
+                seq: row.seq,
+                doc: mintDoc(vctx, req, row),
+                channels: docChannels.get(row.docId) ?? [],
+            }));
+        }
+        const result = computeSyncPull({ feed, cursors: req.cursors, grantedChannels, liveDocs, adminOverride });
+        await ctx.send.send(ctx, {
+            type: "vibes.diy.res-sync-pull",
+            status: "ok",
+            mode: result.mode,
+            entries: result.entries,
+            cursors: result.cursors,
+            grantedChannels: result.grantedChannels,
+        });
+        return Result.Ok(EventoResult.Continue);
+    }),
+};
+function mintDoc(vctx, req, row) {
+    const doc = mintFilesUrls(row.data, {
+        ownerHandle: req.ownerHandle,
+        appSlug: req.appSlug,
+        dbName: req.dbName,
+        docId: row.docId,
+        svc: vctx.params.vibes.svc,
+    });
+    return { _id: row.docId, ...doc };
+}
+async function loadFeed(vctx, req, cursors) {
+    const f = vctx.sql.tables.syncFeed;
+    let minCursor = 0;
+    let first = true;
+    for (const raw of Object.values(cursors)) {
+        const v = Number.isFinite(raw) && raw >= 0 ? raw : 0;
+        if (first || v < minCursor)
+            minCursor = v;
+        first = false;
+    }
+    const rows = await vctx.sql.db
+        .select({ syncSeq: f.syncSeq, kind: f.kind, docId: f.docId, seq: f.seq, channel: f.channel })
+        .from(f)
+        .where(and(eq(f.ownerHandle, req.ownerHandle), eq(f.appSlug, req.appSlug), eq(f.dbName, req.dbName), or(gt(f.syncSeq, minCursor), eq(f.kind, "delete"))));
+    return rows.map((r) => ({
+        syncSeq: r.syncSeq,
+        kind: r.kind,
+        docId: r.docId,
+        seq: r.seq,
+        channel: r.channel,
+    }));
+}
+export const syncPushEvento = {
+    hash: "sync-push",
+    validate: unwrapMsgBase(async (msg) => {
+        const ret = reqSyncPush(msg.payload);
+        if (ret instanceof type.errors)
+            return Result.Ok(Option.None());
+        return Result.Ok(Option.Some({ ...msg, payload: ret }));
+    }),
+    handle: optAuth(async (ctx) => {
+        const req = ctx.validated.payload;
+        const vctx = ctx.ctx.getOrThrow("vibesApiCtx");
+        const userId = req._auth?.verifiedAuth.claims.userId ?? null;
+        const isDm = isDirectChannel(req.ownerHandle);
+        const adminRequested = connectionAdminMode(ctx) || req.adminMode === true;
+        const afbRow = await resolveAccessBinding(vctx, req.ownerHandle, req.appSlug, req.dbName);
+        const { aclWriteAllowed, adminActive } = await resolveWriteAclVerdict(vctx, {
+            ownerHandle: req.ownerHandle,
+            appSlug: req.appSlug,
+            dbName: req.dbName,
+            userId,
+            isDm,
+            adminRequested,
+        });
+        if (userId !== null && !isDm && !aclWriteAllowed) {
+            await ctx.send.send(ctx, { type: "vibes.diy.res-sync-push", status: "ok", accepted: [] });
+            return Result.Ok(EventoResult.Continue);
+        }
+        const { userContext } = await resolveWriterContext(vctx, { userId, isDm, ownerHandle: req.ownerHandle });
+        const accepted = [];
+        const senderConnId = clientWsSend(ctx).connId;
+        const email = req._auth?.verifiedAuth.claims.params.email;
+        const putDocIds = req.writes.filter((w) => !w.deleted).map((w) => w.docId);
+        const headByDoc = afbRow?.accessFnCid ? await currentHeads(vctx, req, putDocIds) : new Map();
+        for (const w of req.writes) {
+            if (w.deleted) {
+                if (!userId)
+                    continue;
+                const delGate = await runDeleteAccessGate(vctx, {
+                    ownerHandle: req.ownerHandle,
+                    appSlug: req.appSlug,
+                    dbName: req.dbName,
+                    docId: w.docId,
+                    userId,
+                    adminMode: adminRequested,
+                });
+                if (delGate.kind === "deny")
+                    continue;
+                const tombstoned = await tryTombstone(vctx, req, w.docId, userId);
+                if (!tombstoned)
+                    continue;
+                accepted.push({ docId: tombstoned.docId, seq: tombstoned.seq, syncSeq: tombstoned.syncSeq });
+                await runPushDeleteEffects(vctx, {
+                    ownerHandle: req.ownerHandle,
+                    appSlug: req.appSlug,
+                    dbName: req.dbName,
+                    docId: w.docId,
+                    seq: tombstoned.seq,
+                    channels: tombstoned.channels,
+                    deletedDocHadGrants: tombstoned.deletedDocHadGrants,
+                    writerUserId: userId,
+                    senderConnId,
+                });
+                continue;
+            }
+            let descriptor;
+            let grantsReduceBefore;
+            if (afbRow?.accessFnCid) {
+                if (!vctx.invokeAccessFn)
+                    continue;
+                const gate = await runPutAccessGate(vctx, {
+                    ownerHandle: req.ownerHandle,
+                    appSlug: req.appSlug,
+                    dbName: req.dbName,
+                    fnCid: afbRow.accessFnCid,
+                    accessFnAssetUri: afbRow.accessFnAssetUri,
+                    accessFnDbName: afbRow.dbName,
+                    docId: w.docId,
+                    doc: w.doc,
+                    oldDoc: headByDoc.get(w.docId) ?? null,
+                    userContext,
+                    adminMode: adminActive,
+                });
+                if (gate.kind === "deny")
+                    continue;
+                descriptor = gate.descriptor;
+                grantsReduceBefore = gate.grantsReduceBefore;
+            }
+            else if (!userId) {
+                continue;
+            }
+            const persisted = await tryPersist(vctx, req, w, userId, descriptor, afbRow?.accessFnCid);
+            if (!persisted)
+                continue;
+            accepted.push(persisted);
+            await runPushPutEffects(vctx, {
+                ownerHandle: req.ownerHandle,
+                appSlug: req.appSlug,
+                dbName: req.dbName,
+                docId: w.docId,
+                seq: persisted.seq,
+                doc: w.doc,
+                userId,
+                email,
+                descriptor,
+                grantsReduceBefore,
+                senderConnId,
+            });
+        }
+        await ctx.send.send(ctx, { type: "vibes.diy.res-sync-push", status: "ok", accepted });
+        return Result.Ok(EventoResult.Continue);
+    }),
+};
+async function currentHeads(vctx, req, docIds) {
+    if (docIds.length === 0)
+        return new Map();
+    const t = vctx.sql.tables.appDocuments;
+    const t2 = aliasedTable(t, "headdata");
+    const rows = await vctx.sql.db
+        .select({ docId: t.docId, data: t.data })
+        .from(t)
+        .where(and(eq(t.ownerHandle, req.ownerHandle), eq(t.appSlug, req.appSlug), eq(t.dbName, req.dbName), inArray(t.docId, [...docIds]), eq(t.seq, vctx.sql.db
+        .select({ m: max(t2.seq) })
+        .from(t2)
+        .where(and(eq(t2.ownerHandle, req.ownerHandle), eq(t2.appSlug, req.appSlug), eq(t2.dbName, req.dbName), eq(t2.docId, t.docId))))));
+    return new Map(rows.map((r) => [r.docId, r.data]));
+}
+async function tryPersist(vctx, req, w, userId, descriptor, accessFnCid) {
+    const now = new Date().toISOString();
+    const oldChannels = accessFnCid ? await loadDocChannels(vctx, { ...req, docId: w.docId }) : [];
+    let seq;
+    try {
+        const persisted = await persistPutRevision(vctx, {
+            ownerHandle: req.ownerHandle,
+            appSlug: req.appSlug,
+            dbName: req.dbName,
+            docId: w.docId,
+            doc: w.doc,
+            userId,
+            now,
+            accessResult: descriptor,
+            accessFnCid,
+            mightNoop: false,
+            baseSeq: w.baseSeq,
+        });
+        if (!persisted.alloc.inserted)
+            return undefined;
+        if (persisted.grantUpsertErr) {
+            console.warn("sync push: AccessFnOutputs upsert failed, dropping write (client retries):", persisted.grantUpsertErr);
+            return undefined;
+        }
+        seq = persisted.alloc.seq;
+    }
+    catch (err) {
+        if (err instanceof SeqConflictError)
+            return undefined;
+        throw err;
+    }
+    const syncSeq = await bestEffortChannelChange({
+        db: vctx.sql.db,
+        flavour: vctx.sql.flavour,
+        ownerHandle: req.ownerHandle,
+        appSlug: req.appSlug,
+        dbName: req.dbName,
+        docId: w.docId,
+        seq,
+        oldChannels,
+        newChannels: channelSetOfDescriptor(descriptor),
+        alwaysPut: true,
+        created: now,
+    });
+    if (syncSeq === undefined)
+        return undefined;
+    return { docId: w.docId, seq, syncSeq };
+}
+async function runPushPutEffects(vctx, p) {
+    const now = new Date().toISOString();
+    await emitBackendOnChange(vctx, {
+        ownerHandle: p.ownerHandle,
+        appSlug: p.appSlug,
+        dbName: p.dbName,
+        docId: p.docId,
+        seq: p.seq,
+        deleted: false,
+        doc: p.doc,
+        originDepth: 0,
+        writerUserId: p.userId,
+    });
+    await emitDmWriteEffects(vctx, {
+        ownerHandle: p.ownerHandle,
+        docId: p.docId,
+        userId: p.userId,
+        nextSeq: p.seq,
+        now,
+        doc: p.doc,
+    });
+    await emitCommentPostedEvent(vctx, {
+        ownerHandle: p.ownerHandle,
+        appSlug: p.appSlug,
+        dbName: p.dbName,
+        docId: p.docId,
+        userId: p.userId,
+        email: p.email,
+        nextSeq: p.seq,
+        now,
+    });
+    const channels = [
+        ...normalizeChannels(p.descriptor?.channels ?? []),
+        ...(p.descriptor === undefined ? [] : audienceChannelsOf(p.descriptor)),
+        ...(p.descriptor === undefined ? [] : inheritChannelOf(p.descriptor)),
+    ];
+    if (hasInheritChannel(channels))
+        channels.push(INHERIT_CAPABILITY_CHANNEL);
+    notifyDocChangedFanOut(vctx, {
+        ownerHandle: p.ownerHandle,
+        appSlug: p.appSlug,
+        dbName: p.dbName,
+        docId: p.docId,
+        channels,
+        senderConnId: p.senderConnId,
+    });
+    if (p.descriptor && p.grantsReduceBefore) {
+        const outputHasGrants = hasGrantBearingDescriptor(p.descriptor) ? 1 : 0;
+        notifyViewerGrantDeltaIfChanged(vctx, {
+            ownerHandle: p.ownerHandle,
+            appSlug: p.appSlug,
+            docId: p.docId,
+            descriptor: p.descriptor,
+            outputHasGrants,
+            grantsReduceBefore: p.grantsReduceBefore,
+            senderConnId: p.senderConnId,
+        });
+    }
+}
+async function runPushDeleteEffects(vctx, p) {
+    await emitBackendOnChange(vctx, {
+        ownerHandle: p.ownerHandle,
+        appSlug: p.appSlug,
+        dbName: p.dbName,
+        docId: p.docId,
+        seq: p.seq,
+        deleted: true,
+        doc: {},
+        originDepth: 0,
+        writerUserId: p.writerUserId,
+    });
+    notifyDocChangedFanOut(vctx, {
+        ownerHandle: p.ownerHandle,
+        appSlug: p.appSlug,
+        dbName: p.dbName,
+        docId: p.docId,
+        channels: p.channels,
+        senderConnId: p.senderConnId,
+    });
+    if (p.deletedDocHadGrants) {
+        notifyViewerGrantsChangedFanOut(vctx, {
+            ownerHandle: p.ownerHandle,
+            appSlug: p.appSlug,
+            senderConnId: p.senderConnId,
+        });
+    }
+    purgeRootHtmlCacheSameColo(vctx, p.ownerHandle, p.appSlug);
+}
+async function tryTombstone(vctx, req, docId, userId) {
+    const now = new Date().toISOString();
+    const t = vctx.sql.tables.appDocuments;
+    const tOutputs = vctx.sql.tables.accessFnOutputs;
+    let seq;
+    let channels = [];
+    let deletedDocHadGrants = false;
+    try {
+        const alloc = await allocateAndInsertRevision({
+            db: vctx.sql.db,
+            flavour: vctx.sql.flavour,
+            table: t,
+            row: {
+                ownerHandle: req.ownerHandle,
+                appSlug: req.appSlug,
+                dbName: req.dbName,
+                docId,
+                userId,
+                data: {},
+                deleted: 1,
+                created: now,
+            },
+            sidecar: async (_seq, exec) => {
+                const outRow = await exec
+                    .select({ output: tOutputs.output, hasGrants: tOutputs.hasGrants })
+                    .from(tOutputs)
+                    .where(and(eq(tOutputs.ownerHandle, req.ownerHandle), eq(tOutputs.appSlug, req.appSlug), eq(tOutputs.dbName, req.dbName), eq(tOutputs.docId, docId)))
+                    .limit(1)
+                    .then((r) => r[0]);
+                if (outRow) {
+                    deletedDocHadGrants = outRow.hasGrants === 1;
+                    if (outRow.output) {
+                        try {
+                            const parsed = JSON.parse(outRow.output);
+                            channels = channelSetOfDescriptor(parsed);
+                            if (hasInheritChannel(channels))
+                                channels.push(INHERIT_CAPABILITY_CHANNEL);
+                        }
+                        catch (e) {
+                            console.error("push delete stored-channels parse error:", e);
+                        }
+                    }
+                }
+                await exec
+                    .delete(tOutputs)
+                    .where(and(eq(tOutputs.ownerHandle, req.ownerHandle), eq(tOutputs.appSlug, req.appSlug), eq(tOutputs.dbName, req.dbName), eq(tOutputs.docId, docId)));
+            },
+        });
+        if (!alloc.inserted)
+            return undefined;
+        seq = alloc.seq;
+    }
+    catch (err) {
+        if (err instanceof SeqConflictError)
+            return undefined;
+        throw err;
+    }
+    const syncSeq = await bestEffortAppendDelete({
+        db: vctx.sql.db,
+        flavour: vctx.sql.flavour,
+        ownerHandle: req.ownerHandle,
+        appSlug: req.appSlug,
+        dbName: req.dbName,
+        docId,
+        seq,
+        created: now,
+    });
+    if (syncSeq === undefined)
+        return undefined;
+    return { docId, seq, syncSeq, channels, deletedDocHadGrants };
+}
+//# sourceMappingURL=sync-eventos.js.map