@e-mc/core 0.11.13 → 0.11.15

package/LICENSE

@@ -1,11 +1,7 @@
 Copyright 2024 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.11.13/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.11.15/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, LogStatus } from "./squared";
@@ -232,13 +232,13 @@ NOTE: **@e-mc/core** is mostly a collection of abstract base classes which canno
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/dom.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.11.13/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/dom.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.11.15/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -68,10 +68,17 @@ function closeHostThread(host) {
             resumeHostQueue(item, true);
         }
     }
-    if (HOST.QUEUE.length > 0 && HOST.DONE.size < HOST.THREAD_LIMIT) {
-        const queue = HOST.QUEUE.shift();
-        addHostThread(queue.instance);
-        resumeHostQueue(queue);
+    const length = HOST.QUEUE.length;
+    if (length > 0 && HOST.DONE.size < HOST.THREAD_LIMIT) {
+        for (let i = 0; i < length; ++i) {
+            const queue = HOST.QUEUE[i];
+            if (queue.joined) {
+                addHostThread(queue.instance);
+                resumeHostQueue(queue);
+                HOST.QUEUE.splice(i, 1);
+                break;
+            }
+        }
         HOST.QUEUE.forEach((item, index) => {
             notifyHostQueue(item.instance, index, item.priority, true);
         });
@@ -145,16 +152,32 @@ function resumeHostQueue(item, aborted) {
                 }
             }
         }
-        HOST.LOG_PROGRESS_QUEUE.delete(instance);
         instance.writeTimeElapsed('JOIN', ['Thread restarting...', HOST.THREAD_LIMIT > 1 ? 'Availability: ' + HOST.DONE.size + ' / ' + HOST.THREAD_LIMIT : ''], startTime, { type: 2, ...module_1.LOG_STYLE_WARN });
     }
