anote-server-libs 0.5.2 → 0.6.0

package/models/repository/ModelDao.js

@@ -8,23 +8,33 @@ function promiseAllStepN(n, list) {
     const head = list;
     const resolved = [];
     let processed = 0;
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         head.forEach(x => {
-            const res = x();
-            resolved.push(res);
-            res.then((y) => {
+            const res = x().then(y => {
+                runNext();
+                return [true, y];
+            }).catch(y => {
                 runNext();
-                return y;
+                return [false, y];
             });
+            resolved.push(res);
         });
         function runNext() {
             if (processed === tail.length) {
-                resolve(Promise.all(resolved));
+                Promise.all(resolved).then(ys => {
+                    const ny = ys.find(y => !y[0]);
+                    if (ny)
+                        return reject(ny[1]);
+                    resolve(ys.map(y => y[1]));
+                });
             }
             else {
-                resolved.push(tail[processed]().then((x) => {
+                resolved.push(tail[processed]().then(y => {
+                    runNext();
+                    return [true, y];
+                }).catch(y => {
                     runNext();
-                    return x;
+                    return [false, y];
                 }));
                 processed++;
             }

package/models/repository/ModelDao.ts

@@ -13,22 +13,31 @@ export function promiseAllStepN<T>(n: number, list: (() => Promise<T>)[]): Promi
     const head = list;
     const resolved: any[] = [];
     let processed = 0;
-    return new Promise(resolve => {
+    return new Promise((resolve, reject) => {
         head.forEach(x => {
-            const res = x();
-            resolved.push(res);
-            res.then((y: any) => {
+            const res = x().then(y => {
+                runNext();
+                return [true, y];
+            }).catch(y => {
                 runNext();
-                return y;
+                return [false, y];
             });
+            resolved.push(res);
         });
         function runNext() {
             if(processed === tail.length) {
-                resolve(Promise.all(resolved));
+                Promise.all(resolved).then(ys => {
+                    const ny = ys.find(y => !y[0]);
+                    if(ny) return reject(ny[1]);
+                    resolve(ys.map(y => y[1]));
+                });
             } else {
-                resolved.push(tail[processed]().then((x: any) => {
+                resolved.push(tail[processed]().then(y => {
+                    runNext();
+                    return [true, y];
+                }).catch(y => {
                     runNext();
-                    return x;
+                    return [false, y];
                 }));
                 processed++;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.5.2",
+  "version": "0.6.0",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -29,8 +29,8 @@
     "winston": "3.11.0"
   },
   "devDependencies": {
-    "@types/express": "4.17.20",
+    "@types/express": "4.17.21",
     "@types/node": "18.15.0",
-    "typescript": "5.2.2"
+    "typescript": "5.3.3"
   }
 }

package/services/WithTransaction.js

@@ -1,7 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.withTransaction = void 0;
+exports.withTransaction = exports.withTransactionConfig = void 0;
 const utils_1 = require("./utils");
+exports.withTransactionConfig = {
+    timeoutMillis: 15000
+};
 function withTransaction(repo, logger, previousMethod, lock) {
     return function (req, res, next) {
         const endTerminator = res.end.bind(res);
@@ -12,7 +15,7 @@ function withTransaction(repo, logger, previousMethod, lock) {
         const connectTimeoutHandler = setTimeout(() => {
             logger.error('Error timed out getting a client, exiting...');
             process.exit(22);
-        }, 15000);
+        }, exports.withTransactionConfig.timeoutMillis);
         Promise.all([
             repo.db ? repo.db.connect() : Promise.resolve(undefined),
             repo.dbMssql ? Promise.resolve(repo.dbMssql.transaction()) : Promise.resolve(undefined)

package/services/WithTransaction.ts

@@ -5,9 +5,14 @@ import {jsonStringify, utils} from './utils';
 
 export const enum SystemLock {
     CHECK_CROSSING = 1,
-    FLUSH_CALLS = 2
+    FLUSH_CALLS = 2,
+    TX_CHECK = 3
 }
 
+export const withTransactionConfig = {
+    timeoutMillis: 15000
+};
+
 export function withTransaction(repo: BaseModelRepository, logger: Logger, previousMethod: (req: Request, res: Response, next: NextFunction) => void, lock?: SystemLock) {
     return function(req: Request, res: Response, next: NextFunction) {
         const endTerminator = res.end.bind(res);
@@ -19,7 +24,7 @@ export function withTransaction(repo: BaseModelRepository, logger: Logger, previ
             // Timed out getting a client, restart worker or process...
             logger.error('Error timed out getting a client, exiting...');
             process.exit(22);
-        }, 15000);
+        }, withTransactionConfig.timeoutMillis);
         Promise.all([
             repo.db ? repo.db.connect() : Promise.resolve(undefined),
             repo.dbMssql ? Promise.resolve(repo.dbMssql.transaction()) : Promise.resolve(undefined)