@e-mc/core 0.12.13 → 0.12.15

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-* [View Source](https://www.unpkg.com/@e-mc/types@0.12.13/lib/index.d.ts)
+* [View Source](https://www.unpkg.com/@e-mc/types@0.12.15/lib/index.d.ts)
 
 ```typescript
 import type { DataSource, LogStatus, WorkerAction } from "./squared";
@@ -74,6 +74,7 @@ interface HostConstructor extends ModuleConstructor {
     getThreadCount(full: true): ThreadCountStat;
     getThreadCount(username: string, iv?: BinaryLike): ThreadCountStat;
     getThreadCount(username?: string | boolean, iv?: BinaryLike): number;
+    parseIp(value: unknown, kind?: "ipv4" | "ipv6"): string;
     getPermissionFromSettings(freeze?: boolean): IPermission;
     readonly prototype: IHost;
     new(config?: HostInitConfig): IHost;
@@ -132,9 +133,10 @@ interface ClientDbConstructor extends ClientConstructor<IHost, ClientModule> {
     convertTime(value: number | string): number;
     findResult(source: string, credential: unknown, queryString: string, timeout: number, sessionKey?: string | boolean, renewCache?: boolean): QueryResult | undefined;
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, options: StoreResultOptions): QueryResult;
+    /** @deprecated */
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, sessionKey: string, sessionExpires: number): QueryResult;
     storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, cache: DbCacheValue): QueryResult;
-    storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, cache: DbCacheValue | undefined, options: StoreResultOptions): QueryResult;
+    storeResult(source: string, credential: unknown, queryString: string, result: QueryResult, cache: DbCacheValue | undefined, options: Omit<StoreResultOptions, "cache">): QueryResult;
     purgeResult(prefix?: string): Promise<number>;
     extractUUID(credential: unknown): string;
     setPoolConfig(value: unknown): void;
@@ -319,13 +321,13 @@ NOTE: **@e-mc/core** is mostly a collection of abstract base classes which canno
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/dom.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.12.13/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.15/lib/squared.d.ts
+- 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/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.15/lib/dom.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/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.12.15/lib/settings.d.ts
 
 * https://www.npmjs.com/package/@types/node
 

package/index.js

@@ -72,10 +72,17 @@ function closeHostThread(host) {
             resumeHostQueue(item, true);
         }
     }
-    if (HOST.QUEUE.length > 0 && HOST.DONE.size < HOST.THREAD_LIMIT) {
-        const queue = HOST.QUEUE.shift();
-        HOST.DONE.set(queue.instance, HOST.PID++);
-        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) {
+                HOST.DONE.set(queue.instance, HOST.PID++);
+                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 encryptText(data, iv) {
     return HOST.CIPHER && (0, types_1.isString)(data) && (0, types_1.encryptUTF8)(HOST.CIPHER.algorithm, HOST.CIPHER.key, iv, data) || '';
@@ -211,10 +234,6 @@ function incrementSourceCount(source, data, cacheData, queryString) {
         }
     }
 }
-function getSettingsValue(options, name, component) {
-    const result = options[name];
-    return component ? (0, types_1.isObject)(result) ? result[component] : undefined : result;
-}
 function isInvalidRange(result, range) {
     const [lower, upper = 0] = range;
     return Array.isArray(result) && (result.length <= lower || upper > 0 && result.length > upper);
@@ -226,30 +245,8 @@ function asPosix(value) {
     }
     return path.normalize(value);
 }
-function parseIp(value, kind) {
-    if (value) {
-        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 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 [kHost] = true;
@@ -436,21 +433,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 };
@@ -484,6 +467,32 @@ class Host extends module_1 {
         }
         return count;
     }
+    static parseIp(value, kind) {
+        if ((0, types_1.isString)(value)) {
+            try {
+                let ip = ipaddr.parse(value);
+                if (kind) {
+                    if (ip.kind() === 'ipv4') {
+                        if (kind === 'ipv6') {
+                            ip = ip.toIPv4MappedAddress();
+                        }
+                    }
+                    else if (kind === 'ipv4') {
+                        if (ip.isIPv4MappedAddress()) {
+                            ip = ip.toIPv4Address();
+                        }
+                        else {
+                            return '';
+                        }
+                    }
+                }
+                return ip.toNormalizedString();
+            }
+            catch {
+            }
+        }
+        return '';
+    }
     static getLogDelayed() {
         return HOST.LOG_DELAYED;
     }
@@ -537,10 +546,16 @@ class Host extends module_1 {
             this.ignoreLog(typeof log === 'boolean' ? !log : log);
         }
         this.#config = 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;
@@ -740,10 +755,10 @@ class Host extends module_1 {
                 HOST.QUEUE.splice(index, 1);
                 return false;
             }
-            if (Array.isArray(args)) {
-                queue.args = args;
-            }
             if (!queue.joined) {
+                if (Array.isArray(args)) {
+                    queue.args = args;
+                }
                 queue.joined = true;
                 ++HOST.QUEUED;
             }
@@ -762,10 +777,10 @@ class Host extends module_1 {
         return this.#username;
     }
     get ipV4() {
-        return parseIp(this.config.remoteIp, 4);
+        return Host.parseIp(this.config.remoteIp, 'ipv4');
     }
     get ipV6() {
-        return parseIp(this.config.remoteIp, 6);
+        return Host.parseIp(this.config.remoteIp, 'ipv6');
     }
     set done(value) {
         if (value) {
@@ -891,29 +906,31 @@ 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];
-                            const { enabled, limit = 0, min = 0, max = 0 } = item;
-                            if (enabled && +limit > 0) {
-                                let percent = item.percent || 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 (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];
+                                const { enabled, limit = 0, min = 0, max = 0 } = item;
+                                if (enabled && +limit > 0) {
+                                    let percent = item.percent || 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 };
+                                    }
                                 }
-                                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;
                                 }
                             }
-                            else if (stored) {
-                                delete stored.config;
-                            }
                         }
                     }
                 }
@@ -925,7 +942,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;
@@ -962,11 +979,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;
@@ -998,38 +1017,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;
                     }
@@ -1037,15 +1045,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);
@@ -1076,7 +1094,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;
@@ -1154,13 +1172,8 @@ class ClientDb extends Client {
             this.cacheDir = cache_dir;
         }
         if (expires !== undefined) {
-            if (typeof expires === 'string') {
-                if (!isNaN(expires = (0, types_1.parseTime)(expires))) {
-                    this.settings.session_expires = expires;
-                }
-                else {
-                    delete this.settings.cache_session;
-                }
+            if (typeof expires === 'string' && !isNaN(expires = (0, types_1.parseTime)(expires))) {
+                this.settings.session_expires = expires;
             }
             if (expires >= 0) {
                 this.cacheExpires = expires;
@@ -1207,15 +1220,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;
@@ -1228,7 +1241,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;
@@ -1241,30 +1254,37 @@ class ClientDb extends Client {
             return result;
         }
         const uuidKey = ClientDb.extractUUID(credential);
-        let options;
-        if (this.hasPermission('memory')) {
-            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 (this.hasPermission('memory')) {
+            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, value, options) : result;
     }
     getCacheResult(source, credential, queryString, cacheValue, ignoreCache) {
         if (ignoreCache !== 1) {
@@ -1300,13 +1320,22 @@ class ClientDb extends Client {
     settingsOf(source, name, component) {
         const data = this.settings[source];
         if ((0, types_1.isObject)(data)) {
-            return getSettingsValue(data, name, component);
+            return this.#settingsValue(data, name, component);
         }
     }
     settingsKey(uuidKey, name, component) {
         const data = this.settings.user_key?.[uuidKey];
         if ((0, types_1.isObject)(data)) {
-            return getSettingsValue(data, name, component);
+            return this.#settingsValue(data, name, component);
+        }
+    }
+    #settingsValue(options, name, component) {
+        const result = options[name];
+        if (!component) {
+            return result;
+        }
+        if ((0, types_1.isObject)(result)) {
+            return result[component];
         }
     }
     get pending() {

package/package.json

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