anote-server-libs 0.12.2 → 0.12.4

package/services/WithBody.ts

@@ -1,65 +1,65 @@
-import {Request, Response} from 'express';
-import Ajv, {_} from 'ajv';
-
-export const ajv = new Ajv();
-ajv.addKeyword({
-    keyword: 'maxDigits',
-    type: 'number',
-    schemaType: 'number',
-    validate: (schema: number, data: any) => typeof data === 'number' && Math.round(data * 10 ** schema) / (10 ** schema) === data
-});
-
-export function WithBody(schema: any, collapseTopLevelNulls = true) {
-    if(schema.type === 'object') {
-        const required: string[] = [];
-        const keys = Object.getOwnPropertyNames(schema.properties);
-        keys.forEach(key => {
-            if(schema.properties[key].required === true) {
-                required.push(key);
-            }
-            if(schema.properties[key].required === true || schema.properties[key].required === false) {
-                delete schema.properties[key].required;
-            }
-        });
-        schema.required = required;
-    }
-    const validate = ajv.compile(schema);
-    return function(_: any, __: string, descriptor: PropertyDescriptor) {
-        if(typeof descriptor.value === 'function') {
-            const previousMethod = descriptor.value;
-            descriptor.value = function(this: any, req: Request, res: Response) {
-                if(req.method.toUpperCase() !== 'POST' && req.method.toUpperCase() !== 'PUT') {
-                    return previousMethod.call(this, req, res);
-                }
-                if(!req.body) {
-                    res.status(400).json({
-                        error: {
-                            errorKey: 'client.body.missing',
-                            additionalInfo: 'client.extended.badPayload'
-                        }
-                    });
-                } else {
-                    if(collapseTopLevelNulls) {
-                        Object.keys(req.body).forEach(k => {
-                            if(req.body[k] === null) delete req.body[k];
-                        });
-                    }
-                    const valid = validate(req.body);
-                    if(valid) {
-                        return previousMethod.call(this, req, res);
-                    } else {
-                        res.status(400).json({
-                            error: {
-                                errorKey: 'client.body.missing',
-                                additionalInfo: 'client.extended.badPayload',
-                                detailedInfo: validate.errors
-                            }
-                        });
-                    }
-                }
-            };
-            return descriptor;
-        }
-        return undefined;
-    };
-}
+import {Request, Response} from 'express';
+import Ajv, {_} from 'ajv';
+
+export const ajv = new Ajv();
+ajv.addKeyword({
+    keyword: 'maxDigits',
+    type: 'number',
+    schemaType: 'number',
+    validate: (schema: number, data: any) => typeof data === 'number' && Math.round(data * 10 ** schema) / (10 ** schema) === data
+});
+
+export function WithBody(schema: any, collapseTopLevelNulls = true) {
+    if(schema.type === 'object') {
+        const required: string[] = [];
+        const keys = Object.getOwnPropertyNames(schema.properties);
+        keys.forEach(key => {
+            if(schema.properties[key].required === true) {
+                required.push(key);
+            }
+            if(schema.properties[key].required === true || schema.properties[key].required === false) {
+                delete schema.properties[key].required;
+            }
+        });
+        schema.required = required;
+    }
+    const validate = ajv.compile(schema);
+    return function(_: any, __: string, descriptor: PropertyDescriptor) {
+        if(typeof descriptor.value === 'function') {
+            const previousMethod = descriptor.value;
+            descriptor.value = function(this: any, req: Request, res: Response) {
+                if(req.method.toUpperCase() !== 'POST' && req.method.toUpperCase() !== 'PUT') {
+                    return previousMethod.call(this, req, res);
+                }
+                if(!req.body) {
+                    res.status(400).json({
+                        error: {
+                            errorKey: 'client.body.missing',
+                            additionalInfo: 'client.extended.badPayload'
+                        }
+                    });
+                } else {
+                    if(collapseTopLevelNulls) {
+                        Object.keys(req.body).forEach(k => {
+                            if(req.body[k] === null) delete req.body[k];
+                        });
+                    }
+                    const valid = validate(req.body);
+                    if(valid) {
+                        return previousMethod.call(this, req, res);
+                    } else {
+                        res.status(400).json({
+                            error: {
+                                errorKey: 'client.body.missing',
+                                additionalInfo: 'client.extended.badPayload',
+                                detailedInfo: validate.errors
+                            }
+                        });
+                    }
+                }
+            };
+            return descriptor;
+        }
+        return undefined;
+    };
+}

