@ubs-platform/crud-base 5.5.1 → 5.7.0

package/microservice-setup-util/src/microservice-setup-util.d.ts

@@ -1,3 +1,8 @@
 export declare class MicroserviceSetupUtil {
-    static getMicroserviceConnection(instanceName: any): Object;
+    static setupServer(instanceName: any): import("@nestjs/microservices").TcpOptions | import("@nestjs/microservices").KafkaOptions | import("@nestjs/microservices").CustomStrategy;
+    private static e5PortEnvOrDef;
+    private static e5hostEnvOrDef;
+    static setupClient(instanceName: string, moduleInjectionName: string): any;
+    private static generateInstanceNameIfNotExist;
+    private static TypeFromEnv;
 }

package/microservice-setup-util/src/microservice-setup-util.js

@@ -3,15 +3,59 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.MicroserviceSetupUtil = void 0;
 const microservices_1 = require("@nestjs/microservices");
 const crypto_1 = require("crypto");
+const server_1 = require("./engine5/server");
+const client_1 = require("./engine5/client");
 class MicroserviceSetupUtil {
-    static getMicroserviceConnection(instanceName) {
-        const type = process.env['NX_MICROSERVICE_TYPE'];
-        if (!instanceName) {
-            instanceName = 'tk' + (0, crypto_1.randomUUID)();
+    static setupServer(instanceName) {
+        instanceName = MicroserviceSetupUtil.generateInstanceNameIfNotExist(instanceName);
+        const type = MicroserviceSetupUtil.TypeFromEnv();
+        let microservice = null;
+        if (type == 'KAFKA') {
+            microservice = {
+                transport: microservices_1.Transport.KAFKA,
+                options: {
+                    client: {
+                        clientId: 'users',
+                        brokers: [`${process.env['NX_KAFKA_URL']}`],
+                    },
+                    consumer: {
+                        groupId: instanceName,
+                    },
+                },
+            };
         }
+        else if (type == "ENGINE5") {
+            microservice = {
+                strategy: new server_1.E5NestServer(MicroserviceSetupUtil.e5hostEnvOrDef(), MicroserviceSetupUtil.e5PortEnvOrDef(), instanceName),
+            };
+        }
+        else {
+            microservice = {
+                transport: microservices_1.Transport.TCP,
+                options: {
+                    host: process.env['NX_TCP_HOST'],
+                    port: parseInt(process.env['NX_TCP_PORT'] ?? "0"),
+                },
+            };
+        }
+        if (microservice == null) {
+            throw 'Microservice type not recognized';
+        }
+        return microservice;
+    }
+    static e5PortEnvOrDef() {
+        return process.env['E5_PORT'] || 'localhost';
+    }
+    static e5hostEnvOrDef() {
+        return process.env['E5_HOST'] || 'localhost';
+    }
+    static setupClient(instanceName, moduleInjectionName) {
+        const type = MicroserviceSetupUtil.TypeFromEnv();
+        instanceName = MicroserviceSetupUtil.generateInstanceNameIfNotExist(instanceName);
         let microservice = null;
         if (type == 'KAFKA') {
             microservice = {
+                name: moduleInjectionName,
                 transport: microservices_1.Transport.KAFKA,
                 options: {
                     client: {
@@ -24,12 +68,23 @@ class MicroserviceSetupUtil {
                 },
             };
         }
+        else if (type == "ENGINE5") {
+            microservice = {
+                name: moduleInjectionName,
+                customClass: client_1.E5NestClient,
+                options: {
+                    host: this.e5hostEnvOrDef(),
+                    port: this.e5PortEnvOrDef(),
+                }
+            };
+        }
         else {
             microservice = {
+                name: moduleInjectionName,
                 transport: microservices_1.Transport.TCP,
                 options: {
                     host: process.env['NX_TCP_HOST'],
-                    port: process.env['NX_TCP_PORT'],
+                    port: parseInt(process.env['NX_TCP_PORT'] ?? "0"),
                 },
             };
         }
@@ -38,6 +93,15 @@ class MicroserviceSetupUtil {
         }
         return microservice;
     }
+    static generateInstanceNameIfNotExist(instanceName) {
+        if (!instanceName) {
+            instanceName = 'tk' + (0, crypto_1.randomUUID)();
+        }
+        return instanceName;
+    }
+    static TypeFromEnv() {
+        return process.env['NX_MICROSERVICE_TYPE'];
+    }
 }
 exports.MicroserviceSetupUtil = MicroserviceSetupUtil;
 //# sourceMappingURL=microservice-setup-util.js.map

package/microservice-setup-util/src/microservice-setup-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"microservice-setup-util.js","sourceRoot":"","sources":["../../../../../libs/microservice-setup-util/src/microservice-setup-util.ts"],"names":[],"mappings":";;;AAAA,yDAAkD;AAClD,mCAAoC;AACpC,MAAa,qBAAqB;IAC9B,MAAM,CAAC,yBAAyB,CAAC,YAAY;QACzC,MAAM,IAAI,GAAG,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAoB,CAAC;QACpE,IAAI,CAAC,YAAY,EAAE,CAAC;YAChB,YAAY,GAAG,IAAI,GAAG,IAAA,mBAAU,GAAE,CAAC;QACvC,CAAC;QACD,IAAI,YAAY,GAAkB,IAAI,CAAC;QACvC,IAAI,IAAI,IAAI,OAAO,EAAE,CAAC;YAClB,YAAY,GAAG;gBACX,SAAS,EAAE,yBAAS,CAAC,KAAK;gBAC1B,OAAO,EAAE;oBACL,MAAM,EAAE;wBACJ,QAAQ,EAAE,OAAO;wBACjB,OAAO,EAAE,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC;qBAC9C;oBACD,QAAQ,EAAE;wBACN,OAAO,EAAE,YAAY;qBACxB;iBACJ;aACJ,CAAC;QACN,CAAC;aAAM,CAAC;YACJ,YAAY,GAAG;gBACX,SAAS,EAAE,yBAAS,CAAC,GAAG;gBACxB,OAAO,EAAE;oBACL,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;oBAChC,IAAI,EAAE,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC;iBACnC;aACJ,CAAC;QACN,CAAC;QACD,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,kCAAkC,CAAC;QAC7C,CAAC;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;CAKJ;AAtCD,sDAsCC"}
+{"version":3,"file":"microservice-setup-util.js","sourceRoot":"","sources":["../../../../../libs/microservice-setup-util/src/microservice-setup-util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1 +1 @@
-{"name":"@ubs-platform/crud-base","repository":{"url":"https://github.com/ubs-platform/ubs-mona-mr"},"homepage":"https://github.com/ubs-platform/ubs-mona-mr","version":"5.5.1","iksir":{"type":"LIBRARY","libraryMode":"PEER","buildSubFolder":""},"peerDependencies":{"@nestjs/common":"11.0.16","@nestjs/core":"11.0.7","@nestjs/jwt":"^11.0.0","@nestjs/passport":"^11.0.5","@nestjs/microservices":"^11.0.7","passport-jwt":"^4.0.1","rxjs":"^7.8.1","@ubs-platform/microservice-setup-util":"5.5.1","@ubs-platform/users-microservice-helper":"5.5.1","@ubs-platform/users-roles":"5.5.1","@ubs-platform/crud-base-common":"5.5.1"}}
+{"name":"@ubs-platform/crud-base","repository":{"url":"https://github.com/ubs-platform/ubs-mona-mr"},"homepage":"https://github.com/ubs-platform/ubs-mona-mr","version":"5.7.0","iksir":{"type":"LIBRARY","libraryMode":"PEER","buildSubFolder":""},"peerDependencies":{"@nestjs/common":"11.0.16","@nestjs/core":"11.0.7","@nestjs/jwt":"^11.0.0","@nestjs/passport":"^11.0.5","@nestjs/microservices":"11.0.7","passport-jwt":"^4.0.1","rxjs":"^7.8.1","@msgpack/msgpack":"^3.1.2","@ubs-platform/microservice-setup-util":"5.7.0","@ubs-platform/dynamic-queue":"5.7.0","@ubs-platform/users-microservice-helper":"5.7.0","@ubs-platform/users-roles":"5.7.0","@ubs-platform/crud-base-common":"5.7.0"}}