exodus-framework 2.0.964 → 2.0.966
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/contracts/communication/operation.d.ts +1 -0
- package/lib/contracts/communication/operation.d.ts.map +1 -1
- package/lib/controllers/api/log.js +1 -1
- package/lib/controllers/api/report.d.ts.map +1 -1
- package/lib/controllers/api/report.js +2 -2
- package/lib/controllers/messaging/environment.js +4 -4
- package/lib/middlewares/authentication.d.ts.map +1 -1
- package/lib/middlewares/authentication.js +7 -0
- package/lib/services/database.d.ts +1 -0
- package/lib/services/database.d.ts.map +1 -1
- package/lib/services/database.js +16 -0
- package/lib/services/ecosystem.js +4 -4
- package/lib/services/express.d.ts.map +1 -1
- package/lib/services/express.js +3 -3
- package/lib/services/log.js +2 -2
- package/lib/tasks/queue/environment.d.ts.map +1 -1
- package/lib/tasks/queue/environment.js +4 -5
- package/package.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../src/contracts/communication/operation.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE;QAEX,QAAQ,EAAE,OAAO,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QACb,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,oBAAoB,CAAC,EAAE,MAAM,CAAC;KAC/B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,UAAU,GACV,QAAQ,GACR,UAAU,CAAC;AAEf,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
|
1
|
+
{"version":3,"file":"operation.d.ts","sourceRoot":"","sources":["../../../src/contracts/communication/operation.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,wBAAwB,GAAG;IACrC,UAAU,CAAC,EAAE;QAEX,QAAQ,EAAE,OAAO,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,mBAAmB,EAAE,MAAM,CAAC;QAC5B,eAAe,EAAE,MAAM,CAAC;QACxB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;IAClB,YAAY,CAAC,EAAE;QACb,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,eAAe,CAAC,EAAE,MAAM,CAAC;QACzB,mBAAmB,CAAC,EAAE,MAAM,CAAC;QAC7B,oBAAoB,CAAC,EAAE,MAAM,CAAC;QAC9B,cAAc,CAAC,EAAE,MAAM,CAAC;QACxB,sBAAsB,CAAC,EAAE,MAAM,CAAC;QAChC,oBAAoB,CAAC,EAAE,MAAM,CAAC;KAC/B,CAAC;CACH,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG;IAC9B,GAAG,EAAE,SAAS,CAAC;IACf,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,QAAQ,GACR,SAAS,GACT,WAAW,GACX,UAAU,GACV,QAAQ,GACR,UAAU,CAAC;AAEf,MAAM,MAAM,MAAM,GAAG;IACnB,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb,CAAC"}
|
@@ -19,7 +19,7 @@ class LogController extends _app.HttpController {
|
|
19
19
|
} = req.body;
|
20
20
|
const offset = (Number(page) - 1) * Number(limit);
|
21
21
|
try {
|
22
|
-
const Entity = await _services.
|
22
|
+
const Entity = await _services.DatabaseService.getService().getEntity(_Log.Log, req.tenant.id);
|
23
23
|
/* filters */
|
24
24
|
const where = (0, _utils.processFilters)(filters);
|
25
25
|
const {
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/controllers/api/report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,cAAc,EAAa,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAqB,YAAY,EAAE,MAAM,iBAAiB,CAAC;
|
1
|
+
{"version":3,"file":"report.d.ts","sourceRoot":"","sources":["../../../src/controllers/api/report.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AACvC,OAAO,EAAE,cAAc,EAAa,MAAM,WAAW,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAqB,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpF,OAAO,EAAE,MAAM,EAAE,MAAM,qBAAqB,CAAC;AAI7C,cAAM,gBAAiB,SAAQ,cAAc;IAC3C,IAAI,EAAE,YAAY,CAAC,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAuCtD;CACH;AACD,eAAe,gBAAgB,CAAC"}
|
@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.default = void 0;
|
7
7
|
var _app = require("../../app");
|
8
|
+
var _Report = require("../../models/Report");
|
8
9
|
var _services = require("../../services");
|
9
10
|
var _utils = require("../../utils");
|
10
|
-
var _Report = require("../../models/Report");
|
11
11
|
class ReportController extends _app.HttpController {
|
12
12
|
list = async (req, res) => {
|
13
13
|
const {
|
@@ -19,7 +19,7 @@ class ReportController extends _app.HttpController {
|
|
19
19
|
} = req.body;
|
20
20
|
const offset = (Number(page) - 1) * Number(limit);
|
21
21
|
try {
|
22
|
-
const Entity = await _services.
|
22
|
+
const Entity = await _services.DatabaseService.getService().getEntity(_Report.Report, req.tenant.id);
|
23
23
|
/* filters */
|
24
24
|
const where = (0, _utils.processFilters)(filters);
|
25
25
|
const {
|
@@ -18,7 +18,7 @@ class EnvironmentController extends _app.MessagingController {
|
|
18
18
|
try {
|
19
19
|
const db = data.database;
|
20
20
|
const token = data.envToken;
|
21
|
-
await _services.
|
21
|
+
await _services.DatabaseService.getService().createDB(db, token);
|
22
22
|
await _models.EnvDBHost.create({
|
23
23
|
envUuid: data.uuid,
|
24
24
|
hostUuid: data.database,
|
@@ -35,7 +35,7 @@ class EnvironmentController extends _app.MessagingController {
|
|
35
35
|
try {
|
36
36
|
const token = data.token;
|
37
37
|
const db = data.database;
|
38
|
-
await _services.
|
38
|
+
await _services.DatabaseService.getService().deleteDB(db, token);
|
39
39
|
const relation = await _models.EnvDBHost.findOne({
|
40
40
|
where: {
|
41
41
|
envUuid: data.uuid
|
@@ -92,10 +92,10 @@ class EnvironmentController extends _app.MessagingController {
|
|
92
92
|
envToken: env.envToken
|
93
93
|
});
|
94
94
|
}
|
95
|
-
if (!(await _services.
|
95
|
+
if (!(await _services.DatabaseService.getService().hasDB(env.database, env.envToken))) {
|
96
96
|
(0, _utils.logger)().info(env, `Sincronizando novo banco de dados ${env.uuid}`);
|
97
97
|
this.log(`Sincronizando novo banco de dados ${env.uuid}`, 'info');
|
98
|
-
await _services.
|
98
|
+
await _services.DatabaseService.getService().createDB(env.database, env.envToken);
|
99
99
|
}
|
100
100
|
} catch (error) {
|
101
101
|
new _app.ErrorHandler('Houve um erro ao tentar sincronizar um novo ambiente/relação ou banco de dados', error);
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../../src/middlewares/authentication.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,cAAc,EAAE,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAMrE,qBAAa,wBAAyB,SAAQ,cAAc;
|
1
|
+
{"version":3,"file":"authentication.d.ts","sourceRoot":"","sources":["../../src/middlewares/authentication.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,OAAO,cAAc,EAAE,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAMrE,qBAAa,wBAAyB,SAAQ,cAAc;IAQ1D,YAAY,CAAC,QAAQ,GAAE,OAAc,GAAG,cAAc;CAUvD;AAED,qBAAa,8BAA+B,SAAQ,gBAAgB;IAClE,YAAY,WAAkB,MAAM,QAAQ,CAAC,GAAG,CAAC,EAAE,aAAa,KAAK,IAAI,mBAoFvE;CACH"}
|
@@ -14,6 +14,13 @@ function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e
|
|
14
14
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
15
15
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
16
16
|
class AuthenticationMiddleware extends _controller.default {
|
17
|
+
/**
|
18
|
+
* Recupera a sessão ativa baseada no token
|
19
|
+
*
|
20
|
+
* @param {boolean} [required=true] Controla se o token de sessão é obrigatório (Em caso de rota API usar como false)
|
21
|
+
* @return {*} {RequestHandler}
|
22
|
+
* @memberof AuthenticationMiddleware
|
23
|
+
*/
|
17
24
|
decryptToken(required = true) {
|
18
25
|
return (0, _expressJwt.expressjwt)({
|
19
26
|
secret: async () => {
|
@@ -26,6 +26,7 @@ declare class DatabaseService extends Service {
|
|
26
26
|
private normalizeDatabaseName;
|
27
27
|
createDB(hostId: string, name: string): Promise<boolean>;
|
28
28
|
deleteDB(hostId: string, name: string): Promise<boolean>;
|
29
|
+
hasDB(hostId: string, name: string): Promise<boolean>;
|
29
30
|
}
|
30
31
|
export default DatabaseService;
|
31
32
|
//# sourceMappingURL=database.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAIpD,cAAM,eAAgB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,WAAW,CAAyB;IAE/B,aAAa;IAWb,OAAO;IAgBP,WAAW;YAMV,cAAc;IA0Cf,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO;IAwBL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,cAAc,CAAC,IAAI,EAAE;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB;YA2Ba,sBAAsB;IA6BvB,YAAY;IAKZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM;YAMpC,UAAU;IASX,SAAS,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAClD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAU1B,OAAO,CAAC,qBAAqB;IAIhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA0BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../src/services/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAsB,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAgB,SAAS,EAAE,MAAM,WAAW,CAAC;AAIpD,cAAM,eAAgB,SAAQ,OAAO;IACnC,OAAO,CAAC,QAAQ,CAAgC;IAChD,OAAO,CAAC,WAAW,CAAyB;IAE/B,aAAa;IAWb,OAAO;IAgBP,WAAW;YAMV,cAAc;IA0Cf,gBAAgB,CAC3B,IAAI,EAAE,MAAM,EACZ,IAAI,EAAE,MAAM,EACZ,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,QAAQ,EAAE,MAAM,EAChB,OAAO,EAAE,OAAO;IAwBL,aAAa,CAAC,QAAQ,EAAE,MAAM;IAO9B,cAAc,CAAC,IAAI,EAAE;QAChC,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,QAAQ,EAAE,MAAM,CAAC;QACjB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,OAAO,CAAC;KAClB;YA2Ba,sBAAsB;IA6BvB,YAAY;IAKZ,oBAAoB,CAAC,QAAQ,EAAE,MAAM;YAMpC,UAAU;IASX,SAAS,CAAC,CAAC,SAAS,YAAY,CAAC,KAAK,CAAC,EAClD,KAAK,EAAE,kBAAkB,CAAC,CAAC,CAAC,EAC5B,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;IAU1B,OAAO,CAAC,qBAAqB;IAIhB,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA0BrC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAmBrC,KAAK,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;CAiBhD;AAED,eAAe,eAAe,CAAC"}
|
package/lib/services/database.js
CHANGED
@@ -211,5 +211,21 @@ class DatabaseService extends _app.Service {
|
|
211
211
|
return false;
|
212
212
|
}
|
213
213
|
}
|
214
|
+
async hasDB(hostId, name) {
|
215
|
+
try {
|
216
|
+
const connection = await this.createConnectionByHost(hostId);
|
217
|
+
try {
|
218
|
+
const dbQueryName = `${_app.Core.settings.getDatabase().main.database}_${name}`;
|
219
|
+
const [results] = await connection.query(`SHOW DATABASES LIKE '${dbQueryName}';`);
|
220
|
+
return results.length > 0;
|
221
|
+
} catch (error) {
|
222
|
+
return false;
|
223
|
+
} finally {
|
224
|
+
connection.close();
|
225
|
+
}
|
226
|
+
} catch (error) {
|
227
|
+
return false;
|
228
|
+
}
|
229
|
+
}
|
214
230
|
}
|
215
231
|
var _default = exports.default = DatabaseService;
|
@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.default = void 0;
|
7
7
|
var _app = require("../app");
|
8
8
|
var _System = require("../models/System");
|
9
|
-
var
|
9
|
+
var _database = _interopRequireDefault(require("./database"));
|
10
10
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
11
11
|
class EcosystemService extends _app.Service {
|
12
12
|
async getSystemVariable(tenantId, key) {
|
13
|
-
const Entity = await
|
13
|
+
const Entity = await _database.default.getService().getEntity(_System.System, tenantId);
|
14
14
|
return Entity.findOne({
|
15
15
|
where: {
|
16
16
|
key
|
@@ -18,7 +18,7 @@ class EcosystemService extends _app.Service {
|
|
18
18
|
});
|
19
19
|
}
|
20
20
|
async setSystemVariable(tenantId, key, value) {
|
21
|
-
const Entity = await
|
21
|
+
const Entity = await _database.default.getService().getEntity(_System.System, tenantId);
|
22
22
|
const variable = await Entity.findOne({
|
23
23
|
where: {
|
24
24
|
key
|
@@ -30,7 +30,7 @@ class EcosystemService extends _app.Service {
|
|
30
30
|
await variable.save();
|
31
31
|
}
|
32
32
|
async createSystemVariable(tenantId, key, value) {
|
33
|
-
const Entity = await
|
33
|
+
const Entity = await _database.default.getService().getEntity(_System.System, tenantId);
|
34
34
|
const variable = await Entity.findOne({
|
35
35
|
where: {
|
36
36
|
key
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/services/express.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;
|
1
|
+
{"version":3,"file":"express.d.ts","sourceRoot":"","sources":["../../src/services/express.ts"],"names":[],"mappings":"AACA,OAAgB,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAElE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,OAAO,MAAM,wBAAwB,CAAC;AAG7C,OAAO,EAAqB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAGrE,cAAM,cAAe,SAAQ,OAAO;IAClC,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAS;IAGd,oBAAoB;IAIpB,cAAc;IAoBd,sBAAsB;IAS5B,aAAa;IAIb,YAAY,CAAC,WAAW,EAAE,aAAa,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,YAAY;IAiC3E,sBAAsB,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY;IAMtE,aAAa,CAAC,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ;IAWzC,0BAA0B,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,YAAY;IAUtF,2BAA2B,QAC3B,GAAG,OACH,OAAO,OACP,QAAQ,KAEV,YAAY,mBAoBf;IAEW,YAAY,CAAC,MAAM,EAAE,MAAM;IAyBxC,MAAM,CAAC,cAAc,CAAC,MAAM,EAAE,MAAM;CAGrC;AAED,eAAe,cAAc,CAAC"}
|
package/lib/services/express.js
CHANGED
@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
|
|
6
6
|
exports.default = void 0;
|
7
7
|
var _cors = _interopRequireDefault(require("cors"));
|
8
8
|
var _express = _interopRequireDefault(require("express"));
|
9
|
-
var _expressRequestsLogger = _interopRequireDefault(require("express-requests-logger"));
|
10
9
|
var http = _interopRequireWildcard(require("http"));
|
10
|
+
var _pinoHttp = require("pino-http");
|
11
11
|
var _qs = _interopRequireDefault(require("qs"));
|
12
|
+
var _service = _interopRequireDefault(require("../app/classes/service"));
|
12
13
|
var _core = _interopRequireDefault(require("../app/core"));
|
13
14
|
var _error = require("../app/error");
|
14
|
-
var _service = _interopRequireDefault(require("../app/classes/service"));
|
15
15
|
var _http2 = require("../contracts/http");
|
16
16
|
var _logger = _interopRequireDefault(require("../utils/logger"));
|
17
17
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
@@ -33,7 +33,7 @@ class ExpressService extends _service.default {
|
|
33
33
|
const expss = (0, _express.default)();
|
34
34
|
this.server = http.createServer(expss);
|
35
35
|
expss.use('/public', _express.default.static(_core.default.settings.getHttp().publicPath));
|
36
|
-
expss.use((0,
|
36
|
+
expss.use((0, _pinoHttp.pinoHttp)({
|
37
37
|
logger: (0, _logger.default)()
|
38
38
|
}));
|
39
39
|
expss.set('query parser', str => _qs.default.parse(str));
|
package/lib/services/log.js
CHANGED
@@ -7,12 +7,12 @@ exports.default = void 0;
|
|
7
7
|
var _dateFns = require("date-fns");
|
8
8
|
var _app = require("../app");
|
9
9
|
var _Log = require("../models/Log");
|
10
|
-
var
|
10
|
+
var _database = _interopRequireDefault(require("./database"));
|
11
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
12
12
|
class LogService extends _app.Service {
|
13
13
|
async register(tenantId, data) {
|
14
14
|
try {
|
15
|
-
const Entity = await
|
15
|
+
const Entity = await _database.default.getService().getEntity(_Log.Log, tenantId);
|
16
16
|
await Entity.create({
|
17
17
|
...data,
|
18
18
|
happenedAt: (0, _dateFns.format)(new Date(), 'yyyy-MM-dd HH:mm:ss')
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/tasks/queue/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/tasks/queue/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,QAAQ,CAAC;AAE7B,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAIxE,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AAGtD,KAAK,CAAC,GAAG;IACP,MAAM,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAClE,MAAM,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAAC;IAC1E,IAAI,CAAC,EAAE,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC,CAAC;CAC9D,CAAC;AAEF,cAAM,oBAAqB,SAAQ,SAAS,CAAC,CAAC,CAAC;IAC7C,OAAO,IAAI,MAAM;IAIX,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;IAK3B,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAcrD,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,kBAAkB,CAAC;IAiBvE,QAAQ,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,0BAA0B,CAAC;IAgB/E,MAAM,CAAC,IAAI,EAAE,oBAAoB,CAAC,eAAe,CAAC,eAAe,CAAC;CA4BzE;AAED,eAAe,oBAAoB,CAAC"}
|
@@ -7,10 +7,9 @@ exports.default = void 0;
|
|
7
7
|
var _app = require("../../app");
|
8
8
|
var _core = require("../../contracts/core");
|
9
9
|
var _models = require("../../models");
|
10
|
+
var _services = require("../../services");
|
10
11
|
var _queue = require("../../services/task/queue");
|
11
12
|
var _utils = require("../../utils");
|
12
|
-
var _sequelize = _interopRequireDefault(require("../../services/sequelize"));
|
13
|
-
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
14
13
|
class EnvironmentSyncQueue extends _queue.QueueTask {
|
15
14
|
getName() {
|
16
15
|
return 'Environment Sync Queue';
|
@@ -34,7 +33,7 @@ class EnvironmentSyncQueue extends _queue.QueueTask {
|
|
34
33
|
try {
|
35
34
|
const db = data.database;
|
36
35
|
const token = data.envToken;
|
37
|
-
await
|
36
|
+
await _services.DatabaseService.getService().createDB(db, token);
|
38
37
|
await _models.EnvDBHost.create({
|
39
38
|
envUuid: data.uuid,
|
40
39
|
hostUuid: data.database,
|
@@ -78,10 +77,10 @@ class EnvironmentSyncQueue extends _queue.QueueTask {
|
|
78
77
|
envToken: env.envToken
|
79
78
|
});
|
80
79
|
}
|
81
|
-
if (!(await
|
80
|
+
if (!(await _services.DatabaseService.getService().hasDB(env.database, env.envToken))) {
|
82
81
|
(0, _utils.logger)().info(env, `Sincronizando novo banco de dados ${env.uuid}`);
|
83
82
|
this.log(`Sincronizando novo banco de dados ${env.uuid}`, 'info');
|
84
|
-
await
|
83
|
+
await _services.DatabaseService.getService().createDB(env.database, env.envToken);
|
85
84
|
}
|
86
85
|
} catch (error) {
|
87
86
|
new _app.ErrorHandler('Houve um erro ao tentar sincronizar um novo ambiente/relação ou banco de dados', error);
|