From 9b7499a23eb6b7c1da93566db1fa02db3e335c1e Mon Sep 17 00:00:00 2001
From: moonrailgun <moonrailgun@gmail.com>
Date: Wed, 1 Feb 2023 10:43:23 +0800
Subject: [PATCH] =?UTF-8?q?fix(cli):=20v1.5.4=20=E4=BF=AE=E5=A4=8Dbench?=
 =?UTF-8?q?=E5=91=BD=E4=BB=A4=E7=9A=84=E8=AE=A1=E7=AE=97=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=E5=92=8C=E5=AE=B9=E9=94=99=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/cli/package.json          | 2 +-
 apps/cli/src/commands/bench.ts | 6 +++---
 server/moleculer.config.ts     | 4 +++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/apps/cli/package.json b/apps/cli/package.json
index 363390f6..285e546b 100644
--- a/apps/cli/package.json
+++ b/apps/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tailchat-cli",
-  "version": "1.5.3",
+  "version": "1.5.4",
   "description": "A Command line interface of tailchat",
   "bin": {
     "tailchat": "./bin/cli"
diff --git a/apps/cli/src/commands/bench.ts b/apps/cli/src/commands/bench.ts
index 117d5937..3ae7cdc7 100644
--- a/apps/cli/src/commands/bench.ts
+++ b/apps/cli/src/commands/bench.ts
@@ -90,8 +90,8 @@ export const benchCommand: CommandModule = {
             },
             onCompleted: (res) => {
               console.log(`测试数量: \t${res.length}`);
-              console.log(`最大用时: \t${prettyMs(Math.max(...res))}`);
-              console.log(`最小用时: \t${prettyMs(Math.min(...res))}`);
+              console.log(`最大用时: \t${prettyMs(Math.max(...res, 0))}`);
+              console.log(`最小用时: \t${prettyMs(Math.min(...res, 0))}`);
               console.log(`平均用时: \t${prettyMs(_.mean(res))}`);
             },
           });
@@ -174,7 +174,7 @@ async function startBenchmark<T>(options: BenchmarkOptions<T>) {
     const failed = res.filter((i) => !Boolean(i));
     spinner.succeed(`基准测试完毕, 用时: ${prettyMs(allUsage)}`);
     console.log(`成功/失败: ${succeed.length}/${failed.length}`);
-    console.log(`TPS: ${res.length / allUsage}`);
+    console.log(`TPS: ${res.length / (allUsage / 1000)}`);
 
     onCompleted(succeed);
   } catch (err) {
diff --git a/server/moleculer.config.ts b/server/moleculer.config.ts
index fdef6ec0..755c2dfc 100644
--- a/server/moleculer.config.ts
+++ b/server/moleculer.config.ts
@@ -1,3 +1,5 @@
 import brokerConfig from 'tailchat-server-sdk/dist/runner/moleculer.config';
 
-export default brokerConfig;
+export default {
+  ...brokerConfig,
+};