@atproto/pds 0.3.16 → 0.3.17

package/tests/proxied/feedgen.test.ts

@@ -1,66 +1,57 @@
-import { makeAlgos } from '@atproto/bsky'
-import AtpAgent, { AtUri, AppBskyFeedNS } from '@atproto/api'
+import AtpAgent, { AtUri } from '@atproto/api'
 import { TestNetwork, SeedClient } from '@atproto/dev-env'
 import basicSeed from '../seeds/basic'
 import { forSnapshot } from '../_util'
+import { InvalidRequestError } from '@atproto/xrpc-server'
 
 describe('feedgen proxy view', () => {
   let network: TestNetwork
   let agent: AtpAgent
   let sc: SeedClient
 
-  const origGetFeedGenerator = AppBskyFeedNS.prototype.getFeedGenerator
-  const feedUri = AtUri.make(
-    'did:example:feed-publisher',
-    'app.bsky.feed.generator',
-    'mutuals',
-  )
+  let feedUri: AtUri
 
   beforeAll(async () => {
     network = await TestNetwork.create({
       dbPostgresSchema: 'proxy_feedgen',
-      bsky: { algos: makeAlgos(feedUri.host) },
     })
     agent = network.pds.getClient()
     sc = network.getSeedClient()
     await basicSeed(sc, { addModLabels: true })
+
+    feedUri = AtUri.make(sc.dids.alice, 'app.bsky.feed.generator', 'mutuals')
+
+    const feedGen = await network.createFeedGen({
+      [feedUri.toString()]: ({ params }) => {
+        if (params.feed !== feedUri.toString()) {
+          throw new InvalidRequestError('Unknown feed')
+        }
+        return {
+          encoding: 'application/json',
+          body: {
+            feed: [
+              { post: sc.posts[sc.dids.alice][0].ref.uriStr },
+              { post: sc.posts[sc.dids.carol][0].ref.uriStr },
+            ],
+          },
+        }
+      },
+    })
+
     // publish feed
-    const feed = await agent.api.app.bsky.feed.generator.create(
+    await agent.api.app.bsky.feed.generator.create(
       { repo: sc.dids.alice, rkey: feedUri.rkey },
       {
-        did: network.bsky.ctx.cfg.feedGenDid ?? '',
-        displayName: 'Mutuals',
+        did: feedGen.did,
+        displayName: 'Test feed',
         createdAt: new Date().toISOString(),
       },
       sc.getHeaders(sc.dids.alice),
     )
     await network.processAll()
-    // mock getFeedGenerator() for use by pds's getFeed since we don't have a proper feedGenDid or feed publisher
-    AppBskyFeedNS.prototype.getFeedGenerator = async function (params, opts) {
-      if (params?.feed === feedUri.toString()) {
-        return {
-          success: true,
-          data: {
-            isOnline: true,
-            isValid: true,
-            view: {
-              cid: feed.cid,
-              uri: feed.uri,
-              did: network.bsky.ctx.cfg.feedGenDid ?? '',
-              creator: { did: sc.dids.alice, handle: 'alice.test' },
-              displayName: 'Mutuals',
-              indexedAt: new Date().toISOString(),
-            },
-          },
-          headers: {},
-        }
-      }
-      return origGetFeedGenerator.call(this, params, opts)
-    }
   })
 
   afterAll(async () => {
-    AppBskyFeedNS.prototype.getFeedGenerator = origGetFeedGenerator
     await network.close()
   })
 

package/dist/lexicon/types/app/bsky/unspecced/getTimelineSkeleton.d.ts

@@ -1,35 +0,0 @@
-import express from 'express';
-import { HandlerAuth } from '@atproto/xrpc-server';
-import * as AppBskyFeedDefs from '../feed/defs';
-export interface QueryParams {
-    limit: number;
-    cursor?: string;
-}
-export type InputSchema = undefined;
-export interface OutputSchema {
-    cursor?: string;
-    feed: AppBskyFeedDefs.SkeletonFeedPost[];
-    [k: string]: unknown;
-}
-export type HandlerInput = undefined;
-export interface HandlerSuccess {
-    encoding: 'application/json';
-    body: OutputSchema;
-    headers?: {
-        [key: string]: string;
-    };
-}
-export interface HandlerError {
-    status: number;
-    message?: string;
-    error?: 'UnknownFeed';
-}
-export type HandlerOutput = HandlerError | HandlerSuccess;
-export type HandlerReqCtx<HA extends HandlerAuth = never> = {
-    auth: HA;
-    params: QueryParams;
-    input: HandlerInput;
-    req: express.Request;
-    res: express.Response;
-};
-export type Handler<HA extends HandlerAuth = never> = (ctx: HandlerReqCtx<HA>) => Promise<HandlerOutput> | HandlerOutput;

package/src/lexicon/types/app/bsky/unspecced/getTimelineSkeleton.ts

@@ -1,49 +0,0 @@
-/**
- * GENERATED CODE - DO NOT MODIFY
- */
-import express from 'express'
-import { ValidationResult, BlobRef } from '@atproto/lexicon'
-import { lexicons } from '../../../../lexicons'
-import { isObj, hasProp } from '../../../../util'
-import { CID } from 'multiformats/cid'
-import { HandlerAuth } from '@atproto/xrpc-server'
-import * as AppBskyFeedDefs from '../feed/defs'
-
-export interface QueryParams {
-  limit: number
-  cursor?: string
-}
-
-export type InputSchema = undefined
-
-export interface OutputSchema {
-  cursor?: string
-  feed: AppBskyFeedDefs.SkeletonFeedPost[]
-  [k: string]: unknown
-}
-
-export type HandlerInput = undefined
-
-export interface HandlerSuccess {
-  encoding: 'application/json'
-  body: OutputSchema
-  headers?: { [key: string]: string }
-}
-
-export interface HandlerError {
-  status: number
-  message?: string
-  error?: 'UnknownFeed'
-}
-
-export type HandlerOutput = HandlerError | HandlerSuccess
-export type HandlerReqCtx<HA extends HandlerAuth = never> = {
-  auth: HA
-  params: QueryParams
-  input: HandlerInput
-  req: express.Request
-  res: express.Response
-}
-export type Handler<HA extends HandlerAuth = never> = (
-  ctx: HandlerReqCtx<HA>,
-) => Promise<HandlerOutput> | HandlerOutput