@e-mc/file-manager 0.13.4 → 0.13.6

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.4/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.6/lib/index.d.ts)
 
 ```typescript
 import type { ChecksumValue, DataSource, IncrementalMatch, TaskAction } from "./squared";
@@ -175,6 +175,7 @@ interface FileManagerConstructor extends HostConstructor {
     setTimeout(options: Record<string, number | string>): void;
     defineHttpCache(options: HttpMemorySettings, disk?: boolean): void;
     defineHttpConnect(options: HttpConnectSettings): void;
+    generateSessionId(): string;
     readonly prototype: IFileManager;
     new(baseDirectory: string, config: RequestData, postFinalize?: PostFinalizeCallback): IFileManager;
     new(baseDirectory: string, config: RequestData, permission?: IPermission | null, postFinalize?: PostFinalizeCallback): IFileManager;
@@ -296,15 +297,15 @@ NOTE: **FileManager** is a sub-class of [Host](https://www.npmjs.com/package/@e-
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/asset.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/filemanager.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/request.d.ts
-- https://www.unpkg.com/@e-mc/types@0.13.4/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/asset.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/filemanager.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/request.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.6/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -70,7 +70,7 @@ let SESSION_ID = 0;
 let SESSION_LIMIT = 1000;
 let ASSET_ID = 0;
 let RETRY_LIMIT = 10;
-let PROCESS_SUB_LIMIT = Math.max(require('node:os').cpus().length, 1) * 2;
+let PROCESS_SUB_LIMIT = core_1.Host.availableParallelism(2);
 let LOG_TIMEELAPSED = true;
 let LOG_TIMEPROCESS = true;
 const HTTP_CLIENT = {
@@ -109,14 +109,6 @@ function withinSizeRange(uri, value, pattern) {
     }
     return true;
 }
-function unsetContent(item) {
-    if ('buffer' in item) {
-        item.buffer = null;
-    }
-    if ('sourceUTF8' in item) {
-        item.sourceUTF8 = undefined;
-    }
-}
 function bundleTorrent(host, files, mimeType, encoding) {
     let output = '';
     for (const file of files) {
@@ -238,40 +230,6 @@ function formatMinutes(elapsed) {
     }
     return (0, types_1.formatTime)(elapsed, ':');
 }
-function setHttpCacheLimit(value, type, disk) {
-    if (value === undefined) {
-        return;
-    }
-    if (typeof value === 'string') {
-        value = (0, types_1.formatSize)(value);
-    }
-    if (value >= 0) {
-        switch (type) {
-            case 1:
-                (disk ? DISK : MEMORY).LIMIT = value;
-                break;
-            case 2:
-                MEMORY.LIMIT_ALL = value;
-                break;
-            case 3:
-                MEMORY.DISK_MIN = value;
-                break;
-            case 4:
-                MEMORY.DISK_MAX = value;
-                break;
-        }
-    }
-    else if (value === -1) {
-        switch (type) {
-            case 3:
-                MEMORY.DISK_MIN = Infinity;
-                break;
-            case 4:
-                MEMORY.DISK_MAX = 0;
-                break;
-        }
-    }
-}
 function clearQueue(data, attr) {
     if (attr && data[attr]) {
         for (const item of data[attr]) {
@@ -323,7 +281,7 @@ function processHeaders(item, headers, lastModified, mainEtag) {
         return item.lastModified = headers['last-modified'];
     }
 }
-function setBufferTarget(item, buffer) {
+function setContent(item, buffer) {
     if (typeof buffer === 'string') {
         item.sourceUTF8 = buffer;
     }
@@ -331,6 +289,14 @@ function setBufferTarget(item, buffer) {
         item.buffer = buffer;
     }
 }
+function unsetContent(item) {
+    if ('buffer' in item) {
+        item.buffer = null;
+    }
+    if ('sourceUTF8' in item) {
+        item.sourceUTF8 = undefined;
+    }
+}
 async function doVerifyChecksum(root, from, options, nested) {
     const { digestEncoding = options.digest, sortBy = 0, recursive = false, ignore = [], ignoreRoot = [], verbose = true, joinRoot } = options;
     const parent = recursive === 1 && typeof verbose !== 'number';
@@ -472,6 +438,40 @@ function formatSegment(endTime, ...values) {
     }
     return values;
 }
+function setHttpCache(value, type, disk) {
+    if (value === undefined) {
+        return;
+    }
+    if (typeof value === 'string') {
+        value = (0, types_1.formatSize)(value);
+    }
+    if (value >= 0) {
+        switch (type) {
+            case 1:
+                (disk ? DISK : MEMORY).LIMIT = value;
+                break;
+            case 2:
+                MEMORY.LIMIT_ALL = value;
+                break;
+            case 3:
+                MEMORY.DISK_MIN = value;
+                break;
+            case 4:
+                MEMORY.DISK_MAX = value;
+                break;
+        }
+    }
+    else if (value === -1) {
+        switch (type) {
+            case 3:
+                MEMORY.DISK_MIN = Infinity;
+                break;
+            case 4:
+                MEMORY.DISK_MAX = 0;
+                break;
+        }
+    }
+}
 function setLogMinWidth() {
     LOGGER.MIN_WIDTH = LOGGER.TITLE_WIDTH + 2 + LOGGER.VALUE_WIDTH + 1;
     LOGGER.MESSAGE_WIDTH = LOGGER.MIN_WIDTH + LOGGER.MESSAGE_SEP_START;
@@ -488,7 +488,7 @@ const matchPathname = (value) => core_1.Host.PLATFORM_WIN32 ? value.toLowerCase(
 const mapPosix = (values) => core_1.Host.PLATFORM_WIN32 ? values.map(value => core_1.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) => /\n$/.test(value) ? value : value + '\n';
+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 validateChecksum = (host, item, buffer, localUri = item.localUri) => !item.checksum || host.checkHash(item.checksum, buffer, localUri);
@@ -1403,7 +1403,7 @@ class FileManager extends core_1.Host {
         const [L, R] = message.braces;
         const Lch = L.trim();
         const Rch = R.trim();
-        LOGGER.MESSAGE_SEP = Lch.length + Rch.length === 1 ? ` ${Rch + Lch} ` : (R ? R[0] === ' ' ? R : ' ' + R.trimEnd() : '') + (L ? L[L.length - 1] === ' ' ? L : L.trimStart() + ' ' : '');
+        LOGGER.MESSAGE_SEP = Lch.length + Rch.length === 1 ? ` ${Rch + Lch} ` : (R ? R[0] === ' ' ? R : ' ' + R.trimEnd() : '') + (L ? L.at(-1) === ' ' ? L : L.trimStart() + ' ' : '');
         LOGGER.MESSAGE_SEP_START = Lch.trimEnd().length;
         LOG_TIMEELAPSED = this.hasLogType(128);
         LOG_TIMEPROCESS = this.hasLogType(256);
@@ -1521,18 +1521,18 @@ class FileManager extends core_1.Host {
         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) : [];
-        setHttpCacheLimit(limit, 1, disk);
+        setHttpCache(limit, 1, disk);
         if (disk) {
             return;
         }
-        setHttpCacheLimit(limit_all, 2, disk);
+        setHttpCache(limit_all, 2, disk);
         if (to_disk) {
             let limit_disk;
             if (Array.isArray(to_disk)) {
                 [to_disk, limit_disk] = to_disk;
             }
-            setHttpCacheLimit(to_disk, 3, disk);
-            setHttpCacheLimit(limit_disk, 4, disk);
+            setHttpCache(to_disk, 3, disk);
+            setHttpCache(limit_disk, 4, disk);
         }
         if ((purge_amount = (0, util_2.asFloat)(purge_amount)) > 0) {
             MEMORY.PURGE = Math.min(purge_amount, 1);
@@ -1555,6 +1555,9 @@ class FileManager extends core_1.Host {
             HTTP_CLIENT.redirectLimit = redirect_limit;
         }
     }
+    static generateSessionId() {
+        return (++SESSION_ID === SESSION_LIMIT ? SESSION_ID = 1 : SESSION_ID).toString();
+    }
     processTimeout = PROCESS_TIMEOUT.filemanager;
     Request;
     Document = [];
@@ -1604,15 +1607,15 @@ class FileManager extends core_1.Host {
         if (LOG_TIMEPROCESS) {
             core_1.Host.initCpuUsage(this);
         }
-        const index = baseDirectory.length - 1;
-        this.#baseDirectory = path.normalize(baseDirectory[index] === path.sep ? baseDirectory.substring(0, index) : baseDirectory);
+        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.sessionId = (++SESSION_ID === SESSION_LIMIT ? SESSION_ID = 1 : SESSION_ID).toString();
+        this.sessionId = FileManager.generateSessionId();
+        this.supports('permission', false, true);
+        this.supports('sessionId', false, true);
         const assets = config.assets || [];
         const targeted = [];
         for (let i = 0, length = assets.length; i < length; ++i) {
             const item = assets[i];
-            let encoding = item.encoding;
             if (item.document) {
                 this.documentAssets.push(item);
             }
@@ -1622,20 +1625,20 @@ class FileManager extends core_1.Host {
             if ((0, types_1.usingFlag)(item)) {
                 targeted.push(item);
             }
-            item.id ||= ++ASSET_ID;
-            if (encoding) {
-                switch (encoding) {
-                    case 'utf8':
-                        break;
-                    case 'utf-8':
-                        item.encoding = 'utf8';
-                        break;
-                    default:
-                        encoding = (0, types_1.getEncoding)(encoding);
-                        item.encoding = encoding === 'utf8' ? undefined : encoding;
-                        break;
+            switch (item.encoding) {
+                case undefined:
+                case 'utf8':
+                    break;
+                case 'utf-8':
+                    item.encoding = 'utf8';
+                    break;
+                default: {
+                    const encoding = (0, types_1.getEncoding)(item.encoding);
+                    item.encoding = encoding === 'utf8' ? undefined : encoding;
+                    break;
                 }
             }
+            item.id ||= ++ASSET_ID;
         }
         this._assets = assets.slice(0);
         this.#incremental = config.incremental === "staging" ? "staging" : "none";
@@ -2714,11 +2717,11 @@ class FileManager extends core_1.Host {
         return mimeType;
     }
     async compressFile(file, overwrite = true) {
-        const { localUri, compress } = file;
-        const instance = this.Compress;
-        if (instance && compress && localUri && (this.has(localUri) || (0, types_1.existsFlag)(file))) {
+        const compress = this.Compress;
+        const localUri = file.localUri;
+        if (compress && localUri && (this.has(localUri) || (0, types_1.existsFlag)(file)) && file.compress) {
             const tasks = [];
-            for (const options of compress) {
+            for (const options of file.compress) {
                 const { format, condition } = options;
                 let output;
                 switch (format) {
@@ -2734,7 +2737,7 @@ class FileManager extends core_1.Host {
                         options.etag = file.etag;
                         break;
                     default:
-                        if (format && typeof instance.compressors[format] === 'function') {
+                        if (format && typeof compress.compressors[format] === 'function') {
                             output = (0, types_1.renameExt)(localUri, format);
                         }
                         break;
@@ -2743,7 +2746,7 @@ class FileManager extends core_1.Host {
                     try {
                         if (overwrite || !fs.existsSync(output) || !(0, types_1.existsFlag)(file) && fs.statSync(output).mtimeMs < this.startTime) {
                             options.timeout = this.#getModuleTimeout('compress');
-                            tasks.push(instance.tryFile(file.buffer || localUri, output, options).then(() => {
+                            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)) {
@@ -3586,7 +3589,7 @@ class FileManager extends core_1.Host {
                                                                     }
                                                                 }
                                                                 if (item.willChange && buffer) {
-                                                                    setBufferTarget(item, buffer);
+                                                                    setContent(item, buffer);
                                                                 }
                                                                 target.received(null, incremental, true, false, true);
                                                             }
@@ -3597,7 +3600,7 @@ class FileManager extends core_1.Host {
                                                             return;
                                                         }
                                                         if (buffer) {
-                                                            setBufferTarget(item, buffer);
+                                                            setContent(item, buffer);
                                                             fs.writeFileSync(localUri, buffer);
                                                             this.addDownload(Buffer.byteLength(buffer, encoding), types_1.DOWNLOAD_TYPE.CACHE);
                                                             if (checkEtag) {
@@ -4072,7 +4075,7 @@ class FileManager extends core_1.Host {
     }
     async finalizeCompress(assets) {
         const compress = this.Compress;
-        if (!(assets.length > 0 && compress)) {
+        if (!compress || assets.length === 0) {
             return;
         }
         const tasks = [];
@@ -4343,28 +4346,26 @@ class FileManager extends core_1.Host {
             if (core_1.Host.isPath(pathname, true)) {
                 const [content, encoding] = diffSource[pathname];
                 const hunks = diff.structuredPatch('', '', checkEOF(content), checkEOF(fs.readFileSync(pathname, encoding)), '', '', { context: 0 }).hunks;
-                const length = hunks.length;
-                if (length === 0) {
-                    continue;
-                }
-                const lastHunk = hunks[length - 1];
-                const oldMax = lastHunk.oldStart + lastHunk.oldLines;
-                const newMax = lastHunk.newStart + lastHunk.newLines;
-                const posLength = Math.max(Math.max(oldMax, newMax).toString().length, Math.min(oldMax, newMax).toString().length);
-                addHeader(pathname, formatLength('hunk', length));
-                for (const { lines, oldLines, oldStart, newStart, newLines } of hunks) {
-                    for (let i = 0, j = oldStart, k = oldLines, l = 0, q = lines.length, added = false; i < q && k > 0; ++i) {
-                        const line = lines[i].substring(1);
-                        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;
-                            k = newLines;
-                            l = 0;
-                            added = true;
+                const lastHunk = hunks.at(-1);
+                if (lastHunk) {
+                    const oldMax = lastHunk.oldStart + lastHunk.oldLines;
+                    const newMax = lastHunk.newStart + lastHunk.newLines;
+                    const posLength = Math.max(Math.max(oldMax, newMax).toString().length, Math.min(oldMax, newMax).toString().length);
+                    addHeader(pathname, 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);
+                            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;
+                                k = newLines;
+                                l = 0;
+                                added = true;
+                            }
                         }
                     }
+                    divider = true;
                 }
-                divider = true;
             }
             else {
                 addHeader(pathname, 'deleted');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/file-manager",
-  "version": "0.13.4",
+  "version": "0.13.6",
   "description": "FileManager constructor for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,15 +19,15 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/cloud": "0.13.4",
-    "@e-mc/compress": "0.13.4",
-    "@e-mc/core": "0.13.4",
-    "@e-mc/document": "0.13.4",
-    "@e-mc/image": "0.13.4",
-    "@e-mc/request": "0.13.4",
-    "@e-mc/task": "0.13.4",
-    "@e-mc/types": "0.13.4",
-    "@e-mc/watch": "0.13.4",
+    "@e-mc/cloud": "0.13.6",
+    "@e-mc/compress": "0.13.6",
+    "@e-mc/core": "0.13.6",
+    "@e-mc/document": "0.13.6",
+    "@e-mc/image": "0.13.6",
+    "@e-mc/request": "0.13.6",
+    "@e-mc/task": "0.13.6",
+    "@e-mc/types": "0.13.6",
+    "@e-mc/watch": "0.13.6",
     "chalk": "4.1.2",
     "diff": "^8.0.2",
     "picomatch": "^4.0.3"