@quatrain/storage-s3 1.1.25 → 1.2.1

package/dist/S3StorageAdapter.d.ts

@@ -17,7 +17,7 @@ export declare class S3StorageAdapter extends AbstractStorageAdapter {
      * @returns
      */
     move(file: FileType, destFile: FileType): Promise<FileType>;
-    getUrl(file: FileType, expiresIn?: number): Promise<{
+    getUrl(file: FileType, expiresIn?: number, action?: any, extra?: any): Promise<{
         url: string;
         expiresIn: number;
     }>;

package/dist/S3StorageAdapter.js

@@ -115,11 +115,16 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
         });
     }
     getUrl(file_1) {
-        return __awaiter(this, arguments, void 0, function* (file, expiresIn = 3600) {
-            const command = new client_s3_1.GetObjectCommand({
+        return __awaiter(this, arguments, void 0, function* (file, expiresIn = 3600, action = 'read', extra = {}) {
+            const commandArgs = {
                 Bucket: file.bucket,
                 Key: encodeURI(file.ref),
-            });
+            };
+            const cacheControl = extra.cacheControl || (this._params.config.publicCacheDuration ? `max-age=${this._params.config.publicCacheDuration}` : undefined);
+            if (cacheControl) {
+                commandArgs.ResponseCacheControl = cacheControl;
+            }
+            const command = new client_s3_1.GetObjectCommand(commandArgs);
             storage_1.Storage.debug(`Creating public url for ${file.bucket}/${file.ref}`);
             const url = yield (0, s3_request_presigner_1.getSignedUrl)(this._client, command, { expiresIn });
             return { url, expiresIn };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/storage-s3",
-  "version": "1.1.25",
+  "version": "1.2.1",
   "description": "Storage adapter for S3 compatible services",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.337.0",
     "@aws-sdk/s3-request-presigner": "^3.342.0",
-    "@quatrain/storage": "^1.1.34",
+    "@quatrain/storage": "^1.2.1",
     "fs-extra": "^11.2.0"
   },
   "scripts": {
@@ -41,5 +41,8 @@
     "build": "tsc",
     "wbuild": "tsc --watch",
     "bump-to": "yarn version"
+  },
+  "typedoc": {
+    "entryPoint": "src/index.ts"
   }
 }

package/src/S3StorageAdapter.ts

@@ -141,11 +141,19 @@ export class S3StorageAdapter extends AbstractStorageAdapter {
       return destFile
    }
 
-   async getUrl(file: FileType, expiresIn = 3600) {
-      const command = new GetObjectCommand({
+   async getUrl(file: FileType, expiresIn = 3600, action: any = 'read', extra: any = {}) {
+      const commandArgs: any = {
          Bucket: file.bucket,
          Key: encodeURI(file.ref),
-      })
+      }
+
+      const cacheControl = extra.cacheControl || (this._params.config.publicCacheDuration ? `max-age=${this._params.config.publicCacheDuration}` : undefined)
+
+      if (cacheControl) {
+         commandArgs.ResponseCacheControl = cacheControl
+      }
+
+      const command = new GetObjectCommand(commandArgs)
       Storage.debug(`Creating public url for ${file.bucket}/${file.ref}`)
       const url = await getSignedUrl(this._client, command, { expiresIn })
       return { url, expiresIn }