Merge branch 'main' of https://github.com/NapNeko/NapCatQQ

This reverts commit 9c534f8afd.

.github/workflows/build.yml

@@ -1,8 +1,7 @@
 name: "Build Action"
 on:
   push:
-    branches:
-      - main
+  pull_request:
   workflow_dispatch:
 
 permissions: write-all
@@ -11,60 +10,38 @@ jobs:
   Build-LiteLoader:
     runs-on: ubuntu-latest
     steps:
-    - name: Clone Main Repository
-      uses: actions/checkout@v4
-      with:
-          repository: 'NapNeko/NapCatQQ'
-          submodules: true
-          ref: main
-          token: ${{ secrets.NAPCAT_BUILD }}
-    - name: Use Node.js 20.X
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20.x
-    - name: Build NuCat Framework
-      run: |
-          npm i
-          cd napcat.webui
-          npm i
-          cd ..
-          npm run build:framework
-          cd dist
-          npm i --omit=dev 
+      - name: Clone Main Repository
+        uses: actions/checkout@v4
+      - name: Use Node.js 20.X
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Build NapCat.Framework
+        run: |
+          npm i && cd napcat.webui && npm i && cd ..
+          npm run build:framework && npm run depend
           rm package-lock.json
-          cd ..
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: NapCat.Framework
-        path: dist
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: NapCat.Framework
+          path: dist
   Build-Shell:
     runs-on: ubuntu-latest
     steps:
-        - name: Clone Main Repository
-          uses: actions/checkout@v4
-          with:
-                repository: 'NapNeko/NapCatQQ'
-                submodules: true
-                ref: main
-                token: ${{ secrets.NAPCAT_BUILD }}
-        - name: Use Node.js 20.X
-          uses: actions/setup-node@v4
-          with:
-              node-version: 20.x
-        - name: Build NuCat LiteLoader
-          run: |
-                npm i
-                cd napcat.webui
-                npm i
-                cd ..
-                npm run build:shell
-                cd dist
-                npm i --omit=dev
-                rm package-lock.json
-                cd ..
-        - name: Upload Artifact
-          uses: actions/upload-artifact@v4
-          with:
-              name: NapCat.Shell
-              path: dist
+      - name: Clone Main Repository
+        uses: actions/checkout@v4
+      - name: Use Node.js 20.X
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Build NapCat.Shell
+        run: |
+          npm i && cd napcat.webui && npm i && cd ..
+          npm run build:shell && npm run depend
+          rm package-lock.json
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: NapCat.Shell
+          path: dist

README.md

@@ -8,7 +8,7 @@
 ## 欢迎回家
 NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 碎碎叨叨
+## 特性介绍
 - [x] **安装简单**：就算是笨蛋也能使用
 - [x] **性能友好**：就算是低内存也能使用
 - [x] **接口丰富**：就算是没有也能使用
