@atproto/pds 0.4.20 → 0.4.22

package/dist/lexicon/types/chat/bsky/moderation/getActorMetadata.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateMetadata = exports.isMetadata = void 0;
+const lexicons_1 = require("../../../../lexicons");
+const util_1 = require("../../../../util");
+function isMetadata(v) {
+    return ((0, util_1.isObj)(v) &&
+        (0, util_1.hasProp)(v, '$type') &&
+        v.$type === 'chat.bsky.moderation.getActorMetadata#metadata');
+}
+exports.isMetadata = isMetadata;
+function validateMetadata(v) {
+    return lexicons_1.lexicons.validate('chat.bsky.moderation.getActorMetadata#metadata', v);
+}
+exports.validateMetadata = validateMetadata;
+//# sourceMappingURL=getActorMetadata.js.map

package/dist/lexicon/types/chat/bsky/moderation/getActorMetadata.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getActorMetadata.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/chat/bsky/moderation/getActorMetadata.ts"],"names":[],"mappings":";;;AAKA,mDAA+C;AAC/C,2CAAiD;AAkDjD,SAAgB,UAAU,CAAC,CAAU;IACnC,OAAO,CACL,IAAA,YAAK,EAAC,CAAC,CAAC;QACR,IAAA,cAAO,EAAC,CAAC,EAAE,OAAO,CAAC;QACnB,CAAC,CAAC,KAAK,KAAK,gDAAgD,CAC7D,CAAA;AACH,CAAC;AAND,gCAMC;AAED,SAAgB,gBAAgB,CAAC,CAAU;IACzC,OAAO,mBAAQ,CAAC,QAAQ,CAAC,gDAAgD,EAAE,CAAC,CAAC,CAAA;AAC/E,CAAC;AAFD,4CAEC"}

package/dist/lexicon/types/chat/bsky/moderation/getMessageContext.d.ts

@@ -0,0 +1,41 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express';
+import { HandlerAuth, HandlerPipeThrough } from '@atproto/xrpc-server';
+import * as ChatBskyConvoDefs from '../convo/defs';
+export interface QueryParams {
+    messageId: string;
+    before: number;
+    after: number;
+}
+export type InputSchema = undefined;
+export interface OutputSchema {
+    messages: (ChatBskyConvoDefs.MessageView | ChatBskyConvoDefs.DeletedMessageView | {
+        $type: string;
+        [k: string]: unknown;
+    })[];
+    [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;
+}
+export type HandlerOutput = HandlerError | HandlerSuccess | HandlerPipeThrough;
+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;
+//# sourceMappingURL=getMessageContext.d.ts.map

package/dist/lexicon/types/chat/bsky/moderation/getMessageContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMessageContext.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/chat/bsky/moderation/getMessageContext.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAA;AACtE,OAAO,KAAK,iBAAiB,MAAM,eAAe,CAAA;AAElD,MAAM,WAAW,WAAW;IAC1B,SAAS,EAAE,MAAM,CAAA;IACjB,MAAM,EAAE,MAAM,CAAA;IACd,KAAK,EAAE,MAAM,CAAA;CACd;AAED,MAAM,MAAM,WAAW,GAAG,SAAS,CAAA;AAEnC,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,CACN,iBAAiB,CAAC,WAAW,GAC7B,iBAAiB,CAAC,kBAAkB,GACpC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;KAAE,CAC1C,EAAE,CAAA;IACH,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,MAAM,MAAM,YAAY,GAAG,SAAS,CAAA;AAEpC,MAAM,WAAW,cAAc;IAC7B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,YAAY,CAAA;IAClB,OAAO,CAAC,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,CAAA;CACpC;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,cAAc,GAAG,kBAAkB,CAAA;AAC9E,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI;IAC1D,IAAI,EAAE,EAAE,CAAA;IACR,MAAM,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAA;IACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAA;CACtB,CAAA;AACD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI,CACpD,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,KACnB,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA"}

package/dist/lexicon/types/chat/bsky/moderation/getMessageContext.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=getMessageContext.js.map

package/dist/lexicon/types/chat/bsky/moderation/getMessageContext.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getMessageContext.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/chat/bsky/moderation/getMessageContext.ts"],"names":[],"mappings":""}

package/dist/lexicon/types/chat/bsky/moderation/updateActorAccess.d.ts

@@ -0,0 +1,31 @@
+/**
+ * GENERATED CODE - DO NOT MODIFY
+ */
+import express from 'express';
+import { HandlerAuth } from '@atproto/xrpc-server';
+export interface QueryParams {
+}
+export interface InputSchema {
+    actor: string;
+    allowAccess: boolean;
+    ref?: string;
+    [k: string]: unknown;
+}
+export interface HandlerInput {
+    encoding: 'application/json';
+    body: InputSchema;
+}
+export interface HandlerError {
+    status: number;
+    message?: string;
+}
+export type HandlerOutput = HandlerError | void;
+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;
+//# sourceMappingURL=updateActorAccess.d.ts.map

package/dist/lexicon/types/chat/bsky/moderation/updateActorAccess.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateActorAccess.d.ts","sourceRoot":"","sources":["../../../../../../src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,OAAO,MAAM,SAAS,CAAA;AAK7B,OAAO,EAAE,WAAW,EAAsB,MAAM,sBAAsB,CAAA;AAEtE,MAAM,WAAW,WAAW;CAAG;AAE/B,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,EAAE,OAAO,CAAA;IACpB,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,CAAC,CAAC,EAAE,MAAM,GAAG,OAAO,CAAA;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,QAAQ,EAAE,kBAAkB,CAAA;IAC5B,IAAI,EAAE,WAAW,CAAA;CAClB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAED,MAAM,MAAM,aAAa,GAAG,YAAY,GAAG,IAAI,CAAA;AAC/C,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI;IAC1D,IAAI,EAAE,EAAE,CAAA;IACR,MAAM,EAAE,WAAW,CAAA;IACnB,KAAK,EAAE,YAAY,CAAA;IACnB,GAAG,EAAE,OAAO,CAAC,OAAO,CAAA;IACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,CAAA;CACtB,CAAA;AACD,MAAM,MAAM,OAAO,CAAC,EAAE,SAAS,WAAW,GAAG,KAAK,IAAI,CACpD,GAAG,EAAE,aAAa,CAAC,EAAE,CAAC,KACnB,OAAO,CAAC,aAAa,CAAC,GAAG,aAAa,CAAA"}

package/dist/lexicon/types/chat/bsky/moderation/updateActorAccess.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=updateActorAccess.js.map

package/dist/lexicon/types/chat/bsky/moderation/updateActorAccess.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"updateActorAccess.js","sourceRoot":"","sources":["../../../../../../src/lexicon/types/chat/bsky/moderation/updateActorAccess.ts"],"names":[],"mappings":""}

