@breautek/storm 3.1.0 → 3.2.1

package/src/Application.ts

@@ -238,7 +238,17 @@ export abstract class Application
         });
     }
 
-    public close(): Promise<void> {
+    public async close(): Promise<void> {
+        await Promise.all([ this._closeSocket(), this._closeDatabase() ]);
+    }
+
+    protected async _closeDatabase(): Promise<void> {
+        if (this.$db) {
+            await this.$db.destroy();
+        }
+    }
+
+    protected async _closeSocket(): Promise<void> {
         return new Promise<void>((resolve, reject) => {
             if (this.$socket && this.$socket.listening) {
                 this.$socket.close(() => {

package/src/BackendAuthenticationMiddleware.ts

@@ -16,7 +16,6 @@
 
 import {StatusCode} from './StatusCode';
 import {Request} from './Request';
-import {Response} from './Response';
 import {ResponseData} from './ResponseData';
 import {Logger} from '@arashi/logger';
 import {getInstance} from './instance';
@@ -44,7 +43,7 @@ export class BackendAuthenticationMiddleware {
      * @param options Arbituary object containing any relevant information used for authentication.
      */
     // eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-    public execute(request: Request, response: Response, options?: any): Promise<any> {
+    public execute(request: Request, options?: any): Promise<any> {
         let config: IConfig = getInstance().getConfig();
 
         let backendAuthHeader: string = config.backend_authentication_header;

package/src/ConfigLoader.ts

@@ -22,7 +22,7 @@ import * as Path from 'path';
 import {Application} from './Application';
 import {IConfig} from './IConfig';
 import Ajv from 'ajv';
-import * as MergeChange from 'merge-change';
+import * as MergeChange from '@breautek/merge-change';
 import { InvalidConfigError } from './InvalidConfigError';
 import { MissingConfigError } from './MissingConfigError';
 

package/src/Database.ts

@@ -75,6 +75,11 @@ export abstract class Database<TDatabaseConfig, TConnectionAPI> {
         return this._getConnection(query, requireWriteAccess);
     }
 
+    public destroy(): Promise<void> {
+        return this._destroy();
+    }
+
+    protected abstract _destroy(): Promise<void>;
     protected abstract _addNode(name: string, config: TDatabaseConfig): void;
     protected abstract _removeNode(name: string): void;
     protected abstract _getConnection(query: string, requireWriteAccess: boolean): Promise<DatabaseConnection<TConnectionAPI>>;

package/src/Handler.ts

@@ -133,9 +133,7 @@ export class Handler<
         return Promise.resolve(result);
     }
 
-    protected _onMiddlewareReject(request: Request, response: Response, error: StormError): void {
-        response.error(error);
-    }
+    protected _onMiddlewareReject(request: Request, response: Response, error: StormError): void {}
 
     private $handleResponse<TResponse>(response: Response<TResponse>, data: any): void {
         response.send(data);

package/src/MySQLDatabase.ts

@@ -56,6 +56,19 @@ export class MySQLDatabase extends Database<MySQL.PoolConfig, MySQL.PoolConnecti
         this.$cluster.remove(nodeID);
     }
 
+    protected _destroy(): Promise<void> {
+        return new Promise<void>((resolve, reject) => {
+            this.$cluster.end((err: MySQL.MysqlError) => {
+                if (err) {
+                    reject(err);
+                    return;
+                }
+
+                resolve();
+            });
+        });
+    }
+
     protected _getConnection(query: string, requireWriteAccess: boolean): Promise<MySQLConnection> {
         getInstance().getLogger().trace(TAG, `Querying connection pool for "${query}".`);
         return new Promise<MySQLConnection>((resolve, reject) => {

package/src/defs/merge-change.d.ts

@@ -14,4 +14,4 @@
    limitations under the License.
 */
 
-declare module 'merge-change';
+declare module '@breautek/merge-change';