@forestadmin/datasource-sql 1.6.8 → 1.6.10
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.
|
@@ -30,6 +30,7 @@ export default class ConnectionOptions {
|
|
|
30
30
|
get host(): string;
|
|
31
31
|
get port(): number;
|
|
32
32
|
get database(): string;
|
|
33
|
+
private get plainConnectionOptions();
|
|
33
34
|
constructor(options: PlainConnectionOptionsOrUri, logger?: Logger);
|
|
34
35
|
changeHostAndPort(host: string, port: number): void;
|
|
35
36
|
buildPreprocessedOptions(): Promise<PlainConnectionOptions>;
|
|
@@ -61,6 +61,16 @@ class ConnectionOptions {
|
|
|
61
61
|
get database() {
|
|
62
62
|
return this.uri?.pathname?.slice(1) || this.sequelizeOptions.database;
|
|
63
63
|
}
|
|
64
|
+
get plainConnectionOptions() {
|
|
65
|
+
const options = { ...this.sequelizeOptions };
|
|
66
|
+
if (this.uri)
|
|
67
|
+
options.uri = this.uri.toString();
|
|
68
|
+
if (this.proxyOptions)
|
|
69
|
+
options.proxySocks = this.proxyOptions;
|
|
70
|
+
options.dialect = this.dialect;
|
|
71
|
+
options.sslMode = this.sslMode;
|
|
72
|
+
return options;
|
|
73
|
+
}
|
|
64
74
|
constructor(options, logger) {
|
|
65
75
|
this.logger = logger;
|
|
66
76
|
if (typeof options === 'string') {
|
|
@@ -96,12 +106,7 @@ class ConnectionOptions {
|
|
|
96
106
|
this.sequelizeOptions.port = port;
|
|
97
107
|
}
|
|
98
108
|
async buildPreprocessedOptions() {
|
|
99
|
-
const options =
|
|
100
|
-
if (this.uri)
|
|
101
|
-
options.uri = this.uri.toString();
|
|
102
|
-
if (this.proxyOptions)
|
|
103
|
-
options.proxySocks = this.proxyOptions;
|
|
104
|
-
options.dialect = this.dialect;
|
|
109
|
+
const options = this.plainConnectionOptions;
|
|
105
110
|
options.sslMode = await this.computeSslMode();
|
|
106
111
|
return options;
|
|
107
112
|
}
|
|
@@ -210,11 +215,7 @@ class ConnectionOptions {
|
|
|
210
215
|
let sequelize;
|
|
211
216
|
try {
|
|
212
217
|
// eslint-disable-next-line no-await-in-loop
|
|
213
|
-
sequelize = await (0, index_1.default)(new ConnectionOptions({
|
|
214
|
-
uri: this.uri?.toString(),
|
|
215
|
-
sslMode,
|
|
216
|
-
...this.sequelizeOptions,
|
|
217
|
-
}));
|
|
218
|
+
sequelize = await (0, index_1.default)(new ConnectionOptions({ ...this.plainConnectionOptions, sslMode }));
|
|
218
219
|
return sslMode;
|
|
219
220
|
}
|
|
220
221
|
catch (e) {
|
|
@@ -228,4 +229,4 @@ class ConnectionOptions {
|
|
|
228
229
|
}
|
|
229
230
|
}
|
|
230
231
|
exports.default = ConnectionOptions;
|
|
231
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
232
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"connection-options.js","sourceRoot":"","sources":["../../src/connection/connection-options.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const errors_1 = require("./errors");
|
|
4
|
+
async function testConnectionWithTimeOut(sequelize, databaseUri, timeout = 10000) {
|
|
5
|
+
// Test connection. If this doesn't resolve after 10s, throw a timeout error
|
|
6
|
+
const timeoutPromise = new Promise(resolve => {
|
|
7
|
+
setTimeout(resolve, timeout);
|
|
8
|
+
}).then(() => Promise.reject(new errors_1.DatabaseConnectError('Connection to database timed out', databaseUri)));
|
|
9
|
+
await Promise.race([sequelize.authenticate(), timeoutPromise]);
|
|
10
|
+
}
|
|
11
|
+
exports.default = testConnectionWithTimeOut;
|
|
12
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29ubmVjdGlvbi10ZXN0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9jb25uZWN0aW9uLXRlc3Rlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLHFDQUFnRDtBQUVqQyxLQUFLLFVBQVUseUJBQXlCLENBQ3JELFNBQW9CLEVBQ3BCLFdBQW1CLEVBQ25CLE9BQU8sR0FBRyxLQUFLO0lBRWYsNEVBQTRFO0lBQzVFLE1BQU0sY0FBYyxHQUFHLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQzNDLFVBQVUsQ0FBQyxPQUFPLEVBQUUsT0FBTyxDQUFDLENBQUM7SUFDL0IsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEdBQUcsRUFBRSxDQUNYLE9BQU8sQ0FBQyxNQUFNLENBQUMsSUFBSSw2QkFBb0IsQ0FBQyxrQ0FBa0MsRUFBRSxXQUFXLENBQUMsQ0FBQyxDQUMxRixDQUFDO0lBRUYsTUFBTSxPQUFPLENBQUMsSUFBSSxDQUFDLENBQUMsU0FBUyxDQUFDLFlBQVksRUFBRSxFQUFFLGNBQWMsQ0FBQyxDQUFDLENBQUM7QUFDakUsQ0FBQztBQWJELDRDQWFDIn0=
|
package/dist/connection/index.js
CHANGED
|
@@ -3,6 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
const connection_tester_1 = __importDefault(require("./connection-tester"));
|
|
6
7
|
const handle_errors_1 = __importDefault(require("./handle-errors"));
|
|
7
8
|
const reverse_proxy_1 = __importDefault(require("./services/reverse-proxy"));
|
|
8
9
|
const sequelize_factory_1 = __importDefault(require("./services/sequelize-factory"));
|
|
@@ -26,7 +27,7 @@ async function connect(options) {
|
|
|
26
27
|
if (tcpServer)
|
|
27
28
|
sequelizeFactory.onClose(tcpServer.closeListener.bind(tcpServer));
|
|
28
29
|
sequelize = sequelizeFactory.build(await options.buildSequelizeCtorOptions());
|
|
29
|
-
await sequelize.
|
|
30
|
+
await (0, connection_tester_1.default)(sequelize, options.debugDatabaseUri);
|
|
30
31
|
return sequelize;
|
|
31
32
|
}
|
|
32
33
|
catch (e) {
|
|
@@ -36,4 +37,4 @@ async function connect(options) {
|
|
|
36
37
|
}
|
|
37
38
|
}
|
|
38
39
|
exports.default = connect;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
40
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvY29ubmVjdGlvbi9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUdBLDRFQUE0RDtBQUM1RCxvRUFBMkM7QUFDM0MsNkVBQW9EO0FBQ3BELHFGQUE0RDtBQUM1RCx1RUFBOEM7QUFFOUMseUNBQXlDO0FBQzFCLEtBQUssVUFBVSxPQUFPLENBQUMsT0FBMEI7SUFDOUQsSUFBSSxLQUFtQixDQUFDO0lBQ3hCLElBQUksU0FBb0IsQ0FBQztJQUN6QixJQUFJLFNBQW9CLENBQUM7SUFFekIsSUFBSTtRQUNGLElBQUksT0FBTyxDQUFDLFlBQVksRUFBRTtZQUN4QixTQUFTLEdBQUcsSUFBSSxvQkFBUyxFQUFFLENBQUM7WUFDNUIsTUFBTSxTQUFTLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDeEIsS0FBSyxHQUFHLElBQUksdUJBQVksQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxJQUFJLEVBQUUsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDO1lBQzNFLFNBQVMsQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLGVBQWUsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQztZQUN2RCxTQUFTLENBQUMsT0FBTyxDQUFDLEtBQUssQ0FBQyxhQUFhLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7WUFDbkQsNERBQTREO1lBQzVELE9BQU8sQ0FBQyxpQkFBaUIsQ0FBQyxTQUFTLENBQUMsSUFBSSxFQUFFLFNBQVMsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUMzRDtRQUVELE1BQU0sZ0JBQWdCLEdBQUcsSUFBSSwyQkFBZ0IsRUFBRSxDQUFDO1FBQ2hELElBQUksU0FBUztZQUFFLGdCQUFnQixDQUFDLE9BQU8sQ0FBQyxTQUFTLENBQUMsYUFBYSxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsQ0FBQyxDQUFDO1FBRWpGLFNBQVMsR0FBRyxnQkFBZ0IsQ0FBQyxLQUFLLENBQUMsTUFBTSxPQUFPLENBQUMseUJBQXlCLEVBQUUsQ0FBQyxDQUFDO1FBRTlFLE1BQU0sSUFBQSwyQkFBeUIsRUFBQyxTQUFTLEVBQUUsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUM7UUFFckUsT0FBTyxTQUFTLENBQUM7S0FDbEI7SUFBQyxPQUFPLENBQUMsRUFBRTtRQUNWLE1BQU0sU0FBUyxFQUFFLEtBQUssRUFBRSxDQUFDO1FBQ3pCLG9GQUFvRjtRQUNwRixJQUFBLHVCQUFZLEVBQUMsS0FBSyxFQUFFLEtBQUssSUFBSSxDQUFDLEVBQUUsT0FBTyxDQUFDLENBQUM7S0FDMUM7QUFDSCxDQUFDO0FBN0JELDBCQTZCQyJ9
|