exodus-framework 2.0.741 → 2.0.742
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/controllers/messaging/database.d.ts.map +1 -1
- package/lib/controllers/messaging/database.js +3 -3
- package/lib/controllers/messaging/environment.d.ts.map +1 -1
- package/lib/controllers/messaging/environment.js +8 -3
- package/lib/services/sequelize.d.ts +1 -0
- package/lib/services/sequelize.d.ts.map +1 -1
- package/lib/services/sequelize.js +20 -0
- package/package.json +1 -1
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/controllers/messaging/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAI1E,cAAM,kBAAmB,SAAQ,mBAAmB;IAClD,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CAc9D;IAEF,MAAM,EAAE,sBAAsB,CAAC,eAAe,CAAC,cAAc,CAAC,CAmB5D;IAEF,MAAM,EAAE,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CAmB7D;IAEF,IAAI,EAAE,sBAAsB,CAAC,eAAe,CAAC,YAAY,CAAC,
|
1
|
+
{"version":3,"file":"database.d.ts","sourceRoot":"","sources":["../../../src/controllers/messaging/database.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAI1E,cAAM,kBAAmB,SAAQ,mBAAmB;IAClD,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CAc9D;IAEF,MAAM,EAAE,sBAAsB,CAAC,eAAe,CAAC,cAAc,CAAC,CAmB5D;IAEF,MAAM,EAAE,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CAmB7D;IAEF,IAAI,EAAE,sBAAsB,CAAC,eAAe,CAAC,YAAY,CAAC,CAgBxD;CACH;AAED,eAAe,kBAAkB,CAAC"}
|
@@ -57,13 +57,13 @@ class DatabaseController extends _app.MessagingController {
|
|
57
57
|
try {
|
58
58
|
const host = await _models.DatabaseHost.findByPk(database.uuid);
|
59
59
|
if (!host) {
|
60
|
-
(0, _utils.logger)().info(database, `Sincronizando novo host
|
61
|
-
this.log(`Sincronizando novo host
|
60
|
+
(0, _utils.logger)().info(database, `Sincronizando novo host ${database.host}`);
|
61
|
+
this.log(`Sincronizando novo host ${database.host}`, 'info');
|
62
62
|
await _models.DatabaseHost.create(database);
|
63
63
|
}
|
64
64
|
} catch (error) {
|
65
65
|
(0, _utils.logger)().error(error);
|
66
|
-
this.log('Houve um erro ao tentar sincronizar
|
66
|
+
this.log('Houve um erro ao tentar sincronizar um novo host, check o log...', 'danger');
|
67
67
|
}
|
68
68
|
});
|
69
69
|
ack();
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/controllers/messaging/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAK1E,cAAM,qBAAsB,SAAQ,mBAAmB;IACrD,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAkBjE;IAEF,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAoBjE;IAEF,eAAe,EAAE,sBAAsB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAyBjF;IAEF,IAAI,EAAE,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../../src/controllers/messaging/environment.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAK1E,cAAM,qBAAsB,SAAQ,mBAAmB;IACrD,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAkBjE;IAEF,OAAO,EAAE,sBAAsB,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAoBjE;IAEF,eAAe,EAAE,sBAAsB,CAAC,eAAe,CAAC,0BAA0B,CAAC,CAyBjF;IAEF,IAAI,EAAE,sBAAsB,CAAC,eAAe,CAAC,eAAe,CAAC,CA6B3D;CACH;AAED,eAAe,qBAAqB,CAAC"}
|
@@ -74,17 +74,22 @@ class EnvironmentController extends _app.MessagingController {
|
|
74
74
|
}
|
75
75
|
});
|
76
76
|
if (!host) {
|
77
|
-
(0, _utils.logger)().info(env, `Sincronizando
|
78
|
-
this.log(`Sincronizando
|
77
|
+
(0, _utils.logger)().info(env, `Sincronizando relação env-db ${env.uuid}`);
|
78
|
+
this.log(`Sincronizando relação env-db ${env.uuid}`, 'info');
|
79
79
|
await _models.EnvDBHost.create({
|
80
80
|
envUuid: env.uuid,
|
81
81
|
hostUuid: env.database,
|
82
82
|
envToken: env.envToken
|
83
83
|
});
|
84
84
|
}
|
85
|
+
if (!(await _services.SequelizeService.singleton().hasDB(env.database, env.envToken))) {
|
86
|
+
(0, _utils.logger)().info(env, `Sincronizando novo banco de dados ${env.uuid}`);
|
87
|
+
this.log(`Sincronizando novo banco de dados ${env.uuid}`, 'info');
|
88
|
+
await _services.SequelizeService.singleton().createDB(env.database, env.envToken);
|
89
|
+
}
|
85
90
|
} catch (error) {
|
86
91
|
(0, _utils.logger)().error(error);
|
87
|
-
this.log('Houve um erro ao tentar sincronizar um banco de dados, check o log...', 'danger');
|
92
|
+
this.log('Houve um erro ao tentar sincronizar um novo ambiente/relação ou banco de dados, check o log...', 'danger');
|
88
93
|
}
|
89
94
|
});
|
90
95
|
ack();
|
@@ -14,6 +14,7 @@ declare class SequelizeService extends Service implements IService {
|
|
14
14
|
connectDatabases(): Promise<unknown>;
|
15
15
|
getDB(tenantId: string): Promise<false | Sequelize>;
|
16
16
|
createDB(hostUuid: string, name: string): Promise<boolean>;
|
17
|
+
hasDB(hostUuid: string, name: string): Promise<boolean>;
|
17
18
|
deleteDB(hostUuid: string, name: string): Promise<boolean>;
|
18
19
|
initDB(tenantId: string): Promise<false | Sequelize>;
|
19
20
|
getDBName(envToken: string): string;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAcpD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACvD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAM5B,IAAI;IAQJ,gBAAgB;IAgChB,KAAK,CAAC,QAAQ,EAAE,MAAM;IActB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6BvC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IAiB7B,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAe/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA6CpD,cAAc,CAAC,IAAI,EAAE;QACzB,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;IA6BK,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,QAAQ,EAAE,MAAM;IA2BlB,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;CAG1C;AAED,eAAe,gBAAgB,CAAC"}
|
1
|
+
{"version":3,"file":"sequelize.d.ts","sourceRoot":"","sources":["../../src/services/sequelize.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAEnE,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,SAAS,EAAgB,MAAM,WAAW,CAAC;AAcpD,cAAM,gBAAiB,SAAQ,OAAQ,YAAW,QAAQ;IACxD,SAAS,EAAE,SAAS,CAAC;IACrB,QAAQ,EAAE,SAAS,CAAC;IACpB,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE,CAAC;IAC3B,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;IACpC,iBAAiB,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;IACvD,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;;IAM5B,IAAI;IAQJ,gBAAgB;IAgChB,KAAK,CAAC,QAAQ,EAAE,MAAM;IActB,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IA6BvC,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAqBpC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM;IAiBvC,MAAM,CAAC,QAAQ,EAAE,MAAM;IAiB7B,SAAS,CAAC,QAAQ,EAAE,MAAM;IAK1B,SAAS,CAAC,EAAE,EAAE,SAAS,EAAE,QAAQ,SAAI;IAe/B,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM;IA6CpD,cAAc,CAAC,IAAI,EAAE;QACzB,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;IA6BK,WAAW,CAAC,QAAQ,EAAE,MAAM;IAe5B,QAAQ,CAAC,CAAC,SAAS,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,EAC7C,KAAK,EAAE,OAAO,KAAK,CAAC,GAAG,EAAE,GAAG,CAAC,GAAG;QAAE,UAAU,EAAE,CAAC,UAAU,EAAE,SAAS,KAAK,CAAC,CAAA;KAAE,EAC5E,QAAQ,EAAE,MAAM;IA2BlB,cAAc,CAAC,MAAM,EAAE,WAAW,CAAC,GAAG,CAAC,EAAE;CAG1C;AAED,eAAe,gBAAgB,CAAC"}
|
@@ -106,6 +106,26 @@ class SequelizeService extends _service.default {
|
|
106
106
|
}
|
107
107
|
return false;
|
108
108
|
}
|
109
|
+
async hasDB(hostUuid, name) {
|
110
|
+
const host = await _DatabaseHost.DatabaseHost.findByPk(hostUuid);
|
111
|
+
if (!host) {
|
112
|
+
this.log('Database host information not found: ' + hostUuid);
|
113
|
+
return false;
|
114
|
+
}
|
115
|
+
const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
|
116
|
+
const connection = await this.createConnection(hostUuid);
|
117
|
+
if (connection) {
|
118
|
+
try {
|
119
|
+
const [results] = await connection.query(`SHOW DATABASES LIKE '${dbQueryName}';`);
|
120
|
+
return results.length > 0;
|
121
|
+
} catch (error) {
|
122
|
+
new _error.ApplicationException('Erro on creating database', error);
|
123
|
+
} finally {
|
124
|
+
connection.close();
|
125
|
+
}
|
126
|
+
}
|
127
|
+
return false;
|
128
|
+
}
|
109
129
|
async deleteDB(hostUuid, name) {
|
110
130
|
const dbQueryName = `${_app.Core.settings.getDatabase().service.database}_${name}`;
|
111
131
|
const connection = await this.createConnection(hostUuid);
|