@golemio/core 1.2.16-dev.614668565 → 1.2.17-dev.623758334
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/dist/input-gateway/config/config.js +2 -2
- package/dist/input-gateway/config/config.js.map +1 -1
- package/dist/integration-engine/connectors/MongoConnector.js +4 -9
- package/dist/integration-engine/connectors/MongoConnector.js.map +1 -1
- package/dist/output-gateway/database/MongoDatabase.js +3 -5
- package/dist/output-gateway/database/MongoDatabase.js.map +1 -1
- package/dist/output-gateway/models/MongoModel.d.ts +3 -1
- package/dist/output-gateway/routes/AbstractHistoryRouter.js +2 -3
- package/dist/output-gateway/routes/AbstractHistoryRouter.js.map +1 -1
- package/dist/output-gateway/routes/GeoJsonRouter.js +2 -3
- package/dist/output-gateway/routes/GeoJsonRouter.js.map +1 -1
- package/dist/schema-definitions/ErrorLog.d.ts +25 -1
- package/package.json +3 -5
|
@@ -2,10 +2,10 @@
|
|
|
2
2
|
var _a;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
exports.config = void 0;
|
|
5
|
-
const lodash_1 = require("lodash");
|
|
6
5
|
const _helpers_1 = require("../../helpers");
|
|
7
6
|
const _monitoring_1 = require("../../monitoring");
|
|
8
7
|
const saveRawDataWhitelist = new _helpers_1.ConfigLoader("saveRawDataWhitelist").conf;
|
|
8
|
+
const isEmpty = (obj) => [Object, Array].includes((obj || {}).constructor) && !Object.entries(obj || {}).length;
|
|
9
9
|
exports.config = {
|
|
10
10
|
app_version: process.env.npm_package_version,
|
|
11
11
|
app_name: process.env.APP_NAME || "input-gateway",
|
|
@@ -27,7 +27,7 @@ exports.config = {
|
|
|
27
27
|
upload_part_size: parseInt(process.env.S3_UPLOAD_PART_SIZE, 10) || 10,
|
|
28
28
|
upload_queue_size: parseInt(process.env.S3_UPLOAD_QUEUE_SIZE, 10) || 2, // concurrency uploading, default 2
|
|
29
29
|
},
|
|
30
|
-
saveRawDataWhitelist:
|
|
30
|
+
saveRawDataWhitelist: isEmpty(saveRawDataWhitelist) ? [] : saveRawDataWhitelist,
|
|
31
31
|
sentry: {
|
|
32
32
|
enabled: process.env.SENTRY_ENABLED === "true",
|
|
33
33
|
dsn: process.env.SENTRY_DSN,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/input-gateway/config/config.ts"],"names":[],"mappings":";;;;AAAA,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/input-gateway/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -24,17 +24,12 @@ class MyMongoose {
|
|
|
24
24
|
if (!config_1.config.MONGO_CONN) {
|
|
25
25
|
throw new errors_1.CustomError("The ENV variable MONGO_CONN cannot be undefined.", true, this.constructor.name, 6003);
|
|
26
26
|
}
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
bufferMaxEntries: 0,
|
|
27
|
+
const connectOptions = {
|
|
28
|
+
bufferCommands: false,
|
|
30
29
|
connectTimeoutMS: 90000,
|
|
31
|
-
reconnectInterval: 5000,
|
|
32
|
-
reconnectTries: Number.MAX_VALUE,
|
|
33
30
|
socketTimeoutMS: 90000,
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
useNewUrlParser: true,
|
|
37
|
-
});
|
|
31
|
+
};
|
|
32
|
+
yield mongoose_1.default.connect(config_1.config.MONGO_CONN, connectOptions);
|
|
38
33
|
mongoose_1.default.connection.on("disconnected", () => {
|
|
39
34
|
helpers_1.log.error("MongoDB disconnected!");
|
|
40
35
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/MongoConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA4D;AAC5D,
|
|
1
|
+
{"version":3,"file":"MongoConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/MongoConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA4D;AAC5D,wDAAoD;AACpD,sCAAoC;AACpC,wCAAkC;AAElC,MAAM,UAAU;IAAhB;QACW,YAAO,GAAG,GAAuC,EAAE;YACtD,IAAI;gBACA,IAAI,CAAC,eAAM,CAAC,UAAU,EAAE;oBACpB,MAAM,IAAI,oBAAW,CAAC,kDAAkD,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBAChH;gBACD,MAAM,cAAc,GAAmB;oBACnC,cAAc,EAAE,KAAK;oBACrB,gBAAgB,EAAE,KAAK;oBACvB,eAAe,EAAE,KAAK;iBACzB,CAAC;gBAEF,MAAM,kBAAQ,CAAC,OAAO,CAAC,eAAM,CAAC,UAAU,EAAE,cAAc,CAAC,CAAC;gBAE1D,kBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;oBACxC,aAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBACvC,CAAC,CAAC,CAAC;gBAEH,kBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;oBACvC,aAAG,CAAC,IAAI,CAAC,4CAA4C,CAAC,CAAC;gBAC3D,CAAC,CAAC,CAAC;gBAEH,kBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACpC,aAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;gBAEH,aAAG,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;gBAClC,OAAO,kBAAQ,CAAC,UAAU,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,aAAG,CAAC,KAAK,CAAC,uBAAuB,GAAG,eAAM,CAAC,UAAU,CAAC,CAAC;gBACvD,MAAM,IAAI,oBAAW,CAAC,oCAAoC,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aACxG;QACL,CAAC,CAAA,CAAC;QAEK,kBAAa,GAAG,GAAwB,EAAE;YAC7C,IAAI,kBAAQ,CAAC,UAAU,CAAC,UAAU,KAAK,CAAC,EAAE;gBACtC,MAAM,IAAI,oBAAW,CACjB,kEAAkE,EAClE,KAAK,EACL,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,CACP,CAAC;aACL;YACD,OAAO,kBAAQ,CAAC,UAAU,CAAC;QAC/B,CAAC,CAAC;QAEK,gBAAW,GAAG,GAA2B,EAAE;YAC9C,OAAO,kBAAQ,CAAC,UAAU,CAAC,UAAU,KAAK,CAAC,CAAC;QAChD,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,GAAwB,EAAE;YAC1C,aAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACtC,OAAO,kBAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACvC,CAAC,CAAA,CAAC;IACN,CAAC;CAAA;AAED,MAAM,cAAc,GAAG,IAAI,UAAU,EAAE,CAAC;AAE/B,wCAAc"}
|
|
@@ -29,13 +29,11 @@ class MongoDatabase {
|
|
|
29
29
|
if (!this.connectionString || this.connectionString === "YOUR CONNECTION STRING GOES HERE") {
|
|
30
30
|
throw new Error("Undefined connection string.");
|
|
31
31
|
}
|
|
32
|
-
|
|
32
|
+
const connectOptions = {
|
|
33
33
|
connectTimeoutMS: this.connectTimeoutMS,
|
|
34
34
|
serverSelectionTimeoutMS: this.connectTimeoutMS,
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
useUnifiedTopology: true,
|
|
38
|
-
});
|
|
35
|
+
};
|
|
36
|
+
yield mongoose_1.default.connect(this.connectionString, connectOptions);
|
|
39
37
|
mongoose_1.default.connection.on("disconnected", () => {
|
|
40
38
|
Logger_1.log.error("Mongo DB disconnected!");
|
|
41
39
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MongoDatabase.js","sourceRoot":"","sources":["../../../src/output-gateway/database/MongoDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"MongoDatabase.js","sourceRoot":"","sources":["../../../src/output-gateway/database/MongoDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA8C;AAC9C,wDAAoD;AACpD,sCAAoC;AACpC,sCAAiC;AAEjC;;GAEG;AACH,MAAa,aAAa;IAItB,+BAA+B;IAC/B;QAKA,qBAAqB;QACd,YAAO,GAAG,GAAuC,EAAE;YACtD,IAAI;gBACA,IAAI,CAAC,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,KAAK,kCAAkC,EAAE;oBACxF,MAAM,IAAI,KAAK,CAAC,8BAA8B,CAAC,CAAC;iBACnD;gBACD,MAAM,cAAc,GAAmB;oBACnC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;oBACvC,wBAAwB,EAAE,IAAI,CAAC,gBAAgB;iBAClD,CAAC;gBAEF,MAAM,kBAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;gBAE9D,kBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,cAAc,EAAE,GAAG,EAAE;oBACxC,YAAG,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;gBACxC,CAAC,CAAC,CAAC;gBAEH,kBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,aAAa,EAAE,GAAG,EAAE;oBACvC,YAAG,CAAC,IAAI,CAAC,6CAA6C,CAAC,CAAC;gBAC5D,CAAC,CAAC,CAAC;gBAEH,kBAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBACpC,YAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;gBACnB,CAAC,CAAC,CAAC;gBAEH,YAAG,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;gBACnC,OAAO,kBAAQ,CAAC,UAAU,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,YAAG,CAAC,KAAK,CAAC,uBAAuB,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC3D,MAAM,IAAI,oBAAW,CAAC,oCAAoC,EAAE,KAAK,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aAClG;QACL,CAAC,CAAA,CAAC;QAEK,gBAAW,GAAG,GAA2B,EAAE;YAC9C,OAAO,kBAAQ,CAAC,UAAU,CAAC,UAAU,KAAK,CAAC,CAAC;QAChD,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,GAAwB,EAAE;YAC1C,YAAG,CAAC,IAAI,CAAC,2BAA2B,CAAC,CAAC;YACtC,OAAO,kBAAQ,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC;QACvC,CAAC,CAAA,CAAC;QA5CE,IAAI,CAAC,gBAAgB,GAAG,eAAM,CAAC,gBAAgB,CAAC;QAChD,IAAI,CAAC,gBAAgB,GAAG,eAAM,CAAC,aAAa,CAAC;IACjD,CAAC;CA2CJ;AAnDD,sCAmDC;AAED,MAAM,kBAAkB,GAAG,IAAI,aAAa,EAAE,CAAC,OAAO,EAAE,CAAC;AAEhD,gDAAkB"}
|
|
@@ -28,7 +28,9 @@ export declare abstract class MongoModel extends BaseModel {
|
|
|
28
28
|
/**
|
|
29
29
|
* Returns current schema of the data
|
|
30
30
|
*/
|
|
31
|
-
GetSchema: () => Promise<Schema<
|
|
31
|
+
GetSchema: () => Promise<Schema<any, Model<any, any, any, any, any>, {}, {}, {}, {}, "type", {
|
|
32
|
+
[x: string]: any;
|
|
33
|
+
}>>;
|
|
32
34
|
/**
|
|
33
35
|
* Specifies where is the primary ID of the entity.
|
|
34
36
|
* Searches by this selection in FindOne()
|
|
@@ -15,7 +15,6 @@ const BaseRouter_1 = require("./BaseRouter");
|
|
|
15
15
|
const Validation_1 = require("../Validation");
|
|
16
16
|
const express_1 = require("express");
|
|
17
17
|
const check_1 = require("express-validator/check");
|
|
18
|
-
const lodash_1 = require("lodash");
|
|
19
18
|
class AbstractHistoryRouter extends BaseRouter_1.BaseRouter {
|
|
20
19
|
constructor(inModel) {
|
|
21
20
|
super();
|
|
@@ -31,8 +30,8 @@ class AbstractHistoryRouter extends BaseRouter_1.BaseRouter {
|
|
|
31
30
|
try {
|
|
32
31
|
const data = yield this.model.GetAll({
|
|
33
32
|
from: timestampFrom,
|
|
34
|
-
limit: (
|
|
35
|
-
offset: (
|
|
33
|
+
limit: Number(req.query.limit),
|
|
34
|
+
offset: Number(req.query.offset),
|
|
36
35
|
sensorId: req.query.sensorId,
|
|
37
36
|
to: timestampTo,
|
|
38
37
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AbstractHistoryRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/AbstractHistoryRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAA+C;AAC/C,6CAAmD;AACnD,8CAAoF;AACpF,qCAAkE;AAClE,mDAAiE;
|
|
1
|
+
{"version":3,"file":"AbstractHistoryRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/AbstractHistoryRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AACA,oCAA+C;AAC/C,6CAAmD;AACnD,8CAAoF;AACpF,qCAAkE;AAClE,mDAAiE;AAEjE,MAAsB,qBAAsB,SAAQ,uBAAU;IAM1D,YAAmB,OAAmB;QAClC,KAAK,EAAE,CAAC;QANZ,iDAAiD;QAC1C,WAAM,GAAW,IAAA,gBAAM,GAAE,CAAC;QAS1B,eAAU,GAAG,CAAO,MAAwB,EAAE,EAAE;YACnD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,8BAA8B,EAAE,CAAC;YAClE,IAAI,CAAC,MAAM,CAAC,GAAG,CACX,GAAG,EACH,IAAA,0BAAkB,EAAC,MAAM,CAAC,EAC1B,CAAC,IAAA,aAAK,EAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE,IAAA,aAAK,EAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,EAAE,aAAa,CAAC,EACzF,uBAAU,EACV,IAAA,sCAAyB,EAAC,eAAe,CAAC,EAC1C,wBAAW,EACX,IAAI,CAAC,MAAM,CACd,CAAC;QACN,CAAC,CAAA,CAAC;QAEK,WAAM,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;YACtE,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAc,CAAC,CAAC,OAAO,EAAE,CAAC;YACnE,MAAM,WAAW,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAY,CAAC,CAAC,OAAO,EAAE,CAAC;YAE/D,IAAI;gBACA,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC;oBACjC,IAAI,EAAE,aAAa;oBACnB,KAAK,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;oBAC9B,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;oBAChC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAkB;oBACtC,EAAE,EAAE,WAAW;iBAClB,CAAC,CAAC;gBAEH,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC9B;YAAC,OAAO,GAAG,EAAE;gBACV,IAAI,CAAC,GAAG,CAAC,CAAC;aACb;QACL,CAAC,CAAA,CAAC;QAjCE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC;IACzB,CAAC;CAmCJ;AA5CD,sDA4CC"}
|
|
@@ -17,7 +17,6 @@ const BaseRouter_1 = require("./BaseRouter");
|
|
|
17
17
|
const Validation_1 = require("../Validation");
|
|
18
18
|
const express_1 = require("express");
|
|
19
19
|
const check_1 = require("express-validator/check");
|
|
20
|
-
const lodash_1 = require("lodash");
|
|
21
20
|
/**
|
|
22
21
|
* Router for data in GeoJSON format using GeoJSON model -
|
|
23
22
|
* binds / and /:id to GetAll and GetOne methods of GeoJsonModel.
|
|
@@ -78,9 +77,9 @@ class GeoJsonRouter extends BaseRouter_1.BaseRouter {
|
|
|
78
77
|
districts,
|
|
79
78
|
ids: ids,
|
|
80
79
|
lat: coords.lat,
|
|
81
|
-
limit: (
|
|
80
|
+
limit: Number(req.query.limit),
|
|
82
81
|
lng: coords.lng,
|
|
83
|
-
offset: (
|
|
82
|
+
offset: Number(req.query.offset),
|
|
84
83
|
range: coords.range,
|
|
85
84
|
updatedSince: req.query.updatedSince,
|
|
86
85
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GeoJsonRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/GeoJsonRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,gCAA2C;AAC3C,sCAAiC;AAEjC,oCAA+C;AAC/C,6CAAmD;AACnD,8CAAoF;AACpF,qCAAkE;AAClE,mDAAwE;
|
|
1
|
+
{"version":3,"file":"GeoJsonRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/GeoJsonRouter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,33 @@
|
|
|
1
|
+
/// <reference types="mongoose/types/aggregate" />
|
|
2
|
+
/// <reference types="mongoose/types/callback" />
|
|
3
|
+
/// <reference types="mongoose/types/collection" />
|
|
4
|
+
/// <reference types="mongoose/types/connection" />
|
|
5
|
+
/// <reference types="mongoose/types/cursor" />
|
|
6
|
+
/// <reference types="mongoose/types/document" />
|
|
7
|
+
/// <reference types="mongoose/types/error" />
|
|
8
|
+
/// <reference types="mongoose/types/expressions" />
|
|
9
|
+
/// <reference types="mongoose/types/helpers" />
|
|
10
|
+
/// <reference types="mongoose/types/middlewares" />
|
|
11
|
+
/// <reference types="mongoose/types/indexes" />
|
|
12
|
+
/// <reference types="mongoose/types/models" />
|
|
13
|
+
/// <reference types="mongoose/types/mongooseoptions" />
|
|
14
|
+
/// <reference types="mongoose/types/pipelinestage" />
|
|
15
|
+
/// <reference types="mongoose/types/populate" />
|
|
16
|
+
/// <reference types="mongoose/types/query" />
|
|
17
|
+
/// <reference types="mongoose/types/schemaoptions" />
|
|
18
|
+
/// <reference types="mongoose/types/schematypes" />
|
|
19
|
+
/// <reference types="mongoose/types/session" />
|
|
20
|
+
/// <reference types="mongoose/types/types" />
|
|
21
|
+
/// <reference types="mongoose/types/utility" />
|
|
22
|
+
/// <reference types="mongoose/types/validation" />
|
|
23
|
+
/// <reference types="mongoose/types/virtuals" />
|
|
1
24
|
/// <reference types="mongoose" />
|
|
25
|
+
/// <reference types="mongoose/types/inferschematype" />
|
|
2
26
|
import { ModelAttributes } from "sequelize";
|
|
3
27
|
declare const forExport: {
|
|
4
28
|
name: string;
|
|
5
29
|
outputMongooseSchemaObject: {
|
|
6
|
-
[path: string]:
|
|
30
|
+
[path: string]: import("mongoose").SchemaDefinitionProperty<undefined>;
|
|
7
31
|
};
|
|
8
32
|
outputSequelizeAttributes: ModelAttributes<any, any>;
|
|
9
33
|
pgTableName: string;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/core",
|
|
3
|
-
"version": "1.2.
|
|
3
|
+
"version": "1.2.17-dev.623758334",
|
|
4
4
|
"description": "Golemio Core Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -37,7 +37,6 @@
|
|
|
37
37
|
"@types/content-type": "^1.1.3",
|
|
38
38
|
"@types/debug": "0.0.31",
|
|
39
39
|
"@types/decompress": "^4.2.3",
|
|
40
|
-
"@types/lodash": "^4.14.165",
|
|
41
40
|
"@types/mocha": "^8.2.0",
|
|
42
41
|
"@types/morgan": "^1.9.2",
|
|
43
42
|
"@types/node": "^16.11.35",
|
|
@@ -67,7 +66,7 @@
|
|
|
67
66
|
"dependencies": {
|
|
68
67
|
"@golemio/errors": "^1.0.1",
|
|
69
68
|
"@golemio/utils": "^1.0.0",
|
|
70
|
-
"@golemio/validator": "0.2.
|
|
69
|
+
"@golemio/validator": "0.2.4-dev.623627646",
|
|
71
70
|
"@google-cloud/storage": "^5.18.0",
|
|
72
71
|
"@opentelemetry/api": "1.0.4",
|
|
73
72
|
"@opentelemetry/exporter-jaeger": "^1.2.0",
|
|
@@ -105,11 +104,10 @@
|
|
|
105
104
|
"iconv-lite": "^0.6.2",
|
|
106
105
|
"ioredis": "^4.28.5",
|
|
107
106
|
"lightship": "^6.7.2",
|
|
108
|
-
"lodash": "^4.17.21",
|
|
109
107
|
"luxon": "^2.3.2",
|
|
110
108
|
"moment-timezone": "^0.5.26",
|
|
111
109
|
"mongodb-restore-dump": "1.0.1",
|
|
112
|
-
"mongoose": "^5.3
|
|
110
|
+
"mongoose": "^6.5.3",
|
|
113
111
|
"morgan": "^1.10.0",
|
|
114
112
|
"opentelemetry-instrumentation-mongoose": "^0.27.1",
|
|
115
113
|
"opentelemetry-instrumentation-sequelize": "^0.27.1",
|