package/dist/pipethrough.d.ts

@@ -1,37 +1,27 @@
 /// <reference types="node" />
 /// <reference types="node" />
 import express from 'express';
-import { LexValue } from '@atproto/lexicon';
-import { HandlerPipeThrough } from '@atproto/xrpc-server';
+import { CatchallHandler, HandlerPipeThrough } from '@atproto/xrpc-server';
 import AppContext from './context';
-type PipethroughOptions = {
-    /**
-     * Request headers to pass-through, in addition to those defined in
-     * {@link REQ_HEADERS_TO_FORWARD}
-     */
-    reqHeadersToForward?: string[];
-};
-export declare const pipethrough: (ctx: AppContext, req: express.Request, requester?: string, audOverride?: string, options?: PipethroughOptions) => Promise<HandlerPipeThrough>;
-export declare const pipethroughProcedure: (ctx: AppContext, req: express.Request, body: LexValue, requester?: string, audOverride?: string) => Promise<{
-    encoding: string;
-    buffer: ArrayBuffer;
-    headers: Record<string, string>;
+export declare const proxyHandler: (ctx: AppContext) => CatchallHandler;
+export declare const pipethrough: (ctx: AppContext, req: express.Request, requester: string | null, audOverride?: string) => Promise<HandlerPipeThrough>;
+export declare const formatUrlAndAud: (ctx: AppContext, req: express.Request, audOverride?: string) => Promise<{
+    url: URL;
+    aud: string;
+}>;
+export declare const formatHeaders: (ctx: AppContext, req: express.Request, aud: string, requester: string | null) => Promise<{
+    authorization?: string;
 }>;
 export declare const parseProxyHeader: (ctx: AppContext, req: express.Request) => Promise<{
     did: string;
     serviceUrl: string;
 } | undefined>;
-export declare const createUrlAndHeaders: (ctx: AppContext, req: express.Request, requester?: string, audOverride?: string, options?: PipethroughOptions) => Promise<{
-    url: URL;
-    headers: {
-        authorization?: string;
-    };
-}>;
-export declare const doProxy: (url: URL, reqInit: RequestInit) => Promise<{
+export declare const makeRequest: (url: URL, reqInit: RequestInit) => Promise<Response>;
+export declare const pipeProxyRes: (upstreamRes: Response, ownRes: express.Response) => Promise<void>;
+export declare const parseProxyRes: (res: Response) => Promise<{
     encoding: string;
     buffer: ArrayBuffer;
     headers: Record<string, string>;
 }>;
 export declare const parseRes: <T>(nsid: string, res: HandlerPipeThrough) => T;
-export {};
 //# sourceMappingURL=pipethrough.d.ts.map

package/dist/pipethrough.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pipethrough.d.ts","sourceRoot":"","sources":["../src/pipethrough.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAG7B,OAAO,EAAE,QAAQ,EAA2B,MAAM,kBAAkB,CAAA;AACpE,OAAO,EAAE,kBAAkB,EAAuB,MAAM,sBAAsB,CAAA;AAK9E,OAAO,UAAU,MAAM,WAAW,CAAA;AAElC,KAAK,kBAAkB,GAAG;IACxB;;;OAGG;IACH,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAA;CAC/B,CAAA;AA2BD,eAAO,MAAM,WAAW,QACjB,UAAU,OACV,eAAe,cACR,MAAM,gBACJ,MAAM,YACV,kBAAkB,KAC3B,QAAQ,kBAAkB,CAY5B,CAAA;AAED,eAAO,MAAM,oBAAoB,QAC1B,UAAU,OACV,eAAe,QACd,QAAQ,cACF,MAAM,gBACJ,MAAM;;;;EAerB,CAAA;AAED,eAAO,MAAM,gBAAgB,QACtB,UAAU,OACV,eAAe,KACnB,QAAQ;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAgBzD,CAAA;AAQD,eAAO,MAAM,mBAAmB,QACzB,UAAU,OACV,eAAe,cACR,MAAM,gBACJ,MAAM,YACV,kBAAkB,KAC3B,QAAQ;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,OAAO,EAAE;QAAE,aAAa,CAAC,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CA0B3D,CAAA;AAED,eAAO,MAAM,OAAO,QAAe,GAAG,WAAW,WAAW;;;;EAuB3D,CAAA;AA0BD,eAAO,MAAM,QAAQ,YAAa,MAAM,OAAO,kBAAkB,KAAG,CAKnE,CAAA"}
+{"version":3,"file":"pipethrough.d.ts","sourceRoot":"","sources":["../src/pipethrough.ts"],"names":[],"mappings":";;AAAA,OAAO,OAAO,MAAM,SAAS,CAAA;AAM7B,OAAO,EACL,eAAe,EACf,kBAAkB,EAEnB,MAAM,sBAAsB,CAAA;AAK7B,OAAO,UAAU,MAAM,WAAW,CAAA;AAElC,eAAO,MAAM,YAAY,QACjB,UAAU,KAAG,eAclB,CAAA;AAEH,eAAO,MAAM,WAAW,QACjB,UAAU,OACV,eAAe,aACT,MAAM,GAAG,IAAI,gBACV,MAAM,KACnB,QAAQ,kBAAkB,CAM5B,CAAA;AAYD,eAAO,MAAM,eAAe,QACrB,UAAU,OACV,eAAe,gBACN,MAAM,KACnB,QAAQ;IAAE,GAAG,EAAE,GAAG,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAAE,CAanC,CAAA;AAED,eAAO,MAAM,aAAa,QACnB,UAAU,OACV,eAAe,OACf,MAAM,aACA,MAAM,GAAG,IAAI,KACvB,QAAQ;IAAE,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,CAYpC,CAAA;AA6BD,eAAO,MAAM,gBAAgB,QACtB,UAAU,OACV,eAAe,KACnB,QAAQ;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAA;CAAE,GAAG,SAAS,CAgBzD,CAAA;AAKD,eAAO,MAAM,WAAW,QACjB,GAAG,WACC,WAAW,KACnB,QAAQ,QAAQ,CAoBlB,CAAA;AAYD,eAAO,MAAM,YAAY,gBACV,QAAQ,UACb,gBAAgB,kBAwBzB,CAAA;AAED,eAAO,MAAM,aAAa,QAAe,QAAQ;;;;EAWhD,CAAA;AA8BD,eAAO,MAAM,QAAQ,YAAa,MAAM,OAAO,kBAAkB,KAAG,CAKnE,CAAA"}

package/dist/pipethrough.js

@@ -26,82 +26,51 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseRes = exports.doProxy = exports.createUrlAndHeaders = exports.parseProxyHeader = exports.pipethroughProcedure = exports.pipethrough = void 0;
+exports.parseRes = exports.parseProxyRes = exports.pipeProxyRes = exports.makeRequest = exports.parseProxyHeader = exports.formatHeaders = exports.formatUrlAndAud = exports.pipethrough = exports.proxyHandler = void 0;
 const ui8 = __importStar(require("uint8arrays"));
 const node_net_1 = __importDefault(require("node:net"));
+const node_stream_1 = __importDefault(require("node:stream"));
 const lexicon_1 = require("@atproto/lexicon");
 const xrpc_server_1 = require("@atproto/xrpc-server");
 const xrpc_1 = require("@atproto/xrpc");
 const lexicons_1 = require("./lexicon/lexicons");
 const logger_1 = require("./logger");
 const common_1 = require("@atproto/common");
-const defaultService = (ctx, path) => {
-    const nsid = path.replace('/xrpc/', '');
-    switch (nsid) {
-        case lexicons_1.ids.ToolsOzoneCommunicationCreateTemplate:
-        case lexicons_1.ids.ToolsOzoneCommunicationDeleteTemplate:
-        case lexicons_1.ids.ToolsOzoneCommunicationUpdateTemplate:
-        case lexicons_1.ids.ToolsOzoneCommunicationListTemplates:
-        case lexicons_1.ids.ToolsOzoneModerationEmitEvent:
-        case lexicons_1.ids.ToolsOzoneModerationGetEvent:
-        case lexicons_1.ids.ToolsOzoneModerationGetRecord:
-        case lexicons_1.ids.ToolsOzoneModerationGetRepo:
-        case lexicons_1.ids.ToolsOzoneModerationQueryEvents:
-        case lexicons_1.ids.ToolsOzoneModerationQueryStatuses:
-        case lexicons_1.ids.ToolsOzoneModerationSearchRepos:
-            return ctx.cfg.modService;
-        case lexicons_1.ids.ComAtprotoModerationCreateReport:
-            return ctx.cfg.reportService;
-        default:
-            return ctx.cfg.bskyAppView;
+const proxyHandler = (ctx) => async (req, res, next) => {
+    try {
+        const { url, aud } = await (0, exports.formatUrlAndAud)(ctx, req);
+        const auth = await ctx.authVerifier.access({ req });
+        const headers = await (0, exports.formatHeaders)(ctx, req, aud, auth.credentials.did);
+        const body = node_stream_1.default.Readable.toWeb(req);
+        const reqInit = formatReqInit(req, headers, body);
+        const proxyRes = await (0, exports.makeRequest)(url, reqInit);
+        await (0, exports.pipeProxyRes)(proxyRes, res);
     }
+    catch (err) {
+        return next(err);
+    }
+    return next();
 };
-const pipethrough = async (ctx, req, requester, audOverride, options) => {
-    const { url, headers } = await (0, exports.createUrlAndHeaders)(ctx, req, requester, audOverride, options);
-    const reqInit = {
-        headers,
-    };
-    return (0, exports.doProxy)(url, reqInit);
+exports.proxyHandler = proxyHandler;
+const pipethrough = async (ctx, req, requester, audOverride) => {
+    const { url, aud } = await (0, exports.formatUrlAndAud)(ctx, req, audOverride);
+    const headers = await (0, exports.formatHeaders)(ctx, req, aud, requester);
+    const reqInit = formatReqInit(req, headers);
+    const res = await (0, exports.makeRequest)(url, reqInit);
+    return (0, exports.parseProxyRes)(res);
 };
 exports.pipethrough = pipethrough;
-const pipethroughProcedure = async (ctx, req, body, requester, audOverride) => {
-    const { url, headers } = await (0, exports.createUrlAndHeaders)(ctx, req, requester, audOverride);
-    const reqInit = {
-        method: 'post',
-        headers,
-        body: new TextEncoder().encode((0, lexicon_1.stringifyLex)(body)),
-        duplex: 'half',
-    };
-    return (0, exports.doProxy)(url, reqInit);
-};
-exports.pipethroughProcedure = pipethroughProcedure;
-const parseProxyHeader = async (ctx, req) => {
-    const proxyTo = req.header('atproto-proxy');
-    if (!proxyTo)
-        return;
-    const [did, serviceId] = proxyTo.split('#');
-    if (!serviceId) {
-        throw new xrpc_server_1.InvalidRequestError('no service id specified');
-    }
-    const didDoc = await ctx.idResolver.did.resolve(did);
-    if (!didDoc) {
-        throw new xrpc_server_1.InvalidRequestError('could not resolve proxy did');
-    }
-    const serviceUrl = (0, common_1.getServiceEndpoint)(didDoc, { id: `#${serviceId}` });
-    if (!serviceUrl) {
-        throw new xrpc_server_1.InvalidRequestError('could not resolve proxy did service url');
-    }
-    return { did, serviceUrl };
-};
-exports.parseProxyHeader = parseProxyHeader;
+// Request setup/formatting
+// -------------------
 const REQ_HEADERS_TO_FORWARD = [
     'accept-language',
     'content-type',
     'atproto-accept-labelers',
+    'x-bsky-topics',
 ];
-const createUrlAndHeaders = async (ctx, req, requester, audOverride, options) => {
+const formatUrlAndAud = async (ctx, req, audOverride) => {
     const proxyTo = await (0, exports.parseProxyHeader)(ctx, req);
-    const defaultProxy = defaultService(ctx, req.path);
+    const defaultProxy = defaultService(ctx, req);
     const serviceUrl = proxyTo?.serviceUrl ?? defaultProxy?.url;
     const aud = audOverride ?? proxyTo?.did ?? defaultProxy?.did;
     if (!serviceUrl || !aud) {
@@ -111,52 +80,168 @@ const createUrlAndHeaders = async (ctx, req, requester, audOverride, options) =>
     if (!ctx.cfg.service.devMode && !isSafeUrl(url)) {
         throw new xrpc_server_1.InvalidRequestError(`Invalid service url: ${url.toString()}`);
     }
+    return { url, aud };
+};
+exports.formatUrlAndAud = formatUrlAndAud;
+const formatHeaders = async (ctx, req, aud, requester) => {
     const headers = requester
         ? (await ctx.serviceAuthHeaders(requester, aud)).headers
         : {};
-    const allowedHeaders = REQ_HEADERS_TO_FORWARD.concat(options?.reqHeadersToForward ?? []);
     // forward select headers to upstream services
-    for (const header of allowedHeaders) {
+    for (const header of REQ_HEADERS_TO_FORWARD) {
         const val = req.headers[header];
         if (val) {
             headers[header] = val;
         }
     }
-    return { url, headers };
+    return headers;
+};
+exports.formatHeaders = formatHeaders;
+const formatReqInit = (req, headers, body) => {
+    if (req.method === 'GET') {
+        return {
+            method: 'get',
+            headers,
+        };
+    }
+    else if (req.method === 'HEAD') {
+        return {
+            method: 'head',
+            headers,
+        };
+    }
+    else if (req.method === 'POST') {
+        return {
+            method: 'post',
+            headers,
+            body,
+            duplex: 'half',
+        };
+    }
+    else {
+        throw new xrpc_server_1.InvalidRequestError('Method not found');
+    }
+};
+const parseProxyHeader = async (ctx, req) => {
+    const proxyTo = req.header('atproto-proxy');
+    if (!proxyTo)
+        return;
+    const [did, serviceId] = proxyTo.split('#');
+    if (!serviceId) {
+        throw new xrpc_server_1.InvalidRequestError('no service id specified');
+    }
+    const didDoc = await ctx.idResolver.did.resolve(did);
+    if (!didDoc) {
+        throw new xrpc_server_1.InvalidRequestError('could not resolve proxy did');
+    }
+    const serviceUrl = (0, common_1.getServiceEndpoint)(didDoc, { id: `#${serviceId}` });
+    if (!serviceUrl) {
+        throw new xrpc_server_1.InvalidRequestError('could not resolve proxy did service url');
+    }
+    return { did, serviceUrl };
 };
-exports.createUrlAndHeaders = createUrlAndHeaders;
-const doProxy = async (url, reqInit) => {
+exports.parseProxyHeader = parseProxyHeader;
+// Sending request
+// -------------------
+const makeRequest = async (url, reqInit) => {
     let res;
-    let buffer;
     try {
         res = await fetch(url, reqInit);
-        buffer = await res.arrayBuffer();
     }
     catch (err) {
         logger_1.httpLogger.warn({ err }, 'pipethrough network error');
         throw new xrpc_1.XRPCError(xrpc_1.ResponseType.UpstreamFailure);
     }
     if (res.status !== xrpc_1.ResponseType.Success) {
-        const ui8Buffer = new Uint8Array(buffer);
+        const arrBuffer = await readArrayBufferRes(res);
+        const ui8Buffer = new Uint8Array(arrBuffer);
         const errInfo = safeParseJson(ui8.toString(ui8Buffer, 'utf8'));
         throw new xrpc_1.XRPCError(res.status, safeString(errInfo?.['error']), safeString(errInfo?.['message']), simpleHeaders(res.headers));
     }
-    const encoding = res.headers.get('content-type') ?? 'application/json';
-    const resHeaders = makeResHeaders(res);
-    return { encoding, buffer, headers: resHeaders };
+    return res;
 };
-exports.doProxy = doProxy;
+exports.makeRequest = makeRequest;
+// Response parsing/forwarding
+// -------------------
 const RES_HEADERS_TO_FORWARD = [
-    'atproto-repo-rev',
+    'content-type',
     'content-language',
+    'atproto-repo-rev',
     'atproto-content-labelers',
 ];
-const makeResHeaders = (res) => {
-    const headers = RES_HEADERS_TO_FORWARD.reduce((acc, cur) => {
+const pipeProxyRes = async (upstreamRes, ownRes) => {
+    for (const headerName of RES_HEADERS_TO_FORWARD) {
+        const headerVal = upstreamRes.headers.get(headerName);
+        if (headerVal) {
+            ownRes.setHeader(headerName, headerVal);
+        }
+    }
+    if (upstreamRes.body) {
+        const contentLength = upstreamRes.headers.get('content-length');
+        const contentEncoding = upstreamRes.headers.get('content-encoding');
+        if (contentLength && (!contentEncoding || contentEncoding === 'identity')) {
+            ownRes.setHeader('content-length', contentLength);
+        }
+        else {
+            ownRes.setHeader('transfer-encoding', 'chunked');
+        }
+        ownRes.status(200);
+        const resStream = node_stream_1.default.Readable.fromWeb(upstreamRes.body);
+        await node_stream_1.default.promises.pipeline(resStream, ownRes);
+    }
+    else {
+        ownRes.status(200).end();
+    }
+};
+exports.pipeProxyRes = pipeProxyRes;
+const parseProxyRes = async (res) => {
+    const buffer = await readArrayBufferRes(res);
+    const encoding = res.headers.get('content-type') ?? 'application/json';
+    const resHeaders = RES_HEADERS_TO_FORWARD.reduce((acc, cur) => {
         acc[cur] = res.headers.get(cur) ?? undefined;
         return acc;
     }, {});
-    return (0, common_1.noUndefinedVals)(headers);
+    return { encoding, buffer, headers: (0, common_1.noUndefinedVals)(resHeaders) };
+};
+exports.parseProxyRes = parseProxyRes;
+// Utils
+// -------------------
+const defaultService = (ctx, req) => {
+    const nsid = req.originalUrl.split('?')[0].replace('/xrpc/', '');
+    switch (nsid) {
+        case lexicons_1.ids.ToolsOzoneCommunicationCreateTemplate:
+        case lexicons_1.ids.ToolsOzoneCommunicationDeleteTemplate:
+        case lexicons_1.ids.ToolsOzoneCommunicationUpdateTemplate:
+        case lexicons_1.ids.ToolsOzoneCommunicationListTemplates:
+        case lexicons_1.ids.ToolsOzoneModerationEmitEvent:
+        case lexicons_1.ids.ToolsOzoneModerationGetEvent:
+        case lexicons_1.ids.ToolsOzoneModerationGetRecord:
+        case lexicons_1.ids.ToolsOzoneModerationGetRepo:
+        case lexicons_1.ids.ToolsOzoneModerationQueryEvents:
+        case lexicons_1.ids.ToolsOzoneModerationQueryStatuses:
+        case lexicons_1.ids.ToolsOzoneModerationSearchRepos:
+            return ctx.cfg.modService;
+        case lexicons_1.ids.ComAtprotoModerationCreateReport:
+            return ctx.cfg.reportService;
+        default:
+            return ctx.cfg.bskyAppView;
+    }
+};
+const parseRes = (nsid, res) => {
+    const buffer = new Uint8Array(res.buffer);
+    const json = safeParseJson(ui8.toString(buffer, 'utf8'));
+    const lex = json && (0, lexicon_1.jsonToLex)(json);
+    return lexicons_1.lexicons.assertValidXrpcOutput(nsid, lex);
+};
+exports.parseRes = parseRes;
+const readArrayBufferRes = async (res) => {
+    try {
+        return await res.arrayBuffer();
+    }
+    catch (err) {
+        logger_1.httpLogger.warn({ err }, 'pipethrough network error');
+        throw new xrpc_1.XRPCError(xrpc_1.ResponseType.UpstreamFailure);
+    }
 };
 const isSafeUrl = (url) => {
     if (url.protocol !== 'https:')
@@ -167,13 +252,6 @@ const isSafeUrl = (url) => {
         return false;
     return true;
 };
-const parseRes = (nsid, res) => {
-    const buffer = new Uint8Array(res.buffer);
-    const json = safeParseJson(ui8.toString(buffer, 'utf8'));
-    const lex = json && (0, lexicon_1.jsonToLex)(json);
-    return lexicons_1.lexicons.assertValidXrpcOutput(nsid, lex);
-};
-exports.parseRes = parseRes;
 const safeString = (str) => {
     return typeof str === 'string' ? str : undefined;
 };

package/dist/pipethrough.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipethrough.js","sourceRoot":"","sources":["../src/pipethrough.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iDAAkC;AAClC,wDAA0B;AAC1B,8CAAoE;AACpE,sDAA8E;AAC9E,wCAAuD;AACvD,iDAAkD;AAClD,qCAAqC;AACrC,4CAAqE;AAWrE,MAAM,cAAc,GAAG,CACrB,GAAe,EACf,IAAY,EACyB,EAAE;IACvC,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACvC,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,cAAG,CAAC,qCAAqC,CAAC;QAC/C,KAAK,cAAG,CAAC,qCAAqC,CAAC;QAC/C,KAAK,cAAG,CAAC,qCAAqC,CAAC;QAC/C,KAAK,cAAG,CAAC,oCAAoC,CAAC;QAC9C,KAAK,cAAG,CAAC,6BAA6B,CAAC;QACvC,KAAK,cAAG,CAAC,4BAA4B,CAAC;QACtC,KAAK,cAAG,CAAC,6BAA6B,CAAC;QACvC,KAAK,cAAG,CAAC,2BAA2B,CAAC;QACrC,KAAK,cAAG,CAAC,+BAA+B,CAAC;QACzC,KAAK,cAAG,CAAC,iCAAiC,CAAC;QAC3C,KAAK,cAAG,CAAC,+BAA+B;YACtC,OAAO,GAAG,CAAC,GAAG,CAAC,UAAU,CAAA;QAC3B,KAAK,cAAG,CAAC,gCAAgC;YACvC,OAAO,GAAG,CAAC,GAAG,CAAC,aAAa,CAAA;QAC9B;YACE,OAAO,GAAG,CAAC,GAAG,CAAC,WAAW,CAAA;IAC9B,CAAC;AACH,CAAC,CAAA;AAEM,MAAM,WAAW,GAAG,KAAK,EAC9B,GAAe,EACf,GAAoB,EACpB,SAAkB,EAClB,WAAoB,EACpB,OAA4B,EACC,EAAE;IAC/B,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAmB,EAChD,GAAG,EACH,GAAG,EACH,SAAS,EACT,WAAW,EACX,OAAO,CACR,CAAA;IACD,MAAM,OAAO,GAAgB;QAC3B,OAAO;KACR,CAAA;IACD,OAAO,IAAA,eAAO,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AAC9B,CAAC,CAAA;AAlBY,QAAA,WAAW,eAkBvB;AAEM,MAAM,oBAAoB,GAAG,KAAK,EACvC,GAAe,EACf,GAAoB,EACpB,IAAc,EACd,SAAkB,EAClB,WAAoB,EACpB,EAAE;IACF,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,MAAM,IAAA,2BAAmB,EAChD,GAAG,EACH,GAAG,EACH,SAAS,EACT,WAAW,CACZ,CAAA;IACD,MAAM,OAAO,GAAqC;QAChD,MAAM,EAAE,MAAM;QACd,OAAO;QACP,IAAI,EAAE,IAAI,WAAW,EAAE,CAAC,MAAM,CAAC,IAAA,sBAAY,EAAC,IAAI,CAAC,CAAC;QAClD,MAAM,EAAE,MAAM;KACf,CAAA;IACD,OAAO,IAAA,eAAO,EAAC,GAAG,EAAE,OAAO,CAAC,CAAA;AAC9B,CAAC,CAAA;AApBY,QAAA,oBAAoB,wBAoBhC;AAEM,MAAM,gBAAgB,GAAG,KAAK,EACnC,GAAe,EACf,GAAoB,EACsC,EAAE;IAC5D,MAAM,OAAO,GAAG,GAAG,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;IAC3C,IAAI,CAAC,OAAO;QAAE,OAAM;IACpB,MAAM,CAAC,GAAG,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;IAC3C,IAAI,CAAC,SAAS,EAAE,CAAC;QACf,MAAM,IAAI,iCAAmB,CAAC,yBAAyB,CAAC,CAAA;IAC1D,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,GAAG,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAA;IACpD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,IAAI,iCAAmB,CAAC,6BAA6B,CAAC,CAAA;IAC9D,CAAC;IACD,MAAM,UAAU,GAAG,IAAA,2BAAkB,EAAC,MAAM,EAAE,EAAE,EAAE,EAAE,IAAI,SAAS,EAAE,EAAE,CAAC,CAAA;IACtE,IAAI,CAAC,UAAU,EAAE,CAAC;QAChB,MAAM,IAAI,iCAAmB,CAAC,yCAAyC,CAAC,CAAA;IAC1E,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,UAAU,EAAE,CAAA;AAC5B,CAAC,CAAA;AAnBY,QAAA,gBAAgB,oBAmB5B;AAED,MAAM,sBAAsB,GAAG;IAC7B,iBAAiB;IACjB,cAAc;IACd,yBAAyB;CAC1B,CAAA;AAEM,MAAM,mBAAmB,GAAG,KAAK,EACtC,GAAe,EACf,GAAoB,EACpB,SAAkB,EAClB,WAAoB,EACpB,OAA4B,EACgC,EAAE;IAC9D,MAAM,OAAO,GAAG,MAAM,IAAA,wBAAgB,EAAC,GAAG,EAAE,GAAG,CAAC,CAAA;IAChD,MAAM,YAAY,GAAG,cAAc,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAA;IAClD,MAAM,UAAU,GAAG,OAAO,EAAE,UAAU,IAAI,YAAY,EAAE,GAAG,CAAA;IAC3D,MAAM,GAAG,GAAG,WAAW,IAAI,OAAO,EAAE,GAAG,IAAI,YAAY,EAAE,GAAG,CAAA;IAC5D,IAAI,CAAC,UAAU,IAAI,CAAC,GAAG,EAAE,CAAC;QACxB,MAAM,IAAI,iCAAmB,CAAC,6BAA6B,GAAG,CAAC,IAAI,EAAE,CAAC,CAAA;IACxE,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,WAAW,EAAE,UAAU,CAAC,CAAA;IAChD,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,iCAAmB,CAAC,wBAAwB,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAA;IACzE,CAAC;IACD,MAAM,OAAO,GAAG,SAAS;QACvB,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,kBAAkB,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC,CAAC,OAAO;QACxD,CAAC,CAAC,EAAE,CAAA;IACN,MAAM,cAAc,GAAG,sBAAsB,CAAC,MAAM,CAClD,OAAO,EAAE,mBAAmB,IAAI,EAAE,CACnC,CAAA;IACD,8CAA8C;IAC9C,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACpC,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAA;QAC/B,IAAI,GAAG,EAAE,CAAC;YACR,OAAO,CAAC,MAAM,CAAC,GAAG,GAAG,CAAA;QACvB,CAAC;IACH,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAA;AACzB,CAAC,CAAA;AAhCY,QAAA,mBAAmB,uBAgC/B;AAEM,MAAM,OAAO,GAAG,KAAK,EAAE,GAAQ,EAAE,OAAoB,EAAE,EAAE;IAC9D,IAAI,GAAa,CAAA;IACjB,IAAI,MAAmB,CAAA;IACvB,IAAI,CAAC;QACH,GAAG,GAAG,MAAM,KAAK,CAAC,GAAG,EAAE,OAAO,CAAC,CAAA;QAC/B,MAAM,GAAG,MAAM,GAAG,CAAC,WAAW,EAAE,CAAA;IAClC,CAAC;IAAC,OAAO,GAAG,EAAE,CAAC;QACb,mBAAU,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,EAAE,2BAA2B,CAAC,CAAA;QACrD,MAAM,IAAI,gBAAS,CAAC,mBAAY,CAAC,eAAe,CAAC,CAAA;IACnD,CAAC;IACD,IAAI,GAAG,CAAC,MAAM,KAAK,mBAAY,CAAC,OAAO,EAAE,CAAC;QACxC,MAAM,SAAS,GAAG,IAAI,UAAU,CAAC,MAAM,CAAC,CAAA;QACxC,MAAM,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAA;QAC9D,MAAM,IAAI,gBAAS,CACjB,GAAG,CAAC,MAAM,EACV,UAAU,CAAC,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,EAC9B,UAAU,CAAC,OAAO,EAAE,CAAC,SAAS,CAAC,CAAC,EAChC,aAAa,CAAC,GAAG,CAAC,OAAO,CAAC,CAC3B,CAAA;IACH,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,kBAAkB,CAAA;IACtE,MAAM,UAAU,GAAG,cAAc,CAAC,GAAG,CAAC,CAAA;IACtC,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,UAAU,EAAE,CAAA;AAClD,CAAC,CAAA;AAvBY,QAAA,OAAO,WAuBnB;AAED,MAAM,sBAAsB,GAAG;IAC7B,kBAAkB;IAClB,kBAAkB;IAClB,0BAA0B;CAC3B,CAAA;AAED,MAAM,cAAc,GAAG,CAAC,GAAa,EAA0B,EAAE;IAC/D,MAAM,OAAO,GAAG,sBAAsB,CAAC,MAAM,CAC3C,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;QACX,GAAG,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,SAAS,CAAA;QAC5C,OAAO,GAAG,CAAA;IACZ,CAAC,EACD,EAAwC,CACzC,CAAA;IACD,OAAO,IAAA,wBAAe,EAAC,OAAO,CAAC,CAAA;AACjC,CAAC,CAAA;AAED,MAAM,SAAS,GAAG,CAAC,GAAQ,EAAE,EAAE;IAC7B,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ;QAAE,OAAO,KAAK,CAAA;IAC3C,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,GAAG,CAAC,QAAQ,KAAK,WAAW;QAAE,OAAO,KAAK,CAAA;IAC/D,IAAI,kBAAG,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,KAAK,CAAC;QAAE,OAAO,KAAK,CAAA;IAC9C,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAEM,MAAM,QAAQ,GAAG,CAAI,IAAY,EAAE,GAAuB,EAAK,EAAE;IACtE,MAAM,MAAM,GAAG,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACzC,MAAM,IAAI,GAAG,aAAa,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;IACxD,MAAM,GAAG,GAAG,IAAI,IAAI,IAAA,mBAAS,EAAC,IAAI,CAAC,CAAA;IACnC,OAAO,mBAAQ,CAAC,qBAAqB,CAAC,IAAI,EAAE,GAAG,CAAM,CAAA;AACvD,CAAC,CAAA;AALY,QAAA,QAAQ,YAKpB;AAED,MAAM,UAAU,GAAG,CAAC,GAAW,EAAsB,EAAE;IACrD,OAAO,OAAO,GAAG,KAAK,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,SAAS,CAAA;AAClD,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,IAAY,EAAW,EAAE;IAC9C,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAA;IACzB,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,IAAI,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAED,MAAM,aAAa,GAAG,CAAC,OAAgB,EAA0B,EAAE;IACjE,MAAM,MAAM,GAAG,EAAE,CAAA;IACjB,KAAK,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC,IAAI,OAAO,EAAE,CAAC;QACjC,MAAM,CAAC,GAAG,CAAC,GAAG,GAAG,CAAA;IACnB,CAAC;IACD,OAAO,MAAM,CAAA;AACf,CAAC,CAAA"}
+{"version":3,"file":"pipethrough.js","sourceRoot":"","sources":["../src/pipethrough.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/pds",
-  "version": "0.4.20",
+  "version": "0.4.22",
   "license": "MIT",
   "description": "Reference implementation of atproto Personal Data Server (PDS)",
   "keywords": [
@@ -43,7 +43,7 @@
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
     "zod": "^3.21.4",
-    "@atproto/api": "^0.12.9",
+    "@atproto/api": "^0.12.10",
     "@atproto/aws": "^0.2.0",
     "@atproto/common": "^0.4.0",
     "@atproto/crypto": "^0.4.0",
@@ -70,12 +70,12 @@
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "ws": "^8.12.0",
-    "@atproto/api": "^0.12.9",
-    "@atproto/bsky": "^0.0.51",
+    "@atproto/api": "^0.12.10",
+    "@atproto/bsky": "^0.0.52",
     "@atproto/lex-cli": "^0.4.0"
   },
   "scripts": {
-    "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/tools/ozone/*/*",
+    "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",
     "build": "tsc --build tsconfig.build.json",
     "postbuild": "node ./build.templates.js",
     "dev": "node ./build.templates.js --watch",

package/src/api/app/bsky/actor/index.ts

@@ -4,17 +4,11 @@ import AppContext from '../../../../context'
 import getPreferences from './getPreferences'
 import getProfile from './getProfile'
 import getProfiles from './getProfiles'
-import getSuggestions from './getSuggestions'
 import putPreferences from './putPreferences'
-import searchActors from './searchActors'
-import searchActorsTypeahead from './searchActorsTypeahead'
 
 export default function (server: Server, ctx: AppContext) {
   getPreferences(server, ctx)
   getProfile(server, ctx)
   getProfiles(server, ctx)
-  getSuggestions(server, ctx)
   putPreferences(server, ctx)
-  searchActors(server, ctx)
-  searchActorsTypeahead(server, ctx)
 }

package/src/api/app/bsky/feed/getFeed.ts

@@ -16,9 +16,7 @@ export default function (server: Server, ctx: AppContext) {
           { feed: params.feed },
           await ctx.appviewAuthHeaders(requester),
         )
-      return pipethrough(ctx, req, requester, feed.view.did, {
-        reqHeadersToForward: ['x-bsky-topics'],
-      })
+      return pipethrough(ctx, req, requester, feed.view.did)
     },
   })
 }