baja-lite 1.0.23 → 1.0.25

package/cjs/boot-remote.d.ts

@@ -1,3 +1,2 @@
 import { GlobalSqlOptionForWeb } from './sql';
 export declare const BootRomote: (options: GlobalSqlOptionForWeb) => Promise<void>;
-export declare const AppendRomote: (dbName: string) => Promise<void>;

package/cjs/boot-remote.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AppendRomote = exports.BootRomote = void 0;
+exports.BootRomote = void 0;
 const enum_1 = require("./enum");
 const sql_1 = require("./sql");
 const BootRomote = async function (options) {
@@ -19,7 +19,7 @@ const BootRomote = async function (options) {
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
+            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = new sql_1.SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
         }
         else {
@@ -37,14 +37,13 @@ const BootRomote = async function (options) {
     }
 };
 exports.BootRomote = BootRomote;
-const AppendRomote = async function (dbName) {
-    if (!globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][dbName]) {
-        await globalThis[sql_1._GlobalSqlOption].SqliteRemote.service.initDB(dbName);
-        const db = new sql_1.SqliteRemote(globalThis[sql_1._GlobalSqlOption].SqliteRemote.service, dbName);
-        if (globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] === undefined) {
-            globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = db;
-        }
-        globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][dbName] = db;
-    }
-};
-exports.AppendRomote = AppendRomote;
+// export const AppendRomote = async function (dbName: string) {
+//     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
+//         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+//         const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
+//         if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
+//             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
+//         }
+//         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
+//     }
+// }

package/cjs/boot.js

