fix: plugin register management

perf: 优化网页搜索回答规范

.github/workflows/docker-image.yml

@@ -1,12 +1,8 @@
 name: Docker Image CI/CD
 
 on:
-  push:
-    branches:
-      - master
-      - dev_dashboard
-    paths-ignore:
-      - '**/*.md'
+  release:
+    types: [published]
   workflow_dispatch:
 jobs:
   publish-latest-docker-image:
@@ -18,8 +14,8 @@ jobs:
         uses: actions/checkout@v2
       - name: Build image
         run: |
-          docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:v1 .
+          docker build -t ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest .
       - name: Publish image
         run: |
           docker login -u ${{ secrets.DOCKER_HUB_USERNAME }} -p ${{ secrets.DOCKER_HUB_PASSWORD }}
-          docker push ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:v1
+          docker push ${{ secrets.DOCKER_HUB_USERNAME }}/astrbot:latest

.github/workflows/stale.yml

@@ -0,0 +1,27 @@
+# This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Mark stale issues and pull requests
+
+on:
+  schedule:
+  - cron: '21 23 * * *'
+
+jobs:
+  stale:
+
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-message: 'Stale issue message'
+        stale-pr-message: 'Stale pull request message'
+        stale-issue-label: 'no-issue-activity'
+        stale-pr-label: 'no-pr-activity'

.gitignore

@@ -6,3 +6,7 @@ configs/session
 configs/config.yaml
 **/.DS_Store
 temp
+cmd_config.json
+addons/plugins/
+data/
+cookies.json

README.md

@@ -6,36 +6,36 @@
 
 # AstrBot
 
