@atproto/bsky 0.0.220 → 0.0.222

package/dist/hydration/hydrator.js

@@ -7,12 +7,10 @@ exports.mergeManyStates = exports.mergeStates = exports.Hydrator = exports.Hydra
 const node_assert_1 = __importDefault(require("node:assert"));
 const common_1 = require("@atproto/common");
 const syntax_1 = require("@atproto/syntax");
-const lexicons_1 = require("../lexicon/lexicons");
-const record_1 = require("../lexicon/types/app/bsky/embed/record");
-const recordWithMedia_1 = require("../lexicon/types/app/bsky/embed/recordWithMedia");
-const threadgate_1 = require("../lexicon/types/app/bsky/feed/threadgate");
+const index_js_1 = require("../lexicons/index.js");
 const logger_1 = require("../logger");
 const uris_1 = require("../util/uris");
+const types_js_1 = require("../views/types.js");
 const actor_1 = require("./actor");
 const feed_1 = require("./feed");
 const graph_1 = require("./graph");
@@ -62,22 +60,11 @@ class HydrateCtx {
             writable: true,
             value: this.vals.includeDebugField
         });
-        Object.defineProperty(this, "featureGatesClient", {
+        Object.defineProperty(this, "features", {
             enumerable: true,
             configurable: true,
             writable: true,
-            value: this.vals.featureGatesClient
-        });
-        /**
-         * Cache of evaluated feature gates to be used in a given request lifecycle.
-         * The actual evaluations happen at the top of the route handler and the
-         * results are stored in this map.
-         */
-        Object.defineProperty(this, "featureGatesMap", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: this.vals.featureGatesMap || new Map()
+            value: this.vals.features
         });
     }
     // Convenience with use with dataplane.getActors cache control
@@ -92,7 +79,7 @@ class HydrateCtx {
 }
 exports.HydrateCtx = HydrateCtx;
 class Hydrator {
-    constructor(dataplane, serviceLabelers = [], config, featureGatesClient) {
+    constructor(dataplane, serviceLabelers = [], config) {
         Object.defineProperty(this, "dataplane", {
             enumerable: true,
             configurable: true,
@@ -135,20 +122,12 @@ class Hydrator {
             writable: true,
             value: void 0
         });
-        // TODO: remove after image format rollout.
-        Object.defineProperty(this, "featureGatesClient", {
-            enumerable: true,
-            configurable: true,
-            writable: true,
-            value: void 0
-        });
         this.config = config;
         this.actor = new actor_1.ActorHydrator(dataplane);
         this.feed = new feed_1.FeedHydrator(dataplane);
         this.graph = new graph_1.GraphHydrator(dataplane);
         this.label = new label_1.LabelHydrator(dataplane);
         this.serviceLabelers = new Set(serviceLabelers);
-        this.featureGatesClient = featureGatesClient;
     }
     // app.bsky.actor.defs#profileView
     // - profile viewer
@@ -229,13 +208,12 @@ class Hydrator {
         catch (err) {
             logger_1.hydrationLogger.error({ err }, 'Failed to get activity subscriptions state for profiles');
         }
-        const subjectsToKnownFollowersMap = Array.from(knownFollowers.keys()).reduce((acc, did) => {
+        const subjectsToKnownFollowersMap = new Map();
+        for (const did of knownFollowers.keys()) {
             const known = knownFollowers.get(did);
-            if (known) {
-                acc.set(did, known.followers);
-            }
-            return acc;
-        }, new Map());
+            if (known)
+                subjectsToKnownFollowersMap.set(did, known.followers);
+        }
         const allKnownFollowerDids = Array.from(knownFollowers.values())
             .filter(Boolean)
             .flatMap((f) => f.followers);
@@ -385,13 +363,13 @@ class Hydrator {
         // layer 1: first level embeds plus thread roots we haven't fetched yet
         const urisLayer1 = nestedRecordUrisFromPosts(postsLayer0);
         const urisLayer1ByCollection = (0, util_1.urisByCollection)(urisLayer1);
-        const embedPostUrisLayer1 = urisLayer1ByCollection.get(lexicons_1.ids.AppBskyFeedPost) ?? [];
+        const embedPostUrisLayer1 = urisLayer1ByCollection.get(index_js_1.app.bsky.feed.post.$type) ?? [];
         const postsLayer1 = await this.feed.getPosts([...embedPostUrisLayer1, ...additionalRootUris], ctx.includeTakedowns, state.posts);
         addPostsToHydrationState(postsLayer1);
         // layer 2: second level embeds, ignoring any additional root uris we mixed-in to the previous layer
         const urisLayer2 = nestedRecordUrisFromPosts(postsLayer1, embedPostUrisLayer1);
         const urisLayer2ByCollection = (0, util_1.urisByCollection)(urisLayer2);
-        const embedPostUrisLayer2 = urisLayer2ByCollection.get(lexicons_1.ids.AppBskyFeedPost) ?? [];
+        const embedPostUrisLayer2 = urisLayer2ByCollection.get(index_js_1.app.bsky.feed.post.$type) ?? [];
         const [postsLayer2, threadgates] = await Promise.all([
             this.feed.getPosts(embedPostUrisLayer2, ctx.includeTakedowns, state.posts),
             this.feed.getThreadgatesForPosts([...postUrisWithThreadgates.values()]),
@@ -400,20 +378,20 @@ class Hydrator {
         // collect list/feedgen embeds, lists in threadgates, post record hydration
         const threadgateListUris = getListUrisFromThreadgates(threadgates);
         const nestedListUris = [
-            ...(urisLayer1ByCollection.get(lexicons_1.ids.AppBskyGraphList) ?? []),
-            ...(urisLayer2ByCollection.get(lexicons_1.ids.AppBskyGraphList) ?? []),
+            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.graph.list.$type) ?? []),
+            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.graph.list.$type) ?? []),
         ];
         const nestedFeedGenUris = [
-            ...(urisLayer1ByCollection.get(lexicons_1.ids.AppBskyFeedGenerator) ?? []),
-            ...(urisLayer2ByCollection.get(lexicons_1.ids.AppBskyFeedGenerator) ?? []),
+            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.feed.generator.$type) ?? []),
+            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.feed.generator.$type) ?? []),
         ];
         const nestedLabelerDids = [
-            ...(urisLayer1ByCollection.get(lexicons_1.ids.AppBskyLabelerService) ?? []),
-            ...(urisLayer2ByCollection.get(lexicons_1.ids.AppBskyLabelerService) ?? []),
+            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.labeler.service.$type) ?? []),
+            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.labeler.service.$type) ?? []),
         ].map(uris_1.uriToDid);
         const nestedStarterPackUris = [
-            ...(urisLayer1ByCollection.get(lexicons_1.ids.AppBskyGraphStarterpack) ?? []),
-            ...(urisLayer2ByCollection.get(lexicons_1.ids.AppBskyGraphStarterpack) ?? []),
+            ...(urisLayer1ByCollection.get(index_js_1.app.bsky.graph.starterpack.$type) ?? []),
+            ...(urisLayer2ByCollection.get(index_js_1.app.bsky.graph.starterpack.$type) ?? []),
         ];
         const posts = (0, util_1.mergeManyMaps)(postsLayer0, postsLayer1, postsLayer2) ?? postsLayer0;
         const allPostUris = [...posts.keys()];
