@atproto/aws 0.2.28 → 0.2.30

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @atproto/aws
 
+## 0.2.30
+
+### Patch Changes
+
+- Updated dependencies [[`8dd77bad2`](https://github.com/bluesky-social/atproto/commit/8dd77bad2fdee20e39d3787198d960c19d8df3d0)]:
+  - @atproto/repo@0.8.10
+
+## 0.2.29
+
+### Patch Changes
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Optimistically attempt to move files before checking for their existence, resulting in faster `makePermanent` calls
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - `S3BlobStore`'s `deleteMany` now supports any number of input (and will process deletes by chunks internally)
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Update `@aws-sdk` dependencies
+
+- [#4169](https://github.com/bluesky-social/atproto/pull/4169) [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099) Thanks [@matthieusieben](https://github.com/matthieusieben)! - Set a timeout (of 10 seconds by default) on every `S3BlobStore` requests
+
+- Updated dependencies [[`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099), [`055a413fb`](https://github.com/bluesky-social/atproto/commit/055a413fba4fab510ec899377154f1204ab12099)]:
+  - @atproto/repo@0.8.9
+  - @atproto/common-web@0.4.3
+  - @atproto/common@0.4.12
+  - @atproto/crypto@0.4.4
+
 ## 0.2.28
 
 ### Patch Changes

package/dist/s3.d.ts

@@ -1,11 +1,19 @@
 import stream from 'node:stream';
-import * as aws from '@aws-sdk/client-s3';
+import { S3ClientConfig } from '@aws-sdk/client-s3';
 import { CID } from 'multiformats/cid';
 import { BlobStore } from '@atproto/repo';
 export type S3Config = {
     bucket: string;
+    /**
+     * The maximum time any request to S3 (including individual blob chunks
+     * uploads) can take, in milliseconds.
+     */
+    requestTimeoutMs?: number;
+    /**
+     * The maximum total time a blob upload can take, in milliseconds.
+     */
     uploadTimeoutMs?: number;
-} & Omit<aws.S3ClientConfig, 'apiVersion'>;
+} & Omit<S3ClientConfig, 'apiVersion' | 'requestHandler'>;
 export declare class S3BlobStore implements BlobStore {
     did: string;
     private client;
@@ -17,6 +25,7 @@ export declare class S3BlobStore implements BlobStore {
     private getTmpPath;
     private getStoredPath;
     private getQuarantinedPath;
+    private uploadBytes;
     putTemp(bytes: Uint8Array | stream.Readable): Promise<string>;
     makePermanent(key: string, cid: CID): Promise<void>;
     putPermanent(cid: CID, bytes: Uint8Array | stream.Readable): Promise<void>;

package/dist/s3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../src/s3.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,KAAK,GAAG,MAAM,oBAAoB,CAAA;AAEzC,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAEtC,OAAO,EAAqB,SAAS,EAAE,MAAM,eAAe,CAAA;AAE5D,MAAM,MAAM,QAAQ,GAAG;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,eAAe,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CACxE,GAAG,CAAC,cAAc,EAClB,YAAY,CACb,CAAA;AAKD,qBAAa,WAAY,YAAW,SAAS;IAMlC,GAAG,EAAE,MAAM;IALpB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,eAAe,CAAQ;gBAGtB,GAAG,EAAE,MAAM,EAClB,GAAG,EAAE,QAAQ;IAWf,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,IAClB,KAAK,MAAM;IAKrB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,kBAAkB;IAIpB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IA0B7D,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAanD,YAAY,CAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,QAAQ,GAClC,OAAO,CAAC,IAAI,CAAC;IAwBV,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnC,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;YAO7B,SAAS;IAYjB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAKvC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;IAK7C,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/B,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAKtC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAIrC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAI9B,MAAM;YAYN,SAAS;YAOT,cAAc;YASd,IAAI;CAenB;AAUD,eAAe,WAAW,CAAA"}
+{"version":3,"file":"s3.d.ts","sourceRoot":"","sources":["../src/s3.ts"],"names":[],"mappings":"AAAA,OAAO,MAAM,MAAM,aAAa,CAAA;AAChC,OAAO,EAAiB,cAAc,EAAE,MAAM,oBAAoB,CAAA;AAElE,OAAO,EAAE,GAAG,EAAE,MAAM,kBAAkB,CAAA;AAGtC,OAAO,EAAqB,SAAS,EAAE,MAAM,eAAe,CAAA;AAE5D,MAAM,MAAM,QAAQ,GAAG;IACrB,MAAM,EAAE,MAAM,CAAA;IACd;;;OAGG;IACH,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,eAAe,CAAC,EAAE,MAAM,CAAA;CACzB,GAAG,IAAI,CAAC,cAAc,EAAE,YAAY,GAAG,gBAAgB,CAAC,CAAA;AAEzD,qBAAa,WAAY,YAAW,SAAS;IAMlC,GAAG,EAAE,MAAM;IALpB,OAAO,CAAC,MAAM,CAAI;IAClB,OAAO,CAAC,MAAM,CAAQ;IACtB,OAAO,CAAC,eAAe,CAAQ;gBAGtB,GAAG,EAAE,MAAM,EAClB,GAAG,EAAE,QAAQ;IAqBf,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,QAAQ,IAClB,KAAK,MAAM;IAKrB,OAAO,CAAC,MAAM;IAId,OAAO,CAAC,UAAU;IAIlB,OAAO,CAAC,aAAa;IAIrB,OAAO,CAAC,kBAAkB;YAIZ,WAAW;IAoCnB,OAAO,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC;IAM7D,aAAa,CAAC,GAAG,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAyBnD,YAAY,CAChB,GAAG,EAAE,GAAG,EACR,KAAK,EAAE,UAAU,GAAG,MAAM,CAAC,QAAQ,GAClC,OAAO,CAAC,IAAI,CAAC;IAIV,UAAU,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAOnC,YAAY,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;YAO7B,SAAS;IAYjB,QAAQ,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,UAAU,CAAC;IAKvC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,CAAC;IAK7C,MAAM,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/B,UAAU,CAAC,IAAI,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAatC,SAAS,CAAC,GAAG,EAAE,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;IAIrC,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;YAI9B,MAAM;YAYN,SAAS;YAOT,cAAc;YASd,IAAI;CA8BnB;AAED,eAAe,WAAW,CAAA"}

package/dist/s3.js

@@ -1,45 +1,11 @@
 "use strict";
-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 () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.S3BlobStore = void 0;
-const aws = __importStar(require("@aws-sdk/client-s3"));
+const client_s3_1 = require("@aws-sdk/client-s3");
 const lib_storage_1 = require("@aws-sdk/lib-storage");
+const common_web_1 = require("@atproto/common-web");
 const crypto_1 = require("@atproto/crypto");
 const repo_1 = require("@atproto/repo");
-// @NOTE we use Upload rather than client.putObject because stream
-// length is not known in advance. See also aws/aws-sdk-js-v3#2348.
 class S3BlobStore {
     constructor(did, cfg) {
         Object.defineProperty(this, "did", {
@@ -66,12 +32,17 @@ class S3BlobStore {
             writable: true,
             value: void 0
         });
-        const { bucket, uploadTimeoutMs, ...rest } = cfg;
+        const { bucket, uploadTimeoutMs = 10 * common_web_1.SECOND, requestTimeoutMs = uploadTimeoutMs, ...rest } = cfg;
         this.bucket = bucket;
-        this.uploadTimeoutMs = uploadTimeoutMs ?? 10000;
-        this.client = new aws.S3({
+        this.uploadTimeoutMs = uploadTimeoutMs;
+        this.client = new client_s3_1.S3({
             ...rest,
             apiVersion: '2006-03-01',
+            // Ensures that all requests timeout under "requestTimeoutMs".
+            //
+            // @NOTE This will also apply to the upload of each individual chunk
+            // when using Upload from @aws-sdk/lib-storage.
+            requestHandler: { requestTimeout: requestTimeoutMs },
         });
     }
     static creator(cfg) {
@@ -91,17 +62,23 @@ class S3BlobStore {
     getQuarantinedPath(cid) {
         return `quarantine/${this.did}/${cid.toString()}`;
     }
-    async putTemp(bytes) {
-        const key = this.genKey();
-        // @NOTE abort results in error from aws-sdk "Upload aborted." with name "AbortError"
+    async uploadBytes(path, bytes) {
+        // @NOTE we use Upload rather than client.putObject because stream length is
+        // not known in advance. See also aws/aws-sdk-js-v3#2348.
+        //
+        // See also https://github.com/aws/aws-sdk-js-v3/issues/6426, wherein Upload
+        // may hang the s3 connection under certain circumstances. We don't have a
+        // good way to avoid this, so we use timeouts defensively on all s3
+        // requests.
+        const abortSignal = AbortSignal.timeout(this.uploadTimeoutMs);
         const abortController = new AbortController();
-        const timeout = setTimeout(() => abortController.abort(), this.uploadTimeoutMs);
+        abortSignal.addEventListener('abort', () => abortController.abort());
         const upload = new lib_storage_1.Upload({
             client: this.client,
             params: {
                 Bucket: this.bucket,
                 Body: bytes,
-                Key: this.getTmpPath(key),
+                Key: path,
             },
             // @ts-ignore native implementation fine in node >=15
             abortController,
@@ -109,44 +86,46 @@ class S3BlobStore {
         try {
             await upload.done();
         }
-        finally {
-            clearTimeout(timeout);
+        catch (err) {
+            // Translate aws-sdk's abort error to something more specific
+            if (err instanceof Error && err.name === 'AbortError') {
+                throw new Error('Blob upload timed out', { cause: err });
+            }
+            throw err;
         }
+    }
+    async putTemp(bytes) {
+        const key = this.genKey();
+        await this.uploadBytes(this.getTmpPath(key), bytes);
         return key;
     }
     async makePermanent(key, cid) {
-        const alreadyHas = await this.hasStored(cid);
-        if (!alreadyHas) {
+        try {
+            // @NOTE we normally call this method when we know the file is temporary.
+            // Because of this, we optimistically move the file, allowing to make
+            // fewer network requests in the happy path.
             await this.move({
                 from: this.getTmpPath(key),
                 to: this.getStoredPath(cid),
             });
         }
-        else {
-            // already saved, so we no-op & just delete the temp
-            await this.deleteKey(this.getTmpPath(key));
+        catch (err) {
+            // If the optimistic move failed because the temp file was not found,
+            // check if the permanent file already exists. If it does, we can assume
+            // that another process made the file permanent concurrently, and we can
+            // no-op.
+            if (err instanceof repo_1.BlobNotFoundError) {
+                // Blob was not found from temp storage...
+                const alreadyHas = await this.hasStored(cid);
+                // already saved, so we no-op
+                if (alreadyHas)
+                    return;
+            }
+            throw err;
         }
     }
     async putPermanent(cid, bytes) {
-        // @NOTE abort results in error from aws-sdk "Upload aborted." with name "AbortError"
-        const abortController = new AbortController();
-        const timeout = setTimeout(() => abortController.abort(), this.uploadTimeoutMs);
-        const upload = new lib_storage_1.Upload({
-            client: this.client,
-            params: {
-                Bucket: this.bucket,
-                Body: bytes,
-                Key: this.getStoredPath(cid),
-            },
-            // @ts-ignore native implementation fine in node >=15
-            abortController,
-        });
-        try {
-            await upload.done();
-        }
-        finally {
-            clearTimeout(timeout);
-        }
+        await this.uploadBytes(this.getStoredPath(cid), bytes);
     }
     async quarantine(cid) {
         await this.move({
@@ -184,8 +163,18 @@ class S3BlobStore {
         await this.deleteKey(this.getStoredPath(cid));
     }
     async deleteMany(cids) {
-        const keys = cids.map((cid) => this.getStoredPath(cid));
-        await this.deleteManyKeys(keys);
+        const errors = [];
+        for (const chunk of (0, common_web_1.chunkArray)(cids, 500)) {
+            try {
+                const keys = chunk.map((cid) => this.getStoredPath(cid));
+                await this.deleteManyKeys(keys);
+            }
+            catch (err) {
+                errors.push(err);
+            }
+        }
+        if (errors.length)
+            throw (0, common_web_1.aggregateErrors)(errors);
     }
     async hasStored(cid) {
         return this.hasKey(this.getStoredPath(cid));
@@ -226,24 +215,29 @@ class S3BlobStore {
                 CopySource: `${this.bucket}/${keys.from}`,
                 Key: keys.to,
             });
+        }
+        catch (cause) {
+            if (cause instanceof client_s3_1.NoSuchKey) {
+                // Already deleted, possibly by a concurrently running process
+                throw new repo_1.BlobNotFoundError(undefined, { cause });
+            }
+            throw cause;
+        }
+        try {
             await this.client.deleteObject({
                 Bucket: this.bucket,
                 Key: keys.from,
             });
         }
         catch (err) {
-            handleErr(err);
+            if (err instanceof client_s3_1.NoSuchKey) {
+                // Already deleted, possibly by a concurrently running process
+                return;
+            }
+            throw err;
         }
     }
 }
 exports.S3BlobStore = S3BlobStore;
-const handleErr = (err) => {
-    if (err?.['Code'] === 'NoSuchKey') {
-        throw new repo_1.BlobNotFoundError();
-    }
-    else {
-        throw err;
-    }
-};
 exports.default = S3BlobStore;
 //# sourceMappingURL=s3.js.map

package/dist/s3.js.map

@@ -1 +1 @@
-{"version":3,"file":"s3.js","sourceRoot":"","sources":["../src/s3.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,wDAAyC;AACzC,sDAA6C;AAE7C,4CAA2C;AAC3C,wCAA4D;AAO5D,kEAAkE;AAClE,mEAAmE;AAEnE,MAAa,WAAW;IAKtB,YACS,GAAW,EAClB,GAAa;QADb;;;;mBAAO,GAAG;WAAQ;QALZ;;;;;WAAc;QACd;;;;;WAAc;QACd;;;;;WAAuB;QAM7B,MAAM,EAAE,MAAM,EAAE,eAAe,EAAE,GAAG,IAAI,EAAE,GAAG,GAAG,CAAA;QAChD,IAAI,CAAC,MAAM,GAAG,MAAM,CAAA;QACpB,IAAI,CAAC,eAAe,GAAG,eAAe,IAAI,KAAK,CAAA;QAC/C,IAAI,CAAC,MAAM,GAAG,IAAI,GAAG,CAAC,EAAE,CAAC;YACvB,GAAG,IAAI;YACP,UAAU,EAAE,YAAY;SACzB,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,CAAC,OAAO,CAAC,GAAa;QAC1B,OAAO,CAAC,GAAW,EAAE,EAAE;YACrB,OAAO,IAAI,WAAW,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;QAClC,CAAC,CAAA;IACH,CAAC;IAEO,MAAM;QACZ,OAAO,IAAA,kBAAS,EAAC,EAAE,EAAE,QAAQ,CAAC,CAAA;IAChC,CAAC;IAEO,UAAU,CAAC,GAAW;QAC5B,OAAO,OAAO,IAAI,CAAC,GAAG,IAAI,GAAG,EAAE,CAAA;IACjC,CAAC;IAEO,aAAa,CAAC,GAAQ;QAC5B,OAAO,UAAU,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAA;IAC/C,CAAC;IAEO,kBAAkB,CAAC,GAAQ;QACjC,OAAO,cAAc,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,QAAQ,EAAE,EAAE,CAAA;IACnD,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAAmC;QAC/C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAA;QACzB,qFAAqF;QACrF,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,OAAO,GAAG,UAAU,CACxB,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAC7B,IAAI,CAAC,eAAe,CACrB,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,KAAK;gBACX,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;aAC1B;YACD,qDAAqD;YACrD,eAAe;SAChB,CAAC,CAAA;QACF,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;QACrB,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC;QACD,OAAO,GAAG,CAAA;IACZ,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,GAAW,EAAE,GAAQ;QACvC,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QAC5C,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,MAAM,IAAI,CAAC,IAAI,CAAC;gBACd,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC;gBAC1B,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;aAC5B,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,oDAAoD;YACpD,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;QAC5C,CAAC;IACH,CAAC;IAED,KAAK,CAAC,YAAY,CAChB,GAAQ,EACR,KAAmC;QAEnC,qFAAqF;QACrF,MAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAA;QAC7C,MAAM,OAAO,GAAG,UAAU,CACxB,GAAG,EAAE,CAAC,eAAe,CAAC,KAAK,EAAE,EAC7B,IAAI,CAAC,eAAe,CACrB,CAAA;QACD,MAAM,MAAM,GAAG,IAAI,oBAAM,CAAC;YACxB,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE;gBACN,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,IAAI,EAAE,KAAK;gBACX,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;aAC7B;YACD,qDAAqD;YACrD,eAAe;SAChB,CAAC,CAAA;QACF,IAAI,CAAC;YACH,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;QACrB,CAAC;gBAAS,CAAC;YACT,YAAY,CAAC,OAAO,CAAC,CAAA;QACvB,CAAC;IACH,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,GAAQ;QACvB,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;YAC7B,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;SACjC,CAAC,CAAA;IACJ,CAAC;IAED,KAAK,CAAC,YAAY,CAAC,GAAQ;QACzB,MAAM,IAAI,CAAC,IAAI,CAAC;YACd,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC;YAClC,EAAE,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;SAC5B,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAQ;QAC9B,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC;YACtC,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC;SAC7B,CAAC,CAAA;QACF,IAAI,GAAG,CAAC,IAAI,EAAE,CAAC;YACb,OAAO,GAAG,CAAC,IAAI,CAAA;QACjB,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,wBAAiB,EAAE,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,KAAK,CAAC,QAAQ,CAAC,GAAQ;QACrB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACrC,OAAO,GAAG,CAAC,oBAAoB,EAAE,CAAA;IACnC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAQ;QACtB,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,CAAA;QACrC,OAAO,GAAsB,CAAA;IAC/B,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,GAAQ;QACnB,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IAC/C,CAAC;IAED,KAAK,CAAC,UAAU,CAAC,IAAW;QAC1B,MAAM,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;QACvD,MAAM,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,CAAA;IACjC,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,GAAQ;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAA;IAC7C,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,GAAW;QACvB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAA;IAC1C,CAAC;IAEO,KAAK,CAAC,MAAM,CAAC,GAAW;QAC9B,IAAI,CAAC;YACH,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBACvC,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,EAAE,GAAG;aACT,CAAC,CAAA;YACF,OAAO,GAAG,CAAC,SAAS,CAAC,cAAc,KAAK,GAAG,CAAA;QAC7C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,OAAO,KAAK,CAAA;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,GAAW;QACjC,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;YAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,GAAG,EAAE,GAAG;SACT,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,IAAc;QACzC,MAAM,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC;YAC9B,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,MAAM,EAAE;gBACN,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;aACvC;SACF,CAAC,CAAA;IACJ,CAAC;IAEO,KAAK,CAAC,IAAI,CAAC,IAAkC;QACnD,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;gBAC3B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,UAAU,EAAE,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE;gBACzC,GAAG,EAAE,IAAI,CAAC,EAAE;aACb,CAAC,CAAA;YACF,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;gBAC7B,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,GAAG,EAAE,IAAI,CAAC,IAAI;aACf,CAAC,CAAA;QACJ,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,SAAS,CAAC,GAAG,CAAC,CAAA;QAChB,CAAC;IACH,CAAC;CACF;AA1MD,kCA0MC;AAED,MAAM,SAAS,GAAG,CAAC,GAAY,EAAE,EAAE;IACjC,IAAI,GAAG,EAAE,CAAC,MAAM,CAAC,KAAK,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,wBAAiB,EAAE,CAAA;IAC/B,CAAC;SAAM,CAAC;QACN,MAAM,GAAG,CAAA;IACX,CAAC;AACH,CAAC,CAAA;AAED,kBAAe,WAAW,CAAA"}
+{"version":3,"file":"s3.js","sourceRoot":"","sources":["../src/s3.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/aws",
-  "version": "0.2.28",
+  "version": "0.2.30",
   "license": "MIT",
   "description": "Shared AWS cloud API helpers for atproto services",
   "keywords": [
@@ -19,17 +19,18 @@
     "node": ">=18.7.0"
   },
   "dependencies": {
-    "@aws-sdk/client-cloudfront": "^3.261.0",
-    "@aws-sdk/client-kms": "^3.196.0",
-    "@aws-sdk/client-s3": "^3.224.0",
-    "@aws-sdk/lib-storage": "^3.226.0",
+    "@aws-sdk/client-cloudfront": "^3.879.0",
+    "@aws-sdk/client-kms": "^3.879.0",
+    "@aws-sdk/client-s3": "^3.879.0",
+    "@aws-sdk/lib-storage": "3.879.0",
     "@noble/curves": "^1.7.0",
     "key-encoder": "^2.0.3",
     "multiformats": "^9.9.0",
     "uint8arrays": "3.0.0",
-    "@atproto/common": "^0.4.11",
+    "@atproto/common": "^0.4.12",
+    "@atproto/common-web": "^0.4.3",
     "@atproto/crypto": "^0.4.4",
-    "@atproto/repo": "^0.8.8"
+    "@atproto/repo": "^0.8.10"
   },
   "devDependencies": {
     "typescript": "^5.6.3"

package/src/s3.ts

@@ -1,20 +1,26 @@
 import stream from 'node:stream'
-import * as aws from '@aws-sdk/client-s3'
+import { NoSuchKey, S3, S3ClientConfig } from '@aws-sdk/client-s3'
 import { Upload } from '@aws-sdk/lib-storage'
 import { CID } from 'multiformats/cid'
+import { SECOND, aggregateErrors, chunkArray } from '@atproto/common-web'
 import { randomStr } from '@atproto/crypto'
 import { BlobNotFoundError, BlobStore } from '@atproto/repo'
 
-export type S3Config = { bucket: string; uploadTimeoutMs?: number } & Omit<
-  aws.S3ClientConfig,
-  'apiVersion'
->
-
-// @NOTE we use Upload rather than client.putObject because stream
-// length is not known in advance. See also aws/aws-sdk-js-v3#2348.
+export type S3Config = {
+  bucket: string
+  /**
+   * The maximum time any request to S3 (including individual blob chunks
+   * uploads) can take, in milliseconds.
+   */
+  requestTimeoutMs?: number
+  /**
+   * The maximum total time a blob upload can take, in milliseconds.
+   */
+  uploadTimeoutMs?: number
+} & Omit<S3ClientConfig, 'apiVersion' | 'requestHandler'>
 
 export class S3BlobStore implements BlobStore {
-  private client: aws.S3
+  private client: S3
   private bucket: string
   private uploadTimeoutMs: number
 
@@ -22,12 +28,22 @@ export class S3BlobStore implements BlobStore {
     public did: string,
     cfg: S3Config,
   ) {
-    const { bucket, uploadTimeoutMs, ...rest } = cfg
+    const {
+      bucket,
+      uploadTimeoutMs = 10 * SECOND,
+      requestTimeoutMs = uploadTimeoutMs,
+      ...rest
+    } = cfg
     this.bucket = bucket
-    this.uploadTimeoutMs = uploadTimeoutMs ?? 10000
-    this.client = new aws.S3({
+    this.uploadTimeoutMs = uploadTimeoutMs
+    this.client = new S3({
       ...rest,
       apiVersion: '2006-03-01',
+      // Ensures that all requests timeout under "requestTimeoutMs".
+      //
+      // @NOTE This will also apply to the upload of each individual chunk
+      // when using Upload from @aws-sdk/lib-storage.
+      requestHandler: { requestTimeout: requestTimeoutMs },
     })
   }
 
@@ -53,42 +69,70 @@ export class S3BlobStore implements BlobStore {
     return `quarantine/${this.did}/${cid.toString()}`
   }
 
-  async putTemp(bytes: Uint8Array | stream.Readable): Promise<string> {
-    const key = this.genKey()
-    // @NOTE abort results in error from aws-sdk "Upload aborted." with name "AbortError"
+  private async uploadBytes(path: string, bytes: Uint8Array | stream.Readable) {
+    // @NOTE we use Upload rather than client.putObject because stream length is
+    // not known in advance. See also aws/aws-sdk-js-v3#2348.
+    //
+    // See also https://github.com/aws/aws-sdk-js-v3/issues/6426, wherein Upload
+    // may hang the s3 connection under certain circumstances. We don't have a
+    // good way to avoid this, so we use timeouts defensively on all s3
+    // requests.
+
+    const abortSignal = AbortSignal.timeout(this.uploadTimeoutMs)
     const abortController = new AbortController()
-    const timeout = setTimeout(
-      () => abortController.abort(),
-      this.uploadTimeoutMs,
-    )
+    abortSignal.addEventListener('abort', () => abortController.abort())
+
     const upload = new Upload({
       client: this.client,
       params: {
         Bucket: this.bucket,
         Body: bytes,
-        Key: this.getTmpPath(key),
+        Key: path,
       },
       // @ts-ignore native implementation fine in node >=15
       abortController,
     })
+
     try {
       await upload.done()
-    } finally {
-      clearTimeout(timeout)
+    } catch (err) {
+      // Translate aws-sdk's abort error to something more specific
+      if (err instanceof Error && err.name === 'AbortError') {
+        throw new Error('Blob upload timed out', { cause: err })
+      }
+
+      throw err
     }
+  }
+
+  async putTemp(bytes: Uint8Array | stream.Readable): Promise<string> {
+    const key = this.genKey()
+    await this.uploadBytes(this.getTmpPath(key), bytes)
     return key
   }
 
   async makePermanent(key: string, cid: CID): Promise<void> {
-    const alreadyHas = await this.hasStored(cid)
-    if (!alreadyHas) {
+    try {
+      // @NOTE we normally call this method when we know the file is temporary.
+      // Because of this, we optimistically move the file, allowing to make
+      // fewer network requests in the happy path.
       await this.move({
         from: this.getTmpPath(key),
         to: this.getStoredPath(cid),
       })
-    } else {
-      // already saved, so we no-op & just delete the temp
-      await this.deleteKey(this.getTmpPath(key))
+    } catch (err) {
+      // If the optimistic move failed because the temp file was not found,
+      // check if the permanent file already exists. If it does, we can assume
+      // that another process made the file permanent concurrently, and we can
+      // no-op.
+      if (err instanceof BlobNotFoundError) {
+        // Blob was not found from temp storage...
+        const alreadyHas = await this.hasStored(cid)
+        // already saved, so we no-op
+        if (alreadyHas) return
+      }
+
+      throw err
     }
   }
 
@@ -96,27 +140,7 @@ export class S3BlobStore implements BlobStore {
     cid: CID,
     bytes: Uint8Array | stream.Readable,
   ): Promise<void> {
-    // @NOTE abort results in error from aws-sdk "Upload aborted." with name "AbortError"
-    const abortController = new AbortController()
-    const timeout = setTimeout(
-      () => abortController.abort(),
-      this.uploadTimeoutMs,
-    )
-    const upload = new Upload({
-      client: this.client,
-      params: {
-        Bucket: this.bucket,
-        Body: bytes,
-        Key: this.getStoredPath(cid),
-      },
-      // @ts-ignore native implementation fine in node >=15
-      abortController,
-    })
-    try {
-      await upload.done()
-    } finally {
-      clearTimeout(timeout)
-    }
+    await this.uploadBytes(this.getStoredPath(cid), bytes)
   }
 
   async quarantine(cid: CID): Promise<void> {
@@ -160,8 +184,16 @@ export class S3BlobStore implements BlobStore {
   }
 
   async deleteMany(cids: CID[]): Promise<void> {
-    const keys = cids.map((cid) => this.getStoredPath(cid))
-    await this.deleteManyKeys(keys)
+    const errors: unknown[] = []
+    for (const chunk of chunkArray(cids, 500)) {
+      try {
+        const keys = chunk.map((cid) => this.getStoredPath(cid))
+        await this.deleteManyKeys(keys)
+      } catch (err) {
+        errors.push(err)
+      }
+    }
+    if (errors.length) throw aggregateErrors(errors)
   }
 
   async hasStored(cid: CID): Promise<boolean> {
@@ -207,21 +239,28 @@ export class S3BlobStore implements BlobStore {
         CopySource: `${this.bucket}/${keys.from}`,
         Key: keys.to,
       })
+    } catch (cause) {
+      if (cause instanceof NoSuchKey) {
+        // Already deleted, possibly by a concurrently running process
+        throw new BlobNotFoundError(undefined, { cause })
+      }
+
+      throw cause
+    }
+
+    try {
       await this.client.deleteObject({
         Bucket: this.bucket,
         Key: keys.from,
       })
     } catch (err) {
-      handleErr(err)
-    }
-  }
-}
+      if (err instanceof NoSuchKey) {
+        // Already deleted, possibly by a concurrently running process
+        return
+      }
 
-const handleErr = (err: unknown) => {
-  if (err?.['Code'] === 'NoSuchKey') {
-    throw new BlobNotFoundError()
-  } else {
-    throw err
+      throw err
+    }
   }
 }