@quatrain/storage-s3 1.1.11 → 1.1.13

package/lib/S3StorageAdapter.d.ts

@@ -11,13 +11,21 @@ export declare class S3StorageAdapter extends AbstractStorageAdapter {
     streamToBuffer(stream: Stream): Promise<Buffer>;
     create(file: FileType, stream: Readable): Promise<FileType>;
     copy(file: FileType, destFile: FileType): Promise<void>;
-    move(file: FileType, destFile: FileType): Promise<void>;
+    /**
+     * Move file to given destination
+     * There is no native command in AWS SDK for this, we need to copy then delete source media
+     * @param file
+     * @param destFile
+     * @returns
+     */
+    move(file: FileType, destFile: FileType): Promise<FileType>;
     getUrl(file: FileType, expiresIn?: number): Promise<{
         url: string;
         expiresIn: number;
     }>;
     delete(file: FileType): Promise<boolean>;
     getReadable(file: FileType): Promise<Readable>;
+    getMetaData(file: FileType): Promise<FileType>;
     stream(file: FileType, res: any): Promise<any>;
     download(file: FileType, meta: DownloadFileMetaType): Promise<string>;
     getUploadUrl(file: FileType, expiresIn?: number): Promise<FileResponseLinkType>;

package/lib/S3StorageAdapter.js

@@ -28,7 +28,7 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
             },
         };
         this._client = new client_s3_1.S3Client(config);
-        storage_1.Storage.info(`AWS Storage Adapter initialized in ${this._params.config.region}`);
+        storage_1.Storage.info(`AWS Storage Adapter initialized in ${this._params.endpoint || this._params.region}`);
     }
     getDriver() {
         return this._client;
@@ -59,7 +59,7 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
     }
     copy(file, destFile) {
         return __awaiter(this, void 0, void 0, function* () {
-            storage_1.Storage.debug(`Copying file ${file.ref} to ${destFile.ref}`);
+            storage_1.Storage.debug(`Copying file ${file.bucket}/${file.ref} to ${file.bucket}/${destFile.ref}`);
             const command = new client_s3_1.CopyObjectCommand({
                 CopySource: encodeURI(`${file.bucket}/${file.ref}`),
                 Bucket: file.bucket,
@@ -73,15 +73,25 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
             }
         });
     }
+    /**
+     * Move file to given destination
+     * There is no native command in AWS SDK for this, we need to copy then delete source media
+     * @param file
+     * @param destFile
+     * @returns
+     */
     move(file, destFile) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
+                storage_1.Storage.debug(`Moving file ${file.bucket}/${file.ref} to ${file.bucket}/${destFile.ref}`);
                 yield this.copy(file, destFile);
                 yield this.delete(file);
             }
             catch (err) {
+                storage_1.Storage.error(`Failed to move file from ${file.ref} to ${destFile.ref}: ${err.message}`);
                 console.log(err);
             }
+            return destFile;
         });
     }
     getUrl(file, expiresIn = 3600) {
@@ -90,7 +100,7 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
                 Bucket: file.bucket,
                 Key: encodeURI(file.ref),
             });
-            storage_1.Storage.debug(`Creating public url for ${file.ref}`);
+            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 };
         });
@@ -98,7 +108,7 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
     delete(file) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            storage_1.Storage.log(`Deleting file ${file.ref}`);
+            storage_1.Storage.debug(`Deleting file ${file.bucket}/${file.ref}`);
             const command = new client_s3_1.DeleteObjectCommand({
                 Bucket: file.bucket,
                 Key: file.ref,
@@ -125,6 +135,17 @@ class S3StorageAdapter extends storage_1.AbstractStorageAdapter {
             return readable;
         });
     }
+    getMetaData(file) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const command = new client_s3_1.HeadObjectCommand({
+                Bucket: file.bucket,
+                Key: file.ref,
+            });
+            const item = yield this._client.send(command);
+            const meta = Object.assign(Object.assign({}, file), { contentType: item.ContentType, size: item.ContentLength, lastModified: item.LastModified });
+            return meta;
+        });
+    }
     stream(file, res) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quatrain/storage-s3",
-  "version": "1.1.11",
+  "version": "1.1.13",
   "description": "Storage adapter for S3 compatible services",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -24,14 +24,18 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.337.0",
     "@aws-sdk/s3-request-presigner": "^3.342.0",
-    "@quatrain/storage": "^1.1.11",
+    "@quatrain/storage": "^1.1.16",
     "fs-extra": "^11.2.0"
   },
   "scripts": {
-    "test": "tsc && jest --verbose",
+    "test-ci": "jest --runInBand",
     "build": "tsc",
     "wbuild": "tsc --watch",
     "bump-to": "yarn version",
-    "publish": "yarn build && yarn npm publish --access public"
+    "hash": "node ../../bin/hashFolder.js",
+    "hash:persist": "yarn hash  > .hash_latest.txt",
+    "hash:compare": "yarn hash > .hash_newest.txt && cmp -s .hash_latest.txt .hash_newest.txt",
+    "publish": "yarn hash:compare || yarn publish:process",
+    "publish:process": "yarn version patch && yarn build && yarn npm publish --access public && yarn hash:persist"
   }
 }