anote-server-libs 0.3.2 → 0.3.3

package/models/repository/BaseModelRepository.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseModelRepository = void 0;
+const crypto = require("crypto");
 const fs = require("fs");
-const node_forge_1 = require("node-forge");
 const ApiCall_1 = require("../ApiCall");
 const Migration_1 = require("../Migration");
 class BaseModelRepository {
@@ -23,7 +23,7 @@ class BaseModelRepository {
         this.Migration = new Migration_1.MigrationRepository(db, dbMssql, logger);
         this.ApiCall = new ApiCall_1.ApiCallRepository(db, dbMssql, logger);
     }
-    migrate(migrationsPath, callback) {
+    migrate(migrationsPath, callback, onlyAboveOrEquals = 0) {
         (this.db ? this.db.query('CREATE TABLE IF NOT EXISTS migration (' +
             'id integer PRIMARY KEY,' +
             'hash text NOT NULL,' +
@@ -51,19 +51,19 @@ class BaseModelRepository {
                         return {
                             id: file,
                             content: content,
-                            hash: node_forge_1.md.sha256.create().update(content).digest().toHex()
+                            hash: crypto.createHash('sha256').update(content).digest('hex')
                         };
                     });
                     if (migrationsAvailable.length === 0
                         || migrationsAvailable.length
                             !== migrationsAvailable[migrationsAvailable.length - 1].id)
                         process.exit(5);
-                    let highestCommon = 0;
+                    let highestCommon = onlyAboveOrEquals;
                     while (highestCommon < migrations.length && highestCommon < migrationsAvailable.length
                         && migrations[highestCommon].hash === migrationsAvailable[highestCommon].hash)
                         highestCommon++;
                     this.applyDownUntil(migrations, migrations.length, highestCommon).then(() => {
-                        this.applyUpUntil(migrationsAvailable, highestCommon, migrationsAvailable.length).then(callback, process.exit);
+                        this.applyUpUntil(migrationsAvailable, Math.min(highestCommon, migrations.length), migrationsAvailable.length).then(callback, process.exit);
                     }, process.exit);
                 });
             }, () => process.exit(3));

package/models/repository/ModelDao.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModelDao = exports.promiseAllStepN = void 0;
+exports.ModelDao = exports.Dao = exports.promiseAllStepN = void 0;
 function promiseAllStepN(n, list) {
     if (!list || !list.length)
         return Promise.resolve([]);
@@ -74,18 +74,11 @@ class Dao {
             return request.query('UPDATE ' + this.table + ' SET ' + this.updateDefinition + ' WHERE id=@' + (this.nFields + 1)).then(() => instance.id);
         }
     }
-    replace(instance, client) {
-        if (instance.archivedOn)
-            return Promise.reject('Record archived!');
-        return this.create({ ...instance, replaced_id: instance.id }, client).then(id => {
-            return this.archive(instance.id, id, client).then(() => id);
-        });
-    }
     create(instance, client) {
         instance.createdOn = instance.updatedOn = new Date();
         if (this.pool) {
             const props = this.serialize(instance);
-            return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '') + ')'
+            return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
                 + ' VALUES(' + new Array(this.nFields).fill(undefined).map((_, i) => '$' + (i + 1)).join(',') + ') RETURNING id', props).then(q => {
                 const idNum = parseInt(q.rows[0].id, 10);
                 if (String(idNum) !== q.rows[0].id)
@@ -108,7 +101,7 @@ class Dao {
         const now = new Date();
         instances.forEach(instance => instance.updatedOn = now);
         const props = [].concat.apply([], instances.map(instance => this.serialize(instance)));
-        return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '') + ')'
+        return (client || this.pool).query('INSERT INTO ' + this.table + '(' + this.updateDefinition.replace(/=\$\d+/g, '').replace(/=[^)]+\)/g, '') + ')'
             + ' VALUES' + instances.map((_, j) => ('(' + new Array(this.nFields).fill(undefined).map((__, i) => '$' + (j * this.nFields + i + 1)).join(', ') + ')')).join(',') + ' RETURNING id', props).then(q => q.rows.map(r => {
             const idNum = parseInt(r.id, 10);
             if (String(idNum) !== q.rows[0].id)
@@ -117,6 +110,7 @@ class Dao {
         }));
     }
 }
+exports.Dao = Dao;
 class ModelDao extends Dao {
     get(id, client, lock = true) {
         if (this.pool) {
@@ -125,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) {
@@ -146,9 +140,9 @@ 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)));
+                .then(q => q.recordsets[0].map((r) => this.buildObject(r)));
         }
     }
     getAllBy(order, offset, limit, where, inputs = [], client, lock = true) {
@@ -161,9 +155,9 @@ 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)));
+                .then(q => q.recordsets[0].map((r) => this.buildObject(r)));
         }
     }
     getViewCountBy(order, offset, limit, where, inputs = [], client, lock = true) {
@@ -180,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]) => ({
@@ -204,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]) => ({
@@ -224,6 +218,13 @@ class ModelDao extends Dao {
             return request.query('UPDATE ' + this.table + ' SET "archivedOn"=now(),replaced_by_id=@1 WHERE id=@2');
         }
     }
+    replace(instance, client) {
+        if (instance.archivedOn)
+            return Promise.reject('Record archived!');
+        return this.create({ ...instance, replaced_id: instance.id }, client).then(id => {
+            return this.archive(instance.id, id, client).then(() => id);
+        });
+    }
     delete(id, client) {
         if (this.pool) {
             return client.query('DELETE FROM ' + this.table + ' WHERE id=$1', [id]);

package/models/repository/ModelDao.ts

@@ -166,7 +166,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
             const request = (<Transaction | ConnectionPool>(client || this.poolMssql)).request();
             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)));
+                .then(q => q.recordsets[0].map((r: any) => this.buildObject(r)));
         }
     }
 
@@ -180,7 +180,7 @@ export abstract class ModelDao<R, T extends Model<R>> extends Dao<R, T> {
             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 (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)));
+                .then(q => q.recordsets[0].map((r: any) => this.buildObject(r)));
         }
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "anote-server-libs",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "description": "Helpers for express-TS servers",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

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({