@e-mc/core 0.7.1 → 0.8.1

package/index.js

@@ -216,118 +216,122 @@ function updateHostQueue(host, position, priority, broadcast) {
         host.formatMessage(2 /* LOG_TYPE.NODE */, 'QUEUE', ["Thread limit exceeded" /* ERR_MESSAGE.THREAD */ + ` (position #${position + 1})`, host.username], 'Priority: ' + priority, { type: 2 /* LOG_TYPE.NODE */, ...module_1.default.LOG_STYLE_WARN });
     }
 }
+function isInvalidRange(result, range) {
+    const [lower, upper = 0] = range;
+    return result.length <= lower || upper > 0 && result.length > upper;
+}
 function asPosix(value) {
     value = path.normalize(value.trim());
-    return PLATFORM_WIN32 ? value.replace(/\\/g, '/') : value;
+    return PLATFORM_WIN32 ? value.replace(/(?:^\\|\\+)/g, '/') : value;
 }
 const readable = (value) => (0, types_1.isString)(value) || (0, types_1.isArray)(value);
 const expireTime = (value) => Date.now() + value * 1000 /* TIME.S */;
 const convertSeconds = (value) => typeof value === 'string' && Math.ceil((0, types_1.parseTime)(value) / 1000 /* TIME.S */) || 0;
 class Host extends module_1.default {
-    static purgeMemory(percent = 1, limit = 0, parent) {
-        return parent ? super.purgeMemory(percent, limit) : Promise.resolve(0);
+    static async purgeMemory(percent = 1, limit = 0, parent) {
+        return parent ? super.purgeMemory(percent, limit) : 0;
     }
     static loadSettings(settings, permission, password) {
         if (typeof permission === 'string') {
             password = permission;
             permission = undefined;
         }
-        if (super.loadSettings(settings, password)) {
-            const { permission: perm, process: proc } = settings;
-            if (perm) {
-                if (permission && Permission.validate(perm)) {
-                    const { disk_read, disk_write, unc_read, unc_write } = perm;
-                    PERMISSION = new Permission(true);
-                    if (permission.disk_read) {
-                        PERMISSION.setDiskRead(disk_read);
-                    }
-                    if (permission.disk_write) {
-                        PERMISSION.setDiskWrite(disk_write);
-                    }
-                    if (permission.unc_read) {
-                        PERMISSION.setUNCRead(unc_read);
-                    }
-                    if (permission.unc_write) {
-                        PERMISSION.setUNCWrite(unc_write);
-                    }
+        if (!super.loadSettings(settings, password)) {
+            return false;
+        }
+        const { permission: perm, process: proc } = settings;
+        if (perm) {
+            if (permission && Permission.validate(perm)) {
+                const { disk_read, disk_write, unc_read, unc_write } = perm;
+                PERMISSION = new Permission(true);
+                if (permission.disk_read) {
+                    PERMISSION.setDiskRead(disk_read);
                 }
-                if ((0, types_1.isObject)(perm.settings)) {
-                    const { picomatch: pico, minimatch: mini } = perm.settings;
-                    if ((0, types_1.isPlainObject)(pico)) {
-                        PICOMATCH_OPTIONS = { matchBase: true, nocase: PLATFORM_WIN32, ...pico };
+                if (permission.disk_write) {
+                    PERMISSION.setDiskWrite(disk_write);
+                }
+                if (permission.unc_read) {
+                    PERMISSION.setUNCRead(unc_read);
+                }
+                if (permission.unc_write) {
+                    PERMISSION.setUNCWrite(unc_write);
+                }
+            }
+            if ((0, types_1.isObject)(perm.settings)) {
+                const { picomatch: pico, minimatch: mini } = perm.settings;
+                if ((0, types_1.isPlainObject)(pico)) {
+                    PICOMATCH_OPTIONS = { matchBase: true, nocase: PLATFORM_WIN32, ...pico };
+                }
+                if ((0, types_1.isPlainObject)(mini)) {
+                    try {
+                        const pkg = require('minimatch');
+                        MINIMATCH = 'minimatch' in pkg ? pkg.minimatch : pkg;
+                        MINIMATCH_OPTIONS = { matchBase: true, nocase: PLATFORM_WIN32, ...mini };
                     }
-                    if ((0, types_1.isPlainObject)(mini)) {
-                        try {
-                            const pkg = require('minimatch');
-                            MINIMATCH = 'minimatch' in pkg ? pkg.minimatch : pkg;
-                            MINIMATCH_OPTIONS = { matchBase: true, nocase: PLATFORM_WIN32, ...mini };
-                        }
-                        catch {
-                        }
+                    catch {
                     }
                 }
             }
-            if (proc && (0, types_1.isObject)(proc.thread)) {
-                let { limit, expires, queue, admin } = proc.thread;
-                if (limit && (limit = Math.floor(+limit)) > 0) {
-                    HOST.THREAD_LIMIT = limit;
+        }
+        if (proc && (0, types_1.isObject)(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;
+            }
+            if ((0, types_1.isObject)(queue)) {
+                let priority;
+                ({ limit, expires, priority } = queue);
+                if (limit !== undefined && (limit = Math.floor(+limit)) >= -1) {
+                    HOST.QUEUE_LIMIT = limit >= 0 ? limit : Infinity;
                 }
                 if (expires && (expires = (0, types_1.parseTime)(expires)) > 0) {
-                    HOST.THREAD_EXPIRES = expires;
+                    HOST.QUEUE_EXPIRES = expires;
                 }
-                if ((0, types_1.isObject)(queue)) {
-                    let priority;
-                    ({ limit, expires, priority } = queue);
-                    if (limit !== undefined && (limit = Math.floor(+limit)) >= -1) {
-                        HOST.QUEUE_LIMIT = limit >= 0 ? limit : Infinity;
+                if ((0, types_1.isObject)(priority)) {
+                    let { min = -1, max = 0, bypass } = priority;
+                    if ((min = Math.floor(+min)) >= 0) {
+                        HOST.PRIORITY_MIN = min;
                     }
-                    if (expires && (expires = (0, types_1.parseTime)(expires)) > 0) {
-                        HOST.QUEUE_EXPIRES = expires;
+                    if ((max = Math.floor(+max)) > 0) {
+                        HOST.PRIORITY_MAX = max;
                     }
-                    if ((0, types_1.isObject)(priority)) {
-                        let { min = -1, max = 0, bypass } = priority;
-                        if ((min = Math.floor(+min)) >= 0) {
-                            HOST.PRIORITY_MIN = min;
-                        }
-                        if ((max = Math.floor(+max)) > 0) {
-                            HOST.PRIORITY_MAX = max;
-                        }
-                        if (HOST.PRIORITY_MAX < HOST.PRIORITY_MIN) {
-                            HOST.PRIORITY_MAX = HOST.PRIORITY_MIN + 1;
-                        }
-                        if (bypass !== undefined && (bypass = Math.floor(+bypass)) && (bypass < HOST.PRIORITY_MIN || bypass > HOST.PRIORITY_MAX)) {
-                            HOST.PRIORITY_BYPASS = bypass;
-                        }
-                        else {
-                            bypass = HOST.PRIORITY_BYPASS;
-                        }
-                        if (bypass !== undefined && bypass >= HOST.PRIORITY_MIN && bypass <= HOST.PRIORITY_MAX) {
-                            HOST.PRIORITY_BYPASS = undefined;
-                        }
+                    if (HOST.PRIORITY_MAX < HOST.PRIORITY_MIN) {
+                        HOST.PRIORITY_MAX = HOST.PRIORITY_MIN + 1;
+                    }
+                    if (bypass !== undefined && (bypass = Math.floor(+bypass)) && (bypass < HOST.PRIORITY_MIN || bypass > HOST.PRIORITY_MAX)) {
+                        HOST.PRIORITY_BYPASS = bypass;
+                    }
+                    else {
+                        bypass = HOST.PRIORITY_BYPASS;
+                    }
+                    if (bypass !== undefined && bypass >= HOST.PRIORITY_MIN && bypass <= HOST.PRIORITY_MAX) {
+                        HOST.PRIORITY_BYPASS = undefined;
                     }
                 }
-                if (admin) {
-                    const cipher = proc.cipher;
-                    if ((0, types_1.isArray)(admin.users) && (0, types_1.isPlainObject)(cipher) && (HOST.CIPHER_KEY = cipher.key) && (HOST.CIPHER_IV = cipher.iv)) {
-                        const algorithm = cipher.algorithm || 'aes-256-gcm';
-                        HOST.ADMIN_USERS = admin.users.map(value => (0, types_1.encryptUTF8)(algorithm, HOST.CIPHER_KEY, HOST.CIPHER_IV, value)).filter(value => value);
-                        if (HOST.ADMIN_USERS.length) {
-                            HOST.CIPHER_ALGORITHM = algorithm;
-                        }
-                        else {
-                            HOST.CIPHER_ALGORITHM = null;
-                            HOST.CIPHER_KEY = null;
-                            HOST.CIPHER_IV = null;
-                        }
+            }
+            if (admin) {
+                const cipher = proc.cipher;
+                if ((0, types_1.isArray)(admin.users) && (0, types_1.isPlainObject)(cipher) && (HOST.CIPHER_KEY = cipher.key) && (HOST.CIPHER_IV = cipher.iv)) {
+                    const algorithm = cipher.algorithm || 'aes-256-gcm';
+                    HOST.ADMIN_USERS = admin.users.map(value => (0, types_1.encryptUTF8)(algorithm, HOST.CIPHER_KEY, HOST.CIPHER_IV, value)).filter(value => value);
+                    if (HOST.ADMIN_USERS.length) {
+                        HOST.CIPHER_ALGORITHM = algorithm;
                     }
-                    if (typeof admin.private === 'boolean') {
-                        HOST.ADMIN_PRIVATE = admin.private;
+                    else {
+                        HOST.CIPHER_ALGORITHM = null;
+                        HOST.CIPHER_KEY = null;
+                        HOST.CIPHER_IV = null;
                     }
                 }
+                if (typeof admin.private === 'boolean') {
+                    HOST.ADMIN_PRIVATE = admin.private;
+                }
             }
-            return true;
         }
-        return false;
+        return true;
     }
     static createPermission(all, freeze) {
         const permission = new Permission(freeze);
@@ -653,8 +657,8 @@ class Host extends module_1.default {
 exports.Host = Host;
 _a = kDone, _b = kQueued, _c = kUsername;
 class Client extends module_1.default {
-    static purgeMemory(percent = 1, limit = 0, parent) {
-        return parent ? super.purgeMemory(percent, limit) : Promise.resolve(0);
+    static async purgeMemory(percent = 1, limit = 0, parent) {
+        return parent ? super.purgeMemory(percent, limit) : 0;
     }
     constructor(data) {
         super();
@@ -679,6 +683,11 @@ class Client extends module_1.default {
         }
         return this;
     }
+    getUserSettings() {
+        const username = this.host?.username;
+        let result;
+        return username && (0, types_1.isPlainObject)(result = this.settings.users?.[username]) ? result : null;
+    }
     set cacheDir(value) {
         if (path.isAbsolute(value) && module_1.default.isDir(value)) {
             this[kCacheDir] = value;
@@ -711,43 +720,43 @@ class ClientDb extends Client {
     static get TRANSACTION_ABORT() { return 16 /* DB_TRANSACTION.ABORT */; }
     static get TRANSACTION_FAIL() { return 32 /* DB_TRANSACTION.FAIL */; }
     static loadSettings(settings, password) {
-        if (super.loadSettings({ process: settings.process }, password)) {
-            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);
-                                    }
-                                    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 (!super.loadSettings({ process: settings.process }, password)) {
+            return false;
+        }
+        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);
+                                }
+                                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;
+                            }
                         }
                     }
                 }
             }
-            return true;
         }
-        return false;
+        return true;
     }
-    static purgeMemory(percent = 1, limit = 0, parent) {
-        return parent ? super.purgeMemory(percent, limit, parent) : Promise.resolve(0);
+    static async purgeMemory(percent = 1, limit = 0, parent) {
+        return parent ? super.purgeMemory(percent, limit, parent) : 0;
     }
     static getTimeout(value) {
         if (value === undefined) {
@@ -762,7 +771,7 @@ class ClientDb extends Client {
                 result = convertSeconds(value);
                 break;
             case 'object':
-                if (value && typeof (result = value.timeout) === 'string') {
+                if (value !== null && typeof (result = value.timeout) === 'string') {
                     result = convertSeconds(value.timeout);
                     value.timeout = result;
                 }
@@ -898,11 +907,11 @@ class ClientDb extends Client {
         }
         return result;
     }
-    static purgeResult(prefix) {
+    static async purgeResult(prefix) {
         const current = Date.now();
         const providers = new Map();
         if (prefix) {
-            if (prefix.indexOf('_') === -1) {
+            if (!prefix.includes('_')) {
                 prefix += '_';
                 for (const key in CACHE_USER) {
                     if (key.startsWith(prefix)) {
@@ -942,7 +951,7 @@ class ClientDb extends Client {
                 }
             }
         }
-        return Promise.resolve(result);
+        return result;
     }
     static setPoolConfig(value) { }
     static getPoolConfig(source) { }
@@ -1025,7 +1034,7 @@ class ClientDb extends Client {
         return this.settingsOf(source, 'coerce', component) === true || component === 'options' && this.settingsOf(source, 'coerce') === true;
     }
     getQueryResult(source, credential, queryString, options, renewCache) {
-        let sessionKey, value;
+        let sessionKey, value, exclusiveOf;
         switch (typeof options) {
             case 'boolean':
                 renewCache = options;
@@ -1034,8 +1043,16 @@ class ClientDb extends Client {
                 sessionKey = options;
                 break;
             case 'object':
-                if (options) {
-                    ({ value, sessionKey, renewCache } = options);
+                if (options !== null) {
+                    ({ value, sessionKey, renewCache, exclusiveOf } = options);
+                    if (Array.isArray(exclusiveOf)) {
+                        const ignoreCache = exclusiveOf[2];
+                        if (ignoreCache === 1) {
+                            return;
+                        }
+                        renewCache || (renewCache = ignoreCache === 0);
+                        queryString += '_' + exclusiveOf.toString();
+                    }
                 }
                 break;
         }
@@ -1046,7 +1063,10 @@ class ClientDb extends Client {
                 value = cache;
             }
         }
-        return ClientDb.findResult(this.moduleName + '_' + source, uuidKey || credential, queryString, value === 0 ? 0 : ClientDb.getTimeout(value || this.settingsOf(source, 'cache')), sessionKey, renewCache);
+        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;
+        }
     }
     setQueryResult(source, credential, queryString, result, sessionKey) {
         if (!Array.isArray(result)) {
@@ -1058,9 +1078,15 @@ class ClientDb extends Client {
         const uuidKey = ClientDb.extractUUID(credential);
         let options;
         if (ClientDb.enabled("memory.settings.users" /* KEY_NAME.MEMORY_SETTINGS_USERS */, this.host?.username)) {
-            let value;
+            let value, exclusiveOf;
             if ((0, types_1.isObject)(sessionKey)) {
-                ({ value, sessionKey } = sessionKey);
+                ({ value, sessionKey, exclusiveOf } = sessionKey);
+            }
+            if (Array.isArray(exclusiveOf)) {
+                if (isInvalidRange(result, exclusiveOf)) {
+                    return result;
+                }
+                queryString += '_' + exclusiveOf.toString();
             }
             if (uuidKey) {
                 const cache = this.settingsKey(uuidKey, 'cache');
@@ -1153,9 +1179,9 @@ class AbortComponent {
             map.splice(index, 1);
         }
     }
-    abort() {
+    abort(reason) {
         if (!this.aborted) {
-            this[kAbortHandler].abort();
+            this[kAbortHandler].abort(reason);
         }
     }
     reset() {

package/package.json

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