@atproto/bsky 0.0.273 → 0.0.274

package/dist/data-plane/server/op-thread.d.ts

@@ -0,0 +1,7 @@
+export type OpThreadReply = {
+    uri: string;
+    parentUri: string;
+    deletedAt: string | null;
+};
+export declare const resolveCanonicalOpThread: (rootUri: string, opReplies: OpThreadReply[]) => string[] | undefined;
+//# sourceMappingURL=op-thread.d.ts.map

package/dist/data-plane/server/op-thread.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"op-thread.d.ts","sourceRoot":"","sources":["../../../src/data-plane/server/op-thread.ts"],"names":[],"mappings":"AAGA,MAAM,MAAM,aAAa,GAAG;IAC1B,GAAG,EAAE,MAAM,CAAA;IACX,SAAS,EAAE,MAAM,CAAA;IACjB,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CACzB,CAAA;AAMD,eAAO,MAAM,wBAAwB,YAC1B,MAAM,aACJ,aAAa,EAAE,KACzB,MAAM,EAAE,GAAG,SAwDb,CAAA"}

package/dist/data-plane/server/op-thread.js

@@ -0,0 +1,71 @@
+import { TID } from '@atproto/common';
+import { AtUri } from '@atproto/syntax';
+// Resolves the oldest contiguous line of OP replies from a thread root.
+// A deleted reply keeps its place while replies below it survive. Once
+// nothing survives below it, only a reply written after the deletion may
+// claim the vacated slot.
+export const resolveCanonicalOpThread = (rootUri, opReplies) => {
+    const repliesByParent = new Map();
+    const deletedAtByUri = new Map();
+    for (const reply of opReplies) {
+        const siblings = repliesByParent.get(reply.parentUri) ?? [];
+        siblings.push(reply.uri);
+        repliesByParent.set(reply.parentUri, siblings);
+        if (reply.deletedAt !== null) {
+            deletedAtByUri.set(reply.uri, new Date(reply.deletedAt).getTime());
+        }
+    }
+    // Sort replies (TID enables this) for each parent so we can
+    // deterministically pick the oldest reply.
+    for (const replies of repliesByParent.values()) {
+        replies.sort();
+    }
+    // Track the current path so malformed denormalized rows cannot introduce a
+    // cycle into the result.
+    const visited = new Set([rootUri]);
+    let validOpThread = true;
+    const resolve = (parentUri) => {
+        let vacatedAt = 0;
+        for (const reply of repliesByParent.get(parentUri) ?? []) {
+            if (visited.has(reply)) {
+                validOpThread = false;
+                return [];
+            }
+            if (vacatedAt !== 0 && !isOpReplyNewerThanTimestamp(reply, vacatedAt)) {
+                continue;
+            }
+            visited.add(reply);
+            const below = resolve(reply);
+            if (!validOpThread) {
+                return [];
+            }
+            const deletedAt = deletedAtByUri.get(reply);
+            if (deletedAt === undefined || below.length > 0) {
+                return [reply, ...below];
+            }
+            visited.delete(reply);
+            if (deletedAt > vacatedAt) {
+                vacatedAt = deletedAt;
+            }
+        }
+        return [];
+    };
+    const opThread = [rootUri, ...resolve(rootUri)];
+    // A chain of one is just the root; only threads with OP replies count.
+    return validOpThread && opThread.length > 1 ? opThread : undefined;
+};
+// isOpReplyNewerThanTimestamp reports whether the post's rkey places its creation after ts.
+// The rkey is a TID, so this is the post's own claimed creation time rather
+// than when we observed it. An unparseable rkey is treated as not newer, which
+// keeps a malformed reply from claiming a vacated slot.
+const isOpReplyNewerThanTimestamp = (uri, ts) => {
+    try {
+        const tid = TID.fromStr(new AtUri(uri).rkey);
+        // TID timestamps are in microseconds.
+        return tid.timestamp() / 1000 > ts;
+    }
+    catch {
+        return false;
+    }
+};
+//# sourceMappingURL=op-thread.js.map

package/dist/data-plane/server/op-thread.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"op-thread.js","sourceRoot":"","sources":["../../../src/data-plane/server/op-thread.ts"],"names":[],"mappings":"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","sourcesContent":["import { TID } from '@atproto/common'\nimport { AtUri } from '@atproto/syntax'\n\nexport type OpThreadReply = {\n  uri: string\n  parentUri: string\n  deletedAt: string | null\n}\n\n// Resolves the oldest contiguous line of OP replies from a thread root.\n// A deleted reply keeps its place while replies below it survive. Once\n// nothing survives below it, only a reply written after the deletion may\n// claim the vacated slot.\nexport const resolveCanonicalOpThread = (\n  rootUri: string,\n  opReplies: OpThreadReply[],\n): string[] | undefined => {\n  const repliesByParent = new Map<string, string[]>()\n  const deletedAtByUri = new Map<string, number>()\n  for (const reply of opReplies) {\n    const siblings = repliesByParent.get(reply.parentUri) ?? []\n    siblings.push(reply.uri)\n    repliesByParent.set(reply.parentUri, siblings)\n    if (reply.deletedAt !== null) {\n      deletedAtByUri.set(reply.uri, new Date(reply.deletedAt).getTime())\n    }\n  }\n\n  // Sort replies (TID enables this) for each parent so we can\n  // deterministically pick the oldest reply.\n  for (const replies of repliesByParent.values()) {\n    replies.sort()\n  }\n\n  // Track the current path so malformed denormalized rows cannot introduce a\n  // cycle into the result.\n  const visited = new Set([rootUri])\n  let validOpThread = true\n  const resolve = (parentUri: string): string[] => {\n    let vacatedAt = 0\n    for (const reply of repliesByParent.get(parentUri) ?? []) {\n      if (visited.has(reply)) {\n        validOpThread = false\n        return []\n      }\n\n      if (vacatedAt !== 0 && !isOpReplyNewerThanTimestamp(reply, vacatedAt)) {\n        continue\n      }\n\n      visited.add(reply)\n\n      const below = resolve(reply)\n      if (!validOpThread) {\n        return []\n      }\n      const deletedAt = deletedAtByUri.get(reply)\n      if (deletedAt === undefined || below.length > 0) {\n        return [reply, ...below]\n      }\n\n      visited.delete(reply)\n      if (deletedAt > vacatedAt) {\n        vacatedAt = deletedAt\n      }\n    }\n    return []\n  }\n\n  const opThread = [rootUri, ...resolve(rootUri)]\n  // A chain of one is just the root; only threads with OP replies count.\n  return validOpThread && opThread.length > 1 ? opThread : undefined\n}\n\n// isOpReplyNewerThanTimestamp reports whether the post's rkey places its creation after ts.\n// The rkey is a TID, so this is the post's own claimed creation time rather\n// than when we observed it. An unparseable rkey is treated as not newer, which\n// keeps a malformed reply from claiming a vacated slot.\nconst isOpReplyNewerThanTimestamp = (uri: string, ts: number): boolean => {\n  try {\n    const tid = TID.fromStr(new AtUri(uri).rkey)\n    // TID timestamps are in microseconds.\n    return tid.timestamp() / 1000 > ts\n  } catch {\n    return false\n  }\n}\n"]}

