@haku-sci/utils 1.2.3 → 1.2.5

package/package.json

@@ -1,20 +1,26 @@
 {
   "name": "@haku-sci/utils",
-  "dependencies": {
+  "peerdependencies": {
     "@nestjs/common": "^10.4.1",
     "@nestjs/microservices": "^10.4.1",
+    "axios": "^1.7.9",
     "utils": "^0.3.1"
   },
+  "dependencies": {
+    "@nestjs/typeorm": "^10.0.2",
+    "axios": "^1.7.9"
+  },
   "devDependencies": {
     "@nestjs/testing": "^10.4.1",
-    "@types/jest": "^29.5.12"
+    "@types/jest": "^29.5.12",
+    "typescript": "^5.7.2"
   },
-  "version": "1.2.3",
+  "version": "1.2.5",
   "description": "utils from haku-sci. Library only",
   "main": "./dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "build":"tsc"
+    "build": "tsc"
   },
   "author": "Nicolas Blexmann",
   "license": "ISC",

package/utils/src/index.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/utils/src/microservice/microservice.module.ts

@@ -0,0 +1,8 @@
+import { Module } from '@nestjs/common';
+import { MicroserviceService } from './microservice.service';
+
+@Module({
+  providers: [MicroserviceService],
+  exports: [MicroserviceService],
+})
+export class MicroserviceModule { }

package/utils/src/microservice/{microservice.libs.ts → microservice.service.ts}

@@ -1,4 +1,4 @@
-import { DynamicModule, INestMicroservice, Module, NotFoundException } from '@nestjs/common';
+import { INestMicroservice, Injectable, NotFoundException } from '@nestjs/common';
 import { readFile } from 'fs/promises';
 import * as path from 'path';
 import { NestFactory } from '@nestjs/core';
@@ -7,7 +7,8 @@ import * as net from 'net';
 import axios from 'axios';
 import { lastValueFrom } from 'rxjs';
 
-export class MicroserviceLib { 
+@Injectable()
+export class MicroserviceService { 
   static async projectName(): Promise<string> {
     var data = await readFile(
         path.join(
@@ -36,10 +37,10 @@ export class MicroserviceLib {
     }
   }
 
-  static async sendTCPMessage(service, messagePattern, payload):Promise<any>{
+  static async sendTCPMessage(service, messagePattern, payload?):Promise<any>{
     const client: ClientProxy = ClientProxyFactory.create({
       transport: Transport.TCP,
-      options: await MicroserviceLib.getServiceURI(service),
+      options: await MicroserviceService.getServiceURI(service),
     });
     try {
       const result = await lastValueFrom(await client.send(messagePattern, payload));
@@ -81,7 +82,7 @@ export class MicroserviceLib {
     if (process.env["CONSUL_URL"]){
       const tcpServer: net.Server = (app as any).server.server;
       this.registerService(tcpServer.address() as net.AddressInfo)
-   }  
+    } 
     return app    
   }
 }

package/dist/health/health.controller.d.ts

@@ -1,6 +0,0 @@
-export declare class HealthController {
-    checkHealth(): {
-        status: string;
-        timestamp: string;
-    };
-}

package/dist/health/health.controller.js

@@ -1,31 +0,0 @@
-"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 __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HealthController = void 0;
-const common_1 = require("@nestjs/common");
-const microservices_1 = require("@nestjs/microservices");
-let HealthController = class HealthController {
-    checkHealth() {
-        console.log('Health check received');
-        return { status: 'ok', timestamp: new Date().toISOString() };
-    }
-};
-exports.HealthController = HealthController;
-__decorate([
-    (0, microservices_1.MessagePattern)('is-alive'),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", void 0)
-], HealthController.prototype, "checkHealth", null);
-exports.HealthController = HealthController = __decorate([
-    (0, common_1.Controller)()
-], HealthController);
-//# sourceMappingURL=health.controller.js.map

package/dist/health/health.controller.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"health.controller.js","sourceRoot":"","sources":["../../utils/src/health/health.controller.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,yDAAuD;AAGhD,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAE3B,WAAW;QACT,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,EAAE,CAAC;IAC/D,CAAC;CACF,CAAA;AANY,4CAAgB;AAE3B;IADC,IAAA,8BAAc,EAAC,UAAU,CAAC;;;;mDAI1B;2BALU,gBAAgB;IAD5B,IAAA,mBAAU,GAAE;GACA,gBAAgB,CAM5B"}

package/dist/health/health.module.d.ts

@@ -1,4 +0,0 @@
-import { DynamicModule } from "@nestjs/common";
-export declare class HealthModule {
-    static forRoot(): DynamicModule;
-}

package/dist/health/health.module.js

@@ -1,25 +0,0 @@
-"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 HealthModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.HealthModule = void 0;
-const common_1 = require("@nestjs/common");
-const health_controller_1 = require("./health.controller");
-let HealthModule = HealthModule_1 = class HealthModule {
-    static forRoot() {
-        return {
-            module: HealthModule_1,
-            controllers: [health_controller_1.HealthController],
-        };
-    }
-};
-exports.HealthModule = HealthModule;
-exports.HealthModule = HealthModule = HealthModule_1 = __decorate([
-    (0, common_1.Module)({})
-], HealthModule);
-//# sourceMappingURL=health.module.js.map

package/dist/health/health.module.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"health.module.js","sourceRoot":"","sources":["../../utils/src/health/health.module.ts"],"names":[],"mappings":";;;;;;;;;;AAAA,2CAAuD;AACvD,2DAAuD;AAGhD,IAAM,YAAY,oBAAlB,MAAM,YAAY;IACvB,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,MAAM,EAAE,cAAY;YACpB,WAAW,EAAE,CAAC,oCAAgB,CAAC;SAChC,CAAC;IACJ,CAAC;CACF,CAAA;AAPY,oCAAY;uBAAZ,YAAY;IADxB,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,YAAY,CAOxB"}

package/dist/microservice/microservice.libs.js

@@ -1,45 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.MicroserviceLib = void 0;
-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");
-class MicroserviceLib {
-    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 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.MicroserviceLib = MicroserviceLib;
-//# sourceMappingURL=microservice.libs.js.map

package/dist/microservice/microservice.libs.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"microservice.libs.js","sourceRoot":"","sources":["../../utils/src/microservice/microservice.libs.ts"],"names":[],"mappings":";;;AACA,0CAAuC;AACvC,6BAA6B;AAC7B,uCAA2C;AAC3C,yDAAuE;AAEvE,iCAA0B;AAE1B,MAAa,eAAe;IAC1B,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;IAED,MAAM,CAAC,KAAK,CAAC,qBAAqB,CAAC,SAAS;QAC1C,MAAM,GAAG,GAAG,MAAM,kBAAW,CAAC,kBAAkB,CAC9C,SAAS,EACT;YACE,SAAS,EAAE,yBAAS,CAAC,GAAG;SACzB,CACF,CAAC;QACF,MAAM,GAAG,CAAC,MAAM,EAAE,CAAC;QACnB,IAAI,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAC,CAAC;YAC7B,MAAM,SAAS,GAAgB,GAAW,CAAC,MAAM,CAAC,MAAM,CAAC;YACzD,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,OAAO,EAAqB,CAAC,CAAA;QAC/D,CAAC;QACA,OAAO,GAAG,CAAA;IACZ,CAAC;CACF;AA7CD,0CA6CC"}

package/dist/utils.module.d.ts

@@ -1,2 +0,0 @@
-export declare class UtilsModule {
-}

package/dist/utils.module.js

@@ -1,17 +0,0 @@
-"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;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UtilsModule = void 0;
-const common_1 = require("@nestjs/common");
-let UtilsModule = class UtilsModule {
-};
-exports.UtilsModule = UtilsModule;
-exports.UtilsModule = UtilsModule = __decorate([
-    (0, common_1.Module)({})
-], UtilsModule);
-//# sourceMappingURL=utils.module.js.map

package/dist/utils.module.js.map

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

package/dist/utils.service.js

@@ -1,61 +0,0 @@
-"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 MicroserviceLibModule_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-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");
-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 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 register(appModule, additionalModules = []) {
-        return {
-            module: MicroserviceLibModule_1,
-            imports: [appModule, health_module_1.HealthModule, ...additionalModules],
-        };
-    }
-    static async bootstrapMicroservice(appModule, customControllers) {
-        const app = await core_1.NestFactory.createMicroservice(MicroserviceLibModule_1.register(appModule, customControllers), {
-            transport: microservices_1.Transport.TCP,
-        });
-        await app.listen();
-        const tcpServer = app.server.server;
-        this.registerService(tcpServer.address());
-        return app;
-    }
-};
-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 +0,0 @@
-{"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.d.ts

@@ -1 +0,0 @@
-export {};

package/dist/utils.service.spec.js

@@ -1,3 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=utils.service.spec.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"utils.service.spec.js","sourceRoot":"","sources":["../utils/src/utils.service.spec.ts"],"names":[],"mappings":""}

package/utils/src/utils.module.ts

@@ -1,4 +0,0 @@
-import { Module } from '@nestjs/common';
-@Module({
-})
-export class UtilsModule { }

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

@@ -1,19 +0,0 @@
-import { Test, TestingModule } from '@nestjs/testing';
-
-/*
-describe('UtilsService', () => {
-  let service: UtilsService;
-
-  beforeEach(async () => {
-    const module: TestingModule = await Test.createTestingModule({
-      providers: [UtilsService],
-    }).compile();
-
-    service = module.get<UtilsService>(UtilsService);
-  });
-
-  it('should be defined', () => {
-    expect(service).toBeDefined();
-  });
-});
-*/