From bb49108a5fec63cfc358e667d8ff7f379c80995f Mon Sep 17 00:00:00 2001
From: veypi <i@veypi.com>
Date: Thu, 19 Oct 2023 22:11:28 +0800
Subject: [PATCH] update sys info

---
 oab/src/main.rs               |  2 +-
 oaweb/src/boot/api/index.ts   |  2 ++
 oaweb/src/pages/app/oasys.vue | 64 ++++++++++++++++++++++++-----------
 3 files changed, 48 insertions(+), 20 deletions(-)

diff --git a/oab/src/main.rs b/oab/src/main.rs
index f853d9e..7a77846 100644
--- a/oab/src/main.rs
+++ b/oab/src/main.rs
@@ -64,7 +64,7 @@ async fn web(data: AppState) -> Result<()> {
             return Err(oab::Error::Unknown);
         }
     };
-    libs::task::start_nats_online(client.clone());
+    // libs::task::start_nats_online(client.clone());
     client
         .publish("msg".to_string(), Bytes::from("asd"))
         .await
diff --git a/oaweb/src/boot/api/index.ts b/oaweb/src/boot/api/index.ts
index 4158b3c..8632e06 100644
--- a/oaweb/src/boot/api/index.ts
+++ b/oaweb/src/boot/api/index.ts
@@ -11,6 +11,7 @@ import token from "./token";
 import user from "./user";
 import resource from "./resource";
 import access from './access';
+import nats from './nats'
 
 
 
@@ -21,6 +22,7 @@ const api = {
   role,
   resource,
   access,
+  nats
 }
 
 
diff --git a/oaweb/src/pages/app/oasys.vue b/oaweb/src/pages/app/oasys.vue
index b337e8e..6107299 100644
--- a/oaweb/src/pages/app/oasys.vue
+++ b/oaweb/src/pages/app/oasys.vue
@@ -6,20 +6,32 @@
  -->
 <template>
   <div>
-    <div v-if="data.server?.id">
+    <div v-if="id">
       <div class="text-2xl mb-4">
         消息服务
-        <div class="float-right text-sm">{{ new Date(data.server.time).toLocaleString() }}</div>
+        <div class="float-right text-sm">{{ new Date(data.now).toLocaleString() }}</div>
       </div>
       <div class="">
-        <div class="w-full">ID: {{ data.server?.id }}</div>
+        <div class="w-full">ID: {{ id }}</div>
         <div class="flex gap-8">
-          <div>CPU占用: {{ data.statsz.cpu }}%</div>
-          <div>内存占用: {{ (data.statsz.mem / 1024 / 1024).toFixed(2) }}M</div>
-          <div>连接数: {{ data.statsz.connections }}</div>
+          <div>CPU占用: {{ data.cpu }}%</div>
+          <div>内存占用: {{ (data.mem / 1024 / 1024).toFixed(2) }}M</div>
+          <div>连接数: {{ data.connections }}</div>
         </div>
-        <div>发送: {{ (send_received[1] / 1024).toFixed(2) }} KB/s</div>
-        <div>收到: {{ (send_received[0] / 1024).toFixed(2) }} KB/s</div>
+        <div>发送: {{ (send_received[0] / 1024).toFixed(2) }} KB/s</div>
+        <div>收到: {{ (send_received[1] / 1024).toFixed(2) }} KB/s</div>
+      </div>
+      <div class="grid grid-cols-4 gap-4 mt-10" v-if="conns.length">
+        <div>ID</div>
+        <div>Name</div>
+        <div>运行时间</div>
+        <div>订阅主题</div>
+        <template v-for="c of conns" :key="c.cid">
+          <div>{{ c.cid }}</div>
+          <div>{{ c.name || '无' }}</div>
+          <div>{{ new Date(c.start).toLocaleString() }}</div>
+          <div>{{ c.subscriptions_list.sort().join(' ') }}</div>
+        </template>
       </div>
     </div>
   </div>
@@ -28,10 +40,12 @@
 <script lang="ts" setup>
 import { computed, ref, watch, onUnmounted } from 'vue';
 import { nats } from '@veypi/oaer'
+import api from 'src/boot/api'
 
 
 const data = ref({} as any)
-const id = computed(() => data.value.server?.id)
+const conns = ref<any[]>([])
+const id = computed(() => data.value.server_id)
 const subs: any[] = []
 const timer = ref()
 
@@ -40,8 +54,8 @@ const send_received = computed(() => {
   if (!id.value) {
     return [0, 0]
   }
-  let os = data.value.statsz.sent.bytes
-  let or = data.value.statsz.received.bytes
+  let os = data.value.out_bytes
+  let or = data.value.in_bytes
   let res = [os - old_data[0], or - old_data[1]]
   old_data = [os, or]
   return res
@@ -49,25 +63,37 @@ const send_received = computed(() => {
 
 watch(id, (_) => {
   timer.value = setInterval(() => {
-    nats.request('$SYS.REQ.SERVER.PING').then((m) => {
-      data.value = JSON.parse(m)
+    api.nats.general().then(e => {
+      data.value = e
+    })
+    api.nats.conns().then(e => {
+      conns.value = e.connections
     })
+    // nats.request('$SYS.REQ.SERVER.PING').then((m) => {
+    //   data.value = JSON.parse(m)
+    // })
   }, 1000)
 })
 
 watch(computed(() => nats.ready.value), e => {
   if (e) {
-    nats.request('$SYS.REQ.SERVER.PING').then((m) => {
-      data.value = JSON.parse(m)
-      let os = data.value.statsz.sent.bytes
-      let or = data.value.statsz.received.bytes
-      old_data = [os, or]
+    api.nats.general().then(e => {
+      old_data = [e.out_bytes, e.in_bytes]
+      data.value = e
     })
+    // nats.request('$SYS.REQ.SERVER.PING').then((m) => {
+    //   data.value = JSON.parse(m)
+    //   let os = data.value.statsz.sent.bytes
+    //   let or = data.value.statsz.received.bytes
+    //   old_data = [os, or]
+    // })
   }
 }, { immediate: true })
 
 onUnmounted(() => {
-  clearInterval(timer.value)
+  if (timer.value) {
+    clearInterval(timer.value)
+  }
   for (let i of subs) {
     i.unsubscribe()
   }