@supersuit/artifacts 0.33.1 → 0.35.0

package/lib/routes/state-routes.js

@@ -18,6 +18,8 @@ import { isPublisherAuthed } from '../artifacts/auth.js';
 import { ARTIFACT_ID_RE } from './ids.js';
 import { GRANT_COOKIE, decide, firstName, signInUrl, verifyGrant } from '../artifacts/reader.js';
 import { isUnlocked, unlockCookieName } from '../artifacts/unlock.js';
+import { ridCookieName, usableSecret } from '../artifacts/recipients.js';
+import { perReaderGate } from './per-reader.js';
 import { ANON_WRITES_PER_MINUTE, MAX_ENTRIES_PER_SLOT, checkValue, effectiveWriters, slotVisibility } from '../artifacts/state.js';
 import { COMMENTS_SLOT, MAX_COMMENT_NAME_CHARS, cleanResolveNote, resolutionOf, validateComment } from '../artifacts/comments.js';
 import { isCommentAudioPath } from '../artifacts/audio.js';
@@ -83,9 +85,19 @@ export function createStateRoutes(ctx) {
             if (!(await ctx.readers.acknowledged(id, reader.email)))
                 return { error: json({ error: 'accept the agreement first' }, 403) };
         }
+        // A per-reader page is answered through the link it was sent with: the rid cookie names the
+        // reader, and what they write is theirs under that key. A revoked or expired rid is shut.
+        let recipient = null;
+        // The owner and the page's admins open it without a link: their comment layer is signed-in, never a reader's.
+        if (a.links === 'per-reader' && !isOwner(reader)) {
+            const g = await perReaderGate({ id, param: undefined, cookie: req.cookies.get(ridCookieName(id))?.value, secret: usableSecret(ctx.recipientSecret?.()), recipients: ctx.recipients });
+            if (g.state === 'shut')
+                return { error: json({ error: 'this page is locked' }, 403) };
+            recipient = { rid: g.rid, label: g.label };
+        }
         const rawAnon = req.cookies.get(ANON_COOKIE)?.value;
         const anonId = rawAnon && ANON_ID.test(rawAnon) ? rawAnon : null;
-        return { a, reader, anonId, signIn };
+        return { a, reader, anonId, signIn, recipient };
     }
     const ownerEmail = ctx.ownerEmail?.trim().toLowerCase();
     const admins = new Set((ctx.admins ?? []).map((e) => e.trim().toLowerCase()));
@@ -107,11 +119,19 @@ export function createStateRoutes(ctx) {
         }
         return rows;
     }
