@golemio/core 1.2.11-dev.548752302 → 1.2.11-dev.548903848
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/integration-engine/config/abstract.d.ts +1 -0
- package/dist/integration-engine/config/config.js +2 -0
- package/dist/integration-engine/config/config.js.map +1 -1
- package/dist/integration-engine/connectors/PostgresConnector.js +7 -0
- package/dist/integration-engine/connectors/PostgresConnector.js.map +1 -1
- package/dist/integration-engine/models/IModel.d.ts +2 -3
- package/dist/integration-engine/models/PostgresModel.d.ts +1 -2
- package/dist/integration-engine/models/PostgresModel.js.map +1 -1
- package/dist/integration-engine/models/RedisModel.d.ts +10 -3
- package/dist/integration-engine/models/RedisModel.js +29 -13
- package/dist/integration-engine/models/RedisModel.js.map +1 -1
- package/dist/monitoring/opentelemetry/instrumentation/index.d.ts +1 -2
- package/dist/monitoring/opentelemetry/instrumentation/index.js +0 -2
- package/dist/monitoring/opentelemetry/instrumentation/index.js.map +1 -1
- package/dist/output-gateway/config/config.d.ts +1 -0
- package/dist/output-gateway/config/config.js +1 -0
- package/dist/output-gateway/config/config.js.map +1 -1
- package/dist/output-gateway/database/PostgreDatabase.js +8 -1
- package/dist/output-gateway/database/PostgreDatabase.js.map +1 -1
- package/dist/output-gateway/redis/CacheMiddleware.js +3 -3
- package/dist/output-gateway/redis/CacheMiddleware.js.map +1 -1
- package/dist/output-gateway/redis/RedisConnector.d.ts +3 -4
- package/dist/output-gateway/redis/RedisConnector.js +13 -23
- package/dist/output-gateway/redis/RedisConnector.js.map +1 -1
- package/package.json +4 -9
|
@@ -70,6 +70,8 @@ exports.config = {
|
|
|
70
70
|
tcpBusTjrNegativeOffset: process.env.VEHICLE_POSITIONS_TCP_BUS_NEGATIVE_OFFSET
|
|
71
71
|
? Number(process.env.VEHICLE_POSITIONS_TCP_BUS_NEGATIVE_OFFSET)
|
|
72
72
|
: 1,
|
|
73
|
+
// time at which Redis keys should expire
|
|
74
|
+
redisExpireTime: process.env.VEHICLE_POSITIONS_REDIS_EXPIRE_TIME || "03:00",
|
|
73
75
|
},
|
|
74
76
|
};
|
|
75
77
|
//# sourceMappingURL=config.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/integration-engine/config/config.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/integration-engine/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.PostgresConnector = exports.MySequelize = void 0;
|
|
16
|
+
const os_1 = __importDefault(require("os"));
|
|
13
17
|
const errors_1 = require("@golemio/errors");
|
|
14
18
|
const sequelize_1 = require("sequelize");
|
|
15
19
|
const config_1 = require("../config");
|
|
@@ -25,6 +29,9 @@ class MySequelize {
|
|
|
25
29
|
throw new errors_1.CustomError("The ENV variable POSTGRES_CONN cannot be undefined.", true, this.constructor.name, 6003);
|
|
26
30
|
}
|
|
27
31
|
this.connection = new sequelize_1.Sequelize(connectionString, {
|
|
32
|
+
dialectOptions: {
|
|
33
|
+
application_name: `Integration Engine (${os_1.default.hostname()})`,
|
|
34
|
+
},
|
|
28
35
|
define: {
|
|
29
36
|
freezeTableName: true,
|
|
30
37
|
timestamps: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/PostgresConnector.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PostgresConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/PostgresConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { SchemaDefinition } from "mongoose";
|
|
2
2
|
import { ModelAttributes } from "sequelize";
|
|
3
|
-
import { Ok } from "ioredis";
|
|
4
3
|
export interface ISequelizeSettings {
|
|
5
4
|
attributesToRemove?: string[];
|
|
6
5
|
outputSequelizeAttributes: ModelAttributes<any>;
|
|
@@ -34,11 +33,11 @@ export interface IModel {
|
|
|
34
33
|
}
|
|
35
34
|
export interface IRedisModel {
|
|
36
35
|
name: string;
|
|
37
|
-
set: (key: string, data: any, ttlSeconds: number) => Promise<any>;
|
|
36
|
+
set: (key: string, data: any, ttlSeconds: number, expireTimestamp: number | undefined) => Promise<any>;
|
|
38
37
|
hset: (key: string, data: any) => Promise<any>;
|
|
39
38
|
get: (key: string) => Promise<any>;
|
|
40
39
|
hget: (key: string) => Promise<any>;
|
|
41
40
|
delete: (key: string) => Promise<any>;
|
|
42
41
|
truncate: () => Promise<number>;
|
|
43
|
-
flush: () => Promise<
|
|
42
|
+
flush: () => Promise<"OK">;
|
|
44
43
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { IModel, ISequelizeSettings } from "./";
|
|
2
2
|
import { JSONSchemaValidator, Validator } from "@golemio/validator";
|
|
3
|
-
import { Model, ModelCtor, Sequelize, Transaction } from "sequelize";
|
|
4
|
-
import { SyncOptions } from "sequelize/types/lib/sequelize";
|
|
3
|
+
import { Model, ModelCtor, Sequelize, Transaction, SyncOptions } from "sequelize";
|
|
5
4
|
export declare class PostgresModel implements IModel {
|
|
6
5
|
/** Model name */
|
|
7
6
|
name: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgresModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/PostgresModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAAmD;AAGnD,4CAA8C;AAE9C,
|
|
1
|
+
{"version":3,"file":"PostgresModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/PostgresModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Validator } from "@golemio/validator";
|
|
2
|
-
import { Redis
|
|
2
|
+
import { Redis } from "ioredis";
|
|
3
3
|
import { IRedisModel, IRedisSettings } from "./";
|
|
4
4
|
export declare class RedisModel implements IRedisModel {
|
|
5
5
|
/** Model name */
|
|
@@ -17,13 +17,20 @@ export declare class RedisModel implements IRedisModel {
|
|
|
17
17
|
/** Validation helper */
|
|
18
18
|
protected validator: Validator | null;
|
|
19
19
|
constructor(name: string, settings: IRedisSettings, validator?: Validator | null);
|
|
20
|
-
|
|
20
|
+
/**
|
|
21
|
+
*
|
|
22
|
+
* @param key
|
|
23
|
+
* @param data
|
|
24
|
+
* @param ttlSeconds Key timeout, in seconds
|
|
25
|
+
* @param expireTimestamp Unix time at which the key will expire, in milliseconds
|
|
26
|
+
*/
|
|
27
|
+
set: (key: string, data: any, ttlSeconds?: number | undefined, expireTimestamp?: number | undefined) => Promise<any>;
|
|
21
28
|
hset: (key: string, data: any) => Promise<any>;
|
|
22
29
|
get: (key: string) => Promise<any>;
|
|
23
30
|
hget: (key: string) => Promise<any>;
|
|
24
31
|
delete: (key?: string | undefined) => Promise<any>;
|
|
25
32
|
truncate: (namespace?: boolean) => Promise<number>;
|
|
26
|
-
flush: () => Promise<
|
|
33
|
+
flush: () => Promise<"OK">;
|
|
27
34
|
private validate;
|
|
28
35
|
private buildKey;
|
|
29
36
|
}
|
|
@@ -17,32 +17,47 @@ const helpers_1 = require("../helpers");
|
|
|
17
17
|
class RedisModel {
|
|
18
18
|
constructor(name, settings, validator = null) {
|
|
19
19
|
var _a;
|
|
20
|
-
|
|
20
|
+
/**
|
|
21
|
+
*
|
|
22
|
+
* @param key
|
|
23
|
+
* @param data
|
|
24
|
+
* @param ttlSeconds Key timeout, in seconds
|
|
25
|
+
* @param expireTimestamp Unix time at which the key will expire, in milliseconds
|
|
26
|
+
*/
|
|
27
|
+
this.set = (key, data, ttlSeconds, expireTimestamp) => __awaiter(this, void 0, void 0, function* () {
|
|
21
28
|
yield this.validate(data);
|
|
22
29
|
if (data instanceof Array) {
|
|
23
30
|
// start the redis transaction
|
|
24
31
|
const multi = this.connection.multi();
|
|
25
|
-
data
|
|
26
|
-
const
|
|
27
|
-
|
|
32
|
+
for (const dataItem of data) {
|
|
33
|
+
const redisKey = `${this.prefix}:${this.buildKey(key, dataItem)}`;
|
|
34
|
+
const encodedData = this.encodeDataBeforeSave(dataItem);
|
|
28
35
|
if (ttlSeconds) {
|
|
29
|
-
return multi.setex(
|
|
36
|
+
return multi.setex(redisKey, ttlSeconds, encodedData);
|
|
37
|
+
}
|
|
38
|
+
else if (expireTimestamp) {
|
|
39
|
+
// PXAT timestamp in milliseconds
|
|
40
|
+
return multi.set(redisKey, encodedData, "PXAT", expireTimestamp);
|
|
30
41
|
}
|
|
31
42
|
else {
|
|
32
|
-
return multi.set(
|
|
43
|
+
return multi.set(redisKey, encodedData);
|
|
33
44
|
}
|
|
34
|
-
}
|
|
45
|
+
}
|
|
35
46
|
// redis transaction commit
|
|
36
47
|
return multi.exec();
|
|
37
48
|
}
|
|
38
49
|
else {
|
|
39
|
-
const
|
|
40
|
-
|
|
50
|
+
const redisKey = `${this.prefix}:${this.buildKey(key, data)}`;
|
|
51
|
+
const encodedData = this.encodeDataBeforeSave(data);
|
|
41
52
|
if (ttlSeconds) {
|
|
42
|
-
return this.connection.setex(
|
|
53
|
+
return this.connection.setex(redisKey, ttlSeconds, encodedData);
|
|
54
|
+
}
|
|
55
|
+
else if (expireTimestamp) {
|
|
56
|
+
// PXAT timestamp in milliseconds
|
|
57
|
+
return this.connection.set(redisKey, encodedData, "PXAT", expireTimestamp);
|
|
43
58
|
}
|
|
44
59
|
else {
|
|
45
|
-
return this.connection.set(
|
|
60
|
+
return this.connection.set(redisKey, encodedData);
|
|
46
61
|
}
|
|
47
62
|
}
|
|
48
63
|
});
|
|
@@ -94,10 +109,11 @@ class RedisModel {
|
|
|
94
109
|
return reject(err);
|
|
95
110
|
});
|
|
96
111
|
stream.on("end", () => __awaiter(this, void 0, void 0, function* () {
|
|
112
|
+
var _a, _b;
|
|
97
113
|
try {
|
|
98
114
|
const result = yield pipeline.exec();
|
|
99
|
-
const deleteCount = result.reduce((acc, el) => acc + el[1], 0);
|
|
100
|
-
helpers_1.log.info(`Truncate complete for ${prefix}, deleted ${deleteCount} in (${result.length}) batches`);
|
|
115
|
+
const deleteCount = (_a = result === null || result === void 0 ? void 0 : result.reduce((acc, el) => acc + el[1], 0)) !== null && _a !== void 0 ? _a : 0;
|
|
116
|
+
helpers_1.log.info(`Truncate complete for ${prefix}, deleted ${deleteCount} in (${(_b = result === null || result === void 0 ? void 0 : result.length) !== null && _b !== void 0 ? _b : 0}) batches`);
|
|
101
117
|
resolve(deleteCount);
|
|
102
118
|
}
|
|
103
119
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/RedisModel.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,4CAA8C;AAC9C,0CAAgD;AAGhD,8CAAgD;AAChD,wCAAkC;AAGlC,MAAa,UAAU;IAgBnB,YAAY,IAAY,EAAE,QAAwB,EAAE,YAA8B,IAAI;;
|
|
1
|
+
{"version":3,"file":"RedisModel.js","sourceRoot":"","sources":["../../../src/integration-engine/models/RedisModel.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { HttpInstrumentation } from "@opentelemetry/instrumentation-http";
|
|
2
2
|
import { IORedisInstrumentation } from "@opentelemetry/instrumentation-ioredis";
|
|
3
|
-
import { RedisInstrumentation } from "@opentelemetry/instrumentation-redis";
|
|
4
3
|
import { ExpressInstrumentation } from "@opentelemetry/instrumentation-express";
|
|
5
4
|
import { SequelizeInstrumentation } from "opentelemetry-instrumentation-sequelize";
|
|
6
5
|
import { MongooseInstrumentation } from "opentelemetry-instrumentation-mongoose";
|
|
7
6
|
import { AmqplibInstrumentation } from "@opentelemetry/instrumentation-amqplib";
|
|
8
7
|
import { AwsInstrumentation } from "@opentelemetry/instrumentation-aws-sdk";
|
|
9
|
-
export declare const getInstrumentation: () => (ExpressInstrumentation | HttpInstrumentation | SequelizeInstrumentation | MongooseInstrumentation | AmqplibInstrumentation | IORedisInstrumentation |
|
|
8
|
+
export declare const getInstrumentation: () => (ExpressInstrumentation | HttpInstrumentation | SequelizeInstrumentation | MongooseInstrumentation | AmqplibInstrumentation | IORedisInstrumentation | AwsInstrumentation)[];
|
|
@@ -4,7 +4,6 @@ exports.getInstrumentation = void 0;
|
|
|
4
4
|
// Instrumentation
|
|
5
5
|
const instrumentation_http_1 = require("@opentelemetry/instrumentation-http");
|
|
6
6
|
const instrumentation_ioredis_1 = require("@opentelemetry/instrumentation-ioredis");
|
|
7
|
-
const instrumentation_redis_1 = require("@opentelemetry/instrumentation-redis");
|
|
8
7
|
const instrumentation_express_1 = require("@opentelemetry/instrumentation-express");
|
|
9
8
|
const opentelemetry_instrumentation_sequelize_1 = require("opentelemetry-instrumentation-sequelize");
|
|
10
9
|
const opentelemetry_instrumentation_mongoose_1 = require("opentelemetry-instrumentation-mongoose");
|
|
@@ -20,7 +19,6 @@ const getInstrumentation = () => {
|
|
|
20
19
|
new opentelemetry_instrumentation_mongoose_1.MongooseInstrumentation(configs_1.mongooseConfig),
|
|
21
20
|
new instrumentation_amqplib_1.AmqplibInstrumentation(configs_1.amqplibConfig),
|
|
22
21
|
new instrumentation_ioredis_1.IORedisInstrumentation(),
|
|
23
|
-
new instrumentation_redis_1.RedisInstrumentation(),
|
|
24
22
|
new instrumentation_aws_sdk_1.AwsInstrumentation(configs_1.awsSdkConfig),
|
|
25
23
|
];
|
|
26
24
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/monitoring/opentelemetry/instrumentation/index.ts"],"names":[],"mappings":";;;AAAA,kBAAkB;AAClB,8EAA0E;AAC1E,oFAAgF;AAChF,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/monitoring/opentelemetry/instrumentation/index.ts"],"names":[],"mappings":";;;AAAA,kBAAkB;AAClB,8EAA0E;AAC1E,oFAAgF;AAChF,oFAAgF;AAChF,qGAAmF;AACnF,mGAAiF;AACjF,oFAAgF;AAChF,oFAA4E;AAE5E,UAAU;AACV,uCAAqG;AAE9F,MAAM,kBAAkB,GAAG,GAAG,EAAE;IACnC,OAAO;QACH,IAAI,gDAAsB,EAAE;QAC5B,IAAI,0CAAmB,CAAC,oBAAU,CAAC;QACnC,IAAI,kEAAwB,CAAC,yBAAe,CAAC;QAC7C,IAAI,gEAAuB,CAAC,wBAAc,CAAC;QAC3C,IAAI,gDAAsB,CAAC,uBAAa,CAAC;QACzC,IAAI,gDAAsB,EAAE;QAC5B,IAAI,4CAAkB,CAAC,sBAAY,CAAC;KACvC,CAAC;AACN,CAAC,CAAC;AAVW,QAAA,kBAAkB,sBAU7B"}
|
|
@@ -10,6 +10,7 @@ export declare const config: {
|
|
|
10
10
|
port: string | undefined;
|
|
11
11
|
postgres_connection: string | undefined;
|
|
12
12
|
postgres_read_only_connection: string | undefined;
|
|
13
|
+
postgres_pool_max_connections: string | undefined;
|
|
13
14
|
redis_connection: string | undefined;
|
|
14
15
|
redis_enable: boolean;
|
|
15
16
|
redis_ttl: string | undefined;
|
|
@@ -32,6 +32,7 @@ exports.config = {
|
|
|
32
32
|
port: process.env.PORT,
|
|
33
33
|
postgres_connection: process.env.POSTGRES_CONN,
|
|
34
34
|
postgres_read_only_connection: process.env.POSTGRES_RO_CONN || process.env.POSTGRES_CONN,
|
|
35
|
+
postgres_pool_max_connections: process.env.POSTGRES_POOL_MAX_CONNECTIONS,
|
|
35
36
|
redis_connection: process.env.REDIS_CONN,
|
|
36
37
|
redis_enable: process.env.REDIS_ENABLE === "true",
|
|
37
38
|
redis_ttl: process.env.REDIS_DEFAULT_TTL,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/output-gateway/config/config.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/output-gateway/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,8 +8,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
9
|
});
|
|
10
10
|
};
|
|
11
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
12
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
13
|
+
};
|
|
11
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
15
|
exports.sequelizeReadOnlyConnection = exports.sequelizeConnection = void 0;
|
|
16
|
+
const os_1 = __importDefault(require("os"));
|
|
13
17
|
const sequelize_1 = require("sequelize");
|
|
14
18
|
const config_1 = require("../config");
|
|
15
19
|
const Logger_1 = require("../Logger");
|
|
@@ -25,6 +29,9 @@ class PostgresDatabase {
|
|
|
25
29
|
return this.sequelize;
|
|
26
30
|
}
|
|
27
31
|
this.sequelize = new sequelize_1.Sequelize(connectionString || this.connectionString, {
|
|
32
|
+
dialectOptions: {
|
|
33
|
+
application_name: `Output Gateway (${os_1.default.hostname()})`,
|
|
34
|
+
},
|
|
28
35
|
define: {
|
|
29
36
|
freezeTableName: true,
|
|
30
37
|
timestamps: false,
|
|
@@ -33,7 +40,7 @@ class PostgresDatabase {
|
|
|
33
40
|
pool: {
|
|
34
41
|
acquire: 60000,
|
|
35
42
|
idle: 10000,
|
|
36
|
-
max: 5,
|
|
43
|
+
max: Number(config_1.config.postgres_pool_max_connections) || 5,
|
|
37
44
|
min: 0,
|
|
38
45
|
},
|
|
39
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PostgreDatabase.js","sourceRoot":"","sources":["../../../src/output-gateway/database/PostgreDatabase.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"PostgreDatabase.js","sourceRoot":"","sources":["../../../src/output-gateway/database/PostgreDatabase.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAAoB;AACpB,yCAAsC;AACtC,sCAAoC;AACpC,sCAAiC;AAEjC;;GAEG;AACH,MAAM,gBAAgB;IAIlB;QAIA,qBAAqB;QACd,YAAO,GAAG,CAAC,gBAAyB,EAAE,EAAE;YAC3C,IAAI;gBACA,IAAI,IAAI,CAAC,SAAS,EAAE;oBAChB,OAAO,IAAI,CAAC,SAAS,CAAC;iBACzB;gBACD,IAAI,CAAC,SAAS,GAAG,IAAI,qBAAS,CAAC,gBAAgB,IAAI,IAAI,CAAC,gBAAgB,EAAE;oBACtE,cAAc,EAAE;wBACZ,gBAAgB,EAAE,mBAAmB,YAAE,CAAC,QAAQ,EAAE,GAAG;qBACxD;oBACD,MAAM,EAAE;wBACJ,eAAe,EAAE,IAAI;wBACrB,UAAU,EAAE,KAAK;qBACpB;oBACD,OAAO,EAAE,YAAG,CAAC,KAAK;oBAClB,IAAI,EAAE;wBACF,OAAO,EAAE,KAAK;wBACd,IAAI,EAAE,KAAK;wBACX,GAAG,EAAE,MAAM,CAAC,eAAM,CAAC,6BAA6B,CAAC,IAAI,CAAC;wBACtD,GAAG,EAAE,CAAC;qBACT;iBACJ,CAAC,CAAC;gBACH,YAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;gBACzC,OAAO,IAAI,CAAC,SAAS,CAAC;aACzB;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,IAAI,CAAC,SAAS,CAAC;aACzB;QACL,CAAC,CAAC;QAEK,gBAAW,GAAG,GAA2B,EAAE;YAC9C,IAAI;gBACA,MAAM,IAAI,CAAC,SAAU,CAAC,YAAY,EAAE,CAAC;gBACrC,OAAO,IAAI,CAAC;aACf;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,KAAK,CAAC;aAChB;QACL,CAAC,CAAA,CAAC;QAEK,eAAU,GAAG,GAAwB,EAAE;YAC1C,YAAG,CAAC,IAAI,CAAC,8BAA8B,CAAC,CAAC;YACzC,IAAI,IAAI,CAAC,SAAS,EAAE;gBAChB,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,CAAC;aAChC;QACL,CAAC,CAAA,CAAC;QA9CE,IAAI,CAAC,gBAAgB,GAAG,eAAM,CAAC,mBAAmB,IAAI,EAAE,CAAC;IAC7D,CAAC;CA8CJ;AAED,MAAM,mBAAmB,GAAG,IAAI,gBAAgB,EAAE,CAAC,OAAO,CAAC,eAAM,CAAC,mBAAmB,IAAI,EAAE,CAAC,CAAC;AAGpF,kDAAmB;AAF5B,MAAM,2BAA2B,GAAG,IAAI,gBAAgB,EAAE,CAAC,OAAO,CAAC,eAAM,CAAC,6BAA6B,IAAI,EAAE,CAAC,CAAC;AAEjF,kEAA2B"}
|
|
@@ -4,7 +4,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
4
4
|
};
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.useCacheMiddleware = exports.CacheMiddleware = void 0;
|
|
7
|
-
const
|
|
7
|
+
const apicache_plus_1 = __importDefault(require("apicache-plus"));
|
|
8
8
|
const config_1 = require("../config");
|
|
9
9
|
const Logger_1 = require("../Logger");
|
|
10
10
|
const _1 = require("./");
|
|
@@ -12,7 +12,7 @@ class MyCacheMiddleware {
|
|
|
12
12
|
constructor() {
|
|
13
13
|
this.defaultCacheTtl = parseInt(config_1.config.redis_ttl || "60000", 10);
|
|
14
14
|
// as default is used memory-cache
|
|
15
|
-
this.cacheWithRedisMiddleware =
|
|
15
|
+
this.cacheWithRedisMiddleware = apicache_plus_1.default.options({
|
|
16
16
|
defaultDuration: this.defaultCacheTtl.toString(),
|
|
17
17
|
}).middleware;
|
|
18
18
|
this.isNoCacheHeader = (req, res) => {
|
|
@@ -35,7 +35,7 @@ class MyCacheMiddleware {
|
|
|
35
35
|
if (config_1.config.redis_enable) {
|
|
36
36
|
this.redisClient = _1.RedisConnector.getConnection();
|
|
37
37
|
// sets redis to apicache
|
|
38
|
-
this.cacheWithRedisMiddleware =
|
|
38
|
+
this.cacheWithRedisMiddleware = apicache_plus_1.default.options({
|
|
39
39
|
defaultDuration: this.defaultCacheTtl.toString(),
|
|
40
40
|
redisClient: this.redisClient,
|
|
41
41
|
}).middleware;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CacheMiddleware.js","sourceRoot":"","sources":["../../../src/output-gateway/redis/CacheMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"CacheMiddleware.js","sourceRoot":"","sources":["../../../src/output-gateway/redis/CacheMiddleware.ts"],"names":[],"mappings":";;;;;;AAAA,kEAAqC;AAGrC,sCAAoC;AACpC,sCAAiC;AACjC,yBAAoC;AAEpC,MAAM,iBAAiB;IAAvB;QACY,oBAAe,GAAW,QAAQ,CAAC,eAAM,CAAC,SAAS,IAAI,OAAO,EAAE,EAAE,CAAC,CAAC;QAI5E,kCAAkC;QAC1B,6BAAwB,GAAG,uBAAQ,CAAC,OAAO,CAAC;YAChD,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;SACnD,CAAC,CAAC,UAAU,CAAC;QAoBP,oBAAe,GAAG,CAAC,GAAY,EAAE,GAAa,EAAW,EAAE;YAC9D,MAAM,WAAW,GAAuB,GAAG,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;YACrE,OAAO,WAAW,KAAK,UAAU,CAAC;QACtC,CAAC,CAAC;QAMM,eAAU,GAAG,CAAC,MAAwB,EAAE,EAAE;YAC9C,OAAO,CAAC,GAAY,EAAE,GAAa,EAAE,IAAkB,EAAE,EAAE;gBACvD,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE;oBACjC,MAAM,UAAU,GAAG,IAAI,CAAC,wBAAwB,CAAC,MAAM,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC;oBACjF,UAAU,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC;iBAC9B;qBAAM;oBACH,IAAI,EAAE,CAAC;iBACV;YACL,CAAC,CAAC;QACN,CAAC,CAAC;IACN,CAAC;IArCU,IAAI;QACP,IAAI,eAAM,CAAC,YAAY,EAAE;YACrB,IAAI,CAAC,WAAW,GAAG,iBAAc,CAAC,aAAa,EAAE,CAAC;YAElD,yBAAyB;YACzB,IAAI,CAAC,wBAAwB,GAAG,uBAAQ,CAAC,OAAO,CAAC;gBAC7C,eAAe,EAAE,IAAI,CAAC,eAAe,CAAC,QAAQ,EAAE;gBAChD,WAAW,EAAE,IAAI,CAAC,WAAW;aAChC,CAAC,CAAC,UAAU,CAAC;SACjB;aAAM;YACH,YAAG,CAAC,IAAI,CAAC,4DAA4D,CAAC,CAAC;SAC1E;IACL,CAAC;IAEM,kBAAkB;QACrB,OAAO,IAAI,CAAC,eAAe,CAAC;IAChC,CAAC;IAOM,aAAa,CAAC,MAAwB;QACzC,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;IACnC,CAAC;CAYJ;AAED,MAAM,eAAe,GAAG,IAAI,iBAAiB,EAAE,CAAC;AAGvC,0CAAe;AAFxB,MAAM,kBAAkB,GAAG,CAAC,MAAwB,EAAE,EAAE,CAAC,eAAe,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;AAErE,gDAAkB"}
|
|
@@ -1,11 +1,10 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { Redis as RedisInstance } from "ioredis";
|
|
2
2
|
declare class MyRedis {
|
|
3
3
|
private connection?;
|
|
4
|
-
connect: () => Promise<
|
|
5
|
-
getConnection():
|
|
4
|
+
connect: () => Promise<RedisInstance>;
|
|
5
|
+
getConnection(): RedisInstance;
|
|
6
6
|
isConnected(): boolean;
|
|
7
7
|
disconnect(): Promise<void>;
|
|
8
|
-
private checkOnConnect;
|
|
9
8
|
}
|
|
10
9
|
declare const RedisConnector: MyRedis;
|
|
11
10
|
export { RedisConnector };
|
|
@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
14
14
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
15
15
|
exports.RedisConnector = void 0;
|
|
16
16
|
const errors_1 = require("@golemio/errors");
|
|
17
|
-
const
|
|
17
|
+
const ioredis_1 = __importDefault(require("ioredis"));
|
|
18
18
|
const config_1 = require("../config");
|
|
19
19
|
const Logger_1 = require("../Logger");
|
|
20
20
|
class MyRedis {
|
|
@@ -27,32 +27,22 @@ class MyRedis {
|
|
|
27
27
|
if (!config_1.config.redis_connection) {
|
|
28
28
|
throw new errors_1.CustomError("The ENV variable REDIS_CONN cannot be undefined.", true, this.constructor.name);
|
|
29
29
|
}
|
|
30
|
-
this.connection =
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
this.connection = new ioredis_1.default(config_1.config.redis_connection);
|
|
31
|
+
this.connection.on("message", (message) => {
|
|
32
|
+
Logger_1.log.verbose(message);
|
|
33
|
+
});
|
|
34
|
+
this.connection.on("error", (err) => {
|
|
35
|
+
Logger_1.log.error("Redis connection error", err);
|
|
36
|
+
});
|
|
37
|
+
this.connection.on("connect", () => {
|
|
38
|
+
Logger_1.log.info("Connected to Redis!");
|
|
39
|
+
});
|
|
39
40
|
return this.connection;
|
|
40
41
|
}
|
|
41
42
|
catch (err) {
|
|
42
43
|
throw new errors_1.CustomError("Error while connecting to Redis.", false, this.constructor.name, 1001, err);
|
|
43
44
|
}
|
|
44
45
|
});
|
|
45
|
-
this.checkOnConnect = (retry, attemps, delay) => (resolve, reject) => {
|
|
46
|
-
if (this.isConnected()) {
|
|
47
|
-
return resolve();
|
|
48
|
-
}
|
|
49
|
-
else if (retry <= 0) {
|
|
50
|
-
reject(`Failed to connect to Redis after ${attemps * delay} millis.`);
|
|
51
|
-
}
|
|
52
|
-
else {
|
|
53
|
-
setTimeout(() => this.checkOnConnect(retry - 1, attemps, delay)(resolve, reject), delay);
|
|
54
|
-
}
|
|
55
|
-
};
|
|
56
46
|
}
|
|
57
47
|
getConnection() {
|
|
58
48
|
if (!this.connection) {
|
|
@@ -61,13 +51,13 @@ class MyRedis {
|
|
|
61
51
|
return this.connection;
|
|
62
52
|
}
|
|
63
53
|
isConnected() {
|
|
64
|
-
return !!this.connection && this.connection.
|
|
54
|
+
return !!this.connection && this.connection.status === "ready";
|
|
65
55
|
}
|
|
66
56
|
disconnect() {
|
|
67
57
|
return __awaiter(this, void 0, void 0, function* () {
|
|
68
58
|
Logger_1.log.info("Redis disconnect called");
|
|
69
59
|
if (this.connection) {
|
|
70
|
-
|
|
60
|
+
yield this.connection.quit();
|
|
71
61
|
}
|
|
72
62
|
});
|
|
73
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RedisConnector.js","sourceRoot":"","sources":["../../../src/output-gateway/redis/RedisConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA8C;AAC9C,
|
|
1
|
+
{"version":3,"file":"RedisConnector.js","sourceRoot":"","sources":["../../../src/output-gateway/redis/RedisConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,4CAA8C;AAC9C,sDAAwD;AACxD,sCAAoC;AACpC,sCAAiC;AAEjC,MAAM,OAAO;IAAb;QAGW,YAAO,GAAG,GAAiC,EAAE;YAChD,IAAI;gBACA,IAAI,IAAI,CAAC,UAAU,EAAE;oBACjB,OAAO,IAAI,CAAC,UAAU,CAAC;iBAC1B;gBAED,IAAI,CAAC,eAAM,CAAC,gBAAgB,EAAE;oBAC1B,MAAM,IAAI,oBAAW,CAAC,kDAAkD,EAAE,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;iBAC1G;gBAED,IAAI,CAAC,UAAU,GAAG,IAAI,iBAAK,CAAC,eAAM,CAAC,gBAAgB,CAAC,CAAC;gBACrD,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,CAAC,OAAO,EAAE,EAAE;oBACtC,YAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;gBACzB,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;oBAChC,YAAG,CAAC,KAAK,CAAC,wBAAwB,EAAE,GAAG,CAAC,CAAC;gBAC7C,CAAC,CAAC,CAAC;gBAEH,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,SAAS,EAAE,GAAG,EAAE;oBAC/B,YAAG,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;gBACpC,CAAC,CAAC,CAAC;gBAEH,OAAO,IAAI,CAAC,UAAU,CAAC;aAC1B;YAAC,OAAO,GAAG,EAAE;gBACV,MAAM,IAAI,oBAAW,CAAC,kCAAkC,EAAE,KAAK,EAAE,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC;aACtG;QACL,CAAC,CAAA,CAAC;IAwBN,CAAC;IAtBU,aAAa;QAChB,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,MAAM,IAAI,oBAAW,CACjB,gEAAgE,EAChE,KAAK,EACL,IAAI,CAAC,WAAW,CAAC,IAAI,EACrB,IAAI,CACP,CAAC;SACL;QACD,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAEM,WAAW;QACd,OAAO,CAAC,CAAC,IAAI,CAAC,UAAU,IAAI,IAAI,CAAC,UAAU,CAAC,MAAM,KAAK,OAAO,CAAC;IACnE,CAAC;IAEY,UAAU;;YACnB,YAAG,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;YACpC,IAAI,IAAI,CAAC,UAAU,EAAE;gBACjB,MAAM,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;aAChC;QACL,CAAC;KAAA;CACJ;AAED,MAAM,cAAc,GAAG,IAAI,OAAO,EAAE,CAAC;AAE5B,wCAAc"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@golemio/core",
|
|
3
|
-
"version": "1.2.11-dev.
|
|
3
|
+
"version": "1.2.11-dev.548903848",
|
|
4
4
|
"description": "Golemio Core Module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -15,7 +15,7 @@
|
|
|
15
15
|
"test-debug": "run-s 'test --inspect-brk=9230'",
|
|
16
16
|
"code-coverage": "nyc run-s 'test -r source-map-support/register'",
|
|
17
17
|
"generate-docs": "typedoc --out docs/typedoc src",
|
|
18
|
-
"lint": "eslint \"{src,test}/**/*.ts\""
|
|
18
|
+
"lint": "eslint --cache \"{src,test}/**/*.ts\""
|
|
19
19
|
},
|
|
20
20
|
"keywords": [
|
|
21
21
|
"golemio"
|
|
@@ -32,18 +32,15 @@
|
|
|
32
32
|
"@golemio/eslint-config": "^1.1.0",
|
|
33
33
|
"@ovos-media/ts-transform-paths": "^1.7.18-1",
|
|
34
34
|
"@types/amqplib": "^0.5.17",
|
|
35
|
-
"@types/apicache": "^1.2.3",
|
|
36
35
|
"@types/chai": "4.2.3",
|
|
37
36
|
"@types/chai-as-promised": "7.1.2",
|
|
38
37
|
"@types/content-type": "^1.1.3",
|
|
39
38
|
"@types/debug": "0.0.31",
|
|
40
39
|
"@types/decompress": "^4.2.3",
|
|
41
|
-
"@types/ioredis": "^4.17.10",
|
|
42
40
|
"@types/lodash": "^4.14.165",
|
|
43
41
|
"@types/mocha": "^8.2.0",
|
|
44
42
|
"@types/morgan": "^1.9.2",
|
|
45
43
|
"@types/node": "^16.11.35",
|
|
46
|
-
"@types/redis": "^2.8.28",
|
|
47
44
|
"@types/sinon": "7.0.13",
|
|
48
45
|
"@types/ssh2-sftp-client": "^5.3.1",
|
|
49
46
|
"@types/supertest": "^2.0.11",
|
|
@@ -80,7 +77,6 @@
|
|
|
80
77
|
"@opentelemetry/instrumentation-http": "^0.27.0",
|
|
81
78
|
"@opentelemetry/instrumentation-ioredis": "^0.28.0",
|
|
82
79
|
"@opentelemetry/instrumentation-pg": "^0.28.0",
|
|
83
|
-
"@opentelemetry/instrumentation-redis": "^0.29.0",
|
|
84
80
|
"@opentelemetry/resources": "^1.2.0",
|
|
85
81
|
"@opentelemetry/sdk-trace-base": "^1.2.0",
|
|
86
82
|
"@opentelemetry/sdk-trace-node": "^1.2.0",
|
|
@@ -91,7 +87,7 @@
|
|
|
91
87
|
"@types/request-promise": "^4.1.45",
|
|
92
88
|
"ajv": "^8.10.0",
|
|
93
89
|
"amqplib": "^0.7.1",
|
|
94
|
-
"apicache": "^
|
|
90
|
+
"apicache-plus": "^2.3.1",
|
|
95
91
|
"aws-sdk": "^2.823.0",
|
|
96
92
|
"axios": "^0.24.0",
|
|
97
93
|
"basic-ftp": "^4.6.6",
|
|
@@ -104,7 +100,7 @@
|
|
|
104
100
|
"fast-csv": "^4.3.6",
|
|
105
101
|
"fast-glob": "^3.2.5",
|
|
106
102
|
"iconv-lite": "^0.6.2",
|
|
107
|
-
"ioredis": "^
|
|
103
|
+
"ioredis": "^5.0.5",
|
|
108
104
|
"lightship": "^6.7.2",
|
|
109
105
|
"lodash": "^4.17.21",
|
|
110
106
|
"luxon": "^2.3.2",
|
|
@@ -117,7 +113,6 @@
|
|
|
117
113
|
"path-to-regexp": "^6.2.0",
|
|
118
114
|
"pg": "^8.6.0",
|
|
119
115
|
"prom-client": "^14.0.0",
|
|
120
|
-
"redis": "^3.1.1",
|
|
121
116
|
"request": "2.88.0",
|
|
122
117
|
"request-promise": "^4.2.5",
|
|
123
118
|
"sequelize": "^6.6.5",
|