vona-module-a-version 5.0.28 → 5.0.30

package/dist/index.js

@@ -131,46 +131,68 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
   get configDatabase() {
     return this.app.config.database;
   }
-  get databasePrefix() {
-    return `vona${__separator}test${__separator}${this.app.name}${__separator}`;
+  getDatabasePrefix(configInstanceBase) {
+    const instanceName = configInstanceBase?.isolate ? `isolate${__separator}${configInstanceBase.name}` : 'share';
+    return `vona${__separator}test${__separator}${this.app.name}${__separator}${instanceName}${__separator}`;
   }
   async databaseInitStartup() {
     // database
-    await this.__database();
-    // version start
-    await this.scope.service.version.__start();
+    await this.__preparedatabases(true);
   }
   async databaseNameStartup() {
     // database
-    await this.__database();
+    await this.__preparedatabases(false);
   }
-  async __fetchDatabases(client) {
+  async __fetchDatabases(client, configInstanceBase) {
+    const databasePrefix = this.getDatabasePrefix(configInstanceBase);
     // dbs
-    let dbs = await client.connection.schema.fetchDatabases(this.databasePrefix);
+    let dbs = await client.connection.schema.fetchDatabases(databasePrefix);
     // filter
     dbs = dbs.filter(db => {
-      const _time = db.name.substring(this.databasePrefix.length);
+      const _time = db.name.substring(databasePrefix.length);
       return _time.length === __timeFormat.length;
     });
     // ok
     return dbs;
   }
-  async __createDatabase(client) {
+  async __createDatabase(client, configInstanceBase) {
+    const databasePrefix = this.getDatabasePrefix(configInstanceBase);
     // create
-    const databaseName = `${this.databasePrefix}${moment().format(__timeFormat)}`;
+    const databaseName = `${databasePrefix}${moment().format(__timeFormat)}`;
     await client.connection.schema.createDatabase(databaseName);
     return databaseName;
   }
-  async __database() {
+  async __preparedatabases(versionStart) {
+    // default
+    await this.bean.database.switchDb(async () => {
+      await this.__preparedatabase(versionStart);
+    }, 'default');
+    // isolate
+    for (const configInstanceBase of this.app.config.instances) {
+      if (!configInstanceBase.isolate) continue;
+      if (!configInstanceBase.isolateClient) throw new Error(`should specify isolateClient for isolate instance: ${configInstanceBase.name}`);
+      await this.bean.database.switchDb(async () => {
+        await this.__preparedatabase(versionStart, configInstanceBase);
+      }, configInstanceBase.isolateClient);
+    }
+  }
+  async __preparedatabase(versionStart, configInstanceBase) {
+    await this.__preparedatabaseInner(configInstanceBase);
+    if (versionStart) {
+      await this.scope.service.version.__start();
+    }
+  }
+  async __preparedatabaseInner(configInstanceBase) {
     if (this.app.meta.isProd) {
       // donothing
       return;
     }
+    const databasePrefix = this.getDatabasePrefix(configInstanceBase);
     // client
     const client = this.bean.database.current.client;
     // get current database name
     let databaseName = client.getDatabaseName();
-    const isTestDatabase = databaseName.indexOf(this.databasePrefix) === 0;
+    const isTestDatabase = databaseName.indexOf(databasePrefix) === 0;
     // dev/debug db
     if (this.app.meta.isDev) {
       // if enable testDatabase
@@ -180,14 +202,15 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
         // donothing
         return;
       }
-      const dbs = await this.__fetchDatabases(client);
+      const dbs = await this.__fetchDatabases(client, configInstanceBase);
       if (dbs.length === 0) {
-        databaseName = await this.__createDatabase(client);
+        databaseName = await this.__createDatabase(client, configInstanceBase);
       } else {
         databaseName = dbs[0].name;
       }
       // set config and reload client
       await client.changeConfigAndReload(databaseName);
+      this.$logger.silly(chalk.cyan(`dialect: ${client.db.dialectName}`));
       this.$logger.silly(chalk.cyan(`database: ${databaseName}, pid: ${process.pid}`));
     }
     // test db
@@ -198,15 +221,16 @@ let ServiceDatabase = (_dec$7 = Service(), _dec2$7 = BeanInfo({
         return;
       }
       // drop old databases
-      const dbs = await this.__fetchDatabases(client);
+      const dbs = await this.__fetchDatabases(client, configInstanceBase);
       for (const db of dbs) {
         await client.connection.schema.dropDatabase(db.name);
       }
       // create database
-      const databaseName = await this.__createDatabase(client);
+      const databaseName = await this.__createDatabase(client, configInstanceBase);
       // set config and reload client
       await client.changeConfigAndReload(databaseName);
       // database ready
+      this.$logger.silly(chalk.cyan(`dialect: ${client.db.dialectName}`));
       this.$logger.silly(chalk.cyan(`database: ${databaseName}, pid: ${process.pid}`));
     }
   }

package/dist/service/database.d.ts

@@ -1,11 +1,14 @@
+import type { ConfigInstanceBase } from 'vona-module-a-instance';
 import type { ServiceDatabaseClient } from 'vona-module-a-orm';
 import { BeanBase } from 'vona';
 export declare class ServiceDatabase extends BeanBase {
     get configDatabase(): import("vona-module-a-orm").ConfigDatabase;
-    get databasePrefix(): string;
+    getDatabasePrefix(configInstanceBase?: ConfigInstanceBase): string;
     databaseInitStartup(): Promise<void>;
     databaseNameStartup(): Promise<void>;
-    __fetchDatabases(client: ServiceDatabaseClient): Promise<import("vona-module-a-orm").IFetchDatabasesResultItem[]>;
-    __createDatabase(client: ServiceDatabaseClient): Promise<string>;
-    __database(): Promise<void>;
+    __fetchDatabases(client: ServiceDatabaseClient, configInstanceBase?: ConfigInstanceBase): Promise<import("vona-module-a-orm").IFetchDatabasesResultItem[]>;
+    __createDatabase(client: ServiceDatabaseClient, configInstanceBase?: ConfigInstanceBase): Promise<string>;
+    __preparedatabases(versionStart: boolean): Promise<void>;
+    __preparedatabase(versionStart: boolean, configInstanceBase?: ConfigInstanceBase): Promise<void>;
+    __preparedatabaseInner(configInstanceBase?: ConfigInstanceBase): Promise<void>;
 }

package/dist/service/version.d.ts

@@ -1,4 +1,5 @@
-import type { ConfigInstanceBase, IInstanceRecord } from 'vona';
+import type { IInstanceRecord } from 'vona';
+import type { ConfigInstanceBase } from 'vona-module-a-instance';
 import type { IInstanceStartupOptions } from 'vona-module-a-startup';
 import type { IMetaVersionOptions, IMetaVersionOptionsInner } from '../types/version.ts';
 import { BeanBase } from 'vona';

package/dist/types/version.d.ts

@@ -1,4 +1,5 @@
-import type { ConfigInstanceBase, IInstanceRecord } from 'vona';
+import type { IInstanceRecord } from 'vona';
+import type { ConfigInstanceBase } from 'vona-module-a-instance';
 export interface IMetaVersionOptions {
     scene: 'update' | 'init' | 'test';
     instanceName?: keyof IInstanceRecord;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vona-module-a-version",
   "type": "module",
-  "version": "5.0.28",
+  "version": "5.0.30",
   "vonaModule": {
     "fileVersion": 1,
     "dependencies": {},