@haku-sci/utils 1.7.1 → 1.8.0
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.
|
@@ -1,14 +1,15 @@
|
|
|
1
1
|
import { INestMicroservice } from '@nestjs/common';
|
|
2
2
|
export declare class MicroserviceService {
|
|
3
|
-
private static
|
|
3
|
+
private static serverAddress;
|
|
4
4
|
private static rabbitMQApp;
|
|
5
5
|
private static appModule;
|
|
6
6
|
private static getServiceURI;
|
|
7
7
|
private static detectCloudProvider;
|
|
8
8
|
private static registerService;
|
|
9
|
-
private static
|
|
9
|
+
private static defineServerAddress;
|
|
10
10
|
private static startMainMicroService;
|
|
11
11
|
private static startRabbitMQMicroService;
|
|
12
|
+
static get host(): string;
|
|
12
13
|
static bootstrapMicroservice(appModule: any): Promise<INestMicroservice>;
|
|
13
14
|
static sendTCPMessage(service: any, messagePattern: any, payload?: any): Promise<any>;
|
|
14
15
|
}
|
|
@@ -47,19 +47,19 @@ class MicroserviceService {
|
|
|
47
47
|
const serviceData = {
|
|
48
48
|
ID: microServiceName,
|
|
49
49
|
Name: microServiceName,
|
|
50
|
-
Address: this.
|
|
51
|
-
Port: this.
|
|
50
|
+
Address: this.serverAddress.address,
|
|
51
|
+
Port: this.serverAddress.port,
|
|
52
52
|
Check: {
|
|
53
|
-
TCP:
|
|
53
|
+
TCP: this.host,
|
|
54
54
|
Interval: "10s",
|
|
55
55
|
Timeout: "5s",
|
|
56
56
|
DeregisterCriticalServiceAfter: "1m"
|
|
57
57
|
}
|
|
58
58
|
};
|
|
59
59
|
await axios_1.default.put(`${process.env["CONSUL_URL"]}/v1/agent/service/register`, serviceData);
|
|
60
|
-
console.log(`Service registered with Consul on ${this.
|
|
60
|
+
console.log(`Service registered with Consul on ${this.serverAddress.address}:${this.serverAddress.port}`);
|
|
61
61
|
}
|
|
62
|
-
static async
|
|
62
|
+
static async defineServerAddress() {
|
|
63
63
|
if (await this.detectCloudProvider())
|
|
64
64
|
return {
|
|
65
65
|
address: `haku-sci-${await utils.microServiceName()}-${process.env.BRANCH}.${process.env.AWS_REGION}.elasticbeanstalk.com`,
|
|
@@ -72,13 +72,13 @@ class MicroserviceService {
|
|
|
72
72
|
address.address = 'localhost';
|
|
73
73
|
address.family = 'IPv4';
|
|
74
74
|
server.close();
|
|
75
|
-
|
|
75
|
+
this.serverAddress = address;
|
|
76
76
|
}
|
|
77
77
|
static async startMainMicroService() {
|
|
78
78
|
const app = await core_1.NestFactory.createMicroservice(this.appModule, {
|
|
79
79
|
transport: microservices_1.Transport.TCP,
|
|
80
80
|
options: {
|
|
81
|
-
port: this.
|
|
81
|
+
port: this.serverAddress.port
|
|
82
82
|
}
|
|
83
83
|
});
|
|
84
84
|
await app.listen();
|
|
@@ -100,9 +100,12 @@ class MicroserviceService {
|
|
|
100
100
|
await app.listen();
|
|
101
101
|
return app;
|
|
102
102
|
}
|
|
103
|
+
static get host() {
|
|
104
|
+
return `${this.serverAddress.address}:${this.serverAddress.port}`;
|
|
105
|
+
}
|
|
103
106
|
static async bootstrapMicroservice(appModule) {
|
|
104
107
|
this.appModule = appModule;
|
|
105
|
-
|
|
108
|
+
await this.defineServerAddress();
|
|
106
109
|
if (process.env["RDS_DBNAME"]) {
|
|
107
110
|
const postGresService = require('./postgres.service');
|
|
108
111
|
postGresService.createDatabaseIfNotExists();
|
|
@@ -122,6 +125,8 @@ class MicroserviceService {
|
|
|
122
125
|
try {
|
|
123
126
|
const response$ = client.send(messagePattern, payload).pipe((0, rxjs_1.catchError)(sendErr => {
|
|
124
127
|
return (0, rxjs_1.throwError)(() => new Error(sendErr));
|
|
128
|
+
}), (0, rxjs_1.timeout)({
|
|
129
|
+
first: 1000
|
|
125
130
|
}));
|
|
126
131
|
const result = await (0, rxjs_1.lastValueFrom)(response$);
|
|
127
132
|
return result;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"microservice.service.js","sourceRoot":"","sources":["../../src/microservice/microservice.service.ts"],"names":[],"mappings":";;;AAAA,2CAAsE;AACtE,uCAA2C;AAC3C,yDAAwG;AACxG,2BAA2B;AAC3B,iCAA0B;AAC1B,+
|
|
1
|
+
{"version":3,"file":"microservice.service.js","sourceRoot":"","sources":["../../src/microservice/microservice.service.ts"],"names":[],"mappings":"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"}
|