@@ -571,23 +549,22 @@ class Hydrator {
     //       - list basic
     async hydrateThreadPosts(refs, ctx) {
         const postsState = await this.hydratePosts(refs, ctx, undefined, {
-            processDynamicTagsForView: ctx.featureGatesMap.get('threads:reply_ranking_exploration:enable')
+            processDynamicTagsForView: ctx.features.checkGate(ctx.features.Gate.ThreadsReplyRankingExplorationEnable)
                 ? 'thread'
                 : undefined,
         });
-        const { posts } = postsState;
-        const postsList = posts ? Array.from(posts.entries()) : [];
-        const isDefined = (entry) => {
-            const [, post] = entry;
-            return !!post;
-        };
-        const threadRefs = postsList
-            .filter(isDefined)
-            .map(([uri, post]) => ({
-            uri,
-            cid: post.cid,
-            threadRoot: post.record.reply?.root.uri ?? uri,
-        }));
+        const threadRefs = [];
+        if (postsState.posts) {
+            for (const [uri, post] of postsState.posts.entries()) {
+                if (post) {
+                    threadRefs.push({
+                        uri,
+                        cid: post.cid,
+                        threadRoot: post.record.reply?.root.uri ?? uri,
+                    });
+                }
+            }
+        }
         const threadContexts = await this.feed.getThreadContexts(threadRefs);
         return (0, exports.mergeStates)(postsState, { threadContexts });
     }
@@ -692,7 +669,8 @@ class Hydrator {
             const creator = (0, uris_1.uriToDid)(sp.record.list);
             // update aggregation with list items for top 12 most followed members
             agg.listItemSampleUris = [
-                ...members.listitems.filter((li) => ctx.viewer === creator || !isBlocked(blocks, [creator, li.did])),
+                ...members.listitems.filter((li) => ctx.viewer === creator ||
+                    !isBlocked(blocks, [creator, li.did])),
             ]
                 .sort((li1, li2) => {
                 const score1 = listMemberAggs.get(li1.did)?.followers ?? 0;
@@ -752,11 +730,11 @@ class Hydrator {
     async hydrateNotifications(notifs, ctx) {
         const uris = notifs.map((notif) => notif.uri);
         const collections = (0, util_1.urisByCollection)(uris);
-        const postUris = collections.get(lexicons_1.ids.AppBskyFeedPost) ?? [];
-        const likeUris = collections.get(lexicons_1.ids.AppBskyFeedLike) ?? [];
-        const repostUris = collections.get(lexicons_1.ids.AppBskyFeedRepost) ?? [];
-        const followUris = collections.get(lexicons_1.ids.AppBskyGraphFollow) ?? [];
-        const verificationUris = collections.get(lexicons_1.ids.AppBskyGraphVerification) ?? [];
+        const postUris = collections.get(index_js_1.app.bsky.feed.post.$type) ?? [];
+        const likeUris = collections.get(index_js_1.app.bsky.feed.like.$type) ?? [];
+        const repostUris = collections.get(index_js_1.app.bsky.feed.repost.$type) ?? [];
+        const followUris = collections.get(index_js_1.app.bsky.graph.follow.$type) ?? [];
+        const verificationUris = collections.get(index_js_1.app.bsky.graph.verification.$type) ?? [];
         const [posts, likes, reposts, follows, verifications, labels, profileState,] = await Promise.all([
             this.feed.getPosts(postUris), // reason: mention, reply, quote
             this.feed.getLikes(likeUris), // reason: like
@@ -803,24 +781,21 @@ class Hydrator {
         });
         const bookmarks = bookmarksRes.bookmarks.filter((bookmark) => !!bookmark.ref?.key);
         // mapping DID -> stash key -> bookmark
-        const bookmarksMap = new util_1.HydrationMap([
-            [
-                viewer,
-                new util_1.HydrationMap(bookmarks.map((bookmark) => {
-                    const { ref: { key }, } = bookmark;
-                    const processed = {
-                        ref: bookmark.ref,
-                        subjectUri: bookmark.subjectUri,
-                        subjectCid: bookmark.subjectCid,
-                        indexedAt: (0, util_1.parseDate)(bookmark.indexedAt),
-                    };
-                    return [key, processed];
-                })),
-            ],
-        ]);
+        const bookmarksMap = new util_1.HydrationMap();
+        bookmarksMap.set(viewer, new util_1.HydrationMap(bookmarks.map((bookmark) => [
+            bookmark.ref.key,
+            {
+                ref: bookmark.ref,
+                subjectUri: bookmark.subjectUri,
+                subjectCid: bookmark.subjectCid,
+                indexedAt: (0, util_1.parseDate)(bookmark.indexedAt),
+            },
+        ])));
         // @NOTE: The `createBookmark` endpoint limits bookmarks to be of posts,
         // so we can assume currently all subjects are posts.
-        const postsState = await this.hydratePosts(bookmarks.map((bookmark) => ({ uri: bookmark.subjectUri })), ctx);
+        const postsState = await this.hydratePosts(bookmarks.map((bookmark) => ({
+            uri: bookmark.subjectUri,
+        })), ctx);
         return (0, exports.mergeStates)(postsState, { bookmarks: bookmarksMap });
     }
     // provides partial hydration state within getFollows / getFollowers, mainly for applying rules
@@ -922,78 +897,78 @@ class Hydrator {
     async getRecord(uri, includeTakedowns = false) {
         const parsed = new syntax_1.AtUri(uri);
         const collection = parsed.collection;
-        if (collection === lexicons_1.ids.AppBskyFeedPost) {
+        if (collection === index_js_1.app.bsky.feed.post.$type) {
             return ((await this.feed.getPosts([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyFeedRepost) {
+        else if (collection === index_js_1.app.bsky.feed.repost.$type) {
             return ((await this.feed.getReposts([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyFeedLike) {
+        else if (collection === index_js_1.app.bsky.feed.like.$type) {
             return ((await this.feed.getLikes([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyGraphFollow) {
+        else if (collection === index_js_1.app.bsky.graph.follow.$type) {
             return ((await this.graph.getFollows([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyGraphList) {
+        else if (collection === index_js_1.app.bsky.graph.list.$type) {
             return ((await this.graph.getLists([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyGraphListitem) {
+        else if (collection === index_js_1.app.bsky.graph.listitem.$type) {
             return ((await this.graph.getListItems([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyGraphBlock) {
+        else if (collection === index_js_1.app.bsky.graph.block.$type) {
             return ((await this.graph.getBlocks([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyGraphStarterpack) {
+        else if (collection === index_js_1.app.bsky.graph.starterpack.$type) {
             return ((await this.graph.getStarterPacks([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyFeedGenerator) {
+        else if (collection === index_js_1.app.bsky.feed.generator.$type) {
             return ((await this.feed.getFeedGens([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyFeedThreadgate) {
+        else if (collection === index_js_1.app.bsky.feed.threadgate.$type) {
             return ((await this.feed.getThreadgateRecords([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyFeedPostgate) {
+        else if (collection === index_js_1.app.bsky.feed.postgate.$type) {
             return ((await this.feed.getPostgateRecords([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyLabelerService) {
+        else if (collection === index_js_1.app.bsky.labeler.service.$type) {
             if (parsed.rkey !== 'self')
                 return;
-            const did = parsed.hostname;
+            const { did } = parsed;
             return ((await this.label.getLabelers([did], includeTakedowns)).get(did) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.ChatBskyActorDeclaration) {
+        else if (collection === index_js_1.chat.bsky.actor.declaration.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getChatDeclarations([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === lexicons_1.ids.ComGermnetworkDeclaration) {
+        else if (collection === index_js_1.com.germnetwork.declaration.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getGermDeclarations([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyNotificationDeclaration) {
+        else if (collection === index_js_1.app.bsky.notification.declaration.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getNotificationDeclarations([uri], includeTakedowns)).get(uri) ?? undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyActorStatus) {
+        else if (collection === index_js_1.app.bsky.actor.status.$type) {
             if (parsed.rkey !== 'self')
                 return;
             return ((await this.actor.getStatus([uri], includeTakedowns)).get(uri) ??
                 undefined);
         }
-        else if (collection === lexicons_1.ids.AppBskyActorProfile) {
-            const did = parsed.hostname;
+        else if (collection === index_js_1.app.bsky.actor.profile.$type) {
+            const did = parsed.did;
             const actor = (await this.actor.getActors([did], { includeTakedowns })).get(did);
             if (!actor?.profile || !actor?.profileCid)
                 return undefined;
@@ -1026,8 +1001,8 @@ class Hydrator {
             includeTakedowns: vals.includeTakedowns,
             include3pBlocks: vals.include3pBlocks,
             includeDebugField,
-            featureGatesMap: vals.featureGatesMap,
-            featureGatesClient: this.featureGatesClient,
+            // create default anonymous scope
+            features: vals.features || this.config.featureGatesClient.scope({}),
         });
     }
     async resolveUri(uriStr) {
@@ -1043,7 +1018,7 @@ exports.Hydrator = Hydrator;
 // service refs may look like "did:plc:example#service_id". we want to extract the did part "did:plc:example".
 const serviceRefToDid = (serviceRef) => {
     const idx = serviceRef.indexOf('#');
-    return idx !== -1 ? serviceRef.slice(0, idx) : serviceRef;
+    return (idx !== -1 ? serviceRef.slice(0, idx) : serviceRef);
 };
 const listUrisFromProfileViewer = (item) => {
     const listUris = [];
@@ -1079,7 +1054,7 @@ const isModList = (listUri, state) => {
 const labelSubjectsForDid = (dids) => {
     return [
         ...dids,
-        ...dids.map((did) => syntax_1.AtUri.make(did, lexicons_1.ids.AppBskyActorProfile, 'self').toString()),
+        ...dids.map((did) => syntax_1.AtUri.make(did, index_js_1.app.bsky.actor.profile.$type, 'self').toString()),
     ];
 };
 const rootUrisFromPosts = (posts) => {
@@ -1110,10 +1085,10 @@ const nestedRecordUris = (post) => {
     const uris = [];
     if (!post?.embed)
         return uris;
-    if ((0, record_1.isMain)(post.embed)) {
+    if ((0, types_js_1.isRecordEmbedType)(post.embed)) {
         uris.push(post.embed.record.uri);
     }
-    else if ((0, recordWithMedia_1.isMain)(post.embed)) {
+    else if ((0, types_js_1.isRecordWithMediaType)(post.embed)) {
         uris.push(post.embed.record.record.uri);
     }
     return uris;
@@ -1121,7 +1096,7 @@ const nestedRecordUris = (post) => {
 const getListUrisFromThreadgates = (gates) => {
     const uris = [];
     for (const gate of gates.values()) {
-        const listRules = gate?.record.allow?.filter(threadgate_1.isListRule) ?? [];
+        const listRules = gate?.record.allow?.filter(types_js_1.isListRuleType) ?? [];
         for (const rule of listRules) {
             uris.push(rule.list);
         }
@@ -1134,9 +1109,11 @@ const isBlocked = (blocks, [a, b]) => {
 const pairsToMap = (pairs) => {
     const map = new Map();
     for (const [a, b] of pairs) {
-        const list = map.get(a) ?? [];
-        list.push(b);
-        map.set(a, list);
+        const list = map.get(a);
+        if (list)
+            list.push(b);
+        else
+            map.set(a, [b]);
     }
     return map;
 };