@@ -26,19 +26,17 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
 [Cloudflare.HKServer](https://napcat.napneko.icu/)
 
-[Cloudflare.Pages](https://napneko.pages.dev/)
+[Github.IO](https://napneko.github.io/)
 
-[Server.China](https://napneko.com/)
+[Cloudflare.Pages](https://napneko.pages.dev/)
 
 [Server.Other](https://napcat.cyou/)
 
-[Github.IO](https://napneko.github.io/)
+
 ## 回家旅途
-[QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
+[QQ Group](https://qm.qq.com/q/haLGHixZ74)
 
 ## 感谢他们
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 
-
 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
 感谢 Tencent Tdesign / Vue3 强力驱动 NapCat.WebUi
@@ -46,6 +44,14 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
+
+## 延缓Native模块与NapCat对新版QQ适配
+为未来持续与高效的使用Native模块 模块代码转为完全非Git仓库的本地保存源码 并进行相关重构
+
+同时为了保证稳定 NapCat 本体通常会在3 Week+的周期进行新版本适配
+
+因此此时推荐使用release指定版本
+
 ## 开源附加
 
 任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。**

manifest.json

@@ -4,7 +4,7 @@
   "name": "NapCatQQ",
   "slug": "NapCat.Framework",
   "description": "高性能的 OneBot 11 协议实现",
-  "version": "4.1.1",
+  "version": "4.1.9",
   "icon": "./logo.png",
   "authors": [
     {

napcat.webui/package.json

@@ -1,10 +1,10 @@
 {
   "name": "napcat.webui",
   "private": true,
-  "version": "0.0.0",
+  "version": "1.0.0",
   "type": "module",
   "scripts": {
-    "webui:lint": "eslint . --fix",
+    "webui:lint": "eslint --fix src/**/*.{js,ts,vue}",
     "webui:dev": "vite",
     "webui:build": "vue-tsc -b && vite build",
     "webui:preview": "vite preview"

napcat.webui/src/pages/AboutUs.vue

@@ -13,9 +13,11 @@
                 <t-list-item class="list-item">
                     <span class="item-label">版本信息:</span>
                     <span class="item-content">
-                        <t-tag class="tag-item" theme="success"> WebUi: 1.0.0 </t-tag>
-                        <t-tag class="tag-item" theme="success"> NapCat: 4.?.? </t-tag>
-                        <t-tag class="tag-item" theme="success"> Tdesign: 1.10.3 </t-tag>
+                        <t-tag class="tag-item" theme="success"> WebUi: {{ pkg.version }} </t-tag>
+                        <t-tag class="tag-item" theme="success"> NapCat: {{ napCatVersion }} </t-tag>
+                        <t-tag class="tag-item" theme="success">
+                            TDesign: {{ pkg.dependencies['tdesign-vue-next'] }}
+                        </t-tag>
                     </span>
                 </t-list-item>
             </t-list>
@@ -24,7 +26,8 @@
 </template>
 
 <script setup lang="ts">
-
+import pkg from '../../package.json';
+import { napCatVersion } from '../../../src/common/version';
 </script>
 
 <style scoped>

napcat.webui/src/pages/NetWork.vue

@@ -1,52 +1,59 @@
 <template>
     <t-space class="full-space">
-      <template v-if="clientPanelData.length > 0">
-        <t-tabs v-model="activeTab" :addable="true" theme="card" @add="showAddTabDialog" @remove="removeTab" class="full-tabs">
-          <t-tab-panel
-            v-for="(config, idx) in clientPanelData"
-            :key="idx"
-            :label="config.name"
-            :removable="true"
-            :value="idx"
-            class="full-tab-panel"
-          >
-            <component :is="resolveDynamicComponent(getComponent(config.key))" :config="config.data" />
-            <div class="button-container">
-              <t-button @click="saveConfig" style="width: 100px; height: 40px;">保存</t-button>
-            </div>
-          </t-tab-panel>
-        </t-tabs>
-      </template>
-      <template v-else>
-        <EmptyStateComponent :showAddTabDialog="showAddTabDialog" />
-      </template>
-      <t-dialog
-        v-model:visible="isDialogVisible"
-        header="添加网络配置"
-        @close="isDialogVisible = false"
-        @confirm="addTab"
-      >
-        <t-form ref="form" :model="newTab">
-          <t-form-item :rules="[{ required: true, message: '请输入名称' }]" label="名称" name="name">
-            <t-input v-model="newTab.name" />
-          </t-form-item>
-          <t-form-item :rules="[{ required: true, message: '请选择类型' }]" label="类型" name="type">
-            <t-select v-model="newTab.type">
-              <t-option value="httpServers">HTTP 服务器</t-option>
-              <t-option value="httpClients">HTTP 客户端</t-option>
-              <t-option value="websocketServers">WebSocket 服务器</t-option>
-              <t-option value="websocketClients">WebSocket 客户端</t-option>
-            </t-select>
-          </t-form-item>
-        </t-form>
-      </t-dialog>
+        <template v-if="clientPanelData.length > 0">
+            <t-tabs
+                v-model="activeTab"
+                :addable="true"
+                theme="card"
+                @add="showAddTabDialog"
+                @remove="removeTab"
+                class="full-tabs"
+            >
+                <t-tab-panel
+                    v-for="(config, idx) in clientPanelData"
+                    :key="idx"
+                    :label="config.name"
+                    :removable="true"
+                    :value="idx"
+                    class="full-tab-panel"
+                >
+                    <component :is="resolveDynamicComponent(getComponent(config.key))" :config="config.data" />
+                    <div class="button-container">
+                        <t-button @click="saveConfig" style="width: 100px; height: 40px">保存</t-button>
+                    </div>
+                </t-tab-panel>
+            </t-tabs>
+        </template>
+        <template v-else>
+            <EmptyStateComponent :showAddTabDialog="showAddTabDialog" />
+        </template>
+        <t-dialog
+            v-model:visible="isDialogVisible"
+            header="添加网络配置"
+            @close="isDialogVisible = false"
+            @confirm="addTab"
+        >
+            <t-form ref="form" :model="newTab">
+                <t-form-item :rules="[{ required: true, message: '请输入名称' }]" label="名称" name="name">
+                    <t-input v-model="newTab.name" />
+                </t-form-item>
+                <t-form-item :rules="[{ required: true, message: '请选择类型' }]" label="类型" name="type">
+                    <t-select v-model="newTab.type">
+                        <t-option value="httpServers">HTTP 服务器</t-option>
+                        <t-option value="httpClients">HTTP 客户端</t-option>
+                        <t-option value="websocketServers">WebSocket 服务器</t-option>
+                        <t-option value="websocketClients">WebSocket 客户端</t-option>
+                    </t-select>
+                </t-form-item>
+            </t-form>
+        </t-dialog>
     </t-space>
-  </template>
-  
-  <script setup lang="ts">
-  import { ref, resolveDynamicComponent, nextTick, Ref, onMounted, reactive, Reactive } from 'vue';
-  import { MessagePlugin } from 'tdesign-vue-next';
-  import {
+</template>
+
+<script setup lang="ts">
+import { ref, resolveDynamicComponent, nextTick, Ref, onMounted } from 'vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import {
     httpServerDefaultConfigs,
     httpClientDefaultConfigs,
     websocketServerDefaultConfigs,
@@ -58,187 +65,185 @@
     NetworkConfig,
     OneBotConfig,
     mergeOneBotConfigs,
-  } from '../../../src/onebot/config/config';
-  import { QQLoginManager } from '@/backend/shell';
-  import HttpServerComponent from '@/pages/network/HttpServerComponent.vue';
-  import HttpClientComponent from '@/pages/network/HttpClientComponent.vue';
-  import WebsocketServerComponent from '@/pages/network/WebsocketServerComponent.vue';
-  import WebsocketClientComponent from '@/pages/network/WebsocketClientComponent.vue';
-  import EmptyStateComponent from '@/pages/network/EmptyStateComponent.vue';
-  
-  type ConfigKey = 'httpServers' | 'httpClients' | 'websocketServers' | 'websocketClients';
-  
-  type ConfigUnion = HttpClientConfig | HttpServerConfig | WebsocketServerConfig | WebsocketClientConfig;
-  
-  const defaultConfigs: Record<ConfigKey, ConfigUnion> = {
-    httpServers: httpServerDefaultConfigs,
-    httpClients: httpClientDefaultConfigs,
-    websocketServers: websocketServerDefaultConfigs,
-    websocketClients: websocketClientDefaultConfigs,
-  };
-  
-  const componentMap: Record<
-    ConfigKey,
+} from '../../../src/onebot/config/config';
+import { QQLoginManager } from '@/backend/shell';
+import HttpServerComponent from '@/pages/network/HttpServerComponent.vue';
+import HttpClientComponent from '@/pages/network/HttpClientComponent.vue';
+import WebsocketServerComponent from '@/pages/network/WebsocketServerComponent.vue';
+import WebsocketClientComponent from '@/pages/network/WebsocketClientComponent.vue';
+import EmptyStateComponent from '@/pages/network/EmptyStateComponent.vue';
+
+type ConfigKey = 'httpServers' | 'httpClients' | 'websocketServers' | 'websocketClients';
+type ConfigUnion = HttpClientConfig | HttpServerConfig | WebsocketServerConfig | WebsocketClientConfig;
+type ComponentUnion =
     | typeof HttpServerComponent
     | typeof HttpClientComponent
     | typeof WebsocketServerComponent
-    | typeof WebsocketClientComponent
-  > = {
+    | typeof WebsocketClientComponent;
+
+const componentMap: Record<ConfigKey, ComponentUnion> = {
     httpServers: HttpServerComponent,
     httpClients: HttpClientComponent,
     websocketServers: WebsocketServerComponent,
     websocketClients: WebsocketClientComponent,
-  };
-  
-  interface ClientPanel {
+};
+
+const defaultConfigMap: Record<ConfigKey, ConfigUnion> = {
+    httpServers: httpServerDefaultConfigs,
+    httpClients: httpClientDefaultConfigs,
+    websocketServers: websocketServerDefaultConfigs,
+    websocketClients: websocketClientDefaultConfigs,
+};
+
+interface ConfigMap {
+    httpServers: HttpServerConfig;
+    httpClients: HttpClientConfig;
+    websocketServers: WebsocketServerConfig;
+    websocketClients: WebsocketClientConfig;
+}
+
+interface ClientPanel<K extends ConfigKey = ConfigKey> {
     name: string;
-    key: ConfigKey;
-    data: Ref<ConfigUnion>;
-  }
-  
-  type ComponentKey = keyof typeof componentMap;
-  
-  // TODO: store these state in global store (aka pinia)
-  const activeTab = ref<number>(0);
-  const isDialogVisible = ref(false);
-  const newTab = ref<{ name: string; type: ComponentKey }>({ name: '', type: 'httpServers' });
-  const clientPanelData: Reactive<Array<ClientPanel>> = reactive([]);
-  
-  const getComponent = (type: ComponentKey) => {
+    key: K;
+    data: ConfigMap[K];
+}
+
+const activeTab = ref<number>(0);
+const isDialogVisible = ref(false);
+const newTab = ref<{ name: string; type: ConfigKey }>({ name: '', type: 'httpServers' });
+const clientPanelData: Ref<ClientPanel[]> = ref([]);
+
+const getComponent = (type: ConfigKey) => {
     return componentMap[type];
-  };
-  
-  const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
+};
+
+const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
     const storedCredential = localStorage.getItem('auth');
     if (!storedCredential) {
-      console.error('No stored credential found');
-      return;
+        console.error('No stored credential found');
+        return;
     }
     const loginManager = new QQLoginManager(storedCredential);
     return await loginManager.GetOB11Config();
-  };
-  
-  const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
+};
+
+const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
     const storedCredential = localStorage.getItem('auth');
     if (!storedCredential) {
-      console.error('No stored credential found');
-      return false;
+        console.error('No stored credential found');
+        return false;
     }
     const loginManager = new QQLoginManager(storedCredential);
     return await loginManager.SetOB11Config(config);
-  };
-  
-  const addToPanel = <T extends ConfigUnion>(configs: T[], key: ConfigKey) => {
-    configs.forEach((config) => clientPanelData.push({ name: config.name, data: config, key: key }));
-  };
-  
-  const addConfigDataToPanel = (data: NetworkConfig) => {
-    Object.entries(data).forEach(([key, configs]) => {
-      if (key in defaultConfigs) {
-        addToPanel(configs as ConfigUnion[], key as ConfigKey);
-      }
+};
+
+const addToPanel = <K extends ConfigKey>(configs: ConfigMap[K][], key: K) => {
+    configs.forEach((config) => clientPanelData.value.push({ name: config.name, data: config, key }));
+};
+
+const addConfigDataToPanel = (data: NetworkConfig) => {
+    (Object.keys(data) as ConfigKey[]).forEach((key) => {
+        addToPanel(data[key], key);
     });
-  };
-  
-  const parsePanelData = (): NetworkConfig => {
-    return {
-      websocketClients: clientPanelData
-        .filter((panel) => panel.key === 'websocketClients')
-        .map((panel) => panel.data as WebsocketClientConfig),
-      websocketServers: clientPanelData
-        .filter((panel) => panel.key === 'websocketServers')
-        .map((panel) => panel.data as WebsocketServerConfig),
-      httpClients: clientPanelData
-        .filter((panel) => panel.key === 'httpClients')
-        .map((panel) => panel.data as HttpClientConfig),
-      httpServers: clientPanelData
-        .filter((panel) => panel.key === 'httpServers')
-        .map((panel) => panel.data as HttpServerConfig),
+};
+
+const parsePanelData = (): NetworkConfig => {
+    const result: NetworkConfig = {
+        httpServers: [],
+        httpClients: [],
+        websocketServers: [],
+        websocketClients: [],
     };
-  };
-  
-  const loadConfig = async () => {
+    clientPanelData.value.forEach((panel) => {
+        (result[panel.key] as Array<typeof panel.data>).push(panel.data);
+    });
+    return result;
+};
+
+const loadConfig = async () => {
     try {
-      const userConfig = await getOB11Config();
-      if (!userConfig) return;
-      const mergedConfig = mergeOneBotConfigs(userConfig);
-      addConfigDataToPanel(mergedConfig.network);
+        const userConfig = await getOB11Config();
+        if (!userConfig) return;
+        const mergedConfig = mergeOneBotConfigs(userConfig);
+        addConfigDataToPanel(mergedConfig.network);
     } catch (error) {
-      console.error('Error loading config:', error);
+        console.error('Error loading config:', error);
     }
-  };
-  
-  // It's better to "saveConfig" instead of using deep watch
-  const saveConfig = async () => {
+};
+
+const saveConfig = async () => {
     const config = parsePanelData();
     const userConfig = await getOB11Config();
-    if (!userConfig) return;
+    if (!userConfig) {
+        await MessagePlugin.error('无法获取配置！');
+        return;
+    }
     userConfig.network = config;
     const success = await setOB11Config(userConfig);
     if (success) {
-      MessagePlugin.success('配置保存成功');
+        await MessagePlugin.success('配置保存成功');
     } else {
-      MessagePlugin.error('配置保存失败');
+        await MessagePlugin.error('配置保存失败');
     }
-  };
-  
-  const showAddTabDialog = () => {
+};
+
+const showAddTabDialog = () => {
     newTab.value = { name: '', type: 'httpServers' };
     isDialogVisible.value = true;
-  };
-  
-  const addTab = async () => {
+};
+
+const addTab = async () => {
     const { name, type } = newTab.value;
-    if (clientPanelData.some(panel => panel.name === name)) {
-      MessagePlugin.error('选项卡名称已存在');
-      return;
+    if (clientPanelData.value.some((panel) => panel.name === name)) {
+        await MessagePlugin.error('选项卡名称已存在');
+        return;
     }
-    const defaultConfig = structuredClone(defaultConfigs[type]);
+    const defaultConfig = structuredClone(defaultConfigMap[type]);
     defaultConfig.name = name;
-    clientPanelData.push({ name, data: defaultConfig, key: type });
+    clientPanelData.value.push({ name, data: defaultConfig, key: type });
     isDialogVisible.value = false;
     await nextTick();
-    activeTab.value = clientPanelData.length - 1;
-    MessagePlugin.success('选项卡添加成功');
-  };
-  
-  const removeTab = async (payload: { value: string; index: number; e: PointerEvent }) => {
-    clientPanelData.splice(payload.index, 1);
+    activeTab.value = clientPanelData.value.length - 1;
+    await MessagePlugin.success('选项卡添加成功');
+};
+
+const removeTab = async (payload: { value: string; index: number; e: PointerEvent }) => {
+    clientPanelData.value.splice(payload.index, 1);
     activeTab.value = Math.max(0, activeTab.value - 1);
     await saveConfig();
-  };
-  
-  onMounted(() => {
+};
+
+onMounted(() => {
     loadConfig();
-  });
-  </script>
-  
-  <style scoped>
-  .full-space {
+});
+</script>
+
+<style scoped>
+.full-space {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
     align-items: flex-start;
     justify-content: flex-start;
-  }
-  
-  .full-tabs {
+}
+
+.full-tabs {
     width: 100%;
     height: 100%;
     display: flex;
     flex-direction: column;
-  }
-  
-  .full-tab-panel {
+}
+
+.full-tab-panel {
     flex: 1;
     display: flex;
     flex-direction: column;
-  }
-  
-  .button-container {
+}
+
+.button-container {
     display: flex;
     justify-content: center;
     margin-top: 20px;
-  }
-  </style>
+}
+</style>

napcat.webui/src/pages/OtherConfig.vue

@@ -131,4 +131,4 @@ onMounted(() => {
         margin-left: 20px;
     }
 }
-</style>
+</style>

napcat.webui/src/pages/network/EmptyStateComponent.vue

@@ -19,4 +19,4 @@ defineProps<{ showAddTabDialog: () => void }>();
     height: 100%;
     text-align: center;
 }
-</style>
+</style>

napcat.webui/src/pages/network/HttpClientComponent.vue

@@ -36,14 +36,17 @@ const props = defineProps<{
 
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
-    { label: 'String', value: 'string' }
+    { label: 'String', value: 'string' },
 ]);
 
-watch(() => props.config.messagePostFormat, (newValue) => {
-    if (newValue !== 'array' && newValue !== 'string') {
-        props.config.messagePostFormat = 'array';
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
     }
-});
+);
 </script>
 
 <style scoped>
@@ -62,4 +65,4 @@ watch(() => props.config.messagePostFormat, (newValue) => {
     padding: 20px;
     border-radius: 8px;
 }
-</style>
+</style>

napcat.webui/src/pages/network/HttpServerComponent.vue

@@ -42,14 +42,17 @@ const props = defineProps<{
 
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
-    { label: 'String', value: 'string' }
+    { label: 'String', value: 'string' },
 ]);
 
-watch(() => props.config.messagePostFormat, (newValue) => {
-    if (newValue !== 'array' && newValue !== 'string') {
-        props.config.messagePostFormat = 'array';
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
     }
-});
+);
 </script>
 
 <style scoped>
@@ -68,4 +71,4 @@ watch(() => props.config.messagePostFormat, (newValue) => {
     padding: 20px;
     border-radius: 8px;
 }
-</style>
+</style>

napcat.webui/src/pages/network/WebsocketClientComponent.vue

@@ -39,14 +39,17 @@ const props = defineProps<{
 
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
-    { label: 'String', value: 'string' }
+    { label: 'String', value: 'string' },
 ]);
 
-watch(() => props.config.messagePostFormat, (newValue) => {
-    if (newValue !== 'array' && newValue !== 'string') {
-        props.config.messagePostFormat = 'array';
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
     }
-});
+);
 </script>
 
 <style scoped>
@@ -65,4 +68,4 @@ watch(() => props.config.messagePostFormat, (newValue) => {
     padding: 20px;
     border-radius: 8px;
 }
-</style>
+</style>

napcat.webui/src/pages/network/WebsocketServerComponent.vue

@@ -45,14 +45,17 @@ const props = defineProps<{
 
 const messageFormatOptions = ref([
     { label: 'Array', value: 'array' },
-    { label: 'String', value: 'string' }
+    { label: 'String', value: 'string' },
 ]);
 
-watch(() => props.config.messagePostFormat, (newValue) => {
-    if (newValue !== 'array' && newValue !== 'string') {
-        props.config.messagePostFormat = 'array';
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
     }
-});
+);
 </script>
 
 <style scoped>
@@ -71,4 +74,4 @@ watch(() => props.config.messagePostFormat, (newValue) => {
     padding: 20px;
     border-radius: 8px;
 }
-</style>
+</style>

napcat.webui/src/pages/new/NetWork.old.vue

@@ -1,267 +0,0 @@
-<template>
-    <t-space class="full-space">
-        <t-tabs v-model="activeTab" :addable="true" theme="card" @add="showAddTabDialog" @remove="removeTab" class="full-tabs">
-            <t-tab-panel
-                v-for="(config, idx) in clientPanelData"
-                :key="idx"
-                :label="config.name"
-                :removable="true"
-                :value="idx"
-                class="full-tab-panel"
-            >
-                <component :is="resolveDynamicComponent(getComponent(config.key))" :config="config.data" />
-                <div class="button-container">
-                    <t-button @click="saveConfig" style="width: 100px; height: 40px;">保存</t-button>
-                </div>
-            </t-tab-panel>
-        </t-tabs>
-        <t-dialog
-            v-model:visible="isDialogVisible"
-            header="添加新选项卡"
-            @close="isDialogVisible = false"
-            @confirm="addTab"
-        >
-            <t-form ref="form" :model="newTab">
-                <t-form-item :rules="[{ required: true, message: '请输入名称' }]" label="名称" name="name">
-                    <t-input v-model="newTab.name" />
-                </t-form-item>
-                <t-form-item :rules="[{ required: true, message: '请选择类型' }]" label="类型" name="type">
-                    <t-select v-model="newTab.type">
-                        <t-option value="httpServers">HTTP 服务器</t-option>
-                        <t-option value="httpClients">HTTP 客户端</t-option>
-                        <t-option value="websocketServers">WebSocket 服务器</t-option>
-                        <t-option value="websocketClients">WebSocket 客户端</t-option>
-                    </t-select>
-                </t-form-item>
-            </t-form>
-        </t-dialog>
-    </t-space>
-</template>
-
-<script setup lang="ts">
-import { ref, resolveDynamicComponent, nextTick, Ref, onMounted, reactive, Reactive } from 'vue';
-import { MessagePlugin } from 'tdesign-vue-next';
-import {
-    httpServerDefaultConfigs,
-    httpClientDefaultConfigs,
-    websocketServerDefaultConfigs,
-    websocketClientDefaultConfigs,
-    HttpClientConfig,
-    HttpServerConfig,
-    WebsocketClientConfig,
-    WebsocketServerConfig,
-    NetworkConfig,
-    OneBotConfig,
-    mergeOneBotConfigs,
-} from '../../../../src/onebot/config/config';
-import { QQLoginManager } from '@/backend/shell';
-import HttpServerComponent from '@/pages/network/HttpServerComponent.vue';
-import HttpClientComponent from '@/pages/network/HttpClientComponent.vue';
-import WebsocketServerComponent from '@/pages/network/WebsocketServerComponent.vue';
-import WebsocketClientComponent from '@/pages/network/WebsocketClientComponent.vue';
-
-type ConfigKey = 'httpServers' | 'httpClients' | 'websocketServers' | 'websocketClients';
-
-type ConfigUnion = HttpClientConfig | HttpServerConfig | WebsocketServerConfig | WebsocketClientConfig;
-
-const defaultConfigs: Record<ConfigKey, ConfigUnion> = {
-    httpServers: httpServerDefaultConfigs,
-    httpClients: httpClientDefaultConfigs,
-    websocketServers: websocketServerDefaultConfigs,
-    websocketClients: websocketClientDefaultConfigs,
-};
-
-const componentMap: Record<
-    ConfigKey,
-    | typeof HttpServerComponent
-    | typeof HttpClientComponent
-    | typeof WebsocketServerComponent
-    | typeof WebsocketClientComponent
-> = {
-    httpServers: HttpServerComponent,
-    httpClients: HttpClientComponent,
-    websocketServers: WebsocketServerComponent,
-    websocketClients: WebsocketClientComponent,
-};
-
-interface ClientPanel {
-    name: string;
-    key: ConfigKey;
-    data: Ref<ConfigUnion>;
-}
-
-type ComponentKey = keyof typeof componentMap;
-
-// TODO: store these state in global store (aka pinia)
-const activeTab = ref<number>(0);
-const isDialogVisible = ref(false);
-const newTab = ref<{ name: string; type: ComponentKey }>({ name: '', type: 'httpServers' });
-const clientPanelData: Reactive<Array<ClientPanel>> = reactive([]);
-
-const getComponent = (type: ComponentKey) => {
-    return componentMap[type];
-};
-
-const getOB11Config = async (): Promise<OneBotConfig | undefined> => {
-    const storedCredential = localStorage.getItem('auth');
-    if (!storedCredential) {
-        console.error('No stored credential found');
-        return;
-    }
-    const loginManager = new QQLoginManager(storedCredential);
-    return await loginManager.GetOB11Config();
-};
-
-const setOB11Config = async (config: OneBotConfig): Promise<boolean> => {
-    const storedCredential = localStorage.getItem('auth');
-    if (!storedCredential) {
-        console.error('No stored credential found');
-        return false;
-    }
-    const loginManager = new QQLoginManager(storedCredential);
-    return await loginManager.SetOB11Config(config);
-};
-
-const addToPanel = <T extends ConfigUnion>(configs: T[], key: ConfigKey) => {
-    configs.forEach((config) => clientPanelData.push({ name: config.name, data: config, key: key }));
-};
-
-const addConfigDataToPanel = (data: NetworkConfig) => {
-    Object.entries(data).forEach(([key, configs]) => {
-        if (key in defaultConfigs) {
-            addToPanel(configs as ConfigUnion[], key as ConfigKey);
-        }
-    });
-};
-
-const parsePanelData = (): NetworkConfig => {
-    return {
-        websocketClients: clientPanelData
-            .filter((panel) => panel.key === 'websocketClients')
-            .map((panel) => panel.data as WebsocketClientConfig),
-        websocketServers: clientPanelData
-            .filter((panel) => panel.key === 'websocketServers')
-            .map((panel) => panel.data as WebsocketServerConfig),
-        httpClients: clientPanelData
-            .filter((panel) => panel.key === 'httpClients')
-            .map((panel) => panel.data as HttpClientConfig),
-        httpServers: clientPanelData
-            .filter((panel) => panel.key === 'httpServers')
-            .map((panel) => panel.data as HttpServerConfig),
-    };
-};
-
-const loadConfig = async () => {
-    try {
-        const userConfig = await getOB11Config();
-        if (!userConfig) return;
-        const mergedConfig = mergeOneBotConfigs(userConfig);
-        addConfigDataToPanel(mergedConfig.network);
-    } catch (error) {
-        console.error('Error loading config:', error);
-    }
-};
-
-// It's better to "saveConfig" instead of using deep watch
-const saveConfig = async () => {
-    const config = parsePanelData();
-    const userConfig = await getOB11Config();
-    if (!userConfig) return;
-    userConfig.network = config;
-    const success = await setOB11Config(userConfig);
-    if (success) {
-        MessagePlugin.success('配置保存成功');
-    } else {
-        MessagePlugin.error('配置保存失败');
-    }
-};
-
-const showAddTabDialog = () => {
-    newTab.value = { name: '', type: 'httpServers' };
-    isDialogVisible.value = true;
-};
-
-const addTab = async () => {
-    const { name, type } = newTab.value;
-    if (clientPanelData.some(panel => panel.name === name)) {
-        MessagePlugin.error('选项卡名称已存在');
-        return;
-    }
-    const defaultConfig = structuredClone(defaultConfigs[type]);
-    defaultConfig.name = name;
-    clientPanelData.push({ name, data: defaultConfig, key: type });
-    isDialogVisible.value = false;
-    await nextTick();
-    activeTab.value = clientPanelData.length - 1;
-    MessagePlugin.success('选项卡添加成功');
-};
-
-const removeTab = async (payload: { value: string; index: number; e: PointerEvent }) => {
-    clientPanelData.splice(payload.index, 1);
-    activeTab.value = Math.max(0, activeTab.value - 1);
-    await saveConfig();
-};
-
-onMounted(() => {
-    loadConfig();
-});
-</script>
-
-<style scoped>
-.full-space {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
-}
-
-.full-tabs {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.full-tab-panel {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-}
-
-.button-container {
-    display: flex;
-    justify-content: center;
-    margin-top: 20px;
-}
-</style>
-<style scoped>
-.full-space {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-    align-items: flex-start;
-    justify-content: flex-start;
-}
-
-.full-tabs {
-    width: 100%;
-    height: 100%;
-    display: flex;
-    flex-direction: column;
-}
-
-.full-tab-panel {
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-}
-
-.button-container {
-    display: flex;
-    justify-content: center;
-    margin-top: 20px;
-}
-</style>

package.json

@@ -2,7 +2,7 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "4.1.1",
+  "version": "4.1.9",
   "scripts": {
     "build:framework": "npm run build:webui && vite build --mode framework",
     "build:shell": "npm run build:webui && vite build --mode shell",

src/common/event.ts

@@ -234,25 +234,33 @@ export class NTEventWrapper {
                 this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
                 this.createListenerFunction(ListenerMainName);
 
-                this.createEventFunction(serviceAndMethod)!(...(args))
-                    .then((eventResult: any) => {
-                        retEvent = eventResult;
-                        if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
-                            clearTimeout(timeoutRef);
-                            reject(
-                                new Error(
-                                    'EventChecker Failed: NTEvent serviceAndMethod:' +
-                                    serviceAndMethod +
-                                    ' ListenerName:' +
-                                    listenerAndMethod +
-                                    ' EventRet:\n' +
-                                    JSON.stringify(retEvent, null, 4) +
-                                    '\n',
-                                ),
-                            );
-                        }
+                let eventResult = this.createEventFunction(serviceAndMethod)!(...(args));
+
+                const eventRetHandle = (eventData: any) => {
+                    retEvent = eventData;
+                    if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
+                        clearTimeout(timeoutRef);
+                        reject(
+                            new Error(
+                                'EventChecker Failed: NTEvent serviceAndMethod:' +
+                                serviceAndMethod +
+                                ' ListenerName:' +
+                                listenerAndMethod +
+                                ' EventRet:\n' +
+                                JSON.stringify(retEvent, null, 4) +
+                                '\n',
+                            ),
+                        );
+                    }
+                }
+                if (eventResult instanceof Promise) {
+                    eventResult.then((eventResult: any) => {
+                        eventRetHandle(eventResult);
                     })
-                    .catch(reject);
+                        .catch(reject);
+                } else {
+                    eventRetHandle(eventResult);
+                }
             },
         );
     }

src/common/file.ts

@@ -242,7 +242,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
     //解析Http和Https协议
 
     if (UriType == FileUriType.Unknown) {
-        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
+        return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
     }
     //解析File协议和本地文件
     if (UriType == FileUriType.Local) {
@@ -289,5 +289,5 @@ export async function uri2local(dir: string, uri: string, filename: string | und
         }
         return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
-    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '' };
+    return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
 }

src/common/log.ts

@@ -36,7 +36,7 @@ export class LogWrapper {
         this.logger = winston.createLogger({
             level: 'debug',
             format: format.combine(
-                format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
+                format.timestamp({ format: 'MM-DD HH:mm:ss' }),
                 format.printf(({ timestamp, level, message, ...meta }) => {
                     const userInfo = meta.userInfo ? `${meta.userInfo} | ` : '';
                     return `${timestamp} [${level}] ${userInfo}${message}`;
@@ -61,7 +61,7 @@ export class LogWrapper {
             ]
         });
 
-        this.setLogSelfInfo({ nick: '', uin: '', uid: '' });
+        this.setLogSelfInfo({ nick: '', uid: '' });
         this.cleanOldLogs(logDir);
     }
 
@@ -111,8 +111,8 @@ export class LogWrapper {
         });
     }
 
-    setLogSelfInfo(selfInfo: { nick: string, uin: string, uid: string }) {
-        const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
+    setLogSelfInfo(selfInfo: { nick: string, uid: string }) {
+        const userInfo = `${selfInfo.nick}`;
         this.logger.defaultMeta = { userInfo };
     }
 

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '4.1.1';
+export const napCatVersion = '4.1.9';

src/core/apis/file.ts

@@ -36,7 +36,7 @@ export class NTQQFileApi {
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.rkeyManager = new RkeyManager(['https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger);
+        this.rkeyManager = new RkeyManager(['https://rkey.napneko.icu/rkeys', 'https://llob.linyuchen.net/rkey', 'http://napcat-sign.wumiao.wang:2082/rkey'], this.context.logger);
     }
 
     async copyFile(filePath: string, destPath: string) {
@@ -107,7 +107,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+    async createValidSendPicElement(context: MessageContext, picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
         const { md5, fileName, path, fileSize } = await this.core.apis.FileApi.uploadFile(picPath, ElementType.PIC, subType);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
@@ -300,18 +300,18 @@ export class NTQQFileApi {
                     element.elementType === ElementType.FILE
                 ) {
                     switch (element.elementType) {
-                    case ElementType.PIC:
+                        case ElementType.PIC:
                             element.picElement!.sourcePath = elementResults[elementIndex];
-                        break;
-                    case ElementType.VIDEO:
+                            break;
+                        case ElementType.VIDEO:
                             element.videoElement!.filePath = elementResults[elementIndex];
-                        break;
-                    case ElementType.PTT:
+                            break;
+                        case ElementType.PTT:
                             element.pttElement!.filePath = elementResults[elementIndex];
-                        break;
-                    case ElementType.FILE:
+                            break;
+                        case ElementType.FILE:
                             element.fileElement!.filePath = elementResults[elementIndex];
-                        break;
+                            break;
                     }
                     elementIndex++;
                 }

src/core/apis/msg.ts

@@ -1,5 +1,5 @@
 import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/entities';
-import { InstanceContext, NapCatCore } from '@/core';
+import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
@@ -25,9 +25,11 @@ export class NTQQMsgApi {
     async sendShowInputStatusReq(peer: Peer, eventType: number) {
         return this.context.session.getMsgService().sendShowInputStatusReq(peer.chatType, eventType, peer.peerUid);
     }
+
     async getSourceOfReplyMsgV2(peer: Peer, clientSeq: string, time: string) {
         return this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, clientSeq, time);
     }
+
     async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number = 20) {
         //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
         return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
@@ -111,7 +113,7 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
-    // 客户端还在用别慌 
+    // 客户端还在用别慌
     async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, isReverseOrder: boolean) {
         return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, isReverseOrder);
     }
@@ -136,19 +138,29 @@ export class NTQQMsgApi {
     }
 
     async getGroupFileList(GroupCode: string, params: GetFileListParam) {
-        const [, groupFileListResult] = await this.core.eventWrapper.callNormalEventV2(
-            'NodeIKernelRichMediaService/getGroupFileList',
-            'NodeIKernelMsgListener/onGroupFileInfoUpdate',
-            [
-                GroupCode,
-                params,
-            ],
-            () => true,
-            () => true, // 应当通过 groupFileListResult 判断
-            1,
-            5000,
-        );
-        return groupFileListResult.item;
+        const item: GroupFileInfoUpdateItem[] = [];
+        let index = params.startIndex;
+        while (true) {
+            params.startIndex = index;
+            const [, groupFileListResult] = await this.core.eventWrapper.callNormalEventV2(
+                'NodeIKernelRichMediaService/getGroupFileList',
+                'NodeIKernelMsgListener/onGroupFileInfoUpdate',
+                [
+                    GroupCode,
+                    params,
+                ],
+                () => true,
+                () => true, // 应当通过 groupFileListResult 判断
+                1,
+                5000,
+            );
+            if (!groupFileListResult?.item?.length) break;
+            item.push(...groupFileListResult.item);
+            if (groupFileListResult.isEnd) break;
+            if (item.length === params.fileCount) break;
+            index = groupFileListResult.nextIndex;
+        }
+        return item;
     }
 
     async getMsgHistory(peer: Peer, msgId: string, count: number, isReverseOrder: boolean = false) {

src/core/apis/webapi.ts

@@ -8,6 +8,9 @@ import {
     WebHonorType,
 } from '@/core';
 import { NapCatCore } from '..';
+import { createReadStream, readFileSync, statSync } from 'node:fs';
+import { createHash } from 'node:crypto';
+import { basename } from 'node:path';
 
 export class NTQQWebApi {
     context: InstanceContext;
@@ -303,4 +306,110 @@ export class NTQQWebApi {
         }
         return (hash & 0x7FFFFFFF).toString();
     }
+    async createQunAlbumSession(gc: string, sAlbumID: string, sAlbumName: string, path: string, skey: string, pskey: string, uin: string) {
+        const img = readFileSync(path);
+        const img_md5 = createHash('md5').update(img).digest('hex');
+        const img_size = img.length;
+        const img_name = basename(path);
+        const time = Math.floor(Date.now() / 1000);
+        const GTK = this.getBknFromSKey(pskey);
+        const cookie = `p_uin=${uin}; p_skey=${pskey}; skey=${skey}; uin=${uin}`;
+        const body = {
+            control_req: [{
+                uin: uin,
+                token: {
+                    type: 4,
+                    data: pskey,
+                    appid: 5
+                },
+                appid: "qun",
+                checksum: img_md5,
+                check_type: 0,
+                file_len: img_size,
+                env: {
+                    refer: "qzone",
+                    deviceInfo: "h5"
+                },
+                model: 0,
+                biz_req: {
+                    sPicTitle: img_name,
+                    sPicDesc: "",
+                    sAlbumName: sAlbumName,
+                    sAlbumID: sAlbumID,
+                    iAlbumTypeID: 0,
+                    iBitmap: 0,
+                    iUploadType: 0,
+                    iUpPicType: 0,
+                    iBatchID: time,
+                    sPicPath: "",
+                    iPicWidth: 0,
+                    iPicHight: 0,
+                    iWaterType: 0,
+                    iDistinctUse: 0,
+                    iNeedFeeds: 1,
+                    iUploadTime: time,
+                    mapExt: {
+                        appid: "qun",
+                        userid: gc
+                    }
+                },
+                session: "",
+                asy_upload: 0,
+                cmd: "FileUpload"
+            }]
+        };
+        const api = `https://h5.qzone.qq.com/webapp/json/sliceUpload/FileBatchControl/${img_md5}?g_tk=${GTK}`;
+        const post = await RequestUtil.HttpGetJson(api, 'POST', body, {
+            "Cookie": cookie,
+            "Content-Type": "application/json"
+        });
+
+        return post;
+    }
+
+    async uploadQunAlbumSlice(path: string, session: string, skey: string, pskey: string, uin: string, slice_size: number) {
+        const img_size = statSync(path).size;
+        const img_name = basename(path);
+        let seq = 0;
+        let offset = 0;
+        const GTK = this.getBknFromSKey(pskey);
+        const cookie = `p_uin=${uin}; p_skey=${pskey}; skey=${skey}; uin=${uin}`;
+
+        const stream = createReadStream(path, { highWaterMark: slice_size });
+
+        for await (const chunk of stream) {
+            const end = Math.min(offset + chunk.length, img_size);
+            const boundary = `----WebKitFormBoundary${Math.random().toString(36).substring(2)}`;
+            const formData = await RequestUtil.createFormData(boundary, path);
+
+            const api = `https://h5.qzone.qq.com/webapp/json/sliceUpload/FileUpload?seq=${seq}&retry=0&offset=${offset}&end=${end}&total=${img_size}&type=form&g_tk=${GTK}`;
+            const body = {
+                uin: uin,
+                appid: "qun",
+                session: session,
+                offset: offset,
+                data: formData,
+                checksum: "",
+                check_type: 0,
+                retry: 0,
+                seq: seq,
+                end: end,
+                cmd: "FileUpload",
+                slice_size: slice_size,
+                "biz_req.iUploadType": 0
+            };
+
+            const post = await RequestUtil.HttpGetJson(api, 'POST', body, {
+                "Cookie": cookie,
+                "Content-Type": `multipart/form-data; boundary=${boundary}`
+            });
+
+            offset += chunk.length;
+            seq++;
+        }
+    }
+    async uploadQunAlbum(path: string, albumId: string, group: string, skey: string, pskey: string, uin: string) {
+        const session = (await this.createQunAlbumSession(group, albumId, group, path, skey, pskey, uin) as { data: { session: string } }).data.session;
+        return await this.uploadQunAlbumSlice(path, session, skey, pskey, uin, 1024 * 1024);
+    }
 }

src/core/entities/cache.ts

@@ -23,7 +23,7 @@ export interface ChatCacheList {
 export interface ChatCacheListItem {
     chatType: ChatType;
     basicChatCacheInfo: ChatCacheListItemBasic;
-    guildChatCacheInfo: unknown[]; // work: 没用过频道所以不知道这里边的详细内容
+    guildChatCacheInfo: unknown[]; // TODO: 没用过频道所以不知道这里边的详细内容
 }
 
 export interface ChatCacheListItemBasic {

src/core/helper/adaptDecoder.ts

@@ -1,4 +1,4 @@
-// work:further refactor in NapCat.Packet v2
+// TODO: further refactor in NapCat.Packet v2
 import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core";
 
 const LikeDetail = {

src/core/helper/adaptSysMessageDecoder.ts

@@ -1,4 +1,4 @@
-// work:further refactor in NapCat.Packet v2
+// TODO: further refactor in NapCat.Packet v2
 import { NapProtoMsg, ProtoField, ScalarType } from "@napneko/nap-proto-core";
 
 const BodyInner = {

src/core/index.ts

@@ -120,7 +120,7 @@ export class NapCatCore {
         if (!fs.existsSync(this.NapCatTempPath)) {
             fs.mkdirSync(this.NapCatTempPath, { recursive: true });
         }
-        //遍历this.apis[i].initApi 如果存在该函数进行async 调用 
+        //遍历this.apis[i].initApi 如果存在该函数进行async 调用
         for (const apiKey in this.apis) {
             const api = this.apis[apiKey as keyof StableNTApiWrapper];
             if ('initApi' in api && typeof api.initApi === 'function') {
@@ -210,7 +210,7 @@ export class NapCatCore {
             });
         };
         groupListener.onMemberListChange = (arg) => {
-            // work:应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
+            // TODO: 应该加一个内部自己维护的成员变动callback，用于判断成员变化通知
             const groupCode = arg.sceneId.split('_')[0];
             if (this.apis.GroupApi.groupMemberCache.has(groupCode)) {
                 const existMembers = this.apis.GroupApi.groupMemberCache.get(groupCode)!;

src/core/listeners/NodeIKernelMsgListener.ts

@@ -29,50 +29,10 @@ export interface GroupFileInfoUpdateParamType {
     retMsg: string;
     clientWording: string;
     isEnd: boolean;
-    item: Array<{
-        peerId: string;
-        type: number;
-        folderInfo?: {
-            folderId: string;
-            parentFolderId: string;
-            folderName: string;
-            createTime: number;
-            modifyTime: number;
-            createUin: string;
-            creatorName: string;
-            totalFileCount: number;
-            modifyUin: string;
-            modifyName: string;
-            usedSpace: string;
-        },
-        fileInfo?: {
-            fileModelId: string;
-            fileId: string;
-            fileName: string;
-            fileSize: string;
-            busId: number;
-            uploadedSize: string;
-            uploadTime: number;
-            deadTime: number;
-            modifyTime: number;
-            downloadTimes: number;
-            sha: string;
-            sha3: string;
-            md5: string;
-            uploaderLocalPath: string;
-            uploaderName: string;
-            uploaderUin: string;
-            parentFolderId: string;
-            localPath: string;
-            transStatus: number;
-            transType: number;
-            elementId: string;
-            isFolder: boolean;
-        },
-    }>;
-    allFileCount: string;
-    nextIndex: string;
-    reqId: string;
+    item: Array<GroupFileInfoUpdateItem>;
+    allFileCount: number;
+    nextIndex: number;
+    reqId: number;
 }
 
 // {
@@ -83,6 +43,49 @@ export interface GroupFileInfoUpdateParamType {
 //   fromNick: '拾xxxx,
 //   sig: '0x'
 // }
+
+export interface GroupFileInfoUpdateItem {
+    peerId: string;
+    type: number;
+    folderInfo?: {
+        folderId: string;
+        parentFolderId: string;
+        folderName: string;
+        createTime: number;
+        modifyTime: number;
+        createUin: string;
+        creatorName: string;
+        totalFileCount: number;
+        modifyUin: string;
+        modifyName: string;
+        usedSpace: string;
+    },
+    fileInfo?: {
+        fileModelId: string;
+        fileId: string;
+        fileName: string;
+        fileSize: string;
+        busId: number;
+        uploadedSize: string;
+        uploadTime: number;
+        deadTime: number;
+        modifyTime: number;
+        downloadTimes: number;
+        sha: string;
+        sha3: string;
+        md5: string;
+        uploaderLocalPath: string;
+        uploaderName: string;
+        uploaderUin: string;
+        parentFolderId: string;
+        localPath: string;
+        transStatus: number;
+        transType: number;
+        elementId: string;
+        isFolder: boolean;
+    },
+}
+
 export interface TempOnRecvParams {
     sessionType: number,//1
     chatType: ChatType,//100

src/core/packet/clientSession.ts

@@ -24,7 +24,7 @@ export class PacketClientSession {
         return this.context.operation;
     }
 
-    // work: global message element adapter (?
+    // TODO: global message element adapter (?
     get msgConverter() {
         return this.context.msgConverter;
     }

src/core/packet/context/loggerContext.ts

@@ -1,7 +1,7 @@
 import { LogLevel, LogWrapper } from "@/common/log";
 import { PacketContext } from "@/core/packet/context/packetContext";
 
-// work: check bind?
+// TODO: check bind?
 export class PacketLogger {
     private readonly napLogger: LogWrapper;
 

src/core/packet/message/converter.ts

@@ -76,7 +76,7 @@ export type rawMsgWithSendMsg = {
     msg: PacketSendMsgElement[]
 }
 
-// work:make it become adapter?
+// TODO: make it become adapter?
 export class PacketMsgConverter {
     private isValidElementType(type: ElementType): type is keyof ElementToPacketMsgConverters {
         return SupportedElementTypes.includes(type);
@@ -116,7 +116,7 @@ export class PacketMsgConverter {
         [ElementType.MARKDOWN]: (element) => {
             return new PacketMsgMarkDownElement(element as SendMarkdownElement);
         },
-        // work:check this logic, move it in arkElement?
+        // TODO: check this logic, move it in arkElement?
         [ElementType.STRUCTLONGMSG]: (element) => {
             return new PacketMultiMsgElement(element as SendStructLongMsgElement);
         }

src/core/packet/message/element.ts

@@ -32,7 +32,7 @@ import { ForwardMsgBuilder } from "@/common/forward-msg-builder";
 import { PacketMsg, PacketSendMsgElement } from "@/core/packet/message/message";
 
 // raw <-> packet
-// work:SendStructLongMsgElement
+// TODO: SendStructLongMsgElement
 export abstract class IPacketMsgElement<T extends PacketSendMsgElement> {
     protected constructor(rawElement: T) {
     }
@@ -118,7 +118,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
         this.targetUin = +(element.replyElement.senderUin ?? 0);
         this.targetUid = element.replyElement.senderUidStr ?? '';
         this.time = +(element.replyElement.replyMsgTime ?? 0);
-        this.elems = []; // work:in replyElement.sourceMsgTextElems
+        this.elems = []; // TODO: in replyElement.sourceMsgTextElems
     }
 
     get isGroupReply(): boolean {
@@ -131,7 +131,7 @@ export class PacketMsgReplyElement extends IPacketMsgElement<SendReplyElement> {
                 origSeqs: [this.isGroupReply ? this.messageClientSeq : this.messageSeq],
                 senderUin: BigInt(this.targetUin),
                 time: this.time,
-                elems: [], // work:in replyElement.sourceMsgTextElems
+                elems: [], // TODO: in replyElement.sourceMsgTextElems
                 pbReserve: {
                     messageId: this.messageId,
                 },
@@ -346,9 +346,9 @@ export class PacketMsgPttElement extends IPacketMsgElement<SendPttElement> {
     constructor(element: SendPttElement) {
         super(element);
         this.filePath = element.pttElement.filePath;
-        this.fileSize = +element.pttElement.fileSize; // work:cc
+        this.fileSize = +element.pttElement.fileSize; // TODO: cc
         this.fileMd5 = element.pttElement.md5HexStr;
-        this.fileDuration = Math.round(element.pttElement.duration); // work:cc
+        this.fileDuration = Math.round(element.pttElement.duration); // TODO: cc
     }
 
     get valid(): boolean {

src/core/packet/transformer/highway/DownloadOfflineFile.ts

@@ -25,7 +25,7 @@ class DownloadOfflineFile extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0
         return OidbBase.build(0xE37, 800, body, false, false);
     }
 
-    // work:check
+    // TODO:check
     parse(data: Buffer) {
         const oidbBody = OidbBase.parse(data).body;
         return new NapProtoMsg(proto.OidbSvcTrpcTcp0XE37Response).decode(oidbBody);

src/core/packet/transformer/highway/FetchSessionKey.ts

@@ -16,7 +16,7 @@ class FetchSessionKey extends PacketTransformer<typeof proto.HttpConn0x6ff_501Re
                 field4: 1,
                 field6: 3,
                 serviceTypes: [1, 5, 10, 21],
-                // tgt: "",  // work:do we really need tgt? seems not
+                // tgt: "",  // TODO: do we really need tgt? seems not
                 field9: 2,
                 field10: 9,
                 field11: 8,

src/core/packet/transformer/highway/UploadGroupFile.ts

@@ -16,7 +16,7 @@ class UploadGroupFile extends PacketTransformer<typeof proto.OidbSvcTrpcTcp0x6D6
                 appId: 4,
                 busId: 102,
                 entrance: 6,
-                targetDirectory: '/',  // work:
+                targetDirectory: '/',  // TODO:
                 fileName: file.fileName,
                 localDirectory: `/${file.fileName}`,
                 fileSize: BigInt(file.fileSize),

src/core/packet/transformer/highway/UploadGroupImage.ts

@@ -40,7 +40,7 @@ class UploadGroupImage extends PacketTransformer<typeof proto.NTV2RichMediaResp>
                                 fileName: img.name,
                                 type: {
                                     type: 1,
-                                    picFormat: img.picType,  //work:extend NapCat imgType /cc @MliKiowa
+                                    picFormat: img.picType,  //TODO: extend NapCat imgType /cc @MliKiowa
                                     videoFormat: 0,
                                     voiceFormat: 0,
                                 },
@@ -59,7 +59,7 @@ class UploadGroupImage extends PacketTransformer<typeof proto.NTV2RichMediaResp>
                     extBizInfo: {
                         pic: {
                             bytesPbReserveTroop: Buffer.from("0800180020004200500062009201009a0100a2010c080012001800200028003a00", 'hex'),
-                            textSummary: "Nya~",  // work:
+                            textSummary: "Nya~",  // TODO:
                         },
                         video: {
                             bytesPbReserve: Buffer.alloc(0),

src/core/packet/transformer/highway/UploadPrivateImage.ts

@@ -40,7 +40,7 @@ class UploadPrivateImage extends PacketTransformer<typeof proto.NTV2RichMediaRes
                             fileName: img.name,
                             type: {
                                 type: 1,
-                                picFormat: img.picType,  //work:extend NapCat imgType /cc @MliKiowa
+                                picFormat: img.picType,  //TODO: extend NapCat imgType /cc @MliKiowa
                                 videoFormat: 0,
                                 voiceFormat: 0,
                             },
@@ -59,7 +59,7 @@ class UploadPrivateImage extends PacketTransformer<typeof proto.NTV2RichMediaRes
                 extBizInfo: {
                     pic: {
                         bytesPbReserveTroop: Buffer.from("0800180020004200500062009201009a0100a2010c080012001800200028003a00", 'hex'),
-                        textSummary: "Nya~",  // work:
+                        textSummary: "Nya~",  // TODO:
                     },
                     video: {
                         bytesPbReserve: Buffer.alloc(0),

src/core/wrapper.ts

@@ -150,7 +150,7 @@ export interface NodeIQQNTWrapperSession {
         nodeIKernelSessionListener: NodeIKernelSessionListener,
     ): void;
 
-    startNT(n: 0): void;
+    startNT(session: number): void;
 
     startNT(): void;
 

src/onebot/action/OB11Response.ts

@@ -1,32 +0,0 @@
-import { OB11Return } from '../types';
-
-import { isNull } from '@/common/helper';
-
-export class OB11Response {
-    static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {
-        return {
-            status: status,
-            retcode: retcode,
-            data: data,
-            message: message,
-            wording: message,
-            echo: null,
-        };
-    }
-
-    static ok<T>(data: T, echo: any = null) {
-        const res = OB11Response.res<T>(data, 'ok', 0);
-        if (!isNull(echo)) {
-            res.echo = echo;
-        }
-        return res;
-    }
-
-    static error(err: string, retcode: number, echo: any = null) {
-        const res = OB11Response.res(null, 'failed', retcode, err);
-        if (!isNull(echo)) {
-            res.echo = echo;
-        }
-        return res;
-    }
-}

src/onebot/action/OneBotAction.ts

@@ -1,15 +1,38 @@
 import { ActionName, BaseCheckResult } from './types';
-import { OB11Response } from './OB11Response';
-import { OB11Return } from '@/onebot/types';
 import Ajv, { ErrorObject, ValidateFunction } from 'ajv';
 import { NapCatCore } from '@/core';
+import { isNull } from '@/common/helper';
+import { NapCatOneBot11Adapter, OB11Return } from '@/onebot';
 
-import { NapCatOneBot11Adapter } from '@/onebot';
+export class OB11Response {
+    private static createResponse<T>(data: T, status: string, retcode: number, message: string = '', echo: any = null): OB11Return<T> {
+        return {
+            status,
+            retcode,
+            data,
+            message,
+            wording: message,
+            echo,
+        };
+    }
 
-abstract class BaseAction<PayloadType, ReturnDataType> {
+    static res<T>(data: T, status: string, retcode: number, message: string = ''): OB11Return<T> {
+        return this.createResponse(data, status, retcode, message);
+    }
+
+    static ok<T>(data: T, echo: any = null): OB11Return<T> {
+        return this.createResponse(data, 'ok', 0, '', echo);
+    }
+
+    static error(err: string, retcode: number, echo: any = null): OB11Return<null> {
+        return this.createResponse(null, 'failed', retcode, err, echo);
+    }
+}
+
+export abstract class OneBotAction<PayloadType, ReturnDataType> {
     actionName: ActionName = ActionName.Unknown;
     core: NapCatCore;
-    private validate: undefined | ValidateFunction<any> = undefined;
+    private validate: ValidateFunction<any> | undefined = undefined;
     payloadSchema: any = undefined;
     obContext: NapCatOneBot11Adapter;
 
@@ -24,17 +47,13 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
         }
         if (this.validate && !this.validate(payload)) {
             const errors = this.validate.errors as ErrorObject[];
-            const errorMessages: string[] = errors.map((e) => {
-                return `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`;
-            });
+            const errorMessages = errors.map(e => `Key: ${e.instancePath.split('/').slice(1).join('.')}, Message: ${e.message}`);
             return {
                 valid: false,
                 message: errorMessages.join('\n') ?? '未知错误',
             };
         }
-        return {
-            valid: true,
-        };
+        return { valid: true };
     }
 
     public async handle(payload: PayloadType, adaptername: string): Promise<OB11Return<ReturnDataType | null>> {
@@ -46,7 +65,7 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
             const resData = await this._handle(payload, adaptername);
             return OB11Response.ok(resData);
         } catch (e: any) {
-            this.core.context.logger.logError.bind(this.core.context.logger)('发生错误', e);
+            this.core.context.logger.logError('发生错误', e);
             return OB11Response.error(e?.toString() || e?.stack?.toString() || '未知错误，可能操作超时', 200);
         }
     }
@@ -60,12 +79,10 @@ abstract class BaseAction<PayloadType, ReturnDataType> {
             const resData = await this._handle(payload, adaptername);
             return OB11Response.ok(resData, echo);
         } catch (e: any) {
-            this.core.context.logger.logError.bind(this.core.context.logger)('发生错误', e);
-            return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo);
+            this.core.context.logger.logError('发生错误', e);
+            return OB11Response.error(e.toString() || e.stack?.toString(), 1200, echo);
         }
     }
 
     abstract _handle(payload: PayloadType, adaptername: string): PromiseLike<ReturnDataType>;
-}
-
-export default BaseAction;
+}

src/onebot/action/extends/CreateCollection.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class CreateCollection extends BaseAction<Payload, any> {
+export class CreateCollection extends OneBotAction<Payload, any> {
     actionName = ActionName.CreateCollection;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/FetchCustomFace.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 const SchemaData = {
@@ -11,7 +11,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class FetchCustomFace extends BaseAction<Payload, string[]> {
+export class FetchCustomFace extends OneBotAction<Payload, string[]> {
     actionName = ActionName.FetchCustomFace;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/FetchEmojiLike.ts

@@ -1,6 +1,6 @@
 //getMsgEmojiLikesList
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { MessageUnique } from '@/common/message-unique';
 
@@ -19,7 +19,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class FetchEmojiLike extends BaseAction<Payload, any> {
+export class FetchEmojiLike extends OneBotAction<Payload, any> {
     actionName = ActionName.FetchEmojiLike;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/FetchUserProfileLike.ts

@@ -1,7 +1,7 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
-export class FetchUserProfileLike extends BaseAction<{ qq: number }, any> {
+export class FetchUserProfileLike extends OneBotAction<{ qq: number }, any> {
     actionName = ActionName.FetchUserProfileLike;
 
     async _handle(payload: { qq: number }) {

src/onebot/action/extends/GetCollectionList.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetCollectionList extends BaseAction<Payload, any> {
+export class GetCollectionList extends OneBotAction<Payload, any> {
     actionName = ActionName.GetCollectionList;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/GetFriendWithCategory.ts

@@ -1,8 +1,8 @@
 import { OB11Entities } from '@/onebot/entities';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
-export class GetFriendWithCategory extends BaseAction<void, any> {
+export class GetFriendWithCategory extends OneBotAction<void, any> {
     actionName = ActionName.GetFriendsWithCategory;
 
     async _handle(payload: void) {

src/onebot/action/extends/GetGroupAddRequest.ts

@@ -1,5 +1,5 @@
 import { GroupNotifyMsgStatus } from '@/core';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 interface OB11GroupRequestNotify {
@@ -8,7 +8,7 @@ interface OB11GroupRequestNotify {
     flag: string
 }
 
-export default class GetGroupAddRequest extends BaseAction<null, OB11GroupRequestNotify[] | null> {
+export default class GetGroupAddRequest extends OneBotAction<null, OB11GroupRequestNotify[] | null> {
     actionName = ActionName.GetGroupIgnoreAddRequest;
 
     async _handle(payload: null): Promise<OB11GroupRequestNotify[] | null> {

src/onebot/action/extends/GetGroupInfoEx.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -12,7 +12,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupInfoEx extends BaseAction<Payload, any> {
+export class GetGroupInfoEx extends OneBotAction<Payload, any> {
     actionName = ActionName.GetGroupInfoEx;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/GetProfileLike.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 interface Payload {
@@ -6,7 +6,7 @@ interface Payload {
     count: number
 }
 
-export class GetProfileLike extends BaseAction<Payload, any> {
+export class GetProfileLike extends OneBotAction<Payload, any> {
     actionName = ActionName.GetProfileLike;
 
     async _handle(payload: Payload) {

src/onebot/action/extends/GetRobotUinRange.ts

@@ -1,7 +1,7 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
-export class GetRobotUinRange extends BaseAction<void, Array<any>> {
+export class GetRobotUinRange extends OneBotAction<void, Array<any>> {
     actionName = ActionName.GetRobotUinRange;
 
     async _handle(payload: void) {

src/onebot/action/extends/OCRImage.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { checkFileReceived, uri2local } from '@/common/file';
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class OCRImage extends BaseAction<Payload, any> {
+export class OCRImage extends OneBotAction<Payload, any> {
     actionName = ActionName.OCRImage;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/SetGroupSign.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { GetPacketStatusDepends } from '../packet/GetPacketStatus';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -12,7 +12,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class SetGroupSign extends BaseAction<Payload, any> {
+export class SetGroupSign extends GetPacketStatusDepends<Payload, any> {
     actionName = ActionName.SetGroupSign;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/SetInputStatus.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { ChatType } from '@/core';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class SetInputStatus extends BaseAction<Payload, any> {
+export class SetInputStatus extends OneBotAction<Payload, any> {
     actionName = ActionName.SetInputStatus;
 
     async _handle(payload: Payload) {

src/onebot/action/extends/SetLongNick.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -12,7 +12,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class SetLongNick extends BaseAction<Payload, any> {
+export class SetLongNick extends OneBotAction<Payload, any> {
     actionName = ActionName.SetLongNick;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/SetOnlineStatus.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 // 设置在线状态
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class SetOnlineStatus extends BaseAction<Payload, null> {
+export class SetOnlineStatus extends OneBotAction<Payload, null> {
     actionName = ActionName.SetOnlineStatus;
     payloadSchema = SchemaData;
 

src/onebot/action/extends/SetQQAvatar.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
 import { checkFileReceived, uri2local } from '@/common/file';
@@ -7,7 +7,7 @@ interface Payload {
     file: string;
 }
 
-export default class SetAvatar extends BaseAction<Payload, null> {
+export default class SetAvatar extends OneBotAction<Payload, null> {
     actionName = ActionName.SetQQAvatar;
 
     // 用不着复杂检测

src/onebot/action/extends/ShareContact.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 type Payload = FromSchema<typeof SchemaData>;
 
 
-export class SharePeer extends BaseAction<Payload, any> {
+export class SharePeer extends OneBotAction<Payload, any> {
     actionName = ActionName.SharePeer;
     payloadSchema = SchemaData;
 
@@ -37,7 +37,7 @@ const SchemaDataGroupEx = {
 
 type PayloadGroupEx = FromSchema<typeof SchemaDataGroupEx>;
 
-export class ShareGroupEx extends BaseAction<PayloadGroupEx, any> {
+export class ShareGroupEx extends OneBotAction<PayloadGroupEx, any> {
     actionName = ActionName.ShareGroupEx;
     payloadSchema = SchemaDataGroupEx;
 

src/onebot/action/extends/TranslateEnWordToZn.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class TranslateEnWordToZn extends BaseAction<Payload, Array<any> | null> {
+export class TranslateEnWordToZn extends OneBotAction<Payload, Array<any> | null> {
     actionName = ActionName.TranslateEnWordToZn;
     payloadSchema = SchemaData;
 

src/onebot/action/file/GetFile.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import fs from 'fs/promises';
 import { FileNapCatOneBotUUID } from '@/common/helper';
 import { ActionName } from '../types';
@@ -30,7 +30,7 @@ const GetFileBase_PayloadSchema = {
 
 export type GetFilePayload = FromSchema<typeof GetFileBase_PayloadSchema>;
 
-export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
+export class GetFileBase extends OneBotAction<GetFilePayload, GetFileResponse> {
     payloadSchema = GetFileBase_PayloadSchema;
 
     async _handle(payload: GetFilePayload): Promise<GetFileResponse> {

src/onebot/action/go-cqhttp/CreateGroupFileFolder.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 const SchemaData = {
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class CreateGroupFileFolder extends  BaseAction<Payload, any>  {
+export class CreateGroupFileFolder extends  OneBotAction<Payload, any>  {
     actionName = ActionName.GoCQHTTP_CreateGroupFileFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {

src/onebot/action/go-cqhttp/DeleteGroupFile.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FileNapCatOneBotUUID } from '@/common/helper';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class DeleteGroupFile extends BaseAction<Payload, any> {
+export class DeleteGroupFile extends OneBotAction<Payload, any> {
     actionName = ActionName.GOCQHTTP_DeleteGroupFile;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {

src/onebot/action/go-cqhttp/DeleteGroupFileFolder.ts

@@ -1,6 +1,6 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { ActionName } from '../types';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 
 const SchemaData = {
     type: 'object',
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class DeleteGroupFileFolder extends BaseAction<Payload, any> {
+export class DeleteGroupFileFolder extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_DeleteGroupFileFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {

src/onebot/action/go-cqhttp/DownloadFile.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import fs from 'fs';
 import { join as joinPath } from 'node:path';
@@ -28,7 +28,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class GoCQHTTPDownloadFile extends BaseAction<Payload, FileResponse> {
+export default class GoCQHTTPDownloadFile extends OneBotAction<Payload, FileResponse> {
     actionName = ActionName.GoCQHTTP_DownloadFile;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GetForwardMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { OB11Message, OB11MessageData, OB11MessageDataType, OB11MessageForward, OB11MessageNodePlain as OB11MessageNode } from '@/onebot';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -16,7 +16,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GoCQHTTPGetForwardMsgAction extends BaseAction<Payload, any> {
+export class GoCQHTTPGetForwardMsgAction extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetForwardMsg;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GetFriendMsgHistory.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
 import { ChatType } from '@/core/entities';
@@ -23,7 +23,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class GetFriendMsgHistory extends BaseAction<Payload, Response> {
+export default class GetFriendMsgHistory extends OneBotAction<Payload, Response> {
     actionName = ActionName.GetFriendMsgHistory;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GetGroupAtAllRemain.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -11,7 +11,7 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GoCQHTTPGetGroupAtAllRemain extends BaseAction<Payload, any> {
+export class GoCQHTTPGetGroupAtAllRemain extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetGroupAtAllRemain;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GetGroupFileSystemInfo.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 const SchemaData = {
@@ -12,10 +12,10 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupFileSystemInfo extends BaseAction<Payload, {
+export class GetGroupFileSystemInfo extends OneBotAction<Payload, {
     file_count: number,
     limit_count: number, // unimplemented
-    used_space: number, // work:unimplemented, but can be implemented later
+    used_space: number, // TODO:unimplemented, but can be implemented later
     total_space: number, // unimplemented, 10 GB by default
 }> {
     actionName = ActionName.GoCQHTTP_GetGroupFileSystemInfo;

src/onebot/action/go-cqhttp/GetGroupFilesByFolder.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { OB11Entities } from '@/onebot/entities';
 
@@ -16,7 +16,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupFilesByFolder extends BaseAction<any, any> {
+export class GetGroupFilesByFolder extends OneBotAction<any, any> {
     actionName = ActionName.GoCQHTTP_GetGroupFilesByFolder;
     payloadSchema = SchemaData;
     async _handle(payload: Payload) {

src/onebot/action/go-cqhttp/GetGroupHonorInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { WebHonorType } from '@/core/entities';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -14,7 +14,7 @@ const SchemaData = {
 // enum是不是有点抽象
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupHonorInfo extends BaseAction<Payload, Array<any>> {
+export class GetGroupHonorInfo extends OneBotAction<Payload, Array<any>> {
     actionName = ActionName.GetGroupHonorInfo;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GetGroupMsgHistory.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { OB11Message } from '@/onebot';
 import { ActionName } from '../types';
 import { ChatType, Peer } from '@/core/entities';
@@ -23,7 +23,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class GoCQHTTPGetGroupMsgHistory extends BaseAction<Payload, Response> {
+export default class GoCQHTTPGetGroupMsgHistory extends OneBotAction<Payload, Response> {
     actionName = ActionName.GoCQHTTP_GetGroupMsgHistory;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GetGroupRootFiles.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupRootFiles extends BaseAction<Payload, {
+export class GetGroupRootFiles extends OneBotAction<Payload, {
     files: OB11GroupFile[],
     folders: OB11GroupFileFolder[],
 }> {
@@ -28,7 +28,7 @@ export class GetGroupRootFiles extends BaseAction<Payload, {
             startIndex: 0,
             sortOrder: 2,
             showOnlinedocFolder: 0,
-        }).catch(() => []);
+        });
 
         return {
             files: ret.filter(item => item.fileInfo)

src/onebot/action/go-cqhttp/GetOnlineClient.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { JSONSchema } from 'json-schema-to-ts';
 import { sleep } from '@/common/helper';
@@ -10,7 +10,7 @@ const SchemaData = {
     },
 } as const satisfies JSONSchema;
 
-export class GetOnlineClient extends BaseAction<void, Array<any>> {
+export class GetOnlineClient extends OneBotAction<void, Array<any>> {
     actionName = ActionName.GetOnlineClient;
 
     async _handle(payload: void) {

src/onebot/action/go-cqhttp/GetStrangerInfo.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { OB11User, OB11UserSex } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
 import { ActionName } from '../types';
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class GoCQHTTPGetStrangerInfo extends BaseAction<Payload, OB11User> {
+export default class GoCQHTTPGetStrangerInfo extends OneBotAction<Payload, OB11User> {
     actionName = ActionName.GoCQHTTP_GetStrangerInfo;
 
     async _handle(payload: Payload): Promise<OB11User> {

src/onebot/action/go-cqhttp/GoCQHTTPCheckUrlSafely.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -11,7 +11,7 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GoCQHTTPCheckUrlSafely extends BaseAction<Payload, any> {
+export class GoCQHTTPCheckUrlSafely extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_CheckUrlSafely;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GoCQHTTPDeleteFriend.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -18,7 +18,7 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GoCQHTTPDeleteFriend extends BaseAction<Payload, any> {
+export class GoCQHTTPDeleteFriend extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_DeleteFriend;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GoCQHTTPGetModelShow.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -10,7 +10,7 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GoCQHTTPGetModelShow extends BaseAction<Payload, any> {
+export class GoCQHTTPGetModelShow extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetModelShow;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/GoCQHTTPSetModelShow.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -9,7 +9,7 @@ const SchemaData = {
 type Payload = FromSchema<typeof SchemaData>;
 
 //兼容性代码
-export class GoCQHTTPSetModelShow extends BaseAction<Payload, any> {
+export class GoCQHTTPSetModelShow extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_SetModelShow;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/QuickAction.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { QuickAction, QuickActionEvent } from '@/onebot/types';
 
@@ -7,7 +7,7 @@ interface Payload {
     operation: QuickAction
 }
 
-export class GoCQHTTPHandleQuickAction extends BaseAction<Payload, null> {
+export class GoCQHTTPHandleQuickAction extends OneBotAction<Payload, null> {
     actionName = ActionName.GoCQHTTP_HandleQuickAction;
 
     async _handle(payload: Payload): Promise<null> {

src/onebot/action/go-cqhttp/SendGroupNotice.ts

@@ -1,5 +1,5 @@
 import { checkFileReceived, uri2local } from '@/common/file';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { unlink } from 'node:fs';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -21,7 +21,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class SendGroupNotice extends BaseAction<Payload, null> {
+export class SendGroupNotice extends OneBotAction<Payload, null> {
     actionName = ActionName.GoCQHTTP_SendGroupNotice;
 
     async _handle(payload: Payload) {

src/onebot/action/go-cqhttp/SetGroupPortrait.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName, BaseCheckResult } from '../types';
 import * as fs from 'node:fs';
 import { checkFileReceived, uri2local } from '@/common/file';
@@ -8,7 +8,7 @@ interface Payload {
     group_id: number
 }
 
-export default class SetGroupPortrait extends BaseAction<Payload, any> {
+export default class SetGroupPortrait extends OneBotAction<Payload, any> {
     actionName = ActionName.SetGroupPortrait;
 
     // 用不着复杂检测

src/onebot/action/go-cqhttp/SetQQProfile.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class SetQQProfile extends BaseAction<Payload, any> {
+export class SetQQProfile extends OneBotAction<Payload, any> {
     actionName = ActionName.SetQQProfile;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/UploadGroupFile.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { ChatType, Peer } from '@/core/entities';
 import fs from 'fs';
@@ -20,7 +20,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class GoCQHTTPUploadGroupFile extends BaseAction<Payload, null> {
+export default class GoCQHTTPUploadGroupFile extends OneBotAction<Payload, null> {
     actionName = ActionName.GoCQHTTP_UploadGroupFile;
     payloadSchema = SchemaData;
 

src/onebot/action/go-cqhttp/UploadPrivateFile.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { ChatType, Peer, SendFileElement } from '@/core/entities';
 import fs from 'fs';
@@ -19,7 +19,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class GoCQHTTPUploadPrivateFile extends BaseAction<Payload, null> {
+export default class GoCQHTTPUploadPrivateFile extends OneBotAction<Payload, null> {
     actionName = ActionName.GOCQHTTP_UploadPrivateFile;
     payloadSchema = SchemaData;
 

src/onebot/action/group/DelEssenceMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class DelEssenceMsg extends BaseAction<Payload, any> {
+export default class DelEssenceMsg extends OneBotAction<Payload, any> {
     actionName = ActionName.DelEssenceMsg;
     payloadSchema = SchemaData;
 

src/onebot/action/group/DelGroupNotice.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class DelGroupNotice extends BaseAction<Payload, any> {
+export class DelGroupNotice extends OneBotAction<Payload, any> {
     actionName = ActionName.DelGroupNotice;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupEssence.ts

@@ -1,5 +1,5 @@
 import { ChatType, Peer } from '@/core';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
@@ -16,7 +16,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupEssence extends BaseAction<Payload, any> {
+export class GetGroupEssence extends OneBotAction<Payload, any> {
     actionName = ActionName.GoCQHTTP_GetEssenceMsg;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupIgnoredNotifies.ts

@@ -1,5 +1,5 @@
 import { GroupNotifyMsgStatus } from '@/core';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -12,7 +12,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupIgnoredNotifies extends BaseAction<void, any> {
+export class GetGroupIgnoredNotifies extends OneBotAction<void, any> {
     actionName = ActionName.GetGroupIgnoredNotifies;
 
     async _handle(payload: void) {

src/onebot/action/group/GetGroupInfo.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-class GetGroupInfo extends BaseAction<Payload, OB11Group> {
+class GetGroupInfo extends OneBotAction<Payload, OB11Group> {
     actionName = ActionName.GetGroupInfo;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupList.ts

@@ -1,6 +1,6 @@
 import { OB11Group } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 // no_cache get时传字符串
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-class GetGroupList extends BaseAction<Payload, OB11Group[]> {
+class GetGroupList extends OneBotAction<Payload, OB11Group[]> {
     actionName = ActionName.GetGroupList;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupMemberInfo.ts

@@ -1,6 +1,6 @@
 import { OB11GroupMember } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -16,7 +16,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-class GetGroupMemberInfo extends BaseAction<Payload, OB11GroupMember> {
+class GetGroupMemberInfo extends OneBotAction<Payload, OB11GroupMember> {
     actionName = ActionName.GetGroupMemberInfo;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupMemberList.ts

@@ -1,6 +1,6 @@
 import { OB11GroupMember } from '@/onebot';
 import { OB11Entities } from '@/onebot/entities';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupMemberList extends BaseAction<Payload, OB11GroupMember[]> {
+export class GetGroupMemberList extends OneBotAction<Payload, OB11GroupMember[]> {
     actionName = ActionName.GetGroupMemberList;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupNotice.ts

@@ -1,5 +1,5 @@
 import { WebApiGroupNoticeFeed } from '@/core';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -29,7 +29,7 @@ type Payload = FromSchema<typeof SchemaData>;
 
 type ApiGroupNotice = GroupNotice & WebApiGroupNoticeFeed;
 
-export class GetGroupNotice extends BaseAction<Payload, GroupNotice[]> {
+export class GetGroupNotice extends OneBotAction<Payload, GroupNotice[]> {
     actionName = ActionName.GoCQHTTP_GetGroupNotice;
     payloadSchema = SchemaData;
 

src/onebot/action/group/GetGroupShutList.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -12,7 +12,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export class GetGroupShutList extends BaseAction<Payload, any> {
+export class GetGroupShutList extends OneBotAction<Payload, any> {
     actionName = ActionName.GetGroupShutList;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetEssenceMsg.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 import { MessageUnique } from '@/common/message-unique';
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetEssenceMsg extends BaseAction<Payload, any> {
+export default class SetEssenceMsg extends OneBotAction<Payload, any> {
     actionName = ActionName.SetEssenceMsg;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupAddRequest.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { GroupRequestOperateTypes } from '@/core/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetGroupAddRequest extends BaseAction<Payload, null> {
+export default class SetGroupAddRequest extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupAddRequest;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupAdmin.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { GroupMemberRole } from '@/core/entities';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetGroupAdmin extends BaseAction<Payload, null> {
+export default class SetGroupAdmin extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupAdmin;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupBan.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetGroupBan extends BaseAction<Payload, null> {
+export default class SetGroupBan extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupBan;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupCard.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -14,7 +14,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetGroupCard extends BaseAction<Payload, null> {
+export default class SetGroupCard extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupCard;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupKick.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -15,7 +15,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetGroupKick extends BaseAction<Payload, null> {
+export default class SetGroupKick extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupKick;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupLeave.ts

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
 
@@ -12,7 +12,7 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
-export default class SetGroupLeave extends BaseAction<Payload, any> {
+export default class SetGroupLeave extends OneBotAction<Payload, any> {
     actionName = ActionName.SetGroupLeave;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupName.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 const SchemaData = {
@@ -12,7 +12,7 @@ const SchemaData = {
 } as const satisfies JSONSchema;
 
 type Payload = FromSchema<typeof SchemaData>;
-export default class SetGroupName extends BaseAction<Payload, null> {
+export default class SetGroupName extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupName;
     payloadSchema = SchemaData;
 

src/onebot/action/group/SetGroupWholeBan.ts

@@ -1,5 +1,5 @@
 import { FromSchema, JSONSchema } from 'json-schema-to-ts';
-import BaseAction from '../BaseAction';
+import { OneBotAction } from '@/onebot/action/OneBotAction';
 import { ActionName } from '../types';
 
 const SchemaData = {
@@ -13,7 +13,7 @@ const SchemaData = {
 
 type Payload = FromSchema<typeof SchemaData>;
 
-export default class SetGroupWholeBan extends BaseAction<Payload, null> {
+export default class SetGroupWholeBan extends OneBotAction<Payload, null> {
     actionName = ActionName.SetGroupWholeBan;
     payloadSchema = SchemaData;