@bitblit/ratchet-rdbms 4.0.116-alpha → 4.0.119-alpha
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/lib/build/ratchet-rdbms-info.d.ts +1 -1
- package/lib/index.d.ts +28 -0
- package/lib/index.mjs +2 -0
- package/lib/index.mjs.map +1 -0
- package/lib/model/paginator.d.ts +1 -1
- package/lib/model/ssh/ssh-tunnel-container.d.ts +1 -1
- package/package.json +13 -12
- package/lib/build/ratchet-rdbms-info.js +0 -15
- package/lib/build/ratchet-rdbms-info.js.map +0 -1
- package/lib/model/connection-config.js +0 -2
- package/lib/model/connection-config.js.map +0 -1
- package/lib/model/db-config.js +0 -2
- package/lib/model/db-config.js.map +0 -1
- package/lib/model/group-by-count-result.js +0 -2
- package/lib/model/group-by-count-result.js.map +0 -1
- package/lib/model/mysql/mysql-master-status.js +0 -2
- package/lib/model/mysql/mysql-master-status.js.map +0 -1
- package/lib/model/mysql/mysql-results-wrapper.js +0 -2
- package/lib/model/mysql/mysql-results-wrapper.js.map +0 -1
- package/lib/model/mysql/mysql-slave-status.js +0 -2
- package/lib/model/mysql/mysql-slave-status.js.map +0 -1
- package/lib/model/mysql/mysql-style-connection-provider.js +0 -2
- package/lib/model/mysql/mysql-style-connection-provider.js.map +0 -1
- package/lib/model/mysql/mysql-update-results.js +0 -2
- package/lib/model/mysql/mysql-update-results.js.map +0 -1
- package/lib/model/paginated-results.js +0 -2
- package/lib/model/paginated-results.js.map +0 -1
- package/lib/model/pagination-bounds.js +0 -2
- package/lib/model/pagination-bounds.js.map +0 -1
- package/lib/model/paginator.js +0 -2
- package/lib/model/paginator.js.map +0 -1
- package/lib/model/query-defaults.js +0 -2
- package/lib/model/query-defaults.js.map +0 -1
- package/lib/model/query-text-provider.js +0 -2
- package/lib/model/query-text-provider.js.map +0 -1
- package/lib/model/sort-direction.js +0 -6
- package/lib/model/sort-direction.js.map +0 -1
- package/lib/model/ssh/ssh-tunnel-config.js +0 -2
- package/lib/model/ssh/ssh-tunnel-config.js.map +0 -1
- package/lib/model/ssh/ssh-tunnel-container.js +0 -2
- package/lib/model/ssh/ssh-tunnel-container.js.map +0 -1
- package/lib/model/ssh-config.js +0 -2
- package/lib/model/ssh-config.js.map +0 -1
- package/lib/model/transaction-isolation-level.js +0 -6
- package/lib/model/transaction-isolation-level.js.map +0 -1
- package/lib/named-parameter-maria-db-service.js +0 -253
- package/lib/named-parameter-maria-db-service.js.map +0 -1
- package/lib/non-pooled-mysql-style-connection-provider.js +0 -17
- package/lib/non-pooled-mysql-style-connection-provider.js.map +0 -1
- package/lib/query-builder/query-builder-result.js +0 -13
- package/lib/query-builder/query-builder-result.js.map +0 -1
- package/lib/query-builder/query-builder.js +0 -354
- package/lib/query-builder/query-builder.js.map +0 -1
- package/lib/query-builder/query-builder.spec.js +0 -127
- package/lib/query-builder/query-builder.spec.js.map +0 -1
- package/lib/query-builder/query-util.js +0 -70
- package/lib/query-builder/query-util.js.map +0 -1
- package/lib/rds-mysql-style-connection-provider.js +0 -161
- package/lib/rds-mysql-style-connection-provider.js.map +0 -1
- package/lib/ssh-tunnel-service.js +0 -48
- package/lib/ssh-tunnel-service.js.map +0 -1
- package/lib/transactional-named-parameter-maria-db-service.js +0 -130
- package/lib/transactional-named-parameter-maria-db-service.js.map +0 -1
- package/lib/util/relational-database-utils.js +0 -30
- package/lib/util/relational-database-utils.js.map +0 -1
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../../src/query-builder/query-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,127 +0,0 @@
|
|
|
1
|
-
import { NamedParameterMariaDbService } from '../named-parameter-maria-db-service.js';
|
|
2
|
-
import { JestRatchet } from '@bitblit/ratchet-jest/lib/jest/jest-ratchet.js';
|
|
3
|
-
import { SortDirection } from '../model/sort-direction.js';
|
|
4
|
-
import { jest } from '@jest/globals';
|
|
5
|
-
const prov = {
|
|
6
|
-
fetchQuery(queryPath) {
|
|
7
|
-
return this.fetchAllQueries()[queryPath];
|
|
8
|
-
},
|
|
9
|
-
fetchAllQueries() {
|
|
10
|
-
return {
|
|
11
|
-
'named_parameter_tests.named_fragment_1': 'SELECT b.`id`, b.`owner_id`, b.`name` FROM boards b',
|
|
12
|
-
'named_parameter_tests.named_test_1': '[[named_parameter_tests.named_fragment_1]] WHERE id=:boardId OR owner_id=:ownerId',
|
|
13
|
-
'named_parameter_tests.conditional_section_test': 'SELECT b.`id` FROM boards b WHERE b.id < 1000<<COND1>> AND b.owner_id = :ownerId <</COND1>>',
|
|
14
|
-
'named_parameter_tests.pagination_count_test': 'SELECT b.`id` ##pagination## FROM boards b WHERE b.id < 1000 UNION (SELECT x.`id` ##pagination## FROM somewherelse WHERE x.`id` = 3)',
|
|
15
|
-
'named_parameter_tests.negated_conditional_section_test': 'SELECT b.`id` FROM boards b WHERE b.id < 1000 <<!COND1>> AND b.owner_id = :ownerId <</!COND1>>',
|
|
16
|
-
'named_parameter_tests.conditional_param_section_test': 'SELECT b.`id` FROM boards b WHERE b.id < 1000 <<:ownerId>> AND b.owner_id = :ownerId <</:ownerId>>',
|
|
17
|
-
'named_parameter_tests.new_repeat_section_test': '<repeat count=:clsLength join=AND> repeated ::clsW:: ::clsH:: clause </repeat>',
|
|
18
|
-
'named_parameter_tests.sql_construct_test': 'GROUP BY x.##sqlConstruct:groupingColumn##',
|
|
19
|
-
'named_parameter_tests.constant_test': 'SELECT b.`id`, :constantName as constant FROM boards b where b.`id` = 52',
|
|
20
|
-
};
|
|
21
|
-
},
|
|
22
|
-
};
|
|
23
|
-
const mariaDb = new NamedParameterMariaDbService(prov, JestRatchet.mock(jest.fn), { databaseName: 'test', timeoutMS: 2_000 });
|
|
24
|
-
describe('query-builder', () => {
|
|
25
|
-
it('builds filtered', () => {
|
|
26
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.pagination_count_test');
|
|
27
|
-
const build = queryBuilder.build();
|
|
28
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.pagination_count_test */b.`id` FROM boards b WHERE b.id < 1000 UNION (SELECT x.`id` FROM somewherelse WHERE x.`id` = 3)');
|
|
29
|
-
});
|
|
30
|
-
it('builds unfiltered', () => {
|
|
31
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.pagination_count_test');
|
|
32
|
-
const build = queryBuilder.buildUnfiltered();
|
|
33
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.pagination_count_test */COUNT(*) FROM boards b WHERE b.id < 1000 UNION (SELECT x.`id` FROM somewherelse WHERE x.`id` = 3)');
|
|
34
|
-
});
|
|
35
|
-
it('fails if param is missing', () => {
|
|
36
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.pagination_count_test');
|
|
37
|
-
const build = queryBuilder.build();
|
|
38
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.pagination_count_test */b.`id` FROM boards b WHERE b.id < 1000 UNION (SELECT x.`id` FROM somewherelse WHERE x.`id` = 3)');
|
|
39
|
-
});
|
|
40
|
-
it('removes conditional blocks when missing', () => {
|
|
41
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.conditional_section_test');
|
|
42
|
-
const build = queryBuilder.build();
|
|
43
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.conditional_section_test */b.`id` FROM boards b WHERE b.id < 1000');
|
|
44
|
-
});
|
|
45
|
-
it('handles negated conditional blocks true state', () => {
|
|
46
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.negated_conditional_section_test');
|
|
47
|
-
queryBuilder.withConditional('COND1');
|
|
48
|
-
const build = queryBuilder.build();
|
|
49
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.negated_conditional_section_test */b.`id` FROM boards b WHERE b.id < 1000');
|
|
50
|
-
});
|
|
51
|
-
it('handles negated conditional blocks false state', () => {
|
|
52
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.negated_conditional_section_test');
|
|
53
|
-
queryBuilder.withConditional('COND1', false);
|
|
54
|
-
const build = queryBuilder.build();
|
|
55
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.negated_conditional_section_test */b.`id` FROM boards b WHERE b.id < 1000 AND b.owner_id = :ownerId');
|
|
56
|
-
});
|
|
57
|
-
it('leaves conditional blocks when present', () => {
|
|
58
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.conditional_section_test');
|
|
59
|
-
queryBuilder.withConditional('COND1');
|
|
60
|
-
const build = queryBuilder.build();
|
|
61
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.conditional_section_test */b.`id` FROM boards b WHERE b.id < 1000 AND b.owner_id = :ownerId');
|
|
62
|
-
});
|
|
63
|
-
it('leaves param-conditional blocks when param exists', () => {
|
|
64
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.conditional_param_section_test');
|
|
65
|
-
queryBuilder.withParam('ownerId', 'testvalue');
|
|
66
|
-
const build = queryBuilder.build();
|
|
67
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.conditional_param_section_test */b.`id` FROM boards b WHERE b.id < 1000 AND b.owner_id = :ownerId');
|
|
68
|
-
});
|
|
69
|
-
it('removes param-conditional blocks when param missing', () => {
|
|
70
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.conditional_param_section_test');
|
|
71
|
-
const build = queryBuilder.build();
|
|
72
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.conditional_param_section_test */b.`id` FROM boards b WHERE b.id < 1000');
|
|
73
|
-
});
|
|
74
|
-
it('removes param-conditional blocks when param is an empty array', () => {
|
|
75
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.conditional_param_section_test');
|
|
76
|
-
queryBuilder.withParam('ownerId', []);
|
|
77
|
-
const build = queryBuilder.build();
|
|
78
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.conditional_param_section_test */b.`id` FROM boards b WHERE b.id < 1000');
|
|
79
|
-
});
|
|
80
|
-
it('applies query fragments', () => {
|
|
81
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.named_test_1');
|
|
82
|
-
const build = queryBuilder.build();
|
|
83
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.named_test_1 */b.`id`, b.`owner_id`, b.`name` FROM boards b WHERE id=:boardId OR owner_id=:ownerId');
|
|
84
|
-
});
|
|
85
|
-
it('applies sql constructs', () => {
|
|
86
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.sql_construct_test');
|
|
87
|
-
queryBuilder.withSqlConstruct('groupingColumn', 'test_column');
|
|
88
|
-
const build = queryBuilder.build();
|
|
89
|
-
expect(build.query).toBe('GROUP /* named_parameter_tests.sql_construct_test */BY x.test_column');
|
|
90
|
-
});
|
|
91
|
-
it('expands object arrays', () => {
|
|
92
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.new_repeat_section_test');
|
|
93
|
-
queryBuilder.withExpandedParam('cls', [
|
|
94
|
-
{ w: 1, h: 1 },
|
|
95
|
-
{ w: 2, h: 2 },
|
|
96
|
-
], true);
|
|
97
|
-
expect(queryBuilder.fetchCopyOfParam('clsW0')).toBe(1);
|
|
98
|
-
expect(queryBuilder.fetchCopyOfParam('clsW1')).toBe(2);
|
|
99
|
-
expect(queryBuilder.fetchCopyOfParam('clsH0')).toBe(1);
|
|
100
|
-
expect(queryBuilder.fetchCopyOfParam('clsH1')).toBe(2);
|
|
101
|
-
});
|
|
102
|
-
it('expands string arrays', () => {
|
|
103
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.new_repeat_section_test');
|
|
104
|
-
queryBuilder.withExpandedParam('cls', ['s0', 's1'], true);
|
|
105
|
-
expect(queryBuilder.fetchCopyOfParam('cls0')).toBe('s0');
|
|
106
|
-
expect(queryBuilder.fetchCopyOfParam('cls1')).toBe('s1');
|
|
107
|
-
});
|
|
108
|
-
it('applies repeat blocks', () => {
|
|
109
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.new_repeat_section_test');
|
|
110
|
-
queryBuilder.withExpandedParam('cls', [
|
|
111
|
-
{ w: 1, h: 1 },
|
|
112
|
-
{ w: 2, h: 2 },
|
|
113
|
-
], true);
|
|
114
|
-
const build = queryBuilder.build();
|
|
115
|
-
expect(build.query).toBe('/* named_parameter_tests.new_repeat_section_test */repeated :clsW1 :clsH1 clause AND repeated :clsW0 :clsH0 clause');
|
|
116
|
-
});
|
|
117
|
-
xit('applies pagination', () => {
|
|
118
|
-
const queryBuilder = mariaDb.queryBuilder('named_parameter_tests.conditional_param_section_test');
|
|
119
|
-
queryBuilder.withPaginator({ s: SortDirection.Desc, cn: 'b.id', max: 1000, l: 25 });
|
|
120
|
-
const build = queryBuilder.build();
|
|
121
|
-
expect(build.query).toBe('SELECT /* named_parameter_tests.conditional_param_section_test */b.`id` FROM boards b WHERE b.id < 1000 ORDER BY id Desc LIMIT :queryBuilderLimit');
|
|
122
|
-
expect(build.namedParams).toStrictEqual({
|
|
123
|
-
queryBuilderLimit: 20,
|
|
124
|
-
});
|
|
125
|
-
});
|
|
126
|
-
});
|
|
127
|
-
//# sourceMappingURL=query-builder.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.spec.js","sourceRoot":"","sources":["../../src/query-builder/query-builder.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,70 +0,0 @@
|
|
|
1
|
-
import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
|
|
2
|
-
import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
|
|
3
|
-
export class QueryUtil {
|
|
4
|
-
fields = [];
|
|
5
|
-
replacements = {};
|
|
6
|
-
addReplacement(replacement, ...fields) {
|
|
7
|
-
this.replacements = Object.assign(this.replacements, replacement);
|
|
8
|
-
this.addFields(...fields);
|
|
9
|
-
}
|
|
10
|
-
appendReplacement(replacementKey, appendValue, ...fields) {
|
|
11
|
-
this.replacements[replacementKey] = this.replacements[replacementKey] + appendValue;
|
|
12
|
-
this.addFields(...fields);
|
|
13
|
-
}
|
|
14
|
-
addFields(...fields) {
|
|
15
|
-
this.fields = this.fields.concat(...fields);
|
|
16
|
-
}
|
|
17
|
-
getFields() {
|
|
18
|
-
return this.fields;
|
|
19
|
-
}
|
|
20
|
-
getReplacements() {
|
|
21
|
-
return this.replacements;
|
|
22
|
-
}
|
|
23
|
-
static sqlInjectionUnsafeParamRenderer(value) {
|
|
24
|
-
const rFn = (val) => (typeof val === 'string' ? '"' + val + '"' : StringRatchet.safeString(val));
|
|
25
|
-
const repl = Array.isArray(value) ? value.map((s) => rFn(s)).join(',') : rFn(value);
|
|
26
|
-
return repl;
|
|
27
|
-
}
|
|
28
|
-
static renderQueryStringForPasteIntoTool(query, inFields, transform = QueryUtil.sqlInjectionUnsafeParamRenderer) {
|
|
29
|
-
const fields = inFields ?? {};
|
|
30
|
-
let rval = QueryUtil.reformatQueryForLogging(query);
|
|
31
|
-
if (rval) {
|
|
32
|
-
const keys = Object.keys(fields);
|
|
33
|
-
keys.sort((b, a) => a.length - b.length);
|
|
34
|
-
for (const key of keys) {
|
|
35
|
-
const val = fields[key];
|
|
36
|
-
const find = ':' + key;
|
|
37
|
-
const repl = transform(val);
|
|
38
|
-
rval = rval.split(find).join(repl);
|
|
39
|
-
}
|
|
40
|
-
if (!rval.endsWith(';')) {
|
|
41
|
-
rval += ';';
|
|
42
|
-
}
|
|
43
|
-
}
|
|
44
|
-
return rval;
|
|
45
|
-
}
|
|
46
|
-
static reformatQueryForLogging(qry, inMaxLineLength = 80) {
|
|
47
|
-
let maxLineLength = inMaxLineLength;
|
|
48
|
-
if (!StringRatchet.trimToNull(qry)) {
|
|
49
|
-
return null;
|
|
50
|
-
}
|
|
51
|
-
let loggableQuery = '';
|
|
52
|
-
let cleaned = StringRatchet.trimToEmpty(qry).split('\n').join(' ').split('\r').join(' ');
|
|
53
|
-
while (cleaned.length > maxLineLength) {
|
|
54
|
-
let idx = Math.min(cleaned.length, maxLineLength);
|
|
55
|
-
while (idx > 0 && ![' ', ','].includes(cleaned.charAt(idx))) {
|
|
56
|
-
idx--;
|
|
57
|
-
}
|
|
58
|
-
if (idx > 0) {
|
|
59
|
-
loggableQuery += cleaned.substring(0, idx) + '\n';
|
|
60
|
-
cleaned = StringRatchet.trimToEmpty(cleaned.substring(idx));
|
|
61
|
-
}
|
|
62
|
-
else {
|
|
63
|
-
Logger.silly('Input contains a string longer than the max line length - bumping');
|
|
64
|
-
maxLineLength += 2;
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
return loggableQuery + (cleaned.length > 0 ? cleaned : '');
|
|
68
|
-
}
|
|
69
|
-
}
|
|
70
|
-
//# sourceMappingURL=query-util.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"query-util.js","sourceRoot":"","sources":["../../src/query-builder/query-util.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,161 +0,0 @@
|
|
|
1
|
-
import maria from 'mysql2/promise';
|
|
2
|
-
import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
|
|
3
|
-
import getPort from 'get-port';
|
|
4
|
-
import _ from 'lodash';
|
|
5
|
-
import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
|
|
6
|
-
import { RequireRatchet } from '@bitblit/ratchet-common/lib/lang/require-ratchet.js';
|
|
7
|
-
class RdsMysqlStyleConnectionProvider {
|
|
8
|
-
inConfigPromise;
|
|
9
|
-
additionalConfig;
|
|
10
|
-
ssh;
|
|
11
|
-
static DEFAULT_CONNECTION_OPTIONS = { multipleStatements: true };
|
|
12
|
-
tunnels = new Map();
|
|
13
|
-
dbPromise = new Map();
|
|
14
|
-
configPromise;
|
|
15
|
-
constructor(inConfigPromise, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS, ssh) {
|
|
16
|
-
this.inConfigPromise = inConfigPromise;
|
|
17
|
-
this.additionalConfig = additionalConfig;
|
|
18
|
-
this.ssh = ssh;
|
|
19
|
-
this.configPromise = this.prepareConnectionConfig(inConfigPromise);
|
|
20
|
-
Logger.info('Added shutdown handler to the process (Only once per instantiation)');
|
|
21
|
-
this.addShutdownHandlerToProcess();
|
|
22
|
-
}
|
|
23
|
-
get usingSshTunnel() {
|
|
24
|
-
return !!this.ssh;
|
|
25
|
-
}
|
|
26
|
-
addShutdownHandlerToProcess() {
|
|
27
|
-
process.on('exit', () => {
|
|
28
|
-
Logger.info('Process is shutting down, closing connections');
|
|
29
|
-
this.clearConnectionCache().catch((err) => {
|
|
30
|
-
Logger.error('Shutdown connection failed : %s', err);
|
|
31
|
-
});
|
|
32
|
-
});
|
|
33
|
-
}
|
|
34
|
-
async clearConnectionCache() {
|
|
35
|
-
const rval = false;
|
|
36
|
-
Logger.info('Clearing connection cache for RdsMysqlConnectionProvider');
|
|
37
|
-
const oldDbHooks = this.dbPromise;
|
|
38
|
-
const oldSshTunnels = this.tunnels;
|
|
39
|
-
this.dbPromise = new Map();
|
|
40
|
-
this.tunnels = new Map();
|
|
41
|
-
if (oldDbHooks.size > 0) {
|
|
42
|
-
const hookNames = Array.from(oldDbHooks.keys());
|
|
43
|
-
for (const hookName of hookNames) {
|
|
44
|
-
Logger.info('Shutting down connection : %s', hookName);
|
|
45
|
-
const oldDbHook = oldDbHooks.get(hookName);
|
|
46
|
-
try {
|
|
47
|
-
const oldConn = await oldDbHook;
|
|
48
|
-
if (oldConn) {
|
|
49
|
-
await oldConn.destroy();
|
|
50
|
-
Logger.info('Finished destroying old connection');
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
Logger.warn('Could not get old connection, so not destroying it');
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
catch (err) {
|
|
57
|
-
if (ErrorRatchet.asErr(err).message.includes('closed state')) {
|
|
58
|
-
}
|
|
59
|
-
else {
|
|
60
|
-
Logger.error('Something went wrong closing the connection : %s', err);
|
|
61
|
-
throw err;
|
|
62
|
-
}
|
|
63
|
-
}
|
|
64
|
-
}
|
|
65
|
-
}
|
|
66
|
-
if (oldSshTunnels.size > 0) {
|
|
67
|
-
const tunnelNames = Array.from(oldSshTunnels.keys());
|
|
68
|
-
for (const tunnelName of tunnelNames) {
|
|
69
|
-
try {
|
|
70
|
-
Logger.info('Shutting down SSH tunnel: %s', tunnelName);
|
|
71
|
-
const tunnel = oldSshTunnels.get(tunnelName);
|
|
72
|
-
if (tunnel) {
|
|
73
|
-
await this.ssh.shutdown(tunnel);
|
|
74
|
-
}
|
|
75
|
-
else {
|
|
76
|
-
Logger.warn('Could not get old tunnel, so not destroying it');
|
|
77
|
-
}
|
|
78
|
-
Logger.info('SSH Tunnel closed');
|
|
79
|
-
}
|
|
80
|
-
catch (err) {
|
|
81
|
-
Logger.error('Failure closing old tunnel : %s', err);
|
|
82
|
-
}
|
|
83
|
-
}
|
|
84
|
-
}
|
|
85
|
-
Logger.info('Old db and tunnel removed');
|
|
86
|
-
return rval;
|
|
87
|
-
}
|
|
88
|
-
async getConnection(name) {
|
|
89
|
-
if (!this.dbPromise.has(name)) {
|
|
90
|
-
const dbConfig = await this.getDbConfig(name);
|
|
91
|
-
const connection = this.createDatabaseConnection(dbConfig, this.additionalConfig, true);
|
|
92
|
-
this.dbPromise.set(name, connection);
|
|
93
|
-
}
|
|
94
|
-
return this.dbPromise.get(name);
|
|
95
|
-
}
|
|
96
|
-
async createNonPooledDatabaseConnection(queryDefaults, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS) {
|
|
97
|
-
Logger.info('Creating non-pooled connection for %s', queryDefaults.databaseName);
|
|
98
|
-
const dbConfig = await this.getDbConfig(queryDefaults.databaseName);
|
|
99
|
-
const rval = await this.createDatabaseConnection(dbConfig, additionalConfig, false);
|
|
100
|
-
return rval;
|
|
101
|
-
}
|
|
102
|
-
async getDbConfig(name) {
|
|
103
|
-
Logger.info('RdsMysqlStyleConnectionProvider:getDbConfig:Initiating promise for %s', name);
|
|
104
|
-
const cfgs = await this.configPromise;
|
|
105
|
-
const dbConfig = cfgs.dbList.find((s) => s.label === name.toLowerCase());
|
|
106
|
-
if (!dbConfig) {
|
|
107
|
-
throw new Error(`Cannot find any connection config named ${name}`);
|
|
108
|
-
}
|
|
109
|
-
return dbConfig;
|
|
110
|
-
}
|
|
111
|
-
async createDatabaseConnection(dbCfg, additionalConfig = RdsMysqlStyleConnectionProvider.DEFAULT_CONNECTION_OPTIONS, clearCacheOnConnectionFailure, sshConfigPromise) {
|
|
112
|
-
Logger.debug('In RdsMysqlStyleConnectionProvider:createDatabaseConnection : %s', dbCfg.label);
|
|
113
|
-
const cfgCopy = _.omit(_.clone(dbCfg), 'label', 'tunnelPort');
|
|
114
|
-
if (this.usingSshTunnel && dbCfg.tunnelPort) {
|
|
115
|
-
let tunnel = this.tunnels.get(dbCfg.label);
|
|
116
|
-
if (!tunnel) {
|
|
117
|
-
Logger.debug('Creating SSH tunnel from local port %d to remote host %s and port %d', dbCfg.tunnelPort, dbCfg.host, dbCfg.port);
|
|
118
|
-
const sshConfig = await sshConfigPromise;
|
|
119
|
-
tunnel = await this.ssh.createSSHTunnel(sshConfig, dbCfg.host, dbCfg.port, dbCfg.tunnelPort);
|
|
120
|
-
this.tunnels.set(dbCfg.label, tunnel);
|
|
121
|
-
}
|
|
122
|
-
cfgCopy.port = tunnel.serverOptions.port ?? -1;
|
|
123
|
-
cfgCopy.host = 'localhost';
|
|
124
|
-
}
|
|
125
|
-
Logger.debug('Opening connection for RdsMysqlStyleConnectionProvider');
|
|
126
|
-
let connection;
|
|
127
|
-
try {
|
|
128
|
-
connection = await maria.createConnection({ ...additionalConfig, ...cfgCopy });
|
|
129
|
-
}
|
|
130
|
-
catch (err) {
|
|
131
|
-
Logger.info('Failed trying to create connection : %s : clearing for retry', err);
|
|
132
|
-
if (clearCacheOnConnectionFailure) {
|
|
133
|
-
this.dbPromise = new Map();
|
|
134
|
-
}
|
|
135
|
-
return undefined;
|
|
136
|
-
}
|
|
137
|
-
connection.on('error', (err) => {
|
|
138
|
-
Logger.info('An error was detected on the connection : %s : Clearing', err);
|
|
139
|
-
this.clearConnectionCache()
|
|
140
|
-
.then((cleared) => {
|
|
141
|
-
Logger.info('Connection cleared: %s', cleared);
|
|
142
|
-
})
|
|
143
|
-
.catch((err) => Logger.error('Failed to clear RDS connection cache: %j', err));
|
|
144
|
-
});
|
|
145
|
-
Logger.info('Added error handler to db, there are now %d error handlers and %d shutdown handlers', connection.rawListeners('error').length, process.rawListeners('exit').length);
|
|
146
|
-
return connection;
|
|
147
|
-
}
|
|
148
|
-
async prepareConnectionConfig(inputPromise) {
|
|
149
|
-
RequireRatchet.notNullOrUndefined(inputPromise, 'input');
|
|
150
|
-
const cfg = await inputPromise;
|
|
151
|
-
RequireRatchet.true(cfg.dbList.length > 0, 'input.dbList');
|
|
152
|
-
if (this.usingSshTunnel) {
|
|
153
|
-
for (const dbConfig of cfg.dbList) {
|
|
154
|
-
dbConfig.tunnelPort = await getPort();
|
|
155
|
-
}
|
|
156
|
-
}
|
|
157
|
-
return cfg;
|
|
158
|
-
}
|
|
159
|
-
}
|
|
160
|
-
export { RdsMysqlStyleConnectionProvider };
|
|
161
|
-
//# sourceMappingURL=rds-mysql-style-connection-provider.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"rds-mysql-style-connection-provider.js","sourceRoot":"","sources":["../src/rds-mysql-style-connection-provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,48 +0,0 @@
|
|
|
1
|
-
import * as TunnelSsh from 'tunnel-ssh';
|
|
2
|
-
import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
|
|
3
|
-
export class SshTunnelService {
|
|
4
|
-
async shutdown(ssh) {
|
|
5
|
-
if (!ssh.connection) {
|
|
6
|
-
Logger.info('Not shutting down tunnel - non-tunnel passed');
|
|
7
|
-
return false;
|
|
8
|
-
}
|
|
9
|
-
try {
|
|
10
|
-
Logger.info('Shutting down SSH Tunnel');
|
|
11
|
-
ssh.connection.end();
|
|
12
|
-
ssh.server.close();
|
|
13
|
-
return true;
|
|
14
|
-
}
|
|
15
|
-
catch (err) {
|
|
16
|
-
Logger.error('Error closing ssh tunnel : %s', err);
|
|
17
|
-
return false;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
async createSSHTunnel(sshOptions, dstHost, dstPort, localPort) {
|
|
21
|
-
const tunnelOptions = {
|
|
22
|
-
autoClose: true,
|
|
23
|
-
};
|
|
24
|
-
const serverOptions = {
|
|
25
|
-
port: localPort,
|
|
26
|
-
};
|
|
27
|
-
const forwardOptions = {
|
|
28
|
-
srcAddr: 'localhost',
|
|
29
|
-
srcPort: localPort,
|
|
30
|
-
dstAddr: dstHost,
|
|
31
|
-
dstPort: dstPort,
|
|
32
|
-
};
|
|
33
|
-
const [server, connection] = await TunnelSsh.createTunnel(tunnelOptions, serverOptions, sshOptions, forwardOptions);
|
|
34
|
-
server.on('error', (err) => {
|
|
35
|
-
Logger.warn('SSH Server Error : %s', err);
|
|
36
|
-
});
|
|
37
|
-
const rval = {
|
|
38
|
-
tunnelOptions: tunnelOptions,
|
|
39
|
-
serverOptions: serverOptions,
|
|
40
|
-
sshOptions: sshOptions,
|
|
41
|
-
forwardOptions: forwardOptions,
|
|
42
|
-
server: server,
|
|
43
|
-
connection: connection,
|
|
44
|
-
};
|
|
45
|
-
return rval;
|
|
46
|
-
}
|
|
47
|
-
}
|
|
48
|
-
//# sourceMappingURL=ssh-tunnel-service.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"ssh-tunnel-service.js","sourceRoot":"","sources":["../src/ssh-tunnel-service.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,SAAS,MAAM,YAAY,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,8CAA8C,CAAC;AAItE,MAAM,OAAO,gBAAgB;IACpB,KAAK,CAAC,QAAQ,CAAC,GAAuB;QAC3C,IAAI,CAAC,GAAG,CAAC,UAAU,EAAE;YACnB,MAAM,CAAC,IAAI,CAAC,8CAA8C,CAAC,CAAC;YAC5D,OAAO,KAAK,CAAC;SACd;QACD,IAAI;YACF,MAAM,CAAC,IAAI,CAAC,0BAA0B,CAAC,CAAC;YACxC,GAAG,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC;YACrB,GAAG,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC;YACnB,OAAO,IAAI,CAAC;SACb;QAAC,OAAO,GAAG,EAAE;YACZ,MAAM,CAAC,KAAK,CAAC,+BAA+B,EAAE,GAAG,CAAC,CAAC;YACnD,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,KAAK,CAAC,eAAe,CAC1B,UAA2B,EAC3B,OAAe,EACf,OAAe,EACf,SAAiB;QAEjB,MAAM,aAAa,GAAG;YACpB,SAAS,EAAE,IAAI;SAChB,CAAC;QACF,MAAM,aAAa,GAAG;YACpB,IAAI,EAAE,SAAS;SAChB,CAAC;QACF,MAAM,cAAc,GAAG;YACrB,OAAO,EAAE,WAAW;YACpB,OAAO,EAAE,SAAS;YAClB,OAAO,EAAE,OAAO;YAChB,OAAO,EAAE,OAAO;SACjB,CAAC;QAEF,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,GAAG,MAAM,SAAS,CAAC,YAAY,CAAC,aAAa,EAAE,aAAa,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;QAEpH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAU,EAAE,EAAE;YAChC,MAAM,CAAC,IAAI,CAAC,uBAAuB,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,MAAM,IAAI,GAAuB;YAC/B,aAAa,EAAE,aAAa;YAC5B,aAAa,EAAE,aAAa;YAC5B,UAAU,EAAE,UAAU;YACtB,cAAc,EAAE,cAAc;YAC9B,MAAM,EAAE,MAAM;YACd,UAAU,EAAE,UAAU;SACvB,CAAC;QAEF,OAAO,IAAI,CAAC;IACd,CAAC;CACF"}
|
|
@@ -1,130 +0,0 @@
|
|
|
1
|
-
import { NamedParameterMariaDbService } from './named-parameter-maria-db-service.js';
|
|
2
|
-
import { ErrorRatchet } from '@bitblit/ratchet-common/lib/lang/error-ratchet.js';
|
|
3
|
-
import { Logger } from '@bitblit/ratchet-common/lib/logger/logger.js';
|
|
4
|
-
import { StringRatchet } from '@bitblit/ratchet-common/lib/lang/string-ratchet.js';
|
|
5
|
-
export class TransactionalNamedParameterMariaDbService extends NamedParameterMariaDbService {
|
|
6
|
-
myQueryProvider;
|
|
7
|
-
myConnectionProvider;
|
|
8
|
-
myQueryDefaults;
|
|
9
|
-
currentTxFlag;
|
|
10
|
-
static async create(src, queryDefaults, additionalConfig) {
|
|
11
|
-
Logger.info('createTransactionalNamedParameterMariaDbService : %j : %j', queryDefaults, additionalConfig);
|
|
12
|
-
const connProv = await src.createNonPooledMysqlStyleConnectionProvider(queryDefaults, additionalConfig);
|
|
13
|
-
return new TransactionalNamedParameterMariaDbService(src.getQueryProvider(), connProv, queryDefaults);
|
|
14
|
-
}
|
|
15
|
-
constructor(myQueryProvider, myConnectionProvider, myQueryDefaults) {
|
|
16
|
-
super(myQueryProvider, myConnectionProvider, myQueryDefaults);
|
|
17
|
-
this.myQueryProvider = myQueryProvider;
|
|
18
|
-
this.myConnectionProvider = myConnectionProvider;
|
|
19
|
-
this.myQueryDefaults = myQueryDefaults;
|
|
20
|
-
}
|
|
21
|
-
async cleanShutdown() {
|
|
22
|
-
Logger.info('cleanShutdown');
|
|
23
|
-
try {
|
|
24
|
-
const conn = await this.myConnectionProvider.getConnection();
|
|
25
|
-
if (conn) {
|
|
26
|
-
Logger.info('Shutting down connection');
|
|
27
|
-
conn.destroy();
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
catch (err) {
|
|
31
|
-
Logger.info('Failure shutting down single-use connection : %s', err);
|
|
32
|
-
}
|
|
33
|
-
}
|
|
34
|
-
async startTransaction() {
|
|
35
|
-
if (!this.currentTxFlag) {
|
|
36
|
-
this.currentTxFlag = StringRatchet.createRandomHexString(10);
|
|
37
|
-
Logger.info('Starting a transaction : %s', this.currentTxFlag);
|
|
38
|
-
const conn = await this.myConnectionProvider.getConnection();
|
|
39
|
-
await conn?.beginTransaction();
|
|
40
|
-
}
|
|
41
|
-
else {
|
|
42
|
-
ErrorRatchet.throwFormattedErr('Tried to start a new transaction while one is already in progress : %s', this.currentTxFlag);
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
async commitTransaction() {
|
|
46
|
-
if (this.currentTxFlag) {
|
|
47
|
-
Logger.info('commit a transaction : %s', this.currentTxFlag);
|
|
48
|
-
const conn = await this.myConnectionProvider.getConnection();
|
|
49
|
-
await conn?.commit();
|
|
50
|
-
this.currentTxFlag = undefined;
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
ErrorRatchet.throwFormattedErr('Cannot commit transaction - none in process');
|
|
54
|
-
}
|
|
55
|
-
}
|
|
56
|
-
async rollBackTransaction() {
|
|
57
|
-
if (this.currentTxFlag) {
|
|
58
|
-
Logger.info('rollBack a transaction : %s', this.currentTxFlag);
|
|
59
|
-
const conn = await this.myConnectionProvider.getConnection();
|
|
60
|
-
await conn?.rollback();
|
|
61
|
-
this.currentTxFlag = undefined;
|
|
62
|
-
}
|
|
63
|
-
else {
|
|
64
|
-
ErrorRatchet.throwFormattedErr('Cannot rollBack transaction - none in process');
|
|
65
|
-
}
|
|
66
|
-
}
|
|
67
|
-
async buildAndExecuteUpdateOrInsertInTransaction(queryBuilder, timeoutMS = this.myQueryDefaults.timeoutMS) {
|
|
68
|
-
Logger.info('buildAndExecuteUpdateOrInsertInTransaction');
|
|
69
|
-
await this.startTransaction();
|
|
70
|
-
try {
|
|
71
|
-
const rval = await this.buildAndExecuteUpdateOrInsert(queryBuilder, timeoutMS);
|
|
72
|
-
await this.commitTransaction();
|
|
73
|
-
return rval;
|
|
74
|
-
}
|
|
75
|
-
catch (err) {
|
|
76
|
-
Logger.error('Failed - rolling back transaction : %s', err, err);
|
|
77
|
-
await this.rollBackTransaction();
|
|
78
|
-
return null;
|
|
79
|
-
}
|
|
80
|
-
}
|
|
81
|
-
async buildAndExecuteInTransaction(queryBuilder, timeoutMS = this.myQueryDefaults.timeoutMS) {
|
|
82
|
-
Logger.info('buildAndExecuteInTransaction');
|
|
83
|
-
await this.startTransaction();
|
|
84
|
-
try {
|
|
85
|
-
const rval = await this.buildAndExecute(queryBuilder, timeoutMS);
|
|
86
|
-
await this.commitTransaction();
|
|
87
|
-
return rval;
|
|
88
|
-
}
|
|
89
|
-
catch (err) {
|
|
90
|
-
Logger.error('Failed - rolling back transaction : %s', err, err);
|
|
91
|
-
await this.rollBackTransaction();
|
|
92
|
-
return null;
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
static async oneStepBuildAndExecuteUpdateOrInsertInTransaction(src, queryBuilder, timeoutMS = src.getQueryDefaults().timeoutMS, additionalConfig) {
|
|
96
|
-
let handler;
|
|
97
|
-
let rval = null;
|
|
98
|
-
try {
|
|
99
|
-
handler = await TransactionalNamedParameterMariaDbService.create(src, src.getQueryDefaults(), additionalConfig);
|
|
100
|
-
rval = await handler.buildAndExecuteUpdateOrInsertInTransaction(queryBuilder, timeoutMS);
|
|
101
|
-
}
|
|
102
|
-
catch (err) {
|
|
103
|
-
Logger.error('Failure in oneStepBuildAndExecuteUpdateOrInsertInTransaction : %j : %s', queryBuilder, err, err);
|
|
104
|
-
}
|
|
105
|
-
finally {
|
|
106
|
-
if (handler) {
|
|
107
|
-
await handler.cleanShutdown();
|
|
108
|
-
}
|
|
109
|
-
}
|
|
110
|
-
return rval;
|
|
111
|
-
}
|
|
112
|
-
static async oneStepBuildAndExecuteInTransaction(src, queryBuilder, timeoutMS = src.getQueryDefaults().timeoutMS, additionalConfig) {
|
|
113
|
-
let handler;
|
|
114
|
-
let rval = null;
|
|
115
|
-
try {
|
|
116
|
-
handler = await TransactionalNamedParameterMariaDbService.create(src, src.getQueryDefaults(), additionalConfig);
|
|
117
|
-
rval = await handler.buildAndExecuteInTransaction(queryBuilder, timeoutMS);
|
|
118
|
-
}
|
|
119
|
-
catch (err) {
|
|
120
|
-
Logger.error('Failure in oneStepbuildAndExecuteInTransaction : %j : %s', queryBuilder, err, err);
|
|
121
|
-
}
|
|
122
|
-
finally {
|
|
123
|
-
if (handler) {
|
|
124
|
-
await handler.cleanShutdown();
|
|
125
|
-
}
|
|
126
|
-
}
|
|
127
|
-
return rval;
|
|
128
|
-
}
|
|
129
|
-
}
|
|
130
|
-
//# sourceMappingURL=transactional-named-parameter-maria-db-service.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"transactional-named-parameter-maria-db-service.js","sourceRoot":"","sources":["../src/transactional-named-parameter-maria-db-service.ts"],"names":[],"mappings":"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"}
|