@@ -76,14 +76,13 @@ const Boot = async function (options) {
         }
     }
     if (options.Sqlite) {
-        const BetterSqlite3 = await Promise.resolve().then(() => __importStar(require('better-sqlite3')));
         if (typeof options.Sqlite === 'string') {
-            globalThis[sql_1._dao][sql_1.DBType.Sqlite][sql_1._primaryDB] = new sql_1.Sqlite(new BetterSqlite3.default(options.Sqlite, { fileMustExist: false }));
+            globalThis[sql_1._dao][sql_1.DBType.Sqlite][sql_1._primaryDB] = new sql_1.Sqlite(new options.BetterSqlite3(options.Sqlite, { fileMustExist: false }));
         }
         else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
-                const db = new sql_1.Sqlite(new BetterSqlite3.default(fileName, { fileMustExist: false }));
+                const db = new sql_1.Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
                 if (flag === false) {
                     globalThis[sql_1._dao][sql_1.DBType.Sqlite][sql_1._primaryDB] = db;
                     flag = true;
@@ -94,13 +93,13 @@ const Boot = async function (options) {
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
+            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = new sql_1.SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
         }
         else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
-                await options.SqliteRemote.service.initDB(fileName);
+                options.SqliteRemote.service.initDB(fileName);
                 const db = new sql_1.SqliteRemote(options.SqliteRemote.service, fileName);
                 if (flag === false) {
                     globalThis[sql_1._dao][sql_1.DBType.SqliteRemote][sql_1._primaryDB] = db;

package/cjs/sql.d.ts

@@ -432,6 +432,8 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
     ```
      */
     Redis?: Record<string, Record<string, any>> | Record<string, any>;
+    /** sqlite数据库驱动初始化函数 */
+    BetterSqlite3?: any;
     /**
      * 读取查询语句时，是否扫描JS文件？
      * JS文件需要默认导出一个 SqlModel对象
@@ -483,14 +485,15 @@ export interface PageQuery<L> {
 }
 /** sqlite electron服务端需要支持的接口 */
 export interface SqliteRemoteInterface {
-    execute(inData: Uint8Array): Promise<Uint8Array>;
-    pluck(inData: Uint8Array): Promise<Uint8Array>;
-    get(inData: Uint8Array): Promise<Uint8Array>;
-    raw(inData: Uint8Array): Promise<Uint8Array>;
-    query(inData: Uint8Array): Promise<Uint8Array>;
-    initDB(dbName: string): Promise<void>;
-    export(dbName: string): Promise<void>;
-    restore(dbName: string, fromName: string): Promise<void>;
+    execute(inData: Uint8Array): Uint8Array;
+    pluck(inData: Uint8Array): Uint8Array;
+    get(inData: Uint8Array): Uint8Array;
+    raw(inData: Uint8Array): Uint8Array;
+    query(inData: Uint8Array): Uint8Array;
+    initDB(dbName: string): void;
+    export(dbName: string, exportPath: string): Promise<void>;
+    restore(dbName: string, importPath: string): void;
+    close(dbName?: string): void;
 }
 interface Connection {
     [_daoConnection]: any;
@@ -600,12 +603,12 @@ export declare class SqliteRemote implements Dao {
     transaction<T = any>(sync: SyncMode.Async, fn: (conn: Connection) => Promise<T>, conn?: Connection | null): Promise<T | null>;
     close(sync: SyncMode.Sync): void;
     close(sync: SyncMode.Async): Promise<void>;
-    backup(sync: SyncMode.Sync, name: string): void;
-    backup(sync: SyncMode.Async, name: string): Promise<void>;
+    backup(sync: SyncMode.Sync, exportPath: string): void;
+    backup(sync: SyncMode.Async, exportPath: string): Promise<void>;
     remove(sync: SyncMode.Sync): void;
     remove(sync: SyncMode.Async): Promise<void>;
-    restore(sync: SyncMode.Sync, name: string): void;
-    restore(sync: SyncMode.Async, name: string): Promise<void>;
+    restore(sync: SyncMode.Sync, importPath: string): void;
+    restore(sync: SyncMode.Async, importPath: string): Promise<void>;
 }
 export type SqlMapper = ([string, string[], any?])[];
 export type SqlMappers = Record<string, SqlMapper>;

package/cjs/sql.js

@@ -974,53 +974,21 @@ class SqliteRemote {
     }
     close(sync) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].close();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.close(this[_sqliteRemoteName]);
         }
         ;
     }
-    backup(sync, name) {
+    backup(sync, exportPath) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.export(this[_sqliteRemoteName], exportPath);
         }
         ;
     }
     remove(sync) {
-        if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].remove();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
-        }
-        ;
     }
-    restore(sync, name) {
+    restore(sync, importPath) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.restore(this[_sqliteRemoteName], importPath);
         }
         ;
     }
@@ -1571,11 +1539,16 @@ function P(skipConn = false) {
             // option
             const option = args[0] = Object.assign({}, globalThis[exports._GlobalSqlOption], this[_SqlOption], args[0]);
             option.sync ?? (option.sync = SyncMode.Async);
+            option.tableName = option?.tableName ?? this[_tableName];
             const dbName = option?.dbName ?? this[_daoDBName] ?? exports._primaryDB;
             option.dao = globalThis[exports._dao][this[_dbType]][dbName];
-            error_1.Throw.if(!option.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
-            option.tableName = option?.tableName ?? this[_tableName];
             if (this[_dbType] === DBType.Sqlite) {
+                const db = new Sqlite(new globalThis[exports._GlobalSqlOption].BetterSqlite3(dbName, { fileMustExist: false }));
+                if (globalThis[exports._dao][this[_dbType]][exports._primaryDB] === undefined) {
+                    globalThis[exports._dao][this[_dbType]][exports._primaryDB] = db;
+                }
+                globalThis[exports._dao][this[_dbType]][dbName] = db;
+                option.dao = db;
                 error_1.Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
                 // 连接共享
                 if (skipConn === false && !option.conn) {
@@ -1608,6 +1581,13 @@ function P(skipConn = false) {
                 }
             }
             else if (this[_dbType] === DBType.SqliteRemote) {
+                globalThis[exports._GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+                const db = new SqliteRemote(globalThis[exports._GlobalSqlOption].SqliteRemote.service, dbName);
+                if (globalThis[exports._dao][this[_dbType]][exports._primaryDB] === undefined) {
+                    globalThis[exports._dao][this[_dbType]][exports._primaryDB] = db;
+                }
+                globalThis[exports._dao][this[_dbType]][dbName] = db;
+                option.dao = db;
                 error_1.Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
                 return new Promise(async (resolve, reject) => {
                     // 连接共享
@@ -1638,6 +1618,7 @@ function P(skipConn = false) {
                 });
             }
             else if (this[_dbType] === DBType.Mysql) {
+                error_1.Throw.if(!option.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享

package/cjs/sqlite.d.ts

@@ -5,10 +5,7 @@ export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface
     abstract getStoreName(dbName: string): string;
     /** 导入时，备份源文件路径 */
     abstract getBackName(dbName: string): string;
-    /** 实现导出时选择文件路径方法  */
-    abstract getExportPath(): Promise<string | undefined | null>;
-    /** 实现入时选择文件路径方法  */
-    abstract getImportPath(): Promise<string | undefined | null>;
+    abstract BetterSqlite3: any;
     /** 实现复制 */
     abstract cpSync(from: string, to: string, option?: {
         force: true;
@@ -23,13 +20,13 @@ export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface
      */
     abstract setMod(name: string): void;
     abstract trace: boolean;
-    execute(inData: Uint8Array): Promise<Uint8Array>;
-    pluck(inData: Uint8Array): Promise<Uint8Array>;
-    get(inData: Uint8Array): Promise<Uint8Array>;
-    raw(inData: Uint8Array): Promise<Uint8Array>;
-    query(inData: Uint8Array): Promise<Uint8Array>;
-    initDB(dbName: string): Promise<void>;
-    export(dbName: string): Promise<void>;
-    restore(dbName: string): Promise<void>;
+    execute(inData: Uint8Array): Uint8Array;
+    pluck(inData: Uint8Array): Uint8Array;
+    get(inData: Uint8Array): Uint8Array;
+    raw(inData: Uint8Array): Uint8Array;
+    query(inData: Uint8Array): Uint8Array;
+    initDB(dbName: string): void;
+    export(dbName: string, exportPath: string): Promise<void>;
+    restore(dbName: string, importPath: string): void;
     close(dbName?: string): void;
 }

package/cjs/sqlite.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -34,7 +11,7 @@ class SqliteRemoteClass {
     constructor() {
         this.dbList = {};
     }
-    async execute(inData) {
+    execute(inData) {
         const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
         sql_1.logger.debug(sql, params ?? '');
         try {
@@ -61,7 +38,7 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async pluck(inData) {
+    pluck(inData) {
         const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
         sql_1.logger.debug(sql, params ?? '');
         try {
@@ -84,7 +61,7 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async get(inData) {
+    get(inData) {
         const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
         sql_1.logger.debug(sql, params ?? '');
         try {
@@ -102,7 +79,7 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async raw(inData) {
+    raw(inData) {
         const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
         sql_1.logger.debug(sql, params ?? '');
         try {
@@ -124,7 +101,7 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async query(inData) {
+    query(inData) {
         const [dbName, sql, params] = (0, msgpack_1.decode)(inData);
         sql_1.logger.debug(sql, params ?? '');
         try {
@@ -146,10 +123,9 @@ class SqliteRemoteClass {
             throw error;
         }
     }
-    async initDB(dbName) {
+    initDB(dbName) {
         if (!this.dbList[dbName]) {
-            const BetterSqlite3 = await Promise.resolve().then(() => __importStar(require('better-sqlite3')));
-            this.dbList[dbName] = new BetterSqlite3.default(this.getStoreName(dbName), { fileMustExist: false });
+            this.dbList[dbName] = new this.BetterSqlite3(this.getStoreName(dbName), { fileMustExist: false });
             this.dbList[dbName].pragma('journal_mode = WAL');
             this.dbList[dbName].exec(`
                 CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
@@ -163,34 +139,30 @@ class SqliteRemoteClass {
             `);
         }
     }
-    async export(dbName) {
-        const exportPath = await this.getExportPath();
-        if (exportPath) {
-            await this.dbList[dbName].backup(exportPath);
-        }
+    async export(dbName, exportPath) {
+        await this.dbList[dbName].backup(exportPath);
     }
-    async restore(dbName) {
-        const importPath = await this.getImportPath();
-        if (importPath) {
-            if (this.dbList[dbName]) {
-                this.dbList[dbName].close();
-                this.dbList[dbName] = null;
-            }
-            const nn = this.getStoreName(dbName);
-            this.cpSync(nn, this.getBackName(dbName));
-            this.cpSync(importPath, nn, { force: true });
-            this.setMod(nn);
-            this.initDB(dbName);
+    restore(dbName, importPath) {
+        if (this.dbList[dbName]) {
+            this.dbList[dbName].close();
+            this.dbList[dbName] = null;
         }
+        const nn = this.getStoreName(dbName);
+        this.cpSync(nn, this.getBackName(dbName));
+        this.cpSync(importPath, nn, { force: true });
+        this.setMod(nn);
+        this.initDB(dbName);
     }
     close(dbName) {
         if (dbName) {
             this.dbList[dbName]?.close();
+            this.dbList[dbName] = null;
         }
         else {
             for (const db of Object.values(this.dbList)) {
                 db.close();
             }
+            this.dbList = {};
         }
     }
 }

package/es/boot-remote.d.ts

@@ -1,3 +1,2 @@
 import { GlobalSqlOptionForWeb } from './sql';
 export declare const BootRomote: (options: GlobalSqlOptionForWeb) => Promise<void>;
-export declare const AppendRomote: (dbName: string) => Promise<void>;

package/es/boot-remote.js

@@ -16,7 +16,7 @@ export const BootRomote = async function (options) {
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
+            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
         }
         else {
@@ -33,13 +33,13 @@ export const BootRomote = async function (options) {
         }
     }
 };
-export const AppendRomote = async function (dbName) {
-    if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
-        await globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
-        const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
-        if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
-            globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
-        }
-        globalThis[_dao][DBType.SqliteRemote][dbName] = db;
-    }
-};
+// export const AppendRomote = async function (dbName: string) {
+//     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
+//         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+//         const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
+//         if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
+//             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
+//         }
+//         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
+//     }
+// }

package/es/boot.js

@@ -50,14 +50,13 @@ export const Boot = async function (options) {
         }
     }
     if (options.Sqlite) {
-        const BetterSqlite3 = await import('better-sqlite3');
         if (typeof options.Sqlite === 'string') {
-            globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new BetterSqlite3.default(options.Sqlite, { fileMustExist: false }));
+            globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new options.BetterSqlite3(options.Sqlite, { fileMustExist: false }));
         }
         else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
-                const db = new Sqlite(new BetterSqlite3.default(fileName, { fileMustExist: false }));
+                const db = new Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
                 if (flag === false) {
                     globalThis[_dao][DBType.Sqlite][_primaryDB] = db;
                     flag = true;
@@ -68,13 +67,13 @@ export const Boot = async function (options) {
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
+            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
         }
         else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
-                await options.SqliteRemote.service.initDB(fileName);
+                options.SqliteRemote.service.initDB(fileName);
                 const db = new SqliteRemote(options.SqliteRemote.service, fileName);
                 if (flag === false) {
                     globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;

package/es/sql.d.ts

@@ -432,6 +432,8 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
     ```
      */
     Redis?: Record<string, Record<string, any>> | Record<string, any>;
+    /** sqlite数据库驱动初始化函数 */
+    BetterSqlite3?: any;
     /**
      * 读取查询语句时，是否扫描JS文件？
      * JS文件需要默认导出一个 SqlModel对象
@@ -483,14 +485,15 @@ export interface PageQuery<L> {
 }
 /** sqlite electron服务端需要支持的接口 */
 export interface SqliteRemoteInterface {
-    execute(inData: Uint8Array): Promise<Uint8Array>;
-    pluck(inData: Uint8Array): Promise<Uint8Array>;
-    get(inData: Uint8Array): Promise<Uint8Array>;
-    raw(inData: Uint8Array): Promise<Uint8Array>;
-    query(inData: Uint8Array): Promise<Uint8Array>;
-    initDB(dbName: string): Promise<void>;
-    export(dbName: string): Promise<void>;
-    restore(dbName: string, fromName: string): Promise<void>;
+    execute(inData: Uint8Array): Uint8Array;
+    pluck(inData: Uint8Array): Uint8Array;
+    get(inData: Uint8Array): Uint8Array;
+    raw(inData: Uint8Array): Uint8Array;
+    query(inData: Uint8Array): Uint8Array;
+    initDB(dbName: string): void;
+    export(dbName: string, exportPath: string): Promise<void>;
+    restore(dbName: string, importPath: string): void;
+    close(dbName?: string): void;
 }
 interface Connection {
     [_daoConnection]: any;
@@ -600,12 +603,12 @@ export declare class SqliteRemote implements Dao {
     transaction<T = any>(sync: SyncMode.Async, fn: (conn: Connection) => Promise<T>, conn?: Connection | null): Promise<T | null>;
     close(sync: SyncMode.Sync): void;
     close(sync: SyncMode.Async): Promise<void>;
-    backup(sync: SyncMode.Sync, name: string): void;
-    backup(sync: SyncMode.Async, name: string): Promise<void>;
+    backup(sync: SyncMode.Sync, exportPath: string): void;
+    backup(sync: SyncMode.Async, exportPath: string): Promise<void>;
     remove(sync: SyncMode.Sync): void;
     remove(sync: SyncMode.Async): Promise<void>;
-    restore(sync: SyncMode.Sync, name: string): void;
-    restore(sync: SyncMode.Async, name: string): Promise<void>;
+    restore(sync: SyncMode.Sync, importPath: string): void;
+    restore(sync: SyncMode.Async, importPath: string): Promise<void>;
 }
 export type SqlMapper = ([string, string[], any?])[];
 export type SqlMappers = Record<string, SqlMapper>;

package/es/sql.js

@@ -932,53 +932,21 @@ export class SqliteRemote {
     }
     close(sync) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].close();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.close(this[_sqliteRemoteName]);
         }
         ;
     }
-    backup(sync, name) {
+    backup(sync, exportPath) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.export(this[_sqliteRemoteName], exportPath);
         }
         ;
     }
     remove(sync) {
-        if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].remove();
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
-        }
-        ;
     }
