@haku-sci/utils 1.1.0 → 1.2.0

package/dist/utils.module.js

@@ -8,14 +8,10 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UtilsModule = void 0;
 const common_1 = require("@nestjs/common");
-const utils_service_1 = require("./utils.service");
 let UtilsModule = class UtilsModule {
 };
 exports.UtilsModule = UtilsModule;
 exports.UtilsModule = UtilsModule = __decorate([
-    (0, common_1.Module)({
-        providers: [utils_service_1.UtilsService],
-        exports: [utils_service_1.UtilsService],
-    })
+    (0, common_1.Module)({})
 ], UtilsModule);
 //# sourceMappingURL=utils.module.js.map

package/dist/utils.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.module.js","sourceRoot":"","sources":["../utils/src/utils.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AACxC,mDAA+C;AAMxC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAI,CAAA;AAAf,kCAAW;sBAAX,WAAW;IAJvB,IAAA,eAAM,EAAC;QACN,SAAS,EAAE,CAAC,4BAAY,CAAC;QACzB,OAAO,EAAE,CAAC,4BAAY,CAAC;KACxB,CAAC;GACW,WAAW,CAAI"}
+{"version":3,"file":"utils.module.js","sourceRoot":"","sources":["../utils/src/utils.module.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAAwC;AAGjC,IAAM,WAAW,GAAjB,MAAM,WAAW;CAAI,CAAA;AAAf,kCAAW;sBAAX,WAAW;IAFvB,IAAA,eAAM,EAAC,EACP,CAAC;GACW,WAAW,CAAI"}

package/dist/utils.service.d.ts

@@ -1,8 +1,7 @@
-export declare class UtilsService {
-    private static listServices;
+import { INestMicroservice } from '@nestjs/common';
+export declare class MicroserviceLibModule {
     static projectName(): Promise<string>;
-    static port(): Promise<number>;
-    static microservicesClients(): any[];
-    private static getServiceClient;
-    static bootstrap(appModule: any): Promise<void>;
+    private static registerService;
+    private static register;
+    static bootstrapMicroservice(appModule: any, customControllers?: any): Promise<INestMicroservice>;
 }

package/dist/utils.service.js

@@ -5,52 +5,57 @@ 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 UtilsService_1;
+var MicroserviceLibModule_1;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.UtilsService = void 0;
+exports.MicroserviceLibModule = 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");
-let UtilsService = UtilsService_1 = class UtilsService {
+const axios_1 = require("axios");
+const health_module_1 = require("./health/health.module");
+let MicroserviceLibModule = MicroserviceLibModule_1 = class MicroserviceLibModule {
     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 port() {
-        return this.listServices[await this.projectName()];
-    }
-    static microservicesClients() {
-        return Object.keys(this.listServices).map(service => this.getServiceClient(service, this.listServices[service]));
+    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}/is-alive`,
+                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 getServiceClient(service, port) {
+    static register(appModule, additionalModules = []) {
         return {
-            name: service.toUpperCase(),
-            transport: microservices_1.Transport.TCP,
-            options: {
-                host: `${process.env["CURRENT_BRANCH_SUBENDPOINT"]}.${service.toLowerCase()}.${process.env["DOMAIN_NAME"]}`,
-                port: port
-            }
+            module: MicroserviceLibModule_1,
+            imports: [appModule, health_module_1.HealthModule, ...additionalModules],
         };
     }
-    static async bootstrap(appModule) {
-        const app = await core_1.NestFactory.createMicroservice(appModule, {
+    static async bootstrapMicroservice(appModule, customControllers) {
+        const app = await core_1.NestFactory.createMicroservice(MicroserviceLibModule_1.register(appModule, customControllers), {
             transport: microservices_1.Transport.TCP,
-            options: {
-                host: process.env["DOMAIN_NAME"]
-                    && `${process.env["CURRENT_BRANCH_SUBENDPOINT"]}.${await UtilsService_1.projectName()}.${process.env["DOMAIN_NAME"]}`
-                    || "localhost",
-                port: await UtilsService_1.port()
-            }
         });
         await app.listen();
+        const tcpServer = app.server.server;
+        this.registerService(tcpServer.address());
+        return app;
     }
 };
-exports.UtilsService = UtilsService;
-UtilsService.listServices = JSON.parse(process.env["SERVICES"].replaceAll("'", '"'));
-exports.UtilsService = UtilsService = UtilsService_1 = __decorate([
-    (0, common_1.Injectable)()
-], UtilsService);
+exports.MicroserviceLibModule = MicroserviceLibModule;
+exports.MicroserviceLibModule = MicroserviceLibModule = MicroserviceLibModule_1 = __decorate([
+    (0, common_1.Module)({})
+], MicroserviceLibModule);
 //# sourceMappingURL=utils.service.js.map

package/dist/utils.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.service.js","sourceRoot":"","sources":["../utils/src/utils.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA4C;AAC5C,0CAAuC;AACvC,6BAA6B;AAC7B,uCAA2C;AAC3C,yDAAuE;AAEhE,IAAM,YAAY,oBAAlB,MAAM,YAAY;IAGrB,MAAM,CAAC,KAAK,CAAC,WAAW;QACxB,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;IAChB,CAAC;IACG,MAAM,CAAC,KAAK,CAAC,IAAI;QACb,OAAO,IAAI,CAAC,YAAY,CAAC,MAAM,IAAI,CAAC,WAAW,EAAE,CAAC,CAAA;IACtD,CAAC;IAED,MAAM,CAAC,oBAAoB;QAC3B,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IACpH,CAAC;IAEO,MAAM,CAAC,gBAAgB,CAAC,OAAe,EAAE,IAAa;QAC1D,OAAO;YACH,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE;YAC3B,SAAS,EAAE,yBAAS,CAAC,GAAG;YACxB,OAAO,EAAE;gBACL,IAAI,EAAE,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,OAAO,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;gBAC3G,IAAI,EAAE,IAAI;aACb;SACJ,CAAA;IACL,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAS;QAC5B,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,kBAAkB,CAC9C,SAAS,EACT;YACE,SAAS,EAAE,yBAAS,CAAC,GAAG;YACxB,OAAO,EAAC;gBACN,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;uBAC3B,GAAG,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,IAAI,MAAM,cAAY,CAAC,WAAW,EAAE,IAAI,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE;uBACjH,WAAW;gBACf,IAAI,EAAC,MAAM,cAAY,CAAC,IAAI,EAAE;aAC/B;SACF,CACF,CAAC;QACF,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;IACrB,CAAC;;AA9CU,oCAAY;AAEN,yBAAY,GAA2B,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,AAAnF,CAAmF;uBAFrG,YAAY;IADxB,IAAA,mBAAU,GAAE;GACA,YAAY,CA+CxB"}
+{"version":3,"file":"utils.service.js","sourceRoot":"","sources":["../utils/src/utils.service.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAA0E;AAC1E,0CAAuC;AACvC,6BAA6B;AAC7B,uCAA2C;AAC3C,yDAAuE;AAEvE,iCAA0B;AAC1B,0DAAsD;AAG/C,IAAM,qBAAqB,6BAA3B,MAAM,qBAAqB;IAChC,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,WAAW;gBAClD,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,uBAAqB;YAC7B,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,uBAAqB,CAAC,QAAQ,CAC5B,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,sDAAqB;gCAArB,qBAAqB;IADjC,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,qBAAqB,CAqDjC"}

package/dist/utils.service.spec.js

@@ -1,17 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const testing_1 = require("@nestjs/testing");
-const utils_service_1 = require("./utils.service");
-describe('UtilsService', () => {
-    let service;
-    beforeEach(async () => {
-        const module = await testing_1.Test.createTestingModule({
-            providers: [utils_service_1.UtilsService],
-        }).compile();
-        service = module.get(utils_service_1.UtilsService);
-    });
-    it('should be defined', () => {
-        expect(service).toBeDefined();
-    });
-});
 //# sourceMappingURL=utils.service.spec.js.map

package/dist/utils.service.spec.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.service.spec.js","sourceRoot":"","sources":["../utils/src/utils.service.spec.ts"],"names":[],"mappings":";;AAAA,6CAAsD;AACtD,mDAA+C;AAE/C,QAAQ,CAAC,cAAc,EAAE,GAAG,EAAE;IAC5B,IAAI,OAAqB,CAAC;IAE1B,UAAU,CAAC,KAAK,IAAI,EAAE;QACpB,MAAM,MAAM,GAAkB,MAAM,cAAI,CAAC,mBAAmB,CAAC;YAC3D,SAAS,EAAE,CAAC,4BAAY,CAAC;SAC1B,CAAC,CAAC,OAAO,EAAE,CAAC;QAEb,OAAO,GAAG,MAAM,CAAC,GAAG,CAAe,4BAAY,CAAC,CAAC;IACnD,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,OAAO,CAAC,CAAC,WAAW,EAAE,CAAC;IAChC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
+{"version":3,"file":"utils.service.spec.js","sourceRoot":"","sources":["../utils/src/utils.service.spec.ts"],"names":[],"mappings":""}

package/package.json

@@ -1,29 +1,30 @@
-{
-  "name": "@haku-sci/utils",
-  "dependencies": {
-    "@nestjs/common": "^10.4.1",
-    "@nestjs/microservices": "^10.4.1",
-    "utils": "^0.3.1"
-  },
-  "devDependencies": {
-    "@nestjs/testing": "^10.4.1",
-    "@types/jest": "^29.5.12"
-  },
-  "version": "1.1.0",
-  "description": "utils from haku-sci. Library only",
-  "main": "./dist/index.js",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "author": "Nicolas Blexmann",
-  "license": "ISC",
-  "repository": {
-    "type": "git",
-    "url": "Haku-Nicolas-Blexmann"
-  },
-  "keywords": [
-    "microservices",
-    "ports",
-    "hosts"
-  ]
-}
+{
+  "name": "@haku-sci/utils",
+  "dependencies": {
+    "@nestjs/common": "^10.4.1",
+    "@nestjs/microservices": "^10.4.1",
+    "utils": "^0.3.1"
+  },
+  "devDependencies": {
+    "@nestjs/testing": "^10.4.1",
+    "@types/jest": "^29.5.12"
+  },
+  "version": "1.2.0",
+  "description": "utils from haku-sci. Library only",
+  "main": "./dist/index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build":"tsc"
+  },
+  "author": "Nicolas Blexmann",
+  "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "Haku-Nicolas-Blexmann"
+  },
+  "keywords": [
+    "microservices",
+    "ports",
+    "hosts"
+  ]
+}

package/utils/src/index.ts

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

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

@@ -0,0 +1,52 @@
+import { DynamicModule, INestMicroservice, Module } 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 * as net from 'net';
+import axios from 'axios';
+
+export class MicroserviceLib { 
+  static async projectName(): Promise<string> {
+    var data = await readFile(
+        path.join(
+            process.cwd(),
+            'package.json',
+        )
+    )
+    const { name } = JSON.parse(data.toString());
+    return name;
+  }
+    
+  private static async registerService(address: net.AddressInfo) {
+    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.put(process.env["CONSUL_URL"], serviceData);
+    console.log(`Service registered with Consul on ${address.address}:${address.port}`);
+  }
+
+  static async bootstrapMicroservice(appModule):Promise<INestMicroservice> {
+    const app = await NestFactory.createMicroservice<MicroserviceOptions>(
+      appModule,
+      {
+        transport: Transport.TCP,
+      },
+    );
+    await app.listen();
+    const tcpServer: net.Server = (app as any).server.server;
+    this.registerService(tcpServer.address() as net.AddressInfo)  
+    return app    
+  }
+}

package/utils/src/utils.module.ts

@@ -1,8 +1,4 @@
 import { Module } from '@nestjs/common';
-import { UtilsService } from './utils.service';
-
 @Module({
-  providers: [UtilsService],
-  exports: [UtilsService],
 })
 export class UtilsModule { }

package/utils/src/utils.service.spec.ts

@@ -1,6 +1,6 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { UtilsService } from './utils.service';
 
+/*
 describe('UtilsService', () => {
   let service: UtilsService;
 
@@ -16,3 +16,4 @@ describe('UtilsService', () => {
     expect(service).toBeDefined();
   });
 });
+*/

package/utils/src/utils.service.ts

@@ -1,54 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { readFile } from 'fs/promises';
-import * as path from 'path';
-import { NestFactory } from '@nestjs/core';
-import { MicroserviceOptions, Transport } from '@nestjs/microservices';
-@Injectable()
-export class UtilsService { 
-    
-    private static listServices: Record<string, number> = JSON.parse(process.env["SERVICES"].replaceAll("'", '"'))
-    static async projectName(): Promise<string> {
-    var data = await readFile(
-        path.join(
-            process.cwd(),
-            'package.json',
-        )
-    )
-    const { name } = JSON.parse(data.toString());
-    return name;
-}
-    static async port(): Promise<number> {
-        return this.listServices[await this.projectName()]
-    }
-
-    static microservicesClients(): any[] {
-    return Object.keys(this.listServices).map(service => this.getServiceClient(service,this.listServices[service]));
-}
-
-private static getServiceClient(service: string, port?: number): { name, transport, options } {
-    return {
-        name: service.toUpperCase(),
-        transport: Transport.TCP,
-        options: {
-            host: `${process.env["CURRENT_BRANCH_SUBENDPOINT"]}.${service.toLowerCase()}.${process.env["DOMAIN_NAME"]}`,
-            port: port
-        }
-    }
-}
-
-static async bootstrap(appModule) {
-    const app = await NestFactory.createMicroservice<MicroserviceOptions>(
-      appModule,
-      {
-        transport: Transport.TCP,
-        options:{
-          host: process.env["DOMAIN_NAME"]
-            && `${process.env["CURRENT_BRANCH_SUBENDPOINT"]}.${await UtilsService.projectName()}.${process.env["DOMAIN_NAME"]}` 
-            ||"localhost",
-          port:await UtilsService.port()
-        }
-      },
-    );
-    await app.listen();
-  }
-}