-    async function viewBody(a, reader, readerKey) {
+    async function viewBody(a, reader, readerKey, canWriteAs = false) {
         const allow = reader && ctx.readers && a.access ? await ctx.readers.allowList(a.id) : [];
         const entries = await ctx.state.entries(a.id);
         const slots = stateView(a.state, entries, readerKey);
-        const owner = isOwner(reader);
+        // A reader who came through their own link sees only their own answers: whatever the page's
+        // settings say, nothing of another reader's is shared with them.
+        if (canWriteAs)
+            for (const v of Object.values(slots)) {
+                v.visibility = 'private';
+                delete v.shared;
+                delete v.tally;
+            }
+        const owner = !canWriteAs && isOwner(reader);
         // The owner reads every comment with its writer's full name, whatever the page shows readers.
         if (owner && commentsOn(a)) {
             slots[COMMENTS_SLOT].shared = entries.filter((e) => e.slot === COMMENTS_SLOT)
@@ -125,15 +145,15 @@ export function createStateRoutes(ctx) {
         }
         return {
             reader: reader ? { firstName: firstName(reader, allow) } : null,
-            canWrite: !!reader || effectiveWriters(a.state, a.access) === 'anyone',
+            canWrite: !!reader || canWriteAs || effectiveWriters(a.state, a.access) === 'anyone',
             ...(owner ? { owner: true } : {}),
             slots,
         };
     }
     /** The comments a writer can see, by id: every one on a readers-visible page, else their own,
      *  and every one for the owner. A reply may name only a comment its writer was shown. */
-    async function visibleComments(a, writerKey, reader) {
-        const all = slotVisibility(a.state, COMMENTS_SLOT) === 'shared' || isOwner(reader);
+    async function visibleComments(a, writerKey, reader, perReader = false) {
+        const all = !perReader && (slotVisibility(a.state, COMMENTS_SLOT) === 'shared' || isOwner(reader));
         const byId = new Map();
         for (const e of await ctx.state.entries(a.id))
             if (e.slot === COMMENTS_SLOT && (all || e.readerKey === writerKey))
@@ -150,14 +170,14 @@ export function createStateRoutes(ctx) {
         const o = await open(req, id);
         if ('error' in o)
             return o.error;
-        const { a, reader, anonId, signIn } = o;
+        const { a, reader, anonId, signIn, recipient } = o;
         let clearAnon = false;
-        if (reader && anonId) {
+        if (reader && anonId && !recipient) {
             await ctx.state.moveReader(readerKeyFor.anonymous(anonId), writerFor(reader));
             clearAnon = true;
         }
-        const key = reader ? readerKeyFor.signedIn(reader.uid) : anonId ? readerKeyFor.anonymous(anonId) : null;
-        const res = json({ ...(await viewBody(a, reader, key)), ...(reader ? {} : { signIn }) });
+        const key = recipient ? readerKeyFor.recipient(recipient.rid) : reader ? readerKeyFor.signedIn(reader.uid) : anonId ? readerKeyFor.anonymous(anonId) : null;
+        const res = json({ ...(await viewBody(a, reader, key, !!recipient)), ...(reader || recipient ? {} : { signIn }) });
         if (clearAnon)
             res.headers.append('set-cookie', anonCookie('', 0));
         return res;
@@ -192,7 +212,7 @@ export function createStateRoutes(ctx) {
         const o = await open(req, id);
         if ('error' in o)
             return o.error;
-        const { a, reader, signIn } = o;
+        const { a, reader, signIn, recipient } = o;
         let { anonId } = o;
         const slot = typeof b.slot === 'string' ? b.slot : '';
         // Object.hasOwn, never a bracket read: `slots['__proto__']` or `slots['constructor']`
@@ -215,7 +235,9 @@ export function createStateRoutes(ctx) {
         const isComments = slot === COMMENTS_SLOT && commentsOn(a);
         let setCookie = null;
         let writer;
-        if (reader)
+        if (recipient)
+            writer = { key: readerKeyFor.recipient(recipient.rid), name: recipient.label, anonymous: true };
+        else if (reader)
             writer = writerFor(reader);
         else {
             if (effectiveWriters(a.state, a.access, slot) !== 'anyone')
@@ -258,7 +280,7 @@ export function createStateRoutes(ctx) {
                 return json({ error: bad }, 400);
             let value = b.value;
             if (isComments) {
-                const seen = await visibleComments(a, writer.key, reader);
+                const seen = await visibleComments(a, writer.key, reader, !!recipient);
                 const c = validateComment(b.value, (cid) => seen.get(cid) ?? null);
                 if (!c.ok)
                     return json({ error: c.error }, 400);
@@ -279,7 +301,7 @@ export function createStateRoutes(ctx) {
                 const r = await ctx.state.replace({ artifactId: id, slot, readerKey: writer.key, entryId: entryId, value });
                 if (!r)
                     return json({ error: 'no answer of yours with that id' }, 404);
-                const res = json(await viewBody(a, reader, writer.key));
+                const res = json(await viewBody(a, reader, writer.key, !!recipient));
                 if (setCookie)
                     res.headers.append('set-cookie', setCookie);
                 return res;
@@ -299,7 +321,7 @@ export function createStateRoutes(ctx) {
             if ('full' in r)
                 return json({ error: 'you have left the most answers this page takes here' }, 409);
         }
-        const res = json(await viewBody(a, reader, writer.key));
+        const res = json(await viewBody(a, reader, writer.key, !!recipient));
         if (setCookie)
             res.headers.append('set-cookie', setCookie);
         return res;
@@ -396,6 +418,7 @@ export function createStateRoutes(ctx) {
     async function RESOLVE(req, { params }) {
         const publisher = isPublisherAuthed(req, ctx);
         let by = 'the publisher';
+        let actorEmail;
         if (!publisher) {
             const reader = verifyGrant(ctx.readerSecret(), req.cookies.get(GRANT_COOKIE)?.value);
             if (!reader)
@@ -409,6 +432,7 @@ export function createStateRoutes(ctx) {
             if (!/^application\/json\b/i.test(req.headers.get('content-type') ?? ''))
                 return json({ error: 'send JSON' }, 415);
             by = reader.name?.trim().split(/\s+/)[0] || 'the owner';
+            actorEmail = reader.email;
         }
         const raw = await req.text();
         if (Buffer.byteLength(raw, 'utf8') > 4096)
@@ -461,6 +485,19 @@ export function createStateRoutes(ctx) {
         const r = await ctx.state.setResolved({ artifactId: id, slot: COMMENTS_SLOT, entryId: root.id, resolved: resolution });
         if (!r)
             return json({ error: 'no comment with that id on this page' }, 404);
+        if (ctx.onResolve) {
+            const thread = [r, ...[...all.values()].filter((e) => e.value.parent === root.id)
+                    .sort((x, y) => x.at.localeCompare(y.at) || x.id.localeCompare(y.id))];
+            try {
+                await ctx.onResolve({
+                    artifactId: id, title: a.title, url: ctx.pageUrl(id), thread: { id: root.id, entries: thread }, resolution,
+                    actor: { publisher, ...(actorEmail ? { email: actorEmail } : {}) }, at: resolution?.at ?? new Date().toISOString(),
+                });
+            }
+            catch (err) {
+                console.error('onResolve failed', err);
+            }
+        }
         return json({ id, entry: root.id, resolved: resolution });
     }
     return { STATE_GET, STATE_POST, RESPONSES, COMMENTS_FEED, RESOLVE };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supersuit/artifacts",
-  "version": "0.33.1",
+  "version": "0.35.0",
   "description": "Publish markdown as branded, read-aloud pages from a Next.js app: the artifacts store, the route factory, the read-along reader, brand packs, password and confidential pages, and share cards.",
   "license": "MIT",
   "type": "module",