anote-server-libs 0.6.3 → 0.6.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -18,19 +18,19 @@
   "dependencies": {
     "@types/memcached": "2.2.10",
     "@types/mssql": "9.1.5",
-    "@types/pg": "8.11.6",
-    "ajv": "8.16.0",
+    "@types/pg": "8.11.10",
+    "ajv": "8.17.1",
     "memcached": "2.2.2",
-    "mssql": "11.0.0",
-    "pg": "8.12.0"
+    "mssql": "11.0.1",
+    "pg": "8.13.1"
   },
   "peerDependencies": {
-    "express": "4.19.2",
-    "winston": "3.13.0"
+    "express": "4.12.1",
+    "winston": "3.17.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.21",
+    "@types/express": "5.0.0",
     "@types/node": "20.12.2",
-    "typescript": "5.5.2"
+    "typescript": "5.6.3"
   }
 }

package/services/WithTransaction.js

@@ -6,8 +6,12 @@ const utils_1 = require("./utils");
 exports.withTransactionConfig = {
     timeoutMillis: 15000
 };
-function withTransaction(repo, logger, previousMethod, lock) {
+function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true) {
     return function (req, res, next) {
+        let commit = true;
+        if (!commitIfLost) {
+            req.once('close', () => commit = false);
+        }
         const endTerminator = res.end.bind(res);
         const jsonTerminator = (obj) => {
             res.write((0, utils_1.jsonStringify)(obj) || '{}');
@@ -31,7 +35,7 @@ function withTransaction(repo, logger, previousMethod, lock) {
             res.locals.dbClientCommit = (cb) => {
                 if (!res.locals.dbClientCommited) {
                     res.locals.dbClientCommited = true;
-                    (repo.db ? dbClient.query('COMMIT') : dbClient.commit()).catch((err) => err).then((err) => {
+                    (commit ? (repo.db ? dbClient.query('COMMIT') : dbClient.commit()) : Promise.reject(new Error('Client lost'))).catch((err) => err).then((err) => {
                         if (repo.db)
                             dbClient.release();
                         if (!(err instanceof Error)) {

package/services/WithTransaction.ts

@@ -13,8 +13,12 @@ export const withTransactionConfig = {
     timeoutMillis: 15000
 };
 
-export function withTransaction(repo: BaseModelRepository, logger: Logger, previousMethod: (req: Request, res: Response, next: NextFunction) => void, lock?: SystemLock) {
+export function withTransaction(repo: BaseModelRepository, logger: Logger, previousMethod: (req: Request, res: Response, next: NextFunction) => void, lock?: SystemLock, commitIfLost = true) {
     return function(req: Request, res: Response, next: NextFunction) {
+        let commit = true;
+        if(!commitIfLost) {
+            req.once('close', () => commit = false);
+        }
         const endTerminator = res.end.bind(res);
         const jsonTerminator = (obj: any) => {
             res.write(jsonStringify(obj) || '{}');
@@ -41,7 +45,7 @@ export function withTransaction(repo: BaseModelRepository, logger: Logger, previ
             res.locals.dbClientCommit = (cb: (err: any) => any) => {
                 if(!res.locals.dbClientCommited) {
                     res.locals.dbClientCommited = true;
-                    (repo.db ? dbClient.query('COMMIT') : dbClient.commit()).catch((err: any) => err).then((err: any) => {
+                    (commit ? (repo.db ? dbClient.query('COMMIT') : dbClient.commit()) : Promise.reject(new Error('Client lost'))).catch((err: any) => err).then((err: any) => {
                         if(repo.db) dbClient.release();
                         if(!(err instanceof Error)) {
                             for(let i = 0; i < res.locals.dbClientOnCommit.length; i++) {

package/tsconfig.json

@@ -14,8 +14,6 @@
     "sourceMap": false,
     "skipDefaultLibCheck": true,
     "skipLibCheck": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "ignoreDeprecations": "5.0",
     "target": "es2021",
     "typeRoots": [
       "node_modules/@types"

package/.vscode/settings.json

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