-*✨ 2024 - 希望成为一个跨平台、极易上手、稳定安全的机器人项目。✨*
-
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/Soulter/AstrBot)](https://github.com/Soulter/AstrBot/releases/latest)
 <img src="https://wakatime.com/badge/user/915e5316-99c6-4563-a483-ef186cf000c9/project/34412545-2e37-400f-bedc-42348713ac1f.svg" alt="wakatime">
 <img src="https://img.shields.io/badge/python-3.9+-blue.svg" alt="python">
+<a href="https://hub.docker.com/r/soulter/astrbot"><img alt="Docker pull" src="https://img.shields.io/docker/pulls/soulter/astrbot.svg"/></a>
 <a href="https://qm.qq.com/cgi-bin/qm/qr?k=EYGsuUTfe00_iOu9JTXS7_TEpMkXOvwv&jump_from=webapi&authKey=uUEMKCROfsseS+8IzqPjzV3y1tzy4AkykwTib2jNkOFdzezF9s9XknqnIaf3CDft">
 <img alt="Static Badge" src="https://img.shields.io/badge/QQ群-322154837-purple">
 </a>
 <img alt="Static Badge" src="https://img.shields.io/badge/频道-x42d56aki2-purple">
 
-<a href="https://astrbot.soulter.top/center">项目主页(开发中)</a> ｜
-<a href="https://github.com/Soulter/QQChannelChatGPT/wiki">部署文档</a> ｜
+<a href="https://astrbot.soulter.top/center">项目部署</a> ｜
 <a href="https://github.com/Soulter/QQChannelChatGPT/issues">问题提交</a> ｜
-<a href="https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91">插件开发（最少只需 25 行，真不难！）</a>
-
+<a href="https://astrbot.soulter.top/center/docs/%E5%BC%80%E5%8F%91/%E6%8F%92%E4%BB%B6%E5%BC%80%E5%8F%91">插件开发（最少只需 25 行）</a>
 </div>
 
-
-
 ## 🤔您可能想了解的
-- **如何部署？** [帮助文档](https://github.com/Soulter/QQChannelChatGPT/wiki) (部署不成功欢迎进群捞人解决<3)
+- **如何部署？** [帮助文档](https://astrbot.soulter.top/center/docs/%E9%83%A8%E7%BD%B2/%E9%80%9A%E8%BF%87Docker%E9%83%A8%E7%BD%B2) (部署不成功欢迎进群捞人解决<3)
 - **go-cqhttp启动不成功、报登录失败？** [在这里搜索解决方法](https://github.com/Mrs4s/go-cqhttp/issues)
 - **程序闪退/机器人启动不成功？** [提交issue或加群反馈](https://github.com/Soulter/QQChannelChatGPT/issues)
-- **如何开启ChatGPT、Bard、Claude等语言模型？** [查看帮助](https://github.com/Soulter/QQChannelChatGPT/wiki/%E8%A1%A5%E5%85%85%EF%BC%9A%E5%A6%82%E4%BD%95%E5%BC%80%E5%90%AFChatGPT%E3%80%81Bard%E3%80%81Claude%E7%AD%89%E8%AF%AD%E8%A8%80%E6%A8%A1%E5%9E%8B%EF%BC%9F)
+- **如何开启 ChatGPT、Claude、HuggingChat 等语言模型？** [查看帮助](https://astrbot.soulter.top/center/docs/%E4%BD%BF%E7%94%A8/%E5%A4%A7%E8%AF%AD%E8%A8%80%E6%A8%A1%E5%9E%8B)
 
 ## 🧩功能：
 
 ✨ 最近功能：
-1. 支持切换代码分支。输入`/update checkout <分支名>`即可切换代码分支
-2. 正在测试可视化面板，输入`/update checkout dev_dashboard`后根据提示即可体验
+1. 可视化面板
+2. Docker 一键部署项目：[链接](https://astrbot.soulter.top/center/docs/%E9%83%A8%E7%BD%B2/%E9%80%9A%E8%BF%87Docker%E9%83%A8%E7%BD%B2)
+
+🌍支持的消息平台/接口
+- go-cqhttp（QQ、QQ频道）
+- QQ 官方机器人接口
+- Telegram（由 [astrbot_plugin_telegram](https://github.com/Soulter/astrbot_plugin_telegram) 插件支持）
 
 🌍支持的AI语言模型一览：
 
@@ -46,12 +46,12 @@
 - OpenAI GPT-4（原生支持）
 - Claude（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
 - HuggingChat（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
+- Gemini（免费，由[LLMs插件](https://github.com/Soulter/llms)支持）
 
 **图片生成**
-
+- OpenAI Dalle 接口
 - NovelAI/Naifu (免费，由[AIDraw插件](https://github.com/Soulter/aidraw)支持)
 
-
 🌍机器人支持的能力一览：
 - 可视化面板（beta）
 - 同时部署机器人到 QQ 和 QQ 频道
@@ -129,8 +129,6 @@
 
 > 使用`plugin i 插件GitHub链接`即可安装。
 
-插件开发教程：https://github.com/Soulter/QQChannelChatGPT/wiki/%E5%9B%9B%E3%80%81%E5%BC%80%E5%8F%91%E6%8F%92%E4%BB%B6
-
 部分插件：
 
 - `LLMS`: https://github.com/Soulter/llms | Claude, HuggingChat 大语言模型接入。
@@ -162,15 +160,13 @@
 - `/key` 动态添加key
 - `/set` 人格设置面板
 - `/keyword nihao 你好` 设置关键词回复。nihao->你好
-- `/bing` 切换为bing
 - `/revgpt` 切换为ChatGPT逆向库
 - `/画` 画画
 
 #### 逆向ChatGPT库语言模型
 - `/gpt` 切换为OpenAI官方API
-- `/bing` 切换为bing
 
-* 切换模型指令支持临时回复。如`/bing 你好`将会临时使用一次bing模型 -->
+* 切换模型指令支持临时回复。如`/a 你好`将会临时使用一次bing模型 -->
 <!--
 ## 🙇‍感谢
 

addons/dashboard/dist/assets/BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js

@@ -1 +1 @@
-import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as r,b as t,t as u,ab as p,B as n,ac as o,j as f}from"./index-7c8bc001.js";const b={class:"text-h3"},h={class:"d-flex align-center"},g={class:"d-flex align-center"},V=i({__name:"BaseBreadcrumb",props:{title:String,breadcrumbs:Array,icon:String},setup(d){const c=d;return(x,B)=>(l(),_(r,{class:"page-breadcrumb mb-1 mt-1"},{default:s(()=>[e(a,{cols:"12",md:"12"},{default:s(()=>[e(m,{variant:"outlined",elevation:"0",class:"px-4 py-3 withbg"},{default:s(()=>[e(r,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(c.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:c.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};
+import{x as i,o as l,c as _,w as s,a as e,f as a,J as m,V as c,b as t,t as u,ad as p,B as n,ae as o,j as f}from"./index-9075b0bb.js";const b={class:"text-h3"},h={class:"d-flex align-center"},g={class:"d-flex align-center"},V=i({__name:"BaseBreadcrumb",props:{title:String,breadcrumbs:Array,icon:String},setup(d){const r=d;return(x,B)=>(l(),_(c,{class:"page-breadcrumb mb-1 mt-1"},{default:s(()=>[e(a,{cols:"12",md:"12"},{default:s(()=>[e(m,{variant:"outlined",elevation:"0",class:"px-4 py-3 withbg"},{default:s(()=>[e(c,{"no-gutters":"",class:"align-center"},{default:s(()=>[e(a,{md:"5"},{default:s(()=>[t("h3",b,u(r.title),1)]),_:1}),e(a,{md:"7",sm:"12",cols:"12"},{default:s(()=>[e(p,{items:r.breadcrumbs,class:"text-h5 justify-md-end pa-1"},{divider:s(()=>[t("div",h,[e(n(o),{size:"17"})])]),prepend:s(()=>[e(f,{size:"small",icon:"mdi-home",class:"text-secondary mr-2"}),t("div",g,[e(n(o),{size:"17"})])]),_:1},8,["items"])]),_:1})]),_:1})]),_:1})]),_:1})]),_:1}))}});export{V as _};

addons/dashboard/dist/assets/BlankLayout-77752188.js

@@ -0,0 +1 @@
+import{x as e,o as a,c as t,w as o,a as s,B as n,Z as r,W as c}from"./index-9075b0bb.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};

addons/dashboard/dist/assets/BlankLayout-7c60dfeb.js

@@ -1 +0,0 @@
-import{x as e,o as a,c as t,w as o,a as s,B as n,X as r,T as c}from"./index-7c8bc001.js";const f=e({__name:"BlankLayout",setup(p){return(u,_)=>(a(),t(c,null,{default:o(()=>[s(n(r))]),_:1}))}});export{f as default};

addons/dashboard/dist/assets/ColorPage-ba6164f7.js

@@ -0,0 +1 @@
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as p,D as a,o as r,s,a as e,w as t,f as o,V as i,F as n,u as g,c as h,a0 as b,e as x,t as y}from"./index-9075b0bb.js";const P=p({__name:"ColorPage",setup(C){const c=a({title:"Colors Page"}),d=a([{title:"Utilities",disabled:!1,href:"#"},{title:"Colors",disabled:!0,href:"#"}]),u=a(["primary","lightprimary","secondary","lightsecondary","info","success","accent","warning","error","darkText","lightText","borderLight","inputBorder","containerBg"]);return(V,k)=>(r(),s(n,null,[e(m,{title:c.value.title,breadcrumbs:d.value},null,8,["title","breadcrumbs"]),e(i,null,{default:t(()=>[e(o,{cols:"12",md:"12"},{default:t(()=>[e(_,{title:"Color Palette"},{default:t(()=>[e(i,null,{default:t(()=>[(r(!0),s(n,null,g(u.value,(l,f)=>(r(),h(o,{md:"3",cols:"12",key:f},{default:t(()=>[e(b,{rounded:"md",class:"align-center justify-center d-flex",height:"100",width:"100%",color:l},{default:t(()=>[x("class: "+y(l),1)]),_:2},1032,["color"])]),_:2},1024))),128))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{P as default};

addons/dashboard/dist/assets/ColorPage-fe404e65.js

@@ -1 +0,0 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-89ca5198.js";import{_}from"./UiParentCard.vue_vue_type_script_setup_true_lang-03a5c441.js";import{x as p,D as a,o as r,s,a as e,w as t,f as o,V as i,F as n,u as g,c as h,_ as b,e as x,t as y}from"./index-7c8bc001.js";const P=p({__name:"ColorPage",setup(C){const c=a({title:"Colors Page"}),d=a([{title:"Utilities",disabled:!1,href:"#"},{title:"Colors",disabled:!0,href:"#"}]),u=a(["primary","lightprimary","secondary","lightsecondary","info","success","accent","warning","error","darkText","lightText","borderLight","inputBorder","containerBg"]);return(V,k)=>(r(),s(n,null,[e(m,{title:c.value.title,breadcrumbs:d.value},null,8,["title","breadcrumbs"]),e(i,null,{default:t(()=>[e(o,{cols:"12",md:"12"},{default:t(()=>[e(_,{title:"Color Palette"},{default:t(()=>[e(i,null,{default:t(()=>[(r(!0),s(n,null,g(u.value,(l,f)=>(r(),h(o,{md:"3",cols:"12",key:f},{default:t(()=>[e(b,{rounded:"md",class:"align-center justify-center d-flex",height:"100",width:"100%",color:l},{default:t(()=>[x("class: "+y(l),1)]),_:2},1032,["color"])]),_:2},1024))),128))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{P as default};

addons/dashboard/dist/assets/ConfigDetailCard-d45b9ca7.js

@@ -0,0 +1 @@
+import{o as l,s as o,u as c,c as n,w as u,Q as g,b as s,R as k,F as t,ab as h,O as p,t as m,a as V,ac as f,i as C,q as x,k as v,A as U}from"./index-9075b0bb.js";import{_ as w}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";const S={__name:"ConfigDetailCard",props:{config:Array},setup(d){return(y,B)=>(l(!0),o(t,null,c(d.config,r=>(l(),n(w,{key:r.name,title:r.name,style:{"margin-bottom":"16px"}},{default:u(()=>[g(s("a",null,"No data",512),[[k,d.config.length===0]]),(l(!0),o(t,null,c(r.body,e=>(l(),o(t,null,[e.config_type==="item"?(l(),o(t,{key:0},[e.val_type==="bool"?(l(),n(h,{key:0,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="str"?(l(),n(p,{key:1,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(l(),n(p,{key:2,modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(l(),o(t,{key:3},[s("span",null,m(e.name),1),V(f,{modelValue:e.value,"onUpdate:modelValue":a=>e.value=a,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:u(({attrs:a,item:i,select:b,selected:_})=>[V(C,x(a,{"model-value":_,closable:"",onClick:b,"onClick:close":D=>y.remove(i)}),{default:u(()=>[s("strong",null,m(i),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):v("",!0)],64)):e.config_type==="divider"?(l(),n(U,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):v("",!0)],64))),256))]),_:2},1032,["title"]))),128))}};export{S as _};

addons/dashboard/dist/assets/ConfigPage-3d69363d.js

@@ -1 +0,0 @@
-import{_ as h}from"./UiParentCard.vue_vue_type_script_setup_true_lang-03a5c441.js";import{o as a,s as t,a as n,w as i,f as b,F as d,u as g,V as C,d as U,e as x,t as c,a8 as B,R as _,c as r,a9 as w,O as v,b as V,aa as N,i as F,q as P,k as f,A as S}from"./index-7c8bc001.js";const D={name:"ConfigPage",components:{UiParentCard:h},data(){return{config_data:{data:[]},save_message_snack:!1,save_message:"",save_message_success:""}},mounted(){this.getConfig()},methods:{getConfig(){_.get("/api/configs").then(o=>{this.config_data=o.data.data,console.log(this.config_data)})},updateConfig(){_.post("/api/configs",this.config_data).then(o=>{console.log(this.config_data),o.data.status==="success"?(this.save_message=o.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=o.data.message,this.save_message_snack=!0,this.save_message_success="error")})}}},$=Object.assign(D,{setup(o){return(s,m)=>(a(),t(d,null,[n(C,null,{default:i(()=>[n(b,{cols:"12",md:"12"},{default:i(()=>[(a(!0),t(d,null,g(s.config_data.data,u=>(a(),r(h,{key:u.name,title:u.name,style:{"margin-bottom":"16px"}},{default:i(()=>[(a(!0),t(d,null,g(u.body,e=>(a(),t(d,null,[e.config_type==="item"?(a(),t(d,{key:0},[e.val_type==="bool"?(a(),r(w,{key:0,modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,label:e.name,hint:e.description,color:"primary",inset:""},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="string"?(a(),r(v,{key:1,modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="int"?(a(),r(v,{key:2,modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,label:e.name,hint:e.description,style:{"margin-bottom":"8px"},variant:"outlined"},null,8,["modelValue","onUpdate:modelValue","label","hint"])):e.val_type==="list"?(a(),t(d,{key:3},[V("span",null,c(e.name),1),n(N,{modelValue:e.value,"onUpdate:modelValue":l=>e.value=l,chips:"",clearable:"",label:"请添加",multiple:"","prepend-icon":"mdi-tag-multiple-outline"},{selection:i(({attrs:l,item:p,select:k,selected:y})=>[n(F,P(l,{"model-value":y,closable:"",onClick:k,"onClick:close":O=>s.remove(p)}),{default:i(()=>[V("strong",null,c(p),1)]),_:2},1040,["model-value","onClick","onClick:close"])]),_:2},1032,["modelValue","onUpdate:modelValue"])],64)):f("",!0)],64)):e.config_type==="divider"?(a(),r(S,{key:1,style:{"margin-top":"8px","margin-bottom":"8px"}})):f("",!0)],64))),256))]),_:2},1032,["title"]))),128))]),_:1})]),_:1}),n(U,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),n(B,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":m[0]||(m[0]=u=>s.save_message_snack=u)},{default:i(()=>[x(c(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{$ as default};

addons/dashboard/dist/assets/ConfigPage-a63602fb.js

@@ -0,0 +1 @@
+import{_ as y}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as h,o,c as u,w as t,a,a8 as b,b as c,K as x,e as f,t as g,G as V,A as w,L as S,a9 as $,J as B,s as _,d as v,F as d,u as p,f as G,V as T,aa as j,T as l}from"./index-9075b0bb.js";import{_ as m}from"./ConfigDetailCard-d45b9ca7.js";const D={class:"d-sm-flex align-center justify-space-between"},C=h({__name:"ConfigGroupCard",props:{title:String},setup(e){const s=e;return(i,n)=>(o(),u(B,{variant:"outlined",elevation:"0",class:"withbg",style:{width:"50%"}},{default:t(()=>[a(b,{style:{padding:"10px 20px"}},{default:t(()=>[c("div",D,[a(x,null,{default:t(()=>[f(g(s.title),1)]),_:1}),a(V)])]),_:1}),a(w),a(S,null,{default:t(()=>[$(i.$slots,"default")]),_:3})]),_:3}))}}),I={style:{display:"flex","flex-direction":"row","justify-content":"space-between","align-items":"center","margin-bottom":"12px"}},N={style:{display:"flex","flex-direction":"row"}},R={style:{"margin-right":"10px",color:"black"}},F={style:{color:"#222"}},k=h({__name:"ConfigGroupItem",props:{title:String,desc:String,btnRoute:String,namespace:String},setup(e){const s=e;return(i,n)=>(o(),_("div",I,[c("div",N,[c("h3",R,g(s.title),1),c("p",F,g(s.desc),1)]),a(v,{to:s.btnRoute,color:"primary",class:"ml-2",style:{"border-radius":"10px"}},{default:t(()=>[f("配置")]),_:1},8,["to"])]))}}),L={style:{display:"flex","flex-direction":"row",padding:"16px",gap:"16px",width:"100%"}},P={name:"ConfigPage",components:{UiParentCard:y,ConfigGroupCard:C,ConfigGroupItem:k,ConfigDetailCard:m},data(){return{config_data:[],config_base:[],save_message_snack:!1,save_message:"",save_message_success:"",config_outline:[],namespace:""}},mounted(){this.getConfig()},methods:{switchConfig(e){l.get("/api/configs?namespace="+e).then(s=>{this.namespace=e,this.config_data=s.data.data,console.log(this.config_data)}).catch(s=>{save_message=s,save_message_snack=!0,save_message_success="error"})},getConfig(){l.get("/api/config_outline").then(e=>{this.config_outline=e.data.data,console.log(this.config_outline)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"}),l.get("/api/configs").then(e=>{this.config_base=e.data.data,console.log(this.config_data)}).catch(e=>{save_message=e,save_message_snack=!0,save_message_success="error"})},updateConfig(){l.post("/api/configs",{base_config:this.config_base,config:this.config_data,namespace:this.namespace}).then(e=>{e.data.status==="success"?(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="success"):(this.save_message=e.data.message,this.save_message_snack=!0,this.save_message_success="error")}).catch(e=>{this.save_message=e,this.save_message_snack=!0,this.save_message_success="error"})}}},J=Object.assign(P,{setup(e){return(s,i)=>(o(),_(d,null,[a(T,null,{default:t(()=>[c("div",L,[(o(!0),_(d,null,p(s.config_outline,n=>(o(),u(C,{key:n.name,title:n.name},{default:t(()=>[(o(!0),_(d,null,p(n.body,r=>(o(),u(k,{title:r.title,desc:r.desc,namespace:r.namespace,onClick:U=>s.switchConfig(r.namespace)},null,8,["title","desc","namespace","onClick"]))),256))]),_:2},1032,["title"]))),128))]),a(G,{cols:"12",md:"12"},{default:t(()=>[a(m,{config:s.config_data},null,8,["config"]),a(m,{config:s.config_base},null,8,["config"])]),_:1})]),_:1}),a(v,{icon:"mdi-content-save",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary",onClick:s.updateConfig},null,8,["onClick"]),a(j,{timeout:2e3,elevation:"24",color:s.save_message_success,modelValue:s.save_message_snack,"onUpdate:modelValue":i[0]||(i[0]=n=>s.save_message_snack=n)},{default:t(()=>[f(g(s.save_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};

addons/dashboard/dist/assets/ConsolePage-ff373be6.css

@@ -0,0 +1,32 @@
+/**
+ * Copyright (c) 2014 The xterm.js authors. All rights reserved.
+ * Copyright (c) 2012-2013, Christopher Jeffrey (MIT License)
+ * https://github.com/chjj/term.js
+ * @license MIT
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ *
+ * Originally forked from (with the author's permission):
+ *   Fabrice Bellard's javascript vt100 for jslinux:
+ *   http://bellard.org/jslinux/
+ *   Copyright (c) 2011 Fabrice Bellard
+ *   The original design remains. The terminal itself
+ *   has been extended to include xterm CSI codes, among
+ *   other features.
+ */.xterm{cursor:text;position:relative;user-select:none;-ms-user-select:none;-webkit-user-select:none}.xterm.focus,.xterm:focus{outline:none}.xterm .xterm-helpers{position:absolute;top:0;z-index:5}.xterm .xterm-helper-textarea{padding:0;border:0;margin:0;position:absolute;opacity:0;left:-9999em;top:0;width:0;height:0;z-index:-5;white-space:nowrap;overflow:hidden;resize:none}.xterm .composition-view{background:#000;color:#fff;display:none;position:absolute;white-space:nowrap;z-index:1}.xterm .composition-view.active{display:block}.xterm .xterm-viewport{background-color:#000;overflow-y:scroll;cursor:default;position:absolute;right:0;left:0;top:0;bottom:0}.xterm .xterm-screen{position:relative}.xterm .xterm-screen canvas{position:absolute;left:0;top:0}.xterm .xterm-scroll-area{visibility:hidden}.xterm-char-measure-element{display:inline-block;visibility:hidden;position:absolute;top:0;left:-9999em;line-height:normal}.xterm.enable-mouse-events{cursor:default}.xterm.xterm-cursor-pointer,.xterm .xterm-cursor-pointer{cursor:pointer}.xterm.column-select.focus{cursor:crosshair}.xterm .xterm-accessibility,.xterm .xterm-message{position:absolute;left:0;top:0;bottom:0;right:0;z-index:10;color:transparent;pointer-events:none}.xterm .live-region{position:absolute;left:-9999px;width:1px;height:1px;overflow:hidden}.xterm-dim{opacity:1!important}.xterm-underline-1{text-decoration:underline}.xterm-underline-2{text-decoration:double underline}.xterm-underline-3{text-decoration:wavy underline}.xterm-underline-4{text-decoration:dotted underline}.xterm-underline-5{text-decoration:dashed underline}.xterm-overline{text-decoration:overline}.xterm-overline.xterm-underline-1{text-decoration:overline underline}.xterm-overline.xterm-underline-2{text-decoration:overline double underline}.xterm-overline.xterm-underline-3{text-decoration:overline wavy underline}.xterm-overline.xterm-underline-4{text-decoration:overline dotted underline}.xterm-overline.xterm-underline-5{text-decoration:overline dashed underline}.xterm-strikethrough{text-decoration:line-through}.xterm-screen .xterm-decoration-container .xterm-decoration{z-index:6;position:absolute}.xterm-screen .xterm-decoration-container .xterm-decoration.xterm-decoration-top-layer{z-index:7}.xterm-decoration-overview-ruler{z-index:8;position:absolute;top:0;right:0;pointer-events:none}.xterm-decoration-top{z-index:2;position:relative}

addons/dashboard/dist/assets/Error404Page-d8de4014.js

@@ -1 +1 @@
-import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{o,c,w as s,V as i,a as r,b as e,d as l,e as a,f as d}from"./index-7c8bc001.js";const n="/assets/img-error-bg-ab6474a0.svg",_="/assets/img-error-blue-2675a7a9.svg",m="/assets/img-error-text-a6aebfa0.svg",g="/assets/img-error-purple-edee3fbc.svg";const p={},u={class:"text-center"},f=e("div",{class:"CardMediaWrapper"},[e("img",{src:n,alt:"grid",class:"w-100"}),e("img",{src:_,alt:"grid",class:"CardMediaParts"}),e("img",{src:m,alt:"build",class:"CardMediaBuild"}),e("img",{src:g,alt:"build",class:"CardMediaBuild"})],-1),h=e("h1",{class:"text-h1"},"Something is wrong",-1),v=e("p",null,[e("small",null,[a("The page you are looking was moved, removed, "),e("br"),a("renamed, or might never exist! ")])],-1);function x(b,V){return o(),c(i,{"no-gutters":"",class:"h-100vh"},{default:s(()=>[r(d,{class:"d-flex align-center justify-center"},{default:s(()=>[e("div",u,[f,h,v,r(l,{variant:"flat",color:"primary",class:"mt-4",to:"/","prepend-icon":"mdi-home"},{default:s(()=>[a(" Home")]),_:1})])]),_:1})]),_:1})}const C=t(p,[["render",x]]);export{C as default};
+import{_ as t}from"./_plugin-vue_export-helper-c27b6911.js";import{o,c,w as s,V as i,a as r,b as e,d as l,e as a,f as d}from"./index-9075b0bb.js";const n="/assets/img-error-bg-ab6474a0.svg",_="/assets/img-error-blue-2675a7a9.svg",m="/assets/img-error-text-a6aebfa0.svg",g="/assets/img-error-purple-edee3fbc.svg";const p={},u={class:"text-center"},f=e("div",{class:"CardMediaWrapper"},[e("img",{src:n,alt:"grid",class:"w-100"}),e("img",{src:_,alt:"grid",class:"CardMediaParts"}),e("img",{src:m,alt:"build",class:"CardMediaBuild"}),e("img",{src:g,alt:"build",class:"CardMediaBuild"})],-1),h=e("h1",{class:"text-h1"},"Something is wrong",-1),v=e("p",null,[e("small",null,[a("The page you are looking was moved, removed, "),e("br"),a("renamed, or might never exist! ")])],-1);function x(b,V){return o(),c(i,{"no-gutters":"",class:"h-100vh"},{default:s(()=>[r(d,{class:"d-flex align-center justify-center"},{default:s(()=>[e("div",u,[f,h,v,r(l,{variant:"flat",color:"primary",class:"mt-4",to:"/","prepend-icon":"mdi-home"},{default:s(()=>[a(" Home")]),_:1})])]),_:1})]),_:1})}const C=t(p,[["render",x]]);export{C as default};

addons/dashboard/dist/assets/ExtensionPage-fc6b100e.js

@@ -1 +0,0 @@
-import{x as b,o as d,c as h,w as e,a,a6 as C,b as i,K as x,e as o,t as u,G as m,d as r,A as E,L as V,a7 as y,J as w,s as p,f as c,F as f,u as $,V as k,q as S,N as B,O as N,P as T,H as j,a8 as D,R as g,j as F}from"./index-7c8bc001.js";const G={class:"d-sm-flex align-center justify-space-between"},v=b({__name:"ExtensionCard",props:{title:String,link:String},setup(n){const s=n,l=t=>{window.open(t,"_blank")};return(t,_)=>(d(),h(w,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(C,{style:{padding:"10px 20px"}},{default:e(()=>[i("div",G,[a(x,null,{default:e(()=>[o(u(s.title),1)]),_:1}),a(m),a(r,{icon:"mdi-link",variant:"plain",onClick:_[0]||(_[0]=z=>l(s.link))})])]),_:1}),a(E),a(V,null,{default:e(()=>[y(t.$slots,"default")]),_:3})]),_:3}))}}),P=i("div",{style:{"background-color":"white",width:"100%",padding:"16px","border-radius":"10px"}},[i("h3",null,"🧩 已安装的插件")],-1),U={style:{"min-height":"180px","max-height":"180px",overflow:"hidden"}},q={class:"d-flex align-center gap-3"},A=i("div",{style:{"background-color":"white",width:"100%",padding:"16px","border-radius":"10px"}},[i("h3",null,"🧩 插件市场 [待开发]")],-1),I=i("span",{class:"text-h5"},"从 Git 仓库链接安装插件",-1),L=i("small",null,"github, gitee, gitlab 等公开的仓库都行。",-1),O=i("br",null,null,-1),R={name:"ExtensionPage",components:{ExtensionCard:v},data(){return{extension_data:{data:[]},save_message_snack:!1,save_message:"",save_message_success:"",extension_url:"",status:"",dialog:!1,snack_message:"",snack_show:!1,snack_success:"success",install_loading:!1,uninstall_loading:!1}},mounted(){this.getExtensions()},methods:{getExtensions(){g.get("/api/extensions").then(n=>{this.extension_data.data=n.data.data,console.log(this.extension_data)})},newExtension(){this.install_loading=!0,console.log(this.install_loading),g.post("/api/extensions/install",{url:this.extension_url}).then(n=>{if(this.install_loading=!1,n.data.status==="error"){this.snack_message=n.data.message,this.snack_show=!0,this.snack_success="error";return}this.extension_data.data=n.data.data,console.log(this.extension_data),this.extension_url="",this.snack_message=n.data.message,this.snack_show=!0,this.snack_success="success",this.dialog=!1,this.getExtensions()}).catch(n=>{this.install_loading=!1,this.snack_message=n,this.snack_show=!0,this.snack_success="error"})},uninstallExtension(n){this.uninstall_loading=!0,g.post("/api/extensions/uninstall",{name:n}).then(s=>{if(this.uninstall_loading=!1,s.data.status==="error"){this.snack_message=s.data.message,this.snack_show=!0,this.snack_success="error";return}this.extension_data.data=s.data.data,console.log(this.extension_data),this.snack_message=s.data.message,this.snack_show=!0,this.snack_success="success",this.dialog=!1,this.getExtensions()}).catch(s=>{this.uninstall_loading=!1,this.snack_message=s,this.snack_show=!0,this.snack_success="error"})}}},J=Object.assign(R,{setup(n){return(s,l)=>(d(),p(f,null,[a(k,null,{default:e(()=>[a(c,{cols:"12",md:"12"},{default:e(()=>[P]),_:1}),(d(!0),p(f,null,$(s.extension_data.data,t=>(d(),h(c,{cols:"12",md:"6",lg:"4"},{default:e(()=>[(d(),h(v,{key:t.name,title:t.name,link:t.repo,style:{"margin-bottom":"16px"}},{default:e(()=>[i("p",U,u(t.desc),1),i("div",q,[a(F,null,{default:e(()=>[o("mdi-account")]),_:1}),i("span",null,u(t.author),1),a(m),a(r,{variant:"plain",onClick:_=>s.uninstallExtension(t.name),loading:s.uninstall_loading},{default:e(()=>[o("卸 载")]),_:2},1032,["onClick","loading"])])]),_:2},1032,["title","link"]))]),_:2},1024))),256)),a(c,{cols:"12",md:"12"},{default:e(()=>[A]),_:1})]),_:1}),a(j,{modelValue:s.dialog,"onUpdate:modelValue":l[3]||(l[3]=t=>s.dialog=t),persistent:"",width:"700"},{activator:e(({props:t})=>[a(r,S(t,{icon:"mdi-plus",size:"x-large",style:{position:"fixed",right:"52px",bottom:"52px"},color:"darkprimary"}),null,16)]),default:e(()=>[a(w,null,{default:e(()=>[a(x,null,{default:e(()=>[I]),_:1}),a(V,null,{default:e(()=>[a(B,null,{default:e(()=>[a(k,null,{default:e(()=>[a(c,{cols:"12"},{default:e(()=>[a(N,{label:"Git 库链接",modelValue:s.extension_url,"onUpdate:modelValue":l[0]||(l[0]=t=>s.extension_url=t),required:""},null,8,["modelValue"])]),_:1})]),_:1})]),_:1}),L,O,i("small",null,u(s.status),1)]),_:1}),a(T,null,{default:e(()=>[a(m),a(r,{color:"blue-darken-1",variant:"text",onClick:l[1]||(l[1]=t=>s.dialog=!1)},{default:e(()=>[o(" 关闭 ")]),_:1}),a(r,{color:"blue-darken-1",variant:"text",loading:s.install_loading,onClick:l[2]||(l[2]=t=>s.newExtension(s.extension_url))},{default:e(()=>[o(" 安装 ")]),_:1},8,["loading"])]),_:1})]),_:1})]),_:1},8,["modelValue"]),a(D,{timeout:2e3,elevation:"24",color:s.snack_success,modelValue:s.snack_show,"onUpdate:modelValue":l[4]||(l[4]=t=>s.snack_show=t)},{default:e(()=>[o(u(s.snack_message),1)]),_:1},8,["color","modelValue"])],64))}});export{J as default};

addons/dashboard/dist/assets/LogoDark.vue_vue_type_script_setup_true_lang-4faa128a.js

@@ -1 +0,0 @@
-import{at as _,x as d,D as n,o as c,s as m,a as f,w as p,au as r,b as a,av as o,B as t,aw as h}from"./index-7c8bc001.js";const s={Sidebar_drawer:!0,Customizer_drawer:!1,mini_sidebar:!1,fontTheme:"Roboto",inputBg:!1},l=_({id:"customizer",state:()=>({Sidebar_drawer:s.Sidebar_drawer,Customizer_drawer:s.Customizer_drawer,mini_sidebar:s.mini_sidebar,fontTheme:"Poppins",inputBg:s.inputBg}),getters:{},actions:{SET_SIDEBAR_DRAWER(){this.Sidebar_drawer=!this.Sidebar_drawer},SET_MINI_SIDEBAR(e){this.mini_sidebar=e},SET_FONT(e){this.fontTheme=e}}}),u={class:"logo",style:{display:"flex","align-items":"center"}},b={style:{"font-size":"24px","font-weight":"1000"}},w={style:{"font-size":"20px","font-weight":"1000"}},S={style:{"font-size":"20px"}},z=d({__name:"LogoDark",setup(e){n("rgb(var(--v-theme-primary))"),n("rgb(var(--v-theme-secondary))");const i=l();return(g,B)=>(c(),m("div",u,[f(t(h),{to:"/",style:{"text-decoration":"none",color:"black"}},{default:p(()=>[r(a("span",b,"AstrBot 仪表盘",512),[[o,!t(i).mini_sidebar]]),r(a("span",w,"Astr",512),[[o,t(i).mini_sidebar]]),r(a("span",S,"Bot",512),[[o,t(i).mini_sidebar]])]),_:1})]))}});export{z as _,l as u};

addons/dashboard/dist/assets/LogoDark.vue_vue_type_script_setup_true_lang-b3521e6c.js

@@ -0,0 +1 @@
+import{av as _,x as d,D as n,o as c,s as m,a as f,w as p,Q as r,b as a,R as o,B as t,aw as h}from"./index-9075b0bb.js";const s={Sidebar_drawer:!0,Customizer_drawer:!1,mini_sidebar:!1,fontTheme:"Roboto",inputBg:!1},l=_({id:"customizer",state:()=>({Sidebar_drawer:s.Sidebar_drawer,Customizer_drawer:s.Customizer_drawer,mini_sidebar:s.mini_sidebar,fontTheme:"Poppins",inputBg:s.inputBg}),getters:{},actions:{SET_SIDEBAR_DRAWER(){this.Sidebar_drawer=!this.Sidebar_drawer},SET_MINI_SIDEBAR(e){this.mini_sidebar=e},SET_FONT(e){this.fontTheme=e}}}),u={class:"logo",style:{display:"flex","align-items":"center"}},b={style:{"font-size":"24px","font-weight":"1000"}},w={style:{"font-size":"20px","font-weight":"1000"}},S={style:{"font-size":"20px"}},z=d({__name:"LogoDark",setup(e){n("rgb(var(--v-theme-primary))"),n("rgb(var(--v-theme-secondary))");const i=l();return(g,B)=>(c(),m("div",u,[f(t(h),{to:"/",style:{"text-decoration":"none",color:"black"}},{default:p(()=>[r(a("span",b,"AstrBot 仪表盘",512),[[o,!t(i).mini_sidebar]]),r(a("span",w,"Astr",512),[[o,t(i).mini_sidebar]]),r(a("span",S,"Bot",512),[[o,t(i).mini_sidebar]])]),_:1})]))}});export{z as _,l as u};

addons/dashboard/dist/assets/MaterialIcons-64e6b36e.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-89ca5198.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-03a5c441.js";import{x as n,D as a,o as c,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-7c8bc001.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as i}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as n,D as a,o as c,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-9075b0bb.js";const p=["innerHTML"],v=n({__name:"MaterialIcons",setup(b){const s=a({title:"Material Icons"}),r=a('<iframe src="https://materialdesignicons.com/" frameborder="0"  width="100%" height="1000"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Material Icons",disabled:!0,href:"#"}]);return(h,M)=>(c(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(i,{title:"Material Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,p)]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/RegisterPage-50c79593.js

@@ -1 +1 @@
-import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-4faa128a.js";import{x as y,D as o,o as b,s as U,a as e,w as a,b as n,B as $,d as u,f as d,A as _,e as f,V as r,O as m,an as A,as as E,F,c as T,N as q,J as V,L as P}from"./index-7c8bc001.js";const z="/assets/social-google-a359a253.svg",N=["src"],S=n("span",{class:"ml-2"},"Sign up with Google",-1),D=n("h5",{class:"text-h5 text-center my-4 mb-8"},"Sign up with Email address",-1),G={class:"d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold"},L=n("a",{href:"#",class:"ml-1 text-lightText"},"Terms and Condition",-1),O={class:"mt-5 text-right"},j=y({__name:"AuthRegister",setup(w){const c=o(!1),i=o(!1),p=o(""),v=o(""),g=o(),h=o(""),x=o(""),k=o([s=>!!s||"Password is required",s=>s&&s.length<=10||"Password must be less than 10 characters"]),C=o([s=>!!s||"E-mail is required",s=>/.+@.+\..+/.test(s)||"E-mail must be valid"]);function R(){g.value.validate()}return(s,l)=>(b(),U(F,null,[e(u,{block:"",color:"primary",variant:"outlined",class:"text-lightText googleBtn"},{default:a(()=>[n("img",{src:$(z),alt:"google"},null,8,N),S]),_:1}),e(r,null,{default:a(()=>[e(d,{class:"d-flex align-center"},{default:a(()=>[e(_,{class:"custom-devider"}),e(u,{variant:"outlined",class:"orbtn",rounded:"md",size:"small"},{default:a(()=>[f("OR")]),_:1}),e(_,{class:"custom-devider"})]),_:1})]),_:1}),D,e(E,{ref_key:"Regform",ref:g,"lazy-validation":"",action:"/dashboards/analytical",class:"mt-7 loginForm"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:h.value,"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Firstname"},null,8,["modelValue"])]),_:1}),e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:x.value,"onUpdate:modelValue":l[1]||(l[1]=t=>x.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Lastname"},null,8,["modelValue"])]),_:1})]),_:1}),e(m,{modelValue:v.value,"onUpdate:modelValue":l[2]||(l[2]=t=>v.value=t),rules:C.value,label:"Email Address / Username",class:"mt-4 mb-4",required:"",density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary"},null,8,["modelValue","rules"]),e(m,{modelValue:p.value,"onUpdate:modelValue":l[3]||(l[3]=t=>p.value=t),rules:k.value,label:"Password",required:"",density:"comfortable",variant:"outlined",color:"primary","hide-details":"auto","append-icon":i.value?"mdi-eye":"mdi-eye-off",type:i.value?"text":"password","onClick:append":l[4]||(l[4]=t=>i.value=!i.value),class:"pwdInput"},null,8,["modelValue","rules","append-icon","type"]),n("div",G,[e(A,{modelValue:c.value,"onUpdate:modelValue":l[5]||(l[5]=t=>c.value=t),rules:[t=>!!t||"You must agree to continue!"],label:"Agree with?",required:"",color:"primary",class:"ms-n2","hide-details":""},null,8,["modelValue","rules"]),L]),e(u,{color:"secondary",block:"",class:"mt-2",variant:"flat",size:"large",onClick:l[6]||(l[6]=t=>R())},{default:a(()=>[f("Sign Up")]),_:1})]),_:1},512),n("div",O,[e(_),e(u,{variant:"plain",to:"/auth/login",class:"mt-2 text-capitalize mr-n2"},{default:a(()=>[f("Already have an account?")]),_:1})])],64))}});const I={class:"pa-7 pa-sm-12"},J=n("h2",{class:"text-secondary text-h2 mt-8"},"Sign up",-1),Y=n("h4",{class:"text-disabled text-h4 mt-3"},"Enter credentials to continue",-1),M=y({__name:"RegisterPage",setup(w){return(c,i)=>(b(),T(r,{class:"h-100vh","no-gutters":""},{default:a(()=>[e(d,{cols:"12",class:"d-flex align-center bg-lightprimary"},{default:a(()=>[e(q,null,{default:a(()=>[n("div",I,[e(r,{justify:"center"},{default:a(()=>[e(d,{cols:"12",lg:"10",xl:"6",md:"7"},{default:a(()=>[e(V,{elevation:"0",class:"loginBox"},{default:a(()=>[e(V,{variant:"outlined"},{default:a(()=>[e(P,{class:"pa-9"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",class:"text-center"},{default:a(()=>[e(B),J,Y]),_:1})]),_:1}),e(j)]),_:1})]),_:1})]),_:1})]),_:1})]),_:1})])]),_:1})]),_:1})]),_:1}))}});export{M as default};
+import{_ as B}from"./LogoDark.vue_vue_type_script_setup_true_lang-b3521e6c.js";import{x as y,D as o,o as b,s as U,a as e,w as a,b as n,B as $,d as u,f as d,A as _,e as f,V as r,O as m,ap as A,au as E,F,c as T,N as q,J as V,L as P}from"./index-9075b0bb.js";const z="/assets/social-google-a359a253.svg",N=["src"],S=n("span",{class:"ml-2"},"Sign up with Google",-1),D=n("h5",{class:"text-h5 text-center my-4 mb-8"},"Sign up with Email address",-1),G={class:"d-sm-inline-flex align-center mt-2 mb-7 mb-sm-0 font-weight-bold"},L=n("a",{href:"#",class:"ml-1 text-lightText"},"Terms and Condition",-1),O={class:"mt-5 text-right"},j=y({__name:"AuthRegister",setup(w){const c=o(!1),i=o(!1),p=o(""),v=o(""),g=o(),h=o(""),x=o(""),k=o([s=>!!s||"Password is required",s=>s&&s.length<=10||"Password must be less than 10 characters"]),C=o([s=>!!s||"E-mail is required",s=>/.+@.+\..+/.test(s)||"E-mail must be valid"]);function R(){g.value.validate()}return(s,l)=>(b(),U(F,null,[e(u,{block:"",color:"primary",variant:"outlined",class:"text-lightText googleBtn"},{default:a(()=>[n("img",{src:$(z),alt:"google"},null,8,N),S]),_:1}),e(r,null,{default:a(()=>[e(d,{class:"d-flex align-center"},{default:a(()=>[e(_,{class:"custom-devider"}),e(u,{variant:"outlined",class:"orbtn",rounded:"md",size:"small"},{default:a(()=>[f("OR")]),_:1}),e(_,{class:"custom-devider"})]),_:1})]),_:1}),D,e(E,{ref_key:"Regform",ref:g,"lazy-validation":"",action:"/dashboards/analytical",class:"mt-7 loginForm"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:h.value,"onUpdate:modelValue":l[0]||(l[0]=t=>h.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Firstname"},null,8,["modelValue"])]),_:1}),e(d,{cols:"12",sm:"6"},{default:a(()=>[e(m,{modelValue:x.value,"onUpdate:modelValue":l[1]||(l[1]=t=>x.value=t),density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary",label:"Lastname"},null,8,["modelValue"])]),_:1})]),_:1}),e(m,{modelValue:v.value,"onUpdate:modelValue":l[2]||(l[2]=t=>v.value=t),rules:C.value,label:"Email Address / Username",class:"mt-4 mb-4",required:"",density:"comfortable","hide-details":"auto",variant:"outlined",color:"primary"},null,8,["modelValue","rules"]),e(m,{modelValue:p.value,"onUpdate:modelValue":l[3]||(l[3]=t=>p.value=t),rules:k.value,label:"Password",required:"",density:"comfortable",variant:"outlined",color:"primary","hide-details":"auto","append-icon":i.value?"mdi-eye":"mdi-eye-off",type:i.value?"text":"password","onClick:append":l[4]||(l[4]=t=>i.value=!i.value),class:"pwdInput"},null,8,["modelValue","rules","append-icon","type"]),n("div",G,[e(A,{modelValue:c.value,"onUpdate:modelValue":l[5]||(l[5]=t=>c.value=t),rules:[t=>!!t||"You must agree to continue!"],label:"Agree with?",required:"",color:"primary",class:"ms-n2","hide-details":""},null,8,["modelValue","rules"]),L]),e(u,{color:"secondary",block:"",class:"mt-2",variant:"flat",size:"large",onClick:l[6]||(l[6]=t=>R())},{default:a(()=>[f("Sign Up")]),_:1})]),_:1},512),n("div",O,[e(_),e(u,{variant:"plain",to:"/auth/login",class:"mt-2 text-capitalize mr-n2"},{default:a(()=>[f("Already have an account?")]),_:1})])],64))}});const I={class:"pa-7 pa-sm-12"},J=n("h2",{class:"text-secondary text-h2 mt-8"},"Sign up",-1),Y=n("h4",{class:"text-disabled text-h4 mt-3"},"Enter credentials to continue",-1),M=y({__name:"RegisterPage",setup(w){return(c,i)=>(b(),T(r,{class:"h-100vh","no-gutters":""},{default:a(()=>[e(d,{cols:"12",class:"d-flex align-center bg-lightprimary"},{default:a(()=>[e(q,null,{default:a(()=>[n("div",I,[e(r,{justify:"center"},{default:a(()=>[e(d,{cols:"12",lg:"10",xl:"6",md:"7"},{default:a(()=>[e(V,{elevation:"0",class:"loginBox"},{default:a(()=>[e(V,{variant:"outlined"},{default:a(()=>[e(P,{class:"pa-9"},{default:a(()=>[e(r,null,{default:a(()=>[e(d,{cols:"12",class:"text-center"},{default:a(()=>[e(B),J,Y]),_:1})]),_:1}),e(j)]),_:1})]),_:1})]),_:1})]),_:1})]),_:1})])]),_:1})]),_:1})]),_:1}))}});export{M as default};

addons/dashboard/dist/assets/ShadowPage-f14eacf9.js

@@ -1 +1 @@
-import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-89ca5198.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-03a5c441.js";import{x as m,D as s,o as l,s as r,a as e,w as a,f as i,V as o,F as d,u as _,J as p,U as b,b as h,t as g}from"./index-7c8bc001.js";const v=m({__name:"ShadowPage",setup(w){const n=s({title:"Shadow Page"}),u=s([{title:"Utilities",disabled:!1,href:"#"},{title:"Shadow",disabled:!0,href:"#"}]);return(V,x)=>(l(),r(d,null,[e(c,{title:n.value.title,breadcrumbs:u.value},null,8,["title","breadcrumbs"]),e(o,null,{default:a(()=>[e(i,{cols:"12",md:"12"},{default:a(()=>[e(f,{title:"Basic Shadow"},{default:a(()=>[e(o,{justify:"center"},{default:a(()=>[(l(),r(d,null,_(25,t=>e(i,{key:t,cols:"auto"},{default:a(()=>[e(p,{height:"100",width:"100",class:b(["mb-5",["d-flex justify-center align-center bg-primary",`elevation-${t}`]])},{default:a(()=>[h("div",null,g(t-1),1)]),_:2},1032,["class"])]),_:2},1024)),64))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{v as default};
+import{_ as c}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as f}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as m,D as s,o as l,s as r,a as e,w as a,f as i,V as o,F as d,u as _,J as p,X as b,b as h,t as g}from"./index-9075b0bb.js";const v=m({__name:"ShadowPage",setup(w){const n=s({title:"Shadow Page"}),u=s([{title:"Utilities",disabled:!1,href:"#"},{title:"Shadow",disabled:!0,href:"#"}]);return(V,x)=>(l(),r(d,null,[e(c,{title:n.value.title,breadcrumbs:u.value},null,8,["title","breadcrumbs"]),e(o,null,{default:a(()=>[e(i,{cols:"12",md:"12"},{default:a(()=>[e(f,{title:"Basic Shadow"},{default:a(()=>[e(o,{justify:"center"},{default:a(()=>[(l(),r(d,null,_(25,t=>e(i,{key:t,cols:"auto"},{default:a(()=>[e(p,{height:"100",width:"100",class:b(["mb-5",["d-flex justify-center align-center bg-primary",`elevation-${t}`]])},{default:a(()=>[h("div",null,g(t-1),1)]),_:2},1032,["class"])]),_:2},1024)),64))]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{v as default};

addons/dashboard/dist/assets/TablerIcons-3d72dfa8.js

@@ -1 +1 @@
-import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-89ca5198.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-03a5c441.js";import{x as c,D as a,o as i,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-7c8bc001.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};
+import{_ as o}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as n}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as c,D as a,o as i,s as m,a as e,w as t,f as d,b as f,V as _,F as u}from"./index-9075b0bb.js";const b=["innerHTML"],w=c({__name:"TablerIcons",setup(p){const s=a({title:"Tabler Icons"}),r=a('<iframe src="https://tablericons.com/" frameborder="0"  width="100%" height="600"></iframe>'),l=a([{title:"Icons",disabled:!1,href:"#"},{title:"Tabler Icons",disabled:!0,href:"#"}]);return(h,T)=>(i(),m(u,null,[e(o,{title:s.value.title,breadcrumbs:l.value},null,8,["title","breadcrumbs"]),e(_,null,{default:t(()=>[e(d,{cols:"12",md:"12"},{default:t(()=>[e(n,{title:"Tabler Icons"},{default:t(()=>[f("div",{innerHTML:r.value},null,8,b)]),_:1})]),_:1})]),_:1})],64))}});export{w as default};

addons/dashboard/dist/assets/TypographyPage-7ea8b746.js

@@ -1 +1 @@
-import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-89ca5198.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-03a5c441.js";import{x as f,o as i,c as g,w as e,a,a6 as y,K as b,e as w,t as d,A as C,L as V,a7 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,U as H,V as T}from"./index-7c8bc001.js";const s=f({__name:"UiChildCard",props:{title:String},setup(r){const l=r;return(n,c)=>(i(),g(_,{variant:"outlined"},{default:e(()=>[a(y,{class:"py-3"},{default:e(()=>[a(b,{class:"text-h5"},{default:e(()=>[w(d(l.title),1)]),_:1})]),_:1}),a(C),a(V,null,{default:e(()=>[L(n.$slots,"default")]),_:3})]),_:3}))}}),D={class:"d-flex flex-column gap-1"},S={class:"text-caption pa-2 bg-lightprimary"},z=t("div",{class:"text-grey"},"Class",-1),N={class:"font-weight-medium"},U=t("div",null,[t("p",{class:"text-left"},"Left aligned on all viewport sizes."),t("p",{class:"text-center"},"Center aligned on all viewport sizes."),t("p",{class:"text-right"},"Right aligned on all viewport sizes."),t("p",{class:"text-sm-left"},"Left aligned on viewports SM (small) or wider."),t("p",{class:"text-right text-md-left"},"Left aligned on viewports MD (medium) or wider."),t("p",{class:"text-right text-lg-left"},"Left aligned on viewports LG (large) or wider."),t("p",{class:"text-right text-xl-left"},"Left aligned on viewports XL (extra-large) or wider.")],-1),$=t("div",{class:"d-flex justify-space-between flex-row"},[t("a",{href:"#",class:"text-decoration-none"},"Non-underlined link"),t("div",{class:"text-decoration-line-through"},"Line-through text"),t("div",{class:"text-decoration-overline"},"Overline text"),t("div",{class:"text-decoration-underline"},"Underline text")],-1),M=t("div",null,[t("p",{class:"text-high-emphasis"},"High-emphasis has an opacity of 87% in light theme and 100% in dark."),t("p",{class:"text-medium-emphasis"},"Medium-emphasis text and hint text have opacities of 60% in light theme and 70% in dark."),t("p",{class:"text-disabled"},"Disabled text has an opacity of 38% in light theme and 50% in dark.")],-1),A=f({__name:"TypographyPage",setup(r){const l=o({title:"Typography Page"}),n=o([["Heading 1","text-h1"],["Heading 2","text-h2"],["Heading 3","text-h3"],["Heading 4","text-h4"],["Heading 5","text-h5"],["Heading 6","text-h6"],["Subtitle 1","text-subtitle-1"],["Subtitle 2","text-subtitle-2"],["Body 1","text-body-1"],["Body 2","text-body-2"],["Button","text-button"],["Caption","text-caption"],["Overline","text-overline"]]),c=o([{title:"Utilities",disabled:!1,href:"#"},{title:"Typography",disabled:!0,href:"#"}]);return(O,F)=>(i(),h(x,null,[a(m,{title:l.value.title,breadcrumbs:c.value},null,8,["title","breadcrumbs"]),a(T,null,{default:e(()=>[a(k,{cols:"12",md:"12"},{default:e(()=>[a(v,{title:"Basic Typography"},{default:e(()=>[a(s,{title:"Heading"},{default:e(()=>[t("div",D,[(i(!0),h(x,null,B(n.value,([p,u])=>(i(),g(_,{variant:"outlined",key:p,class:"my-4"},{default:e(()=>[t("div",{class:H([u,"pa-2"])},d(p),3),t("div",S,[z,t("div",N,d(u),1)])]),_:2},1024))),128))])]),_:1}),a(s,{title:"Text-alignment",class:"mt-8"},{default:e(()=>[U]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[M]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{A as default};
+import{_ as m}from"./BaseBreadcrumb.vue_vue_type_style_index_0_lang-3bf6ea80.js";import{_ as v}from"./UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js";import{x as f,o as i,c as g,w as e,a,a8 as y,K as b,e as w,t as d,A as C,L as V,a9 as L,J as _,D as o,s as h,f as k,b as t,F as x,u as B,X as H,V as T}from"./index-9075b0bb.js";const s=f({__name:"UiChildCard",props:{title:String},setup(r){const l=r;return(n,c)=>(i(),g(_,{variant:"outlined"},{default:e(()=>[a(y,{class:"py-3"},{default:e(()=>[a(b,{class:"text-h5"},{default:e(()=>[w(d(l.title),1)]),_:1})]),_:1}),a(C),a(V,null,{default:e(()=>[L(n.$slots,"default")]),_:3})]),_:3}))}}),D={class:"d-flex flex-column gap-1"},S={class:"text-caption pa-2 bg-lightprimary"},z=t("div",{class:"text-grey"},"Class",-1),N={class:"font-weight-medium"},$=t("div",null,[t("p",{class:"text-left"},"Left aligned on all viewport sizes."),t("p",{class:"text-center"},"Center aligned on all viewport sizes."),t("p",{class:"text-right"},"Right aligned on all viewport sizes."),t("p",{class:"text-sm-left"},"Left aligned on viewports SM (small) or wider."),t("p",{class:"text-right text-md-left"},"Left aligned on viewports MD (medium) or wider."),t("p",{class:"text-right text-lg-left"},"Left aligned on viewports LG (large) or wider."),t("p",{class:"text-right text-xl-left"},"Left aligned on viewports XL (extra-large) or wider.")],-1),M=t("div",{class:"d-flex justify-space-between flex-row"},[t("a",{href:"#",class:"text-decoration-none"},"Non-underlined link"),t("div",{class:"text-decoration-line-through"},"Line-through text"),t("div",{class:"text-decoration-overline"},"Overline text"),t("div",{class:"text-decoration-underline"},"Underline text")],-1),O=t("div",null,[t("p",{class:"text-high-emphasis"},"High-emphasis has an opacity of 87% in light theme and 100% in dark."),t("p",{class:"text-medium-emphasis"},"Medium-emphasis text and hint text have opacities of 60% in light theme and 70% in dark."),t("p",{class:"text-disabled"},"Disabled text has an opacity of 38% in light theme and 50% in dark.")],-1),j=f({__name:"TypographyPage",setup(r){const l=o({title:"Typography Page"}),n=o([["Heading 1","text-h1"],["Heading 2","text-h2"],["Heading 3","text-h3"],["Heading 4","text-h4"],["Heading 5","text-h5"],["Heading 6","text-h6"],["Subtitle 1","text-subtitle-1"],["Subtitle 2","text-subtitle-2"],["Body 1","text-body-1"],["Body 2","text-body-2"],["Button","text-button"],["Caption","text-caption"],["Overline","text-overline"]]),c=o([{title:"Utilities",disabled:!1,href:"#"},{title:"Typography",disabled:!0,href:"#"}]);return(U,F)=>(i(),h(x,null,[a(m,{title:l.value.title,breadcrumbs:c.value},null,8,["title","breadcrumbs"]),a(T,null,{default:e(()=>[a(k,{cols:"12",md:"12"},{default:e(()=>[a(v,{title:"Basic Typography"},{default:e(()=>[a(s,{title:"Heading"},{default:e(()=>[t("div",D,[(i(!0),h(x,null,B(n.value,([p,u])=>(i(),g(_,{variant:"outlined",key:p,class:"my-4"},{default:e(()=>[t("div",{class:H([u,"pa-2"])},d(p),3),t("div",S,[z,t("div",N,d(u),1)])]),_:2},1024))),128))])]),_:1}),a(s,{title:"Text-alignment",class:"mt-8"},{default:e(()=>[$]),_:1}),a(s,{title:"Decoration",class:"mt-8"},{default:e(()=>[M]),_:1}),a(s,{title:"Opacity",class:"mt-8"},{default:e(()=>[O]),_:1})]),_:1})]),_:1})]),_:1})],64))}});export{j as default};

addons/dashboard/dist/assets/UiParentCard.vue_vue_type_script_setup_true_lang-73bcbbd5.js

@@ -1 +1 @@
-import{x as n,o,c as i,w as e,a,a6 as d,b as c,K as u,e as p,t as _,a7 as s,A as f,L as V,J as m}from"./index-7c8bc001.js";const C={class:"d-sm-flex align-center justify-space-between"},h=n({__name:"UiParentCard",props:{title:String},setup(l){const r=l;return(t,x)=>(o(),i(m,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(d,null,{default:e(()=>[c("div",C,[a(u,null,{default:e(()=>[p(_(r.title),1)]),_:1}),s(t.$slots,"action")])]),_:3}),a(f),a(V,null,{default:e(()=>[s(t.$slots,"default")]),_:3})]),_:3}))}});export{h as _};
+import{x as n,o,c as i,w as e,a,a8 as d,b as c,K as u,e as p,t as _,a9 as s,A as f,L as V,J as m}from"./index-9075b0bb.js";const C={class:"d-sm-flex align-center justify-space-between"},h=n({__name:"UiParentCard",props:{title:String},setup(l){const r=l;return(t,x)=>(o(),i(m,{variant:"outlined",elevation:"0",class:"withbg"},{default:e(()=>[a(d,null,{default:e(()=>[c("div",C,[a(u,null,{default:e(()=>[p(_(r.title),1)]),_:1}),s(t.$slots,"action")])]),_:3}),a(f),a(V,null,{default:e(()=>[s(t.$slots,"default")]),_:3})]),_:3}))}});export{h as _};

addons/dashboard/dist/index.html

@@ -11,7 +11,7 @@
       href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Poppins:wght@400;500;600;700&family=Roboto:wght@400;500;700&display=swap"
     />
     <title>AstrBot - 仪表盘</title>
-    <script type="module" crossorigin src="/assets/index-7c8bc001.js"></script>
+    <script type="module" crossorigin src="/assets/index-9075b0bb.js"></script>
     <link rel="stylesheet" href="/assets/index-0f1523f3.css">
   </head>
   <body>

addons/dashboard/helper.py

@@ -9,12 +9,8 @@ import sys
 import os
 import threading
 import time
-
-
-def shutdown_bot(delay_s: int):
-    time.sleep(delay_s)
-    py = sys.executable
-    os.execl(py, py, *sys.argv)
+import asyncio
+from util.plugin_dev.api.v1.config import update_config
 
 @dataclass
 class DashBoardConfig():
@@ -27,49 +23,54 @@ class DashBoardConfig():
     val_type: Optional[str] = None # 仅 item 才需要
 
 class DashBoardHelper():
-    def __init__(self, dashboard_data: DashBoardData, config: dict):
+    def __init__(self, global_object, config: dict):
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+        self.logger = global_object.logger
+        dashboard_data = global_object.dashboard_data
         dashboard_data.configs = {
             "data": []
         }
         self.parse_default_config(dashboard_data, config)
         self.dashboard_data: DashBoardData = dashboard_data
-        self.dashboard = AstrBotDashBoard(self.dashboard_data)
+        self.dashboard = AstrBotDashBoard(global_object)
         self.key_map = {} # key: uuid, value: config key name
         self.cc = CmdConfig()
         
         @self.dashboard.register("post_configs")
         def on_post_configs(post_configs: dict):
             try:
-                gu.log(f"收到配置更新请求", gu.LEVEL_INFO, tag="可视化面板")
-                self.save_config(post_configs)
+                # self.logger.log(f"收到配置更新请求", gu.LEVEL_INFO, tag="可视化面板")
+                if 'base_config' in post_configs:
+                    self.save_config(post_configs['base_config'], namespace='') # 基础配置
+                self.save_config(post_configs['config'], namespace=post_configs['namespace']) # 选定配置
                 self.parse_default_config(self.dashboard_data, self.cc.get_all())
                 # 重启
-                threading.Thread(target=shutdown_bot, args=(2,), daemon=True).start()
+                threading.Thread(target=self.dashboard.shutdown_bot, args=(2,), daemon=True).start()
             except Exception as e:
-                gu.log(f"在保存配置时发生错误：{e}", gu.LEVEL_ERROR, tag="可视化面板")
+                # self.logger.log(f"在保存配置时发生错误：{e}", gu.LEVEL_ERROR, tag="可视化面板")
                 raise e
-
         
     # 将 config.yaml、 中的配置解析到 dashboard_data.configs 中
     def parse_default_config(self, dashboard_data: DashBoardData, config: dict):
         
         try:
-            bot_platform_group = DashBoardConfig(
+            qq_official_platform_group = DashBoardConfig(
                 config_type="group",
-                name="机器人平台配置",
-                description="机器人平台配置描述",
+                name="QQ_OFFICIAL 平台配置",
+                description="",
                 body=[
                     DashBoardConfig(
                         config_type="item",
                         val_type="bool",
-                        name="启用 QQ 频道平台",
-                        description="就是你想到的那个 QQ 频道平台。详见 q.qq.com",
+                        name="启用 QQ_OFFICIAL 平台",
+                        description="官方的接口，仅支持 QQ 频道。详见 q.qq.com",
                         value=config['qqbot']['enable'],
                         path="qqbot.enable",
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="QQ机器人APPID",
                         description="详见 q.qq.com",
                         value=config['qqbot']['appid'],
@@ -77,7 +78,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="QQ机器人令牌",
                         description="详见 q.qq.com",
                         value=config['qqbot']['token'],
@@ -85,129 +86,38 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="QQ机器人 Secret",
                         description="详见 q.qq.com",
                         value=config['qqbot_secret'],
                         path="qqbot_secret",
                     ),
-                    DashBoardConfig(
-                        config_type="divider"
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="bool",
-                        name="启用 GO-CQHTTP 平台",
-                        description="gocq 是一个基于 HTTP 协议的 CQHTTP 协议的实现。详见 github.com/Mrs4s/go-cqhttp",
-                        value=config['gocqbot']['enable'],
-                        path="gocqbot.enable",
-                    )
-                ]
-            )
-            
-            proxy_group = DashBoardConfig(
-                config_type="group",
-                name="代理配置",
-                description="代理配置描述",
-                body=[
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="string",
-                        name="HTTP 代理地址",
-                        description="建议上下一致",
-                        value=config['http_proxy'],
-                        path="proxy",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="string",
-                        name="HTTPS 代理地址",
-                        description="建议上下一致",
-                        value=config['https_proxy'],
-                        path="proxy",
-                    )
-                ]
-            )
-            general_platform_detail_group = DashBoardConfig(
-                config_type="group",
-                name="通用平台配置",
-                description="",
-                body=[
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="bool",
-                        name="启动消息文字转图片",
-                        description="启动后，机器人会将消息转换为图片发送，以降低风控风险。",
-                        value=config['qq_pic_mode'],
-                        path="qq_pic_mode",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="int",
-                        name="消息限制时间",
-                        description="在此时间内，机器人不会回复同一个用户的消息。单位：秒",
-                        value=config['limit']['time'],
-                        path="limit.time",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="int",
-                        name="消息限制次数",
-                        description="在上面的时间内，如果用户发送消息超过此次数，则机器人不会回复。单位：次",
-                        value=config['limit']['count'],
-                        path="limit.count",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="string",
-                        name="回复前缀",
-                        description="[xxxx] 你好！ 其中xxxx是你可以填写的前缀。如果为空则不显示。",
-                        value=config['reply_prefix'],
-                        path="reply_prefix",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="string",
-                        name="管理员用户 ID",
-                        description="对机器人 !myid 即可获得。如果此功能不可用，请加群 322154837",
-                        value=config['gocq_qqchan_admin'],
-                        path="gocq_qqchan_admin",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="list",
-                        name="通用管理员用户 ID（同上，此项支持多个管理员）",
-                        description="",
-                        value=config['other_admins'],
-                        path="other_admins",
-                    ),
-                    DashBoardConfig(
-                        config_type="item",
-                        val_type="bool",
-                        name="独立会话",
-                        description="是否启用独立会话模式，即 1 个用户自然账号 1 个会话。",
-                        value=config['uniqueSessionMode'],
-                        path="uniqueSessionMode",
-                    ),
                     DashBoardConfig(
                         config_type="item",
                         val_type="bool",
                         name="是否允许 QQ 频道私聊",
-                        description="仅针对 QQ 频道 SDK，而非 GO-CQHTTP。如果启用，那么机器人会响应私聊消息。",
+                        description="如果启用，机器人会响应私聊消息。",
                         value=config['direct_message_mode'],
                         path="direct_message_mode",
                     ),
                 ]
             )
-            
-            gocq_platform_detail_group = DashBoardConfig(
+            qq_gocq_platform_group = DashBoardConfig(
                 config_type="group",
-                name="GO-CQHTTP 平台配置",
+                name="OneBot协议平台配置",
                 description="",
                 body=[
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="bool",
+                        name="启用",
+                        description="支持cq-http、shamrock等（目前仅支持QQ平台）",
+                        value=config['gocqbot']['enable'],
+                        path="gocqbot.enable",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="str",
                         name="HTTP 服务器地址",
                         description="",
                         value=config['gocq_host'],
@@ -225,7 +135,7 @@ class DashBoardHelper():
                         config_type="item",
                         val_type="int",
                         name="WebSocket 服务器端口",
-                        description="",
+                        description="目前仅支持正向 WebSocket",
                         value=config['gocq_websocket_port'],
                         path="gocq_websocket_port",
                     ),
@@ -272,39 +182,103 @@ class DashBoardHelper():
                 ]
             )
 
-            llm_group = DashBoardConfig(
+            general_platform_detail_group = DashBoardConfig(
                 config_type="group",
-                name="LLM 配置",
+                name="通用平台配置",
+                description="",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启动消息文字转图片",
+                        description="启动后，机器人会将消息转换为图片发送，以降低风控风险。",
+                        value=config['qq_pic_mode'],
+                        path="qq_pic_mode",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="消息限制时间",
+                        description="在此时间内，机器人不会回复同一个用户的消息。单位：秒",
+                        value=config['limit']['time'],
+                        path="limit.time",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="int",
+                        name="消息限制次数",
+                        description="在上面的时间内，如果用户发送消息超过此次数，则机器人不会回复。单位：次",
+                        value=config['limit']['count'],
+                        path="limit.count",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="str",
+                        name="回复前缀",
+                        description="[xxxx] 你好！ 其中xxxx是你可以填写的前缀。如果为空则不显示。",
+                        value=config['reply_prefix'],
+                        path="reply_prefix",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="list",
+                        name="通用管理员用户 ID（支持多个管理员）。通过 !myid 指令获取。",
+                        description="",
+                        value=config['other_admins'],
+                        path="other_admins",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="独立会话",
+                        description="是否启用独立会话模式，即 1 个用户自然账号 1 个会话。",
+                        value=config['uniqueSessionMode'],
+                        path="uniqueSessionMode",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="str",
+                        name="LLM 唤醒词",
+                        description="如果不为空, 那么只有当消息以此词开头时，才会调用大语言模型进行回复。如设置为 /chat，那么只有当消息以 /chat 开头时，才会调用大语言模型进行回复。",
+                        value=config['llm_wake_prefix'],
+                        path="llm_wake_prefix",
+                    )
+                ]
+            )
+
+            openai_official_llm_group = DashBoardConfig(
+                config_type="group",
+                name="OpenAI 官方接口类设置",
                 description="",
                 body=[
                     DashBoardConfig(
                         config_type="item",
                         val_type="list",
-                        name="OpenAI API KEY",
-                        description="OpenAI API 的 KEY。支持使用非官方但是兼容的 API。",
+                        name="OpenAI API Key",
+                        description="OpenAI API 的 Key。支持使用非官方但兼容的 API（第三方中转key）。",
                         value=config['openai']['key'],
                         path="openai.key",
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
-                        name="OpenAI API 节点地址",
+                        val_type="str",
+                        name="OpenAI API 节点地址(api base)",
                         description="OpenAI API 的节点地址，配合非官方 API 使用。如果不想填写，那么请填写 none",
                         value=config['openai']['api_base'],
                         path="openai.api_base",
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
-                        name="OpenAI 模型",
-                        description="OpenAI 模型。详见 https://platform.openai.com/docs/api-reference/chat",
+                        val_type="str",
+                        name="OpenAI model",
+                        description="OpenAI LLM 模型。详见 https://platform.openai.com/docs/api-reference/chat",
                         value=config['openai']['chatGPTConfigs']['model'],
                         path="openai.chatGPTConfigs.model",
                     ),
                     DashBoardConfig(
                         config_type="item",
                         val_type="int",
-                        name="OpenAI 最大生成长度",
+                        name="OpenAI max_tokens",
                         description="OpenAI 最大生成长度。详见 https://platform.openai.com/docs/api-reference/chat",
                         value=config['openai']['chatGPTConfigs']['max_tokens'],
                         path="openai.chatGPTConfigs.max_tokens",
@@ -312,7 +286,7 @@ class DashBoardHelper():
                     DashBoardConfig(
                         config_type="item",
                         val_type="float",
-                        name="OpenAI 温度",
+                        name="OpenAI temperature",
                         description="OpenAI 温度。详见 https://platform.openai.com/docs/api-reference/chat",
                         value=config['openai']['chatGPTConfigs']['temperature'],
                         path="openai.chatGPTConfigs.temperature",
@@ -351,7 +325,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="OpenAI 图像生成模型",
                         description="OpenAI 图像生成模型。",
                         value=config['openai_image_generate']['model'],
@@ -359,7 +333,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="OpenAI 图像生成大小",
                         description="OpenAI 图像生成大小。",
                         value=config['openai_image_generate']['size'],
@@ -367,7 +341,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="OpenAI 图像生成风格",
                         description="OpenAI 图像生成风格。修改前请参考 OpenAI 官方文档",
                         value=config['openai_image_generate']['style'],
@@ -375,7 +349,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="OpenAI 图像生成质量",
                         description="OpenAI 图像生成质量。修改前请参考 OpenAI 官方文档",
                         value=config['openai_image_generate']['quality'],
@@ -383,12 +357,61 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
-                        name="大语言模型问题题首提示词",
+                        val_type="str",
+                        name="问题题首提示词",
                         description="如果填写了此项，在每个对大语言模型的请求中，都会在问题前加上此提示词。",
                         value=config['llm_env_prompt'],
                         path="llm_env_prompt",
                     ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="str",
+                        name="默认人格文本",
+                        description="默认人格文本",
+                        value=config['default_personality_str'],
+                        path="default_personality_str",
+                    ),
+                ]
+            )
+            
+            rev_chatgpt_accounts = config['rev_ChatGPT']['account']
+            new_accs = []
+            for i in rev_chatgpt_accounts:
+                if isinstance(i, dict) and 'access_token' in i:
+                    new_accs.append(i['access_token'])
+                elif isinstance(i, str):
+                    new_accs.append(i)
+            config['rev_ChatGPT']['account'] = new_accs
+            
+            rev_chatgpt_llm_group = DashBoardConfig(
+                config_type="group",
+                name="逆向语言模型服务设置",
+                description="",
+                body=[
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="bool",
+                        name="启用逆向语言模型服务",
+                        description="",
+                        value=config['rev_ChatGPT']['enable'],
+                        path="rev_ChatGPT.enable",
+                    ), 
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="str",
+                        name="终结点（Endpoint）地址",
+                        description="逆向服务的终结点服务器的地址。",
+                        value=config['CHATGPT_BASE_URL'],
+                        path="CHATGPT_BASE_URL",
+                    ), 
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="list",
+                        name="assess_token",
+                        description="assess_token",
+                        value=config['rev_ChatGPT']['account'],
+                        path="rev_ChatGPT.account",
+                    ),
                 ]
             )
             
@@ -410,7 +433,7 @@ class DashBoardHelper():
                     # "secret_key": null
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="APP ID",
                         description="",
                         value=config['baidu_aip']['app_id'],
@@ -418,7 +441,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="API KEY",
                         description="",
                         value=config['baidu_aip']['api_key'],
@@ -426,7 +449,7 @@ class DashBoardHelper():
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
                         name="SECRET KEY",
                         description="",
                         value=config['baidu_aip']['secret_key'],
@@ -435,25 +458,30 @@ class DashBoardHelper():
                 ]
             )
 
-
-
             other_group = DashBoardConfig(
                 config_type="group",
                 name="其他配置",
                 description="其他配置描述",
                 body=[
-                    # 人格
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
-                        name="默认人格文本",
-                        description="默认人格文本",
-                        value=config['default_personality_str'],
-                        path="default_personality_str",
+                        val_type="str",
+                        name="HTTP 代理地址",
+                        description="建议上下一致",
+                        value=config['http_proxy'],
+                        path="http_proxy",
                     ),
                     DashBoardConfig(
                         config_type="item",
-                        val_type="string",
+                        val_type="str",
+                        name="HTTPS 代理地址",
+                        description="建议上下一致",
+                        value=config['https_proxy'],
+                        path="https_proxy",
+                    ),
+                    DashBoardConfig(
+                        config_type="item",
+                        val_type="str",
                         name="面板用户名",
                         description="是的，就是你理解的这个面板的用户名",
                         value=config['dashboard_username'],
@@ -463,29 +491,26 @@ class DashBoardHelper():
             )
             
             dashboard_data.configs['data'] = [
-                bot_platform_group,
+                qq_official_platform_group,
+                qq_gocq_platform_group,
                 general_platform_detail_group,
-                gocq_platform_detail_group,
-                proxy_group,
-                llm_group,
+                openai_official_llm_group,
+                rev_chatgpt_llm_group,
                 other_group,
                 baidu_aip_group
             ]
-        
+
         except Exception as e:
-            gu.log(f"配置文件解析错误：{e}", gu.LEVEL_ERROR)
+            self.logger.log(f"配置文件解析错误：{e}", gu.LEVEL_ERROR)
             raise e
         
     
-    def save_config(self, post_config: dict):
+    def save_config(self, post_config: list, namespace: str):
         '''
         根据 path 解析并保存配置
         '''
         
-        queue = []
-        for config in post_config['data']:
-            queue.append(config)
-            
+        queue = post_config
         while len(queue) > 0:
             config = queue.pop(0)
             if config['config_type'] == "group":
@@ -500,27 +525,34 @@ class DashBoardHelper():
                     continue
                 
                 if config['val_type'] == "bool":
-                    self.cc.put_by_dot_str(config['path'], config['value'])
-                elif config['val_type'] == "string":
-                    self.cc.put_by_dot_str(config['path'], config['value'])
+                    self._write_config(namespace, config['path'], config['value'])
+                elif config['val_type'] == "str":
+                    self._write_config(namespace, config['path'], config['value'])
                 elif config['val_type'] == "int":
                     try:
-                        self.cc.put_by_dot_str(config['path'], int(config['value']))
+                        self._write_config(namespace, config['path'], int(config['value']))
                     except:
                         raise ValueError(f"配置项 {config['name']} 的值必须是整数")
                 elif config['val_type'] == "float":
                     try:
-                        self.cc.put_by_dot_str(config['path'], float(config['value']))
+                        self._write_config(namespace, config['path'], float(config['value']))
                     except:
                         raise ValueError(f"配置项 {config['name']} 的值必须是浮点数")
                 elif config['val_type'] == "list":
                     if config['value'] is None:
-                        self.cc.put_by_dot_str(config['path'], [])
+                        self._write_config(namespace, config['path'], [])
                     elif not isinstance(config['value'], list):
                         raise ValueError(f"配置项 {config['name']} 的值必须是列表")
-                    self.cc.put_by_dot_str(config['path'], config['value'])
+                    self._write_config(namespace, config['path'], config['value'])
                 else:
-                    raise NotImplementedError(f"未知或者未实现的的配置项类型：{config['val_type']}")
+                    raise NotImplementedError(f"未知或者未实现的配置项类型：{config['val_type']}")
+    
+    def _write_config(self, namespace: str, key: str, value):
+        if namespace == "" or namespace.startswith("internal_"):
+            # 机器人自带配置，存到 config.yaml
+            self.cc.put_by_dot_str(key, value)
+        else:
+            update_config(namespace, key, value)
         
     def run(self):
         self.dashboard.run()

addons/dashboard/server.py

@@ -1,20 +1,27 @@
 from flask import Flask, request
 from flask.logging import default_handler
 from werkzeug.serving import make_server
-import datetime
 from util import general_utils as gu
 from dataclasses import dataclass
 import logging
 from cores.database.conn import dbConn
 from util.cmd_config import CmdConfig
+from util.updator import check_update, update_project, request_release_info
+from cores.qqbot.types import *
 import util.plugin_util as putil
+import websockets
+import json
+import threading
+import asyncio
+import os, sys
+import time
 
 @dataclass
 class DashBoardData():
     stats: dict
     configs: dict
     logs: dict
-    plugins: list[dict]
+    plugins: List[RegisteredPlugin]
 
 @dataclass
 class Response():
@@ -23,14 +30,20 @@ class Response():
     data: dict
     
 class AstrBotDashBoard():
-    def __init__(self, dashboard_data: DashBoardData):
-        self.dashboard_data = dashboard_data
+    def __init__(self, global_object: 'gu.GlobalObject'):
+        self.global_object = global_object
+        self.loop = asyncio.get_event_loop()
+        asyncio.set_event_loop(self.loop)
+        self.dashboard_data: DashBoardData = global_object.dashboard_data
         self.dashboard_be = Flask(__name__, static_folder="dist", static_url_path="/")
         log = logging.getLogger('werkzeug')
         log.setLevel(logging.ERROR)
         self.funcs = {}
         self.cc = CmdConfig()
-        
+        self.logger = global_object.logger
+        self.ws_clients = {} # remote_ip: ws
+        # 启动 websocket 服务器
+        self.ws_server = websockets.serve(self.__handle_msg, "0.0.0.0", 6186)
         
         @self.dashboard_be.get("/")
         def index():
@@ -99,10 +112,23 @@ class AstrBotDashBoard():
         
         @self.dashboard_be.get("/api/configs")
         def get_configs():
+            # 如果params中有namespace，则返回该namespace下的配置
+            # 否则返回所有配置
+            namespace = "" if "namespace" not in request.args else request.args["namespace"]
+            conf = self._get_configs(namespace)
             return Response(
                 status="success",
                 message="",
-                data=self.dashboard_data.configs
+                data=conf
+            ).__dict__
+            
+        @self.dashboard_be.get("/api/config_outline")
+        def get_config_outline():
+            outline = self._generate_outline()
+            return Response(
+                status="success",
+                message="",
+                data=outline
             ).__dict__
             
         @self.dashboard_be.post("/api/configs")
@@ -121,35 +147,18 @@ class AstrBotDashBoard():
                     message=e.__str__(),
                     data=self.dashboard_data.configs
                 ).__dict__
-        
-        @self.dashboard_be.get("/api/logs")
-        def get_logs():
-            return Response(
-                status="success",
-                message="",
-                data=self.dashboard_data.logs
-            ).__dict__
             
         @self.dashboard_be.get("/api/extensions")
         def get_plugins():
-            """
-            {
-                "name": "GoodPlugins",
-                "repo": "https://gitee.com/soulter/goodplugins",
-                "author": "soulter",
-                "desc": "一些好用的插件",
-                "version": "1.0"
-            }
-            """
             _plugin_resp = []
             for plugin in self.dashboard_data.plugins:
-                _p = self.dashboard_data.plugins[plugin]
+                _p = plugin.metadata
                 _t = {
-                    "name": _p["info"]["name"],
-                    "repo": '' if "repo" not in _p["info"] else _p["info"]["repo"],
-                    "author": _p["info"]["author"],
-                    "desc": _p["info"]["desc"],
-                    "version": _p["info"]["version"]
+                    "name": _p.plugin_name,
+                    "repo": '' if _p.repo is None else _p.repo,
+                    "author": _p.author,
+                    "desc": _p.desc,
+                    "version": _p.version
                 }
                 _plugin_resp.append(_t)
             return Response(
@@ -163,9 +172,9 @@ class AstrBotDashBoard():
             post_data = request.json
             repo_url = post_data["url"]
             try:
-                gu.log(f"正在安装插件 {repo_url}", tag="可视化面板")
+                self.logger.log(f"正在安装插件 {repo_url}", tag="可视化面板")
                 putil.install_plugin(repo_url, self.dashboard_data.plugins)
-                gu.log(f"安装插件 {repo_url} 成功", tag="可视化面板")
+                self.logger.log(f"安装插件 {repo_url} 成功", tag="可视化面板")
                 return Response(
                     status="success",
                     message="安装成功~",
@@ -183,9 +192,9 @@ class AstrBotDashBoard():
             post_data = request.json
             plugin_name = post_data["name"]
             try:
-                gu.log(f"正在卸载插件 {plugin_name}", tag="可视化面板")
+                self.logger.log(f"正在卸载插件 {plugin_name}", tag="可视化面板")
                 putil.uninstall_plugin(plugin_name, self.dashboard_data.plugins)
-                gu.log(f"卸载插件 {plugin_name} 成功", tag="可视化面板")
+                self.logger.log(f"卸载插件 {plugin_name} 成功", tag="可视化面板")
                 return Response(
                     status="success",
                     message="卸载成功~",
@@ -203,9 +212,9 @@ class AstrBotDashBoard():
             post_data = request.json
             plugin_name = post_data["name"]
             try:
-                gu.log(f"正在更新插件 {plugin_name}", tag="可视化面板")
+                self.logger.log(f"正在更新插件 {plugin_name}", tag="可视化面板")
                 putil.update_plugin(plugin_name, self.dashboard_data.plugins)
-                gu.log(f"更新插件 {plugin_name} 成功", tag="可视化面板")
+                self.logger.log(f"更新插件 {plugin_name} 成功", tag="可视化面板")
                 return Response(
                     status="success",
                     message="更新成功~",
@@ -217,17 +226,185 @@ class AstrBotDashBoard():
                     message=e.__str__(),
                     data=None
                 ).__dict__
+                
+        @self.dashboard_be.post("/api/log")
+        def log():
+            for item in self.ws_clients:
+                try:
+                    asyncio.run_coroutine_threadsafe(self.ws_clients[item].send(request.data.decode()), self.loop)
+                except Exception as e:
+                    pass
+            return 'ok'
         
+        @self.dashboard_be.get("/api/check_update")
+        def get_update_info():
+            try:
+                ret = check_update()
+                return Response(
+                    status="success",
+                    message=ret,
+                    data={
+                        "has_new_version": ret != "当前已经是最新版本。" # 先这样吧，累了=.=
+                    }
+                ).__dict__
+            except Exception as e:
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    data=None
+                ).__dict__
+                
+        @self.dashboard_be.post("/api/update_project")
+        def update_project_api():
+            version = request.json['version']
+            if version == "" or version == "latest":
+                latest = True
+                version = ''
+            else:
+                latest = False
+                version = request.json["version"]
+            try:
+                update_project(request_release_info(), latest=latest, version=version)
+                threading.Thread(target=self.shutdown_bot, args=(3,)).start()
+                return Response(
+                    status="success",
+                    message="更新成功，机器人将在 3 秒内重启。",
+                    data=None
+                ).__dict__
+            except Exception as e:
+                return Response(
+                    status="error",
+                    message=e.__str__(),
+                    data=None
+                ).__dict__
+            
+    def shutdown_bot(self, delay_s: int):
+        time.sleep(delay_s)
+        py = sys.executable
+        os.execl(py, py, *sys.argv)
+    
+    def _get_configs(self, namespace: str):
+        if namespace == "":
+            ret = [self.dashboard_data.configs['data'][5], 
+                    self.dashboard_data.configs['data'][6],]
+        elif namespace == "internal_platform_qq_official":
+            ret = [self.dashboard_data.configs['data'][0],]
+        elif namespace == "internal_platform_qq_gocq":
+            ret = [self.dashboard_data.configs['data'][1],]
+        elif namespace == "internal_platform_general": # 全局平台配置
+            ret = [self.dashboard_data.configs['data'][2],]
+        elif namespace == "internal_llm_openai_official":
+            ret = [self.dashboard_data.configs['data'][3],]
+        elif namespace == "internal_llm_rev_chatgpt":
+            ret = [self.dashboard_data.configs['data'][4],]
+        else:
+            path = f"data/config/{namespace}.json"
+            if not os.path.exists(path):
+                return []
+            with open(path, "r", encoding="utf-8-sig") as f:
+                ret = [{
+                    "config_type": "group",
+                    "name": namespace + " 插件配置",
+                    "description": "",
+                    "body": list(json.load(f).values())
+                },]
+        return ret
+
+    def _generate_outline(self):
+        '''
+        生成配置大纲。目前分为 platform(消息平台配置) 和 llm(语言模型配置) 两大类。
+        插件的info函数中如果带了plugin_type字段，则会被归类到对应的大纲中。目前仅支持 platform 和 llm 两种类型。
+        '''
+        outline = [
+            {
+            "type": "platform",
+            "name": "配置通用消息平台",
+            "body": [
+                {
+                "title": "通用",
+                "desc": "通用平台配置",
+                "namespace": "internal_platform_general",
+                "tag": ""
+                },
+                {
+                "title": "QQ_OFFICIAL",
+                "desc": "QQ官方API，仅支持频道",
+                "namespace": "internal_platform_qq_official",
+                "tag": ""
+                },
+                {
+                "title": "OneBot协议",
+                "desc": "支持cq-http、shamrock等（目前仅支持QQ平台）",
+                "namespace": "internal_platform_qq_gocq",
+                "tag": ""
+                }
+            ]
+            },
+            {
+                "type": "llm",
+                "name": "配置 LLM",
+                "body": [
+                    {
+                        "title": "OpenAI Official",
+                        "desc": "也支持使用官方接口的中转服务",
+                        "namespace": "internal_llm_openai_official",
+                        "tag": ""
+                    },
+                    {
+                        "title": "Rev ChatGPT",
+                        "desc": "早期的逆向ChatGPT，不推荐",
+                        "namespace": "internal_llm_rev_chatgpt",
+                        "tag": ""
+                    }
+                ]
+            }
+        ]
+        for plugin in self.global_object.cached_plugins:
+            for item in outline:
+                if item['type'] == plugin.metadata.plugin_type:
+                    item['body'].append({
+                        "title": plugin.metadata.plugin_name,
+                        "desc": plugin.metadata.desc,
+                        "namespace": plugin.metadata.plugin_name,
+                        "tag": plugin.metadata.plugin_name
+                    })
+        return outline
+
     def register(self, name: str):
         def decorator(func):
             self.funcs[name] = func
             return func
         return decorator
 
+    async def __handle_msg(self, websocket, path):
+        address = websocket.remote_address
+        # self.logger.log(f"和 {address} 建立了 websocket 连接", tag="可视化面板")
+        self.ws_clients[address] = websocket
+        data = ''.join(self.logger.history).replace('\n', '\r\n')
+        await websocket.send(data)
+        while True:
+            try:
+                msg = await websocket.recv()
+            except websockets.exceptions.ConnectionClosedError:
+                # self.logger.log(f"和 {address} 的 websocket 连接已断开", tag="可视化面板")
+                del self.ws_clients[address]
+                break
+            except Exception as e:
+                # self.logger.log(f"和 {path} 的 websocket 连接发生了错误: {e.__str__()}", tag="可视化面板")
+                del self.ws_clients[address]
+                break
+        
+    def run_ws_server(self, loop):
+        asyncio.set_event_loop(loop)
+        loop.run_until_complete(self.ws_server)
+        loop.run_forever()
+
     def run(self):
+        threading.Thread(target=self.run_ws_server, args=(self.loop,)).start()
+        self.logger.log("已启动 websocket 服务器", tag="可视化面板")
         ip_address = gu.get_local_ip_addresses()
         ip_str = f"http://{ip_address}:6185\n\thttp://localhost:6185"
-        gu.log(f"\n\n==================\n您可以访问:\n\n\t{ip_str}\n\n来登录可视化面板。\n注意: 所有配置项现已全量迁移至 cmd_config.json 文件下。您可以登录可视化面板在线修改配置。\n==================\n\n", tag="可视化面板")
-        # self.dashboard_be.run(host="0.0.0.0", port=6185)
-        http_server = make_server('0.0.0.0', 6185, self.dashboard_be)
+        self.logger.log(f"\n==================\n您可访问:\n\n\t{ip_str}\n\n来登录可视化面板，默认账号密码为空。\n注意: 所有配置项现已全量迁移至 cmd_config.json 文件下，可登录可视化面板在线修改配置。\n==================\n", tag="可视化面板")
+        http_server = make_server('0.0.0.0', 6185, self.dashboard_be, threaded=True)
         http_server.serve_forever()
+

addons/plugins/helloworld/README.md

@@ -1,5 +0,0 @@
-# helloworld
-
-QQChannelChatGPT项目的测试插件
-
-A test plugin for QQChannelChatGPT plugin feature

addons/plugins/helloworld/helloworld.py

@@ -1,14 +1,25 @@
+import os
+import shutil
 from nakuru.entities.components import *
 from nakuru import (
     GroupMessage,
     FriendMessage
 )
 from botpy.message import Message, DirectMessage
-from model.platform.qq import QQ
-from cores.qqbot.global_object import (
-    AstrMessageEvent,
-    CommandResult
-)
+flag_not_support = False
+try:
+    from util.plugin_dev.api.v1.config import *
+    from util.plugin_dev.api.v1.bot import (
+        PluginMetadata,
+        PluginType,
+        AstrMessageEvent,
+        CommandResult,
+    )
+    from util.plugin_dev.api.v1.register import register_llm, unregister_llm
+except ImportError:
+    flag_not_support = True
+    print("llms: 导入接口失败。请升级到 AstrBot 最新版本。")
+
 
 '''
 注意改插件名噢！格式：XXXPlugin 或 Main
@@ -19,7 +30,14 @@ class HelloWorldPlugin:
     初始化函数, 可以选择直接pass
     """
     def __init__(self) -> None:
-        print("hello, world!")
+        # 复制旧配置文件到 data 目录下。
+        if os.path.exists("keyword.json"):
+            shutil.move("keyword.json", "data/keyword.json")
+        self.keywords = {}
+        if os.path.exists("data/keyword.json"):
+            self.keywords = json.load(open("data/keyword.json", "r"))
+        else:
+            self.save_keyword()
 
     """
     机器人程序会调用此函数。
@@ -29,20 +47,106 @@ class HelloWorldPlugin:
     """
     def run(self, ame: AstrMessageEvent):
         if ame.message_str == "helloworld":
-            # return True, tuple([True, "Hello World!!", "helloworld"])
             return CommandResult(
                 hit=True,
                 success=True,
                 message_chain=[Plain("Hello World!!")],
                 command_name="helloworld"
             )
+        if ame.message_str.startswith("/keyword") or ame.message_str.startswith("keyword"):
+            return self.handle_keyword_command(ame)
+            
+        ret = self.check_keyword(ame.message_str)
+        if ret: return ret
+
+        return CommandResult(
+            hit=False,
+            success=False,
+            message_chain=None,
+            command_name=None
+        )
+        
+    def handle_keyword_command(self, ame: AstrMessageEvent):
+        l = ame.message_str.split(" ")
+        
+        # 获取图片
+        image_url = ""
+        for comp in ame.message_obj.message:
+            if isinstance(comp, Image) and image_url == "":
+                if comp.url is None:
+                    image_url = comp.file
+                else:
+                    image_url = comp.url
+    
+        command_result = CommandResult(
+            hit=True,
+            success=False,
+            message_chain=None,
+            command_name="keyword"
+        )
+        if len(l) == 1 or (len(l) == 2 and image_url == ""):
+            ret = """【设置关键词回复】
+示例：
+1. keyword <触发词> <回复词>
+keyword hi 你好
+发送 hi 回复你好
+* 回复词支持图片
+
+2. keyword d <触发词>
+keyword d hi
+删除 hi 触发词产生的回复"""
+            command_result.success = True
+            command_result.message_chain = [Plain(ret)]
+            return command_result
+        elif len(l) == 3 and l[1] == "d":
+            if l[2] not in self.keywords:
+                command_result.message_chain = [Plain(f"关键词 {l[2]} 不存在")]
+                return command_result
+            self.keywords.pop(l[2])
+            self.save_keyword()
+            command_result.success = True
+            command_result.message_chain = [Plain("删除成功")]
+            return command_result
         else:
-            return CommandResult(
-                hit=False,
-                success=False,
-                message_chain=None,
-                command_name=None
-            )
+            self.keywords[l[1]] = {
+                "plain_text": " ".join(l[2:]),
+                "image_url": image_url
+            }
+            self.save_keyword()
+            command_result.success = True
+            command_result.message_chain = [Plain("设置成功")]
+            return command_result
+        
+    def save_keyword(self):
+        json.dump(self.keywords, open("data/keyword.json", "w"), ensure_ascii=False)
+        
+        
+    def check_keyword(self, message_str: str):
+        for k in self.keywords:
+            if message_str == k:
+                plain_text = ""
+                if 'plain_text' in self.keywords[k]:
+                    plain_text = self.keywords[k]['plain_text']
+                else:
+                    plain_text = self.keywords[k]
+                image_url = ""
+                if 'image_url' in self.keywords[k]:
+                    image_url = self.keywords[k]['image_url']
+                if image_url != "":
+                    res = [Plain(plain_text), Image.fromURL(image_url)]
+                    return CommandResult(
+                        hit=True,
+                        success=True,
+                        message_chain=res,
+                        command_name="keyword"
+                    )
+                return CommandResult(
+                    hit=True,
+                    success=True,
+                    message_chain=[Plain(plain_text)],
+                    command_name="keyword"
+                )
+
     """
     插件元信息。
     当用户输入 plugin v 插件名称 时，会调用此函数，返回帮助信息。
@@ -59,8 +163,8 @@ class HelloWorldPlugin:
     def info(self):
         return {
             "name": "helloworld",
-            "desc": "测试插件",
-            "help": "测试插件, 回复 helloworld 即可触发",
-            "version": "v1.2",
+            "desc": "这是 AstrBot 的默认插件，支持关键词回复。",
+            "help": "输入 /keyword 查看关键词回复帮助。",
+            "version": "v1.3",
             "author": "Soulter"
         }

cores/monitor/perf.py

@@ -1,23 +0,0 @@
-'''
-监测机器性能
-- Bot 内存使用量
-- CPU 占用率
-'''
-
-import psutil
-from cores.qqbot.global_object import GlobalObject
-import time
-
-def run_monitor(global_object: GlobalObject):
-    '''运行监测'''
-    start_time = time.time()
-    while True:
-        stat = global_object.dashboard_data.stats
-        # 程序占用的内存大小
-        mem = psutil.Process().memory_info().rss / 1024 / 1024 # MB
-        stat['sys_perf'] = {
-            'memory': mem,
-            'cpu': psutil.cpu_percent()
-        }
-        stat['sys_start_time'] = start_time
-        time.sleep(30)

cores/qqbot/global_object.py

@@ -1,113 +0,0 @@
-from model.platform.qqchan import QQChan, NakuruGuildMember, NakuruGuildMessage
-from model.platform.qq import QQ
-from model.provider.provider import Provider
-from addons.dashboard.server import DashBoardData
-from nakuru import (
-    CQHTTP,
-    GroupMessage,
-    GroupMemberIncrease,
-    FriendMessage,
-    GuildMessage,
-    Notify
-)
-from typing import Union
-
-class GlobalObject:
-    '''
-    存放一些公用的数据，用于在不同模块(如core与command)之间传递
-    '''
-    nick: str # gocq 的昵称
-    base_config: dict # config.yaml
-    cached_plugins: dict # 缓存的插件
-    web_search: bool # 是否开启了网页搜索
-    reply_prefix: str
-    admin_qq: str
-    admin_qqchan: str
-    uniqueSession: bool
-    cnt_total: int
-    platform_qq: QQ
-    platform_qqchan: QQChan
-    default_personality: dict
-    dashboard_data: DashBoardData
-    stat: dict
-    
-    def __init__(self):
-        self.nick = None # gocq 的昵称
-        self.base_config = None # config.yaml
-        self.cached_plugins = {} # 缓存的插件
-        self.web_search = False # 是否开启了网页搜索
-        self.reply_prefix = None
-        self.admin_qq = "123456"
-        self.admin_qqchan = "123456"
-        self.uniqueSession = False
-        self.cnt_total = 0
-        self.platform_qq = None
-        self.platform_qqchan = None
-        self.default_personality = None
-        self.dashboard_data = None
-        self.stat = {}
-        '''
-        
-        {
-            "config": {},
-            "session": [
-                {
-                    "platform": "qq",
-                    "session_id": 123456,
-                    "cnt": 0
-                },
-                {...}
-            ],
-            "message": [
-                // 以一小时为单位
-                {
-                    "ts": 1234567,
-                    "cnt": 0
-                }
-            ]
-        }
-        
-        '''
-
-
-class AstrMessageEvent():
-    message_str: str # 纯消息字符串
-    message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage] # 消息对象
-    gocq_platform: QQ
-    qq_sdk_platform: QQChan
-    platform: str # `gocq` 或 `qqchan`
-    role: str # `admin` 或 `member`
-    global_object: GlobalObject # 一些公用数据
-    session_id: int # 会话id (可能是群id，也可能是某个user的id。取决于是否开启了 uniqueSession)
-
-    def __init__(self, message_str: str, 
-                 message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage], 
-                 gocq_platform: QQ, 
-                 qq_sdk_platform: QQChan, 
-                 platform: str, 
-                 role: str, 
-                 global_object: GlobalObject,
-                 llm_provider: Provider = None,
-                 session_id: int = None):
-        self.message_str = message_str
-        self.message_obj = message_obj
-        self.gocq_platform = gocq_platform
-        self.qq_sdk_platform = qq_sdk_platform
-        self.platform = platform
-        self.role = role
-        self.global_object = global_object
-        self.llm_provider = llm_provider
-        self.session_id = session_id
-        
-class CommandResult():
-    '''
-    用于在Command中返回多个值
-    '''
-    def __init__(self, hit: bool, success: bool, message_chain: list, command_name: str = "unknown_command") -> None:
-        self.hit = hit
-        self.success = success
-        self.message_chain = message_chain
-        self.command_name = command_name
-        
-    def _result_tuple(self):
-        return (self.success, self.message_chain, self.command_name)

cores/qqbot/types.py

@@ -0,0 +1,140 @@
+from model.platform.qq_official import NakuruGuildMessage
+from model.provider.provider import Provider as LLMProvider
+from model.platform._platfrom import Platform
+from nakuru import (
+    GroupMessage,
+    FriendMessage,
+    GuildMessage,
+)
+from typing import Union, List, ClassVar
+from types import ModuleType
+from enum import Enum
+from dataclasses import dataclass
+
+class PluginType(Enum):
+    PLATFORM = 'platfrom' # 平台类插件。
+    LLM = 'llm' # 大语言模型类插件
+    COMMON = 'common' # 其他插件
+
+@dataclass
+class PluginMetadata:
+    '''
+    插件的元数据。
+    '''
+    # required
+    plugin_name: str
+    plugin_type: PluginType
+    author: str # 插件作者
+    desc: str # 插件简介
+    version: str # 插件版本
+    
+    # optional
+    repo: str = None # 插件仓库地址
+    
+    def __str__(self) -> str:
+        return f"PluginMetadata({self.plugin_name}, {self.plugin_type}, {self.desc}, {self.version}, {self.repo})"
+    
+@dataclass
+class RegisteredPlugin:
+    '''
+    注册在 AstrBot 中的插件。
+    '''
+    metadata: PluginMetadata
+    plugin_instance: object
+    module_path: str
+    module: ModuleType
+    root_dir_name: str
+
+    def __str__(self) -> str:
+        return f"RegisteredPlugin({self.metadata}, {self.module_path}, {self.root_dir_name})"
+    
+RegisteredPlugins = List[RegisteredPlugin]
+
+@dataclass
+class RegisteredPlatform:
+    '''
+    注册在 AstrBot 中的平台。平台应当实现 Platform 接口。
+    '''
+    platform_name: str
+    platform_instance: Platform
+    origin: str = None # 注册来源
+    
+@dataclass
+class RegisteredLLM:
+    '''
+    注册在 AstrBot 中的大语言模型调用。大语言模型应当实现 LLMProvider 接口。
+    '''
+    llm_name: str
+    llm_instance: LLMProvider
+    origin: str = None # 注册来源
+    
+class GlobalObject:
+    '''
+    存放一些公用的数据，用于在不同模块(如core与command)之间传递
+    '''
+    version: str # 机器人版本
+    nick: str # 用户定义的机器人的别名
+    base_config: dict # config.json 中导出的配置
+    cached_plugins: List[RegisteredPlugin] # 加载的插件
+    platforms: List[RegisteredPlatform]
+    llms: List[RegisteredLLM]
+    
+    web_search: bool # 是否开启了网页搜索
+    reply_prefix: str # 回复前缀
+    unique_session: bool # 是否开启了独立会话
+    cnt_total: int # 总消息数
+    default_personality: dict
+    dashboard_data = None
+    logger: None
+    
+    def __init__(self):
+        self.nick = None # gocq 的昵称
+        self.base_config = None # config.yaml
+        self.cached_plugins = [] # 缓存的插件
+        self.web_search = False # 是否开启了网页搜索
+        self.reply_prefix = None
+        self.unique_session = False
+        self.cnt_total = 0
+        self.platforms = []
+        self.llms = []
+        self.default_personality = None
+        self.dashboard_data = None
+        self.stat = {}
+
+class AstrMessageEvent():
+    '''
+    消息事件。
+    '''
+    context: GlobalObject # 一些公用数据
+    message_str: str # 纯消息字符串
+    message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage] # 消息对象
+    platform: RegisteredPlatform # 来源平台
+    role: str # 基本身份。`admin` 或 `member`
+    session_id: int # 会话 id
+
+    def __init__(self, 
+                 message_str: str, 
+                 message_obj: Union[GroupMessage, FriendMessage, GuildMessage, NakuruGuildMessage], 
+                 platform: RegisteredPlatform, 
+                 role: str,
+                 context: GlobalObject,
+                 session_id: str = None):
+        self.context = context
+        self.message_str = message_str
+        self.message_obj = message_obj
+        self.platform = platform
+        self.role = role
+        self.session_id = session_id
+        
+class CommandResult():
+    '''
+    用于在Command中返回多个值
+    '''
+    def __init__(self, hit: bool, success: bool, message_chain: list, command_name: str = "unknown_command") -> None:
+        self.hit = hit
+        self.success = success
+        self.message_chain = message_chain
+        self.command_name = command_name
+        
+    def _result_tuple(self):
+        return (self.success, self.message_chain, self.command_name)

data/config/astrbot_plugin_llms.json

@@ -0,0 +1,26 @@
+{
+  "llms_claude_cookie": {
+    "config_type": "item",
+    "name": "llms_claude_cookie",
+    "description": "Claude 的 Cookie",
+    "path": "llms_claude_cookie",
+    "value": "hihi",
+    "val_type": "str"
+  },
+  "llms_huggingchat_email": {
+    "config_type": "item",
+    "name": "llms_huggingchat_email",
+    "description": "HuggingChat 的邮箱",
+    "path": "llms_huggingchat_email",
+    "value": "",
+    "val_type": "str"
+  },
+  "llms_huggingchat_psw": {
+    "config_type": "item",
+    "name": "llms_huggingchat_psw",
+    "description": "HuggingChat 的密码",
+    "path": "llms_huggingchat_psw",
+    "value": "",
+    "val_type": "str"
+  }
+}

main.py

@@ -3,49 +3,46 @@ from pip._internal import main as pipmain
 import warnings
 import traceback
 import threading
-import logging
 
 warnings.filterwarnings("ignore")
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 
 def main():
-    logging.basicConfig(
-        level=logging.INFO,
-        format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-        datefmt='%H:%M:%S',
-    )
     # config.yaml 配置文件加载和环境确认
     try:
         import cores.qqbot.core as qqBot
         import yaml
-        from yaml.scanner import ScannerError
         import util.general_utils as gu
         ymlfile =  open(abs_path+"configs/config.yaml", 'r', encoding='utf-8')
         cfg = yaml.safe_load(ymlfile)
     except ImportError as import_error:
+        traceback.print_exc()
         print(import_error)
         input("第三方库未完全安装完毕，请退出程序重试。")
     except FileNotFoundError as file_not_found:
         print(file_not_found)
         input("配置文件不存在，请检查是否已经下载配置文件。")
-    except ScannerError as e:
-        print(traceback.format_exc())
-        input("config.yaml 配置文件格式错误，请遵守 yaml 格式。")
-
+    except BaseException as e:
+        raise e
+        
     # 设置代理
     if 'http_proxy' in cfg and cfg['http_proxy'] != '':
         os.environ['HTTP_PROXY'] = cfg['http_proxy']
     if 'https_proxy' in cfg and cfg['https_proxy'] != '':
         os.environ['HTTPS_PROXY'] = cfg['https_proxy']
     
-    os.environ['NO_PROXY'] = 'cn.bing.com,https://api.sgroup.qq.com'
+    os.environ['NO_PROXY'] = 'https://api.sgroup.qq.com'
 
     # 检查并创建 temp 文件夹
     if not os.path.exists(abs_path + "temp"):
         os.mkdir(abs_path+"temp")
+    if not os.path.exists(abs_path + "data"):
+        os.mkdir(abs_path+"data")
+    if not os.path.exists(abs_path + "data/config"):
+        os.mkdir(abs_path+"data/config")
 
     # 启动主程序（cores/qqbot/core.py）
-    qqBot.initBot(cfg)
+    qqBot.init(cfg)
 
 def check_env(ch_mirror=False):
     if not (sys.version_info.major == 3 and sys.version_info.minor >= 9):
@@ -57,13 +54,13 @@ def check_env(ch_mirror=False):
         pth = 'requirements.txt'
     else:
         pth = 'QQChannelChatGPT'+ os.sep +'requirements.txt'
-    print("正在检查更新第三方库...")
+    print("正在检查或下载第三方库，请耐心等待...")
     try:
         if ch_mirror:
             print("使用阿里云镜像")
-            pipmain(['install', '-r', pth, '-i', 'https://mirrors.aliyun.com/pypi/simple/', '--quiet'])
+            pipmain(['install', '-r', pth, '-i', 'https://mirrors.aliyun.com/pypi/simple/'])
         else:
-            pipmain(['install', '-r', pth, '--quiet'])
+            pipmain(['install', '-r', pth])
     except BaseException as e:
         print(e)
         while True:
@@ -86,18 +83,6 @@ def check_env(ch_mirror=False):
                 break
     print("第三方库检查完毕。")
 
-def get_platform():
-    import platform
-    sys_platform = platform.platform().lower()
-    if "windows" in sys_platform:
-        return "win"
-    elif "macos" in sys_platform:
-        return "mac"
-    elif "linux" in sys_platform:
-        return "linux"
-    else:
-        print("other")
-
 if __name__ == "__main__":
     args = sys.argv
 
@@ -105,15 +90,6 @@ if __name__ == "__main__":
         check_env(True)
     else:
         check_env()
-
-    if '-replit' in args:
-        print("[System] 启动Replit Web保活服务...")
-        try:
-            from util.webapp_replit import keep_alive
-            keep_alive()
-        except BaseException as e:
-            print(e)
-            print(f"[System-err] Replit Web保活服务启动失败:{str(e)}")
     
     t = threading.Thread(target=main, daemon=False)
     t.start()

model/command/command.py

@@ -1,31 +1,29 @@
 import json
-from util import general_utils as gu
-has_git = True
-try:
-    import git.exc
-    from git.repo import Repo
-except BaseException as e:
-    gu.log("你正运行在无Git环境下，暂时将无法使用插件、热更新功能。")
-    has_git = False
-import os
-import sys
-import requests
-from model.provider.provider import Provider
+import inspect
+import aiohttp
+import asyncio
 import json
+
 import util.plugin_util as putil
-import shutil
-import importlib
-from util.cmd_config import CmdConfig as cc
-from model.platform.qq import QQ
-import stat
+import util.updator
+
 from nakuru.entities.components import (
-    Plain,
     Image
 )
-from PIL import Image as PILImage
-from cores.qqbot.global_object import GlobalObject, AstrMessageEvent
-from pip._internal import main as pipmain
-from cores.qqbot.global_object import CommandResult
+from util import general_utils as gu
+from model.provider.provider import Provider
+from util.cmd_config import CmdConfig as cc
+from util.general_utils import Logger
+from cores.qqbot.types import (
+    GlobalObject,
+    AstrMessageEvent,
+    PluginType,
+    CommandResult,
+    RegisteredPlugin,
+    RegisteredPlatform
+)
+
+from typing import List, Tuple
 
 PLATFORM_QQCHAN = 'qqchan'
 PLATFORM_GOCQ = 'gocq'
@@ -35,32 +33,39 @@ class Command:
     def __init__(self, provider: Provider, global_object: GlobalObject = None):
         self.provider = provider
         self.global_object = global_object
+        self.logger: Logger = global_object.logger
 
-    def check_command(self, 
+    async def check_command(self, 
                       message, 
                       session_id: str,
-                      role, 
-                      platform, 
+                      role: str, 
+                      platform: RegisteredPlatform, 
                       message_obj):
+        self.platform = platform
         # 插件
         cached_plugins = self.global_object.cached_plugins
+        # 将消息封装成 AstrMessageEvent 对象
         ame = AstrMessageEvent(
             message_str=message,
             message_obj=message_obj,
-            gocq_platform=self.global_object.platform_qq,
-            qq_sdk_platform=self.global_object.platform_qqchan,
             platform=platform,
             role=role,
-            global_object=self.global_object,
+            context=self.global_object,
             session_id = session_id
         )
-        for k, v in cached_plugins.items():
+        # 从已启动的插件中查找是否有匹配的指令
+        for plugin in cached_plugins:
+            # 过滤掉平台类插件
+            if plugin.metadata.plugin_type == PluginType.PLATFORM:
+                continue
             try:
-                result = v["clsobj"].run(ame)
+                if inspect.iscoroutinefunction(plugin.plugin_instance.run):
+                    result = await plugin.plugin_instance.run(ame)
+                else:
+                    result = await asyncio.to_thread(plugin.plugin_instance.run, ame)
                 if isinstance(result, CommandResult):
                     hit = result.hit
                     res = result._result_tuple()
-                    print(hit, res)
                 elif isinstance(result, tuple):
                     hit = result[0]
                     res = result[1]
@@ -71,45 +76,48 @@ class Command:
             except TypeError as e:
                 # 参数不匹配，尝试使用旧的参数方案
                 try:
-                    hit, res = v["clsobj"].run(message, role, platform, message_obj, self.global_object.platform_qq)
+                    if inspect.iscoroutinefunction(plugin.plugin_instance.run):
+                        hit, res = await plugin.plugin_instance.run(message, role, platform, message_obj, self.global_object.platform_qq)
+                    else:
+                        hit, res = await asyncio.to_thread(plugin.plugin_instance.run, message, role, platform, message_obj, self.global_object.platform_qq)
                     if hit:
                         return True, res
                 except BaseException as e:
-                    gu.log(f"{k}插件异常，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
+                    self.logger.log(f"{plugin.metadata.plugin_name} 插件异常，原因: {str(e)}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
             except BaseException as e:
-                gu.log(f"{k} 插件异常，原因: {str(e)}\n已安装插件: {cached_plugins.keys}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
+                self.logger.log(f"{plugin.metadata.plugin_name} 插件异常，原因: {str(e)}\n如果你没有相关装插件的想法, 请直接忽略此报错, 不影响其他功能的运行。", level=gu.LEVEL_WARNING)
 
         if self.command_start_with(message, "nick"):
             return True, self.set_nick(message, platform, role)
         if self.command_start_with(message, "plugin"):
             return True, self.plugin_oper(message, role, cached_plugins, platform)
         if self.command_start_with(message, "myid") or self.command_start_with(message, "!myid"):
-            return True, self.get_my_id(message_obj)
-        if self.command_start_with(message, "nconf") or self.command_start_with(message, "newconf"):
-            return True, self.get_new_conf(message, role)
+            return True, self.get_my_id(message_obj, platform)
         if self.command_start_with(message, "web"): # 网页搜索
             return True, self.web_search(message)
-        if self.command_start_with(message, "keyword"):
-            return True, self.keyword(message_obj, role)
-        if self.command_start_with(message, "ip"):
-            ip = requests.get("https://myip.ipip.net", timeout=5).text
-            return True, f"机器人 IP 信息：{ip}", "ip"
-            
+        if not self.provider and self.command_start_with(message, "help"):
+            return True, await self.help()
         
         return False, None
-    
+
     def web_search(self, message):
-        if message == "web on":
+        l = message.split(' ')
+        if len(l) == 1:
+            return True, f"网页搜索功能当前状态: {self.global_object.web_search}", "web"
+        elif l[1] == 'on':
             self.global_object.web_search = True
             return True, "已开启网页搜索", "web"
-        elif message == "web off":
+        elif l[1] == 'off':
             self.global_object.web_search = False
             return True, "已关闭网页搜索", "web"
-        return True, f"网页搜索功能当前状态: {self.global_object.web_search}", "web"
 
-    def get_my_id(self, message_obj):
-        return True, f"你的ID：{str(message_obj.sender.tiny_id)}", "plugin"
-            
+    def get_my_id(self, message_obj, platform):
+        try:
+            user_id = str(message_obj.user_id)
+            return True, f"你在此平台上的ID：{user_id}", "plugin"
+        except BaseException as e:
+            return False, f"在{platform}上获取你的ID失败，原因: {str(e)}", "plugin"
+
     def get_new_conf(self, message, role):
         if role != "admin":
             return False, f"你的身份组{role}没有权限使用此指令。", "newconf"
@@ -122,9 +130,7 @@ class Command:
     '''
     插件指令
     '''
-    def plugin_oper(self, message: str, role: str, cached_plugins: dict, platform: str):
-        if not has_git:
-            return False, "你正在运行在无Git环境下，暂时将无法使用插件、热更新功能。", "plugin"
+    def plugin_oper(self, message: str, role: str, cached_plugins: List[RegisteredPlugin], platform: str):
         l = message.split(" ")
         if len(l) < 2:
             p = gu.create_text_image("【插件指令面板】", "安装插件: \nplugin i 插件Github地址\n卸载插件: \nplugin d 插件名 \n重载插件: \nplugin reload\n查看插件列表：\nplugin l\n更新插件: plugin u 插件名\n")
@@ -154,49 +160,27 @@ class Command:
                     return False, f"更新插件失败，原因: {str(e)}。\n建议: 使用 plugin i 指令进行覆盖安装(插件数据可能会丢失)", "plugin"
             elif l[1] == "l":
                 try:
-                    plugin_list_info = "\n".join([f"{k}: \n名称: {v['info']['name']}\n简介: {v['info']['desc']}\n版本: {v['info']['version']}\n作者: {v['info']['author']}\n" for k, v in cached_plugins.items()])
+                    plugin_list_info = ""
+                    for plugin in cached_plugins:
+                        plugin_list_info += f"{plugin.metadata.plugin_name}: \n名称: {plugin.metadata.plugin_name}\n简介: {plugin.metadata.plugin_desc}\n版本: {plugin.metadata.version}\n作者: {plugin.metadata.author}\n"
                     p = gu.create_text_image("【已激活插件列表】", plugin_list_info + "\n使用plugin v 插件名 查看插件帮助\n")
                     return True, [Image.fromFileSystem(p)], "plugin"
                 except BaseException as e:
                     return False, f"获取插件列表失败，原因: {str(e)}", "plugin"
             elif l[1] == "v":
                 try:
-                    if l[2] in cached_plugins:
-                        info = cached_plugins[l[2]]["info"]
+                    info = None
+                    for i in cached_plugins:
+                        if i.metadata.plugin_name == l[2]:
+                            info = i.metadata
+                            break
+                    if info:
                         p = gu.create_text_image(f"【插件信息】", f"名称: {info['name']}\n{info['desc']}\n版本: {info['version']}\n作者: {info['author']}\n\n帮助:\n{info['help']}")
                         return True, [Image.fromFileSystem(p)], "plugin"
                     else:
                         return False, "未找到该插件", "plugin"
                 except BaseException as e:
                     return False, f"获取插件信息失败，原因: {str(e)}", "plugin"
-            # elif l[1] == "reload":
-            #     if role != "admin":
-            #         return False, f"你的身份组{role}没有权限重载插件", "plugin"
-            #     for plugin in cached_plugins:
-            #         try:
-            #             print(f"更新插件 {plugin} 依赖...")
-            #             plugin_path = os.path.join(ppath, cached_plugins[plugin]["root_dir_name"])
-            #             if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
-            #                 mm = pipmain(['install', '-r', os.path.join(plugin_path, "requirements.txt"), "--quiet"])
-            #                 if mm != 0:
-            #                     return False, "插件依赖安装失败，需要您手动pip安装对应插件的依赖。", "plugin"
-            #         except BaseException as e:
-            #             print(f"插件{plugin}依赖安装失败，原因: {str(e)}")
-            #     try:
-            #         ok, err = self.plugin_reload(cached_plugins, all = True)
-            #         if ok:
-            #             return True, "\n重载插件成功~", "plugin"
-            #         else:
-            #             # if os.path.exists(plugin_path):
-            #             #     shutil.rmtree(plugin_path)
-            #             return False, f"插件重载失败。\n跟踪: \n{err}", "plugin"
-            #     except BaseException as e:
-            #         return False, f"插件重载失败，原因: {str(e)}", "plugin"
-
-            elif l[1] == "dev":
-                if role != "admin":
-                    return False, f"你的身份组{role}没有权限开发者模式", "plugin"
-                return True, "cached_plugins: \n" + str(cached_plugins), "plugin"
 
     '''
     nick: 存储机器人的昵称
@@ -220,186 +204,82 @@ class Command:
         return {
             "help": "帮助",
             "keyword": "设置关键词/关键指令回复",
-            "update": "更新面板",
-            "update latest": "更新到最新版本",
-            "update r": "重启机器人",
-            "reset": "重置会话",
+            "update": "更新项目",
             "nick": "设置机器人昵称",
             "plugin": "插件安装、卸载和重载",
-            "web on/off": "启动或关闭网页搜索能力",
-            "/bing": "切换到bing模型",
-            "/gpt": "切换到OpenAI ChatGPT API",
+            "web on/off": "LLM 网页搜索能力",
+            "reset": "重置 LLM 对话",
+            "/gpt": "切换到 OpenAI 官方接口",
             "/revgpt": "切换到网页版ChatGPT",
         }
     
-    def help_messager(self, commands: dict, platform: str, cached_plugins: dict = None):
+    async def help_messager(self, commands: dict, platform: str, cached_plugins: List[RegisteredPlugin] = None):
         try:
-            resp = requests.get("https://soulter.top/channelbot/notice.json").text
-            notice = json.loads(resp)["notice"]
+            async with aiohttp.ClientSession() as session:
+                async with session.get("https://soulter.top/channelbot/notice.json") as resp:
+                    notice = (await resp.json())["notice"]
         except BaseException as e:
             notice = ""
         msg = "# Help Center\n## 指令列表\n"
-        # msg = "Github项目名QQChannelChatGPT, 有问题提交issue, 欢迎Star\n【指令列表】\n"
         for key, value in commands.items():
             msg += f"`{key}` - {value}\n"
         # plugins
         if cached_plugins != None:
-            plugin_list_info = "\n".join([f"`{k}` {v['info']['name']}\n{v['info']['desc']}\n" for k, v in cached_plugins.items()])
+            plugin_list_info = ""
+            for plugin in cached_plugins:
+                plugin_list_info += f"`{plugin.metadata.plugin_name}` {plugin.metadata.desc}\n"
             if plugin_list_info.strip() != "":
                 msg += "\n## 插件列表\n> 使用plugin v 插件名 查看插件帮助\n"
                 msg += plugin_list_info
         msg += notice
 
         try:
-            # p = gu.create_text_image("【Help Center】", msg)
             p = gu.create_markdown_image(msg)
-            return [Image.fromFileSystem(p)]
+            return [Image.fromFileSystem(p),]
         except BaseException as e:
-            gu.log(str(e))
-        finally:
+            self.logger.log(str(e))
             return msg
     
-    # 接受可变参数
     def command_start_with(self, message: str, *args):
+        '''
+        当消息以指定的指令开头时返回True
+        '''
         for arg in args:
             if message.startswith(arg) or message.startswith('/'+arg):
                 return True
         return False
     
-    # keyword: 关键字
-    def keyword(self, message_obj, role: str):
-        if role != "admin":
-            return True, "你没有权限使用该指令", "keyword"
-        
-        plain_text = ""
-        image_url = ""
-
-        for comp in message_obj.message:
-            if isinstance(comp, Plain):
-                plain_text += comp.text
-            elif isinstance(comp, Image) and image_url == "":
-                if comp.url is None:
-                    image_url = comp.file
-                else:
-                    image_url = comp.url
-
-        l = plain_text.split(" ")
-
-        if len(l) < 3 and image_url == "":
-            return True, """
-【设置关键词回复】示例：
-1. keyword hi 你好
-当发送hi的时候会回复你好
-2. keyword /hi 你好
-当发送/hi时会回复你好
-3. keyword d hi
-删除hi关键词的回复
-4. keyword hi <图片>
-当发送hi时会回复图片
-""", "keyword"
-        
-        del_mode = False
-        if l[1] == "d":
-            del_mode = True    
-
-        try:
-            if os.path.exists("keyword.json"):
-                with open("keyword.json", "r", encoding="utf-8") as f:
-                    keyword = json.load(f)
-                    if del_mode:
-                        # 删除关键词
-                        if l[2] not in keyword:
-                            return False, "该关键词不存在", "keyword"
-                        else: del keyword[l[2]]
-                    else:
-                        keyword[l[1]] = {
-                            "plain_text": " ".join(l[2:]),
-                            "image_url": image_url
-                        }
-            else:
-                if del_mode:
-                    return False, "该关键词不存在", "keyword"
-                keyword = {
-                    l[1]: {
-                    "plain_text": " ".join(l[2:]),
-                    "image_url": image_url
-                    }
-                }
-            with open("keyword.json", "w", encoding="utf-8") as f:
-                json.dump(keyword, f, ensure_ascii=False, indent=4)
-                f.flush()
-            if del_mode:
-                return True, "删除成功: "+l[2], "keyword"
-            if image_url == "":
-                return True, "设置成功: "+l[1]+" "+" ".join(l[2:]), "keyword"
-            else:
-                return True, [Plain("设置成功: "+l[1]+" "+" ".join(l[2:])), Image.fromURL(image_url)], "keyword"
-        except BaseException as e:
-            return False, "设置失败: "+str(e), "keyword"
-    
     def update(self, message: str, role: str):
-        if not has_git:
-            return False, "你正在运行在无Git环境下，暂时将无法使用插件、热更新功能。", "update"
         if role != "admin":
-            return True, "你没有权限使用该指令", "keyword"
+            return True, "你没有权限使用该指令", "update"
         l = message.split(" ")
-        try:
-            repo = Repo()
-        except git.exc.InvalidGitRepositoryError:
-            try:
-                repo = Repo(path="QQChannelChatGPT")  
-            except git.exc.InvalidGitRepositoryError:
-                repo = Repo(path="AstrBot")
         if len(l) == 1:
-            curr_branch = repo.active_branch.name
-            # 得到本地版本号和最新版本号
-            now_commit = repo.head.commit
-            # 得到远程3条commit列表, 包含commit信息
-            origin = repo.remotes.origin
-            origin.fetch()
-            commits = list(repo.iter_commits(curr_branch, max_count=3))
-            commits_log = ''
-            index = 1
-            for commit in commits:
-                if commit.message.endswith("\n"):
-                    commits_log += f"[{index}] {commit.message}-----------\n"
-                else:
-                    commits_log += f"[{index}] {commit.message}\n-----------\n"
-                index+=1
-            remote_commit_hash = origin.refs.master.commit.hexsha[:6]
-            return True, f"当前分支: {curr_branch}\n当前版本: {now_commit.hexsha[:6]}\n最新版本: {remote_commit_hash}\n\n3条commit(非最新):\n{str(commits_log)}\nTips:\n1. 使用 update latest 更新至最新版本；\n2. 使用 update checkout <分支名> 切换代码分支。", "update"
+            try:
+                update_info = util.updator.check_update()
+                update_info += "\nTips:\n输入「update latest」更新到最新版本\n输入「update <版本号如v3.1.3>」切换到指定版本\n输入「update r」重启机器人\n"
+                return True, update_info, "update"
+            except BaseException as e:
+                return False, "检查更新失败: "+str(e), "update"
         else:
             if l[1] == "latest":
                 try:
-                    origin = repo.remotes.origin
-                    origin.fetch()
-                    commits = list(repo.iter_commits('master', max_count=1))
-                    commit_log = commits[0].message
-                    tag = "update"
-                    if len(l) == 3 and l[2] == "r":
-                        tag = "update latest r"
-                    return True, f"更新成功。新版本内容: \n{commit_log}\nps:重启后生效。输入update r重启（重启指令不返回任何确认信息）。", tag
+                    release_data = util.updator.request_release_info()
+                    util.updator.update_project(release_data)
+                    return True, "更新成功，重启生效。可输入「update r」重启", "update"
                 except BaseException as e:
                     return False, "更新失败: "+str(e), "update"
-            if l[1] == "r":
-                py = sys.executable
-                os.execl(py, py, *sys.argv)
-            if l[1] == 'checkout':
-                # 切换分支
-                if len(l) < 3:
-                    return False, "请提供分支名，如 /update checkout dev_dashboard", "update"
-                try:
-                    origin = repo.remotes.origin
-                    origin.fetch()
-                    repo.git.checkout(l[2])
-                    
-                    # 获得最新的 commit
-                    commits = list(repo.iter_commits(max_count=1))
-                    commit_log = commits[0].message
-                    
-                    return True, f"切换分支成功，机器人将在 5 秒内重新启动以应用新的功能。\n当前分支: {l[2]}\n此分支最近更新: \n{commit_log}", "update latest r"
-                except BaseException as e:
-                    return False, f"切换分支失败。原因: {str(e)}", "update"
+            elif l[1] == "r":
+                util.updator._reboot()
+            else:
+                if l[1].lower().startswith('v'):
+                    try:
+                        release_data = util.updator.request_release_info(latest=False)
+                        util.updator.update_project(release_data, latest=False, version=l[1])
+                        return True, "更新成功，重启生效。可输入「update r」重启", "update"
+                    except BaseException as e:
+                        return False, "更新失败: "+str(e), "update"
+                else:
+                    return False, "版本号格式错误", "update"
 
     def reset(self):
         return False
@@ -413,8 +293,9 @@ class Command:
     def key(self):
         return False
     
-    def help(self):
-        return False
+    async def help(self):
+        ret = await self.help_messager(self.general_commands(), self.platform, self.global_object.cached_plugins)
+        return True, ret, "help"
     
     def status(self):
         return False
@@ -426,6 +307,4 @@ class Command:
         return False
     
     def draw(self):
-        return False
-    
-    
+        return False

model/command/openai_official.py

@@ -1,27 +1,25 @@
 from model.command.command import Command
 from model.provider.openai_official import ProviderOpenAIOfficial
 from cores.qqbot.personality import personalities
-
-from model.platform.qq import QQ
-from util import general_utils as gu
-from cores.qqbot.global_object import GlobalObject
+from cores.qqbot.types import GlobalObject
 
 class CommandOpenAIOfficial(Command):
     def __init__(self, provider: ProviderOpenAIOfficial, global_object: GlobalObject):
         self.provider = provider
-        self.cached_plugins = {}
         self.global_object = global_object
         self.personality_str = ""
         super().__init__(provider, global_object)
         
-    def check_command(self, 
+    async def check_command(self, 
                       message: str, 
                       session_id: str, 
                       role: str, 
                       platform: str,
                       message_obj):
         self.platform = platform
-        hit, res = super().check_command(
+        
+        # 检查基础指令
+        hit, res = await super().check_command(
             message,
             session_id,
             role,
@@ -29,10 +27,11 @@ class CommandOpenAIOfficial(Command):
             message_obj
         )
         
+        # 这里是这个 LLM 的专属指令
         if hit:
             return True, res
         if self.command_start_with(message, "reset", "重置"):
-            return True, self.reset(session_id, message)
+            return True, await self.reset(session_id, message)
         elif self.command_start_with(message, "his", "历史"):
             return True, self.his(message, session_id)
         elif self.command_start_with(message, "token"):
@@ -41,10 +40,8 @@ class CommandOpenAIOfficial(Command):
             return True, self.gpt()
         elif self.command_start_with(message, "status"):
             return True, self.status()
-        elif self.command_start_with(message, "count"):
-            return True, self.count()
         elif self.command_start_with(message, "help", "帮助"):
-            return True, self.help()
+            return True, await self.help()
         elif self.command_start_with(message, "unset"):
             return True, self.unset(session_id)
         elif self.command_start_with(message, "set"):
@@ -56,11 +53,11 @@ class CommandOpenAIOfficial(Command):
         elif self.command_start_with(message, "key"):
             return True, self.key(message)
         elif self.command_start_with(message, "switch"):
-            return True, self.switch(message)
+            return True, await self.switch(message)
         
         return False, None
     
-    def help(self):
+    async def help(self):
         commands = super().general_commands()
         commands['画'] = '画画'
         commands['key'] = '添加OpenAI key'
@@ -68,15 +65,15 @@ class CommandOpenAIOfficial(Command):
         commands['gpt'] = '查看gpt配置信息'
         commands['status'] = '查看key使用状态'
         commands['token'] = '查看本轮会话token'
-        return True, super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"
+        return True, await super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"
 
         
-    def reset(self, session_id: str, message: str = "reset"):
+    async def reset(self, session_id: str, message: str = "reset"):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "reset"
+            return False, "未启用 OpenAI 官方 API", "reset"
         l = message.split(" ")
         if len(l) == 1:
-            self.provider.forget(session_id)
+            await self.provider.forget(session_id)
             return True, "重置成功", "reset"
         if len(l) == 2 and l[1] == "p":
             self.provider.forget(session_id)
@@ -86,7 +83,7 @@ class CommandOpenAIOfficial(Command):
     
     def his(self, message: str, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "his"
+            return False, "未启用 OpenAI 官方 API", "his"
         #分页，每页5条
         msg = ''
         size_per_page = 3
@@ -104,17 +101,17 @@ class CommandOpenAIOfficial(Command):
     
     def token(self, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "token"
+            return False, "未启用 OpenAI 官方 API", "token"
         return True, f"会话的token数: {self.provider.get_user_usage_tokens(self.provider.session_dict[session_id])}\n系统最大缓存token数: {self.provider.max_tokens}", "token"
 
     def gpt(self):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "gpt"
+            return False, "未启用 OpenAI 官方 API", "gpt"
         return True, f"OpenAI GPT配置:\n {self.provider.chatGPT_configs}", "gpt"
     
     def status(self):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "status"
+            return False, "未启用 OpenAI 官方 API", "status"
         chatgpt_cfg_str = ""
         key_stat = self.provider.get_key_stat()
         index = 1
@@ -134,15 +131,9 @@ class CommandOpenAIOfficial(Command):
             index += 1
         return True, f"⭐使用情况({str(gg_count)}个已用):\n{chatgpt_cfg_str}", "status"
 
-    def count(self):
-        if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型。", "reset"
-        guild_count, guild_msg_count, guild_direct_msg_count, session_count = self.provider.get_stat()
-        return True, f"【本指令部分统计可能已经过时】\n当前会话数: {len(self.provider.session_dict)}\n共有频道数: {guild_count} \n共有消息数: {guild_msg_count}\n私信数: {guild_direct_msg_count}\n历史会话数: {session_count}", "count"
-
     def key(self, message: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "reset"
+            return False, "未启用 OpenAI 官方 API", "reset"
         l = message.split(" ")
         if len(l) == 1:
             msg = "感谢您赞助key，key为官方API使用，请以以下格式赞助:\n/key xxxxx"
@@ -154,7 +145,7 @@ class CommandOpenAIOfficial(Command):
         else:
             return True, "该Key被验证为无效。也许是输入错误了，或者重试。", "key"
 
-    def switch(self, message: str):
+    async def switch(self, message: str):
         '''
         切换账号
         '''
@@ -176,7 +167,7 @@ class CommandOpenAIOfficial(Command):
                 else:
                     try:
                         new_key = list(key_stat.keys())[index-1]
-                        ret = self.provider.check_key(new_key)
+                        ret = await self.provider.check_key(new_key)
                         self.provider.set_key(new_key)
                     except BaseException as e:
                         return True, "账号切换失败，原因: " + str(e), "switch"
@@ -188,14 +179,14 @@ class CommandOpenAIOfficial(Command):
 
     def unset(self, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "unset"
+            return False, "未启用 OpenAI 官方 API", "unset"
         self.provider.curr_personality = {}
         self.provider.forget(session_id)
         return True, "已清除人格并重置历史记录。", "unset"
 
     def set(self, message: str, session_id: str):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "set"
+            return False, "未启用 OpenAI 官方 API", "set"
         l = message.split(" ")
         if len(l) == 1:
             return True, f"【人格文本由PlexPt开源项目awesome-chatgpt-pr \
@@ -267,7 +258,7 @@ class CommandOpenAIOfficial(Command):
             
     def draw(self, message):
         if self.provider is None:
-            return False, "未启动OpenAI ChatGPT语言模型.", "draw"
+            return False, "未启用 OpenAI 官方 API", "draw"
         if message.startswith("/画"):
             message = message[2:]
         elif message.startswith("画"):
@@ -279,9 +270,4 @@ class CommandOpenAIOfficial(Command):
         except Exception as e:
             if 'exceeded' in str(e):
                 return f"OpenAI API错误。原因：\n{str(e)} \n超额了。可自己搭建一个机器人(Github仓库：QQChannelChatGPT)"
-            return False, f"图片生成失败: {e}", "draw"
-        
-    
-
-    
-    
+            return False, f"图片生成失败: {e}", "draw"

model/command/rev_chatgpt.py

@@ -1,25 +1,23 @@
 from model.command.command import Command
 from model.provider.rev_chatgpt import ProviderRevChatGPT
-from model.platform.qq import QQ
 from cores.qqbot.personality import personalities
-from cores.qqbot.global_object import GlobalObject
+from cores.qqbot.types import GlobalObject
 
 class CommandRevChatGPT(Command):
     def __init__(self, provider: ProviderRevChatGPT, global_object: GlobalObject):
         self.provider = provider
-        self.cached_plugins = {}
         self.global_object = global_object
         self.personality_str = ""
         super().__init__(provider, global_object)
 
-    def check_command(self, 
+    async def check_command(self, 
                       message: str, 
                       session_id: str,
                       role: str, 
                       platform: str,
                       message_obj):
         self.platform = platform
-        hit, res = super().check_command(
+        hit, res = await super().check_command(
             message,
             session_id,
             role,
@@ -30,7 +28,7 @@ class CommandRevChatGPT(Command):
         if hit:
             return True, res
         if self.command_start_with(message, "help", "帮助"):
-            return True, self.help()
+            return True, await self.help()
         elif self.command_start_with(message, "reset"):
             return True, self.reset(session_id, message)
         elif self.command_start_with(message, "update"):
@@ -128,7 +126,7 @@ class CommandRevChatGPT(Command):
         else:
             return True, "参数过多。", "switch"
 
-    def help(self):
+    async def help(self):
         commands = super().general_commands()
         commands['set'] = '设置人格'
-        return True, super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"
+        return True, await super().help_messager(commands, self.platform, self.global_object.cached_plugins), "help"

model/command/rev_edgegpt.py

@@ -1,52 +0,0 @@
-from model.command.command import Command
-from model.provider.rev_edgegpt import ProviderRevEdgeGPT
-import asyncio
-from model.platform.qq import QQ
-from cores.qqbot.global_object import GlobalObject
-
-class CommandRevEdgeGPT(Command):
-    def __init__(self, provider: ProviderRevEdgeGPT, global_object: GlobalObject):
-        self.provider = provider
-        self.cached_plugins = {}
-        self.global_object = global_object
-        super().__init__(provider, global_object)
-
-    def check_command(self, 
-                      message: str, 
-                      session_id: str, 
-                      role: str, 
-                      platform: str,
-                      message_obj):
-        self.platform = platform
-
-        hit, res = super().check_command(
-            message,
-            session_id,
-            role,
-            platform,
-            message_obj
-        )
-        
-        if hit:
-            return True, res
-        if self.command_start_with(message, "reset"):
-            return True, self.reset()
-        elif self.command_start_with(message, "help"):
-            return True, self.help()
-        elif self.command_start_with(message, "update"):
-            return True, self.update(message, role)
-
-        return False, None
-    
-    def reset(self, loop = None):
-        if self.provider is None:
-            return False, "未启动Bing语言模型.", "reset"
-        res = asyncio.run_coroutine_threadsafe(self.provider.forget(), loop).result()
-        print(res)
-        if res:
-            return res, "重置成功", "reset"
-        else:
-            return res, "重置失败", "reset"
-    
-    def help(self):
-        return True, super().help_messager(super().general_commands(), self.platform, self.global_object.cached_plugins), "help"

model/platform/_message_result.py

@@ -0,0 +1,8 @@
+from dataclasses import dataclass
+from typing import Union, Optional
+
+@dataclass
+class MessageResult():
+    result_message: Union[str, list]
+    is_command_call: Optional[bool] = False
+    callback: Optional[callable] = None

model/platform/_nakuru_translation_layer.py

@@ -0,0 +1,77 @@
+from nakuru.entities.components import Plain, At, Image
+from botpy.message import Message, DirectMessage
+
+class NakuruGuildMember():
+    tiny_id: int # 发送者识别号
+    user_id: int # 发送者识别号
+    title: str 
+    nickname: str # 昵称
+    role: int # 角色
+    icon_url: str # 头像url
+
+class NakuruGuildMessage():
+    type: str = "GuildMessage"
+    self_id: int # bot的qq号
+    self_tiny_id: int # bot的qq号
+    sub_type: str # 消息类型
+    message_id: str # 消息id
+    guild_id: int # 频道号 
+    channel_id: int # 子频道号
+    user_id: int # 发送者qq号
+    message: list # 消息内容
+    sender: NakuruGuildMember # 发送者信息
+    raw_message: Message
+
+    def __str__(self) -> str:
+        return str(self.__dict__)
+
+# gocq-频道SDK兼容层（发）
+def gocq_compatible_send(gocq_message_chain: list):
+    plain_text = ""
+    image_path = None # only one img supported
+    for i in gocq_message_chain:
+        if isinstance(i, Plain):
+            plain_text += i.text
+        elif isinstance(i, Image) and image_path == None:
+            if i.path is not None:
+                image_path = i.path
+            else:
+                image_path = i.file
+    return plain_text, image_path
+
+# gocq-频道SDK兼容层（收）
+def gocq_compatible_receive(message: Message) -> NakuruGuildMessage:
+    ngm = NakuruGuildMessage()
+    try:
+        ngm.self_id = message.mentions[0].id
+        ngm.self_tiny_id = message.mentions[0].id
+    except:
+        ngm.self_id = 0
+        ngm.self_tiny_id = 0
+
+    ngm.sub_type = "normal"
+    ngm.message_id = message.id
+    ngm.guild_id = int(message.guild_id)
+    ngm.channel_id = int(message.channel_id)
+    ngm.user_id = int(message.author.id)
+    msg = []
+    plain_content = message.content.replace("<@!"+str(ngm.self_id)+">", "").strip()
+    msg.append(Plain(plain_content))
+    if message.attachments:
+        for i in message.attachments:
+            if i.content_type.startswith("image"):
+                url = i.url
+                if not url.startswith("http"):
+                    url = "https://"+url
+                img = Image.fromURL(url)
+                msg.append(img)
+    ngm.message = msg
+    ngm.sender = NakuruGuildMember()
+    ngm.sender.tiny_id = int(message.author.id)
+    ngm.sender.user_id = int(message.author.id)
+    ngm.sender.title = ""
+    ngm.sender.nickname = message.author.username
+    ngm.sender.role = 0
+    ngm.sender.icon_url = message.author.avatar
+    ngm.raw_message = message
+    return ngm

model/platform/_platfrom.py

@@ -0,0 +1,70 @@
+import abc
+from typing import Union
+from nakuru import (
+    GuildMessage,
+    GroupMessage,
+    FriendMessage,
+)
+from ._nakuru_translation_layer import (
+    NakuruGuildMessage,
+)
+from nakuru.entities.components import Plain, At, Image
+
+
+class Platform():
+    def __init__(self, message_handler: callable) -> None:
+        '''
+        初始化平台的各种接口
+        '''
+        self.message_handler = message_handler
+        pass
+
+    @abc.abstractmethod
+    async def handle_msg():
+        '''
+        处理到来的消息
+        '''
+        pass
+
+    @abc.abstractmethod
+    async def reply_msg():
+        '''
+        回复消息（被动发送）
+        '''
+        pass
+
+    @abc.abstractmethod
+    async def send_msg(target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
+        '''
+        发送消息（主动发送）
+        '''
+        pass
+
+    @abc.abstractmethod
+    async def send(target: Union[GuildMessage, GroupMessage, FriendMessage, str], message: Union[str, list]):
+        '''
+        发送消息（主动发送）同 send_msg()
+        '''
+        pass
+    
+    def parse_message_outline(self, message: Union[GuildMessage, GroupMessage, FriendMessage, str, list]) -> str:
+        '''
+        将消息解析成大纲消息形式。
+        如: xxxxx[图片]xxxxx
+        '''
+        if isinstance(message, str):
+            return message
+        ret = ''
+        ls_to_parse = message if isinstance(message, list) else message.message
+        try:
+            for node in ls_to_parse:
+                if isinstance(node, Plain):
+                    ret += node.text
+                elif isinstance(node, At):
+                    ret += f'[At: {node.name}/{node.qq}]'
+                elif isinstance(node, Image):
+                    ret += '[图片]'
+        except Exception as e:
+            pass
+        ret.replace('\n', '')
+        return ret

model/platform/qq.py

@@ -1,190 +0,0 @@
-from nakuru.entities.components import Plain, At, Image, Node
-from util import general_utils as gu
-from util.cmd_config import CmdConfig
-import asyncio
-from nakuru import (
-    CQHTTP,
-    GuildMessage,
-    GroupMessage,
-    FriendMessage
-)
-from typing import Union
-import time
-
-
-class FakeSource:
-    def __init__(self, type, group_id):
-        self.type = type
-        self.group_id = group_id
-    
-class QQ:
-    def __init__(self, is_start: bool, cc: CmdConfig = None, gocq_loop = None) -> None:
-        self.is_start = is_start
-        self.gocq_loop = gocq_loop
-        self.cc = cc
-        self.waiting = {}
-        self.gocq_cnt = 0
-
-    def run_bot(self, gocq):
-        self.client: CQHTTP = gocq
-        self.client.run()
-
-    def get_msg_loop(self):
-        return self.gocq_loop
-    
-    def get_cnt(self):
-        return self.gocq_cnt
-    
-    def set_cnt(self, cnt):
-        self.gocq_cnt = cnt
-
-    async def send_qq_msg(self, 
-                          source, 
-                          res,
-                          image_mode=None):
-        self.gocq_cnt += 1
-        if not self.is_start:
-            raise Exception("管理员未启动GOCQ平台")
-        """
-         res可以是一个数组, 也就是gocq的消息链。
-         插件开发者请使用send方法, 可以不用直接调用这个方法。
-        """
-        gu.log("回复GOCQ消息: "+str(res), level=gu.LEVEL_INFO, tag="GOCQ", max_len=300)
-
-        if isinstance(source, int):
-            source = FakeSource("GroupMessage", source)
-        
-        # str convert to CQ Message Chain
-        if isinstance(res, str):
-            res_str = res
-            res = []
-            if source.type == "GroupMessage" and not isinstance(source, FakeSource):
-                res.append(At(qq=source.user_id))
-            res.append(Plain(text=res_str))
-
-        # if image mode, put all Plain texts into a new picture.
-        if image_mode is None:
-            image_mode = self.cc.get('qq_pic_mode', False)
-        if image_mode and isinstance(res, list):
-            plains = []
-            news = []
-            for i in res:
-                if isinstance(i, Plain):
-                    plains.append(i.text)
-                else:
-                    news.append(i)
-            plains_str = "".join(plains).strip()
-            if plains_str != "" and len(plains_str) > 50:
-                p = gu.create_markdown_image("".join(plains))
-                news.append(Image.fromFileSystem(p))
-                res = news
-
-        # 回复消息链
-        if isinstance(res, list) and len(res) > 0:
-            if source.type == "GuildMessage":
-                await self.client.sendGuildChannelMessage(source.guild_id, source.channel_id, res)
-                return
-            elif source.type == "FriendMessage":
-                await self.client.sendFriendMessage(source.user_id, res)
-                return
-            elif source.type == "GroupMessage":
-                # 过长时forward发送
-                plain_text_len = 0
-                image_num = 0
-                for i in res:
-                    if isinstance(i, Plain):
-                        plain_text_len += len(i.text)
-                    elif isinstance(i, Image):
-                        image_num += 1
-                if plain_text_len > self.cc.get('qq_forward_threshold', 200):
-                    # 删除At
-                    for i in res:
-                        if isinstance(i, At):
-                            res.remove(i)
-                    node = Node(res)
-                    # node.content = res
-                    node.uin = 123456
-                    node.name = f"bot"
-                    node.time = int(time.time())
-                    # print(node)
-                    nodes=[node]
-                    await self.client.sendGroupForwardMessage(source.group_id, nodes)
-                    return
-                await self.client.sendGroupMessage(source.group_id, res)
-                return
-
-    def send(self, 
-            to,
-            res,
-            image_mode=False,
-            ):
-        '''
-        提供给插件的发送QQ消息接口, 不用在外部await。
-        参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
-        第三个参数是是否开启图片模式，如果开启，那么所有纯文字信息都会被合并成一张图片。
-        '''
-        try:
-            asyncio.run_coroutine_threadsafe(self.send_qq_msg(to, res, image_mode), self.gocq_loop).result()
-        except BaseException as e:
-            raise e
-        
-    def send_guild(self, 
-            message_obj,
-            res,
-            ):
-        '''
-        提供给插件的发送GOCQ QQ频道消息接口, 不用在外部await。
-        参数说明：第一个参数必须是消息对象, 第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
-        '''
-        try:
-            asyncio.run_coroutine_threadsafe(self.send_qq_msg(message_obj, res), self.gocq_loop).result()
-        except BaseException as e:
-            raise e
-
-    def create_text_image(title: str, text: str, max_width=30, font_size=20):
-        '''
-        文本转图片。
-        title: 标题
-        text: 文本内容
-        max_width: 文本宽度最大值（默认30）
-        font_size: 字体大小（默认20）
-
-        返回：文件路径
-        '''
-        try:
-            img = gu.word2img(title, text, max_width, font_size)
-            p = gu.save_temp_img(img)
-            return p
-        except Exception as e:
-            raise e
-
-    def wait_for_message(self, group_id) -> Union[GroupMessage, FriendMessage, GuildMessage]:
-        '''
-        等待下一条消息，超时 300s 后抛出异常
-        '''
-        self.waiting[group_id] = ''
-        cnt = 0
-        while True:
-            if group_id in self.waiting and self.waiting[group_id] != '':
-                # 去掉
-                ret = self.waiting[group_id]
-                del self.waiting[group_id]
-                return ret
-            cnt += 1
-            if cnt > 300:
-                raise Exception("等待消息超时。")
-            time.sleep(1)
-
-    def get_client(self):
-        return self.client
-
-    def nakuru_method_invoker(self, func, *args, **kwargs):
-        """
-        返回一个方法调用器，可以用来立即调用nakuru的方法。
-        """
-        try:
-            ret = asyncio.run_coroutine_threadsafe(func(*args, **kwargs), self.gocq_loop).result()
-            return ret
-        except BaseException as e:
-            raise e
-

model/platform/qq_gocq.py

@@ -0,0 +1,300 @@
+from nakuru.entities.components import Plain, At, Image, Node
+from util import general_utils as gu
+from util.cmd_config import CmdConfig
+import asyncio
+from nakuru import (
+    CQHTTP,
+    GuildMessage,
+    GroupMessage,
+    FriendMessage,
+    GroupMemberIncrease,
+    Notify
+)
+from typing import Union
+import time
+
+from ._platfrom import Platform
+
+
+class FakeSource:
+    def __init__(self, type, group_id):
+        self.type = type
+        self.group_id = group_id
+
+    
+class QQGOCQ(Platform):
+    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+        super().__init__(message_handler)
+
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+
+        self.waiting = {}
+        self.cc = CmdConfig()
+        self.cfg = cfg
+        self.logger: gu.Logger = global_object.logger
+
+        try:
+            self.nick_qq = cfg['nick_qq']
+        except:
+            self.nick_qq = ["ai","!","！"]
+        nick_qq = self.nick_qq
+        if isinstance(nick_qq, str):
+            nick_qq = [nick_qq]
+        
+        self.unique_session = cfg['uniqueSessionMode']
+        self.pic_mode = cfg['qq_pic_mode']
+
+        self.client = CQHTTP(
+            host=self.cc.get("gocq_host", "127.0.0.1"),
+            port=self.cc.get("gocq_websocket_port", 6700),
+            http_port=self.cc.get("gocq_http_port", 5700),
+        )
+        gocq_app = self.client
+
+        self.announcement = self.cc.get("announcement", "欢迎新人！")
+
+        @gocq_app.receiver("GroupMessage")
+        async def _(app: CQHTTP, source: GroupMessage):
+            if self.cc.get("gocq_react_group", True):
+                if isinstance(source.message[0], Plain):
+                    await self.handle_msg(source, True)
+                elif isinstance(source.message[0], At):
+                    if source.message[0].qq == source.self_id:
+                        await self.handle_msg(source, True)
+                else:
+                    return
+            
+        @gocq_app.receiver("FriendMessage")
+        async def _(app: CQHTTP, source: FriendMessage):
+            if self.cc.get("gocq_react_friend", True):
+                if isinstance(source.message[0], Plain):
+                    await self.handle_msg(source, False)
+                else:
+                    return
+            
+        @gocq_app.receiver("GroupMemberIncrease")
+        async def _(app: CQHTTP, source: GroupMemberIncrease):
+            if self.cc.get("gocq_react_group_increase", True):
+
+                await app.sendGroupMessage(source.group_id, [
+                    Plain(text = self.announcement)
+                ])
+
+        @gocq_app.receiver("Notify")
+        async def _(app: CQHTTP, source: Notify):
+            print(source)
+            if source.sub_type == "poke" and source.target_id == source.self_id:
+                await self.handle_msg(source, False)
+
+        @gocq_app.receiver("GuildMessage")
+        async def _(app: CQHTTP, source: GuildMessage):
+            if self.cc.get("gocq_react_guild", True):
+                if isinstance(source.message[0], Plain):
+                    await self.handle_msg(source, True)
+                elif isinstance(source.message[0], At):
+                    if source.message[0].qq == source.self_tiny_id:
+                        await self.handle_msg(source, True)
+                else:
+                    return
+        
+    def run(self):
+        self.client.run()
+                
+    async def handle_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, Notify], is_group: bool):
+        self.logger.log(f"{message.user_id} -> {self.parse_message_outline(message)}", tag="QQ_GOCQ")
+        # 判断是否响应消息
+        resp = False
+        if not is_group:
+            resp = True
+        else:
+            for i in message.message:
+                if isinstance(i, At):
+                    if message.type == "GuildMessage":
+                        if i.qq == message.user_id or i.qq == message.self_tiny_id:
+                            resp = True
+                    if message.type == "FriendMessage":
+                        if i.qq == message.self_id:
+                            resp = True
+                    if message.type == "GroupMessage":
+                        if i.qq == message.self_id:
+                            resp = True
+                elif isinstance(i, Plain):
+                    for nick in self.nick_qq:
+                        if nick != '' and i.text.strip().startswith(nick):
+                            resp = True
+                            break
+                
+        if not resp: return
+        
+        # 解析 session_id
+        if self.unique_session or not is_group:
+            session_id = message.user_id
+        elif message.type == "GroupMessage":
+            session_id = message.group_id
+        elif message.type == "GuildMessage":
+            session_id = message.channel_id
+        else:
+            session_id = message.user_id
+
+        # 解析 role
+        sender_id = str(message.user_id)
+        if sender_id == self.cc.get('admin_qq', '') or \
+        sender_id in self.cc.get('other_admins', []):
+            role = 'admin'
+        else:
+            role = 'member'
+
+        message_result = await self.message_handler(
+            message=message,
+            session_id=session_id,
+            role=role,
+            platform='gocq'
+        )
+
+        if message_result is None:
+            return
+        await self.reply_msg(message, message_result.result_message)
+        if message_result.callback is not None:
+            message_result.callback()
+        
+        # 如果是等待回复的消息
+        if session_id in self.waiting and self.waiting[session_id] == '':
+            self.waiting[session_id] = message
+
+    async def reply_msg(self,
+                        message: Union[GroupMessage, FriendMessage, GuildMessage, Notify],
+                        result_message: list):
+        """
+        插件开发者请使用send方法, 可以不用直接调用这个方法。
+        """
+        source = message
+        res = result_message
+        
+        self.logger.log(f"{source.user_id} <- {self.parse_message_outline(res)}", tag="QQ_GOCQ")
+
+        if isinstance(source, int):
+            source = FakeSource("GroupMessage", source)
+        
+        # str convert to CQ Message Chain
+        if isinstance(res, str):
+            res_str = res
+            res = []
+            if source.type == "GroupMessage" and not isinstance(source, FakeSource):
+                res.append(At(qq=source.user_id))
+            res.append(Plain(text=res_str))
+
+        # if image mode, put all Plain texts into a new picture.
+        if self.pic_mode and isinstance(res, list):
+            plains = []
+            news = []
+            for i in res:
+                if isinstance(i, Plain):
+                    plains.append(i.text)
+                else:
+                    news.append(i)
+            plains_str = "".join(plains).strip()
+            if plains_str != "" and len(plains_str) > 50:
+                p = gu.create_markdown_image("".join(plains))
+                news.append(Image.fromFileSystem(p))
+                res = news
+
+        # 回复消息链
+        if isinstance(res, list) and len(res) > 0:
+            if source.type == "GuildMessage":
+                await self.client.sendGuildChannelMessage(source.guild_id, source.channel_id, res)
+                return
+            elif source.type == "FriendMessage":
+                await self.client.sendFriendMessage(source.user_id, res)
+                return
+            elif source.type == "GroupMessage":
+                # 过长时forward发送
+                plain_text_len = 0
+                image_num = 0
+                for i in res:
+                    if isinstance(i, Plain):
+                        plain_text_len += len(i.text)
+                    elif isinstance(i, Image):
+                        image_num += 1
+                if plain_text_len > self.cc.get('qq_forward_threshold', 200):
+                    # 删除At
+                    for i in res:
+                        if isinstance(i, At):
+                            res.remove(i)
+                    node = Node(res)
+                    # node.content = res
+                    node.uin = 123456
+                    node.name = f"bot"
+                    node.time = int(time.time())
+                    # print(node)
+                    nodes=[node]
+                    await self.client.sendGroupForwardMessage(source.group_id, nodes)
+                    return
+                await self.client.sendGroupMessage(source.group_id, res)
+                return
+
+    async def send_msg(self, message: Union[GroupMessage, FriendMessage, GuildMessage, Notify], result_message: list):
+        '''
+        提供给插件的发送QQ消息接口。
+        参数说明：第一个参数可以是消息对象，也可以是QQ群号。第二个参数是消息内容（消息内容可以是消息链列表，也可以是纯文字信息）。
+        '''
+        try:
+            await self.reply_msg(message, result_message)
+        except BaseException as e:
+            raise e
+    
+    async def send(self, 
+            to,
+            res):
+        '''
+        同 send_msg()
+        '''
+        await self.reply_msg(to, res)
+
+    def create_text_image(title: str, text: str, max_width=30, font_size=20):
+        '''
+        文本转图片。
+        title: 标题
+        text: 文本内容
+        max_width: 文本宽度最大值（默认30）
+        font_size: 字体大小（默认20）
+
+        返回：文件路径
+        '''
+        try:
+            img = gu.word2img(title, text, max_width, font_size)
+            p = gu.save_temp_img(img)
+            return p
+        except Exception as e:
+            raise e
+
+    def wait_for_message(self, group_id) -> Union[GroupMessage, FriendMessage, GuildMessage]:
+        '''
+        等待下一条消息，超时 300s 后抛出异常
+        '''
+        self.waiting[group_id] = ''
+        cnt = 0
+        while True:
+            if group_id in self.waiting and self.waiting[group_id] != '':
+                # 去掉
+                ret = self.waiting[group_id]
+                del self.waiting[group_id]
+                return ret
+            cnt += 1
+            if cnt > 300:
+                raise Exception("等待消息超时。")
+            time.sleep(1)
+
+    def get_client(self):
+        return self.client
+
+    async def nakuru_method_invoker(self, func, *args, **kwargs):
+        """
+        返回一个方法调用器，可以用来立即调用nakuru的方法。
+        """
+        try:
+            ret = func(*args, **kwargs)
+            return ret
+        except BaseException as e:
+            raise e
+    

model/platform/qq_official.py

@@ -0,0 +1,238 @@
+import io
+import botpy
+from PIL import Image as PILImage
+from botpy.message import Message, DirectMessage
+import re
+import asyncio
+import aiohttp
+from util import general_utils as gu
+
+from botpy.types.message import Reference
+from botpy import Client
+import time
+from ._platfrom import Platform
+from ._nakuru_translation_layer import(
+    NakuruGuildMessage, 
+    gocq_compatible_receive, 
+    gocq_compatible_send
+)
+from typing import Union
+
+# QQ 机器人官方框架
+class botClient(Client):
+    def set_platform(self, platform: 'QQOfficial'):
+        self.platform = platform
+
+    # 收到频道消息
+    async def on_at_message_create(self, message: Message):
+        # 转换层
+        nakuru_guild_message = gocq_compatible_receive(message)
+        await self.platform.handle_msg(nakuru_guild_message, True)
+
+    # 收到私聊消息
+    async def on_direct_message_create(self, message: DirectMessage):
+        # 转换层
+        nakuru_guild_message = gocq_compatible_receive(message)
+        await self.platform.handle_msg(nakuru_guild_message, False)
+
+class QQOfficial(Platform):
+
+    def __init__(self, cfg: dict, message_handler: callable, global_object) -> None:
+        super().__init__(message_handler)
+
+        self.loop = asyncio.new_event_loop()
+        asyncio.set_event_loop(self.loop)
+        
+        self.waiting: dict = {}
+
+        self.cfg = cfg
+        self.appid = cfg['qqbot']['appid']
+        self.token = cfg['qqbot']['token']
+        self.secret = cfg['qqbot_secret']
+        self.unique_session = cfg['uniqueSessionMode']
+        self.logger: gu.Logger = global_object.logger
+
+        self.intents = botpy.Intents(
+            public_guild_messages=True,
+            direct_message=cfg['direct_message_mode']
+        )
+        self.client = botClient(
+            intents=self.intents,
+            bot_log=False
+        )
+        self.client.set_platform(self)
+
+    def run(self):
+        try:
+            self.loop.run_until_complete(self.client.run(
+                appid=self.appid, 
+                secret=self.secret
+            ))
+        except BaseException as e:
+            print(e)
+            self.client = botClient(
+                intents=self.intents,
+                bot_log=False
+            )
+            self.client.set_platform(self)
+            self.client.run(
+                appid=self.appid, 
+                token=self.token
+            )
+
+    async def handle_msg(self, message: NakuruGuildMessage, is_group: bool):
+        _t = "/私聊" if not is_group else ""
+        self.logger.log(f"{message.sender.nickname}({message.sender.tiny_id}{_t}) -> {self.parse_message_outline(message)}", tag="QQ_OFFICIAL")
+        # 解析出 session_id
+        if self.unique_session or not is_group:
+            session_id = message.sender.user_id
+        else:
+            session_id = message.channel_id
+
+        # 解析出 role
+        sender_id = str(message.sender.tiny_id)
+        if sender_id == self.cfg['admin_qqchan'] or \
+        sender_id in self.cfg['other_admins']:
+            role = 'admin'
+        else:
+            role = 'member'
+
+        message_result = await self.message_handler(
+            message=message,
+            session_id=session_id,
+            role=role,
+            platform='qqchan'
+        )
+
+        if message_result is None:
+            return
+
+        await self.reply_msg(is_group, message, message_result.result_message)
+        if message_result.callback is not None:
+            message_result.callback()
+
+        # 如果是等待回复的消息
+        if session_id in self.waiting and self.waiting[session_id] == '':
+            self.waiting[session_id] = message
+
+    async def reply_msg(self, 
+                is_group: bool,
+                message: NakuruGuildMessage, 
+                res: Union[str, list]):
+        '''
+        回复频道消息
+        '''
+        self.logger.log(f"{message.sender.nickname}({message.sender.tiny_id}) <- {self.parse_message_outline(res)}", tag="QQ_OFFICIAL")
+
+        plain_text = ''
+        image_path = ''
+        msg_ref = None
+
+        if isinstance(res, list):
+            plain_text, image_path = gocq_compatible_send(res)
+        elif isinstance(res, str):
+            plain_text = res
+            
+        if self.cfg['qq_pic_mode']:
+            # 文本转图片，并且加上原来的图片
+            if plain_text != '' or image_path != '':
+                if image_path is not None and image_path != '':
+                    if image_path.startswith("http"):
+                        plain_text += "\n\n" + "![](" + image_path + ")"
+                    else:
+                        plain_text += "\n\n" + "![](file:///" + image_path + ")"
+                image_path = gu.create_markdown_image("".join(plain_text))
+                plain_text = ""
+
+        else:
+            if image_path is not None and image_path != '':
+                msg_ref = None
+                if image_path.startswith("http"):
+                    async with aiohttp.ClientSession() as session:
+                        async with session.get(image_path) as response:
+                            if response.status == 200:
+                                image = PILImage.open(io.BytesIO(await response.read()))
+                                image_path = gu.save_temp_img(image)
+
+        if message.raw_message is not None and image_path == '': # file_image与message_reference不能同时传入
+            msg_ref = Reference(message_id=message.raw_message.id, ignore_get_message_error=False)
+        
+        # 到这里，我们得到了 plain_text，image_path，msg_ref
+        data = {
+            'content': plain_text,
+            'msg_id': message.message_id,
+            'message_reference': msg_ref
+        }
+        if is_group:
+            data['channel_id'] = str(message.channel_id)
+        else:
+            data['guild_id'] = str(message.guild_id)
+        if image_path != '':
+            data['file_image'] = image_path
+
+        try:
+            await self._send_wrapper(**data)
+        except BaseException as e:
+            print(e)
+            # 分割过长的消息
+            if "msg over length" in str(e):
+                split_res = []
+                split_res.append(plain_text[:len(plain_text)//2])      
+                split_res.append(plain_text[len(plain_text)//2:])
+                for i in split_res:
+                    data['content'] = i
+                    await self._send_wrapper(**data)
+            else:
+                # 发送qq信息
+                try:
+                    # 防止被qq频道过滤消息
+                    plain_text = plain_text.replace(".", " . ")
+                    await self._send_wrapper(**data)
+
+                except BaseException as e:
+                    try:
+                        data['content'] = str.join(" ", plain_text)
+                        await self._send_wrapper(**data)
+                    except BaseException as e:
+                        plain_text = re.sub(r'(https|http)?:\/\/(\w|\.|\/|\?|\=|\&|\%)*\b', '[被隐藏的链接]', str(e), flags=re.MULTILINE)
+                        plain_text = plain_text.replace(".", "·")
+                        data['content'] = plain_text
+                        await self._send_wrapper(**data)
+ 
+    async def _send_wrapper(self, **kwargs):
+        if 'channel_id' in kwargs:
+            await self.client.api.post_message(**kwargs)
+        else:
+            await self.client.api.post_dms(**kwargs)
+
+    async def send_msg(self, channel_id: int, message_chain: list, message_id: int = None):
+        '''
+        推送消息, 如果有 message_id，那么就是回复消息。
+        '''
+        _n = NakuruGuildMessage()
+        _n.channel_id = channel_id
+        _n.message_id = message_id
+        await self.reply_msg(_n, message_chain)
+
+    async def send(self, message_obj, message_chain: list):
+        '''
+        发送信息。内容同 reply_msg。
+        '''
+        await self.reply_msg(message_obj, message_chain)
+
+    def wait_for_message(self, channel_id: int) -> NakuruGuildMessage:
+        '''
+        等待指定 channel_id 的下一条信息，超时 300s 后抛出异常
+        '''
+        self.waiting[channel_id] = ''
+        cnt = 0
+        while True:
+            if channel_id in self.waiting and self.waiting[channel_id] != '':
+                # 去掉
+                ret = self.waiting[channel_id]
+                del self.waiting[channel_id]
+                return ret
+            cnt += 1
+            if cnt > 300:
+                raise Exception("等待消息超时。")
+            time.sleep(1)

model/platform/qqchan.py

@@ -1,217 +0,0 @@
-import io
-import botpy
-from PIL import Image as PILImage
-from botpy.message import Message, DirectMessage
-import re
-import asyncio
-import requests
-from cores.qqbot.personality import personalities
-from util import general_utils as gu
-from nakuru.entities.components import Plain, At, Image
-from botpy.types.message import Reference
-from botpy import Client
-import time
-
-class NakuruGuildMember():
-    tiny_id: int # 发送者识别号
-    user_id: int # 发送者识别号
-    title: str 
-    nickname: str # 昵称
-    role: int # 角色
-    icon_url: str # 头像url
-
-class NakuruGuildMessage():
-    type: str = "GuildMessage"
-    self_id: int # bot的qq号
-    self_tiny_id: int # bot的qq号
-    sub_type: str # 消息类型
-    message_id: str # 消息id
-    guild_id: int # 频道号 
-    channel_id: int # 子频道号
-    user_id: int # 发送者qq号
-    message: list # 消息内容
-    sender: NakuruGuildMember # 发送者信息
-    raw_message: Message
-
-    def __str__(self) -> str:
-        return str(self.__dict__)
-
-class QQChan():
-    def __init__(self, cnt: dict = None) -> None:
-        self.qqchan_cnt = 0
-        self.waiting: dict = {}
-
-    def get_cnt(self):
-        return self.qqchan_cnt
-    
-    def set_cnt(self, cnt):
-        self.qqchan_cnt = cnt
-
-    def run_bot(self, botclient: Client, appid, token):
-        intents = botpy.Intents(public_guild_messages=True, direct_message=True) 
-        self.client = botclient
-        self.client.run(appid=appid, token=token)
-
-    # gocq-频道SDK兼容层（发）
-    def gocq_compatible_send(self, gocq_message_chain: list):
-        plain_text = ""
-        image_path = None # only one img supported
-        for i in gocq_message_chain:
-            if isinstance(i, Plain):
-                plain_text += i.text
-            elif isinstance(i, Image) and image_path == None:
-                if i.path is not None:
-                    image_path = i.path
-                else:
-                    image_path = i.file
-        return plain_text, image_path
-    
-    # gocq-频道SDK兼容层（收）
-    def gocq_compatible_receive(self, message: Message) -> NakuruGuildMessage:
-        ngm = NakuruGuildMessage()
-        try:
-            ngm.self_id = message.mentions[0].id
-            ngm.self_tiny_id = message.mentions[0].id
-        except:
-            ngm.self_id = 0
-            ngm.self_tiny_id = 0
-
-        ngm.sub_type = "normal"
-        ngm.message_id = message.id
-        ngm.guild_id = int(message.guild_id)
-        ngm.channel_id = int(message.channel_id)
-        ngm.user_id = int(message.author.id)
-        msg = []
-        plain_content = message.content.replace("<@!"+str(ngm.self_id)+">", "").strip()
-        msg.append(Plain(plain_content))
-        if message.attachments:
-            for i in message.attachments:
-                if i.content_type.startswith("image"):
-                    url = i.url
-                    if not url.startswith("http"):
-                        url = "https://"+url
-                    img = Image.fromURL(url)
-                    msg.append(img)
-        ngm.message = msg
-        ngm.sender = NakuruGuildMember()
-        ngm.sender.tiny_id = int(message.author.id)
-        ngm.sender.user_id = int(message.author.id)
-        ngm.sender.title = ""
-        ngm.sender.nickname = message.author.username
-        ngm.sender.role = 0
-        ngm.sender.icon_url = message.author.avatar
-        ngm.raw_message = message
-        return ngm
-
-    def send_qq_msg(self, 
-                    message: NakuruGuildMessage, 
-                    res: list):
-        '''
-        回复频道消息
-        '''
-        gu.log("回复QQ频道消息: "+str(res), level=gu.LEVEL_INFO, tag="QQ频道", max_len=500)
-        self.qqchan_cnt += 1
-        plain_text = ""
-        image_path = None
-        if isinstance(res, list):
-            # 兼容gocq
-            plain_text, image_path = self.gocq_compatible_send(res)
-        elif isinstance(res, str):
-            plain_text = res
-
-        # print(plain_text, image_path)
-        msg_ref = None
-        if message.raw_message is not None:
-            msg_ref = Reference(message_id=message.raw_message.id, ignore_get_message_error=False)
-        if image_path is not None:
-            msg_ref = None
-            if image_path.startswith("http"):
-                pic_res = requests.get(image_path, stream = True)
-                if pic_res.status_code == 200:
-                    image = PILImage.open(io.BytesIO(pic_res.content))
-                    image_path = gu.save_temp_img(image)
-
-
-
-        try:
-            # reply_res = asyncio.run_coroutine_threadsafe(message.raw_message.reply(content=str(plain_text), message_reference = msg_ref, file_image=image_path), self.client.loop)
-            reply_res = asyncio.run_coroutine_threadsafe(self.client.api.post_message(channel_id=str(message.channel_id), 
-                                                                                      content=str(plain_text), 
-                                                                                      msg_id=message.message_id, 
-                                                                                      file_image=image_path,
-                                                                                      message_reference=msg_ref), self.client.loop)
-            reply_res.result()
-        except BaseException as e:
-            # 分割过长的消息
-            if "msg over length" in str(e):
-                split_res = []
-                split_res.append(plain_text[:len(plain_text)//2])      
-                split_res.append(plain_text[len(plain_text)//2:])
-                for i in split_res:
-                    reply_res = asyncio.run_coroutine_threadsafe(self.client.api.post_message(channel_id=str(message.channel_id), 
-                                                                                            content=str(i), 
-                                                                                            msg_id=message.message_id, 
-                                                                                            file_image=image_path,
-                                                                                            message_reference=msg_ref), self.client.loop)                    
-                    reply_res.result()
-            else:
-                # 发送qq信息
-                try:
-                    # 防止被qq频道过滤消息
-                    plain_text = plain_text.replace(".", " . ")
-                    reply_res = asyncio.run_coroutine_threadsafe(self.client.api.post_message(channel_id=str(message.channel_id), 
-                                                                                            content=str(plain_text), 
-                                                                                            msg_id=message.message_id, 
-                                                                                            file_image=image_path,
-                                                                                            message_reference=msg_ref), self.client.loop).result()                 # 发送信息
-                except BaseException as e:
-                    print("QQ频道API错误: \n"+str(e))
-                    try:
-                        # reply_res = asyncio.run_coroutine_threadsafe(message.raw_message.reply(content=str(str.join(" ", plain_text)), message_reference = msg_ref, file_image=image_path), self.client.loop)
-                        reply_res = asyncio.run_coroutine_threadsafe(self.client.api.post_message(channel_id=str(message.channel_id), 
-                                                                        content=str(str.join(" ", plain_text)), 
-                                                                        msg_id=message.message_id, 
-                                                                        file_image=image_path,
-                                                                        message_reference=msg_ref), self.client.loop).result()     
-                    except BaseException as e:
-                        plain_text = re.sub(r'(https|http)?:\/\/(\w|\.|\/|\?|\=|\&|\%)*\b', '[被隐藏的链接]', str(e), flags=re.MULTILINE)
-                        plain_text = plain_text.replace(".", "·")
-                        reply_res = asyncio.run_coroutine_threadsafe(self.client.api.post_message(channel_id=str(message.channel_id), 
-                                                                        content=plain_text, 
-                                                                        msg_id=message.message_id, 
-                                                                        file_image=image_path,
-                                                                        message_reference=msg_ref), self.client.loop).result()  
-                        # send(message, f"QQ频道API错误：{str(e)}\n下面是格式化后的回答：\n{f_res}")
-
-    def push_message(self, channel_id: int, message_chain: list, message_id: int = None):
-        '''
-        推送消息, 如果有 message_id，那么就是回复消息。
-        '''
-        _n = NakuruGuildMessage()
-        _n.channel_id = channel_id
-        _n.message_id = message_id
-        self.send_qq_msg(_n, message_chain)
-
-    def send(self, message_obj, message_chain: list):
-        '''
-        发送信息
-        '''
-        self.send_qq_msg(message_obj, message_chain)
-
-    def wait_for_message(self, channel_id: int) -> NakuruGuildMessage:
-        '''
-        等待指定 channel_id 的下一条信息，超时 300s 后抛出异常
-        '''
-        self.waiting[channel_id] = ''
-        cnt = 0
-        while True:
-            if channel_id in self.waiting and self.waiting[channel_id] != '':
-                # 去掉
-                ret = self.waiting[channel_id]
-                del self.waiting[channel_id]
-                return ret
-            cnt += 1
-            if cnt > 300:
-                raise Exception("等待消息超时。")
-            time.sleep(1)
-        

model/platform/qqgroup.py

@@ -1,188 +0,0 @@
-import requests
-import asyncio
-import websockets
-from websockets import WebSocketClientProtocol
-import json
-import inspect
-from typing import Callable, Awaitable, Union
-from pydantic import BaseModel
-import datetime
-
-class Event(BaseModel):
-    GroupMessage: str = "GuildMessage"
-
-class Sender(BaseModel):
-    user_id: str
-    member_openid: str
-
-
-class MessageComponent(BaseModel):
-    type: str
-
-class PlainText(MessageComponent):
-    text: str
-
-class Image(MessageComponent):
-    path: str
-    file: str
-    url: str
-
-class MessageChain(list):
-
-    def append(self, __object: MessageComponent) -> None:
-        if not isinstance(__object, MessageComponent):
-            raise TypeError("不受支持的消息链元素类型。回复的消息链必须是 MessageComponent 的子类。")
-        return super().append(__object)
-    
-    def insert(self, __index: int, __object: MessageComponent) -> None:
-        if not isinstance(__object, MessageComponent):
-            raise TypeError("不受支持的消息链元素类型。回复的消息链必须是 MessageComponent 的子类。")
-        return super().insert(__index, __object)
-    
-    def parse_from_nakuru(self, nakuru_message_chain: Union[list, str]) -> None:
-        if isinstance(nakuru_message_chain, str):
-            self.append(PlainText(type='Plain', text=nakuru_message_chain))
-        else:
-            for i in nakuru_message_chain:
-                if i['type'] == 'Plain':
-                    self.append(PlainText(type='Plain', text=i['text']))
-                elif i['type'] == 'Image':
-                    self.append(Image(path=i['path'], file=i['file'], url=i['url']))
-
-class Message(BaseModel):
-    type: str
-    user_id: str
-    member_openid: str
-    message_id: str
-    group_id: str
-    group_openid: str
-    content: str
-    message: MessageChain
-    time: int
-    sender: Sender
-
-class UnofficialQQBotSDK:
-
-    GET_APP_ACCESS_TOKEN_URL = "https://bots.qq.com/app/getAppAccessToken"
-    OPENAPI_BASE_URL = "https://api.sgroup.qq.com"
-
-    def __init__(self, appid: str, client_secret: str) -> None:
-        self.appid = appid
-        self.client_secret = client_secret
-        self.events: dict[str, Awaitable] = {}
-
-
-    def run_bot(self) -> None:
-        self.__get_access_token()
-        self.__get_wss_endpoint()
-        asyncio.get_event_loop().run_until_complete(self.__ws_client())
-
-    def __get_access_token(self) -> None:
-        res = requests.post(self.GET_APP_ACCESS_TOKEN_URL, json={
-            "appId": self.appid,
-            "clientSecret": self.client_secret
-        }, headers={
-            "Content-Type": "application/json"
-        })
-        res = res.json()
-        code = res['code'] if 'code' in res else 1
-        if 'access_token' not in res:
-            raise Exception(f"获取 access_token 失败。原因：{res['message'] if 'message' in res else '未知'}")
-        self.access_token = 'QQBot ' + res['access_token']
-
-    def __auth_header(self) -> str:
-        return {
-            'Authorization': self.access_token,
-            'X-Union-Appid': self.appid,
-        }
-
-    def __get_wss_endpoint(self):
-        res = requests.get(self.OPENAPI_BASE_URL + "/gateway", headers=self.__auth_header())
-        self.wss_endpoint = res.json()['url']
-        # print("wss_endpoint: " + self.wss_endpoint)
-
-    async def __behav_heartbeat(self, ws: WebSocketClientProtocol, t: int):
-        while True:
-            await asyncio.sleep(t - 1)
-            try:
-                await ws.send(json.dumps({
-                    "op": 1,
-                    "d": self.s
-                }))
-            except:
-                print("heartbeat error.")
-
-    async def __handle_msg(self, ws: WebSocketClientProtocol, msg: dict):
-        if msg['op'] == 10:
-            asyncio.get_event_loop().create_task(self.__behav_heartbeat(ws, msg['d']['heartbeat_interval'] / 1000))
-            # 鉴权，获得session
-            await ws.send(json.dumps({
-                "op": 2,
-                "d": {
-                    "token": self.access_token,
-                    "intents": 33554432,
-                    "shard": [0, 1],
-                    "properties": {
-                        "$os": "linux",
-                        "$browser": "my_library",
-                        "$device": "my_library"
-                    }
-                }
-            }))
-        if msg['op'] == 0:
-            # ready
-            data = msg['d']
-            event_typ: str = msg['t'] if 't' in msg else None
-            if event_typ == 'GROUP_AT_MESSAGE_CREATE':
-                if 'GroupMessage' in self.events:
-                    coro = self.events['GroupMessage']
-                else:
-                    return
-                message_chain = MessageChain()
-                message_chain.append(PlainText(type="Plain", text=data['content']))
-                group_message = Message(
-                    type='GroupMessage',
-                    user_id=data['author']['id'],
-                    member_openid=data['author']['member_openid'],
-                    message_id=data['id'],
-                    group_id=data['group_id'],
-                    group_openid=data['group_openid'],
-                    content=data['content'],
-                    # 2023-11-24T19:51:11+08:00
-                    time=int(datetime.datetime.strptime(data['timestamp'], "%Y-%m-%dT%H:%M:%S%z").timestamp()),
-                    sender=Sender(
-                        user_id=data['author']['id'],
-                        member_openid=data['author']['member_openid']
-                    ),
-                    message=message_chain
-                )
-                await coro(self, group_message)
-
-    async def send(self, message: Message, message_chain: MessageChain) -> None:
-        # todo: 消息链转换支持更多类型。
-        plain_text = ""
-        for i in message_chain:
-            if isinstance(i, PlainText):
-                plain_text += i.text
-        requests.post(self.OPENAPI_BASE_URL + f"/v2/groups/{message.group_openid}/messages", headers=self.__auth_header(), json={
-            "content": plain_text,
-            "message_type": 0,
-            "msg_id": message.message_id
-        })
-
-    async def __ws_client(self):
-        self.s = 0
-        async with websockets.connect(self.wss_endpoint) as websocket:
-            while True:
-                msg = await websocket.recv()
-                msg = json.loads(msg)
-                if 's' in msg:
-                    self.s = msg['s']
-                await self.__handle_msg(websocket, msg)
-    
-    def on(self, event: str) -> None:
-        def wrapper(func: Awaitable):
-            if inspect.iscoroutinefunction(func) == False:
-                raise TypeError("func must be a coroutine function")
-            self.events[event] = func
-        return wrapper

model/provider/openai_official.py

@@ -1,17 +1,21 @@
-from openai import OpenAI
-from openai.types.chat.chat_completion import ChatCompletion
-from openai.types.images_response import ImagesResponse
-import json
-import time
 import os
 import sys
+import json
+import time
+import tiktoken
+import threading
+import traceback
+
+from openai import AsyncOpenAI
+from openai.types.images_response import ImagesResponse
+from openai.types.chat.chat_completion import ChatCompletion
+
 from cores.database.conn import dbConn
 from model.provider.provider import Provider
-import threading
 from util import general_utils as gu
 from util.cmd_config import CmdConfig
-import traceback
-import tiktoken
+from util.general_utils import Logger
+
 
 
 abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
@@ -19,17 +23,15 @@ abs_path = os.path.dirname(os.path.realpath(sys.argv[0])) + '/'
 class ProviderOpenAIOfficial(Provider):
     def __init__(self, cfg):
         self.cc = CmdConfig()
+        self.logger = Logger()
 
         self.key_list = []
-        # 如果 cfg['key']中有长度为1的字符串，那么是格式错误，直接报错
+        # 如果 cfg['key'] 中有长度为 1 的字符串，那么是格式错误，直接报错
         for key in cfg['key']:
             if len(key) == 1:
-                input("检查到了长度为 1 的Key。配置文件中的 openai.key 处的格式错误 (符号 - 的后面要加空格)，请退出程序并检查配置文件，按回车跳过。")
-                raise BaseException("配置文件格式错误")
+                raise BaseException("检查到了长度为 1 的Key。配置文件中的 openai.key 处的格式错误 (符号 - 的后面要加空格)。")
         if cfg['key'] != '' and cfg['key'] != None:
             self.key_list = cfg['key']
-        else:
-            input("[System] 请先去完善ChatGPT的Key。详情请前往https://beta.openai.com/account/api-keys")
         if len(self.key_list) == 0:
             raise Exception("您打开了 OpenAI 模型服务，但是未填写 key。请前往填写。")
         
@@ -40,15 +42,16 @@ class ProviderOpenAIOfficial(Provider):
         self.api_base = None
         if 'api_base' in cfg and cfg['api_base'] != 'none' and cfg['api_base'] != '':
             self.api_base = cfg['api_base']
-            gu.log(f"设置 api_base 为: {self.api_base}")
-        # openai client
-        self.client = OpenAI(
+            self.logger.log(f"设置 api_base 为: {self.api_base}", tag="OpenAI")
+            
+        # 创建 OpenAI Client
+        self.client = AsyncOpenAI(
             api_key=self.key_list[0],
             base_url=self.api_base
         )
 
         self.openai_model_configs: dict = cfg['chatGPTConfigs']
-        gu.log(f'加载 OpenAI Chat Configs: {self.openai_model_configs}')
+        self.logger.log(f'加载 OpenAI Chat Configs: {self.openai_model_configs}', tag="OpenAI")
         self.openai_configs = cfg
         # 会话缓存
         self.session_dict = {}
@@ -59,30 +62,14 @@ class ProviderOpenAIOfficial(Provider):
 
         self.enc = tiktoken.get_encoding("cl100k_base")
 
-        # 读取历史记录
+        # 从 SQLite DB 读取历史记录
         try:
             db1 = dbConn()
             for session in db1.get_all_session():
                 self.session_dict[session[0]] = json.loads(session[1])['data']
-            gu.log("读取历史记录成功。")
+            self.logger.log("读取历史记录成功。", tag="OpenAI")
         except BaseException as e:
-            gu.log("读取历史记录失败，但不影响使用。", level=gu.LEVEL_ERROR)
-
-
-        # 读取统计信息
-        if not os.path.exists(abs_path+"configs/stat"):
-            with open(abs_path+"configs/stat", 'w', encoding='utf-8') as f:
-                    json.dump({}, f)
-        self.stat_file = open(abs_path+"configs/stat", 'r', encoding='utf-8')
-        global count
-        res = self.stat_file.read()
-        if res == '':
-            count = {}
-        else:
-            try: 
-                count = json.loads(res)
-            except BaseException:
-                pass
+            self.logger.log("读取历史记录失败，但不影响使用。", level=gu.LEVEL_ERROR, tag="OpenAI")
 
         # 创建转储定时器线程
         threading.Thread(target=self.dump_history, daemon=True).start()
@@ -90,7 +77,6 @@ class ProviderOpenAIOfficial(Provider):
         # 人格
         self.curr_personality = {}
 
-
     # 转储历史记录
     def dump_history(self):
         time.sleep(10)
@@ -99,7 +85,6 @@ class ProviderOpenAIOfficial(Provider):
             try:
                 # print("转储历史记录...")
                 for key in self.session_dict:
-                    # print("TEST: "+str(db.get_session(key)))
                     data = self.session_dict[key]
                     data_json = {
                         'data': data
@@ -131,7 +116,7 @@ class ProviderOpenAIOfficial(Provider):
         }
         self.session_dict[session_id].append(new_record)
 
-    def text_chat(self, prompt, 
+    async def text_chat(self, prompt, 
                   session_id = None, 
                   image_url = None, 
                   function_call=None,
@@ -144,36 +129,21 @@ class ProviderOpenAIOfficial(Provider):
         # 会话机制
         if session_id not in self.session_dict:
             self.session_dict[session_id] = []
-
-            fjson = {}
-            try:
-                f = open(abs_path+"configs/session", "r", encoding="utf-8")
-                fjson = json.loads(f.read())
-                f.close()
-            except:
-                pass
-            finally:
-                fjson[session_id] = 'true'
-                f = open(abs_path+"configs/session", "w", encoding="utf-8")
-                f.write(json.dumps(fjson))
-                f.flush()
-                f.close()
         
         if len(self.session_dict[session_id]) == 0:
             # 设置默认人格
             if default_personality is not None:
                 self.personality_set(default_personality, session_id)
 
-
         # 使用 tictoken 截断消息
         _encoded_prompt = self.enc.encode(prompt)
         if self.openai_model_configs['max_tokens'] < len(_encoded_prompt):
             prompt = self.enc.decode(_encoded_prompt[:int(self.openai_model_configs['max_tokens']*0.80)])
-            gu.log(f"注意，有一部分 prompt 文本由于超出 token 限制而被截断。", level=gu.LEVEL_WARNING, max_len=300)
+            self.logger.log(f"注意，有一部分 prompt 文本由于超出 token 限制而被截断。", level=gu.LEVEL_WARNING, tag="OpenAI")
 
         cache_data_list, new_record, req = self.wrap(prompt, session_id, image_url)
-        gu.log(f"CACHE_DATA_: {str(cache_data_list)}", level=gu.LEVEL_DEBUG, max_len=99999)
-        gu.log(f"OPENAI REQUEST: {str(req)}", level=gu.LEVEL_DEBUG, max_len=9999)
+        self.logger.log(f"cache: {str(cache_data_list)}", level=gu.LEVEL_DEBUG, tag="OpenAI")
+        self.logger.log(f"request: {str(req)}", level=gu.LEVEL_DEBUG, tag="OpenAI")
         retry = 0
         response = None
         err = ''
@@ -200,31 +170,30 @@ class ProviderOpenAIOfficial(Provider):
         while retry < 10:
             try:
                 if function_call is None:
-                    response = self.client.chat.completions.create(
+                    response = await self.client.chat.completions.create(
                         messages=req,
                         **conf
                     )
                 else:
-                    response = self.client.chat.completions.create(
+                    response = await self.client.chat.completions.create(
                         messages=req,
                         tools = function_call,
                         **conf
                     )
                 break
             except Exception as e:
-                print(traceback.format_exc())
+                traceback.print_exc()
                 if 'Invalid content type. image_url is only supported by certain models.' in str(e):
                     raise e
                 if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e):
-                    gu.log("当前Key已超额或异常, 正在切换", level=gu.LEVEL_WARNING)
+                    self.logger.log("当前 Key 已超额或异常, 正在切换", level=gu.LEVEL_WARNING, tag="OpenAI")
                     self.key_stat[self.client.api_key]['exceed'] = True
                     is_switched = self.handle_switch_key()
                     if not is_switched:
-                        # 所有Key都超额或不正常
                         raise e
                     retry -= 1
                 elif 'maximum context length' in str(e):
-                    gu.log("token超限, 清空对应缓存，并进行消息截断")
+                    self.logger.log("token 超限, 清空对应缓存，并进行消息截断", tag="OpenAI")
                     self.session_dict[session_id] = []
                     prompt = prompt[:int(len(prompt)*truncate_rate)]
                     truncate_rate -= 0.05
@@ -234,15 +203,15 @@ class ProviderOpenAIOfficial(Provider):
                     time.sleep(30)
                     continue
                 else:
-                    gu.log(str(e), level=gu.LEVEL_ERROR)
+                    self.logger.log(str(e), level=gu.LEVEL_ERROR, tag="OpenAI")
                 time.sleep(2)
                 err = str(e)
                 retry += 1
         if retry >= 10:
-            gu.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见https://github.com/Soulter/QQChannelChatGPT/wiki/%E4%BA%8C%E3%80%81%E9%A1%B9%E7%9B%AE%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E9%85%8D%E7%BD%AE", max_len=999)
+            self.logger.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见 https://github.com/Soulter/QQChannelChatGPT/wiki", tag="OpenAI")
             raise BaseException("连接出错: "+str(err))
         assert isinstance(response, ChatCompletion)
-        gu.log(f"OPENAI RESPONSE: {response.usage}", level=gu.LEVEL_DEBUG, max_len=9999)
+        self.logger.log(f"OPENAI RESPONSE: {response.usage}", level=gu.LEVEL_DEBUG, tag="OpenAI")
 
         # 结果分类
         choice = response.choices[0]
@@ -271,7 +240,6 @@ class ProviderOpenAIOfficial(Provider):
                     index += 1
             # 删除完后更新相关字段
             self.session_dict[session_id] = cache_data_list
-            # cache_prompt = get_prompts_by_cache_list(cache_data_list)
 
         # 添加新条目进入缓存的prompt
         new_record['AI'] = {
@@ -290,7 +258,7 @@ class ProviderOpenAIOfficial(Provider):
 
         return chatgpt_res
         
-    def image_chat(self, prompt, img_num = 1, img_size = "1024x1024"):
+    async def image_chat(self, prompt, img_num = 1, img_size = "1024x1024"):
         retry = 0
         image_url = ''
 
@@ -298,7 +266,7 @@ class ProviderOpenAIOfficial(Provider):
         
         while retry < 5:
             try:
-                response: ImagesResponse = self.client.images.generate(
+                response: ImagesResponse = await self.client.images.generate(
                     prompt=prompt,
                     **image_generate_configs
                 )
@@ -307,17 +275,16 @@ class ProviderOpenAIOfficial(Provider):
                     image_url.append(response.data[i].url)
                 break
             except Exception as e:
-                gu.log(str(e), level=gu.LEVEL_ERROR)
+                self.logger.log(str(e), level=gu.LEVEL_ERROR)
                 if 'You exceeded' in str(e) or 'Billing hard limit has been reached' in str(
                         e) or 'No API key provided' in str(e) or 'Incorrect API key provided' in str(e):
-                    gu.log("当前 Key 已超额或者不正常, 正在切换", level=gu.LEVEL_WARNING)
+                    self.logger.log("当前 Key 已超额或者不正常, 正在切换", level=gu.LEVEL_WARNING, tag="OpenAI")
                     self.key_stat[self.client.api_key]['exceed'] = True
                     is_switched = self.handle_switch_key()
                     if not is_switched:
-                        # 所有Key都超额或不正常
                         raise e
                 elif 'Your request was rejected as a result of our safety system.' in str(e):
-                    gu.log("您的请求被 OpenAI 安全系统拒绝, 请稍后再试", level=gu.LEVEL_WARNING)
+                    self.logger.log("您的请求被 OpenAI 安全系统拒绝, 请稍后再试", level=gu.LEVEL_WARNING, tag="OpenAI")
                     raise e
                 else:
                     retry += 1
@@ -326,16 +293,16 @@ class ProviderOpenAIOfficial(Provider):
                 
         return image_url
 
-    def forget(self, session_id = None) -> bool:
+    async def forget(self, session_id = None) -> bool:
         if session_id is None:
             return False
         self.session_dict[session_id] = []
         return True
     
-    '''
-    获取缓存的会话
-    '''
     def get_prompts_by_cache_list(self, cache_data_list, divide=False, paging=False, size=5, page=1):
+        '''
+        获取缓存的会话
+        '''
         prompts = ""
         if paging:
             page_begin = (page-1)*size
@@ -352,43 +319,7 @@ class ProviderOpenAIOfficial(Provider):
             if divide:
                 prompts += "----------\n"
         return prompts
-    
-        
-    def get_user_usage_tokens(self,cache_list):
-        usage_tokens = 0
-        for item in cache_list:
-            usage_tokens += int(item['single_tokens'])
-        return usage_tokens
-        
-    '''
-    获取统计信息
-    '''
-    def get_stat(self):
-        try:
-            f = open(abs_path+"configs/stat", "r", encoding="utf-8")
-            fjson = json.loads(f.read())
-            f.close()
-            guild_count = 0
-            guild_msg_count = 0
-            guild_direct_msg_count = 0
 
-            for k,v in fjson.items():
-                guild_count += 1
-                guild_msg_count += v['count']
-                guild_direct_msg_count += v['direct_count']
-            
-            session_count = 0
-
-            f = open(abs_path+"configs/session", "r", encoding="utf-8")
-            fjson = json.loads(f.read())
-            f.close()
-            for k,v in fjson.items():
-                session_count += 1
-            return guild_count, guild_msg_count, guild_direct_msg_count, session_count
-        except:
-            return -1, -1, -1, -1
-
-    # 包装信息
     def wrap(self, prompt, session_id, image_url = None):
         if image_url is not None:
             prompt = [
@@ -424,17 +355,16 @@ class ProviderOpenAIOfficial(Provider):
         return context, new_record, req_list
     
     def handle_switch_key(self):
-        # messages = [{"role": "user", "content": prompt}]
         is_all_exceed = True
         for key in self.key_stat:
             if key == None or self.key_stat[key]['exceed']:
                 continue
             is_all_exceed = False
             self.client.api_key = key
-            gu.log(f"切换到Key: {key}, 已使用token: {self.key_stat[key]['used']}", level=gu.LEVEL_INFO)
+            self.logger.log(f"切换到 Key: {key}(已使用 token: {self.key_stat[key]['used']})", level=gu.LEVEL_INFO, tag="OpenAI")
             break
         if is_all_exceed:
-            gu.log("所有Key已超额", level=gu.LEVEL_CRITICAL)
+            self.logger.log("所有 Key 已超额", level=gu.LEVEL_CRITICAL, tag="OpenAI")
             return False
         return True
         
@@ -459,13 +389,13 @@ class ProviderOpenAIOfficial(Provider):
         self.key_stat[key] = {'exceed': False, 'used': 0, 'sponsor': sponsor}
 
     # 检查key是否可用
-    def check_key(self, key):
-        client_ = OpenAI(
+    async def check_key(self, key):
+        client_ = AsyncOpenAI(
             api_key=key,
             base_url=self.api_base
         )
         messages = [{"role": "user", "content": "please just echo `test`"}]
-        client_.chat.completions.create(
+        await client_.chat.completions.create(
             messages=messages,
             **self.openai_model_configs
         )

model/provider/provider.py

@@ -1,13 +1,35 @@
-import abc
-
 class Provider:
-    def __init__(self, cfg):
-        pass
+    async def text_chat(self, 
+                        prompt: str, 
+                        session_id: str, 
+                        image_url: None,
+                        function_call: None,
+                        extra_conf: dict = None,
+                        default_personality: dict = None,
+                        **kwargs) -> str:
+        '''
+        [require]
+        prompt: 提示词
+        session_id: 会话id
+        
+        [optional]
+        image_url: 图片url（识图）
+        function_call: 函数调用
+        extra_conf: 额外配置
+        default_personality: 默认人格
+        '''
+        raise NotImplementedError
     
-    @abc.abstractmethod
-    def text_chat(self, prompt, session_id, image_url: None, function_call: None, extra_conf: dict = None, default_personality: dict = None) -> str:
-        pass
+    async def image_generate(self, prompt, session_id, **kwargs) -> str:
+        '''
+        [require]
+        prompt: 提示词
+        session_id: 会话id
+        '''
+        raise NotImplementedError
 
-    @abc.abstractmethod
-    def forget(self, session_id = None) -> bool:
-        pass
+    async def forget(self, session_id = None) -> bool:
+        '''
+        重置会话
+        '''
+        raise NotImplementedError

model/provider/rev_chatgpt.py

@@ -15,13 +15,19 @@ class ProviderRevChatGPT(Provider):
         for i in range(0, len(config['account'])):
             try:
                 gu.log(f"创建逆向ChatGPT负载{str(i+1)}中...", level=gu.LEVEL_INFO, tag="RevChatGPT")
-
-                if 'password' in config['account'][i]:
-                    gu.log(f"创建逆向ChatGPT负载{str(i+1)}失败: 已不支持账号密码登录，请使用access_token方式登录。", level=gu.LEVEL_ERROR, tag="RevChatGPT")
-                    continue
-                rev_account_config = {
-                    'access_token': config['account'][i]['access_token'],
-                }
+                
+                if isinstance(config['account'][i], str):
+                    # 默认是 access_token
+                    rev_account_config = {
+                        'access_token': config['account'][i],
+                    }
+                else:
+                    if 'password' in config['account'][i]:
+                        gu.log(f"创建逆向ChatGPT负载{str(i+1)}失败: 已不支持账号密码登录，请使用access_token方式登录。", level=gu.LEVEL_ERROR, tag="RevChatGPT")
+                        continue
+                    rev_account_config = {
+                        'access_token': config['account'][i]['access_token'],
+                    }
                 if self.cc.get("rev_chatgpt_model") != "":
                     rev_account_config['model'] = self.cc.get("rev_chatgpt_model")
                 if len(self.cc.get("rev_chatgpt_plugin_ids")) > 0:

model/provider/rev_edgegpt.py

@@ -1,104 +0,0 @@
-from model.provider.provider import Provider
-from EdgeGPT import Chatbot, ConversationStyle
-import json
-import os
-from util import general_utils as gu
-from util.cmd_config import CmdConfig as cc
-import time
-
-class ProviderRevEdgeGPT(Provider):
-    def __init__(self):
-        raise Exception("Bing 逆向已停止维护，不可用，请使用 ChatGPT 官方 API。")
-
-        self.busy = False
-        self.wait_stack = []
-        with open('./cookies.json', 'r') as f:
-            cookies = json.load(f)
-        proxy = cc.get("bing_proxy", None)
-        if proxy == "":
-            proxy = None
-        # q = Query("Hello, bing!", cookie_files="./cookies.json")
-        # print(q)
-        self.bot = EdgeChatbot(cookies=cookies, proxy = "http://127.0.0.1:7890")
-        ret = self.bot.ask_stream("Hello, bing!", conversation_style=ConversationStyle.creative, wss_link="wss://ai.nothingnessvoid.tech/sydney/ChatHub")
-        # self.bot = Chatbot(cookies=cookies, proxy = proxy)
-        for i in ret:
-            print(i, flush=True)
-
-    def is_busy(self):
-        return self.busy
-
-    async def forget(self, session_id = None):
-        try:
-            await self.bot.reset()
-            return True
-        except BaseException:
-            return False
-        
-    async def text_chat(self, prompt, platform = 'none', image_url=None, function_call=None):
-        while self.busy:
-            time.sleep(1)
-        self.busy = True
-        resp = 'err'
-        err_count = 0
-        retry_count = 5
-        
-        while err_count < retry_count:
-            try:
-                resp = await self.bot.ask(prompt=prompt, conversation_style=ConversationStyle.creative)
-                # print("[RevEdgeGPT] "+str(resp))
-                if 'messages' not in resp['item']:
-                    await self.bot.reset()
-                msj_obj = resp['item']['messages'][len(resp['item']['messages'])-1]
-                reply_msg = msj_obj['text']
-                if 'sourceAttributions' in msj_obj:
-                    reply_source = msj_obj['sourceAttributions']
-                else:
-                    reply_source = []
-                if 'throttling' in resp['item']:
-                    throttling = resp['item']['throttling']
-                    # print(throttling)
-                else:
-                    throttling = None
-                if 'I\'m sorry but I prefer not to continue this conversation. I\'m still learning so I appreciate your understanding and patience.' in reply_msg:
-                    self.busy = False
-                    return '', 0
-                if reply_msg == prompt:
-                    # resp += '\n\n如果你没有让我复述你的话，那代表我可能不想和你继续这个话题了，请输入reset重置会话😶'
-                    await self.forget()
-                    err_count += 1
-                    continue
-                if reply_source is None:
-                    # 不想答复
-                    return '', 0
-                else:
-                    if platform != 'qqchan':
-                        index = 1
-                        if len(reply_source) > 0:
-                            reply_msg += "\n\n信息来源:\n"
-                        for i in reply_source:
-                            reply_msg += f"[{str(index)}]: {i['seeMoreUrl']} | {i['providerDisplayName']}\n"
-                            index += 1
-                if throttling is not None:
-                    if throttling['numUserMessagesInConversation'] == throttling['maxNumUserMessagesInConversation']:
-                        # 达到上限，重置会话
-                        await self.forget()
-                    if throttling['numUserMessagesInConversation'] > throttling['maxNumUserMessagesInConversation']:
-                        await self.forget()
-                        err_count += 1
-                        continue
-                    reply_msg += f"\n[{throttling['numUserMessagesInConversation']}/{throttling['maxNumUserMessagesInConversation']}]"
-                break
-            except BaseException as e:
-                gu.log(str(e), level=gu.LEVEL_WARNING, tag="RevEdgeGPT")
-                err_count += 1
-                if err_count >= retry_count:
-                        gu.log(r"如果报错, 且您的机器在中国大陆内, 请确保您的电脑已经设置好代理软件(梯子), 并在配置文件设置了系统代理地址。详见https://github.com/Soulter/QQChannelChatGPT/wiki/%E4%BA%8C%E3%80%81%E9%A1%B9%E7%9B%AE%E9%85%8D%E7%BD%AE%E6%96%87%E4%BB%B6%E9%85%8D%E7%BD%AE", max_len=999)
-                        self.busy = False
-                        raise e
-                gu.log("请求出现了一些问题, 正在重试。次数"+str(err_count), level=gu.LEVEL_WARNING, tag="RevEdgeGPT")
-        self.busy = False
-        
-        # print("[RevEdgeGPT] "+str(reply_msg))
-        return reply_msg, 1
-    

requirements.txt

@@ -1,7 +1,8 @@
 pydantic~=1.10.4
-requests~=2.28.1
+aiohttp
+requests
 openai~=1.2.3
-qq-botpy==1.1.2
+qq-botpy
 chardet~=5.1.0
 Pillow~=9.4.0
 GitPython~=3.1.31

util/cmd_config.py

@@ -80,4 +80,41 @@ class CmdConfig():
         if _tag:
             with open(cpath, "w", encoding="utf-8-sig") as f:
                 json.dump(d, f, indent=4, ensure_ascii=False)
-                f.flush()
+                f.flush()
+
+def init_astrbot_config_items():
+    # 加载默认配置
+    cc = CmdConfig()
+    cc.init_attributes("qq_forward_threshold", 200)
+    cc.init_attributes("qq_welcome", "欢迎加入本群！\n欢迎给https://github.com/Soulter/QQChannelChatGPT项目一个Star😊~\n输入help查看帮助~\n")
+    cc.init_attributes("qq_pic_mode", False)
+    cc.init_attributes("rev_chatgpt_model", "")
+    cc.init_attributes("rev_chatgpt_plugin_ids", [])
+    cc.init_attributes("rev_chatgpt_PUID", "")
+    cc.init_attributes("rev_chatgpt_unverified_plugin_domains", [])
+    cc.init_attributes("gocq_host", "127.0.0.1")
+    cc.init_attributes("gocq_http_port", 5700)
+    cc.init_attributes("gocq_websocket_port", 6700)
+    cc.init_attributes("gocq_react_group", True)
+    cc.init_attributes("gocq_react_guild", True)
+    cc.init_attributes("gocq_react_friend", True)
+    cc.init_attributes("gocq_react_group_increase", True)
+    cc.init_attributes("other_admins", [])
+    cc.init_attributes("CHATGPT_BASE_URL", "")
+    cc.init_attributes("qqbot_secret", "")
+    cc.init_attributes("admin_qq", "")
+    cc.init_attributes("nick_qq", ["!", "！", "ai"])
+    cc.init_attributes("admin_qqchan", "")
+    cc.init_attributes("llm_env_prompt", "")
+    cc.init_attributes("llm_wake_prefix", "")
+    cc.init_attributes("default_personality_str", "")
+    cc.init_attributes("openai_image_generate", {
+        "model": "dall-e-3",
+        "size": "1024x1024",
+        "style": "vivid",
+        "quality": "standard",
+    })
+    cc.init_attributes("http_proxy", "")
+    cc.init_attributes("https_proxy", "")
+    cc.init_attributes("dashboard_username", "")
+    cc.init_attributes("dashboard_password", "")

util/function_calling/gplugin.py

@@ -1,18 +1,19 @@
 import requests
 import util.general_utils as gu
-from bs4 import BeautifulSoup
+import traceback
 import time
+import json
+import asyncio
+from googlesearch import search, SearchResult
+from readability import Document
+from bs4 import BeautifulSoup
+from openai.types.chat.chat_completion_message_tool_call import Function
 from util.function_calling.func_call import (
     FuncCall, 
     FuncCallJsonFormatError, 
     FuncNotFoundError
 )
-from openai.types.chat.chat_completion_message_tool_call import Function
-import traceback
-from googlesearch import search, SearchResult
 from model.provider.provider import Provider
-import json
-from readability import Document
 
 
 def tidy_text(text: str) -> str:
@@ -53,10 +54,11 @@ def google_web_search(keyword) -> str:
         for i in ls:
             desc = i.description
             try:
+                # gu.log(f"搜索网页: {i.url}", tag="网页搜索", level=gu.LEVEL_INFO)
                 desc = fetch_website_content(i.url)
             except BaseException as e:
                 print(f"(google) fetch_website_content err: {str(e)}")
-            gu.log(f"# No.{str(index)}\ntitle: {i.title}\nurl: {i.url}\ncontent: {desc}\n\n", level=gu.LEVEL_DEBUG, max_len=9999)
+            # gu.log(f"# No.{str(index)}\ntitle: {i.title}\nurl: {i.url}\ncontent: {desc}\n\n", level=gu.LEVEL_DEBUG, max_len=9999)
             ret += f"# No.{str(index)}\ntitle: {i.title}\nurl: {i.url}\ncontent: {desc}\n\n"
             index += 1
     except Exception as e:
@@ -74,57 +76,60 @@ def web_keyword_search_via_bing(keyword) -> str:
     }
     url = "https://www.bing.com/search?q="+keyword
     _cnt = 0
-    _detail_store = []
+    # _detail_store = []
     while _cnt < 5:
         try:
             response = requests.get(url, headers=headers)
             response.encoding = "utf-8"
-            gu.log(f"bing response: {response.text}", tag="bing", level=gu.LEVEL_DEBUG, max_len=9999)
+            # gu.log(f"bing response: {response.text}", tag="bing", level=gu.LEVEL_DEBUG, max_len=9999)
             soup = BeautifulSoup(response.text, "html.parser")
-            res = []
+            res = ""
+            result_cnt = 0
             ols = soup.find(id="b_results")
             for i in ols.find_all("li", class_="b_algo"):
                 try:
                     title = i.find("h2").text
                     desc = i.find("p").text
                     link = i.find("h2").find("a").get("href")
-                    res.append({
-                        "title": title,
-                        "desc": desc,
-                        "link": link,
-                    })
-                    if len(res) >= 5: # 限制5条
-                        break
-                    if len(_detail_store) >= 3:
-                        continue
+                    # res.append({
+                    #     "title": title,
+                    #     "desc": desc,
+                    #     "link": link,
+                    # })
+                    try:
+                        # gu.log(f"搜索网页: {link}", tag="网页搜索", level=gu.LEVEL_INFO)
+                        desc = fetch_website_content(link)
+                    except BaseException as e:
+                        print(f"(bing) fetch_website_content err: {str(e)}")
 
-                    # 爬取前两条的网页内容
-                    if "zhihu.com" in link:
-                        try:
-                            _detail_store.append(special_fetch_zhihu(link))
-                        except BaseException as e:
-                            print(f"zhihu parse err: {str(e)}")
-                    else:
-                        try:
-                            _detail_store.append(fetch_website_content(link))
-                        except BaseException as e:
-                            print(f"fetch_website_content err: {str(e)}")
+                    res += f"# No.{str(result_cnt + 1)}\ntitle: {title}\nurl: {link}\ncontent: {desc}\n\n"
+                    result_cnt += 1
+                    if result_cnt > 5: break
+
+                    # if len(_detail_store) >= 3:
+                    #     continue
+                    # # 爬取前两条的网页内容
+                    # if "zhihu.com" in link:
+                    #     try:
+                    #         _detail_store.append(special_fetch_zhihu(link))
+                    #     except BaseException as e:
+                    #         print(f"zhihu parse err: {str(e)}")
+                    # else:
+                    #     try:
+                    #         _detail_store.append(fetch_website_content(link))
+                    #     except BaseException as e:
+                    #         print(f"fetch_website_content err: {str(e)}")
 
                 except Exception as e:
                     print(f"bing parse err: {str(e)}")
-            if len(res) == 0:
-                break
-            if len(_detail_store) > 0:
-                ret = f"{str(res)} \n具体网页内容: {str(_detail_store)}"
-            else:
-                ret = f"{str(res)}"
-            return str(ret)
+            if result_cnt == 0: break
+            return res
         except Exception as e:
-            gu.log(f"bing fetch err: {str(e)}")
+            # gu.log(f"bing fetch err: {str(e)}")
             _cnt += 1
             time.sleep(1)
             
-    gu.log("fail to fetch bing info, using sougou.")
+    # gu.log("fail to fetch bing info, using sougou.")
     return web_keyword_search_via_sougou(keyword)
 
 def web_keyword_search_via_sougou(keyword) -> str:
@@ -152,7 +157,8 @@ def web_keyword_search_via_sougou(keyword) -> str:
             if len(res) >= 5: # 限制5条
                 break
         except Exception as e:
-            gu.log(f"sougou parse err: {str(e)}", tag="web_keyword_search_via_sougou", level=gu.LEVEL_ERROR)
+            pass
+            # gu.log(f"sougou parse err: {str(e)}", tag="web_keyword_search_via_sougou", level=gu.LEVEL_ERROR)
     # 爬取网页内容
     _detail_store = []
     for i in res:
@@ -168,33 +174,13 @@ def web_keyword_search_via_sougou(keyword) -> str:
     return ret
 
 def fetch_website_content(url):
-    gu.log(f"fetch_website_content: {url}", tag="fetch_website_content", level=gu.LEVEL_DEBUG)
+    # gu.log(f"fetch_website_content: {url}", tag="fetch_website_content", level=gu.LEVEL_DEBUG)
     headers = {
         "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) \
             AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36"
     }
     response = requests.get(url, headers=headers, timeout=3)
     response.encoding = "utf-8"
-    # soup = BeautifulSoup(response.text, "html.parser")
-    # # 如果有container / content / main等的话，就只取这些部分
-    # has = False
-    # beleive_ls = ["container", "content", "main"]
-    # res = ""
-    # for cls in beleive_ls:
-    #     for i in soup.find_all(class_=cls):
-    #         has = True
-    #         res += i.text
-    # if not has:
-    #     res = soup.text
-    # res = res.replace("\n", "").replace("  ", " ").replace("\r", "").replace("\t", "")
-    # if not has:
-    #     res = res[300:1100]
-    # else:
-    #     res = res[100:800]
-    # # with open(f"temp_{time.time()}.html", "w", encoding="utf-8") as f:
-    # #     f.write(res)
-    # gu.log(f"fetch_website_content: end", tag="fetch_website_content", level=gu.LEVEL_DEBUG)
-    # return res
     doc = Document(response.content)
     # print('title:', doc.title())
     ret = doc.summary(html_partial=True)
@@ -202,7 +188,7 @@ def fetch_website_content(url):
     ret = tidy_text(soup.get_text())
     return ret
 
-def web_search(question, provider: Provider, session_id, official_fc=False):
+async def web_search(question, provider: Provider, session_id, official_fc=False):
     '''
     official_fc: 使用官方 function-calling
     '''
@@ -212,24 +198,24 @@ def web_search(question, provider: Provider, session_id, official_fc=False):
         "name": "keyword",
         "description": "google search query (分词，尽量保留所有信息)"
         }],
-    "通过搜索引擎搜索。如果问题需要在网页上搜索(如天气、新闻或任何需要通过网页获取信息的问题)，则调用此函数；如果没有，不要调用此函数。",
-    google_web_search
+    "通过搜索引擎搜索。如果问题需要获取近期、实时的消息，在网页上搜索(如天气、新闻或任何需要通过网页获取信息的问题)，则调用此函数；如果没有，不要调用此函数。",
+    web_keyword_search_via_bing
     )
     new_func_call.add_func("fetch_website_content", [{
         "type": "string",
         "name": "url",
         "description": "网址"
         }],
-    "获取网页的内容。如果问题带有合法的网页链接(例如: `帮我总结一下https://github.com的内容`), 就调用此函数。如果没有，不要调用此函数。",
+    "获取网页的内容。如果问题带有合法的网页链接(例如: `帮我总结一下 https://github.com 的内容`), 就调用此函数。如果没有，不要调用此函数。",
     fetch_website_content
     )
     question1 = f"{question} \n> hint: 最多只能调用1个function, 并且存在不会调用任何function的可能性。"
     has_func = False
     function_invoked_ret = ""
     if official_fc:
-        func = provider.text_chat(question1, session_id, function_call=new_func_call.get_func())
+        # we use official function-calling
+        func = await provider.text_chat(question1, session_id, function_call=new_func_call.get_func())
         if isinstance(func, Function):
-            # arguments='{\n  "keyword": "北京今天的天气"\n}', name='google_web_search'
             # 执行对应的结果：
             func_obj = None
             for i in new_func_call.func_list:
@@ -237,43 +223,68 @@ def web_search(question, provider: Provider, session_id, official_fc=False):
                     func_obj = i["func_obj"]
                     break
             if not func_obj:
-                gu.log("找不到返回的 func name " + func.name, level=gu.LEVEL_ERROR)
-                return provider.text_chat(question1, session_id) + "\n(网页搜索失败, 此为默认回复)"
+                # gu.log("找不到返回的 func name " + func.name, level=gu.LEVEL_ERROR)
+                return await provider.text_chat(question1, session_id) + "\n(网页搜索失败, 此为默认回复)"
             try:
                 args = json.loads(func.arguments)
-                function_invoked_ret = func_obj(**args)
+                # we use to_thread to avoid blocking the event loop
+                function_invoked_ret = await asyncio.to_thread(func_obj, **args)
                 has_func = True
             except BaseException as e:
                 traceback.print_exc()
-                return provider.text_chat(question1, session_id) + "\n(网页搜索失败, 此为默认回复)"
+                return await provider.text_chat(question1, session_id) + "\n(网页搜索失败, 此为默认回复)"
         else:
             # now func is a string
             return func
     else:
+        # we use our own function-calling
         try:
-            function_invoked_ret, has_func = new_func_call.func_call(question1, new_func_call.func_dump(), is_task=False, is_summary=False)
+            args = {
+                'question': question1,
+                'func_definition': new_func_call.func_dump(),
+                'is_task': False,
+                'is_summary': False,
+            }
+            function_invoked_ret, has_func = await asyncio.to_thread(new_func_call.func_call, **args)
         except BaseException as e:
-            res = provider.text_chat(question) + "\n(网页搜索失败, 此为默认回复)"
+            res = await provider.text_chat(question) + "\n(网页搜索失败, 此为默认回复)"
             return res
         has_func = True
 
     if has_func:
-        provider.forget(session_id)
-        question3 = f"""请你用活泼的语气回答`{question}`问题。\n以下是相关材料，请直接拿此材料针对问题进行总结回答。在文章末尾加上各参考链接，如`[1] <title> <url>`；不要提到任何函数调用的信息；在总结的末尾加上1或2个相关的emoji。```\n{function_invoked_ret}\n```\n"""
-        gu.log(f"web_search: {question3}", tag="web_search", level=gu.LEVEL_DEBUG, max_len=99999)
+        await provider.forget(session_id)
+        question3 = f"""
+你的任务是：
+1. 根据末尾的材料对问题`{question}`做切题的总结（详细）;
+2. 简单地发表你对这个问题的看法（简略）。
+你的总结末尾应当有对材料的引用, 如果有链接, 请在末尾附上引用网页链接。引用格式严格按照 `\n[1] title url \n`。
+不要提到任何函数调用的信息。
+
+一些回复的消息模板：
+模板1:
+```
+从网上的信息来看，可以知道...我个人认为...你觉得呢？
+```
+模板2:
+```
+根据网上的最新信息，可以得知...我觉得...你怎么看？
+```
+你可以根据这些模板来组织回答，但可以不照搬，要根据问题的内容来回答。
+
+以下是相关材料：
+"""
         _c = 0
         while _c < 3:
             try:
                 print('text chat')
-                final_ret = provider.text_chat(question3)
+                final_ret = await provider.text_chat(question3 + "```" + function_invoked_ret + "```", session_id)
                 return final_ret
             except Exception as e:
                 print(e)
                 _c += 1
                 if _c == 3: raise e
                 if "The message you submitted was too long" in str(e):
-                    provider.forget(session_id)
+                    await provider.forget(session_id)
                     function_invoked_ret = function_invoked_ret[:int(len(function_invoked_ret) / 2)]
                     time.sleep(3)
-                    question3 = f"""请回答`{question}`问题。\n以下是相关材料，请直接拿此材料针对问题进行回答，再给参考链接, 参考链接首末有空格。```\n{function_invoked_ret}\n```\n"""
     return function_invoked_ret

util/general_utils.py

@@ -7,6 +7,12 @@ import re
 import requests
 from util.cmd_config import CmdConfig
 import socket
+from cores.qqbot.types import GlobalObject
+import platform
+import logging
+import json
+import sys
+import psutil
 
 PLATFORM_GOCQ = 'gocq'
 PLATFORM_QQCHAN = 'qqchan'
@@ -37,84 +43,98 @@ BG_COLORS = {
 
 LEVEL_DEBUG = "DEBUG"
 LEVEL_INFO = "INFO"
-LEVEL_WARNING = "WARNING"
+LEVEL_WARNING = "WARN"
 LEVEL_ERROR = "ERROR"
 LEVEL_CRITICAL = "CRITICAL"
 
+# 为了兼容旧版
 level_codes = {
-    LEVEL_DEBUG: 0,
-    LEVEL_INFO: 1,
-    LEVEL_WARNING: 2,
-    LEVEL_ERROR: 3,
-    LEVEL_CRITICAL: 4
+    LEVEL_DEBUG: logging.DEBUG,
+    LEVEL_INFO: logging.INFO,
+    LEVEL_WARNING: logging.WARNING,
+    LEVEL_ERROR: logging.ERROR,
+    LEVEL_CRITICAL: logging.CRITICAL,
 }
 
 level_colors = {
     "INFO": "green",
-    "WARNING": "yellow",
+    "WARN": "yellow",
     "ERROR": "red",
     "CRITICAL": "purple",
 }
 
-def log(
-        msg: str,
-        level: str = "INFO",
-        tag: str = "System",
-        fg: str = None,
-        bg: str = None,
-        max_len: int = 500,
-        err: Exception = None,):
-    """
-    日志打印函数
-    """
-    _set_level_code = level_codes[LEVEL_INFO]
-    if 'LOG_LEVEL' in os.environ and os.environ['LOG_LEVEL'] in level_codes:
-        _set_level_code = level_codes[os.environ['LOG_LEVEL']]
-
-    if level in level_codes and level_codes[level] < _set_level_code:
-        return
+class Logger:
+    def __init__(self) -> None:
+        self.history = []
     
-    if err is not None:
-        msg += "\n异常原因: " + str(err)
-        level = LEVEL_ERROR
+    def log(
+            self,
+            msg: str,
+            level: str = "INFO",
+            tag: str = "System",
+            fg: str = None,
+            bg: str = None,
+            max_len: int = 50000,
+            err: Exception = None,):
+        """
+        日志打印函数
+        """
+        _set_level_code = level_codes[LEVEL_INFO]
+        if 'LOG_LEVEL' in os.environ and os.environ['LOG_LEVEL'] in level_codes:
+            _set_level_code = level_codes[os.environ['LOG_LEVEL']]
 
-    if len(msg) > max_len:
-        msg = msg[:max_len] + "..."
-    now = datetime.datetime.now().strftime("%m-%d %H:%M:%S")
-    
-    pres = []
-    for line in msg.split("\n"):
-        if line == "\n":
-            pres.append("")
-        else:
-            pres.append(f"[{now}] [{level}] [{tag}]: {line}")
+        if level in level_codes and level_codes[level] < _set_level_code:
+            return
+        
+        if err is not None:
+            msg += "\n异常原因: " + str(err)
+            level = LEVEL_ERROR
 
-    if level == "INFO":
-        if fg is None:
-            fg = FG_COLORS["green"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-    elif level == "WARNING":
-        if fg is None:
-            fg = FG_COLORS["yellow"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-    elif level == "ERROR":
-        if fg is None:
-            fg = FG_COLORS["red"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-    elif level == "CRITICAL":
-        if fg is None:
-            fg = FG_COLORS["purple"]
-        if bg is None:
-            bg = BG_COLORS["default"]
-            
-    ret = ""
-    for line in pres:
-        ret += f"\033[{fg};{bg}m{line}\033[0m\n"
-    print(ret[:-1])
+        if len(msg) > max_len:
+            msg = msg[:max_len] + "..."
+        now = datetime.datetime.now().strftime("%H:%M:%S")
+        
+        pres = []
+        for line in msg.split("\n"):
+            if line == "\n":
+                pres.append("")
+            else:
+                pres.append(f"[{now}] [{tag}/{level}] {line}")
 
+        if level == "INFO":
+            if fg is None:
+                fg = FG_COLORS["green"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+        elif level == "WARN":
+            if fg is None:
+                fg = FG_COLORS["yellow"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+        elif level == "ERROR":
+            if fg is None:
+                fg = FG_COLORS["red"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+        elif level == "CRITICAL":
+            if fg is None:
+                fg = FG_COLORS["purple"]
+            if bg is None:
+                bg = BG_COLORS["default"]
+                
+        ret = ""
+        for line in pres:
+            ret += f"\033[{fg};{bg}m{line}\033[0m\n"
+        try:
+            requests.post("http://localhost:6185/api/log", data=ret[:-1].encode(), timeout=1)
+        except BaseException as e:
+            pass
+        self.history.append(ret)
+        if len(self.history) > 100:
+            self.history = self.history[-100:]
+        print(ret[:-1])
+
+log = Logger()
 
 def port_checker(port: int, host: str = "localhost"):
     sk = socket.socket(socket.AF_INET,socket.SOCK_STREAM)
@@ -127,18 +147,23 @@ def port_checker(port: int, host: str = "localhost"):
         sk.close()
         return False
     
-def word2img(title: str, text: str, max_width=30, font_size=20):
+def get_font_path() -> str:
     if os.path.exists("resources/fonts/syst.otf"):
         font_path = "resources/fonts/syst.otf"
     elif os.path.exists("QQChannelChatGPT/resources/fonts/syst.otf"):
         font_path = "QQChannelChatGPT/resources/fonts/syst.otf"
+    elif os.path.exists("AstrBot/resources/fonts/syst.otf"):
+        font_path = "AstrBot/resources/fonts/syst.otf"
     elif os.path.exists("C:/Windows/Fonts/simhei.ttf"):
         font_path = "C:/Windows/Fonts/simhei.ttf"
     elif os.path.exists("/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"):
         font_path = "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
     else:
         raise Exception("找不到字体文件")
+    return font_path
     
+def word2img(title: str, text: str, max_width=30, font_size=20):
+    font_path = get_font_path()
     width_factor = 1.0
     height_factor = 1.5
     # 格式化文本宽度最大为30
@@ -147,8 +172,6 @@ def word2img(title: str, text: str, max_width=30, font_size=20):
     length = len(lines)
     for l in lines:
         if len(l) > max_width:
-            # lines[i] = l[:max_width] + '\n' + l[max_width:]
-            # for
             cp = l
             for ii in range(len(l)):
                 if ii % max_width == 0:
@@ -172,7 +195,6 @@ def word2img(title: str, text: str, max_width=30, font_size=20):
 
     return image
 
-
 def render_markdown(markdown_text, image_width=800, image_height=600, font_size=26, font_color=(0, 0, 0), bg_color=(255, 255, 255)):
 
     HEADER_MARGIN = 20
@@ -212,24 +234,9 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
     # 用于匹配图片的正则表达式
     IMAGE_REGEX = r"!\s*\[.*?\]\s*\((.*?)\)"
 
-    
-    if os.path.exists("resources/fonts/syst.otf"):
-        font_path = "resources/fonts/syst.otf"
-    elif os.path.exists("QQChannelChatGPT/resources/fonts/syst.otf"):
-        font_path = "QQChannelChatGPT/resources/fonts/syst.otf"
-    elif os.path.exists("C:/Windows/Fonts/simhei.ttf"):
-        font_path = "C:/Windows/Fonts/simhei.ttf"
-    elif os.path.exists("/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"):
-        font_path = "/usr/share/fonts/opentype/noto/NotoSansCJK-Regular.ttc"
-    else:
-        raise Exception("找不到字体文件")
-    # backup
-    if os.path.exists("resources/fonts/simhei.ttf"):
-        font_path1 = "resources/fonts/simhei.ttf"
-    elif os.path.exists("QQChannelChatGPT/resources/fonts/simhei.ttf"):
-        font_path1 = "QQChannelChatGPT/resources/fonts/simhei.ttf"
-    else:
-        font_path1 = font_path
+    font_path = get_font_path()
+    font_path1 = font_path
+
     # 加载字体
     font = ImageFont.truetype(font_path, font_size)
     
@@ -316,7 +323,6 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
             height += font_size + TEXT_LINE_MARGIN*2
 
     markdown_text = '\n'.join(pre_lines)
-    print("Pre process done, height: ", height)
     image_height = height
     if image_height < 100:
         image_height = 100
@@ -326,13 +332,6 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
     image = Image.new('RGB', (image_width, image_height), bg_color)
     draw = ImageDraw.Draw(image)
 
-
-    # # get all the emojis unicode in the markdown text
-    # unicode_text = markdown_text.encode('unicode_escape').decode()
-    # # print(unicode_text)
-    # unicode_emojis = re.findall(r'\\U\w{8}', unicode_text)
-    # emoji_base_url = "https://abs.twimg.com/emoji/v1/72x72/{unicode_emoji}.png"
-
     # 设置初始位置
     x, y = 10, 10
 
@@ -354,25 +353,10 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
         line = line.strip()
 
         if line.startswith("#"):
-            # unicode_emojis = re.findall(r'\\U0001\w{4}', line)
-            # for unicode_emoji in unicode_emojis:
-            #     line = line.replace(unicode_emoji, "")
-            # unicode_emoji = ""
-            # if len(unicode_emojis) > 0:
-            #     unicode_emoji = unicode_emojis[0]
-            
             # 处理标题
             header_level = line.count("#")
             line = line.strip("#").strip()
             font_size_header = HEADER_FONT_STANDARD_SIZE - header_level * 4
-
-            # if unicode_emoji != "":
-            #     emoji_url = emoji_base_url.format(unicode_emoji=unicode_emoji[-5:])
-            #     emoji = Image.open(requests.get(emoji_url, stream=True).raw)
-            #     emoji = emoji.resize((font_size, font_size))
-            #     image.paste(emoji, (x, y))
-            #     x += font_size
-
             font = ImageFont.truetype(font_path, font_size_header)
             y += HEADER_MARGIN # 上边距
             # 字间距
@@ -383,10 +367,6 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
         elif line.startswith(">"):
             # 处理引用
             quote_text = line.strip(">")
-            # quote_width = image_width - 20  # 引用框的宽度为图像宽度减去左右边距
-            # quote_height = font_size + 10  # 引用框的高度为字体大小加上上下边距
-            # quote_box = (x, y, x + quote_width, y + quote_height)
-            # draw.rounded_rectangle(quote_box, radius=5, fill=(230, 230, 230), width=2)  # 使用灰色填充矩形框作为引用背景
             y+=QUOTE_LEFT_LINE_MARGIN
             draw.line((x, y, x, y + QUOTE_LEFT_LINE_HEIGHT), fill=QUOTE_LEFT_LINE_COLOR, width=QUOTE_LEFT_LINE_WIDTH)
             font = ImageFont.truetype(font_path, QUOTE_FONT_SIZE)
@@ -462,7 +442,6 @@ def render_markdown(markdown_text, image_width=800, image_height=600, font_size=
             y += image_res.size[1] + IMAGE_MARGIN*2
     return image
 
-
 def save_temp_img(img: Image) -> str:
     if not os.path.exists("temp"):
         os.makedirs("temp")
@@ -476,7 +455,7 @@ def save_temp_img(img: Image) -> str:
                 if time.time() - ctime > 3600:
                     os.remove(path)
     except Exception as e:
-        log(f"清除临时文件失败: {e}", level=LEVEL_WARNING, tag="GeneralUtils")
+        print(f"清除临时文件失败: {e}", level=LEVEL_WARNING, tag="GeneralUtils")
 
     # 获得时间戳
     timestamp = int(time.time())
@@ -484,7 +463,6 @@ def save_temp_img(img: Image) -> str:
     img.save(p)
     return p
 
-
 def create_text_image(title: str, text: str, max_width=30, font_size=20):
     '''
     文本转图片。
@@ -514,9 +492,10 @@ def create_markdown_image(text: str):
     except Exception as e:
         raise e
 
-
-# 迁移配置文件到 cmd_config.json    
 def try_migrate_config(old_config: dict):
+    '''
+    迁移配置文件到 cmd_config.json    
+    '''
     cc = CmdConfig()
     if cc.get("qqbot", None) is None:
         # 未迁移过
@@ -524,11 +503,65 @@ def try_migrate_config(old_config: dict):
             cc.put(k, old_config[k])
 
 def get_local_ip_addresses():
+    ip = ''
     try:
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         s.connect(('8.8.8.8', 80))
         ip = s.getsockname()[0]
+    except BaseException as e:
+        pass
     finally:
         s.close()
+    return ip
 
-    return ip
+def get_sys_info(global_object: GlobalObject):
+    mem = None
+    stats = global_object.dashboard_data.stats
+    os_name = platform.system()
+    os_version = platform.version()
+
+    if 'sys_perf' in stats and 'memory' in stats['sys_perf']:
+        mem = stats['sys_perf']['memory']
+    return {
+        'mem': mem,
+        'os': os_name + '_' + os_version,
+        'py': platform.python_version(),
+    }
+    
+def upload(_global_object: GlobalObject):
+    while True:
+        addr_ip = ''
+        try:
+            res = {
+                "version": _global_object.version, 
+                "count": _global_object.cnt_total,
+                "ip": addr_ip,
+                "sys": sys.platform,
+                "admin": "null",
+            }
+            resp = requests.post('https://api.soulter.top/upload', data=json.dumps(res), timeout=5)
+            if resp.status_code == 200:
+                ok = resp.json()
+                if ok['status'] == 'ok':
+                    _global_object.cnt_total = 0
+        except BaseException as e:
+            pass
+        time.sleep(10*60)
+
+def run_monitor(global_object: GlobalObject):
+    '''
+    监测机器性能
+    - Bot 内存使用量
+    - CPU 占用率
+    '''
+    start_time = time.time()
+    while True:
+        stat = global_object.dashboard_data.stats
+        # 程序占用的内存大小
+        mem = psutil.Process().memory_info().rss / 1024 / 1024 # MB
+        stat['sys_perf'] = {
+            'memory': mem,
+            'cpu': psutil.cpu_percent()
+        }
+        stat['sys_start_time'] = start_time
+        time.sleep(30)

util/plugin_dev/api/v1/bot.py

@@ -0,0 +1,11 @@
+from cores.qqbot.types import (
+    PluginMetadata,
+    RegisteredLLM,
+    RegisteredPlugin,
+    RegisteredPlatform,
+    RegisteredPlugins,
+    PluginType,
+    GlobalObject,
+    AstrMessageEvent,
+    CommandResult
+)

util/plugin_dev/api/v1/config.py

@@ -0,0 +1,82 @@
+from typing import Union
+import os
+import json
+
+def load_config(namespace: str) -> Union[dict, bool]:
+    '''
+    从配置文件中加载配置。
+    namespace: str, 配置的唯一识别符，也就是配置文件的名字。
+    返回值: 当配置文件存在时，返回 namespace 对应配置文件的内容dict，否则返回 False。
+    '''
+    path = f"data/config/{namespace}.json"
+    if not os.path.exists(path):
+        return False
+    with open(path, "r", encoding="utf-8-sig") as f:
+        ret = {}
+        data = json.load(f)
+        for k in data:
+            ret[k] = data[k]["value"]
+        return ret
+        
+def put_config(namespace: str, name: str, key: str, value, description: str):
+    '''
+    将配置项写入以namespace为名字的配置文件，如果key不存在于目标配置文件中。当前 value 仅支持 str, int, float, bool, list 类型（暂不支持 dict）。
+    namespace: str, 配置的唯一识别符，也就是配置文件的名字。
+    name: str, 配置项的显示名字。
+    key: str, 配置项的键。
+    value: str, int, float, bool, list, 配置项的值。
+    description: str, 配置项的描述。
+    注意：只有当 namespace 为插件名(info 函数中的 name)时，该配置才会显示到可视化面板上。
+    注意：value一定要是该配置项对应类型的值，否则类型判断会乱。
+    '''
+    if namespace == "":
+        raise ValueError("namespace 不能为空。")
+    if namespace.startswith("internal_"):
+        raise ValueError("namespace 不能以 internal_ 开头。")
+    if not isinstance(key, str):
+        raise ValueError("key 只支持 str 类型。")
+    if not isinstance(value, (str, int, float, bool, list)):
+        raise ValueError("value 只支持 str, int, float, bool, list 类型。")
+    path = f"data/config/{namespace}.json"
+    if not os.path.exists(path):
+        with open(path, "w", encoding="utf-8-sig") as f:
+            f.write("{}")
+    with open(path, "r", encoding="utf-8-sig") as f:
+        d = json.load(f)
+    assert(isinstance(d, dict))
+    if key not in d:
+        d[key] = {
+            "config_type": "item",
+            "name": name,
+            "description": description,
+            "path": key,
+            "value": value,
+            "val_type": type(value).__name__
+        }
+        with open(path, "w", encoding="utf-8-sig") as f:
+            json.dump(d, f, indent=2, ensure_ascii=False)
+            f.flush()
+        
+def update_config(namespace: str, key: str, value):
+    '''
+    更新配置文件中的配置项。
+    namespace: str, 配置的唯一识别符，也就是配置文件的名字。
+    key: str, 配置项的键。
+    value: str, int, float, bool, list, 配置项的值。
+    '''
+    path = f"data/config/{namespace}.json"
+    if not os.path.exists(path):
+        raise FileNotFoundError(f"配置文件 {namespace}.json 不存在。")
+    with open(path, "r", encoding="utf-8-sig") as f:
+        d = json.load(f)
+    assert(isinstance(d, dict))
+    if key not in d:
+        raise KeyError(f"配置项 {key} 不存在。")
+    d[key]["value"] = value
+    with open(path, "w", encoding="utf-8-sig") as f:
+        json.dump(d, f, indent=2, ensure_ascii=False)
+        f.flush()  
+        
+
+    
+    

util/plugin_dev/api/v1/llm.py

@@ -0,0 +1,6 @@
+'''
+大语言模型.
+
+插件开发者可以继承这个类来做实现。
+'''
+from model.provider.provider import Provider as LLMProvider

util/plugin_dev/api/v1/message.py

@@ -0,0 +1,9 @@
+from cores.qqbot.core import oper_msg
+from cores.qqbot.types import AstrMessageEvent, CommandResult
+from model.platform._message_result import MessageResult
+
+'''
+消息处理。在消息平台接收到消息后，调用此函数进行处理。
+集成了指令检测、指令处理、LLM 调用等功能。
+'''
+message_handler = oper_msg 

util/plugin_dev/api/v1/platform.py

@@ -0,0 +1,11 @@
+'''
+消息平台。
+
+Platform类是消息平台的抽象类，定义了消息平台的基本接口。
+消息平台的具体实现类需要继承Platform类，并实现其中的抽象方法。
+'''
+
+from model.platform._platfrom import Platform
+
+from model.platform.qq_gocq import QQGOCQ
+from model.platform.qq_official import QQOfficial

util/plugin_dev/api/v1/register.py

@@ -0,0 +1,63 @@
+'''
+允许开发者注册某一个类的实例到 LLM 或者 PLATFORM 中，方便其他插件调用。
+
+必须分别实现 Platform 和 LLMProvider 中涉及的接口
+'''
+from model.provider.provider import Provider as LLMProvider
+from model.platform._platfrom import Platform
+from cores.qqbot.types import GlobalObject, RegisteredPlatform, RegisteredLLM
+
+def register_platform(platform_name: str, platform_instance: Platform, context: GlobalObject) -> None:
+    '''
+    注册一个消息平台。
+
+    Args:
+        platform_name: 平台名称。
+        platform_instance: 平台实例。
+    '''
+    
+    # check 是否已经注册
+    for platform in context.platforms:
+        if platform.platform_name == platform_name:
+            raise ValueError(f"Platform {platform_name} has been registered.")
+    
+    context.platforms.append(RegisteredPlatform(platform_name, platform_instance))
+    
+def register_llm(llm_name: str, llm_instance: LLMProvider, context: GlobalObject) -> None:
+    '''
+    注册一个大语言模型。
+
+    Args:
+        llm_name: 大语言模型名称。
+        llm_instance: 大语言模型实例。
+    '''
+    # check 是否已经注册
+    for llm in context.llms:
+        if llm.llm_name == llm_name:
+            raise ValueError(f"LLMProvider {llm_name} has been registered.")
+    
+    context.llms.append(RegisteredLLM(llm_name, llm_instance))
+
+def unregister_platform(platform_name: str, context: GlobalObject) -> None:
+    '''
+    注销一个消息平台。
+
+    Args:
+        platform_name: 平台名称。
+    '''
+    for i, platform in enumerate(context.platforms):
+        if platform.platform_name == platform_name:
+            context.platforms.pop(i)
+            return
+        
+def unregister_llm(llm_name: str, context: GlobalObject) -> None:
+    '''
+    注销一个大语言模型。
+
+    Args:
+        llm_name: 大语言模型名称。
+    '''
+    for i, llm in enumerate(context.llms):
+        if llm.llm_name == llm_name:
+            context.llms.pop(i)
+            return

util/plugin_dev/api/v1/types.py

@@ -0,0 +1,5 @@
+'''
+插件类型
+'''
+
+from cores.qqbot.types import PluginType

util/plugin_util.py

@@ -9,36 +9,52 @@ try:
 except ImportError:
     pass
 import shutil
-from pip._internal import main as pipmain
 import importlib
 import stat
+import traceback
+from types import ModuleType
+from typing import List
+from pip._internal import main as pipmain
+from cores.qqbot.types import (
+    PluginMetadata,
+    PluginType,
+    RegisteredPlugin,
+    RegisteredPlugins
+)
 
 
 # 找出模块里所有的类名
-def get_classes(p_name, arg):
+def get_classes(p_name, arg: ModuleType):
     classes = []
     clsmembers = inspect.getmembers(arg, inspect.isclass)
     for (name, _) in clsmembers:
-        # print(name, p_name)
-        if p_name.lower() == name.lower()[:-6] or name.lower() == "main":
+        if name.lower().endswith("plugin") or name.lower() == "main":
             classes.append(name)
             break
+        # if p_name.lower() == name.lower()[:-6] or name.lower() == "main":
     return classes
 
 # 获取一个文件夹下所有的模块, 文件名和文件夹名相同
 def get_modules(path):
     modules = []
-    for root, dirs, files in os.walk(path):
-        # 获得所在目录名
-        p_name = os.path.basename(root)
-        for file in files:
-            """
-            与文件夹名（不计大小写）相同或者是main.py的，都算启动模块
-            """
-            if file.endswith(".py") and not file.startswith("__") and (p_name.lower() == file[:-3].lower() or file[:-3].lower() == "main"):
+
+    # 得到其下的所有文件夹
+    dirs = os.listdir(path)
+    # 遍历文件夹，找到 main.py 或者和文件夹同名的文件
+    for d in dirs:
+        if os.path.isdir(os.path.join(path, d)):
+            if os.path.exists(os.path.join(path, d, "main.py")):
+                module_str = 'main'
+            elif os.path.exists(os.path.join(path, d, d + ".py")):
+                module_str = d
+            else:
+                print(f"插件 {d} 未找到 main.py 或者 {d}.py，跳过。")
+                continue
+            if os.path.exists(os.path.join(path, d, "main.py")) or os.path.exists(os.path.join(path, d, d + ".py")):
                 modules.append({
-                    "pname": p_name,
-                    "module": file[:-3],
+                    "pname": d,
+                    "module": module_str,
+                    "module_path": os.path.join(path, d, module_str)
                 })
     return modules
 
@@ -66,47 +82,71 @@ def get_plugin_modules():
     except BaseException as e:
         raise e
 
-def plugin_reload(cached_plugins: dict, target: str = None, all: bool = False):
+def plugin_reload(cached_plugins: RegisteredPlugins):
     plugins = get_plugin_modules()
     if plugins is None:
         return False, "未找到任何插件模块"
     fail_rec = ""
+    
+    registered_map = {}
+    for p in cached_plugins:
+        registered_map[p.module_path] = None
+    
     for plugin in plugins:
         try:
             p = plugin['module']
+            module_path = plugin['module_path']
             root_dir_name = plugin['pname']
-            if p not in cached_plugins or p == target or all:
+            
+            if module_path in registered_map:
+                # 之前注册过
+                module = importlib.reload(module)
+            else:
                 module = __import__("addons.plugins." + root_dir_name + "." + p, fromlist=[p])
-                if p in cached_plugins:
-                    module = importlib.reload(module)
-                cls = get_classes(p, module)
-                obj = getattr(module, cls[0])()
-                try:
-                    info = obj.info()
+
+            cls = get_classes(p, module)
+            obj = getattr(module, cls[0])()
+            
+            metadata = None
+            try:
+                info = obj.info()
+                if isinstance(info, dict):
                     if 'name' not in info or 'desc' not in info or 'version' not in info or 'author' not in info:
-                        fail_rec += f"载入插件{p}失败，原因: 插件信息不完整\n"
+                        fail_rec += f"注册插件 {module_path} 失败，原因: 插件信息不完整\n"
                         continue
-                    if isinstance(info, dict) == False:
-                        fail_rec += f"载入插件{p}失败，原因: 插件信息格式不正确\n"
-                        continue
-                except BaseException as e:
-                    fail_rec += f"调用插件{p} info失败, 原因: {str(e)}\n"
+                    else:
+                        metadata = PluginMetadata(
+                            plugin_name=info['name'],
+                            plugin_type=PluginType.COMMON if 'plugin_type' not in info else PluginType(info['plugin_type']),
+                            author=info['author'],
+                            desc=info['desc'],
+                            version=info['version'],
+                            repo=info['repo'] if 'repo' in info else None
+                        )
+                elif isinstance(info, PluginMetadata):
+                    metadata = info
+                else:
+                    fail_rec += f"注册插件 {module_path} 失败，原因: info 函数返回值类型错误\n"
                     continue
-                cached_plugins[info['name']] = {
-                    "module": module,
-                    "clsobj": obj,
-                    "info": info,
-                    "name": info['name'],
-                    "root_dir_name": root_dir_name,
-                }
+            except BaseException as e:
+                fail_rec += f"注册插件 {module_path} 失败, 原因: {str(e)}\n"
+                continue
+            cached_plugins.append(RegisteredPlugin(
+                metadata=metadata,
+                plugin_instance=obj,
+                module=module,
+                module_path=module_path,
+                root_dir_name=root_dir_name
+            ))
         except BaseException as e:
+            traceback.print_exc()
             fail_rec += f"加载{p}插件出现问题，原因 {str(e)}\n"
     if fail_rec == "":
         return True, None
     else:
         return False, fail_rec
 
-def install_plugin(repo_url: str, cached_plugins: dict):
+def install_plugin(repo_url: str, cached_plugins: RegisteredPlugins):
     ppath = get_plugin_store_path()
     # 删除末尾的 /
     if repo_url.endswith("/"):
@@ -124,23 +164,33 @@ def install_plugin(repo_url: str, cached_plugins: dict):
     if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
         if pipmain(['install', '-r', os.path.join(plugin_path, "requirements.txt"), '--quiet']) != 0:
             raise Exception("插件的依赖安装失败, 需要您手动 pip 安装对应插件的依赖。")
-    ok, err = plugin_reload(cached_plugins, target=d)
+    ok, err = plugin_reload(cached_plugins)
     if not ok: raise Exception(err)
+    
+def get_registered_plugin(plugin_name: str, cached_plugins: RegisteredPlugins) -> RegisteredPlugin:
+    ret = None
+    for p in cached_plugins:
+        if p.metadata.plugin_name == plugin_name:
+            ret = p
+            break
+    return ret
 
-def uninstall_plugin(plugin_name: str, cached_plugins: dict):
-    if plugin_name not in cached_plugins:
+def uninstall_plugin(plugin_name: str, cached_plugins: RegisteredPlugins):
+    plugin = get_registered_plugin(plugin_name, cached_plugins)
+    if not plugin:
         raise Exception("插件不存在。")
-    root_dir_name = cached_plugins[plugin_name]["root_dir_name"]
+    root_dir_name = plugin.root_dir_name
     ppath = get_plugin_store_path()
-    del cached_plugins[plugin_name]
+    cached_plugins.remove(plugin)
     if not remove_dir(os.path.join(ppath, root_dir_name)):
         raise Exception("移除插件成功，但是删除插件文件夹失败。您可以手动删除该文件夹，位于 addons/plugins/ 下。")
 
-def update_plugin(plugin_name: str, cached_plugins: dict):
-    if plugin_name not in cached_plugins:
+def update_plugin(plugin_name: str, cached_plugins: RegisteredPlugins):
+    plugin = get_registered_plugin(plugin_name, cached_plugins)
+    if not plugin:
         raise Exception("插件不存在。")
     ppath = get_plugin_store_path()
-    root_dir_name = cached_plugins[plugin_name]["root_dir_name"]
+    root_dir_name = plugin.root_dir_name
     plugin_path = os.path.join(ppath, root_dir_name)
     repo = Repo(path = plugin_path)
     repo.remotes.origin.pull()
@@ -148,7 +198,7 @@ def update_plugin(plugin_name: str, cached_plugins: dict):
     if os.path.exists(os.path.join(plugin_path, "requirements.txt")):
         if pipmain(['install', '-r', os.path.join(plugin_path, "requirements.txt"), '--quiet']) != 0:
             raise Exception("插件依赖安装失败, 需要您手动pip安装对应插件的依赖。")
-    ok, err = plugin_reload(cached_plugins, target=plugin_name)
+    ok, err = plugin_reload(cached_plugins)
     if not ok: raise Exception(err)
 
 def remove_dir(file_path) -> bool:

util/updator.py

@@ -0,0 +1,145 @@
+has_git = True
+try:
+    import git.exc
+    from git.repo import Repo
+except BaseException as e:
+    has_git = False
+import sys, os
+import requests
+
+def _reboot():
+    py = sys.executable
+    os.execl(py, py, *sys.argv)
+    
+def find_repo() -> Repo:
+    if not has_git:
+        raise Exception("未安装 GitPython 库，无法进行更新。")
+    repo = None
+    
+    # 由于项目更名过，因此这里需要多次尝试。
+    try:
+        repo = Repo()
+    except git.exc.InvalidGitRepositoryError:
+        try:
+            repo = Repo(path="QQChannelChatGPT")  
+        except git.exc.InvalidGitRepositoryError:
+            repo = Repo(path="AstrBot")
+    if not repo:
+        raise Exception("在已知的目录下未找到项目位置。请联系项目维护者。")
+    return repo
+    
+def request_release_info(latest: bool = True) -> list:
+    '''
+    请求版本信息。
+    返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
+    '''
+    api_url1 = "https://api.github.com/repos/Soulter/AstrBot/releases"
+    api_url2 = "https://api.soulter.top/releases" # 0-10 分钟的缓存时间
+    try:
+        result = requests.get(api_url2).json()
+    except BaseException as e:
+        result = requests.get(api_url1).json()
+    try:
+        if latest:
+            ret = github_api_release_parser([result[0]])
+        else:
+            ret = github_api_release_parser(result)
+    except BaseException as e:
+        raise Exception(f"解析版本信息失败: {result}")
+    return ret
+        
+def github_api_release_parser(releases: list) -> list:
+    '''
+    解析 GitHub API 返回的 releases 信息。
+    返回一个列表，每个元素是一个字典，包含版本号、发布时间、更新内容、commit hash等信息。
+    '''
+    ret = []
+    for release in releases:
+        version = release['name']
+        commit_hash = ''
+        # 规范是: v3.0.7.xxxxxx，其中xxxxxx为 commit hash
+        _t = version.split(".")
+        if len(_t) == 4:
+            commit_hash = _t[3]
+        ret.append({
+            "version": release['name'],
+            "published_at": release['published_at'],
+            "body": release['body'],
+            "commit_hash": commit_hash,
+            "tag_name": release['tag_name']
+        })
+    return ret
+
+def check_update() -> str:
+    repo = find_repo()
+    curr_commit = repo.commit().hexsha
+    update_data = request_release_info()
+    new_commit = update_data[0]['commit_hash']
+    print(f"当前版本: {curr_commit}")
+    print(f"最新版本: {new_commit}")
+    if curr_commit.startswith(new_commit):
+        return "当前已经是最新版本。"
+    else:
+        update_info = f"""有新版本可用。
+=== 当前版本 ===
+{curr_commit}
+
+=== 新版本 ===
+{update_data[0]['version']}
+
+=== 发布时间 ===
+{update_data[0]['published_at']}
+
+=== 更新内容 ===
+{update_data[0]['body']}"""
+        return update_info
+    
+def update_project(update_data: list,
+                   reboot: bool = False, 
+                   latest: bool = True,
+                   version: str = ''):
+    repo = find_repo()
+    # update_data = request_release_info(latest)
+    if latest:
+        # 检查本地commit和最新commit是否一致
+        curr_commit = repo.head.commit.hexsha
+        new_commit = update_data[0]['commit_hash']
+        if curr_commit == '':
+            raise Exception("无法获取当前版本号对应的版本位置。请联系项目维护者。")
+        if curr_commit.startswith(new_commit):
+            raise Exception("当前已经是最新版本。")
+        else:
+            # 更新到最新版本对应的commit
+            try:
+                repo.remotes.origin.fetch()
+                repo.git.checkout(update_data[0]['tag_name'])
+                if reboot: _reboot()
+            except BaseException as e:
+                raise e
+    else:
+        # 更新到指定版本
+        flag = False
+        for data in update_data:
+            if data['tag_name'] == version:
+                try:
+                    repo.remotes.origin.fetch()
+                    repo.git.checkout(data['tag_name'])
+                    flag = True
+                    if reboot: _reboot()
+                except BaseException as e:
+                    raise e
+            else:
+                continue
+        if not flag:
+            raise Exception("未找到指定版本。")
+    
+def checkout_branch(branch_name: str):
+    repo = find_repo()
+    try:
+        origin = repo.remotes.origin
+        origin.fetch()
+        repo.git.checkout(branch_name)
+        repo.git.pull("origin", branch_name, "-f")
+        return True
+    except BaseException as e:
+        raise e

util/webapp_replit.py

@@ -1,25 +0,0 @@
-from flask import Flask
-from threading import Thread
-import datetime
-
-app = Flask(__name__)
-
-
-@app.route('/')
-def main_func():
-  content = "<h1>QQChannelChatGPT Web APP</h1>"
-
-  content += "<p>" + "Online @ " + str(datetime.datetime.now()) + "</p>"
-  content += "<p>欢迎Star本项目！！！</p>"
-  return content
-
-
-def run():
-  app.run(host="0.0.0.0", port=8080)
-  
-
-
-
-def keep_alive():
-  server = Thread(target=run)
-  server.start()