chore: publish 0.2.3

Author: ifaim

lib/express-casandra-core.module.ts

@@ -1,4 +1,13 @@
-import { DynamicModule, Module, Global, Provider } from '@nestjs/common';
+import {
+  DynamicModule,
+  Module,
+  Global,
+  Provider,
+  OnModuleDestroy,
+  Inject,
+  Logger,
+} from '@nestjs/common';
+import { ModuleRef } from '@nestjs/core';
 import {
   ExpressCassandraModuleOptions,
   ExpressCassandraModuleAsyncOptions,
@@ -7,10 +16,18 @@ import {
 import { EXPRESS_CASSANDRA_MODULE_OPTIONS } from './express-cassandra.constant';
 import { getConnectionToken, handleRetry } from './utils/cassandra-orm.utils';
 import { createClient } from 'express-cassandra';
+import { defer } from 'rxjs';
+import { map } from 'rxjs/operators';
 
 @Global()
 @Module({})
-export class ExpressCassandraCoreModule {
+export class ExpressCassandraCoreModule implements OnModuleDestroy {
+  constructor(
+    @Inject(EXPRESS_CASSANDRA_MODULE_OPTIONS)
+    private readonly options: ExpressCassandraModuleOptions,
+    private readonly moduleRef: ModuleRef,
+  ) {}
+
   static forRoot(options: ExpressCassandraModuleOptions = {}): DynamicModule {
     const expressModuleOptions = {
       provide: EXPRESS_CASSANDRA_MODULE_OPTIONS,
@@ -45,6 +62,15 @@ export class ExpressCassandraCoreModule {
     };
   }
 
+  async onModuleDestroy() {
+    if (this.options.keepConnectionAlive) {
+      return;
+    }
+    Logger.log('Closing connection', 'ExpressCassandraModule');
+    const connection = this.moduleRef.get(getConnectionToken(this.options));
+    connection && (await connection.closeAsync());
+  }
+
   private static createAsyncProviders(
     options: ExpressCassandraModuleAsyncOptions,
   ): Provider[] {
@@ -81,7 +107,13 @@ export class ExpressCassandraCoreModule {
   private static async createConnectionFactory(
     options: ExpressCassandraModuleOptions,
   ): Promise<any> {
-    const { name, retryAttempts, retryDelay, ...cassandraOptions } = options;
-    return await createClient(cassandraOptions);
+    const { retryAttempts, retryDelay, ...cassandraOptions } = options;
+    const client = await createClient(cassandraOptions);
+    return await defer(() => client.initAsync())
+      .pipe(
+        handleRetry(retryAttempts, retryDelay),
+        map(() => client),
+      )
+      .toPromise();
   }
 }

lib/express-cassandra.providers.ts

@@ -1,7 +1,6 @@
 import {
   getModelToken,
   getConnectionToken,
-  handleRetry,
   getRepositoryToken,
 } from './utils/cassandra-orm.utils';
 import { EXPRESS_CASSANDRA_MODULE_OPTIONS } from './express-cassandra.constant';
@@ -16,9 +15,7 @@ export function createExpressCassandraProviders(
   const providerModel = entity => ({
     provide: getModelToken(entity),
     useFactory: async (client: any, options) => {
-      return await defer(() => loadModel(client, entity))
-        .pipe(handleRetry(options.retryAttempts, options.retryDelay))
-        .toPromise();
+      return await defer(() => loadModel(client, entity)).toPromise();
     },
     inject: [getConnectionToken(connection), EXPRESS_CASSANDRA_MODULE_OPTIONS],
   });

lib/interfaces/express-cassandra-module-options.interface.ts

@@ -6,6 +6,7 @@ export type ExpressCassandraModuleOptions = {
   name?: string;
   retryAttempts?: number;
   retryDelay?: number;
+  keepConnectionAlive?: boolean;
 } & Partial<ClientOptionsStatic>;
 
 export interface ExpressCassandraOptionsFactory {

lib/orm/interfaces/column-options.interface.ts

@@ -3,13 +3,11 @@ import { ColumnType, DataType } from './data.type';
 export interface ColumnOptions {
   type?: ColumnType | DataType;
   typeDef?: string;
-  default?: string | (() => any) | { $db_function: dbFunctionType };
+  default?: string | (() => any) | { $db_function: string };
   virtual?: { get?: any; set?: any };
   rule?: ColumnRuleOptions | ((value: any) => boolean);
 }
 
-export type dbFunctionType = 'uuid()' | 'timeuuid()';
-
 export interface ColumnRuleOptions {
   validator?: (value: any) => boolean;
   validators?: any[];

lib/orm/utils/model.utils.ts

@@ -1,13 +1,15 @@
 import { getAttributes, getOptions } from './decorator.utils';
+import { Logger } from '@nestjs/common';
 
 export function loadModel(client, entity): Promise<any> {
   const schema = getSchema(entity);
   const modelName = entity.name || entity.table_name;
   const model = client.loadSchema(modelName, schema);
-  return new Promise((resolve, reject) => {
+  return new Promise(resolve => {
     model.syncDB(err => {
       if (err) {
-        return reject(err);
+        Logger.error(err.message, err.stack, 'ExpressCassandraModule');
+        return resolve(model);
       }
       return resolve(model);
     });

lib/utils/cassandra-orm.utils.ts

@@ -14,7 +14,7 @@ export function handleRetry(
             Logger.error(
               `Unable to connect to the database. Retrying (${errorCount +
                 1})...`,
-              error.message,
+              error.stack,
               'ExpressCassandraModule',
             );
             if (errorCount + 1 >= retryAttempts) {
@@ -39,8 +39,8 @@ export function getConnectionToken(
   return 'string' === typeof connection
     ? `${connection}Connection`
     : connection.name
-      ? `${connection.name}Connection`
-      : 'defaultConnection';
+    ? `${connection.name}Connection`
+    : 'defaultConnection';
 }
 
 /**

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@iaminfinity/express-cassandra",
-  "version": "0.2.2",
+  "version": "0.2.3",
   "description": "Nest - modern, fast, powerful node.js web framework (@express-cassandra)",
   "author": {
     "name": "Fahim Rahman",
@@ -62,4 +62,4 @@
   "engines": {
     "node": ">=4.2.4"
   }
-}
+}