anote-server-libs 0.2.10 → 0.2.13

package/models/repository/BaseModelRepository.ts

@@ -1,7 +1,7 @@
+import * as crypto from 'crypto';
 import * as fs from 'fs';
 import * as Memcached from 'memcached';
 import {ConnectionPool, Transaction} from 'mssql';
-import {md} from 'node-forge';
 import {ClientBase, Pool} from 'pg';
 import {Logger} from 'winston';
 import { ApiCallRepository } from '../ApiCall';
@@ -53,7 +53,7 @@ export class BaseModelRepository {
                             return {
                                 id: file,
                                 content: content,
-                                hash: md.sha256.create().update(content).digest().toHex()
+                                hash: crypto.createHash('sha256').update(content).digest('hex')
                             };
                         });
                     if(migrationsAvailable.length === 0

package/models/repository/ModelDao.js

@@ -119,7 +119,7 @@ class ModelDao extends Dao {
         else {
             const request = (client || this.poolMssql).request();
             request.input('1', id);
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id=@1').then(q => this.buildObject(q.recordsets[0][0]));
         }
     }
     count(where, inputs = [], client) {
@@ -140,7 +140,7 @@ class ModelDao extends Dao {
         }
         else {
             const request = (client || this.poolMssql).request();
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + ' WHERE id IN ('
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + ' WHERE id IN ('
                 + (ids.length > 0 ? (typeof ids[0] === 'string' ? '\'' + ids.join('\',\'') + '\'' : ids.join(',')) : '') + ')')
                 .then(q => q.recordsets[0].map(r => this.buildObject(r)));
         }
@@ -155,7 +155,7 @@ class ModelDao extends Dao {
             const request = (client || this.poolMssql).request();
             if (where)
                 where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
-            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
+            return request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
                 + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : ''))
                 .then(q => q.recordsets[0].map(r => this.buildObject(r)));
         }
@@ -174,7 +174,7 @@ class ModelDao extends Dao {
             if (where)
                 where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
             return Promise.allConcurrent(1)([
-                () => request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
+                () => request.query('SELECT * FROM ' + this.table + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '')
                     + (order ? (' ORDER BY ' + order) : '') + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
                 () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
             ]).then(([q1, q2]) => ({
@@ -198,7 +198,7 @@ class ModelDao extends Dao {
                 where.match(/(@\d+)/g).forEach((match, i) => request.input(match.substr(1), inputs[i]));
             return Promise.allConcurrent(1)([
                 () => request.query('SELECT ' + rows.map(r => '"' + r + '"').join(',') + ' FROM ' + this.table
-                    + ((client && lock) ? ' WITH (ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
+                    + ((client && lock) ? ' WITH (UPDLOCK, ROWLOCK)' : '') + (where ? (' WHERE ' + where) : '') + (order ? (' ORDER BY ' + order) : '')
                     + (offset !== undefined ? (' OFFSET ' + offset + ' ROWS') : '') + (limit !== undefined ? (' FETCH NEXT ' + limit + ' ROWS ONLY') : '')),
                 () => request.query('SELECT COUNT(DISTINCT id) AS cnt FROM ' + this.table + (where ? (' WHERE ' + where) : ''))
             ]).then(([q1, q2]) => ({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.2.10",
+  "version": "0.2.13",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -17,22 +17,20 @@
   "license": "MIT",
   "dependencies": {
     "@types/memcached": "2.2.7",
-    "@types/mssql": "7.1.4",
-    "@types/pg": "8.6.4",
+    "@types/mssql": "7.1.5",
+    "@types/pg": "8.6.5",
     "memcached": "2.2.2",
-    "mssql": "8.0.2",
+    "mssql": "8.1.0",
     "pg": "8.7.3"
   },
   "peerDependencies": {
     "express": "^4.17.3",
     "jsonschema": "^1.4.0",
-    "node-forge": "^1.2.1",
-    "winston": "3.6.0"
+    "winston": "^3.7.2"
   },
   "devDependencies": {
     "@types/express": "4.17.13",
     "@types/node": "14.18.2",
-    "@types/node-forge": "1.0.0",
-    "typescript": "4.5.5"
+    "typescript": "4.6.3"
   }
 }

package/services/WithTransaction.js

@@ -12,7 +12,7 @@ function withTransaction(repo, logger, previousMethod, lock) {
         const connectTimeoutHandler = setTimeout(() => {
             logger.error('Error timed out getting a client, exiting...');
             process.exit(22);
-        }, 3000);
+        }, 15000);
         Promise.all([
             repo.db ? repo.db.connect() : Promise.resolve(undefined),
             repo.dbMssql ? Promise.resolve(repo.dbMssql.transaction()) : Promise.resolve(undefined)
@@ -117,12 +117,6 @@ function withTransaction(repo, logger, previousMethod, lock) {
                 else {
                     finish();
                 }
-            }).catch((err) => {
-                if (repo.db)
-                    dbClient.release();
-                else
-                    dbClient.rollback();
-                throw err;
             });
         }).catch(err => {
             res.status(500).json({

package/services/WithTransaction.ts

@@ -19,7 +19,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);
-        }, 3000);
+        }, 15000);
         Promise.all([
             repo.db ? repo.db.connect() : Promise.resolve(undefined),
             repo.dbMssql ? Promise.resolve(repo.dbMssql.transaction()) : Promise.resolve(undefined)