@did-space/s3-driver 0.2.150 → 0.2.152

package/dist/operator/index.d.ts

@@ -57,8 +57,17 @@ export declare class S3SpaceOperator implements SpaceOperatorProtocol {
      * @memberof S3SpaceOperator
      */
     private listsOneLevel;
+    /**
+     * @description 列出当前文件夹下的所有文件夹和文件
+     * @private
+     * @param {string} prefix
+     * @return {*}  {Promise<Object[]>}
+     * @memberof S3SpaceOperator
+     */
+    listsRecursiveAsOwner(prefix: string): Promise<Object[]>;
     /**
      *
+     * @FIXME: 还不够通用, options.key 还需要拼凑出来，这不好
      * @see 使用paginateListObjectsV2快速检索所有对象 https://stackoverflow.com/a/34912646
      * @see s3开发者指南 https://docs.aws.amazon.com/zh_cn/sdk-for-javascript/v3/developer-guide/javascript_s3_code_examples.html
      * @param {ListOptions} options

package/dist/operator/index.js

@@ -27,6 +27,7 @@ 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 p_all_1 = __importDefault(require("p-all"));
 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');
@@ -110,19 +111,24 @@ class S3SpaceOperator {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.s3Client.send(new client_s3_1.PutObjectCommand({
                 Bucket: this.options.bucket,
-                Key: `${yield this.getAppSpacePath(options)}/`,
+                Key: yield this.getAppSpacePath(options),
             }));
         });
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     destroyAppSpace(options) {
-        // @see: https://stackoverflow.com/questions/20207063/how-can-i-delete-folder-on-s3-with-node-js
-        // FIXME: @yejianchao 目前只能删除空文件夹
-        throw new Error('Method not implemented.');
+        return __awaiter(this, void 0, void 0, function* () {
+            // @see: https://stackoverflow.com/questions/20207063/how-can-i-delete-folder-on-s3-with-node-js
+            // FIXME: @yejianchao 目前只能删除空文件夹
+            const folderKey = yield this.getAppSpacePath(options);
+            debug('destroyAppSpace.before', `options=${JSON.stringify(options)} folderKey=${folderKey}`);
+            yield this.deleteAsOwner(folderKey);
+            debug('destroyAppSpace.after', `options=${JSON.stringify(options)} folderKey=${folderKey}`);
+        });
     }
     getAppSpacePath(options) {
         // @ts-expect-error
-        return (0, path_1.join)(this.options.root, S3SpaceOperator.APPS, options.appDid);
+        return (0, path_1.join)(this.options.root, S3SpaceOperator.APPS, options.appDid, '/');
     }
     getObjectKey(options) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -325,8 +331,66 @@ class S3SpaceOperator {
             return objects;
         });
     }
+    /**
+     * @description 列出当前文件夹下的所有文件夹和文件
+     * @private
+     * @param {string} prefix
+     * @return {*}  {Promise<Object[]>}
+     * @memberof S3SpaceOperator
+     */
+    listsRecursiveAsOwner(prefix) {
+        var _a, e_3, _b, _c;
+        var _d;
+        return __awaiter(this, void 0, void 0, function* () {
+            debug('_listsRecursiveAsOwner.before', `Prefix=${prefix}`);
+            const objects = [];
+            try {
+                for (var _e = true, _f = __asyncValues((0, client_s3_1.paginateListObjectsV2)({ client: this.s3Client }, {
+                    Bucket: this.options.bucket,
+                    // @note: 如果 key 以 / 结尾，则返回结果是文件夹 和 文件，如果 key 不以 / 结尾则会返回文件, 这个存疑 @jianchao
+                    Prefix: prefix,
+                })), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
+                    _c = _g.value;
+                    _e = false;
+                    try {
+                        const response = _c;
+                        const contents = (_d = response === null || response === void 0 ? void 0 : response.Contents) !== null && _d !== void 0 ? _d : [];
+                        contents.forEach((content) => {
+                            const key = content.Key;
+                            const name = (0, path_1.basename)(key);
+                            if ((0, isEmpty_1.default)(name)) {
+                                return;
+                            }
+                            objects.push({
+                                key,
+                                name,
+                                isDir: name.endsWith('/'),
+                                size: content.Size,
+                                lastModified: new Date(content.LastModified).getTime(),
+                                editable: core_1.Space.editable(key),
+                                mimeType: mime_types_1.default.lookup(name) || 'unknown',
+                            });
+                        });
+                    }
+                    finally {
+                        _e = true;
+                    }
+                }
+            }
+            catch (e_3_1) { e_3 = { error: e_3_1 }; }
+            finally {
+                try {
+                    if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
+                }
+                finally { if (e_3) throw e_3.error; }
+            }
+            debug('_listsRecursiveAsOwner.after', `Prefix=${prefix}`);
+            return objects;
+        });
+    }
     /**
      *
+     * @FIXME: 还不够通用, options.key 还需要拼凑出来，这不好
      * @see 使用paginateListObjectsV2快速检索所有对象 https://stackoverflow.com/a/34912646
      * @see s3开发者指南 https://docs.aws.amazon.com/zh_cn/sdk-for-javascript/v3/developer-guide/javascript_s3_code_examples.html
      * @param {ListOptions} options
@@ -334,10 +398,9 @@ class S3SpaceOperator {
      * @memberof S3SpaceOperator
      */
     lists(options) {
-        var _a, e_3, _b, _c;
-        var _d;
         return __awaiter(this, void 0, void 0, function* () {
             const prefix = (0, path_1.join)(this.options.root, options.key);
+            debug('lists.before', `Prefix=${prefix}`);
             if (!(yield this.existsAsOwner(options.key))) {
                 return [];
             }
@@ -346,48 +409,14 @@ class S3SpaceOperator {
                 return this.listsOneLevel(options);
             }
             if (options.recursive && options.ignoreDirectories) {
-                const objects = [];
-                try {
-                    for (var _e = true, _f = __asyncValues((0, client_s3_1.paginateListObjectsV2)({ client: this.s3Client }, {
-                        Bucket: this.options.bucket,
-                        Prefix: prefix,
-                    })), _g; _g = yield _f.next(), _a = _g.done, !_a;) {
-                        _c = _g.value;
-                        _e = false;
-                        try {
-                            const response = _c;
-                            const contents = (_d = response === null || response === void 0 ? void 0 : response.Contents) !== null && _d !== void 0 ? _d : [];
-                            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,
-                                    isDir: name.endsWith('/'),
-                                    size: content.Size,
-                                    lastModified: new Date(content.LastModified).getTime(),
-                                    editable: core_1.Space.editable(key),
-                                    mimeType: mime_types_1.default.lookup(name) || 'unknown',
-                                });
-                            });
-                        }
-                        finally {
-                            _e = true;
-                        }
-                    }
-                }
-                catch (e_3_1) { e_3 = { error: e_3_1 }; }
-                finally {
-                    try {
-                        if (!_e && !_a && (_b = _f.return)) yield _b.call(_f);
-                    }
-                    finally { if (e_3) throw e_3.error; }
-                }
-                return objects;
+                const objects = yield this.listsRecursiveAsOwner(prefix);
+                return objects.map((x) => {
+                    // @FIXME: 以 / 开头没问题，但是备份/还原的时候不统一
+                    const $key = x.key.replace(new RegExp(`^${prefix}`), '/');
+                    return Object.assign(Object.assign({}, x), { key: $key, editable: core_1.Space.editable($key) });
+                });
             }