package/dist/data-plane/server/routes/activity-subscription.js

@@ -55,11 +55,11 @@ export default (db) => ({
             cursor,
             limit,
         });
-        const res = await builder.execute();
-        const dids = res.map(({ subjectDid }) => subjectDid);
+        const page = key.page(await builder.execute(), limit);
+        const dids = page.items.map(({ subjectDid }) => subjectDid);
         return {
             dids,
-            cursor: key.packFromResult(res),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/activity-subscription.js.map

@@ -1 +1 @@
-{"version":3,"file":"activity-subscription.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/activity-subscription.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PlainMessage } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport { keyBy } from '@atproto/common'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport {\n  type ActivitySubscription,\n  GetActivitySubscriptionsByActorAndSubjectsResponse,\n} from '../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../stash.js'\nimport type { Database } from '../db/index.js'\nimport { StashKeyKey } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActivitySubscriptionsByActorAndSubjects(req) {\n    const { actorDid, subjectDids } = req\n    if (subjectDids.length === 0) {\n      return new GetActivitySubscriptionsByActorAndSubjectsResponse({\n        subscriptions: [],\n      })\n    }\n\n    const res = await db.db\n      .selectFrom('activity_subscription')\n      .selectAll()\n      .where('creator', '=', actorDid)\n      .where('subjectDid', 'in', subjectDids)\n      .execute()\n\n    const bySubject = keyBy(res, 'subjectDid')\n    const subscriptions = subjectDids.map(\n      (did): PlainMessage<ActivitySubscription> => {\n        const subject = bySubject.get(did)\n        if (!subject) {\n          return {\n            actorDid,\n            namespace:\n              Namespaces.AppBskyNotificationDefsSubjectActivitySubscription\n                .$type,\n            key: '',\n            post: undefined,\n            reply: undefined,\n            subjectDid: '',\n          }\n        }\n\n        return {\n          actorDid,\n          namespace:\n            Namespaces.AppBskyNotificationDefsSubjectActivitySubscription.$type,\n          key: subject.key,\n          post: subject.post ? {} : undefined,\n          reply: subject.reply ? {} : undefined,\n          subjectDid: subject.subjectDid,\n        }\n      },\n    )\n\n    return {\n      subscriptions,\n    }\n  },\n\n  async getActivitySubscriptionDids(req) {\n    const { actorDid, cursor, limit } = req\n\n    let builder = db.db\n      .selectFrom('activity_subscription')\n      .selectAll()\n      .where('creator', '=', actorDid)\n\n    const { ref } = db.db.dynamic\n    const key = new StashKeyKey(ref('activity_subscription.key'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n    const res = await builder.execute()\n    const dids = res.map(({ subjectDid }) => subjectDid)\n    return {\n      dids,\n      cursor: key.packFromResult(res),\n    }\n  },\n})\n"]}
+{"version":3,"file":"activity-subscription.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/activity-subscription.ts"],"names":[],"mappings":"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","sourcesContent":["import type { PlainMessage } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport { keyBy } from '@atproto/common'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport {\n  type ActivitySubscription,\n  GetActivitySubscriptionsByActorAndSubjectsResponse,\n} from '../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../stash.js'\nimport type { Database } from '../db/index.js'\nimport { StashKeyKey } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActivitySubscriptionsByActorAndSubjects(req) {\n    const { actorDid, subjectDids } = req\n    if (subjectDids.length === 0) {\n      return new GetActivitySubscriptionsByActorAndSubjectsResponse({\n        subscriptions: [],\n      })\n    }\n\n    const res = await db.db\n      .selectFrom('activity_subscription')\n      .selectAll()\n      .where('creator', '=', actorDid)\n      .where('subjectDid', 'in', subjectDids)\n      .execute()\n\n    const bySubject = keyBy(res, 'subjectDid')\n    const subscriptions = subjectDids.map(\n      (did): PlainMessage<ActivitySubscription> => {\n        const subject = bySubject.get(did)\n        if (!subject) {\n          return {\n            actorDid,\n            namespace:\n              Namespaces.AppBskyNotificationDefsSubjectActivitySubscription\n                .$type,\n            key: '',\n            post: undefined,\n            reply: undefined,\n            subjectDid: '',\n          }\n        }\n\n        return {\n          actorDid,\n          namespace:\n            Namespaces.AppBskyNotificationDefsSubjectActivitySubscription.$type,\n          key: subject.key,\n          post: subject.post ? {} : undefined,\n          reply: subject.reply ? {} : undefined,\n          subjectDid: subject.subjectDid,\n        }\n      },\n    )\n\n    return {\n      subscriptions,\n    }\n  },\n\n  async getActivitySubscriptionDids(req) {\n    const { actorDid, cursor, limit } = req\n\n    let builder = db.db\n      .selectFrom('activity_subscription')\n      .selectAll()\n      .where('creator', '=', actorDid)\n\n    const { ref } = db.db.dynamic\n    const key = new StashKeyKey(ref('activity_subscription.key'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n    const page = key.page(await builder.execute(), limit)\n    const dids = page.items.map(({ subjectDid }) => subjectDid)\n    return {\n      dids,\n      cursor: page.cursor,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/blocks.js

@@ -34,10 +34,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const blocks = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            blockUris: blocks.map((b) => b.uri),
-            cursor: keyset.packFromResult(blocks),
+            blockUris: page.items.map((b) => b.uri),
+            cursor: page.cursor,
         };
     },
     async getBidirectionalBlockViaList(req) {
@@ -92,10 +92,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const lists = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            listUris: lists.map((l) => l.uri),
-            cursor: keyset.packFromResult(lists),
+            listUris: page.items.map((l) => l.uri),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/blocks.js.map

@@ -1 +1 @@
-{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/blocks.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getBidirectionalBlock(req) {\n    const { actorDid, targetDid } = req\n    const res = await db.db\n      .selectFrom('actor_block')\n      .where((eb) =>\n        eb.or([\n          eb.and([\n            eb('actor_block.creator', '=', actorDid),\n            eb('actor_block.subjectDid', '=', targetDid),\n          ]),\n          eb.and([\n            eb('actor_block.creator', '=', targetDid),\n            eb('actor_block.subjectDid', '=', actorDid),\n          ]),\n        ]),\n      )\n      .limit(1)\n      .selectAll()\n      .executeTakeFirst()\n\n    return {\n      blockUri: res?.uri,\n    }\n  },\n\n  async getBlocks(req) {\n    const { actorDid, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('actor_block')\n      .where('actor_block.creator', '=', actorDid)\n      .selectAll()\n\n    const keyset = new TimeCidKeyset(\n      ref('actor_block.sortAt'),\n      ref('actor_block.cid'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const blocks = await builder.execute()\n    return {\n      blockUris: blocks.map((b) => b.uri),\n      cursor: keyset.packFromResult(blocks),\n    }\n  },\n\n  async getBidirectionalBlockViaList(req) {\n    const { actorDid, targetDid } = req\n    const res = await db.db\n      .selectFrom('list_block')\n      .innerJoin('list_item', 'list_item.listUri', 'list_block.subjectUri')\n      .where((eb) =>\n        eb.or([\n          eb.and([\n            eb('list_block.creator', '=', actorDid),\n            eb('list_item.subjectDid', '=', targetDid),\n          ]),\n          eb.and([\n            eb('list_block.creator', '=', targetDid),\n            eb('list_item.subjectDid', '=', actorDid),\n          ]),\n        ]),\n      )\n      .limit(1)\n      .selectAll('list_block')\n      .executeTakeFirst()\n\n    return {\n      listUri: res?.subjectUri,\n    }\n  },\n\n  async getBlocklistSubscription(req) {\n    const { actorDid, listUri } = req\n    const res = await db.db\n      .selectFrom('list_block')\n      .where('creator', '=', actorDid)\n      .where('subjectUri', '=', listUri)\n      .selectAll()\n      .limit(1)\n      .executeTakeFirst()\n    return {\n      listblockUri: res?.uri,\n    }\n  },\n\n  async getBlocklistSubscriptions(req) {\n    const { actorDid, limit, cursor } = req\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('list')\n      .where(({ exists }) =>\n        exists(\n          db.db\n            .selectFrom('list_block')\n            .where('list_block.creator', '=', actorDid)\n            .whereRef('list_block.subjectUri', '=', ref('list.uri'))\n            .selectAll(),\n        ),\n      )\n      .selectAll('list')\n\n    const keyset = new TimeCidKeyset(ref('list.createdAt'), ref('list.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n    const lists = await builder.execute()\n\n    return {\n      listUris: lists.map((l) => l.uri),\n      cursor: keyset.packFromResult(lists),\n    }\n  },\n})\n"]}
+{"version":3,"file":"blocks.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/blocks.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getBidirectionalBlock(req) {\n    const { actorDid, targetDid } = req\n    const res = await db.db\n      .selectFrom('actor_block')\n      .where((eb) =>\n        eb.or([\n          eb.and([\n            eb('actor_block.creator', '=', actorDid),\n            eb('actor_block.subjectDid', '=', targetDid),\n          ]),\n          eb.and([\n            eb('actor_block.creator', '=', targetDid),\n            eb('actor_block.subjectDid', '=', actorDid),\n          ]),\n        ]),\n      )\n      .limit(1)\n      .selectAll()\n      .executeTakeFirst()\n\n    return {\n      blockUri: res?.uri,\n    }\n  },\n\n  async getBlocks(req) {\n    const { actorDid, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('actor_block')\n      .where('actor_block.creator', '=', actorDid)\n      .selectAll()\n\n    const keyset = new TimeCidKeyset(\n      ref('actor_block.sortAt'),\n      ref('actor_block.cid'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n    return {\n      blockUris: page.items.map((b) => b.uri),\n      cursor: page.cursor,\n    }\n  },\n\n  async getBidirectionalBlockViaList(req) {\n    const { actorDid, targetDid } = req\n    const res = await db.db\n      .selectFrom('list_block')\n      .innerJoin('list_item', 'list_item.listUri', 'list_block.subjectUri')\n      .where((eb) =>\n        eb.or([\n          eb.and([\n            eb('list_block.creator', '=', actorDid),\n            eb('list_item.subjectDid', '=', targetDid),\n          ]),\n          eb.and([\n            eb('list_block.creator', '=', targetDid),\n            eb('list_item.subjectDid', '=', actorDid),\n          ]),\n        ]),\n      )\n      .limit(1)\n      .selectAll('list_block')\n      .executeTakeFirst()\n\n    return {\n      listUri: res?.subjectUri,\n    }\n  },\n\n  async getBlocklistSubscription(req) {\n    const { actorDid, listUri } = req\n    const res = await db.db\n      .selectFrom('list_block')\n      .where('creator', '=', actorDid)\n      .where('subjectUri', '=', listUri)\n      .selectAll()\n      .limit(1)\n      .executeTakeFirst()\n    return {\n      listblockUri: res?.uri,\n    }\n  },\n\n  async getBlocklistSubscriptions(req) {\n    const { actorDid, limit, cursor } = req\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('list')\n      .where(({ exists }) =>\n        exists(\n          db.db\n            .selectFrom('list_block')\n            .where('list_block.creator', '=', actorDid)\n            .whereRef('list_block.subjectUri', '=', ref('list.uri'))\n            .selectAll(),\n        ),\n      )\n      .selectAll('list')\n\n    const keyset = new TimeCidKeyset(ref('list.createdAt'), ref('list.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      listUris: page.items.map((l) => l.uri),\n      cursor: page.cursor,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/bookmarks.js

@@ -16,13 +16,13 @@ export default (db) => ({
             cursor,
             limit,
         });
-        const res = await builder.execute();
+        const page = key.page(await builder.execute(), limit);
         return {
-            bookmarks: res.map((b) => ({
+            bookmarks: page.items.map((b) => ({
                 key: b.key,
                 subject: b.subjectUri,
             })),
-            cursor: key.packFromResult(res),
+            cursor: page.cursor,
         };
     },
     async getBookmarksByActorAndSubjects(req) {

package/dist/data-plane/server/routes/bookmarks.js.map

@@ -1 +1 @@
-{"version":3,"file":"bookmarks.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/bookmarks.ts"],"names":[],"mappings":"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","sourcesContent":["import { type PlainMessage, Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport { keyBy } from '@atproto/common'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport {\n  type Bookmark,\n  GetBookmarksByActorAndSubjectsResponse,\n} from '../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../stash.js'\nimport type { Database } from '../db/index.js'\nimport { StashKeyKey } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorBookmarks(req) {\n    const { actorDid, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('bookmark')\n      .where('bookmark.creator', '=', actorDid)\n      .selectAll()\n\n    const key = new StashKeyKey(ref('bookmark.key'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n\n    const res = await builder.execute()\n    return {\n      bookmarks: res.map((b) => ({\n        key: b.key,\n        subject: b.subjectUri,\n      })),\n      cursor: key.packFromResult(res),\n    }\n  },\n\n  async getBookmarksByActorAndSubjects(req) {\n    const { actorDid, uris } = req\n\n    if (uris.length === 0) {\n      return new GetBookmarksByActorAndSubjectsResponse({\n        bookmarks: [],\n      })\n    }\n\n    const res = await db.db\n      .selectFrom('bookmark')\n      .where('bookmark.creator', '=', actorDid)\n      .where('bookmark.subjectUri', 'in', uris)\n      .selectAll()\n      .execute()\n\n    const byUri = keyBy(res, 'subjectUri')\n    const bookmarks = uris.map((did): PlainMessage<Bookmark> => {\n      const bookmark = byUri.get(did)\n      if (!bookmark) {\n        return {\n          ref: undefined,\n          subjectUri: '',\n          subjectCid: '',\n          indexedAt: undefined,\n        }\n      }\n\n      return {\n        ref: {\n          actorDid,\n          namespace: Namespaces.AppBskyBookmarkDefsBookmark.$type,\n          key: bookmark.key,\n        },\n        subjectUri: bookmark.subjectUri,\n        subjectCid: bookmark.subjectCid,\n        indexedAt: Timestamp.fromDate(new Date(bookmark.indexedAt)),\n      }\n    })\n\n    return {\n      bookmarks,\n    }\n  },\n})\n"]}
+{"version":3,"file":"bookmarks.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/bookmarks.ts"],"names":[],"mappings":"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","sourcesContent":["import { type PlainMessage, Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport { keyBy } from '@atproto/common'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport {\n  type Bookmark,\n  GetBookmarksByActorAndSubjectsResponse,\n} from '../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../stash.js'\nimport type { Database } from '../db/index.js'\nimport { StashKeyKey } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorBookmarks(req) {\n    const { actorDid, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('bookmark')\n      .where('bookmark.creator', '=', actorDid)\n      .selectAll()\n\n    const key = new StashKeyKey(ref('bookmark.key'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n\n    const page = key.page(await builder.execute(), limit)\n    return {\n      bookmarks: page.items.map((b) => ({\n        key: b.key,\n        subject: b.subjectUri,\n      })),\n      cursor: page.cursor,\n    }\n  },\n\n  async getBookmarksByActorAndSubjects(req) {\n    const { actorDid, uris } = req\n\n    if (uris.length === 0) {\n      return new GetBookmarksByActorAndSubjectsResponse({\n        bookmarks: [],\n      })\n    }\n\n    const res = await db.db\n      .selectFrom('bookmark')\n      .where('bookmark.creator', '=', actorDid)\n      .where('bookmark.subjectUri', 'in', uris)\n      .selectAll()\n      .execute()\n\n    const byUri = keyBy(res, 'subjectUri')\n    const bookmarks = uris.map((did): PlainMessage<Bookmark> => {\n      const bookmark = byUri.get(did)\n      if (!bookmark) {\n        return {\n          ref: undefined,\n          subjectUri: '',\n          subjectCid: '',\n          indexedAt: undefined,\n        }\n      }\n\n      return {\n        ref: {\n          actorDid,\n          namespace: Namespaces.AppBskyBookmarkDefsBookmark.$type,\n          key: bookmark.key,\n        },\n        subjectUri: bookmark.subjectUri,\n        subjectCid: bookmark.subjectCid,\n        indexedAt: Timestamp.fromDate(new Date(bookmark.indexedAt)),\n      }\n    })\n\n    return {\n      bookmarks,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/drafts.js

@@ -13,15 +13,15 @@ export default (db) => ({
             cursor,
             limit,
         });
-        const res = await builder.execute();
+        const page = key.page(await builder.execute(), limit);
         return {
-            drafts: res.map((d) => ({
+            drafts: page.items.map((d) => ({
                 key: d.key,
                 payload: Buffer.from(d.payload),
                 createdAt: Timestamp.fromDate(new Date(d.createdAt)),
                 updatedAt: Timestamp.fromDate(new Date(d.updatedAt)),
             })),
-            cursor: key.packFromResult(res),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/drafts.js.map

@@ -1 +1 @@
-{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/drafts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAKjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,cAAc,CAAC,GAAG;QACtB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QACvC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAE7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,OAAO,CAAC;aACnB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,CAAC;aACrC,SAAS,EAAE,CAAA;QAEd,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACvD,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9B,MAAM;YACN,KAAK;SACN,CAAC,CAAA;QAEF,MAAM,GAAG,GAAG,MAAM,OAAO,CAAC,OAAO,EAAE,CAAA;QACnC,OAAO;YACL,MAAM,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAA2B,EAAE,CAAC,CAAC;gBAC/C,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC/B,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBACpD,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aACrD,CAAC,CAAC;YACH,MAAM,EAAE,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC;SAChC,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import { type PlainMessage, Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { DraftInfo } from '../../../proto/bsky_pb.js'\nimport type { Database } from '../db/index.js'\nimport { IsoUpdatedAtKey } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorDrafts(req) {\n    const { actorDid, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('draft')\n      .where('draft.creator', '=', actorDid)\n      .selectAll()\n\n    const key = new IsoUpdatedAtKey(ref('draft.updatedAt'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n\n    const res = await builder.execute()\n    return {\n      drafts: res.map((d): PlainMessage<DraftInfo> => ({\n        key: d.key,\n        payload: Buffer.from(d.payload),\n        createdAt: Timestamp.fromDate(new Date(d.createdAt)),\n        updatedAt: Timestamp.fromDate(new Date(d.updatedAt)),\n      })),\n      cursor: key.packFromResult(res),\n    }\n  },\n})\n"]}
+{"version":3,"file":"drafts.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/drafts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,SAAS,EAAE,MAAM,oBAAoB,CAAA;AAKjE,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAErD,eAAe,CAAC,EAAY,EAAwC,EAAE,CAAC,CAAC;IACtE,KAAK,CAAC,cAAc,CAAC,GAAG;QACtB,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,CAAA;QACvC,MAAM,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,OAAO,CAAA;QAE7B,IAAI,OAAO,GAAG,EAAE,CAAC,EAAE;aAChB,UAAU,CAAC,OAAO,CAAC;aACnB,KAAK,CAAC,eAAe,EAAE,GAAG,EAAE,QAAQ,CAAC;aACrC,SAAS,EAAE,CAAA;QAEd,MAAM,GAAG,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC,CAAA;QACvD,OAAO,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,EAAE;YAC9B,MAAM;YACN,KAAK;SACN,CAAC,CAAA;QAEF,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,MAAM,OAAO,CAAC,OAAO,EAAE,EAAE,KAAK,CAAC,CAAA;QACrD,OAAO;YACL,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAA2B,EAAE,CAAC,CAAC;gBACtD,GAAG,EAAE,CAAC,CAAC,GAAG;gBACV,OAAO,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC;gBAC/B,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;gBACpD,SAAS,EAAE,SAAS,CAAC,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;aACrD,CAAC,CAAC;YACH,MAAM,EAAE,IAAI,CAAC,MAAM;SACpB,CAAA;IACH,CAAC;CACF,CAAC,CAAA","sourcesContent":["import { type PlainMessage, Timestamp } from '@bufbuild/protobuf'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { DraftInfo } from '../../../proto/bsky_pb.js'\nimport type { Database } from '../db/index.js'\nimport { IsoUpdatedAtKey } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorDrafts(req) {\n    const { actorDid, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('draft')\n      .where('draft.creator', '=', actorDid)\n      .selectAll()\n\n    const key = new IsoUpdatedAtKey(ref('draft.updatedAt'))\n    builder = key.paginate(builder, {\n      cursor,\n      limit,\n    })\n\n    const page = key.page(await builder.execute(), limit)\n    return {\n      drafts: page.items.map((d): PlainMessage<DraftInfo> => ({\n        key: d.key,\n        payload: Buffer.from(d.payload),\n        createdAt: Timestamp.fromDate(new Date(d.createdAt)),\n        updatedAt: Timestamp.fromDate(new Date(d.updatedAt)),\n      })),\n      cursor: page.cursor,\n    }\n  },\n})\n"]}

package/dist/data-plane/server/routes/feed-gens.js

@@ -13,10 +13,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const feeds = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            uris: feeds.map((f) => f.uri),
-            cursor: keyset.packFromResult(feeds),
+            uris: page.items.map((f) => f.uri),
+            cursor: page.cursor,
         };
     },
     async getSuggestedFeeds(req) {
@@ -24,19 +24,21 @@ export default (db) => ({
             .selectFrom('suggested_feed')
             .orderBy('suggested_feed.order', 'asc')
             .$if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))
-            .limit(req.limit || 50)
+            .limit((req.limit || 50) + 1)
             .selectAll()
             .execute();
+        const limit = req.limit || 50;
+        const items = feeds.slice(0, limit);
         return {
-            uris: feeds.map((f) => f.uri),
-            cursor: feeds.at(-1)?.order.toString(),
+            uris: items.map((f) => f.uri),
+            cursor: feeds.length > limit ? items.at(-1)?.order.toString() : undefined,
         };
     },
     async searchFeedGenerators(req) {
         return searchFeedGeneratorsImpl(db, req.query, req.limit);
     },
     async searchFeedGeneratorsV2(req) {
-        const { uris, cursor } = await searchFeedGeneratorsImpl(db, req.params?.query ?? '', req.params?.limit ?? 25);
+        const { uris, cursor } = await searchFeedGeneratorsImpl(db, req.params?.query ?? '', req.params?.limit ?? 25, req.params?.cursor);
         return {
             feedGenerators: uris.map((uri) => ({ uri, score: 0 })),
             pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },
@@ -46,7 +48,7 @@ export default (db) => ({
         throw new Error('unimplemented');
     },
 });
-const searchFeedGeneratorsImpl = async (db, query, limit) => {
+const searchFeedGeneratorsImpl = async (db, query, limit, cursor) => {
     const { ref } = db.db.dynamic;
     const trimmed = query.trim();
     let builder = db.db
@@ -54,11 +56,11 @@ const searchFeedGeneratorsImpl = async (db, query, limit) => {
         .$if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))
         .selectAll();
     const keyset = new TimeCidKeyset(ref('feed_generator.createdAt'), ref('feed_generator.cid'));
-    builder = paginate(builder, { limit, keyset });
-    const feeds = await builder.execute();
+    builder = paginate(builder, { limit, cursor, keyset });
+    const page = keyset.page(await builder.execute(), limit);
     return {
-        uris: feeds.map((f) => f.uri),
-        cursor: keyset.packFromResult(feeds),
+        uris: page.items.map((f) => f.uri),
+        cursor: page.cursor,
     };
 };
 //# sourceMappingURL=feed-gens.js.map

package/dist/data-plane/server/routes/feed-gens.js.map

@@ -1 +1 @@
-{"version":3,"file":"feed-gens.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/feed-gens.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorFeeds(req) {\n    const { actorDid, limit, cursor } = req\n\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('feed_generator')\n      .selectAll()\n      .where('feed_generator.creator', '=', actorDid)\n\n    const keyset = new TimeCidKeyset(\n      ref('feed_generator.createdAt'),\n      ref('feed_generator.cid'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n    const feeds = await builder.execute()\n\n    return {\n      uris: feeds.map((f) => f.uri),\n      cursor: keyset.packFromResult(feeds),\n    }\n  },\n\n  async getSuggestedFeeds(req) {\n    const feeds = await db.db\n      .selectFrom('suggested_feed')\n      .orderBy('suggested_feed.order', 'asc')\n      .$if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))\n      .limit(req.limit || 50)\n      .selectAll()\n      .execute()\n    return {\n      uris: feeds.map((f) => f.uri),\n      cursor: feeds.at(-1)?.order.toString(),\n    }\n  },\n\n  async searchFeedGenerators(req) {\n    return searchFeedGeneratorsImpl(db, req.query, req.limit)\n  },\n\n  async searchFeedGeneratorsV2(req) {\n    const { uris, cursor } = await searchFeedGeneratorsImpl(\n      db,\n      req.params?.query ?? '',\n      req.params?.limit ?? 25,\n    )\n    return {\n      feedGenerators: uris.map((uri) => ({ uri, score: 0 })),\n      pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n    }\n  },\n\n  async getFeedGeneratorStatus() {\n    throw new Error('unimplemented')\n  },\n})\n\nconst searchFeedGeneratorsImpl = async (\n  db: Database,\n  query: string,\n  limit: number,\n) => {\n  const { ref } = db.db.dynamic\n  const trimmed = query.trim()\n  let builder = db.db\n    .selectFrom('feed_generator')\n    .$if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))\n    .selectAll()\n  const keyset = new TimeCidKeyset(\n    ref('feed_generator.createdAt'),\n    ref('feed_generator.cid'),\n  )\n  builder = paginate(builder, { limit, keyset })\n  const feeds = await builder.execute()\n  return {\n    uris: feeds.map((f) => f.uri),\n    cursor: keyset.packFromResult(feeds),\n  }\n}\n"]}
+{"version":3,"file":"feed-gens.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/feed-gens.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getActorFeeds(req) {\n    const { actorDid, limit, cursor } = req\n\n    const { ref } = db.db.dynamic\n    let builder = db.db\n      .selectFrom('feed_generator')\n      .selectAll()\n      .where('feed_generator.creator', '=', actorDid)\n\n    const keyset = new TimeCidKeyset(\n      ref('feed_generator.createdAt'),\n      ref('feed_generator.cid'),\n    )\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      uris: page.items.map((f) => f.uri),\n      cursor: page.cursor,\n    }\n  },\n\n  async getSuggestedFeeds(req) {\n    const feeds = await db.db\n      .selectFrom('suggested_feed')\n      .orderBy('suggested_feed.order', 'asc')\n      .$if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))\n      .limit((req.limit || 50) + 1)\n      .selectAll()\n      .execute()\n    const limit = req.limit || 50\n    const items = feeds.slice(0, limit)\n    return {\n      uris: items.map((f) => f.uri),\n      cursor: feeds.length > limit ? items.at(-1)?.order.toString() : undefined,\n    }\n  },\n\n  async searchFeedGenerators(req) {\n    return searchFeedGeneratorsImpl(db, req.query, req.limit)\n  },\n\n  async searchFeedGeneratorsV2(req) {\n    const { uris, cursor } = await searchFeedGeneratorsImpl(\n      db,\n      req.params?.query ?? '',\n      req.params?.limit ?? 25,\n      req.params?.cursor,\n    )\n    return {\n      feedGenerators: uris.map((uri) => ({ uri, score: 0 })),\n      pageInfo: { cursor: cursor ?? '', hitsTotal: 0n },\n    }\n  },\n\n  async getFeedGeneratorStatus() {\n    throw new Error('unimplemented')\n  },\n})\n\nconst searchFeedGeneratorsImpl = async (\n  db: Database,\n  query: string,\n  limit: number,\n  cursor?: string,\n) => {\n  const { ref } = db.db.dynamic\n  const trimmed = query.trim()\n  let builder = db.db\n    .selectFrom('feed_generator')\n    .$if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))\n    .selectAll()\n  const keyset = new TimeCidKeyset(\n    ref('feed_generator.createdAt'),\n    ref('feed_generator.cid'),\n  )\n  builder = paginate(builder, { limit, cursor, keyset })\n  const page = keyset.page(await builder.execute(), limit)\n  return {\n    uris: page.items.map((f) => f.uri),\n    cursor: page.cursor,\n  }\n}\n"]}

package/dist/data-plane/server/routes/feeds.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/feeds.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;;0BAG9B,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC"}
+{"version":3,"file":"feeds.d.ts","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/feeds.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAA;AACtD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,gCAAgC,CAAA;AAE7D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;;0BAG9B,EAAE,EAAE,QAAQ,GAAG,OAAO,CAAC,WAAW,CAAC,OAAO,OAAO,CAAC,CAAC"}

package/dist/data-plane/server/routes/feeds.js

@@ -1,3 +1,4 @@
+import assert from 'node:assert';
 import { FeedType } from '../../../proto/bsky_pb.js';
 import { TimeCidKeyset, paginate } from '../db/pagination.js';
 export default (db) => ({
@@ -52,10 +53,10 @@ export default (db) => ({
             cursor,
             keyset,
         });
-        const feedItems = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            items: feedItems.map(feedItemFromRow),
-            cursor: keyset.packFromResult(feedItems),
+            items: page.items.map(feedItemFromRow),
+            cursor: page.cursor,
         };
     },
     async getTimeline(req) {
@@ -78,7 +79,7 @@ export default (db) => ({
             .where('feed_item.originatorDid', '=', actorDid)
             .selectAll('feed_item');
         selfQb = paginate(selfQb, {
-            limit: Math.min(limit, 10),
+            limit,
             cursor,
             keyset,
             tryIndex: true,
@@ -87,19 +88,39 @@ export default (db) => ({
             followQb.execute(),
             selfQb.execute(),
         ]);
-        const feedItems = [...followRes, ...selfRes]
-            .sort((a, b) => {
+        // Use own posts to fill space left by followed-account posts. When followed-account
+        // posts already fill the page, still allow up to 10 own posts into the merged results.
+        const selfLimit = Math.max(
+        // Allow up to 10 own posts even when followed-account posts can fill the page.
+        Math.min(limit, 10), 
+        // Allow enough own posts to fill the slots not occupied by followed-account posts.
+        limit - Math.min(followRes.length, limit));
+        // The extra own post proves that another page exists, but is not part of this page.
+        const selfHasMore = selfRes.length > selfLimit;
+        const selfItems = selfRes.slice(0, selfLimit);
+        const feedItems = [...followRes, ...selfItems].sort((a, b) => {
             if (a.sortAt > b.sortAt)
                 return -1;
             if (a.sortAt < b.sortAt)
                 return 1;
             return a.cid > b.cid ? -1 : 1;
-        })
-            .slice(0, limit);
-        return {
-            items: feedItems.map(feedItemFromRow),
-            cursor: keyset.packFromResult(feedItems),
-        };
+        });
+        const page = keyset.page(feedItems, limit);
+        if (page.items.length === 0) {
+            return { items: [], cursor: undefined };
+        }
+        const items = page.items.map(feedItemFromRow);
+        // The combined results exceeded the requested limit.
+        if (page.cursor) {
+            return { items, cursor: page.cursor };
+        }
+        // Own posts exceeded their separate cap, but the combined results did not exceed the requested limit.
+        if (selfHasMore) {
+            const lastItem = page.items.at(-1);
+            assert(lastItem);
+            return { items, cursor: keyset.packFromResult(lastItem) };
+        }
+        return { items, cursor: undefined };
     },
     async getListFeed(req) {
         const { listUri, cursor, limit } = req;
@@ -116,10 +137,10 @@ export default (db) => ({
             keyset,
             tryIndex: true,
         });
-        const feedItems = await builder.execute();
+        const page = keyset.page(await builder.execute(), limit);
         return {
-            items: feedItems.map((item) => ({ uri: item.uri, cid: item.cid })),
-            cursor: keyset.packFromResult(feedItems),
+            items: page.items.map((item) => ({ uri: item.uri, cid: item.cid })),
+            cursor: page.cursor,
         };
     },
 });

package/dist/data-plane/server/routes/feeds.js.map

@@ -1 +1 @@
-{"version":3,"file":"feeds.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/feeds.ts"],"names":[],"mappings":"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","sourcesContent":["import type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport { FeedType } from '../../../proto/bsky_pb.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getAuthorFeed(req) {\n    const { actorDid, limit, cursor, feedType } = req\n    const { ref } = db.db.dynamic\n\n    // defaults to posts, reposts, and replies\n    let builder = db.db\n      .selectFrom('feed_item')\n      .innerJoin('post', 'post.uri', 'feed_item.postUri')\n      .selectAll('feed_item')\n      .where('originatorDid', '=', actorDid)\n\n    if (feedType === FeedType.POSTS_WITH_MEDIA) {\n      builder = builder\n        // only your own posts\n        .where('type', '=', 'post')\n        // only posts with media\n        .where((eb) =>\n          eb.or([\n            eb.exists(\n              eb\n                .selectFrom('post_embed_image')\n                .select('post_embed_image.postUri')\n                .whereRef('post_embed_image.postUri', '=', 'feed_item.postUri'),\n            ),\n            eb.exists(\n              eb\n                .selectFrom('post_embed_gallery_image')\n                .select('post_embed_gallery_image.postUri')\n                .whereRef(\n                  'post_embed_gallery_image.postUri',\n                  '=',\n                  'feed_item.postUri',\n                ),\n            ),\n          ]),\n        )\n    } else if (feedType === FeedType.POSTS_WITH_VIDEO) {\n      builder = builder\n        // only your own posts\n        .where('type', '=', 'post')\n        // only posts with video\n        .where(({ eb, exists }) =>\n          exists(\n            eb\n              .selectFrom('post_embed_video')\n              .select('post_embed_video.postUri')\n              .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),\n          ),\n        )\n    } else if (feedType === FeedType.POSTS_NO_REPLIES) {\n      builder = builder.where((eb) =>\n        eb.or([eb('post.replyParent', 'is', null), eb('type', '=', 'repost')]),\n      )\n    } else if (feedType === FeedType.POSTS_AND_AUTHOR_THREADS) {\n      builder = builder.where((eb) =>\n        eb.or([\n          eb('type', '=', 'repost'),\n          eb('post.replyParent', 'is', null),\n          eb('post.replyRoot', 'like', `at://${actorDid}/%`),\n        ]),\n      )\n    }\n\n    const keyset = new TimeCidKeyset(\n      ref('feed_item.sortAt'),\n      ref('feed_item.cid'),\n    )\n\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const feedItems = await builder.execute()\n\n    return {\n      items: feedItems.map(feedItemFromRow),\n      cursor: keyset.packFromResult(feedItems),\n    }\n  },\n\n  async getTimeline(req) {\n    const { actorDid, limit, cursor } = req\n    const { ref } = db.db.dynamic\n\n    const keyset = new TimeCidKeyset(\n      ref('feed_item.sortAt'),\n      ref('feed_item.cid'),\n    )\n\n    let followQb = db.db\n      .selectFrom('feed_item')\n      .innerJoin('follow', 'follow.subjectDid', 'feed_item.originatorDid')\n      .where('follow.creator', '=', actorDid)\n      .selectAll('feed_item')\n\n    followQb = paginate(followQb, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    let selfQb = db.db\n      .selectFrom('feed_item')\n      .where('feed_item.originatorDid', '=', actorDid)\n      .selectAll('feed_item')\n\n    selfQb = paginate(selfQb, {\n      limit: Math.min(limit, 10),\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const [followRes, selfRes] = await Promise.all([\n      followQb.execute(),\n      selfQb.execute(),\n    ])\n\n    const feedItems = [...followRes, ...selfRes]\n      .sort((a, b) => {\n        if (a.sortAt > b.sortAt) return -1\n        if (a.sortAt < b.sortAt) return 1\n        return a.cid > b.cid ? -1 : 1\n      })\n      .slice(0, limit)\n\n    return {\n      items: feedItems.map(feedItemFromRow),\n      cursor: keyset.packFromResult(feedItems),\n    }\n  },\n\n  async getListFeed(req) {\n    const { listUri, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('post')\n      .selectAll('post')\n      .innerJoin('list_item', 'list_item.subjectDid', 'post.creator')\n      .where('list_item.listUri', '=', listUri)\n\n    const keyset = new TimeCidKeyset(ref('post.sortAt'), ref('post.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n    const feedItems = await builder.execute()\n\n    return {\n      items: feedItems.map((item) => ({ uri: item.uri, cid: item.cid })),\n      cursor: keyset.packFromResult(feedItems),\n    }\n  },\n})\n\n// @NOTE does not support additional fields in the protos specific to author feeds\n// and timelines. at the time of writing, hydration/view implementations do not rely on them.\nconst feedItemFromRow = (row: { postUri: string; uri: string }) => {\n  return {\n    uri: row.postUri,\n    repost: row.uri === row.postUri ? undefined : row.uri,\n  }\n}\n"]}
+{"version":3,"file":"feeds.js","sourceRoot":"","sources":["../../../../src/data-plane/server/routes/feeds.ts"],"names":[],"mappings":"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","sourcesContent":["import assert from 'node:assert'\nimport type { ServiceImpl } from '@connectrpc/connect'\nimport type { Service } from '../../../proto/bsky_connect.js'\nimport { FeedType } from '../../../proto/bsky_pb.js'\nimport type { Database } from '../db/index.js'\nimport { TimeCidKeyset, paginate } from '../db/pagination.js'\n\nexport default (db: Database): Partial<ServiceImpl<typeof Service>> => ({\n  async getAuthorFeed(req) {\n    const { actorDid, limit, cursor, feedType } = req\n    const { ref } = db.db.dynamic\n\n    // defaults to posts, reposts, and replies\n    let builder = db.db\n      .selectFrom('feed_item')\n      .innerJoin('post', 'post.uri', 'feed_item.postUri')\n      .selectAll('feed_item')\n      .where('originatorDid', '=', actorDid)\n\n    if (feedType === FeedType.POSTS_WITH_MEDIA) {\n      builder = builder\n        // only your own posts\n        .where('type', '=', 'post')\n        // only posts with media\n        .where((eb) =>\n          eb.or([\n            eb.exists(\n              eb\n                .selectFrom('post_embed_image')\n                .select('post_embed_image.postUri')\n                .whereRef('post_embed_image.postUri', '=', 'feed_item.postUri'),\n            ),\n            eb.exists(\n              eb\n                .selectFrom('post_embed_gallery_image')\n                .select('post_embed_gallery_image.postUri')\n                .whereRef(\n                  'post_embed_gallery_image.postUri',\n                  '=',\n                  'feed_item.postUri',\n                ),\n            ),\n          ]),\n        )\n    } else if (feedType === FeedType.POSTS_WITH_VIDEO) {\n      builder = builder\n        // only your own posts\n        .where('type', '=', 'post')\n        // only posts with video\n        .where(({ eb, exists }) =>\n          exists(\n            eb\n              .selectFrom('post_embed_video')\n              .select('post_embed_video.postUri')\n              .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),\n          ),\n        )\n    } else if (feedType === FeedType.POSTS_NO_REPLIES) {\n      builder = builder.where((eb) =>\n        eb.or([eb('post.replyParent', 'is', null), eb('type', '=', 'repost')]),\n      )\n    } else if (feedType === FeedType.POSTS_AND_AUTHOR_THREADS) {\n      builder = builder.where((eb) =>\n        eb.or([\n          eb('type', '=', 'repost'),\n          eb('post.replyParent', 'is', null),\n          eb('post.replyRoot', 'like', `at://${actorDid}/%`),\n        ]),\n      )\n    }\n\n    const keyset = new TimeCidKeyset(\n      ref('feed_item.sortAt'),\n      ref('feed_item.cid'),\n    )\n\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n    })\n\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      items: page.items.map(feedItemFromRow),\n      cursor: page.cursor,\n    }\n  },\n\n  async getTimeline(req) {\n    const { actorDid, limit, cursor } = req\n    const { ref } = db.db.dynamic\n\n    const keyset = new TimeCidKeyset(\n      ref('feed_item.sortAt'),\n      ref('feed_item.cid'),\n    )\n\n    let followQb = db.db\n      .selectFrom('feed_item')\n      .innerJoin('follow', 'follow.subjectDid', 'feed_item.originatorDid')\n      .where('follow.creator', '=', actorDid)\n      .selectAll('feed_item')\n\n    followQb = paginate(followQb, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    let selfQb = db.db\n      .selectFrom('feed_item')\n      .where('feed_item.originatorDid', '=', actorDid)\n      .selectAll('feed_item')\n\n    selfQb = paginate(selfQb, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n\n    const [followRes, selfRes] = await Promise.all([\n      followQb.execute(),\n      selfQb.execute(),\n    ])\n\n    // Use own posts to fill space left by followed-account posts. When followed-account\n    // posts already fill the page, still allow up to 10 own posts into the merged results.\n    const selfLimit = Math.max(\n      // Allow up to 10 own posts even when followed-account posts can fill the page.\n      Math.min(limit, 10),\n      // Allow enough own posts to fill the slots not occupied by followed-account posts.\n      limit - Math.min(followRes.length, limit),\n    )\n\n    // The extra own post proves that another page exists, but is not part of this page.\n    const selfHasMore = selfRes.length > selfLimit\n\n    const selfItems = selfRes.slice(0, selfLimit)\n    const feedItems = [...followRes, ...selfItems].sort((a, b) => {\n      if (a.sortAt > b.sortAt) return -1\n      if (a.sortAt < b.sortAt) return 1\n      return a.cid > b.cid ? -1 : 1\n    })\n\n    const page = keyset.page(feedItems, limit)\n    if (page.items.length === 0) {\n      return { items: [], cursor: undefined }\n    }\n    const items = page.items.map(feedItemFromRow)\n\n    // The combined results exceeded the requested limit.\n    if (page.cursor) {\n      return { items, cursor: page.cursor }\n    }\n\n    // Own posts exceeded their separate cap, but the combined results did not exceed the requested limit.\n    if (selfHasMore) {\n      const lastItem = page.items.at(-1)\n      assert(lastItem)\n      return { items, cursor: keyset.packFromResult(lastItem) }\n    }\n\n    return { items, cursor: undefined }\n  },\n\n  async getListFeed(req) {\n    const { listUri, cursor, limit } = req\n    const { ref } = db.db.dynamic\n\n    let builder = db.db\n      .selectFrom('post')\n      .selectAll('post')\n      .innerJoin('list_item', 'list_item.subjectDid', 'post.creator')\n      .where('list_item.listUri', '=', listUri)\n\n    const keyset = new TimeCidKeyset(ref('post.sortAt'), ref('post.cid'))\n    builder = paginate(builder, {\n      limit,\n      cursor,\n      keyset,\n      tryIndex: true,\n    })\n    const page = keyset.page(await builder.execute(), limit)\n\n    return {\n      items: page.items.map((item) => ({ uri: item.uri, cid: item.cid })),\n      cursor: page.cursor,\n    }\n  },\n})\n\n// @NOTE does not support additional fields in the protos specific to author feeds\n// and timelines. at the time of writing, hydration/view implementations do not rely on them.\nconst feedItemFromRow = (row: { postUri: string; uri: string }) => {\n  return {\n    uri: row.postUri,\n    repost: row.uri === row.postUri ? undefined : row.uri,\n  }\n}\n"]}

package/dist/data-plane/server/routes/follows.js

@@ -41,14 +41,14 @@ export default (db) => ({
             keyset,
             tryIndex: true,
         });
-        const followers = await followersReq.execute();
+        const page = keyset.page(await followersReq.execute(), limit);
         return {
-            followers: followers.map((f) => ({
+            followers: page.items.map((f) => ({
                 uri: f.uri,
                 actorDid: f.creatorDid,
                 subjectDid: f.subjectDid,
             })),
-            cursor: keyset.packFromResult(followers),
+            cursor: page.cursor,
         };
     },
     async getFollows(req) {
@@ -73,14 +73,14 @@ export default (db) => ({
             keyset,
             tryIndex: true,
         });
-        const follows = await followsReq.execute();
+        const page = keyset.page(await followsReq.execute(), limit);
         return {
-            follows: follows.map((f) => ({
+            follows: page.items.map((f) => ({
                 uri: f.uri,
                 actorDid: f.creatorDid,
                 subjectDid: f.subjectDid,
             })),
-            cursor: keyset.packFromResult(follows),
+            cursor: page.cursor,
         };
     },
     /**