@haku-sci/utils 8.3.3 → 8.4.0

package/dist/index.d.ts

@@ -1,4 +1,5 @@
 export * from './microservice/microservice.service';
+export * from './microservice/consul';
 export * from './TCP/tcp.service';
 export * from './TCP/tcp.module';
 export * from './TCP/restrict-sender.decorator';

package/dist/index.js

@@ -15,6 +15,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./microservice/microservice.service"), exports);
+__exportStar(require("./microservice/consul"), exports);
 __exportStar(require("./TCP/tcp.service"), exports);
 __exportStar(require("./TCP/tcp.module"), exports);
 __exportStar(require("./TCP/restrict-sender.decorator"), exports);

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAoD;AACpD,oDAAkC;AAClC,mDAAiC;AACjC,kEAAgD;AAChD,4DAA0C;AAC1C,oEAAkD;AAClD,+DAA6C;AAC7C,gEAA8C;AAC9C,sDAAoC;AACpC,uDAAqC;AACrC,uDAAqC;AACrC,mDAAiC;AACjC,gEAA8C;AAC9C,8CAA4B;AAC5B,iEAA+C;AAC/C,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sEAAoD;AACpD,wDAAsC;AACtC,oDAAkC;AAClC,mDAAiC;AACjC,kEAAgD;AAChD,4DAA0C;AAC1C,oEAAkD;AAClD,+DAA6C;AAC7C,gEAA8C;AAC9C,sDAAoC;AACpC,uDAAqC;AACrC,uDAAqC;AACrC,mDAAiC;AACjC,gEAA8C;AAC9C,8CAA4B;AAC5B,iEAA+C;AAC/C,0CAAwB"}

package/dist/microservice/consul.d.ts

