@trenskow/pged 4.1.2 → 4.1.5

package/.vscode/settings.json

@@ -1,6 +1,7 @@
 {
 	"cSpell.words": [
 		"caseit",
+		"pged",
 		"trenskow"
 	]
-}
+}

package/event-emitter.js

@@ -0,0 +1,43 @@
+'use strict';
+
+module.exports = exports = class EventEmitter {
+
+	constructor() {
+		this._identifier = -1;
+		this._listeners = {};
+	}
+
+	on(name, handler) {
+		this._listeners[name] = this._listeners[name] || [];
+		this._listeners[name].push({
+			handler,
+			identifier: ++this._identifier
+		});
+		return this._identifier;
+	}
+
+	remove(name, identifier) {
+		if (typeof this._listeners[name] === 'undefined') return;
+		this._listeners[name] = this._listeners[name].filter((listener) => {
+			return listener.handler !== identifier && listener.identifier !== identifier;
+		});
+	}
+
+	once(name, handler) {
+		const identifier = this.on(name, async (...args) => {
+			this.remove(name, identifier);
+			await handler(...args);
+		});
+	}
+
+	removeAll(name) {
+		this._identifier[name] = undefined;
+	}
+
+	async emit(name, ...args) {
+		await Promise.all((this._listeners[name] || []).map(async (listener) => {
+			await listener.handler(...args);
+		}));
+	}
+
+};

package/index.js

@@ -6,14 +6,15 @@ const
 	{ Pool } = require('pg');
 
 const
-	QueryBuilder = require('./query-builder');
+	QueryBuilder = require('./query-builder'),
+	EventEmitter = require('./event-emitter');
 
 let id = 0;
 
 let pgOptions;
 let pool;
 
-module.exports = exports = class PGed {
+module.exports = exports = class PGed extends EventEmitter {
 
 	static get pg() {
 		return pgOptions;
@@ -30,6 +31,8 @@ module.exports = exports = class PGed {
 
 	constructor(options = {}) {
 
+		super();
+
 		pool = pool || new Pool(pgOptions);
 
 		options.casing = options.casing || {};
@@ -105,6 +108,7 @@ module.exports = exports = class PGed {
 		this._connectionCount++;
 		if (this._connectionCount == 1) {
 			this._client = await pool.connect();
+			await this.emit('connected');
 		}
 	}
 
@@ -113,6 +117,7 @@ module.exports = exports = class PGed {
 		if (this._connectionCount == 0) {
 			await this._client.release();
 			this._client = undefined;
+			await this.emit('disconnected');
 		}
 	}
 
@@ -151,6 +156,7 @@ module.exports = exports = class PGed {
 					await this.set.transactionMode[this._transactions.mode]();
 				}
 				await this._query('begin;');
+				await this.emit('startedTransaction');
 			}
 		});
 	}
@@ -160,7 +166,9 @@ module.exports = exports = class PGed {
 			opt.rethrow = opt.rethrow !== false;
 			this._transactions.count--;
 			if (this._transactions.count == 0) {
-				await this._query(err || !this._commit ? 'rollback;' : 'commit;');
+				const shouldCommit = typeof err === 'undefined' && this._commit;
+				await this._query(shouldCommit ? 'commit;' : 'rollback;');
+				await this.emit('endedTransaction', err, shouldCommit);
 			}
 			await this._release();
 			if (err && opt.rethrow) throw err;
@@ -212,8 +220,14 @@ module.exports = exports = class PGed {
 
 		const todo = async () => result = this._convertResult(await this._query(query, parameters), options);
 
-		if (this._transactions.always || options.transaction) await this.transaction(todo);
-		else await this.retained(todo);
+		await this.emit('preQuery', query, parameters);
+
+		try {
+			if (this._transactions.always || options.transaction) await this.transaction(todo);
+			else await this.retained(todo);
+		} finally {
+			await this.emit('query', query, parameters);
+		}
 
 		if (options.first === true) {
 			return (result || [])[0];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@trenskow/pged",
-  "version": "4.1.2",
+  "version": "4.1.5",
   "description": "Just a silly little db management and query builder for PostgreSQL.",
   "main": "index.js",
   "scripts": {
@@ -25,6 +25,6 @@
     "@trenskow/caseit": "^1.1.4",
     "@trenskow/custom-promise": "^0.10.1",
     "pg": "^8.7.3",
-    "puqeue": "^1.0.5"
+    "puqeue": "^1.0.6"
   }
 }