refactor: oracle.js

Author: cuyl

lib/loader.js

@@ -15,8 +15,6 @@ function createOneClient(config, app) {
   app.coreLogger.info('[egg-oracle] connecting %s', config.connectString);
   let client = new OracleDB(config, app.coreLogger);
   app.beforeStart(async () => {
-    // connection init
-    await client.init();
     const { rows } = await client.execute("select to_char(sysdate,'yyyy-MM-dd HH24:mi:ss') from dual", []);
     const index = count++;
     app.coreLogger.info(`[egg-oracle] instance[${index}] status OK, currentTime: ${rows[0][0]}`);

lib/oracle.js

@@ -10,8 +10,8 @@ class OracleDB {
     this.log = log;
   }
 
-  async init() {
-    return (this.pool = await oracledb.createPool(this.config));
+  async ensure() {
+    return this.pool || (this.pool = await oracledb.createPool(this.config));
   }
 
   /**
@@ -22,33 +22,25 @@ class OracleDB {
    * @see {@link https://github.com/OraOpenSource/orawrap}
    */
   async _getConnection() {
+    const pool = this.pool || (await this.ensure());
     try {
-      return await this.pool.getConnection();
+      return await pool.getConnection();
     } catch (err) {
       this.log.error(err.message);
-      try {
-        await this.pool.close();
-      } catch (closeError) {
-        this.log.error(closeError.message);
-        this.pool = await oracledb.createPool(this.config);
-        throw closeError;
-      }
+      await pool.close();
+      this.pool = await oracledb.createPool(this.config);
       throw err;
     }
   }
   async getConnection() {
+    const pool = this.pool || (await this.ensure());
     try {
-      const connection = await this.pool.getConnection();
+      const connection = await pool.getConnection();
       return new Connection(connection, this.log);
     } catch (err) {
       this.log.error(err.message);
-      try {
-        await this.pool.close();
-      } catch (closeError) {
-        this.log.error(closeError.message);
-        this.pool = await oracledb.createPool(this.config);
-        throw closeError;
-      }
+      await pool.close();
+      this.pool = await oracledb.createPool(this.config);
       throw err;
     }
   }
@@ -75,20 +67,21 @@ class OracleDB {
   }
 
   async close() {
-    const error = await this.connection.close();
-    if (error) {
-      throw error;
+    if (this.connection && this.connection.close) {
+      await this.connection.close();
+      this.connection = null;
     }
-    this.connection = null;
   }
 
   async destroy() {
-    const error = await this.pool.close();
-    if (error) {
-      throw error;
+    if (this.connection && this.connection.close) {
+      await this.connection.close();
+      this.connection = null;
+    }
+    if (this.pool && this.pool.close) {
+      await this.pool.close();
+      this.pool = null;
     }
-    this.connection = null;
-    this.pool = null;
   }
 }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "egg-oracle",
-  "version": "1.0.11",
+  "version": "1.0.12",
   "description": "Oracle database plugin for egg",
   "eggPlugin": {
     "name": "oracle"