@haku-sci/utils 1.8.2 → 1.9.1
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/index.d.ts +1 -1
- package/dist/index.js +1 -1
- package/dist/index.js.map +1 -1
- package/dist/microservice/microservice.service.d.ts +0 -1
- package/dist/microservice/microservice.service.js +6 -6
- package/dist/microservice/microservice.service.js.map +1 -1
- package/dist/rabbit-mq/rabbit-mq.module.js +2 -11
- package/dist/rabbit-mq/rabbit-mq.module.js.map +1 -1
- package/dist/rabbit-mq/rabbit-mq.service.d.ts +1 -3
- package/dist/rabbit-mq/rabbit-mq.service.js +29 -24
- package/dist/rabbit-mq/rabbit-mq.service.js.map +1 -1
- package/package.json +3 -3
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -15,6 +15,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
__exportStar(require("./microservice/microservice.service"), exports);
|
|
18
|
-
__exportStar(require("./rabbit-mq/rabbit-mq.
|
|
18
|
+
__exportStar(require("./rabbit-mq/rabbit-mq.module"), exports);
|
|
19
19
|
__exportStar(require("./utils"), exports);
|
|
20
20
|
//# sourceMappingURL=index.js.map
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAoD;AACpD
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAoD;AACpD,+DAA6C;AAC7C,0CAAwB"}
|
|
@@ -2,7 +2,6 @@ import { INestMicroservice } from '@nestjs/common';
|
|
|
2
2
|
export declare class MicroserviceService {
|
|
3
3
|
private static serverAddress;
|
|
4
4
|
private static rabbitMQApp;
|
|
5
|
-
private static appModule;
|
|
6
5
|
private static getServiceURI;
|
|
7
6
|
private static detectCloudProvider;
|
|
8
7
|
private static registerService;
|
|
@@ -8,6 +8,7 @@ const net = require("net");
|
|
|
8
8
|
const axios_1 = require("axios");
|
|
9
9
|
const rxjs_1 = require("rxjs");
|
|
10
10
|
const utils = require("../utils");
|
|
11
|
+
const rabbit_mq_module_1 = require("../rabbit-mq/rabbit-mq.module");
|
|
11
12
|
const cloudChecks = [
|
|
12
13
|
{ name: 'AWS', url: 'http://169.254.169.254/latest/meta-data/' },
|
|
13
14
|
{ name: 'Azure', url: 'http://169.254.169.254/metadata/instance?api-version=2021-02-01', headers: { 'Metadata': 'true' } },
|
|
@@ -74,8 +75,8 @@ class MicroserviceService {
|
|
|
74
75
|
server.close();
|
|
75
76
|
this.serverAddress = address;
|
|
76
77
|
}
|
|
77
|
-
static async startMainMicroService() {
|
|
78
|
-
const app = await core_1.NestFactory.createMicroservice(
|
|
78
|
+
static async startMainMicroService(appModule) {
|
|
79
|
+
const app = await core_1.NestFactory.createMicroservice(appModule, {
|
|
79
80
|
transport: microservices_1.Transport.TCP,
|
|
80
81
|
options: {
|
|
81
82
|
port: this.serverAddress.port
|
|
@@ -86,7 +87,7 @@ class MicroserviceService {
|
|
|
86
87
|
}
|
|
87
88
|
static async startRabbitMQMicroService() {
|
|
88
89
|
const queue = await utils.microServiceName();
|
|
89
|
-
const app = await core_1.NestFactory.createMicroservice(
|
|
90
|
+
const app = await core_1.NestFactory.createMicroservice(rabbit_mq_module_1.RabbitMqModule, {
|
|
90
91
|
transport: microservices_1.Transport.RMQ,
|
|
91
92
|
options: {
|
|
92
93
|
urls: [process.env.RABBITMQ_URL],
|
|
@@ -104,13 +105,12 @@ class MicroserviceService {
|
|
|
104
105
|
return `${this.serverAddress.address}:${this.serverAddress.port}`;
|
|
105
106
|
}
|
|
106
107
|
static async bootstrapMicroservice(appModule) {
|
|
107
|
-
this.appModule = appModule;
|
|
108
108
|
await this.defineServerAddress();
|
|
109
109
|
if (process.env["RDS_DBNAME"]) {
|
|
110
110
|
const postGresService = require('./postgres.service');
|
|
111
111
|
postGresService.createDatabaseIfNotExists();
|
|
112
112
|
}
|
|
113
|
-
const app = await this.startMainMicroService();
|
|
113
|
+
const app = await this.startMainMicroService(appModule);
|
|
114
114
|
if (process.env.RABBITMQ_URL)
|
|
115
115
|
this.rabbitMQApp = await this.startRabbitMQMicroService();
|
|
116
116
|
if (process.env["CONSUL_URL"])
|
|
@@ -123,7 +123,7 @@ class MicroserviceService {
|
|
|
123
123
|
options: await MicroserviceService.getServiceURI(service),
|
|
124
124
|
});
|
|
125
125
|
try {
|
|
126
|
-
const response$ = client.send(messagePattern, payload).pipe((0, rxjs_1.catchError)(sendErr => {
|
|
126
|
+
const response$ = await client.send(messagePattern, payload).pipe((0, rxjs_1.catchError)(sendErr => {
|
|
127
127
|
return (0, rxjs_1.throwError)(() => new Error(sendErr));
|
|
128
128
|
}), (0, rxjs_1.timeout)({
|
|
129
129
|
first: 1000
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"microservice.service.js","sourceRoot":"","sources":["../../src/microservice/microservice.service.ts"],"names":[],"mappings":";;;AAAA,2CAAgF;AAChF,uCAA2C;AAC3C,yDAAwG;AACxG,2BAA2B;AAC3B,iCAA0B;AAC1B,+BAAsE;AACtE,kCAAiC;
|
|
1
|
+
{"version":3,"file":"microservice.service.js","sourceRoot":"","sources":["../../src/microservice/microservice.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,23 +10,14 @@ exports.RabbitMqModule = void 0;
|
|
|
10
10
|
const common_1 = require("@nestjs/common");
|
|
11
11
|
const rabbit_mq_service_1 = require("./rabbit-mq.service");
|
|
12
12
|
const nestjs_rabbitmq_1 = require("@golevelup/nestjs-rabbitmq");
|
|
13
|
-
const utils = require("./constants");
|
|
14
13
|
let RabbitMqModule = class RabbitMqModule {
|
|
15
14
|
};
|
|
16
15
|
exports.RabbitMqModule = RabbitMqModule;
|
|
17
16
|
exports.RabbitMqModule = RabbitMqModule = __decorate([
|
|
18
17
|
(0, common_1.Module)({
|
|
19
|
-
imports: [
|
|
20
|
-
nestjs_rabbitmq_1.RabbitMQModule.forRoot({
|
|
21
|
-
exchanges: [
|
|
22
|
-
{
|
|
23
|
-
name: utils.HAKU_SCI_EXCHANGE,
|
|
24
|
-
type: 'topic',
|
|
25
|
-
},
|
|
26
|
-
],
|
|
18
|
+
imports: [nestjs_rabbitmq_1.RabbitMQModule.forRoot({
|
|
27
19
|
uri: process.env.RABBITMQ_URL,
|
|
28
|
-
}),
|
|
29
|
-
],
|
|
20
|
+
})],
|
|
30
21
|
providers: [rabbit_mq_service_1.RabbitMqService],
|
|
31
22
|
exports: [rabbit_mq_service_1.RabbitMqService]
|
|
32
23
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbit-mq.module.js","sourceRoot":"","sources":["../../src/rabbit-mq/rabbit-mq.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2DAAsD;AACtD,gEAA4D;
|
|
1
|
+
{"version":3,"file":"rabbit-mq.module.js","sourceRoot":"","sources":["../../src/rabbit-mq/rabbit-mq.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,2DAAsD;AACtD,gEAA4D;AASrD,IAAM,cAAc,GAApB,MAAM,cAAc;CAAG,CAAA;AAAjB,wCAAc;yBAAd,cAAc;IAP1B,IAAA,eAAM,EAAC;QACJ,OAAO,EAAC,CAAC,gCAAc,CAAC,OAAO,CAAC;gBAC5B,GAAG,EAAE,OAAO,CAAC,GAAG,CAAC,YAAY;aAC9B,CAAC,CAAC;QACL,SAAS,EAAC,CAAC,mCAAe,CAAC;QAC3B,OAAO,EAAC,CAAC,mCAAe,CAAC;KAC5B,CAAC;GACW,cAAc,CAAG"}
|
|
@@ -9,9 +9,7 @@ export declare class RabbitMqService {
|
|
|
9
9
|
amqpConnection: AmqpConnection;
|
|
10
10
|
projectName: string;
|
|
11
11
|
ackAttached: boolean;
|
|
12
|
-
|
|
13
|
-
private constructor();
|
|
14
|
-
private init;
|
|
12
|
+
constructor();
|
|
15
13
|
private get ackQueueName();
|
|
16
14
|
dispatchMessage(messagePattern: string, userId: string, id: string, payload?: Record<string, any>, requireAck?: boolean): Promise<void>;
|
|
17
15
|
sendAck(message: any): void;
|
|
@@ -1,8 +1,18 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
+
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
3
|
+
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
4
|
+
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
5
|
+
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
6
|
+
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
7
|
+
};
|
|
8
|
+
var __metadata = (this && this.__metadata) || function (k, v) {
|
|
9
|
+
if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
|
|
10
|
+
};
|
|
2
11
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
12
|
exports.RabbitMqService = void 0;
|
|
4
13
|
exports.HakuSubscribe = HakuSubscribe;
|
|
5
14
|
const nestjs_rabbitmq_1 = require("@golevelup/nestjs-rabbitmq");
|
|
15
|
+
const common_1 = require("@nestjs/common");
|
|
6
16
|
const rabbitMQutils = require("./constants");
|
|
7
17
|
const utils = require("../utils");
|
|
8
18
|
const axios_1 = require("axios");
|
|
@@ -10,30 +20,23 @@ const rabbitMqApiAuth = {
|
|
|
10
20
|
username: process.env.RABBITMQ_USERNAME,
|
|
11
21
|
password: process.env.RABBITMQ_PASSWORD,
|
|
12
22
|
};
|
|
13
|
-
class RabbitMqService {
|
|
14
|
-
static async get() {
|
|
15
|
-
if (!this.instance) {
|
|
16
|
-
this.instance = new RabbitMqService();
|
|
17
|
-
await this.instance.init();
|
|
18
|
-
}
|
|
19
|
-
return this.instance;
|
|
20
|
-
}
|
|
23
|
+
let RabbitMqService = class RabbitMqService {
|
|
21
24
|
constructor() {
|
|
22
25
|
this.waitAckownledge = {};
|
|
23
26
|
this.ackAttached = false;
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
27
|
+
utils.microServiceName().then(projectName => {
|
|
28
|
+
this.projectName = projectName;
|
|
29
|
+
this.amqpConnection = new nestjs_rabbitmq_1.AmqpConnection({
|
|
30
|
+
exchanges: [
|
|
31
|
+
{
|
|
32
|
+
name: rabbitMQutils.HAKU_SCI_EXCHANGE,
|
|
33
|
+
type: 'topic',
|
|
34
|
+
}
|
|
35
|
+
],
|
|
36
|
+
uri: process.env.RABBITMQ_URL,
|
|
37
|
+
});
|
|
38
|
+
this.amqpConnection.init();
|
|
35
39
|
});
|
|
36
|
-
await this.amqpConnection.init();
|
|
37
40
|
}
|
|
38
41
|
get ackQueueName() {
|
|
39
42
|
return `${this.projectName}_${rabbitMQutils.ACK_QUEUE}`;
|
|
@@ -77,8 +80,12 @@ class RabbitMqService {
|
|
|
77
80
|
}
|
|
78
81
|
}
|
|
79
82
|
}
|
|
80
|
-
}
|
|
83
|
+
};
|
|
81
84
|
exports.RabbitMqService = RabbitMqService;
|
|
85
|
+
exports.RabbitMqService = RabbitMqService = __decorate([
|
|
86
|
+
(0, common_1.Injectable)(),
|
|
87
|
+
__metadata("design:paramtypes", [])
|
|
88
|
+
], RabbitMqService);
|
|
82
89
|
function HakuSubscribe(options) {
|
|
83
90
|
return function (target, key, descriptor) {
|
|
84
91
|
const originalMethod = descriptor.value;
|
|
@@ -93,9 +100,7 @@ function HakuSubscribe(options) {
|
|
|
93
100
|
finally {
|
|
94
101
|
if (message.properties.headers.replyTo) {
|
|
95
102
|
try {
|
|
96
|
-
await
|
|
97
|
-
rabbitMqService.sendAck(message);
|
|
98
|
-
});
|
|
103
|
+
await this.moduleRef.get(RabbitMqService).sendAck(message);
|
|
99
104
|
}
|
|
100
105
|
catch (e) {
|
|
101
106
|
console.log(e);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rabbit-mq.service.js","sourceRoot":"","sources":["../../src/rabbit-mq/rabbit-mq.service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"rabbit-mq.service.js","sourceRoot":"","sources":["../../src/rabbit-mq/rabbit-mq.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@haku-sci/utils",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.9.1",
|
|
4
4
|
"description": "utils from haku-sci. Library only",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -10,10 +10,10 @@
|
|
|
10
10
|
"utils": "^0.3.1",
|
|
11
11
|
"@nestjs/typeorm": "^10.0.2",
|
|
12
12
|
"@nestjs/platform-express": "^10.4.15",
|
|
13
|
-
"pg": "^8.13.1"
|
|
14
|
-
"@golevelup/nestjs-rabbitmq": "^5.7.0"
|
|
13
|
+
"pg": "^8.13.1"
|
|
15
14
|
},
|
|
16
15
|
"dependencies": {
|
|
16
|
+
"@golevelup/nestjs-rabbitmq": "^5.7.0",
|
|
17
17
|
"amqp-connection-manager": "^4.1.14",
|
|
18
18
|
"amqplib": "^0.10.5",
|
|
19
19
|
"axios": "^1.7.9",
|