-    queueMicrotask(() => {
-        try {
+    HOST.LOG_PROGRESS_QUEUE.delete(instance);
+    if (typeof instance.resumeThread === 'function') {
+        queueMicrotask(() => {
             instance.resumeThread({ args, startTime, aborted });
+        });
+    }
+}
+function killHostThread() {
+    const items = [];
+    const current = Date.now();
+    for (const [host, pid] of HOST.DONE) {
+        if (host.done) {
+            closeHostThread(host);
         }
-        catch {
+        else if (host.startTime + HOST.THREAD_EXPIRES >= current) {
+            host.writeFail(["Transaction was cancelled", host.username], (0, types_1.errorValue)("Timeout was exceeded", (0, types_1.formatTime)(HOST.THREAD_EXPIRES)), { fatal: true });
+            host.abort();
+            closeHostThread(host);
         }
-    });
+        else {
+            items.push([host, pid]);
+        }
+    }
+    return items;
 }
 function encryptUsername(data, iv) {
     return HOST.CIPHER_ALGORITHM && HOST.CIPHER_KEY && (0, types_1.isString)(data) && (0, types_1.encryptUTF8)(HOST.CIPHER_ALGORITHM, HOST.CIPHER_KEY, iv, data) || '';
@@ -269,7 +292,7 @@ function parseIp(value, kind) {
     return '';
 }
 const readable = (value) => (0, types_1.isString)(value) || (0, types_1.isArray)(value);
-const expireTime = (value) => Date.now() + value * 1000;
+const expireTime = (value) => Date.now() + Math.trunc(value * 1000);
 const convertSeconds = (value) => typeof value === 'string' && Math.ceil((0, types_1.parseTime)(value) / 1000) || 0;
 class Host extends module_1 {
     static async purgeMemory(percent = 1, limit = 0, parent) {
@@ -426,21 +449,7 @@ class Host extends module_1 {
         if (HOST.ADMIN_PRIVATE && !username) {
             return full ? { count: -1 } : -1;
         }
-        const current = Date.now();
-        const items = [];
-        for (const [host, pid] of HOST.DONE) {
-            if (host.done) {
-                closeHostThread(host);
-            }
-            else if (host.startTime + HOST.THREAD_EXPIRES >= current) {
-                host.writeFail(["Transaction was cancelled", host.username], (0, types_1.errorValue)("Timeout was exceeded", (0, types_1.formatTime)(HOST.THREAD_EXPIRES)), { fatal: true });
-                host.abort();
-                closeHostThread(host);
-            }
-            else {
-                items.push([host, pid]);
-            }
-        }
+        const items = killHostThread();
         const count = items.length;
         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 };
@@ -525,10 +534,16 @@ class Host extends module_1 {
             this.ignoreLog(typeof log === 'boolean' ? !log : log);
         }
         this[kConfig] = Object.freeze({ ...config });
+        if (HOST.DONE.size >= HOST.THREAD_LIMIT) {
+            killHostThread();
+        }
         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) {
                 this.pauseLog('progress');
+                if (showProgress) {
+                    HOST.LOG_PROGRESS_QUEUE.add(this);
+                }
             }
             else if (showProgress) {
                 HOST.LOG_PROGRESS = this;
@@ -727,10 +742,10 @@ class Host extends module_1 {
                 addHostThread(this);
                 return false;
             }
-            if (Array.isArray(args)) {
-                queue.args = args;
-            }
             if (!queue.joined) {
+                if (Array.isArray(args)) {
+                    queue.args = args;
+                }
                 queue.joined = true;
                 ++HOST.QUEUED;
             }
@@ -874,27 +889,29 @@ class ClientDb extends Client {
         const memory = settings.memory;
         if ((0, types_1.isPlainObject)(memory)) {
             for (const name in memory) {
-                const client = memory[name];
-                if ((0, types_1.isPlainObject)(client)) {
-                    for (const source in client) {
-                        const item = client[source];
-                        if ((0, types_1.isPlainObject)(item) && 'enabled' in item) {
-                            const key = name + '_' + source;
-                            const stored = CACHE_SOURCE[key];
-                            let { enabled, percent = 0, limit = 0, min = 0, max = 0 } = item;
-                            if (enabled && limit > 0) {
-                                if ((0, types_1.isString)(percent)) {
-                                    percent = percent.includes('%') ? parseFloat(percent) / 100 : parseFloat(percent);
+                if (name !== 'settings') {
+                    const client = memory[name];
+                    if ((0, types_1.isPlainObject)(client)) {
+                        for (const source in client) {
+                            const item = client[source];
+                            if ((0, types_1.isPlainObject)(item) && 'enabled' in item) {
+                                const key = name + '_' + source;
+                                const stored = CACHE_SOURCE[key];
+                                let { enabled, percent = 0, limit = 0, min = 0, max = 0 } = item;
+                                if (enabled && limit > 0) {
+                                    if ((0, types_1.isString)(percent)) {
+                                        percent = percent.includes('%') ? parseFloat(percent) / 100 : parseFloat(percent);
+                                    }
+                                    else if ((percent = Math.max(percent, 0)) > 1) {
+                                        percent /= 100;
+                                    }
+                                    if (percent > 0) {
+                                        (stored || (CACHE_SOURCE[key] = { items: [] })).config = { limit: limit > 0 ? limit : 0, percent: Math.min(percent, 1), min: min > 0 ? min : 0, max: max > 0 ? max : Infinity };
+                                    }
                                 }
-                                else if ((percent = Math.max(percent, 0)) > 1) {
-                                    percent /= 100;
+                                else if (stored) {
+                                    delete stored.config;
                                 }
-                                if (percent > 0) {
-                                    (stored || (CACHE_SOURCE[key] = { items: [] })).config = { limit: limit > 0 ? limit : 0, percent: Math.min(percent, 1), min: min > 0 ? min : 0, max: max > 0 ? max : Infinity };
-                                }
-                            }
-                            else if (stored) {
-                                delete stored.config;
                             }
                         }
                     }
@@ -907,7 +924,7 @@ class ClientDb extends Client {
         return parent ? super.purgeMemory(percent, limit, parent) : 0;
     }
     static getTimeout(value) {
-        if (value === undefined) {
+        if (value == null) {
             return 0;
         }
         let result = 0;
@@ -944,11 +961,13 @@ class ClientDb extends Client {
         if (!userKey) {
             return;
         }
-        queryString = (0, types_1.hashKey)(queryString);
-        if (timeout > 0) {
+        if (timeout > 0 && timeout < Infinity) {
             const userCache = CACHE_USER[source]?.[userKey];
-            let stored;
-            if (!(userCache && (stored = userCache[queryString]))) {
+            if (!userCache) {
+                return;
+            }
+            const stored = userCache[queryString = (0, types_1.hashKey)(queryString)];
+            if (!stored) {
                 return;
             }
             const [expires, result] = stored;
@@ -980,38 +999,27 @@ class ClientDb extends Client {
             delete userCache[queryString];
         }
         else if (sessionKey) {
-            return CACHE_SESSION[source]?.[userKey + sessionKey]?.[queryString];
+            return CACHE_SESSION[source]?.[userKey + sessionKey]?.[(0, types_1.hashKey)(queryString)];
         }
     }
-    static storeResult(source, credential, queryString, result, options, sessionKey, sessionExpires) {
+    static storeResult(source, credential, queryString, result, cache, sessionKey, sessionExpires) {
         if (!credential || !Array.isArray(result)) {
             return result;
         }
-        let cache, cacheDir;
+        let cacheDir;
         if ((0, types_1.isObject)(sessionKey)) {
             ({ cacheDir, sessionKey, sessionExpires } = sessionKey);
         }
-        else if ((0, types_1.isObject)(options) && 'cache' in options) {
-            ({ cache, cacheDir, sessionKey, sessionExpires } = options);
+        else if ((0, types_1.isObject)(cache) && 'cache' in cache) {
+            ({ cache, cacheDir, sessionKey, sessionExpires } = cache);
         }
         let timeout = 0, userKey, whenEmpty, partition = false;
-        if (cache) {
-            switch (typeof cache) {
-                case 'number':
-                    timeout = cache;
-                    break;
-                case 'string':
-                    if (typeof sessionKey === 'number') {
-                        sessionExpires = sessionKey;
-                        sessionKey = cache;
-                        break;
-                    }
-                    timeout = convertSeconds(cache);
-                    break;
-                case 'object': {
+        switch (typeof cache) {
+            case 'object':
+                if (cache) {
                     let seconds, dir;
                     ({ timeout: seconds, when_empty: whenEmpty, dir } = cache);
-                    if ((0, types_1.isString)(dir) && (!cacheDir || module_1.isDir(dir))) {
+                    if (dir && (!cacheDir || module_1.isDir(dir))) {
                         cacheDir = dir;
                         partition = true;
                     }
@@ -1019,15 +1027,25 @@ class ClientDb extends Client {
                         timeout = seconds;
                     }
                     else {
-                        cache.timeout = seconds ? convertSeconds(seconds) : 0;
+                        cache.timeout = seconds ? timeout = convertSeconds(seconds) : 0;
                     }
+                }
+                break;
+            case 'number':
+                timeout = cache;
+                break;
+            case 'string':
+                if (typeof sessionKey === 'number') {
+                    sessionExpires = sessionKey;
+                    sessionKey = cache;
                     break;
                 }
-            }
+                timeout = convertSeconds(cache);
+                break;
         }
         if ((result.length > 0 || whenEmpty) && (userKey = this.extractUUID(credential) || (0, types_1.hashKey)(this.asString(credential)))) {
-            queryString = (0, types_1.hashKey)(queryString);
-            if (timeout > 0) {
+            if (timeout > 0 && timeout < Infinity) {
+                queryString = (0, types_1.hashKey)(queryString);
                 const item = [expireTime(timeout), result, Date.now(), 0];
                 ((CACHE_USER[source] ||= {})[userKey] ||= {})[queryString] = item;
                 addSourceResult(source, item);
@@ -1058,7 +1076,7 @@ class ClientDb extends Client {
                     sourceData[dbKey] = data;
                     setTimeout(() => delete sourceData[dbKey], sessionExpires * 1000);
                 }
-                data[queryString] = result;
+                data[(0, types_1.hashKey)(queryString)] = result;
             }
         }
         return result;
@@ -1186,15 +1204,15 @@ class ClientDb extends Client {
                 sessionKey = options;
                 break;
             case 'object':
-                if (options !== null) {
-                    ({ value, sessionKey, renewCache, exclusiveOf } = options);
+                if (options) {
+                    ({ value, sessionKey, exclusiveOf, renewCache } = options);
                     if (Array.isArray(exclusiveOf)) {
                         const ignoreCache = exclusiveOf[2];
                         if (ignoreCache === 1) {
                             return;
                         }
                         renewCache ||= ignoreCache === 0;
-                        queryString += '_' + exclusiveOf.toString();
+                        queryString += '_' + exclusiveOf.slice(0, 2).toString();
                     }
                 }
                 break;
@@ -1207,7 +1225,7 @@ class ClientDb extends Client {
             }
         }
         const result = ClientDb.findResult(this.moduleName + '_' + source, uuidKey || credential, queryString, value === 0 ? 0 : ClientDb.getTimeout(value || this.settingsOf(source, 'cache')), sessionKey, renewCache);
-        if (exclusiveOf && !isInvalidRange(result, exclusiveOf)) {
+        if (exclusiveOf && isInvalidRange(result, exclusiveOf)) {
             return;
         }
         return result;
@@ -1220,30 +1238,37 @@ class ClientDb extends Client {
             return result;
         }
         const uuidKey = ClientDb.extractUUID(credential);
-        let options;
-        if (ClientDb.enabled("memory.settings.users", this.host?.username)) {
-            let value, exclusiveOf;
-            if ((0, types_1.isObject)(sessionKey)) {
-                ({ value, sessionKey, exclusiveOf } = sessionKey);
+        let value, exclusiveOf;
+        if ((0, types_1.isObject)(sessionKey)) {
+            ({ value, sessionKey, exclusiveOf } = sessionKey);
+        }
+        if (Array.isArray(exclusiveOf)) {
+            if (isInvalidRange(result, exclusiveOf)) {
+                return result;
             }
-            if (Array.isArray(exclusiveOf)) {
-                if (isInvalidRange(result, exclusiveOf)) {
-                    return result;
-                }
-                queryString += '_' + exclusiveOf.toString();
+            queryString += '_' + exclusiveOf.slice(0, 2).toString();
+        }
+        if (uuidKey) {
+            const cache = this.settingsKey(uuidKey, 'cache');
+            if (cache !== undefined) {
+                value = cache;
             }
-            if (uuidKey) {
-                const cache = this.settingsKey(uuidKey, 'cache');
-                if (cache !== undefined) {
-                    value = cache;
-                }
+        }
+        const cacheDir = this.cacheDir;
+        value ??= this.settingsOf(source, 'cache');
+        let options;
+        if (ClientDb.enabled("memory.settings.users", this.host?.username)) {
+            if (cacheDir || sessionKey) {
+                options = { cacheDir, sessionKey, sessionExpires: this.cacheExpires / 1000 };
             }
-            options = { cache: value === 0 ? 0 : value || this.settingsOf(source, 'cache'), cacheDir: this.cacheDir, sessionKey, sessionExpires: this.cacheExpires / 1000 };
         }
-        else {
-            options = { cacheDir: this.cacheDir };
+        else if (cacheDir) {
+            options = { cacheDir };
+        }
+        else if (!(0, types_1.isObject)(value) || !(0, types_1.isString)(value.dir)) {
+            return result;
         }
-        return ClientDb.storeResult(this.moduleName + '_' + source, uuidKey || credential, queryString, result, options);
+        return value || options ? ClientDb.storeResult(this.moduleName + '_' + source, uuidKey || credential, queryString, result, options) : result;
     }
     getCacheResult(source, credential, queryString, cacheValue, ignoreCache) {
         if (ignoreCache !== 1) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/core",
-  "version": "0.11.13",
+  "version": "0.11.15",
   "description": "Core modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -17,11 +17,11 @@
     "squared-functions"
   ],
   "author": "An Pham <anpham6@gmail.com>",
-  "license": "BSD-3-Clause",
+  "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.11.13",
-    "@e-mc/types": "0.11.13",
+    "@e-mc/module": "0.11.15",
+    "@e-mc/types": "0.11.15",
     "ipaddr.js": "^2.2.0",
     "picomatch": "^4.0.3"
   }