@midwayjs/consul 4.0.0-beta.7 → 4.0.0-beta.8

package/dist/extension/helper.js

@@ -1,16 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TCPHealthCheck = exports.HTTPHealthCheck = exports.calculateTTL = exports.TTLHeartbeat = void 0;
+exports.TCPHealthCheck = exports.HTTPHealthCheck = exports.TTLHeartbeat = void 0;
+exports.calculateTTL = calculateTTL;
 const ms_1 = require("ms");
 const http_1 = require("http");
 const url_1 = require("url");
 const net_1 = require("net");
 class TTLHeartbeat {
+    consul;
+    checkId;
+    interval;
+    timer = null;
+    logger;
     /**
      * @param {TTLHeartbeatOptions} options - 配置项
      */
     constructor(options) {
-        this.timer = null;
         this.consul = options.consul;
         this.checkId = options.checkId;
         this.interval = options.interval ?? 5000;
@@ -53,18 +58,20 @@ function calculateTTL(ttl) {
     // 最小不能低于 1 秒
     return Math.max(ttlMs, 1000);
 }
-exports.calculateTTL = calculateTTL;
 /**
  * HTTP 健康检查工具类
  * 传入 http url，自动启动一个健康检查服务
  */
 class HTTPHealthCheck {
+    server = null;
+    port;
+    path;
+    message;
     /**
      * @param httpUrl 形如 'http://127.0.0.1:3000/health'
      * @param message 健康时返回的内容，默认 'ok'
      */
     constructor(httpUrl, message = 'ok') {
-        this.server = null;
         const url = new url_1.URL(httpUrl);
         this.port = Number(url.port) || 80;
         this.path = url.pathname;
@@ -106,11 +113,13 @@ exports.HTTPHealthCheck = HTTPHealthCheck;
  * 传入 tcp url，自动启动一个 TCP 服务
  */
 class TCPHealthCheck {
+    server = null;
+    port;
+    host;
     /**
      * @param tcpUrl 形如 'tcp://127.0.0.1:3000'
      */
     constructor(tcpUrl) {
-        this.server = null;
         const url = new url_1.URL(tcpUrl);
         this.port = Number(url.port) || 80;
         this.host = url.hostname || '0.0.0.0';

package/dist/extension/serviceDiscovery.d.ts

@@ -35,7 +35,7 @@ export declare class ConsulServiceDiscovery extends ServiceDiscovery<ConsulClien
     private listenerStore;
     private configService;
     init(): Promise<void>;
-    protected getServiceClient(): import("consul/lib/consul").Consul;
+    protected getServiceClient(): import("consul");
     protected createServiceDiscoverClientImpl(options: ConsulServiceDiscoveryOptions): ConsulServiceDiscoverClient;
     protected getDefaultServiceDiscoveryOptions(): ConsulServiceDiscoveryOptions;
     private getListener;

package/dist/extension/serviceDiscovery.js

@@ -19,6 +19,10 @@ const helper_1 = require("./helper");
  * @since 4.0.0
  */
 class ConsulDataListener extends core_1.DataListener {
+    client;
+    options;
+    logger;
+    watcher;
     constructor(client, options, logger) {
         super();
         this.client = client;
@@ -60,6 +64,13 @@ class ConsulDataListener extends core_1.DataListener {
  * @since 4.0.0
  */
 class ConsulServiceDiscoverClient extends core_1.ServiceDiscoveryClient {
+    consul;
+    applicationManager;
+    webRouterService;
+    logger;
+    ttlHeartbeat;
+    httpHealthCheck;
+    tcpHealthCheck;
     constructor(consul, serviceDiscoveryOptions, applicationManager, webRouterService, logger) {
         super(consul, serviceDiscoveryOptions);
         this.consul = consul;
@@ -170,10 +181,14 @@ exports.ConsulServiceDiscoverClient = ConsulServiceDiscoverClient;
  * @since 4.0.0
  */
 let ConsulServiceDiscovery = class ConsulServiceDiscovery extends core_1.ServiceDiscovery {
-    constructor() {
-        super(...arguments);
-        this.listenerStore = new Map();
-    }
+    consulServiceFactory;
+    consulServiceDiscoveryOptions;
+    applicationManager;
+    webRouterService;
+    coreLogger;
+    defaultServiceClient;
+    listenerStore = new Map();
+    configService;
     async init() {
         this.consulServiceDiscoveryOptions = this.configService.getConfiguration('consul.serviceDiscovery', {});
     }

package/dist/manager.js

@@ -13,11 +13,13 @@ exports.ConsulService = exports.ConsulServiceFactory = void 0;
 const core_1 = require("@midwayjs/core");
 const Consul = require("consul");
 let ConsulServiceFactory = class ConsulServiceFactory extends core_1.ServiceFactory {
+    consulConfig;
     async init() {
         await this.initClients(this.consulConfig, {
             concurrent: true,
         });
     }
+    logger;
     async createClient(config, clientName) {
         this.logger.info('[midway:consul] init %s at %s:%s', clientName, config.host, config.port);
         return new Consul(config);
@@ -49,6 +51,8 @@ exports.ConsulServiceFactory = ConsulServiceFactory = __decorate([
     (0, core_1.Singleton)()
 ], ConsulServiceFactory);
 let ConsulService = class ConsulService {
+    serviceFactory;
+    instance;
     async init() {
         this.instance = this.serviceFactory.get(this.serviceFactory.getDefaultClientName?.() || 'default');
         if (!this.instance) {

package/dist/utils.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hashServiceOptions = exports.formatObjectErrorToError = exports.isObjectError = void 0;
+exports.isObjectError = isObjectError;
+exports.formatObjectErrorToError = formatObjectErrorToError;
+exports.hashServiceOptions = hashServiceOptions;
 const core_1 = require("@midwayjs/core");
 function isObjectError(obj) {
     return obj && typeof obj === 'object' && 'errno' in obj;
 }
-exports.isObjectError = isObjectError;
 function formatObjectErrorToError(obj) {
     const err = new Error(obj.message);
     err.stack = obj.stack;
@@ -19,7 +20,6 @@ function formatObjectErrorToError(obj) {
     err.cause = commonErr;
     return commonErr;
 }
-exports.formatObjectErrorToError = formatObjectErrorToError;
 /**
  * 对于 1 万个不同 ServiceOptions 组合，使用当前这个基于 DJB2 + base36 的方法，冲突概率大约是 0.1%，也就是理论上每 1 万个中只有 10 个左右可能冲突，而且这还是在完全随机分布的情况下估算的
  * 适用于对象类型是扁平的，没有嵌套
@@ -41,5 +41,4 @@ function hashServiceOptions(options) {
     }
     return (hash >>> 0).toString(36); // 无符号，base36 更短
 }
-exports.hashServiceOptions = hashServiceOptions;
 //# sourceMappingURL=utils.js.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/consul",
   "description": "midway consul",
-  "version": "4.0.0-beta.7",
+  "version": "4.0.0-beta.8",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,9 +10,9 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^4.0.0-beta.7",
-    "@midwayjs/koa": "^4.0.0-beta.7",
-    "@midwayjs/mock": "^4.0.0-beta.7",
+    "@midwayjs/core": "^4.0.0-beta.8",
+    "@midwayjs/koa": "^4.0.0-beta.8",
+    "@midwayjs/mock": "^4.0.0-beta.8",
     "@types/sinon": "17.0.4",
     "nock": "13.5.6"
   },
@@ -39,5 +39,5 @@
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
   },
-  "gitHead": "6a221788112b4d998b3958e0a275579f42816c59"
+  "gitHead": "355e55949fdd132b0bdcb4830222a0a027e92ded"
 }