exodus-framework 2.0.757 → 2.0.758
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/core.js +2 -2
- package/lib/index.d.ts +0 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js +1 -12
- package/lib/models/EnvConnection.js +2 -2
- package/lib/services/express.d.ts +0 -1
- package/lib/services/express.d.ts.map +1 -1
- package/lib/services/express.js +2 -1
- package/lib/utils/database.js +9 -9
- package/lib/utils/logger.js +9 -9
- package/lib/utils/session.js +2 -2
- package/package.json +1 -1
package/lib/app/core.js
CHANGED
@@ -7,7 +7,7 @@ exports.default = void 0;
|
|
7
7
|
var _cluster = _interopRequireDefault(require("cluster"));
|
8
8
|
var _dateFns = require("date-fns");
|
9
9
|
var _settings = _interopRequireDefault(require("./settings"));
|
10
|
-
var
|
10
|
+
var _logger = _interopRequireDefault(require("../utils/logger"));
|
11
11
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
12
12
|
/**
|
13
13
|
* Class base responsável pelo gerênciamento RUNTIME da aplicação
|
@@ -64,7 +64,7 @@ class Core {
|
|
64
64
|
this.settings = settings;
|
65
65
|
}
|
66
66
|
handleError(msg, error) {
|
67
|
-
(0,
|
67
|
+
(0, _logger.default)().error(error);
|
68
68
|
this.log(msg, 'danger');
|
69
69
|
}
|
70
70
|
}
|
package/lib/index.d.ts
CHANGED
package/lib/index.d.ts.map
CHANGED
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAG3B,eAAe,MAAM,CAAC"}
|
package/lib/index.js
CHANGED
@@ -77,16 +77,5 @@ Object.keys(_services).forEach(function (key) {
|
|
77
77
|
}
|
78
78
|
});
|
79
79
|
});
|
80
|
-
|
81
|
-
Object.keys(_utils).forEach(function (key) {
|
82
|
-
if (key === "default" || key === "__esModule") return;
|
83
|
-
if (Object.prototype.hasOwnProperty.call(_exportNames, key)) return;
|
84
|
-
if (key in exports && exports[key] === _utils[key]) return;
|
85
|
-
Object.defineProperty(exports, key, {
|
86
|
-
enumerable: true,
|
87
|
-
get: function () {
|
88
|
-
return _utils[key];
|
89
|
-
}
|
90
|
-
});
|
91
|
-
});
|
80
|
+
// export * from './utils';
|
92
81
|
var _default = exports.default = _app.Exodus;
|
@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", {
|
|
5
5
|
});
|
6
6
|
exports.EnvDBHost = void 0;
|
7
7
|
var _sequelize = require("sequelize");
|
8
|
-
var
|
8
|
+
var _database = require("../utils/database");
|
9
9
|
class EnvDBHost extends _sequelize.Model {}
|
10
10
|
exports.EnvDBHost = EnvDBHost;
|
11
11
|
EnvDBHost.init({
|
@@ -30,7 +30,7 @@ EnvDBHost.init({
|
|
30
30
|
}
|
31
31
|
}, {
|
32
32
|
tableName: 'env_dbhost',
|
33
|
-
sequelize:
|
33
|
+
sequelize: _database.serviceDB,
|
34
34
|
indexes: [{
|
35
35
|
fields: ['envUuid'],
|
36
36
|
unique: true
|
@@ -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;AAGlE,OAAO,KAAK,IAAI,MAAM,MAAM,CAAC;AAG7B,OAAO,OAAO,MAAM,gBAAgB,CAAC;AACrC,OAAO,EAAqB,aAAa,EAAE,MAAM,mBAAmB,CAAC;AACrE,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAGhD,cAAM,cAAe,SAAQ,OAAQ,YAAW,QAAQ;IACtD,OAAO,CAAC,MAAM,CAAc;IAC5B,OAAO,CAAC,UAAU,CAAS;IAErB,IAAI;IAuBV,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,QACpB,GAAG,OACH,OAAO,OACP,QAAQ,KAEV,YAAY,mBAoBf;IAEI,YAAY,CAAC,MAAM,EAAE,MAAM;IAyBjC,cAAc,CAAC,MAAM,EAAE,MAAM;CAG9B;AAED,eAAe,cAAc,CAAC"}
|
package/lib/services/express.js
CHANGED
@@ -6,7 +6,6 @@ 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
|
-
require("express-async-errors");
|
10
9
|
var _expressRequestsLogger = _interopRequireDefault(require("express-requests-logger"));
|
11
10
|
var http = _interopRequireWildcard(require("http"));
|
12
11
|
var _qs = _interopRequireDefault(require("qs"));
|
@@ -17,6 +16,8 @@ var _logger = _interopRequireDefault(require("../utils/logger"));
|
|
17
16
|
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); }
|
18
17
|
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; }
|
19
18
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
19
|
+
// import 'express-async-errors';
|
20
|
+
|
20
21
|
class ExpressService extends _service.default {
|
21
22
|
server;
|
22
23
|
mainRouter;
|
package/lib/utils/database.js
CHANGED
@@ -7,14 +7,14 @@ exports.masterDB = void 0;
|
|
7
7
|
exports.processFilters = processFilters;
|
8
8
|
exports.serviceDB = void 0;
|
9
9
|
var _sequelize = require("sequelize");
|
10
|
-
var
|
10
|
+
var _core = _interopRequireDefault(require("../app/core"));
|
11
11
|
var _logger = _interopRequireDefault(require("./logger"));
|
12
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
13
13
|
const serviceDB = exports.serviceDB = new _sequelize.Sequelize({
|
14
|
-
database:
|
15
|
-
dialect:
|
16
|
-
username:
|
17
|
-
password:
|
14
|
+
database: _core.default.settings.getDatabase().service.database,
|
15
|
+
dialect: _core.default.settings.getDatabase().master.dialect,
|
16
|
+
username: _core.default.settings.getDatabase().master.username,
|
17
|
+
password: _core.default.settings.getDatabase().master.password,
|
18
18
|
define: {
|
19
19
|
timestamps: true
|
20
20
|
},
|
@@ -24,10 +24,10 @@ const serviceDB = exports.serviceDB = new _sequelize.Sequelize({
|
|
24
24
|
}
|
25
25
|
});
|
26
26
|
const masterDB = exports.masterDB = new _sequelize.Sequelize({
|
27
|
-
database:
|
28
|
-
dialect:
|
29
|
-
username:
|
30
|
-
password:
|
27
|
+
database: _core.default.settings.getDatabase().master.database,
|
28
|
+
dialect: _core.default.settings.getDatabase().master.dialect,
|
29
|
+
username: _core.default.settings.getDatabase().master.username,
|
30
|
+
password: _core.default.settings.getDatabase().master.password,
|
31
31
|
define: {
|
32
32
|
timestamps: true
|
33
33
|
},
|
package/lib/utils/logger.js
CHANGED
@@ -8,34 +8,34 @@ var _dateFns = require("date-fns");
|
|
8
8
|
var _fs = require("fs");
|
9
9
|
var _path = _interopRequireDefault(require("path"));
|
10
10
|
var _pinoMultiStream = _interopRequireDefault(require("pino-multi-stream"));
|
11
|
-
var
|
11
|
+
var _core = _interopRequireDefault(require("../app/core"));
|
12
12
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
13
13
|
let loggerInstance = null;
|
14
14
|
const createLogger = () => {
|
15
|
-
const basePath = _path.default.resolve(
|
15
|
+
const basePath = _path.default.resolve(_core.default.settings.getLogger().path, (0, _dateFns.format)(new Date(), 'dd-MM-yyyy'), (0, _dateFns.format)(new Date(), 'HH_mm'));
|
16
16
|
(0, _fs.mkdirSync)(basePath, {
|
17
17
|
recursive: true
|
18
18
|
});
|
19
19
|
const streams = [{
|
20
20
|
level: 'error',
|
21
|
-
stream: (0, _fs.createWriteStream)(basePath + '/error' +
|
21
|
+
stream: (0, _fs.createWriteStream)(basePath + '/error' + _core.default.settings.getLogger().fileformat)
|
22
22
|
}, {
|
23
23
|
level: 'info',
|
24
|
-
stream: (0, _fs.createWriteStream)(basePath + '/info' +
|
24
|
+
stream: (0, _fs.createWriteStream)(basePath + '/info' + _core.default.settings.getLogger().fileformat)
|
25
25
|
}, {
|
26
26
|
level: 'fatal',
|
27
|
-
stream: (0, _fs.createWriteStream)(basePath + '/fatal' +
|
27
|
+
stream: (0, _fs.createWriteStream)(basePath + '/fatal' + _core.default.settings.getLogger().fileformat)
|
28
28
|
}, {
|
29
29
|
level: 'warn',
|
30
|
-
stream: (0, _fs.createWriteStream)(basePath + '/warn' +
|
30
|
+
stream: (0, _fs.createWriteStream)(basePath + '/warn' + _core.default.settings.getLogger().fileformat)
|
31
31
|
}, {
|
32
32
|
level: 'silent',
|
33
|
-
stream: (0, _fs.createWriteStream)(basePath + '/silent' +
|
33
|
+
stream: (0, _fs.createWriteStream)(basePath + '/silent' + _core.default.settings.getLogger().fileformat)
|
34
34
|
}, {
|
35
35
|
level: 'trace',
|
36
|
-
stream: (0, _fs.createWriteStream)(basePath + '/trace' +
|
36
|
+
stream: (0, _fs.createWriteStream)(basePath + '/trace' + _core.default.settings.getLogger().fileformat)
|
37
37
|
}];
|
38
|
-
|
38
|
+
_core.default.settings.getLogger().console ?? streams.push({
|
39
39
|
stream: process.stdout
|
40
40
|
});
|
41
41
|
return (0, _pinoMultiStream.default)({
|
package/lib/utils/session.js
CHANGED
@@ -4,14 +4,14 @@ Object.defineProperty(exports, "__esModule", {
|
|
4
4
|
value: true
|
5
5
|
});
|
6
6
|
exports.SessionAPI = void 0;
|
7
|
-
var _app = require("../app");
|
7
|
+
var _app = _interopRequireDefault(require("../app/app"));
|
8
8
|
var _api = _interopRequireDefault(require("./api"));
|
9
9
|
function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
|
10
10
|
class SessionAPI extends _api.default {
|
11
11
|
host = process.env.APP_SESSION_URL;
|
12
12
|
headers = {
|
13
13
|
'X-Exodus-App-Sec': this.getLogicalSecurityId(),
|
14
|
-
'X-Exodus-Core-Version': _app.
|
14
|
+
'X-Exodus-Core-Version': _app.default.getVersion()
|
15
15
|
};
|
16
16
|
validateStatus(status) {
|
17
17
|
return status < 400;
|