@e-mc/module 0.13.6 → 0.13.8

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/module
 
-* NodeJS 18.20.5 LTS
+* NodeJS 18.20 LTS
 * ES2022
 
 ## General Usage
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.13.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.13.8/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -228,11 +228,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;
@@ -261,8 +267,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?: {
@@ -306,6 +312,11 @@ interface MemoryModule {
             exclude?: string[];
             expires?: number | string;
         };
+        gc?: {
+            expires?: number | string;
+            expires_limit?: number | string;
+            interval?: number | string;
+        };
     };
 }
 
@@ -422,13 +433,15 @@ interface LoggerModule {
 
 ## References
 
-- 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/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/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.13.8/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
+* https://www.npmjs.com/package/file-type
 
 ## LICENSE
 

package/index.js

@@ -18,8 +18,10 @@ const PROCESS_CWD = process.cwd();
 const PROCESS_STDOUT = process.stdout;
 const PLATFORM_WIN32 = process.platform === 'win32';
 const OS_HOMEDIR = os.homedir();
-const MEM_TOTAL = os.totalmem();
+const MEM_TOTAL = ((0, types_1.supported)(19, 6) || (0, types_1.supported)(18, 15, true)) && process.constrainedMemory() || 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('|');
@@ -411,7 +412,7 @@ function tryRemoveDir(srcDir, empty, recursive) {
     const failed = [];
     const current = Date.now();
     let entry;
-    fs.readdirSync(srcDir, { withFileTypes: true }).forEach(file => {
+    for (const file of fs.readdirSync(srcDir, { withFileTypes: true })) {
         const pathname = path.join(srcDir, file.name);
         try {
             if (file.isDirectory()) {
@@ -431,7 +432,7 @@ function tryRemoveDir(srcDir, empty, recursive) {
         catch {
             failed.push(pathname);
         }
-    });
+    }
     if (!empty && failed.length === 0) {
         fs.rmdirSync(srcDir);
     }
@@ -632,7 +633,7 @@ function isMatch(value, globs) {
 function listDir(src, paths, depth, include, exclude, excludeDir, outFiles) {
     const srcDir = path.join(src, ...paths);
     try {
-        fs.readdirSync(srcDir, { withFileTypes: true }).forEach(file => {
+        for (const file of fs.readdirSync(srcDir, { withFileTypes: true })) {
             if (file.isFile()) {
                 const pathname = path.join(srcDir, file.name);
                 const pathglob = pathname.substring(src.length);
@@ -646,7 +647,7 @@ function listDir(src, paths, depth, include, exclude, excludeDir, outFiles) {
                     listDir(src, subDirs, depth - 1, include, exclude, excludeDir, outFiles);
                 }
             }
-        });
+        }
     }
     catch {
     }
@@ -858,7 +859,7 @@ const isFileURL = (value) => /^file:\/\//i.test(value);
 const sanitizePath = (value) => value && path.resolve(value);
 const stripPath = (value) => path.normalize(value).replace(REGEXP_PATHEND, '');
 const ensureDir = (value) => value.endsWith(path.sep) ? value : value + path.sep;
-const trimDir = (value) => value.endsWith(path.sep) ? value.substring(0, value.length - 1) : value;
+const trimDir = (value) => value.endsWith(path.sep) ? value.slice(0, -1) : value;
 const getExtension = (value) => path.extname(value).toLowerCase().substring(1);
 const getBarColor = (index) => SETTINGS.process.cpu_bar_color[index];
 const hasString = (item, value) => item === value || Array.isArray(item) && item.includes(value);
@@ -878,7 +879,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.13.6";
+        return "0.13.8";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -1484,8 +1485,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) {
@@ -2012,18 +2019,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) {
@@ -2032,9 +2039,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() : process.cpuUsage();
                     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;
             }
@@ -3027,13 +3034,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);
                         }
@@ -3042,7 +3049,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;
                 }
@@ -3563,7 +3570,7 @@ class Module extends EventEmitter {
         return false;
     }
     checkFail(message, options) {
-        switch (options.code || message.code) {
+        switch (options.code || message instanceof Error && message.code) {
             case types_1.ERR_CODE.MODULE_NOT_FOUND:
             case types_1.ERR_CODE.ERR_MODULE_NOT_FOUND:
                 if (options.exec) {
@@ -3865,7 +3872,7 @@ class Module extends EventEmitter {
         }
         return options;
     }
-    #supportsProperty(name) {
+    supportsProperty(name) {
         return !(name in this.#supports) || this.supports(name);
     }
     get moduleName() {
@@ -3897,7 +3904,7 @@ class Module extends EventEmitter {
         return this._host;
     }
     set sessionId(value) {
-        if (this.#supportsProperty('sessionId')) {
+        if (this.supportsProperty('sessionId')) {
             this.#sessionId = value;
         }
     }
@@ -3905,7 +3912,7 @@ class Module extends EventEmitter {
         return this.#sessionId || this.host?.sessionId || '';
     }
     set broadcastId(value) {
-        if (this.#supportsProperty('broadcastId')) {
+        if (this.supportsProperty('broadcastId')) {
             this.#broadcastId = value;
         }
     }
@@ -3913,7 +3920,7 @@ class Module extends EventEmitter {
         return this.#broadcastId || this.host?.broadcastId || '';
     }
     set permission(value) {
-        if (this.#supportsProperty('permission')) {
+        if (this.supportsProperty('permission')) {
             this.#permission = value;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.13.6",
+  "version": "0.13.8",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,7 +19,7 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.13.6",
+    "@e-mc/types": "0.13.8",
     "chalk": "4.1.2",
     "file-type": "^20.5.0",
     "js-yaml": "^4.1.1",