@e-mc/module 0.12.15 → 0.12.16

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.16/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,13 +422,14 @@ 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.16/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.16/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('|');
@@ -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.16";
     }
     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) {
@@ -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.16",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -19,11 +19,11 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.12.15",
+    "@e-mc/types": "0.12.16",
     "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"
   }
 }