@did-space/fs-driver 0.3.20 → 0.3.22

package/dist/operator/index.d.ts

@@ -43,7 +43,7 @@ export declare class FsSpaceOperator implements SpaceOperatorProtocol {
      * @memberof FsSpaceOperator
      */
     lists(options: ListsOptions): Promise<Object[]>;
-    list(options: ListOptions): Promise<Object>;
+    list(options: ListOptions): Promise<Object | null>;
     writeAsOwner(key: string, data: Data, options?: WriteAsOwnerOptions): Promise<void>;
     deleteAsOwner(key: string, options?: DeleteAsOwnerOptions): Promise<void>;
     readAsOwner(key: string, options?: ReadAsOwnerOptions): Promise<Stream>;

package/dist/operator/index.js

@@ -45,7 +45,7 @@ const mime_types_1 = __importDefault(require("mime-types"));
 const path_1 = require("path");
 const stream_1 = require("stream");
 const debug_1 = __importDefault(require("debug"));
-const read_stream_to_file_1 = require("./read-stream-to-file");
+const promises_1 = require("stream/promises");
 const debug = (0, debug_1.default)('@did-space/fs-driver:FsSpaceOperator');
 function getPrefix(root) {
     return root.split('/').slice(0, -1).join('/');
@@ -120,6 +120,7 @@ class FsSpaceOperator {
         return __awaiter(this, void 0, void 0, function* () {
             const objectPath = yield this.getObjectKey(options);
             const { data } = options;
+            yield fs_extra_1.default.ensureDir((0, path_1.dirname)(objectPath));
             if (objectPath.endsWith('/')) {
                 // 这是一个文件夹
                 yield fs_extra_1.default.ensureDir(objectPath);
@@ -128,8 +129,7 @@ class FsSpaceOperator {
                 yield fs_extra_1.default.outputFile(objectPath, data);
             }
             else if (data instanceof stream_1.Stream || data instanceof stream_1.Readable || (0, lodash_1.isFunction)(data === null || data === void 0 ? void 0 : data.pipe)) {
-                fs_extra_1.default.ensureDirSync((0, path_1.dirname)(objectPath));
-                yield (0, read_stream_to_file_1.readStreamToFile)(data, fs_extra_1.default.createWriteStream(objectPath));
+                yield (0, promises_1.pipeline)(data, fs_extra_1.default.createWriteStream(objectPath));
             }
             else {
                 throw new Error('Data is unsupported format, expected data to be one of: string | Buffer | ReadableStream.');
@@ -171,7 +171,7 @@ class FsSpaceOperator {
             debug('lists.before', JSON.stringify({ options }));
             let path = (0, path_1.join)(this.options.root, options.key);
             if (options === null || options === void 0 ? void 0 : options.useGlobal) {
-                const prefix = this.options.root.split('/').slice(0, -1).join('/');
+                const prefix = getPrefix(this.options.root);
                 path = (0, path_1.join)(prefix, options.key);
                 debug('lists.$prefix', prefix);
             }
@@ -231,7 +231,14 @@ class FsSpaceOperator {
     }
     list(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const objectKey = (0, path_1.join)(this.options.root, options.key);
+            debug('list.before', { options: (0, lodash_1.omit)(options, 'data') });
+            let objectKey = (0, path_1.join)(this.options.root, options.key);
+            if (options === null || options === void 0 ? void 0 : options.useGlobal) {
+                const prefix = getPrefix(this.options.root);
+                objectKey = (0, path_1.join)(prefix, options.key);
+                debug('lists.$prefix', prefix);
+            }
+            debug('list.$objectKey', objectKey);
             if (!fs_extra_1.default.existsSync(objectKey)) {
                 return null;
             }
@@ -256,27 +263,34 @@ class FsSpaceOperator {
             debug('writeAsOwner.before', JSON.stringify({ key, options: (0, lodash_1.omit)(options, 'data') }));
             let objectPath = (0, path_1.join)(this.options.root, key);
             if (options === null || options === void 0 ? void 0 : options.useGlobal) {
-                const prefix = this.options.root.split('/').slice(0, -1).join('/');
+                const prefix = getPrefix(this.options.root);
                 objectPath = (0, path_1.join)(prefix, key);
                 debug('writeAsOwner.$prefix', prefix);
             }
             yield (0, fs_extra_1.ensureDir)((0, path_1.dirname)(objectPath));
             debug('writeAsOwner.$dirname(objectPath)', (0, path_1.dirname)(objectPath));
             debug('writeAsOwner.$objectPath', objectPath);
-            if (objectPath.endsWith('/')) {
+            const isDirectory = objectPath.endsWith('/');
+            if (isDirectory) {
                 // 这是一个文件夹
                 yield fs_extra_1.default.ensureDir(objectPath);
+                return;
             }
-            else if ((0, lodash_1.isString)(data) || (0, lodash_1.isBuffer)(data)) {
-                yield fs_extra_1.default.outputFile(objectPath, data);
+            if (!(0, core_1.isValidData)(data)) {
+                throw new Error('Data is unsupported format, expected data to be one of: string | Buffer | ReadableStream.');
             }
-            else if (data instanceof stream_1.Stream || data instanceof stream_1.Readable || (0, lodash_1.isFunction)(data === null || data === void 0 ? void 0 : data.pipe)) {
-                fs_extra_1.default.ensureDirSync((0, path_1.dirname)(objectPath));
-                yield (0, read_stream_to_file_1.readStreamToFile)(data, fs_extra_1.default.createWriteStream(objectPath));
+            if ((0, lodash_1.isString)(data) || (0, lodash_1.isBuffer)(data)) {
+                yield fs_extra_1.default.outputFile(objectPath, data);
             }
             else {
-                throw new Error('Data is unsupported format, expected data to be one of: string | Buffer | ReadableStream.');
+                yield (0, promises_1.pipeline)(data, fs_extra_1.default.createWriteStream(objectPath));
             }
+            const object = yield this.list(Object.assign(Object.assign({}, options), { key }));
+            if (!isDirectory && options && (!object || object.size !== (options === null || options === void 0 ? void 0 : options.size))) {
+                core_1.logger.error('writeAsOwner.throwError', { key, options });
+                throw new Error(`Uploaded size ${object === null || object === void 0 ? void 0 : object.size} does not match actual size ${options === null || options === void 0 ? void 0 : options.size}`);
+            }
+            debug('writeAsOwner.after', JSON.stringify({ key, options: (0, lodash_1.omit)(options, 'data') }));
         });
     }
     deleteAsOwner(key, options) {
@@ -284,7 +298,7 @@ class FsSpaceOperator {
         debug('deleteAsOwner.$this.options.root', this.options.root);
         let $key = (0, path_1.join)(this.options.root, key);
         if (options === null || options === void 0 ? void 0 : options.useGlobal) {
-            const prefix = this.options.root.split('/').slice(0, -1).join('/');
+            const prefix = getPrefix(this.options.root);
             $key = (0, path_1.join)(prefix, key);
             debug('deleteAsOwner.$prefix', prefix);
         }
@@ -296,7 +310,7 @@ class FsSpaceOperator {
         // FIXME: @yejianchao 这里的 key 不能以 / 开头
         let $key = (0, path_1.join)(this.options.root, key);
         if (options === null || options === void 0 ? void 0 : options.useGlobal) {
-            const prefix = this.options.root.split('/').slice(0, -1).join('/');
+            const prefix = getPrefix(this.options.root);
             $key = (0, path_1.join)(prefix, key);
             debug('readAsOwner.$prefix', prefix);
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@did-space/fs-driver",
-  "version": "0.3.20",
+  "version": "0.3.22",
   "publishConfig": {
     "access": "public"
   },
@@ -36,7 +36,7 @@
     ]
   },
   "dependencies": {
-    "@did-space/core": "0.3.20",
+    "@did-space/core": "0.3.22",
     "debug": "^4.3.4",
     "filehound": "^1.17.6",
     "fs-extra": "^10.1.0",
@@ -60,5 +60,5 @@
     "ts-jest": "^28.0.6",
     "typescript": "^4.9.5"
   },
-  "gitHead": "64e248cbe5f336706bec92aae6fee2dc34bab59b"
+  "gitHead": "09a609e207a621b158581f3d3f8623e61ccbb90a"
 }

package/dist/operator/read-stream-to-file.d.ts

@@ -1,6 +0,0 @@
-/// <reference types="node" />
-/// <reference types="node" />
-import { Stream } from 'stream';
-import { WriteStream } from 'fs';
-declare function readStreamToFile(readStream: Stream, writeStream: WriteStream): Promise<void>;
-export { readStreamToFile };

package/dist/operator/read-stream-to-file.js

@@ -1,20 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readStreamToFile = void 0;
-const core_1 = require("@did-space/core");
-function readStreamToFile(readStream, writeStream) {
-    return new Promise((resolve, reject) => {
-        writeStream.on('data', () => {
-            return resolve();
-        });
-        writeStream.on('finish', () => {
-            return resolve();
-        });
-        writeStream.on('error', (error) => {
-            core_1.logger.error('readStreamToFile', error.message);
-            return reject(error);
-        });
-        readStream.pipe(writeStream);
-    });
-}
-exports.readStreamToFile = readStreamToFile;