anote-server-libs 0.11.0 → 0.11.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.vscode/settings.json +2 -2
- package/models/ApiCall.ts +40 -40
- package/models/Migration.ts +43 -43
- package/models/repository/MemoryCache.ts +87 -87
- package/models/repository/ModelDao.ts +268 -268
- package/package.json +35 -35
- package/services/WithBody.ts +65 -65
- package/services/WithTransaction.ts +161 -161
- package/services/utils.js +108 -16
- package/services/utils.ts +269 -181
- package/tsconfig.json +29 -29
- package/models/repository/CryptModelDao.js +0 -82
package/services/WithBody.ts
CHANGED
|
@@ -1,65 +1,65 @@
|
|
|
1
|
-
import {Request, Response} from 'express';
|
|
2
|
-
import Ajv, {_} from 'ajv';
|
|
3
|
-
|
|
4
|
-
export const ajv = new Ajv();
|
|
5
|
-
ajv.addKeyword({
|
|
6
|
-
keyword: 'maxDigits',
|
|
7
|
-
type: 'number',
|
|
8
|
-
schemaType: 'number',
|
|
9
|
-
validate: (schema: number, data: any) => typeof data === 'number' && Math.round(data * 10 ** schema) / (10 ** schema) === data
|
|
10
|
-
});
|
|
11
|
-
|
|
12
|
-
export function WithBody(schema: any, collapseTopLevelNulls = true) {
|
|
13
|
-
if(schema.type === 'object') {
|
|
14
|
-
const required: string[] = [];
|
|
15
|
-
const keys = Object.getOwnPropertyNames(schema.properties);
|
|
16
|
-
keys.forEach(key => {
|
|
17
|
-
if(schema.properties[key].required === true) {
|
|
18
|
-
required.push(key);
|
|
19
|
-
}
|
|
20
|
-
if(schema.properties[key].required === true || schema.properties[key].required === false) {
|
|
21
|
-
delete schema.properties[key].required;
|
|
22
|
-
}
|
|
23
|
-
});
|
|
24
|
-
schema.required = required;
|
|
25
|
-
}
|
|
26
|
-
const validate = ajv.compile(schema);
|
|
27
|
-
return function(_: any, __: string, descriptor: PropertyDescriptor) {
|
|
28
|
-
if(typeof descriptor.value === 'function') {
|
|
29
|
-
const previousMethod = descriptor.value;
|
|
30
|
-
descriptor.value = function(this: any, req: Request, res: Response) {
|
|
31
|
-
if(req.method.toUpperCase() !== 'POST' && req.method.toUpperCase() !== 'PUT') {
|
|
32
|
-
return previousMethod.call(this, req, res);
|
|
33
|
-
}
|
|
34
|
-
if(!req.body) {
|
|
35
|
-
res.status(400).json({
|
|
36
|
-
error: {
|
|
37
|
-
errorKey: 'client.body.missing',
|
|
38
|
-
additionalInfo: 'client.extended.badPayload'
|
|
39
|
-
}
|
|
40
|
-
});
|
|
41
|
-
} else {
|
|
42
|
-
if(collapseTopLevelNulls) {
|
|
43
|
-
Object.keys(req.body).forEach(k => {
|
|
44
|
-
if(req.body[k] === null) delete req.body[k];
|
|
45
|
-
});
|
|
46
|
-
}
|
|
47
|
-
const valid = validate(req.body);
|
|
48
|
-
if(valid) {
|
|
49
|
-
return previousMethod.call(this, req, res);
|
|
50
|
-
} else {
|
|
51
|
-
res.status(400).json({
|
|
52
|
-
error: {
|
|
53
|
-
errorKey: 'client.body.missing',
|
|
54
|
-
additionalInfo: 'client.extended.badPayload',
|
|
55
|
-
detailedInfo: validate.errors
|
|
56
|
-
}
|
|
57
|
-
});
|
|
58
|
-
}
|
|
59
|
-
}
|
|
60
|
-
};
|
|
61
|
-
return descriptor;
|
|
62
|
-
}
|
|
63
|
-
return undefined;
|
|
64
|
-
};
|
|
65
|
-
}
|
|
1
|
+
import {Request, Response} from 'express';
|
|
2
|
+
import Ajv, {_} from 'ajv';
|
|
3
|
+
|
|
4
|
+
export const ajv = new Ajv();
|
|
5
|
+
ajv.addKeyword({
|
|
6
|
+
keyword: 'maxDigits',
|
|
7
|
+
type: 'number',
|
|
8
|
+
schemaType: 'number',
|
|
9
|
+
validate: (schema: number, data: any) => typeof data === 'number' && Math.round(data * 10 ** schema) / (10 ** schema) === data
|
|
10
|
+
});
|
|
11
|
+
|
|
12
|
+
export function WithBody(schema: any, collapseTopLevelNulls = true) {
|
|
13
|
+
if(schema.type === 'object') {
|
|
14
|
+
const required: string[] = [];
|
|
15
|
+
const keys = Object.getOwnPropertyNames(schema.properties);
|
|
16
|
+
keys.forEach(key => {
|
|
17
|
+
if(schema.properties[key].required === true) {
|
|
18
|
+
required.push(key);
|
|
19
|
+
}
|
|
20
|
+
if(schema.properties[key].required === true || schema.properties[key].required === false) {
|
|
21
|
+
delete schema.properties[key].required;
|
|
22
|
+
}
|
|
23
|
+
});
|
|
24
|
+
schema.required = required;
|
|
25
|
+
}
|
|
26
|
+
const validate = ajv.compile(schema);
|
|
27
|
+
return function(_: any, __: string, descriptor: PropertyDescriptor) {
|
|
28
|
+
if(typeof descriptor.value === 'function') {
|
|
29
|
+
const previousMethod = descriptor.value;
|
|
30
|
+
descriptor.value = function(this: any, req: Request, res: Response) {
|
|
31
|
+
if(req.method.toUpperCase() !== 'POST' && req.method.toUpperCase() !== 'PUT') {
|
|
32
|
+
return previousMethod.call(this, req, res);
|
|
33
|
+
}
|
|
34
|
+
if(!req.body) {
|
|
35
|
+
res.status(400).json({
|
|
36
|
+
error: {
|
|
37
|
+
errorKey: 'client.body.missing',
|
|
38
|
+
additionalInfo: 'client.extended.badPayload'
|
|
39
|
+
}
|
|
40
|
+
});
|
|
41
|
+
} else {
|
|
42
|
+
if(collapseTopLevelNulls) {
|
|
43
|
+
Object.keys(req.body).forEach(k => {
|
|
44
|
+
if(req.body[k] === null) delete req.body[k];
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
const valid = validate(req.body);
|
|
48
|
+
if(valid) {
|
|
49
|
+
return previousMethod.call(this, req, res);
|
|
50
|
+
} else {
|
|
51
|
+
res.status(400).json({
|
|
52
|
+
error: {
|
|
53
|
+
errorKey: 'client.body.missing',
|
|
54
|
+
additionalInfo: 'client.extended.badPayload',
|
|
55
|
+
detailedInfo: validate.errors
|
|
56
|
+
}
|
|
57
|
+
});
|
|
58
|
+
}
|
|
59
|
+
}
|
|
60
|
+
};
|
|
61
|
+
return descriptor;
|
|
62
|
+
}
|
|
63
|
+
return undefined;
|
|
64
|
+
};
|
|
65
|
+
}
|
|
@@ -1,161 +1,161 @@
|
|
|
1
|
-
import {NextFunction, Request, Response} from 'express';
|
|
2
|
-
import {Logger} from 'winston';
|
|
3
|
-
import {BaseModelRepository} from '../models/repository/BaseModelRepository';
|
|
4
|
-
import {jsonStringify, utils} from './utils';
|
|
5
|
-
|
|
6
|
-
export const enum SystemLock {
|
|
7
|
-
CHECK_CROSSING = 1,
|
|
8
|
-
FLUSH_CALLS = 2,
|
|
9
|
-
TX_CHECK = 3
|
|
10
|
-
}
|
|
11
|
-
|
|
12
|
-
export const withTransactionConfig = {
|
|
13
|
-
logQueries: false,
|
|
14
|
-
timeoutMillis: 15000
|
|
15
|
-
};
|
|
16
|
-
|
|
17
|
-
export function withTransaction(repo: BaseModelRepository, logger: Logger, previousMethod: (req: Request, res: Response, next: NextFunction) => void, lock?: SystemLock, commitIfLost = true) {
|
|
18
|
-
return function(req: Request, res: Response, next: NextFunction) {
|
|
19
|
-
let commit = true;
|
|
20
|
-
if(!commitIfLost) {
|
|
21
|
-
res.once('close', () => commit = false);
|
|
22
|
-
}
|
|
23
|
-
const endTerminator = res.end.bind(res);
|
|
24
|
-
const jsonTerminator = (obj: any) => {
|
|
25
|
-
try { res.set('Content-Type', 'application/json'); } catch(_) {}
|
|
26
|
-
res.write(jsonStringify(obj) || '{}');
|
|
27
|
-
endTerminator();
|
|
28
|
-
};
|
|
29
|
-
const connectTimeoutHandler = setTimeout(() => {
|
|
30
|
-
// Timed out getting a client, restart worker or process...
|
|
31
|
-
logger.error('Error timed out getting a client, exiting...');
|
|
32
|
-
process.exit(22);
|
|
33
|
-
}, withTransactionConfig.timeoutMillis);
|
|
34
|
-
Promise.all([
|
|
35
|
-
repo.db ? repo.db.connect() : Promise.resolve(undefined),
|
|
36
|
-
repo.dbMssql ? Promise.resolve(repo.dbMssql.transaction()) : Promise.resolve(undefined)
|
|
37
|
-
]).then(([c1, c2]) => {
|
|
38
|
-
const dbClient = c1 || c2;
|
|
39
|
-
clearTimeout(connectTimeoutHandler);
|
|
40
|
-
// On error, will rollback...
|
|
41
|
-
utils.logger = logger;
|
|
42
|
-
if(withTransactionConfig.logQueries && !dbClient.queryPatched) {
|
|
43
|
-
const originalQuery = dbClient.query.bind(dbClient);
|
|
44
|
-
dbClient.query = (...args: any[]) => {
|
|
45
|
-
logger.debug('SQL [Client %d] QUERY: %s', dbClient.processID, args[0]);
|
|
46
|
-
return originalQuery(...args);
|
|
47
|
-
};
|
|
48
|
-
dbClient.queryPatched = true;
|
|
49
|
-
}
|
|
50
|
-
dbClient.removeAllListeners('error');
|
|
51
|
-
dbClient.on('error', (err: any) => utils.clientErrorHandler(err, dbClient));
|
|
52
|
-
|
|
53
|
-
res.locals.dbClient = dbClient;
|
|
54
|
-
res.locals.dbClientCommited = false;
|
|
55
|
-
res.locals.dbClientCommit = (cb: (err: any) => any) => {
|
|
56
|
-
if(!res.locals.dbClientCommited) {
|
|
57
|
-
res.locals.dbClientCommited = true;
|
|
58
|
-
(commit ? (repo.db ? dbClient.query('COMMIT') : dbClient.commit()) : Promise.reject(new Error('Client lost'))).catch((err: any) => err).then((err: any) => {
|
|
59
|
-
if(repo.db) dbClient.release();
|
|
60
|
-
if(!(err instanceof Error)) {
|
|
61
|
-
for(let i = 0; i < res.locals.dbClientOnCommit.length; i++) {
|
|
62
|
-
res.locals.dbClientOnCommit[i]();
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
cb(err instanceof Error ? err : undefined);
|
|
66
|
-
});
|
|
67
|
-
} else {
|
|
68
|
-
cb(undefined);
|
|
69
|
-
}
|
|
70
|
-
};
|
|
71
|
-
res.locals.dbClientOnCommit = [];
|
|
72
|
-
return (repo.db ? dbClient.query('BEGIN') : dbClient.begin()).then(() => {
|
|
73
|
-
const finish = () => {
|
|
74
|
-
res.send = () => {
|
|
75
|
-
throw new Error('res.send() should not be used within transactions. Use res.json() instead.');
|
|
76
|
-
};
|
|
77
|
-
res.json = (obj: any) => {
|
|
78
|
-
if(res.statusCode > 303 && res.statusCode !== 412) {
|
|
79
|
-
if(logger) {
|
|
80
|
-
if(res.statusCode > 499) {
|
|
81
|
-
logger.error('Uncaught 500: %j', obj?.error?.additionalInfo);
|
|
82
|
-
} else {
|
|
83
|
-
logger.warn('Client error 4XX: %j', obj?.error);
|
|
84
|
-
}
|
|
85
|
-
}
|
|
86
|
-
(repo.db ? dbClient.query('ROLLBACK') : dbClient.rollback()).catch((err: any) => obj && obj.error && (obj.error.additionalInfo2 = {message: err.message})).then(() => {
|
|
87
|
-
if(repo.db) dbClient.release();
|
|
88
|
-
jsonTerminator(obj);
|
|
89
|
-
});
|
|
90
|
-
} else {
|
|
91
|
-
res.locals.dbClientCommit((err: any) => {
|
|
92
|
-
if(err && commitIfLost) {
|
|
93
|
-
res.status(500);
|
|
94
|
-
jsonTerminator({
|
|
95
|
-
error: {
|
|
96
|
-
errorKey: 'internal.db',
|
|
97
|
-
additionalInfo: {message: err.message}
|
|
98
|
-
}
|
|
99
|
-
});
|
|
100
|
-
} else jsonTerminator(obj);
|
|
101
|
-
});
|
|
102
|
-
}
|
|
103
|
-
return res;
|
|
104
|
-
};
|
|
105
|
-
res.end = () => {
|
|
106
|
-
if(res.statusCode > 303 && res.statusCode !== 412) {
|
|
107
|
-
if(logger && res.statusCode > 499) {
|
|
108
|
-
logger.error('Uncaught 500 with no details...');
|
|
109
|
-
}
|
|
110
|
-
(repo.db ? dbClient.query('ROLLBACK') : dbClient.rollback()).catch((): any => undefined).then(() => {
|
|
111
|
-
if(repo.db) dbClient.release();
|
|
112
|
-
endTerminator();
|
|
113
|
-
});
|
|
114
|
-
} else {
|
|
115
|
-
res.locals.dbClientCommit((err: any) => {
|
|
116
|
-
if(err && commitIfLost) {
|
|
117
|
-
res.status(500);
|
|
118
|
-
jsonTerminator({
|
|
119
|
-
error: {
|
|
120
|
-
errorKey: 'internal.db',
|
|
121
|
-
additionalInfo: {message: err.message}
|
|
122
|
-
}
|
|
123
|
-
});
|
|
124
|
-
} else endTerminator();
|
|
125
|
-
});
|
|
126
|
-
}
|
|
127
|
-
return res;
|
|
128
|
-
};
|
|
129
|
-
return previousMethod.call(this, req, res, next);
|
|
130
|
-
};
|
|
131
|
-
|
|
132
|
-
if(lock) {
|
|
133
|
-
dbClient.query('SELECT pg_advisory_xact_lock(' + lock + ')').then(() => finish()).catch((err: any) => {
|
|
134
|
-
res.status(500).json({
|
|
135
|
-
error: {
|
|
136
|
-
errorKey: 'internal.db',
|
|
137
|
-
additionalInfo: {message: err.message}
|
|
138
|
-
}
|
|
139
|
-
});
|
|
140
|
-
dbClient.release(); // Lock acquisition failed, release will also rollback
|
|
141
|
-
});
|
|
142
|
-
} else {
|
|
143
|
-
finish();
|
|
144
|
-
}
|
|
145
|
-
}).catch((err: any) => {
|
|
146
|
-
// Error beginning transaction
|
|
147
|
-
dbClient.release();
|
|
148
|
-
throw err;
|
|
149
|
-
});
|
|
150
|
-
}).catch(err => {
|
|
151
|
-
// Error connecting to database for other reason than timeout or beginning transaction
|
|
152
|
-
clearTimeout(connectTimeoutHandler);
|
|
153
|
-
res.status(500).json({
|
|
154
|
-
error: {
|
|
155
|
-
errorKey: 'internal.db',
|
|
156
|
-
additionalInfo: {message: err.message}
|
|
157
|
-
}
|
|
158
|
-
});
|
|
159
|
-
});
|
|
160
|
-
};
|
|
161
|
-
}
|
|
1
|
+
import {NextFunction, Request, Response} from 'express';
|
|
2
|
+
import {Logger} from 'winston';
|
|
3
|
+
import {BaseModelRepository} from '../models/repository/BaseModelRepository';
|
|
4
|
+
import {jsonStringify, utils} from './utils';
|
|
5
|
+
|
|
6
|
+
export const enum SystemLock {
|
|
7
|
+
CHECK_CROSSING = 1,
|
|
8
|
+
FLUSH_CALLS = 2,
|
|
9
|
+
TX_CHECK = 3
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const withTransactionConfig = {
|
|
13
|
+
logQueries: false,
|
|
14
|
+
timeoutMillis: 15000
|
|
15
|
+
};
|
|
16
|
+
|
|
17
|
+
export function withTransaction(repo: BaseModelRepository, logger: Logger, previousMethod: (req: Request, res: Response, next: NextFunction) => void, lock?: SystemLock, commitIfLost = true) {
|
|
18
|
+
return function(req: Request, res: Response, next: NextFunction) {
|
|
19
|
+
let commit = true;
|
|
20
|
+
if(!commitIfLost) {
|
|
21
|
+
res.once('close', () => commit = false);
|
|
22
|
+
}
|
|
23
|
+
const endTerminator = res.end.bind(res);
|
|
24
|
+
const jsonTerminator = (obj: any) => {
|
|
25
|
+
try { res.set('Content-Type', 'application/json'); } catch(_) {}
|
|
26
|
+
res.write(jsonStringify(obj) || '{}');
|
|
27
|
+
endTerminator();
|
|
28
|
+
};
|
|
29
|
+
const connectTimeoutHandler = setTimeout(() => {
|
|
30
|
+
// Timed out getting a client, restart worker or process...
|
|
31
|
+
logger.error('Error timed out getting a client, exiting...');
|
|
32
|
+
process.exit(22);
|
|
33
|
+
}, withTransactionConfig.timeoutMillis);
|
|
34
|
+
Promise.all([
|
|
35
|
+
repo.db ? repo.db.connect() : Promise.resolve(undefined),
|
|
36
|
+
repo.dbMssql ? Promise.resolve(repo.dbMssql.transaction()) : Promise.resolve(undefined)
|
|
37
|
+
]).then(([c1, c2]) => {
|
|
38
|
+
const dbClient = c1 || c2;
|
|
39
|
+
clearTimeout(connectTimeoutHandler);
|
|
40
|
+
// On error, will rollback...
|
|
41
|
+
utils.logger = logger;
|
|
42
|
+
if(withTransactionConfig.logQueries && !dbClient.queryPatched) {
|
|
43
|
+
const originalQuery = dbClient.query.bind(dbClient);
|
|
44
|
+
dbClient.query = (...args: any[]) => {
|
|
45
|
+
logger.debug('SQL [Client %d] QUERY: %s', dbClient.processID, args[0]);
|
|
46
|
+
return originalQuery(...args);
|
|
47
|
+
};
|
|
48
|
+
dbClient.queryPatched = true;
|
|
49
|
+
}
|
|
50
|
+
dbClient.removeAllListeners('error');
|
|
51
|
+
dbClient.on('error', (err: any) => utils.clientErrorHandler(err, dbClient));
|
|
52
|
+
|
|
53
|
+
res.locals.dbClient = dbClient;
|
|
54
|
+
res.locals.dbClientCommited = false;
|
|
55
|
+
res.locals.dbClientCommit = (cb: (err: any) => any) => {
|
|
56
|
+
if(!res.locals.dbClientCommited) {
|
|
57
|
+
res.locals.dbClientCommited = true;
|
|
58
|
+
(commit ? (repo.db ? dbClient.query('COMMIT') : dbClient.commit()) : Promise.reject(new Error('Client lost'))).catch((err: any) => err).then((err: any) => {
|
|
59
|
+
if(repo.db) dbClient.release();
|
|
60
|
+
if(!(err instanceof Error)) {
|
|
61
|
+
for(let i = 0; i < res.locals.dbClientOnCommit.length; i++) {
|
|
62
|
+
res.locals.dbClientOnCommit[i]();
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
cb(err instanceof Error ? err : undefined);
|
|
66
|
+
});
|
|
67
|
+
} else {
|
|
68
|
+
cb(undefined);
|
|
69
|
+
}
|
|
70
|
+
};
|
|
71
|
+
res.locals.dbClientOnCommit = [];
|
|
72
|
+
return (repo.db ? dbClient.query('BEGIN') : dbClient.begin()).then(() => {
|
|
73
|
+
const finish = () => {
|
|
74
|
+
res.send = () => {
|
|
75
|
+
throw new Error('res.send() should not be used within transactions. Use res.json() instead.');
|
|
76
|
+
};
|
|
77
|
+
res.json = (obj: any) => {
|
|
78
|
+
if(res.statusCode > 303 && res.statusCode !== 412) {
|
|
79
|
+
if(logger) {
|
|
80
|
+
if(res.statusCode > 499) {
|
|
81
|
+
logger.error('Uncaught 500: %j', obj?.error?.additionalInfo);
|
|
82
|
+
} else {
|
|
83
|
+
logger.warn('Client error 4XX: %j', obj?.error);
|
|
84
|
+
}
|
|
85
|
+
}
|
|
86
|
+
(repo.db ? dbClient.query('ROLLBACK') : dbClient.rollback()).catch((err: any) => obj && obj.error && (obj.error.additionalInfo2 = {message: err.message})).then(() => {
|
|
87
|
+
if(repo.db) dbClient.release();
|
|
88
|
+
jsonTerminator(obj);
|
|
89
|
+
});
|
|
90
|
+
} else {
|
|
91
|
+
res.locals.dbClientCommit((err: any) => {
|
|
92
|
+
if(err && commitIfLost) {
|
|
93
|
+
res.status(500);
|
|
94
|
+
jsonTerminator({
|
|
95
|
+
error: {
|
|
96
|
+
errorKey: 'internal.db',
|
|
97
|
+
additionalInfo: {message: err.message}
|
|
98
|
+
}
|
|
99
|
+
});
|
|
100
|
+
} else jsonTerminator(obj);
|
|
101
|
+
});
|
|
102
|
+
}
|
|
103
|
+
return res;
|
|
104
|
+
};
|
|
105
|
+
res.end = () => {
|
|
106
|
+
if(res.statusCode > 303 && res.statusCode !== 412) {
|
|
107
|
+
if(logger && res.statusCode > 499) {
|
|
108
|
+
logger.error('Uncaught 500 with no details...');
|
|
109
|
+
}
|
|
110
|
+
(repo.db ? dbClient.query('ROLLBACK') : dbClient.rollback()).catch((): any => undefined).then(() => {
|
|
111
|
+
if(repo.db) dbClient.release();
|
|
112
|
+
endTerminator();
|
|
113
|
+
});
|
|
114
|
+
} else {
|
|
115
|
+
res.locals.dbClientCommit((err: any) => {
|
|
116
|
+
if(err && commitIfLost) {
|
|
117
|
+
res.status(500);
|
|
118
|
+
jsonTerminator({
|
|
119
|
+
error: {
|
|
120
|
+
errorKey: 'internal.db',
|
|
121
|
+
additionalInfo: {message: err.message}
|
|
122
|
+
}
|
|
123
|
+
});
|
|
124
|
+
} else endTerminator();
|
|
125
|
+
});
|
|
126
|
+
}
|
|
127
|
+
return res;
|
|
128
|
+
};
|
|
129
|
+
return previousMethod.call(this, req, res, next);
|
|
130
|
+
};
|
|
131
|
+
|
|
132
|
+
if(lock) {
|
|
133
|
+
dbClient.query('SELECT pg_advisory_xact_lock(' + lock + ')').then(() => finish()).catch((err: any) => {
|
|
134
|
+
res.status(500).json({
|
|
135
|
+
error: {
|
|
136
|
+
errorKey: 'internal.db',
|
|
137
|
+
additionalInfo: {message: err.message}
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
dbClient.release(); // Lock acquisition failed, release will also rollback
|
|
141
|
+
});
|
|
142
|
+
} else {
|
|
143
|
+
finish();
|
|
144
|
+
}
|
|
145
|
+
}).catch((err: any) => {
|
|
146
|
+
// Error beginning transaction
|
|
147
|
+
dbClient.release();
|
|
148
|
+
throw err;
|
|
149
|
+
});
|
|
150
|
+
}).catch(err => {
|
|
151
|
+
// Error connecting to database for other reason than timeout or beginning transaction
|
|
152
|
+
clearTimeout(connectTimeoutHandler);
|
|
153
|
+
res.status(500).json({
|
|
154
|
+
error: {
|
|
155
|
+
errorKey: 'internal.db',
|
|
156
|
+
additionalInfo: {message: err.message}
|
|
157
|
+
}
|
|
158
|
+
});
|
|
159
|
+
});
|
|
160
|
+
};
|
|
161
|
+
}
|
package/services/utils.js
CHANGED
|
@@ -11,6 +11,12 @@ exports.idempotent = idempotent;
|
|
|
11
11
|
exports.sendSelfPostableMessage = sendSelfPostableMessage;
|
|
12
12
|
exports.fpEuros = fpEuros;
|
|
13
13
|
exports.digitize = digitize;
|
|
14
|
+
exports.readEmailTemplates = readEmailTemplates;
|
|
15
|
+
exports.replacePlaceholders = replacePlaceholders;
|
|
16
|
+
exports.getHtmlReplaced = getHtmlReplaced;
|
|
17
|
+
exports.getEmailTitle = getEmailTitle;
|
|
18
|
+
exports.getEmailTranslation = getEmailTranslation;
|
|
19
|
+
const fs = require("fs");
|
|
14
20
|
function atob(str) {
|
|
15
21
|
return Buffer.from(str, 'base64').toString('binary');
|
|
16
22
|
}
|
|
@@ -143,22 +149,22 @@ function idempotent(repo, debug, logger) {
|
|
|
143
149
|
};
|
|
144
150
|
}
|
|
145
151
|
function sendSelfPostableMessage(res, code, messageType, err) {
|
|
146
|
-
res.type('text/html').status(code).write(`
|
|
147
|
-
<!DOCTYPE HTML>
|
|
148
|
-
<html>
|
|
149
|
-
<head>
|
|
150
|
-
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
|
151
|
-
</head>
|
|
152
|
-
<body>
|
|
153
|
-
<script type="text/javascript">
|
|
154
|
-
window.parent.postMessage({
|
|
155
|
-
type: '${messageType}',
|
|
156
|
-
confirm: ${!err},
|
|
157
|
-
error: JSON.parse('${JSON.stringify(err) || 'null'}')
|
|
158
|
-
}, '*');
|
|
159
|
-
</script>
|
|
160
|
-
</body>
|
|
161
|
-
</html>
|
|
152
|
+
res.type('text/html').status(code).write(`
|
|
153
|
+
<!DOCTYPE HTML>
|
|
154
|
+
<html>
|
|
155
|
+
<head>
|
|
156
|
+
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
|
|
157
|
+
</head>
|
|
158
|
+
<body>
|
|
159
|
+
<script type="text/javascript">
|
|
160
|
+
window.parent.postMessage({
|
|
161
|
+
type: '${messageType}',
|
|
162
|
+
confirm: ${!err},
|
|
163
|
+
error: JSON.parse('${JSON.stringify(err) || 'null'}')
|
|
164
|
+
}, '*');
|
|
165
|
+
</script>
|
|
166
|
+
</body>
|
|
167
|
+
</html>
|
|
162
168
|
`);
|
|
163
169
|
res.end();
|
|
164
170
|
}
|
|
@@ -195,3 +201,89 @@ function digitize(value, opts) {
|
|
|
195
201
|
}
|
|
196
202
|
return (opts && opts.currency) ? (parts[0] + '.00') : parts[0];
|
|
197
203
|
}
|
|
204
|
+
function loadEmailTemplates(path) {
|
|
205
|
+
if (!path || !fs.existsSync(path))
|
|
206
|
+
return undefined;
|
|
207
|
+
const loadedEmailTemplates = {};
|
|
208
|
+
const fileNames = fs.readdirSync(path);
|
|
209
|
+
fileNames.forEach(fileName => {
|
|
210
|
+
if (!fileName.startsWith('template-') || !fileName.endsWith('.html'))
|
|
211
|
+
return;
|
|
212
|
+
const templateIdentifier = fileName.slice('template-'.length, -'.html'.length);
|
|
213
|
+
loadedEmailTemplates[templateIdentifier] = fs.readFileSync(path + '/' + fileName).toString('utf8');
|
|
214
|
+
});
|
|
215
|
+
return loadedEmailTemplates;
|
|
216
|
+
}
|
|
217
|
+
function readEmailTemplates(path, config) {
|
|
218
|
+
const { product, name } = config.app;
|
|
219
|
+
if (!product || !name)
|
|
220
|
+
return loadEmailTemplates(path);
|
|
221
|
+
const mainPath = path + '/' + product;
|
|
222
|
+
const overridePath = product !== name ? path + `/${product}/${name}` : undefined;
|
|
223
|
+
const defaultTemplates = loadEmailTemplates(mainPath);
|
|
224
|
+
const overrideTemplates = overridePath ? loadEmailTemplates(overridePath) : {};
|
|
225
|
+
return { ...defaultTemplates, ...overrideTemplates };
|
|
226
|
+
}
|
|
227
|
+
function replacePlaceholders(data, keys, depth) {
|
|
228
|
+
if (!keys || depth >= keys.length)
|
|
229
|
+
return undefined;
|
|
230
|
+
if (depth === keys.length - 1)
|
|
231
|
+
return (data || {})[keys[depth]];
|
|
232
|
+
return replacePlaceholders((data || {})[keys[depth]], keys, depth + 1);
|
|
233
|
+
}
|
|
234
|
+
function getHtml(template, translationKeyValue) {
|
|
235
|
+
if (!template)
|
|
236
|
+
return undefined;
|
|
237
|
+
const pattern = new RegExp('{{\\s*([a-zA-Z._0-9]+)\\s*}}', 'g');
|
|
238
|
+
const replacer = (_, key) => replacePlaceholders(translationKeyValue, key.split('.'), 0) ?? '';
|
|
239
|
+
template = template.replace(pattern, replacer);
|
|
240
|
+
template = template.replace(pattern, replacer);
|
|
241
|
+
template = template.replace(new RegExp('\\[\\[\\s*([a-zA-Z._0-9:]+)\\s*\\]\\]', 'g'), (_, key) => {
|
|
242
|
+
const keyParts = key.split(':');
|
|
243
|
+
return (replacePlaceholders(translationKeyValue, keyParts[1].split('.'), 0) || [])
|
|
244
|
+
.map((subContext) => getHtml(keyParts[0], subContext)).join('');
|
|
245
|
+
});
|
|
246
|
+
template = template.replace(new RegExp('<<\\s*([a-zA-Z._0-9:]+)\\s*>>', 'g'), (_, key) => {
|
|
247
|
+
const keyParts = key.split(':');
|
|
248
|
+
if (replacePlaceholders(translationKeyValue, keyParts[1].split('.'), 0))
|
|
249
|
+
return getHtml(keyParts[0], translationKeyValue);
|
|
250
|
+
return '';
|
|
251
|
+
});
|
|
252
|
+
return template;
|
|
253
|
+
}
|
|
254
|
+
function getHtmlReplaced(config, templates, key, lang, defaultTemplateTranslations = {}, envSpecificTranslations, extraData, newPage) {
|
|
255
|
+
const name = config.app.name;
|
|
256
|
+
const defaultTranslations = defaultTemplateTranslations?.[lang] || defaultTemplateTranslations?.[0] || {};
|
|
257
|
+
const envSpecificTrans = envSpecificTranslations?.[name]?.[key]?.[lang]
|
|
258
|
+
|| envSpecificTranslations?.[name]?.[key]?.[0]
|
|
259
|
+
|| {};
|
|
260
|
+
const translationKeyValue = {
|
|
261
|
+
...defaultTranslations,
|
|
262
|
+
...envSpecificTrans,
|
|
263
|
+
...extraData,
|
|
264
|
+
domain: config.frontend,
|
|
265
|
+
...config.app.emailConfig
|
|
266
|
+
};
|
|
267
|
+
let html = getHtml(templates[key], translationKeyValue);
|
|
268
|
+
if (newPage) {
|
|
269
|
+
html = html.replace('</head>', `<style>
|
|
270
|
+
@media print {
|
|
271
|
+
.new-page {
|
|
272
|
+
page-break-before: always;
|
|
273
|
+
}
|
|
274
|
+
}
|
|
275
|
+
</style>
|
|
276
|
+
</head>`);
|
|
277
|
+
html = html.replace('</body>', `<p class="new-page">Provided by Satoris</p>
|
|
278
|
+
</body>`);
|
|
279
|
+
}
|
|
280
|
+
return html;
|
|
281
|
+
}
|
|
282
|
+
function getEmailTitle(key, lang, titles, overrideTitles, data) {
|
|
283
|
+
const pattern = new RegExp('{{\\s*([a-zA-Z._0-9]+)\\s*}}', 'g');
|
|
284
|
+
const title = overrideTitles?.[lang]?.[key] ?? titles[lang]?.[key];
|
|
285
|
+
return title?.replace(pattern, (_, placeholderKey) => data?.[placeholderKey]);
|
|
286
|
+
}
|
|
287
|
+
function getEmailTranslation(key, lang, translationKeyValue, defaultLang = 0) {
|
|
288
|
+
return translationKeyValue?.[lang]?.[key] ?? translationKeyValue?.[defaultLang]?.[key];
|
|
289
|
+
}
|