@golemio/core 1.2.6-dev.506735002 → 1.2.6
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/helpers/SaveRawDataMiddleware.d.ts +8 -1
- package/dist/input-gateway/helpers/SaveRawDataMiddleware.js +28 -32
- package/dist/input-gateway/helpers/SaveRawDataMiddleware.js.map +1 -1
- package/dist/output-gateway/routes/AbstractHistoryRouter.d.ts +12 -0
- package/dist/output-gateway/routes/AbstractHistoryRouter.js +49 -0
- package/dist/output-gateway/routes/AbstractHistoryRouter.js.map +1 -0
- package/dist/output-gateway/routes/HistoryRouter.d.ts +3 -8
- package/dist/output-gateway/routes/HistoryRouter.js +4 -36
- package/dist/output-gateway/routes/HistoryRouter.js.map +1 -1
- package/dist/output-gateway/routes/interfaces/IHistoryFilterParameters.d.ts +7 -0
- package/dist/output-gateway/routes/interfaces/IHistoryFilterParameters.js +3 -0
- package/dist/output-gateway/routes/interfaces/IHistoryFilterParameters.js.map +1 -0
- package/package.json +130 -130
|
@@ -1,5 +1,12 @@
|
|
|
1
|
+
import { S3 } from "aws-sdk";
|
|
1
2
|
import { NextFunction, Request, Response } from "express";
|
|
3
|
+
export declare const routesRegexp: RegExp;
|
|
4
|
+
export declare const headersRegexp: RegExp;
|
|
2
5
|
/**
|
|
3
|
-
* Middleware function
|
|
6
|
+
* Middleware function for saving raw data to file
|
|
4
7
|
*/
|
|
5
8
|
export declare const saveRawDataMiddleware: (req: Request, res: Response, next: NextFunction) => void;
|
|
9
|
+
/**
|
|
10
|
+
* Helper function for saving data to S3
|
|
11
|
+
*/
|
|
12
|
+
export declare const uploadDataToS3: (data: S3.Types.PutObjectRequest, options: S3.ManagedUpload.ManagedUploadOptions, requestUrlPath: string) => void;
|
|
@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
3
3
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
exports.saveRawDataMiddleware = void 0;
|
|
6
|
+
exports.uploadDataToS3 = exports.saveRawDataMiddleware = exports.headersRegexp = exports.routesRegexp = void 0;
|
|
7
7
|
const errors_1 = require("@golemio/errors");
|
|
8
8
|
const aws_sdk_1 = require("aws-sdk");
|
|
9
9
|
const moment_timezone_1 = __importDefault(require("moment-timezone"));
|
|
@@ -13,7 +13,7 @@ const helpers_1 = require("./");
|
|
|
13
13
|
// load all whitelisted datasets
|
|
14
14
|
let regexpRoutesString = "";
|
|
15
15
|
let regexpHeadersString = "";
|
|
16
|
-
config_1.config.saveRawDataWhitelist
|
|
16
|
+
for (const dataset of config_1.config.saveRawDataWhitelist) {
|
|
17
17
|
if (regexpRoutesString.length !== 0) {
|
|
18
18
|
regexpRoutesString += "|";
|
|
19
19
|
}
|
|
@@ -25,10 +25,10 @@ config_1.config.saveRawDataWhitelist.forEach((dataset) => {
|
|
|
25
25
|
}
|
|
26
26
|
regexpHeadersString += routeRegexp;
|
|
27
27
|
}
|
|
28
|
-
}
|
|
28
|
+
}
|
|
29
29
|
// regexp for matching all whitelisted datasets
|
|
30
|
-
|
|
31
|
-
|
|
30
|
+
exports.routesRegexp = regexpRoutesString !== "" ? RegExp(regexpRoutesString) : RegExp(/.^/);
|
|
31
|
+
exports.headersRegexp = regexpHeadersString !== "" ? RegExp(regexpHeadersString) : RegExp(/.^/);
|
|
32
32
|
const s3 = new aws_sdk_1.S3({
|
|
33
33
|
accessKeyId: config_1.config.s3.access_key_id,
|
|
34
34
|
endpoint: config_1.config.s3.endpoint,
|
|
@@ -37,24 +37,25 @@ const s3 = new aws_sdk_1.S3({
|
|
|
37
37
|
signatureVersion: "v4",
|
|
38
38
|
});
|
|
39
39
|
/**
|
|
40
|
-
* Middleware function
|
|
40
|
+
* Middleware function for saving raw data to file
|
|
41
41
|
*/
|
|
42
42
|
const saveRawDataMiddleware = (req, res, next) => {
|
|
43
|
+
const requestUrlPath = req.path;
|
|
43
44
|
// save file only if S3 is enabled and the method is POST and the url match one of whitelisted route
|
|
44
|
-
if (config_1.config.s3.enabled && req.method === "POST" && routesRegexp.exec(
|
|
45
|
+
if (config_1.config.s3.enabled && req.method === "POST" && exports.routesRegexp.exec(requestUrlPath)) {
|
|
45
46
|
// file name (path) in format {url}/{YYYY-MM-DD}/{HH_mm_ss.s}, e.g. mos-be/accounts/2020-04-17/12_59_42.456
|
|
46
47
|
const now = (0, moment_timezone_1.default)().tz("Europe/Prague");
|
|
47
|
-
const name = `${
|
|
48
|
+
const name = `${requestUrlPath.slice(1)}/${now.format("YYYY-MM-DD")}/${now.format("HH_mm_ss.SSS")}`;
|
|
48
49
|
// file extension by content-type
|
|
49
50
|
const contentType = (0, helpers_1.getContentType)(req);
|
|
50
51
|
const ext = helpers_1.contentTypeToExtension[contentType];
|
|
51
52
|
// content-type checking
|
|
52
53
|
if (!ext) {
|
|
53
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Saving raw data failed. (${
|
|
54
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Saving raw data failed. (${requestUrlPath})`, true, "SaveRawDataMiddleware", 406, new Error(`Extension for content-type ${contentType} was not found.`)));
|
|
54
55
|
return next();
|
|
55
56
|
}
|
|
56
57
|
// save file with body of the matched route
|
|
57
|
-
const
|
|
58
|
+
const dataPutRequest = {
|
|
58
59
|
Body: req,
|
|
59
60
|
Bucket: config_1.config.s3.bucket_name,
|
|
60
61
|
Key: `${name}.${ext}`,
|
|
@@ -63,36 +64,31 @@ const saveRawDataMiddleware = (req, res, next) => {
|
|
|
63
64
|
partSize: config_1.config.s3.upload_part_size * 1024 * 1024,
|
|
64
65
|
queueSize: config_1.config.s3.upload_queue_size,
|
|
65
66
|
};
|
|
66
|
-
|
|
67
|
-
if (err) {
|
|
68
|
-
errors_1.ErrorHandler.handle(
|
|
69
|
-
// @ts-ignore
|
|
70
|
-
new errors_1.CustomError(`Saving raw data failed. (${req.url})`, true, "SaveRawDataMiddleware", err.statusCode, err));
|
|
71
|
-
}
|
|
72
|
-
})
|
|
73
|
-
.on("httpUploadProgress", (httpUploadProgress) => {
|
|
74
|
-
helpers_1.log.debug(`S3 file upload progress: ${httpUploadProgress.loaded} / ${httpUploadProgress.total}`);
|
|
75
|
-
})
|
|
76
|
-
.on("error", (err) => {
|
|
77
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Saving raw data failed. (${req.url})`, true, "SaveRawDataMiddleware", err.statusCode, err));
|
|
78
|
-
});
|
|
67
|
+
(0, exports.uploadDataToS3)(dataPutRequest, options, requestUrlPath);
|
|
79
68
|
// save file with headers of the matched route
|
|
80
|
-
if (headersRegexp.exec(
|
|
81
|
-
const
|
|
69
|
+
if (exports.headersRegexp.exec(requestUrlPath)) {
|
|
70
|
+
const headersPutRequest = {
|
|
82
71
|
Body: JSON.stringify(req.headers),
|
|
83
72
|
Bucket: config_1.config.s3.bucket_name,
|
|
84
73
|
Key: `${name}_headers.json`,
|
|
85
74
|
};
|
|
86
|
-
|
|
87
|
-
if (err) {
|
|
88
|
-
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Saving headers of raw data failed. (${req.url})`, true, "SaveRawDataMiddleware",
|
|
89
|
-
// @ts-ignore
|
|
90
|
-
err.statusCode, err));
|
|
91
|
-
}
|
|
92
|
-
});
|
|
75
|
+
(0, exports.uploadDataToS3)(headersPutRequest, options, requestUrlPath);
|
|
93
76
|
}
|
|
94
77
|
}
|
|
95
78
|
next();
|
|
96
79
|
};
|
|
97
80
|
exports.saveRawDataMiddleware = saveRawDataMiddleware;
|
|
81
|
+
/**
|
|
82
|
+
* Helper function for saving data to S3
|
|
83
|
+
*/
|
|
84
|
+
const uploadDataToS3 = (data, options, requestUrlPath) => {
|
|
85
|
+
s3.upload(data, options, (err, _data) => {
|
|
86
|
+
if (err) {
|
|
87
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError(`Uploading data failed to S3 failed. (${requestUrlPath})`, true, "SaveRawDataMiddleware", err.statusCode, err));
|
|
88
|
+
}
|
|
89
|
+
}).on("httpUploadProgress", (httpUploadProgress) => {
|
|
90
|
+
helpers_1.log.debug(`S3 file upload progress: ${httpUploadProgress.loaded} / ${httpUploadProgress.total}`);
|
|
91
|
+
});
|
|
92
|
+
};
|
|
93
|
+
exports.uploadDataToS3 = uploadDataToS3;
|
|
98
94
|
//# sourceMappingURL=SaveRawDataMiddleware.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SaveRawDataMiddleware.js","sourceRoot":"","sources":["../../../src/input-gateway/helpers/SaveRawDataMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA4D;AAC5D,qCAA6B;AAE7B,sEAAqC;AACrC,mDAA8C;AAC9C,sCAAoC;AACpC,gCAA0E;
|
|
1
|
+
{"version":3,"file":"SaveRawDataMiddleware.js","sourceRoot":"","sources":["../../../src/input-gateway/helpers/SaveRawDataMiddleware.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { IBaseModel } from "../models/interfaces/IBaseModel";
|
|
2
|
+
import { BaseRouter } from "./BaseRouter";
|
|
3
|
+
import { NextFunction, Request, Response, Router } from "express";
|
|
4
|
+
import { ValidationChain } from "express-validator/check";
|
|
5
|
+
export declare abstract class AbstractHistoryRouter extends BaseRouter {
|
|
6
|
+
router: Router;
|
|
7
|
+
protected model: IBaseModel;
|
|
8
|
+
constructor(inModel: IBaseModel);
|
|
9
|
+
initRoutes: (expire?: string | number | undefined) => Promise<void>;
|
|
10
|
+
GetAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
11
|
+
protected abstract GetIdQueryParamWithCorrectType(): Promise<ValidationChain>;
|
|
12
|
+
}
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.AbstractHistoryRouter = void 0;
|
|
13
|
+
const redis_1 = require("../redis");
|
|
14
|
+
const BaseRouter_1 = require("./BaseRouter");
|
|
15
|
+
const Validation_1 = require("../Validation");
|
|
16
|
+
const express_1 = require("express");
|
|
17
|
+
const check_1 = require("express-validator/check");
|
|
18
|
+
const lodash_1 = require("lodash");
|
|
19
|
+
class AbstractHistoryRouter extends BaseRouter_1.BaseRouter {
|
|
20
|
+
constructor(inModel) {
|
|
21
|
+
super();
|
|
22
|
+
// Assign router to the express.Router() instance
|
|
23
|
+
this.router = (0, express_1.Router)();
|
|
24
|
+
this.initRoutes = (expire) => __awaiter(this, void 0, void 0, function* () {
|
|
25
|
+
const sensorIdParam = yield this.GetIdQueryParamWithCorrectType();
|
|
26
|
+
this.router.get("/", (0, redis_1.useCacheMiddleware)(expire), [(0, check_1.query)("from").optional().isISO8601(), (0, check_1.query)("to").optional().isISO8601(), sensorIdParam], Validation_1.pagination, (0, Validation_1.paginationLimitMiddleware)("HistoryRouter"), Validation_1.checkErrors, this.GetAll);
|
|
27
|
+
});
|
|
28
|
+
this.GetAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
29
|
+
const timestampFrom = new Date(req.query.from).getTime();
|
|
30
|
+
const timestampTo = new Date(req.query.to).getTime();
|
|
31
|
+
try {
|
|
32
|
+
const data = yield this.model.GetAll({
|
|
33
|
+
from: timestampFrom,
|
|
34
|
+
limit: (0, lodash_1.toNumber)(req.query.limit),
|
|
35
|
+
offset: (0, lodash_1.toNumber)(req.query.offset),
|
|
36
|
+
sensorId: req.query.sensorId,
|
|
37
|
+
to: timestampTo,
|
|
38
|
+
});
|
|
39
|
+
res.status(200).send(data);
|
|
40
|
+
}
|
|
41
|
+
catch (err) {
|
|
42
|
+
next(err);
|
|
43
|
+
}
|
|
44
|
+
});
|
|
45
|
+
this.model = inModel;
|
|
46
|
+
}
|
|
47
|
+
}
|
|
48
|
+
exports.AbstractHistoryRouter = AbstractHistoryRouter;
|
|
49
|
+
//# sourceMappingURL=AbstractHistoryRouter.js.map
|
|
@@ -0,0 +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;AACjE,mCAAkC;AAElC,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,IAAA,iBAAQ,EAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC;oBAChC,MAAM,EAAE,IAAA,iBAAQ,EAAC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC;oBAClC,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"}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
|
-
import { NextFunction, Request, Response, Router } from "express";
|
|
2
|
-
import { ValidationChain } from "express-validator/check";
|
|
3
1
|
import { HistoryModel } from "../models";
|
|
4
|
-
import {
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
protected model: HistoryModel;
|
|
2
|
+
import { ValidationChain } from "express-validator/check";
|
|
3
|
+
import { AbstractHistoryRouter } from "./AbstractHistoryRouter";
|
|
4
|
+
export declare class HistoryRouter extends AbstractHistoryRouter {
|
|
8
5
|
constructor(inModel: HistoryModel);
|
|
9
|
-
initRoutes: (expire?: string | number | undefined) => Promise<void>;
|
|
10
|
-
GetAll: (req: Request, res: Response, next: NextFunction) => Promise<void>;
|
|
11
6
|
protected GetIdQueryParamWithCorrectType: () => Promise<ValidationChain>;
|
|
12
7
|
}
|
|
@@ -10,44 +10,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
10
10
|
};
|
|
11
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
12
|
exports.HistoryRouter = void 0;
|
|
13
|
-
const
|
|
13
|
+
const Logger_1 = require("../Logger");
|
|
14
14
|
const check_1 = require("express-validator/check");
|
|
15
15
|
const mongoose_1 = require("mongoose");
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
const redis_1 = require("../redis");
|
|
19
|
-
const Validation_1 = require("../Validation");
|
|
20
|
-
const BaseRouter_1 = require("./BaseRouter");
|
|
21
|
-
class HistoryRouter extends BaseRouter_1.BaseRouter {
|
|
16
|
+
const AbstractHistoryRouter_1 = require("./AbstractHistoryRouter");
|
|
17
|
+
class HistoryRouter extends AbstractHistoryRouter_1.AbstractHistoryRouter {
|
|
22
18
|
constructor(inModel) {
|
|
23
|
-
super();
|
|
24
|
-
// Assign router to the express.Router() instance
|
|
25
|
-
this.router = (0, express_1.Router)();
|
|
26
|
-
this.initRoutes = (expire) => __awaiter(this, void 0, void 0, function* () {
|
|
27
|
-
const sensorIdParam = yield this.GetIdQueryParamWithCorrectType();
|
|
28
|
-
this.router.get("/", (0, redis_1.useCacheMiddleware)(expire), [(0, check_1.query)("from").optional().isISO8601(), (0, check_1.query)("to").optional().isISO8601(), sensorIdParam], Validation_1.pagination, (0, Validation_1.paginationLimitMiddleware)("HistoryRouter"), Validation_1.checkErrors, this.GetAll);
|
|
29
|
-
});
|
|
30
|
-
this.GetAll = (req, res, next) => __awaiter(this, void 0, void 0, function* () {
|
|
31
|
-
const timestampFrom = new Date(req.query.from).getTime();
|
|
32
|
-
const timestampTo = new Date(req.query.to).getTime();
|
|
33
|
-
let sensorIds = req.query.ids;
|
|
34
|
-
if (sensorIds) {
|
|
35
|
-
sensorIds = this.ConvertToArray(sensorIds);
|
|
36
|
-
}
|
|
37
|
-
try {
|
|
38
|
-
const data = yield this.model.GetAll({
|
|
39
|
-
from: timestampFrom,
|
|
40
|
-
limit: (0, lodash_1.toNumber)(req.query.limit),
|
|
41
|
-
offset: (0, lodash_1.toNumber)(req.query.offset),
|
|
42
|
-
sensorId: req.query.sensorId,
|
|
43
|
-
to: timestampTo,
|
|
44
|
-
});
|
|
45
|
-
res.status(200).send(data);
|
|
46
|
-
}
|
|
47
|
-
catch (err) {
|
|
48
|
-
next(err);
|
|
49
|
-
}
|
|
50
|
-
});
|
|
19
|
+
super(inModel);
|
|
51
20
|
this.GetIdQueryParamWithCorrectType = () => __awaiter(this, void 0, void 0, function* () {
|
|
52
21
|
let sensorIdParam;
|
|
53
22
|
// @ts-ignore
|
|
@@ -71,7 +40,6 @@ class HistoryRouter extends BaseRouter_1.BaseRouter {
|
|
|
71
40
|
return sensorIdParam;
|
|
72
41
|
});
|
|
73
42
|
});
|
|
74
|
-
this.model = inModel;
|
|
75
43
|
}
|
|
76
44
|
}
|
|
77
45
|
exports.HistoryRouter = HistoryRouter;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"HistoryRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/HistoryRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"HistoryRouter.js","sourceRoot":"","sources":["../../../src/output-gateway/routes/HistoryRouter.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,sCAAiC;AAEjC,mDAAiE;AACjE,uCAAkC;AAClC,mEAAgE;AAEhE,MAAa,aAAc,SAAQ,6CAAqB;IACpD,YAAmB,OAAqB;QACpC,KAAK,CAAC,OAAO,CAAC,CAAC;QAGT,mCAA8B,GAAG,GAAmC,EAAE;YAC5E,IAAI,aAA8B,CAAC;YACnC,aAAa;YACb,OAAO,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBAChD,gEAAgE;gBAChE,MAAM,KAAK,GAAI,IAAI,CAAC,KAAsB,CAAC,+BAA+B,CAAC;gBAC3E,IAAI,OAAO,GAAW,wBAAwB,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,EAAE,GAAG,qBAAqB,GAAG,KAAK,GAAG,YAAY,CAAC;gBACrH,mDAAmD;gBACnD,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,YAAY,iBAAM,CAAC,KAAK,CAAC,MAAM,EAAE;oBACnD,OAAO,IAAI,SAAS,CAAC;oBACrB,oGAAoG;oBACpG,aAAa,GAAG,IAAA,aAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,SAAS,EAAE,CAAC;oBAC3D,mDAAmD;iBACtD;qBAAM;oBACH,OAAO,IAAI,SAAS,CAAC;oBACrB,oGAAoG;oBACpG,aAAa,GAAG,IAAA,aAAK,EAAC,YAAY,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC;iBAC7D;gBACD,YAAG,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;gBACnB,OAAO,aAAa,CAAC;YACzB,CAAC,CAAC,CAAC;QACP,CAAC,CAAA,CAAC;IAvBF,CAAC;CAwBJ;AA3BD,sCA2BC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"IHistoryFilterParameters.js","sourceRoot":"","sources":["../../../../src/output-gateway/routes/interfaces/IHistoryFilterParameters.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,132 +1,132 @@
|
|
|
1
1
|
{
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
2
|
+
"name": "@golemio/core",
|
|
3
|
+
"version": "1.2.6",
|
|
4
|
+
"description": "Golemio Core Module",
|
|
5
|
+
"main": "dist/index.js",
|
|
6
|
+
"types": "dist/index.d.ts",
|
|
7
|
+
"bin": {
|
|
8
|
+
"golemio-import-test-data": "bin/import-test-data.js"
|
|
9
|
+
},
|
|
10
|
+
"scripts": {
|
|
11
|
+
"build": "rimraf ./dist && ttsc -p ./tsconfig.build.json",
|
|
12
|
+
"build-minimal": "run-s 'build --sourceMap false --declaration false'",
|
|
13
|
+
"build-watch": "run-s 'build --watch --preserveWatchOutput'",
|
|
14
|
+
"test": "cross-env NODE_ENV=test TS_NODE_COMPILER='ttypescript' mocha --exit --check-leaks --timeout 120000 -r ts-node/register -r dotenv/config 'test/**/*.test.ts'",
|
|
15
|
+
"test-debug": "run-s 'test --inspect-brk=9230'",
|
|
16
|
+
"code-coverage": "nyc run-s 'test -r source-map-support/register'",
|
|
17
|
+
"generate-docs": "typedoc --out docs/typedoc src",
|
|
18
|
+
"lint": "eslint \"{src,test}/**/*.ts\""
|
|
19
|
+
},
|
|
20
|
+
"keywords": [
|
|
21
|
+
"golemio"
|
|
22
|
+
],
|
|
23
|
+
"author": "Operator ICT, a.s.",
|
|
24
|
+
"license": "MIT",
|
|
25
|
+
"repository": {
|
|
26
|
+
"type": "git",
|
|
27
|
+
"url": "https://gitlab.com/operator-ict/golemio/code/modules/core"
|
|
28
|
+
},
|
|
29
|
+
"devDependencies": {
|
|
30
|
+
"@commitlint/cli": "^11.0.0",
|
|
31
|
+
"@commitlint/config-conventional": "^11.0.0",
|
|
32
|
+
"@golemio/eslint-config": "^1.1.0",
|
|
33
|
+
"@types/amqplib": "^0.5.17",
|
|
34
|
+
"@types/apicache": "^1.2.3",
|
|
35
|
+
"@types/chai": "4.2.3",
|
|
36
|
+
"@types/chai-as-promised": "7.1.2",
|
|
37
|
+
"@types/content-type": "^1.1.3",
|
|
38
|
+
"@types/debug": "0.0.31",
|
|
39
|
+
"@types/decompress": "^4.2.3",
|
|
40
|
+
"@types/ioredis": "^4.17.10",
|
|
41
|
+
"@types/lodash": "^4.14.165",
|
|
42
|
+
"@types/mocha": "^8.2.0",
|
|
43
|
+
"@types/morgan": "^1.9.2",
|
|
44
|
+
"@types/node": "^14.14.20",
|
|
45
|
+
"@types/redis": "^2.8.28",
|
|
46
|
+
"@types/sinon": "7.0.13",
|
|
47
|
+
"@types/ssh2-sftp-client": "^5.3.1",
|
|
48
|
+
"@types/supertest": "^2.0.11",
|
|
49
|
+
"@zerollup/ts-transform-paths": "^1.7.18",
|
|
50
|
+
"chai": "4.2.0",
|
|
51
|
+
"chai-as-promised": "7.1.1",
|
|
52
|
+
"cross-env": "^7.0.3",
|
|
53
|
+
"eslint": "^8.1.1",
|
|
54
|
+
"husky": "^4.3.7",
|
|
55
|
+
"mocha": "^9.1.2",
|
|
56
|
+
"nock": "^13.0.5",
|
|
57
|
+
"npm-run-all": "^4.1.5",
|
|
58
|
+
"nyc": "^15.1.0",
|
|
59
|
+
"prettier": "^2.5.1",
|
|
60
|
+
"pretty-quick": "^3.1.0",
|
|
61
|
+
"rimraf": "^3.0.2",
|
|
62
|
+
"sinon": "7.1.1",
|
|
63
|
+
"source-map-support": "0.5.9",
|
|
64
|
+
"supertest": "^6.1.6",
|
|
65
|
+
"ts-node": "^9.1.1",
|
|
66
|
+
"ttypescript": "^1.5.13",
|
|
67
|
+
"typedoc": "^0.21.4",
|
|
68
|
+
"typescript": "4.4.4"
|
|
69
|
+
},
|
|
70
|
+
"dependencies": {
|
|
71
|
+
"@golemio/errors": "^1.0.1",
|
|
72
|
+
"@golemio/utils": "^1.0.0",
|
|
73
|
+
"@golemio/validator": "0.2.0",
|
|
74
|
+
"@google-cloud/storage": "^5.18.0",
|
|
75
|
+
"@opentelemetry/api": "^1.0.2",
|
|
76
|
+
"@opentelemetry/exporter-jaeger": "^0.24.0",
|
|
77
|
+
"@opentelemetry/instrumentation-express": "^0.24.0",
|
|
78
|
+
"@opentelemetry/instrumentation-http": "^0.24.0",
|
|
79
|
+
"@opentelemetry/instrumentation-ioredis": "^0.24.0",
|
|
80
|
+
"@opentelemetry/node": "^0.24.0",
|
|
81
|
+
"@opentelemetry/resources": "^0.24.0",
|
|
82
|
+
"@opentelemetry/tracing": "^0.24.0",
|
|
83
|
+
"@sentry/node": "^6.11.0",
|
|
84
|
+
"@sentry/tracing": "^6.11.0",
|
|
85
|
+
"@types/express": "^4.16.0",
|
|
86
|
+
"@types/request-promise": "^4.1.45",
|
|
87
|
+
"ajv": "^8.10.0",
|
|
88
|
+
"amqplib": "^0.7.1",
|
|
89
|
+
"apicache": "^1.6.3",
|
|
90
|
+
"aws-sdk": "^2.823.0",
|
|
91
|
+
"axios": "^0.24.0",
|
|
92
|
+
"basic-ftp": "^4.6.6",
|
|
93
|
+
"content-type": "^1.0.4",
|
|
94
|
+
"debug": "3.1.0",
|
|
95
|
+
"decompress": "^4.2.1",
|
|
96
|
+
"dotenv": "^8.2.0",
|
|
97
|
+
"express": "^4.16.4",
|
|
98
|
+
"express-validator": "^5.3.1",
|
|
99
|
+
"fast-csv": "^4.3.6",
|
|
100
|
+
"fast-glob": "^3.2.5",
|
|
101
|
+
"iconv-lite": "^0.6.2",
|
|
102
|
+
"influx": "^5.6.3",
|
|
103
|
+
"ioredis": "^4.19.4",
|
|
104
|
+
"lightship": "^6.7.2",
|
|
105
|
+
"lodash": "^4.17.21",
|
|
106
|
+
"moment-timezone": "^0.5.26",
|
|
107
|
+
"mongodb-restore-dump": "1.0.1",
|
|
108
|
+
"mongoose": "^5.3.6",
|
|
109
|
+
"morgan": "^1.10.0",
|
|
110
|
+
"opentelemetry-instrumentation-amqplib": "^0.24.0",
|
|
111
|
+
"opentelemetry-instrumentation-aws-sdk": "^0.24.1",
|
|
112
|
+
"opentelemetry-instrumentation-mongoose": "^0.24.0",
|
|
113
|
+
"opentelemetry-instrumentation-sequelize": "^0.24.0",
|
|
114
|
+
"path-to-regexp": "^6.2.0",
|
|
115
|
+
"pg": "^8.6.0",
|
|
116
|
+
"prom-client": "^14.0.0",
|
|
117
|
+
"redis": "^3.1.1",
|
|
118
|
+
"request": "2.88.0",
|
|
119
|
+
"request-promise": "^4.2.5",
|
|
120
|
+
"sequelize": "^6.6.5",
|
|
121
|
+
"ssh2-sftp-client": "^7.1.0",
|
|
122
|
+
"winston": "^3.3.3",
|
|
123
|
+
"xml2js-es6-promise": "^1.1.1"
|
|
124
|
+
},
|
|
125
|
+
"resolutions": {
|
|
126
|
+
"mpath": "^0.8.4",
|
|
127
|
+
"url-parse": "^1.5.6",
|
|
128
|
+
"minimist": "^1.2.6",
|
|
129
|
+
"@google-cloud/storage/**/node-forge": "^1.3.0",
|
|
130
|
+
"**/axios/follow-redirects": "^1.14.7"
|
|
131
|
+
}
|
|
132
132
|
}
|