@e-mc/file-manager 0.13.10 → 0.14.1

package/index.js

@@ -1,22 +1,23 @@
 "use strict";
-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 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");
-const util_1 = require("@e-mc/document/util");
-const util_2 = require("@e-mc/request/util");
-const request_1 = require("@e-mc/request");
-const image_1 = require("@e-mc/image");
-const watch_1 = require("@e-mc/watch");
-const compress_1 = require("@e-mc/compress");
-const cloud_1 = require("@e-mc/cloud");
+
+const path = require('node:path');
+const fs = require('node:fs');
+const stream = require('node:stream');
+const pm = require('picomatch');
+const chalk = require('chalk');
+const { fileURLToPath } = require('node:url');
+const { stripVTControlCharacters } = require('node:util');
+const { structuredPatch } = require('diff');
+const { DOWNLOAD_TYPE, FILE_TYPE, THRESHOLD, asExt, cloneFlag, convertTime, createAbortError, errorMessage, errorValue, existsFlag, formatSize, formatTime, getAlgorithm, getEncoding, getLogCurrent, getTempDir, hasBit, hasGlob, ignoreFlag, incrementUUID, isArray, isEmpty, isError, isErrorCode, isFunction, isObject, isPlainObject, isString, mainFlag, parseExpires, parseTime, renameExt, requireESM, setLogCurrent, usingFlag, watchFlag } = require('@e-mc/types');
+const { AbortComponent, Host, Permission } = require('@e-mc/core');
+const { isEqual, setInitialValue } = require('@e-mc/document/asset');
+const { concatString, getNewline } = require('@e-mc/document/util');
+const { asFloat, asInt, byteLength, checkRetryable, fromSeconds, fromURL, getSize, getTransferRate, hasSameStat, hasSize, parseHeader } = require('@e-mc/request/util');
+const Request = require('@e-mc/request');
+const Image = require('@e-mc/image');
+const Watch = require('@e-mc/watch');
+const Compress = require('@e-mc/compress');
+const Cloud = require('@e-mc/cloud');
 const kFileManager = Symbol.for('filemanager:constructor');
 const PROCESS_STDOUT = process.stdout;
 const PROCESS_STDIN = process.stdin;
@@ -27,7 +28,7 @@ const CACHE_ETAG = new Map();
 const DISK = {
     ENABLED: false,
     EXPIRES: 0,
-    LIMIT: (0, types_1.formatSize)("1gb"),
+    LIMIT: formatSize("1gb"),
     INCLUDE: [],
     EXCLUDE: []
 };
