@atproto/ozone 0.1.64 → 0.1.66

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @atproto/ozone
 
+## 0.1.66
+
+### Patch Changes
+
+- Updated dependencies [[`1abfd74ec`](https://github.com/bluesky-social/atproto/commit/1abfd74ec7114e5d8e2411f7a4fa10bdce97e277)]:
+  - @atproto/crypto@0.4.3
+  - @atproto/identity@0.4.5
+  - @atproto/xrpc-server@0.7.6
+
+## 0.1.65
+
+### Patch Changes
+
+- [#3177](https://github.com/bluesky-social/atproto/pull/3177) [`72eba67af`](https://github.com/bluesky-social/atproto/commit/72eba67af1af8320b5400bcb9319d5c3c8407d99) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Remove dependency on Axios
+
+- Updated dependencies [[`72eba67af`](https://github.com/bluesky-social/atproto/commit/72eba67af1af8320b5400bcb9319d5c3c8407d99)]:
+  - @atproto/identity@0.4.4
+  - @atproto/api@0.13.26
+  - @atproto/common@0.4.6
+  - @atproto/lexicon@0.4.5
+  - @atproto/crypto@0.4.2
+  - @atproto/xrpc-server@0.7.5
+  - @atproto/xrpc@0.6.6
+
 ## 0.1.64
 
 ### Patch Changes

package/dist/daemon/blob-diverter.d.ts

@@ -1,7 +1,7 @@
 import { IdResolver } from '@atproto/identity';
-import { Readable } from 'stream';
-import Database from '../db';
+import { Readable } from 'node:stream';
 import { BlobDivertConfig } from '../config';
+import Database from '../db';
 export declare class BlobDiverter {
     db: Database;
     serviceConfig: BlobDivertConfig;
@@ -10,17 +10,32 @@ export declare class BlobDiverter {
         idResolver: IdResolver;
         serviceConfig: BlobDivertConfig;
     });
-    private getBlob;
-    sendImage({ url, imageStream, contentType, }: {
-        url: string;
-        imageStream: Readable;
-        contentType: string;
-    }): Promise<boolean>;
-    private uploadBlob;
-    uploadBlobOnService({ subjectDid, subjectUri, subjectBlobCids, }: {
+    /**
+     * @throws {XRPCError} so that retryHttp can handle retries
+     */
+    getBlob(options: GetBlobOptions): Promise<Blob>;
+    /**
+     * @throws {XRPCError} so that retryHttp can handle retries
+     */
+    uploadBlob(blob: Blob, report: ReportBlobOptions): Promise<void>;
+    uploadBlobOnService({ subjectDid: did, subjectUri: uri, subjectBlobCids, }: {
         subjectDid: string;
         subjectUri: string | null;
         subjectBlobCids: string[];
-    }): Promise<boolean>;
+    }): Promise<void>;
 }
+type Blob = {
+    type: string;
+    stream: Readable;
+};
+type GetBlobOptions = {
+    pds: string;
+    did: string;
+    cid: string;
+};
+type ReportBlobOptions = {
+    did: string;
+    uri: string | null;
+};
+export {};
 //# sourceMappingURL=blob-diverter.d.ts.map

package/dist/daemon/blob-diverter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"blob-diverter.d.ts","sourceRoot":"","sources":["../../src/daemon/blob-diverter.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAA;AAGjC,OAAO,QAAQ,MAAM,OAAO,CAAA;AAE5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAE5C,qBAAa,YAAY;IAKd,EAAE,EAAE,QAAQ;IAJrB,aAAa,EAAE,gBAAgB,CAAA;IAC/B,UAAU,EAAE,UAAU,CAAA;gBAGb,EAAE,EAAE,QAAQ,EACnB,QAAQ,EAAE;QACR,UAAU,EAAE,UAAU,CAAA;QACtB,aAAa,EAAE,gBAAgB,CAAA;KAChC;YAMW,OAAO;IA6Bf,SAAS,CAAC,EACd,GAAG,EACH,WAAW,EACX,WAAW,GACZ,EAAE;QACD,GAAG,EAAE,MAAM,CAAA;QACX,WAAW,EAAE,QAAQ,CAAA;QACrB,WAAW,EAAE,MAAM,CAAA;KACpB;YAaa,UAAU;IAwBlB,mBAAmB,CAAC,EACxB,UAAU,EACV,UAAU,EACV,eAAe,GAChB,EAAE;QACD,UAAU,EAAE,MAAM,CAAA;QAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;QACzB,eAAe,EAAE,MAAM,EAAE,CAAA;KAC1B,GAAG,OAAO,CAAC,OAAO,CAAC;CAoCrB"}
+{"version":3,"file":"blob-diverter.d.ts","sourceRoot":"","sources":["../../src/daemon/blob-diverter.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAG9C,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAItC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAA;AAC5C,OAAO,QAAQ,MAAM,OAAO,CAAA;AAG5B,qBAAa,YAAY;IAKd,EAAE,EAAE,QAAQ;IAJrB,aAAa,EAAE,gBAAgB,CAAA;IAC/B,UAAU,EAAE,UAAU,CAAA;gBAGb,EAAE,EAAE,QAAQ,EACnB,QAAQ,EAAE;QACR,UAAU,EAAE,UAAU,CAAA;QACtB,aAAa,EAAE,gBAAgB,CAAA;KAChC;IAMH;;OAEG;IACG,OAAO,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,IAAI,CAAC;IA4CrD;;OAEG;IACG,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,iBAAiB;IA8BhD,mBAAmB,CAAC,EACxB,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,GAAG,EACf,eAAe,GAChB,EAAE;QACD,UAAU,EAAE,MAAM,CAAA;QAClB,UAAU,EAAE,MAAM,GAAG,IAAI,CAAA;QACzB,eAAe,EAAE,MAAM,EAAE,CAAA;KAC1B,GAAG,OAAO,CAAC,IAAI,CAAC;CA0BlB;AAMD,KAAK,IAAI,GAAG;IACV,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,QAAQ,CAAA;CACjB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;CACZ,CAAA;AASD,KAAK,iBAAiB,GAAG;IACvB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;CACnB,CAAA"}

package/dist/daemon/blob-diverter.js

@@ -1,12 +1,34 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BlobDiverter = void 0;
 const common_1 = require("@atproto/common");
-const axios_1 = __importDefault(require("axios"));
+const xrpc_1 = require("@atproto/xrpc");
 const cid_1 = require("multiformats/cid");
+const promises_1 = require("node:stream/promises");
+const undici = __importStar(require("undici"));
 const util_1 = require("../util");
 class BlobDiverter {
     constructor(db, services) {
@@ -31,70 +53,105 @@ class BlobDiverter {
         this.serviceConfig = services.serviceConfig;
         this.idResolver = services.idResolver;
     }
-    async getBlob({ pds, did, cid, }) {
-        const blobResponse = await axios_1.default.get(`${pds}/xrpc/com.atproto.sync.getBlob`, {
-            params: { did, cid },
-            decompress: true,
-            responseType: 'stream',
-            timeout: 5000, // 5sec of inactivity on the connection
+    /**
+     * @throws {XRPCError} so that retryHttp can handle retries
+     */
+    async getBlob(options) {
+        const blobUrl = getBlobUrl(options);
+        const blobResponse = await undici
+            .request(blobUrl, {
+            headersTimeout: 10e3,
+            bodyTimeout: 30e3,
+        })
+            .catch((err) => {
+            throw asXrpcClientError(err, `Error fetching blob ${options.cid}`);
         });
-        const imageStream = blobResponse.data;
-        const verifyCid = new common_1.VerifyCidTransform(cid_1.CID.parse(cid));
-        (0, common_1.forwardStreamErrors)(imageStream, verifyCid);
-        return {
-            contentType: blobResponse.headers['content-type'] || 'application/octet-stream',
-            imageStream: imageStream.pipe(verifyCid),
-        };
+        if (blobResponse.statusCode !== 200) {
+            blobResponse.body.destroy();
+            throw new xrpc_1.XRPCError(blobResponse.statusCode, undefined, `Error downloading blob ${options.cid}`);
+        }
+        try {
+            const type = blobResponse.headers['content-type'];
+            const encoding = blobResponse.headers['content-encoding'];
+            const verifier = new common_1.VerifyCidTransform(cid_1.CID.parse(options.cid));
+            void (0, promises_1.pipeline)([
+                blobResponse.body,
+                ...(0, common_1.createDecoders)(encoding),
+                verifier,
+            ]).catch((_err) => { });
+            return {
+                type: typeof type === 'string' ? type : 'application/octet-stream',
+                stream: verifier,
+            };
+        }
+        catch (err) {
+            // Typically un-supported content encoding
+            blobResponse.body.destroy();
+            throw err;
+        }
     }
-    async sendImage({ url, imageStream, contentType, }) {
-        const result = await (0, axios_1.default)(url, {
+    /**
+     * @throws {XRPCError} so that retryHttp can handle retries
+     */
+    async uploadBlob(blob, report) {
+        const uploadUrl = reportBlobUrl(this.serviceConfig.url, report);
+        const result = await undici
+            .request(uploadUrl, {
             method: 'POST',
-            data: imageStream,
+            body: blob.stream,
+            headersTimeout: 30e3,
+            bodyTimeout: 10e3,
             headers: {
                 Authorization: basicAuth('admin', this.serviceConfig.adminPassword),
-                'Content-Type': contentType,
+                'content-type': blob.type,
             },
+        })
+            .catch((err) => {
+            throw asXrpcClientError(err, `Error uploading blob ${report.did}`);
         });
-        return result.status === 200;
-    }
-    async uploadBlob({ imageStream, contentType, }, { subjectDid, subjectUri, }) {
-        const url = new URL(`${this.serviceConfig.url}/xrpc/com.atproto.unspecced.reportBlob`);
-        url.searchParams.set('did', subjectDid);
-        if (subjectUri)
-            url.searchParams.set('uri', subjectUri);
-        const result = await this.sendImage({
-            url: url.toString(),
-            imageStream,
-            contentType,
-        });
-        return result;
+        if (result.statusCode !== 200) {
+            result.body.destroy();
+            throw new xrpc_1.XRPCError(result.statusCode, undefined, `Error uploading blob ${report.did}`);
+        }
+        await (0, promises_1.finished)(result.body.resume());
     }
-    async uploadBlobOnService({ subjectDid, subjectUri, subjectBlobCids, }) {
-        const didDoc = await this.idResolver.did.resolve(subjectDid);
-        if (!didDoc) {
+    async uploadBlobOnService({ subjectDid: did, subjectUri: uri, subjectBlobCids, }) {
+        const didDoc = await this.idResolver.did.resolve(did);
+        if (!didDoc)
             throw new Error('Error resolving DID');
-        }
         const pds = (0, common_1.getPdsEndpoint)(didDoc);
-        if (!pds) {
+        if (!pds)
             throw new Error('Error resolving PDS');
-        }
-        // attempt to download and upload within the same retry block since the imageStream is not reusable
-        const uploadResult = await Promise.all(subjectBlobCids.map((cid) => (0, util_1.retryHttp)(async () => {
-            const { imageStream, contentType } = await this.getBlob({
-                pds,
-                cid,
-                did: subjectDid,
-            });
-            return this.uploadBlob({ imageStream, contentType }, { subjectDid, subjectUri });
-        })));
-        if (uploadResult.includes(false)) {
-            throw new Error(`Error uploading blob ${subjectUri}`);
-        }
-        return true;
+        await (0, common_1.allFulfilled)(subjectBlobCids.map((cid) => (0, util_1.retryHttp)(async () => {
+            // attempt to download and upload within the same retry block since
+            // the blob stream is not reusable
+            const blob = await this.getBlob({ pds, cid, did });
+            return this.uploadBlob(blob, { did, uri });
+        }))).catch((err) => {
+            throw new xrpc_1.XRPCError(xrpc_1.ResponseType.UpstreamFailure, undefined, 'Failed to process blobs', undefined, { cause: err });
+        });
     }
 }
 exports.BlobDiverter = BlobDiverter;
 const basicAuth = (username, password) => {
     return 'Basic ' + Buffer.from(`${username}:${password}`).toString('base64');
 };
+function getBlobUrl({ pds, did, cid }) {
+    const url = new URL(`/xrpc/com.atproto.sync.getBlob`, pds);
+    url.searchParams.set('did', did);
+    url.searchParams.set('cid', cid);
+    return url;
+}
+function reportBlobUrl(service, { did, uri }) {
+    const url = new URL(`/xrpc/com.atproto.unspecced.reportBlob`, service);
+    url.searchParams.set('did', did);
+    if (uri != null)
+        url.searchParams.set('uri', uri);
+    return url;
+}
+function asXrpcClientError(err, message) {
+    return new xrpc_1.XRPCError(xrpc_1.ResponseType.Unknown, undefined, message, undefined, {
+        cause: err,
+    });
+}
 //# sourceMappingURL=blob-diverter.js.map

package/dist/daemon/blob-diverter.js.map

@@ -1 +1 @@
-{"version":3,"file":"blob-diverter.js","sourceRoot":"","sources":["../../src/daemon/blob-diverter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"blob-diverter.js","sourceRoot":"","sources":["../../src/daemon/blob-diverter.ts"],"names":[],"mappings":"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"}

package/dist/util.d.ts

@@ -1,8 +1,7 @@
-import { RetryOptions } from '@atproto/common';
 import Database from './db';
 export declare const getSigningKeyId: (db: Database, signingKey: string) => Promise<number>;
-export declare function retryHttp<T>(fn: () => Promise<T>, opts?: RetryOptions): Promise<T>;
-export declare function retryableHttp(err: unknown): boolean;
+export declare const RETRYABLE_HTTP_STATUS_CODES: Set<number>;
+export declare const retryHttp: <T>(fn: () => Promise<T>, opts?: import("@atproto/common").RetryOptions) => Promise<T>;
 export type ParsedLabelers = {
     dids: string[];
     redact: Set<string>;

package/dist/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,YAAY,EAAS,MAAM,iBAAiB,CAAA;AACrD,OAAO,QAAQ,MAAM,MAAM,CAAA;AAE3B,eAAO,MAAM,eAAe,OACtB,QAAQ,cACA,MAAM,KACjB,OAAO,CAAC,MAAM,CAehB,CAAA;AAED,wBAAsB,SAAS,CAAC,CAAC,EAC/B,EAAE,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,EACpB,IAAI,GAAE,YAAiB,GACtB,OAAO,CAAC,CAAC,CAAC,CAEZ;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,OAAO,WAUzC;AAMD,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,mBAAmB,4BAA4B,CAAA;AAE5D,eAAO,MAAM,kBAAkB,WACrB,MAAM,GAAG,SAAS,cACd,MAAM,KACjB,cAAc,GAAG,IAuBnB,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,MAAM,EAAE,KAAG,cAKrD,CAAA;AAED,eAAO,MAAM,mBAAmB,WAAY,cAAc,KAAG,MAK5D,CAAA"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAGA,OAAO,QAAQ,MAAM,MAAM,CAAA;AAE3B,eAAO,MAAM,eAAe,OACtB,QAAQ,cACA,MAAM,KACjB,OAAO,CAAC,MAAM,CAehB,CAAA;AAED,eAAO,MAAM,2BAA2B,aAEtC,CAAA;AAEF,eAAO,MAAM,SAAS,wFAMpB,CAAA;AAEF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,EAAE,CAAA;IACd,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAA;CACpB,CAAA;AAED,eAAO,MAAM,mBAAmB,4BAA4B,CAAA;AAE5D,eAAO,MAAM,kBAAkB,WACrB,MAAM,GAAG,SAAS,cACd,MAAM,KACjB,cAAc,GAAG,IAuBnB,CAAA;AAED,eAAO,MAAM,oBAAoB,SAAU,MAAM,EAAE,KAAG,cAKrD,CAAA;AAED,eAAO,MAAM,mBAAmB,WAAY,cAAc,KAAG,MAK5D,CAAA"}

package/dist/util.js

@@ -1,12 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatLabelerHeader = exports.defaultLabelerHeader = exports.parseLabelerHeader = exports.LABELER_HEADER_NAME = exports.getSigningKeyId = void 0;
-exports.retryHttp = retryHttp;
-exports.retryableHttp = retryableHttp;
-const axios_1 = require("axios");
-const structured_headers_1 = require("structured-headers");
-const xrpc_1 = require("@atproto/xrpc");
+exports.formatLabelerHeader = exports.defaultLabelerHeader = exports.parseLabelerHeader = exports.LABELER_HEADER_NAME = exports.retryHttp = exports.RETRYABLE_HTTP_STATUS_CODES = exports.getSigningKeyId = void 0;
 const common_1 = require("@atproto/common");
+const xrpc_1 = require("@atproto/xrpc");
+const structured_headers_1 = require("structured-headers");
 const getSigningKeyId = async (db, signingKey) => {
     const selectRes = await db.db
         .selectFrom('signing_key')
@@ -24,25 +21,17 @@ const getSigningKeyId = async (db, signingKey) => {
     return insertRes.id;
 };
 exports.getSigningKeyId = getSigningKeyId;
-async function retryHttp(fn, opts = {}) {
-    return (0, common_1.retry)(fn, { retryable: retryableHttp, ...opts });
-}
-function retryableHttp(err) {
+exports.RETRYABLE_HTTP_STATUS_CODES = new Set([
+    408, 425, 429, 500, 502, 503, 504, 522, 524,
+]);
+exports.retryHttp = (0, common_1.createRetryable)((err) => {
     if (err instanceof xrpc_1.XRPCError) {
         if (err.status === xrpc_1.ResponseType.Unknown)
             return true;
-        return retryableHttpStatusCodes.has(err.status);
-    }
-    if (err instanceof axios_1.AxiosError) {
-        if (!err.response)
-            return true;
-        return retryableHttpStatusCodes.has(err.response.status);
+        return exports.RETRYABLE_HTTP_STATUS_CODES.has(err.status);
     }
     return false;
-}
-const retryableHttpStatusCodes = new Set([
-    408, 425, 429, 500, 502, 503, 504, 522, 524,
-]);
+});
 exports.LABELER_HEADER_NAME = 'atproto-accept-labelers';
 const parseLabelerHeader = (header, ignoreDid) => {
     if (!header)

package/dist/util.js.map

@@ -1 +1 @@
-{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"util.js","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":";;;AAAA,4CAAiD;AACjD,wCAAuD;AACvD,2DAA8C;AAGvC,MAAM,eAAe,GAAG,KAAK,EAClC,EAAY,EACZ,UAAkB,EACD,EAAE;IACnB,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,EAAE;SAC1B,UAAU,CAAC,aAAa,CAAC;SACzB,SAAS,EAAE;SACX,KAAK,CAAC,KAAK,EAAE,GAAG,EAAE,UAAU,CAAC;SAC7B,gBAAgB,EAAE,CAAA;IACrB,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,SAAS,CAAC,EAAE,CAAA;IACrB,CAAC;IACD,MAAM,SAAS,GAAG,MAAM,EAAE,CAAC,EAAE;SAC1B,UAAU,CAAC,aAAa,CAAC;SACzB,MAAM,CAAC,EAAE,GAAG,EAAE,UAAU,EAAE,CAAC;SAC3B,YAAY,EAAE;SACd,uBAAuB,EAAE,CAAA;IAC5B,OAAO,SAAS,CAAC,EAAE,CAAA;AACrB,CAAC,CAAA;AAlBY,QAAA,eAAe,mBAkB3B;AAEY,QAAA,2BAA2B,GAAG,IAAI,GAAG,CAAC;IACjD,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG;CAC5C,CAAC,CAAA;AAEW,QAAA,SAAS,GAAG,IAAA,wBAAe,EAAC,CAAC,GAAY,EAAE,EAAE;IACxD,IAAI,GAAG,YAAY,gBAAS,EAAE,CAAC;QAC7B,IAAI,GAAG,CAAC,MAAM,KAAK,mBAAY,CAAC,OAAO;YAAE,OAAO,IAAI,CAAA;QACpD,OAAO,mCAA2B,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,CAAA;IACpD,CAAC;IACD,OAAO,KAAK,CAAA;AACd,CAAC,CAAC,CAAA;AAOW,QAAA,mBAAmB,GAAG,yBAAyB,CAAA;AAErD,MAAM,kBAAkB,GAAG,CAChC,MAA0B,EAC1B,SAAkB,EACK,EAAE;IACzB,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAA;IACxB,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAA;IACrC,MAAM,UAAU,GAAG,IAAI,GAAG,EAAU,CAAA;IACpC,MAAM,MAAM,GAAG,IAAA,8BAAS,EAAC,MAAM,CAAC,CAAA;IAChC,KAAK,MAAM,IAAI,IAAI,MAAM,EAAE,CAAC;QAC1B,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAA;QAC9B,IAAI,CAAC,GAAG,EAAE,CAAC;YACT,OAAO,IAAI,CAAA;QACb,CAAC;QACD,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,SAAQ;QACV,CAAC;QACD,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACpB,MAAM,MAAM,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAA;QAC/C,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;YACpB,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,CAAA;QACrB,CAAC;IACH,CAAC;IACD,OAAO;QACL,IAAI,EAAE,CAAC,GAAG,WAAW,CAAC;QACtB,MAAM,EAAE,UAAU;KACnB,CAAA;AACH,CAAC,CAAA;AA1BY,QAAA,kBAAkB,sBA0B9B;AAEM,MAAM,oBAAoB,GAAG,CAAC,IAAc,EAAkB,EAAE;IACrE,OAAO;QACL,IAAI;QACJ,MAAM,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC;KACtB,CAAA;AACH,CAAC,CAAA;AALY,QAAA,oBAAoB,wBAKhC;AAEM,MAAM,mBAAmB,GAAG,CAAC,MAAsB,EAAU,EAAE;IACpE,MAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CACpC,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAC/C,CAAA;IACD,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;AACxB,CAAC,CAAA;AALY,QAAA,mBAAmB,uBAK/B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/ozone",
-  "version": "0.1.64",
+  "version": "0.1.66",
   "license": "MIT",
   "description": "Backend service for moderating the Bluesky network.",
   "keywords": [
@@ -18,7 +18,6 @@
   "bin": "dist/bin.js",
   "dependencies": {
     "@did-plc/lib": "^0.0.1",
-    "axios": "^1.6.7",
     "compression": "^1.7.4",
     "cors": "^2.8.5",
     "express": "^4.17.2",
@@ -32,14 +31,15 @@
     "structured-headers": "^1.0.1",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.13.25",
-    "@atproto/common": "^0.4.5",
-    "@atproto/crypto": "^0.4.2",
-    "@atproto/identity": "^0.4.3",
-    "@atproto/lexicon": "^0.4.4",
+    "undici": "^6.14.1",
+    "@atproto/api": "^0.13.26",
+    "@atproto/common": "^0.4.6",
+    "@atproto/crypto": "^0.4.3",
+    "@atproto/identity": "^0.4.5",
+    "@atproto/lexicon": "^0.4.5",
     "@atproto/syntax": "^0.3.1",
-    "@atproto/xrpc": "^0.6.5",
-    "@atproto/xrpc-server": "^0.7.4"
+    "@atproto/xrpc": "^0.6.6",
+    "@atproto/xrpc-server": "^0.7.6"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -48,12 +48,11 @@
     "@types/express-serve-static-core": "^4.17.36",
     "@types/pg": "^8.6.6",
     "@types/qs": "^6.9.7",
-    "axios": "^0.27.2",
     "jest": "^28.1.2",
     "ts-node": "^10.8.2",
     "typescript": "^5.6.3",
-    "@atproto/lex-cli": "^0.5.4",
-    "@atproto/pds": "^0.4.81"
+    "@atproto/lex-cli": "^0.5.5",
+    "@atproto/pds": "^0.4.83"
   },
   "scripts": {
     "codegen": "lex gen-server --yes ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/* ../../lexicons/chat/bsky/*/* ../../lexicons/tools/ozone/*/*",

package/src/daemon/blob-diverter.ts

@@ -1,16 +1,19 @@
 import {
-  VerifyCidTransform,
-  forwardStreamErrors,
+  createDecoders,
   getPdsEndpoint,
+  VerifyCidTransform,
+  allFulfilled,
 } from '@atproto/common'
 import { IdResolver } from '@atproto/identity'
-import axios from 'axios'
-import { Readable } from 'stream'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
 import { CID } from 'multiformats/cid'
+import { Readable } from 'node:stream'
+import { finished, pipeline } from 'node:stream/promises'
+import * as undici from 'undici'
 
+import { BlobDivertConfig } from '../config'
 import Database from '../db'
 import { retryHttp } from '../util'
-import { BlobDivertConfig } from '../config'
 
 export class BlobDiverter {
   serviceConfig: BlobDivertConfig
@@ -27,126 +30,158 @@ export class BlobDiverter {
     this.idResolver = services.idResolver
   }
 
-  private async getBlob({
-    pds,
-    did,
-    cid,
-  }: {
-    pds: string
-    did: string
-    cid: string
-  }) {
-    const blobResponse = await axios.get(
-      `${pds}/xrpc/com.atproto.sync.getBlob`,
-      {
-        params: { did, cid },
-        decompress: true,
-        responseType: 'stream',
-        timeout: 5000, // 5sec of inactivity on the connection
-      },
-    )
-    const imageStream: Readable = blobResponse.data
-    const verifyCid = new VerifyCidTransform(CID.parse(cid))
-    forwardStreamErrors(imageStream, verifyCid)
-
-    return {
-      contentType:
-        blobResponse.headers['content-type'] || 'application/octet-stream',
-      imageStream: imageStream.pipe(verifyCid),
+  /**
+   * @throws {XRPCError} so that retryHttp can handle retries
+   */
+  async getBlob(options: GetBlobOptions): Promise<Blob> {
+    const blobUrl = getBlobUrl(options)
+
+    const blobResponse = await undici
+      .request(blobUrl, {
+        headersTimeout: 10e3,
+        bodyTimeout: 30e3,
+      })
+      .catch((err) => {
+        throw asXrpcClientError(err, `Error fetching blob ${options.cid}`)
+      })
+
+    if (blobResponse.statusCode !== 200) {
+      blobResponse.body.destroy()
+      throw new XRPCError(
+        blobResponse.statusCode,
+        undefined,
+        `Error downloading blob ${options.cid}`,
+      )
     }
-  }
-
-  async sendImage({
-    url,
-    imageStream,
-    contentType,
-  }: {
-    url: string
-    imageStream: Readable
-    contentType: string
-  }) {
-    const result = await axios(url, {
-      method: 'POST',
-      data: imageStream,
-      headers: {
-        Authorization: basicAuth('admin', this.serviceConfig.adminPassword),
-        'Content-Type': contentType,
-      },
-    })
 
-    return result.status === 200
+    try {
+      const type = blobResponse.headers['content-type']
+      const encoding = blobResponse.headers['content-encoding']
+
+      const verifier = new VerifyCidTransform(CID.parse(options.cid))
+
+      void pipeline([
+        blobResponse.body,
+        ...createDecoders(encoding),
+        verifier,
+      ]).catch((_err) => {})
+
+      return {
+        type: typeof type === 'string' ? type : 'application/octet-stream',
+        stream: verifier,
+      }
+    } catch (err) {
+      // Typically un-supported content encoding
+      blobResponse.body.destroy()
+      throw err
+    }
   }
 
-  private async uploadBlob(
-    {
-      imageStream,
-      contentType,
-    }: { imageStream: Readable; contentType: string },
-    {
-      subjectDid,
-      subjectUri,
-    }: { subjectDid: string; subjectUri: string | null },
-  ) {
-    const url = new URL(
-      `${this.serviceConfig.url}/xrpc/com.atproto.unspecced.reportBlob`,
-    )
-    url.searchParams.set('did', subjectDid)
-    if (subjectUri) url.searchParams.set('uri', subjectUri)
-    const result = await this.sendImage({
-      url: url.toString(),
-      imageStream,
-      contentType,
-    })
+  /**
+   * @throws {XRPCError} so that retryHttp can handle retries
+   */
+  async uploadBlob(blob: Blob, report: ReportBlobOptions) {
+    const uploadUrl = reportBlobUrl(this.serviceConfig.url, report)
+
+    const result = await undici
+      .request(uploadUrl, {
+        method: 'POST',
+        body: blob.stream,
+        headersTimeout: 30e3,
+        bodyTimeout: 10e3,
+        headers: {
+          Authorization: basicAuth('admin', this.serviceConfig.adminPassword),
+          'content-type': blob.type,
+        },
+      })
+      .catch((err) => {
+        throw asXrpcClientError(err, `Error uploading blob ${report.did}`)
+      })
+
+    if (result.statusCode !== 200) {
+      result.body.destroy()
+      throw new XRPCError(
+        result.statusCode,
+        undefined,
+        `Error uploading blob ${report.did}`,
+      )
+    }
 
-    return result
+    await finished(result.body.resume())
   }
 
   async uploadBlobOnService({
-    subjectDid,
-    subjectUri,
+    subjectDid: did,
+    subjectUri: uri,
     subjectBlobCids,
   }: {
     subjectDid: string
     subjectUri: string | null
     subjectBlobCids: string[]
-  }): Promise<boolean> {
-    const didDoc = await this.idResolver.did.resolve(subjectDid)
-
-    if (!didDoc) {
-      throw new Error('Error resolving DID')
-    }
+  }): Promise<void> {
+    const didDoc = await this.idResolver.did.resolve(did)
+    if (!didDoc) throw new Error('Error resolving DID')
 
     const pds = getPdsEndpoint(didDoc)
+    if (!pds) throw new Error('Error resolving PDS')
 
-    if (!pds) {
-      throw new Error('Error resolving PDS')
-    }
-
-    // attempt to download and upload within the same retry block since the imageStream is not reusable
-    const uploadResult = await Promise.all(
+    await allFulfilled(
       subjectBlobCids.map((cid) =>
         retryHttp(async () => {
-          const { imageStream, contentType } = await this.getBlob({
-            pds,
-            cid,
-            did: subjectDid,
-          })
-          return this.uploadBlob(
-            { imageStream, contentType },
-            { subjectDid, subjectUri },
-          )
+          // attempt to download and upload within the same retry block since
+          // the blob stream is not reusable
+          const blob = await this.getBlob({ pds, cid, did })
+          return this.uploadBlob(blob, { did, uri })
         }),
       ),
-    )
-
-    if (uploadResult.includes(false)) {
-      throw new Error(`Error uploading blob ${subjectUri}`)
-    }
-
-    return true
+    ).catch((err) => {
+      throw new XRPCError(
+        ResponseType.UpstreamFailure,
+        undefined,
+        'Failed to process blobs',
+        undefined,
+        { cause: err },
+      )
+    })
   }
 }
 
 const basicAuth = (username: string, password: string) => {
   return 'Basic ' + Buffer.from(`${username}:${password}`).toString('base64')
 }
+
+type Blob = {
+  type: string
+  stream: Readable
+}
+
+type GetBlobOptions = {
+  pds: string
+  did: string
+  cid: string
+}
+
+function getBlobUrl({ pds, did, cid }: GetBlobOptions): URL {
+  const url = new URL(`/xrpc/com.atproto.sync.getBlob`, pds)
+  url.searchParams.set('did', did)
+  url.searchParams.set('cid', cid)
+  return url
+}
+
+type ReportBlobOptions = {
+  did: string
+  uri: string | null
+}
+
+function reportBlobUrl(service: string, { did, uri }: ReportBlobOptions): URL {
+  const url = new URL(`/xrpc/com.atproto.unspecced.reportBlob`, service)
+  url.searchParams.set('did', did)
+  if (uri != null) url.searchParams.set('uri', uri)
+  return url
+}
+
+function asXrpcClientError(err: unknown, message: string) {
+  return new XRPCError(ResponseType.Unknown, undefined, message, undefined, {
+    cause: err,
+  })
+}

package/src/util.ts

@@ -1,7 +1,6 @@
-import { AxiosError } from 'axios'
+import { createRetryable } from '@atproto/common'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
 import { parseList } from 'structured-headers'
-import { XRPCError, ResponseType } from '@atproto/xrpc'
-import { RetryOptions, retry } from '@atproto/common'
 import Database from './db'
 
 export const getSigningKeyId = async (
@@ -24,28 +23,17 @@ export const getSigningKeyId = async (
   return insertRes.id
 }
 
-export async function retryHttp<T>(
-  fn: () => Promise<T>,
-  opts: RetryOptions = {},
-): Promise<T> {
-  return retry(fn, { retryable: retryableHttp, ...opts })
-}
+export const RETRYABLE_HTTP_STATUS_CODES = new Set([
+  408, 425, 429, 500, 502, 503, 504, 522, 524,
+])
 
-export function retryableHttp(err: unknown) {
+export const retryHttp = createRetryable((err: unknown) => {
   if (err instanceof XRPCError) {
     if (err.status === ResponseType.Unknown) return true
-    return retryableHttpStatusCodes.has(err.status)
-  }
-  if (err instanceof AxiosError) {
-    if (!err.response) return true
-    return retryableHttpStatusCodes.has(err.response.status)
+    return RETRYABLE_HTTP_STATUS_CODES.has(err.status)
   }
   return false
-}
-
-const retryableHttpStatusCodes = new Set([
-  408, 425, 429, 500, 502, 503, 504, 522, 524,
-])
+})
 
 export type ParsedLabelers = {
   dids: string[]

package/tests/_util.ts

@@ -1,3 +1,6 @@
+import { type Express } from 'express'
+import { Server } from 'node:http'
+import { AddressInfo } from 'node:net'
 import { AtUri } from '@atproto/syntax'
 import { lexToJson } from '@atproto/lexicon'
 import { CID } from 'multiformats/cid'
@@ -195,3 +198,46 @@ export const stripViewerFromThread = <T>(thread: T): T => {
   }
   return thread
 }
+
+export async function startServer(app: Express) {
+  return new Promise<{
+    origin: string
+    server: Server
+    stop: () => Promise<void>
+  }>((resolve, reject) => {
+    const onListen = () => {
+      const port = (server.address() as AddressInfo).port
+      resolve({
+        server,
+        origin: `http://localhost:${port}`,
+        stop: () => stopServer(server),
+      })
+      cleanup()
+    }
+    const onError = (err: Error) => {
+      reject(err)
+      cleanup()
+    }
+    const cleanup = () => {
+      server.removeListener('listening', onListen)
+      server.removeListener('error', onError)
+    }
+
+    const server = app
+      .listen(0)
+      .once('listening', onListen)
+      .once('error', onError)
+  })
+}
+
+export async function stopServer(server: Server) {
+  return new Promise<void>((resolve, reject) => {
+    server.close((err) => {
+      if (err) {
+        reject(err)
+      } else {
+        resolve()
+      }
+    })
+  })
+}

package/tests/blob-divert.test.ts

@@ -1,10 +1,11 @@
-import assert from 'node:assert'
 import {
   ModeratorClient,
   SeedClient,
   TestNetwork,
   basicSeed,
 } from '@atproto/dev-env'
+import { ResponseType, XRPCError } from '@atproto/xrpc'
+import assert from 'node:assert'
 import { forSnapshot } from './_util'
 
 describe('blob divert', () => {
@@ -30,13 +31,16 @@ describe('blob divert', () => {
     await network.close()
   })
 
-  const mockReportServiceResponse = (result: boolean) => {
+  const mockReportServiceResponse = (succeeds: boolean) => {
     const blobDiverter = network.ozone.ctx.blobDiverter
     assert(blobDiverter)
     return jest
-      .spyOn(blobDiverter, 'sendImage')
+      .spyOn(blobDiverter, 'uploadBlob')
       .mockImplementation(async () => {
-        return result
+        if (!succeeds) {
+          // Using an XRPCError to trigger retries
+          throw new XRPCError(ResponseType.Unknown, undefined)
+        }
       })
   }
 
@@ -46,6 +50,8 @@ describe('blob divert', () => {
     cid: sc.posts[sc.dids.carol][0].ref.cidStr,
   })
 
+  const getImages = () => sc.posts[sc.dids.carol][0].images
+
   const emitDivertEvent = async () =>
     modClient.emitEvent(
       {
@@ -55,9 +61,7 @@ describe('blob divert', () => {
           comment: 'Diverting for test',
         },
         createdBy: sc.dids.alice,
-        subjectBlobCids: sc.posts[sc.dids.carol][0].images.map((img) =>
-          img.image.ref.toString(),
-        ),
+        subjectBlobCids: getImages().map((img) => img.image.ref.toString()),
       },
       'moderator',
     )
@@ -65,25 +69,32 @@ describe('blob divert', () => {
   it('fails and keeps attempt count when report service fails to accept upload.', async () => {
     // Simulate failure to fail upload
     const reportServiceRequest = mockReportServiceResponse(false)
+    try {
+      await expect(emitDivertEvent()).rejects.toThrow('Failed to process blobs')
 
-    await expect(emitDivertEvent()).rejects.toThrow()
-
-    expect(reportServiceRequest).toHaveBeenCalled()
+      // 1 initial attempt + 3 retries
+      expect(reportServiceRequest).toHaveBeenCalledTimes(getImages().length * 4)
+    } finally {
+      reportServiceRequest.mockRestore()
+    }
   })
 
   it('sends blobs to configured divert service and marks divert date', async () => {
-    // Simulate failure to accept upload
+    // Simulate success to accept upload
     const reportServiceRequest = mockReportServiceResponse(true)
+    try {
+      const divertEvent = await emitDivertEvent()
 
-    const divertEvent = await emitDivertEvent()
+      expect(reportServiceRequest).toHaveBeenCalledTimes(getImages().length)
+      expect(forSnapshot(divertEvent)).toMatchSnapshot()
 
-    expect(reportServiceRequest).toHaveBeenCalled()
-    expect(forSnapshot(divertEvent)).toMatchSnapshot()
-
-    const { subjectStatuses } = await modClient.queryStatuses({
-      subject: getSubject().uri,
-    })
+      const { subjectStatuses } = await modClient.queryStatuses({
+        subject: getSubject().uri,
+      })
 
-    expect(subjectStatuses[0].takendown).toBe(true)
+      expect(subjectStatuses[0].takendown).toBe(true)
+    } finally {
+      reportServiceRequest.mockRestore()
+    }
   })
 })

package/tests/moderation.test.ts

@@ -816,7 +816,9 @@ describe('moderation', () => {
     it.skip('prevents image blob from being served, even when cached.', async () => {
       const fetchImage = await fetch(imageUri)
       expect(fetchImage.status).toEqual(404)
-      expect(await fetchImage.json()).toEqual({ message: 'Image not found' })
+      expect(await fetchImage.json()).toMatchObject({
+        message: 'Blob not found',
+      })
     })
 
     it('invalidates the image in the cdn', async () => {

package/tests/server.test.ts

@@ -1,8 +1,7 @@
-import { AddressInfo } from 'net'
+import { TestNetwork, TestOzone } from '@atproto/dev-env'
 import express from 'express'
-import axios, { AxiosError } from 'axios'
-import { TestOzone, TestNetwork } from '@atproto/dev-env'
 import { handler as errorHandler } from '../src/error'
+import { startServer } from './_util'
 
 describe('server', () => {
   let network: TestNetwork
@@ -20,56 +19,45 @@ describe('server', () => {
   })
 
   it('preserves 404s.', async () => {
-    const promise = axios.get(`${ozone.url}/unknown`)
-    await expect(promise).rejects.toThrow('failed with status code 404')
+    const response = await fetch(`${ozone.url}/unknown`)
+    expect(response.status).toEqual(404)
   })
 
   it('error handler turns unknown errors into 500s.', async () => {
     const app = express()
-    app.get('/oops', () => {
-      throw new Error('Oops!')
-    })
-    app.use(errorHandler)
-    const srv = app.listen()
-    const port = (srv.address() as AddressInfo).port
-    const promise = axios.get(`http://localhost:${port}/oops`)
-    await expect(promise).rejects.toThrow('failed with status code 500')
-    srv.close()
+      .get('/oops', () => {
+        throw new Error('Oops!')
+      })
+      .use(errorHandler)
+
+    const { origin, stop } = await startServer(app)
     try {
-      await promise
-    } catch (err: unknown) {
-      const axiosError = err as AxiosError
-      expect(axiosError.response?.status).toEqual(500)
-      expect(axiosError.response?.data).toEqual({
+      const response = await fetch(new URL(`/oops`, origin))
+      expect(response.status).toEqual(500)
+      await expect(response.json()).resolves.toEqual({
         error: 'InternalServerError',
         message: 'Internal Server Error',
       })
+    } finally {
+      await stop()
     }
   })
 
   it('healthcheck succeeds when database is available.', async () => {
-    const { data, status } = await axios.get(`${ozone.url}/xrpc/_health`)
-    expect(status).toEqual(200)
-    expect(data).toEqual({ version: '0.0.0' })
+    const response = await fetch(`${network.bsky.url}/xrpc/_health`)
+    expect(response.status).toEqual(200)
+    await expect(response.json()).resolves.toEqual({ version: 'unknown' })
   })
 
   it('healthcheck fails when database is unavailable.', async () => {
     // destroy sequencer to release connection that would prevent the db from closing
     await ozone.ctx.sequencer.destroy()
     await ozone.ctx.db.close()
-    let error: AxiosError
-    try {
-      await axios.get(`${ozone.url}/xrpc/_health`)
-      throw new Error('Healthcheck should have failed')
-    } catch (err) {
-      if (axios.isAxiosError(err)) {
-        error = err
-      } else {
-        throw err
-      }
-    }
-    expect(error.response?.status).toEqual(503)
-    expect(error.response?.data).toEqual({
+
+    const res = await fetch(`${ozone.url}/xrpc/_health`)
+
+    expect(res.status).toEqual(503)
+    await expect(res.json()).resolves.toEqual({
       version: '0.0.0',
       error: 'Service Unavailable',
     })