@atproto/aws 0.1.5 → 0.1.7

package/dist/kms.d.ts

@@ -1,6 +1,6 @@
 import * as aws from '@aws-sdk/client-kms';
 import * as crypto from '@atproto/crypto';
-export declare type KmsConfig = {
+export type KmsConfig = {
     keyId: string;
 } & Omit<aws.KMSClientConfig, 'apiVersion'>;
 export declare class KmsKeypair implements crypto.Keypair {

package/dist/s3.d.ts

@@ -3,13 +3,15 @@ import * as aws from '@aws-sdk/client-s3';
 import { BlobStore } from '@atproto/repo';
 import { CID } from 'multiformats/cid';
 import stream from 'stream';
-export declare type S3Config = {
+export type S3Config = {
     bucket: string;
 } & Omit<aws.S3ClientConfig, 'apiVersion'>;
 export declare class S3BlobStore implements BlobStore {
+    did: string;
     private client;
     private bucket;
-    constructor(cfg: S3Config);
+    constructor(did: string, cfg: S3Config);
+    static creator(cfg: S3Config): (did: string) => S3BlobStore;
     private genKey;
     private getTmpPath;
     private getStoredPath;
@@ -23,8 +25,12 @@ export declare class S3BlobStore implements BlobStore {
     getBytes(cid: CID): Promise<Uint8Array>;
     getStream(cid: CID): Promise<stream.Readable>;
     delete(cid: CID): Promise<void>;
+    deleteMany(cids: CID[]): Promise<void>;
     hasStored(cid: CID): Promise<boolean>;
+    hasTemp(key: string): Promise<boolean>;
+    private hasKey;
     private deleteKey;
+    private deleteManyKeys;
     private move;
 }
 export default S3BlobStore;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/aws",
-  "version": "0.1.5",
+  "version": "0.1.7",
   "license": "MIT",
   "description": "Shared AWS cloud API helpers for atproto services",
   "keywords": [
@@ -24,8 +24,8 @@
     "multiformats": "^9.9.0",
     "uint8arrays": "3.0.0",
     "@atproto/common": "^0.3.3",
-    "@atproto/crypto": "^0.3.0",
-    "@atproto/repo": "^0.3.5"
+    "@atproto/repo": "^0.3.7",
+    "@atproto/crypto": "^0.3.0"
   },
   "scripts": {
     "build": "node ./build.js",

package/src/s3.ts

@@ -17,7 +17,7 @@ export class S3BlobStore implements BlobStore {
   private client: aws.S3
   private bucket: string
 
-  constructor(cfg: S3Config) {
+  constructor(public did: string, cfg: S3Config) {
     const { bucket, ...rest } = cfg
     this.bucket = bucket
     this.client = new aws.S3({
@@ -26,20 +26,26 @@ export class S3BlobStore implements BlobStore {
     })
   }
 
+  static creator(cfg: S3Config) {
+    return (did: string) => {
+      return new S3BlobStore(did, cfg)
+    }
+  }
+
   private genKey() {
     return randomStr(32, 'base32')
   }
 
   private getTmpPath(key: string): string {
-    return `tmp/${key}`
+    return `tmp/${this.did}/${key}`
   }
 
   private getStoredPath(cid: CID): string {
-    return `blocks/${cid.toString()}`
+    return `blocks/${this.did}/${cid.toString()}`
   }
 
   private getQuarantinedPath(cid: CID): string {
-    return `quarantine/${cid.toString()}`
+    return `quarantine/${this.did}/${cid.toString()}`
   }
 
   async putTemp(bytes: Uint8Array | stream.Readable): Promise<string> {
@@ -122,11 +128,24 @@ export class S3BlobStore implements BlobStore {
     await this.deleteKey(this.getStoredPath(cid))
   }
 
+  async deleteMany(cids: CID[]): Promise<void> {
+    const keys = cids.map((cid) => this.getStoredPath(cid))
+    await this.deleteManyKeys(keys)
+  }
+
   async hasStored(cid: CID): Promise<boolean> {
+    return this.hasKey(this.getStoredPath(cid))
+  }
+
+  async hasTemp(key: string): Promise<boolean> {
+    return this.hasKey(this.getTmpPath(key))
+  }
+
+  private async hasKey(key: string) {
     try {
       const res = await this.client.headObject({
         Bucket: this.bucket,
-        Key: this.getStoredPath(cid),
+        Key: key,
       })
       return res.$metadata.httpStatusCode === 200
     } catch (err) {
@@ -141,17 +160,38 @@ export class S3BlobStore implements BlobStore {
     })
   }
 
-  private async move(keys: { from: string; to: string }) {
-    await this.client.copyObject({
-      Bucket: this.bucket,
-      CopySource: `${this.bucket}/${keys.from}`,
-      Key: keys.to,
-    })
-    await this.client.deleteObject({
+  private async deleteManyKeys(keys: string[]) {
+    await this.client.deleteObjects({
       Bucket: this.bucket,
-      Key: keys.from,
+      Delete: {
+        Objects: keys.map((k) => ({ Key: k })),
+      },
     })
   }
+
+  private async move(keys: { from: string; to: string }) {
+    try {
+      await this.client.copyObject({
+        Bucket: this.bucket,
+        CopySource: `${this.bucket}/${keys.from}`,
+        Key: keys.to,
+      })
+      await this.client.deleteObject({
+        Bucket: this.bucket,
+        Key: keys.from,
+      })
+    } catch (err) {
+      handleErr(err)
+    }
+  }
+}
+
+const handleErr = (err: unknown) => {
+  if (err?.['Code'] === 'NoSuchKey') {
+    throw new BlobNotFoundError()
+  } else {
+    throw err
+  }
 }
 
 export default S3BlobStore