@haku-sci/utils 1.2.3 → 1.2.5

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export * from './utils.module';
-export * from './microservice/microservice.libs';
+export * from './microservice/microservice.module';
+export * from './microservice/microservice.service';

package/dist/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./utils.module"), exports);
-__exportStar(require("./microservice/microservice.libs"), exports);
+__exportStar(require("./microservice/microservice.module"), exports);
+__exportStar(require("./microservice/microservice.service"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../utils/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iDAA+B;AAC/B,mEAAiD"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../utils/src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,qEAAmD;AACnD,sEAAoD"}

package/dist/microservice/microservice.module.d.ts

@@ -1,7 +1,2 @@
-import { INestMicroservice } from '@nestjs/common';
 export declare class MicroserviceModule {
-    static projectName(): Promise<string>;
-    private static registerService;
-    private static register;
-    static bootstrapMicroservice(appModule: any, customControllers?: any): Promise<INestMicroservice>;
 }

package/dist/microservice/microservice.module.js

@@ -5,57 +5,17 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     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;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var MicroserviceModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MicroserviceModule = void 0;
 const common_1 = require("@nestjs/common");
-const promises_1 = require("fs/promises");
-const path = require("path");
-const core_1 = require("@nestjs/core");
-const microservices_1 = require("@nestjs/microservices");
-const axios_1 = require("axios");
-const health_module_1 = require("../health/health.module");
-let MicroserviceModule = MicroserviceModule_1 = class MicroserviceModule {
-    static async projectName() {
-        var data = await (0, promises_1.readFile)(path.join(process.cwd(), 'package.json'));
-        const { name } = JSON.parse(data.toString());
-        return name;
-    }
-    static async registerService(address) {
-        const projectName = await this.projectName();
-        const serviceData = {
-            ID: projectName,
-            Name: projectName,
-            Address: address.address,
-            Port: address.port,
-            Check: {
-                TCP: `${address.address}:${address.port}`,
-                Interval: "10s",
-                Timeout: "5s",
-                DeregisterCriticalServiceAfter: "1m"
-            }
-        };
-        await axios_1.default.put(process.env["CONSUL_URL"], serviceData);
-    console.log(`Service registered with Consul on ${address.address}:${address.port}`);
-    }
-    static register(appModule, additionalModules = []) {
-        return {
-            module: MicroserviceModule_1,
-            imports: [appModule, health_module_1.HealthModule, ...additionalModules],
-        };
-    }
-    static async bootstrapMicroservice(appModule, customControllers) {
-        const app = await core_1.NestFactory.createMicroservice(MicroserviceModule_1.register(appModule, customControllers), {
-            transport: microservices_1.Transport.TCP,
-        });
-        await app.listen();
-        const tcpServer = app.server.server;
-        this.registerService(tcpServer.address());
-        return app;
-    }
+const microservice_service_1 = require("./microservice.service");
+let MicroserviceModule = class MicroserviceModule {
 };
 exports.MicroserviceModule = MicroserviceModule;
-exports.MicroserviceModule = MicroserviceModule = MicroserviceModule_1 = __decorate([
-    (0, common_1.Module)({})
+exports.MicroserviceModule = MicroserviceModule = __decorate([
+    (0, common_1.Module)({
+        providers: [microservice_service_1.MicroserviceService],
+        exports: [microservice_service_1.MicroserviceService],
+    })
 ], MicroserviceModule);
 //# sourceMappingURL=microservice.module.js.map

package/dist/microservice/microservice.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"microservice.module.js","sourceRoot":"","sources":["../../utils/src/microservice/microservice.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA0E;AAC1E,0CAAuC;AACvC,6BAA6B;AAC7B,uCAA2C;AAC3C,yDAAuE;AAEvE,iCAA0B;AAC1B,2DAAuD;AAGhD,IAAM,kBAAkB,0BAAxB,MAAM,kBAAkB;IAC7B,MAAM,CAAC,KAAK,CAAC,WAAW;QACtB,IAAI,IAAI,GAAG,MAAM,IAAA,mBAAQ,EACrB,IAAI,CAAC,IAAI,CACL,OAAO,CAAC,GAAG,EAAE,EACb,cAAc,CACjB,CACJ,CAAA;QACD,MAAM,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAC7C,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,OAAwB;QAC3D,MAAM,WAAW,GAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC;QAC3C,MAAM,WAAW,GAAG;YAClB,EAAE,EAAE,WAAW;YACf,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO,CAAC,OAAO;YACxB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,KAAK,EAAE;gBACL,GAAG,EAAE,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE;gBACzC,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,8BAA8B,EAAE,IAAI;aACrC;SACF,CAAC;QAEF,MAAM,eAAK,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,WAAW,CAAC,CAAC;QACxD,OAAO,CAAC,GAAG,CAAC,qCAAqC,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;IACtF,CAAC;IAEO,MAAM,CAAC,QAAQ,CAAC,SAAc,EAAE,oBAA2B,EAAE;QACnE,OAAO;YACL,MAAM,EAAE,oBAAkB;YAC1B,OAAO,EAAE,CAAC,SAAS,EAAE,4BAAY,EAAE,GAAG,iBAAiB,CAAC;SACzD,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,SAAS,EAAE,iBAAkB;QAC9D,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,kBAAkB,CAC9C,oBAAkB,CAAC,QAAQ,CACzB,SAAS,EACT,iBAAiB,CAClB,EACD;YACE,SAAS,EAAE,yBAAS,CAAC,GAAG;SACzB,CACF,CAAC;QACF,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;QACnB,MAAM,SAAS,GAAgB,GAAW,CAAC,MAAM,CAAC,MAAM,CAAC;QACzD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAqB,CAAC,CAAA;QAC5D,OAAO,GAAG,CAAA;IACZ,CAAC;CACF,CAAA;AArDY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,kBAAkB,CAqD9B"}
+{"version":3,"file":"microservice.module.js","sourceRoot":"","sources":["../../utils/src/microservice/microservice.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,iEAA6D;AAMtD,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;CAAI,CAAA;AAAtB,gDAAkB;6BAAlB,kBAAkB;IAJ9B,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,0CAAmB,CAAC;QAChC,OAAO,EAAE,CAAC,0CAAmB,CAAC;KAC/B,CAAC;GACW,kBAAkB,CAAI"}

package/dist/microservice/{microservice.libs.d.ts → microservice.service.d.ts}

@@ -1,6 +1,8 @@
 import { INestMicroservice } from '@nestjs/common';
-export declare class MicroserviceLib {
+export declare class MicroserviceService {
     static projectName(): Promise<string>;
+    private static getServiceURI;
+    static sendTCPMessage(service: any, messagePattern: any, payload?: any): Promise<any>;
     private static registerService;
     static bootstrapMicroservice(appModule: any): Promise<INestMicroservice>;
 }

package/dist/microservice/microservice.service.js

@@ -0,0 +1,89 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var MicroserviceService_1;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MicroserviceService = void 0;
+const common_1 = require("@nestjs/common");
+const promises_1 = require("fs/promises");
+const path = require("path");
+const core_1 = require("@nestjs/core");
+const microservices_1 = require("@nestjs/microservices");
+const axios_1 = require("axios");
+const rxjs_1 = require("rxjs");
+let MicroserviceService = MicroserviceService_1 = class MicroserviceService {
+    static async projectName() {
+        var data = await (0, promises_1.readFile)(path.join(process.cwd(), 'package.json'));
+        const { name } = JSON.parse(data.toString());
+        return name;
+    }
+    static async getServiceURI(serviceName) {
+        const response = await axios_1.default.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 common_1.NotFoundException(`Service ${serviceName} not found in Consul catalog`);
+        }
+    }
+    static async sendTCPMessage(service, messagePattern, payload) {
+        const client = microservices_1.ClientProxyFactory.create({
+            transport: microservices_1.Transport.TCP,
+            options: await MicroserviceService_1.getServiceURI(service),
+        });
+        try {
+            const result = await (0, rxjs_1.lastValueFrom)(await client.send(messagePattern, payload));
+            return result;
+        }
+        catch (error) {
+            throw error;
+        }
+        finally {
+            client.close();
+        }
+    }
+    static async registerService(address) {
+        const projectName = await this.projectName();
+        const serviceData = {
+            ID: projectName,
+            Name: projectName,
+            Address: address.address,
+            Port: address.port,
+            Check: {
+                TCP: `${address.address}:${address.port}`,
+                Interval: "10s",
+                Timeout: "5s",
+                DeregisterCriticalServiceAfter: "1m"
+            }
+        };
+        await axios_1.default.put(`${process.env["CONSUL_URL"]}/v1/agent/service/register`, serviceData);
+        console.log(`Service registered with Consul on ${address.address}:${address.port}`);
+    }
+    static async bootstrapMicroservice(appModule) {
+        const app = await core_1.NestFactory.createMicroservice(appModule, {
+            transport: microservices_1.Transport.TCP,
+        });
+        await app.listen();
+        if (process.env["CONSUL_URL"]) {
+            const tcpServer = app.server.server;
+            this.registerService(tcpServer.address());
+        }
+        return app;
+    }
+};
+exports.MicroserviceService = MicroserviceService;
+exports.MicroserviceService = MicroserviceService = MicroserviceService_1 = __decorate([
+    (0, common_1.Injectable)()
+], MicroserviceService);
+//# sourceMappingURL=microservice.service.js.map

package/dist/microservice/microservice.service.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"microservice.service.js","sourceRoot":"","sources":["../../utils/src/microservice/microservice.service.ts"],"names":[],"mappings":"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"}