@golemio/core 1.1.8-dev.416513639 → 1.1.9-dev.425375411
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/abstract.d.ts +0 -2
- package/dist/input-gateway/config/config.js +0 -2
- package/dist/input-gateway/config/config.js.map +1 -1
- package/dist/input-gateway/connectors/AMQPConnector.d.ts +1 -4
- package/dist/input-gateway/connectors/AMQPConnector.js +4 -21
- package/dist/input-gateway/connectors/AMQPConnector.js.map +1 -1
- package/dist/integration-engine/config/abstract.d.ts +0 -2
- package/dist/integration-engine/config/config.js +0 -4
- package/dist/integration-engine/config/config.js.map +1 -1
- package/dist/integration-engine/connectors/AMQPConnector.d.ts +1 -2
- package/dist/integration-engine/connectors/AMQPConnector.js +4 -18
- package/dist/integration-engine/connectors/AMQPConnector.js.map +1 -1
- package/package.json +1 -1
- package/CHANGELOG.md +0 -21
|
@@ -26,8 +26,6 @@ export interface IConfiguration {
|
|
|
26
26
|
port: string | undefined;
|
|
27
27
|
rabbit_connections: string[] | undefined;
|
|
28
28
|
rabbit_exchange_name: string | undefined;
|
|
29
|
-
rabbit_max_reconnections: string | number;
|
|
30
|
-
rabbit_reconnection_timeout: number;
|
|
31
29
|
s3: {
|
|
32
30
|
access_key_id: string | undefined;
|
|
33
31
|
bucket_name: string | undefined;
|
|
@@ -29,8 +29,6 @@ exports.config = {
|
|
|
29
29
|
port: process.env.PORT,
|
|
30
30
|
rabbit_connections: (_a = process.env.RABBIT_CONN) === null || _a === void 0 ? void 0 : _a.split(","),
|
|
31
31
|
rabbit_exchange_name: process.env.RABBIT_EXCHANGE_NAME,
|
|
32
|
-
rabbit_max_reconnections: process.env.RABBIT_MAX_RECONNECTIONS || 5,
|
|
33
|
-
rabbit_reconnection_timeout: parseInt(process.env.RABBIT_RECONNECTION_TIMEOUT, 10) || 5000,
|
|
34
32
|
s3: {
|
|
35
33
|
access_key_id: process.env.S3_ACCESS_KEY_ID,
|
|
36
34
|
bucket_name: process.env.S3_BUCKET_NAME,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/input-gateway/config/config.ts"],"names":[],"mappings":";;;;AAAA,mCAAiC;AACjC,4CAAwC;AAGxC,MAAM,oBAAoB,GAAG,IAAI,uBAAY,CAAC,sBAAsB,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC;AAEpE,QAAA,MAAM,GAAmB;IAClC,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,mBAAmB;IAC5C,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,eAAe;IACjD,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,SAAS,EAAE;QACP,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACxC,OAAO,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB,KAAK,MAAM;QACjD,KAAK,EAAE;YACH;gBACI,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,cAAc;gBAChC,IAAI,EAAE,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,cAAwB,EAAE,EAAE,CAAC;aAC3D;SACJ;QACD,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;QACxC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;KAC3C;IACD,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa;IAC/C,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAChD,kBAAkB,EAAE,OAAO,CAAC,GAAG,CAAC,kBAAkB;IAClD,iBAAiB,EAAE,OAAO,CAAC,GAAG,CAAC,iBAAiB;IAChD,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,IAAI;IACtB,kBAAkB,EAAE,MAAA,OAAO,CAAC,GAAG,CAAC,WAAW,0CAAE,KAAK,CAAC,GAAG,CAAC;IACvD,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACtD,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/input-gateway/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,8 +9,6 @@ declare class MyAMQP {
|
|
|
9
9
|
private currentUrlIndex;
|
|
10
10
|
/** RabbitMQ active connection. */
|
|
11
11
|
private connection;
|
|
12
|
-
/** Number of reconnection attempts. */
|
|
13
|
-
private numberOfReconnectionAttempts;
|
|
14
12
|
/** RabbitMQ active channel. */
|
|
15
13
|
private channel?;
|
|
16
14
|
/** true if disconnect was called */
|
|
@@ -22,10 +20,9 @@ declare class MyAMQP {
|
|
|
22
20
|
/**
|
|
23
21
|
* Connects to RabbitMQ
|
|
24
22
|
*
|
|
25
|
-
* @param {boolean} isFailover If true reconnection process is applied.
|
|
26
23
|
* @returns {amqplib.Channel} RabbitMQ active channel
|
|
27
24
|
*/
|
|
28
|
-
connect(
|
|
25
|
+
connect(): Promise<amqplib.Channel>;
|
|
29
26
|
/**
|
|
30
27
|
* Gets the RabbitMQ channel.
|
|
31
28
|
*
|
|
@@ -38,29 +38,19 @@ class MyAMQP {
|
|
|
38
38
|
});
|
|
39
39
|
this.availableConnectionUrls = config_1.config.rabbit_connections;
|
|
40
40
|
this.currentUrlIndex = 0;
|
|
41
|
-
this.numberOfReconnectionAttempts = 0;
|
|
42
41
|
this.gracefulShutdown = false;
|
|
43
42
|
}
|
|
44
43
|
/**
|
|
45
44
|
* Connects to RabbitMQ
|
|
46
45
|
*
|
|
47
|
-
* @param {boolean} isFailover If true reconnection process is applied.
|
|
48
46
|
* @returns {amqplib.Channel} RabbitMQ active channel
|
|
49
47
|
*/
|
|
50
|
-
connect(
|
|
48
|
+
connect() {
|
|
51
49
|
return __awaiter(this, void 0, void 0, function* () {
|
|
52
50
|
try {
|
|
53
|
-
if (this.channel
|
|
51
|
+
if (this.channel) {
|
|
54
52
|
return this.channel;
|
|
55
53
|
}
|
|
56
|
-
if (isFailover && !this.gracefulShutdown) {
|
|
57
|
-
// sleeps for `config.rabbit_reconnection_timeout` milliseconds, default 5000 (5 seconds)
|
|
58
|
-
helpers_1.log.debug(`Reconnect after: ${config_1.config.rabbit_reconnection_timeout / 1000} seconds.`);
|
|
59
|
-
yield new Promise((done) => setTimeout(done, config_1.config.rabbit_reconnection_timeout));
|
|
60
|
-
this.currentUrlIndex = (this.currentUrlIndex + 1) % this.availableConnectionUrls.length;
|
|
61
|
-
this.numberOfReconnectionAttempts++;
|
|
62
|
-
helpers_1.log.debug(`Number of reconnection attempts: ${this.numberOfReconnectionAttempts}`);
|
|
63
|
-
}
|
|
64
54
|
this.connection = yield amqplib_1.default.connect(this.availableConnectionUrls[this.currentUrlIndex]);
|
|
65
55
|
this.connection
|
|
66
56
|
.on("error", (err) => {
|
|
@@ -69,7 +59,7 @@ class MyAMQP {
|
|
|
69
59
|
.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
70
60
|
helpers_1.log.warn("RabbitMQ Connection closed");
|
|
71
61
|
if (!this.gracefulShutdown) {
|
|
72
|
-
|
|
62
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError("[AMQP] Connection closed", false, this.constructor.name, 1001));
|
|
73
63
|
}
|
|
74
64
|
}));
|
|
75
65
|
this.channel = yield this.connection.createChannel();
|
|
@@ -80,7 +70,6 @@ class MyAMQP {
|
|
|
80
70
|
.on("close", () => {
|
|
81
71
|
var _a;
|
|
82
72
|
helpers_1.log.warn("Channel closing.");
|
|
83
|
-
this.channel = undefined;
|
|
84
73
|
if (!this.gracefulShutdown) {
|
|
85
74
|
(_a = this.connection) === null || _a === void 0 ? void 0 : _a.close();
|
|
86
75
|
}
|
|
@@ -90,13 +79,7 @@ class MyAMQP {
|
|
|
90
79
|
return this.channel;
|
|
91
80
|
}
|
|
92
81
|
catch (err) {
|
|
93
|
-
|
|
94
|
-
helpers_1.log.error(err);
|
|
95
|
-
return yield this.connect(true);
|
|
96
|
-
}
|
|
97
|
-
else {
|
|
98
|
-
throw new errors_1.CustomError("Error while creating AMQP Channel.", false, this.constructor.name, undefined, err);
|
|
99
|
-
}
|
|
82
|
+
throw new errors_1.CustomError("Error while creating AMQP Channel.", false, this.constructor.name, undefined, err);
|
|
100
83
|
}
|
|
101
84
|
});
|
|
102
85
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/input-gateway/connectors/AMQPConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/input-gateway/connectors/AMQPConnector.ts"],"names":[],"mappings":"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"}
|
|
@@ -15,8 +15,6 @@ export interface IConfiguration {
|
|
|
15
15
|
POSTGRES_POOL_MAX_CONNECTIONS: string | undefined;
|
|
16
16
|
RABBIT_CONN: string | undefined;
|
|
17
17
|
RABBIT_EXCHANGE_NAME: string | undefined;
|
|
18
|
-
RABBIT_MAX_RECONNECTIONS: number;
|
|
19
|
-
RABBIT_RECONNECTION_TIMEOUT: number;
|
|
20
18
|
REDIS_CONN: string | undefined;
|
|
21
19
|
SPARQL_ENDPOINT_AUTH: string | undefined;
|
|
22
20
|
SPARQL_ENDPOINT_URL: string | undefined;
|
|
@@ -17,10 +17,6 @@ exports.config = {
|
|
|
17
17
|
POSTGRES_POOL_MAX_CONNECTIONS: process.env.POSTGRES_POOL_MAX_CONNECTIONS,
|
|
18
18
|
RABBIT_CONN: process.env.RABBIT_CONN,
|
|
19
19
|
RABBIT_EXCHANGE_NAME: process.env.RABBIT_EXCHANGE_NAME,
|
|
20
|
-
RABBIT_MAX_RECONNECTIONS: process.env.RABBIT_MAX_RECONNECTIONS ? parseInt(process.env.RABBIT_MAX_RECONNECTIONS, 10) : 5,
|
|
21
|
-
RABBIT_RECONNECTION_TIMEOUT: process.env.RABBIT_RECONNECTION_TIMEOUT
|
|
22
|
-
? parseInt(process.env.RABBIT_RECONNECTION_TIMEOUT, 10)
|
|
23
|
-
: 5000,
|
|
24
20
|
REDIS_CONN: process.env.REDIS_CONN,
|
|
25
21
|
SPARQL_ENDPOINT_AUTH: process.env.SPARQL_ENDPOINT_AUTH,
|
|
26
22
|
SPARQL_ENDPOINT_URL: process.env.SPARQL_ENDPOINT_URL,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/integration-engine/config/config.ts"],"names":[],"mappings":";;;AAAA,4CAAwC;AAG3B,QAAA,MAAM,GAAmB;IAClC,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,eAAe,IAAI,IAAI;IACpD,gBAAgB,EAAE,OAAO,CAAC,GAAG,CAAC,gBAAgB;IAC9C,SAAS,EAAE,OAAO,CAAC,GAAG,CAAC,SAAS;IAChC,0BAA0B,EAAE,OAAO,CAAC,GAAG,CAAC,0BAA0B;IAClE,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,UAAU;IAClC,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,IAAI,aAAa;IAC/C,+BAA+B,EAAE,OAAO,CAAC,GAAG,CAAC,+BAA+B;IAC5E,8BAA8B,EAAE,OAAO,CAAC,GAAG,CAAC,8BAA8B;IAC1E,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACtD,yBAAyB,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB;IAChE,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa;IACxC,6BAA6B,EAAE,OAAO,CAAC,GAAG,CAAC,6BAA6B;IACxE,WAAW,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;IACpC,oBAAoB,EAAE,OAAO,CAAC,GAAG,CAAC,oBAAoB;IACtD,
|
|
1
|
+
{"version":3,"file":"config.js","sourceRoot":"","sources":["../../../src/integration-engine/config/config.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,9 @@ import amqplib from "amqplib";
|
|
|
2
2
|
declare class MyAMQP {
|
|
3
3
|
private connection?;
|
|
4
4
|
private channel?;
|
|
5
|
-
private numberOfReconnectionAttempts;
|
|
6
5
|
private gracefulShutdown;
|
|
7
6
|
constructor();
|
|
8
|
-
connect: (
|
|
7
|
+
connect: () => Promise<amqplib.Channel>;
|
|
9
8
|
getChannel: () => amqplib.Channel;
|
|
10
9
|
private assertDeadQueue;
|
|
11
10
|
isConnected: () => Promise<boolean>;
|
|
@@ -19,17 +19,11 @@ const config_1 = require("../config");
|
|
|
19
19
|
const helpers_1 = require("../helpers");
|
|
20
20
|
class MyAMQP {
|
|
21
21
|
constructor() {
|
|
22
|
-
this.connect = (
|
|
22
|
+
this.connect = () => __awaiter(this, void 0, void 0, function* () {
|
|
23
23
|
try {
|
|
24
|
-
if (this.channel
|
|
24
|
+
if (this.channel) {
|
|
25
25
|
return this.channel;
|
|
26
26
|
}
|
|
27
|
-
if (isFailover && !this.gracefulShutdown) {
|
|
28
|
-
helpers_1.log.info(`[AMQP] Reconnect after: ${config_1.config.RABBIT_RECONNECTION_TIMEOUT / 1000} seconds.`);
|
|
29
|
-
yield new Promise((done) => setTimeout(done, config_1.config.RABBIT_RECONNECTION_TIMEOUT));
|
|
30
|
-
this.numberOfReconnectionAttempts++;
|
|
31
|
-
helpers_1.log.info(`[AMQP] Number of reconnection attempts: ${this.numberOfReconnectionAttempts}.`);
|
|
32
|
-
}
|
|
33
27
|
if (!config_1.config.RABBIT_CONN) {
|
|
34
28
|
throw new errors_1.CustomError("[AMQP] The ENV variable RABBIT_CONN cannot be undefined.", true, this.constructor.name, 6003);
|
|
35
29
|
}
|
|
@@ -41,7 +35,7 @@ class MyAMQP {
|
|
|
41
35
|
.on("close", () => __awaiter(this, void 0, void 0, function* () {
|
|
42
36
|
helpers_1.log.warn("[AMQP] Connection closing.");
|
|
43
37
|
if (!this.gracefulShutdown) {
|
|
44
|
-
|
|
38
|
+
errors_1.ErrorHandler.handle(new errors_1.CustomError("[AMQP] Connection closed", false, this.constructor.name, 1001));
|
|
45
39
|
}
|
|
46
40
|
}));
|
|
47
41
|
this.channel = yield this.connection.createChannel();
|
|
@@ -52,7 +46,6 @@ class MyAMQP {
|
|
|
52
46
|
.on("close", () => {
|
|
53
47
|
var _a;
|
|
54
48
|
helpers_1.log.warn("[AMQP] Channel closing.");
|
|
55
|
-
this.channel = undefined;
|
|
56
49
|
if (!this.gracefulShutdown) {
|
|
57
50
|
(_a = this.connection) === null || _a === void 0 ? void 0 : _a.close();
|
|
58
51
|
}
|
|
@@ -62,13 +55,7 @@ class MyAMQP {
|
|
|
62
55
|
return this.channel;
|
|
63
56
|
}
|
|
64
57
|
catch (err) {
|
|
65
|
-
|
|
66
|
-
helpers_1.log.error(err);
|
|
67
|
-
return yield this.connect(true);
|
|
68
|
-
}
|
|
69
|
-
else {
|
|
70
|
-
throw new errors_1.CustomError("[AMQP] Error while creating AMQP Channel.", false, this.constructor.name, 1001, err);
|
|
71
|
-
}
|
|
58
|
+
throw new errors_1.CustomError("[AMQP] Error while creating AMQP Channel.", false, this.constructor.name, 1001, err);
|
|
72
59
|
}
|
|
73
60
|
});
|
|
74
61
|
this.getChannel = () => {
|
|
@@ -99,7 +86,6 @@ class MyAMQP {
|
|
|
99
86
|
yield ((_b = this.channel) === null || _b === void 0 ? void 0 : _b.close());
|
|
100
87
|
yield ((_c = this.connection) === null || _c === void 0 ? void 0 : _c.close());
|
|
101
88
|
});
|
|
102
|
-
this.numberOfReconnectionAttempts = 0;
|
|
103
89
|
this.gracefulShutdown = false;
|
|
104
90
|
}
|
|
105
91
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/AMQPConnector.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,
|
|
1
|
+
{"version":3,"file":"AMQPConnector.js","sourceRoot":"","sources":["../../../src/integration-engine/connectors/AMQPConnector.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
package/CHANGELOG.md
DELETED
|
@@ -1,21 +0,0 @@
|
|
|
1
|
-
# Changelog
|
|
2
|
-
|
|
3
|
-
All notable changes to this project will be documented in this file.
|
|
4
|
-
|
|
5
|
-
## [Unreleased]
|
|
6
|
-
|
|
7
|
-
## [1.1.7] - 2021-11-23
|
|
8
|
-
|
|
9
|
-
### Added
|
|
10
|
-
|
|
11
|
-
- Add sync to pg model
|
|
12
|
-
|
|
13
|
-
### Changed
|
|
14
|
-
|
|
15
|
-
- Custom postgres model schema ([pid#53](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/issues/53))
|
|
16
|
-
- Upgrade apicache
|
|
17
|
-
- Use custom schema in saveBySqlFunction ([pid#53](https://gitlab.com/operator-ict/golemio/code/modules/pid/-/issues/53))
|
|
18
|
-
|
|
19
|
-
### Security
|
|
20
|
-
|
|
21
|
-
- Security update - mocha
|