@e-mc/file-manager 0.7.0 → 0.8.0

package/index.js

@@ -4,6 +4,7 @@ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
 const fs = require("fs");
+const pm = require("picomatch");
 const lib_v4_1 = require("../module/lib-v4");
 const util_1 = require("../request/util");
 const asset_1 = require("../document/asset");
@@ -177,13 +178,24 @@ function checkHash(data, fromBuffer, options) {
     }
     return true;
 }
-function filterPaths(values, include, exclude) {
+function validatePaths(values, patterns, include, dot) {
+    const items = patterns.map(value => !value.startsWith('*') && /[\\/]/.test(value) ? [core_1.Permission.toPosix(path.resolve(value)), { nocase: PLATFORM_WIN32, dot }] : [value.replace(/(?:^\\|\\+)/g, '/'), { matchBase: true, nocase: PLATFORM_WIN32, dot }]);
+    return values.filter(value => {
+        for (const [pattern, options] of items) {
+            if (pm.isMatch(core_1.Permission.toPosix(value), pattern, options)) {
+                return include;
+            }
+        }
+        return !include;
+    });
+}
+function filterPaths(values, include, exclude, dot) {
     if (include) {
         if ((0, types_1.isString)(include)) {
             include = [include];
         }
         if ((0, types_1.isArray)(include)) {
-            return values.filter(value => core_1.Permission.match(value, include));
+            return validatePaths(values, include, true, dot);
         }
     }
     if (exclude) {
@@ -191,7 +203,7 @@ function filterPaths(values, include, exclude) {
             exclude = [exclude];
         }
         if ((0, types_1.isArray)(exclude)) {
-            return values.filter(value => !core_1.Permission.match(value, exclude));
+            return validatePaths(values, exclude, false, dot);
         }
     }
     return values;
@@ -219,7 +231,7 @@ function observeFile(instance) {
             if (PLATFORM_WIN32) {
                 value = value.toLowerCase();
             }
-            if (value[value.length - 1] !== path.sep) {
+            if (!value.endsWith(path.sep)) {
                 value += path.sep;
             }
             for (const name of this.files) {
@@ -548,44 +560,44 @@ class FileManager extends core_1.Host {
         return result + (parent && result > 0 ? await super.purgeMemory(typeof parent === 'number' && parent > 0 ? parent : percent, limit, true) : 0);
     }
     static loadSettings(settings, permission, password) {
-        if (super.loadSettings(settings, permission, password)) {
-            const { download, request, error, logger } = settings;
-            if ((0, types_1.isPlainObject)(request)) {
-                let { timeout, disk, buffer, connect } = request;
-                if ((timeout = (0, util_1.fromSeconds)(timeout)) >= 0) {
-                    HTTP_CLIENT.timeout = timeout;
-                }
-                if (disk) {
-                    this.defineHttpCache(disk, true);
-                }
-                if (buffer) {
-                    this.defineHttpCache(buffer);
-                }
-                if (connect) {
-                    this.defineHttpConnect(connect);
-                }
-                request_1.default.loadSettings({ process: settings.process, request, download }, password);
+        if (!super.loadSettings(settings, permission, password)) {
+            return false;
+        }
+        const { download, request, error, logger } = settings;
+        if ((0, types_1.isPlainObject)(request)) {
+            let { timeout, disk, buffer, connect } = request;
+            if ((timeout = (0, util_1.fromSeconds)(timeout)) >= 0) {
+                HTTP_CLIENT.timeout = timeout;
             }
-            if (error) {
-                const value = (0, util_1.asInt)(error.recursion_limit);
-                if (value >= 0 && value < Infinity) {
-                    RECURSION_LIMIT = value;
-                }
+            if (disk) {
+                this.defineHttpCache(disk, true);
             }
-            if (logger) {
-                let value = logger.session_id;
-                if (value === true) {
-                    SESSION_LIMIT = 1000;
-                }
-                else if (value && (value = +value) > 0) {
-                    SESSION_LIMIT = Math.pow(10, value);
-                }
+            if (buffer) {
+                this.defineHttpCache(buffer);
             }
-            LOG_TIMEELAPSED = this.hasLogType(128 /* LOG_TYPE.TIME_ELAPSED */);
-            LOG_TIMEPROCESS = this.hasLogType(256 /* LOG_TYPE.TIME_PROCESS */);
-            return true;
+            if (connect) {
+                this.defineHttpConnect(connect);
+            }
+            request_1.default.loadSettings({ process: settings.process, request, download }, password);
         }
-        return false;
+        if (error) {
+            const value = (0, util_1.asInt)(error.recursion_limit);
+            if (value >= 0 && value < Infinity) {
+                RECURSION_LIMIT = value;
+            }
+        }
+        if (logger) {
+            let value = logger.session_id;
+            if (value === true) {
+                SESSION_LIMIT = 1000;
+            }
+            else if (value && (value = +value) > 0) {
+                SESSION_LIMIT = Math.pow(10, value);
+            }
+        }
+        LOG_TIMEELAPSED = this.hasLogType(128 /* LOG_TYPE.TIME_ELAPSED */);
+        LOG_TIMEPROCESS = this.hasLogType(256 /* LOG_TYPE.TIME_PROCESS */);
+        return true;
     }
     static sanitizeAssets(assets, exclusions = []) {
         assets.forEach(item => {
@@ -645,11 +657,11 @@ class FileManager extends core_1.Host {
             to = joinRoot ? path.join(root, to) : path.resolve(to);
             recurseDir(result, [root], { ignore: [...ignore, to], sortBy, recursive });
             const output = [];
-            for (const pathname of result = filterPaths(result, include, exclude)) {
+            for (const pathname of result = filterPaths(result, include, exclude, options.dot)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
                     continue;
                 }
-                const current = await this.readHash(pathname, { algorithm, digest }) + ' ' + (path.sep === '\\' ? pathname.replace(/\\/g, '/') : pathname).substring(root.length).replace(/^\//, '');
+                const current = await this.readHash(pathname, { algorithm, digest }) + ' ' + (path.sep === '\\' ? pathname.replace(/(?:^\\|\\+)/g, '/') : pathname).substring(root.length).replace(/^\//, '');
                 if (verbose) {
                     process.stdout.write(current + '\n');
                 }
@@ -698,7 +710,7 @@ class FileManager extends core_1.Host {
                 const index = item.indexOf(' ');
                 return [item.substring(0, index), path.join(root, item.substring(index + 1))];
             });
-            const checked = include || exclude ? filterPaths(items.map(item => item[1]), include, exclude) : null;
+            const checked = include || exclude ? filterPaths(items.map(item => item[1]), include, exclude, options.dot) : null;
             let valid;
             for (const [previous, pathname] of items) {
                 if (checked !== null && !checked.includes(pathname) || recursive === 1 && path.basename(pathname) === filename) {
@@ -722,7 +734,7 @@ class FileManager extends core_1.Host {
                 const nested = files.filter(value => path.basename(value) === filename);
                 if (nested.length) {
                     const current = items.map(item => item[1]);
-                    const tasks = nested.map(pathname => this.verifyChecksum(path.dirname(pathname), filename, { ...options, ignore: current, joinRoot: true, verbose: (verbose ? 1 : 0) }));
+                    const tasks = nested.map(async (pathname) => this.verifyChecksum(path.dirname(pathname), filename, { ...options, ignore: current, joinRoot: true, verbose: (verbose ? 1 : 0) }));
                     await Promise.all(tasks).then(group => {
                         for (const item of group) {
                             if (item) {
@@ -761,9 +773,12 @@ class FileManager extends core_1.Host {
                 missing = Array.from(new Set(missing));
             }
         }
-        if (verbose === true) {
+        if (verbose === true) { // eslint-disable-line @typescript-eslint/no-unnecessary-boolean-literal-compare
             const max = Math.max(...fail.concat(missing).map(item => item.length));
-            const writeLog = (items, symbol) => items.forEach((value, index) => process.stdout.write(`${symbol} ${value.padEnd(max)} (${(index + 1).toString()})\n`));
+            const writeLog = (items, symbol) => {
+                const [bg, fg] = symbol === "-" /* SUMDIR_STATUS.FAIL */ ? ['\x1b[31m', '\x1b[89m'] : ['\x1b[33m', '\x1b[89m'];
+                items.forEach((value, index) => process.stdout.write(bg + symbol + ` ${value.padEnd(max)} (${(index + 1).toString()})${fg}\n`));
+            };
             writeLog(fail, "-" /* SUMDIR_STATUS.FAIL */);
             writeLog(missing, "?" /* SUMDIR_STATUS.MISSING */);
         }
@@ -1041,9 +1056,9 @@ class FileManager extends core_1.Host {
     get size() {
         return this.files.size;
     }
-    abort() {
-        this.Request.abort();
-        super.abort();
+    abort(reason) {
+        this.Request.abort(reason);
+        super.abort(reason);
     }
     willAbort(value) {
         if ((0, types_1.isObject)(value)) {
@@ -1332,81 +1347,82 @@ class FileManager extends core_1.Host {
         else {
             ({ origin, pathname, href: value } = value);
         }
-        if (value) {
-            const isSame = (a, b) => a === b || decodeURIComponent(a) === decodeURIComponent(b);
-            const result = (assets || this.assets).filter(item => {
-                let { uri, flags } = item;
-                if (uri && (!instance || this.hasDocument(instance, item.document)) && (!item.invalid || assets || (0, types_1.mainFlag)(flags) || (0, types_1.usingFlag)(flags) || (0, types_1.cloneFlag)(flags) || (0, types_1.watchFlag)(flags))) {
-                    if (origin) {
-                        if (!item.url) {
-                            try {
-                                if ((item.url = new URL(uri)).href === value) {
-                                    return true;
-                                }
-                            }
-                            catch {
+        if (!(0, types_1.isString)(value)) {
+            return;
+        }
+        const isSame = (a, b) => a === b || decodeURIComponent(a) === decodeURIComponent(b);
+        const result = (assets || this.assets).filter(item => {
+            let { uri, flags } = item;
+            if (uri && (!instance || this.hasDocument(instance, item.document)) && (!item.invalid || assets || (0, types_1.mainFlag)(flags) || (0, types_1.usingFlag)(flags) || (0, types_1.cloneFlag)(flags) || (0, types_1.watchFlag)(flags))) {
+                if (origin) {
+                    if (!item.url) {
+                        try {
+                            if ((item.url = new URL(uri)).href === value) {
+                                return true;
                             }
                         }
-                        else if (item.url.href === value) {
-                            return true;
+                        catch {
                         }
                     }
-                    if (isSame(uri, value)) {
+                    else if (item.url.href === value) {
                         return true;
                     }
-                    const indexA = uri.indexOf('#');
-                    const indexB = value.indexOf('#');
-                    if (indexA !== -1 || indexB !== -1) {
-                        if (indexA !== -1) {
-                            uri = uri.substring(0, indexA);
-                        }
-                        if (indexB !== -1) {
-                            value = value.substring(0, indexB);
-                        }
-                        return isSame(uri, value);
-                    }
                 }
-                return false;
-            });
-            if (replaced) {
-                const map = this[kReplaceMap];
-                const target = pathname || core_1.Host.toPosix(value);
-                const found = [];
-                for (const relative in map) {
-                    const item = map[relative];
-                    if (origin && item.url && item.url.origin !== origin) {
-                        continue;
-                    }
-                    if (path.basename(relative) === path.basename(target) && path.dirname(target).endsWith(path.dirname(relative))) {
-                        found.push([item, relative]);
-                    }
+                if (isSame(uri, value)) {
+                    return true;
                 }
-                if (found.length) {
-                    if (result.length === 0) {
-                        return found.sort((a, b) => b[1].length - a[1].length)[0][0];
+                const indexA = uri.indexOf('#');
+                const indexB = value.indexOf('#');
+                if (indexA !== -1 || indexB !== -1) {
+                    if (indexA !== -1) {
+                        uri = uri.substring(0, indexA);
+                    }
+                    if (indexB !== -1) {
+                        value = value.substring(0, indexB);
                     }
-                    result.push(...found.map(item => item[0]));
+                    return isSame(uri, value);
                 }
             }
-            return result.sort((a, b) => {
-                if ((a.content || a.base64) && !b.content && !b.base64 || a.uri === value && b.uri !== value) {
-                    return -1;
-                }
-                if ((b.content || b.base64) && !a.content && !a.base64 || b.uri === value && a.uri !== value) {
-                    return 1;
+            return false;
+        });
+        if (replaced) {
+            const map = this[kReplaceMap];
+            const target = pathname || core_1.Host.toPosix(value);
+            const found = [];
+            for (const relative in map) {
+                const item = map[relative];
+                if (origin && item.url && item.url.origin !== origin) {
+                    continue;
                 }
-                const bundleId = a.bundleId;
-                if (((0, types_1.isEmpty)(bundleId) || a.bundleIndex === 0) && ((0, types_1.isEmpty)(b.bundleId) || b.bundleIndex === 0)) {
-                    if (a.id && b.id) {
-                        return a.id < b.id ? -1 : 1;
-                    }
+                if (path.basename(relative) === path.basename(target) && path.dirname(target).endsWith(path.dirname(relative))) {
+                    found.push([item, relative]);
                 }
-                else if (!(0, types_1.isEmpty)(bundleId) && bundleId === b.bundleId) {
-                    return a.bundleIndex < b.bundleIndex ? -1 : 1;
+            }
+            if (found.length) {
+                if (result.length === 0) {
+                    return found.sort((a, b) => b[1].length - a[1].length)[0][0];
                 }
-                return 0;
-            })[0];
+                result.push(...found.map(item => item[0]));
+            }
         }
+        return result.sort((a, b) => {
+            if ((a.content || a.base64) && !b.content && !b.base64 || a.uri === value && b.uri !== value) {
+                return -1;
+            }
+            if ((b.content || b.base64) && !a.content && !a.base64 || b.uri === value && a.uri !== value) {
+                return 1;
+            }
+            const bundleId = a.bundleId;
+            if (((0, types_1.isEmpty)(bundleId) || a.bundleIndex === 0) && ((0, types_1.isEmpty)(b.bundleId) || b.bundleIndex === 0)) {
+                if (a.id && b.id) {
+                    return a.id < b.id ? -1 : 1;
+                }
+            }
+            else if (!(0, types_1.isEmpty)(bundleId) && bundleId === b.bundleId) {
+                return a.bundleIndex < b.bundleIndex ? -1 : 1;
+            }
+            return 0;
+        })[0];
     }
     removeAsset(file) {
         const localUri = file.localUri;
@@ -1565,10 +1581,10 @@ class FileManager extends core_1.Host {
                 const errors = collectErrors.call(this);
                 const files = Array.from(this.files).sort((a, b) => {
                     const sep = path.sep;
-                    if (a.indexOf(sep) !== -1 && b.indexOf(sep) === -1) {
+                    if (a.includes(sep) && !b.includes(sep)) {
                         return -1;
                     }
-                    if (a.indexOf(sep) === -1 && b.indexOf(sep) !== -1) {
+                    if (!a.includes(sep) && b.includes(sep)) {
                         return 1;
                     }
                     return a < b ? -1 : 1;
@@ -1924,7 +1940,7 @@ class FileManager extends core_1.Host {
         }
         return mimeType;
     }
-    compressFile(file, overwrite = true) {
+    async compressFile(file, overwrite = true) {
         const { localUri, compress } = file;
         const instance = this.Compress;
         if (instance && compress && localUri && (this.has(localUri) || (0, types_1.existsFlag)(file.flags))) {
@@ -1978,7 +1994,7 @@ class FileManager extends core_1.Host {
                 return Promise.all(tasks);
             }
         }
-        return Promise.resolve([]);
+        return [];
     }
     async transformAsset(data, parent) {
         const file = data.file;
@@ -2029,29 +2045,27 @@ class FileManager extends core_1.Host {
                     const handler = this.Image.get(mimeType) || this.Image.get('handler');
                     if (handler) {
                         const { instance, constructor } = handler;
-                        if (instance.using || constructor.using) {
-                            for (const command of file.commands) {
-                                if (withinSizeRange(localUri, command, constructor.REGEXP_SIZERANGE) && !data.aborted) {
-                                    try {
-                                        if (instance.threadable) {
-                                            if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
-                                                (instance.using ? instance.using(data, command) : constructor.using.call(this, instance, data, command))
-                                                    .then(() => this.closeThread(instance, data))
-                                                    .catch(err => {
-                                                    this.closeThread(instance, data);
-                                                    errorAsset(instance, err, 2048 /* LOG_TYPE.IMAGE */);
-                                                });
-                                            }
-                                        }
-                                        else if (!this.aborted) {
-                                            this.addProcessTimeout(instance, file, this.getProcessTimeout(handler));
-                                            await (instance.using ? instance.using(data, command) : constructor.using.call(this, instance, data, command));
+                        for (const command of file.commands) {
+                            if (withinSizeRange(localUri, command, constructor.REGEXP_SIZERANGE) && (instance.using || constructor.using) && !data.aborted) {
+                                try {
+                                    if (instance.threadable) {
+                                        if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
+                                            (instance.using ? instance.using(data, command) : constructor.using.call(this, instance, data, command))
+                                                .then(() => this.closeThread(instance, data))
+                                                .catch(err => {
+                                                this.closeThread(instance, data);
+                                                errorAsset(instance, err, 2048 /* LOG_TYPE.IMAGE */);
+                                            });
                                         }
                                     }
-                                    catch (err) {
-                                        errorAsset(instance, err, 2048 /* LOG_TYPE.IMAGE */);
+                                    else if (!this.aborted) {
+                                        this.addProcessTimeout(instance, file, this.getProcessTimeout(handler));
+                                        await (instance.using ? instance.using(data, command) : constructor.using.call(this, instance, data, command));
                                     }
                                 }
+                                catch (err) {
+                                    errorAsset(instance, err, 2048 /* LOG_TYPE.IMAGE */);
+                                }
                             }
                         }
                     }
@@ -2060,7 +2074,7 @@ class FileManager extends core_1.Host {
             else if (file.document) {
                 for (const handler of this.Document) {
                     const { instance, constructor } = handler;
-                    if ((instance.using || constructor.using) && this.hasDocument(instance, file.document) && !data.aborted) {
+                    if (this.hasDocument(instance, file.document) && (instance.using || constructor.using) && !data.aborted) {
                         try {
                             if (instance.threadable) {
                                 if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
@@ -2199,14 +2213,14 @@ class FileManager extends core_1.Host {
     getDownload(type = 0) {
         return this[kDownloadStats][type];
     }
-    fetchObject(uri, options) {
+    async fetchObject(uri, options) {
         if (!(0, types_1.isObject)(options)) {
             options = { format: options };
         }
         options.format || (options.format = 'json');
         return this.fetchBuffer(uri, options).then(data => typeof data === 'object' ? data : null).catch(() => null);
     }
-    fetchBuffer(uri, options) {
+    async fetchBuffer(uri, options) {
         if (options) {
             options.format = undefined;
         }
@@ -2224,14 +2238,14 @@ class FileManager extends core_1.Host {
             return buffer;
         });
     }
-    fetchFiles(uri, options) {
+    async fetchFiles(uri, options) {
         if (!(0, types_1.isObject)(options)) {
             options = { pathname: options };
         }
         options.pathname || (options.pathname = this.baseDirectory);
         return this.Request.aria2c(uri, options);
     }
-    start(emptyDir) {
+    async start(emptyDir) {
         const listener = (resolve) => {
             const callback = (files, errors, status) => {
                 if (!this.restarting) {
@@ -2323,7 +2337,7 @@ class FileManager extends core_1.Host {
             const length = arguments.length;
             const args = new Array(length);
             for (let i = 0; i < length; ++i) {
-                args[i] = arguments[i];
+                args[i] = arguments[i]; // eslint-disable-line prefer-rest-params
             }
             if (this.joinQueue({ args })) {
                 this.finalizeState = 4 /* FINALIZE_STATE.QUEUED */;
@@ -2364,7 +2378,7 @@ class FileManager extends core_1.Host {
                     file.invalid = true;
                     const localUri = file.localUri;
                     if (expired) {
-                        data.abort();
+                        data.abort(new Error("Timeout was exceeded" /* ERR_MESSAGE.TIMEOUT */));
                         if (localUri) {
                             this.deleteFile(localUri, { id: file.id, emptyDir: true, all: true });
                         }
@@ -2612,7 +2626,7 @@ class FileManager extends core_1.Host {
                                                     if (!fs.existsSync(baseDir)) {
                                                         fs.mkdirSync(baseDir);
                                                     }
-                                                    tempFile = path.join(baseDir, (0, types_1.generateUUID)());
+                                                    tempFile = path.join(baseDir, (0, types_1.incrementUUID)());
                                                     options.pipeTo = tempFile;
                                                 }
                                                 catch {
@@ -3304,7 +3318,7 @@ class FileManager extends core_1.Host {
     }
     async finalizeCompress(assets) {
         const compress = this.Compress;
-        if (!(compress && assets.length)) {
+        if (!(assets.length && compress)) {
             return;
         }
         const tasks = [];
@@ -3370,9 +3384,11 @@ class FileManager extends core_1.Host {
             }
         }
     }
-    finalizeCloud() {
+    async finalizeCloud() {
         const cloud = this.Cloud;
-        return cloud ? cloud_1.default.finalize.call(this, cloud).catch(err => rejectModule.call(cloud, err, 64 /* LOG_TYPE.CLOUD */)) : Promise.resolve();
+        if (cloud) {
+            return cloud_1.default.finalize.call(this, cloud).catch(err => rejectModule.call(cloud, err, 64 /* LOG_TYPE.CLOUD */));
+        }
     }
     async finalizeCleanup() {
         if (this.emptyDir.size) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,14 +20,15 @@
   "license": "BSD 3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.7.0",
-    "@e-mc/compress": "0.7.0",
-    "@e-mc/core": "0.7.0",
-    "@e-mc/document": "0.7.0",
-    "@e-mc/image": "0.7.0",
-    "@e-mc/request": "0.7.0",
-    "@e-mc/task": "0.7.0",
-    "@e-mc/types": "0.7.0",
-    "@e-mc/watch": "0.7.0"
+    "@e-mc/cloud": "0.8.0",
+    "@e-mc/compress": "0.8.0",
+    "@e-mc/core": "0.8.0",
+    "@e-mc/document": "0.8.0",
+    "@e-mc/image": "0.8.0",
+    "@e-mc/request": "0.8.0",
+    "@e-mc/task": "0.8.0",
+    "@e-mc/types": "0.8.0",
+    "@e-mc/watch": "0.8.0",
+    "picomatch": "^3.0.1"
   }
 }