@e-mc/file-manager 0.10.6 → 0.11.1

package/LICENSE

@@ -8,4 +8,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
 
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/file-manager
 
-* NodeJS 16
-* ES2020
+* NodeJS 16 LTS
+* ES2021
 
 ## General Usage
 
@@ -9,12 +9,12 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.1/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, IncrementalMatch, TaskAction } from "./squared";
 
-import type { DocumentConstructor, HostConstructor, ICloud, ICompress, IDocument, IHost, IImage, IModule, IRequest, ITask, ImageConstructor, TaskConstructor, WatchInstance } from "./index";
+import type { DocumentConstructor, HostConstructor, ICloud, ICompress, IDocument, IHost, IImage, IModule, IRequest, ITask, IWatch, ImageConstructor, TaskConstructor, WatchConstructor } from "./index";
 import type { ExternalAsset, FileCommand, FileData, IFileThread, OutputFinalize } from "./asset";
 import type { IPermission, PermissionReadWrite } from "./core";
 import type { AssetContentOptions, ChecksumOptions, DeleteFileAddendum, FileOutput, FinalizeResult, FindAssetOptions, IHttpDiskCache, IHttpMemoryCache, ImageMimeMap, InstallData, PostFinalizeCallback, ReplaceOptions } from "./filemanager";
@@ -24,13 +24,11 @@ import type { RequestData, Settings } from "./node";
 import type { Aria2Options, BufferFormat, OpenOptions } from "./request";
 import type { CloudModule, CompressModule, DbModule, DocumentModule, HttpConnectSettings, HttpMemorySettings, ImageModule, RequestModule, TaskModule, WatchModule } from "./settings";
 
