@did-space/s3-driver 0.2.126 → 0.2.128

package/dist/operator/index.js

@@ -21,12 +21,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.S3SpaceOperator = void 0;
 const core_1 = require("@did-space/core");
-const url_join_1 = __importDefault(require("url-join"));
 const client_s3_1 = require("@aws-sdk/client-s3");
 const path_1 = require("path");
 const lib_storage_1 = require("@aws-sdk/lib-storage");
 const mime_types_1 = __importDefault(require("mime-types"));
-const lodash_1 = require("lodash");
+const isEmpty_1 = __importDefault(require("lodash/isEmpty"));
 class S3SpaceOperator {
     constructor(options) {
         this.options = options;
@@ -55,7 +54,7 @@ class S3SpaceOperator {
      */
     getSpaceSize() {
         return __awaiter(this, void 0, void 0, function* () {
-            const prefix = (0, url_join_1.default)(this.options.root, '/');
+            const prefix = (0, path_1.join)(this.options.root, '/');
             const { size } = yield this.getPathStatus(prefix);
             return size;
         });
@@ -215,7 +214,7 @@ class S3SpaceOperator {
         var _a, e_2, _b, _c;
         var _d, _e;
         return __awaiter(this, void 0, void 0, function* () {
-            const prefix = (0, url_join_1.default)(this.options.root, options.key);
+            const prefix = (0, path_1.join)(this.options.root, options.key);
             const objects = [];
             const folders = [];
             try {
@@ -231,10 +230,10 @@ class S3SpaceOperator {
                         (_d = response === null || response === void 0 ? void 0 : response.Contents) === null || _d === void 0 ? void 0 : _d.forEach((content) => {
                             const name = content.Key.replace(prefix, '');
                             // @note: 有时候 name的值可能是空字符 ‘’
-                            if ((0, lodash_1.isEmpty)(name)) {
+                            if ((0, isEmpty_1.default)(name)) {
                                 return;
                             }
-                            const key = (0, url_join_1.default)(options.key, name);
+                            const key = (0, path_1.join)(options.key, name);
                             const isDir = content.Key.endsWith('/');
                             objects.push({
                                 key,
@@ -291,7 +290,7 @@ class S3SpaceOperator {
         var _a, e_3, _b, _c;
         var _d;
         return __awaiter(this, void 0, void 0, function* () {
-            const prefix = (0, url_join_1.default)(this.options.root, options.key);
+            const prefix = (0, path_1.join)(this.options.root, options.key);
             if (!(yield this.existsAsOwner(options.key))) {
                 return [];
             }
@@ -314,6 +313,9 @@ class S3SpaceOperator {
                             contents.forEach((content) => {
                                 const key = content.Key.replace(prefix, '/');
                                 const name = (0, path_1.basename)(key);
+                                if ((0, isEmpty_1.default)(name)) {
+                                    return;
+                                }
                                 objects.push({
                                     key,
                                     name,
@@ -346,7 +348,7 @@ class S3SpaceOperator {
     list(options) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const key = (0, url_join_1.default)(this.options.root, options.key);
+            const key = (0, path_1.join)(this.options.root, options.key);
             const response = yield this.s3Client.send(new client_s3_1.ListObjectsCommand({
                 Bucket: this.options.bucket,
                 Prefix: key,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/s3-driver",
-  "version": "0.2.126",
+  "version": "0.2.128",
   "publishConfig": {
     "access": "public"
   },
@@ -32,17 +32,16 @@
     ]
   },
   "dependencies": {
-    "@aws-sdk/client-s3": "^3.241.0",
-    "@aws-sdk/lib-storage": "^3.241.0",
-    "@did-space/core": "0.2.126",
+    "@aws-sdk/client-s3": "^3.362.0",
+    "@aws-sdk/lib-storage": "^3.362.0",
+    "@did-space/core": "0.2.128",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "mime-types": "^2.1.35",
-    "url-join": "4"
+    "mime-types": "^2.1.35"
   },
   "devDependencies": {
     "@arcblock/eslint-config-ts": "^0.2.4",
-    "@aws-sdk/types": "^3.241.0",
+    "@aws-sdk/types": "^3.357.0",
     "@types/fs-extra": "^9.0.13",
     "@types/jest": "^28.1.5",
     "@types/js-yaml": "^4.0.5",
@@ -50,12 +49,11 @@
     "@types/lodash": "^4.14.182",
     "@types/mime-types": "^2.1.1",
     "@types/node": "15.12.2",
-    "@types/url-join": "^4.0.1",
     "@typescript-eslint/eslint-plugin": "^5.30.6",
     "eslint": "^8.19.0",
     "lint-staged": "^13.0.3",
     "ts-jest": "^28.0.6",
     "typescript": "^4.9.5"
   },
-  "gitHead": "30d5525d885d6ab441718a95155c3ee79a2dcd2a"
+  "gitHead": "7ff4f04cb1a7b94dc500f4fdce188986d4064dbe"
 }