gg-mysql-connector 1.0.23 → 1.0.25

package/dist/GGMySQLConnector.d.ts

@@ -33,6 +33,7 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
         TABLE_NAME: string;
         DATA_TYPE: string;
     }[] | null;
+    isConnected: boolean;
     constructor(DBInfo: DatabaseConfigInterface);
     createDatabaseIfNotExist(tempConnection: mysql.Connection): Promise<void>;
     selectBySearchTextInRow(tableName: string, textToSearch: string): Promise<mysql.RowDataPacket[]>;
@@ -65,6 +66,7 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
     loadColumnListToCache(): Promise<void>;
     getColumnList(tableName: string): Promise<string[]>;
     getColumnFullList(tableName: string): Promise<mysql.RowDataPacket[]>;
+    waitUntilInitSuccess(interval: number): Promise<unknown>;
     query<T>(statment: string, parameter?: any[], isPrint?: boolean): Promise<T | QueryResult>;
     private printResultLength;
 }

package/dist/GGMySQLConnector.js

@@ -20,6 +20,7 @@ class GGMySQLConnector {
         this.tableAndViewNameList = [];
         this.columnAndTableListCache = null;
         this.DBInfo = DBInfo;
+        this.isConnected = false;
     }
     async createDatabaseIfNotExist(tempConnection) {
         const currentDatabaseName = this.DBInfo.database;
@@ -242,7 +243,21 @@ class GGMySQLConnector {
         const result = (await this.query(`SELECT * FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_SCHEMA = '${this.DBInfo.database}' AND TABLE_NAME = '${tableName}'`, undefined, false));
         return result;
     }
+    waitUntilInitSuccess(interval) {
+        console.log("wait for database connection . . .");
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                if (this.isConnected === false) {
+                    this.waitUntilInitSuccess(interval);
+                }
+                else {
+                    return resolve(true);
+                }
+            }, interval);
+        });
+    }
     async query(statment, parameter, isPrint) {
+        await this.waitUntilInitSuccess(1000);
         return new Promise((resolve, reject) => {
             const uniqueTime = `${(0, crypto_1.randomUUID)()} ${statment}`;
             console.time(uniqueTime);

package/dist/ModelGenerator.d.ts

@@ -10,11 +10,13 @@ export default class ModelGenerator {
     model: MyModel[];
     dbInfo: DatabaseConfigInterface;
     connection: mysql.Connection;
+    isConnected: boolean;
     constructor(dbInfo: DatabaseConfigInterface, model: MyModel[]);
     init(): Promise<void>;
     private createDatabaseIfNotExist;
     pushModelToDB(): Promise<void>;
     pushViewToDB(viewDirectory: string): Promise<void>;
+    waitUntilInitSuccess(interval: number): Promise<unknown>;
     query<T>(statment: string, parameter?: any[], isPrint?: boolean): Promise<T>;
     private printResultLength;
     getTableNameList(): Promise<string[]>;

package/dist/ModelGenerator.js

@@ -21,6 +21,7 @@ class ModelGenerator {
         };
         this.model = model;
         this.dbInfo = dbInfo;
+        this.isConnected = false;
     }
     async init() {
         console.log("init");
@@ -29,6 +30,7 @@ class ModelGenerator {
             user: this.dbInfo.user,
             password: this.dbInfo.password,
         });
+        this.isConnected = true;
         await this.createDatabaseIfNotExist();
     }
     async createDatabaseIfNotExist() {
@@ -44,7 +46,21 @@ class ModelGenerator {
         const migrator = new MyDBMigration_1.default(this);
         await migrator.migrateView(viewDirectory);
     }
+    waitUntilInitSuccess(interval) {
+        console.log("wait for database connection . . .");
+        return new Promise((resolve, reject) => {
+            setTimeout(() => {
+                if (this.isConnected === false) {
+                    this.waitUntilInitSuccess(interval);
+                }
+                else {
+                    return resolve(true);
+                }
+            }, interval);
+        });
+    }
     async query(statment, parameter, isPrint) {
+        await this.waitUntilInitSuccess(1000);
         return new Promise((resolve, reject) => {
             const uniqueTime = `${(0, crypto_1.randomUUID)()} ${statment}`;
             console.time(uniqueTime);
@@ -155,11 +171,11 @@ class ModelGenerator {
         }
         const fileName = `${params.appName}_INF.ts`;
         const code = `export default interface ${params.appName}_INF  { ${array.join("\n")} }`;
-        params.outputDirectory.forEach(async (tempPath) => {
-            const serverFilePath = path_1.default.join(tempPath, fileName);
+        for (let row of params.outputDirectory) {
+            const serverFilePath = path_1.default.join(row, fileName);
             await fs_1.default.writeFileSync(serverFilePath, code);
             console.log("save to ", serverFilePath);
-        });
+        }
         console.log(`generate interface ${params.appName} ${chalk_1.default.bgGreen(" SUCCESS ")}`);
         return code;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg-mysql-connector",
-  "version": "1.0.23",
+  "version": "1.0.25",
   "description": "",
   "main": "dist/index.js",
   "scripts": {

package/src/GGMySQLConnector.ts

@@ -59,12 +59,14 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
   columnAndTableListCache:
     | { COLUMN_NAME: string; TABLE_NAME: string; DATA_TYPE: string }[]
     | null
+  isConnected: boolean
 
   constructor(DBInfo: DatabaseConfigInterface) {
     this.isPrintStatement = false
     this.tableAndViewNameList = []
     this.columnAndTableListCache = null
     this.DBInfo = DBInfo
+    this.isConnected = false
   }
   async createDatabaseIfNotExist(
     tempConnection: mysql.Connection
@@ -401,12 +403,25 @@ export default class GGMySQLConnector<Main> implements ClassDBInterface<Main> {
     )) as mysql.RowDataPacket[]
     return result
   }
+  waitUntilInitSuccess(interval: number) {
+    console.log("wait for database connection . . .")
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        if (this.isConnected === false) {
+          this.waitUntilInitSuccess(interval)
+        } else {
+          return resolve(true)
+        }
+      }, interval)
+    })
+  }
 
   async query<T>(
     statment: string,
     parameter?: any[],
     isPrint?: boolean
   ): Promise<T | QueryResult> {
+    await this.waitUntilInitSuccess(1000)
     return new Promise((resolve, reject) => {
       const uniqueTime = `${randomUUID()} ${statment}`
       console.time(uniqueTime)

package/src/ModelGenerator.ts

@@ -16,9 +16,11 @@ export default class ModelGenerator {
   model: MyModel[]
   dbInfo: DatabaseConfigInterface
   connection!: mysql.Connection
+  isConnected: boolean
   constructor(dbInfo: DatabaseConfigInterface, model: MyModel[]) {
     this.model = model
     this.dbInfo = dbInfo
+    this.isConnected = false
   }
   async init() {
     console.log("init")
@@ -27,6 +29,7 @@ export default class ModelGenerator {
       user: this.dbInfo.user,
       password: this.dbInfo.password,
     })
+    this.isConnected = true
     await this.createDatabaseIfNotExist()
   }
   private async createDatabaseIfNotExist() {
@@ -43,12 +46,25 @@ export default class ModelGenerator {
     const migrator = new MyDBMigration(this)
     await migrator.migrateView(viewDirectory)
   }
+  waitUntilInitSuccess(interval: number) {
+    console.log("wait for database connection . . .")
+    return new Promise((resolve, reject) => {
+      setTimeout(() => {
+        if (this.isConnected === false) {
+          this.waitUntilInitSuccess(interval)
+        } else {
+          return resolve(true)
+        }
+      }, interval)
+    })
+  }
 
   async query<T>(
     statment: string,
     parameter?: any[],
     isPrint?: boolean
   ): Promise<T> {
+    await this.waitUntilInitSuccess(1000)
     return new Promise((resolve, reject) => {
       const uniqueTime = `${randomUUID()} ${statment}`
       console.time(uniqueTime)
@@ -207,11 +223,11 @@ export default class ModelGenerator {
       params.appName
     }_INF  { ${array.join("\n")} }`
 
-    params.outputDirectory.forEach(async (tempPath) => {
-      const serverFilePath = path.join(tempPath, fileName)
+    for (let row of params.outputDirectory) {
+      const serverFilePath = path.join(row, fileName)
       await fs.writeFileSync(serverFilePath, code)
       console.log("save to ", serverFilePath)
-    })
+    }
 
     console.log(
       `generate interface ${params.appName} ${chalk.bgGreen(" SUCCESS ")}`