@e-mc/file-manager 0.12.9 → 0.13.0

package/index.js

@@ -42,7 +42,8 @@ const MEMORY = {
     EXCLUDE: [],
     PURGE: 0.25,
     DISK_MIN: Infinity,
-    DISK_MAX: 0
+    DISK_MAX: 0,
+    FILE_COUNT: false
 };
 const LOGGER = {
     TITLE_SEP: '|',
@@ -108,11 +109,6 @@ function withinSizeRange(uri, value, pattern) {
     }
     return true;
 }
-function clearAssets(host) {
-    for (const item of host.assets) {
-        unsetContent(item);
-    }
-}
 function unsetContent(item) {
     if ('buffer' in item) {
         item.buffer = null;
@@ -135,10 +131,6 @@ function bundleTorrent(host, files, mimeType, encoding) {
     }
     return output;
 }
-function resetAssets(host) {
-    host.reset();
-    FileManager.sanitizeAssets(host.assets);
-}
 function recurseDir(output, subDirs, options) {
     const { ignore, sortBy, recursive } = options;
     const baseDir = path.join(...subDirs);
@@ -168,60 +160,46 @@ function recurseDir(output, subDirs, options) {
     }
     return output;
 }
-function checkHash(host, localUri, output, options, data) {
-    let algorithm, digestEncoding, value;
-    if ((0, types_1.isObject)(options)) {
-        ({ algorithm, digestEncoding = options.digest, value } = options);
-    }
-    else {
-        value = options;
-    }
-    if ((0, types_1.isString)(value)) {
-        algorithm ||= "sha256";
-        if (!data && localUri) {
-            try {
-                data = fs.readFileSync(localUri);
-            }
-            catch (err) {
-                host.addLog(host.statusType.WARN, err, { source: `${algorithm}:${value}` });
-                return output && core_1.Host.isErrorCode(err, 'ENOENT');
-            }
-        }
-        if (data && (value = value.toLowerCase()) === core_1.Host.asHash(data, algorithm, digestEncoding)) {
-            host.formatMessage(32, algorithm, ["Checksum matched" + (output ? ' (output)' : ''), localUri && path.basename(localUri)], value, { ...core_1.Host.LOG_STYLE_INFO, queue: true });
-            return true;
-        }
-        return false;
-    }
-    return true;
-}
-function validatePaths(rootDir, values, patterns, include, options) {
-    const items = patterns.map(value => {
+function createMatchNegate(patterns, options) {
+    const base = [];
+    const baseAbs = [];
+    const negate = [];
+    const negateAbs = [];
+    for (let value of patterns) {
         let invert = false;
-        if (!include && value.startsWith('!')) {
+        if (value.startsWith('!')) {
             value = value.substring(1);
             invert = true;
         }
         value = core_1.Permission.toPosix(value);
-        return [pm(value, getPmOptions(value, options)), path.isAbsolute(value), invert];
-    });
-    return values.filter(value => {
-        for (const [pattern, absolute, invert] of items) {
-            if (pattern(absolute ? value : value.substring(rootDir.length))) {
-                return invert ? !include : include;
-            }
+        const match = pm(value, getPmOptions(value, options));
+        if (path.isAbsolute(value)) {
+            (invert ? negateAbs : baseAbs).push(match);
         }
-        return !include;
-    });
+        else {
+            (invert ? negate : base).push(match);
+        }
+    }
+    return [[base, negate], [baseAbs, negateAbs]];
 }
-function filterPaths(rootDir, values, include, exclude, options = {}) {
+function isMatch(value, globs) {
+    return !globs[1].some(match => match(value)) && globs[0].some(match => match(value));
+}
+function filterPaths(rootDir, values, options = {}) {
+    let { include, exclude } = options;
     rootDir = core_1.Host.normalizePath(rootDir, 2);
     if (include) {
         if ((0, types_1.isString)(include)) {
             include = [include];
         }
         if ((0, types_1.isArray)(include)) {
-            values = validatePaths(rootDir, values, include, true, options);
+            const [glob, globAbs] = createMatchNegate(include, options);
+            for (let i = 0; i < values.length; ++i) {
+                const value = values[i];
+                if (!isMatch(value, glob) && !isMatch(value.substring(rootDir.length), globAbs)) {
+                    values.splice(i--, 1);
+                }
+            }
         }
     }
     if (exclude) {
@@ -229,7 +207,13 @@ function filterPaths(rootDir, values, include, exclude, options = {}) {
             exclude = [exclude];
         }
         if ((0, types_1.isArray)(exclude)) {
-            return validatePaths(rootDir, values, exclude, false, options);
+            const [glob, globAbs] = createMatchNegate(exclude, options);
+            for (let i = 0; i < values.length; ++i) {
+                const value = values[i];
+                if (isMatch(value, glob) || isMatch(value.substring(rootDir.length), globAbs)) {
+                    values.splice(i--, 1);
+                }
+            }
         }
     }
     return values;
@@ -243,30 +227,6 @@ function formatMinutes(elapsed) {
     }
     return (0, types_1.formatTime)(elapsed, ':');
 }
-function observeFile(host, instance) {
-    instance.on('file:delete', (value, options) => host.delete(value, !!options?.emptyDir));
-    instance.on('file:copy', value => host.add(value));
-    instance.on('file:move', (value, options) => {
-        host.add(value);
-        const src = options?.outSrc;
-        if (src) {
-            host.delete(src);
-        }
-    });
-    instance.on('dir:remove', value => {
-        if (host.removeCwd(value)) {
-            value = matchPathname(value);
-            if (!value.endsWith(path.sep)) {
-                value += path.sep;
-            }
-            for (const name of host.files) {
-                if (matchPathname(name).startsWith(value)) {
-                    host.files.delete(name);
-                }
-            }
-        }
-    });
-}
 function setHttpCacheLimit(value, type, disk) {
     if (value === undefined) {
         return;
@@ -301,22 +261,6 @@ function setHttpCacheLimit(value, type, disk) {
         }
     }
 }
-function removeFiles(host, items) {
-    if (items.size > 0) {
-        for (const value of items) {
-            host.deleteFile(value, { emptyDir: true });
-        }
-        items.clear();
-    }
-}
-function instanceImage(host, mimeMap, mimeType, constructor, ...params) {
-    const instance = new constructor(...params);
-    instance.host = host;
-    instance.init(host.config);
-    observeFile(host, instance);
-    mimeMap.set(mimeType, { constructor, instance, params });
-    return instance;
-}
 function clearQueue(data, attr) {
     if (attr && data[attr]) {
         for (const item of data[attr]) {
@@ -341,6 +285,14 @@ function hasEtag(item, cacheable, fallback) {
             return fallback;
     }
 }
+function equalAddress(value, other) {
+    if (value === other) {
+        return true;
+    }
+    const a = decodeURIComponent(value);
+    const b = decodeURIComponent(other);
+    return a === b || a === other || value === b;
+}
 function processHeaders(item, headers, lastModified, mainEtag) {
     const contentLength = parseInt(headers['content-length']);
     if (contentLength > 0) {
@@ -360,49 +312,6 @@ function processHeaders(item, headers, lastModified, mainEtag) {
         return item.lastModified = headers['last-modified'];
     }
 }
-function errorPermission(host, item) {
-    host.writeFail(["Unable to read file", item.uri], (0, types_1.errorValue)("Operation not permitted", item.uri || "Unknown"), 8192);
-    item.invalid = true;
-}
-function copyDownload(host, item, queued) {
-    const uriMap = new Map();
-    for (const file of queued) {
-        const destUri = file.localUri;
-        let items = uriMap.get(destUri);
-        if (!items) {
-            const pathname = path.dirname(destUri);
-            if (!core_1.Host.createDir(pathname)) {
-                file.invalid = true;
-                continue;
-            }
-            uriMap.set(destUri, items = []);
-        }
-        file.etag = item.etag;
-        file.lastModified = item.lastModified;
-        items.push(file);
-    }
-    const buffer = item.sourceUTF8 || item.buffer;
-    for (const [destUri, items] of uriMap) {
-        try {
-            if (buffer) {
-                fs.writeFileSync(destUri, buffer);
-            }
-            else {
-                fs.copyFileSync(item.localUri, destUri);
-            }
-            for (const queue of items) {
-                host.performAsyncTask();
-                void host.transformAsset(new FileThread(host, queue, 1));
-            }
-        }
-        catch (err) {
-            for (const queue of items) {
-                queue.invalid = true;
-            }
-            host.writeFail([buffer ? "Unable to write buffer" : "Unable to copy file", path.basename(item.localUri)], err, 32);
-        }
-    }
-}
 function setBufferTarget(item, buffer) {
     if (typeof buffer === 'string') {
         item.sourceUTF8 = buffer;
@@ -411,19 +320,8 @@ function setBufferTarget(item, buffer) {
         item.buffer = buffer;
     }
 }
-function writeBufferCache(host, localUri, buffer, encoding) {
-    fs.writeFileSync(localUri, buffer);
-    host.addDownload(Buffer.byteLength(buffer, encoding), types_1.DOWNLOAD_TYPE.CACHE);
-}
 async function doVerifyChecksum(root, from, options, nested) {
-    if ((0, types_1.isObject)(from)) {
-        options = from;
-        from = undefined;
-    }
-    else {
-        options ||= {};
-    }
-    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], include, exclude, verbose = true, joinRoot } = options;
+    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], verbose = true, joinRoot } = options;
     const parent = recursive === 1 && typeof verbose !== 'number';
     let algorithm = options.algorithm;
     from ||= checksumFile(algorithm);
@@ -456,7 +354,7 @@ 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(root, items.map(item => item[1]), include, exclude, options) : null;
+        const checked = options.include || options.exclude ? filterPaths(root, items.map(item => item[1]), options) : null;
         let valid = false;
         for (const [previous, pathname] of items) {
             if (checked !== null && !checked.includes(pathname) || recursive === 1 && path.basename(pathname) === filename) {
@@ -505,7 +403,7 @@ async function doVerifyChecksum(root, from, options, nested) {
             options.outPath = from;
         }
         else if (options.throwsEmpty) {
-            throw checksumError(algorithm);
+            throw errorChecksum(algorithm);
         }
     }
     catch (err) {
@@ -569,20 +467,20 @@ function setLogMinWidth() {
     LOGGER.PERCENT_WIDTH = LOGGER.MIN_WIDTH + 8;
     LOGGER.STAT_WIDTH = LOGGER.PERCENT_WIDTH + 11 + 13;
 }
-const closeResponse = (client) => client?.destroy();
+const downloadStats = () => [[0, 0], [0, 0], [0, 0]];
 const isCacheable = (item) => item.initialValue?.cacheable !== false;
-const getPmOptions = (value, { matchBase = value.startsWith('*') && !value.includes('/'), dot = false } = {}) => ({ matchBase, nocase: core_1.Host.PLATFORM_WIN32, dot });
+const getPmOptions = (value, { matchBase = value.startsWith('*') && !value.includes('/'), dot = false } = {}) => ({ nocase: core_1.Host.PLATFORM_WIN32, matchBase, dot });
 const isDownloadAll = (type) => type === 4 || type === 0;
 const hasFiles = (type, uri) => type === 3 || type === 4 || type === 0 && request_1.isRclone(uri);
 const hasIncremental = (value) => value === "etag" || value === "exists";
 const matchPathname = (value) => core_1.Host.PLATFORM_WIN32 ? value.toLowerCase() : value;
-const equalAddress = (value, other) => value === other || decodeURIComponent(value) === decodeURIComponent(other);
 const formatPercent = (value) => Math.round(value).toString().padStart(3) + '%';
+const formatLength = (value, length) => `${length} ${value + (length === 1 ? '' : 's')}`;
 const checkEOF = (value) => /\n$/.test(value) ? value : value + '\n';
 const checksumFile = (algorithm) => "checksum" + '.' + ((0, types_1.isString)(algorithm) ? algorithm.toLowerCase() : "sha256");
-const checksumError = (algorithm) => new Error("Invalid parameters" + ` (${algorithm || "sha256"})`);
 const ignoreAsset = (item, exists) => item.invalid || (0, types_1.hasBit)(item.flags, 1 | (!exists ? 128 : 0));
-const validateChecksum = (host, item, buffer, localUri = item.localUri) => !item.checksum || checkHash(host, localUri, false, item.checksum, buffer);
+const validateChecksum = (host, item, buffer, localUri = item.localUri) => !item.checksum || host.checkHash(item.checksum, buffer, localUri);
+const errorChecksum = (algorithm) => (0, types_1.errorValue)("Invalid parameters", algorithm || "sha256");
 const errorAbsolute = (hint) => (0, types_1.errorValue)("Path is not absolute", hint);
 class Scheduler {
     id = 0;
@@ -835,6 +733,12 @@ class HttpMemoryCache extends HttpDiskCache {
     toDisk = [MEMORY.DISK_MIN, MEMORY.DISK_MAX];
     constructor(host, enabled) {
         super(host, enabled && core_1.Host.enabled("memory.settings.users", host.username));
+        if (MEMORY.INCLUDE.length > 0) {
+            this.include = MEMORY.INCLUDE;
+        }
+        if (MEMORY.EXCLUDE.length > 0) {
+            this.exclude = MEMORY.EXCLUDE;
+        }
     }
     has(uri) {
         return this.expires > 0 && super.has(uri);
@@ -1005,7 +909,7 @@ class ProcessFile {
             file.invalid = true;
             host.completeAsyncTask(err, localUri);
         }
-        else if (file.checksum && !checked && !checkHash(host, localUri, false, file.checksum, file.buffer)) {
+        else if (file.checksum && !checked && !host.checkHash(file.checksum, file.buffer, localUri)) {
             file.invalid = true;
             host.filesToRemove.add(localUri);
             host.completeAsyncTask();
@@ -1026,6 +930,46 @@ class ProcessFile {
             }
         }
     }
+    copyDownload(item, queued) {
+        const host = this.host;
+        const uriMap = new Map();
+        const buffer = item.sourceUTF8 || item.buffer;
+        for (const file of queued) {
+            const destUri = file.localUri;
+            let items = uriMap.get(destUri);
+            if (!items) {
+                const pathname = path.dirname(destUri);
+                if (!core_1.Host.createDir(pathname)) {
+                    file.invalid = true;
+                    continue;
+                }
+                uriMap.set(destUri, items = []);
+            }
+            file.etag = item.etag;
+            file.lastModified = item.lastModified;
+            items.push(file);
+        }
+        for (const [destUri, items] of uriMap) {
+            try {
+                if (buffer) {
+                    fs.writeFileSync(destUri, buffer);
+                }
+                else {
+                    fs.copyFileSync(item.localUri, destUri);
+                }
+                for (const queue of items) {
+                    host.performAsyncTask();
+                    void host.transformAsset(new FileThread(host, queue, 1));
+                }
+            }
+            catch (err) {
+                for (const queue of items) {
+                    queue.invalid = true;
+                }
+                host.writeFail([buffer ? "Unable to write buffer" : "Unable to copy file", path.basename(item.localUri)], err, 32);
+            }
+        }
+    }
     async finalize(incremental) {
         const { host, file, localUri, groupData } = this;
         const bundleStart = file.bundleIndex === 0 && !(0, types_1.isEmpty)(file.bundleId) ? host.incremental !== "staging" && host.retryLimit === RETRY_LIMIT ? 2 : 1 : 0;
@@ -1157,7 +1101,7 @@ class ProcessFile {
                                                 else {
                                                     queue.buffer = data;
                                                 }
-                                                copyDownload(host, queue, downloaded);
+                                                this.copyDownload(queue, downloaded);
                                             }
                                             else {
                                                 for (const item of downloaded) {
@@ -1166,17 +1110,13 @@ class ProcessFile {
                                             }
                                         }
                                         if (tempFile && (!pipeTo || core_1.Host.isPath(pipeTo) || !core_1.Host.renameFile(tempFile, pipeTo, false))) {
-                                            queueMicrotask(() => {
-                                                fs.unlink(tempFile, () => { });
-                                            });
+                                            queueMicrotask(() => fs.unlink(tempFile, () => { }));
                                         }
                                         resolve();
                                     }, (err) => {
                                         queue.invalid = true;
                                         if (tempFile) {
-                                            queueMicrotask(() => {
-                                                fs.unlink(tempFile, () => { });
-                                            });
+                                            queueMicrotask(() => fs.unlink(tempFile, () => { }));
                                         }
                                         reject(err);
                                     }, 1);
@@ -1217,7 +1157,7 @@ class ProcessFile {
                             }
                             else {
                                 checkEtag = false;
-                                errorPermission(host, file);
+                                host.handleFilePermission(file);
                             }
                         }
                     }
@@ -1258,7 +1198,7 @@ class ProcessFile {
         const processed = processing[localUri];
         const downloaded = downloading[uri];
         if ((0, types_1.isArray)(downloaded)) {
-            copyDownload(host, file, downloaded);
+            this.copyDownload(file, downloaded);
         }
         if (processed) {
             for (const item of processed) {
@@ -1363,12 +1303,14 @@ class FileManager extends core_1.Host {
         if (!super.loadSettings(settings, permission, password)) {
             return false;
         }
-        const { process: proc, download, request, error, logger } = settings;
-        if (proc?.thread) {
-            const limit = (0, util_2.asInt)(proc.thread.sub_limit);
-            if (limit > 0) {
-                PROCESS_SUB_LIMIT = limit;
-            }
+        const { process: proc, memory, download, request, error, logger } = settings;
+        const sub_limit = (0, util_2.asInt)(proc?.thread?.sub_limit);
+        if (sub_limit > 0) {
+            PROCESS_SUB_LIMIT = sub_limit;
+        }
+        const file_count = memory?.settings?.stats?.file_count;
+        if (typeof file_count === 'boolean') {
+            MEMORY.FILE_COUNT = file_count;
         }
         if ((0, types_1.isPlainObject)(request)) {
             let { timeout, disk, buffer, connect } = request;
@@ -1387,7 +1329,7 @@ class FileManager extends core_1.Host {
             request_1.loadSettings({ process: settings.process, request, download }, password);
         }
         if (error) {
-            const limit = error.retry_limit !== undefined ? (0, util_2.asInt)(error.retry_limit) : (0, util_2.asInt)(error.recursion_limit);
+            const limit = 'retry_limit' in error ? (0, util_2.asInt)(error.retry_limit) : (0, util_2.asInt)(error.recursion_limit);
             if (limit >= 0 && limit < Infinity) {
                 RETRY_LIMIT = limit;
             }
@@ -1506,7 +1448,7 @@ class FileManager extends core_1.Host {
         else {
             options ||= {};
         }
-        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], include, exclude, verbose = false, joinRoot } = options;
+        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], verbose = false, joinRoot } = options;
         to ||= checksumFile(algorithm);
         let result = [];
         try {
@@ -1514,7 +1456,7 @@ 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(root, result, include, exclude, options)) {
+            for (const pathname of result = filterPaths(root, result, options)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
                     continue;
                 }
@@ -1533,7 +1475,7 @@ class FileManager extends core_1.Host {
                     fs.unlinkSync(to);
                 }
                 if (options.throwsEmpty) {
-                    throw checksumError(algorithm);
+                    throw errorChecksum(algorithm);
                 }
             }
         }
@@ -1547,7 +1489,11 @@ class FileManager extends core_1.Host {
         return result;
     }
     static async verifyChecksum(root, from, options) {
-        return doVerifyChecksum(root, from, options, false);
+        if ((0, types_1.isObject)(from)) {
+            options = from;
+            from = undefined;
+        }
+        return doVerifyChecksum(root, from, options || {}, false);
     }
     static createFileThread(host, file) {
         return new FileThread(host, file, 0);
@@ -1632,7 +1578,7 @@ class FileManager extends core_1.Host {
     #timerMain = null;
     #retryLimit = RETRY_LIMIT;
     #scheduler = new Scheduler();
-    #downloadStats = [[0, 0], [0, 0], [0, 0]];
+    #downloadStats = downloadStats();
     #replacedAssets = null;
     #processTimeout = null;
     #diffSource = null;
@@ -1651,27 +1597,37 @@ class FileManager extends core_1.Host {
         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 = config.assets || [];
-        let targeted;
+        const targeted = [];
         for (let i = 0, length = assets.length; i < length; ++i) {
             const item = assets[i];
-            const encoding = item.encoding;
+            let encoding = item.encoding;
             if (item.document) {
                 this.documentAssets.push(item);
             }
             if (item.tasks) {
                 this.taskAssets.push(item);
             }
-            if (encoding && encoding !== 'utf8' && encoding !== 'utf-8') {
-                item.encoding = encoding.endsWith('be') ? undefined : (0, types_1.getEncoding)(encoding);
-            }
             if ((0, types_1.usingFlag)(item)) {
-                (targeted ||= []).push(item);
+                targeted.push(item);
             }
             item.id ||= ++ASSET_ID;
+            if (encoding) {
+                switch (encoding) {
+                    case 'utf8':
+                        break;
+                    case 'utf-8':
+                        item.encoding = 'utf8';
+                        break;
+                    default:
+                        encoding = (0, types_1.getEncoding)(encoding);
+                        item.encoding = encoding === 'utf8' ? undefined : encoding;
+                        break;
+                }
+            }
         }
         this._assets = assets.slice(0);
         this.#incremental = config.incremental === "staging" ? "staging" : "none";
-        if (targeted) {
+        if (targeted.length > 0) {
             this.using(...targeted);
         }
         if (Array.isArray(config.dataSource)) {
@@ -1688,12 +1644,6 @@ class FileManager extends core_1.Host {
         }
         this.cacheToDisk = new HttpDiskCache(this, DISK.ENABLED);
         this.cacheToMemory = new HttpMemoryCache(this, MEMORY.ENABLED);
-        if (MEMORY.INCLUDE.length > 0) {
-            this.cacheToMemory.include = MEMORY.INCLUDE;
-        }
-        if (MEMORY.EXCLUDE.length > 0) {
-            this.cacheToMemory.exclude = MEMORY.EXCLUDE;
-        }
         if (typeof config.threads === 'number') {
             this.setTaskLimit(config.threads);
         }
@@ -1741,7 +1691,7 @@ class FileManager extends core_1.Host {
                         torrent.push(value);
                     }
                 }
-                if ((type & types_1.FILE_TYPE.SOURCEMAP) || (type & types_1.FILE_TYPE.COMPRESSED)) {
+                if (type & (types_1.FILE_TYPE.COMPRESSED | types_1.FILE_TYPE.SOURCEMAP)) {
                     const connected = parent.descendants;
                     if (!connected) {
                         parent.descendants = [value];
@@ -1752,6 +1702,10 @@ class FileManager extends core_1.Host {
                 }
             }
         }
+        else {
+            this.addLog(3, `File ignored: ${value}`, { source: parent?.uri });
+            this.emit('file:permission', value, 'write');
+        }
         return this;
     }
     delete(value, emptyDir = true) {
@@ -1823,7 +1777,7 @@ class FileManager extends core_1.Host {
                 this.processAssets(emptyDir);
             }
             else {
-                this.writeFail('Unable to restart during finalization', (0, types_1.errorMessage)('Session ID', this.sessionId));
+                this.writeFail(['Unable to restart session', formatLength('asset', this.assets.length)], (0, types_1.errorMessage)('sessionId', this.sessionId));
             }
         }
         else {
@@ -1841,7 +1795,7 @@ class FileManager extends core_1.Host {
                     const instance = new cloud_1(args[0], args[1]);
                     instance.host = this;
                     instance.init(this.config);
-                    observeFile(this, instance);
+                    this.observeFile(instance);
                     return this.Cloud = instance;
                 }
             }
@@ -1874,11 +1828,11 @@ class FileManager extends core_1.Host {
             this.close();
             this._pendingResult = null;
         }
-        clearAssets(this);
+        this.#releaseMemory();
         this.cleared = false;
         this.#delayed = 0;
         this.#scheduler = new Scheduler();
-        this.#downloadStats = [[0, 0], [0, 0], [0, 0]];
+        this.#downloadStats = downloadStats();
         this.clearStorage();
         this.finalizeState = 0;
         return true;
@@ -1921,7 +1875,7 @@ class FileManager extends core_1.Host {
         if (this.aborted) {
             return;
         }
-        const target = args.shift();
+        let target = args.shift();
         switch (name) {
             case 'document': {
                 const Module = this.#tryPackage(target, name, 4);
@@ -1929,7 +1883,7 @@ class FileManager extends core_1.Host {
                     const instance = new Module(...args);
                     instance.host = this;
                     instance.init(this.getDocumentAssets(instance), this.config);
-                    observeFile(this, instance);
+                    this.observeFile(instance);
                     this.Document.push({ instance, constructor: Module, params: args });
                     return instance;
                 }
@@ -1941,7 +1895,7 @@ class FileManager extends core_1.Host {
                     const instance = new Module(...args);
                     instance.host = this;
                     instance.init(this.config);
-                    observeFile(this, instance);
+                    this.observeFile(instance);
                     this.Task.push({ instance, constructor: Module, params: args });
                     return instance;
                 }
@@ -1972,7 +1926,7 @@ class FileManager extends core_1.Host {
                 }
                 instance.host = this;
                 instance.init(this.config);
-                observeFile(this, instance);
+                this.observeFile(instance);
                 return this.Cloud = instance;
             }
             case 'watch': {
@@ -2062,31 +2016,38 @@ class FileManager extends core_1.Host {
                 }
                 return this.Watch = instance;
             }
-            case 'image': {
+            case 'image':
                 if (target instanceof Map) {
-                    const mimeMap = new Map();
-                    for (const [mimeType, constructor] of target) {
-                        if (core_1.Host.constructorOf(constructor, 'image')) {
-                            instanceImage(this, mimeMap, mimeType, constructor, args[0]);
-                        }
-                    }
-                    if (mimeMap.size > 0) {
-                        this.Image = mimeMap;
-                    }
+                    args = [args[0]];
+                    this.Image = new Map();
                 }
                 else {
-                    const Module = this.#tryPackage(target, name, 2048);
-                    if (Module) {
-                        return instanceImage(this, this.Image ??= new Map(), 'handler', Module, ...args);
+                    const Module = this.#tryPackage(target, 'image', 2048);
+                    if (!Module) {
+                        return;
+                    }
+                    target = [['handler', Module]];
+                    this.Image ||= new Map();
+                }
+                for (const [mimeType, Module] of target) {
+                    if (core_1.Host.constructorOf(Module, 'image')) {
+                        const instance = new Module(...args);
+                        instance.host = this;
+                        instance.init(this.config);
+                        this.observeFile(instance);
+                        this.Image.set(mimeType, { constructor: Module, params: args, instance });
                     }
                 }
+                if (this.Image.size > 0) {
+                    return this.Image.get('handler')?.instance;
+                }
+                this.Image = null;
                 break;
-            }
             case 'compress': {
                 const instance = new compress_1(target);
                 instance.host = this;
                 instance.init();
-                observeFile(this, instance);
+                this.observeFile(instance);
                 return this.Compress = instance;
             }
         }
@@ -2248,7 +2209,7 @@ class FileManager extends core_1.Host {
                 if (localUri && !this.assets.find(item => item.localUri === localUri && !item.invalid)) {
                     this.filesToRemove.add(localUri);
                 }
-                (this.#replacedAssets ||= {})[core_1.Host.joinPath(file.pathname, file.filename)] = file;
+                (this.#replacedAssets ||= {})[path.join(file.pathname, file.filename)] = file;
             }
         }
         unsetContent(file);
@@ -2308,7 +2269,7 @@ class FileManager extends core_1.Host {
     }
     performFinalize(override) {
         const state = this.finalizeState;
-        if (state === 0 && (this.cleared && this.#delayed <= 0 || override) || (this.aborted || state === 3) && override) {
+        if (state === 0 && (this.cleared && this.#delayed <= 0 || override) || override && (this.aborted || state === 3)) {
             this.clearProcessTimeout();
             this.#delayed = Infinity;
             if (this.aborted) {
@@ -2344,9 +2305,7 @@ class FileManager extends core_1.Host {
                 this.emit('end', items, errors, this.collectLog());
                 this.done = true;
             })
-                .catch((err) => {
-                this.abortFinalize(err);
-            });
+                .catch((err) => this.abortFinalize(err));
         }
     }
     hasDocument(instance, document) {
@@ -2539,7 +2498,7 @@ class FileManager extends core_1.Host {
                 return fs.readFileSync(localUri);
             }
             catch (err) {
-                if (!(base64 && core_1.Host.isErrorCode(err, 'ENOENT', 'EACCES'))) {
+                if (!(base64 && (0, types_1.isErrorCode)(err, 'ENOENT', 'EACCES'))) {
                     this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
                     base64 = undefined;
                 }
@@ -2697,6 +2656,11 @@ class FileManager extends core_1.Host {
         this.filesQueued.add(output ||= localUri);
         return output;
     }
+    handleFilePermission(file) {
+        this.writeFail(["Unable to read file", file.uri && path.basename(file.uri)], (0, types_1.errorValue)("Operation not permitted", file.uri || file.filename), 8192);
+        file.invalid = true;
+        this.emit('asset:permission', file);
+    }
     async findMime(file, rename) {
         const localUri = file.localUri;
         if (!localUri) {
@@ -2813,9 +2777,7 @@ class FileManager extends core_1.Host {
                 file.mimeType = mimeType;
                 data.mimeType = mimeType;
             }
-            const errorAsset = (instance, err, type) => {
-                this.rejectModule(err, type, { instance, hint: path.basename(localUri) });
-            };
+            const errorAsset = (instance, err, type) => this.rejectModule(err, type, { instance, hint: path.basename(localUri) });
             if (file.tasks) {
                 const taskName = [];
                 let handler;
@@ -2827,16 +2789,12 @@ class FileManager extends core_1.Host {
                                 if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
                                     instance.using(data)
                                         .finally(() => this.closeThread(instance, data))
-                                        .catch((err) => {
-                                        errorAsset(instance, err);
-                                    });
+                                        .catch((err) => errorAsset(instance, err));
                                 }
                             }
                             else if (!this.aborted) {
                                 this.addProcessTimeout(instance, file, this.getProcessTimeout(handler));
-                                await instance.using(data).catch((err) => {
-                                    errorAsset(instance, err);
-                                });
+                                await instance.using(data).catch((err) => errorAsset(instance, err));
                             }
                             taskName.push(moduleName);
                         }
@@ -2854,16 +2812,12 @@ class FileManager extends core_1.Host {
                                     if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
                                         instance.using(data, command)
                                             .finally(() => this.closeThread(instance, data))
-                                            .catch((err) => {
-                                            errorAsset(instance, err, 2048);
-                                        });
+                                            .catch((err) => errorAsset(instance, err, 2048));
                                     }
                                 }
                                 else if (!this.aborted) {
                                     this.addProcessTimeout(instance, file, this.getProcessTimeout(handler));
-                                    await instance.using(data, command).catch((err) => {
-                                        errorAsset(instance, err, 2048);
-                                    });
+                                    await instance.using(data, command).catch((err) => errorAsset(instance, err, 2048));
                                 }
                             }
                         }
@@ -2878,16 +2832,12 @@ class FileManager extends core_1.Host {
                             if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
                                 instance.using(data)
                                     .finally(() => this.closeThread(instance, data))
-                                    .catch((err) => {
-                                    errorAsset(instance, err);
-                                });
+                                    .catch((err) => errorAsset(instance, err));
                             }
                         }
                         else if (!this.aborted) {
                             this.addProcessTimeout(instance, file, this.getProcessTimeout(handler));
-                            await instance.using(data).catch((err) => {
-                                errorAsset(instance, err);
-                            });
+                            await instance.using(data).catch((err) => errorAsset(instance, err));
                         }
                     }
                 }
@@ -3010,11 +2960,53 @@ class FileManager extends core_1.Host {
     getDownload(type = 0) {
         return this.#downloadStats[type] || [NaN, 0];
     }
+    checkHash(checksum, data, uri) {
+        let algorithm, digestEncoding, value;
+        if ((0, types_1.isObject)(checksum)) {
+            ({ algorithm, digestEncoding = checksum.digest, value } = checksum);
+        }
+        else {
+            value = checksum;
+        }
+        let output;
+        if ((0, types_1.isPlainObject)(data)) {
+            ({ data, uri, output } = data);
+        }
+        else if ((0, types_1.isPlainObject)(uri)) {
+            ({ uri, output } = uri);
+        }
+        if ((0, types_1.isString)(value)) {
+            algorithm ||= "sha256";
+            if (!data) {
+                if (!uri) {
+                    return false;
+                }
+                try {
+                    data = fs.readFileSync(uri);
+                }
+                catch (err) {
+                    this.addLog(3, err, { source: `${algorithm}:${value}` });
+                    return output ? (0, types_1.isErrorCode)(err, 'ENOENT') : false;
+                }
+            }
+            if ((value = value.toLowerCase()) === core_1.Host.asHash(data, algorithm, digestEncoding)) {
+                if (uri instanceof URL) {
+                    uri = (0, node_url_1.fileURLToPath)(uri);
+                }
+                this.formatMessage(32, algorithm, ["Checksum matched" + (output ? ' (output)' : ''), uri && path.basename(uri)], value, { ...core_1.Host.LOG_STYLE_INFO, queue: true });
+                return true;
+            }
+            return false;
+        }
+        return true;
+    }
     async fetchObject(uri, options = {}) {
         if (typeof options === 'string') {
             options = { format: options };
         }
-        options.format ||= 'json';
+        else {
+            options.format ||= 'json';
+        }
         return this.Request.get(uri, options).then(data => typeof data === 'object' ? data : null);
     }
     async fetchBuffer(uri, options) {
@@ -3039,19 +3031,12 @@ class FileManager extends core_1.Host {
         if (typeof options === 'string') {
             options = { pathname: options };
         }
-        options.pathname ||= this.baseDirectory;
+        else {
+            options.pathname ||= this.baseDirectory;
+        }
         return request_1.isRclone(uri) ? this.Request.rclone(uri, options) : this.Request.aria2c(uri, options);
     }
     async start(emptyDir) {
-        const listener = (resolve) => {
-            const callback = (files, errors, status) => {
-                if (!this.restarting) {
-                    this.removeListener('end', callback);
-                    resolve({ files, errors, status, aborted: this.aborted });
-                }
-            };
-            return callback;
-        };
         if (this.aborted) {
             this.clearStorage();
             const pending = this._pendingResult;
@@ -3063,7 +3048,7 @@ class FileManager extends core_1.Host {
                 return pending;
             }
             return new Promise(resolve => {
-                this.on('end', listener(resolve));
+                this.on('end', this.#onStartEnd(resolve));
                 queueMicrotask(() => {
                     if (!this.#didAbortHost()) {
                         this.restarting = false;
@@ -3087,11 +3072,11 @@ class FileManager extends core_1.Host {
                 }
                 this.finalizeState = 0;
             case 2:
-                resetAssets(this);
+                this.resetAssets();
                 break;
         }
         return this._pendingResult ||= new Promise((resolve, reject) => {
-            this.on('end', listener(resolve));
+            this.on('end', this.#onStartEnd(resolve));
             try {
                 this.processAssets(emptyDir);
             }
@@ -3130,7 +3115,7 @@ class FileManager extends core_1.Host {
             case 4:
                 return;
             case 2:
-                resetAssets(this);
+                this.resetAssets();
                 break;
         }
         if (this.queued) {
@@ -3304,7 +3289,7 @@ class FileManager extends core_1.Host {
                             setBuffer(item);
                         }
                         const checksumOutput = item.checksumOutput;
-                        if (core_1.Host.isPath(localUri) && (!checksumOutput || checkHash(this, localUri, true, checksumOutput))) {
+                        if (core_1.Host.isPath(localUri) && (!checksumOutput || this.checkHash(checksumOutput, { uri: localUri, output: true }))) {
                             item.flags |= 128;
                             if (!etag || item.fetchType !== 1 || checksumOutput) {
                                 if (bundleIndex === 0 && !(0, types_1.isEmpty)(bundleId)) {
@@ -3322,12 +3307,12 @@ class FileManager extends core_1.Host {
                         else if (cached) {
                             try {
                                 const buffer = cached[1];
-                                if (!item.checksum || checkHash(this, localUri, false, item.checksum, buffer)) {
+                                if (!item.checksum || this.checkHash(item.checksum, buffer, localUri)) {
                                     fs.writeFileSync(localUri, buffer);
                                     if (item.willChange && Buffer.isBuffer(buffer)) {
                                         item.buffer = buffer;
                                     }
-                                    if (!(checksumOutput && (0, types_1.isEmpty)(bundleId) && checkHash(this, localUri, true, checksumOutput, buffer))) {
+                                    if (!(checksumOutput && (0, types_1.isEmpty)(bundleId) && this.checkHash(checksumOutput, { data: buffer, uri: localUri, output: true }))) {
                                         this.performAsyncTask();
                                         const target = new ProcessFile(this, item, localUri, groupData);
                                         target.received(null, incremental, true, false, true);
@@ -3453,7 +3438,7 @@ class FileManager extends core_1.Host {
                         downloading[uri].push(item);
                     }
                     else if (type === 2 && !this.canRead(uri)) {
-                        errorPermission(this, item);
+                        this.handleFilePermission(item);
                     }
                     else {
                         if (!checkEtag) {
@@ -3470,7 +3455,7 @@ class FileManager extends core_1.Host {
                             if (checkEtag) {
                                 item.flags &= ~128;
                             }
-                            closeResponse(client);
+                            client?.destroy();
                             const location = request.url.toString();
                             request.encoding = encoding;
                             request.pipeTo = localUri;
@@ -3536,13 +3521,13 @@ class FileManager extends core_1.Host {
                                                     let buffer;
                                                     if (cached) {
                                                         if (etagDir === cached[5] && (!encoding || encoding === cached[2])) {
-                                                            if (item.checksum && !checkHash(this, localUri, false, item.checksum, cached[1])) {
+                                                            if (item.checksum && !this.checkHash(item.checksum, cached[1], localUri)) {
                                                                 tempDir = undefined;
                                                             }
                                                             else {
                                                                 if (checkEtag) {
                                                                     this.completeAsyncTask(null, localUri);
-                                                                    closeResponse(client);
+                                                                    client?.destroy();
                                                                     return;
                                                                 }
                                                                 buffer = cached[1];
@@ -3561,7 +3546,7 @@ class FileManager extends core_1.Host {
                                                             if (!checkEtag) {
                                                                 if (cacheBuffer && !buffer) {
                                                                     buffer = fs.readFileSync(pipeAs, encoding);
-                                                                    if (item.checksum && !checkHash(this, localUri, false, item.checksum, buffer)) {
+                                                                    if (item.checksum && !this.checkHash(item.checksum, buffer, localUri)) {
                                                                         downloadUri(opts, etagDir);
                                                                         return;
                                                                     }
@@ -3570,20 +3555,22 @@ class FileManager extends core_1.Host {
                                                                     }
                                                                 }
                                                                 if (checkDest(pipeAs, localUri)) {
-                                                                    if (buffer) {
-                                                                        writeBufferCache(this, localUri, buffer, encoding);
-                                                                    }
-                                                                    else if (item.checksum) {
-                                                                        buffer = fs.readFileSync(pipeAs, encoding);
-                                                                        if (!checkHash(this, localUri, false, item.checksum, buffer)) {
-                                                                            downloadUri(opts, etagDir);
-                                                                            return;
+                                                                    if (!buffer) {
+                                                                        if (item.checksum) {
+                                                                            buffer = fs.readFileSync(pipeAs, encoding);
+                                                                            if (!this.checkHash(item.checksum, buffer, localUri)) {
+                                                                                downloadUri(opts, etagDir);
+                                                                                return;
+                                                                            }
+                                                                        }
+                                                                        else {
+                                                                            fs.copyFileSync(pipeAs, localUri);
+                                                                            this.addDownload(pipeAs, types_1.DOWNLOAD_TYPE.CACHE);
                                                                         }
-                                                                        writeBufferCache(this, localUri, buffer, encoding);
                                                                     }
-                                                                    else {
-                                                                        fs.copyFileSync(pipeAs, localUri);
-                                                                        this.addDownload(pipeAs, types_1.DOWNLOAD_TYPE.CACHE);
+                                                                    if (buffer) {
+                                                                        fs.writeFileSync(localUri, buffer);
+                                                                        this.addDownload(Buffer.byteLength(buffer, encoding), types_1.DOWNLOAD_TYPE.CACHE);
                                                                     }
                                                                 }
                                                                 if (item.willChange && buffer) {
@@ -3594,7 +3581,7 @@ class FileManager extends core_1.Host {
                                                             else {
                                                                 this.completeAsyncTask(null, localUri);
                                                             }
-                                                            closeResponse(client);
+                                                            client?.destroy();
                                                             return;
                                                         }
                                                         if (buffer) {
@@ -3605,7 +3592,7 @@ class FileManager extends core_1.Host {
                                                                 item.flags &= ~128;
                                                             }
                                                             target.received(null, incremental, true, false, true);
-                                                            closeResponse(client);
+                                                            client?.destroy();
                                                             if (pipeAs) {
                                                                 fs.writeFile(pipeAs, buffer, () => { });
                                                             }
@@ -3619,7 +3606,7 @@ class FileManager extends core_1.Host {
                                             downloadUri(opts, etagDir);
                                         }
                                         else if (statusCode < 400) {
-                                            closeResponse(client);
+                                            client?.destroy();
                                             const location = res.headers.location;
                                             if (location && ++redirects <= HTTP_CLIENT.redirectLimit) {
                                                 try {
@@ -3754,7 +3741,7 @@ class FileManager extends core_1.Host {
                 }
             }
             else if (!this.canRead(uri)) {
-                errorPermission(this, item);
+                this.handleFilePermission(item);
             }
             else if (!target.queued(pathname, emptyDir, false)) {
                 this.performAsyncTask();
@@ -3809,8 +3796,8 @@ class FileManager extends core_1.Host {
             const barLength = processTask.barLength;
             const barIncrement = 100 / barLength;
             const initial = processTask.logCurrent !== logCurrent;
-            let redraw = false, scrollHeight = 0, logDelayed;
-            if ((logDelayed = core_1.Host.getLogDelayed()) && logDelayed.length > 0) {
+            let redraw = false, scrollHeight = 0, logDelayed = core_1.Host.getLogDelayed();
+            if (logDelayed.length > 0) {
                 logDelayed = logDelayed.filter(item => typeof item[4].progressBar !== 'boolean');
                 scrollHeight = Math.min(logDelayed.length, LOGGER.PROGRESS_SCROLLBUFFER);
             }
@@ -3836,7 +3823,7 @@ class FileManager extends core_1.Host {
                 PROCESS_STDOUT.moveCursor(0, -(statusHeight + 1 + 1 + (scrollHeight > 0 ? 1 + scrollHeight : 0)));
             }
             processTask.updated = currentTime;
-            const summary = new TaskStatus(-1, chalk.bold(`${statusHeight} requests`.padEnd(LOGGER.VALUE_WIDTH)));
+            const summary = new TaskStatus(-1, chalk.bold(formatLength('request', statusHeight).padEnd(LOGGER.VALUE_WIDTH)));
             const spacer = LOGGER.PROGRESS_SPACER;
             let finished = processTask.pending === 0;
             for (let i = 0; i <= statusHeight; ++i) {
@@ -4041,12 +4028,14 @@ class FileManager extends core_1.Host {
                 ++scheduler.count;
                 target = new Promise((resolve, reject) => {
                     const writable = fs.createWriteStream(uri);
-                    writable.on('finish', () => {
+                    writable
+                        .on('error', reject)
+                        .on('finish', () => {
                         resolve(1);
                     });
-                    writable.on('error', reject);
-                    data.on('error', reject);
-                    data.pipe(writable);
+                    data
+                        .on('error', reject)
+                        .pipe(writable);
                 });
             }
         }
@@ -4120,9 +4109,7 @@ class FileManager extends core_1.Host {
     async finalizeDocument() {
         for (const { instance, constructor } of this.Document) {
             if (constructor.finalize && instance.assets.length > 0) {
-                await constructor.finalize.call(this, instance).catch((err) => {
-                    this.rejectModule(err, 4, { instance });
-                });
+                await constructor.finalize.call(this, instance).catch((err) => this.rejectModule(err, 4, { instance }));
                 if (this.aborted) {
                     return;
                 }
@@ -4134,9 +4121,7 @@ class FileManager extends core_1.Host {
             for (const { instance, constructor } of this.Task) {
                 const items = assets.filter(item => item.tasks.find(data => data.handler === instance.moduleName));
                 if (items.length > 0) {
-                    await constructor.finalize.call(this, instance, items).catch((err) => {
-                        this.rejectModule(err, 4, { instance });
-                    });
+                    await constructor.finalize.call(this, instance, items).catch((err) => this.rejectModule(err, 4, { instance }));
                     if (this.aborted) {
                         return;
                     }
@@ -4147,9 +4132,7 @@ class FileManager extends core_1.Host {
     async finalizeCloud() {
         const instance = this.Cloud;
         if (instance) {
-            await cloud_1.finalize.call(this, instance).catch((err) => {
-                this.rejectModule(err, 64, { instance });
-            });
+            await cloud_1.finalize.call(this, instance).catch((err) => this.rejectModule(err, 64, { instance }));
         }
     }
     async finalizeChecksum() {
@@ -4162,7 +4145,7 @@ class FileManager extends core_1.Host {
         }
         else if ((0, types_1.isString)(checksum)) {
             const items = checksum.split('.');
-            checksum = items.length > 1 ? { algorithm: items[items.length - 1], filename: checksum } : { algorithm: checksum };
+            checksum = items.length > 1 ? { algorithm: items.at(-1), filename: checksum } : { algorithm: checksum };
         }
         if ((0, types_1.isPlainObject)(checksum)) {
             const baseDirectory = this.baseDirectory;
@@ -4187,9 +4170,7 @@ class FileManager extends core_1.Host {
         }
         for (const { instance, constructor } of this.Document) {
             if (constructor.cleanup && instance.assets.length > 0) {
-                await constructor.cleanup.call(this, instance).catch((err) => {
-                    this.rejectModule(err, 4, { instance });
-                });
+                await constructor.cleanup.call(this, instance).catch((err) => this.rejectModule(err, 4, { instance }));
             }
         }
     }
@@ -4201,35 +4182,30 @@ class FileManager extends core_1.Host {
             this.writeTimeElapsed('READY', 'Finalizing assets...', this.startTime, { ...core_1.Host.LOG_STYLE_WARN, showCpu: true });
         }
         const startTime = process.hrtime.bigint();
-        const filesToRemove = this.filesToRemove;
         for (const [file, output] of this.filesToCompare) {
             const localUri = file.localUri;
             let minFile = localUri, minSize = (0, util_2.getSize)(minFile);
             for (const other of output) {
                 const size = (0, util_2.getSize)(other);
                 if (minSize === 0 || size > 0 && size < minSize) {
-                    filesToRemove.add(minFile);
+                    this.filesToRemove.add(minFile);
                     minFile = other;
                     minSize = size;
                 }
                 else {
-                    filesToRemove.add(other);
+                    this.filesToRemove.add(other);
                 }
             }
             if (minFile !== localUri) {
                 this.replace(file, minFile);
             }
         }
-        removeFiles(this, filesToRemove);
-        await this.finalizeCompress(this.assets.filter(item => item.compress && !ignoreAsset(item))).catch((err) => {
-            this.rejectModule(err, 8);
-        });
+        this.removeFiles();
+        await this.finalizeCompress(this.assets.filter(item => item.compress && !ignoreAsset(item))).catch((err) => this.rejectModule(err, 8));
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        await this.finalizeDocument().catch((err) => {
-            this.rejectModule(err, 4);
-        });
+        await this.finalizeDocument().catch((err) => this.rejectModule(err, 4));
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
@@ -4243,32 +4219,27 @@ class FileManager extends core_1.Host {
                 }
             }
         }
-        removeFiles(this, filesToRemove);
-        await this.finalizeTask(this.taskAssets.filter(item => item.tasks?.find(data => !data.preceding) && item.localUri && this.has(item.localUri) && !ignoreAsset(item))).catch((err) => {
-            this.rejectModule(err, 4);
-        });
+        this.removeFiles();
+        await this.finalizeTask(this.taskAssets.filter(item => item.tasks?.find(data => !data.preceding) && this.has(item.localUri) && !ignoreAsset(item))).catch((err) => this.rejectModule(err, 4));
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        removeFiles(this, filesToRemove);
         for (const item of this.assets) {
             if (item.checksumOutput && !ignoreAsset(item)) {
                 const localUri = item.localUri;
-                if (!filesToRemove.has(localUri) && !checkHash(this, localUri, true, item.checksumOutput)) {
+                if (!this.filesToRemove.has(localUri) && !this.checkHash(item.checksumOutput, { uri: localUri, output: true })) {
                     item.invalid = true;
-                    filesToRemove.add(localUri);
+                    this.filesToRemove.add(localUri);
                     this.writeFail(["Checksum did not match", path.basename(localUri)], (0, types_1.errorValue)(localUri, "Invalid checksum"), { type: 32, startTime, queue: true });
                 }
             }
         }
-        removeFiles(this, filesToRemove);
-        await this.finalizeCloud().catch((err) => {
-            this.rejectModule(err, 64);
-        });
+        this.removeFiles();
+        await this.finalizeCloud().catch((err) => this.rejectModule(err, 64));
         if (this.aborted) {
             return (0, types_1.createAbortError)(true);
         }
-        removeFiles(this, filesToRemove);
+        this.removeFiles();
         if (this.Compress) {
             const tasks = [];
             for (const item of this.assets) {
@@ -4280,46 +4251,68 @@ class FileManager extends core_1.Host {
                 await Promise.allSettled(tasks);
             }
         }
-        await this.finalizeChecksum().catch((err) => {
-            this.rejectModule(err, 32);
-        });
-        await this.finalizeCleanup().catch((err) => {
-            this.rejectModule(err, 1);
-        });
-        removeFiles(this, filesToRemove);
+        await this.finalizeChecksum().catch((err) => this.rejectModule(err, 32));
+        await this.finalizeCleanup().catch((err) => this.rejectModule(err, 1));
+        this.removeFiles();
         this.closeMessage(startTime);
         this.Watch?.start(this.assets);
     }
+    removeFiles() {
+        const filesToRemove = this.filesToRemove;
+        if (filesToRemove.size > 0) {
+            for (const value of filesToRemove) {
+                this.deleteFile(value, { emptyDir: true });
+            }
+            filesToRemove.clear();
+        }
+    }
     close() {
         this.Request.close();
+        this.#releaseMemory();
+    }
+    observeFile(instance) {
+        instance.on('file:delete', (value, options) => this.delete(value, !!options?.emptyDir));
+        instance.on('file:copy', value => this.add(value));
+        instance.on('file:move', (value, options) => {
+            this.add(value);
+            const src = options?.outSrc;
+            if (src) {
+                this.delete(src);
+            }
+        });
+        instance.on('dir:remove', value => {
+            if (this.removeCwd(value)) {
+                value = matchPathname(value);
+                if (!value.endsWith(path.sep)) {
+                    value += path.sep;
+                }
+                for (const name of this.files) {
+                    if (matchPathname(name).startsWith(value)) {
+                        this.files.delete(name);
+                    }
+                }
+            }
+        });
     }
     startMessage() {
         if (!this.silent) {
-            this.formatMessage(128, 'START', [new Date().toLocaleString(), this.assets.length + ' assets'], this.baseDirectory, { ...core_1.Host.LOG_STYLE_SUCCESS });
+            this.formatMessage(128, 'START', [new Date().toLocaleString(), formatLength('asset', this.assets.length)], this.baseDirectory, { ...core_1.Host.LOG_STYLE_SUCCESS });
         }
     }
     closeMessage(startTime) {
         if (LOG_TIMEELAPSED) {
-            const [http, disk, cache] = this.#downloadStats;
             const errorCount = this.errorCount;
             const message = [];
             if (errorCount > 0) {
                 message.push('ERROR ' + errorCount);
             }
-            let [size, count] = http;
-            if (count > 0) {
-                message.push('HTTP ' + (count > 1 ? count + ' / ' : '') + (0, types_1.formatSize)(size));
-            }
-            [size, count] = disk;
-            if (count > 0) {
-                message.push('DISK ' + (count > 1 ? count + ' / ' : '') + (0, types_1.formatSize)(size));
-            }
-            [size, count] = cache;
-            if (count > 0) {
-                message.push('CACHE ' + (count > 1 ? count + ' / ' : '') + (0, types_1.formatSize)(size));
-            }
+            this.#downloadStats.forEach(([size, count], index) => {
+                if (count > 0) {
+                    message.push(`${types_1.DOWNLOAD_TYPE[index]} ` + (count > 1 && MEMORY.FILE_COUNT ? count + ' / ' : '') + (0, types_1.formatSize)(size));
+                }
+            });
             if (MEMORY.SIZE > 0) {
-                message.push('BUFFER ' + (MEMORY.CACHE.size > 1 ? MEMORY.CACHE.size + ' / ' : '') + (0, types_1.formatSize)(MEMORY.SIZE));
+                message.push('BUFFER ' + (MEMORY.CACHE.size > 1 && MEMORY.FILE_COUNT ? 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 });
         }
@@ -4346,7 +4339,7 @@ class FileManager extends core_1.Host {
                 const oldMax = lastHunk.oldStart + lastHunk.oldLines;
                 const newMax = lastHunk.newStart + lastHunk.newLines;
                 const posLength = Math.max(Math.max(oldMax, newMax).toString().length, Math.min(oldMax, newMax).toString().length);
-                addHeader(pathname, length + ` hunk${length > 1 ? 's' : ''}`);
+                addHeader(pathname, formatLength('hunk', length));
                 for (const { lines, oldLines, oldStart, newStart, newLines } of hunks) {
                     for (let i = 0, j = oldStart, k = oldLines, l = 0, q = lines.length, added = false; i < q && k > 0; ++i) {
                         const line = lines[i].substring(1);
@@ -4410,6 +4403,10 @@ class FileManager extends core_1.Host {
         this._pendingResult = null;
         this.clearStorage();
     }
+    resetAssets() {
+        this.reset();
+        FileManager.sanitizeAssets(this.assets);
+    }
     abortFinalize(err) {
         if (!this.restarting) {
             this.writeFail(["Transaction was not completed", this.baseDirectory], err);
@@ -4460,14 +4457,18 @@ class FileManager extends core_1.Host {
                     }
                 }
                 this.close();
-                clearAssets(this);
             });
         }
         else {
-            clearAssets(this);
+            this.#releaseMemory();
         }
         return result;
     }
+    #releaseMemory() {
+        for (const item of this.assets) {
+            unsetContent(item);
+        }
+    }
     #nextScheduled(scheduler, pid) {
         if (pid > 0) {
             const found = scheduler.status.find(item => item.id === pid);
@@ -4502,6 +4503,15 @@ class FileManager extends core_1.Host {
         const timeout = this.#processTimeout;
         return timeout && name in timeout ? timeout[name] : PROCESS_TIMEOUT[name];
     }
+    #onStartEnd(resolve) {
+        const callback = (files, errors, status) => {
+            if (!this.restarting) {
+                this.removeListener('end', callback);
+                resolve({ files, errors, status, aborted: this.aborted });
+            }
+        };
+        return callback;
+    }
     set restarting(value) {
         this.finalizeState = (this.#restarting = value) ? 3 : 0;
     }