@haku-sci/utils 1.2.1 → 1.2.3

package/README.md

@@ -1,9 +1,9 @@
 # Description of the utils inside this package
 
 This package is used by Haku-Sci, to handle microservices.
-It allows to fetch:
+Loading the class MicroserviceLib, it allows to fetch:
 
 * The name of the current microservice
-* The list of services for configuration (Based on the environment variable "SERVICES"), and their port
-* The port of the current microservice (Based on the environment variable "SERVICES" and this service's name)
 * default bootstrap for microservices
+
+if consul is used, and env variabe CONSUL_URI is defined, then the lib allows as well to send messages to other services via TCP, and fetch the response if any.

package/package.json

@@ -9,8 +9,8 @@
     "@nestjs/testing": "^10.4.1",
     "@types/jest": "^29.5.12"
   },
-  "version": "1.2.1",
-  "description": "utils from haku-sci. Library only.\nAllow management of microservices, and registering in consul, using the env variable CONSUL_URI.",
+  "version": "1.2.3",
+  "description": "utils from haku-sci. Library only",
   "main": "./dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/utils/src/microservice/microservice.libs.ts

@@ -1,10 +1,11 @@
-import { DynamicModule, INestMicroservice, Module } from '@nestjs/common';
+import { DynamicModule, INestMicroservice, Module, NotFoundException } from '@nestjs/common';
 import { readFile } from 'fs/promises';
 import * as path from 'path';
 import { NestFactory } from '@nestjs/core';
-import { MicroserviceOptions, Transport } from '@nestjs/microservices';
+import { ClientProxy, ClientProxyFactory, MicroserviceOptions, Transport } from '@nestjs/microservices';
 import * as net from 'net';
 import axios from 'axios';
+import { lastValueFrom } from 'rxjs';
 
 export class MicroserviceLib { 
   static async projectName(): Promise<string> {
@@ -18,6 +19,38 @@ export class MicroserviceLib {
     return name;
   }
     
+  private static async getServiceURI(serviceName: string) :Promise<{host: string, port: number}> {
+    const response = await axios.get(`${process.env["CONSUL_URL"]}/v1/catalog/service/${serviceName}`);
+    const serviceInfo = response.data;
+
+    if (serviceInfo.length > 0) {
+      const service = serviceInfo[0];
+      const address = service.ServiceAddress || service.Address; 
+      const port = service.ServicePort; 
+      return {
+        host: address,
+        port: port,
+      };
+    } else {
+      throw new NotFoundException(`Service ${serviceName} not found in Consul catalog`);
+    }
+  }
+
+  static async sendTCPMessage(service, messagePattern, payload):Promise<any>{
+    const client: ClientProxy = ClientProxyFactory.create({
+      transport: Transport.TCP,
+      options: await MicroserviceLib.getServiceURI(service),
+    });
+    try {
+      const result = await lastValueFrom(await client.send(messagePattern, payload));
+      return result;
+    } catch (error) {
+      throw error;
+    } finally {
+      client.close();
+    }
+  }
+
   private static async registerService(address: net.AddressInfo) {
     const projectName=await this.projectName();
     const serviceData = {
@@ -33,7 +66,7 @@ export class MicroserviceLib {
       }
     };
   
-    await axios.put(process.env["CONSUL_URL"], serviceData);
+    await axios.put(`${process.env["CONSUL_URL"]}/v1/agent/service/register`, serviceData);
     console.log(`Service registered with Consul on ${address.address}:${address.port}`);
   }