@e-mc/core 0.10.6 → 0.11.1

package/LICENSE

@@ -8,4 +8,4 @@ Redistribution and use in source and binary forms, with or without modification,
 
 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.
+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.

package/README.md

@@ -1,7 +1,7 @@
 # @e-mc/core
 
-* NodeJS 16
-* ES2020
+* NodeJS 16 LTS
+* ES2021
 
 ## General Usage
 
@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.10.6/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.1/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, LogStatus } from "./squared";
@@ -50,6 +50,8 @@ interface IHost extends IModule {
     get host(): null;
     get config(): Readonly<HostInitConfig>;
     get username(): string;
+    get ipV4(): string;
+    get ipV6(): string;
     set done(value);
     get done(): boolean;
     get queued(): boolean;
@@ -93,7 +95,7 @@ interface IClientDb extends IClient<IHost, ClientModule<ClientDbSettings>> {
     cacheExpires: number;
     add(item: DataSource, state?: number): void;
     hasCache(source: string, sessionKey?: string): boolean;
-    hasCoerce(source: string, component: keyof DbCoerceSettings, uuidKey: Undef<string>): boolean;
+    hasCoerce(source: string, component: keyof DbCoerceSettings, uuidKey: string | undefined): boolean;
     hasCoerce(source: string, component: keyof DbCoerceSettings, credential?: unknown): boolean;
     getQueryResult(source: string, credential: unknown, queryString: string, renewCache: boolean): QueryResult | undefined;
     getQueryResult(source: string, credential: unknown, queryString: string, sessionKey?: string, renewCache?: boolean): QueryResult | undefined;
@@ -230,14 +232,14 @@ NOTE: **@e-mc/core** is mostly a collection of abstract base classes which canno
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/dom.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.10.6/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/dom.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.1/lib/settings.d.ts
 
 ## LICENSE
 
-BSD 3-Clause
+BSD 3-Clause

package/index.js

@@ -1,9 +1,10 @@
 "use strict";
 var _a, _b, _c, _d, _e, _f, _g, _h, _j;
 exports.Module = exports.Permission = exports.AbortComponent = exports.ClientDb = exports.Client = exports.Host = void 0;
-const path = require("path");
-const fs = require("fs");
+const path = require("node:path");
+const fs = require("node:fs");
 const pm = require("picomatch");
+const ipaddr = require("ipaddr.js");
 const types_1 = require("@e-mc/types");
 const module_1 = require("@e-mc/module");
 exports.Module = module_1;
@@ -20,7 +21,7 @@ const kUncRead = Symbol('uncRead');
 const kUncWrite = Symbol('uncWrite');
 const CACHE_USER = {};
 const CACHE_SOURCE = {};
-const CACHE_SESSION = {};
+const CACHE_SESSION = Object.create(null);
 const ABORT_LISTENER = new WeakMap();
 const HOST = {
     DONE: new Map(),
@@ -241,6 +242,29 @@ function asPosix(value) {
     value = path.normalize(value.trim());
     return module_1.PLATFORM_WIN32 ? value.replace(/(?:^\\|\\+)/g, '/') : value;
 }
+function parseIp(value, kind) {
+    if (!value) {
+        return '';
+    }
+    try {
+        let ip = ipaddr.parse(value);
+        if (ip.kind() === 'ipv4') {
+            if (kind === 6) {
+                ip = ip.toIPv4MappedAddress();
+            }
+        }
+        else if (kind === 4) {
+            if (!ip.isIPv4MappedAddress()) {
+                return '';
+            }
+            ip = ip.toIPv4Address();
+        }
+        return ip.toNormalizedString();
+    }
+    catch {
+    }
+    return '';
+}
 const readable = (value) => (0, types_1.isString)(value) || (0, types_1.isArray)(value);
 const expireTime = (value) => Date.now() + value * 1000;
 const convertSeconds = (value) => typeof value === 'string' && Math.ceil((0, types_1.parseTime)(value) / 1000) || 0;
@@ -291,16 +315,18 @@ class Host extends module_1 {
             }
         }
         if (proc?.thread) {
-            let { limit, expires, queue, admin } = proc.thread;
-            if (limit && (limit = Math.floor(+limit)) > 0) {
-                HOST.THREAD_LIMIT = limit;
-            }
-            if (expires && (expires = (0, types_1.parseTime)(expires)) > 0) {
-                HOST.THREAD_EXPIRES = expires;
+            const { queue, admin } = proc.thread;
+            {
+                let { limit, expires } = proc.thread;
+                if (limit && (limit = Math.floor(+limit)) > 0) {
+                    HOST.THREAD_LIMIT = limit;
+                }
+                if (expires && (expires = (0, types_1.parseTime)(expires)) > 0) {
+                    HOST.THREAD_EXPIRES = expires;
+                }
             }
             if (queue) {
-                let priority;
-                ({ limit, expires, priority } = queue);
+                let { limit, expires, priority } = queue;
                 if (limit !== undefined && (limit = Math.floor(+limit)) >= -1) {
                     HOST.QUEUE_LIMIT = limit >= 0 ? limit : Infinity;
                 }
@@ -377,7 +403,7 @@ class Host extends module_1 {
         return result;
     }
     static getThreadCount(username, iv) {
-        let full;
+        let full = false;
         switch (typeof username) {
             case 'boolean':
                 full = username;
@@ -394,7 +420,7 @@ class Host extends module_1 {
                 break;
         }
         if (HOST.ADMIN_PRIVATE && !username) {
-            return full === true ? { count: -1 } : -1;
+            return full ? { count: -1 } : -1;
         }
         const current = Date.now();
         const items = [];
@@ -412,7 +438,7 @@ class Host extends module_1 {
             }
         }
         const count = items.length;
-        if (full === true) {
+        if (full) {
             const result = { count, pending: HOST.QUEUE.length, opened: HOST.DONE.size, closed: HOST.CLOSED, queued: HOST.QUEUED, rejected: HOST.REJECTED, killed: HOST.KILLED };
             if (count) {
                 if (count > 1) {
@@ -494,7 +520,7 @@ class Host extends module_1 {
         else if (log !== undefined) {
             this.ignoreLog(typeof log === 'boolean' ? !log : log);
         }
-        this[kConfig] = Object.freeze(config);
+        this[kConfig] = Object.freeze({ ...config });
         if (HOST.DONE.size < HOST.THREAD_LIMIT || this.username && typeof priority === 'number' && priority === HOST.PRIORITY_BYPASS) {
             HOST.DONE.set(this, HOST.PID++);
             if (HOST.LOG_PROGRESS) {
@@ -718,6 +744,12 @@ class Host extends module_1 {
     get username() {
         return HOST_USERNAME.get(this) || '';
     }
+    get ipV4() {
+        return parseIp(this.config.remoteIp, 4);
+    }
+    get ipV6() {
+        return parseIp(this.config.remoteIp, 6);
+    }
     set done(value) {
         if (value) {
             this[kDone] = true;
@@ -918,7 +950,7 @@ class ClientDb extends Client {
             const [expires, result] = stored;
             if (result) {
                 const current = Date.now();
-                let valid;
+                let valid = false;
                 if (renewCache) {
                     stored[0] = expireTime(timeout);
                     valid = true;
@@ -955,7 +987,7 @@ class ClientDb extends Client {
         else if ((0, types_1.isObject)(options) && 'cache' in options) {
             ({ cache, cacheDir, sessionKey, sessionExpires } = options);
         }
-        let timeout = 0, userKey, whenEmpty, partition;
+        let timeout = 0, userKey, whenEmpty, partition = false;
         if (cache) {
             switch (typeof cache) {
                 case 'number':
@@ -1315,7 +1347,7 @@ class Permission {
             if (inherit === false) {
                 parent = null;
             }
-            let valid;
+            let valid = false;
             if (readable(disk_read) && (!parent || parent.diskRead)) {
                 result.setDiskRead(disk_read);
                 valid = true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/core",
-  "version": "0.10.6",
+  "version": "0.11.1",
   "description": "Core modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,9 @@
   "license": "BSD-3-Clause",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.10.6",
-    "@e-mc/types": "0.10.6",
+    "@e-mc/module": "0.11.1",
+    "@e-mc/types": "0.11.1",
+    "ipaddr.js": "^2.2.0",
     "picomatch": "^4.0.2"
   }
 }