fsd-fs 0.7.1 → 0.10.0

package/README.md

@@ -15,7 +15,7 @@ let content = await fsd.read();
 
 ```
 
-FSD 文档： https://github.com/maichong/fsd
+FSD 文档： https://github.com/liangxingchen/fsd
 
 适配器初始化选项：
 

package/lib/index.js

@@ -3,17 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const util = require("util");
 const os = require("os");
 const Path = require("path");
-const fs = require("mz/fs");
+const fs = require("fs");
 const isStream = require("is-stream");
 const _glob = require("glob");
-const _rimraf = require("rimraf");
-const _cpr = require("cpr");
+const mapLimit = require("async/mapLimit");
 const Debugger = require("debug");
-const url_1 = require("url");
 const glob = util.promisify(_glob);
-const rimraf = util.promisify(_rimraf);
-const cpr = util.promisify(_cpr);
 const debug = Debugger('fsd-fs');
+async function getStat(path) {
+    try {
+        return await fs.promises.stat(path);
+    }
+    catch (e) {
+        return null;
+    }
+}
 class FSAdapter {
     constructor(options) {
         this.instanceOfFSDAdapter = true;
@@ -50,7 +54,7 @@ class FSAdapter {
             });
             return;
         }
-        await fs.appendFile(p, data, { mode });
+        await fs.promises.appendFile(p, data, { mode });
     }
     async createReadStream(path, options) {
         debug('createReadStream %s options: %o', path, options);
@@ -59,37 +63,24 @@ class FSAdapter {
     }
     async createWriteStream(path, options) {
         debug('createWriteStream %s', path);
-        let p = Path.join(this._options.root, path);
+        let p;
         if (path.startsWith('task://')) {
-            let info = new url_1.URL(path);
-            if (!info.pathname)
-                throw new Error('Invalid part pathname');
-            p = Path.join(this._options.tmpdir, info.hostname || '');
+            p = Path.join(this._options.tmpdir, path.replace('task://', ''));
+        }
+        else {
+            p = Path.join(this._options.root, path);
         }
         return fs.createWriteStream(p, options);
     }
     async unlink(path) {
         debug('unlink %s', path);
         let p = Path.join(this._options.root, path);
-        await rimraf(p);
+        await fs.promises.rm(p, { recursive: true, force: true });
     }
-    async mkdir(path, prefix) {
+    async mkdir(path, recursive) {
         debug('mkdir %s', path);
         let fsPath = Path.join(this._options.root, path);
-        let parent = Path.dirname(path);
-        if (prefix && parent !== '/') {
-            try {
-                let parentFsPath = Path.join(this._options.root, parent);
-                let stat = await fs.stat(parentFsPath);
-                if (!stat.isDirectory()) {
-                    await this.mkdir(parent, true);
-                }
-            }
-            catch (e) {
-                await this.mkdir(parent, true);
-            }
-        }
-        await fs.mkdir(fsPath);
+        await fs.promises.mkdir(fsPath, { recursive });
     }
     async readdir(path, recursion) {
         debug('readdir %s', path);
@@ -101,7 +92,18 @@ class FSAdapter {
         let files = await glob(pattern, {
             cwd: p
         });
-        return files.map((name) => ({ name }));
+        return await mapLimit(files, 20, async (name) => {
+            let filePath = Path.join(p, name);
+            let stat = await getStat(filePath);
+            let isDir = stat.isDirectory();
+            return {
+                name: isDir ? `${name}/` : name,
+                metadata: {
+                    size: isDir ? 0 : stat.size,
+                    lastModified: stat.mtime
+                }
+            };
+        });
     }
     async createUrl(path, options) {
         debug('createUrl %s', path);
@@ -113,71 +115,58 @@ class FSAdapter {
         const { root } = this._options;
         let from = Path.join(root, path);
         let to = Path.join(root, dest);
-        if (!(await fs.exists(from)))
+        if (!(await getStat(from)))
             throw new Error(`source file '${path}' is not exists!`);
-        if (await fs.exists(to))
-            throw new Error(`dest file '${dest}' is already exists!`);
-        await cpr(from, to);
+        await fs.promises.cp(from, to, { recursive: true, force: true });
     }
     async rename(path, dest) {
         debug('rename %s to %s', path, dest);
         let from = Path.join(this._options.root, path);
         let to = Path.join(this._options.root, dest);
-        await fs.rename(from, to);
+        await fs.promises.rename(from, to);
     }
     async exists(path) {
         debug('check exists %s', path);
         let p = Path.join(this._options.root, path);
-        return await fs.exists(p);
+        return !!(await getStat(p));
     }
     async isFile(path) {
         debug('check is file %s', path);
         let p = Path.join(this._options.root, path);
-        try {
-            let stat = await fs.stat(p);
-            return stat.isFile();
-        }
-        catch (e) {
-            return false;
-        }
+        let stat = await getStat(p);
+        return stat === null || stat === void 0 ? void 0 : stat.isFile();
     }
     async isDirectory(path) {
         debug('check is directory %s', path);
         let p = Path.join(this._options.root, path);
-        try {
-            let stat = await fs.stat(p);
-            return stat.isDirectory();
-        }
-        catch (e) {
-            return false;
-        }
+        let stat = await getStat(p);
+        return stat === null || stat === void 0 ? void 0 : stat.isDirectory();
     }
     async size(path) {
         debug('get file size %s', path);
         let p = Path.join(this._options.root, path);
-        let stat = await fs.stat(p);
+        let stat = await getStat(p);
         return stat.size;
     }
     async lastModified(path) {
         debug('get file lastModified %s', path);
         let p = Path.join(this._options.root, path);
-        let stat = await fs.stat(p);
+        let stat = await getStat(p);
         return stat.mtime;
     }
     async initMultipartUpload(path, partCount) {
         debug('initMultipartUpload %s, partCount: %d', path, partCount);
-        let taskId = `upload-${Math.random().toString().substr(2)}-`;
+        let taskId = `upload-${Math.random().toString().substring(2)}-`;
         let tasks = [];
         for (let i = 1; i <= partCount; i += 1) {
-            tasks.push(`task://${taskId}${i}${path}?${i}`);
+            tasks.push(`task://${taskId}${i}`);
         }
         return tasks;
     }
     async writePart(path, partTask, data) {
         debug('writePart %s, task: %s', path, partTask);
-        let info = new url_1.URL(partTask);
-        if (!info.pathname || info.pathname !== path)
-            throw new Error('Invalid part pathname');
+        if (!partTask.startsWith('task://'))
+            throw new Error('Invalid part task id');
         let writeStream = await this.createWriteStream(partTask);
         await new Promise((resolve, reject) => {
             data.pipe(writeStream).on('close', resolve).on('error', reject);
@@ -186,25 +175,31 @@ class FSAdapter {
     }
     async completeMultipartUpload(path, parts) {
         debug('completeMultipartUpload %s', path);
-        let files = [];
+        let partPaths = [];
         for (let part of parts) {
             if (!part.startsWith('part://'))
                 throw new Error(`${part} is not a part file`);
-            let info = new url_1.URL(part);
-            if (!info.hostname)
-                throw new Error(`Invalid part link: ${part}`);
-            if (info.pathname !== path)
-                throw new Error(`Invalid part link: ${part} for path: ${path}`);
-            let file = Path.join(this._options.tmpdir, info.hostname);
-            if (!(await fs.exists(file)))
+            let partPath = Path.join(this._options.tmpdir, part.replace('part://', ''));
+            let stat = await getStat(partPath);
+            if (!stat)
                 throw new Error(`part file ${part} is not exists`);
-            files.push(file);
+            partPaths.push({ file: partPath, size: stat.size });
         }
-        for (let file of files) {
-            let stream = fs.createReadStream(file);
-            await this.append(path, stream);
+        let p = Path.join(this._options.root, path);
+        let start = 0;
+        for (let info of partPaths) {
+            let writeStream = fs.createWriteStream(p, {
+                flags: 'a',
+                start
+            });
+            let stream = fs.createReadStream(info.file);
+            await new Promise((resolve, reject) => {
+                stream.pipe(writeStream).on('close', resolve).on('error', reject);
+            });
+            start += info.size;
+            writeStream.close();
         }
-        files.forEach((file) => fs.unlink(file));
+        partPaths.forEach((info) => fs.promises.rm(info.file, { force: true }));
     }
 }
 exports.default = FSAdapter;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fsd-fs",
-  "version": "0.7.1",
+  "version": "0.10.0",
   "description": "File system adapter for fsd",
   "main": "lib/index.js",
   "types": "index.d.ts",
@@ -8,16 +8,14 @@
     "build": "tsc",
     "prepublish": "npm run build"
   },
-  "repository": "https://github.com/maichong/fsd/tree/master/packages/fsd-fs",
-  "author": "Liang <liang@maichong.it> (https://github.com/liangxingchen)",
+  "repository": "https://github.com/liangxingchen/fsd/tree/master/packages/fsd-fs",
+  "author": "Liang <liang@miaomo.cc> (https://github.com/liangxingchen)",
   "license": "MIT",
   "dependencies": {
-    "cpr": "^3.0.1",
-    "debug": "^4.3.1",
-    "glob": "^7.1.6",
-    "is-stream": "^2.0.0",
-    "mz": "^2.7.0",
-    "rimraf": "^3.0.2"
+    "async": "*",
+    "debug": "^4.3.4",
+    "glob": "^7.2.0",
+    "is-stream": "^2.0.1"
   },
-  "gitHead": "867c73a70c5140405c9fa89c9ab423f575096854"
+  "gitHead": "9820fd7263b6791a38e5568396bfac0f2d3e37e9"
 }

package/tsconfig.json

@@ -1,29 +0,0 @@
-{
-  "compilerOptions": {
-    "module": "commonjs",
-    "allowSyntheticDefaultImports": true,
-    "noImplicitAny": true,
-    "noImplicitAny": true,
-    "removeComments": true,
-    "preserveConstEnums": true,
-    "outDir": "lib",
-    "moduleResolution": "node",
-    "baseUrl": ".",
-    "paths": {
-      "*": [
-        "../../packages/*",
-        "../../typings/*"
-      ]
-    },
-    "target": "ES2017",
-    "lib": [
-      "ES2017"
-    ]
-  },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "node_modules"
-  ]
-}