@e-mc/core 0.8.27 → 0.8.29

package/README.md

@@ -9,7 +9,7 @@
 
 ## Interface
 
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/index.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/index.d.ts
 
 ```typescript
 import type { DataSource, LogStatus } from "./squared";
@@ -61,7 +61,7 @@ interface HostConstructor extends ModuleConstructor {
     getThreadCount(full: true): ThreadCountStat;
     getThreadCount(username: string, iv?: BinaryLike): ThreadCountStat;
     getThreadCount(username?: string | boolean, iv?: BinaryLike): number;
-    getPermissionFromSettings(): IPermission;
+    getPermissionFromSettings(freeze?: boolean): IPermission;
     readonly prototype: IHost;
     new(config?: HostInitConfig): IHost;
 }
@@ -165,13 +165,13 @@ interface IPermission {
 
 ## References
 
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/squared.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/core.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/db.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/dom.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/logger.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/node.d.ts
-- https://www.unpkg.com/@e-mc/types@0.8.27/lib/settings.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/squared.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/core.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/db.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/dom.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/logger.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/node.d.ts
+- https://www.unpkg.com/@e-mc/types@0.8.29/lib/settings.d.ts
 
 ## LICENSE
 

package/index.js

@@ -99,6 +99,24 @@ function cancelThread(host, hint, rejected) {
         ++HOST.KILLED;
     }
 }
+function killThread() {
+    const items = [];
+    const current = Date.now();
+    for (const [host, pid] of HOST.DONE) {
+        if (host.done) {
+            closeThread(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();
+            closeThread(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) || '';
 }
@@ -218,7 +236,7 @@ function updateHostQueue(host, position, priority, broadcast) {
 }
 function isInvalidRange(result, range) {
     const [lower, upper = 0] = range;
-    return result.length <= lower || upper > 0 && result.length > upper;
+    return Array.isArray(result) && (result.length <= lower || upper > 0 && result.length > upper);
 }
 function asPosix(value) {
     if (PLATFORM_WIN32) {
@@ -228,7 +246,7 @@ function asPosix(value) {
     return path.normalize(value);
 }
 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.default {
     static async purgeMemory(percent = 1, limit = 0, parent) {
@@ -259,6 +277,7 @@ class Host extends module_1.default {
                 if (permission.unc_write) {
                     PERMISSION.setUNCWrite(unc_write);
                 }
+                Object.freeze(PERMISSION);
             }
             if ((0, types_1.isObject)(perm.settings)) {
                 const { picomatch: pico, minimatch: mini } = perm.settings;
@@ -382,21 +401,7 @@ class Host extends module_1.default {
         if (HOST.ADMIN_PRIVATE && !username) {
             return full === true ? { count: -1 } : -1;
         }
-        const current = Date.now();
-        const items = [];
-        for (const [host, pid] of HOST.DONE) {
-            if (host.done) {
-                closeThread(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();
-                closeThread(host);
-            }
-            else {
-                items.push([host, pid]);
-            }
-        }
+        const items = killThread();
         const count = items.length;
         if (full === true) {
             const result = { count, pending: HOST.QUEUE.length, opened: HOST.DONE.size, closed: HOST.CLOSED, queued: HOST.QUEUED, rejected: HOST.REJECTED, killed: HOST.KILLED };
@@ -430,8 +435,8 @@ class Host extends module_1.default {
         }
         return count;
     }
-    static getPermissionFromSettings() {
-        return PERMISSION;
+    static getPermissionFromSettings(freeze = true) {
+        return freeze ? PERMISSION : Permission.clone(PERMISSION);
     }
     constructor(config = {}) {
         super();
@@ -473,6 +478,9 @@ class Host extends module_1.default {
             }
         }
         this[kConfig] = Object.freeze(config);
+        if (HOST.DONE.size >= HOST.THREAD_LIMIT) {
+            killThread();
+        }
         if (HOST.DONE.size < HOST.THREAD_LIMIT || this.username && typeof priority === 'number' && priority === HOST.PRIORITY_BYPASS) {
             HOST.DONE.set(this, HOST.PID++);
         }
@@ -731,27 +739,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;
                             }
                         }
                     }
@@ -764,7 +774,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;
@@ -802,17 +812,19 @@ class ClientDb extends Client {
         if (!userKey) {
             return;
         }
-        queryString = this.asHash(queryString);
-        if (timeout > 0) {
+        if (timeout > 0 && timeout < Infinity) {
             const userCache = (_j = CACHE_USER[source]) === null || _j === void 0 ? void 0 : _j[userKey];
-            let stored;
-            if (!(userCache && (stored = userCache[queryString]))) {
+            if (!userCache) {
+                return;
+            }
+            const stored = userCache[queryString = this.asHash(queryString)];
+            if (!stored) {
                 return;
             }
             const [expires, result] = stored;
             if (result) {
                 const current = Date.now();
-                let valid;
+                let valid = false;
                 if (renewCache) {
                     stored[0] = expireTime(timeout);
                     valid = true;
@@ -838,36 +850,28 @@ class ClientDb extends Client {
             delete userCache[queryString];
         }
         else if (sessionKey) {
-            return (_l = (_k = CACHE_SESSION[source]) === null || _k === void 0 ? void 0 : _k[userKey + sessionKey]) === null || _l === void 0 ? void 0 : _l[queryString];
+            return (_l = (_k = CACHE_SESSION[source]) === null || _k === void 0 ? void 0 : _k[userKey + sessionKey]) === null || _l === void 0 ? void 0 : _l[this.asHash(queryString)];
         }
     }
-    static storeResult(source, credential, queryString, result, options, sessionKey, sessionExpires) {
-        var _j, _k;
-        let cache, cacheDir;
+    static storeResult(source, credential, queryString, result, cache, sessionKey, sessionExpires) {
+        var _j;
+        if (!credential || !Array.isArray(result)) {
+            return result;
+        }
+        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;
-        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.default.isDir(dir))) {
+                    if (dir && (!cacheDir || module_1.default.isDir(dir))) {
                         cacheDir = dir;
                         partition = true;
                     }
@@ -875,15 +879,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 || whenEmpty) && (userKey = this.extractUUID(credential) || this.asHash(this.asString(credential)))) {
-            queryString = this.asHash(queryString);
-            if (timeout > 0) {
+            if (timeout > 0 && timeout < Infinity) {
+                queryString = this.asHash(queryString);
                 const item = [expireTime(timeout), result, Date.now(), 0];
                 ((_j = (CACHE_USER[source] || (CACHE_USER[source] = {})))[userKey] || (_j[userKey] = {}))[queryString] = item;
                 addSourceResult(source, item);
@@ -907,8 +921,14 @@ class ClientDb extends Client {
             }
             else if (typeof sessionKey === 'string' && sessionExpires && sessionExpires > 0) {
                 const dbKey = userKey + sessionKey;
-                ((_k = (CACHE_SESSION[source] || (CACHE_SESSION[source] = {})))[dbKey] || (_k[dbKey] = {}))[queryString] = result;
-                setTimeout(() => delete CACHE_SESSION[dbKey], sessionExpires * 1000);
+                const sourceData = CACHE_SESSION[source] || (CACHE_SESSION[source] = {});
+                let data = sourceData[dbKey];
+                if (!data) {
+                    data = {};
+                    sourceData[dbKey] = data;
+                    setTimeout(() => delete sourceData[dbKey], sessionExpires * 1000);
+                }
+                data[this.asHash(queryString)] = result;
             }
         }
         return result;
@@ -1049,15 +1069,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 || (renewCache = ignoreCache === 0);
-                        queryString += '_' + exclusiveOf.toString();
+                        queryString += '_' + exclusiveOf.slice(0, 2).toString();
                     }
                 }
                 break;
@@ -1070,9 +1090,10 @@ 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)) {
-            return result;
+        if (exclusiveOf && isInvalidRange(result, exclusiveOf)) {
+            return;
         }
+        return result;
     }
     setQueryResult(source, credential, queryString, result, sessionKey) {
         var _j;
@@ -1083,30 +1104,37 @@ class ClientDb extends Client {
             return result;
         }
         const uuidKey = ClientDb.extractUUID(credential);
-        let options;
-        if (ClientDb.enabled("memory.settings.users", (_j = this.host) === null || _j === void 0 ? void 0 : _j.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 !== null && value !== void 0 ? value : (value = this.settingsOf(source, 'cache'));
+        let options;
+        if (ClientDb.enabled("memory.settings.users", (_j = this.host) === null || _j === void 0 ? void 0 : _j.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, value, options) : result;
     }
     applyState(items, value, as) {
         for (const item of Array.isArray(items) ? items : [items]) {
@@ -1351,3 +1379,4 @@ class Permission {
 exports.Permission = Permission;
 _e = kDiskRead, _f = kDiskWrite, _g = kUncRead, _h = kUncWrite;
 PERMISSION = Host.createPermission(true, true);
+Object.freeze(PERMISSION);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/core",
-  "version": "0.8.27",
+  "version": "0.8.29",
   "description": "Core modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.8.27",
-    "@e-mc/types": "0.8.27",
+    "@e-mc/module": "0.8.29",
+    "@e-mc/types": "0.8.29",
     "picomatch": "^3.0.1"
   }
 }