[accel-wave] add url to Storage intarface

packages/accel-wave/src/index.ts

@@ -44,14 +44,12 @@ export class BaseUploader {
   }
 
   url() {
-    if (!this.file) return undefined;
+    if (!this.filename) return undefined;
+
     if (this.config.assetHost) {
       return new URL(`${this.config.storeDir}/${this.filename}`, this.config.assetHost);
     } else {
-      return new URL(
-        `${this.config.root}/${this.config.storeDir}/${this.filename}`,
-        import.meta.url
-      );
+      return this.storage.url(this.filename);
     }
   }
 

packages/accel-wave/src/storages/file.ts

@@ -21,4 +21,8 @@ export class FileStorage implements Storage {
     ).pathname;
     return new File([fs.readFileSync(filePath)], identifier);
   }
+
+  url(identifier: string) {
+    return new URL(`${this.config.root}/${this.config.storeDir}/${identifier}`, import.meta.url);
+  }
 }

packages/accel-wave/src/storages/index.ts

@@ -1,4 +1,5 @@
 export interface Storage {
   store(file: File): void;
   retrive(identifier: string): File;
+  url(identifier: string): URL;
 }

packages/accel-wave/src/storages/s3.ts

@@ -37,12 +37,13 @@ export class S3Storage implements Storage {
     const config = this.config.s3;
     if (!config) throw new Error("S3 config is not set");
 
-    return actions.getSignedS3Url(
+    const url = actions.getSignedS3Url(
       { region: config.region },
       {
         Bucket: config.bucket,
         Key: identifier,
       }
     );
+    return new URL(url);
   }
 }

packages/accel-wave/tests/config.test.ts

@@ -1,10 +1,12 @@
 import { Config, configureAccelWave } from "src/config";
+import { S3Storage } from "src/storages/s3";
 
 test("initAccelWave()", () => {
-  configureAccelWave({ storeDir: "test", s3: { region: "ap-northeast-1" } });
+  configureAccelWave({ storage: S3Storage, storeDir: "test", s3: { region: "ap-northeast-1" } });
 
   const config = new Config({ s3: { bucket: "test2" } });
 
+  expect(config.storage).toEqual(S3Storage);
   expect(config.storeDir).toBe("test");
   expect(config.s3).toMatchObject({ region: "ap-northeast-1", bucket: "test2" });
 });

packages/accel-wave/tests/s3Storage.test.ts

@@ -1,5 +1,6 @@
 import { config } from "dotenv";
 import { Config } from "src/config";
+import { BaseUploader } from "src/index";
 import { S3Storage } from "../src/storages/s3";
 import { buildFile } from "./buildFile";
 
@@ -27,3 +28,20 @@ test("store()", (context: any) => {
     )
   );
 });
+
+test("S3Storage with Uploader", () => {
+  const region = process.env.AWS_REGION;
+  const bucket = process.env.AWS_S3_BUCKET;
+  if (!region || !bucket) return;
+
+  const uploader = new BaseUploader({
+    storage: S3Storage,
+    s3: { region, bucket },
+    filename: "example.txt",
+  });
+  expect(uploader.url()).toMatch(
+    new RegExp(
+      `https://${bucket}.s3.${region}.amazonaws.com/example.txt\\?X-Amz-Algorithm=AWS4-HMAC-SHA256&X-Amz-Content-Sha256=.+`
+    )
+  );
+});