@@ -36,8 +37,8 @@ const MEMORY = {
     CACHE: new Map(),
     SIZE: 0,
     EXPIRES: 0,
-    LIMIT: (0, types_1.formatSize)("100mb"),
-    LIMIT_ALL: (0, types_1.formatSize)("512mb"),
+    LIMIT: formatSize("100mb"),
+    LIMIT_ALL: formatSize("512mb"),
     INCLUDE: [],
     EXCLUDE: [],
     PURGE: 0.25,
@@ -70,7 +71,7 @@ let SESSION_ID = 0;
 let SESSION_LIMIT = 1000;
 let ASSET_ID = 0;
 let RETRY_LIMIT = 10;
-let PROCESS_SUB_LIMIT = core_1.Host.availableParallelism(2);
+let PROCESS_SUB_LIMIT = Host.availableParallelism(2);
 let LOG_TIMEELAPSED = true;
 let LOG_TIMEPROCESS = true;
 const HTTP_CLIENT = {
@@ -93,7 +94,7 @@ function parseTimeout(value) {
     if (+value === 0) {
         return 0;
     }
-    if ((value = (0, types_1.parseTime)(value)) > 0) {
+    if ((value = parseTime(value)) > 0) {
         return value;
     }
     return -1;
@@ -102,7 +103,7 @@ function withinSizeRange(uri, value, pattern) {
     const match = (pattern || /\(\s*(\d+)\s*(?:,\s*(\d+|\*)\s*)?\)/).exec(value);
     const [minSize, maxSize] = match && !match[1] ? [+match[2], !match[3] || match[3] === '*' ? Infinity : +match[3]] : [0, Infinity];
     if (minSize > 0 || maxSize < Infinity) {
-        const fileSize = (0, util_2.getSize)(uri);
+        const fileSize = getSize(uri);
         if (fileSize === 0 || fileSize < minSize || fileSize > maxSize) {
             return false;
         }
@@ -112,7 +113,7 @@ function withinSizeRange(uri, value, pattern) {
 function bundleTorrent(host, files, mimeType, encoding) {
     let output = '';
     for (const file of files) {
-        if (core_1.Host.lookupMime(file) === mimeType) {
+        if (Host.lookupMime(file) === mimeType) {
             try {
                 output += fs.readFileSync(file, encoding);
             }
@@ -126,14 +127,14 @@ function bundleTorrent(host, files, mimeType, encoding) {
 function recurseDir(output, subDirs, options) {
     const { ignore, ignoreRoot, sortBy, recursive } = options;
     const fromDir = subDirs.length > 1 ? path.posix.join(...subDirs.slice(1)) : null;
-    if (ignoreRoot.length > 0 && fromDir && pm.isMatch(fromDir + '/', ignoreRoot, core_1.Host.PLATFORM_WIN32 ? { nocase: true } : undefined)) {
+    if (ignoreRoot.length > 0 && fromDir && pm.isMatch(fromDir + '/', ignoreRoot, Host.PLATFORM_WIN32 ? { nocase: true } : undefined)) {
         return output;
     }
-    const ignoreGlob = ignore.length > 0 ? pm(ignore, core_1.Host.PLATFORM_WIN32 ? { nocase: true, matchBase: true } : { matchBase: true }) : null;
+    const ignoreGlob = ignore.length > 0 ? pm(ignore, Host.PLATFORM_WIN32 ? { nocase: true, matchBase: true } : { matchBase: true }) : null;
     const baseDir = path.join(...subDirs);
     const items = fs.readdirSync(baseDir, { withFileTypes: true })
         .filter(item => {
-        if (ignoreGlob && ignoreGlob(fromDir ? path.posix.join(fromDir, item.name) : item.name)) {
+        if (ignoreGlob?.(fromDir ? path.posix.join(fromDir, item.name) : item.name)) {
             return false;
         }
         return item.name;
@@ -152,12 +153,12 @@ function recurseDir(output, subDirs, options) {
     for (const item of items) {
         if (!item.isDirectory()) {
             const pathname = path.join(baseDir, item.name);
-            if (item.isSymbolicLink() && core_1.Host.isDir(pathname) || ignore.length > 0 && (core_1.Host.PLATFORM_WIN32 ? ignore.includes(pathname.toLowerCase()) : ignore.includes(pathname))) {
+            if (item.isSymbolicLink() && Host.isDir(pathname) || ignore.length > 0 && !hasPath(ignore, pathname)) {
                 continue;
             }
             output.push(pathname);
         }
-        else if (recursive && (subDirs.length > 1 || (core_1.Host.PLATFORM_WIN32 ? !ignoreRoot.includes(item.name.toLowerCase()) : !ignoreRoot.includes(item.name)))) {
+        else if (recursive && (subDirs.length > 1 || !hasPath(ignoreRoot, item.name))) {
             recurseDir(output, subDirs.concat(item.name), options);
         }
     }
@@ -171,10 +172,10 @@ function createMatchNegate(patterns, options) {
     for (let value of patterns) {
         let invert = false;
         if (value.startsWith('!')) {
-            value = value.substring(1);
+            value = value.slice(1);
             invert = true;
         }
-        value = core_1.Permission.toPosix(value);
+        value = Permission.toPosix(value);
         const match = pm(value, getPmOptions(value, options));
         if (path.isAbsolute(value)) {
             (invert ? negateAbs : baseAbs).push(match);
@@ -190,30 +191,30 @@ function isMatch(value, globs) {
 }
 function filterPaths(rootDir, values, options = {}) {
     let { include, exclude } = options;
-    rootDir = core_1.Host.normalizePath(rootDir, 2);
+    rootDir = Host.normalizePath(rootDir, 2);
     if (include) {
-        if ((0, types_1.isString)(include)) {
+        if (isString(include)) {
             include = [include];
         }
-        if ((0, types_1.isArray)(include)) {
+        if (isArray(include)) {
             const [glob, globAbs] = createMatchNegate(include, options);
             for (let i = 0; i < values.length; ++i) {
                 const value = values[i];
-                if (!isMatch(value, globAbs) && !isMatch(value.substring(rootDir.length), glob)) {
+                if (!isMatch(value, globAbs) && !isMatch(value.slice(rootDir.length), glob)) {
                     values.splice(i--, 1);
                 }
             }
         }
     }
     if (exclude) {
-        if ((0, types_1.isString)(exclude)) {
+        if (isString(exclude)) {
             exclude = [exclude];
         }
-        if ((0, types_1.isArray)(exclude)) {
+        if (isArray(exclude)) {
             const [glob, globAbs] = createMatchNegate(exclude, options);
             for (let i = 0; i < values.length; ++i) {
                 const value = values[i];
-                if (isMatch(value, globAbs) || isMatch(value.substring(rootDir.length), glob)) {
+                if (isMatch(value, globAbs) || isMatch(value.slice(rootDir.length), glob)) {
                     values.splice(i--, 1);
                 }
             }
@@ -228,7 +229,7 @@ function formatMinutes(elapsed) {
     if (elapsed < 60000) {
         return (elapsed / 1000).toPrecision(3) + 's';
     }
-    return (0, types_1.formatTime)(elapsed, ':');
+    return formatTime(elapsed, ':');
 }
 function clearQueue(data, attr) {
     if (attr && data[attr]) {
@@ -239,7 +240,7 @@ function clearQueue(data, attr) {
     }
 }
 function hasEtag(item, cacheable, fallback) {
-    if (!cacheable || !(0, types_1.existsFlag)(item)) {
+    if (!cacheable || !existsFlag(item)) {
         return false;
     }
     switch (item.incremental) {
@@ -262,7 +263,7 @@ function equalAddress(value, other) {
     const b = decodeURIComponent(other);
     return a === b || a === other || value === b;
 }
-function processHeaders(item, headers, lastModified, mainEtag) {
+function processHeaders(headers, item, lastModified, mainEtag) {
     const contentLength = parseInt(headers['content-length']);
     if (contentLength > 0) {
         item.contentLength = contentLength;
@@ -281,6 +282,36 @@ function processHeaders(item, headers, lastModified, mainEtag) {
         return item.lastModified = headers['last-modified'];
     }
 }
+function processCacheHeaders(headers, noCache, noStore) {
+    if (noStore) {
+        return NaN;
+    }
+    const cacheControl = parseHeader(headers, 'cache-control');
+    if (cacheControl) {
+        if (cacheControl.includes('no-store')) {
+            return -1;
+        }
+        const maxAge = cacheControl.find(value => value.startsWith('max-age='));
+        if (maxAge && (!noCache || cacheControl.includes('public') || cacheControl.includes('must-revalidate'))) {
+            const age = parseHeader(headers, 'age');
+            let result = parseInt(maxAge.split('=').pop()) * 1000;
+            if (age) {
+                result -= age;
+                if (result < 0 && noCache) {
+                    return -1;
+                }
+            }
+            return result > 0 ? result : 0;
+        }
+    }
+    if (!noCache) {
+        const expires = parseHeader(headers, 'expires');
+        if (expires && !isNaN(expires)) {
+            const date = parseHeader(headers, 'date') || Date.now();
+            return expires - date;
+        }
+    }
+}
 function setContent(item, buffer) {
     if (typeof buffer === 'string') {
         item.sourceUTF8 = buffer;
@@ -298,38 +329,23 @@ function unsetContent(item) {
     }
 }
 async function doVerifyChecksum(root, from, options, nested) {
-    const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = true, joinRoot } = options;
+    const { digestEncoding, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = true, joinRoot } = options;
     const parent = recursive === 1 && typeof verbose !== 'number';
     let algorithm = options.algorithm;
     from ||= checksumFile(algorithm);
-    if (!algorithm) {
-        switch (algorithm = path.extname(from).substring(1).toLowerCase()) {
-            case 'md5':
-            case 'sha1':
-            case 'sha224':
-            case 'sha256':
-            case 'sha384':
-            case 'sha512':
-            case 'ripemd':
-            case 'ripemd-160':
-                break;
-            default:
-                algorithm = undefined;
-                break;
-        }
-    }
+    algorithm ||= getAlgorithm(asExt(from));
     if (verbose) {
-        (0, types_1.setLogCurrent)(null);
+        setLogCurrent(null);
     }
     let pass = 0, fail = [], missing = [];
     try {
         const filename = path.basename(from);
         const files = [];
         from = joinRoot ? path.join(root, filename) : path.resolve(from);
-        recurseDir(files, [root], { ignore: mapPosix([...ignore, from]), ignoreRoot: mapPosix(ignoreRoot), sortBy, recursive });
+        recurseDir(files, [root], { ignore: toPosix([...ignore, from]), ignoreRoot: toPosix(ignoreRoot), sortBy, recursive });
         const items = fs.readFileSync(from, 'utf8').split('\n').map(item => {
             const index = item.indexOf(' ');
-            return [item.substring(0, index), path.join(root, item.substring(index + 1))];
+            return [item.slice(0, index), path.join(root, item.slice(index + 1))];
         });
         const checked = options.include || options.exclude ? filterPaths(root, items.map(item => item[1]), options) : null;
         let valid = false;
@@ -443,7 +459,7 @@ function setHttpCache(value, type, disk) {
         return;
     }
     if (typeof value === 'string') {
-        value = (0, types_1.formatSize)(value);
+        value = formatSize(value);
     }
     if (value >= 0) {
         switch (type) {
@@ -480,20 +496,22 @@ function setLogMinWidth() {
 }
 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 } = {}) => ({ nocase: core_1.Host.PLATFORM_WIN32, matchBase, dot });
+const getPmOptions = (value, { matchBase = value.startsWith('*') && !value.includes('/'), dot = false } = {}) => ({ nocase: 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 isStored = (noCache, maxAge) => !noCache || typeof maxAge === 'number';
+const hasFiles = (type, uri) => type === 3 || type === 4 || type === 0 && Request.isRclone(uri);
 const hasIncremental = (value) => value === "etag" || value === "exists";
-const matchPathname = (value) => core_1.Host.PLATFORM_WIN32 ? value.toLowerCase() : value;
-const mapPosix = (values) => core_1.Host.PLATFORM_WIN32 ? values.map(value => core_1.Permission.toPosix(value).toLowerCase()) : values;
+const hasPath = (values, name) => Host.PLATFORM_WIN32 ? !values.includes(name.toLowerCase()) : !values.includes(name);
+const toPathCase = (value) => Host.PLATFORM_WIN32 ? value.toLowerCase() : value;
+const toPosix = (values) => Host.PLATFORM_WIN32 ? values.map(value => Permission.toPosix(value).toLowerCase()) : values;
 const formatPercent = (value) => Math.round(value).toString().padStart(3) + '%';
 const formatLength = (value, length) => `${length} ${value + (length === 1 ? '' : 's')}`;
-const checkEOF = (value) => value.endsWith('\n') ? value : value + '\n';
-const checksumFile = (algorithm) => "checksum" + '.' + ((0, types_1.isString)(algorithm) ? algorithm.toLowerCase() : "sha256");
-const ignoreAsset = (item, exists) => item.invalid || (0, types_1.hasBit)(item.flags, 1 | (!exists ? 128 : 0));
+const checkEOF = (value) => value.at(-1) === '\n' ? value : value + '\n';
+const checksumFile = (algorithm) => "checksum" + '.' + (isString(algorithm) ? algorithm.toLowerCase() : "sha256");
+const ignoreAsset = (item, exists) => item.invalid || hasBit(item.flags, 1 | (!exists ? 128 : 0));
 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);
+const errorChecksum = (algorithm) => errorValue("Invalid parameters", algorithm || "sha256");
+const errorAbsolute = (hint) => errorValue("Path is not absolute", hint);
 class Scheduler {
     id = 0;
     count = 0;
@@ -513,7 +531,7 @@ class Scheduler {
     #columns = -1;
     add(id, url) {
         if (url.length > LOGGER.VALUE_WIDTH) {
-            url = url.substring(0, LOGGER.VALUE_WIDTH - 3) + '...';
+            url = url.slice(0, LOGGER.VALUE_WIDTH - 3) + '...';
         }
         else {
             url = url.padEnd(LOGGER.VALUE_WIDTH);
@@ -585,7 +603,7 @@ class Scheduler {
         return width >= 10 ? Math.max(Math.min(width, LOGGER.PROGRESS_MAXWIDTH), 10) : -1;
     }
     get rawMode() {
-        return core_1.Host.PLATFORM_WIN32 && LOGGER.PROGRESS_RAWMODE;
+        return Host.PLATFORM_WIN32 && LOGGER.PROGRESS_RAWMODE;
     }
 }
 class TaskStatus {
@@ -623,20 +641,20 @@ class HttpDiskCache {
         if (!this.enabled) {
             return false;
         }
-        try {
-            if (typeof uri === 'string') {
+        if (typeof uri === 'string') {
+            try {
                 uri = new URL(uri);
             }
-        }
-        catch {
-            return false;
+            catch {
+                return false;
+            }
         }
         const flags = this._flags;
         if (flags === 0) {
             return true;
         }
         if (flags & (2 | 8)) {
-            const ext = path.extname(uri.pathname).substring(1);
+            const ext = asExt(uri.pathname);
             if (ext) {
                 if (flags & 2) {
                     if (!this._includeExt.some(value => value === ext)) {
@@ -653,7 +671,14 @@ class HttpDiskCache {
         }
         return true;
     }
-    add(uri, etag, target, { buffer, contentLength = (0, util_2.getSize)(target) } = {}) {
+    add(uri, etag, target, { buffer, contentLength = getSize(target), maxAge = 0 } = {}) {
+        if (maxAge < 0) {
+            this.clear(target);
+            return;
+        }
+        if (isNaN(maxAge)) {
+            return;
+        }
         let tempDir;
         if (contentLength <= this.limit && (tempDir = this.host.getCacheDir(uri))) {
             const baseDir = path.join(tempDir, etag);
@@ -668,11 +693,11 @@ class HttpDiskCache {
                 else {
                     fs.copyFileSync(target, tempUri);
                 }
-                const expires = this.expires;
+                const expires = maxAge || this.expires;
                 if (expires > 0 && expires < Infinity) {
                     setTimeout(() => {
                         this.clear(target);
-                    }, Math.min(expires, core_1.Host.MAX_TIMEOUT));
+                    }, Math.min(expires, Host.MAX_TIMEOUT));
                 }
             }
             catch {
@@ -686,7 +711,7 @@ class HttpDiskCache {
         return value > 0 && value <= this.limit;
     }
     clear(pathname) {
-        core_1.Host.removeDir(path.dirname(pathname));
+        Host.removeDir(path.dirname(pathname));
     }
     set enabled(value) {
         this.#enabled = value;
@@ -697,9 +722,9 @@ class HttpDiskCache {
     set include(value) {
         this._include = [];
         this._includeExt = [];
-        if ((0, types_1.isArray)(value)) {
+        if (isArray(value)) {
             for (const item of value) {
-                if (core_1.Host.isURL(item)) {
+                if (Host.isURL(item)) {
                     this._include.push(item);
                     this._flags |= 1;
                 }
@@ -719,9 +744,9 @@ class HttpDiskCache {
     set exclude(value) {
         this._exclude = [];
         this._excludeExt = [];
-        if ((0, types_1.isArray)(value)) {
+        if (isArray(value)) {
             for (const item of value) {
-                if (core_1.Host.isURL(item)) {
+                if (Host.isURL(item)) {
                     this._exclude.push(item);
                     this._flags |= 4;
                 }
@@ -744,7 +769,7 @@ class HttpMemoryCache extends HttpDiskCache {
     expires = MEMORY.EXPIRES;
     toDisk = [MEMORY.DISK_MIN, MEMORY.DISK_MAX];
     constructor(host, enabled) {
-        super(host, enabled && core_1.Host.enabled("memory.settings.users", host.username));
+        super(host, enabled && Host.enabled("memory.settings.users", host.username));
         if (MEMORY.INCLUDE.length > 0) {
             this.include = MEMORY.INCLUDE;
         }
@@ -755,7 +780,14 @@ class HttpMemoryCache extends HttpDiskCache {
     has(uri) {
         return this.expires > 0 && super.has(uri);
     }
-    add(uri, etag, buffer, { encoding, toDisk, contentLength = Buffer.byteLength(buffer, encoding) } = {}) {
+    add(uri, etag, buffer, { encoding, toDisk, contentLength = Buffer.byteLength(buffer, encoding), maxAge = 0 } = {}) {
+        if (maxAge < 0) {
+            this.clear(uri);
+            return;
+        }
+        if (isNaN(maxAge)) {
+            return;
+        }
         if (contentLength <= this.limit) {
             if (uri instanceof URL) {
                 uri = uri.href;
@@ -767,10 +799,11 @@ class HttpMemoryCache extends HttpDiskCache {
             const item = [Date.now(), buffer, encoding, contentLength, uri, etag];
             this._items.push(item);
             MEMORY.CACHE.set(uri, item);
-            if (this.expires < Infinity) {
+            const expires = maxAge || this.expires;
+            if (expires < Infinity) {
                 setTimeout(() => {
                     this.clear(uri);
-                }, Math.min(this.expires, core_1.Host.MAX_TIMEOUT));
+                }, Math.min(expires, Host.MAX_TIMEOUT));
             }
         }
         else {
@@ -846,15 +879,15 @@ class ProcessFile {
     createFolder(pathname, emptyDir) {
         const emptied = this.groupData.emptied;
         if (!emptied.includes(pathname)) {
-            if (emptyDir && core_1.Host.removeDir(pathname, true)) {
+            if (emptyDir && Host.removeDir(pathname, true)) {
                 emptied.push(pathname);
             }
-            else if (core_1.Host.createDir(pathname)) {
+            else if (Host.createDir(pathname)) {
                 emptied.push(pathname);
             }
             else {
                 this.file.invalid = true;
-                this.host.writeFail("Unable to create directory", (0, types_1.errorValue)("Path not found", pathname));
+                this.host.writeFail("Unable to create directory", errorValue("Path not found", pathname));
                 return false;
             }
         }
@@ -866,7 +899,7 @@ class ProcessFile {
         }
         const { host, groupData: group, file, localUri } = this;
         const { bundleId, bundleIndex = -1 } = file;
-        if (!(0, types_1.isEmpty)(bundleId) && bundleIndex >= 0) {
+        if (!isEmpty(bundleId) && bundleIndex >= 0) {
             const items = group.appending[localUri] ||= [];
             group.bundling[file.uri] ||= [];
             if (bundleIndex > 0) {
@@ -876,10 +909,14 @@ class ProcessFile {
                     const parent = host.assets.find(item => item.bundleIndex === 0 && item.bundleId === bundleId);
                     if (parent) {
                         (parent.bundleQueue ||= []).push(new Promise(resolve => {
-                            host.Request.open(url, { method: 'HEAD', httpVersion: 1 })
+                            host.Request.open(url, { method: 'HEAD', httpVersion: 1, headers: file.headers })
                                 .on('response', res => {
-                                if (res.statusCode < 300) {
-                                    processHeaders(file, res.headers, false, false);
+                                const statusCode = res.statusCode;
+                                if (statusCode === 204 || statusCode === 304) {
+                                    file.contentLength = 0;
+                                }
+                                else if (statusCode < 300) {
+                                    processHeaders(res.headers, file, false, false);
                                 }
                                 resolve(file);
                             })
@@ -925,7 +962,7 @@ class ProcessFile {
             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 });
+            host.writeFail(["Checksum did not match", path.basename(localUri)], errorValue(file.uri || localUri, "Invalid checksum"), { type: 32, queue: true });
         }
         else {
             if (fetched) {
@@ -951,7 +988,7 @@ class ProcessFile {
             let items = uriMap.get(destUri);
             if (!items) {
                 const pathname = path.dirname(destUri);
-                if (!core_1.Host.createDir(pathname)) {
+                if (!Host.createDir(pathname)) {
                     file.invalid = true;
                     continue;
                 }
@@ -984,7 +1021,7 @@ class ProcessFile {
     }
     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;
+        const bundleStart = file.bundleIndex === 0 && !isEmpty(file.bundleId) ? host.incremental !== "staging" && host.retryLimit === RETRY_LIMIT ? 2 : 1 : 0;
         groupData.completed[localUri] = file;
         if (bundleStart > 0) {
             host.setAssetContent(file, host.getUTF8String(file, localUri));
@@ -1006,11 +1043,11 @@ class ProcessFile {
                     for (const queue of items) {
                         const encoding = queue.encoding ||= 'utf8';
                         const { uri, fetchType: type } = queue;
-                        let tempFile;
+                        let tempFile, maxAge;
                         if (checkEtag && queue.trailingContent) {
                             checkEtag = false;
                         }
-                        const verifyBundle = (value, etag, checked) => {
+                        const verifyBundle = (value, etag, checked, noCache) => {
                             if (!queue.invalid) {
                                 if (!checked && !validateChecksum(host, queue, value, localUri)) {
                                     queue.invalid = true;
@@ -1020,10 +1057,11 @@ class ProcessFile {
                                     value = value.toString(encoding);
                                 }
                                 const url = queue.url;
-                                if (etag && host.cacheToMemory.has(url)) {
+                                if (etag && host.cacheToMemory.has(url) && isStored(noCache, maxAge)) {
                                     host.cacheToMemory.add(url, encodeURIComponent(etag), value, {
-                                        encoding,
                                         contentLength: queue.contentLength,
+                                        maxAge,
+                                        encoding,
                                         toDisk: !tempFile && isCacheable(queue) ? queue.filename || queue.localUri && path.basename(queue.localUri) : ''
                                     });
                                 }
@@ -1040,6 +1078,8 @@ class ProcessFile {
                                 const options = {
                                     url,
                                     encoding,
+                                    headers: queue.headers,
+                                    noCache: true,
                                     statusMessage: uri + ` (${queue.bundleIndex})`
                                 };
                                 let etag, pipeTo;
@@ -1057,7 +1097,7 @@ class ProcessFile {
                                                 const source = cached[1];
                                                 if (validateChecksum(host, queue, source, localUri)) {
                                                     verifyBundle(typeof source === 'string' ? source : source.toString(encoding), '', true);
-                                                    host.addDownload(Buffer.byteLength(source, encoding), types_1.DOWNLOAD_TYPE.CACHE);
+                                                    host.addDownload(Buffer.byteLength(source, encoding), DOWNLOAD_TYPE.CACHE);
                                                     continue;
                                                 }
                                             }
@@ -1069,18 +1109,18 @@ class ProcessFile {
                                             const baseDir = path.join(host.getCacheDir(url), etagDir);
                                             pipeTo = path.join(baseDir, path.basename(localUri));
                                             try {
-                                                if (valid && (0, util_2.hasSize)(pipeTo)) {
+                                                if (valid && hasSize(pipeTo)) {
                                                     const buffer = fs.readFileSync(pipeTo, { encoding });
                                                     if (validateChecksum(host, queue, localUri, buffer)) {
                                                         verifyBundle(buffer, etag, true);
-                                                        host.addDownload(Buffer.byteLength(buffer, encoding), types_1.DOWNLOAD_TYPE.CACHE);
+                                                        host.addDownload(Buffer.byteLength(buffer, encoding), DOWNLOAD_TYPE.CACHE);
                                                         continue;
                                                     }
                                                 }
                                                 if (!fs.existsSync(baseDir)) {
                                                     fs.mkdirSync(baseDir);
                                                 }
-                                                tempFile = path.join(baseDir, (0, types_1.incrementUUID)());
+                                                tempFile = path.join(baseDir, incrementUUID());
                                                 options.pipeTo = tempFile;
                                             }
                                             catch {
@@ -1092,20 +1132,21 @@ class ProcessFile {
                                         options.httpVersion = 1;
                                     }
                                     options.connected = (headers) => {
-                                        etag = processHeaders(queue, headers, !!host.Watch, false);
+                                        etag = processHeaders(headers, queue, !!host.Watch, false);
+                                        maxAge = processCacheHeaders(headers, options.noCache, options.noStore);
                                         return true;
                                     };
                                 }
                                 tasks.push(new Promise((resolve, reject) => {
                                     void host.scheduleTask(url || uri, options, (data) => {
                                         if (data) {
-                                            verifyBundle(data, etag);
+                                            verifyBundle(data, etag, false, options.noCache);
                                         }
                                         else {
                                             queue.invalid = true;
                                         }
                                         const downloaded = groupData.bundling[uri];
-                                        if ((0, types_1.isArray)(downloaded)) {
+                                        if (isArray(downloaded)) {
                                             if (data && !queue.invalid) {
                                                 if (typeof data === 'string') {
                                                     queue.sourceUTF8 = data;
@@ -1121,7 +1162,7 @@ class ProcessFile {
                                                 }
                                             }
                                         }
-                                        if (tempFile && (!pipeTo || core_1.Host.isPath(pipeTo) || !core_1.Host.renameFile(tempFile, pipeTo, false))) {
+                                        if (tempFile && (!pipeTo || Host.isPath(pipeTo) || !Host.renameFile(tempFile, pipeTo, false))) {
                                             queueMicrotask(() => fs.unlink(tempFile, () => { }));
                                         }
                                         resolve();
@@ -1138,12 +1179,12 @@ class ProcessFile {
                                 const mimeType = queue.mimeType || file.mimeType;
                                 if (!mimeType) {
                                     queue.invalid = true;
-                                    tasks.push(Promise.reject((0, types_1.errorValue)("MIME not found", uri)));
+                                    tasks.push(Promise.reject(errorValue("MIME not found", uri)));
                                     break;
                                 }
-                                const pathname = (0, types_1.getTempDir)(true);
+                                const pathname = getTempDir(true);
                                 tasks.push(new Promise((resolve, reject) => {
-                                    void host.scheduleTask(queue.url || uri, { pathname, binOpts: queue.binOpts || file.binOpts }, (result) => {
+                                    void host.scheduleTask(queue.url || uri, { pathname, binOpts: queue.binOpts || file.binOpts, headers: queue.headers }, (result) => {
                                         if (result.length > 0) {
                                             verifyBundle(bundleTorrent(host, result, mimeType, encoding));
                                         }
@@ -1161,7 +1202,7 @@ class ProcessFile {
                                 tasks.push(fs.promises.readFile(uri, encoding)
                                     .then(data => {
                                     verifyBundle(data);
-                                    host.addDownload(Buffer.byteLength(data, encoding), types_1.DOWNLOAD_TYPE.DISK);
+                                    host.addDownload(Buffer.byteLength(data, encoding), DOWNLOAD_TYPE.DISK);
                                 })
                                     .catch(() => {
                                     queue.invalid = true;
@@ -1181,7 +1222,7 @@ class ProcessFile {
                             return false;
                         });
                     }
-                    else if (checkEtag && core_1.Host.isPath(localUri)) {
+                    else if (checkEtag && Host.isPath(localUri)) {
                         host.completeAsyncTask();
                         groupData.appending[localUri] = undefined;
                         return;
@@ -1209,7 +1250,7 @@ class ProcessFile {
         const uri = file.uri;
         const processed = processing[localUri];
         const downloaded = downloading[uri];
-        if ((0, types_1.isArray)(downloaded)) {
+        if (isArray(downloaded)) {
             this.copyDownload(file, downloaded);
         }
         if (processed) {
@@ -1242,14 +1283,14 @@ class ProcessFile {
         if (!preceding) {
             host.completeAsyncTask();
         }
-        host.writeFail(["Unable to download file", uri], err, err instanceof Error && err.message.startsWith("Timeout was exceeded") ? 16384 : 1024);
+        host.writeFail(["Unable to download file", uri], err, isError(err) && err.message.startsWith("Timeout was exceeded") ? 16384 : 1024);
     }
 }
-class FileThread extends core_1.AbortComponent {
+class FileThread extends AbortComponent {
     file;
     threadCount;
-    mimeType = '';
     startTime = Date.now();
+    #mimeType = '';
     #host;
     #queuedTasks = [];
     constructor(host, file, threadCount) {
@@ -1278,8 +1319,16 @@ class FileThread extends core_1.AbortComponent {
     get localUri() {
         return this.file.localUri;
     }
+    set mimeType(value) {
+        if (typeof value === 'string') {
+            this.#mimeType = value;
+        }
+    }
+    get mimeType() {
+        return this.#mimeType;
+    }
 }
-class FileManager extends core_1.Host {
+class FileManager extends Host {
     static [kFileManager] = true;
     static async purgeMemory(percent = 1, limit = 0, parent) {
         if (typeof limit === 'boolean') {
@@ -1292,6 +1341,7 @@ class FileManager extends core_1.Host {
                 result = MEMORY.CACHE.size;
                 MEMORY.CACHE.clear();
                 MEMORY.SIZE = 0;
+                CACHE_ETAG.clear();
             }
             else if (percent > 0) {
                 const items = Array.from(MEMORY.CACHE.entries());
@@ -1319,7 +1369,7 @@ class FileManager extends core_1.Host {
             return false;
         }
         const { process: proc, memory, download, request, error, logger } = settings;
-        const sub_limit = (0, util_2.asInt)(proc?.thread?.sub_limit);
+        const sub_limit = asInt(proc?.thread?.sub_limit);
         if (sub_limit > 0) {
             PROCESS_SUB_LIMIT = sub_limit;
         }
@@ -1329,7 +1379,7 @@ class FileManager extends core_1.Host {
         }
         if (request) {
             let { timeout, disk, buffer, connect } = request;
-            if ((timeout = (0, util_2.fromSeconds)(timeout)) >= 0) {
+            if ((timeout = fromSeconds(timeout)) >= 0) {
                 HTTP_CLIENT.timeout = timeout;
             }
             if (disk) {
@@ -1341,10 +1391,10 @@ class FileManager extends core_1.Host {
             if (connect) {
                 this.defineHttpConnect(connect);
             }
-            request_1.loadSettings({ process: settings.process, request, download }, password);
+            Request.loadSettings({ process: settings.process, request, download }, password);
         }
-        if (error) {
-            const limit = 'retry_limit' in error ? (0, util_2.asInt)(error.retry_limit) : (0, util_2.asInt)(error.recursion_limit);
+        if (error?.retry_limit) {
+            const limit = asInt(error.retry_limit);
             if (limit >= 0 && limit < Infinity) {
                 RETRY_LIMIT = limit;
             }
@@ -1362,13 +1412,13 @@ class FileManager extends core_1.Host {
             }
             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) {
+                if ((scroll_buffer = asInt(scroll_buffer)) >= 0 && scroll_buffer <= 16) {
                     LOGGER.PROGRESS_SCROLLBUFFER = scroll_buffer;
                 }
                 if (max_width === 'auto' || max_width === '100%') {
                     LOGGER.PROGRESS_MAXWIDTH = Infinity;
                 }
-                else if ((max_width = (0, util_2.asInt)(max_width)) >= 10) {
+                else if ((max_width = asInt(max_width)) >= 10) {
                     LOGGER.PROGRESS_MAXWIDTH = max_width;
                 }
                 if (typeof use_color === 'boolean') {
@@ -1382,18 +1432,18 @@ class FileManager extends core_1.Host {
                         LOGGER.PROGRESS_TEXTWRAP = text_wrap;
                         break;
                 }
-                if ((0, types_1.isString)(color)) {
+                if (isString(color)) {
                     LOGGER.PROGRESS_COLOR = color;
                 }
-                if ((0, types_1.isString)(bg_color)) {
+                if (isString(bg_color)) {
                     LOGGER.PROGRESS_BGCOLOR = bg_color;
                 }
-                if ((0, types_1.isString)(box_char) && box_char.length === 1) {
+                if (isString(box_char) && box_char.length === 1) {
                     LOGGER.PROGRESS_BOXCHAR = box_char;
                 }
                 if (typeof raw_mode === 'boolean') {
                     LOGGER.PROGRESS_RAWMODE = raw_mode;
-                    if (raw_mode && core_1.Host.PLATFORM_WIN32) {
+                    if (raw_mode && Host.PLATFORM_WIN32) {
                         require('readline').emitKeypressEvents(PROCESS_STDIN);
                     }
                 }
@@ -1415,7 +1465,7 @@ class FileManager extends core_1.Host {
     }
     static sanitizeAssets(assets, exclusions = []) {
         for (const item of assets) {
-            if ((0, types_1.ignoreFlag)(item)) {
+            if (ignoreFlag(item)) {
                 continue;
             }
             const initialValue = item.initialValue;
@@ -1431,7 +1481,7 @@ class FileManager extends core_1.Host {
                         item.flags &= ~(128 | 16);
                         break;
                     case 'watch':
-                        if ((0, types_1.isObject)(item.watch) && item.watch.assets) {
+                        if (isObject(item.watch) && item.watch.assets) {
                             delete item.watch.assets;
                         }
                     case 'buffer':
@@ -1456,26 +1506,26 @@ class FileManager extends core_1.Host {
         return assets;
     }
     static async writeChecksum(root, to, options) {
-        if ((0, types_1.isObject)(to)) {
+        if (isObject(to)) {
             options = to;
             to = undefined;
         }
         else {
             options ||= {};
         }
-        const { algorithm, digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = false, joinRoot } = options;
+        const { algorithm, digestEncoding, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = false, joinRoot } = options;
         to ||= checksumFile(algorithm);
         let result = [];
         try {
             const filename = path.basename(to);
             to = joinRoot ? path.join(root, to) : path.resolve(to);
-            recurseDir(result, [root], { ignore: mapPosix([...ignore, to]), ignoreRoot: mapPosix(ignoreRoot), sortBy, recursive });
+            recurseDir(result, [root], { ignore: toPosix([...ignore, to]), ignoreRoot: toPosix(ignoreRoot), sortBy, recursive });
             const output = [];
             for (const pathname of result = filterPaths(root, result, options)) {
                 if (recursive === 1 && path.basename(pathname) === filename) {
                     continue;
                 }
-                const current = await this.readHash(pathname, { algorithm, digestEncoding }) + ' ' + core_1.Permission.toPosix(pathname).substring(root.length).replace(/^\//, '');
+                const current = await this.readHash(pathname, { algorithm, digestEncoding }) + ' ' + Permission.toPosix(pathname).slice(root.length).replace(/^\//, '');
                 if (verbose) {
                     process.stdout.write(current + '\n');
                 }
@@ -1504,7 +1554,7 @@ class FileManager extends core_1.Host {
         return result;
     }
     static async verifyChecksum(root, from, options) {
-        if ((0, types_1.isObject)(from)) {
+        if (isObject(from)) {
             options = from;
             from = undefined;
         }
@@ -1521,9 +1571,9 @@ class FileManager extends core_1.Host {
         if (typeof enabled === 'boolean') {
             cache.ENABLED = enabled;
         }
-        cache.EXPIRES = expires ? (0, types_1.parseExpires)(expires) : 0;
-        cache.INCLUDE = (0, types_1.isArray)(include) ? include.slice(0) : [];
-        cache.EXCLUDE = (0, types_1.isArray)(exclude) ? exclude.slice(0) : [];
+        cache.EXPIRES = expires ? parseExpires(expires) : 0;
+        cache.INCLUDE = isArray(include) ? include.slice(0) : [];
+        cache.EXCLUDE = isArray(exclude) ? exclude.slice(0) : [];
         setHttpCache(limit, 1, disk);
         if (disk) {
             return;
@@ -1537,24 +1587,24 @@ class FileManager extends core_1.Host {
             setHttpCache(to_disk, 3, disk);
             setHttpCache(limit_disk, 4, disk);
         }
-        if ((purge_amount = (0, util_2.asFloat)(purge_amount)) > 0) {
+        if ((purge_amount = asFloat(purge_amount)) > 0) {
             MEMORY.PURGE = Math.min(purge_amount, 1);
         }
     }
     static defineHttpConnect({ timeout, retry_wait, retry_after, retry_limit, redirect_limit }) {
-        if ((timeout = (0, util_2.fromSeconds)(timeout)) >= 0) {
+        if ((timeout = fromSeconds(timeout)) >= 0) {
             HTTP_CLIENT.connectTimeout = timeout;
         }
-        if ((retry_wait = (0, util_2.fromSeconds)(retry_wait)) >= 0) {
+        if ((retry_wait = fromSeconds(retry_wait)) >= 0) {
             HTTP_CLIENT.retryWait = Math.min(retry_wait, 600 * 1000);
         }
-        if ((retry_after = (0, util_2.fromSeconds)(retry_after)) >= 0) {
+        if ((retry_after = fromSeconds(retry_after)) >= 0) {
             HTTP_CLIENT.retryAfter = Math.min(retry_after, this.MAX_TIMEOUT);
         }
-        if ((retry_limit = (0, util_2.asInt)(retry_limit)) >= 0) {
+        if ((retry_limit = asInt(retry_limit)) >= 0) {
             HTTP_CLIENT.retryLimit = retry_limit;
         }
-        if ((redirect_limit = (0, util_2.asInt)(redirect_limit)) >= 0) {
+        if ((redirect_limit = asInt(redirect_limit)) >= 0) {
             HTTP_CLIENT.redirectLimit = redirect_limit;
         }
     }
@@ -1603,15 +1653,15 @@ class FileManager extends core_1.Host {
     #baseDirectory;
     constructor(baseDirectory, config, permission, postFinalize) {
         super(config);
-        if ((0, types_1.isFunction)(permission)) {
+        if (isFunction(permission)) {
             postFinalize = permission;
             permission = undefined;
         }
         if (LOG_TIMEPROCESS) {
-            core_1.Host.initCpuUsage(this);
+            Host.initCpuUsage(this);
         }
-        this.#baseDirectory = path.normalize(baseDirectory.at(-1) === path.sep ? baseDirectory.slice(0, -1) : baseDirectory);
-        this.permission = permission && core_1.Host.isPermission(permission) ? permission : core_1.Host.getPermissionFromSettings();
+        this.#baseDirectory = path.normalize(Host.PLATFORM_WIN32 ? baseDirectory.replace(/[\\/]+$/, '') : baseDirectory.replace(/\/+$/, ''));
+        this.permission = permission && Host.isPermission(permission) ? permission : Host.getPermissionFromSettings();
         this.sessionId = FileManager.generateSessionId();
         this.supports('permission', false, true);
         this.supports('sessionId', false, true);
@@ -1625,7 +1675,7 @@ class FileManager extends core_1.Host {
             if (item.tasks) {
                 this.taskAssets.push(item);
             }
-            if ((0, types_1.usingFlag)(item)) {
+            if (usingFlag(item)) {
                 targeted.push(item);
             }
             switch (item.encoding) {
@@ -1636,7 +1686,7 @@ class FileManager extends core_1.Host {
                     item.encoding = 'utf8';
                     break;
                 default: {
-                    const encoding = (0, types_1.getEncoding)(item.encoding);
+                    const encoding = getEncoding(item.encoding);
                     item.encoding = encoding === 'utf8' ? undefined : encoding;
                     break;
                 }
@@ -1657,7 +1707,7 @@ class FileManager extends core_1.Host {
         if (config.timeout) {
             applyTimeout(this.#processTimeout = Object.create(null), config.timeout);
         }
-        if ((0, types_1.isFunction)(postFinalize)) {
+        if (isFunction(postFinalize)) {
             this.on('end', postFinalize);
         }
         this.cacheToDisk = new HttpDiskCache(this, DISK.ENABLED);
@@ -1665,10 +1715,10 @@ class FileManager extends core_1.Host {
         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.#diffSource = [config.log.showDiff.map(value => (0, types_1.hasGlob)(value) ? (value = core_1.Permission.toPosix(value), pm(value, getPmOptions(value))) : value), {}];
+        if (isPlainObject(config.log) && isArray(config.log.showDiff) && this.incremental !== "staging") {
+            this.#diffSource = [config.log.showDiff.map(value => hasGlob(value) ? (value = Permission.toPosix(value), pm(value, getPmOptions(value))) : value), {}];
         }
-        const request = new request_1();
+        const request = new Request();
         request.host = this;
         this.Request = request;
         if (this.aborted) {
@@ -1686,12 +1736,12 @@ class FileManager extends core_1.Host {
             yield file;
         }
     }
-    add(value, parent, type = types_1.FILE_TYPE.TRANSFORM) {
+    add(value, parent, type = FILE_TYPE.TRANSFORM) {
         const file = this.removeCwd(value);
         if (file) {
             this.files.add(file);
             if (parent) {
-                if (type & types_1.FILE_TYPE.TRANSFORM) {
+                if (type & FILE_TYPE.TRANSFORM) {
                     const transforms = parent.transforms;
                     if (!transforms) {
                         parent.transforms = [value];
@@ -1700,7 +1750,7 @@ class FileManager extends core_1.Host {
                         transforms.push(value);
                     }
                 }
-                if (type & types_1.FILE_TYPE.TORRENT) {
+                if (type & FILE_TYPE.TORRENT) {
                     const torrent = parent.torrentFiles;
                     if (!torrent) {
                         parent.torrentFiles = [value];
@@ -1709,7 +1759,7 @@ class FileManager extends core_1.Host {
                         torrent.push(value);
                     }
                 }
-                if (type & (types_1.FILE_TYPE.COMPRESSED | types_1.FILE_TYPE.SOURCEMAP)) {
+                if (type & (FILE_TYPE.COMPRESSED | FILE_TYPE.SOURCEMAP)) {
                     const connected = parent.descendants;
                     if (!connected) {
                         parent.descendants = [value];
@@ -1730,7 +1780,7 @@ class FileManager extends core_1.Host {
         if (this.files.delete(this.removeCwd(value))) {
             if (emptyDir) {
                 let dir = this.baseDirectory;
-                for (const seg of path.dirname(value).substring(this.baseDirectory.length + 1).split(path.sep)) {
+                for (const seg of path.dirname(value).slice(this.baseDirectory.length + 1).split(path.sep)) {
                     if (seg) {
                         dir += path.sep + seg;
                         this.emptyDir.add(dir);
@@ -1757,7 +1807,7 @@ class FileManager extends core_1.Host {
         this.files.forEach(predicate, thisArg);
     }
     clear() {
-        core_1.Host.removeDir(this.baseDirectory, true);
+        Host.removeDir(this.baseDirectory, true);
         this.files.clear();
     }
     get size() {
@@ -1768,11 +1818,11 @@ class FileManager extends core_1.Host {
         super.abort(reason);
     }
     willAbort(value) {
-        if ((0, types_1.isObject)(value)) {
+        if (isObject(value)) {
             value = value.moduleName;
         }
         const error = this.config.error;
-        return !!error && (0, types_1.isArray)(error.abort) && error.abort.includes(value);
+        return !!error && isArray(error.abort) && error.abort.includes(value);
     }
     restart(recursive, exclusions, emptyDir) {
         if (recursive === 'abort') {
@@ -1795,7 +1845,7 @@ class FileManager extends core_1.Host {
                 this.processAssets(emptyDir);
             }
             else {
-                this.writeFail(['Unable to restart session', formatLength('asset', this.assets.length)], (0, types_1.errorMessage)('sessionId', this.sessionId));
+                this.writeFail(['Unable to restart session', formatLength('asset', this.assets.length)], errorMessage('sessionId', this.sessionId));
             }
         }
         else {
@@ -1809,8 +1859,8 @@ class FileManager extends core_1.Host {
         }
         switch (name) {
             case 'cloud': {
-                if ((0, types_1.isArray)(args[1])) {
-                    const instance = new cloud_1(args[0], args[1]);
+                if (isArray(args[1])) {
+                    const instance = new Cloud(args[0], args[1]);
                     instance.host = this;
                     instance.init(this.config);
                     this.observeFile(instance);
@@ -1858,7 +1908,7 @@ class FileManager extends core_1.Host {
     deleteFile(value, options = {}, callback) {
         if (super.deleteFile(value, options, callback)) {
             let emptyDir = false;
-            if ((0, types_1.isObject)(options)) {
+            if (isObject(options)) {
                 if (options.emptyDir) {
                     emptyDir = true;
                 }
@@ -1909,7 +1959,7 @@ class FileManager extends core_1.Host {
             }
             case 'task': {
                 const Module = this.#tryPackage(target, name, 4);
-                if (Module && (0, types_1.isPlainObject)(args[0])) {
+                if (Module && isPlainObject(args[0])) {
                     const instance = new Module(...args);
                     instance.host = this;
                     instance.init(this.config);
@@ -1922,11 +1972,11 @@ class FileManager extends core_1.Host {
             case 'cloud': {
                 const database = this.dataSourceItems.filter(item => item.source === 'cloud');
                 let instance;
-                if ((0, types_1.isString)(target)) {
+                if (isString(target)) {
                     const mod = args.shift();
-                    if ((0, types_1.isObject)(mod)) {
+                    if (isObject(mod)) {
                         if (target === "@e-mc/cloud") {
-                            instance = new cloud_1(mod, database);
+                            instance = new Cloud(mod, database);
                         }
                         else {
                             const Module = this.#tryPackage(target, name, 64);
@@ -1936,8 +1986,8 @@ class FileManager extends core_1.Host {
                         }
                     }
                 }
-                else if ((0, types_1.isObject)(target)) {
-                    instance = new cloud_1(target, database);
+                else if (isObject(target)) {
+                    instance = new Cloud(target, database);
                 }
                 if (!instance) {
                     return;
@@ -1949,11 +1999,11 @@ class FileManager extends core_1.Host {
             }
             case 'watch': {
                 let instance;
-                if ((0, types_1.isString)(target)) {
+                if (isString(target)) {
                     const mod = args.shift();
-                    if ((0, types_1.isObject)(mod)) {
+                    if (isObject(mod)) {
                         if (target === "@e-mc/watch") {
-                            instance = new watch_1(mod);
+                            instance = new Watch(mod);
                         }
                         else {
                             const Module = this.#tryPackage(target, name, 16);
@@ -1963,8 +2013,8 @@ class FileManager extends core_1.Host {
                         }
                     }
                 }
-                else if ((0, types_1.isObject)(target)) {
-                    instance = new watch_1(target);
+                else if (isObject(target)) {
+                    instance = new Watch(target);
                 }
                 if (!instance) {
                     return;
@@ -2048,7 +2098,7 @@ class FileManager extends core_1.Host {
                     this.Image ||= new Map();
                 }
                 for (const [mimeType, Module] of target) {
-                    if (core_1.Host.constructorOf(Module, 'image')) {
+                    if (Host.constructorOf(Module, 'image')) {
                         const instance = new Module(...args);
                         instance.host = this;
                         instance.init(this.config);
@@ -2062,7 +2112,7 @@ class FileManager extends core_1.Host {
                 this.Image = null;
                 break;
             case 'compress': {
-                const instance = new compress_1(target);
+                const instance = new Compress(target);
                 instance.host = this;
                 instance.init();
                 this.observeFile(instance);
@@ -2072,12 +2122,12 @@ class FileManager extends core_1.Host {
     }
     findAsset(value, instance) {
         let assets, replaced;
-        if ((0, types_1.isPlainObject)(instance)) {
+        if (isPlainObject(instance)) {
             ({ instance, assets, replaced } = instance);
         }
         let origin, pathname;
         if (typeof value === 'string') {
-            if (core_1.Host.isURL(value, 'file')) {
+            if (Host.isURL(value, 'file')) {
                 try {
                     ({ origin, pathname, href: value } = new URL(value));
                 }
@@ -2086,18 +2136,18 @@ class FileManager extends core_1.Host {
                 }
             }
             else {
-                value = core_1.Host.resolveFile(value);
+                value = Host.resolveFile(value);
             }
         }
         else {
             ({ origin, pathname, href: value } = value);
         }
-        if (!(0, types_1.isString)(value)) {
+        if (!isString(value)) {
             return;
         }
         const result = (assets || this.assets).filter(item => {
             const { uri, flags } = item;
-            if (uri && (!instance || this.hasDocument(instance, item.document)) && (!item.invalid || assets || (0, types_1.mainFlag)(flags) || (0, types_1.usingFlag)(flags) || (0, types_1.cloneFlag)(flags) || (0, types_1.watchFlag)(flags))) {
+            if (uri && (!instance || this.hasDocument(instance, item.document)) && (!item.invalid || assets || mainFlag(flags) || usingFlag(flags) || cloneFlag(flags) || watchFlag(flags))) {
                 if (origin) {
                     if (!item.url) {
                         try {
@@ -2118,7 +2168,7 @@ class FileManager extends core_1.Host {
                 const indexA = uri.indexOf('#');
                 const indexB = value.indexOf('#');
                 if (indexA !== -1 || indexB !== -1) {
-                    return equalAddress(indexA !== -1 ? uri.substring(0, indexA) : uri, indexB !== -1 ? value.substring(0, indexB) : value);
+                    return equalAddress(indexA !== -1 ? uri.slice(0, indexA) : uri, indexB !== -1 ? value.slice(0, indexB) : value);
                 }
             }
             return false;
@@ -2126,7 +2176,7 @@ class FileManager extends core_1.Host {
         if (replaced) {
             const map = this.#replacedAssets;
             if (map) {
-                const target = pathname || core_1.Host.toPosix(value);
+                const target = pathname || Host.toPosix(value);
                 const found = [];
                 for (const relative in map) {
                     const item = map[relative];
@@ -2153,12 +2203,12 @@ class FileManager extends core_1.Host {
                 return 1;
             }
             const bundleId = a.bundleId;
-            if (((0, types_1.isEmpty)(bundleId) || a.bundleIndex === 0) && ((0, types_1.isEmpty)(b.bundleId) || b.bundleIndex === 0)) {
+            if ((isEmpty(bundleId) || a.bundleIndex === 0) && (isEmpty(b.bundleId) || b.bundleIndex === 0)) {
                 if (a.id && b.id) {
                     return a.id < b.id ? -1 : 1;
                 }
             }
-            else if (!(0, types_1.isEmpty)(bundleId) && bundleId === b.bundleId) {
+            else if (!isEmpty(bundleId) && bundleId === b.bundleId) {
                 return a.bundleIndex < b.bundleIndex ? -1 : 1;
             }
             return 0;
@@ -2175,16 +2225,16 @@ class FileManager extends core_1.Host {
     removeCwd(value) {
         if (typeof value === 'string') {
             const baseDir = this.baseDirectory + path.sep;
-            const leading = value.substring(0, baseDir.length);
-            if (leading === baseDir || core_1.Host.PLATFORM_WIN32 && leading.toLowerCase() === baseDir.toLowerCase()) {
-                return value.substring(baseDir.length);
+            const leading = value.slice(0, baseDir.length);
+            if (leading === baseDir || Host.PLATFORM_WIN32 && leading.toLowerCase() === baseDir.toLowerCase()) {
+                return value.slice(baseDir.length);
             }
         }
         return '';
     }
     replace(file, replaceWith, mimeType) {
         let ignoreExt, rewritePath;
-        if ((0, types_1.isObject)(mimeType)) {
+        if (isObject(mimeType)) {
             ({ mimeType, ignoreExt, rewritePath } = mimeType);
         }
         const { pathname, filename, localUri } = file;
@@ -2192,7 +2242,7 @@ class FileManager extends core_1.Host {
             const name = path.basename(replaceWith);
             if (!ignoreExt && localUri && path.extname(localUri) === path.extname(replaceWith)) {
                 try {
-                    if (!core_1.Host.renameFile(replaceWith, localUri)) {
+                    if (!Host.renameFile(replaceWith, localUri)) {
                         this.filesToRemove.add(replaceWith);
                     }
                 }
@@ -2202,7 +2252,7 @@ class FileManager extends core_1.Host {
                 }
             }
             else {
-                (0, asset_1.setInitialValue)(file);
+                setInitialValue(file);
                 if (rewritePath || !localUri) {
                     file.pathname = this.removeCwd(path.dirname(replaceWith));
                 }
@@ -2210,7 +2260,7 @@ class FileManager extends core_1.Host {
                 const replacePath = this.setLocalUri(file, true).localUri;
                 if (replaceWith !== replacePath) {
                     try {
-                        if (!core_1.Host.renameFile(replaceWith, replacePath)) {
+                        if (!Host.renameFile(replaceWith, replacePath)) {
                             this.filesToRemove.add(replaceWith);
                         }
                     }
@@ -2222,7 +2272,7 @@ class FileManager extends core_1.Host {
                         return false;
                     }
                 }
-                file.mimeType = mimeType || core_1.Host.lookupMime(name) || file.mimeType;
+                file.mimeType = mimeType || Host.lookupMime(name) || file.mimeType;
                 this.add(replaceWith);
                 if (localUri && !this.assets.find(item => item.localUri === localUri && !item.invalid)) {
                     this.filesToRemove.add(localUri);
@@ -2248,7 +2298,7 @@ class FileManager extends core_1.Host {
                         if (copy) {
                             fs.copyFileSync(oldPath, newPath);
                         }
-                        else if (!core_1.Host.renameFile(oldPath, newPath)) {
+                        else if (!Host.renameFile(oldPath, newPath)) {
                             this.filesToRemove.add(oldPath);
                         }
                     }
@@ -2261,7 +2311,7 @@ class FileManager extends core_1.Host {
                     this.delete(oldPath);
                 }
             }
-            (0, asset_1.setInitialValue)(file);
+            setInitialValue(file);
             file.filename = value;
             this.add(file.localUri = this.setLocalUri(file, true).localUri);
         }
@@ -2291,7 +2341,7 @@ class FileManager extends core_1.Host {
             this.clearProcessTimeout();
             this.#delayed = Infinity;
             if (this.aborted) {
-                this.abortFinalize((0, types_1.createAbortError)());
+                this.abortFinalize(createAbortError());
                 return;
             }
             this.finalizeState = 1;
@@ -2313,12 +2363,12 @@ class FileManager extends core_1.Host {
                 this.resetState();
                 const log = this.config.log;
                 let useNumeric, showSize;
-                if ((0, types_1.isObject)(log)) {
+                if (isObject(log)) {
                     ({ useNumeric, showSize } = log);
                 }
                 const items = showSize === false ? files : files.map(name => {
-                    const size = (0, util_2.getSize)(path.join(this.baseDirectory, name));
-                    return { name, size: useNumeric ? size : (0, types_1.formatSize)(size) };
+                    const size = getSize(path.join(this.baseDirectory, name));
+                    return { name, size: useNumeric ? size : formatSize(size) };
                 });
                 this.emit('end', items, errors, this.collectLog());
                 this.done = true;
@@ -2337,13 +2387,13 @@ class FileManager extends core_1.Host {
                 pathname = file.pathname || '';
             }
             const assets = this.assets;
-            let target = matchPathname(path.join(pathname, filename)), modified = false;
+            let target = toPathCase(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))) {
+                if (item !== file && item.filename && target === toPathCase(path.join(item.pathname || '', item.filename))) {
                     const { name, ext } = path.parse(filename);
                     filename = name + '_' + j + ext;
-                    target = matchPathname(path.join(pathname, filename));
+                    target = toPathCase(path.join(pathname, filename));
                     modified = true;
                     i = -1;
                     ++j;
@@ -2358,14 +2408,14 @@ class FileManager extends core_1.Host {
     setLocalUri(file, replace) {
         let uri = file.uri || file.url?.toString(), type;
         if (uri && !file.content && !file.base64 && !file.dataView) {
-            if (core_1.Host.isFile(uri, 'torrent')) {
+            if (Host.isFile(uri, 'torrent')) {
                 type = 4;
             }
-            else if (request_1.isRclone(uri)) {
+            else if (Request.isRclone(uri)) {
                 type = 0;
             }
             else if (!file.url) {
-                if (core_1.Host.isURL(uri, 'file')) {
+                if (Host.isURL(uri, 'file')) {
                     try {
                         file.url = new URL(uri);
                         file.uri = file.url.toString();
@@ -2380,7 +2430,7 @@ class FileManager extends core_1.Host {
                 }
                 else {
                     try {
-                        if (!(file.uri = core_1.Host.resolveFile(uri))) {
+                        if (!(file.uri = Host.resolveFile(uri))) {
                             throw errorAbsolute(uri);
                         }
                         if (file.socketPath) {
@@ -2404,7 +2454,7 @@ class FileManager extends core_1.Host {
         }
         const url = file.url;
         if (file.pathname) {
-            file.pathname = core_1.Host.toPosix(file.pathname);
+            file.pathname = Host.toPosix(file.pathname);
         }
         if (url) {
             if (type === undefined) {
@@ -2428,7 +2478,7 @@ class FileManager extends core_1.Host {
             if (!filename && !file.document && !isDownloadAll(type)) {
                 filename = url.pathname.split('/').pop();
                 if (filename.includes('.')) {
-                    const mimeType = file.mimeType || core_1.Host.lookupMime(filename);
+                    const mimeType = file.mimeType || Host.lookupMime(filename);
                     if (mimeType) {
                         file.filename = filename;
                         file.mimeType = mimeType;
@@ -2436,7 +2486,7 @@ class FileManager extends core_1.Host {
                     }
                 }
                 else if (file.mimeType && filename) {
-                    const ext = core_1.Host.lookupMime(file.mimeType, true);
+                    const ext = Host.lookupMime(file.mimeType, true);
                     if (ext) {
                         filename += '.' + ext;
                         file.filename = filename;
@@ -2464,7 +2514,7 @@ class FileManager extends core_1.Host {
         const localUri = file.filename ? path.join(pathname, file.filename) : pathname;
         file.localUri = localUri;
         if (!file.mimeType && !isDownloadAll(type)) {
-            file.mimeType = file.url && core_1.Host.lookupMime(path.basename(file.url.pathname)) || core_1.Host.lookupMime(file.filename);
+            file.mimeType = file.url && Host.lookupMime(path.basename(file.url.pathname)) || Host.lookupMime(file.filename);
         }
         return { pathname, localUri };
     }
@@ -2472,7 +2522,7 @@ class FileManager extends core_1.Host {
         return data.file.localUri || '';
     }
     getMimeType(data) {
-        return data.mimeType ||= data.file.mimeType || core_1.Host.lookupMime(path.basename(this.getLocalUri(data)));
+        return data.mimeType ||= data.file.mimeType || Host.lookupMime(path.basename(this.getLocalUri(data)));
     }
     getDocumentAssets(instance, condition) {
         return this.documentAssets.filter(item => this.hasDocument(instance, item.document) && (!condition || condition(item)));
@@ -2483,7 +2533,7 @@ class FileManager extends core_1.Host {
     getUTF8String(file, uri) {
         let sourceUTF8 = file.sourceUTF8;
         if (!sourceUTF8) {
-            file.encoding = (0, types_1.getEncoding)(file.encoding);
+            file.encoding = getEncoding(file.encoding);
             if (file.buffer) {
                 sourceUTF8 = file.buffer.toString(file.encoding);
                 file.buffer = null;
@@ -2497,7 +2547,7 @@ class FileManager extends core_1.Host {
                 }
             }
             if (sourceUTF8?.[0] === '\uFEFF' && file.encoding !== 'utf16le') {
-                sourceUTF8 = sourceUTF8.substring(1);
+                sourceUTF8 = sourceUTF8.slice(1);
             }
             return file.sourceUTF8 = sourceUTF8 || '';
         }
@@ -2510,13 +2560,13 @@ class FileManager extends core_1.Host {
         let { base64, localUri } = file;
         if (localUri) {
             if (typeof minStreamSize === 'number') {
-                return core_1.Host.streamFile(localUri, { minStreamSize, cache: false, signal: this.signal });
+                return Host.streamFile(localUri, { minStreamSize, cache: false, signal: this.signal });
             }
             try {
                 return fs.readFileSync(localUri);
             }
             catch (err) {
-                if (!(base64 && (0, types_1.isErrorCode)(err, 'ENOENT', 'EACCES'))) {
+                if (!(base64 && isErrorCode(err, 'ENOENT', 'EACCES'))) {
                     this.writeFail(["Unable to read file", path.basename(localUri)], err, 32);
                     base64 = undefined;
                 }
@@ -2537,7 +2587,7 @@ class FileManager extends core_1.Host {
         return this.getTempDir({ pathname: url.hostname + '_' + (url.port || (url.protocol === 'https:' ? '443' : '80')), moduleDir: true, createDir });
     }
     setAssetContent(file, content, options) {
-        let trailing = (0, util_1.concatString)(file.trailingContent);
+        let trailing = concatString(file.trailingContent);
         if (file.document) {
             for (const { instance } of this.Document) {
                 if (instance.resolveUri && this.hasDocument(instance, file.document)) {
@@ -2565,7 +2615,7 @@ class FileManager extends core_1.Host {
                     this.contentToReplace.set(localUri, replacing = []);
                 }
                 appending[bundleIndex - 1] = content;
-                if ((0, types_1.isString)(options.bundleReplace)) {
+                if (isString(options.bundleReplace)) {
                     replacing[bundleIndex - 1] = options.bundleReplace;
                 }
                 file.invalid = true;
@@ -2580,10 +2630,11 @@ class FileManager extends core_1.Host {
             return content;
         }
         let replacing, newline;
-        const getSeparator = (value) => newline ||= (0, util_1.getNewline)(value);
+        const getSeparator = (value) => newline ||= getNewline(value);
         if (content && (replacing = this.contentToReplace.get(localUri)) && replacing.length > 0) {
-            for (let i = 0, value, match; i < replacing.length; ++i) {
-                if ((0, types_1.isString)(value = appending[i])) {
+            for (let i = 0, match; i < replacing.length; ++i) {
+                let value = appending[i];
+                if (isString(value)) {
                     if (replacing[i] && (match = new RegExp(replacing[i], 'i').exec(content))) {
                         if (document) {
                             for (const { instance } of this.Document) {
@@ -2596,7 +2647,7 @@ class FileManager extends core_1.Host {
                                 }
                             }
                         }
-                        content = content.substring(0, match.index) + value + getSeparator(content) + content.substring(match.index + match[0].length);
+                        content = content.slice(0, match.index) + value + getSeparator(content) + content.slice(match.index + match[0].length);
                     }
                     else {
                         content += getSeparator(content) + value;
@@ -2636,7 +2687,7 @@ class FileManager extends core_1.Host {
             return;
         }
         const document = data.file.document;
-        const ext = path.extname(localUri).substring(1);
+        const ext = asExt(localUri);
         let output;
         saveAs ||= ext;
         if (document) {
@@ -2651,7 +2702,7 @@ class FileManager extends core_1.Host {
             if (!replace || this.filesQueued.has(localUri)) {
                 let i = 1;
                 do {
-                    output = (0, types_1.renameExt)(localUri, '__copy__.' + (i > 1 ? `(${i}).` : '') + saveAs);
+                    output = renameExt(localUri, '__copy__.' + (i > 1 ? `(${i}).` : '') + saveAs);
                 } while (this.filesQueued.has(output) && ++i);
                 try {
                     fs.copyFileSync(localUri, output);
@@ -2665,7 +2716,7 @@ class FileManager extends core_1.Host {
         else {
             let i = 1;
             do {
-                output = (0, types_1.renameExt)(localUri, (i > 1 ? `(${i}).` : '') + saveAs);
+                output = renameExt(localUri, (i > 1 ? `(${i}).` : '') + saveAs);
                 if (replace) {
                     break;
                 }
@@ -2675,7 +2726,7 @@ class FileManager extends core_1.Host {
         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);
+        this.writeFail(["Unable to read file", file.uri && path.basename(file.uri)], errorValue("Operation not permitted", file.uri || file.filename), 8192);
         file.invalid = true;
         this.emit('asset:permission', file);
     }
@@ -2686,7 +2737,7 @@ class FileManager extends core_1.Host {
         }
         let mimeType = '', ext;
         try {
-            const result = await core_1.Host.resolveMime(file.buffer || localUri);
+            const result = await Host.resolveMime(file.buffer || localUri);
             if (result) {
                 ({ mime: mimeType, ext } = result);
             }
@@ -2699,10 +2750,10 @@ class FileManager extends core_1.Host {
                 file.invalid = true;
             }
             else {
-                const output = (0, types_1.renameExt)(localUri, ext);
+                const output = renameExt(localUri, ext);
                 if (localUri !== output) {
                     try {
-                        const success = core_1.Host.renameFile(localUri, output);
+                        const success = Host.renameFile(localUri, output);
                         this.replace(file, output, mimeType);
                         if (!success) {
                             this.filesToRemove.add(localUri);
@@ -2722,43 +2773,44 @@ class FileManager extends core_1.Host {
     async compressFile(file, overwrite = true) {
         const compress = this.Compress;
         const localUri = file.localUri;
-        if (compress && localUri && (this.has(localUri) || (0, types_1.existsFlag)(file)) && file.compress) {
+        if (compress && localUri && (this.has(localUri) || existsFlag(file)) && file.compress) {
             const tasks = [];
             for (const options of file.compress) {
                 const { format, condition } = options;
                 let output;
                 switch (format) {
                     case 'br':
+                    case 'zst':
                         options.mimeType ||= file.mimeType;
                     case 'gz':
                         output = localUri + '.' + format;
                         break;
                     case 'woff':
                     case 'woff2':
-                        output = (0, types_1.renameExt)(localUri, format);
+                        output = renameExt(localUri, format);
                         options.filename = file.filename;
                         options.etag = file.etag;
                         break;
                     default:
                         if (format && typeof compress.compressors[format] === 'function') {
-                            output = (0, types_1.renameExt)(localUri, format);
+                            output = renameExt(localUri, format);
                         }
                         break;
                 }
                 if (output && (!condition || withinSizeRange(localUri, condition))) {
                     try {
-                        if (overwrite || !fs.existsSync(output) || !(0, types_1.existsFlag)(file) && fs.statSync(output).mtimeMs < this.startTime) {
+                        if (overwrite || !fs.existsSync(output) || !existsFlag(file) && fs.statSync(output).mtimeMs < this.startTime) {
                             options.timeout = this.#getModuleTimeout('compress');
                             tasks.push(compress.tryFile(file.buffer || localUri, output, options).then(() => {
                                 const outFile = options.outFile;
                                 if (outFile) {
-                                    if (condition?.includes('%') && (0, util_2.getSize)(outFile) >= (0, util_2.getSize)(localUri)) {
+                                    if (condition?.includes('%') && getSize(outFile) >= getSize(localUri)) {
                                         queueMicrotask(() => {
                                             this.deleteFile(outFile);
                                         });
                                     }
                                     else {
-                                        this.add(outFile, file, types_1.FILE_TYPE.COMPRESSED);
+                                        this.add(outFile, file, FILE_TYPE.COMPRESSED);
                                     }
                                 }
                             })
@@ -2819,13 +2871,13 @@ class FileManager extends core_1.Host {
                     }
                 }
             }
-            if (image_1.isBinary(mimeType)) {
+            if (Image.isBinary(mimeType)) {
                 if (file.commands && this.Image) {
                     const handler = this.Image.get(mimeType) || this.Image.get('handler');
                     if (handler) {
                         const { instance } = handler;
                         for (const command of file.commands) {
-                            if (withinSizeRange(localUri, command, REGEXP_SIZERANGE) && instance.using && !data.aborted) {
+                            if (command && withinSizeRange(localUri, command, REGEXP_SIZERANGE) && instance.using && !data.aborted) {
                                 if (instance.threadable) {
                                     if (this.openThread(instance, data, this.getProcessTimeout(handler))) {
                                         instance.using(data, command)
@@ -2865,7 +2917,7 @@ class FileManager extends core_1.Host {
             if (!file.invalid) {
                 this.add(localUri, parent);
             }
-            else if (localUri && (0, types_1.isEmpty)(file.bundleId)) {
+            else if (localUri && isEmpty(file.bundleId)) {
                 this.deleteFile(localUri, { emptyDir: true });
             }
         });
@@ -2875,7 +2927,7 @@ class FileManager extends core_1.Host {
         if (this.aborted || data.aborted) {
             return false;
         }
-        core_1.AbortComponent.attach(data, instance.signal);
+        AbortComponent.attach(data, instance.signal);
         if (timeout > 0) {
             this.addProcessTimeout(instance, data.file, timeout);
         }
@@ -2888,7 +2940,7 @@ class FileManager extends core_1.Host {
             return false;
         }
         if (instance) {
-            core_1.AbortComponent.detach(data, instance.signal);
+            AbortComponent.detach(data, instance.signal);
             this.removeProcessTimeout(instance, data.file);
         }
         if (typeof callback === 'function') {
@@ -2958,7 +3010,7 @@ class FileManager extends core_1.Host {
             result = value;
         }
         else if (typeof value === 'string') {
-            if ((result = (0, util_2.byteLength)(value, encoding)) === 0) {
+            if ((result = byteLength(value, encoding)) === 0) {
                 return 0;
             }
         }
@@ -2980,20 +3032,20 @@ class FileManager extends core_1.Host {
     }
     checkHash(checksum, data, uri) {
         let algorithm, digestEncoding, value;
-        if ((0, types_1.isObject)(checksum)) {
-            ({ algorithm, digestEncoding = checksum.digest, value } = checksum);
+        if (isObject(checksum)) {
+            ({ algorithm, digestEncoding, value } = checksum);
         }
         else {
             value = checksum;
         }
         let output;
-        if ((0, types_1.isPlainObject)(data)) {
+        if (isPlainObject(data)) {
             ({ data, uri, output } = data);
         }
-        else if ((0, types_1.isPlainObject)(uri)) {
+        else if (isPlainObject(uri)) {
             ({ uri, output } = uri);
         }
-        if ((0, types_1.isString)(value)) {
+        if (isString(value)) {
             algorithm ||= "sha256";
             if (!data) {
                 if (!uri) {
@@ -3004,14 +3056,14 @@ class FileManager extends core_1.Host {
                 }
                 catch (err) {
                     this.addLog(3, err, { source: `${algorithm}:${value}` });
-                    return output ? (0, types_1.isErrorCode)(err, 'ENOENT') : false;
+                    return output ? isErrorCode(err, 'ENOENT') : false;
                 }
             }
-            if ((value = value.toLowerCase()) === core_1.Host.asHash(data, algorithm, digestEncoding)) {
+            if ((value = value.toLowerCase()) === Host.asHash(data, algorithm, digestEncoding)) {
                 if (uri instanceof URL) {
-                    uri = (0, node_url_1.fileURLToPath)(uri);
+                    uri = fileURLToPath(uri);
                 }
-                this.formatMessage(32, algorithm, ["Checksum matched" + (output ? ' (output)' : ''), uri && path.basename(uri)], value, { ...core_1.Host.LOG_STYLE_INFO, queue: true });
+                this.formatMessage(32, algorithm, ["Checksum matched" + (output ? ' (output)' : ''), uri && path.basename(uri)], value, { ...Host.LOG_STYLE_INFO, queue: true });
                 return true;
             }
             return false;
@@ -3039,7 +3091,7 @@ class FileManager extends core_1.Host {
             if (buffer) {
                 this.addDownload(Buffer.byteLength(buffer, encoding));
             }
-            else if ((0, types_1.isString)(pipeTo) && core_1.Host.isPath(pipeTo, true)) {
+            else if (isString(pipeTo) && Host.isPath(pipeTo, true)) {
                 this.addDownload(pipeTo);
             }
             return buffer;
@@ -3052,7 +3104,7 @@ class FileManager extends core_1.Host {
         else {
             options.pathname ||= this.baseDirectory;
         }
-        return request_1.isRclone(uri) ? this.Request.rclone(uri, options) : this.Request.aria2c(uri, options);
+        return Request.isRclone(uri) ? this.Request.rclone(uri, options) : this.Request.aria2c(uri, options);
     }
     async start(emptyDir) {
         if (this.aborted) {
@@ -3179,7 +3231,7 @@ class FileManager extends core_1.Host {
                             this.deleteFile(localUri, { id: file.id, emptyDir: true, all: true });
                         }
                     }
-                    (moduleName && this.find(moduleName) || this).formatFail(16384, "FAIL!", ["Unable to process file", moduleName || 'main'], (0, types_1.errorValue)(expired ? "Timeout was exceeded" : "Aborted", localUri), { queue: false, startTime: data.startTime });
+                    (moduleName && this.find(moduleName) || this).formatFail(16384, "FAIL!", ["Unable to process file", moduleName || 'main'], errorValue(expired ? "Timeout was exceeded" : "Aborted", localUri), { queue: false, startTime: data.startTime });
                     processing.splice(i--, 1);
                     aborted = true;
                 }
@@ -3190,12 +3242,12 @@ class FileManager extends core_1.Host {
             else if (aborted) {
                 this.performFinalize();
             }
-        }, types_1.THRESHOLD.FILEMANAGER_INTERVAL);
+        }, THRESHOLD.FILEMANAGER_INTERVAL);
         const { assets, cacheToDisk, cacheToMemory, fetchedAssets } = this;
         const downloadable = new Map();
         const staging = this.#incremental === "staging";
         const incremental = this.config.incremental;
-        const checkDest = (src, localUri) => staging || !(0, util_2.hasSameStat)(src, localUri);
+        const checkDest = (src, localUri) => staging || !hasSameStat(src, localUri);
         let cacheable = false, cacheOpen = false, cacheEtag = false;
         if (!staging) {
             cacheable = this.retryLimit === RETRY_LIMIT;
@@ -3211,9 +3263,9 @@ class FileManager extends core_1.Host {
         }
         const targeting = this._usingObjects.size > 0;
         const groupData = new ProcessGroup();
-        const imported = assets.filter(item => item.imported && (0, types_1.isArray)(item.imported));
+        const imported = assets.filter(item => item.imported && isArray(item.imported));
         for (let item of assets) {
-            if (item.invalid || (0, types_1.ignoreFlag)(item)) {
+            if (item.invalid || ignoreFlag(item)) {
                 continue;
             }
             let download = this.setLocalUri(item), uri = item.uri;
@@ -3224,7 +3276,7 @@ class FileManager extends core_1.Host {
                 }
                 item.filename = '';
             }
-            if (targeting && !this.contains(item, (other) => (0, asset_1.isEqual)(item, other))) {
+            if (targeting && !this.contains(item, (other) => isEqual(item, other))) {
                 item.invalid = true;
                 continue;
             }
@@ -3253,7 +3305,7 @@ 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)) {
+                else if (!mainFlag(item)) {
                     let cached;
                     const { bundleId, bundleIndex = -1 } = item;
                     const setBuffer = (target) => {
@@ -3264,12 +3316,12 @@ class FileManager extends core_1.Host {
                         }
                         return false;
                     };
-                    if ((!etag || item.fetchType === 1 && ((0, types_1.isEmpty)(bundleId) || bundleIndex <= 0)) && (!this.Watch || !item.watch || setBuffer(item))) {
+                    if ((!etag || item.fetchType === 1 && (isEmpty(bundleId) || bundleIndex <= 0)) && (!this.Watch || !item.watch || setBuffer(item))) {
                         let childBundle, childDownload;
-                        if (!(0, types_1.isEmpty)(bundleId) && bundleIndex > 0) {
+                        if (!isEmpty(bundleId) && bundleIndex > 0) {
                             const target = assets.find(parent => parent.bundleIndex === 0 && parent.bundleId === bundleId);
                             if (target) {
-                                if ((0, types_1.existsFlag)(target)) {
+                                if (existsFlag(target)) {
                                     setBuffer(item);
                                     item.invalid = true;
                                 }
@@ -3300,10 +3352,10 @@ class FileManager extends core_1.Host {
                             setBuffer(item);
                         }
                         const checksumOutput = item.checksumOutput;
-                        if (core_1.Host.isPath(localUri) && (!checksumOutput || this.checkHash(checksumOutput, { uri: localUri, output: true }))) {
+                        if (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)) {
+                                if (bundleIndex === 0 && !isEmpty(bundleId)) {
                                     for (const target of assets.filter(child => child.bundleId === bundleId && child.bundleIndex > 0)) {
                                         setBuffer(target);
                                         target.invalid = true;
@@ -3323,7 +3375,7 @@ class FileManager extends core_1.Host {
                                     if (item.willChange && Buffer.isBuffer(buffer)) {
                                         item.buffer = buffer;
                                     }
-                                    if (!(checksumOutput && (0, types_1.isEmpty)(bundleId) && this.checkHash(checksumOutput, { data: buffer, uri: localUri, output: true }))) {
+                                    if (!(checksumOutput && 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);
@@ -3336,14 +3388,14 @@ class FileManager extends core_1.Host {
                         }
                     }
                 }
-                else if (core_1.Host.isPath(localUri)) {
+                else if (Host.isPath(localUri)) {
                     try {
                         const buffer = fs.readFileSync(localUri);
                         if (!etag) {
-                            (0, asset_1.setInitialValue)(item, false).buffer = buffer;
+                            setInitialValue(item, false).buffer = buffer;
                         }
                         else if (uri && CACHE_ETAG.has(uri)) {
-                            const initialValue = (0, asset_1.setInitialValue)(item, false);
+                            const initialValue = setInitialValue(item, false);
                             initialValue.buffer = buffer;
                             initialValue.etag = CACHE_ETAG.get(uri);
                         }
@@ -3372,13 +3424,13 @@ class FileManager extends core_1.Host {
             }
             const { pathname, localUri } = download;
             const target = new ProcessFile(this, item, localUri, groupData);
-            if (diffSource && core_1.Host.isPath(localUri, true) && diffSource[0].some(pattern => typeof pattern === 'string' ? pattern === item.mimeType || pattern === item.mimeType?.split('/')[1] : pattern(localUri))) {
+            if (diffSource && Host.isPath(localUri, true) && diffSource[0].some(pattern => typeof pattern === 'string' ? pattern === item.mimeType || pattern === item.mimeType?.split('/')[1] : pattern(localUri))) {
                 try {
-                    const encoding = image_1.isBinary(item.mimeType) ? 'base64' : item.encoding || 'utf8';
+                    const encoding = Image.isBinary(item.mimeType) ? 'base64' : item.encoding || 'utf8';
                     diffSource[1][localUri] ||= [fs.readFileSync(localUri, encoding), encoding];
                 }
                 catch (err) {
-                    this.formatMessage(32, "WARN!", ["Unable to read file", path.basename(localUri)], err, { ...core_1.Host.LOG_STYLE_WARN });
+                    this.formatMessage(32, "WARN!", ["Unable to read file", path.basename(localUri)], err, { ...Host.LOG_STYLE_WARN });
                 }
             }
             if (item.content) {
@@ -3425,7 +3477,7 @@ class FileManager extends core_1.Host {
                             target.received(err);
                         }).then(code => {
                             if (code === -1) {
-                                target.received((0, types_1.errorValue)("Not able to read buffer", path.basename(localUri)));
+                                target.received(errorValue("Not able to read buffer", path.basename(localUri)));
                             }
                         });
                     }
@@ -3435,10 +3487,10 @@ class FileManager extends core_1.Host {
                 continue;
             }
             const type = item.fetchType || 0;
-            const bundleMain = item.bundleIndex === 0 && !(0, types_1.isEmpty)(item.bundleId);
+            const bundleMain = item.bundleIndex === 0 && !isEmpty(item.bundleId);
             if (type === 1 || type === 2) {
-                let checkEtag;
-                if (bundling[uri] && (0, types_1.isEmpty)(item.bundleId)) {
+                let checkEtag = false;
+                if (bundling[uri] && isEmpty(item.bundleId)) {
                     bundling[uri].push(item);
                 }
                 else if ((checkEtag = hasEtag(item, cacheable, cacheEtag)) || !target.queued(pathname, emptyDir, false)) {
@@ -3460,7 +3512,7 @@ class FileManager extends core_1.Host {
                         if (type === 1) {
                             cacheDir = cacheToDisk.has(url) && isCacheable(item);
                             cacheBuffer = cacheToMemory.has(url);
-                            mainEtag = (0, types_1.mainFlag)(item) && (cacheEtag || item.incremental === "etag");
+                            mainEtag = mainFlag(item) && (cacheEtag || item.incremental === "etag");
                         }
                         const downloadUri = (request, etagDir) => {
                             if (checkEtag) {
@@ -3468,14 +3520,17 @@ class FileManager extends core_1.Host {
                             }
                             client?.destroy();
                             const location = request.url.toString();
+                            let maxAge;
                             request.encoding = encoding;
+                            request.headers = item.headers;
                             request.pipeTo = localUri;
                             request.statusMessage = location + (bundleMain ? ' (0)' : '');
                             if (type === 1) {
                                 request.method = 'GET';
                                 request.httpVersion = (originCount[request.url.origin] || 0) <= 1 ? 1 : undefined;
                                 request.connected = headers => {
-                                    processHeaders(item, headers, watching, mainEtag);
+                                    processHeaders(headers, item, watching, mainEtag);
+                                    maxAge = processCacheHeaders(headers, request.noCache, request.noStore);
                                     return item.willChange || !!etagDir && (cacheDir || !item.contentLength || cacheToMemory.within(item.contentLength)) || this.hasLog('progress');
                                 };
                             }
@@ -3492,13 +3547,13 @@ class FileManager extends core_1.Host {
                                     item.buffer = data;
                                 }
                                 target.received(null, incremental, type === 1);
-                                if (etagDir) {
+                                if (etagDir && isStored(request.noCache, maxAge)) {
                                     queueMicrotask(() => {
                                         if (cacheBuffer && data) {
-                                            cacheToMemory.add(location, etagDir, data, { encoding, contentLength: item.contentLength, toDisk: !cacheDir && isCacheable(item) ? path.basename(localUri) : '' });
+                                            cacheToMemory.add(location, etagDir, data, { contentLength: item.contentLength, maxAge, encoding, toDisk: !cacheDir && isCacheable(item) ? path.basename(localUri) : '' });
                                         }
                                         if (cacheDir) {
-                                            cacheToDisk.add(location, etagDir, localUri, { buffer: data, contentLength: item.contentLength });
+                                            cacheToDisk.add(location, etagDir, localUri, { contentLength: item.contentLength, maxAge, buffer: data });
                                         }
                                     });
                                 }
@@ -3512,15 +3567,15 @@ class FileManager extends core_1.Host {
                                 const request = this.Request;
                                 try {
                                     ++processTask.pending;
-                                    const opts = request.opts(href, { method: 'HEAD', httpVersion: 1 });
+                                    const opts = request.opts(href, { method: 'HEAD', httpVersion: 1, headers: item.headers });
                                     (client = request.open(href, opts))
                                         .on('response', res => {
                                         --processTask.pending;
                                         const statusCode = res.statusCode;
                                         if (statusCode < 300) {
-                                            const etag = processHeaders(item, res.headers, false, mainEtag);
+                                            const etag = processHeaders(res.headers, item, false, mainEtag);
                                             let etagDir = null, tempDir;
-                                            if (etag) {
+                                            if (etag && !opts.noCache) {
                                                 if (cacheDir || mainEtag) {
                                                     tempDir = this.getCacheDir(href);
                                                 }
@@ -3552,7 +3607,7 @@ class FileManager extends core_1.Host {
                                                     }
                                                     try {
                                                         let pipeAs;
-                                                        if (tempDir && (0, util_2.hasSize)(pipeAs = path.join(tempDir, etagDir, path.basename(localUri)))) {
+                                                        if (tempDir && hasSize(pipeAs = path.join(tempDir, etagDir, path.basename(localUri)))) {
                                                             if (!checkEtag) {
                                                                 if (cacheBuffer && !buffer) {
                                                                     buffer = fs.readFileSync(pipeAs, encoding);
@@ -3561,7 +3616,7 @@ class FileManager extends core_1.Host {
                                                                         return;
                                                                     }
                                                                     if (cacheToMemory.within(item.contentLength = Buffer.byteLength(buffer, encoding))) {
-                                                                        cacheToMemory.add(location, etagDir, buffer, { encoding, contentLength: item.contentLength, tempFile: pipeAs });
+                                                                        cacheToMemory.add(location, etagDir, buffer, { contentLength: item.contentLength, encoding, tempFile: pipeAs });
                                                                     }
                                                                 }
                                                                 if (checkDest(pipeAs, localUri)) {
@@ -3575,12 +3630,12 @@ class FileManager extends core_1.Host {
                                                                         }
                                                                         else {
                                                                             fs.copyFileSync(pipeAs, localUri);
-                                                                            this.addDownload(pipeAs, types_1.DOWNLOAD_TYPE.CACHE);
+                                                                            this.addDownload(pipeAs, DOWNLOAD_TYPE.CACHE);
                                                                         }
                                                                     }
                                                                     if (buffer) {
                                                                         fs.writeFileSync(localUri, buffer);
-                                                                        this.addDownload(Buffer.byteLength(buffer, encoding), types_1.DOWNLOAD_TYPE.CACHE);
+                                                                        this.addDownload(Buffer.byteLength(buffer, encoding), DOWNLOAD_TYPE.CACHE);
                                                                     }
                                                                 }
                                                                 if (item.willChange && buffer) {
@@ -3597,7 +3652,7 @@ class FileManager extends core_1.Host {
                                                         if (buffer) {
                                                             setContent(item, buffer);
                                                             fs.writeFileSync(localUri, buffer);
-                                                            this.addDownload(Buffer.byteLength(buffer, encoding), types_1.DOWNLOAD_TYPE.CACHE);
+                                                            this.addDownload(Buffer.byteLength(buffer, encoding), DOWNLOAD_TYPE.CACHE);
                                                             if (checkEtag) {
                                                                 item.flags &= ~128;
                                                             }
@@ -3620,13 +3675,13 @@ class FileManager extends core_1.Host {
                                             const location = res.headers.location;
                                             if (location && ++redirects <= HTTP_CLIENT.redirectLimit) {
                                                 try {
-                                                    checkHeaders(new URL((0, util_2.fromURL)(href, location)), redirects);
+                                                    checkHeaders(new URL(fromURL(href, location)), redirects);
                                                     return;
                                                 }
                                                 catch {
                                                 }
                                             }
-                                            target.abort((0, types_1.errorMessage)(statusCode, "Exceeded redirect limit", url.toString()));
+                                            target.abort(errorMessage(statusCode, "Exceeded redirect limit", url.toString()));
                                         }
                                         else {
                                             downloadUri(opts, null);
@@ -3635,7 +3690,7 @@ class FileManager extends core_1.Host {
                                         .on('error', err => {
                                         --processTask.pending;
                                         if (!client.destroyed) {
-                                            if ((0, util_2.checkRetryable)(err)) {
+                                            if (checkRetryable(err)) {
                                                 downloadUri(opts, null);
                                             }
                                             else {
@@ -3665,7 +3720,7 @@ class FileManager extends core_1.Host {
             }
             else if (hasFiles(type, uri)) {
                 if (bundleMain && !item.mimeType) {
-                    target.abort((0, types_1.errorValue)("MIME not found", uri), true);
+                    target.abort(errorValue("MIME not found", uri), true);
                 }
                 else if (!target.queued(pathname, emptyDir, false)) {
                     if (downloading[uri]) {
@@ -3674,7 +3729,7 @@ class FileManager extends core_1.Host {
                     }
                     downloading[uri] = [];
                     this.performAsyncTask();
-                    const options = { pathname, binOpts: item.binOpts, shellExpansion: item.shellExpansion };
+                    const options = { pathname, binOpts: item.binOpts, shellExpansion: item.shellExpansion, headers: item.headers };
                     let src;
                     if (type === 0) {
                         if (item.filename) {
@@ -3688,7 +3743,7 @@ class FileManager extends core_1.Host {
                     }
                     void this.scheduleTask(src, options, (result) => {
                         if (result.length === 0) {
-                            target.abort((0, types_1.errorValue)("No files were successfully downloaded", uri));
+                            target.abort(errorValue("No files were successfully downloaded", uri));
                         }
                         else if (bundleMain) {
                             const encoding = item.encoding ||= 'utf8';
@@ -3719,7 +3774,7 @@ class FileManager extends core_1.Host {
                                     const file = result[i];
                                     if (index === i || !found && ext === path.extname(file)) {
                                         try {
-                                            if (file !== localUri && !core_1.Host.renameFile(file, localUri)) {
+                                            if (file !== localUri && !Host.renameFile(file, localUri)) {
                                                 this.filesToRemove.add(file);
                                             }
                                             found = true;
@@ -3729,7 +3784,7 @@ class FileManager extends core_1.Host {
                                         }
                                     }
                                     else {
-                                        this.add(file, item, types_1.FILE_TYPE.TORRENT);
+                                        this.add(file, item, FILE_TYPE.TORRENT);
                                     }
                                 }
                             }
@@ -3759,7 +3814,7 @@ class FileManager extends core_1.Host {
                 if (checkDest(uri, localUri)) {
                     fs.copyFile(uri, localUri, err => {
                         if (!err) {
-                            this.addDownload(localUri, types_1.DOWNLOAD_TYPE.DISK);
+                            this.addDownload(localUri, DOWNLOAD_TYPE.DISK);
                         }
                         target.received(err);
                     });
@@ -3802,12 +3857,12 @@ class FileManager extends core_1.Host {
             else if (processTask.updated + 100 > currentTime) {
                 return;
             }
-            const logCurrent = (0, types_1.getLogCurrent)();
+            const logCurrent = getLogCurrent();
             const statusHeight = status.length;
             const barLength = processTask.barLength;
             const barIncrement = 100 / barLength;
             const initial = processTask.logCurrent !== logCurrent;
-            let redraw = false, scrollHeight = 0, logDelayed = core_1.Host.getLogDelayed();
+            let redraw = false, scrollHeight = 0, logDelayed = Host.getLogDelayed();
             if (logDelayed.length > 0) {
                 logDelayed = logDelayed.filter(item => typeof item[4].progressBar !== 'boolean');
                 scrollHeight = Math.min(logDelayed.length, LOGGER.PROGRESS_SCROLLBUFFER);
@@ -3887,7 +3942,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 ? Math.max(1, (0, types_1.convertTime)(process.hrtime.bigint() - 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), formatSize(receivedBytes, { unit, unitSeparator: ' ', fixedDecimals: true, decimalPlaces: unit === 'KB' ? 0 : unit === 'MB' ? 1 : 2 }).padStart(8), getTransferRate(receivedBytes, item.dataTime ? Math.max(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;
@@ -3906,7 +3961,7 @@ class FileManager extends core_1.Host {
                 }
                 output += '\n';
                 if (!LOGGER.PROGRESS_USECOLOR) {
-                    output = (0, node_util_1.stripVTControlCharacters)(output);
+                    output = stripVTControlCharacters(output);
                 }
                 PROCESS_STDOUT.clearLine(0);
                 PROCESS_STDOUT.write(output);
@@ -3964,7 +4019,7 @@ class FileManager extends core_1.Host {
                         item[4] = options;
                     }
                     PROCESS_STDOUT.clearLine(0);
-                    core_1.Host.formatMessage(...item);
+                    Host.formatMessage(...item);
                     output = true;
                 }
                 if (last) {
@@ -3981,7 +4036,7 @@ class FileManager extends core_1.Host {
                     }
                 }
                 else if (output) {
-                    processTask.logCurrent = (0, types_1.getLogCurrent)();
+                    processTask.logCurrent = getLogCurrent();
                 }
             }
             if (cleared) {
@@ -4010,7 +4065,7 @@ class FileManager extends core_1.Host {
             return Promise.resolve(0);
         }
         let id = 0, target;
-        if ((0, types_1.isPlainObject)(data)) {
+        if (isPlainObject(data)) {
             ++scheduler.count;
             if ('pathname' in data || 'binOpts' in data) {
                 target = this.fetchFiles(uri, data);
@@ -4029,9 +4084,9 @@ class FileManager extends core_1.Host {
             }
             else {
                 if (data instanceof URL && data.protocol === 'file:') {
-                    data = (0, node_url_1.fileURLToPath)(data);
+                    data = fileURLToPath(data);
                 }
-                if ((0, types_1.isString)(data) && core_1.Host.isPath(data, true) && this.canRead(data)) {
+                if (isString(data) && Host.isPath(data, true) && this.canRead(data)) {
                     data = fs.createReadStream(data);
                 }
             }
@@ -4082,12 +4137,12 @@ class FileManager extends core_1.Host {
             }
             const files = [[item.localUri, mimeType]];
             if (item.transforms) {
-                files.push(...item.transforms.map(img => [img, core_1.Host.lookupMime(img)]));
+                files.push(...item.transforms.map(img => [img, Host.lookupMime(img)]));
             }
             tasks.push(new Promise(async (resolve) => {
                 for (const [file, type] of files) {
                     const ext = type.split('/')[1].split('+')[0];
-                    const output = item.compress.filter(({ format, condition }) => (!format && type !== image_1.MIME_SVG || format === ext) && (!condition || withinSizeRange(file, condition)));
+                    const output = item.compress.filter(({ format, condition }) => (!format && type !== Image.MIME_SVG || format === ext) && (!condition || withinSizeRange(file, condition)));
                     if (output.length > 0 && this.has(file)) {
                         for (let i = 0, length = output.length, buffer = null; i < length; ++i) {
                             const options = output[i];
@@ -4097,7 +4152,7 @@ class FileManager extends core_1.Host {
                                 .then(result => {
                                 if (result) {
                                     if (file === item.localUri) {
-                                        item.buffer = compress_1.asBuffer(result);
+                                        item.buffer = Compress.asBuffer(result);
                                     }
                                     if (i < length - 1) {
                                         buffer = Buffer.from(result);
@@ -4143,7 +4198,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.finalize.call(this, instance).catch((err) => this.rejectModule(err, 64, { instance }));
         }
     }
     async finalizeChecksum() {
@@ -4154,18 +4209,18 @@ class FileManager extends core_1.Host {
         if (typeof checksum === 'boolean' || checksum === 1) {
             checksum = { recursive: checksum };
         }
-        else if ((0, types_1.isString)(checksum)) {
+        else if (isString(checksum)) {
             const items = checksum.split('.');
             checksum = items.length > 1 ? { algorithm: items.at(-1), filename: checksum } : { algorithm: checksum };
         }
-        if ((0, types_1.isPlainObject)(checksum)) {
+        if (isPlainObject(checksum)) {
             const baseDirectory = this.baseDirectory;
             checksum.joinRoot = true;
             checksum.throwsEmpty = true;
             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 });
+                this.writeTimeElapsed(checksum.algorithm || "sha256", [baseDirectory, files.length + (files.length === 1 ? ' file' : ' files')], sumTime, { ...Host.LOG_STYLE_WARN });
             }
         }
     }
@@ -4187,17 +4242,17 @@ class FileManager extends core_1.Host {
     }
     async finalize() {
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         if (LOG_TIMEELAPSED) {
-            this.writeTimeElapsed('READY', 'Finalizing assets...', this.startTime, { ...core_1.Host.LOG_STYLE_WARN, showCpu: true });
+            this.writeTimeElapsed('READY', 'Finalizing assets...', this.startTime, { ...Host.LOG_STYLE_WARN, showCpu: true });
         }
         const startTime = process.hrtime.bigint();
         for (const [file, output] of this.filesToCompare) {
             const localUri = file.localUri;
-            let minFile = localUri, minSize = (0, util_2.getSize)(minFile);
+            let minFile = localUri, minSize = getSize(minFile);
             for (const other of output) {
-                const size = (0, util_2.getSize)(other);
+                const size = getSize(other);
                 if (minSize === 0 || size > 0 && size < minSize) {
                     this.filesToRemove.add(minFile);
                     minFile = other;
@@ -4214,11 +4269,11 @@ class FileManager extends core_1.Host {
         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);
+            return createAbortError(true);
         }
         await this.finalizeDocument().catch((err) => this.rejectModule(err, 4));
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         for (const item of this.assets) {
             if (item.sourceUTF8 && !ignoreAsset(item)) {
@@ -4233,7 +4288,7 @@ class FileManager extends core_1.Host {
         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);
+            return createAbortError(true);
         }
         for (const item of this.assets) {
             if (item.checksumOutput && !ignoreAsset(item)) {
@@ -4241,14 +4296,14 @@ class FileManager extends core_1.Host {
                 if (!this.filesToRemove.has(localUri) && !this.checkHash(item.checksumOutput, { uri: localUri, output: true })) {
                     item.invalid = true;
                     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 });
+                    this.writeFail(["Checksum did not match", path.basename(localUri)], errorValue(localUri, "Invalid checksum"), { type: 32, startTime, queue: true });
                 }
             }
         }
         this.removeFiles();
         await this.finalizeCloud().catch((err) => this.rejectModule(err, 64));
         if (this.aborted) {
-            return (0, types_1.createAbortError)(true);
+            return createAbortError(true);
         }
         this.removeFiles();
         if (this.Compress) {
@@ -4293,12 +4348,12 @@ class FileManager extends core_1.Host {
         });
         instance.on('dir:remove', value => {
             if (this.removeCwd(value)) {
-                value = matchPathname(value);
+                value = toPathCase(value);
                 if (!value.endsWith(path.sep)) {
                     value += path.sep;
                 }
                 for (const name of this.files) {
-                    if (matchPathname(name).startsWith(value)) {
+                    if (toPathCase(name).startsWith(value)) {
                         this.files.delete(name);
                     }
                 }
@@ -4307,7 +4362,7 @@ class FileManager extends core_1.Host {
     }
     startMessage() {
         if (!this.silent) {
-            this.formatMessage(128, 'START', [new Date().toLocaleString(), formatLength('asset', this.assets.length)], this.baseDirectory, { ...core_1.Host.LOG_STYLE_SUCCESS });
+            this.formatMessage(128, 'START', [new Date().toLocaleString(), formatLength('asset', this.assets.length)], this.baseDirectory, { ...Host.LOG_STYLE_SUCCESS });
         }
     }
     closeMessage(startTime) {
@@ -4319,13 +4374,13 @@ class FileManager extends core_1.Host {
             }
             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));
+                    message.push(`${DOWNLOAD_TYPE[index]} ` + (count > 1 && MEMORY.FILE_COUNT ? count + ' / ' : '') + formatSize(size));
                 }
             });
             if (MEMORY.SIZE > 0) {
-                message.push('BUFFER ' + (MEMORY.CACHE.size > 1 && MEMORY.FILE_COUNT ? MEMORY.CACHE.size + ' / ' : '') + (0, types_1.formatSize)(MEMORY.SIZE));
+                message.push('BUFFER ' + (MEMORY.CACHE.size > 1 && MEMORY.FILE_COUNT ? MEMORY.CACHE.size + ' / ' : '') + 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 });
+            this.writeTimeElapsed('CLOSE', ['No further modifications', message.length > 0 ? message.join(chalk.blackBright(LOGGER.MESSAGE_SEP)) : ''], startTime, { ...Host.LOG_STYLE_WARN });
         }
     }
     diffMessage() {
@@ -4339,9 +4394,9 @@ class FileManager extends core_1.Host {
         };
         let divider = false;
         for (const pathname in diffSource) {
-            if (core_1.Host.isPath(pathname, true)) {
+            if (Host.isPath(pathname, true)) {
                 const [content, encoding] = diffSource[pathname];
-                const hunks = diff.structuredPatch('', '', checkEOF(content), checkEOF(fs.readFileSync(pathname, encoding)), '', '', { context: 0 }).hunks;
+                const hunks = structuredPatch('', '', checkEOF(content), checkEOF(fs.readFileSync(pathname, encoding)), '', '', { context: 0 }).hunks;
                 const lastHunk = hunks.at(-1);
                 if (lastHunk) {
                     const oldMax = lastHunk.oldStart + lastHunk.oldLines;
@@ -4350,7 +4405,7 @@ class FileManager extends core_1.Host {
                     addHeader(pathname, formatLength('hunk', hunks.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);
+                            const line = lines[i].slice(1);
                             output.push(` ${chalk[!line && k === 1 ? 'grey' : added ? 'green' : 'red']((j + l++).toString().padStart(posLength))} ${chalk[added ? 'green' : 'red'](line)}`);
                             if (--k === 0 && !added) {
                                 j = newStart;
@@ -4373,18 +4428,18 @@ class FileManager extends core_1.Host {
                 output.push(chalk.blackBright('-'.repeat(LOGGER.MESSAGE_WIDTH)));
             }
             output.push('');
-            if (this.broadcastId && core_1.Host.hasLogType(2)) {
-                core_1.Host.formatMessage(2, '', '', output.join('\n'), { broadcastId: this.broadcastId, rawOutput: true });
+            if (this.broadcastId && Host.hasLogType(2)) {
+                Host.formatMessage(2, '', '', output.join('\n'), { broadcastId: this.broadcastId, rawOutput: true });
             }
             else {
                 process.stdout.write(output.join('\n'));
-                (0, types_1.setLogCurrent)(null);
+                setLogCurrent(null);
             }
         }
     }
     endMessage(errors) {
         if (LOG_TIMEELAPSED) {
-            this.writeTimeElapsed('END', this.baseDirectory, this.startTime, errors.length > 0 ? { failed: true, ...core_1.Host.LOG_STYLE_FAIL } : { ...core_1.Host.LOG_STYLE_SUCCESS });
+            this.writeTimeElapsed('END', this.baseDirectory, this.startTime, errors.length > 0 ? { failed: true, ...Host.LOG_STYLE_FAIL } : { ...Host.LOG_STYLE_SUCCESS });
         }
     }
     clearStorage() {
@@ -4398,7 +4453,7 @@ class FileManager extends core_1.Host {
         const errors = instance.errors;
         if (errors.length > 0) {
             for (const value of errors) {
-                outLog.push(`[${instance.moduleName}] ` + (core_1.Host.asString(value) || "Unknown"));
+                outLog.push(`[${instance.moduleName}] ` + (Host.asString(value) || "Unknown"));
             }
             errors.length = 0;
         }
@@ -4430,16 +4485,16 @@ class FileManager extends core_1.Host {
         }
     }
     #tryPackage(target, name, type) {
-        if ((0, types_1.isString)(target)) {
+        if (isString(target)) {
             try {
-                target = (0, types_1.requireESM)(target);
+                target = requireESM(target);
             }
             catch (err) {
                 this.checkPackage(err, target, ["Unable to load handler", this.moduleName], type);
                 return null;
             }
         }
-        return core_1.Host.constructorOf(target, name) ? target : null;
+        return Host.constructorOf(target, name) ? target : null;
     }
     #collectErrors() {
         const result = [];
@@ -4576,4 +4631,5 @@ class FileManager extends core_1.Host {
     }
 }
 setLogMinWidth();
+
 module.exports = FileManager;