@did-space/s3-driver 0.2.142 → 0.2.144

package/dist/operator/index.js

@@ -26,10 +26,16 @@ const path_1 = require("path");
 const lib_storage_1 = require("@aws-sdk/lib-storage");
 const mime_types_1 = __importDefault(require("mime-types"));
 const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
+const debug_1 = __importDefault(require("debug"));
+const { version: s3ClientVersion } = require('@aws-sdk/client-s3/package.json');
+const { version: libStorageVersion } = require('@aws-sdk/lib-storage/package.json');
+const debug = (0, debug_1.default)('@did-space/s3-driver:S3SpaceOperator');
 class S3SpaceOperator {
     constructor(options) {
         this.options = options;
         this.s3Client = new client_s3_1.S3Client(this.options.s3ClientConfig);
+        debug('@aws-sdk/client-s3.version', s3ClientVersion);
+        debug('@aws-sdk/lib-storage.version', libStorageVersion);
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     createSpace(_storageConfig) {
@@ -132,45 +138,78 @@ class S3SpaceOperator {
      */
     write(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const upload = new lib_storage_1.Upload({
-                client: this.s3Client,
-                params: {
-                    Bucket: this.options.bucket,
-                    Key: yield this.getObjectKey(options),
-                    Body: options.data,
-                    // @FIXME lib-storage 暂时不支持计算部件的 MD5  https://github.com/aws/aws-sdk-js-v3/issues/2673#issuecomment-1057408451
-                    // ContentMD5: 'wSunmxovn3F4x1+NV+/d1A==',
-                    Metadata: {
-                        'x-hash': options.hash,
+            const key = yield this.getObjectKey(options);
+            try {
+                debug('write.before', `Bucket=${this.options.bucket} Key=${key} Body=${String(options.data)} hash=${options.hash}`);
+                const upload = new lib_storage_1.Upload({
+                    client: this.s3Client,
+                    params: {
+                        Bucket: this.options.bucket,
+                        Key: key,
+                        Body: options.data,
+                        // @FIXME lib-storage 暂时不支持计算部件的 MD5  https://github.com/aws/aws-sdk-js-v3/issues/2673#issuecomment-1057408451
+                        // ContentMD5: 'wSunmxovn3F4x1+NV+/d1A==',
+                        Metadata: {
+                            'x-hash': options.hash,
+                        },
                     },
-                },
-            });
-            yield upload.done();
+                });
+                upload.on('httpUploadProgress', (progress) => {
+                    debug('write.progress', `Bucket=${this.options.bucket} Key=${key} Body=${String(options.data)} hash=${options.hash} progress=${JSON.stringify(progress)}`);
+                });
+                yield upload.done();
+                debug('write.after', `Bucket=${this.options.bucket} Key=${key} Body=${String(options.data)} hash=${options.hash}`);
+            }
+            catch (error) {
+                debug('write.error', `Bucket=${this.options.bucket} Key=${key} Body=${String(options.data)} hash=${options.hash}`, error);
+                throw error;
+            }
         });
     }
     delete(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.s3Client.send(new client_s3_1.DeleteObjectCommand({
-                Bucket: this.options.bucket,
-                Key: yield this.getObjectKey(options),
-            }));
+            const key = yield this.getObjectKey(options);
+            try {
+                debug('delete.before', `Bucket=${this.options.bucket} Key=${key}`);
+                yield this.s3Client.send(new client_s3_1.DeleteObjectCommand({
+                    Bucket: this.options.bucket,
+                    Key: yield this.getObjectKey(options),
+                }));
+                debug('delete.after', `Bucket=${this.options.bucket} Key=${key}`);
+            }
+            catch (error) {
+                debug('delete.error', `Bucket=${this.options.bucket} Key=${key}`, error);
+                throw error;
+            }
         });
     }
     read(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const output = yield this.s3Client.send(new client_s3_1.GetObjectCommand({
-                Bucket: this.options.bucket,
-                Key: yield this.getObjectKey(options),
-            }));
-            return output.Body;
+            const key = yield this.getObjectKey(options);
+            try {
+                debug('read.before', `Bucket=${this.options.bucket} Key=${key}`);
+                const output = yield this.s3Client.send(new client_s3_1.GetObjectCommand({
+                    Bucket: this.options.bucket,
+                    Key: key,
+                }));
+                debug('read.after', `Bucket=${this.options.bucket} Key=${key}`);
+                return output.Body;
+            }
+            catch (error) {
+                debug('read.error', `Bucket=${this.options.bucket} Key=${key}`, error);
+                throw error;
+            }
         });
     }
     getHash(options) {
         return __awaiter(this, void 0, void 0, function* () {
+            const key = yield this.getObjectKey(options);
+            debug('getHash.before', `Bucket=${this.options.bucket} Key=${key}`);
             const output = yield this.s3Client.send(new client_s3_1.HeadObjectCommand({
                 Bucket: this.options.bucket,
-                Key: yield this.getObjectKey(options),
+                Key: key,
             }));
+            debug('getHash.after', `Bucket=${this.options.bucket} Key=${key}`);
             return output.Metadata['x-hash'];
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/s3-driver",
-  "version": "0.2.142",
+  "version": "0.2.144",
   "publishConfig": {
     "access": "public"
   },
@@ -34,7 +34,8 @@
   "dependencies": {
     "@aws-sdk/client-s3": "^3.362.0",
     "@aws-sdk/lib-storage": "^3.362.0",
-    "@did-space/core": "0.2.142",
+    "@did-space/core": "0.2.144",
+    "debug": "^4.3.4",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
     "mime-types": "^2.1.35"
@@ -55,5 +56,5 @@
     "ts-jest": "^28.0.6",
     "typescript": "^4.9.5"
   },
-  "gitHead": "3442d9e62e8af280e28ca2ac64b9202b022614a6"
+  "gitHead": "0789527b101f681b56c2c8860fb3d60659c71aa5"
 }