@e-mc/module 0.12.15 → 0.12.17

package/LICENSE

@@ -1,11 +1,7 @@
-Copyright 2024 An Pham
+Copyright 2025 An Pham
 
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
 
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
-2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.15/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.17/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -223,11 +223,17 @@ interface ModuleConstructor {
     readBuffer(value: string | URL, cache?: boolean | ReadBufferOptions): Buffer | null;
     resolveMime(data: string | Buffer | Uint8Array | ArrayBuffer): Promise<FileTypeResult | undefined>;
     lookupMime(value: string, extension?: boolean): string;
-    initCpuUsage(instance?: IModule): CpuUsage;
-    getCpuUsage(start: CpuUsage, format: true): string;
-    getCpuUsage(start: CpuUsage, format?: boolean): number;
+    /** @deprecated class */
+    initCpuUsage(instance?: IModule, thread?: boolean): CpuUsage;
+    /** @deprecated private */
+    getCpuUsage(start: CpuUsage, format: true, thread?: boolean): string;
+    /** @deprecated private */
+    getCpuUsage(start: CpuUsage, format?: boolean, thread?: boolean): number;
+    /** @deprecated private */
     getMemUsage(format: true | "%" | "b" | "gb" | "kb" | "mb" | "pb" | "tb" | "B" | "GB" | "KB" | "MB" | "PB" | "TB", free?: boolean): string;
+    /** @deprecated private */
     getMemUsage(format?: boolean, free?: boolean): number;
+    /** @deprecated private */
     formatCpuMem(start: CpuUsage, all?: boolean): string;
     getPackageVersion(name: string | [string, string], options?: PackageVersionOptions): string;
     checkSemVer(name: string | [string, string], options: CheckSemVerOptions): boolean;
@@ -255,8 +261,8 @@ interface ModuleConstructor {
 import type { BackgroundColor, ForegroundColor, LogMessageOptions, LogTypeValue, LoggerProgress, LoggerStatus } from "./logger";
 import type { LoggerProcessSettings } from "./settings";
 
-import type { BinaryLike, CipherGCMTypes } from "crypto";
-import type { SecureVersion } from "tls";
+import type { BinaryLike, CipherGCMTypes } from "node:crypto";
+import type { SecureVersion } from "node:tls";
 
 interface NodeModule {
     process?: {
@@ -416,14 +422,15 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.15/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.17/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.17/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.17/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.17/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.17/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
+* https://www.npmjs.com/package/file-type
 
 ## LICENSE
 
-BSD 3-Clause
+MIT

package/index.js

@@ -20,6 +20,8 @@ const PLATFORM_WIN32 = process.platform === 'win32';
 const OS_HOMEDIR = os.homedir();
 const MEM_TOTAL = os.totalmem();
 const CPU_CORETOTAL = os.cpus().length;
+const SUPPORTED_CPUTHREAD = (0, types_1.supported)(23, 9);
+const SUPPORTED_CANPARSE = (0, types_1.supported)(19, 9) || (0, types_1.supported)(18, 17, true);
 const CACHE_READTEXT = new Map();
 const CACHE_READBUFFER = new Map();
 const CACHE_READCJS = new Map();
@@ -138,7 +140,6 @@ const MEMORY_CACHE_DISK = {
 };
 const PROCESS_CIPHER = {};
 const REGEXP_TORRENT = /^(?:magnet:\?xt=|(?:https?|s?ftp):\/\/[^/][^\n]*?\.(?:torrent|metalink|meta4)(?:\?[^\n]*)?$)/i;
-const REGEXP_PROTOCOL = /^([a-z][a-z\d+-.]*):\/\/[^@:[\]\\^<>|\s]/i;
 const REGEXP_ANSIESCAPE = /[\u001B\u009B]/;
 const REGEXP_PATHEND = new RegExp(`${path.sep}+$`);
 const LOG_DIVIDER = chalk.blackBright('|');
@@ -661,14 +662,14 @@ function withinDir(value, base, override = false) {
     return value.startsWith(base) && (value !== base || override);
 }
 function formatPercent(value, precision) {
-    if (value <= 0) {
+    if (value <= 0.0001) {
         return '0%';
     }
     if (value === (value | 0)) {
         return value + '00%';
     }
     value *= 100;
-    return value.toPrecision(value < 1 ? 2 : precision) + '%';
+    return value.toPrecision(value < 0.001 ? 1 : value < 1 ? 2 : precision) + '%';
 }
 function relayMessage(instance, args) {
     const host = instance.host || instance;
@@ -850,7 +851,7 @@ class Module extends EventEmitter {
     static LOG_STYLE_NOTICE = Object.freeze({ titleBgColor: 'bgGrey', titleColor: 'white' });
     static LOG_STYLE_REVERSE = Object.freeze({ titleBgColor: 'bgWhite', titleColor: 'black', messageBgColor: 'bgGrey' });
     static get VERSION() {
-        return "0.12.15";
+        return "0.12.17";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1258,10 +1259,14 @@ class Module extends EventEmitter {
         }
         this.formatMessage(((type || 1) | 512), "FAIL!", value, message, applyStyle(options, this.LOG_STYLE_FAIL));
     }
-    static parseFunction(value, absolute, sync = true) {
-        let context, requireExt, external;
-        if ((0, types_1.isObject)(absolute)) {
-            ({ context, requireExt, external, absolute, sync = true } = absolute);
+    static parseFunction(value, options, sync = true) {
+        let context, requireExt, absolute, external;
+        if (typeof options === 'boolean') {
+            absolute = options;
+            options = undefined;
+        }
+        else if (options) {
+            ({ context, requireExt, external, absolute, sync = true } = options);
         }
         if (requireExt === undefined || requireExt === true) {
             requireExt = VALUES["node.require.ext"];
@@ -1275,7 +1280,7 @@ class Module extends EventEmitter {
             else if (pathname = absolute && path.isAbsolute(location) ? location : this.fromLocalPath(location)) {
                 if (requireExt && VALUES["node.require.ext"] && hasString(requireExt, getExtension(pathname))) {
                     try {
-                        result = checkFunction(require(pathname));
+                        result = checkFunction(options?.default ? (0, types_1.requireESM)(pathname, options.url) : require(pathname));
                     }
                     catch {
                     }
@@ -1289,7 +1294,7 @@ class Module extends EventEmitter {
             }
             if (external && !pathname && VALUES["node.require.npm"] && /^(?:@[a-z\d-*~][a-z\d-*._~]*\/|node:)?[a-z\d-~][a-z\d-._~]*(?:\/.*)?$/.test(location)) {
                 try {
-                    result = checkFunction(require(location));
+                    result = checkFunction(options?.default ? (0, types_1.requireESM)(location, options.url) : require(location));
                 }
                 catch {
                 }
@@ -1453,8 +1458,14 @@ class Module extends EventEmitter {
         return filename || '';
     }
     static isURL(value, ...exclude) {
-        const match = REGEXP_PROTOCOL.exec(value);
-        return !!match && !exclude.includes(match[1].toLowerCase());
+        let match;
+        if (!SUPPORTED_CANPARSE) {
+            match = /^([a-z][a-z\d+-.]*):\/\/[^@:[\]\\^<>|\s]/i.exec(value);
+        }
+        else if (URL.canParse(value)) {
+            match = /^([a-z][a-z\d+-.]*):\/\//i.exec(value);
+        }
+        return !!match && (exclude.length === 0 || !exclude.includes(match[1].toLowerCase()));
     }
     static isFile(value, type) {
         if (!type) {
@@ -1821,7 +1832,7 @@ class Module extends EventEmitter {
         if (!this.isDir(outDir)) {
             return Promise.reject(errorDirectory(asFile(src) || "Unknown"));
         }
-        const pmOpts = PLATFORM_WIN32 ? { nocase: true, posixSlashes: true, windows: true } : {};
+        const pmOpts = PLATFORM_WIN32 ? { nocase: true, windows: true } : {};
         let exclude, excludeDir, recursive;
         if ((0, types_1.isObject)(options)) {
             if (options.matchBase) {
@@ -1986,18 +1997,18 @@ class Module extends EventEmitter {
     static lookupMime(value, extension) {
         return (extension ? mime.extension(value) : mime.lookup(value)) || '';
     }
-    static initCpuUsage(instance) {
+    static initCpuUsage(instance, thread = true) {
         if (!VALUES["node.process.cpu_usage"]) {
             return { user: 0, system: 0 };
         }
-        const result = process.cpuUsage();
+        const result = thread && SUPPORTED_CPUTHREAD ? process.threadCpuUsage() : process.cpuUsage();
         CACHE_CPU.set(result, getCpuTimes());
         if (instance) {
             CACHE_CPUHOST.set(instance, result);
         }
         return result;
     }
-    static getCpuUsage(start, format) {
+    static getCpuUsage(start, format, thread = true) {
         if (VALUES["node.process.cpu_usage"]) {
             let value = CACHE_CPU.get(start);
             if (value === undefined) {
@@ -2006,9 +2017,9 @@ class Module extends EventEmitter {
             else if ((value = getCpuTimes() - value) >= 0) {
                 let result = 0;
                 if (value > 0) {
-                    const { user, system } = process.cpuUsage(start);
+                    const { user, system } = thread && SUPPORTED_CPUTHREAD ? process.threadCpuUsage(start) : process.cpuUsage(start);
                     const usage = user + system;
-                    result = usage > 0 ? Math.min(usage / value, 1) * (typeof SETTINGS.process === 'object' && SETTINGS.process.cpu_single_core ? 1 : CPU_CORETOTAL) : 0;
+                    result = usage > 0 ? Math.min(usage / value, 1) * (SETTINGS.process?.cpu_single_core ? 1 : CPU_CORETOTAL) : 0;
                 }
                 return format ? formatPercent(result, 3) : result;
             }
@@ -2811,7 +2822,7 @@ class Module extends EventEmitter {
                 }
                 if (!result) {
                     try {
-                        result = require(outSrc);
+                        result = options.default ? (0, types_1.requireESM)(outSrc, options.url) : require(outSrc);
                         setCache(result, true);
                         checkFunction(result);
                     }
@@ -2984,13 +2995,13 @@ class Module extends EventEmitter {
             else {
                 options.outSrc = outSrc;
                 if (promises) {
-                    return fs.promises.copyFile(outSrc, outDest).then(() => {
+                    return fs.promises.copyFile(outSrc, outDest, options.mode).then(() => {
                         this.emit('file:copy', outDest, options);
                         return true;
                     });
                 }
                 if ((0, types_1.isFunction)(callback)) {
-                    fs.copyFile(outSrc, outDest, err => {
+                    fs.copyFile(outSrc, outDest, options.mode || 0, err => {
                         if (!err) {
                             this.emit('file:copy', outDest, options);
                         }
@@ -2999,7 +3010,7 @@ class Module extends EventEmitter {
                     return;
                 }
                 try {
-                    fs.copyFileSync(outSrc, outDest);
+                    fs.copyFileSync(outSrc, outDest, options.mode);
                     this.emit('file:copy', outDest, options);
                     return true;
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.12.15",
+  "version": "0.12.17",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -16,14 +16,14 @@
     "squared"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.12.15",
+    "@e-mc/types": "0.12.17",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.1",
     "mime-types": "^2.1.35",
-    "picomatch": "^4.0.3"
+    "picomatch": "^4.0.4"
   }
 }