@abtnode/models 1.16.44 → 1.16.45-beta-20250609-082716-b6b0592b

package/lib/models/index.d.ts

@@ -109,3 +109,4 @@ export declare function getConnectModels(): {
 export declare function setupModels(models: any, sequelize: Sequelize): void;
 type TableName = LiteralUnion<'users', string>;
 export declare function existsColumn(context: QueryInterface, tableName: TableName, columnName: string): Promise<boolean>;
+export declare function cleanupSqliteMemory(sequelize: Sequelize, dbPath: string): Promise<void>;

package/lib/models/index.js

@@ -23,6 +23,7 @@ exports.getServerModels = getServerModels;
 exports.getConnectModels = getConnectModels;
 exports.setupModels = setupModels;
 exports.existsColumn = existsColumn;
+exports.cleanupSqliteMemory = cleanupSqliteMemory;
 const sequelize_1 = require("sequelize");
 const message_1 = require("./message");
 const account_1 = require("./account");
@@ -120,7 +121,12 @@ function createSequelize(dbPath, config = {
         sequelize = new sequelize_1.Sequelize('sqlite::memory:', config);
     }
     else {
-        sequelize = new sequelize_1.Sequelize({ dialect: 'sqlite', storage: dbPath, ...config });
+        sequelize = new sequelize_1.Sequelize({
+            dialect: 'sqlite',
+            storage: dbPath,
+            pool: { max: 1, min: 0, idle: 10000, evict: 10000 },
+            ...config,
+        });
         const pragmas = async () => {
             await sequelize.query('pragma journal_mode = WAL;');
             await sequelize.query('pragma synchronous = normal;');
@@ -245,3 +251,30 @@ async function existsColumn(context, tableName, columnName) {
     const columnsDescription = await context.describeTable(tableName);
     return columnName in columnsDescription;
 }
+// 定期清理 SQLite 内存
+async function cleanupSqliteMemory(sequelize, dbPath) {
+    try {
+        // 检查连接状态
+        const [results] = await sequelize.query('SELECT 1');
+        if (!results || results.length === 0) {
+            return;
+        }
+        // 重置内存使用统计
+        await sequelize.query('PRAGMA shrink_memory;');
+    }
+    catch (err) {
+        // 如果是连接错误，说明连接已经断开
+        if (err.name === 'SequelizeConnectionError') {
+            console.warn('SQLite connection is closed, skip cleanup', { dbPath });
+            return;
+        }
+        console.error('Failed to cleanup SQLite memory:', err);
+    }
+}
+// 启动全局清理定时器
+setInterval(async () => {
+    const cleanupPromises = Array.from(instances.entries())
+        .filter(([dbPath]) => !dbPath.endsWith(':memory:'))
+        .map(([dbPath, sequelize]) => cleanupSqliteMemory(sequelize, dbPath));
+    await Promise.all(cleanupPromises);
+}, 60 * 1000 * 4);

package/lib/states/base.d.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'events';
 import { ModelDefined, OrderItem } from 'sequelize';
 import { MakeNullishOptional } from 'sequelize/types/utils';
-import SingleFlightLRUCache from '@abtnode/util/lib/single-flight-lru-cache';
+import { DBCache } from '@abtnode/db-cache';
 import { AnyObject, SelectOptions, SortOptions, UpdateOptions, ConditionOptions, PagingOptions } from '../types';
 export declare class BaseState<T extends object> extends EventEmitter {
     model: ModelDefined<T, T>;
@@ -9,10 +9,11 @@ export declare class BaseState<T extends object> extends EventEmitter {
     config: AnyObject;
     ready: boolean;
     readyCallbacks: Function[];
-    countCaches: SingleFlightLRUCache;
-    enableCountCache: boolean;
+    countCaches: DBCache;
+    enableCountCache: string;
+    cacheGroup: string;
     constructor(model: ModelDefined<T, T>, config?: AnyObject);
-    clearCountCache: () => void;
+    clearCountCache: () => Promise<void>;
     find(condition?: ConditionOptions<T>, selection?: SelectOptions<T>, sort?: SortOptions<T>): Promise<T[]>;
     findOne(condition?: ConditionOptions<T>, selection?: SelectOptions<T>, sort?: SortOptions<T>): Promise<T>;
     count(condition?: ConditionOptions<T>): Promise<number>;

package/lib/states/base.js

@@ -7,17 +7,21 @@ exports.BaseState = void 0;
 const events_1 = require("events");
 const sequelize_1 = require("sequelize");
 const lodash_clonedeep_1 = __importDefault(require("lodash.clonedeep"));
-const single_flight_lru_cache_1 = __importDefault(require("@abtnode/util/lib/single-flight-lru-cache"));
+const db_cache_1 = require("@abtnode/db-cache");
 const util_1 = require("../util");
 // eslint-disable-next-line import/prefer-default-export
 class BaseState extends events_1.EventEmitter {
     constructor(model, config = {}) {
         super();
-        this.clearCountCache = () => {
-            this.countCaches.clear();
+        this.clearCountCache = async () => {
+            await this.countCaches.del(this.enableCountCache);
         };
-        this.countCaches = new single_flight_lru_cache_1.default({ max: 10 * 1000, ttl: 1000 * 60 * 5 });
-        this.enableCountCache = false;
+        this.countCaches = new db_cache_1.DBCache(() => ({
+            ...(0, db_cache_1.getAbtNodeRedisAndSQLiteUrl)(),
+            prefix: 'base-models',
+            ttl: 1000 * 60 * 2,
+        }));
+        this.enableCountCache = '';
         this.model = model;
         this.config = Object.freeze((0, lodash_clonedeep_1.default)(config));
         // Just used to minic ready callbacks of @abtnode/db
@@ -49,19 +53,22 @@ class BaseState extends events_1.EventEmitter {
     }
     count(condition = {}) {
         const params = { ...(0, util_1.formatConditions)(condition) };
+        if (!this.enableCountCache) {
+            return this.model.count(params);
+        }
         const key = this.enableCountCache ? JSON.stringify(params) : '';
-        return this.countCaches.autoCache(key, () => {
+        return this.countCaches.autoCacheGroup(this.enableCountCache, key, () => {
             return this.model.count(params);
         });
     }
     async insert(doc) {
-        this.clearCountCache();
+        await this.clearCountCache();
         const newDoc = await this.model.create(doc, { returning: true });
         await newDoc.save();
         return newDoc.toJSON();
     }
     async insertMany(docs) {
-        this.clearCountCache();
+        await this.clearCountCache();
         const newDocs = await this.model.bulkCreate(docs, { returning: true });
         return newDocs.map((x) => x.toJSON());
     }
@@ -69,7 +76,7 @@ class BaseState extends events_1.EventEmitter {
         if (arguments.length < 2) {
             throw new Error('condition and update param are required to update database record');
         }
-        this.clearCountCache();
+        await this.clearCountCache();
         if (typeof condition === 'string') {
             return this.updateById(condition, updates, options);
         }
@@ -89,7 +96,7 @@ class BaseState extends events_1.EventEmitter {
         return this.update({ id }, updates, options);
     }
     async upsert(condition, updates) {
-        this.clearCountCache();
+        await this.clearCountCache();
         const [instance] = await this.model.upsert(Object.assign({}, condition, updates.$set || updates));
         return instance.toJSON();
     }
@@ -124,8 +131,8 @@ class BaseState extends events_1.EventEmitter {
             },
         };
     }
-    remove(condition) {
-        this.clearCountCache();
+    async remove(condition) {
+        await this.clearCountCache();
         return this.model.destroy((0, util_1.formatConditions)(condition));
     }
     max(field, condition = {}) {
@@ -140,8 +147,8 @@ class BaseState extends events_1.EventEmitter {
     query(query) {
         return this.model.sequelize.query(query, { type: sequelize_1.QueryTypes.SELECT });
     }
-    reset() {
-        this.clearCountCache();
+    async reset() {
+        await this.clearCountCache();
         return this.model.destroy({ truncate: true });
     }
     build(row) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@abtnode/models",
-  "version": "1.16.44",
+  "version": "1.16.45-beta-20250609-082716-b6b0592b",
   "description": "Sequelize models for blocklet server and blocklet service",
   "homepage": "https://github.com/ArcBlock/blocklet-server#readme",
   "publishConfig": {
@@ -33,10 +33,11 @@
     "url": "https://github.com/ArcBlock/blocklet-server/issues"
   },
   "dependencies": {
-    "@abtnode/constant": "1.16.44",
-    "@abtnode/logger": "1.16.44",
-    "@abtnode/types": "1.16.44",
-    "@abtnode/util": "1.16.44",
+    "@abtnode/constant": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/db-cache": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/logger": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/types": "1.16.45-beta-20250609-082716-b6b0592b",
+    "@abtnode/util": "1.16.45-beta-20250609-082716-b6b0592b",
     "lodash.clonedeep": "^4.5.0",
     "lodash.isempty": "^4.4.0",
     "sequelize": "^6.35.0",
@@ -56,5 +57,5 @@
     "typescript": "^5.6.3"
   },
   "resolutions": {},
-  "gitHead": "a177f040e3e8da94311cec1395c8e8defae2da9e"
+  "gitHead": "adeceb28a9b5c91d2eb35d33880782048ae629cc"
 }