Merge branch 'error-handling' into v2.1.0

Author: Drew

src/database/base-db.ts

@@ -8,9 +8,6 @@ export class BaseDb {
 	// Database logging function
 	public logger: Function = (message, body?) => console.log(message, body);
 
-	// Database error function
-	public errorHandler: Function = (error) => console.error(error);
-
 	// Database entities
 	public entities: any[] = [ ExampleUser ];
 

src/database/postgres.ts

@@ -14,60 +14,68 @@ export class PointyPostgres extends BaseDb {
 	 * 	a string to load from file, or pass the object directly).  Database
 	 * 	will rely on `process.env.DATABASE_URL` if this is not set.
 	 */
-	public async connect(options?: string | Object): Promise<Connection> {
-		let pgOptions: any;
+	public connect(options?: string | Object): Promise<Connection> {
+		return new Promise(async (accept, reject) => {
+			let pgOptions: any;
 
-		if (process.env.DATABASE_URL) {
-			// Live
-			pgOptions = PostgressConnectionStringParser.parse(
-				process.env.DATABASE_URL
-			);
-			pgOptions.type = 'postgres';
+			if (process.env.DATABASE_URL) {
+				// Live
+				pgOptions = PostgressConnectionStringParser.parse(
+					process.env.DATABASE_URL
+				);
+				pgOptions.type = 'postgres';
 
-			this.logger('Using production database');
-			this.logger(
-				'Using database driver',
-				process.env.TYPEORM_DRIVER_TYPE || pgOptions.type
-			);
-		}
-		else {
-			// Local
-			if (typeof options === 'string') {
-				pgOptions = require(path.join(
-					options.toString(),
-					'local.config.json'
-				));
+				this.logger('Using production database');
+				this.logger(
+					'Using database driver',
+					process.env.TYPEORM_DRIVER_TYPE || pgOptions.type
+				);
 			}
 			else {
-				pgOptions = options;
-			}
+				// Local
+				if (typeof options === 'string') {
+					pgOptions = require(path.join(
+						options.toString(),
+						'local.config.json'
+					));
+				}
+				else {
+					pgOptions = options;
+				}
 
-			this.logger('Using development database');
-			this.logger(
-				'Using database driver',
-				process.env.TYPEORM_DRIVER_TYPE || pgOptions.type
-			);
+				this.logger('Using development database');
+				this.logger(
+					'Using database driver',
+					process.env.TYPEORM_DRIVER_TYPE || pgOptions.type
+				);
 
-			this.shouldSync = true;
-		}
+				this.shouldSync = true;
+			}
 
-		// Create connection
-		this.conn = await createConnection(<ConnectionOptions>{
-			name: this.connectionName,
-			type: process.env.TYPEORM_DRIVER_TYPE || pgOptions.type,
-			driver: process.env.TYPEORM_DRIVER_TYPE || pgOptions.type,
-			host: pgOptions.host,
-			port: pgOptions.port,
-			username: pgOptions.user,
-			password: pgOptions.password,
-			database: pgOptions.database,
-			entities: this.entities,
-			synchronize: this.shouldSync,
-			uuidExtension: pgOptions.uuidExtension
-				? pgOptions.uuidExtension
-				: 'pgcrypto'
-		}).catch((error) => this.errorHandler(error));
+			// Create connection
+			const conn = await createConnection(<ConnectionOptions>{
+				name: this.connectionName,
+				type: process.env.TYPEORM_DRIVER_TYPE || pgOptions.type,
+				driver: process.env.TYPEORM_DRIVER_TYPE || pgOptions.type,
+				host: pgOptions.host,
+				port: pgOptions.port,
+				username: pgOptions.user,
+				password: pgOptions.password,
+				database: pgOptions.database,
+				entities: this.entities,
+				synchronize: this.shouldSync,
+				uuidExtension: pgOptions.uuidExtension
+					? pgOptions.uuidExtension
+					: 'pgcrypto'
+			}).catch((error) => {
+				reject(error);
+				return false;
+			});
 
-		return this.conn;
+			if (conn && conn instanceof Connection) {
+				this.conn = conn;
+				accept(this.conn);
+			}
+		});
 	}
 }

src/pointy-core.ts

@@ -71,7 +71,6 @@ export class PointyApi {
 		// Default db
 		this.db = new PointyPostgres();
 		this.db.logger = this.log;
-		this.db.errorHandler = this.error;
 
 		if (process.argv.includes('testmode')) {
 			this.testmode = true;

test/spec/api/database/base-db.spec.ts

@@ -37,15 +37,4 @@ describe('[BaseDb]', () => {
 		this.baseDb.logger();
 		expect(result).toBe(true);
 	});
-
-	it('can log an error', () => {
-		let result = false;
-
-		console.error = () => {
-			result = true;
-		};
-
-		this.baseDb.errorHandler();
-		expect(result).toBe(true);
-	});
 });

test/spec/api/database/postgres.spec.ts

@@ -35,7 +35,6 @@ describe('[Database: Postgres]', async () => {
 	it('can connect with json options', async () => {
 		const db = new PointyPostgres();
 		db.connectionName = 'jsonconn';
-		db.errorHandler = (error) => fail(error);
 		db.logger = () => {};
 
 		// Database