@atproto/bsky 0.0.243 → 0.0.245

package/CHANGELOG.md

@@ -1,5 +1,33 @@
 # @atproto/bsky
 
+## 0.0.245
+
+### Patch Changes
+
+- [#5114](https://github.com/bluesky-social/atproto/pull/5114) [`5206b3a`](https://github.com/bluesky-social/atproto/commit/5206b3aae30b1efe39cff8cccbabb5932cd49a3d) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Add searchPostsV2 endpoint
+
+- Updated dependencies [[`ef3adfa`](https://github.com/bluesky-social/atproto/commit/ef3adfaa0731a57780ccf6f1f81183c1938e1af4), [`5206b3a`](https://github.com/bluesky-social/atproto/commit/5206b3aae30b1efe39cff8cccbabb5932cd49a3d)]:
+  - @atproto/api@0.20.18
+
+## 0.0.244
+
+### Patch Changes
+
+- [#5112](https://github.com/bluesky-social/atproto/pull/5112) [`3002e9f`](https://github.com/bluesky-social/atproto/commit/3002e9f195df9715395cb72cd3e613f6e5239679) Thanks [@treethought](https://github.com/treethought)! - searchv2: typeahead params envelope, arabic hint, detected langs
+
+- [#5116](https://github.com/bluesky-social/atproto/pull/5116) [`39f5c01`](https://github.com/bluesky-social/atproto/commit/39f5c018791ae70391fc86f44be283075dfa206b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update undici dependency to v8.5.0
+
+- [#5117](https://github.com/bluesky-social/atproto/pull/5117) [`8a4c88b`](https://github.com/bluesky-social/atproto/commit/8a4c88b0f63fb2d82b1391d64c54e0c760fac48b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Make BackgroundQueue implementation more resilient
+
+- [#5117](https://github.com/bluesky-social/atproto/pull/5117) [`8a4c88b`](https://github.com/bluesky-social/atproto/commit/8a4c88b0f63fb2d82b1391d64c54e0c760fac48b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Make tests less flaky in CI
+
+- [#5117](https://github.com/bluesky-social/atproto/pull/5117) [`8a4c88b`](https://github.com/bluesky-social/atproto/commit/8a4c88b0f63fb2d82b1391d64c54e0c760fac48b) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Use http-terminator to close http server
+
+- Updated dependencies [[`39f5c01`](https://github.com/bluesky-social/atproto/commit/39f5c018791ae70391fc86f44be283075dfa206b), [`8a4c88b`](https://github.com/bluesky-social/atproto/commit/8a4c88b0f63fb2d82b1391d64c54e0c760fac48b), [`8a4c88b`](https://github.com/bluesky-social/atproto/commit/8a4c88b0f63fb2d82b1391d64c54e0c760fac48b), [`cab3ac3`](https://github.com/bluesky-social/atproto/commit/cab3ac321bf939a4c8ba29aed3f632d8a91790bf)]:
+  - @atproto-labs/fetch-node@0.3.2
+  - @atproto/sync@0.3.3
+  - @atproto/api@0.20.17
+
 ## 0.0.243
 
 ### Patch Changes

package/dist/api/app/bsky/actor/searchActorsTypeahead.js

@@ -59,9 +59,11 @@ const skeletonV2 = async (inputs) => {
     const { ctx, params } = inputs;
     const term = params.q ?? params.term ?? '';
     const res = await ctx.dataplane.searchActorsTypeahead({
-        viewer: params.hydrateCtx.viewer ?? undefined,
-        query: term,
-        limit: params.limit,
+        params: {
+            query: term,
+            viewer: params.hydrateCtx.viewer ?? undefined,
+            limit: params.limit,
+        },
     });
     return {
         dids: res.actors.map(({ did }) => did),

package/dist/api/app/bsky/actor/searchActorsTypeahead.js.map

@@ -1 +1 @@
-{"version":3,"file":"searchActorsTypeahead.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActorsTypeahead.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { Client, DidString } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders, resolveSearchV2Override } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchActorsTypeahead = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.add(app.bsky.actor.searchActorsTypeahead, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const results = await searchActorsTypeahead(\n        {\n          ...params,\n          hydrateCtx,\n          isV2Override: resolveSearchV2Override(req, ctx.cfg),\n        },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeletonV1 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // @TODO\n  // add typeahead option\n  // add hits total\n\n  if (ctx.searchClient) {\n    const { actors } = await ctx.searchClient.call(\n      app.bsky.unspecced.searchActorsSkeleton,\n      {\n        typeahead: true,\n        q: term,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      dids: actors.map(({ did }) => did),\n    }\n  }\n\n  const res = await ctx.dataplane.searchActors({\n    term,\n    limit: params.limit,\n  })\n  return {\n    dids: res.dids as DidString[],\n  }\n}\n\nconst skeletonV2 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  const res = await ctx.dataplane.searchActorsTypeahead({\n    viewer: params.hydrateCtx.viewer ?? undefined,\n    query: term,\n    limit: params.limit,\n  })\n  return {\n    dids: res.actors.map(({ did }) => did as DidString),\n  }\n}\n\nconst skeleton = async (input: SkeletonFnInput<Context, Params>) => {\n  const useV2 =\n    input.params.hydrateCtx.features.checkGate(\n      input.params.hydrateCtx.features.Gate.SearchV2Enable,\n    ) || input.params.isV2Override\n  const skeletonFn = useV2 ? skeletonV2 : skeletonV1\n  return skeletonFn(input)\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration, params } = inputs\n  skeleton.dids = skeleton.dids.filter((did) => {\n    const actor = hydration.actors?.get(did)\n    if (!actor) return false\n    // Always display exact matches so that users can find profiles that they have blocked\n    const term = (params.q ?? params.term ?? '').toLowerCase()\n    const isExactMatch = actor.handle?.toLowerCase() === term\n    return isExactMatch || !ctx.views.viewerBlockExists(did, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profileBasic(did, hydration),\n  )\n  return {\n    actors,\n  }\n}\n\ntype Context = {\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchClient?: Client\n}\n\ntype Params = app.bsky.actor.searchActorsTypeahead.$Params & {\n  hydrateCtx: HydrateCtx\n  isV2Override: boolean\n}\n\ntype Skeleton = {\n  dids: DidString[]\n}\n"]}
+{"version":3,"file":"searchActorsTypeahead.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/actor/searchActorsTypeahead.ts"],"names":[],"mappings":"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","sourcesContent":["import { mapDefined } from '@atproto/common'\nimport { Client, DidString } from '@atproto/lex'\nimport { Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders, resolveSearchV2Override } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchActorsTypeahead = createPipeline(\n    skeleton,\n    hydration,\n    noBlocks,\n    presentation,\n  )\n  server.add(app.bsky.actor.searchActorsTypeahead, {\n    auth: ctx.authVerifier.standardOptional,\n    handler: async ({ params, auth, req }) => {\n      const viewer = auth.credentials.iss\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const results = await searchActorsTypeahead(\n        {\n          ...params,\n          hydrateCtx,\n          isV2Override: resolveSearchV2Override(req, ctx.cfg),\n        },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeletonV1 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  // @TODO\n  // add typeahead option\n  // add hits total\n\n  if (ctx.searchClient) {\n    const { actors } = await ctx.searchClient.call(\n      app.bsky.unspecced.searchActorsSkeleton,\n      {\n        typeahead: true,\n        q: term,\n        limit: params.limit,\n        viewer: params.hydrateCtx.viewer ?? undefined,\n      },\n    )\n    return {\n      dids: actors.map(({ did }) => did),\n    }\n  }\n\n  const res = await ctx.dataplane.searchActors({\n    term,\n    limit: params.limit,\n  })\n  return {\n    dids: res.dids as DidString[],\n  }\n}\n\nconst skeletonV2 = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const term = params.q ?? params.term ?? ''\n\n  const res = await ctx.dataplane.searchActorsTypeahead({\n    params: {\n      query: term,\n      viewer: params.hydrateCtx.viewer ?? undefined,\n      limit: params.limit,\n    },\n  })\n  return {\n    dids: res.actors.map(({ did }) => did as DidString),\n  }\n}\n\nconst skeleton = async (input: SkeletonFnInput<Context, Params>) => {\n  const useV2 =\n    input.params.hydrateCtx.features.checkGate(\n      input.params.hydrateCtx.features.Gate.SearchV2Enable,\n    ) || input.params.isV2Override\n  const skeletonFn = useV2 ? skeletonV2 : skeletonV1\n  return skeletonFn(input)\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydrateProfilesBasic(skeleton.dids, params.hydrateCtx)\n}\n\nconst noBlocks = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, skeleton, hydration, params } = inputs\n  skeleton.dids = skeleton.dids.filter((did) => {\n    const actor = hydration.actors?.get(did)\n    if (!actor) return false\n    // Always display exact matches so that users can find profiles that they have blocked\n    const term = (params.q ?? params.term ?? '').toLowerCase()\n    const isExactMatch = actor.handle?.toLowerCase() === term\n    return isExactMatch || !ctx.views.viewerBlockExists(did, hydration)\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const actors = mapDefined(skeleton.dids, (did) =>\n    ctx.views.profileBasic(did, hydration),\n  )\n  return {\n    actors,\n  }\n}\n\ntype Context = {\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n  searchClient?: Client\n}\n\ntype Params = app.bsky.actor.searchActorsTypeahead.$Params & {\n  hydrateCtx: HydrateCtx\n  isV2Override: boolean\n}\n\ntype Skeleton = {\n  dids: DidString[]\n}\n"]}

package/dist/api/app/bsky/feed/searchPostsV2.d.ts

@@ -0,0 +1,4 @@
+import { Server } from '@atproto/xrpc-server';
+import { AppContext } from '../../../../context.js';
+export default function (server: Server, ctx: AppContext): void;
+//# sourceMappingURL=searchPostsV2.d.ts.map

package/dist/api/app/bsky/feed/searchPostsV2.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"searchPostsV2.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPostsV2.ts"],"names":[],"mappings":"AAGA,OAAO,EAAuB,MAAM,EAAE,MAAM,sBAAsB,CAAA;AAClE,OAAO,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAA;AAwBnD,MAAM,CAAC,OAAO,WAAW,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,QAgDvD"}

package/dist/api/app/bsky/feed/searchPostsV2.js

@@ -0,0 +1,169 @@
+import { Timestamp } from '@bufbuild/protobuf';
+import { mapDefined } from '@atproto/common';
+import { InvalidRequestError } from '@atproto/xrpc-server';
+import { parsePostSearchQuery, } from '../../../../data-plane/server/util.js';
+import { parseString } from '../../../../hydration/util.js';
+import { app } from '../../../../lexicons/index.js';
+import { createPipeline, } from '../../../../pipeline.js';
+import { SearchQueryLanguage, SearchSortOrder, } from '../../../../proto/bsky_pb.js';
+import { uriToDid as creatorFromUri } from '../../../../util/uris.js';
+import { resHeaders, resolveSearchV2Override } from '../../../util.js';
+export default function (server, ctx) {
+    const searchPostsV2 = createPipeline(skeleton, hydration, noBlocksOrTagged, presentation);
+    server.add(app.bsky.feed.searchPostsV2, {
+        auth: ctx.authVerifier.standard,
+        handler: async ({ auth, params, req }) => {
+            const { viewer, isModService, skipViewerBlocks } = ctx.authVerifier.parseCreds(auth);
+            const labelers = ctx.reqLabelers(req);
+            const hydrateCtx = await ctx.hydrator.createContext({
+                labelers,
+                viewer,
+                skipViewerBlocks,
+                features: ctx.featureGatesClient.scope(ctx.featureGatesClient.parseUserContextFromHandler({
+                    viewer,
+                    req,
+                })),
+            });
+            const isV2Enabled = hydrateCtx.features.checkGate(hydrateCtx.features.Gate.SearchV2Enable) || resolveSearchV2Override(req, ctx.cfg);
+            if (!isV2Enabled) {
+                throw new InvalidRequestError('Search v2 is not enabled');
+            }
+            const results = await searchPostsV2({
+                ...params,
+                hydrateCtx,
+                isModService,
+            }, ctx);
+            return {
+                encoding: 'application/json',
+                body: results,
+                headers: resHeaders({ labelers: hydrateCtx.labelers }),
+            };
+        },
+    });
+}
+const skeleton = async (inputs) => {
+    const { ctx, params } = inputs;
+    const query = params.query ?? '';
+    const parsedQuery = parsePostSearchQuery(query, {
+        author: params.authors?.[0],
+    });
+    const res = await ctx.dataplane.searchPostsV2({
+        params: {
+            query,
+            viewer: params.hydrateCtx.viewer ?? undefined,
+            limit: params.limit,
+            cursor: params.cursor,
+        },
+        sort: postSortToV2(params.sort),
+        filters: {
+            authors: params.authors ?? [],
+            mentions: params.mentions ?? [],
+            domains: params.domains ?? [],
+            urls: params.urls ?? [],
+            embeddedAtUris: params.embeddedAtUris ?? [],
+            hashtags: params.hashtags ?? [],
+        },
+        exclude: {
+            authors: params.excludeAuthors ?? [],
+            mentions: params.excludeMentions ?? [],
+            domains: params.excludeDomains ?? [],
+            urls: params.excludeUrls ?? [],
+            embeddedAtUris: params.excludeEmbeddedAtUris ?? [],
+            hashtags: params.excludeHashtags ?? [],
+        },
+        since: parseTimestamp(params.since),
+        until: parseTimestamp(params.until),
+        allTime: params.allTime,
+        language: params.language,
+        hasMedia: params.hasMedia,
+        hasVideo: params.hasVideo,
+        replyParentUri: params.replyParentUri,
+        threadRootUri: params.threadRootUri,
+        excludeReplies: params.excludeReplies,
+        repliesOnly: params.repliesOnly,
+        following: params.following,
+        queryLanguage: queryLanguageToV2(params.queryLanguage),
+    });
+    return {
+        posts: res.posts.map(({ uri }) => uri),
+        cursor: parseString(res.pageInfo?.cursor),
+        hitsTotal: res.pageInfo?.hitsTotal
+            ? Number(res.pageInfo.hitsTotal)
+            : undefined,
+        detectedQueryLanguages: res.detectedQueryLanguages,
+        parsedQuery,
+    };
+};
+const hydration = async (inputs) => {
+    const { ctx, params, skeleton } = inputs;
+    return ctx.hydrator.hydratePosts(skeleton.posts.map((uri) => ({ uri })), params.hydrateCtx);
+};
+const noBlocksOrTagged = (inputs) => {
+    const { ctx, params, skeleton, hydration } = inputs;
+    const { parsedQuery } = skeleton;
+    skeleton.posts = skeleton.posts.filter((uri) => {
+        const post = hydration.posts?.get(uri);
+        if (!post)
+            return;
+        const creator = creatorFromUri(uri);
+        const isCuratedSearch = params.sort === 'top';
+        const isPostByViewer = creator === params.hydrateCtx.viewer;
+        if (isPostByViewer)
+            return true;
+        if (params.isModService)
+            return true;
+        if (ctx.views.viewerBlockExists(creator, hydration))
+            return false;
+        const tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t));
+        if (isCuratedSearch && tagged)
+            return false;
+        if (!(parsedQuery.author || params.authors?.length) && tagged)
+            return false;
+        return true;
+    });
+    return skeleton;
+};
+const presentation = (inputs) => {
+    const { ctx, skeleton, hydration } = inputs;
+    const posts = mapDefined(skeleton.posts, (uri) => {
+        const post = hydration.posts?.get(uri);
+        if (!post)
+            return;
+        return ctx.views.post(uri, hydration);
+    });
+    return {
+        posts,
+        cursor: skeleton.cursor,
+        hitsTotal: skeleton.hitsTotal,
+        detectedQueryLanguages: skeleton.detectedQueryLanguages,
+    };
+};
+const postSortToV2 = (sort) => {
+    if (sort === 'top')
+        return SearchSortOrder.TOP;
+    if (sort === 'recent')
+        return SearchSortOrder.RECENT;
+    return SearchSortOrder.UNSPECIFIED;
+};
+const queryLanguageToV2 = (lang) => {
+    if (lang === 'ja')
+        return SearchQueryLanguage.JA;
+    if (lang === 'zh')
+        return SearchQueryLanguage.ZH;
+    if (lang === 'ko')
+        return SearchQueryLanguage.KO;
+    if (lang === 'th')
+        return SearchQueryLanguage.TH;
+    if (lang === 'ar')
+        return SearchQueryLanguage.AR;
+    return undefined;
+};
+const parseTimestamp = (value) => {
+    if (!value)
+        return undefined;
+    const date = new Date(value);
+    if (isNaN(date.getTime()))
+        return undefined;
+    return Timestamp.fromDate(date);
+};
+//# sourceMappingURL=searchPostsV2.js.map

package/dist/api/app/bsky/feed/searchPostsV2.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"searchPostsV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/feed/searchPostsV2.ts"],"names":[],"mappings":"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","sourcesContent":["import { Timestamp } from '@bufbuild/protobuf'\nimport { mapDefined } from '@atproto/common'\nimport { AtUriString } from '@atproto/lex'\nimport { InvalidRequestError, Server } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { DataPlaneClient } from '../../../../data-plane/index.js'\nimport {\n  PostSearchQuery,\n  parsePostSearchQuery,\n} from '../../../../data-plane/server/util.js'\nimport { HydrateCtx, Hydrator } from '../../../../hydration/hydrator.js'\nimport { parseString } from '../../../../hydration/util.js'\nimport { app } from '../../../../lexicons/index.js'\nimport {\n  HydrationFnInput,\n  PresentationFnInput,\n  RulesFnInput,\n  SkeletonFnInput,\n  createPipeline,\n} from '../../../../pipeline.js'\nimport {\n  SearchQueryLanguage,\n  SearchSortOrder,\n} from '../../../../proto/bsky_pb.js'\nimport { uriToDid as creatorFromUri } from '../../../../util/uris.js'\nimport { Views } from '../../../../views/index.js'\nimport { resHeaders, resolveSearchV2Override } from '../../../util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  const searchPostsV2 = createPipeline(\n    skeleton,\n    hydration,\n    noBlocksOrTagged,\n    presentation,\n  )\n  server.add(app.bsky.feed.searchPostsV2, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, params, req }) => {\n      const { viewer, isModService, skipViewerBlocks } =\n        ctx.authVerifier.parseCreds(auth)\n\n      const labelers = ctx.reqLabelers(req)\n      const hydrateCtx = await ctx.hydrator.createContext({\n        labelers,\n        viewer,\n        skipViewerBlocks,\n        features: ctx.featureGatesClient.scope(\n          ctx.featureGatesClient.parseUserContextFromHandler({\n            viewer,\n            req,\n          }),\n        ),\n      })\n      const isV2Enabled =\n        hydrateCtx.features.checkGate(\n          hydrateCtx.features.Gate.SearchV2Enable,\n        ) || resolveSearchV2Override(req, ctx.cfg)\n      if (!isV2Enabled) {\n        throw new InvalidRequestError('Search v2 is not enabled')\n      }\n\n      const results = await searchPostsV2(\n        {\n          ...params,\n          hydrateCtx,\n          isModService,\n        },\n        ctx,\n      )\n      return {\n        encoding: 'application/json',\n        body: results,\n        headers: resHeaders({ labelers: hydrateCtx.labelers }),\n      }\n    },\n  })\n}\n\nconst skeleton = async (\n  inputs: SkeletonFnInput<Context, Params>,\n): Promise<Skeleton> => {\n  const { ctx, params } = inputs\n  const query = params.query ?? ''\n  const parsedQuery = parsePostSearchQuery(query, {\n    author: params.authors?.[0],\n  })\n\n  const res = await ctx.dataplane.searchPostsV2({\n    params: {\n      query,\n      viewer: params.hydrateCtx.viewer ?? undefined,\n      limit: params.limit,\n      cursor: params.cursor,\n    },\n    sort: postSortToV2(params.sort),\n    filters: {\n      authors: params.authors ?? [],\n      mentions: params.mentions ?? [],\n      domains: params.domains ?? [],\n      urls: params.urls ?? [],\n      embeddedAtUris: params.embeddedAtUris ?? [],\n      hashtags: params.hashtags ?? [],\n    },\n    exclude: {\n      authors: params.excludeAuthors ?? [],\n      mentions: params.excludeMentions ?? [],\n      domains: params.excludeDomains ?? [],\n      urls: params.excludeUrls ?? [],\n      embeddedAtUris: params.excludeEmbeddedAtUris ?? [],\n      hashtags: params.excludeHashtags ?? [],\n    },\n    since: parseTimestamp(params.since),\n    until: parseTimestamp(params.until),\n    allTime: params.allTime,\n    language: params.language,\n    hasMedia: params.hasMedia,\n    hasVideo: params.hasVideo,\n    replyParentUri: params.replyParentUri,\n    threadRootUri: params.threadRootUri,\n    excludeReplies: params.excludeReplies,\n    repliesOnly: params.repliesOnly,\n    following: params.following,\n    queryLanguage: queryLanguageToV2(params.queryLanguage),\n  })\n  return {\n    posts: res.posts.map(({ uri }) => uri as AtUriString),\n    cursor: parseString(res.pageInfo?.cursor),\n    hitsTotal: res.pageInfo?.hitsTotal\n      ? Number(res.pageInfo.hitsTotal)\n      : undefined,\n    detectedQueryLanguages: res.detectedQueryLanguages,\n    parsedQuery,\n  }\n}\n\nconst hydration = async (\n  inputs: HydrationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, params, skeleton } = inputs\n  return ctx.hydrator.hydratePosts(\n    skeleton.posts.map((uri) => ({ uri })),\n    params.hydrateCtx,\n  )\n}\n\nconst noBlocksOrTagged = (inputs: RulesFnInput<Context, Params, Skeleton>) => {\n  const { ctx, params, skeleton, hydration } = inputs\n  const { parsedQuery } = skeleton\n\n  skeleton.posts = skeleton.posts.filter((uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    const creator = creatorFromUri(uri)\n    const isCuratedSearch = params.sort === 'top'\n    const isPostByViewer = creator === params.hydrateCtx.viewer\n\n    if (isPostByViewer) return true\n    if (params.isModService) return true\n\n    if (ctx.views.viewerBlockExists(creator, hydration)) return false\n\n    const tagged = [...ctx.cfg.searchTagsHide].some((t) => post.tags.has(t))\n\n    if (isCuratedSearch && tagged) return false\n    if (!(parsedQuery.author || params.authors?.length) && tagged) return false\n    return true\n  })\n  return skeleton\n}\n\nconst presentation = (\n  inputs: PresentationFnInput<Context, Params, Skeleton>,\n) => {\n  const { ctx, skeleton, hydration } = inputs\n  const posts = mapDefined(skeleton.posts, (uri) => {\n    const post = hydration.posts?.get(uri)\n    if (!post) return\n\n    return ctx.views.post(uri, hydration)\n  })\n  return {\n    posts,\n    cursor: skeleton.cursor,\n    hitsTotal: skeleton.hitsTotal,\n    detectedQueryLanguages: skeleton.detectedQueryLanguages,\n  }\n}\n\ntype Context = {\n  cfg: AppContext['cfg']\n  dataplane: DataPlaneClient\n  hydrator: Hydrator\n  views: Views\n}\n\ntype Params = app.bsky.feed.searchPostsV2.$Params & {\n  hydrateCtx: HydrateCtx\n  isModService: boolean\n}\n\ntype Skeleton = {\n  posts: AtUriString[]\n  hitsTotal?: number\n  cursor?: string\n  detectedQueryLanguages?: string[]\n  parsedQuery: PostSearchQuery\n}\n\nconst postSortToV2 = (sort: string): SearchSortOrder => {\n  if (sort === 'top') return SearchSortOrder.TOP\n  if (sort === 'recent') return SearchSortOrder.RECENT\n  return SearchSortOrder.UNSPECIFIED\n}\n\nconst queryLanguageToV2 = (\n  lang: string | undefined,\n): SearchQueryLanguage | undefined => {\n  if (lang === 'ja') return SearchQueryLanguage.JA\n  if (lang === 'zh') return SearchQueryLanguage.ZH\n  if (lang === 'ko') return SearchQueryLanguage.KO\n  if (lang === 'th') return SearchQueryLanguage.TH\n  if (lang === 'ar') return SearchQueryLanguage.AR\n  return undefined\n}\n\nconst parseTimestamp = (value: string | undefined): Timestamp | undefined => {\n  if (!value) return undefined\n  const date = new Date(value)\n  if (isNaN(date.getTime())) return undefined\n  return Timestamp.fromDate(date)\n}\n"]}

package/dist/api/app/bsky/notification/putPreferencesV2.js

@@ -2,7 +2,7 @@ import assert from 'node:assert';
 import { UpstreamFailureError } from '@atproto/xrpc-server';
 import { app } from '../../../../lexicons/index.js';
 import { Namespaces } from '../../../../stash.js';
-import { protobufToLex } from './util.js';
+import { DEFAULT_CHAT_PREFERENCE, protobufToLex } from './util.js';
 export default function (server, ctx) {
     server.add(app.bsky.notification.putPreferencesV2, {
         auth: ctx.authVerifier.standard,
@@ -38,6 +38,9 @@ const computePreferences = async (ctx, actorDid, input) => {
     assert(res.preferences.length === 1, `expected exactly one preferences entry, got ${res.preferences.length}`);
     const currentPreferences = protobufToLex(res.preferences[0]);
     const preferences = { ...currentPreferences, ...input.body };
+    // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.
+    // Use the chat.bsky.notification.defs#preferences type instead.
+    preferences.chat = DEFAULT_CHAT_PREFERENCE;
     return preferences;
 };
 //# sourceMappingURL=putPreferencesV2.js.map

package/dist/api/app/bsky/notification/putPreferencesV2.js.map

@@ -1 +1 @@
-{"version":3,"file":"putPreferencesV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferencesV2.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAU,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;QACjD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;YAElE,oGAAoG;YACpG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,UAAU,CAAC,kCAAkC;gBACxD,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,WAAW;aACrB,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,WAAW;iBACZ;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAe,EACf,QAAgB,EAChB,KAAoD,EACO,EAAE;IAC7D,IAAI,GAAuC,CAAA;IAC3C,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC;YACnD,IAAI,EAAE,CAAC,QAAQ,CAAC;SACjB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,CAC5B,6CAA6C,EAC7C,+BAA+B,EAC/B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAA;IACH,CAAC;IAED,MAAM,CACJ,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAC5B,+CAA+C,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,CACxE,CAAA;IAED,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,MAAM,WAAW,GAAG,EAAE,GAAG,kBAAkB,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5D,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA","sourcesContent":["import assert from 'node:assert'\nimport { Un$Typed } from '@atproto/lex'\nimport { Server, UpstreamFailureError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { GetNotificationPreferencesResponse } from '../../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../../stash.js'\nimport { protobufToLex } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.notification.putPreferencesV2, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, input }) => {\n      const actorDid = auth.credentials.iss\n      const preferences = await computePreferences(ctx, actorDid, input)\n\n      // Notification preferences are created automatically on the dataplane on signup, so we just update.\n      await ctx.stashClient.update({\n        actorDid,\n        namespace: Namespaces.AppBskyNotificationDefsPreferences,\n        key: 'self',\n        payload: preferences,\n      })\n\n      return {\n        encoding: 'application/json',\n        body: {\n          preferences,\n        },\n      }\n    },\n  })\n}\n\nconst computePreferences = async (\n  ctx: AppContext,\n  actorDid: string,\n  input: app.bsky.notification.putPreferencesV2.$Input,\n): Promise<Un$Typed<app.bsky.notification.defs.Preferences>> => {\n  let res: GetNotificationPreferencesResponse\n  try {\n    res = await ctx.dataplane.getNotificationPreferences({\n      dids: [actorDid],\n    })\n  } catch (err) {\n    throw new UpstreamFailureError(\n      'cannot get current notification preferences',\n      'NotificationPreferencesFailed',\n      { cause: err },\n    )\n  }\n\n  assert(\n    res.preferences.length === 1,\n    `expected exactly one preferences entry, got ${res.preferences.length}`,\n  )\n\n  const currentPreferences = protobufToLex(res.preferences[0])\n  const preferences = { ...currentPreferences, ...input.body }\n  return preferences\n}\n"]}
+{"version":3,"file":"putPreferencesV2.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/putPreferencesV2.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAEhC,OAAO,EAAU,oBAAoB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AAEnD,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,uBAAuB,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAElE,MAAM,CAAC,OAAO,WAAW,MAAc,EAAE,GAAe;IACtD,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,gBAAgB,EAAE;QACjD,IAAI,EAAE,GAAG,CAAC,YAAY,CAAC,QAAQ;QAC/B,OAAO,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;YACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAA;YACrC,MAAM,WAAW,GAAG,MAAM,kBAAkB,CAAC,GAAG,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAA;YAElE,oGAAoG;YACpG,MAAM,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC;gBAC3B,QAAQ;gBACR,SAAS,EAAE,UAAU,CAAC,kCAAkC;gBACxD,GAAG,EAAE,MAAM;gBACX,OAAO,EAAE,WAAW;aACrB,CAAC,CAAA;YAEF,OAAO;gBACL,QAAQ,EAAE,kBAAkB;gBAC5B,IAAI,EAAE;oBACJ,WAAW;iBACZ;aACF,CAAA;QACH,CAAC;KACF,CAAC,CAAA;AACJ,CAAC;AAED,MAAM,kBAAkB,GAAG,KAAK,EAC9B,GAAe,EACf,QAAgB,EAChB,KAAoD,EACO,EAAE;IAC7D,IAAI,GAAuC,CAAA;IAC3C,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,GAAG,CAAC,SAAS,CAAC,0BAA0B,CAAC;YACnD,IAAI,EAAE,CAAC,QAAQ,CAAC;SACjB,CAAC,CAAA;IACJ,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,MAAM,IAAI,oBAAoB,CAC5B,6CAA6C,EAC7C,+BAA+B,EAC/B,EAAE,KAAK,EAAE,GAAG,EAAE,CACf,CAAA;IACH,CAAC;IAED,MAAM,CACJ,GAAG,CAAC,WAAW,CAAC,MAAM,KAAK,CAAC,EAC5B,+CAA+C,GAAG,CAAC,WAAW,CAAC,MAAM,EAAE,CACxE,CAAA;IAED,MAAM,kBAAkB,GAAG,aAAa,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,MAAM,WAAW,GAAG,EAAE,GAAG,kBAAkB,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAA;IAC5D,oHAAoH;IACpH,gEAAgE;IAChE,WAAW,CAAC,IAAI,GAAG,uBAAuB,CAAA;IAC1C,OAAO,WAAW,CAAA;AACpB,CAAC,CAAA","sourcesContent":["import assert from 'node:assert'\nimport { Un$Typed } from '@atproto/lex'\nimport { Server, UpstreamFailureError } from '@atproto/xrpc-server'\nimport { AppContext } from '../../../../context.js'\nimport { app } from '../../../../lexicons/index.js'\nimport { GetNotificationPreferencesResponse } from '../../../../proto/bsky_pb.js'\nimport { Namespaces } from '../../../../stash.js'\nimport { DEFAULT_CHAT_PREFERENCE, protobufToLex } from './util.js'\n\nexport default function (server: Server, ctx: AppContext) {\n  server.add(app.bsky.notification.putPreferencesV2, {\n    auth: ctx.authVerifier.standard,\n    handler: async ({ auth, input }) => {\n      const actorDid = auth.credentials.iss\n      const preferences = await computePreferences(ctx, actorDid, input)\n\n      // Notification preferences are created automatically on the dataplane on signup, so we just update.\n      await ctx.stashClient.update({\n        actorDid,\n        namespace: Namespaces.AppBskyNotificationDefsPreferences,\n        key: 'self',\n        payload: preferences,\n      })\n\n      return {\n        encoding: 'application/json',\n        body: {\n          preferences,\n        },\n      }\n    },\n  })\n}\n\nconst computePreferences = async (\n  ctx: AppContext,\n  actorDid: string,\n  input: app.bsky.notification.putPreferencesV2.$Input,\n): Promise<Un$Typed<app.bsky.notification.defs.Preferences>> => {\n  let res: GetNotificationPreferencesResponse\n  try {\n    res = await ctx.dataplane.getNotificationPreferences({\n      dids: [actorDid],\n    })\n  } catch (err) {\n    throw new UpstreamFailureError(\n      'cannot get current notification preferences',\n      'NotificationPreferencesFailed',\n      { cause: err },\n    )\n  }\n\n  assert(\n    res.preferences.length === 1,\n    `expected exactly one preferences entry, got ${res.preferences.length}`,\n  )\n\n  const currentPreferences = protobufToLex(res.preferences[0])\n  const preferences = { ...currentPreferences, ...input.body }\n  // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.\n  // Use the chat.bsky.notification.defs#preferences type instead.\n  preferences.chat = DEFAULT_CHAT_PREFERENCE\n  return preferences\n}\n"]}

package/dist/api/app/bsky/notification/util.d.ts

@@ -4,6 +4,7 @@ import { AppPlatform } from '../../../../proto/courier_pb.js';
 type DeepPartial<T> = T extends object ? {
     [P in keyof T]?: DeepPartial<T[P]>;
 } : T;
+export declare const DEFAULT_CHAT_PREFERENCE: app.bsky.notification.defs.ChatPreference;
 export declare const protobufToLex: (res: DeepPartial<NotificationPreferences>) => app.bsky.notification.defs.Preferences;
 type LexPlatform = 'ios' | 'android' | 'web';
 export declare function assertLexPlatform(platform: string): asserts platform is LexPlatform;

package/dist/api/app/bsky/notification/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAML,uBAAuB,EACxB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAE7D,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAClC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,GACD,CAAC,CAAA;AAuFL,eAAO,MAAM,aAAa,QACnB,WAAW,CAAC,uBAAuB,CAAC,KACxC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAgB7B,CAAA;AAED,KAAK,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,CAAA;AAE5C,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,IAAI,WAAW,CAIjC;AAED,eAAO,MAAM,0BAA0B,aAAc,MAAM,KAAG,WAKvC,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,+BAA+B,CAAA;AACnD,OAAO,EAIL,uBAAuB,EACxB,MAAM,8BAA8B,CAAA;AACrC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAA;AAE7D,KAAK,WAAW,CAAC,CAAC,IAAI,CAAC,SAAS,MAAM,GAClC;KACG,CAAC,IAAI,MAAM,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACnC,GACD,CAAC,CAAA;AA0DL,eAAO,MAAM,uBAAuB,EAAE,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,cAI9D,CAAA;AAqBH,eAAO,MAAM,aAAa,QACnB,WAAW,CAAC,uBAAuB,CAAC,KACxC,GAAG,CAAC,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,WAkB7B,CAAA;AAED,KAAK,WAAW,GAAG,KAAK,GAAG,SAAS,GAAG,KAAK,CAAA;AAE5C,wBAAgB,iBAAiB,CAC/B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,IAAI,WAAW,CAIjC;AAED,eAAO,MAAM,0BAA0B,aAAc,MAAM,KAAG,WAKvC,CAAA"}

package/dist/api/app/bsky/notification/util.js

@@ -1,4 +1,4 @@
-import { ChatNotificationInclude, NotificationInclude, } from '../../../../proto/bsky_pb.js';
+import { NotificationInclude, } from '../../../../proto/bsky_pb.js';
 import { AppPlatform } from '../../../../proto/courier_pb.js';
 const ensureChatPreference = (p) => {
     const includeValues = ['all', 'accepted'];
@@ -42,11 +42,9 @@ const ensurePreferences = (p) => {
         verified: ensurePreference(p.verified),
     };
 };
-const protobufChatPreferenceToLex = (p) => {
-    return {
-        include: p?.include === ChatNotificationInclude.ACCEPTED ? 'accepted' : 'all',
-        push: p?.push?.enabled,
-    };
+export const DEFAULT_CHAT_PREFERENCE = {
+    include: 'all',
+    push: true,
 };
 const protobufFilterablePreferenceToLex = (p) => {
     return {
@@ -63,7 +61,9 @@ const protobufPreferenceToLex = (p) => {
 };
 export const protobufToLex = (res) => {
     return ensurePreferences({
-        chat: protobufChatPreferenceToLex(res.chat),
+        // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.
+        // Use the chat.bsky.notification.defs#preferences type instead.
+        chat: DEFAULT_CHAT_PREFERENCE,
         follow: protobufFilterablePreferenceToLex(res.follow),
         like: protobufFilterablePreferenceToLex(res.like),
         likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),

package/dist/api/app/bsky/notification/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { app } from '../../../../lexicons/index.js'\nimport {\n  ChatNotificationInclude,\n  ChatNotificationPreference,\n  FilterableNotificationPreference,\n  NotificationInclude,\n  NotificationPreference,\n  NotificationPreferences,\n} from '../../../../proto/bsky_pb.js'\nimport { AppPlatform } from '../../../../proto/courier_pb.js'\n\ntype DeepPartial<T> = T extends object\n  ? {\n      [P in keyof T]?: DeepPartial<T[P]>\n    }\n  : T\n\nconst ensureChatPreference = (\n  p?: DeepPartial<app.bsky.notification.defs.ChatPreference>,\n): app.bsky.notification.defs.ChatPreference => {\n  const includeValues = ['all', 'accepted']\n  return {\n    include:\n      typeof p?.include === 'string' && includeValues.includes(p.include)\n        ? p.include\n        : 'all',\n    push: p?.push ?? true,\n  }\n}\n\nconst ensureFilterablePreference = (\n  p?: DeepPartial<app.bsky.notification.defs.FilterablePreference>,\n): app.bsky.notification.defs.FilterablePreference => {\n  const includeValues = ['all', 'follows']\n  return {\n    include:\n      typeof p?.include === 'string' && includeValues.includes(p.include)\n        ? p.include\n        : 'all',\n    list: p?.list ?? true,\n    push: p?.push ?? true,\n  }\n}\n\nconst ensurePreference = (\n  p?: DeepPartial<app.bsky.notification.defs.Preference>,\n): app.bsky.notification.defs.Preference => {\n  return {\n    list: p?.list ?? true,\n    push: p?.push ?? true,\n  }\n}\n\nconst ensurePreferences = (\n  p: DeepPartial<app.bsky.notification.defs.Preferences>,\n): app.bsky.notification.defs.Preferences => {\n  return {\n    chat: ensureChatPreference(p.chat),\n    follow: ensureFilterablePreference(p.follow),\n    like: ensureFilterablePreference(p.like),\n    likeViaRepost: ensureFilterablePreference(p.likeViaRepost),\n    mention: ensureFilterablePreference(p.mention),\n    quote: ensureFilterablePreference(p.quote),\n    reply: ensureFilterablePreference(p.reply),\n    repost: ensureFilterablePreference(p.repost),\n    repostViaRepost: ensureFilterablePreference(p.repostViaRepost),\n    starterpackJoined: ensurePreference(p.starterpackJoined),\n    subscribedPost: ensurePreference(p.subscribedPost),\n    unverified: ensurePreference(p.unverified),\n    verified: ensurePreference(p.verified),\n  }\n}\n\nconst protobufChatPreferenceToLex = (\n  p?: DeepPartial<ChatNotificationPreference>,\n): Partial<app.bsky.notification.defs.ChatPreference> => {\n  return {\n    include:\n      p?.include === ChatNotificationInclude.ACCEPTED ? 'accepted' : 'all',\n    push: p?.push?.enabled,\n  }\n}\n\nconst protobufFilterablePreferenceToLex = (\n  p?: DeepPartial<FilterableNotificationPreference>,\n): Partial<app.bsky.notification.defs.FilterablePreference> => {\n  return {\n    include: p?.include === NotificationInclude.FOLLOWS ? 'follows' : 'all',\n    list: p?.list?.enabled,\n    push: p?.push?.enabled,\n  }\n}\n\nconst protobufPreferenceToLex = (\n  p?: DeepPartial<NotificationPreference>,\n): Partial<app.bsky.notification.defs.Preference> => {\n  return {\n    list: p?.list?.enabled,\n    push: p?.push?.enabled,\n  }\n}\n\nexport const protobufToLex = (\n  res: DeepPartial<NotificationPreferences>,\n): app.bsky.notification.defs.Preferences => {\n  return ensurePreferences({\n    chat: protobufChatPreferenceToLex(res.chat),\n    follow: protobufFilterablePreferenceToLex(res.follow),\n    like: protobufFilterablePreferenceToLex(res.like),\n    likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),\n    mention: protobufFilterablePreferenceToLex(res.mention),\n    quote: protobufFilterablePreferenceToLex(res.quote),\n    reply: protobufFilterablePreferenceToLex(res.reply),\n    repost: protobufFilterablePreferenceToLex(res.repost),\n    repostViaRepost: protobufFilterablePreferenceToLex(res.repostViaRepost),\n    starterpackJoined: protobufPreferenceToLex(res.starterpackJoined),\n    subscribedPost: protobufPreferenceToLex(res.subscribedPost),\n    unverified: protobufPreferenceToLex(res.unverified),\n    verified: protobufPreferenceToLex(res.verified),\n  })\n}\n\ntype LexPlatform = 'ios' | 'android' | 'web'\n\nexport function assertLexPlatform(\n  platform: string,\n): asserts platform is LexPlatform {\n  if (platform !== 'ios' && platform !== 'android' && platform !== 'web') {\n    throw new Error('Unsupported platform: must be \"ios\", \"android\", or \"web\".')\n  }\n}\n\nexport const lexPlatformToProtoPlatform = (platform: string): AppPlatform =>\n  platform === 'ios'\n    ? AppPlatform.IOS\n    : platform === 'android'\n      ? AppPlatform.ANDROID\n      : AppPlatform.WEB\n"]}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../../../../../src/api/app/bsky/notification/util.ts"],"names":[],"mappings":"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","sourcesContent":["import { app } from '../../../../lexicons/index.js'\nimport {\n  FilterableNotificationPreference,\n  NotificationInclude,\n  NotificationPreference,\n  NotificationPreferences,\n} from '../../../../proto/bsky_pb.js'\nimport { AppPlatform } from '../../../../proto/courier_pb.js'\n\ntype DeepPartial<T> = T extends object\n  ? {\n      [P in keyof T]?: DeepPartial<T[P]>\n    }\n  : T\n\nconst ensureChatPreference = (\n  p?: DeepPartial<app.bsky.notification.defs.ChatPreference>,\n): app.bsky.notification.defs.ChatPreference => {\n  const includeValues = ['all', 'accepted']\n  return {\n    include:\n      typeof p?.include === 'string' && includeValues.includes(p.include)\n        ? p.include\n        : 'all',\n    push: p?.push ?? true,\n  }\n}\n\nconst ensureFilterablePreference = (\n  p?: DeepPartial<app.bsky.notification.defs.FilterablePreference>,\n): app.bsky.notification.defs.FilterablePreference => {\n  const includeValues = ['all', 'follows']\n  return {\n    include:\n      typeof p?.include === 'string' && includeValues.includes(p.include)\n        ? p.include\n        : 'all',\n    list: p?.list ?? true,\n    push: p?.push ?? true,\n  }\n}\n\nconst ensurePreference = (\n  p?: DeepPartial<app.bsky.notification.defs.Preference>,\n): app.bsky.notification.defs.Preference => {\n  return {\n    list: p?.list ?? true,\n    push: p?.push ?? true,\n  }\n}\n\nconst ensurePreferences = (\n  p: DeepPartial<app.bsky.notification.defs.Preferences>,\n): app.bsky.notification.defs.Preferences => {\n  return {\n    chat: ensureChatPreference(p.chat),\n    follow: ensureFilterablePreference(p.follow),\n    like: ensureFilterablePreference(p.like),\n    likeViaRepost: ensureFilterablePreference(p.likeViaRepost),\n    mention: ensureFilterablePreference(p.mention),\n    quote: ensureFilterablePreference(p.quote),\n    reply: ensureFilterablePreference(p.reply),\n    repost: ensureFilterablePreference(p.repost),\n    repostViaRepost: ensureFilterablePreference(p.repostViaRepost),\n    starterpackJoined: ensurePreference(p.starterpackJoined),\n    subscribedPost: ensurePreference(p.subscribedPost),\n    unverified: ensurePreference(p.unverified),\n    verified: ensurePreference(p.verified),\n  }\n}\n\nexport const DEFAULT_CHAT_PREFERENCE: app.bsky.notification.defs.ChatPreference =\n  {\n    include: 'all',\n    push: true,\n  }\n\nconst protobufFilterablePreferenceToLex = (\n  p?: DeepPartial<FilterableNotificationPreference>,\n): Partial<app.bsky.notification.defs.FilterablePreference> => {\n  return {\n    include: p?.include === NotificationInclude.FOLLOWS ? 'follows' : 'all',\n    list: p?.list?.enabled,\n    push: p?.push?.enabled,\n  }\n}\n\nconst protobufPreferenceToLex = (\n  p?: DeepPartial<NotificationPreference>,\n): Partial<app.bsky.notification.defs.Preference> => {\n  return {\n    list: p?.list?.enabled,\n    push: p?.push?.enabled,\n  }\n}\n\nexport const protobufToLex = (\n  res: DeepPartial<NotificationPreferences>,\n): app.bsky.notification.defs.Preferences => {\n  return ensurePreferences({\n    // NOTE: See the deprecation notice on the lexicon. This field returns a static default value and shouldn't be used.\n    // Use the chat.bsky.notification.defs#preferences type instead.\n    chat: DEFAULT_CHAT_PREFERENCE,\n    follow: protobufFilterablePreferenceToLex(res.follow),\n    like: protobufFilterablePreferenceToLex(res.like),\n    likeViaRepost: protobufFilterablePreferenceToLex(res.likeViaRepost),\n    mention: protobufFilterablePreferenceToLex(res.mention),\n    quote: protobufFilterablePreferenceToLex(res.quote),\n    reply: protobufFilterablePreferenceToLex(res.reply),\n    repost: protobufFilterablePreferenceToLex(res.repost),\n    repostViaRepost: protobufFilterablePreferenceToLex(res.repostViaRepost),\n    starterpackJoined: protobufPreferenceToLex(res.starterpackJoined),\n    subscribedPost: protobufPreferenceToLex(res.subscribedPost),\n    unverified: protobufPreferenceToLex(res.unverified),\n    verified: protobufPreferenceToLex(res.verified),\n  })\n}\n\ntype LexPlatform = 'ios' | 'android' | 'web'\n\nexport function assertLexPlatform(\n  platform: string,\n): asserts platform is LexPlatform {\n  if (platform !== 'ios' && platform !== 'android' && platform !== 'web') {\n    throw new Error('Unsupported platform: must be \"ios\", \"android\", or \"web\".')\n  }\n}\n\nexport const lexPlatformToProtoPlatform = (platform: string): AppPlatform =>\n  platform === 'ios'\n    ? AppPlatform.IOS\n    : platform === 'android'\n      ? AppPlatform.ANDROID\n      : AppPlatform.WEB\n"]}

package/dist/api/blob-dispatcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blob-dispatcher.d.ts","sourceRoot":"","sources":["../../src/api/blob-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAoB,MAAM,QAAQ,CAAA;AAE5D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,YAAY,GAAG,UAAU,CA+BlE"}
+{"version":3,"file":"blob-dispatcher.d.ts","sourceRoot":"","sources":["../../src/api/blob-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,UAAU,EAAsB,MAAM,QAAQ,CAAA;AAE9D,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAG3C,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,YAAY,GAAG,UAAU,CAmClE"}

package/dist/api/blob-dispatcher.js

@@ -1,4 +1,4 @@
-import { Agent, Pool, RetryAgent } from 'undici';
+import { Agent, Pool, interceptors } from 'undici';
 import { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node';
 import { RETRYABLE_HTTP_STATUS_CODES } from '../util/retry.js';
 export function createBlobDispatcher(cfg) {
@@ -23,12 +23,13 @@ export function createBlobDispatcher(cfg) {
             lookup: cfg.disableSsrfProtection ? undefined : unicastLookup,
         },
     });
-    return cfg.proxyMaxRetries > 0
-        ? new RetryAgent(baseDispatcher, {
-            statusCodes: [...RETRYABLE_HTTP_STATUS_CODES],
-            methods: ['GET', 'HEAD'],
-            maxRetries: cfg.proxyMaxRetries,
-        })
-        : baseDispatcher;
+    return baseDispatcher.compose(interceptors.redirect({
+        maxRedirections: 10,
+        throwOnMaxRedirect: true,
+    }), interceptors.retry({
+        statusCodes: [...RETRYABLE_HTTP_STATUS_CODES],
+        methods: ['GET', 'HEAD'],
+        maxRetries: cfg.proxyMaxRetries,
+    }));
 }
 //# sourceMappingURL=blob-dispatcher.js.map

package/dist/api/blob-dispatcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"blob-dispatcher.js","sourceRoot":"","sources":["../../src/api/blob-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAc,IAAI,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAC5D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAErE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAA;AAE9D,MAAM,UAAU,oBAAoB,CAAC,GAAiB;IACpD,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC;QAC/B,OAAO,EAAE,GAAG,CAAC,eAAe,EAAE,uBAAuB;QACrD,cAAc,EAAE,GAAG,CAAC,mBAAmB;QACvC,eAAe,EAAE,GAAG,CAAC,oBAAoB;QACzC,WAAW,EAAE,GAAG,CAAC,gBAAgB;QACjC,OAAO,EAAE,GAAG,CAAC,qBAAqB;YAChC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACf,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAC1B,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAA;gBAClD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,GAAG,CAAC,CAAA;gBACrD,CAAC;gBACD,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,KAAK,EAAE,CAAC;oBACpC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBAC7D,CAAC;gBACD,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAC/B,CAAC;QACL,OAAO,EAAE;YACP,MAAM,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;SAC9D;KACF,CAAC,CAAA;IAEF,OAAO,GAAG,CAAC,eAAe,GAAG,CAAC;QAC5B,CAAC,CAAC,IAAI,UAAU,CAAC,cAAc,EAAE;YAC7B,WAAW,EAAE,CAAC,GAAG,2BAA2B,CAAC;YAC7C,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;YACxB,UAAU,EAAE,GAAG,CAAC,eAAe;SAChC,CAAC;QACJ,CAAC,CAAC,cAAc,CAAA;AACpB,CAAC","sourcesContent":["import { Agent, Dispatcher, Pool, RetryAgent } from 'undici'\nimport { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node'\nimport { ServerConfig } from '../config.js'\nimport { RETRYABLE_HTTP_STATUS_CODES } from '../util/retry.js'\n\nexport function createBlobDispatcher(cfg: ServerConfig): Dispatcher {\n  const baseDispatcher = new Agent({\n    allowH2: cfg.proxyAllowHTTP2, // This is experimental\n    headersTimeout: cfg.proxyHeadersTimeout,\n    maxResponseSize: cfg.proxyMaxResponseSize,\n    bodyTimeout: cfg.proxyBodyTimeout,\n    factory: cfg.disableSsrfProtection\n      ? undefined\n      : (origin, opts) => {\n          const { protocol, hostname } =\n            origin instanceof URL ? origin : new URL(origin)\n          if (protocol !== 'https:') {\n            throw new Error(`Forbidden protocol \"${protocol}\"`)\n          }\n          if (isUnicastIp(hostname) === false) {\n            throw new Error('Hostname resolved to non-unicast address')\n          }\n          return new Pool(origin, opts)\n        },\n    connect: {\n      lookup: cfg.disableSsrfProtection ? undefined : unicastLookup,\n    },\n  })\n\n  return cfg.proxyMaxRetries > 0\n    ? new RetryAgent(baseDispatcher, {\n        statusCodes: [...RETRYABLE_HTTP_STATUS_CODES],\n        methods: ['GET', 'HEAD'],\n        maxRetries: cfg.proxyMaxRetries,\n      })\n    : baseDispatcher\n}\n"]}
+{"version":3,"file":"blob-dispatcher.js","sourceRoot":"","sources":["../../src/api/blob-dispatcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAc,IAAI,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAA;AAC9D,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAErE,OAAO,EAAE,2BAA2B,EAAE,MAAM,kBAAkB,CAAA;AAE9D,MAAM,UAAU,oBAAoB,CAAC,GAAiB;IACpD,MAAM,cAAc,GAAG,IAAI,KAAK,CAAC;QAC/B,OAAO,EAAE,GAAG,CAAC,eAAe,EAAE,uBAAuB;QACrD,cAAc,EAAE,GAAG,CAAC,mBAAmB;QACvC,eAAe,EAAE,GAAG,CAAC,oBAAoB;QACzC,WAAW,EAAE,GAAG,CAAC,gBAAgB;QACjC,OAAO,EAAE,GAAG,CAAC,qBAAqB;YAChC,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,EAAE;gBACf,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAC1B,MAAM,YAAY,GAAG,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,CAAA;gBAClD,IAAI,QAAQ,KAAK,QAAQ,EAAE,CAAC;oBAC1B,MAAM,IAAI,KAAK,CAAC,uBAAuB,QAAQ,GAAG,CAAC,CAAA;gBACrD,CAAC;gBACD,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,KAAK,EAAE,CAAC;oBACpC,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAA;gBAC7D,CAAC;gBACD,OAAO,IAAI,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;YAC/B,CAAC;QACL,OAAO,EAAE;YACP,MAAM,EAAE,GAAG,CAAC,qBAAqB,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa;SAC9D;KACF,CAAC,CAAA;IAEF,OAAO,cAAc,CAAC,OAAO,CAC3B,YAAY,CAAC,QAAQ,CAAC;QACpB,eAAe,EAAE,EAAE;QACnB,kBAAkB,EAAE,IAAI;KACzB,CAAC,EACF,YAAY,CAAC,KAAK,CAAC;QACjB,WAAW,EAAE,CAAC,GAAG,2BAA2B,CAAC;QAC7C,OAAO,EAAE,CAAC,KAAK,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,GAAG,CAAC,eAAe;KAChC,CAAC,CACH,CAAA;AACH,CAAC","sourcesContent":["import { Agent, Dispatcher, Pool, interceptors } from 'undici'\nimport { isUnicastIp, unicastLookup } from '@atproto-labs/fetch-node'\nimport { ServerConfig } from '../config.js'\nimport { RETRYABLE_HTTP_STATUS_CODES } from '../util/retry.js'\n\nexport function createBlobDispatcher(cfg: ServerConfig): Dispatcher {\n  const baseDispatcher = new Agent({\n    allowH2: cfg.proxyAllowHTTP2, // This is experimental\n    headersTimeout: cfg.proxyHeadersTimeout,\n    maxResponseSize: cfg.proxyMaxResponseSize,\n    bodyTimeout: cfg.proxyBodyTimeout,\n    factory: cfg.disableSsrfProtection\n      ? undefined\n      : (origin, opts) => {\n          const { protocol, hostname } =\n            origin instanceof URL ? origin : new URL(origin)\n          if (protocol !== 'https:') {\n            throw new Error(`Forbidden protocol \"${protocol}\"`)\n          }\n          if (isUnicastIp(hostname) === false) {\n            throw new Error('Hostname resolved to non-unicast address')\n          }\n          return new Pool(origin, opts)\n        },\n    connect: {\n      lookup: cfg.disableSsrfProtection ? undefined : unicastLookup,\n    },\n  })\n\n  return baseDispatcher.compose(\n    interceptors.redirect({\n      maxRedirections: 10,\n      throwOnMaxRedirect: true,\n    }),\n    interceptors.retry({\n      statusCodes: [...RETRYABLE_HTTP_STATUS_CODES],\n      methods: ['GET', 'HEAD'],\n      maxRetries: cfg.proxyMaxRetries,\n    }),\n  )\n}\n"]}

package/dist/api/blob-resolver.d.ts

@@ -16,5 +16,5 @@ export type StreamBlobFactory = (data: Dispatcher.StreamFactoryData, info: {
     did: AtprotoDid;
     cid: Cid;
 }) => Writable;
-export declare function streamBlob(ctx: AppContext, options: StreamBlobOptions, factory: StreamBlobFactory): Promise<Dispatcher.StreamData>;
+export declare function streamBlob(ctx: AppContext, options: StreamBlobOptions, factory: StreamBlobFactory): Promise<Dispatcher.StreamData<null>>;
 //# sourceMappingURL=blob-resolver.d.ts.map

package/dist/api/blob-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blob-resolver.d.ts","sourceRoot":"","sources":["../../src/api/blob-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAMnC,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAQlC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAU1C,OAAO,EACL,UAAU,EAGX,MAAM,iBAAiB,CAAA;AAGxB,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,UAAU,CAoH5D;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC9B,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAClC,IAAI,EAAE;IACJ,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,UAAU,CAAA;IACf,GAAG,EAAE,GAAG,CAAA;CACT,KACE,QAAQ,CAAA;AAEb,wBAAsB,UAAU,CAC9B,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,kCAiE3B"}
+{"version":3,"file":"blob-resolver.d.ts","sourceRoot":"","sources":["../../src/api/blob-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAqB,QAAQ,EAAE,MAAM,aAAa,CAAA;AAGzD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AAMnC,OAAO,EAAE,UAAU,EAAgB,MAAM,cAAc,CAAA;AACvD,OAAO,EAAE,GAAG,EAAE,MAAM,cAAc,CAAA;AAQlC,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAA;AAU1C,OAAO,EACL,UAAU,EAGX,MAAM,iBAAiB,CAAA;AAGxB,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,UAAU,GAAG,UAAU,CAoH5D;AAED,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,cAAc,CAAC,EAAE,MAAM,CAAA;IACvB,MAAM,CAAC,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,iBAAiB,GAAG,CAC9B,IAAI,EAAE,UAAU,CAAC,iBAAiB,EAClC,IAAI,EAAE;IACJ,GAAG,EAAE,GAAG,CAAA;IACR,GAAG,EAAE,UAAU,CAAA;IACf,GAAG,EAAE,GAAG,CAAA;CACT,KACE,QAAQ,CAAA;AAEb,wBAAsB,UAAU,CAC9B,GAAG,EAAE,UAAU,EACf,OAAO,EAAE,iBAAiB,EAC1B,OAAO,EAAE,iBAAiB,wCAgE3B"}

package/dist/api/blob-resolver.js

@@ -126,7 +126,6 @@ export async function streamBlob(ctx, options, factory) {
         path: url.pathname + url.search,
         headers,
         signal: options.signal,
-        maxRedirections: 10,
     }, (upstream) => {
         headersReceived = true;
         if (upstream.statusCode !== 200) {