@e-mc/core 0.5.4 → 0.6.1

package/LICENSE

@@ -1,4 +1,4 @@
-Copyright 2023 Mile Square Park
+Copyright 2023 Studio Trigger
 
 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:
 

package/README.md

@@ -1,6 +1,6 @@
 # @e-mc/core
 
-PEP 402 - Forever
+PEP 402 - Forever Ryuko
 
 ## LICENSE
 

package/index.js

@@ -272,7 +272,8 @@ class Host extends module_1.default {
                     }
                     if ((0, types_1.isPlainObject)(mini)) {
                         try {
-                            MINIMATCH = require('minimatch');
+                            const pkg = require('minimatch');
+                            MINIMATCH = 'minimatch' in pkg ? pkg.minimatch : pkg;
                             MINIMATCH_OPTIONS = { matchBase: true, nocase: PLATFORM_WIN32, ...mini };
                         }
                         catch {
@@ -796,44 +797,46 @@ class ClientDb extends Client {
     }
     static findResult(source, credential, queryString, timeout, sessionKey, renewCache) {
         const userKey = this.extractUUID(credential) || this.asHash(this.asString(credential));
-        if (userKey) {
-            queryString = this.asHash(queryString);
-            if (timeout > 0) {
-                const userCache = CACHE_USER[source]?.[userKey];
-                let stored;
-                if (userCache && (stored = userCache[queryString])) {
-                    const [expires, result] = stored;
-                    if (result) {
-                        const current = Date.now();
-                        let valid;
-                        if (renewCache) {
-                            stored[0] = expireTime(timeout);
-                            valid = true;
-                        }
-                        else if (current < expires) {
-                            valid = true;
-                        }
-                        if (valid) {
-                            stored[2] = current;
-                            incrementSourceCount(source, stored, userCache, queryString);
-                            if (Array.isArray(result)) {
-                                return result;
-                            }
-                            try {
-                                return JSON.parse(fs.readFileSync(result, 'utf-8'));
-                            }
-                            catch {
-                            }
-                        }
-                        clearSourceResult(stored);
+        if (!userKey) {
+            return;
+        }
+        queryString = this.asHash(queryString);
+        if (timeout > 0) {
+            const userCache = CACHE_USER[source]?.[userKey];
+            let stored;
+            if (!(userCache && (stored = userCache[queryString]))) {
+                return;
+            }
+            const [expires, result] = stored;
+            if (result) {
+                const current = Date.now();
+                let valid;
+                if (renewCache) {
+                    stored[0] = expireTime(timeout);
+                    valid = true;
+                }
+                else if (current < expires) {
+                    valid = true;
+                }
+                if (valid) {
+                    stored[2] = current;
+                    incrementSourceCount(source, stored, userCache, queryString);
+                    if (Array.isArray(result)) {
+                        return result;
+                    }
+                    try {
+                        return JSON.parse(fs.readFileSync(result, 'utf-8'));
+                    }
+                    catch {
                     }
-                    deleteSourceResult(source, stored);
-                    delete userCache[queryString];
                 }
+                clearSourceResult(stored);
             }
-            else if (sessionKey) {
-                return CACHE_SESSION[source]?.[userKey + sessionKey]?.[queryString];
-            }
+            deleteSourceResult(source, stored);
+            delete userCache[queryString];
+        }
+        else if (sessionKey) {
+            return CACHE_SESSION[source]?.[userKey + sessionKey]?.[queryString];
         }
     }
     static storeResult(source, credential, queryString, result, options, sessionKey, sessionExpires) {
@@ -884,7 +887,10 @@ class ClientDb extends Client {
                 addSourceResult(source, item);
                 if (cacheDir) {
                     if (partition) {
-                        const subDir = path.join(cacheDir, (STORE_RESULT_COUNT++ % this.STORE_RESULT_PARTITION_SIZE).toString(), queryString.substring(0, this.STORE_RESULT_PARTITION_MULT));
+                        if (STORE_RESULT_COUNT === this.STORE_RESULT_PARTITION_SIZE) {
+                            STORE_RESULT_COUNT = 0;
+                        }
+                        const subDir = path.join(cacheDir, (STORE_RESULT_COUNT++).toString(), queryString.substring(0, this.STORE_RESULT_PARTITION_MULT));
                         if (this.createDir(subDir)) {
                             cacheDir = subDir;
                         }
@@ -1133,9 +1139,9 @@ class ClientDb extends Client {
         return this.database.filter(item => (item.transactionState & 32) === 32);
     }
 }
+exports.ClientDb = ClientDb;
 ClientDb.STORE_RESULT_PARTITION_SIZE = 16;
 ClientDb.STORE_RESULT_PARTITION_MULT = 2;
-exports.ClientDb = ClientDb;
 class AbortComponent {
     constructor() {
         this[_d] = new AbortController();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@e-mc/core",
-  "version": "0.5.4",
+  "version": "0.6.1",
   "description": "Core modules for E-mc.",
   "main": "index.js",
   "types": "index.d.ts",
@@ -9,7 +9,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/anpham6/e-mc.git",
+    "url": "https://github.com/anpham6/e-mc.git",
     "directory": "src/core"
   },
   "keywords": [
@@ -20,8 +20,8 @@
   "license": "MIT",
   "homepage": "https://github.com/anpham6/e-mc#readme",
   "dependencies": {
-    "@e-mc/module": "0.5.4",
-    "@e-mc/types": "0.5.4",
+    "@e-mc/module": "0.6.1",
+    "@e-mc/types": "0.6.1",
     "picomatch": "^2.3.1"
   }
 }