feat(status): unified profile stats

koishijs · Mar 26, 2021 · f8f8d6e · f8f8d6e
1 parent b009502
commit f8f8d6e
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 15 deletions.
diff --git a/packages/plugin-assets/src/index.ts b/packages/plugin-assets/src/index.ts
@@ -162,7 +162,13 @@ class SmmsAssets implements Assets {
   }
 
   async stats() {
-    const { data } = await axios.post(this.config.endpoint + '/profile', null, this.config.axiosConfig)
+    const { token, endpoint, axiosConfig } = this.config
+    const { data } = await axios.post(endpoint + '/profile', null, {
+      ...axiosConfig,
+      headers: {
+        authorization: token,
+      },
+    })
     return {
       assetSize: data.data.disk_usage_raw,
     }

diff --git a/packages/plugin-status/server/index.ts b/packages/plugin-status/server/index.ts
@@ -21,7 +21,7 @@ declare module 'koishi-core' {
   }
 
   interface Database {
-    getProfile(): Promise<Profile.Meta>
+    getProfile(): Promise<Profile.Stats>
     Synchronizer: new (db: Database) => Synchronizer
   }
 

diff --git a/packages/plugin-status/server/profile.ts b/packages/plugin-status/server/profile.ts
@@ -1,6 +1,7 @@
-import { Bot, Context, Platform } from 'koishi-core'
+import { Assets, Bot, Context, Platform } from 'koishi-core'
 import { cpus } from 'os'
 import { mem } from 'systeminformation'
+import { Dialogue } from 'koishi-plugin-teach'
 
 export type LoadRate = [app: number, total: number]
 export type MessageRate = [send: number, receive: number]
@@ -77,14 +78,16 @@ export namespace Profile {
     refreshInterval?: number
   }
 
-  export interface Meta {
+  export interface Stats {
     allUsers: number
     activeUsers: number
     allGroups: number
     activeGroups: number
     storageSize: number
   }
 
+  export interface Meta extends Stats, Dialogue.Stats, Assets.Stats {}
+
   export async function get(ctx: Context, config: Config) {
     const [memory, bots] = await Promise.all([
       memoryRate(),
@@ -95,13 +98,17 @@ export namespace Profile {
   }
 
   let timestamp = 0
-  let cachedMeta: Promise<Meta>
+  let cachedMeta: Promise<Partial<Meta>>
 
   async function getMeta(ctx: Context, config: Config) {
-    const next = Date.now() + config.refreshInterval
-    if (timestamp > next) return cachedMeta
-    timestamp = next
-    return cachedMeta = ctx.database.getProfile()
+    const now = Date.now()
+    if (timestamp > now) return cachedMeta
+    timestamp = now + config.refreshInterval
+    return cachedMeta = Promise.all([
+      ctx.assets?.stats(),
+      ctx.database.getProfile(),
+      ctx.database?.getDialogueStats(),
+    ]).then(data => Object.assign({}, ...data))
   }
 
   export function initBot(bot: Bot) {

diff --git a/packages/plugin-teach/src/utils.ts b/packages/plugin-teach/src/utils.ts
@@ -19,17 +19,12 @@ declare module 'koishi-core' {
   interface Database {
     getDialoguesByTest(test: DialogueTest): Promise<Dialogue[]>
     updateDialogues(dialogues: Observed<Dialogue>[], argv: Dialogue.Argv): Promise<void>
-    getDialogueStats(): Promise<DialogueStats>
+    getDialogueStats(): Promise<Dialogue.Stats>
   }
 }
 
 Tables.extend('dialogue')
 
-interface DialogueStats {
-  questions: number
-  dialogues: number
-}
-
 export interface Dialogue {
   id?: number
   question: string
@@ -80,6 +75,11 @@ export namespace Dialogue {
     validateRegExp?: RegExpValidator.Options
   }
 
+  export interface Stats {
+    questions: number
+    dialogues: number
+  }
+
   export enum Flag {
     /** 冻结：只有 4 级以上权限者可修改 */
     frozen = 1,