exodus-framework 2.0.954 → 2.0.956
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/app/settings.d.ts.map +1 -1
- package/lib/app/settings.js +7 -8
- package/lib/contracts/settings.d.ts +1 -2
- package/lib/contracts/settings.d.ts.map +1 -1
- package/lib/middlewares/access.js +1 -1
- package/lib/middlewares/authentication.js +1 -1
- package/lib/models/Application.js +1 -1
- package/lib/models/DatabaseHost.js +1 -1
- package/lib/models/EnvConnection.js +1 -1
- package/lib/models/Log.js +1 -1
- package/lib/models/System.js +1 -1
- package/lib/services/database.js +4 -4
- package/lib/services/sequelize.js +9 -9
- package/lib/utils/database.d.ts +1 -1
- package/lib/utils/database.d.ts.map +1 -1
- package/lib/utils/database.js +7 -7
- package/package.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/app/settings.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAKvB,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,uBAAuB,EACvB,cAAc,EACd,aAAa,EACb,iBAAiB,EACjB,OAAO,EACP,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAE/B,cAAM,YAAY;IAChB,WAAW,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAM;IAChD,cAAc,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAM;IACtD,KAAK,EAAE,OAAO,CAAC,cAAc,CAAC,CAAM;IACpC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAM;IAC1C,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAM;IAClC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAM;IAC9B,SAAS,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAM;IAE5C,QAAQ,EAAE,eAAe,
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/app/settings.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAKvB,OAAO,EACL,eAAe,EACf,oBAAoB,EACpB,uBAAuB,EACvB,cAAc,EACd,aAAa,EACb,iBAAiB,EACjB,OAAO,EACP,kBAAkB,EACnB,MAAM,uBAAuB,CAAC;AAE/B,cAAM,YAAY;IAChB,WAAW,EAAE,OAAO,CAAC,oBAAoB,CAAC,CAAM;IAChD,cAAc,EAAE,OAAO,CAAC,uBAAuB,CAAC,CAAM;IACtD,KAAK,EAAE,OAAO,CAAC,cAAc,CAAC,CAAM;IACpC,QAAQ,EAAE,OAAO,CAAC,iBAAiB,CAAC,CAAM;IAC1C,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,CAAM;IAClC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAM;IAC9B,SAAS,EAAE,OAAO,CAAC,kBAAkB,CAAC,CAAM;IAE5C,QAAQ,EAAE,eAAe,CAoGvB;IACF,QAAQ,EAAE,eAAe,CAAC;;IAM1B,SAAS,CAAC,aAAa;IAavB,aAAa;IAGb,iBAAiB;IAGjB,QAAQ;IAGR,WAAW;IAGX,OAAO;IAGP,SAAS;IAGT,YAAY;CAGb;AAED,eAAe,YAAY,CAAC"}
|
package/lib/app/settings.js
CHANGED
@@ -50,18 +50,18 @@ class CoreSettings {
|
|
50
50
|
password: process.env.CACHE_USER || 'eYVX7EwVmmxKPCDmwMtyKVge8oLd2t81'
|
51
51
|
},
|
52
52
|
database: {
|
53
|
-
|
54
|
-
database: process.env.
|
55
|
-
dialect: process.env.
|
56
|
-
username: process.env.
|
57
|
-
password: process.env.
|
53
|
+
main: {
|
54
|
+
database: process.env.DB_NAME || 'unknow',
|
55
|
+
dialect: process.env.DB_DIALECT || 'mariadb',
|
56
|
+
username: process.env.DB_USER || 'root',
|
57
|
+
password: process.env.DB_PASS || '',
|
58
58
|
log: (_sql, _timing) => {
|
59
59
|
return;
|
60
60
|
},
|
61
61
|
pool: {
|
62
|
-
max:
|
62
|
+
max: 2,
|
63
63
|
// Número máximo de conexões no pool
|
64
|
-
min:
|
64
|
+
min: 0,
|
65
65
|
// Número mínimo de conexões no pool
|
66
66
|
acquire: 30000,
|
67
67
|
// Tempo máximo (em ms) para adquirir uma conexão do pool
|
@@ -69,7 +69,6 @@ class CoreSettings {
|
|
69
69
|
}
|
70
70
|
},
|
71
71
|
service: {
|
72
|
-
database: process.env.SERVICE_DB_NAME || 'unknow',
|
73
72
|
log: (_sql, _timing) => {
|
74
73
|
return;
|
75
74
|
},
|
@@ -31,7 +31,7 @@ export type TCacheSettings = {
|
|
31
31
|
password: string;
|
32
32
|
};
|
33
33
|
export type TdatabaseSettings = {
|
34
|
-
|
34
|
+
main: {
|
35
35
|
database: string;
|
36
36
|
dialect: Dialect;
|
37
37
|
username: string;
|
@@ -45,7 +45,6 @@ export type TdatabaseSettings = {
|
|
45
45
|
log: (sql: string, timing: number) => void;
|
46
46
|
};
|
47
47
|
service: {
|
48
|
-
database: string;
|
49
48
|
pool: {
|
50
49
|
max: number;
|
51
50
|
min: number;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/contracts/settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAEpC,MAAM,MAAM,iBAAiB,GAAG;IAC9B,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AACF,MAAM,MAAM,oBAAoB,GAAG;IACjC,KAAK,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,EAAE,OAAO,CAAC;IAG1B,SAAS,EAAE,iBAAiB,CAAC;CAC9B,CAAC;AACF,MAAM,MAAM,uBAAuB,GAAG;IACpC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB,EAAE,MAAM,CAAC;IAC7B,kBAAkB,EAAE,MAAM,CAAC;CAC5B,CAAC;AACF,MAAM,MAAM,cAAc,GAAG;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AACF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,
|
1
|
+
{"version":3,"file":"settings.d.ts","sourceRoot":"","sources":["../../src/contracts/settings.ts"],"names":[],"mappings":"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"}
|
@@ -104,7 +104,7 @@ class AccessMiddleware extends _controller.default {
|
|
104
104
|
}
|
105
105
|
}
|
106
106
|
req.tenant = {
|
107
|
-
id: envUuid || _app.Core.settings.getDatabase().
|
107
|
+
id: envUuid || _app.Core.settings.getDatabase().main.database
|
108
108
|
};
|
109
109
|
req.requestor = requestor;
|
110
110
|
req.isApplication = isApplication;
|
@@ -91,7 +91,7 @@ class SocketAuthenticationMiddleware extends _controller.SocketController {
|
|
91
91
|
envUuid = account.envUuid;
|
92
92
|
}
|
93
93
|
socket.tenant = {
|
94
|
-
id: envUuid || _app.Core.settings.getDatabase().
|
94
|
+
id: envUuid || _app.Core.settings.getDatabase().main.database
|
95
95
|
};
|
96
96
|
socket.requestor = requestor;
|
97
97
|
socket.isApplication = isApplication;
|
package/lib/models/Log.js
CHANGED
package/lib/models/System.js
CHANGED
package/lib/services/database.js
CHANGED
@@ -18,15 +18,15 @@ class DatabaseService extends _app.Service {
|
|
18
18
|
this.connections = new Map();
|
19
19
|
|
20
20
|
// para busca rápidas
|
21
|
-
this.connections.set(_app.Core.settings.getDatabase().
|
21
|
+
this.connections.set(_app.Core.settings.getDatabase().main.database, _utils.mainDb);
|
22
22
|
this.startAttemptDelay = 5 * 1000;
|
23
23
|
this.maxStartAttempts = 3;
|
24
24
|
}
|
25
25
|
async onStart() {
|
26
26
|
this.log(`⌛️ Connecting Sequelize to database: ${this.currentStartAttempts}/${this.maxStartAttempts}`);
|
27
27
|
try {
|
28
|
-
await _utils.
|
29
|
-
await _utils.
|
28
|
+
await _utils.mainDb.authenticate();
|
29
|
+
await _utils.mainDb.sync({
|
30
30
|
alter: true
|
31
31
|
});
|
32
32
|
this.log('✅ Connected service database sucessfully', 'success');
|
@@ -130,7 +130,7 @@ class DatabaseService extends _app.Service {
|
|
130
130
|
|
131
131
|
//* Utils
|
132
132
|
normalizeDatabaseName(envToken) {
|
133
|
-
return `${_app.Core.settings.getDatabase().
|
133
|
+
return `${_app.Core.settings.getDatabase().main.database}_${envToken}`;
|
134
134
|
}
|
135
135
|
}
|
136
136
|
var _default = exports.default = DatabaseService;
|
@@ -38,7 +38,7 @@ class SequelizeService extends _service.default {
|
|
38
38
|
async onServiceInit() {
|
39
39
|
await super.onServiceInit();
|
40
40
|
if (!this.models) throw new Error('Models are requireds! Call registerModels(modelsArray)');
|
41
|
-
this.serviceDB = _database.
|
41
|
+
this.serviceDB = _database.mainDb;
|
42
42
|
this.connections = new Map();
|
43
43
|
this.initializedModels = new Map();
|
44
44
|
this.initializingdModels = new Map();
|
@@ -85,8 +85,8 @@ class SequelizeService extends _service.default {
|
|
85
85
|
// #Database
|
86
86
|
async getDB(tenantId) {
|
87
87
|
/* master or service */
|
88
|
-
if (tenantId == _app.Core.settings.getDatabase().
|
89
|
-
return _database.
|
88
|
+
if (tenantId == _app.Core.settings.getDatabase().main.database) {
|
89
|
+
return _database.mainDb;
|
90
90
|
}
|
91
91
|
const relation = await this.getRelation(tenantId);
|
92
92
|
if (!relation) return false;
|
@@ -99,7 +99,7 @@ class SequelizeService extends _service.default {
|
|
99
99
|
this.log('Database host information not found: ' + hostUuid);
|
100
100
|
return false;
|
101
101
|
}
|
102
|
-
const dbQueryName = `${_app.Core.settings.getDatabase().
|
102
|
+
const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
|
103
103
|
const connection = await this.createConnection(hostUuid);
|
104
104
|
if (connection) {
|
105
105
|
try {
|
@@ -127,7 +127,7 @@ class SequelizeService extends _service.default {
|
|
127
127
|
this.log('Database host information not found: ' + hostUuid);
|
128
128
|
return false;
|
129
129
|
}
|
130
|
-
const dbQueryName = `${_app.Core.settings.getDatabase().
|
130
|
+
const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
|
131
131
|
const connection = await this.createConnection(hostUuid);
|
132
132
|
if (connection) {
|
133
133
|
try {
|
@@ -142,7 +142,7 @@ class SequelizeService extends _service.default {
|
|
142
142
|
return false;
|
143
143
|
}
|
144
144
|
async deleteDB(hostUuid, name) {
|
145
|
-
const dbQueryName = `${_app.Core.settings.getDatabase().
|
145
|
+
const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
|
146
146
|
const connection = await this.createConnection(hostUuid);
|
147
147
|
if (connection) {
|
148
148
|
try {
|
@@ -159,8 +159,8 @@ class SequelizeService extends _service.default {
|
|
159
159
|
}
|
160
160
|
async initDB(tenantId) {
|
161
161
|
let connection = false;
|
162
|
-
if (tenantId == _app.Core.settings.getDatabase().
|
163
|
-
connection = _database.
|
162
|
+
if (tenantId == _app.Core.settings.getDatabase().main.database) {
|
163
|
+
connection = _database.mainDb;
|
164
164
|
} else {
|
165
165
|
const relation = await this.getRelation(tenantId);
|
166
166
|
if (!relation) return false;
|
@@ -192,7 +192,7 @@ class SequelizeService extends _service.default {
|
|
192
192
|
}));
|
193
193
|
}
|
194
194
|
getDBName(envToken) {
|
195
|
-
return `${_app.Core.settings.getDatabase().
|
195
|
+
return `${_app.Core.settings.getDatabase().main.database}_${envToken}`;
|
196
196
|
}
|
197
197
|
|
198
198
|
//#Connection
|
package/lib/utils/database.d.ts
CHANGED
@@ -1,5 +1,5 @@
|
|
1
1
|
import { Sequelize, WhereOptions } from 'sequelize';
|
2
2
|
import { IRequestFilterCondition, LogicalCondition } from '../contracts';
|
3
|
-
export declare const
|
3
|
+
export declare const mainDb: Sequelize;
|
4
4
|
export declare function processFilters<D>(filters?: Partial<Record<keyof D, IRequestFilterCondition<D>> | LogicalCondition<D>>): WhereOptions<D>;
|
5
5
|
//# sourceMappingURL=database.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEzE,eAAO,MAAM,
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/utils/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,SAAS,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AAEjE,OAAO,EAAE,uBAAuB,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAEzE,eAAO,MAAM,MAAM,WASjB,CAAC;AA8FH,wBAAgB,cAAc,CAAC,CAAC,EAC9B,OAAO,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,CAAC,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC,GACnF,YAAY,CAAC,CAAC,CAAC,CAwCjB"}
|
package/lib/utils/database.js
CHANGED
@@ -3,17 +3,17 @@
|
|
3
3
|
Object.defineProperty(exports, "__esModule", {
|
4
4
|
value: true
|
5
5
|
});
|
6
|
+
exports.mainDb = void 0;
|
6
7
|
exports.processFilters = processFilters;
|
7
|
-
exports.serviceDB = void 0;
|
8
8
|
var _sequelize = require("sequelize");
|
9
9
|
var _core = _interopRequireDefault(require("../app/core"));
|
10
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
11
|
-
const
|
12
|
-
database: _core.default.settings.getDatabase().
|
13
|
-
dialect: _core.default.settings.getDatabase().
|
14
|
-
username: _core.default.settings.getDatabase().
|
15
|
-
password: _core.default.settings.getDatabase().
|
16
|
-
pool: _core.default.settings.getDatabase().
|
11
|
+
const mainDb = exports.mainDb = new _sequelize.Sequelize({
|
12
|
+
database: _core.default.settings.getDatabase().main.database,
|
13
|
+
dialect: _core.default.settings.getDatabase().main.dialect,
|
14
|
+
username: _core.default.settings.getDatabase().main.username,
|
15
|
+
password: _core.default.settings.getDatabase().main.password,
|
16
|
+
pool: _core.default.settings.getDatabase().main.pool,
|
17
17
|
define: {
|
18
18
|
timestamps: true
|
19
19
|
},
|