anote-server-libs 0.8.2 → 0.9.2

package/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "typescript.tsdk": "node_modules\\typescript\\lib"
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.8.2",
+  "version": "0.9.2",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -17,19 +17,19 @@
   "license": "MIT",
   "dependencies": {
     "@types/memcached": "2.2.10",
-    "@types/mssql": "9.1.6",
-    "@types/pg": "8.11.10",
+    "@types/mssql": "9.1.8",
+    "@types/pg": "8.15.6",
     "ajv": "8.17.1",
     "memcached": "2.2.2",
-    "mssql": "11.0.1",
-    "pg": "8.13.1"
+    "mssql": "12.1.1",
+    "pg": "8.16.3"
   },
   "peerDependencies": {
-    "express": "4.21.2",
-    "winston": "3.17.0"
+    "express": "5.1.0",
+    "winston": "3.18.3"
   },
   "devDependencies": {
-    "@types/express": "5.0.0",
-    "@types/node": "22.10.7",
+    "@types/express": "5.0.5",
+    "@types/node": "22.12.0",
     "typescript": "5.7.3"  }
 }

package/services/WithTransaction.js

@@ -32,8 +32,12 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
             const dbClient = c1 || c2;
             clearTimeout(connectTimeoutHandler);
             utils_1.utils.logger = logger;
-            dbClient.removeListener('error', utils_1.utils.clientErrorHandler);
-            dbClient.on('error', utils_1.utils.clientErrorHandler);
+            if (logger.level === 'debug') {
+                dbClient.removeAllListeners('query');
+                dbClient.on('query', (q) => logger.debug('SQL [Client %d] QUERY: %s', dbClient.processID, q.text));
+            }
+            dbClient.removeAllListeners('error');
+            dbClient.on('error', (err) => utils_1.utils.clientErrorHandler(err, dbClient));
             res.locals.dbClient = dbClient;
             res.locals.dbClientCommited = false;
             res.locals.dbClientCommit = (cb) => {
@@ -57,6 +61,9 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
             res.locals.dbClientOnCommit = [];
             return (repo.db ? dbClient.query('BEGIN') : dbClient.begin()).then(() => {
                 const finish = () => {
+                    res.send = () => {
+                        throw new Error('res.send() should not be used within transactions. Use res.json() instead.');
+                    };
                     res.json = (obj) => {
                         if (res.statusCode > 303 && res.statusCode !== 412) {
                             if (logger) {
@@ -134,8 +141,12 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
                 else {
                     finish();
                 }
+            }).catch((err) => {
+                dbClient.release();
+                throw err;
             });
         }).catch(err => {
+            clearTimeout(connectTimeoutHandler);
             res.status(500).json({
                 error: {
                     errorKey: 'internal.db',

package/services/WithTransaction.ts

@@ -38,8 +38,12 @@ export function withTransaction(repo: BaseModelRepository, logger: Logger, previ
             clearTimeout(connectTimeoutHandler);
             // On error, will rollback...
             utils.logger = logger;
-            dbClient.removeListener('error', utils.clientErrorHandler);
-            dbClient.on('error', utils.clientErrorHandler);
+            if(logger.level === 'debug') {
+                dbClient.removeAllListeners('query');
+                dbClient.on('query', (q: any) => logger.debug('SQL [Client %d] QUERY: %s', dbClient.processID, q.text));
+            }
+            dbClient.removeAllListeners('error');
+            dbClient.on('error', (err: any) => utils.clientErrorHandler(err, dbClient));
 
             res.locals.dbClient = dbClient;
             res.locals.dbClientCommited = false;
@@ -62,6 +66,9 @@ export function withTransaction(repo: BaseModelRepository, logger: Logger, previ
             res.locals.dbClientOnCommit = [];
             return (repo.db ? dbClient.query('BEGIN') : dbClient.begin()).then(() => {
                 const finish = () => {
+                    res.send = () => {
+                        throw new Error('res.send() should not be used within transactions. Use res.json() instead.');
+                    };
                     res.json = (obj: any) => {
                         if(res.statusCode > 303 && res.statusCode !== 412) {
                             if(logger) {
@@ -125,14 +132,19 @@ export function withTransaction(repo: BaseModelRepository, logger: Logger, previ
                                 additionalInfo: {message: err.message}
                             }
                         });
-                        dbClient.release();
+                        dbClient.release();  // Lock acquisition failed, release will also rollback
                     });
                 } else {
                     finish();
                 }
+            }).catch((err: any) => {
+                // Error beginning transaction
+                dbClient.release();
+                throw err;
             });
         }).catch(err => {
-            // Error connecting to database or acquiring transaction, restarting worker after the timeout as well...
+            // Error connecting to database for other reason than timeout or beginning transaction
+            clearTimeout(connectTimeoutHandler);
             res.status(500).json({
                 error: {
                     errorKey: 'internal.db',

package/services/utils.js

@@ -17,8 +17,8 @@ function atob(str) {
 function btoa(str) {
     return Buffer.from(str).toString('base64');
 }
-function clientErrorHandle(err) {
-    this.error('Error on DB client: %j', err);
+function clientErrorHandle(err, dbClient) {
+    this.error('SQL [Client %d] ERROR: %j', dbClient.processID, err);
 }
 exports.utils = {
     clientErrorHandler: undefined

package/services/utils.ts

@@ -10,8 +10,8 @@ export function btoa(str: string): string {
     return Buffer.from(str).toString('base64');
 }
 
-export function clientErrorHandle(this: Logger, err: any) {
-    this.error('Error on DB client: %j', err);
+export function clientErrorHandle(this: Logger, err: any, dbClient: any) {
+    this.error('SQL [Client %d] ERROR: %j', dbClient.processID, err);
 }
 export const utils: {[id: string]: any} = {
     clientErrorHandler: undefined