-import type { SpawnOptions } from "child_process";
-import type { NoParamCallback } from "fs";
+import type { SpawnOptions } from "node:child_process";
+import type { NoParamCallback } from "node:fs";
 
 interface IFileManager extends IHost, Set<string> {
     processTimeout: number;
-    cacheToDisk: IHttpDiskCache<ExternalAsset>;
-    cacheToMemory: IHttpMemoryCache<ExternalAsset>;
     Request: IRequest;
     Document: InstallData<IDocument<IFileManager, ExternalAsset>, DocumentConstructor<IFileManager, ExternalAsset>>[];
     Task: InstallData<ITask, TaskConstructor>[];
@@ -51,6 +49,8 @@ interface IFileManager extends IHost, Set<string> {
     readonly fetchedAssets: ExternalAsset[];
     readonly copiedAssets: ExternalAsset[];
     readonly emptyDir: Set<string>;
+    readonly cacheToDisk: IHttpDiskCache<ExternalAsset>;
+    readonly cacheToMemory: IHttpMemoryCache<ExternalAsset>;
     install(name: "document", handler: string, module?: DocumentModule, ...args: unknown[]): IDocument | undefined;
     install(name: "document", target: DocumentConstructor, module?: DocumentModule, ...args: unknown[]): IDocument | undefined;
     install(name: "task", handler: string, module?: TaskModule, ...args: unknown[]): ITask | undefined;
@@ -60,8 +60,9 @@ interface IFileManager extends IHost, Set<string> {
     install(name: "image", handler: string, module?: ImageModule, ...args: unknown[]): IImage | undefined;
     install(name: "image", target: ImageConstructor, module?: ImageModule, ...args: unknown[]): IImage | undefined;
     install(name: "image", targets: Map<string, ImageConstructor>, module?: ImageModule): void;
-    install(name: "watch", module: WatchModule): WatchInstance<ExternalAsset> | undefined;
-    install(name: "watch", interval?: number | string, port?: number | string, securePort?: number | string, extensions?: unknown[]): WatchInstance<ExternalAsset> | undefined;
+    install(name: "watch", handler: string, module?: WatchModule, ...args: unknown[]): IWatch | undefined;
+    install(name: "watch", target: WatchConstructor, module?: WatchModule, ...args: unknown[]): IWatch | undefined;
+    install(name: "watch", module: WatchModule): IWatch | undefined;
     install(name: "compress", module?: CompressModule): ICompress | undefined;
     install(name: string, ...args: unknown[]): IModule | undefined;
     using(...items: ExternalAsset[] | [boolean, ...ExternalAsset[]]): this;
@@ -69,7 +70,7 @@ interface IFileManager extends IHost, Set<string> {
     removeCwd(value: unknown): string;
     findAsset(value: string | URL, instance?: IModule | FindAssetOptions<ExternalAsset>): ExternalAsset | undefined;
     removeAsset(file: ExternalAsset): boolean;
-    replace(file: ExternalAsset, replaceWith: string, mimeType: Undef<string>): boolean;
+    replace(file: ExternalAsset, replaceWith: string, mimeType: string | undefined): boolean;
     replace(file: ExternalAsset, replaceWith: string, options?: ReplaceOptions): boolean;
     rename(file: ExternalAsset, value: string): boolean;
     performAsyncTask(): void;
@@ -305,18 +306,18 @@ NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 
 ## LICENSE
 
-BSD 3-Clause
+BSD 3-Clause

package/index.js

@@ -1,13 +1,13 @@
 "use strict";
 var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-const path = require("path");
-const fs = require("fs");
-const stream = require("stream");
+const path = require("node:path");
+const fs = require("node:fs");
+const stream = require("node:stream");
 const pm = require("picomatch");
 const diff = require("diff");
 const chalk = require("chalk");
-const stripansi = require("strip-ansi");
-const url_1 = require("url");
+const node_url_1 = require("node:url");
+const node_util_1 = require("node:util");
 const types_1 = require("@e-mc/types");
 const core_1 = require("@e-mc/core");
 const asset_1 = require("@e-mc/document/asset");
@@ -40,7 +40,7 @@ const PROCESS_STDOUT = process.stdout;
 const PROCESS_STDIN = process.stdin;
 const STDOUT_CURSOR = typeof PROCESS_STDOUT.moveCursor === 'function';
 const PROCESS_TIMEOUT = { filemanager: 0, compress: 0 };
-const CACHE_ETAG = {};
+const CACHE_ETAG = new Map();
 const DISK = {
     ENABLED: false,
     EXPIRES: 0,
@@ -50,9 +50,8 @@ const DISK = {
 };
 const MEMORY = {
     ENABLED: false,
-    CACHE: {},
+    CACHE: new Map(),
     SIZE: 0,
-    TOTAL: 0,
     EXPIRES: 0,
     LIMIT: (0, types_1.formatSize)("100mb"),
     LIMIT_ALL: (0, types_1.formatSize)("512mb"),
@@ -87,7 +86,7 @@ let SESSION_ID = 0;
 let SESSION_LIMIT = 1000;
 let ASSET_ID = 0;
 let RECURSION_LIMIT = 10;
-let PROCESS_SUB_LIMIT = Math.max(require('os').cpus().length, 1) * 2;
+let PROCESS_SUB_LIMIT = Math.max(require('node:os').cpus().length, 1) * 2;
 let LOG_TIMEELAPSED = true;
 let LOG_TIMEPROCESS = true;
 const HTTP_CLIENT = {
@@ -136,7 +135,7 @@ function unsetContent(item) {
         item.buffer = null;
     }
     if ('sourceUTF8' in item) {
-        item.sourceUTF8 = '';
+        item.sourceUTF8 = undefined;
     }
 }
 function bundleTorrent(host, files, mimeType, encoding) {
@@ -217,24 +216,33 @@ function checkHash(host, localUri, output, options, data) {
     }
     return true;
 }
-function validatePaths(values, patterns, include, dot) {
-    const items = patterns.map(value => isMatchRoot(value) ? [core_1.Permission.toPosix(path.resolve(value)), { nocase: core_1.Host.PLATFORM_WIN32, dot }] : [sanitizePath(value), { matchBase: true, nocase: core_1.Host.PLATFORM_WIN32, dot }]);
+function validatePaths(rootDir, values, patterns, include, dot) {
+    const items = patterns.map(value => {
+        let invert = false;
+        if (!include && value.startsWith('!')) {
+            value = value.substring(1);
+            invert = true;
+        }
+        const matchBase = !isMatchRoot(value = core_1.Permission.toPosix(value));
+        return [pm(value, { posixSlashes: true, windows: true, nocase: core_1.Host.PLATFORM_WIN32, dot, matchBase }), path.isAbsolute(value), invert];
+    });
     return values.filter(value => {
-        for (const [pattern, options] of items) {
-            if (pm.isMatch(core_1.Permission.toPosix(value), pattern, options)) {
-                return include;
+        for (const [pattern, absolute, invert] of items) {
+            if (pattern(absolute ? value : value.substring(rootDir.length))) {
+                return invert ? !include : include;
             }
         }
         return !include;
     });
 }
-function filterPaths(values, include, exclude, dot) {
+function filterPaths(rootDir, values, include, exclude, dot) {
+    rootDir = core_1.Host.normalizePath(rootDir, 2);
     if (include) {
         if ((0, types_1.isString)(include)) {
             include = [include];
         }
         if ((0, types_1.isArray)(include)) {
-            return validatePaths(values, include, true, dot);
+            values = validatePaths(rootDir, values, include, true, dot);
         }
     }
     if (exclude) {
@@ -242,7 +250,7 @@ function filterPaths(values, include, exclude, dot) {
             exclude = [exclude];
         }
         if ((0, types_1.isArray)(exclude)) {
-            return validatePaths(values, exclude, false, dot);
+            return validatePaths(rootDir, values, exclude, false, dot);
         }
     }
     return values;
@@ -395,7 +403,7 @@ function clearQueue(data, attr) {
     }
 }
 function hasEtag(item, cacheable, fallback) {
-    if (!cacheable || !(0, types_1.existsFlag)(item.flags)) {
+    if (!cacheable || !(0, types_1.existsFlag)(item)) {
         return false;
     }
     switch (item.incremental) {
@@ -421,7 +429,7 @@ function processHeaders(item, headers, lastModified, mainEtag) {
     const etag = headers.etag;
     if (etag) {
         if (mainEtag) {
-            CACHE_ETAG[item.uri] = etag;
+            CACHE_ETAG.set(item.uri, etag);
         }
         return item.etag = etag;
     }
@@ -544,8 +552,8 @@ async function doVerifyChecksum(root, from, options, nested) {
             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, options.dot) : null;
-        let valid;
+        const checked = include || exclude ? filterPaths(root, items.map(item => item[1]), include, exclude, options.dot) : null;
+        let valid = false;
         for (const [previous, pathname] of items) {
             if (checked !== null && !checked.includes(pathname) || recursive === 1 && path.basename(pathname) === filename) {
                 continue;
@@ -671,10 +679,9 @@ function setLogMinWidth() {
 }
 const closeResponse = (client) => client?.destroy();
 const isCacheable = (item) => item.initialValue?.cacheable !== false;
-const isMatchRoot = (value) => !value.startsWith('*') && /[\\/]/.test(value);
+const isMatchRoot = (value) => !value.startsWith('*') && value.includes('/');
 const hasIncremental = (value) => value === "etag" || value === "exists";
 const matchPathname = (value) => core_1.Host.PLATFORM_WIN32 ? value.toLowerCase() : value;
-const sanitizePath = (value) => value.replace(/(?:^\\|\\+)/g, '/');
 const equalAddress = (value, other) => value === other || decodeURIComponent(value) === decodeURIComponent(other);
 const formatPercent = (value) => Math.round(value).toString().padStart(3) + '%';
 const checkEOF = (value) => /\n$/.test(value) ? value : value + '\n';
@@ -936,34 +943,36 @@ class HttpMemoryCache extends HttpDiskCache {
             if (MEMORY.SIZE >= MEMORY.LIMIT_ALL) {
                 this.purge(MEMORY.PURGE);
             }
-            this._items.push(MEMORY.CACHE[uri] = [Date.now(), buffer, encoding, contentLength, uri, etag]);
+            const item = [Date.now(), buffer, encoding, contentLength, uri, etag];
+            this._items.push(item);
+            MEMORY.CACHE.set(uri, item);
             if (this.expires < Infinity) {
                 setTimeout(() => {
                     this.clear(uri);
                 }, Math.min(this.expires, core_1.Host.MAX_TIMEOUT));
             }
-            ++MEMORY.TOTAL;
-            return;
         }
-        let tempDir;
-        if (toDisk && this.withinDisk(contentLength) && (tempDir = this.host.getCacheDir(uri))) {
-            try {
-                const baseDir = path.join(tempDir, etag);
-                if (!fs.existsSync(baseDir)) {
-                    fs.mkdirSync(baseDir);
+        else {
+            let tempDir;
+            if (toDisk && this.withinDisk(contentLength) && (tempDir = this.host.getCacheDir(uri))) {
+                try {
+                    const baseDir = path.join(tempDir, etag);
+                    if (!fs.existsSync(baseDir)) {
+                        fs.mkdirSync(baseDir);
+                    }
+                    fs.writeFileSync(path.join(baseDir, toDisk), buffer);
+                    return;
+                }
+                catch {
                 }
-                fs.writeFileSync(path.join(baseDir, toDisk), buffer);
-                return;
-            }
-            catch {
             }
+            this.clear(uri);
         }
-        this.clear(uri);
     }
     clear(uri) {
         let items;
         if (uri) {
-            const item = MEMORY.CACHE[uri instanceof URL ? uri.href : uri];
+            const item = MEMORY.CACHE.get(uri instanceof URL ? uri.href : uri);
             if (!item) {
                 return;
             }
@@ -973,14 +982,13 @@ class HttpMemoryCache extends HttpDiskCache {
             items = this._items;
         }
         for (const item of items) {
-            const expired = MEMORY.CACHE[uri = item[4]];
+            const expired = MEMORY.CACHE.get(uri = item[4]);
             if (expired) {
                 const size = expired[3];
                 if (size > 0) {
                     MEMORY.SIZE -= size;
                 }
-                delete MEMORY.CACHE[uri];
-                --MEMORY.TOTAL;
+                MEMORY.CACHE.delete(uri);
             }
         }
     }
@@ -1089,26 +1097,26 @@ class ProcessFile {
         if (err) {
             file.invalid = true;
             host.completeAsyncTask(err, localUri);
-            return;
         }
-        if (file.checksum && !checked && !checkHash(host, localUri, false, file.checksum, file.buffer)) {
+        else if (file.checksum && !checked && !checkHash(host, localUri, false, file.checksum, file.buffer)) {
             file.invalid = true;
             host.filesToRemove.add(localUri);
             host.completeAsyncTask();
             host.writeFail(["Checksum did not match", path.basename(localUri)], (0, types_1.errorValue)(file.uri || localUri, "Invalid checksum"), { type: 32, queue: true });
-            return;
-        }
-        if (fetched) {
-            host.fetchedAssets.push(file);
-        }
-        else {
-            host.copiedAssets.push(file);
-        }
-        if (binary) {
-            void host.transformAsset(new FileThread(host, file, 1));
         }
         else {
-            void this.finalize(incremental);
+            if (fetched) {
+                host.fetchedAssets.push(file);
+            }
+            else {
+                host.copiedAssets.push(file);
+            }
+            if (binary) {
+                void host.transformAsset(new FileThread(host, file, 1));
+            }
+            else {
+                void this.finalize(incremental);
+            }
         }
     }
     async finalize(incremental) {
@@ -1145,7 +1153,7 @@ class ProcessFile {
                                     queue.invalid = true;
                                     return;
                                 }
-                                if (value instanceof Buffer) {
+                                if (Buffer.isBuffer(value)) {
                                     value = value.toString(encoding);
                                 }
                                 const url = queue.url;
@@ -1179,7 +1187,7 @@ class ProcessFile {
                                 else if (url) {
                                     if (etag = queue.etag) {
                                         const valid = incremental !== false || file.incremental === true;
-                                        const cached = valid && MEMORY.CACHE[uri];
+                                        const cached = valid && MEMORY.CACHE.get(uri);
                                         const etagDir = encodeURIComponent(etag);
                                         if (cached) {
                                             if (etagDir === cached[5]) {
@@ -1420,40 +1428,29 @@ class FileManager extends core_1.Host {
             limit = 0;
         }
         let result = 0;
-        if (limit === 0 || (parent === undefined && limit >= MEMORY.SIZE) || (parent !== undefined && limit > MEMORY.TOTAL)) {
-            const cache = MEMORY.CACHE;
+        if (limit === 0 || (parent === undefined && limit >= MEMORY.SIZE) || (parent !== undefined && limit > MEMORY.CACHE.size)) {
             if (percent >= 1) {
-                for (const uri in cache) {
-                    delete cache[uri];
-                    ++result;
-                }
+                result = MEMORY.CACHE.size;
+                MEMORY.CACHE.clear();
                 MEMORY.SIZE = 0;
-                MEMORY.TOTAL = 0;
             }
             else if (percent > 0) {
+                const items = Array.from(MEMORY.CACHE.entries());
                 const bufferSize = Math.ceil(MEMORY.SIZE * percent);
-                const items = [];
                 let purgeSize = 0;
-                for (const uri in cache) {
-                    const item = cache[uri];
-                    if (item) {
-                        items.push([item, uri]);
-                    }
-                }
-                items.sort((a, b) => a[0][0] - b[0][0]);
-                for (const [item, uri] of items) {
+                items.sort((a, b) => a[1][0] - b[1][0]);
+                for (const [uri, item] of items) {
                     const size = item[3];
                     if (size > 0) {
                         purgeSize += size;
                         MEMORY.SIZE -= size;
                     }
-                    delete MEMORY.CACHE[uri];
+                    MEMORY.CACHE.delete(uri);
                     ++result;
                     if (purgeSize >= bufferSize) {
                         break;
                     }
                 }
-                MEMORY.TOTAL = items.length - result;
             }
         }
         return result + (parent && result > 0 ? await super.purgeMemory(typeof parent === 'number' && parent > 0 ? parent : percent, limit, true) : 0);
@@ -1499,6 +1496,9 @@ class FileManager extends core_1.Host {
             else if (id && (id = +id) > 0) {
                 SESSION_LIMIT = Math.pow(10, id);
             }
+            if (logger.color === false) {
+                LOGGER.PROGRESS_USECOLOR = false;
+            }
             if (logger.progress) {
                 let { scroll_buffer, max_width, use_color, text_wrap, color, bg_color, raw_mode, box_char } = logger.progress;
                 if ((scroll_buffer = (0, util_2.asInt)(scroll_buffer)) >= 0 && scroll_buffer <= 16) {
@@ -1554,7 +1554,7 @@ class FileManager extends core_1.Host {
     }
     static sanitizeAssets(assets, exclusions = []) {
         for (const item of assets) {
-            if ((0, types_1.ignoreFlag)(item.flags)) {
+            if ((0, types_1.ignoreFlag)(item)) {
                 continue;
             }
             const initialValue = item.initialValue;
@@ -1610,11 +1610,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, options.dot)) {
+            for (const pathname of result = filterPaths(root, result, include, exclude, options.dot)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
                     continue;
                 }
-                const current = await this.readHash(pathname, { algorithm, digest }) + ' ' + (path.sep === '\\' ? sanitizePath(pathname) : pathname).substring(root.length).replace(/^\//, '');
+                const current = await this.readHash(pathname, { algorithm, digest }) + ' ' + core_1.Permission.toPosix(pathname).substring(root.length).replace(/^\//, '');
                 if (verbose) {
                     process.stdout.write(current + '\n');
                 }
@@ -1727,7 +1727,7 @@ class FileManager extends core_1.Host {
         this[_j] = new Scheduler();
         this[_k] = [[0, 0], [0, 0], [0, 0]];
         this[_l] = null;
-        this[_m] = {};
+        this[_m] = null;
         this[_o] = null;
         if (isFunction(permission)) {
             postFinalize = permission;
@@ -1740,7 +1740,7 @@ class FileManager extends core_1.Host {
         this[kBaseDirectory] = path.normalize(baseDirectory[index] === path.sep ? baseDirectory.substring(0, index) : baseDirectory);
         this.permission = permission && core_1.Host.isPermission(permission) ? permission : core_1.Host.getPermissionFromSettings();
         this.sessionId = (++SESSION_ID === SESSION_LIMIT ? SESSION_ID = 1 : SESSION_ID).toString();
-        const { assets = [], incremental, dataSource, timeout, threads } = config;
+        const assets = config.assets || [];
         let targeted;
         for (let i = 0, length = assets.length; i < length; ++i) {
             const item = assets[i];
@@ -1754,24 +1754,24 @@ class FileManager extends core_1.Host {
             if (encoding && encoding !== 'utf8' && encoding !== 'utf-8') {
                 item.encoding = encoding.endsWith('be') ? undefined : (0, types_1.getEncoding)(encoding);
             }
-            if ((0, types_1.usingFlag)(item.flags)) {
+            if ((0, types_1.usingFlag)(item)) {
                 (targeted ||= []).push(item);
             }
             item.id ||= ++ASSET_ID;
         }
         this._assets = assets.slice(0);
-        this[kIncremental] = incremental === "staging" ? "staging" : "none";
+        this[kIncremental] = config.incremental === "staging" ? "staging" : "none";
         if (targeted) {
             this.using(...targeted);
         }
-        if (Array.isArray(dataSource)) {
-            this.dataSourceItems.push(...dataSource);
+        if (Array.isArray(config.dataSource)) {
+            this.dataSourceItems.push(...config.dataSource);
         }
         if (this.willAbort(this)) {
             this.abortable = true;
         }
-        if ((0, types_1.isPlainObject)(timeout)) {
-            applyTimeout(this[kProcessTimeout], timeout);
+        if (config.timeout) {
+            applyTimeout(this[kProcessTimeout] = Object.create(null), config.timeout);
         }
         if (isFunction(postFinalize)) {
             this.on('end', postFinalize);
@@ -1784,19 +1784,11 @@ class FileManager extends core_1.Host {
         if (MEMORY.EXCLUDE.length > 0) {
             this.cacheToMemory.exclude = MEMORY.EXCLUDE;
         }
-        if (threads) {
-            this.setTaskLimit(threads);
+        if (typeof config.threads === 'number') {
+            this.setTaskLimit(config.threads);
         }
         if ((0, types_1.isPlainObject)(config.log) && (0, types_1.isArray)(config.log.showDiff) && this.incremental !== "staging") {
-            this[kDiffSource] = [
-                config.log.showDiff.map(item => {
-                    if (!(0, types_1.hasGlob)(item)) {
-                        return item;
-                    }
-                    return isMatchRoot(item) ? pm(core_1.Permission.toPosix(item), { nocase: core_1.Host.PLATFORM_WIN32 }) : pm(sanitizePath(item), { matchBase: true, nocase: core_1.Host.PLATFORM_WIN32 });
-                }),
-                {}
-            ];
+            this[kDiffSource] = [config.log.showDiff.map(value => (0, types_1.hasGlob)(value) ? (value = core_1.Permission.toPosix(value), pm(value, { matchBase: !isMatchRoot(value), nocase: core_1.Host.PLATFORM_WIN32 })) : value), {}];
         }
         const request = new request_1();
         request.host = this;
@@ -2058,79 +2050,96 @@ class FileManager extends core_1.Host {
                 else if ((0, types_1.isObject)(Target)) {
                     instance = new cloud_1(Target, database);
                 }
-                if (instance) {
-                    instance.host = this;
-                    instance.init(this.config);
-                    observeFile(this, instance);
-                    return this.Cloud = instance;
+                if (!instance) {
+                    return;
                 }
-                break;
+                instance.host = this;
+                instance.init(this.config);
+                observeFile(this, instance);
+                return this.Cloud = instance;
             }
             case 'watch': {
-                const instance = (0, types_1.isObject)(Target) ? new watch_1(Target) : new watch_1({ interval: Target, port: args[0], secure: { port: args[1] }, extensions: args[2] });
+                let instance;
+                if ((0, types_1.isString)(Target)) {
+                    const module = args.shift();
+                    if ((0, types_1.isObject)(module)) {
+                        if (Target === "@e-mc/watch") {
+                            instance = new watch_1(module);
+                        }
+                        else if (isFunction(Target = tryPackage(this, Target, 16)) && Target.prototype instanceof watch_1) {
+                            instance = new Target(module);
+                        }
+                    }
+                }
+                else if ((0, types_1.isObject)(Target)) {
+                    instance = new watch_1(Target);
+                }
+                if (!instance) {
+                    return;
+                }
                 instance.host = this;
                 instance.init(this.config);
-                instance.whenModified = (assets, sanitize, postFinalize) => {
-                    if (typeof sanitize === 'function') {
-                        postFinalize = sanitize;
-                        sanitize = true;
-                    }
-                    if (sanitize) {
-                        FileManager.sanitizeAssets(assets);
-                        for (const { instance: document, constructor } of this.Document) {
-                            if (constructor.sanitizeAssets) {
-                                constructor.sanitizeAssets(assets.filter(item => this.hasDocument(document, item.document)));
+                if (!instance.whenModified) {
+                    instance.whenModified = (assets, sanitize, postFinalize) => {
+                        if (typeof sanitize === 'function') {
+                            postFinalize = sanitize;
+                            sanitize = true;
+                        }
+                        if (sanitize) {
+                            FileManager.sanitizeAssets(assets);
+                            for (const { instance: document, constructor } of this.Document) {
+                                if (constructor.sanitizeAssets) {
+                                    constructor.sanitizeAssets(assets.filter(item => this.hasDocument(document, item.document)));
+                                }
                             }
                         }
-                    }
-                    const manager = new FileManager(this.baseDirectory, { ...this.config, incremental: "none", assets }, postFinalize);
-                    for (const { constructor, params } of this.Document) {
-                        manager.install('document', constructor, ...params);
-                    }
-                    for (const { constructor, params } of this.Task) {
-                        manager.install('task', constructor, ...params);
-                    }
-                    if (this.Cloud) {
-                        manager.install('cloud', this.Cloud.module);
-                    }
-                    if (this.Image) {
-                        const mimeMap = new Map();
-                        let params = [];
-                        for (const [mimeType, handler] of this.Image) {
-                            const { constructor, params: trailing } = handler;
-                            if (mimeType === 'handler') {
-                                if (this.Image.size === 1) {
-                                    manager.install('image', constructor, ...trailing);
-                                    break;
+                        const manager = new FileManager(this.baseDirectory, { ...this.config, incremental: "none", assets }, postFinalize);
+                        for (const { constructor, params } of this.Document) {
+                            manager.install('document', constructor, ...params);
+                        }
+                        for (const { constructor, params } of this.Task) {
+                            manager.install('task', constructor, ...params);
+                        }
+                        if (this.Cloud) {
+                            manager.install('cloud', this.Cloud.module);
+                        }
+                        if (this.Image) {
+                            const mimeMap = new Map();
+                            let params = [];
+                            for (const [mimeType, handler] of this.Image) {
+                                const { constructor, params: trailing } = handler;
+                                if (mimeType === 'handler') {
+                                    if (this.Image.size === 1) {
+                                        manager.install('image', constructor, ...trailing);
+                                        break;
+                                    }
+                                    params = trailing;
+                                }
+                                else if (params.length === 0) {
+                                    params = trailing;
                                 }
-                                params = trailing;
+                                mimeMap.set(mimeType, constructor);
                             }
-                            else if (params.length === 0) {
-                                params = trailing;
+                            if (mimeMap.size > 0) {
+                                manager.install('image', mimeMap, ...params);
                             }
-                            mimeMap.set(mimeType, constructor);
-                        }
-                        if (mimeMap.size > 0) {
-                            manager.install('image', mimeMap, ...params);
                         }
-                    }
-                    if (this.Compress) {
-                        manager.install('compress', this.Compress.module);
-                    }
-                    manager.sessionId = this.sessionId;
-                    manager.permission = this.permission;
-                    manager.cacheToDisk = this.cacheToDisk;
-                    manager.cacheToMemory = this.cacheToMemory;
-                    if (postFinalize) {
-                        try {
-                            manager.processAssets();
+                        if (this.Compress) {
+                            manager.install('compress', this.Compress.module);
                         }
-                        catch (err) {
-                            manager.writeFail("Unknown", err, { startTime: manager.startTime });
+                        manager.sessionId = this.sessionId;
+                        manager.permission = this.permission;
+                        if (postFinalize) {
+                            try {
+                                manager.processAssets();
+                            }
+                            catch (err) {
+                                manager.writeFail("Unknown", err, { startTime: manager.startTime });
+                            }
                         }
-                    }
-                    return manager;
-                };
+                        return manager;
+                    };
+                }
                 return this.Watch = instance;
             }
             case 'image': {
@@ -2431,12 +2440,12 @@ class FileManager extends core_1.Host {
                 pathname = file.pathname || '';
             }
             const assets = this.assets;
-            let target = matchPathname(path.join(pathname, filename)), modified;
+            let target = matchPathname(path.join(pathname, filename)), modified = false;
             for (let i = 0, j = 1, length = assets.length; i < length; ++i) {
                 const item = assets[i];
                 if (item !== file && item.filename && target === matchPathname(path.join(item.pathname || '', item.filename))) {
-                    const ext = path.extname(filename);
-                    filename = path.basename(filename, ext) + '_' + j + ext;
+                    const { name, ext } = path.parse(filename);
+                    filename = name + '_' + j + ext;
                     target = matchPathname(path.join(pathname, filename));
                     modified = true;
                     i = -1;
@@ -2594,7 +2603,7 @@ class FileManager extends core_1.Host {
                 return fs.readFileSync(localUri);
             }
             catch (err) {
-                if (!(base64 && core_1.Host.isErrorCode(err, 'ENOENT'))) {
+                if (!(base64 && core_1.Host.isErrorCode(err, 'ENOENT', 'EACCES'))) {
                     this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
                     base64 = undefined;
                 }
@@ -2795,7 +2804,7 @@ class FileManager extends core_1.Host {
     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))) {
+        if (instance && compress && localUri && (this.has(localUri) || (0, types_1.existsFlag)(file))) {
             const tasks = [];
             for (const options of compress) {
                 const { format, condition } = options;
@@ -2820,8 +2829,8 @@ class FileManager extends core_1.Host {
                 }
                 if (output && (!condition || withinSizeRange(localUri, condition))) {
                     try {
-                        if (overwrite || !fs.existsSync(output) || !(0, types_1.existsFlag)(file.flags) && fs.statSync(output).mtimeMs < this.startTime) {
-                            options.timeout = this[kProcessTimeout].compress ?? PROCESS_TIMEOUT.compress;
+                        if (overwrite || !fs.existsSync(output) || !(0, types_1.existsFlag)(file) && fs.statSync(output).mtimeMs < this.startTime) {
+                            options.timeout = this.getNamedTimeout('compress');
                             tasks.push(instance.tryFile(file.buffer || localUri, output, options).then(() => {
                                 const outFile = options.outFile;
                                 if (outFile) {
@@ -3023,8 +3032,7 @@ class FileManager extends core_1.Host {
         }
     }
     getProcessTimeout(handler) {
-        const moduleName = handler.instance.moduleName;
-        return this[kProcessTimeout][moduleName] ?? PROCESS_TIMEOUT[moduleName] ?? (handler.constructor.PROCESS_TIMEOUT || 0);
+        return this.getNamedTimeout(handler.instance.moduleName) ?? (handler.constructor.PROCESS_TIMEOUT || 0);
     }
     clearProcessTimeout() {
         const timerMain = this[KTimerMain];
@@ -3207,7 +3215,7 @@ class FileManager extends core_1.Host {
             }
             const { processing, processTimeout } = this;
             const currentTime = Date.now();
-            let aborted;
+            let aborted = false;
             for (let i = 0; i < processing.length; ++i) {
                 const data = processing[i];
                 const file = data.file;
@@ -3270,7 +3278,7 @@ class FileManager extends core_1.Host {
         const groupData = new ProcessGroup();
         const imported = assets.filter(item => item.imported && (0, types_1.isArray)(item.imported));
         for (let item of assets) {
-            if (item.invalid || (0, types_1.ignoreFlag)(item.flags)) {
+            if (item.invalid || (0, types_1.ignoreFlag)(item)) {
                 continue;
             }
             let download = this.setLocalUri(item), uri = item.uri;
@@ -3310,11 +3318,11 @@ class FileManager extends core_1.Host {
                 if (etag && imported.some(file => file.imported.includes(uri))) {
                     item.incremental = "none";
                 }
-                else if (!(0, types_1.mainFlag)(item.flags)) {
+                else if (!(0, types_1.mainFlag)(item)) {
                     let cached;
                     const { bundleId, bundleIndex = -1 } = item;
                     const setBuffer = (target) => {
-                        if (!etag && (uri = target.uri) && (cached = MEMORY.CACHE[uri])) {
+                        if (!etag && (uri = target.uri) && (cached = MEMORY.CACHE.get(uri))) {
                             target.etag = cached[5];
                             target.contentLength = cached[3];
                             return true;
@@ -3326,7 +3334,7 @@ class FileManager extends core_1.Host {
                         if (!(0, types_1.isEmpty)(bundleId) && bundleIndex > 0) {
                             const target = assets.find(parent => parent.bundleIndex === 0 && parent.bundleId === bundleId);
                             if (target) {
-                                if ((0, types_1.existsFlag)(target.flags)) {
+                                if ((0, types_1.existsFlag)(target)) {
                                     setBuffer(item);
                                     item.invalid = true;
                                 }
@@ -3399,10 +3407,10 @@ class FileManager extends core_1.Host {
                         if (!etag) {
                             (0, asset_1.setInitialValue)(item, false).buffer = buffer;
                         }
-                        else if (uri && CACHE_ETAG[uri]) {
+                        else if (uri && CACHE_ETAG.has(uri)) {
                             const initialValue = (0, asset_1.setInitialValue)(item, false);
                             initialValue.buffer = buffer;
-                            initialValue.etag = CACHE_ETAG[uri];
+                            initialValue.etag = CACHE_ETAG.get(uri);
                         }
                     }
                     catch {
@@ -3513,11 +3521,11 @@ class FileManager extends core_1.Host {
                             downloading[uri] = [];
                         }
                         const url = item.url;
-                        let mainEtag = false, encoding = item.encoding, client = null, cacheDir, cacheBuffer;
+                        let mainEtag = false, encoding = item.encoding, client = null, cacheDir = false, cacheBuffer = false;
                         if (type === 1) {
                             cacheDir = cacheToDisk.has(url) && isCacheable(item);
                             cacheBuffer = cacheToMemory.has(url);
-                            mainEtag = (0, types_1.mainFlag)(item.flags) && (cacheEtag || item.incremental === "etag");
+                            mainEtag = (0, types_1.mainFlag)(item) && (cacheEtag || item.incremental === "etag");
                         }
                         const downloadUri = (request, etagDir) => {
                             if (checkEtag) {
@@ -3585,7 +3593,7 @@ class FileManager extends core_1.Host {
                                                 etagDir = encodeURIComponent(etag);
                                                 if (incremental !== false || item.incremental === true) {
                                                     const location = href.toString();
-                                                    const cached = MEMORY.CACHE[location];
+                                                    const cached = MEMORY.CACHE.get(location);
                                                     let buffer;
                                                     if (cached) {
                                                         if (etagDir === cached[5] && (!encoding || encoding === cached[2])) {
@@ -3747,7 +3755,7 @@ class FileManager extends core_1.Host {
                         }
                         else {
                             const ext = item.filename && path.extname(item.filename);
-                            let found;
+                            let found = false;
                             for (const file of result) {
                                 if (!found && ext === path.extname(file).toLowerCase()) {
                                     try {
@@ -3814,9 +3822,13 @@ class FileManager extends core_1.Host {
             const received = args[1];
             const total = args[2];
             if (received === 0 && total === 0) {
-                if (Array.isArray(args[3])) {
+                if (typeof args[3] === 'bigint') {
                     found.dataTime = args[3];
                 }
+                else if (Array.isArray(args[3])) {
+                    const [s, n] = args[3];
+                    found.dataTime = BigInt(s * 1000000000) + BigInt(n);
+                }
                 return;
             }
             found.receivedBytes = received;
@@ -3914,7 +3926,7 @@ class FileManager extends core_1.Host {
                 }
                 const diffTime = currentTime - item.startTime;
                 const unit = receivedBytes < 1048576 ? 'KB' : receivedBytes < 1073741824 ? 'MB' : 'GB';
-                const [time, size, speed] = formatSegment(endTime > 0 ? bars === 0 ? -1 : endTime : 0, formatMinutes(diffTime).padStart(LOGGER.TITLE_WIDTH), (0, types_1.formatSize)(receivedBytes, { unit, unitSeparator: ' ', fixedDecimals: true, decimalPlaces: unit === 'KB' ? 0 : unit === 'MB' ? 1 : 2 }).padStart(8), (0, util_2.getTransferRate)(receivedBytes, item.dataTime ? (0, types_1.convertTime)(process.hrtime(item.dataTime), false) * 1000 : diffTime, ' ').padStart(10));
+                const [time, size, speed] = formatSegment(endTime > 0 ? bars === 0 ? -1 : endTime : 0, formatMinutes(diffTime).padStart(LOGGER.TITLE_WIDTH), (0, types_1.formatSize)(receivedBytes, { unit, unitSeparator: ' ', fixedDecimals: true, decimalPlaces: unit === 'KB' ? 0 : unit === 'MB' ? 1 : 2 }).padStart(8), (0, util_2.getTransferRate)(receivedBytes, item.dataTime ? (0, types_1.convertTime)(process.hrtime.bigint() - item.dataTime, false) * 1000 : diffTime, ' ').padStart(10));
                 let output = time + ` ${chalk.blackBright(LOGGER.TITLE_SEP)} ` + (endTime > 0 && bars === 0 ? chalk.grey(item.url) : item.url) + spacer;
                 if (barLength === 1) {
                     output += ` ${endTime > 0 ? bars === 0 ? chalk.red('ERR!') : LOGGER.PROGRESS_COMPLETE : formatPercent(percent)} ` + spacer;
@@ -3933,7 +3945,7 @@ class FileManager extends core_1.Host {
                 }
                 output += '\n';
                 if (!LOGGER.PROGRESS_USECOLOR) {
-                    output = stripansi(output);
+                    output = (0, node_util_1.stripVTControlCharacters)(output);
                 }
                 PROCESS_STDOUT.clearLine(0);
                 PROCESS_STDOUT.write(output);
@@ -3949,7 +3961,7 @@ class FileManager extends core_1.Host {
                 processTask.section(redraw);
                 const { PROGRESS_COLOR: color, PROGRESS_BGCOLOR: bgColor, PROGRESS_USECOLOR: useColor, PROGRESS_TEXTWRAP: messageTextWrap } = LOGGER;
                 const scroll = processTask.scroll;
-                let start = 0, end = 0, output, last;
+                let start = 0, end = 0, output = false, last;
                 if (cleared) {
                     logDelayed = this._logDelayed;
                     end = Math.min(logDelayed.length, scrollHeight);
@@ -4056,7 +4068,7 @@ class FileManager extends core_1.Host {
             }
             else {
                 if (data instanceof URL && data.protocol === 'file:') {
-                    data = (0, url_1.fileURLToPath)(data);
+                    data = (0, node_url_1.fileURLToPath)(data);
                 }
                 if ((0, types_1.isString)(data) && core_1.Host.isPath(data, true) && this.canRead(data)) {
                     data = fs.createReadStream(data);
@@ -4116,7 +4128,7 @@ class FileManager extends core_1.Host {
                         for (let i = 0, length = output.length, buffer = null; i < length; ++i) {
                             const options = output[i];
                             options.mimeType = mimeType;
-                            options.timeout ??= this[kProcessTimeout].compress ?? PROCESS_TIMEOUT.compress;
+                            options.timeout ??= this.getNamedTimeout('compress');
                             await compress.tryImage(buffer || files.length === 1 && item.buffer || file, file, options)
                                 .then(result => {
                                 if (result) {
@@ -4192,7 +4204,7 @@ class FileManager extends core_1.Host {
             const baseDirectory = this.baseDirectory;
             checksum.joinRoot = true;
             checksum.throwsEmpty = true;
-            const sumTime = LOG_TIMEELAPSED ? process.hrtime() : 0;
+            const sumTime = LOG_TIMEELAPSED ? process.hrtime.bigint() : 0;
             const files = (await FileManager.writeChecksum(baseDirectory, checksum.filename, checksum));
             if (sumTime) {
                 this.writeTimeElapsed(checksum.algorithm || "sha256", [baseDirectory, files.length + (files.length === 1 ? ' file' : ' files')], sumTime, { ...core_1.Host.LOG_STYLE_WARN });
@@ -4224,7 +4236,7 @@ class FileManager extends core_1.Host {
         if (LOG_TIMEELAPSED) {
             this.writeTimeElapsed('READY', 'Finalizing assets...', this.startTime, { ...core_1.Host.LOG_STYLE_WARN, showCpu: true });
         }
-        const startTime = process.hrtime();
+        const startTime = process.hrtime.bigint();
         const filesToRemove = this.filesToRemove;
         for (const [file, output] of this.filesToCompare) {
             const localUri = file.localUri;
@@ -4343,8 +4355,7 @@ class FileManager extends core_1.Host {
                 message.push('CACHE ' + (count > 1 ? count + ' / ' : '') + (0, types_1.formatSize)(size));
             }
             if (MEMORY.SIZE > 0) {
-                const bufferCount = Object.keys(MEMORY.CACHE).length;
-                message.push('BUFFER ' + (bufferCount > 1 ? bufferCount + ' / ' : '') + (0, types_1.formatSize)(MEMORY.SIZE));
+                message.push('BUFFER ' + (MEMORY.CACHE.size > 1 ? MEMORY.CACHE.size + ' / ' : '') + (0, types_1.formatSize)(MEMORY.SIZE));
             }
             this.writeTimeElapsed('CLOSE', ['No further modifications', message.length > 0 ? message.join(chalk.blackBright(LOGGER.MESSAGE_SEP)) : ''], startTime, { ...core_1.Host.LOG_STYLE_WARN });
         }
@@ -4435,6 +4446,10 @@ class FileManager extends core_1.Host {
             this.done = true;
         }
     }
+    getNamedTimeout(name) {
+        const timeout = this[kProcessTimeout];
+        return timeout && name in timeout ? timeout[name] : PROCESS_TIMEOUT[name];
+    }
     set restarting(value) {
         this.finalizeState = (this[kRestarting] = value) ? 3 : 0;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.10.6",
+  "version": "0.11.1",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,18 +20,17 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.10.6",
-    "@e-mc/compress": "0.10.6",
-    "@e-mc/core": "0.10.6",
-    "@e-mc/document": "0.10.6",
-    "@e-mc/image": "0.10.6",
-    "@e-mc/request": "0.10.6",
-    "@e-mc/task": "0.10.6",
-    "@e-mc/types": "0.10.6",
-    "@e-mc/watch": "0.10.6",
+    "@e-mc/cloud": "0.11.1",
+    "@e-mc/compress": "0.11.1",
+    "@e-mc/core": "0.11.1",
+    "@e-mc/document": "0.11.1",
+    "@e-mc/image": "0.11.1",
+    "@e-mc/request": "0.11.1",
+    "@e-mc/task": "0.11.1",
+    "@e-mc/types": "0.11.1",
+    "@e-mc/watch": "0.11.1",
     "chalk": "4.1.2",
-    "diff": "^5.2.0",
-    "picomatch": "^4.0.2",
-    "strip-ansi": "6.0.1"
+    "diff": "^7.0.0",
+    "picomatch": "^4.0.2"
   }
 }