package/services/WithTransaction.js

@@ -59,7 +59,7 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
             return new Promise((resolve, reject) => {
                 exports.withTransactionConfig.gateQueue.push({ resolve, reject });
             }).then(() => {
-                return withTransaction(repo, logger, previousMethod, lock, commitIfLost)(req, res, next);
+                return withTransaction(repo, logger, previousMethod, lock, commitIfLost, idleInTransactionTimeout).call(this, req, res, next);
             });
         }
         let commit = true;
@@ -141,10 +141,10 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
                         if (res.statusCode > 303 && res.statusCode !== 412) {
                             if (logger) {
                                 if (res.statusCode > 499) {
-                                    logger.error('Uncaught 500 at %s %s: %j', req.method, req.originalUrl, { body: obj, stack: new Error().stack });
+                                    logger.error('Uncaught 500 at %s %s: %j', req?.method, req?.originalUrl, { body: obj, stack: new Error().stack });
                                 }
                                 else {
-                                    logger.warn('Client error 4XX at %s %s: %j', req.method, req.originalUrl, { body: obj, stack: new Error().stack });
+                                    logger.warn('Client error 4XX at %s %s: %j', req?.method, req?.originalUrl, { body: obj, stack: new Error().stack });
                                 }
                             }
                             (repo.db ? dbClient.query('ROLLBACK') : dbClient.rollback()).catch((err) => obj && obj.error && (obj.error.additionalInfo2 = { message: err.message })).then(() => {
@@ -172,7 +172,7 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
                     res.end = () => {
                         if (res.statusCode > 303 && res.statusCode !== 412) {
                             if (logger && res.statusCode > 499) {
-                                logger.error('Uncaught 500 with no details at %s %s: %j', req.method, req.originalUrl, { stack: new Error().stack });
+                                logger.error('Uncaught 500 with no details at %s %s: %j', req?.method, req?.originalUrl, { stack: new Error().stack });
                             }
                             (repo.db ? dbClient.query('ROLLBACK') : dbClient.rollback()).catch(() => undefined).then(() => {
                                 releaseAndDecrement(repo, dbClient);
@@ -200,7 +200,7 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
                 };
                 if (lock) {
                     dbClient.query('SELECT pg_advisory_xact_lock(' + lock + ')').then(() => finish()).catch((err) => {
-                        logger.error('Error acquiring advisory lock %d at %s %s: %j', lock, req.method, req.originalUrl, { err, stack: new Error().stack });
+                        logger.error('Error acquiring advisory lock %d at %s %s: %j', lock, req?.method, req?.originalUrl, { err, stack: new Error().stack });
                         res.status(500).json({
                             error: {
                                 errorKey: 'internal.db',
@@ -215,7 +215,7 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
                 }
             }).catch((err) => {
                 releaseAndDecrement(repo, dbClient);
-                logger.error('Error beginning transaction at %s %s: %j', req.method, req.originalUrl, { err, stack: new Error().stack });
+                logger.error('Error beginning transaction at %s %s: %j', req?.method, req?.originalUrl, { err, stack: new Error().stack });
                 res.status(500).json({
                     error: {
                         errorKey: 'internal.db',
@@ -225,7 +225,7 @@ function withTransaction(repo, logger, previousMethod, lock, commitIfLost = true
             });
         }).catch(err => {
             clearTimeout(connectTimeoutHandler);
-            logger.error('Error connecting to database at %s %s: %j', req.method, req.originalUrl, { err, stack: new Error().stack });
+            logger.error('Error connecting to database at %s %s: %j', req?.method, req?.originalUrl, { err, stack: new Error().stack });
             exports.withTransactionConfig.activeCount = Math.max(0, exports.withTransactionConfig.activeCount - 1);
             res.status(500).json({
                 error: {