@ti-engine/core 1.0.11 → 1.0.14
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/CHANGELOG.md +20 -3
- package/README.md +35 -21
- package/bin/settings.json +3 -2
- package/components/exchange/message-handler.js +2 -2
- package/components/exchange/message-memory-cache.js +2 -1
- package/components/service-executor.js +12 -6
- package/components/service-instance.js +6 -4
- package/integrations/redis-integration.js +12 -16
- package/package.json +8 -7
- package/utils/cache.js +18 -3
- package/utils/config.js +3 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,7 +1,24 @@
|
|
|
1
|
-
|
|
1
|
+
# ti-engine changelog
|
|
2
|
+
|
|
3
|
+
## Version 1.0.14
|
|
4
|
+
* feat(message exchange): improve the behavior of `onConnectionRecovered` and `onConnectionDisrupted` events in modules `cache`, `message-handler` and `service-executor` to prevent cross-activation or deactivation
|
|
5
|
+
* feat(redis integration): improve Redis integration for greater stability, support of Redis Cloud, and support for Redis 7
|
|
6
|
+
* feat(config): enable setting `auditing.logDetails` by default for all logs
|
|
7
|
+
* docs: update general documentation
|
|
8
|
+
|
|
9
|
+
## Version 1.0.13
|
|
10
|
+
* build(npm): update npm dependencies to their latest versions
|
|
11
|
+
|
|
12
|
+
## Version 1.0.12
|
|
13
|
+
* build(npm): update npm dependencies to their latest versions
|
|
14
|
+
|
|
15
|
+
## Version 1.0.11
|
|
2
16
|
* feat(message exchange): implement message tampering and insertion protection
|
|
3
17
|
* feat(config): provide option to turn on/off the message tampering and insertion protection
|
|
4
18
|
* feat(config): provide option to turn on/off message tracing
|
|
5
|
-
*
|
|
19
|
+
* build(npm): update npm dependencies to their latest versions
|
|
6
20
|
* refactor(config)!: rename all environment variables that set configuration settings to match their related setting
|
|
7
|
-
* docs: add a change log
|
|
21
|
+
* docs: add a change log
|
|
22
|
+
|
|
23
|
+
## Version 1.0.0
|
|
24
|
+
* feat: create initial version of the framework
|
package/README.md
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
# ti-engine core
|
|
2
2
|
Flexible framework for the creation of microservices with [node.js](https://nodejs.org/).
|
|
3
3
|
|
|
4
|
-
##
|
|
4
|
+
## Introduction
|
|
5
5
|
The **ti-engine** is an open source, free to use - both for personal and commercial projects - framework for the creation of microservice-based solutions using **node.js**. The architectural concept of the framework is based on a standard _messaging system_ that allows for certain customization but also provides predictability and traceability of its behavior.
|
|
6
6
|
|
|
7
|
-
Being a messaging system, the **ti-engine** relies on a message broker for the actual exchange of messages between microservice instances. The default implementation of the framework uses [Redis](https://redis.io/) cache, however, you could create your own implementation using something like [Rabbit MQ](https://www.rabbitmq.com/). See the [
|
|
7
|
+
Being a messaging system, the **ti-engine** relies on a message broker for the actual exchange of messages between microservice instances. The default implementation of the framework uses [Redis](https://redis.io/) cache, however, you could create your own implementation using something like [Rabbit MQ](https://www.rabbitmq.com/). See the [Advanced topics](#advanced-topics) section of this documentation for guides on how to do this.
|
|
8
8
|
|
|
9
9
|
Please be aware, that this framework is under active development and will expand in the near future. Also, this documentation is still in the process of being created and refined. Make sure to keep an eye on the changes in case you want to use it in the meantime.
|
|
10
10
|
|
|
11
|
-
##
|
|
11
|
+
## Why ti-engine?
|
|
12
12
|
The framework is created based on a decade of professional experience with the utilized technologies and architectural approach. It's primary goal is to provide you with a lightweight and flexible solution that can help you build quickly a microservice ecosystem with any degree of size and complexity.
|
|
13
13
|
|
|
14
14
|
This is what you gain by using **ti-engine** in your project:
|
|
@@ -21,16 +21,16 @@ This is what you gain by using **ti-engine** in your project:
|
|
|
21
21
|
|
|
22
22
|
These are just some benefits **ti-engine** offers. Get to know it better to find out more ways in which it can help you improve productivity.
|
|
23
23
|
|
|
24
|
-
##
|
|
24
|
+
## Prerequisites & installation
|
|
25
25
|
In order to run the basic ti-engine framework you will need a couple of things:
|
|
26
26
|
* A local [node.js installation](https://nodejs.org/en/download/) with a minimum version of **14.17.0**
|
|
27
27
|
* A local or remote [Redis cache installation](https://redis.io/download) with a minimum version of **5.0.14**
|
|
28
28
|
|
|
29
|
-
If you are working under Windows OS and you need to install Redis, take a look at this [guide](https://redis.com/blog/redis-on-windows-10/).
|
|
29
|
+
If you are working under Windows 10+ OS and you need to install Redis, take a look at this [guide](https://redis.com/blog/redis-on-windows-10/). You could also use [Redis Cloud](https://app.redislabs.com/) for development purposes as it offers free basic account.
|
|
30
30
|
|
|
31
31
|
To get the framework itself, use the command `npm install @ti-engine/core`. And to include it directly in your package.json dependencies execute `npm install @ti-engine/core --save-prod`.
|
|
32
32
|
|
|
33
|
-
##
|
|
33
|
+
## Getting started
|
|
34
34
|
To start using the **ti-engine**, you will have to make sure that all prerequisites are available and operational. However, before we get to the fun part you need to also consider a couple of very important things while working with this framework:
|
|
35
35
|
1. The runtime configuration of the framework can be customized using ENV variables. These can be provided to node.js in all the standard ways, but there is also an option to include an `.env` file.
|
|
36
36
|
2. It loads your framework-related custom scripts and files dynamically, but it always assumes their provided paths are relative to the _current working directory_ (i.e. it uses `process.cwd()`). Be mindful of that whenever you declare file paths in the various settings.
|
|
@@ -61,14 +61,14 @@ At the start of the output log you can see a NOTICE that tells you a couple of i
|
|
|
61
61
|
* The instance name - in this case `tester-service`. In the terminology of the framework, this is also known as a _service domain name_.
|
|
62
62
|
* The _instance identificator_. It is an uuid string with a `ti-` prefix, that is generated by the framework at process start. It can and will be used to trace the messages during their movement through the microservice ecosystem. But more on that later.
|
|
63
63
|
|
|
64
|
-
Following that come a couple of INFO lines that inform you about the microservice interface state. The framework starts with the process of registration of _business services_ within the service domain of the microservice `tester-service` and successfully adds 2 such services. The necessary information for this is read from a JSON config file included in the package. We'll get into more details on what this all means in the section [
|
|
64
|
+
Following that come a couple of INFO lines that inform you about the microservice interface state. The framework starts with the process of registration of _business services_ within the service domain of the microservice `tester-service` and successfully adds 2 such services. The necessary information for this is read from a JSON config file included in the package. We'll get into more details on what this all means in the section [Creating a microservice](#creating-a-microservice).
|
|
65
65
|
|
|
66
66
|
Once the initialization sequence has completed the framework informs you that the microservice instance has started successfully. If the framework encountered an error during initialization instead, you would see something like this:
|
|
67
67
|
```text
|
|
68
68
|
[timestamp]: [instance-id] - notice - Starting new instance of type 'tester-service' with instance ID '[instance-id]'.
|
|
69
69
|
[timestamp]: [instance-id] - alert - Error detected in the instance startup script!
|
|
70
70
|
```
|
|
71
|
-
The following 5 lines inform you about the successful connection to Redis. The default configuration assumes that your Redis is running on localhost and uses the default port. If you have a different setup, you can provide the host and port via ENV variables. We'll cover that in the section [
|
|
71
|
+
The following 5 lines inform you about the successful connection to Redis. The default configuration assumes that your Redis is running on localhost and uses the default port. If you have a different setup, you can provide the host and port via ENV variables. We'll cover that in the section [Using the framework](#using-the-framework).
|
|
72
72
|
|
|
73
73
|
Finally, you should see a couple of execution statements with their results in JSON format.
|
|
74
74
|
|
|
@@ -84,24 +84,24 @@ The tester module gets its starting configuration from an `.env` file included i
|
|
|
84
84
|
TI_INSTANCE_CLASS=tester-service.js
|
|
85
85
|
TI_INSTANCE_CONFIG=tester-service.json
|
|
86
86
|
TI_INSTANCE_NAME=tester-service
|
|
87
|
-
|
|
87
|
+
TI_AUDITING_LOG_MIN_LEVEL=200
|
|
88
88
|
```
|
|
89
89
|
The first variable `TI_INSTANCE_CLASS` is mandatory for every microservice you create with the **ti-engine**. It needs to specify the path to the module that is your microservice. Remember, that this path has to be relative to the working directory in which you plan to execute the `node` command. This is especially important when you're configuring your microservices to work in containers. You can find the full list of available ENV variables and what they do below.
|
|
90
90
|
|
|
91
91
|
Before moving on, also take a good look at the file `bin/start-instance.js`. It should give you an idea on how to the process of starting and stopping a microservice operates. In most cases this file should be sufficient as a starting script for your **ti-engine** based microservice applications. You can, of course, create your own starting script, but then you'll have to consider all necessary steps to properly handle the microservice instance.
|
|
92
92
|
|
|
93
|
-
##
|
|
93
|
+
## Architecture
|
|
94
94
|
The architectural approach for the **ti-engine** is done in _tiers_ with lower tiers being unaware of the tiers above them. The framework prefers a high level of abstraction in all its tiers and provides many options for customization and extension. While the language is JavaScript, the structuring of the framework follows the OOP principles, and you will find a lot of abstract classes and methods that require you to implement them. These are always marked with the `@abstract` annotation but if you happen to miss one, the framework will raise an exception when you try to use it in your solution.
|
|
95
95
|
|
|
96
96
|
There are three general tiers in the **ti-engine**:
|
|
97
|
-
1.
|
|
98
|
-
2.
|
|
99
|
-
3.
|
|
97
|
+
1. Message exchange
|
|
98
|
+
2. Service domains
|
|
99
|
+
3. Solution implementation
|
|
100
100
|
|
|
101
101
|
See the following sections for more information on each of them.
|
|
102
102
|
|
|
103
|
-
###
|
|
104
|
-
This is the lowest framework tier, unless we count the actual data objects processed by the framework. As you already know, the foundational **ti-engine** concept is that of a messaging system. Therefore, the first tier provides an abstraction over a chosen message broker (Redis by default). That abstraction makes it easy to switch between message brokers whenever you want to without having to change anything above tier 1. It also provides several added bonuses that can accelerate your work - message encryption, message tracing, message observers, and others. More details about each of these features will be covered in section [
|
|
103
|
+
### Tier 1 - Message exchange
|
|
104
|
+
This is the lowest framework tier, unless we count the actual data objects processed by the framework. As you already know, the foundational **ti-engine** concept is that of a messaging system. Therefore, the first tier provides an abstraction over a chosen message broker (Redis by default). That abstraction makes it easy to switch between message brokers whenever you want to without having to change anything above tier 1. It also provides several added bonuses that can accelerate your work - message encryption, message tracing, message observers, and others. More details about each of these features will be covered in section [Using the framework](#using-the-framework).
|
|
105
105
|
|
|
106
106
|
Another important aspect for you to remember is that the message exchange is entirely _asynchronous_. This helps reduce system load and optimizes the usage of the available resources. Even so each node.js process can handle a limited amount of load. Therefore, you should plan for running multiple identical senders and receives in order to scale your solution. But more on that later.
|
|
107
107
|
|
|
@@ -115,21 +115,35 @@ After the processing is done the message payload is modified and the receiver se
|
|
|
115
115
|
|
|
116
116
|
In this scenario the framework utilizes _Redis lists_ as queues for the message envelopes and _Redis hash_ as message payload storage. Other message brokers might utilize a slightly different approach, but they should still adhere to the same logical flow.
|
|
117
117
|
|
|
118
|
-
|
|
118
|
+
The modules associated with this tier are all located in the `components/exchange/` folder. This is a short list of some terminology used here and in the JDoc inside the sourcecode itself:
|
|
119
|
+
* Message - this is the actual data object processed by the framework. It consists of two parts: an envelope containing service information and a payload containing the actual data to be processed.
|
|
120
|
+
* Message sender - a specialized connector that is responsible for sending a message on its way to its destination. It does not handle the actual dispatch and delivery.
|
|
121
|
+
* Message receiver - a specialized connector that is responsible for receiving messages at predefined destination.
|
|
122
|
+
* Message exchange - this is the actual message processing engine. It handles sending and receiving messages via preconfigured message senders and message receivers.
|
|
123
|
+
* Message observer - a custom event listener that can be used to react on message `send` and `received` events.
|
|
124
|
+
|
|
125
|
+
### Tier 2 - Service domains
|
|
119
126
|
This tier focuses on hosting and executing the _business logic_ of your application. It's comprised of _business services_ that process input data and return the result of the processing as output data. The business services are grouped in _service domains_, which are in turn hosted inside stateless _microservices_ also named _service instances_. There are two types of service instances in **ti-engine**:
|
|
120
127
|
* Service consumers - these are service instances, that can call business services in any available service domain.
|
|
121
128
|
* Service providers - these are service instances, that host and run a set of business services in a particular service domain. Every service provider is also a service consumer.
|
|
122
129
|
|
|
123
130
|
The various service instances in a solution represent a network of interconnected service domains that contain the business logic of your application. All business services exchange data via _service calls_ using abstract _service addresses_. These service calls are transported from one address in the network to another via the underlying message exchange tier. This, however, is completely transparent to the service instances. In essence, tier 2 does not care about the actual data transportation method or protocol. You could in fact change completely the tier 1 approach without having to modify anything in your business logic and business flow.
|
|
124
131
|
|
|
125
|
-
|
|
126
|
-
|
|
132
|
+
This tier is the place to utilize any databases, file storages, integrations with other applications, scheduling jobs, and so on. In general, it should focus on executing any granular tasks that are essential to backbone operation of your application. The business logic here should remain stateless and any user context should be provided at runtime to each invoked business service. We'll see more concrete examples for that later in section [Using the framework](#using-the-framework).
|
|
133
|
+
|
|
134
|
+
### Tier 3 - Solution implementation
|
|
135
|
+
This tier comprises the actual implementation of your application. Its structure and behavior depends entirely on your vision and business goals. There are still a couple of points that remain constant:
|
|
136
|
+
* It needs to utilize the business logic defined in tier 2 by calling the business services
|
|
137
|
+
* It needs to take care of any type of stateful behavior like user sessions or transactions
|
|
138
|
+
* It needs to act as the primary interface between users and your application thus handling access management and user interactions
|
|
139
|
+
|
|
140
|
+
Depending on the type of software you are building, tier 3 can be an API Gateway, a Web application, backend for a Mobile application, or anything like that.
|
|
127
141
|
|
|
128
|
-
##
|
|
142
|
+
## Creating a microservice
|
|
129
143
|
Under development...
|
|
130
144
|
|
|
131
|
-
##
|
|
145
|
+
## Using the framework
|
|
132
146
|
Under development...
|
|
133
147
|
|
|
134
|
-
##
|
|
148
|
+
## Advanced topics
|
|
135
149
|
Under development...
|
package/bin/settings.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"auditing": {
|
|
3
3
|
"logConsoleEnabled": true,
|
|
4
|
-
"logDetails":
|
|
4
|
+
"logDetails": true,
|
|
5
5
|
"logMinLevel": 0,
|
|
6
6
|
"logUsesJSON": false
|
|
7
7
|
},
|
|
@@ -15,7 +15,8 @@
|
|
|
15
15
|
"authKey": null,
|
|
16
16
|
"redisDB": 0,
|
|
17
17
|
"redisHost": "127.0.0.1",
|
|
18
|
-
"redisPort": 6379
|
|
18
|
+
"redisPort": 6379,
|
|
19
|
+
"user": "default"
|
|
19
20
|
},
|
|
20
21
|
"messageExchange": {
|
|
21
22
|
"messageQueuePrefix": "ti:messages:",
|
|
@@ -158,7 +158,7 @@ class MessageHandler extends ConnectionObserver {
|
|
|
158
158
|
* @private
|
|
159
159
|
*/
|
|
160
160
|
onConnectionRecovered( identifier ) {
|
|
161
|
-
if ( this.#isAvailable === false ) {
|
|
161
|
+
if ( this.#isAvailable === false && identifier === this.#connectionIdentifier ) {
|
|
162
162
|
this.#isAvailable = true;
|
|
163
163
|
_.forEach( this.#messageObservers, ( messageObserver ) => {
|
|
164
164
|
messageObserver.onConnectionRecovered( this.#connectionIdentifier );
|
|
@@ -178,7 +178,7 @@ class MessageHandler extends ConnectionObserver {
|
|
|
178
178
|
* @private
|
|
179
179
|
*/
|
|
180
180
|
onConnectionDisrupted( identifier ) {
|
|
181
|
-
if ( this.#isAvailable === true ) {
|
|
181
|
+
if ( this.#isAvailable === true && identifier === this.#connectionIdentifier ) {
|
|
182
182
|
this.#isAvailable = false;
|
|
183
183
|
_.forEach( this.#messageObservers, ( messageObserver ) => {
|
|
184
184
|
messageObserver.onConnectionDisrupted( this.#connectionIdentifier );
|
|
@@ -27,7 +27,8 @@ class MessageMemoryCache {
|
|
|
27
27
|
let port = config.getSetting( config.setting.MEMORY_CACHE_REDIS_PORT );
|
|
28
28
|
let db = config.getSetting( config.setting.MEMORY_CACHE_REDIS_DB );
|
|
29
29
|
let authKey = config.getSetting( config.setting.MEMORY_CACHE_AUTH_KEY );
|
|
30
|
-
|
|
30
|
+
let user = config.getSetting( config.setting.MEMORY_CACHE_USER );
|
|
31
|
+
this.#redisClient = redis.createRedisClient( identifier, host, port, authKey, user, db );
|
|
31
32
|
}
|
|
32
33
|
|
|
33
34
|
/* Public interface */
|
|
@@ -102,12 +102,18 @@ class ServiceExecutor extends MessageObserver {
|
|
|
102
102
|
onConnectionRecovered( identifier ) {
|
|
103
103
|
super.onConnectionRecovered( identifier );
|
|
104
104
|
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
109
|
-
|
|
110
|
-
|
|
105
|
+
if ( identifier !== cache.connectionIdentifier ) {
|
|
106
|
+
if ( cache.isOperational ) {
|
|
107
|
+
let serviceCatalog = config.getSetting( config.setting.SERVICE_REGISTRY_ADDRESS ) + ServiceInstance.serviceDomainName;
|
|
108
|
+
_.forOwn( this.#serviceInterface, ( versions, serviceAlias ) => {
|
|
109
|
+
cache.addToSet( serviceCatalog, serviceAlias ).catch( ( error ) => {
|
|
110
|
+
logger.log( `Record for service '${ serviceAlias }' could not be added to the service registry.`, logger.logSeverity.ERROR, error );
|
|
111
|
+
} );
|
|
112
|
+
} );
|
|
113
|
+
} else {
|
|
114
|
+
//TODO: Retry service registration after 0.5 seconds.
|
|
115
|
+
}
|
|
116
|
+
}
|
|
111
117
|
}
|
|
112
118
|
|
|
113
119
|
/**
|
|
@@ -269,10 +269,12 @@ class ServiceInstance {
|
|
|
269
269
|
* @private
|
|
270
270
|
*/
|
|
271
271
|
#reportHealthy() {
|
|
272
|
-
|
|
273
|
-
|
|
274
|
-
|
|
275
|
-
|
|
272
|
+
if ( cache.isOperational ) {
|
|
273
|
+
let timestamp = new Date();
|
|
274
|
+
cache.setValue( this.#serviceHealthCheck, timestamp.toISOString(), config.getSetting( config.setting.SERVICE_HEALTH_CHECK_TIMEOUT ) ).catch( ( error ) => {
|
|
275
|
+
logger.log( `Error while trying to report for health check from '${ ServiceInstance.instanceID }'!`, logger.logSeverity.WARNING, error );
|
|
276
|
+
} );
|
|
277
|
+
}
|
|
276
278
|
}
|
|
277
279
|
|
|
278
280
|
}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
*/
|
|
5
5
|
|
|
6
6
|
const ConnectionObserver = require( "#connection-observer" );
|
|
7
|
-
const
|
|
7
|
+
const Redis = require( "ioredis" );
|
|
8
8
|
const tools = require( "#tools" );
|
|
9
9
|
const logger = require( "#logger" );
|
|
10
10
|
const exceptions = require( "#exceptions" );
|
|
@@ -49,7 +49,7 @@ module.exports.cacheCommands = cacheCommandsEnum;
|
|
|
49
49
|
*/
|
|
50
50
|
class RedisClient {
|
|
51
51
|
|
|
52
|
-
#clientIdentifier
|
|
52
|
+
#clientIdentifier;
|
|
53
53
|
#retryMaxInterval = 1000;
|
|
54
54
|
#retryMaxAttempts = undefined;
|
|
55
55
|
#redisClient = undefined;
|
|
@@ -61,12 +61,13 @@ class RedisClient {
|
|
|
61
61
|
* @param {string} host
|
|
62
62
|
* @param {number} port
|
|
63
63
|
* @param {string} authKey
|
|
64
|
+
* @param {string} user
|
|
64
65
|
* @param {number} defaultDB
|
|
65
66
|
* @param {boolean} autoRetryUnfulfilled
|
|
66
67
|
* @param {number} maxRetries
|
|
67
68
|
*/
|
|
68
|
-
constructor( identifier, host, port, authKey, defaultDB, autoRetryUnfulfilled, maxRetries ) {
|
|
69
|
-
this.#clientIdentifier = identifier ||
|
|
69
|
+
constructor( identifier, host, port, authKey, user, defaultDB, autoRetryUnfulfilled, maxRetries ) {
|
|
70
|
+
this.#clientIdentifier = identifier || "redis-client-" + tools.getUUID();
|
|
70
71
|
|
|
71
72
|
let retryStrategy = ( attempt ) => {
|
|
72
73
|
let result = Math.min( attempt * 50, this.#retryMaxInterval );
|
|
@@ -87,6 +88,7 @@ class RedisClient {
|
|
|
87
88
|
let options = {
|
|
88
89
|
port: port,
|
|
89
90
|
host: host,
|
|
91
|
+
username: user,
|
|
90
92
|
password: authKey,
|
|
91
93
|
db: defaultDB,
|
|
92
94
|
autoResendUnfulfilledCommands: autoRetryUnfulfilled,
|
|
@@ -96,18 +98,11 @@ class RedisClient {
|
|
|
96
98
|
};
|
|
97
99
|
|
|
98
100
|
/** @type Redis */
|
|
99
|
-
this.#redisClient = new
|
|
101
|
+
this.#redisClient = new Redis( options );
|
|
100
102
|
|
|
101
103
|
this.#redisClient.on( "ready", () => {
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
redis_mode: this.#redisClient.serverInfo.redis_mode,
|
|
105
|
-
os: this.#redisClient.serverInfo.os,
|
|
106
|
-
uptime_in_days: this.#redisClient.serverInfo.uptime_in_days,
|
|
107
|
-
connected_clients: this.#redisClient.serverInfo.connected_clients,
|
|
108
|
-
role: this.#redisClient.serverInfo.role,
|
|
109
|
-
connected_slaves: this.#redisClient.serverInfo.connected_slaves
|
|
110
|
-
} );
|
|
104
|
+
let serverInfo = this.#redisClient.serverInfo || {};
|
|
105
|
+
logger.log( `Connection to Redis server ${ host }:${ port } (re)established by client '${ this.identifier }' and is ready to be used.`, logger.logSeverity.INFO, serverInfo );
|
|
111
106
|
|
|
112
107
|
// notify all connection observers about this event:
|
|
113
108
|
_.forEach( this.#connectionObservers, ( connectionObservers ) => {
|
|
@@ -250,12 +245,13 @@ class RedisClient {
|
|
|
250
245
|
* @param {string} host
|
|
251
246
|
* @param {number} [port=6379]
|
|
252
247
|
* @param {string} [authKey=undefined]
|
|
248
|
+
* @param {string} [user="default"]
|
|
253
249
|
* @param {number} [defaultDB=0]
|
|
254
250
|
* @param {boolean} [autoRetryUnfulfilled=true]
|
|
255
251
|
* @param {number} [maxRetries=20]
|
|
256
252
|
* @return {RedisClient}
|
|
257
253
|
* @public
|
|
258
254
|
*/
|
|
259
|
-
module.exports.createRedisClient = ( identifier, host, port = 6379, authKey = undefined, defaultDB = 0, autoRetryUnfulfilled = true, maxRetries = 20 ) => {
|
|
260
|
-
return Object.freeze( new RedisClient( identifier, host, port, authKey, defaultDB, autoRetryUnfulfilled, maxRetries ) );
|
|
255
|
+
module.exports.createRedisClient = ( identifier, host, port = 6379, authKey = undefined, user = "default", defaultDB = 0, autoRetryUnfulfilled = true, maxRetries = 20 ) => {
|
|
256
|
+
return Object.freeze( new RedisClient( identifier, host, port, authKey, user, defaultDB, autoRetryUnfulfilled, maxRetries ) );
|
|
261
257
|
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@ti-engine/core",
|
|
3
|
-
"version": "1.0.
|
|
3
|
+
"version": "1.0.14",
|
|
4
4
|
"description": "The ti-engine is an open source, free to use - both for personal and commercial projects - framework for the creation of microservice-based solutions using node.js.",
|
|
5
5
|
"author": "Boris Kostadinov <kostadinov.boris@gmail.com>",
|
|
6
6
|
"license": "ISC",
|
|
@@ -41,15 +41,16 @@
|
|
|
41
41
|
"#tools": "./utils/tools.js"
|
|
42
42
|
},
|
|
43
43
|
"dependencies": {
|
|
44
|
-
"blake2": "^
|
|
45
|
-
"dotenv": "^
|
|
46
|
-
"fs-extra": "^
|
|
44
|
+
"blake2": "^5.0.0",
|
|
45
|
+
"dotenv": "^16.3.1",
|
|
46
|
+
"fs-extra": "^11.1.1",
|
|
47
47
|
"lodash": "^4.17.21",
|
|
48
|
-
"node-schedule": "^2.1.
|
|
49
|
-
"ioredis": "^
|
|
48
|
+
"node-schedule": "^2.1.1",
|
|
49
|
+
"ioredis": "^5.3.2"
|
|
50
50
|
},
|
|
51
51
|
"optionalDependencies": {
|
|
52
|
-
"@google-cloud/error-reporting": "^
|
|
52
|
+
"@google-cloud/error-reporting": "^3.0.5",
|
|
53
|
+
"zeromq": "^6.0.0-beta.17"
|
|
53
54
|
},
|
|
54
55
|
"repository": {
|
|
55
56
|
"type": "git",
|
package/utils/cache.js
CHANGED
|
@@ -23,6 +23,7 @@ class CommonMemoryCache extends ConnectionObserver {
|
|
|
23
23
|
static #instance = null;
|
|
24
24
|
#redisClient = null;
|
|
25
25
|
#isOperational = false;
|
|
26
|
+
#connectionIdentifier = "system-cache";
|
|
26
27
|
|
|
27
28
|
/**
|
|
28
29
|
* @constructor
|
|
@@ -36,7 +37,8 @@ class CommonMemoryCache extends ConnectionObserver {
|
|
|
36
37
|
let port = config.getSetting( config.setting.MEMORY_CACHE_REDIS_PORT );
|
|
37
38
|
let db = config.getSetting( config.setting.MEMORY_CACHE_REDIS_DB );
|
|
38
39
|
let authKey = config.getSetting( config.setting.MEMORY_CACHE_AUTH_KEY );
|
|
39
|
-
|
|
40
|
+
let user = config.getSetting( config.setting.MEMORY_CACHE_USER );
|
|
41
|
+
this.#redisClient = redis.createRedisClient( this.#connectionIdentifier, host, port, authKey, user, db );
|
|
40
42
|
this.#redisClient.addConnectionObserver( this );
|
|
41
43
|
CommonMemoryCache.#instance = this;
|
|
42
44
|
}
|
|
@@ -54,6 +56,15 @@ class CommonMemoryCache extends ConnectionObserver {
|
|
|
54
56
|
*/
|
|
55
57
|
get isOperational() { return this.#isOperational; }
|
|
56
58
|
|
|
59
|
+
/**
|
|
60
|
+
* Property returning the connection identifier of the cache service.
|
|
61
|
+
*
|
|
62
|
+
* @property
|
|
63
|
+
* @returns {string}
|
|
64
|
+
* @public
|
|
65
|
+
*/
|
|
66
|
+
get connectionIdentifier() { return this.#connectionIdentifier; }
|
|
67
|
+
|
|
57
68
|
/**
|
|
58
69
|
* Needs to be invoked by the connection handler when the connection is disrupted.
|
|
59
70
|
*
|
|
@@ -63,7 +74,9 @@ class CommonMemoryCache extends ConnectionObserver {
|
|
|
63
74
|
* @public
|
|
64
75
|
*/
|
|
65
76
|
onConnectionDisrupted( identifier ) {
|
|
66
|
-
this.#
|
|
77
|
+
if ( identifier === this.#connectionIdentifier ) {
|
|
78
|
+
this.#isOperational = false;
|
|
79
|
+
}
|
|
67
80
|
}
|
|
68
81
|
|
|
69
82
|
/**
|
|
@@ -75,7 +88,9 @@ class CommonMemoryCache extends ConnectionObserver {
|
|
|
75
88
|
* @public
|
|
76
89
|
*/
|
|
77
90
|
onConnectionRecovered( identifier ) {
|
|
78
|
-
this.#
|
|
91
|
+
if ( identifier === this.#connectionIdentifier ) {
|
|
92
|
+
this.#isOperational = true;
|
|
93
|
+
}
|
|
79
94
|
}
|
|
80
95
|
|
|
81
96
|
/**
|
package/utils/config.js
CHANGED
|
@@ -67,6 +67,7 @@ const tools = require( "#tools" );
|
|
|
67
67
|
* @property {number} redisDB
|
|
68
68
|
* @property {string} redisHost
|
|
69
69
|
* @property {number} redisPort
|
|
70
|
+
* @property {string} user
|
|
70
71
|
*/
|
|
71
72
|
|
|
72
73
|
/**
|
|
@@ -104,6 +105,7 @@ let settingsEnum = tools.enum( {
|
|
|
104
105
|
MEMORY_CACHE_REDIS_DB: [ "memoryCache.redisDB", "redisDB", "" ],
|
|
105
106
|
MEMORY_CACHE_REDIS_HOST: [ "memoryCache.redisHost", "redisHost", "" ],
|
|
106
107
|
MEMORY_CACHE_REDIS_PORT: [ "memoryCache.redisPort", "redisPort", "" ],
|
|
108
|
+
MEMORY_CACHE_USER: [ "memoryCache.user", "user", "" ],
|
|
107
109
|
MESSAGE_EXCHANGE_QUEUE_PREFIX: [ "messageExchange.messageQueuePrefix", "messageQueuePrefix", "" ],
|
|
108
110
|
MESSAGE_EXCHANGE_MESSAGE_STORE: [ "messageExchange.messageStore", "messageStore", "" ],
|
|
109
111
|
MESSAGE_EXCHANGE_SECURITY_HASH_ENABLED: [ "messageExchange.securityHashEnabled", "securityHashEnabled", "" ],
|
|
@@ -136,6 +138,7 @@ if ( settings.memoryCache ) {
|
|
|
136
138
|
settings.memoryCache.redisDB = ( process.env.TI_MEMORY_CACHE_REDIS_DB !== undefined ) ? process.env.TI_MEMORY_CACHE_REDIS_DB : settings.memoryCache.redisDB;
|
|
137
139
|
settings.memoryCache.redisHost = ( process.env.TI_MEMORY_CACHE_REDIS_HOST !== undefined ) ? process.env.TI_MEMORY_CACHE_REDIS_HOST : settings.memoryCache.redisHost;
|
|
138
140
|
settings.memoryCache.redisPort = ( process.env.TI_MEMORY_CACHE_REDIS_PORT !== undefined ) ? process.env.TI_MEMORY_CACHE_REDIS_PORT : settings.memoryCache.redisPort;
|
|
141
|
+
settings.memoryCache.user = ( process.env.MEMORY_CACHE_USER !== undefined ) ? process.env.MEMORY_CACHE_USER : settings.memoryCache.user;
|
|
139
142
|
}
|
|
140
143
|
if ( settings.messageExchange ) {
|
|
141
144
|
settings.messageExchange.securityHashEnabled = ( process.env.TI_MESSAGE_EXCHANGE_SECURITY_HASH_ENABLED !== undefined ) ? tools.toBool( process.env.TI_MESSAGE_EXCHANGE_SECURITY_HASH_ENABLED ) : settings.messageExchange.securityHashEnabled;
|