-    restore(sync, name) {
+    restore(sync, importPath) {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
-                }
-                catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.restore(this[_sqliteRemoteName], importPath);
         }
         ;
     }
@@ -1527,11 +1495,16 @@ function P(skipConn = false) {
             // option
             const option = args[0] = Object.assign({}, globalThis[_GlobalSqlOption], this[_SqlOption], args[0]);
             option.sync ?? (option.sync = SyncMode.Async);
+            option.tableName = option?.tableName ?? this[_tableName];
             const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
             option.dao = globalThis[_dao][this[_dbType]][dbName];
-            Throw.if(!option.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
-            option.tableName = option?.tableName ?? this[_tableName];
             if (this[_dbType] === DBType.Sqlite) {
+                const db = new Sqlite(new globalThis[_GlobalSqlOption].BetterSqlite3(dbName, { fileMustExist: false }));
+                if (globalThis[_dao][this[_dbType]][_primaryDB] === undefined) {
+                    globalThis[_dao][this[_dbType]][_primaryDB] = db;
+                }
+                globalThis[_dao][this[_dbType]][dbName] = db;
+                option.dao = db;
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!');
                 // 连接共享
                 if (skipConn === false && !option.conn) {
@@ -1564,6 +1537,13 @@ function P(skipConn = false) {
                 }
             }
             else if (this[_dbType] === DBType.SqliteRemote) {
+                globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+                const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
+                if (globalThis[_dao][this[_dbType]][_primaryDB] === undefined) {
+                    globalThis[_dao][this[_dbType]][_primaryDB] = db;
+                }
+                globalThis[_dao][this[_dbType]][dbName] = db;
+                option.dao = db;
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!');
                 return new Promise(async (resolve, reject) => {
                     // 连接共享
@@ -1594,6 +1574,7 @@ function P(skipConn = false) {
                 });
             }
             else if (this[_dbType] === DBType.Mysql) {
+                Throw.if(!option.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享

package/es/sqlite.d.ts

@@ -5,10 +5,7 @@ export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface
     abstract getStoreName(dbName: string): string;
     /** 导入时，备份源文件路径 */
     abstract getBackName(dbName: string): string;
-    /** 实现导出时选择文件路径方法  */
-    abstract getExportPath(): Promise<string | undefined | null>;
-    /** 实现入时选择文件路径方法  */
-    abstract getImportPath(): Promise<string | undefined | null>;
+    abstract BetterSqlite3: any;
     /** 实现复制 */
     abstract cpSync(from: string, to: string, option?: {
         force: true;
@@ -23,13 +20,13 @@ export declare abstract class SqliteRemoteClass implements SqliteRemoteInterface
      */
     abstract setMod(name: string): void;
     abstract trace: boolean;
-    execute(inData: Uint8Array): Promise<Uint8Array>;
-    pluck(inData: Uint8Array): Promise<Uint8Array>;
-    get(inData: Uint8Array): Promise<Uint8Array>;
-    raw(inData: Uint8Array): Promise<Uint8Array>;
-    query(inData: Uint8Array): Promise<Uint8Array>;
-    initDB(dbName: string): Promise<void>;
-    export(dbName: string): Promise<void>;
-    restore(dbName: string): Promise<void>;
+    execute(inData: Uint8Array): Uint8Array;
+    pluck(inData: Uint8Array): Uint8Array;
+    get(inData: Uint8Array): Uint8Array;
+    raw(inData: Uint8Array): Uint8Array;
+    query(inData: Uint8Array): Uint8Array;
+    initDB(dbName: string): void;
+    export(dbName: string, exportPath: string): Promise<void>;
+    restore(dbName: string, importPath: string): void;
     close(dbName?: string): void;
 }

package/es/sqlite.js

@@ -5,7 +5,7 @@ export class SqliteRemoteClass {
     constructor() {
         this.dbList = {};
     }
-    async execute(inData) {
+    execute(inData) {
         const [dbName, sql, params] = decode(inData);
         logger.debug(sql, params ?? '');
         try {
@@ -32,7 +32,7 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async pluck(inData) {
+    pluck(inData) {
         const [dbName, sql, params] = decode(inData);
         logger.debug(sql, params ?? '');
         try {
@@ -55,7 +55,7 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async get(inData) {
+    get(inData) {
         const [dbName, sql, params] = decode(inData);
         logger.debug(sql, params ?? '');
         try {
@@ -73,7 +73,7 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async raw(inData) {
+    raw(inData) {
         const [dbName, sql, params] = decode(inData);
         logger.debug(sql, params ?? '');
         try {
@@ -95,7 +95,7 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async query(inData) {
+    query(inData) {
         const [dbName, sql, params] = decode(inData);
         logger.debug(sql, params ?? '');
         try {
@@ -117,10 +117,9 @@ export class SqliteRemoteClass {
             throw error;
         }
     }
-    async initDB(dbName) {
+    initDB(dbName) {
         if (!this.dbList[dbName]) {
-            const BetterSqlite3 = await import('better-sqlite3');
-            this.dbList[dbName] = new BetterSqlite3.default(this.getStoreName(dbName), { fileMustExist: false });
+            this.dbList[dbName] = new this.BetterSqlite3(this.getStoreName(dbName), { fileMustExist: false });
             this.dbList[dbName].pragma('journal_mode = WAL');
             this.dbList[dbName].exec(`
                 CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
@@ -134,34 +133,30 @@ export class SqliteRemoteClass {
             `);
         }
     }
-    async export(dbName) {
-        const exportPath = await this.getExportPath();
-        if (exportPath) {
-            await this.dbList[dbName].backup(exportPath);
-        }
+    async export(dbName, exportPath) {
+        await this.dbList[dbName].backup(exportPath);
     }
-    async restore(dbName) {
-        const importPath = await this.getImportPath();
-        if (importPath) {
-            if (this.dbList[dbName]) {
-                this.dbList[dbName].close();
-                this.dbList[dbName] = null;
-            }
-            const nn = this.getStoreName(dbName);
-            this.cpSync(nn, this.getBackName(dbName));
-            this.cpSync(importPath, nn, { force: true });
-            this.setMod(nn);
-            this.initDB(dbName);
+    restore(dbName, importPath) {
+        if (this.dbList[dbName]) {
+            this.dbList[dbName].close();
+            this.dbList[dbName] = null;
         }
+        const nn = this.getStoreName(dbName);
+        this.cpSync(nn, this.getBackName(dbName));
+        this.cpSync(importPath, nn, { force: true });
+        this.setMod(nn);
+        this.initDB(dbName);
     }
     close(dbName) {
         if (dbName) {
             this.dbList[dbName]?.close();
+            this.dbList[dbName] = null;
         }
         else {
             for (const db of Object.values(this.dbList)) {
                 db.close();
             }
+            this.dbList = {};
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "baja-lite",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "some util for self",
   "homepage": "https://github.com/void-soul/util-man",
   "repository": {

package/src/boot-remote.ts

@@ -17,7 +17,7 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
+            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
         } else {
             let flag = false;
@@ -34,13 +34,13 @@ export const BootRomote = async function (options: GlobalSqlOptionForWeb) {
     }
 }
 
-export const AppendRomote = async function (dbName: string) {
-    if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
-        await globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
-        const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
-        if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
-            globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
-        }
-        globalThis[_dao][DBType.SqliteRemote][dbName] = db;
-    }
-}
+// export const AppendRomote = async function (dbName: string) {
+//     if (!globalThis[_dao][DBType.SqliteRemote][dbName]) {
+//         globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+//         const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName);
+//         if (globalThis[_dao][DBType.SqliteRemote][_primaryDB] === undefined) {
+//             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;
+//         }
+//         globalThis[_dao][DBType.SqliteRemote][dbName] = db;
+//     }
+// }

package/src/boot.ts

@@ -50,13 +50,12 @@ export const Boot = async function (options: GlobalSqlOption) {
         }
     }
     if (options.Sqlite) {
-        const BetterSqlite3 = await import('better-sqlite3');
         if (typeof options.Sqlite === 'string') {
-            globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new BetterSqlite3.default(options.Sqlite, { fileMustExist: false }));
+            globalThis[_dao][DBType.Sqlite][_primaryDB] = new Sqlite(new options.BetterSqlite3(options.Sqlite, { fileMustExist: false }));
         } else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.Sqlite)) {
-                const db = new Sqlite(new BetterSqlite3.default(fileName, { fileMustExist: false }));
+                const db = new Sqlite(new options.BetterSqlite3(fileName, { fileMustExist: false }));
                 if (flag === false) {
                     globalThis[_dao][DBType.Sqlite][_primaryDB] = db;
                     flag = true;
@@ -67,12 +66,12 @@ export const Boot = async function (options: GlobalSqlOption) {
     }
     if (options.SqliteRemote && options.SqliteRemote.db) {
         if (typeof options.SqliteRemote.db === 'string') {
-            await options.SqliteRemote.service.initDB(options.SqliteRemote.db);
+            options.SqliteRemote.service.initDB(options.SqliteRemote.db);
             globalThis[_dao][DBType.SqliteRemote][_primaryDB] = new SqliteRemote(options.SqliteRemote.service, options.SqliteRemote.db);
         } else {
             let flag = false;
             for (const [key, fileName] of Object.entries(options.SqliteRemote.db)) {
-                await options.SqliteRemote.service.initDB(fileName);
+                options.SqliteRemote.service.initDB(fileName);
                 const db = new SqliteRemote(options.SqliteRemote.service, fileName);
                 if (flag === false) {
                     globalThis[_dao][DBType.SqliteRemote][_primaryDB] = db;

package/src/sql.ts

@@ -493,8 +493,8 @@ export interface GlobalSqlOption extends GlobalSqlOptionForWeb {
     ```
      */
     Redis?: Record<string, Record<string, any>> | Record<string, any>;
-
-
+    /** sqlite数据库驱动初始化函数 */
+    BetterSqlite3?: any;
     /**
      * 读取查询语句时，是否扫描JS文件？
      * JS文件需要默认导出一个 SqlModel对象
@@ -551,14 +551,15 @@ export interface PageQuery<L> {
 // #region 数据方言
 /** sqlite electron服务端需要支持的接口 */
 export interface SqliteRemoteInterface {
-    execute(inData: Uint8Array): | Promise<Uint8Array>
-    pluck(inData: Uint8Array): Promise<Uint8Array>;
-    get(inData: Uint8Array): Promise<Uint8Array>;
-    raw(inData: Uint8Array): Promise<Uint8Array>;
-    query(inData: Uint8Array): Promise<Uint8Array>;
-    initDB(dbName: string): Promise<void>;
-    export(dbName: string): Promise<void>;
-    restore(dbName: string, fromName: string): Promise<void>;
+    execute(inData: Uint8Array):Uint8Array;
+    pluck(inData: Uint8Array):Uint8Array;
+    get(inData: Uint8Array): Uint8Array;
+    raw(inData: Uint8Array): Uint8Array;
+    query(inData: Uint8Array): Uint8Array;
+    initDB(dbName: string): void;
+    export(dbName: string, exportPath: string): Promise<void>;
+    restore(dbName: string, importPath: string): void;
+    close(dbName?: string): void;
 };
 interface Connection {
     [_daoConnection]: any;
@@ -1277,55 +1278,29 @@ export class SqliteRemote implements Dao {
     close(sync: SyncMode.Async): Promise<void>;
     close(sync: SyncMode): Promise<void> | void {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].close();
-                } catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.close(this[_sqliteRemoteName]);
         };
     }
 
-    backup(sync: SyncMode.Sync, name: string): void;
-    backup(sync: SyncMode.Async, name: string): Promise<void>;
-    backup(sync: SyncMode, name: string): Promise<void> | void {
+    backup(sync: SyncMode.Sync, exportPath: string): void;
+    backup(sync: SyncMode.Async, exportPath: string): Promise<void>;
+    backup(sync: SyncMode, exportPath: string): Promise<void> | void {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].backup(this[_sqliteRemoteName], name);
-                } catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.export(this[_sqliteRemoteName], exportPath);
         };
     }
 
     remove(sync: SyncMode.Sync): void;
     remove(sync: SyncMode.Async): Promise<void>;
     remove(sync: SyncMode): Promise<void> | void {
-        if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].remove();
-                } catch (error) {
-                    reject(error);
-                }
-            });
-        };
+
     }
 
-    restore(sync: SyncMode.Sync, name: string): void;
-    restore(sync: SyncMode.Async, name: string): Promise<void>;
-    restore(sync: SyncMode, name: string): Promise<void> | void {
+    restore(sync: SyncMode.Sync, importPath: string): void;
+    restore(sync: SyncMode.Async, importPath: string): Promise<void>;
+    restore(sync: SyncMode, importPath: string): Promise<void> | void {
         if (sync === SyncMode.Async) {
-            return new Promise(async (resolve, reject) => {
-                try {
-                    await this[_daoConnection].restore(this[_sqliteRemoteName], name);
-                } catch (error) {
-                    reject(error);
-                }
-            });
+            return this[_daoDB]?.restore(this[_sqliteRemoteName], importPath, );
         };
     }
 }
@@ -1902,11 +1877,19 @@ function P<T extends object>(skipConn = false) {
             // option
             const option = args[0] = Object.assign({}, globalThis[_GlobalSqlOption], this[_SqlOption], args[0]) as (MethodOption & { sync?: SyncMode; });
             option.sync ??= SyncMode.Async;
+            option!.tableName = option?.tableName ?? this[_tableName];
+
             const dbName = option?.dbName ?? this[_daoDBName] ?? _primaryDB;
             option!.dao = globalThis[_dao][this[_dbType]!][dbName] as Dao;
-            Throw.if(!option!.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
-            option!.tableName = option?.tableName ?? this[_tableName];
+
             if (this[_dbType] === DBType.Sqlite) {
+                const db = new Sqlite(new globalThis[_GlobalSqlOption].BetterSqlite3(dbName as any, { fileMustExist: false }));
+                if (globalThis[_dao][this[_dbType]!][_primaryDB] === undefined) {
+                    globalThis[_dao][this[_dbType]!][_primaryDB] = db;
+                }
+                globalThis[_dao][this[_dbType]!][dbName] = db;
+                option!.dao = db;
+
                 Throw.if(option.sync === SyncMode.Async, 'sqlite can not Async!')
                 // 连接共享
                 if (skipConn === false && !option!.conn) {
@@ -1934,6 +1917,14 @@ function P<T extends object>(skipConn = false) {
                     }
                 }
             } else if (this[_dbType] === DBType.SqliteRemote) {
+                globalThis[_GlobalSqlOption].SqliteRemote.service.initDB(dbName);
+                const db = new SqliteRemote(globalThis[_GlobalSqlOption].SqliteRemote.service, dbName as any);
+                if (globalThis[_dao][this[_dbType]!][_primaryDB] === undefined) {
+                    globalThis[_dao][this[_dbType]!][_primaryDB] = db;
+                }
+                globalThis[_dao][this[_dbType]!][dbName] = db;
+                option!.dao = db;
+
                 Throw.if(option.sync === SyncMode.Sync, 'SqliteRemote remote can not sync!')
                 return new Promise(async (resolve, reject) => {
                     // 连接共享
@@ -1961,6 +1952,7 @@ function P<T extends object>(skipConn = false) {
                 });
 
             } else if (this[_dbType] === DBType.Mysql) {
+                Throw.if(!option!.dao, `not found db:${String(dbName)}(${this[_dbType]})`);
                 return new Promise(async (resolve, reject) => {
                     try {
                         // 连接共享

package/src/sqlite.ts

@@ -7,10 +7,9 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
     abstract getStoreName(dbName: string): string;
     /** 导入时，备份源文件路径 */
     abstract getBackName(dbName: string): string;
-    /** 实现导出时选择文件路径方法  */
-    abstract getExportPath(): Promise<string | undefined | null>;
-    /** 实现入时选择文件路径方法  */
-    abstract getImportPath(): Promise<string | undefined | null>;
+    abstract BetterSqlite3: any;
+
+
     /** 实现复制 */
     abstract cpSync(from: string, to: string, option?: { force: true }): void;
     /**
@@ -23,7 +22,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
      */
     abstract setMod(name: string): void;
     abstract trace: boolean;
-    async execute(inData: Uint8Array): Promise<Uint8Array> {
+    execute(inData: Uint8Array): Uint8Array {
         const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
@@ -46,7 +45,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async pluck(inData: Uint8Array): Promise<Uint8Array> {
+    pluck(inData: Uint8Array): Uint8Array {
         const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
@@ -65,7 +64,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async get(inData: Uint8Array): Promise<Uint8Array> {
+    get(inData: Uint8Array): Uint8Array {
         const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
@@ -82,7 +81,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async raw(inData: Uint8Array): Promise<Uint8Array> {
+    raw(inData: Uint8Array): Uint8Array {
         const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
@@ -100,7 +99,7 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async query(inData: Uint8Array): Promise<Uint8Array> {
+    query(inData: Uint8Array): Uint8Array {
         const [dbName, sql, params] = decode(inData) as [dbName: string, sql?: string | undefined, params?: any];
         logger.debug(sql, params ?? '');
         try {
@@ -118,10 +117,9 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             throw error;
         }
     }
-    async initDB(dbName: string): Promise<void> {
+    initDB(dbName: string) {
         if (!this.dbList[dbName]) {
-            const BetterSqlite3 = await import('better-sqlite3');
-            this.dbList[dbName] = new BetterSqlite3.default(this.getStoreName(dbName), { fileMustExist: false });
+            this.dbList[dbName] = new this.BetterSqlite3(this.getStoreName(dbName), { fileMustExist: false });
             this.dbList[dbName].pragma('journal_mode = WAL');
             this.dbList[dbName].exec(`
                 CREATE TABLE IF NOT EXISTS DUAL ( ______id INTEGER NOT NULL, PRIMARY KEY ( ______id ));
@@ -135,33 +133,29 @@ export abstract class SqliteRemoteClass implements SqliteRemoteInterface {
             `);
         }
     }
-    async export(dbName: string): Promise<void> {
-        const exportPath = await this.getExportPath();
-        if (exportPath) {
-            await this.dbList[dbName].backup(exportPath);
-        }
+    async export(dbName: string, exportPath: string): Promise<void> {
+        await this.dbList[dbName].backup(exportPath);
     }
-    async restore(dbName: string): Promise<void> {
-        const importPath = await this.getImportPath();
-        if (importPath) {
-            if (this.dbList[dbName]) {
-                this.dbList[dbName].close();
-                this.dbList[dbName] = null;
-            }
-            const nn = this.getStoreName(dbName);
-            this.cpSync(nn, this.getBackName(dbName));
-            this.cpSync(importPath, nn, { force: true });
-            this.setMod(nn);
-            this.initDB(dbName);
+    restore(dbName: string, importPath: string) {
+        if (this.dbList[dbName]) {
+            this.dbList[dbName].close();
+            this.dbList[dbName] = null;
         }
+        const nn = this.getStoreName(dbName);
+        this.cpSync(nn, this.getBackName(dbName));
+        this.cpSync(importPath, nn, { force: true });
+        this.setMod(nn);
+        this.initDB(dbName);
     }
     close(dbName?: string) {
         if (dbName) {
             this.dbList[dbName]?.close();
+            this.dbList[dbName] = null;
         } else {
             for (const db of Object.values(this.dbList)) {
                 db.close();
             }
+            this.dbList = {};
         }
     }
 }