@e-mc/module 0.12.2 → 0.12.4

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.2/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.4/lib/index.d.ts)
 
 ```typescript
 import type { LogStatus } from "./squared";
@@ -224,8 +224,8 @@ interface ModuleConstructor {
     initCpuUsage(instance?: IModule): CpuUsage;
     getCpuUsage(start: CpuUsage, format: true): string;
     getCpuUsage(start: CpuUsage, format?: boolean): number;
-    getMemUsage(format: true): string;
-    getMemUsage(format?: boolean): number;
+    getMemUsage(format: true | "%" | "b" | "gb" | "kb" | "mb" | "pb" | "tb" | "B" | "GB" | "KB" | "MB" | "PB" | "TB", free?: boolean): string;
+    getMemUsage(format?: boolean, free?: boolean): number;
     formatCpuMem(start: CpuUsage, all?: boolean): string;
     getPackageVersion(name: string | [string, string], options?: PackageVersionOptions): string;
     checkSemVer(name: string | [string, string], options: CheckSemVerOptions): boolean;
@@ -414,11 +414,11 @@ interface LoggerModule {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.2/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.2/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.2/lib/module.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.2/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.2/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.4/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.4/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.4/lib/module.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.4/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.4/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -89,7 +89,8 @@ const SETTINGS = {
         cpu_bar_color: ['bgBlue', 'bgYellow', 'bgRed'],
         cpu_single_core: true,
         mem: true,
-        mem_format: '%'
+        mem_format: '%',
+        mem_free: false
     },
     image: true,
     compress: true,
@@ -868,7 +869,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.2";
+        return "0.12.4";
     }
     static get LOG_TYPE() {
         return types_1.LOG_TYPE;
@@ -2031,15 +2032,20 @@ class Module extends EventEmitter {
         }
         return format ? '' : 0;
     }
-    static getMemUsage(format) {
+    static getMemUsage(format, free) {
         if (!VALUES["node.process.memory_usage"]) {
             return format ? '' : 0;
         }
-        const usage = process.memoryUsage();
         let result = 0;
-        for (const name in usage) {
-            if (name !== 'heapUsed') {
-                result += usage[name];
+        if (free) {
+            result = os.freemem();
+        }
+        else {
+            const usage = process.memoryUsage();
+            for (const name in usage) {
+                if (name !== 'heapUsed') {
+                    result += usage[name];
+                }
             }
         }
         if (typeof format === 'string' && format !== '%') {
@@ -2059,9 +2065,9 @@ class Module extends EventEmitter {
         return format ? formatPercent(result / MEM_TOTAL, 3) : result;
     }
     static formatCpuMem(start, all) {
-        let cpu, cpu_bar, cpu_single_core, mem, mem_format;
+        let cpu, cpu_bar, cpu_single_core, mem, mem_format, mem_free;
         if (SETTINGS.process.enabled !== false) {
-            ({ cpu, cpu_bar, cpu_single_core, mem, mem_format } = SETTINGS.process);
+            ({ cpu, cpu_bar, cpu_single_core, mem, mem_format, mem_free } = SETTINGS.process);
         }
         let result = '';
         if (cpu || all) {
@@ -2096,7 +2102,7 @@ class Module extends EventEmitter {
         }
         if (mem || all) {
             const format = mem_format || '%';
-            const usage = this.getMemUsage(format);
+            const usage = this.getMemUsage(format, mem_free);
             if (usage) {
                 result += (result ? ' ' : '') + usage + (format === '%' ? ' MEM' : '');
             }

package/lib-v4.js

@@ -0,0 +1,158 @@
+"use strict";
+exports.validateUUID = exports.renameExt = exports.isString = exports.isPlainObject = exports.isObject = exports.formatSize = exports.escapePattern = exports.toTimeMs = exports.coerceObject = exports.cloneObject = exports.asFunction = void 0;
+exports.hasSize = hasSize;
+exports.getSize = getSize;
+exports.hasSameStat = hasSameStat;
+exports.byteLength = byteLength;
+exports.cleanupStream = cleanupStream;
+exports.generateUUID = generateUUID;
+exports.existsSafe = existsSafe;
+exports.isFileHTTP = isFileHTTP;
+exports.isFileUNC = isFileUNC;
+exports.isPathUNC = isPathUNC;
+exports.readFileSafe = readFileSafe;
+exports.getFunctions = getFunctions;
+exports.allSettled = allSettled;
+const path = require("node:path");
+const fs = require("node:fs");
+const types_1 = require("@e-mc/types");
+Object.defineProperty(exports, "asFunction", { enumerable: true, get: function () { return types_1.asFunction; } });
+Object.defineProperty(exports, "cloneObject", { enumerable: true, get: function () { return types_1.cloneObject; } });
+Object.defineProperty(exports, "coerceObject", { enumerable: true, get: function () { return types_1.coerceObject; } });
+Object.defineProperty(exports, "toTimeMs", { enumerable: true, get: function () { return types_1.convertTime; } });
+Object.defineProperty(exports, "escapePattern", { enumerable: true, get: function () { return types_1.escapePattern; } });
+Object.defineProperty(exports, "formatSize", { enumerable: true, get: function () { return types_1.formatSize; } });
+Object.defineProperty(exports, "isObject", { enumerable: true, get: function () { return types_1.isObject; } });
+Object.defineProperty(exports, "isPlainObject", { enumerable: true, get: function () { return types_1.isPlainObject; } });
+Object.defineProperty(exports, "isString", { enumerable: true, get: function () { return types_1.isString; } });
+Object.defineProperty(exports, "renameExt", { enumerable: true, get: function () { return types_1.renameExt; } });
+Object.defineProperty(exports, "validateUUID", { enumerable: true, get: function () { return types_1.validateUUID; } });
+const index_1 = require("@e-mc/module");
+function hasSize(value, keepEmpty) {
+    try {
+        const statSrc = fs.statSync(value);
+        if (statSrc.size > 0) {
+            return true;
+        }
+        if (!keepEmpty) {
+            fs.unlinkSync(value);
+        }
+    }
+    catch {
+    }
+    return false;
+}
+function getSize(value, diskUsed) {
+    try {
+        return fs[diskUsed ? 'lstatSync' : 'statSync'](value).size;
+    }
+    catch {
+        return 0;
+    }
+}
+function hasSameStat(src, dest, keepEmpty) {
+    try {
+        if (fs.existsSync(dest)) {
+            const { size, mtimeMs } = fs.statSync(src);
+            if (size > 0) {
+                const statDest = fs.statSync(dest);
+                return size === statDest.size && mtimeMs === statDest.mtimeMs;
+            }
+            if (!keepEmpty) {
+                fs.unlinkSync(src);
+            }
+        }
+    }
+    catch {
+    }
+    return false;
+}
+function byteLength(value, encoding) {
+    return typeof value === 'string' && (path.isAbsolute(value) || index_1.isPath(value)) ? getSize(value) : Buffer.byteLength(value, encoding && (0, types_1.getEncoding)(encoding));
+}
+function cleanupStream(stream, uri) {
+    stream.removeAllListeners();
+    stream.destroy();
+    try {
+        if (uri && fs.existsSync(uri)) {
+            fs.unlinkSync(uri);
+        }
+    }
+    catch (err) {
+        if (!index_1.isErrorCode(err, 'ENOENT')) {
+            index_1.writeFail(["Unable to delete file", path.basename(uri)], err, 32);
+        }
+    }
+}
+function generateUUID(format, dictionary) {
+    return format ? (0, types_1.randomString)(format, dictionary) : (0, types_1.generateUUID)();
+}
+function existsSafe(value, isFile) {
+    return index_1.isPath(value, isFile);
+}
+function isFileHTTP(value) {
+    return index_1.isFile(value, 'http/s');
+}
+function isFileUNC(value) {
+    return index_1.isFile(value, 'unc');
+}
+function isPathUNC(value) {
+    return index_1.isPath(value, 'unc');
+}
+async function readFileSafe(value, encoding, cache) {
+    return encoding === 'buffer' ? index_1.readBuffer(value, cache) : index_1.readText(value, encoding, cache);
+}
+function getFunctions(values, absolute, sync = true, outFailed) {
+    let options, context;
+    if ((0, types_1.isObject)(absolute)) {
+        options = absolute;
+        ({ context, outFailed } = absolute);
+        if (options.external === undefined) {
+            options.external = true;
+        }
+    }
+    else {
+        options = { external: true, absolute, sync };
+    }
+    const result = [];
+    for (const value of values) {
+        let method = null;
+        if (typeof value === 'string') {
+            method = index_1.parseFunction(value, options);
+        }
+        else if (typeof value === 'function') {
+            method = value;
+            if (context !== undefined) {
+                method.bind(context);
+            }
+        }
+        if (method) {
+            result.push(method);
+        }
+        else if (outFailed) {
+            outFailed.push(index_1.asString(value) || "Unknown");
+        }
+    }
+    return result;
+}
+async function allSettled(tasks, rejected, options) {
+    if (rejected) {
+        return Promise.allSettled(tasks).then(result => {
+            const items = [];
+            for (const item of result) {
+                if (item.status === 'fulfilled') {
+                    items.push(item);
+                }
+                else if (item.reason) {
+                    index_1.writeFail(rejected, item.reason, options);
+                }
+            }
+            return items;
+        })
+            .catch((err) => {
+            index_1.writeFail(rejected, err, options);
+            return [];
+        });
+    }
+    return Promise.allSettled(tasks);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/module",
-  "version": "0.12.2",
+  "version": "0.12.4",
   "description": "Module base class for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,11 +20,11 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/types": "0.12.2",
+    "@e-mc/types": "0.12.4",
     "chalk": "4.1.2",
     "file-type": "^18.7.0",
     "js-yaml": "^4.1.0",
     "mime-types": "^2.1.35",
-    "picomatch": "^4.0.2"
+    "picomatch": "^4.0.3"
   }
 }