+            debug('lists.after', `Prefix=${prefix}`);
             throw new Error(`Filter methods not yet supported:\n ${JSON.stringify(options, null, 2)}`);
         });
     }
@@ -433,10 +462,35 @@ class S3SpaceOperator {
      */
     deleteAsOwner(key) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.s3Client.send(new client_s3_1.DeleteObjectCommand({
-                Bucket: this.options.bucket,
-                Key: (0, path_1.join)(this.options.root, key),
-            }));
+            debug('deleteAsOwner.before', `Bucket=${this.options.bucket} Key=${key}`);
+            if (key.endsWith('/')) {
+                const objects = yield this.listsRecursiveAsOwner(key);
+                const actions = objects.map((x) => {
+                    return () => __awaiter(this, void 0, void 0, function* () {
+                        yield this.s3Client.send(new client_s3_1.DeleteObjectCommand({
+                            Bucket: this.options.bucket,
+                            // @note: 注意 key 不能以 / 开头
+                            Key: x.key,
+                        }));
+                    });
+                });
+                // 注意要删除这个空文件夹
+                actions.push(() => __awaiter(this, void 0, void 0, function* () {
+                    yield this.s3Client.send(new client_s3_1.DeleteObjectCommand({
+                        Bucket: this.options.bucket,
+                        // @note: 注意 key 不能以 / 开头
+                        Key: key,
+                    }));
+                }));
+                yield (0, p_all_1.default)(actions, { concurrency: process.env.DRIVER_CONCURRENCY ? +process.env.DRIVER_CONCURRENCY : 32 });
+            }
+            else {
+                yield this.s3Client.send(new client_s3_1.DeleteObjectCommand({
+                    Bucket: this.options.bucket,
+                    Key: (0, path_1.join)(this.options.root, key),
+                }));
+            }
+            debug('deleteAsOwner.after', `Key=${key}`);
         });
     }
     readAsOwner(key) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/s3-driver",
-  "version": "0.2.150",
+  "version": "0.2.152",
   "publishConfig": {
     "access": "public"
   },
@@ -34,11 +34,12 @@
   "dependencies": {
     "@aws-sdk/client-s3": "3.370.0",
     "@aws-sdk/lib-storage": "3.370.0",
-    "@did-space/core": "0.2.150",
+    "@did-space/core": "0.2.152",
     "debug": "^4.3.4",
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
-    "mime-types": "^2.1.35"
+    "mime-types": "^2.1.35",
+    "p-all": "3.0.0"
   },
   "devDependencies": {
     "@arcblock/eslint-config-ts": "^0.2.4",
@@ -56,5 +57,5 @@
     "ts-jest": "^28.0.6",
     "typescript": "^4.9.5"
   },
-  "gitHead": "0ecd41205eed6fabdb9761b52726ea7ae2594b66"
+  "gitHead": "4cc2f36a917b6fc5ed53c1047768a0861723547e"
 }