diff --git a/package.json b/package.json index 5e05ebcd5ec2..1fa0e18a5613 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "ts-jest": "29.0.5", "ts-node": "10.9.1", "typedoc": "0.23.24", - "typescript": "4.8.4", + "typescript": "4.9.4", "why-is-node-running": "2.2.2", "zx": "7.1.1" }, diff --git a/packages/consul/package.json b/packages/consul/package.json index 8b11773cc535..498b4d36f7ae 100644 --- a/packages/consul/package.json +++ b/packages/consul/package.json @@ -18,7 +18,7 @@ "nock": "13.3.0" }, "dependencies": { - "consul": "^0.40.0" + "consul": "1.2.0" }, "keywords": [ "consul" diff --git a/packages/consul/src/configuration.ts b/packages/consul/src/configuration.ts index 3f0d79f33aac..d34f9a1ef0ad 100644 --- a/packages/consul/src/configuration.ts +++ b/packages/consul/src/configuration.ts @@ -1,7 +1,6 @@ import { Config, Configuration, - MidwayFrameworkType, ILifeCycle, IMidwayApplication, IMidwayContainer, @@ -66,11 +65,8 @@ export class ConsulConfiguration implements ILifeCycle { config.name = config.name || app.getProjectName(); config.id = config.id || `${config.name}:${address}:${port}`; - config.check = - config.check || - (config.check === false - ? void 0 - : app.getFrameworkType() === MidwayFrameworkType.WEB + if (!config.check && (config.check as any) !== false) { + config.check = ['egg', 'koa', 'express'].includes(app.getNamespace()) ? { http: `http://${address}:${port}/consul/health/self/check`, interval: '3s', @@ -78,7 +74,8 @@ export class ConsulConfiguration implements ILifeCycle { : { tcp: `${address}:${port}`, interval: '3s', - }); + }; + } Object.assign(this.consulRegisterConfig, config); diff --git a/packages/consul/src/lib/provider.ts b/packages/consul/src/lib/provider.ts index 141a4967de6f..5f650d93f156 100644 --- a/packages/consul/src/lib/provider.ts +++ b/packages/consul/src/lib/provider.ts @@ -10,7 +10,7 @@ export class ConsulProvider { constructor(providerOptions: IConsulProviderInfoOptions) { // should be, ignore config providerOptions.promisify = true; - this.consul = Consul(providerOptions); + this.consul = new Consul(providerOptions); } getConsul(): Consul.Consul { diff --git a/packages/core/src/service/slsFunctionService.ts b/packages/core/src/service/slsFunctionService.ts index a8e34e10cc0c..02915f46c7f2 100644 --- a/packages/core/src/service/slsFunctionService.ts +++ b/packages/core/src/service/slsFunctionService.ts @@ -137,8 +137,8 @@ export class MidwayServerlessFunctionService extends MidwayWebRouterService { data.functionTriggerName = webRouter['type']; data.functionTriggerMetadata = webRouter['metadata']; data.functionMetadata = { - functionName, ...functionMeta, + functionName, }; this.checkDuplicateAndPush(prefix, data); } else {