@@ -1,7 +1,7 @@
 import * as net from 'net';
 import { Logger } from '@nestjs/common';
 export declare class Consul {
-    static registerService(serverAddress: net.AddressInfo, logger: Logger): Promise<void>;
+    static registerService(server: net.AddressInfo | net.Server, logger: Logger): Promise<void>;
     static getServiceURI(serviceName: string): Promise<{
         host: string;
         port: number;

package/dist/microservice/consul.js

@@ -2,15 +2,30 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Consul = void 0;
 const axios_1 = require("axios");
+const http = require("http");
+const https = require("https");
 const utils = require("../utils");
 const common_1 = require("@nestjs/common");
+const SERVER_CLASS_TRANSPORTS = new Map([
+    [https.Server, 'https'],
+    [http.Server, 'http'],
+]);
 class Consul {
-    static async registerService(serverAddress, logger) {
+    static async registerService(server, logger) {
         if (!process.env["CONSUL_URL"])
             return;
+        const isServerInstance = typeof server?.address === 'function';
+        if (isServerInstance && server.address() === null)
+            await new Promise((resolve) => server.once('listening', resolve));
+        const serverAddress = (isServerInstance ? server.address() : server);
+        const transport = isServerInstance
+            ? [...SERVER_CLASS_TRANSPORTS].find(([cls]) => server instanceof cls)?.[1] ?? 'tcp'
+            : 'tcp';
         const externalAddress = process.env.SERVICE_PRIVATE_HOSTNAME || process.env.SERVICE_PUBLIC_HOSTNAME || serverAddress.address;
         const externalPort = parseInt(process.env.SERVICE_PUBLIC_PORT) || serverAddress.port;
-        const microServiceName = await utils.microServiceName();
+        const microServiceName = transport === 'tcp'
+            ? await utils.microServiceName()
+            : `${await utils.microServiceName()}-${transport}`;
         const serviceData = {
             ID: microServiceName,
             Name: microServiceName,

package/dist/microservice/consul.js.map

@@ -1 +1 @@
-{"version":3,"file":"consul.js","sourceRoot":"","sources":["../../src/microservice/consul.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAE1B,kCAAiC;AACjC,2CAAqE;AACrE,MAAa,MAAM;IACjB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,aAA8B,EAAE,MAAc;QACzE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;YAC5B,OAAO;QACT,MAAM,eAAe,GAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,aAAa,CAAC,OAAO,CAAC;QACzH,MAAM,YAAY,GAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,aAAa,CAAC,IAAI,CAAA;QAClF,MAAM,gBAAgB,GAAG,MAAM,KAAK,CAAC,gBAAgB,EAAE,CAAC;QACxD,MAAM,WAAW,GAAG;YAClB,EAAE,EAAE,gBAAgB;YACpB,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE;gBACL,GAAG,EAAE,GAAG,eAAe,IAAI,YAAY,EAAE;gBACzC,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,8BAA8B,EAAE,IAAI;aACrC;SACF,CAAC;QAEF,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,4BAA4B,EAAE,WAAW,CAAC,CAAC;QACvF,MAAM,CAAC,GAAG,CAAC,qCAAqC,eAAe,IAAI,YAAY,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,WAAmB;QAC5C,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,uBAAuB,WAAW,EAAE,CAAC,CAAC;QACnG,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC;QAElC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;YAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;YACjC,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,IAAI;aACX,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,oCAA2B,CAAC,WAAW,WAAW,8BAA8B,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;CACF;AAxCD,wBAwCC"}
+{"version":3,"file":"consul.js","sourceRoot":"","sources":["../../src/microservice/consul.ts"],"names":[],"mappings":";;;AAAA,iCAA0B;AAC1B,6BAA6B;AAC7B,+BAA+B;AAE/B,kCAAiC;AACjC,2CAAqE;AAIrE,MAAM,uBAAuB,GAAG,IAAI,GAAG,CAAmB;IACxD,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC;IACvB,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,CAAC;CACtB,CAAC,CAAC;AAEH,MAAa,MAAM;IACjB,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAoC,EAAE,MAAc;QAC/E,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC;YAC5B,OAAO;QACT,MAAM,gBAAgB,GAAG,OAAQ,MAAqB,EAAE,OAAO,KAAK,UAAU,CAAC;QAE/E,IAAI,gBAAgB,IAAK,MAAqB,CAAC,OAAO,EAAE,KAAK,IAAI;YAC/D,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE,CAAE,MAAqB,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC,CAAC;QAC1F,MAAM,aAAa,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAE,MAAqB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,MAAM,CAAoB,CAAC;QAGxG,MAAM,SAAS,GAAG,gBAAgB;YAChC,CAAC,CAAC,CAAC,GAAG,uBAAuB,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,MAAM,YAAY,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK;YACnF,CAAC,CAAC,KAAK,CAAC;QAEV,MAAM,eAAe,GAAC,OAAO,CAAC,GAAG,CAAC,wBAAwB,IAAE,OAAO,CAAC,GAAG,CAAC,uBAAuB,IAAI,aAAa,CAAC,OAAO,CAAC;QACzH,MAAM,YAAY,GAAC,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,mBAAmB,CAAC,IAAI,aAAa,CAAC,IAAI,CAAA;QAClF,MAAM,gBAAgB,GAAG,SAAS,KAAK,KAAK;YAC1C,CAAC,CAAC,MAAM,KAAK,CAAC,gBAAgB,EAAE;YAChC,CAAC,CAAC,GAAG,MAAM,KAAK,CAAC,gBAAgB,EAAE,IAAI,SAAS,EAAE,CAAC;QACrD,MAAM,WAAW,GAAG;YAClB,EAAE,EAAE,gBAAgB;YACpB,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,eAAe;YACxB,IAAI,EAAE,YAAY;YAClB,KAAK,EAAE;gBACL,GAAG,EAAE,GAAG,eAAe,IAAI,YAAY,EAAE;gBACzC,QAAQ,EAAE,KAAK;gBACf,OAAO,EAAE,IAAI;gBACb,8BAA8B,EAAE,IAAI;aACrC;SACF,CAAC;QAEF,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,4BAA4B,EAAE,WAAW,CAAC,CAAC;QACvF,MAAM,CAAC,GAAG,CAAC,qCAAqC,eAAe,IAAI,YAAY,EAAE,CAAC,CAAC;IACrF,CAAC;IAED,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,WAAmB;QAC5C,MAAM,QAAQ,GAAG,MAAM,eAAK,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,uBAAuB,WAAW,EAAE,CAAC,CAAC;QACnG,MAAM,WAAW,GAAG,QAAQ,CAAC,IAAI,CAAC;QAElC,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,WAAW,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,OAAO,GAAG,OAAO,CAAC,cAAc,IAAI,OAAO,CAAC,OAAO,CAAC;YAC1D,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC;YACjC,OAAO;gBACL,IAAI,EAAE,OAAO;gBACb,IAAI,EAAE,IAAI;aACX,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,MAAM,IAAI,oCAA2B,CAAC,WAAW,WAAW,8BAA8B,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;CACF;AArDD,wBAqDC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@haku-sci/utils",
-  "version": "8.3.3",
+  "version": "8.4.0",
   "description": "utils from haku-sci. Library only",
   "main": "./dist/index.js",
   "types": "dist/index.d.ts",