fux: #574

refactor:优化WebUI后端代码格式(无新功能添加)

.editorconfig

@@ -17,5 +17,8 @@ charset = utf-8
 indent_style = space
 indent_size = 4
 
+[*.bat]
+charset = latin1
+
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
 # You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.eslintrc.cjs

@@ -1,64 +0,0 @@
-module.exports = {
-    'env': {
-        'browser': true,
-        'es2021': true,
-        'node': true
-    },
-    'ignorePatterns': ['src/core/proto/'],
-    'extends': [
-        'eslint:recommended',
-        'plugin:@typescript-eslint/recommended'
-    ],
-    'overrides': [
-        {
-            'env': {
-                'node': true
-            },
-            'files': [
-                '.eslintrc.{js,cjs}'
-            ],
-            'parserOptions': {
-                'sourceType': 'script'
-            }
-        }
-    ],
-    'parser': '@typescript-eslint/parser',
-    'parserOptions': {
-        'ecmaVersion': 'latest',
-        'sourceType': 'module'
-    },
-    'plugins': [
-        '@typescript-eslint',
-        'import'
-    ],
-    'settings': {
-        'import/parsers': {
-            '@typescript-eslint/parser': ['.ts']
-        },
-        'import/resolver': {
-            'typescript': {
-                'alwaysTryTypes': true
-            }
-        }
-    },
-    'rules': {
-        'indent': [
-            'error',
-            4
-        ],
-        'linebreak-style': [
-            'error',
-            'unix'
-        ],
-        'semi': [
-            'error',
-            'always'
-        ],
-        'no-unused-vars': 'off',
-        'no-async-promise-executor': 'off',
-        '@typescript-eslint/no-explicit-any': 'off',
-        '@typescript-eslint/no-unused-vars': 'off',
-        '@typescript-eslint/no-var-requires': 'off',
-        'object-curly-spacing': ['error', 'always'],
-    }
-};

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -10,6 +10,7 @@ body:
         在提交新的 Bug 反馈前，请确保您：
         * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
         * 不与现有的某一 issue 重复
+        * 不涉及[已经停止维护的特性](https://github.com/NapNeko/NapCatQQ?tab=readme-ov-file#挥别昨日)，例如 CQ 码
   - type: input
     id: system-version
     attributes:
@@ -78,4 +79,4 @@ body:
     attributes:
       label: OneBot 客户端运行日志
       description: 粘贴 OneBot 客户端的相关日志内容到此处
-      render: shell
+      render: shell

.github/workflows/build.yml

@@ -1,5 +1,7 @@
 name: "Build Action"
 on:
+  push:
+  pull_request:
   workflow_dispatch:
 
 permissions: write-all
@@ -8,54 +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
-          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 .. || exit 1
+          npm run build:framework && npm run depend || exit 1
           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
-                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 .. || exit 1
+          npm run build:shell && npm run depend || exit 1
+          rm package-lock.json
+      - name: Upload Artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: NapCat.Shell
+          path: dist

.github/workflows/release.yml

@@ -49,6 +49,9 @@ jobs:
     - name: Build NuCat Framework
       run: |
           npm i
+          cd napcat.webui
+          npm i
+          cd ..
           npm run build:framework
           cd dist
           npm i --omit=dev
@@ -78,6 +81,9 @@ jobs:
         - name: Build NuCat Shell
           run: |
                 npm i 
+                cd napcat.webui
+                npm i
+                cd ..
                 npm run build:shell
                 cd dist
                 npm i --omit=dev
@@ -93,15 +99,18 @@ jobs:
     needs: [Build-LiteLoader,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: Download All Artifact
       uses: actions/download-artifact@v4
-    # - name: Compress subdirectories
-    #   run: |
-    #     cd ./NapCat.Shell/
-    #     zip -q -r NapCat.Shell.zip *
-    #     cd ..
-    #     rm ./NapCat.Shell.zip -rf
-    #     mv ./NapCat.Shell/NapCat.Shell.zip ./
+      
     - name: Compress subdirectories
       run: |
         cd ./NapCat.Shell/
@@ -114,6 +123,16 @@ jobs:
         rm ./NapCat.Framework.zip -rf
         mv ./NapCat.Shell/NapCat.Shell.zip ./
         mv ./NapCat.Framework/NapCat.Framework.zip ./
+
+        mkdir ./NapCat.Framework.Windows.Once
+        unzip -q ./external/LiteLoaderWrapper.zip -d ./NapCat.Framework.Windows.Once
+        cd ./NapCat.Framework.Windows.Once
+        ls 
+        mkdir -p ./LL/plugins/NapCatQQ
+        unzip -q ../NapCat.Framework.zip -d ./LL/plugins/NapCatQQ
+        zip -q -r NapCat.Framework.Windows.Once.zip *
+        cd ..
+        mv ./NapCat.Framework.Windows.Once/NapCat.Framework.Windows.Once.zip ./
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
@@ -129,4 +148,5 @@ jobs:
         files: |
           NapCat.Framework.zip
           NapCat.Shell.zip
+          NapCat.Framework.Windows.Once.zip
         draft: true

LICENSE

@@ -1,343 +1,19 @@
-   GNU GENERAL PUBLIC Without Social media promotion LICENSE 
-                       Version 2, June 1991
+Limited Redistribution License for NapCat
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright © 2024 Mlikiowa
 
-                            Preamble
+1. Usage and Reproduction:
+   - Unauthorized use, reproduction, modification, or distribution of this code is prohibited without explicit permission from the main author of the NapCat repository.
+   
+2. Redistribution:
+   - Redistribution of this code is permitted, provided that the full text of this license is included, and the source and copyright information is clearly stated.
+   - Minor modifications and extensions are allowed for redistribution purposes, but the modified code must not be publicly released.
 
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
+3. Non-Commercial Use:
+   - This code is not to be used for any commercial purposes.
 
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
+4. Additional Permissions:
+   - Any rights not explicitly addressed in this license must be requested from and granted by the main author of the NapCat repository.
 
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-    d）You may use this software in accordance with the above terms, 
-    but you are not allowed to promote this project or your projects
-    based on this project on any public social media.
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
+5. Disclaimer:
+   - This code is provided "as is," without any express or implied warranties, including but not limited to the implied warranties of merchantability and fitness for a particular purpose. In no event shall the author be liable for any damages or other liability arising from, out of, or in connection with the use or distribution of this code.

README.md

@@ -1,37 +1,53 @@
 <div align="center">
-  <img src="https://socialify.git.ci/NapNeko/NapCatQQ/image?description=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2FNapNeko%2FNapCatQQ%2Fmain%2Flogo.png&name=1&stargazers=1&theme=Auto" alt="NapCatQQ" width="640" height="320" />
+  
+  ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto)
+  
 </div>
 
 ---
-## 欢迎回来
-NapCatQQ (aka 猫猫框架) 是现代化的基于 NTQQ 的 Bot 协议端实现。
+## 欢迎回家
+NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现
 
-## 猫猫技能
-- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
-- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
-- [x] **超多接口**：在实现大部分Onebot接口上扩展了一套私有API
-- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
+## 特性介绍
+- [x] **安装简单**：就算是笨蛋也能使用
+- [x] **性能友好**：就算是低内存也能使用
+- [x] **接口丰富**：就算是没有也能使用
+- [x] **稳定好用**：就算是被捉也能使用
 
-## 使用猫猫
+## 使用框架
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
+**首次使用**请务必查看如下文档看使用教程
+
+### 文档地址
+
+[Cloudflare.Worker](https://doc.napneko.icu/)
+
+[Cloudflare.HKServer](https://napcat.napneko.icu/)
+
+[Github.IO](https://napneko.github.io/)
+
+[Cloudflare.Pages](https://napneko.pages.dev/)
+
+[Server.Other](https://napcat.cyou/)
+
 
 ## 回家旅途
-[QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
+[QQ Group](https://qm.qq.com/q/I6LU87a0Yq)
 
-[Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
+## 感谢他们
+感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权
 
-## 猫猫朋友
-感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
+感谢 Tencent Tdesign / Vue3 强力驱动 NapCat.WebUi
 
-感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
+不过最最重要的 还是需要感谢屏幕前的你哦~
 
 ---
 
-## 约法三章
-> [!CAUTION]\
-> **请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论*任何*与本项目存在相关性的信息**
+## 特殊感谢
+[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目
 
-任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 NapCat 代码开发。**
+## 开源附加
+
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经仓库主作者授权二次分发或基于 NapCat 代码开发。**

eslint.config.mjs

@@ -0,0 +1,70 @@
+import typescriptEslint from "@typescript-eslint/eslint-plugin";
+import _import from "eslint-plugin-import";
+import { fixupPluginRules } from "@eslint/compat";
+import globals from "globals";
+import tsParser from "@typescript-eslint/parser";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const filename = fileURLToPath(import.meta.url);
+const dirname = path.dirname(filename);
+const compat = new FlatCompat({
+    baseDirectory: dirname,
+    recommendedConfig: js.configs.recommended,
+    allConfig: js.configs.all
+});
+
+export default [{
+    ignores: ["src/core/proto/"],
+}, ...compat.extends("eslint:recommended", "plugin:@typescript-eslint/recommended"), {
+    plugins: {
+        "@typescript-eslint": typescriptEslint,
+        import: fixupPluginRules(_import),
+    },
+
+    languageOptions: {
+        globals: {
+            ...globals.browser,
+            ...globals.node,
+        },
+
+        parser: tsParser,
+        ecmaVersion: "latest",
+        sourceType: "module",
+    },
+
+    settings: {
+        "import/parsers": {
+            "@typescript-eslint/parser": [".ts"],
+        },
+
+        "import/resolver": {
+            typescript: {
+                alwaysTryTypes: true,
+            },
+        },
+    },
+
+    rules: {
+        indent: ["error", 4],
+        semi: ["error", "always"],
+        "no-unused-vars": "off",
+        "no-async-promise-executor": "off",
+        "@typescript-eslint/no-explicit-any": "off",
+        "@typescript-eslint/no-unused-vars": "off",
+        "@typescript-eslint/no-var-requires": "off",
+        "object-curly-spacing": ["error", "always"],
+    },
+}, {
+    files: ["**/.eslintrc.{js,cjs}"],
+
+    languageOptions: {
+        globals: {
+            ...globals.node,
+        },
+        ecmaVersion: 5,
+        sourceType: "commonjs",
+    },
+}];

launcher/launcher-user.bat

@@ -0,0 +1,32 @@
+@echo off
+chcp 65001
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+pause

launcher/launcher-win10-user.bat

@@ -0,0 +1,33 @@
+@echo off
+chcp 65001
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456
+
+pause

launcher/launcher-win10.bat

@@ -0,0 +1,40 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'cmd.exe' -ArgumentList '/c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs" 
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1
+
+REM "%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" 123456

launcher/launcher.bat

@@ -0,0 +1,39 @@
+@echo off
+chcp 65001
+net session >nul 2>&1
+if %errorLevel% == 0 (
+    echo Administrator mode detected.
+) else (
+    echo Please run this script in administrator mode.
+    powershell -Command "Start-Process 'wt.exe' -ArgumentList 'cmd /c cd /d \"%cd%\" && \"%~f0\" %1' -Verb runAs"
+    exit
+)
+
+set NAPCAT_PATCH_PACKAGE=%cd%\qqnt.json
+set NAPCAT_LOAD_PATH=%cd%\loadNapCat.js
+set NAPCAT_INJECT_PATH=%cd%\NapCatWinBootHook.dll
+set NAPCAT_LAUNCHER_PATH=%cd%\NapCatWinBootMain.exe
+set NAPCAT_MAIN_PATH=%cd%\napcat.mjs
+:loop_read
+for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
+    set RetString=%%b
+    goto :napcat_boot
+)
+
+:napcat_boot
+for %%a in ("%RetString%") do (
+    set "pathWithoutUninstall=%%~dpa"
+)
+
+SET QQPath=%pathWithoutUninstall%QQ.exe
+
+if not exist "%QQpath%" (
+    echo provided QQ path is invalid: %QQpath%
+    pause
+    exit /b
+)
+
+set NAPCAT_MAIN_PATH=%NAPCAT_MAIN_PATH:\=/%
+echo (async () =^> {await import("file:///%NAPCAT_MAIN_PATH%")})() > "%NAPCAT_LOAD_PATH%"
+
+"%NAPCAT_LAUNCHER_PATH%" "%QQPath%" "%NAPCAT_INJECT_PATH%" %1

launcher/loadNapCat.js

@@ -0,0 +1,5 @@
+const path = require('path');
+const CurrentPath = path.dirname(__filename);
+(async () => {
+    await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
+})();

launcher/qqnt.json

@@ -0,0 +1,26 @@
+{
+  "name": "qq-chat",
+  "version": "9.9.16-29456",
+  "verHash": "dd395162",
+  "linuxVersion": "3.2.13-29456",
+  "linuxVerHash": "e379390a",
+  "type": "module",
+  "private": true,
+  "description": "QQ",
+  "productName": "QQ",
+  "author": {
+    "name": "Tencent",
+    "email": "QQ-Team@tencent.com"
+  },
+  "homepage": "https://im.qq.com",
+  "sideEffects": true,
+  "bin": {
+    "qd": "externals/devtools/cli/index.js"
+  },
+  "main": "./loadNapCat.js",
+  "buildVersion": "29456",
+  "isPureShell": true,
+  "isByteCodeShell": true,
+  "platform": "win32",
+  "eleArch": "x64"
+}

launcher/quickLoginExample.bat

@@ -0,0 +1,4 @@
+@echo off
+REM ./launcher.bat 123456
+REM ./launcher-win10.bat 123456
+REM 带有REM的为注释 删掉你需要的系统的那行REM这三个单词 修改QQ本脚本启动即可

manifest.json

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

napcat.webui/.gitignore

@@ -0,0 +1,24 @@
+# Logs
+logs
+*.log
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*
+pnpm-debug.log*
+lerna-debug.log*
+
+node_modules
+dist
+dist-ssr
+*.local
+
+# Editor directories and files
+.vscode/*
+!.vscode/extensions.json
+.idea
+.DS_Store
+*.suo
+*.ntvs*
+*.njsproj
+*.sln
+*.sw?

napcat.webui/.vscode/extensions.json

@@ -0,0 +1,3 @@
+{
+  "recommendations": ["Vue.volar"]
+}

napcat.webui/README.md

@@ -0,0 +1,5 @@
+# Vue 3 + TypeScript + Vite
+
+This template should help get you started developing with Vue 3 and TypeScript in Vite. The template uses Vue 3 `<script setup>` SFCs, check out the [script setup docs](https://v3.vuejs.org/api/sfc-script-setup.html#sfc-script-setup) to learn more.
+
+Learn more about the recommended Project Setup and IDE Support in the [Vue Docs TypeScript Guide](https://vuejs.org/guide/typescript/overview.html#project-setup).

napcat.webui/eslint.config.mjs

@@ -0,0 +1,52 @@
+import globals from 'globals';
+import ts from 'typescript-eslint';
+import vue from 'eslint-plugin-vue';
+import prettier from 'eslint-plugin-prettier/recommended';
+
+export default [
+    {
+        languageOptions: {
+            globals: {
+                ...globals.browser,
+                ...globals.node,
+            },
+        },
+    },
+    ...ts.configs.recommended,
+    {
+        rules: {
+            '@typescript-eslint/no-explicit-any': 'warn',
+            '@typescript-eslint/no-var-requires': 'warn',
+        },
+    },
+    ...vue.configs['flat/base'],
+    {
+        files: ['*.vue', '**/*.vue'],
+        languageOptions: {
+            parserOptions: {
+                parser: ts.parser,
+            },
+        },
+    },
+    {
+        rules: {
+            indent: ['error', 4],
+            semi: ['error', 'always'],
+            'no-unused-vars': 'off',
+            '@typescript-eslint/no-explicit-any': 'warn',
+            '@typescript-eslint/no-unused-vars': 'warn',
+            '@typescript-eslint/no-var-requires': 'warn',
+            'object-curly-spacing': ['error', 'always'],
+            'vue/v-for-delimiter-style': ['error', 'in'],
+            'vue/require-name-property': 'warn',
+            'vue/prefer-true-attribute-shorthand': 'warn',
+            'prefer-arrow-callback': 'warn',
+        },
+    },
+    prettier,
+    {
+        rules: {
+            'prettier/prettier': 'warn',
+        },
+    },
+];

napcat.webui/index.html

@@ -0,0 +1,13 @@
+<!doctype html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/svg+xml" href="./logo_webui.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>NapCat WebUI</title>
+</head>
+<body>
+<div id="app"></div>
+<script type="module" src="./src/main.ts"></script>
+</body>
+</html>

napcat.webui/package.json

@@ -0,0 +1,34 @@
+{
+  "name": "napcat.webui",
+  "private": true,
+  "version": "1.0.0",
+  "type": "module",
+  "scripts": {
+    "webui:lint": "eslint --fix src/**/*.{js,ts,vue}",
+    "webui:dev": "vite",
+    "webui:build": "vite build",
+    "webui:preview": "vite preview"
+  },
+  "dependencies": {
+    "eslint-plugin-prettier": "^5.2.1",
+    "qrcode": "^1.5.4",
+    "tdesign-icons-vue-next": "^0.3.3",
+    "tdesign-vue-next": "^1.10.3",
+    "vue": "^3.5.13",
+    "vue-router": "^4.4.5"
+  },
+  "devDependencies": {
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
+    "@types/qrcode": "^1.5.5",
+    "@vitejs/plugin-legacy": "^5.4.3",
+    "@vitejs/plugin-vue": "^5.1.4",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-vue": "^9.31.0",
+    "globals": "^15.12.0",
+    "terser": "^5.36.0",
+    "typescript": "~5.6.2",
+    "vite": "^5.4.10",
+    "vue-tsc": "^2.1.8"
+  }
+}

napcat.webui/public/vite.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="31.88" height="32" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 257"><defs><linearGradient id="IconifyId1813088fe1fbc01fb466" x1="-.828%" x2="57.636%" y1="7.652%" y2="78.411%"><stop offset="0%" stop-color="#41D1FF"></stop><stop offset="100%" stop-color="#BD34FE"></stop></linearGradient><linearGradient id="IconifyId1813088fe1fbc01fb467" x1="43.376%" x2="50.316%" y1="2.242%" y2="89.03%"><stop offset="0%" stop-color="#FFEA83"></stop><stop offset="8.333%" stop-color="#FFDD35"></stop><stop offset="100%" stop-color="#FFA800"></stop></linearGradient></defs><path fill="url(#IconifyId1813088fe1fbc01fb466)" d="M255.153 37.938L134.897 252.976c-2.483 4.44-8.862 4.466-11.382.048L.875 37.958c-2.746-4.814 1.371-10.646 6.827-9.67l120.385 21.517a6.537 6.537 0 0 0 2.322-.004l117.867-21.483c5.438-.991 9.574 4.796 6.877 9.62Z"></path><path fill="url(#IconifyId1813088fe1fbc01fb467)" d="M185.432.063L96.44 17.501a3.268 3.268 0 0 0-2.634 3.014l-5.474 92.456a3.268 3.268 0 0 0 3.997 3.378l24.777-5.718c2.318-.535 4.413 1.507 3.936 3.838l-7.361 36.047c-.495 2.426 1.782 4.5 4.151 3.78l15.304-4.649c2.372-.72 4.652 1.36 4.15 3.788l-11.698 56.621c-.732 3.542 3.979 5.473 5.943 2.437l1.313-2.028l72.516-144.72c1.215-2.423-.88-5.186-3.54-4.672l-25.505 4.922c-2.396.462-4.435-1.77-3.759-4.114l16.646-57.705c.677-2.35-1.37-4.583-3.769-4.113Z"></path></svg>

napcat.webui/src/App.vue

@@ -0,0 +1,112 @@
+<template>
+    <div id="app" theme-mode="dark">
+        <router-view />
+    </div>
+    <div v-if="show">
+        <t-sticky-tool shape="round" placement="right-bottom" :offset="[-50, 10]" @click="changeTheme">
+            <t-sticky-item label="浅色" popup="切换浅色模式">
+                <template #icon><sunny-icon /></template>
+            </t-sticky-item>
+            <t-sticky-item label="深色" popup="切换深色模式">
+                <template #icon><mode-dark-icon /></template>
+            </t-sticky-item>
+            <t-sticky-item label="自动" popup="跟随系统">
+                <template #icon><control-platform-icon /></template>
+            </t-sticky-item>
+        </t-sticky-tool>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { onBeforeUnmount, onMounted, onUnmounted, ref } from 'vue';
+import { ControlPlatformIcon, ModeDarkIcon, SunnyIcon } from 'tdesign-icons-vue-next';
+const smallScreen = window.matchMedia('(max-width: 768px)');
+interface Item {
+    label: string;
+    popup: string;
+}
+
+interface Context {
+    item: Item;
+}
+enum ThemeMode {
+    Dark = 'dark',
+    Light = 'light',
+    Auto = 'auto',
+}
+const themeLabelMap: Record<string, ThemeMode> = {
+    "浅色": ThemeMode.Light,
+    "深色": ThemeMode.Dark,
+    "自动": ThemeMode.Auto,
+};
+const show = ref<boolean>(true);
+const createSetThemeAttributeFunction = () => {
+    let mediaQueryForAutoTheme: MediaQueryList | null = null;
+    return (mode: ThemeMode | null) => {
+        const element = document.documentElement;
+        if (mode === ThemeMode.Dark) {
+            element.setAttribute('theme-mode', ThemeMode.Dark);
+        } else if (mode === ThemeMode.Light) {
+            element.removeAttribute('theme-mode');
+        } else if (mode === ThemeMode.Auto) {
+            mediaQueryForAutoTheme = window.matchMedia('(prefers-color-scheme: dark)');
+            const handleMediaChange = (e: MediaQueryListEvent) => {
+                if (e.matches) {
+                    element.setAttribute('theme-mode', ThemeMode.Dark);
+                } else {
+                    element.removeAttribute('theme-mode');
+                }
+            };
+            mediaQueryForAutoTheme.addEventListener('change', handleMediaChange);
+            const event = new Event('change');
+            Object.defineProperty(event, 'matches', {
+                value: mediaQueryForAutoTheme.matches,
+                writable: false,
+            });
+            mediaQueryForAutoTheme.dispatchEvent(event);
+            onBeforeUnmount(() => {
+                if (mediaQueryForAutoTheme) {
+                    mediaQueryForAutoTheme.removeEventListener('change', handleMediaChange);
+                }
+            });
+        }
+    };
+};
+
+const setThemeAttribute = createSetThemeAttributeFunction();
+
+const getStoredTheme = (): ThemeMode | null => {
+    return localStorage.getItem('theme') as ThemeMode | null;
+};
+
+const initTheme = () => {
+    const storedTheme = getStoredTheme();
+    if (storedTheme === null) {
+        setThemeAttribute(ThemeMode.Auto);
+    } else {
+        setThemeAttribute(storedTheme);
+    }
+};
+
+const changeTheme = (context: Context) => {
+    const themeLabel = themeLabelMap[context.item.label] as ThemeMode;
+    console.log(themeLabel);
+    setThemeAttribute(themeLabel);
+    localStorage.setItem('theme', themeLabel);
+};
+const haddingFbars = () => {
+    show.value = !smallScreen.matches;
+    if (smallScreen.matches) {
+        localStorage.setItem('theme', 'auto');
+    }
+};
+onMounted(() => {
+    initTheme();
+    haddingFbars();
+    window.addEventListener('resize', haddingFbars);
+});
+onUnmounted(() => {
+    window.removeEventListener('resize', haddingFbars);
+});
+</script>
+<style scoped></style>

napcat.webui/src/assets/vue.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" aria-hidden="true" role="img" class="iconify iconify--logos" width="37.07" height="36" preserveAspectRatio="xMidYMid meet" viewBox="0 0 256 198"><path fill="#41B883" d="M204.8 0H256L128 220.8L0 0h97.92L128 51.2L157.44 0h47.36Z"></path><path fill="#41B883" d="m0 0l128 220.8L256 0h-51.2L128 132.48L50.56 0H0Z"></path><path fill="#35495E" d="M50.56 0L128 133.12L204.8 0h-47.36L128 51.2L97.92 0H50.56Z"></path></svg>

napcat.webui/src/backend/shell.ts

@@ -0,0 +1,205 @@
+import { OneBotConfig } from '../../../src/onebot/config/config';
+
+export class QQLoginManager {
+    private retCredential: string;
+    private readonly apiPrefix: string;
+
+    //调试时http://127.0.0.1:6099/api 打包时 ../api
+    constructor(retCredential: string, apiPrefix: string = '../api') {
+        this.retCredential = retCredential;
+        this.apiPrefix = apiPrefix;
+    }
+
+    // TODO:
+    public async GetOB11Config(): Promise<OneBotConfig> {
+        try {
+            const ConfigResponse = await fetch(`${this.apiPrefix}/OB11Config/GetConfig`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (ConfigResponse.status == 200) {
+                const ConfigResponseJson = await ConfigResponse.json();
+                if (ConfigResponseJson.code == 0) {
+                    return ConfigResponseJson?.data as OneBotConfig;
+                }
+            }
+        } catch (error) {
+            console.error('Error getting OB11 config:', error);
+        }
+        return {} as OneBotConfig;
+    }
+
+    public async SetOB11Config(config: OneBotConfig): Promise<boolean> {
+        try {
+            const ConfigResponse = await fetch(`${this.apiPrefix}/OB11Config/SetConfig`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ config: JSON.stringify(config) }),
+            });
+            if (ConfigResponse.status == 200) {
+                const ConfigResponseJson = await ConfigResponse.json();
+                if (ConfigResponseJson.code == 0) {
+                    return true;
+                }
+            }
+        } catch (error) {
+            console.error('Error setting OB11 config:', error);
+        }
+        return false;
+    }
+
+    public async checkQQLoginStatus(): Promise<boolean> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/CheckLoginStatus`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data.isLogin;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking QQ login status:', error);
+        }
+        return false;
+    }
+    public async checkQQLoginStatusWithQrcode(): Promise<{ qrcodeurl: string; isLogin: string } | undefined> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/CheckLoginStatus`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking QQ login status:', error);
+        }
+        return undefined;
+    }
+
+    public async checkWebUiLogined(): Promise<boolean> {
+        try {
+            const LoginResponse = await fetch(`${this.apiPrefix}/auth/check`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (LoginResponse.status == 200) {
+                const LoginResponseJson = await LoginResponse.json();
+                if (LoginResponseJson.code == 0) {
+                    return true;
+                }
+            }
+        } catch (error) {
+            console.error('Error checking web UI login status:', error);
+        }
+        return false;
+    }
+
+    public async loginWithToken(token: string): Promise<string | null> {
+        try {
+            const loginResponse = await fetch(`${this.apiPrefix}/auth/login`, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ token: token }),
+            });
+            const loginResponseJson = await loginResponse.json();
+            const retCode = loginResponseJson.code;
+            if (retCode === 0) {
+                this.retCredential = loginResponseJson.data.Credential;
+                return this.retCredential;
+            }
+        } catch (error) {
+            console.error('Error logging in with token:', error);
+        }
+        return null;
+    }
+
+    public async getQQLoginQrcode(): Promise<string> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/GetQQLoginQrcode`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data.qrcode || '';
+                }
+            }
+        } catch (error) {
+            console.error('Error getting QQ login QR code:', error);
+        }
+        return '';
+    }
+
+    public async getQQQuickLoginList(): Promise<string[]> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/GetQuickLoginList`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return QQLoginResponseJson.data || [];
+                }
+            }
+        } catch (error) {
+            console.error('Error getting QQ quick login list:', error);
+        }
+        return [];
+    }
+
+    public async setQuickLogin(uin: string): Promise<{ result: boolean; errMsg: string }> {
+        try {
+            const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/SetQuickLogin`, {
+                method: 'POST',
+                headers: {
+                    Authorization: 'Bearer ' + this.retCredential,
+                    'Content-Type': 'application/json',
+                },
+                body: JSON.stringify({ uin: uin }),
+            });
+            if (QQLoginResponse.status == 200) {
+                const QQLoginResponseJson = await QQLoginResponse.json();
+                if (QQLoginResponseJson.code == 0) {
+                    return { result: true, errMsg: '' };
+                } else {
+                    return { result: false, errMsg: QQLoginResponseJson.message };
+                }
+            }
+        } catch (error) {
+            console.error('Error setting quick login:', error);
+        }
+        return { result: false, errMsg: '接口异常' };
+    }
+}

napcat.webui/src/components/Dashboard.vue

@@ -0,0 +1,58 @@
+<template>
+    <t-layout class="dashboard-container">
+        <div ref="menuRef">
+            <SidebarMenu :menu-items="menuItems" class="sidebar-menu" />
+        </div>
+        <t-layout>
+            <router-view />
+        </t-layout>
+    </t-layout>
+</template>
+
+<script setup lang="ts">
+import { onMounted, ref } from 'vue';
+import SidebarMenu from './webui/Nav.vue';
+import emitter from '@/ts/event-bus';
+interface MenuItem {
+    value: string;
+    icon: string;
+    label: string;
+    route: string;
+}
+
+const menuItems = ref<MenuItem[]>([
+    { value: 'item1', icon: 'dashboard', label: '基础信息', route: '/dashboard/basic-info' },
+    { value: 'item3', icon: 'wifi-1', label: '网络配置', route: '/dashboard/network-config' },
+    { value: 'item4', icon: 'setting', label: '其余配置', route: '/dashboard/other-config' },
+    { value: 'item5', icon: 'system-log', label: '日志查看', route: '/dashboard/log-view' },
+    { value: 'item6', icon: 'info-circle', label: '关于我们', route: '/dashboard/about-us' },
+]);
+const menuRef = ref<HTMLDivElement | null>(null);
+emitter.on('sendMenu', (event) => {
+    emitter.emit('sendWidth', menuRef.value?.offsetWidth);
+    localStorage.setItem('menuWidth', menuRef.value?.offsetWidth?.toString() || '0');
+});
+onMounted(() => {
+    localStorage.setItem('menuWidth', menuRef.value?.offsetWidth?.toString() || '0');
+});
+</script>
+
+<style scoped>
+.dashboard-container {
+    display: flex;
+    flex-direction: row;
+    height: 100vh;
+    width: 100%;
+}
+
+.sidebar-menu {
+    position: relative;
+    z-index: 2;
+}
+
+@media (max-width: 768px) {
+    .content {
+        padding: 10px;
+    }
+}
+</style>

napcat.webui/src/components/QQLogin.vue

@@ -0,0 +1,185 @@
+<template>
+    <t-card class="layout">
+        <div class="login-container">
+            <h2 class="sotheby-font">QQ Login</h2>
+            <div class="login-methods">
+                <t-tooltip content="快速登录">
+                    <t-button
+                        id="quick-login"
+                        class="login-method"
+                        :class="{ active: loginMethod === 'quick' }"
+                        @click="loginMethod = 'quick'"
+                        >Quick Login</t-button
+                    >
+                </t-tooltip>
+                <t-tooltip content="二维码登录">
+                    <t-button
+                        id="qrcode-login"
+                        class="login-method"
+                        :class="{ active: loginMethod === 'qrcode' }"
+                        @click="loginMethod = 'qrcode'"
+                        >QR Code</t-button
+                    >
+                </t-tooltip>
+            </div>
+            <div v-show="loginMethod === 'quick'" id="quick-login-dropdown" class="login-form">
+                <t-select
+                    id="quick-login-select"
+                    v-model="selectedAccount"
+                    placeholder="Select Account"
+                    @change="selectAccount"
+                >
+                    <t-option v-for="account in quickLoginList" :key="account" :value="account">{{ account }}</t-option>
+                </t-select>
+            </div>
+            <div v-show="loginMethod === 'qrcode'" id="qrcode" class="qrcode">
+                <canvas ref="qrcodeCanvas"></canvas>
+            </div>
+        </div>
+        <t-footer class="footer">Power By NapCat.WebUi</t-footer>
+    </t-card>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import * as QRCode from 'qrcode';
+import { useRouter } from 'vue-router';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { QQLoginManager } from '@/backend/shell';
+
+const router = useRouter();
+const loginMethod = ref<'quick' | 'qrcode'>('quick');
+const quickLoginList = ref<string[]>([]);
+const selectedAccount = ref<string>('');
+const qrcodeCanvas = ref<HTMLCanvasElement | null>(null);
+const qqLoginManager = new QQLoginManager(localStorage.getItem('auth') || '');
+let heartBeatTimer: number | null = null;
+let qrcodeUrl: string = '';
+const selectAccount = async (accountName: string): Promise<void> => {
+    const { result, errMsg } = await qqLoginManager.setQuickLogin(accountName);
+    if (result) {
+        if (heartBeatTimer) {
+            clearInterval(heartBeatTimer);
+        }
+        await MessagePlugin.success('登录成功即将跳转');
+        await router.push({ path: '/dashboard/basic-info' });
+    } else {
+        await MessagePlugin.error('登录失败,' + errMsg);
+    }
+};
+
+const generateQrCode = (data: string, canvas: HTMLCanvasElement | null): void => {
+    if (!canvas) {
+        console.error('Canvas element not found');
+        return;
+    }
+    QRCode.toCanvas(canvas, data, function (error: Error | null | undefined) {
+        if (error) {
+            console.error('Error generating QR Code:', error);
+        } else {
+            console.log('QR Code generated!');
+        }
+    });
+};
+
+const HeartBeat = async (): Promise<void> => {
+    const isLogined = await qqLoginManager.checkQQLoginStatusWithQrcode();
+    if (isLogined?.isLogin) {
+        if (heartBeatTimer) {
+            clearInterval(heartBeatTimer);
+        }
+        // //判断是否已经调转
+        // if (router.currentRoute.value.path !== '/dashboard/basic-info') {
+        //     return;
+        // }
+        await MessagePlugin.success('登录成功即将跳转');
+        await router.push({ path: '/dashboard/basic-info' });
+    } else if (isLogined?.qrcodeurl && qrcodeUrl !== isLogined.qrcodeurl) {
+        qrcodeUrl = isLogined.qrcodeurl;
+        generateQrCode(qrcodeUrl, qrcodeCanvas.value);
+    }
+};
+
+const InitPages = async (): Promise<void> => {
+    quickLoginList.value = await qqLoginManager.getQQQuickLoginList();
+    qrcodeUrl = await qqLoginManager.getQQLoginQrcode();
+    generateQrCode(qrcodeUrl, qrcodeCanvas.value);
+    heartBeatTimer = window.setInterval(HeartBeat, 3000);
+};
+
+onMounted(() => {
+    InitPages();
+});
+</script>
+
+<style scoped>
+.layout {
+    height: 100vh;
+}
+.login-container {
+    padding: 20px;
+    border-radius: 5px;
+    max-width: 400px;
+    min-width: 300px;
+    position: relative;
+    margin: 50px auto;
+}
+
+@media (max-width: 600px) {
+    .login-container {
+        width: 90%;
+        min-width: unset;
+    }
+}
+
+.login-methods {
+    display: flex;
+    justify-content: space-between;
+    margin-bottom: 20px;
+}
+
+.login-method {
+    padding: 10px 15px;
+    font-size: 16px;
+    cursor: pointer;
+    transition: all 0.3s;
+}
+
+.login-method.active {
+    background-color: #e6f0ff;
+    color: #007bff;
+}
+
+.login-form,
+.qrcode {
+    display: flex;
+    flex-direction: column;
+    gap: 15px;
+}
+
+.qrcode {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    gap: 15px;
+    text-align: center;
+}
+
+.sotheby-font {
+    font-family: Sotheby, Helvetica, monospace;
+    font-size: 3.125rem;
+    line-height: 1.2;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.footer {
+    text-align: center;
+    margin: 0;
+    font-size: 0.875rem;
+    color: #888;
+    position: fixed;
+    bottom: 20px;
+    left: 0;
+    right: 0;
+}
+</style>

napcat.webui/src/components/WebUiLogin.vue

@@ -0,0 +1,153 @@
+<template>
+    <t-card class="layout">
+        <div class="login-container">
+            <h2 class="sotheby-font">WebUi Login</h2>
+            <t-form ref="form" :data="formData" colon :label-width="0" @submit="onSubmit">
+                <t-form-item name="password">
+                    <t-input v-model="formData.token" type="password" clearable placeholder="请输入Token">
+                        <template #prefix-icon>
+                            <lock-on-icon />
+                        </template>
+                    </t-input>
+                </t-form-item>
+                <t-form-item>
+                    <t-button theme="primary" type="submit" block>登录</t-button>
+                </t-form-item>
+            </t-form>
+        </div>
+        <t-footer class="footer">Power By NapCat.WebUi</t-footer>
+    </t-card>
+</template>
+
+<script setup lang="ts">
+import '../css/style.css';
+import '../css/font.css';
+import { reactive, onMounted } from 'vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { LockOnIcon } from 'tdesign-icons-vue-next';
+import { useRouter } from 'vue-router';
+import { QQLoginManager } from '@/backend/shell';
+
+const router = useRouter();
+
+interface FormData {
+    token: string;
+}
+
+const formData: FormData = reactive({
+    token: '',
+});
+
+const handleLoginSuccess = async (credential: string) => {
+    localStorage.setItem('auth', credential);
+    await checkLoginStatus();
+};
+
+const handleLoginFailure = (message: string) => {
+    MessagePlugin.error(message);
+};
+
+const checkLoginStatus = async () => {
+    const storedCredential = localStorage.getItem('auth');
+    if (!storedCredential) {
+        return;
+    }
+    const loginManager = new QQLoginManager(storedCredential);
+    const isWenUiLoggedIn = await loginManager.checkWebUiLogined();
+    console.log('isWenUiLoggedIn', isWenUiLoggedIn);
+    if (!isWenUiLoggedIn) {
+        return;
+    }
+
+    const isQQLoggedIn = await loginManager.checkQQLoginStatus();
+    if (isQQLoggedIn) {
+        await router.push({ path: '/dashboard/basic-info' });
+    } else {
+        await router.push({ path: '/qqlogin' });
+    }
+};
+
+const loginWithToken = async (token: string) => {
+    const loginManager = new QQLoginManager('');
+    const credential = await loginManager.loginWithToken(token);
+    if (credential) {
+        await handleLoginSuccess(credential);
+    } else {
+        handleLoginFailure('登录失败，请检查Token');
+    }
+};
+
+onMounted(() => {
+    const url = new URL(window.location.href);
+    const token = url.searchParams.get('token');
+    if (token) {
+        loginWithToken(token);
+    }
+    checkLoginStatus();
+});
+
+const onSubmit = async ({ validateResult }: { validateResult: boolean }) => {
+    if (validateResult) {
+        await loginWithToken(formData.token);
+    } else {
+        handleLoginFailure('请填写Token');
+    }
+};
+</script>
+
+<style scoped>
+.layout {
+    height: 100vh;
+}
+.login-container {
+    padding: 20px;
+    border-radius: 5px;
+    max-width: 400px;
+    min-width: 300px;
+    position: relative;
+    margin: 50px auto;
+}
+
+@media (max-width: 600px) {
+    .login-container {
+        width: 90%;
+        min-width: unset;
+    }
+}
+
+.tdesign-demo-block-column {
+    display: flex;
+    flex-direction: column;
+    row-gap: 16px;
+}
+
+.tdesign-demo-block-column-large {
+    display: flex;
+    flex-direction: column;
+    row-gap: 32px;
+}
+
+.tdesign-demo-block-row {
+    display: flex;
+    column-gap: 16px;
+    align-items: center;
+}
+
+.sotheby-font {
+    font-family: Sotheby, Helvetica, monospace;
+    font-size: 3.125rem;
+    line-height: 1.2;
+    text-shadow: 0 1px 2px rgba(0, 0, 0, 0.1);
+}
+
+.footer {
+    text-align: center;
+    margin: 0;
+    font-size: 0.875rem;
+    color: #888;
+    position: fixed;
+    bottom: 20px;
+    left: 0;
+    right: 0;
+}
+</style>

napcat.webui/src/components/webui/Nav.vue

@@ -0,0 +1,127 @@
+<template>
+    <t-menu theme="light" default-value="2-1" :collapsed="collapsed" class="sidebar-menu">
+        <template #logo>
+            <div class="logo">
+                <img class="logo-img" :width="collapsed ? 35 : 'auto'" src="@/assets/logo_webui.png" alt="logo" />
+                <div class="logo-textBox">
+                    <div class="logo-text">{{ collapsed ? '' : 'NapCat' }}</div>
+                </div>
+            </div>
+        </template>
+        <router-link v-for="item in menuItems" :key="item.value" :to="item.route">
+            <t-tooltip :disabled="!collapsed" :content="item.label" placement="right">
+                <t-menu-item :value="item.value" :disabled="item.disabled" class="menu-item">
+                    <template #icon>
+                        <t-icon :name="item.icon" />
+                    </template>
+                    {{ item.label }}
+                </t-menu-item>
+            </t-tooltip>
+        </router-link>
+        <template #operations>
+            <t-button
+                :disabled="disBtn"
+                class="t-demo-collapse-btn"
+                variant="text"
+                shape="square"
+                @click="changeCollapsed"
+            >
+                <template #icon><t-icon :name="iconName" /></template>
+            </t-button>
+        </template>
+    </t-menu>
+</template>
+
+<script setup lang="ts">
+import { ref, defineProps, onMounted, watch } from 'vue';
+import emitter from '@/ts/event-bus';
+
+type MenuItem = {
+    value: string;
+    label: string;
+    route: string;
+    icon?: string;
+    disabled?: boolean;
+};
+
+defineProps<{
+    menuItems: MenuItem[];
+}>();
+const collapsed = ref<boolean>(localStorage.getItem('sidebar-collapsed') === 'true');
+const iconName = ref<string>(collapsed.value ? 'menu-unfold' : 'menu-fold');
+const disBtn = ref<boolean>(false);
+
+const changeCollapsed = (): void => {
+    collapsed.value = !collapsed.value;
+    iconName.value = collapsed.value ? 'menu-unfold' : 'menu-fold';
+    localStorage.setItem('sidebar-collapsed', collapsed.value.toString());
+};
+watch(collapsed, (newValue, oldValue) => {
+    setTimeout(() => {
+        emitter.emit('sendMenu', collapsed.value);
+    }, 300);
+});
+onMounted(() => {
+    const mediaQuery = window.matchMedia('(max-width: 800px)');
+    const handleMediaChange = (e: MediaQueryListEvent) => {
+        disBtn.value = e.matches;
+        if (e.matches) {
+            collapsed.value = e.matches;
+        }
+    };
+    mediaQuery.addEventListener('change', handleMediaChange);
+    const event = new Event('change');
+    Object.defineProperty(event, 'matches', {
+        value: mediaQuery.matches,
+        writable: false,
+    });
+    mediaQuery.dispatchEvent(event);
+    return () => {
+        mediaQuery.removeEventListener('change', handleMediaChange);
+    };
+});
+</script>
+
+<style scoped>
+.sidebar-menu {
+    position: fixed;
+    top: 0;
+    left: 0;
+    height: 100%;
+    width: 200px;
+    box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+}
+
+@media (max-width: 768px) {
+    .sidebar-menu {
+        width: 100px; /* 移动端侧边栏宽度 */
+    }
+}
+.logo {
+    display: flex;
+    width: auto;
+    height: 100%;
+}
+.logo-img {
+    object-fit: contain;
+    margin-top: 8px;
+    margin-bottom: 8px;
+}
+.logo-textBox {
+    display: flex;
+    align-items: center;
+    margin-left: 10px;
+}
+.logo-text {
+    display: block;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 22px;
+    font-family: Sotheby, Helvetica, monospace;
+}
+
+.menu-item {
+    margin-bottom: 10px;
+}
+</style>

napcat.webui/src/css/font.css

@@ -0,0 +1,6 @@
+@font-face {
+  font-family: 'Sotheby';
+  src: url('../assets/Sotheby.ttf') format('truetype');
+  font-weight: normal;
+  font-style: normal;
+}

napcat.webui/src/css/style.css

@@ -0,0 +1,84 @@
+:root {
+  font-family: Inter, system-ui, Avenir, Helvetica, Arial, sans-serif;
+  line-height: 1.5;
+  font-weight: 400;
+
+  color-scheme: light dark;
+  color: rgba(255, 255, 255, 0.87);
+  background-color: #242424;
+
+  font-synthesis: none;
+  text-rendering: optimizeLegibility;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+a {
+  font-weight: 500;
+  color: #646cff;
+  text-decoration: inherit;
+}
+
+a:hover {
+  color: #535bf2;
+}
+
+body {
+  margin: 0;
+  display: flex;
+  place-items: center;
+  min-width: 320px;
+  min-height: 100vh;
+}
+
+h1 {
+  font-size: 3.2em;
+  line-height: 1.1;
+}
+
+button {
+  border-radius: 8px;
+  border: 1px solid transparent;
+  padding: 0.6em 1.2em;
+  font-size: 1em;
+  font-weight: 500;
+  font-family: inherit;
+  background-color: #1a1a1a;
+  cursor: pointer;
+  transition: border-color 0.25s;
+}
+
+button:hover {
+  border-color: #646cff;
+}
+
+button:focus,
+button:focus-visible {
+  outline: 4px auto -webkit-focus-ring-color;
+}
+
+.card {
+  padding: 2em;
+}
+
+#app {
+  height: 100%;
+  width: 100%;
+  margin: 0;
+  text-align: center;
+}
+
+@media (prefers-color-scheme: light) {
+  :root {
+    color: #213547;
+    background-color: #ffffff;
+  }
+
+  a:hover {
+    color: #747bff;
+  }
+
+  button {
+    background-color: #f9f9f9;
+  }
+}

napcat.webui/src/main.ts

@@ -0,0 +1,87 @@
+import { createApp } from 'vue';
+import App from './App.vue';
+import {
+    Button as TButton,
+    Input as TInput,
+    Form as TForm,
+    FormItem as TFormItem,
+    Select as TSelect,
+    Option as TOption,
+    Menu as TMenu,
+    MenuItem as TMenuItem,
+    Icon as TIcon,
+    Submenu as TSubmenu,
+    Col as TCol,
+    Row as TRow,
+    Card as TCard,
+    Divider as TDivider,
+    Link as TLink,
+    List as TList,
+    Alert as TAlert,
+    Tag as TTag,
+    Descriptions as TDescriptionsProps,
+    DescriptionsItem as TDescriptionsItem,
+    Collapse as TCollapse,
+    CollapsePanel as TCollapsePanel,
+    ListItem as TListItem,
+    Tabs as TTabs,
+    TabPanel as TTabPanel,
+    Space as TSpace,
+    Checkbox as TCheckbox,
+    Popup as TPopup,
+    Dialog as TDialog,
+    Switch as TSwitch,
+    Tooltip as Tooltip,
+    StickyTool as TStickyTool,
+    StickyItem as TStickyItem,
+    Layout as TLayout,
+    Content as TContent,
+    Footer as TFooter,
+    Aside as TAside,
+    Popconfirm as Tpopconfirm,
+    Empty as TEmpty,
+} from 'tdesign-vue-next';
+import { router } from './router';
+import 'tdesign-vue-next/es/style/index.css';
+const app = createApp(App);
+app.use(router);
+app.use(TButton);
+app.use(TInput);
+app.use(TForm);
+app.use(TFormItem);
+app.use(TSelect);
+app.use(TOption);
+app.use(TMenu);
+app.use(TMenuItem);
+app.use(TIcon);
+app.use(TSubmenu);
+app.use(TCol);
+app.use(TRow);
+app.use(TCard);
+app.use(TDivider);
+app.use(TLink);
+app.use(TList);
+app.use(TAlert);
+app.use(TTag);
+app.use(TDescriptionsProps);
+app.use(TDescriptionsItem);
+app.use(TCollapse);
+app.use(TCollapsePanel);
+app.use(TListItem);
+app.use(TTabs);
+app.use(TTabPanel);
+app.use(TSpace);
+app.use(TCheckbox);
+app.use(TPopup);
+app.use(TDialog);
+app.use(TSwitch);
+app.use(Tooltip);
+app.use(TStickyTool);
+app.use(TStickyItem);
+app.use(TLayout);
+app.use(TContent);
+app.use(TFooter);
+app.use(TAside);
+app.use(Tpopconfirm);
+app.use(TEmpty);
+app.mount('#app');

napcat.webui/src/pages/AboutUs.vue

@@ -0,0 +1,66 @@
+<template>
+    <div class="about-us">
+        <div>
+            <t-divider content="面板关于信息" align="left" />
+            <t-alert theme="success" message="NapCat.WebUi is running" />
+            <t-list class="list">
+                <t-list-item class="list-item">
+                    <span class="item-label">开发人员:</span>
+                    <span class="item-content">
+                        <t-link href="mailto:nanaeonn@outlook.com">Mlikiowa</t-link>
+                    </span>
+                </t-list-item>
+                <t-list-item class="list-item">
+                    <span class="item-label">版本信息:</span>
+                    <span class="item-content">
+                        <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>
+        </div>
+    </div>
+</template>
+
+<script setup lang="ts">
+import pkg from '../../package.json';
+import { napCatVersion } from '../../../src/common/version';
+</script>
+
+<style scoped>
+.about-us {
+    padding: 20px;
+    text-align: left;
+}
+
+.list {
+    display: flex;
+    flex-direction: column;
+}
+
+.list-item {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
+.item-label {
+    flex: 1;
+    font-weight: bold;
+}
+
+.item-content {
+    flex: 2;
+    display: flex;
+    flex-wrap: wrap;
+    justify-content: flex-end;
+}
+
+.tag-item {
+    margin-right: 10px;
+    margin-bottom: 10px;
+}
+</style>

napcat.webui/src/pages/BasicInfo.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="basic-info">
+        <h1>面板基础信息</h1>
+        <p>这里显示面板的基础信息。</p>
+    </div>
+</template>

napcat.webui/src/pages/Log.vue

@@ -0,0 +1,6 @@
+<template>
+    <div class="log-view">
+        <h1>面板日志信息</h1>
+        <p>这里显示面板的日志信息。</p>
+    </div>
+</template>

napcat.webui/src/pages/NetWork.vue

@@ -0,0 +1,540 @@
+<template>
+    <div ref="headerBox" class="title">
+        <t-divider content="网络配置" align="left" />
+        <t-divider align="right">
+            <t-button @click="addConfig()">
+                <template #icon><add-icon /></template>
+                添加配置</t-button>
+        </t-divider>
+    </div>
+    <div v-if="loadPage" ref="setting" class="setting">
+        <t-tabs ref="tabsRef" :style="{ width: tabsWidth + 'px' }" default-value="all" @change="selectType">
+            <t-tab-panel value="all" label="全部"></t-tab-panel>
+            <t-tab-panel value="httpServers" label="HTTP 服务器"></t-tab-panel>
+            <t-tab-panel value="httpClients" label="HTTP 客户端"></t-tab-panel>
+            <t-tab-panel value="websocketServers" label="WebSocket 服务器"></t-tab-panel>
+            <t-tab-panel value="websocketClients" label="WebSocket 客户端"></t-tab-panel>
+        </t-tabs>
+    </div>
+    <div v-if="loadPage" class="card-box" :style="{ width: tabsWidth + 'px' }">
+        <div class="setting-box" :style="{ maxHeight: cardHeight + 'px' }" v-if="cardConfig.length > 0">
+            <div v-for="(item, index) in cardConfig" :key="index">
+                <t-card :title="item.name" :description="item.type" :style="{ width: cardWidth + 'px' }"
+                    :header-bordered="true" class="setting-card">
+                    <template #actions>
+                        <t-space>
+                            <edit2-icon size="20px" @click="editConfig(item)"></edit2-icon>
+                            <t-popconfirm theme="danger" content="确认删除" @confirm="delConfig(item)">
+                                <delete-icon size="20px"></delete-icon>
+                            </t-popconfirm>
+                        </t-space>
+                    </template>
+                    <div class="setting-content">
+                        <t-card class="card-address" :style="{
+                            borderLeft: '7px solid ' + (item.enable ?
+                                'var(--td-success-color)' :
+                                'var(--td-error-color)')
+                        }">
+                                <div class="local-box" v-if="item.host&&item.port">
+                                    <server-filled-icon class="local-icon" size="20px"></server-filled-icon>
+                                    <strong class="local">{{ item.host }}:{{ item.port }}</strong>
+                                    <copy-icon class="copy-icon"  size="20px" @click="copyText(item.host + ':' + item.port)"></copy-icon>
+                                </div>
+                                <div  class="local-box" v-if="item.url">
+                                    <server-filled-icon class="local-icon" size="20px"></server-filled-icon>
+                                    <strong  class="local" >{{ item.url }}</strong>
+                                    <copy-icon class="copy-icon"  size="20px" @click="copyText(item.url)"></copy-icon>
+                                </div>
+                        </t-card>
+                        <t-collapse :default-value="[0]" expand-mutex style="margin-top:10px;" class="info-coll">
+                            <t-collapse-panel header="基础信息">
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
+                                    class="setting-base-info">
+                                    <t-descriptions-item v-if="item.token" label="连接密钥">
+                                        <div v-if="mediumScreen.matches||largeScreen.matches" class="token-view">
+                                            <span>{{ showToken ? item.token : '******' }}</span>
+                                            <browse-icon class="browse-icon" v-if="showToken" size="18px"
+                                                @click="showToken = false"></browse-icon>
+                                            <browse-off-icon class="browse-icon" v-else size="18px"
+                                                @click="showToken = true"></browse-off-icon>
+                                        </div>
+                                        <div v-else>
+                                            <t-popup :showArrow="true" trigger="click">
+                                                <t-tag theme="primary">点击查看</t-tag>
+                                                <template #content>
+                                                    <div @click="copyText(item.token)">{{item.token}}</div>
+                                                </template>
+                                            </t-popup>
+                                        </div>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item label="消息格式">{{ item.messagePostFormat }}</t-descriptions-item>
+                                </t-descriptions>
+                            </t-collapse-panel>
+                            <t-collapse-panel header="状态信息">
+                                <t-descriptions size="small" :layout="infoOneCol ? 'vertical' : 'horizontal'"
+                                    class="setting-base-info">
+                                    <t-descriptions-item v-if="item.hasOwnProperty('debug')" label="调试日志">
+                                        <t-tag class="tag-item" :theme="item.debug ? 'success' : 'danger'">
+                                            {{ item.debug ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableWebsocket')"
+                                        label="Websocket 功能">
+                                        <t-tag class="tag-item" :theme="item.enableWebsocket ? 'success' : 'danger'">
+                                            {{ item.enableWebsocket ? '启用' : '禁用' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableCors')" label="跨域放行">
+                                        <t-tag class="tag-item" :theme="item.enableCors ? 'success' : 'danger'">
+                                            {{ item.enableCors ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="上报自身消息">
+                                        <t-tag class="tag-item" :theme="item.reportSelfMessage ? 'success' : 'danger'">
+                                            {{ item.reportSelfMessage ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                    <t-descriptions-item v-if="item.hasOwnProperty('enableForcePushEvent')"
+                                        label="强制推送事件">
+                                        <t-tag class="tag-item"
+                                            :theme="item.enableForcePushEvent ? 'success' : 'danger'">
+                                            {{ item.enableForcePushEvent ? '开启' : '关闭' }}</t-tag>
+                                    </t-descriptions-item>
+                                </t-descriptions>
+                            </t-collapse-panel>
+                        </t-collapse>
+                    </div>
+                </t-card>
+            </div>
+            <div style="height: 20vh"></div>
+        </div>
+        <t-card  v-else>
+            <t-empty class="card-none" title="暂无网络配置"> </t-empty>
+        </t-card>
+    </div>
+    <t-dialog v-model:visible="visibleBody" :header="dialogTitle" :destroy-on-close="true"
+        :show-in-attached-element="true" placement="center" :on-confirm="saveConfig" class=".t-dialog__ctx .t-dialog--defaul">
+        <div slot="body" class="dialog-body" >
+            <t-form ref="form" :data="newTab" labelAlign="left" :model="newTab">
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请输入名称', trigger: 'blur' }]"
+                    label="名称" name="name">
+                    <t-input v-model="newTab.name" />
+                </t-form-item>
+                <t-form-item style="text-align: left" :rules="[{ required: true, message: '请选择类型', trigger: 'change' }]"
+                    label="类型" name="type">
+                    <t-select v-model="newTab.type" @change="onloadDefault">
+                        <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>
+                <div>
+                    <component :is="resolveDynamicComponent(getComponent(newTab.type as ComponentKey))"
+                        :config="newTab.data" />
+                </div>
+            </t-form>
+        </div>
+    </t-dialog>
+</template>
+
+<script setup lang="ts">
+import { AddIcon, DeleteIcon, Edit2Icon, ServerFilledIcon, CopyIcon, BrowseOffIcon, BrowseIcon } from 'tdesign-icons-vue-next';
+import { onMounted, onUnmounted, ref, resolveDynamicComponent } from 'vue';
+import emitter from '@/ts/event-bus';
+import {
+    mergeNetworkDefaultConfig,
+    mergeOneBotConfigs,
+    NetworkConfig,
+    OneBotConfig,
+} from '../../../src/onebot/config/config';
+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 { MessagePlugin } from 'tdesign-vue-next';
+import { QQLoginManager } from '@/backend/shell';
+
+const showToken = ref<boolean>(false);
+const infoOneCol = ref<boolean>(true);
+const tabsWidth = ref<number>(0);
+const menuWidth = ref<number>(0);
+const cardWidth = ref<number>(0);
+const cardHeight = ref<number>(0);
+const mediumScreen = window.matchMedia('(min-width: 768px) and (max-width: 1024px)');
+const largeScreen = window.matchMedia('(min-width: 1025px)');
+const headerBox = ref<HTMLDivElement | null>(null);
+const setting = ref<HTMLDivElement | null>(null);
+const loadPage = ref<boolean>(false);
+const visibleBody = ref<boolean>(false);
+const newTab = ref<{ name: string; data: any; type: string }>({ name: '', data: {}, type: '' });
+const dialogTitle = ref<string>('');
+
+type ComponentKey = keyof typeof mergeNetworkDefaultConfig;
+
+const componentMap: Record<
+    ComponentKey,
+    | typeof HttpServerComponent
+    | typeof HttpClientComponent
+    | typeof WebsocketServerComponent
+    | typeof WebsocketClientComponent
+> = {
+    httpServers: HttpServerComponent,
+    httpClients: HttpClientComponent,
+    websocketServers: WebsocketServerComponent,
+    websocketClients: WebsocketClientComponent,
+};
+
+//操作类型
+const operateType = ref<string>('');
+//配置项索引
+const configIndex = ref<number>(0);
+//保存时所用数据
+const networkConfig: NetworkConfig & { [key: string]: any; } = {
+    websocketClients: [],
+    websocketServers: [],
+    httpClients: [],
+    httpServers: [],
+};
+
+//挂载的数据
+const WebConfg = ref(
+    new Map<string, Array<null>>([
+        ['all', []],
+        ['httpServers', []],
+        ['httpClients', []],
+        ['websocketServers', []],
+        ['websocketClients', []],
+    ])
+);
+const typeCh: Record<ComponentKey, string> = {
+    httpServers: 'HTTP 服务器',
+    httpClients: 'HTTP 客户端',
+    websocketServers: 'WebSocket 服务器',
+    websocketClients: 'WebSocket 客户端',
+};
+const cardConfig = ref<any>([]);
+const getComponent = (type: ComponentKey) => {
+    return componentMap[type];
+};
+const getKeyByValue = (obj: typeof typeCh, value: string): string | undefined => {
+    return Object.entries(obj).find(([_, v]) => v === value)?.[0];
+};
+
+const addConfig = () => {
+    dialogTitle.value = '添加配置';
+    newTab.value = { name: '', data: {}, type: '' };
+    operateType.value = 'add';
+    visibleBody.value = true;
+};
+
+const editConfig = (item: any) => {
+    dialogTitle.value = '修改配置';
+    const type = getKeyByValue(typeCh, item.type);
+    if (type) {
+        newTab.value = { name: item.name, data: item, type: type };
+    }
+    operateType.value = 'edit';
+    configIndex.value = networkConfig[newTab.value.type].findIndex((obj: any) => obj.name === item.name);
+    visibleBody.value = true;
+};
+const delConfig = (item: any) => {
+    const type = getKeyByValue(typeCh, item.type);
+    if (type) {
+        newTab.value = { name: item.name, data: item, type: type };
+    }
+    configIndex.value = configIndex.value = networkConfig[newTab.value.type].findIndex(
+        (obj: any) => obj.name === item.name
+    );
+    operateType.value = 'delete';
+    saveConfig();
+};
+
+const selectType = (key: ComponentKey) => {
+    cardConfig.value = WebConfg.value.get(key);
+};
+
+const onloadDefault = (key: ComponentKey) => {
+    console.log(key);
+    newTab.value.data = structuredClone(mergeNetworkDefaultConfig[key]);
+};
+//检测重名
+const checkName = (name: string) => {
+    const allConfigs = WebConfg.value.get('all')?.findIndex((obj: any) => obj.name === name);
+    if (newTab.value.name === '' || newTab.value.type === '') {
+        MessagePlugin.error('请填写完整信息');
+        return false;
+    } else if (allConfigs === -1 || newTab.value.data.name === name) {
+        return true;
+    } else {
+        MessagePlugin.error('名称已存在');
+        return false;
+    }
+};
+//保存
+const saveConfig = async () => {
+    if (operateType.value == 'add') {
+        if (!checkName(newTab.value.name)) return;
+        newTab.value.data.name = newTab.value.name;
+        networkConfig[newTab.value.type].push(newTab.value.data);
+    } else if (operateType.value == 'edit') {
+        if (!checkName(newTab.value.name)) return;
+        newTab.value.data.name = newTab.value.name;
+        networkConfig[newTab.value.type][configIndex.value] = newTab.value.data;
+    } else if (operateType.value == 'delete') {
+        networkConfig[newTab.value.type].splice(configIndex.value, 1);
+    }
+    const userConfig = await getOB11Config();
+    if (!userConfig) return;
+    userConfig.network = networkConfig;
+    const success = await setOB11Config(userConfig);
+    if (success) {
+        operateType.value = '';
+        configIndex.value = 0;
+        MessagePlugin.success('配置保存成功');
+        await loadConfig();
+        visibleBody.value = false;
+    } else {
+        MessagePlugin.error('配置保存失败');
+    }
+};
+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 getAllData = (data: NetworkConfig) => {
+    cardConfig.value = [];
+    WebConfg.value.set('all', []);
+    for (const key in data) {
+        const configs = data[key as keyof NetworkConfig];
+        if (key in mergeNetworkDefaultConfig) {
+            networkConfig[key] = [...configs];
+            const newConfigsArray = configs.map((config: any) => ({
+                ...config,
+                type: typeCh[key as ComponentKey],
+            }));
+            WebConfg.value.set(key, newConfigsArray);
+            const allConfigs = WebConfg.value.get('all');
+            if (allConfigs) {
+                const newAllConfigs = [...allConfigs, ...newConfigsArray];
+                WebConfg.value.set('all', newAllConfigs);
+            }
+            cardConfig.value = WebConfg.value.get('all');
+        }
+    }
+};
+
+const loadConfig = async () => {
+    try {
+        const userConfig = await getOB11Config();
+        if (!userConfig) return;
+        const mergedConfig = mergeOneBotConfigs(userConfig);
+        getAllData(mergedConfig.network);
+    } catch (error) {
+        console.error('Error loading config:', error);
+    }
+};
+
+const copyText = async (text: string) => {
+    const input = document.createElement('input');
+    input.value = text;
+    document.body.appendChild(input);
+    input.select();
+    await navigator.clipboard.writeText(text);
+    document.body.removeChild(input);
+    MessagePlugin.success('复制成功');
+};
+
+const handleResize = () => {
+    // 得根据卡片宽度改，懒得改了；先不管了
+    // if(window.innerWidth < 540) {
+    //     infoOneCol.value= true
+    // } else {
+    //     infoOneCol.value= false
+    // }
+    tabsWidth.value = window.innerWidth - 41 - menuWidth.value;
+    if (mediumScreen.matches) {
+        cardWidth.value = (tabsWidth.value - 20) / 2;
+    } else if (largeScreen.matches) {
+        cardWidth.value = (tabsWidth.value - 40) / 3;
+    } else {
+        cardWidth.value = tabsWidth.value;
+    }
+    loadPage.value = true;
+    setTimeout(() => {
+        cardHeight.value = window.innerHeight - (headerBox.value?.offsetHeight ?? 0) - (setting.value?.offsetHeight ?? 0) - 21;
+    }, 300);
+};
+emitter.on('sendWidth', (width) => {
+    if (typeof width === 'number' && !isNaN(width)) {
+        menuWidth.value = width;
+        handleResize();
+    }
+});
+onMounted(() => {
+    loadConfig();
+    const cachedWidth = localStorage.getItem('menuWidth');
+    if (cachedWidth) {
+        menuWidth.value = parseInt(cachedWidth);
+        setTimeout(() => {
+            handleResize();
+        }, 300);
+    }
+    window.addEventListener('resize', handleResize);
+});
+onUnmounted(() => {
+    window.removeEventListener('resize', handleResize);
+});
+</script>
+
+<style scoped>
+.title {
+    padding: 20px 20px 0 20px;
+    display: flex;
+    justify-content: space-between;
+}
+
+.setting {
+    margin: 0 20px;
+}
+
+.setting-box {
+    display: grid;
+    grid-template-columns: 1fr 1fr 1fr;
+    gap: 20px;
+    overflow-y: auto;
+}
+
+.setting-card {
+    width: 100%;
+    text-align: left;
+}
+
+.setting-content {
+    width: 100%;
+}
+
+.card-address svg {
+    fill: var(--td-brand-color);
+    cursor: pointer;
+}
+
+.local-box {
+    display: flex;
+    margin-top: 2px;
+}
+.local-icon{
+    flex: 1;
+}
+.local {
+    flex: 6;
+    margin: 0 10px 0 10px;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+
+
+.copy-icon {
+    flex: 1;
+    cursor: pointer;
+    flex-direction: row;
+}
+
+
+.token-view {
+    display: flex;
+    align-items: center;
+}
+
+.token-view span {
+    flex: 5;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+}
+.browse-icon{
+    flex: 2;
+}
+:global(.t-dialog__ctx .t-dialog--defaul) {
+    margin: 0 20px;
+}
+@media (max-width: 1024px) {
+    .setting-box {
+        grid-template-columns: 1fr 1fr;
+    }
+}
+
+@media (max-width: 786px) {
+    .setting-box {
+        grid-template-columns: 1fr;
+    }
+
+}
+
+.card-box {
+    margin: 10px 20px 0 20px;
+}
+
+.card-none {
+    line-height: 400px !important;
+}
+
+
+.dialog-body {
+    max-height: 60vh;
+    overflow-y: auto;
+}
+
+::-webkit-scrollbar {
+    width: 0;
+    background: transparent;
+}
+</style>
+<style>
+.setting-card .t-card__title {
+    text-align: left !important;
+}
+
+.setting-card .t-card__description {
+    margin-bottom: 0;
+    font-size: 12px;
+}
+
+.card-address .t-card__body {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+}
+
+.setting-base-info .t-descriptions__header {
+    font-size: 15px;
+    margin-bottom: 0;
+}
+
+.setting-base-info .t-descriptions__label {
+    padding: 0 var(--td-comp-paddingLR-l) !important;
+}
+
+.setting-base-info tr>td:last-child {
+    text-align: right;
+}
+
+.info-coll .t-collapse-panel__wrapper .t-collapse-panel__content {
+    padding: var(--td-comp-paddingTB-m) var(--td-comp-paddingLR-l);
+}
+</style>

napcat.webui/src/pages/OtherConfig.vue

@@ -0,0 +1,148 @@
+<template>
+    <div class="title">
+        <t-divider content="其余配置" align="left" />
+    </div>
+    <t-card class="card">
+        <div class="other-config-container">
+            <div class="other-config">
+                <t-form ref="form" :model="otherConfig" :label-align="labelAlign" label-width="auto" colon>
+                    <t-form-item label="音乐签名地址" name="musicSignUrl" class="form-item">
+                        <t-input v-model="otherConfig.musicSignUrl" />
+                    </t-form-item>
+                    <t-form-item label="启用本地文件到URL" name="enableLocalFile2Url" class="form-item">
+                        <t-switch v-model="otherConfig.enableLocalFile2Url" />
+                    </t-form-item>
+                    <t-form-item label="启用上报解析合并消息" name="parseMultMsg" class="form-item">
+                        <t-switch v-model="otherConfig.parseMultMsg" />
+                    </t-form-item>
+                </t-form>
+                <div class="button-container">
+                    <t-button @click="saveConfig">保存</t-button>
+                </div>
+            </div>
+        </div>
+    </t-card>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted } from 'vue';
+import { MessagePlugin } from 'tdesign-vue-next';
+import { OneBotConfig } from '../../../src/onebot/config/config';
+import { QQLoginManager } from '@/backend/shell';
+
+const otherConfig = ref<Partial<OneBotConfig>>({
+    musicSignUrl: '',
+    enableLocalFile2Url: false,
+    parseMultMsg: true
+});
+
+const labelAlign = ref<string>();
+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 loadConfig = async () => {
+    try {
+        const userConfig = await getOB11Config();
+        if (userConfig) {
+            otherConfig.value.musicSignUrl = userConfig.musicSignUrl;
+            otherConfig.value.enableLocalFile2Url = userConfig.enableLocalFile2Url;
+            otherConfig.value.parseMultMsg = userConfig.parseMultMsg;
+        }
+    } catch (error) {
+        console.error('Error loading config:', error);
+    }
+};
+
+const saveConfig = async () => {
+    try {
+        const userConfig = await getOB11Config();
+        if (userConfig) {
+            userConfig.musicSignUrl = otherConfig.value.musicSignUrl || '';
+            userConfig.enableLocalFile2Url = otherConfig.value.enableLocalFile2Url ?? false;
+            userConfig.parseMultMsg = otherConfig.value.parseMultMsg ?? true;
+            const success = await setOB11Config(userConfig);
+            if (success) {
+                MessagePlugin.success('配置保存成功');
+            } else {
+                MessagePlugin.error('配置保存失败');
+            }
+        }
+    } catch (error) {
+        console.error('Error saving config:', error);
+        MessagePlugin.error('配置保存失败');
+    }
+};
+onMounted(() => {
+    loadConfig();
+    const mediaQuery = window.matchMedia('(max-width: 768px)');
+    const handleMediaChange = (e: MediaQueryListEvent) => {
+        if (e.matches) {
+            labelAlign.value = 'top';
+        } else {
+            labelAlign.value = 'left';
+        }
+    };
+    mediaQuery.addEventListener('change', handleMediaChange);
+    const event = new Event('change');
+    Object.defineProperty(event, 'matches', {
+        value: mediaQuery.matches,
+        writable: false,
+    });
+    mediaQuery.dispatchEvent(event);
+    return () => {
+        mediaQuery.removeEventListener('change', handleMediaChange);
+    };
+});
+</script>
+
+<style scoped>
+.title {
+    padding: 20px 20px 0 20px;
+}
+.card {
+    margin: 0 20px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
+.other-config-container {
+    display: flex;
+    justify-content: center;
+    align-items: flex-start;
+    box-sizing: border-box;
+}
+
+.other-config {
+    width: 100%;
+    max-width: 500px;
+
+    border-radius: 8px;
+}
+
+.form-item {
+    margin-bottom: 20px;
+    text-align: left;
+}
+
+.button-container {
+    display: flex;
+    justify-content: center;
+    margin-top: 20px;
+}
+</style>

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

@@ -0,0 +1,49 @@
+<template>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="URL">
+                <t-input v-model="config.url" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="报告自身消息">
+                <t-checkbox v-model="config.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+        </t-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { HttpClientConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: HttpClientConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped></style>

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

@@ -0,0 +1,55 @@
+<template>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="端口">
+                <t-input v-model.number="config.port" type="number" />
+            </t-form-item>
+            <t-form-item label="主机">
+                <t-input v-model="config.host" type="text" />
+            </t-form-item>
+            <t-form-item label="启用 CORS">
+                <t-checkbox v-model="config.enableCors" />
+            </t-form-item>
+            <t-form-item label="启用 WS">
+                <t-checkbox v-model="config.enableWebsocket" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" type="text" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+        </t-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { HttpServerConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: HttpServerConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped></style>

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

@@ -0,0 +1,52 @@
+<template>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="URL">
+                <t-input v-model="config.url" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="报告自身消息">
+                <t-checkbox v-model="config.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+            <t-form-item label="心跳间隔">
+                <t-input v-model.number="config.heartInterval" type="number" />
+            </t-form-item>
+        </t-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { WebsocketClientConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: WebsocketClientConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped></style>

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

@@ -0,0 +1,58 @@
+<template>
+    <div>
+        <t-form labelAlign="left">
+            <t-form-item label="启用">
+                <t-checkbox v-model="config.enable" />
+            </t-form-item>
+            <t-form-item label="主机">
+                <t-input v-model="config.host" />
+            </t-form-item>
+            <t-form-item label="端口">
+                <t-input v-model.number="config.port" type="number" />
+            </t-form-item>
+            <t-form-item label="消息格式">
+                <t-select v-model="config.messagePostFormat" :options="messageFormatOptions" />
+            </t-form-item>
+            <t-form-item label="上报自身消息">
+                <t-checkbox v-model="config.reportSelfMessage" />
+            </t-form-item>
+            <t-form-item label="Token">
+                <t-input v-model="config.token" />
+            </t-form-item>
+            <t-form-item label="强制推送事件">
+                <t-checkbox v-model="config.enableForcePushEvent" />
+            </t-form-item>
+            <t-form-item label="调试模式">
+                <t-checkbox v-model="config.debug" />
+            </t-form-item>
+            <t-form-item label="心跳间隔">
+                <t-input v-model.number="config.heartInterval" type="number" />
+            </t-form-item>
+        </t-form>
+    </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, ref, watch } from 'vue';
+import { WebsocketServerConfig } from '../../../../src/onebot/config/config';
+
+const props = defineProps<{
+    config: WebsocketServerConfig;
+}>();
+
+const messageFormatOptions = ref([
+    { label: 'Array', value: 'array' },
+    { label: 'String', value: 'string' },
+]);
+
+watch(
+    () => props.config.messagePostFormat,
+    (newValue) => {
+        if (newValue !== 'array' && newValue !== 'string') {
+            props.config.messagePostFormat = 'array';
+        }
+    }
+);
+</script>
+
+<style scoped></style>

napcat.webui/src/router/index.ts

@@ -0,0 +1,32 @@
+import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
+import Dashboard from '../components/Dashboard.vue';
+import BasicInfo from '../pages/BasicInfo.vue';
+import AboutUs from '../pages/AboutUs.vue';
+import LogView from '../pages/Log.vue';
+import NetWork from '../pages/NetWork.vue';
+import QQLogin from '../components/QQLogin.vue';
+import WebUiLogin from '../components/WebUiLogin.vue';
+import OtherConfig from '../pages/OtherConfig.vue';
+
+const routes: Array<RouteRecordRaw> = [
+    { path: '/', redirect: '/webui' },
+    { path: '/webui', component: WebUiLogin, name: 'WebUiLogin' },
+    { path: '/qqlogin', component: QQLogin, name: 'QQLogin' },
+    {
+        path: '/dashboard',
+        component: Dashboard,
+        children: [
+            { path: '', redirect: 'basic-info' },
+            { path: 'basic-info', component: BasicInfo, name: 'BasicInfo' },
+            { path: 'network-config', component: NetWork, name: 'NetWork' },
+            { path: 'log-view', component: LogView, name: 'LogView' },
+            { path: 'other-config', component: OtherConfig, name: 'OtherConfig' },
+            { path: 'about-us', component: AboutUs, name: 'AboutUs' },
+        ],
+    },
+];
+
+export const router = createRouter({
+    history: createWebHashHistory(),
+    routes,
+});

napcat.webui/src/ts/event-bus.ts

@@ -0,0 +1,3 @@
+import mitt from 'mitt';
+const emitter = mitt();
+export default emitter;

napcat.webui/src/vite-env.d.ts

@@ -0,0 +1 @@
+/// <reference types="vite/client" />

napcat.webui/tsconfig.json

@@ -0,0 +1,34 @@
+{
+    "compilerOptions": {
+        "target": "ESNext",
+        "jsx": "preserve",
+        "jsxImportSource": "vue",
+        "lib": [
+            "DOM",
+            "DOM.Iterable"
+        ],
+        "baseUrl": ".",
+        "module": "esnext",
+        "moduleResolution": "bundler",
+        "paths": {
+            "@/*": [
+                "src/*"
+            ]
+        },
+        "resolveJsonModule": true,
+        "types": [
+            "vite/client"
+        ],
+        "strict": true,
+        "strictNullChecks": true,
+        "noUnusedLocals": true,
+        "esModuleInterop": true,
+        "forceConsistentCasingInFileNames": true,
+        "isolatedModules": true,
+        "experimentalDecorators": true,
+        "useDefineForClassFields": true
+    },
+    "include": ["src"],
+    "exclude": ["node_modules"],
+    "references": [{"path": "./tsconfig.node.json"}]
+}

napcat.webui/tsconfig.node.json

@@ -0,0 +1,11 @@
+{
+    "compilerOptions": {
+        "composite": true,
+        "skipLibCheck": true,
+        "module": "ESNext",
+        "moduleResolution": "bundler",
+        "allowSyntheticDefaultImports": true,
+        "strictNullChecks": true
+    },
+    "include": ["vite.config.ts"]
+}

napcat.webui/vite.config.ts

@@ -0,0 +1,41 @@
+import { defineConfig } from 'vite';
+import vue from '@vitejs/plugin-vue';
+import legacy from '@vitejs/plugin-legacy';
+import path from 'path';
+
+// https://vite.dev/config/
+export default defineConfig({
+    plugins: [
+        vue(),
+        legacy({
+            targets: ['defaults', 'not IE 11'],
+            modernPolyfills: ['web.structured-clone'],
+        }),
+    ],
+    base: './',
+    resolve: {
+        alias: {
+            '@': path.resolve(__dirname, 'src'),
+        },
+    },
+    server: {
+        proxy: {
+            '/api': 'http://localhost:6099',
+        },
+    },
+    build: {
+        chunkSizeWarningLimit: 4000,
+        rollupOptions: {
+            output: {
+                chunkFileNames: 'static/js/[name]-[hash].js',
+                entryFileNames: 'static/js/[name]-[hash].js',
+                assetFileNames: 'static/[ext]/[name]-[hash].[ext]',
+                manualChunks(id: string) {
+                    if (id.includes('node_modules')) {
+                        return id.toString().split('node_modules/')[1].split('/')[0].toString();
+                    }
+                },
+            },
+        },
+    },
+});

package.json

@@ -1,65 +1,60 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "2.2.41",
-  "scripts": {
-    "build:framework": "vite build --mode framework",
-    "build:shell": "vite build --mode shell",
-    "build:webui": "cd ./src/webui && vite build",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@babel/core": "^7.24.7",
-    "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
-    "@log4js-node/log4js-api": "^1.0.2",
-    "@protobuf-ts/plugin": "^2.9.4",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/jest": "^29.5.12",
-    "@types/node": "^22.0.1",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.5.12",
-    "@typescript-eslint/eslint-plugin": "^8.3.0",
-    "@typescript-eslint/parser": "^8.3.0",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "rollup": "^4.13.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-obfuscator": "^1.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.6",
-    "vite-plugin-babel": "^1.2.0",
-    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "ajv": "^8.13.0",
-    "async-mutex": "^0.5.0",
-    "chalk": "^5.3.0",
-    "commander": "^12.1.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "json-schema-to-ts": "^3.1.0",
-    "log4js": "^6.9.1",
-    "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.6.1",
-    "strtok3": "8.0.1",
-    "ws": "^8.18.0"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "4.2.5",
+  "scripts": {
+    "build:framework": "npm run build:webui && vite build --mode framework || exit 1",
+    "build:shell": "npm run build:webui && vite build --mode shell || exit 1",
+    "build:webui": "cd napcat.webui && vite build",
+    "dev:framework": "vite build --mode framework",
+    "dev:shell": "vite build --mode shell",
+    "dev:webui": "cd napcat.webui && npm run webui:dev",
+    "lint": "eslint --fix src/**/*.{js,ts,vue}",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@babel/preset-typescript": "^7.24.7",
+    "@eslint/compat": "^1.2.2",
+    "@eslint/eslintrc": "^3.1.0",
+    "@eslint/js": "^9.14.0",
+    "@log4js-node/log4js-api": "^1.0.2",
+    "@napneko/nap-proto-core": "^0.0.4",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/node": "^22.0.1",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.5.12",
+    "@typescript-eslint/eslint-plugin": "^8.3.0",
+    "@typescript-eslint/parser": "^8.3.0",
+    "ajv": "^8.13.0",
+    "async-mutex": "^0.5.0",
+    "commander": "^12.1.0",
+    "cors": "^2.8.5",
+    "eslint": "^9.14.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "fast-xml-parser": "^4.3.6",
+    "file-type": "^19.0.0",
+    "globals": "^15.12.0",
+    "image-size": "^1.1.1",
+    "json-schema-to-ts": "^3.1.1",
+    "typescript": "^5.3.3",
+    "typescript-eslint": "^8.13.0",
+    "vite": "^6.0.1",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-tsconfig-paths": "^5.1.0",
+    "winston": "^3.17.0"
+  },
+  "dependencies": {
+    "express": "^5.0.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "piscina": "^4.7.0",
+    "qrcode-terminal": "^0.12.0",
+    "silk-wasm": "^3.6.1",
+    "ws": "^8.18.0"
+  }
+}

script/BootWay.03.ps1

@@ -1,45 +0,0 @@
-# Dont Use This Script
-# 2024.7.3
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "get QQ path error: $_"
-    }
-}
-function Select-QQPath {
-    Add-Type -AssemblyName System.Windows.Forms
-    [System.Windows.Forms.Application]::EnableVisualStyles()
-
-    $dialogTitle = "Select QQ.exe"
-
-    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
-    $filePicker.Title = $dialogTitle
-    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
-    $filePicker.FilterIndex = 1
-    $null = $filePicker.ShowDialog()
-    if (-not ($filePicker.FileName)) {
-        throw "User did not select an .exe file."
-    }
-    return $filePicker.FileName
-}
-
-$params = $args -join " "
-Try {
-    $QQpath = Get-QQpath
-}
-Catch {
-    $QQpath = Select-QQPath
-}
-
-if (!(Test-Path $QQpath)) {
-    throw "provided QQ path is invalid: $QQpath"
-}
-
-$Bootfile = Join-Path $PSScriptRoot "napcat.mjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-$commandInfo = Get-Command $QQpath -ErrorAction Stop
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging }"

script/BootWay05.bat

@@ -1,90 +0,0 @@
-@echo off
-REM 检查当前会话是否具有管理员权限
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM 如果不是管理员，则重新启动脚本以管理员模式运行
-    echo 请求管理员权限...
-    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
-    exit /b
-)
-
-REM 设置当前工作目录
-cd /d %~dp0
-
-REM 获取当前目录路径
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM 生成JavaScript代码
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM 将JavaScript代码保存到文件中
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM 获取QQ路径
-
-
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set RetString=%%b
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in (%RetString%) do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-
-REM 拿不到QQ路径则退出
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM 收集dbghelp.dll路径和HASH信息
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM 如果文件一致则跳过
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM 文件占用则退出
-        echo dbghelp.dll is in use, cannot continue.
-    ) else (
-        REM 文件未占用则尝试覆盖
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Failed to copy dbghelp.dll
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been copied to %QQdir%
-        )
-    )
-)
-
-REM 带参数启动QQ
-REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
-REM %QQPath% --enable-logging  %*
-where wt >nul 2>nul
-if %errorlevel% equ 0 (
-    wt "cmd" /c "%QQPath%" --enable-logging  %* 
-) else (
-    "%QQPath%" --enable-logging  %*
-)

script/BootWay05.ps1

@@ -1,123 +0,0 @@
-# 检查当前会话是否具有管理员权限
-function Test-Administrator {
-    $user = [Security.Principal.WindowsIdentity]::GetCurrent()
-    (New-Object Security.Principal.WindowsPrincipal $user).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator)
-}
-
-if (-not (Test-Administrator)) {
-    # 如果不是管理员，则重新启动脚本以管理员模式运行
-    $scriptPath = $myInvocation.MyCommand.Path
-    if (-not $scriptPath) {
-        $scriptPath = $PSCommandPath
-    }
-    $newProcess = New-Object System.Diagnostics.ProcessStartInfo "powershell";
-    $newProcess.Arguments = "-File `"$scriptPath`" $args"
-    $newProcess.Verb = "runas";
-    [System.Diagnostics.Process]::Start($newProcess);
-    exit
-}
-
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "get QQ path error: $_"
-    }
-}
-function Select-QQPath {
-    Add-Type -AssemblyName System.Windows.Forms
-    [System.Windows.Forms.Application]::EnableVisualStyles()
-
-    $dialogTitle = "Select QQ.exe"
-
-    $filePicker = New-Object System.Windows.Forms.OpenFileDialog
-    $filePicker.Title = $dialogTitle
-    $filePicker.Filter = "Executable Files (*.exe)|*.exe|All Files (*.*)|*.*"
-    $filePicker.FilterIndex = 1
-    $null = $filePicker.ShowDialog()
-    if (-not ($filePicker.FileName)) {
-        throw "User did not select an .exe file."
-    }
-    return $filePicker.FileName
-}
-
-# 设置当前工作目录
-$scriptDirectory = Split-Path -Path $MyInvocation.MyCommand.Definition -Parent
-Set-Location $scriptDirectory
-
-# 获取当前目录路径
-$currentPath = Get-Location
-
-# 替换\为/
-$currentPath = $currentPath -replace '\\', '/'
-
-# 生成JavaScript代码
-$jsCode = @"
-(async () => {
-    await import('file:///$currentPath/napcat.mjs');
-})();
-"@
-
-# 将JavaScript代码保存到文件中
-$jsFilePath = Join-Path $currentPath "loadScript.js"
-$jsCode | Out-File -FilePath $jsFilePath -Encoding UTF8
-
-Write-Output "JavaScript code has been generated and saved to $jsFilePath"
-# 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-$env:NAPCAT_PATH = $jsFilePath
-
-$params = $args -join " "
-Try {
-    $QQpath = Get-QQpath
-}
-Catch {
-    $QQpath = Select-QQPath
-}
-# 拿不到QQ路径则退出
-if (!(Test-Path $QQpath)) {
-    Write-Output "provided QQ path is invalid: $QQpath"
-    Read-Host "Press any key to continue..."
-    exit
-}
-
-$commandInfo = Get-Command $QQpath -ErrorAction Stop
-
-# 收集dbghelp.dll路径和HASH信息
-$QQpath = Split-Path $QQpath
-$oldDllPath = Join-Path $QQpath "dbghelp.dll"
-$oldDllHash = Get-FileHash $oldDllPath -Algorithm MD5
-$newDllPath = Join-Path $currentPath "dbghelp.dll"
-$newDllHash = Get-FileHash $newDllPath -Algorithm MD5
-# 如果文件一致则跳过
-if ($oldDllHash.Hash -ne $newDllHash.Hash) {
-    $processes = Get-Process -Name QQ -ErrorAction SilentlyContinue
-    if ($processes) {
-        # 文件占用则退出
-        Write-Output "dbghelp.dll is in use by the following processes:"
-        $processes | ForEach-Object { Write-Output "$($_.Id) $($_.Name) $($_.Path)" }
-        Write-Output "dbghelp.dll is in use, cannot continue."
-        Read-Host "Press any key to continue..."
-        exit
-    } else {
-        # 文件未占用则尝试覆盖
-        try {
-            Copy-Item -Path "$newDllPath" -Destination "$oldDllPath" -Force
-            Write-Output "dbghelp.dll has been copied to $QQpath"
-        } catch {
-            Write-Output "Failed to copy dbghelp.dll: $_"
-            Read-Host "Press any key to continue..."
-            exit
-        }
-    }
-}
-
-# 带参数启动QQ
-try {
-    Start-Process powershell -ArgumentList '-noexit', '-noprofile', "-command &{& chcp 65001;& '$($commandInfo.Path)' --enable-logging $params}" -NoNewWindow -ErrorAction Stop
-} catch {
-    Write-Output "Failed to start process as administrator: $_"
-    Read-Host "Press any key to continue..."
-}

script/BootWay05.utf8.bat

@@ -1,93 +0,0 @@
-@echo off
-REM 检查当前会话是否具有管理员权限
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM 如果不是管理员，则重新启动脚本以管理员模式运行
-    echo 请求管理员权限...
-    where wt >nul 2>nul
-    if %errorlevel% equ 0 (
-        powershell -Command "Start-Process cmd -ArgumentList ' /c %~f0 %*' -Verb RunAs"
-    ) else (
-        powershell -Command "Start-Process wt -ArgumentList 'cmd /c %~f0 %*' -Verb RunAs"
-    )
-
-    REM wt "cmd" /c  "%~f0 %*"
-    exit /b
-)
-
-REM 设置当前工作目录
-cd /d %~dp0
-
-REM 获取当前目录路径
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM 生成JavaScript代码
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM 将JavaScript代码保存到文件中
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM 设置NAPCAT_PATH环境变量为 当前目录的loadScript.js地址
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM 获取QQ路径
-
-
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set RetString=%%b
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in (%RetString%) do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-
-REM 拿不到QQ路径则退出
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM 收集dbghelp.dll路径和HASH信息
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM 如果文件一致则跳过
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM 文件占用则退出
-        echo dbghelp.dll is in use, cannot continue.
-    ) else (
-        REM 文件未占用则尝试覆盖
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Failed to copy dbghelp.dll
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been copied to %QQdir%
-        )
-    )
-)
-
-REM 带参数启动QQ
-REM 判断wt是否存在，存在则通过wt启动，不存在则通过cmd启动
-REM %QQPath% --enable-logging  %*
-chcp 65001
-"%QQPath%" --enable-logging  %*

script/BootWay05_init.bat

@@ -1,77 +0,0 @@
-@echo off
-REM Check if the script is running as administrator
-openfiles >nul 2>&1
-if %errorlevel% neq 0 (
-    REM If not, restart the script in administrator mode
-    echo Requesting administrator privileges...
-    powershell -Command "Start-Process cmd -ArgumentList '/c %~f0 %*' -Verb RunAs"
-    exit /b
-)
-
-cd /d %~dp0
-
-set currentPath=%cd%
-set currentPath=%currentPath:\=/%
-
-REM Generate JavaScript code
-set "jsCode=(async () =^>await import('file:///%currentPath%/napcat.mjs'))();"
-
-REM Save JavaScript code to a file
-echo %jsCode% > loadScript.js
-echo JavaScript code has been generated and saved to loadScript.js
-
-REM Set NAPCAT_PATH environment variable to the address of loadScript.js in the current directory
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Get QQ path and cache it
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set "RetString=%%b"
-)
-
-set "pathWithoutUninstall=%RetString:Uninstall.exe=%"
-
-SET QQPath=%pathWithoutUninstall%QQ.exe
-echo %QQPath%>qq_path_cache.txt
-echo QQ path %QQPath% has been cached to qq_path_cache.txt
-
-REM Exit if QQ path is invalid
-if not exist "%QQpath%" (
-    echo provided QQ path is invalid: %QQpath%
-    pause
-    exit /b
-)
-
-REM Collect dbghelp.dll path and HASH information
-set QQdir=%~dp0
-set oldDllPath=%QQdir%dbghelp.dll
-set newDllPath=%currentPath%\dbghelp.dll
-
-for /f "tokens=*" %%A in ('certutil -hashfile "%oldDllPath%" MD5') do (
-    if not defined oldDllHash set oldDllHash=%%A
-)
-for /f "tokens=*" %%A in ('certutil -hashfile "%newDllPath%" MD5') do (
-    if not defined newDllHash set newDllHash=%%A
-)
-
-REM Compare the HASH of the old and new dbghelp.dll, and replace the old one if they are different
-if "%oldDllHash%" neq "%newDllHash%" (
-    tasklist /fi "imagename eq QQ.exe" 2>nul | find /i "QQ.exe" >nul
-    if %errorlevel% equ 0 (
-        REM If the file is in use, prompt the user to close QQ
-        echo dbghelp.dll is in use, please close QQ first.
-    ) else (
-        copy /y "%newDllPath%" "%oldDllPath%"
-        if %errorlevel% neq 0 (
-            echo Copy dbghelp.dll failed, please check and try again.
-            pause
-            exit /b
-        ) else (
-            echo dbghelp.dll has been updated.
-            echo Please run BootWay05_run.bat to start QQ.
-            echo If you update QQ in the future, please run BootWay05_init.bat again.
-            pause
-            exit /b
-        )
-    )
-)

script/BootWay05_run.bat

@@ -1,10 +0,0 @@
-@echo off
-set /p QQPath=<qq_path_cache.txt
-echo QQ path %QQPath% has been read from qq_path_cache.txt
-echo If failed to start QQ, please try running this script in administrator mode.
-
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Launch QQ.exe with params provided
-
-"%QQPath%" --enable-logging  %*

script/BootWay05_run.utf8.bat

@@ -1,13 +0,0 @@
-@echo off
-
-chcp 65001
-
-set /p QQPath=<qq_path_cache.txt
-echo QQ path %QQPath% has been read from qq_path_cache.txt
-echo If failed to start QQ, please try running this script in administrator mode.
-
-set NAPCAT_PATH=%cd%\loadScript.js
-
-REM Launch QQ.exe with params provided
-
-"%QQPath%" --enable-logging  %*

script/checkVersion.cjs

@@ -4,16 +4,27 @@ const process = require("process");
 console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
 try {
   const packageJson = require("../package.json");
+  const manifsetJson = require("../manifest.json");
+
   const currentVersion = packageJson.version;
   const targetVersion = process.env.VERSION;
 
+  const manifestCurrentVersion = manifsetJson.version;
+  const manifestTargetVersion = process.env.VERSION;
+
   console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
+  console.log("[NapCat] [CheckVersion] manifestCurrentVersion:", manifestCurrentVersion, "manifestTargetVersion:", manifestTargetVersion);
 
   // 验证 targetVersion 格式
   if (!targetVersion || typeof targetVersion !== 'string') {
     console.log("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
     return;
   }
+  // 验证 manifestTargetVersion 格式
+  if (!manifestTargetVersion || typeof manifestTargetVersion !== 'string') {
+    console.log("[NapCat] [CheckVersion] manifest目标版本格式不正确或未设置！");
+    return;
+  }
 
   // 写入脚本文件的统一函数
   const writeScriptToFile = (content) => {
@@ -21,7 +32,7 @@ try {
     console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
   };
 
-  if (currentVersion === targetVersion) {
+  if (currentVersion === targetVersion && manifestCurrentVersion === manifestTargetVersion) {
     // 不需要更新版本，写入一个简单的脚本
     const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
     writeScriptToFile(simpleScript);
@@ -29,11 +40,13 @@ try {
     // 更新版本，构建安全的sed命令
     const safeScriptContent = `
     #!/bin/bash
-    git config --global user.email "bot@test.wumiao.wang"
-    git config --global user.name "Version"
-    sed -i "s/\\\"version\\\": \\\"${currentVersion}\\\"/\\\"version\\\": \\\"${targetVersion}\\\"/g" package.json
+    git config --global user.email "nanaeonn@outlook.com"
+    git config --global user.name "Mlikiowa"
+    sed -i "s/\\"version\\": \\"${currentVersion}\\"/\\"version\\": \\"${targetVersion}\\"/g" package.json
+    sed -i "s/\\"version\\": \\"${manifestCurrentVersion}\\"/\\"version\\": \\"${targetVersion}\\"/g" manifest.json
+    sed -i "s/napCatVersion = '.*'/napCatVersion = '${targetVersion}'/g" ./src/common/version.ts
     git add .
-    git commit -m "chore:version change"
+    git commit -m "release: v${targetVersion}"
     git push -u origin main`;
     writeScriptToFile(safeScriptContent);
   }

src/common/audio-worker.ts

@@ -0,0 +1,9 @@
+import { encode } from "silk-wasm";
+
+export interface EncodeArgs {
+    input: ArrayBufferView | ArrayBuffer
+    sampleRate: number
+}
+export default async ({ input, sampleRate }: EncodeArgs) => {
+    return await encode(input, sampleRate);
+};

src/common/audio.ts

@@ -1,66 +1,80 @@
-import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
+import Piscina from 'piscina';
 import fsPromise from 'fs/promises';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
 import { spawn } from 'node:child_process';
-import { LogWrapper } from './log';
+import { EncodeResult, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
+import { LogWrapper } from '@/common/log';
+import { EncodeArgs } from "@/common/audio-worker";
+
+const ALLOW_SAMPLE_RATE = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
+const EXIT_CODES = [0, 255];
+const FFMPEG_PATH = process.env.FFMPEG_PATH ?? 'ffmpeg';
+
+async function getWorkerPath() {
+    return new URL(/* @vite-ignore */ './audio-worker.mjs', import.meta.url).href;
+}
+
+const piscina = new Piscina<EncodeArgs, EncodeResult>({
+    filename: await getWorkerPath(),
+});
+
+async function guessDuration(pttPath: string, logger: LogWrapper) {
+    const pttFileInfo = await fsPromise.stat(pttPath);
+    const duration = Math.max(1, Math.floor(pttFileInfo.size / 1024 / 3));  // 3kb/s
+    logger.log('通过文件大小估算语音的时长:', duration);
+    return duration;
+}
+
+async function convert(filePath: string, pcmPath: string, logger: LogWrapper): Promise<Buffer> {
+    return new Promise<Buffer>((resolve, reject) => {
+        const cp = spawn(FFMPEG_PATH, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
+        cp.on('error', (err: Error) => {
+            logger.log('FFmpeg处理转换出错: ', err.message);
+            reject(err);
+        });
+        cp.on('exit', async (code, signal) => {
+            if (code == null || EXIT_CODES.includes(code)) {
+                try {
+                    const data = await fsPromise.readFile(pcmPath);
+                    await fsPromise.unlink(pcmPath);
+                    resolve(data);
+                } catch (err) {
+                    reject(err);
+                }
+            } else {
+                logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
+                reject(new Error('FFmpeg处理转换失败'));
+            }
+        });
+    });
+}
+
+async function handleWavFile(
+    file: Buffer,
+    filePath: string,
+    pcmPath: string,
+    logger: LogWrapper
+): Promise<{ input: Buffer; sampleRate: number }> {
+    const { fmt } = getWavFileInfo(file);
+    if (!ALLOW_SAMPLE_RATE.includes(fmt.sampleRate)) {
+        return { input: await convert(filePath, pcmPath, logger), sampleRate: 24000 };
+    }
+    return { input: file, sampleRate: fmt.sampleRate };
+}
 
 export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
-    async function guessDuration(pttPath: string) {
-        const pttFileInfo = await fsPromise.stat(pttPath);
-        let duration = pttFileInfo.size / 1024 / 3;  // 3kb/s
-        duration = Math.floor(duration);
-        duration = Math.max(1, duration);
-        logger.log('通过文件大小估算语音的时长:', duration);
-        return duration;
-    }
-
     try {
         const file = await fsPromise.readFile(filePath);
         const pttPath = path.join(TEMP_DIR, randomUUID());
         if (!isSilk(file)) {
             logger.log(`语音文件${filePath}需要转换成silk`);
-            const _isWav = isWav(file);
-            const pcmPath = pttPath + '.pcm';
-            let sampleRate = 0;
-            const convert = () => {
-                return new Promise<Buffer>((resolve, reject) => {
-                    // todo: 通过配置文件获取ffmpeg路径
-                    const ffmpegPath = process.env.FFMPEG_PATH || 'ffmpeg';
-                    const cp = spawn(ffmpegPath, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
-                    cp.on('error', err => {
-                        logger.log('FFmpeg处理转换出错: ', err.message);
-                        return reject(err);
-                    });
-                    cp.on('exit', (code, signal) => {
-                        const EXIT_CODES = [0, 255];
-                        if (code == null || EXIT_CODES.includes(code)) {
-                            sampleRate = 24000;
-                            const data = fs.readFileSync(pcmPath);
-                            fs.unlink(pcmPath, (err) => {
-                            });
-                            return resolve(data);
-                        }
-                        logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
-                        reject(Error('FFmpeg处理转换失败'));
-                    });
-                });
-            };
-            let input: Buffer;
-            if (!_isWav) {
-                input = await convert();
-            } else {
-                input = file;
-                const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
-                const { fmt } = getWavFileInfo(input);
-                // log(`wav文件信息`, fmt)
-                if (!allowSampleRate.includes(fmt.sampleRate)) {
-                    input = await convert();
-                }
-            }
-            const silk = await encode(input, sampleRate);
-            fs.writeFileSync(pttPath, silk.data);
+            const pcmPath = `${pttPath}.pcm`;
+            const { input, sampleRate } = isWav(file)
+                ? (await handleWavFile(file, filePath, pcmPath, logger))
+                : { input: await convert(filePath, pcmPath, logger), sampleRate: 24000 };
+            const silk = await piscina.run({ input: input, sampleRate: sampleRate });
+            await fsPromise.writeFile(pttPath, Buffer.from(silk.data));
             logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
             return {
                 converted: true,
@@ -68,15 +82,13 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
                 duration: silk.duration / 1000,
             };
         } else {
-            const silk = file;
             let duration = 0;
             try {
-                duration = getDuration(silk) / 1000;
+                duration = getDuration(file) / 1000;
             } catch (e: any) {
                 logger.log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack);
-                duration = await guessDuration(filePath);
+                duration = await guessDuration(filePath, logger);
             }
-
             return {
                 converted: false,
                 path: filePath,
@@ -84,7 +96,7 @@ export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: Log
             };
         }
     } catch (error: any) {
-        logger.logError('convert silk failed', error.stack);
+        logger.logError.bind(logger)('convert silk failed', error.stack);
         return {};
     }
 }

src/common/config-base.ts

@@ -8,12 +8,12 @@ export abstract class ConfigBase<T> {
     configPath: string;
     configData: T = {} as T;
 
-    protected constructor(name: string, core: NapCatCore, configPath: string) {
+    protected constructor(name: string, core: NapCatCore, configPath: string, copy_default: boolean = true) {
         this.name = name;
         this.core = core;
         this.configPath = configPath;
         fs.mkdirSync(this.configPath, { recursive: true });
-        this.read();
+        this.read(copy_default);
     }
 
     protected getKeys(): string[] | null {
@@ -22,21 +22,28 @@ export abstract class ConfigBase<T> {
     }
 
     getConfigPath(pathName: string | undefined): string {
-        const suffix = pathName ? `_${pathName}` : '';
-        const filename = `${this.name}${suffix}.json`;
-        return path.join(this.configPath, filename);
+        if (!pathName) {
+            const filename = `${this.name}.json`;
+            const mainPath = this.core.context.pathWrapper.binaryPath;
+            return path.join(mainPath, 'config', filename);
+        } else {
+            const filename = `${this.name}_${pathName}.json`;
+            return path.join(this.configPath, filename);
+        }
     }
 
-    read(): T {
+    read(copy_default: boolean = true): T {
         const logger = this.core.context.logger;
         const configPath = this.getConfigPath(this.core.selfInfo.uin);
-        if (!fs.existsSync(configPath)) {
+        if (!fs.existsSync(configPath) && copy_default) {
             try {
                 fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
                 logger.log(`[Core] [Config] 配置文件创建成功!\n`);
             } catch (e: any) {
-                logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
             }
+        } else if (!fs.existsSync(configPath) && !copy_default) {
+            fs.writeFileSync(configPath, '{}');
         }
         try {
             this.configData = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
@@ -44,9 +51,9 @@ export abstract class ConfigBase<T> {
             return this.configData;
         } catch (e: any) {
             if (e instanceof SyntaxError) {
-                logger.logError(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
             } else {
-                logger.logError(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
+                logger.logError.bind(logger)(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
             }
             return {} as T;
         }
@@ -61,7 +68,7 @@ export abstract class ConfigBase<T> {
         try {
             fs.writeFileSync(configPath, JSON.stringify(newConfigData, this.getKeys(), 2));
         } catch (e: any) {
-            logger.logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+            logger.logError.bind(logger)(`保存配置文件 ${configPath} 时发生错误:`, e.message);
         }
     }
 }

src/common/event-v2.ts

@@ -1,133 +0,0 @@
-import type { NodeIQQNTWrapperSession, WrapperNodeApi } from '@/core/wrapper';
-import EventEmitter from 'node:events';
-
-export type ListenerClassBase = Record<string, string>;
-
-export interface ListenerIBase {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(listener: any): ListenerClassBase;
-
-    [key: string]: any;
-}
-
-export class NTEventWrapperV2 extends EventEmitter {
-    private wrapperApi: WrapperNodeApi;
-    private wrapperSession: NodeIQQNTWrapperSession;
-    private listenerRefStorage = new Map<string, ListenerIBase>();
-
-    constructor(WrapperApi: WrapperNodeApi, WrapperSession: NodeIQQNTWrapperSession) {
-        super();
-        this.on('error', () => {
-        });
-        this.wrapperApi = WrapperApi;
-        this.wrapperSession = WrapperSession;
-    }
-
-    dispatcherListener(ListenerEvent: string, ...args: any[]) {
-        this.emit(ListenerEvent, ...args);
-    }
-
-    createProxyDispatch(ListenerMainName: string) {
-        const dispatcherListener = this.dispatcherListener.bind(this);
-        return new Proxy({}, {
-            get(_target: any, prop: any, _receiver: any) {
-                return (...args: any[]) => {
-                    dispatcherListener(ListenerMainName + '/' + prop, ...args);
-                };
-            },
-        });
-    }
-
-    async getOrInitListener<T>(listenerMainName: string): Promise<T> {
-        const ListenerType = this.wrapperApi[listenerMainName];
-        //获取NTQQ 外部 Listener包装
-        if (!ListenerType) throw new Error('Init Listener not found');
-        let Listener = this.listenerRefStorage.get(listenerMainName);
-        //判断是否已创建 创建则跳过
-        if (!Listener && ListenerType) {
-            Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
-            if (!Listener) throw new Error('Init Listener failed');
-            //实例化NTQQ Listener外包装
-            const ServiceSubName = /^NodeIKernel(.*?)Listener$/.exec(listenerMainName)![1];
-            const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
-            const addfunc = this.createEventFunction<(listener: T) => number>(Service);
-            //添加Listener到NTQQ
-            addfunc!(Listener as T);
-            this.listenerRefStorage.set(listenerMainName, Listener);
-            //保存Listener实例
-        }
-        return Listener as T;
-    }
-
-    async createEventWithListener<EventType extends (...args: any) => any, ListenerType extends (...args: any) => any>
-    (
-        eventName: string,
-        listenerName: string,
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...eventArg: Parameters<EventType>
-    ) {
-        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(async (resolve, reject) => {
-            const ListenerNameList = listenerName.split('/');
-            const ListenerMainName = ListenerNameList[0];
-            //const ListenerSubName = ListenerNameList[1];
-            this.getOrInitListener<ListenerType>(ListenerMainName);
-            let complete = 0;
-            const retData: Parameters<ListenerType> | undefined = undefined;
-            let retEvent: any = {};
-            const databack = () => {
-                if (complete == 0) {
-                    reject(new Error('Timeout: NTEvent EventName:' + eventName + ' ListenerName:' + listenerName + ' EventRet:\n' + JSON.stringify(retEvent, null, 4) + '\n'));
-                } else {
-                    resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-                }
-            };
-            const Timeouter = setTimeout(databack, timeout);
-            const callback = (...args: Parameters<ListenerType>) => {
-                if (checker(...args)) {
-                    complete++;
-                    if (complete >= waitTimes) {
-                        clearTimeout(Timeouter);
-                        this.removeListener(listenerName, callback);
-                        databack();
-                    }
-                }
-            };
-            this.on(listenerName, callback);
-            const EventFunc = this.createEventFunction<EventType>(eventName);
-            retEvent = await EventFunc!(...(eventArg as any[]));
-        });
-    }
-
-    private createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
-        const eventNameArr = eventName.split('/');
-        type eventType = {
-            [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> }
-        }
-        if (eventNameArr.length > 1) {
-            const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
-            const eventName = eventNameArr[1];
-            //getNodeIKernelGroupListener,GroupService
-            //console.log('2', eventName);
-            const services = (this.wrapperSession as unknown as eventType)[serviceName]();
-            const event = services[eventName]
-                //重新绑定this
-                .bind(services);
-            if (event) {
-                return event as T;
-            }
-            return undefined;
-        }
-    }
-
-    async callEvent<EventType extends (...args: any[]) => Promise<any> | any>(
-        EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
-        return new Promise<Awaited<ReturnType<EventType>>>((resolve) => {
-            const EventFunc = this.createEventFunction<EventType>(EventName);
-            EventFunc!(...args).then((retData: Awaited<ReturnType<EventType>> | PromiseLike<Awaited<ReturnType<EventType>>>) => resolve(retData));
-        });
-    }
-}
-
-//NTEvent2.0

src/common/event.ts

@@ -9,12 +9,21 @@ interface InternalMapKey {
     checker: ((...args: any[]) => boolean) | undefined;
 }
 
+type EnsureFunc<T> = T extends (...args: any) => any ? T : never;
+
+type FuncKeys<T> = Extract<
+    {
+        [K in keyof T]: EnsureFunc<T[K]> extends never ? never : K;
+    }[keyof T],
+    string
+>;
+
 export type ListenerClassBase = Record<string, string>;
 
 export class NTEventWrapper {
-    private WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
-    private listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
-    private EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+    private readonly WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
+    private readonly listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+    private readonly EventTask = new Map<string, Map<string, Map<string, InternalMapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
 
     constructor(
         wrapperSession: NodeIQQNTWrapperSession,
@@ -43,10 +52,8 @@ export class NTEventWrapper {
 
     createEventFunction<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
-        // eslint-disable-next-line
-        // @ts-ignore
-        T extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
+        T extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
     >(eventName: `${Service}/${ServiceMethod}`): T | undefined {
         const eventNameArr = eventName.split('/');
         type eventType = {
@@ -98,10 +105,8 @@ export class NTEventWrapper {
 
     async callNoListenerEvent<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
-        // eslint-disable-next-line
-        // @ts-ignore
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
     >(
         serviceAndMethod: `${Service}/${ServiceMethod}`,
         ...args: Parameters<EventType>
@@ -111,15 +116,13 @@ export class NTEventWrapper {
 
     async registerListen<
         Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
-        // eslint-disable-next-line
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod],
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>,
     >(
         listenerAndMethod: `${Listener}/${ListenerMethod}`,
+        checker: (...args: Parameters<ListenerType>) => boolean,
         waitTimes = 1,
         timeout = 5000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
     ) {
         return new Promise<Parameters<ListenerType>>((resolve, reject) => {
             const ListenerNameList = listenerAndMethod.split('/');
@@ -164,15 +167,11 @@ export class NTEventWrapper {
 
     async callNormalEventV2<
         Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
+        ServiceMethod extends FuncKeys<ServiceNamingMapping[Service]>,
         Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
-        // eslint-disable-next-line
-        // @ts-ignore
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
-        // eslint-disable-next-line
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod]
+        ListenerMethod extends FuncKeys<ListenerNamingMapping[Listener]>,
+        EventType extends (...args: any) => any = EnsureFunc<ServiceNamingMapping[Service][ServiceMethod]>,
+        ListenerType extends (...args: any) => any = EnsureFunc<ListenerNamingMapping[Listener][ListenerMethod]>
     >(
         serviceAndMethod: `${Service}/${ServiceMethod}`,
         listenerAndMethod: `${Listener}/${ListenerMethod}`,
@@ -182,36 +181,36 @@ export class NTEventWrapper {
         callbackTimesToWait = 1,
         timeout = 5000,
     ) {
+        const id = randomUUID();
+        let complete = 0;
+        let retData: Parameters<ListenerType> | undefined = undefined;
+        let retEvent: any = {};
+
+        function sendDataCallback(resolve: any, reject: any) {
+            if (complete == 0) {
+                reject(
+                    new Error(
+                        'Timeout: NTEvent serviceAndMethod:' +
+                        serviceAndMethod +
+                        ' ListenerName:' +
+                        listenerAndMethod +
+                        ' EventRet:\n' +
+                        JSON.stringify(retEvent, null, 4) +
+                        '\n',
+                    ),
+                );
+            } else {
+                resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
+            }
+        }
+
+        const ListenerNameList = listenerAndMethod.split('/');
+        const ListenerMainName = ListenerNameList[0];
+        const ListenerSubName = ListenerNameList[1];
+
         return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
-            async (resolve, reject) => {
-                const id = randomUUID();
-                let complete = 0;
-                let retData: Parameters<ListenerType> | undefined = undefined;
-                let retEvent: any = {};
-
-                function sendDataCallback() {
-                    if (complete == 0) {
-                        reject(
-                            new Error(
-                                'Timeout: NTEvent serviceAndMethod:' +
-                                serviceAndMethod +
-                                ' ListenerName:' +
-                                listenerAndMethod +
-                                ' EventRet:\n' +
-                                JSON.stringify(retEvent, null, 4) +
-                                '\n',
-                            ),
-                        );
-                    } else {
-                        resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-                    }
-                }
-
-                const ListenerNameList = listenerAndMethod.split('/');
-                const ListenerMainName = ListenerNameList[0];
-                const ListenerSubName = ListenerNameList[1];
-
-                const timeoutRef = setTimeout(sendDataCallback, timeout);
+            (resolve, reject) => {
+                const timeoutRef = setTimeout(() => sendDataCallback(resolve, reject), timeout);
 
                 const eventCallback = {
                     timeout: timeout,
@@ -222,7 +221,7 @@ export class NTEventWrapper {
                         retData = args as Parameters<ListenerType>;
                         if (complete >= callbackTimesToWait) {
                             clearTimeout(timeoutRef);
-                            sendDataCallback();
+                            sendDataCallback(resolve, reject);
                         }
                     },
                 };
@@ -234,57 +233,16 @@ export class NTEventWrapper {
                 }
                 this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallback);
                 this.createListenerFunction(ListenerMainName);
-                const eventFunction = this.createEventFunction(serviceAndMethod);
-                retEvent = await eventFunction!(...(args));
-                if (!checkerEvent(retEvent)) {
-                    clearTimeout(timeoutRef);
-                    reject(
-                        new Error(
-                            'EventChecker Failed: NTEvent serviceAndMethod:' +
-                            serviceAndMethod +
-                            ' ListenerName:' +
-                            listenerAndMethod +
-                            ' EventRet:\n' +
-                            JSON.stringify(retEvent, null, 4) +
-                            '\n',
-                        ),
-                    );
-                }
-            },
-        );
-    }
 
-    /*
-    async callNormalEvent<
-        Service extends keyof ServiceNamingMapping,
-        ServiceMethod extends Exclude<keyof ServiceNamingMapping[Service], symbol>,
-        Listener extends keyof ListenerNamingMapping,
-        ListenerMethod extends Exclude<keyof ListenerNamingMapping[Listener], symbol>,
-        // eslint-disable-next-line
-        // @ts-ignore
-        EventType extends (...args: any) => any = ServiceNamingMapping[Service][ServiceMethod],
-        // eslint-disable-next-line
-        // @ts-ignore
-        ListenerType extends (...args: any) => any = ListenerNamingMapping[Listener][ListenerMethod]
-    >(
-        serviceAndMethod: `${Service}/${ServiceMethod}`,
-        listenerAndMethod: `${Listener}/${ListenerMethod}`,
-        waitTimes = 1,
-        timeout: number = 3000,
-        checker: (...args: Parameters<ListenerType>) => boolean,
-        ...args: Parameters<EventType>
-    ) {
-        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
-            async (resolve, reject) => {
-                const id = randomUUID();
-                let complete = 0;
-                let retData: Parameters<ListenerType> | undefined = undefined;
-                let retEvent: any = {};
-                const databack = () => {
-                    if (complete == 0) {
+                const eventResult = this.createEventFunction(serviceAndMethod)!(...(args));
+
+                const eventRetHandle = (eventData: any) => {
+                    retEvent = eventData;
+                    if (!checkerEvent(retEvent) && timeoutRef.hasRef()) {
+                        clearTimeout(timeoutRef);
                         reject(
                             new Error(
-                                'Timeout: NTEvent EventName:' +
+                                'EventChecker Failed: NTEvent serviceAndMethod:' +
                                 serviceAndMethod +
                                 ' ListenerName:' +
                                 listenerAndMethod +
@@ -293,43 +251,17 @@ export class NTEventWrapper {
                                 '\n',
                             ),
                         );
-                    } else {
-                        resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
                     }
                 };
-
-                const ListenerNameList = listenerAndMethod.split('/');
-                const ListenerMainName = ListenerNameList[0];
-                const ListenerSubName = ListenerNameList[1];
-
-                const Timeouter = setTimeout(databack, timeout);
-
-                const eventCallbak = {
-                    timeout: timeout,
-                    createtime: Date.now(),
-                    checker: checker,
-                    func: (...args: any[]) => {
-                        complete++;
-                        //console.log('func', ...args);
-                        retData = args as Parameters<ListenerType>;
-                        if (complete >= waitTimes) {
-                            clearTimeout(Timeouter);
-                            databack();
-                        }
-                    },
-                };
-                if (!this.EventTask.get(ListenerMainName)) {
-                    this.EventTask.set(ListenerMainName, new Map());
+                if (eventResult instanceof Promise) {
+                    eventResult.then((eventResult: any) => {
+                        eventRetHandle(eventResult);
+                    })
+                        .catch(reject);
+                } else {
+                    eventRetHandle(eventResult);
                 }
-                if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
-                    this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
-                }
-                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
-                this.createListenerFunction(ListenerMainName);
-                const EventFunc = this.createEventFunction<EventType>(serviceAndMethod);
-                retEvent = await EventFunc!(...(args as any[]));
             },
         );
     }
-     */
 }

src/common/file.ts

@@ -4,18 +4,23 @@ import crypto, { randomUUID } from 'crypto';
 import util from 'util';
 import path from 'node:path';
 import * as fileType from 'file-type';
-import { solveProblem } from './helper';
+import { solveProblem } from '@/common/helper';
 
-export function isGIF(path: string) {
-    const buffer = Buffer.alloc(4);
-    const fd = fs.openSync(path, 'r');
-    fs.readSync(fd, buffer, 0, 4, 0);
-    fs.closeSync(fd);
-    return buffer.toString() === 'GIF8';
+export interface HttpDownloadOptions {
+    url: string;
+    headers?: Record<string, string> | string;
+}
+
+type Uri2LocalRes = {
+    success: boolean,
+    errMsg: string,
+    fileName: string,
+    ext: string,
+    path: string
 }
 
 // 定义一个异步函数来检查文件是否存在
-export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
+export function checkFileExist(path: string, timeout: number = 3000): Promise<void> {
     return new Promise((resolve, reject) => {
         const startTime = Date.now();
 
@@ -34,7 +39,7 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
 }
 
 // 定义一个异步函数来检查文件是否存在
-export async function checkFileReceived2(path: string, timeout: number = 3000): Promise<void> {
+export async function checkFileExistV2(path: string, timeout: number = 3000): Promise<void> {
     // 使用 Promise.race 来同时进行文件状态检查和超时计时
     // Promise.race 会返回第一个解决（resolve）或拒绝（reject）的 Promise
     await Promise.race([
@@ -75,18 +80,13 @@ export async function file2base64(path: string) {
         data: '',
     };
     try {
-        // 读取文件内容
-        // if (!fs.existsSync(path)){
-        //     path = path.replace("\\Ori\\", "\\Thumb\\");
-        // }
         try {
-            await checkFileReceived(path, 5000);
+            await checkFileExist(path, 5000);
         } catch (e: any) {
             result.err = e.toString();
             return result;
         }
         const data = await readFile(path);
-        // 转换为Base64编码
         result.data = data.toString('base64');
     } catch (err: any) {
         result.err = err.toString();
@@ -118,13 +118,7 @@ export function calculateFileMD5(filePath: string): Promise<string> {
     });
 }
 
-export interface HttpDownloadOptions {
-    url: string;
-    headers?: Record<string, string> | string;
-}
-
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-    // const chunks: Buffer[] = [];
+async function tryDownload(options: string | HttpDownloadOptions, useReferer: boolean = false): Promise<Response> {
     let url: string;
     let headers: Record<string, string> = {
         'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
@@ -142,26 +136,28 @@ export async function httpDownload(options: string | HttpDownloadOptions): Promi
             }
         }
     }
+    if (useReferer && !headers['Referer']) {
+        headers['Referer'] = url;
+    }
     const fetchRes = await fetch(url, { headers }).catch((err) => {
         if (err.cause) {
             throw err.cause;
         }
         throw err;
     });
-    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
-
-    const blob = await fetchRes.blob();
-    const buffer = await blob.arrayBuffer();
-    return Buffer.from(buffer);
+    return fetchRes;
 }
 
-type Uri2LocalRes = {
-    success: boolean,
-    errMsg: string,
-    fileName: string,
-    ext: string,
-    path: string,
-    isLocal: boolean
+export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
+    const useReferer = typeof options === 'string';
+    let resp = await tryDownload(options);
+    if (resp.status === 403 && useReferer) {
+        resp = await tryDownload(options, true);
+    }
+    if (!resp.ok) throw new Error(`下载文件失败: ${resp.statusText}`);
+    const blob = await resp.blob();
+    const buffer = await blob.arrayBuffer();
+    return Buffer.from(buffer);
 }
 
 export async function checkFileV2(filePath: string) {
@@ -186,7 +182,6 @@ export enum FileUriType {
 }
 
 export async function checkUriType(Uri: string) {
-
     const LocalFileRet = await solveProblem((uri: string) => {
         if (fs.existsSync(uri)) {
             return { Uri: uri, Type: FileUriType.Local };
@@ -194,27 +189,34 @@ export async function checkUriType(Uri: string) {
         return undefined;
     }, Uri);
     if (LocalFileRet) return LocalFileRet;
-
     const OtherFileRet = await solveProblem((uri: string) => {
-        //再判断是否是Http
-        if (uri.startsWith('http://') || uri.startsWith('https://')) {
+        // 再判断是否是Http
+        if (uri.startsWith('http:') || uri.startsWith('https:')) {
             return { Uri: uri, Type: FileUriType.Remote };
         }
-        //再判断是否是Base64
-        if (uri.startsWith('base64://')) {
+        // 再判断是否是Base64
+        if (uri.startsWith('base64:')) {
             return { Uri: uri, Type: FileUriType.Base64 };
         }
-        if (uri.startsWith('file://')) {
-            let filePath: string;
-            // await fs.copyFile(url.pathname, filePath);
-            const pathname = decodeURIComponent(new URL(uri).pathname);
-            if (process.platform === 'win32') {
-                filePath = pathname.slice(1);
-            } else {
-                filePath = pathname;
+        // 默认file://
+        if (uri.startsWith('file:')) {
+            // 兼容file:///
+            // file:///C:/1.jpg
+            if (uri.startsWith('file:///') && process.platform === 'win32') {
+                const filePath: string = uri.slice(8);
+                return { Uri: filePath, Type: FileUriType.Local };
             }
+            // 处理默认规范
+            // file://C:\1.jpg
+            // file:///test/1.jpg
+            const filePath: string = uri.slice(7);
+
             return { Uri: filePath, Type: FileUriType.Local };
         }
+        if (uri.startsWith('data:')) {
+            const data = uri.split(',')[1];
+            if (data) return { Uri: data, Type: FileUriType.Base64 };
+        }
     }, Uri);
     if (OtherFileRet) return OtherFileRet;
 
@@ -223,36 +225,47 @@ export async function checkUriType(Uri: string) {
 
 export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
     const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
-    //解析失败
 
+    //解析失败
+    const tempName = randomUUID();
+    if (!filename) filename = randomUUID();
+
+    //解析Http和Https协议
     if (UriType == FileUriType.Unknown) {
-        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+        return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
     }
+
     //解析File协议和本地文件
     if (UriType == FileUriType.Local) {
         const fileExt = path.extname(HandledUri);
-        const filename = path.basename(HandledUri, fileExt);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+        let filename = path.basename(HandledUri, fileExt);
+        filename += fileExt;
+        //复制文件到临时文件并保持后缀
+        const filenameTemp = tempName + fileExt;
+        const filePath = path.join(dir, filenameTemp);
+        fs.copyFileSync(HandledUri, filePath);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
-    //接下来都要有文件名
-    if (!filename) filename = randomUUID();
-    //解析Http和Https协议
 
+    //接下来都要有文件名
     if (UriType == FileUriType.Remote) {
         const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
         if (pathInfo.name) {
-            filename = pathInfo.name;
+            const pathlen = 200 - dir.length - pathInfo.name.length;
+            filename = pathlen > 0 ? pathInfo.name.substring(0, pathlen) : pathInfo.name.substring(pathInfo.name.length, pathInfo.name.length - 10);//过长截断
             if (pathInfo.ext) {
                 filename += pathInfo.ext;
             }
         }
         filename = filename.replace(/[/\\:*?"<>|]/g, '_');
-        const fileExt = path.extname(HandledUri);
-        const filePath = path.join(dir, filename);
+        const fileExt = path.extname(HandledUri).replace(/[/\\:*?"<>|]/g, '_').substring(0, 10);
+        const filePath = path.join(dir, tempName + fileExt);
         const buffer = await httpDownload(HandledUri);
-        fs.writeFileSync(filePath, buffer);
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        //没有文件就创建
+        fs.writeFileSync(filePath, buffer, { flag: 'wx' });
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
+
     //解析Base64
     if (UriType == FileUriType.Base64) {
         const base64 = HandledUri.replace(/^base64:\/\//, '');
@@ -266,7 +279,7 @@ export async function uri2local(dir: string, uri: string, filename: string | und
             fileExt = ext;
             filename = filename + '.' + ext;
         }
-        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath };
     }
-    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+    return { success: false, errMsg: `未知文件类型, uri= ${uri}`, fileName: '', ext: '', path: '' };
 }

src/common/forward-msg-builder.ts

@@ -0,0 +1,114 @@
+import * as crypto from "node:crypto";
+import { PacketMsg } from "@/core/packet/message/message";
+
+interface ForwardMsgJson {
+    app: string
+    config: ForwardMsgJsonConfig,
+    desc: string,
+    extra: ForwardMsgJsonExtra,
+    meta: ForwardMsgJsonMeta,
+    prompt: string,
+    ver: string,
+    view: string
+}
+
+interface ForwardMsgJsonConfig {
+    autosize: number,
+    forward: number,
+    round: number,
+    type: string,
+    width: number
+}
+
+interface ForwardMsgJsonExtra {
+    filename: string,
+    tsum: number,
+}
+
+interface ForwardMsgJsonMeta {
+    detail: ForwardMsgJsonMetaDetail
+}
+
+interface ForwardMsgJsonMetaDetail {
+    news: {
+        text: string
+    }[],
+    resid: string,
+    source: string,
+    summary: string,
+    uniseq: string
+}
+
+interface ForwardAdaptMsg {
+    senderName?: string;
+    isGroupMsg?: boolean;
+    msg?: ForwardAdaptMsgElement[];
+}
+
+interface ForwardAdaptMsgElement {
+    preview?: string;
+}
+
+export class ForwardMsgBuilder {
+    private static build(resId: string, msg: ForwardAdaptMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson {
+        const id = crypto.randomUUID();
+        const isGroupMsg = msg.some(m => m.isGroupMsg);
+        if (!source) {
+            source = isGroupMsg ? "群聊的聊天记录" : msg.map(m => m.senderName).filter((v, i, a) => a.indexOf(v) === i).slice(0, 4).join('和') + '的聊天记录';
+        }
+        if (!news) {
+            news = msg.length === 0 ? [{
+                text: "Nya~ This message is send from NapCat.Packet!",
+            }] : msg.map(m => ({
+                text: `${m.senderName}: ${m.msg?.map(msg => msg.preview).join('')}`,
+            }));
+        }
+        if (!summary) {
+            summary = `查看${msg.length}条转发消息`;
+        }
+        if (!prompt) {
+            prompt = "[聊天记录]";
+        }
+        return {
+            app: "com.tencent.multimsg",
+            config: {
+                autosize: 1,
+                forward: 1,
+                round: 1,
+                type: "normal",
+                width: 300
+            },
+            desc: prompt,
+            extra: {
+                filename: id,
+                tsum: msg.length,
+            },
+            meta: {
+                detail: {
+                    news,
+                    resid: resId,
+                    source,
+                    summary,
+                    uniseq: id,
+                }
+            },
+            prompt,
+            ver: "0.0.0.5",
+            view: "contact",
+        };
+    }
+
+    static fromResId(resId: string): ForwardMsgJson {
+        return this.build(resId, []);
+    }
+
+    static fromPacketMsg(resId: string, packetMsg: PacketMsg[], source?: string, news?: ForwardMsgJsonMetaDetail["news"], summary?: string, prompt?: string): ForwardMsgJson {
+        return this.build(resId, packetMsg.map(msg => ({
+            senderName: msg.senderName,
+            isGroupMsg: msg.groupId !== undefined,
+            msg: msg.msg.map(m => ({
+                preview: m.valid ? m.toPreview() : "[该消息类型暂不支持查看]",
+            }))
+        })), source, news, summary, prompt);
+    }
+}

src/common/helper.ts

@@ -25,49 +25,76 @@ export async function solveAsyncProblem<T extends (...args: any[]) => Promise<an
 }
 
 export class FileNapCatOneBotUUID {
-    static encodeModelId(peer: Peer, modelId: string, fileId: string): string {
-        return `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}`;
+    static encodeModelId(peer: Peer, modelId: string, fileId: string, fileUUID: string = "", endString: string = ""): string {
+        const data = `NapCatOneBot|ModelIdFile|${peer.chatType}|${peer.peerUid}|${modelId}|${fileId}|${fileUUID}`;
+        //前四个字节塞data长度
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);//储存data的hex长度
+        length.write(data, 4);
+        return length.toString('hex') + endString;
     }
 
     static decodeModelId(uuid: string): undefined | {
         peer: Peer,
         modelId: string,
-        fileId: string
+        fileId: string,
+        fileUUID?: string
     } {
-        if (!uuid.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
-        const data = uuid.split('|');
-        if (data.length !== 6) return undefined;
-        const [, , chatType, peerUid, modelId,fileId] = data;
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|ModelIdFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length < 6) return undefined;  // compatibility requirement
+        const [, , chatType, peerUid, modelId, fileId, fileUUID = undefined] = data;
         return {
             peer: {
-                chatType: chatType as any,
+                chatType: +chatType,
                 peerUid: peerUid,
             },
             modelId,
-            fileId
+            fileId,
+            fileUUID
         };
     }
 
-    static encode(peer: Peer, msgId: string, elementId: string): string {
-        return `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}`;
+    static encode(peer: Peer, msgId: string, elementId: string, fileUUID: string = "", endString: string = ""): string {
+        const data = `NapCatOneBot|MsgFile|${peer.chatType}|${peer.peerUid}|${msgId}|${elementId}|${fileUUID}`;
+        //前四个字节塞data长度
+        //一个字节8位 一个ascii字符1字节 一个hex字符4位 表示一个ascii字符需要两个hex字符
+        const length = Buffer.alloc(4 + data.length);
+        length.writeUInt32BE(data.length * 2, 0);
+        length.write(data, 4);
+        return length.toString('hex') + endString;
     }
 
     static decode(uuid: string): undefined | {
         peer: Peer,
         msgId: string,
-        elementId: string
+        elementId: string,
+        fileUUID?: string
     } {
-        if (!uuid.startsWith('NapCatOneBot|MsgFile|')) return undefined;
-        const data = uuid.split('|');
-        if (data.length !== 6) return undefined;
-        const [, , chatType, peerUid, msgId, elementId] = data;
+        //前四个字节是data长度
+        const length = Buffer.from(uuid.slice(0, 8), 'hex').readUInt32BE(0);
+        //根据length计算需要读取的长度
+        const dataId = uuid.slice(8, 8 + length);
+        //hex还原为string
+        const realData = Buffer.from(dataId, 'hex').toString();
+        if (!realData.startsWith('NapCatOneBot|MsgFile|')) return undefined;
+        const data = realData.split('|');
+        if (data.length < 6) return undefined;  // compatibility requirement
+        const [, , chatType, peerUid, msgId, elementId, fileUUID = undefined] = data;
         return {
             peer: {
-                chatType: chatType as any,
+                chatType: +chatType,
                 peerUid: peerUid,
             },
             msgId,
             elementId,
+            fileUUID
         };
     }
 }
@@ -140,26 +167,55 @@ export function isEqual(obj1: any, obj2: any) {
 export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
     if (os.platform() === 'linux') {
         return {
-            baseVersion: '3.2.12-27597',
-            curVersion: '3.2.12-27597',
+            baseVersion: '3.2.12.28060',
+            curVersion: '3.2.12.28060',
             prevVersion: '',
             onErrorVersions: [],
-            buildId: '27597',
+            buildId: '27254',
+        };
+    }
+    if (os.platform() === 'darwin') {
+        return {
+            baseVersion: '6.9.53.28060',
+            curVersion: '6.9.53.28060',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '28060',
         };
     }
     return {
-        baseVersion: '9.9.15-27597',
-        curVersion: '9.9.15-27597',
+        baseVersion: '9.9.15-28131',
+        curVersion: '9.9.15-28131',
         prevVersion: '',
         onErrorVersions: [],
-        buildId: '27597',
+        buildId: '28131',
     };
 }
 
+export function getQQPackageInfoPath(exePath: string = '', version?: string): string {
+    let packagePath;
+    if (os.platform() === 'darwin') {
+        packagePath = path.join(path.dirname(exePath), '..', 'Resources', 'app', 'package.json');
+    } else if (os.platform() === 'linux') {
+        packagePath = path.join(path.dirname(exePath), './resources/app/package.json');
+    } else {
+        packagePath = path.join(path.dirname(exePath), './versions/' + version + '/resources/app/package.json');
+    }
+    //下面是老版本兼容 未来去掉
+    if (!fs.existsSync(packagePath)) {
+        packagePath = path.join(path.dirname(exePath), './resources/app/versions/' + version + '/package.json');
+    }
+    return packagePath;
+}
+
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
     let configVersionInfoPath;
-    if (os.platform() !== 'linux') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+    if (os.platform() === 'win32') {
+        configVersionInfoPath = path.join(path.dirname(exePath), 'versions', 'config.json');
+    } else if (os.platform() === 'darwin') {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './Library/Application Support/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
     } else {
         const userPath = os.homedir();
         const appDataPath = path.resolve(userPath, './.config/QQ');
@@ -168,13 +224,57 @@ export function getQQVersionConfigPath(exePath: string = ''): string | undefined
     if (typeof configVersionInfoPath !== 'string') {
         return undefined;
     }
+    //老版本兼容 未来去掉
+    if (!fs.existsSync(configVersionInfoPath)) {
+        configVersionInfoPath = path.join(path.dirname(exePath), './resources/app/versions/config.json');
+    }
     if (!fs.existsSync(configVersionInfoPath)) {
         return undefined;
     }
     return configVersionInfoPath;
 }
 
-export function calcQQLevel(level: QQLevel) {
+export function calcQQLevel(level?: QQLevel) {
+    if (!level) return 0;
     const { crownNum, sunNum, moonNum, starNum } = level;
     return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }
+
+export function stringifyWithBigInt(obj: any) {
+    return JSON.stringify(obj, (key, value) =>
+        typeof value === 'bigint' ? value.toString() : value
+    );
+}
+
+export function parseAppidFromMajor(nodeMajor: string): string | undefined {
+    const hexSequence = "A4 09 00 00 00 35";
+    const sequenceBytes = Buffer.from(hexSequence.replace(/ /g, ""), "hex");
+    const filePath = path.resolve(nodeMajor);
+    const fileContent = fs.readFileSync(filePath);
+
+    let searchPosition = 0;
+    while (true) {
+        const index = fileContent.indexOf(sequenceBytes, searchPosition);
+        if (index === -1) {
+            break;
+        }
+
+        const start = index + sequenceBytes.length - 1;
+        const end = fileContent.indexOf(0x00, start);
+        if (end === -1) {
+            break;
+        }
+        const content = fileContent.subarray(start, end);
+        if (!content.every(byte => byte === 0x00)) {
+            try {
+                return content.toString("utf-8");
+            } catch (error) {
+                break;
+            }
+        }
+
+        searchPosition = end + 1;
+    }
+
+    return undefined;
+}

src/common/log.ts

@@ -1,8 +1,8 @@
-import log4js, { Configuration } from 'log4js';
+import winston, { format, transports } from 'winston';
 import { truncateString } from '@/common/helper';
 import path from 'node:path';
-import chalk from 'chalk';
-import { AtType, ChatType, ElementType, MessageElement, RawMessage, SelfInfo } from '@/core';
+import fs from 'node:fs';
+import { NTMsgAtType, ChatType, ElementType, MessageElement, RawMessage, SelfInfo } from '@/core';
 
 export enum LogLevel {
     DEBUG = 'debug',
@@ -27,97 +27,137 @@ function getFormattedTimestamp() {
 export class LogWrapper {
     fileLogEnabled = true;
     consoleLogEnabled = true;
-    logConfig: Configuration;
-    loggerConsole: log4js.Logger;
-    loggerFile: log4js.Logger;
-    loggerDefault: log4js.Logger;
-    // eslint-disable-next-line no-control-regex
-    colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+    logger: winston.Logger;
 
     constructor(logDir: string) {
         const filename = `${getFormattedTimestamp()}.log`;
         const logPath = path.join(logDir, filename);
-        this.logConfig = {
-            appenders: {
-                FileAppender: { // 输出到文件的appender
-                    type: 'file',
-                    filename: logPath, // 指定日志文件的位置和文件名
-                    maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
-                    layout: {
-                        type: 'pattern',
-                        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m',
-                    },
-                },
-                ConsoleAppender: { // 输出到控制台的appender
-                    type: 'console',
-                    layout: {
-                        type: 'pattern',
-                        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`,
-                    },
-                },
-            },
-            categories: {
-                default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
-                file: { appenders: ['FileAppender'], level: 'debug' },
-                console: { appenders: ['ConsoleAppender'], level: 'debug' },
-            },
-        };
-        log4js.configure(this.logConfig);
-        this.loggerConsole = log4js.getLogger('console');
-        this.loggerFile = log4js.getLogger('file');
-        this.loggerDefault = log4js.getLogger('default');
-        this.setLogSelfInfo({ nick: '', uin: '', uid: '' });
+
+        this.logger = winston.createLogger({
+            level: 'debug',
+            format: format.combine(
+                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}`;
+                })
+            ),
+            transports: [
+                new transports.File({
+                    filename: logPath,
+                    level: 'debug',
+                    maxsize: 5 * 1024 * 1024, // 5MB
+                    maxFiles: 5
+                }),
+                new transports.Console({
+                    format: format.combine(
+                        format.colorize(),
+                        format.printf(({ timestamp, level, message, ...meta }) => {
+                            const userInfo = meta.userInfo ? `${meta.userInfo} | ` : '';
+                            return `${timestamp} [${level}] ${userInfo}${message}`;
+                        })
+                    )
+                })
+            ]
+        });
+
+        this.setLogSelfInfo({ nick: '', uid: '' });
+        this.cleanOldLogs(logDir);
+    }
+
+    cleanOldLogs(logDir: string) {
+        const oneWeekAgo = Date.now() - 7 * 24 * 60 * 60 * 1000;
+        fs.readdir(logDir, (err, files) => {
+            if (err) {
+                this.logger.error('Failed to read log directory', err);
+                return;
+            }
+            files.forEach(file => {
+                const filePath = path.join(logDir, file);
+                this.deleteOldLogFile(filePath, oneWeekAgo);
+            });
+        });
+    }
+
+    private deleteOldLogFile(filePath: string, oneWeekAgo: number) {
+        fs.stat(filePath, (err, stats) => {
+            if (err) {
+                this.logger.error('Failed to get file stats', err);
+                return;
+            }
+            if (stats.mtime.getTime() < oneWeekAgo) {
+                fs.unlink(filePath, err => {
+                    if (err) {
+                        if (err.code === 'ENOENT') {
+                            this.logger.warn(`File already deleted: ${filePath}`);
+                        } else {
+                            this.logger.error('Failed to delete old log file', err);
+                        }
+                    } else {
+                        this.logger.info(`Deleted old log file: ${filePath}`);
+                    }
+                });
+            }
+        });
     }
 
     setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
-        this.logConfig.categories.file.level = fileLogLevel;
-        this.logConfig.categories.console.level = consoleLogLevel;
-        log4js.configure(this.logConfig);
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.File) {
+                transport.level = fileLogLevel;
+            } else if (transport instanceof transports.Console) {
+                transport.level = consoleLogLevel;
+            }
+        });
     }
 
-    setLogSelfInfo(selfInfo: { nick: string, uin: string, uid: string }) {
-        const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
-        this.loggerConsole.addContext('userInfo', userInfo);
-        this.loggerFile.addContext('userInfo', userInfo);
-        this.loggerDefault.addContext('userInfo', userInfo);
+    setLogSelfInfo(selfInfo: { nick: string, uid: string }) {
+        const userInfo = `${selfInfo.nick}`;
+        this.logger.defaultMeta = { userInfo };
     }
 
     setFileLogEnabled(isEnabled: boolean) {
         this.fileLogEnabled = isEnabled;
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.File) {
+                transport.silent = !isEnabled;
+            }
+        });
     }
 
     setConsoleLogEnabled(isEnabled: boolean) {
         this.consoleLogEnabled = isEnabled;
+        this.logger.transports.forEach((transport) => {
+            if (transport instanceof transports.Console) {
+                transport.silent = !isEnabled;
+            }
+        });
     }
 
     formatMsg(msg: any[]) {
-        let logMsg = '';
-        for (const msgItem of msg) {
-            if (msgItem instanceof Error) { // 判断是否是错误
-                logMsg += msgItem.stack + ' ';
-                continue;
-            } else if (typeof msgItem === 'object') { // 判断是否是对象
-                const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
-                logMsg += JSON.stringify(truncateString(obj)) + ' ';
-                continue;
+        return msg.map(msgItem => {
+            if (msgItem instanceof Error) {
+                return msgItem.stack;
+            } else if (typeof msgItem === 'object') {
+                return JSON.stringify(truncateString(JSON.parse(JSON.stringify(msgItem, null, 2))));
             }
-            logMsg += msgItem + ' ';
-        }
-        return logMsg;
+            return msgItem;
+        }).join(' ');
     }
 
-
     _log(level: LogLevel, ...args: any[]) {
-        if (this.consoleLogEnabled) {
-            this.loggerConsole[level](this.formatMsg(args));
-        }
-        if (this.fileLogEnabled) {
-            this.loggerFile[level](this.formatMsg(args).replace(this.colorEscape, ''));
+        const message = this.formatMsg(args);
+        if (this.consoleLogEnabled && this.fileLogEnabled) {
+            this.logger.log(level, message);
+        } else if (this.consoleLogEnabled) {
+            this.logger.log(level, message);
+        } else if (this.fileLogEnabled) {
+            // eslint-disable-next-line no-control-regex
+            this.logger.log(level, message.replace(/\x1B[@-_][0-?]*[ -/]*[@-~]/g, ''));
         }
     }
 
     log(...args: any[]) {
-        // info 等级
         this._log(LogLevel.INFO, ...args);
     }
 
@@ -139,9 +179,12 @@ export class LogWrapper {
 
     logMessage(msg: RawMessage, selfInfo: SelfInfo) {
         const isSelfSent = msg.senderUin === selfInfo.uin;
-        this.log(`${
-            isSelfSent ? '发送 ->' : '接收 <-'
-        } ${rawMessageToText(msg)}`);
+
+        if (msg.elements[0]?.elementType === ElementType.GreyTip) {
+            return;
+        }
+
+        this.log(`${isSelfSent ? '发送 ->' : '接收 <-'} ${rawMessageToText(msg)}`);
     }
 }
 
@@ -155,85 +198,97 @@ export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
     if (msg.chatType == ChatType.KCHATTYPEC2C) {
         tokens.push(`私聊 (${msg.peerUin})`);
     } else if (msg.chatType == ChatType.KCHATTYPEGROUP) {
-        tokens.push(`群聊 (群 ${msg.peerUin} 的 ${msg.senderUin})`);
+        if (recursiveLevel < 1) {
+            tokens.push(`群聊 [${msg.peerName}(${msg.peerUin})]`);
+        }
+        if (msg.senderUin !== '0') {
+            tokens.push(`[${msg.sendMemberName ?? msg.sendRemarkName ?? msg.sendNickName}(${msg.senderUin})]`);
+        }
     } else if (msg.chatType == ChatType.KCHATTYPEDATALINE) {
         tokens.push('移动设备');
-    } else /* temp */ {
+    } else {
         tokens.push(`临时消息 (${msg.peerUin})`);
     }
 
-    // message content
-
-    function msgElementToText(element: MessageElement) {
-        if (element.textElement) {
-            if (element.textElement.atType === AtType.notAt) {
-                return element.textElement.content;
-            } else if (element.textElement.atType === AtType.atAll) {
-                return `@全体成员`;
-            } else if (element.textElement.atType === AtType.atUser) {
-                return `${element.textElement.content} (${element.textElement.atUid})`;
-            }
-        }
-
-        if (element.replyElement) {
-            const recordMsgOrNull = msg.records.find(
-                record => element.replyElement!.sourceMsgIdInRecords === record.msgId,
-            );
-            return `[回复消息 ${
-                recordMsgOrNull &&
-                recordMsgOrNull.peerUin != '284840486' // 非转发消息; 否则定位不到
-                    ?
-                    rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
-                    `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
-            }]`;
-        }
-
-        if (element.picElement) {
-            return `[图片 ${element.picElement.fileName}]`;
-        }
-
-        if (element.fileElement) {
-            return `[文件 ${element.fileElement.fileName}]`;
-        }
-
-        if (element.videoElement) {
-            return `[视频 ${element.videoElement.fileName}]`;
-        }
-
-        if (element.pttElement) {
-            return `[语音 ${element.pttElement.duration}s]`;
-        }
-
-        if (element.arkElement) {
-            return `[卡片消息 ${element.arkElement.bytesData}]`;
-        }
-
-        if (element.faceElement) {
-            return `[表情 ${element.faceElement.faceText ?? ''}]`;
-        }
-
-        if (element.marketFaceElement) {
-            return `[商城表情 ${element.marketFaceElement.faceName}]`;
-        }
-
-        if (element.markdownElement) {
-            return `[Markdown ${element.markdownElement.content}]`;
-        }
-
-        if (element.multiForwardMsgElement) {
-            return `[转发消息]`;
-        }
-
-        if (element.elementType === ElementType.GreyTip) {
-            return `[灰条消息]`; // TODO: resolve the text
-        }
-
-        return `[未实现 (ElementType = ${element.elementType})]`;
-    }
-
     for (const element of msg.elements) {
-        tokens.push(msgElementToText(element));
+        tokens.push(msgElementToText(element, msg, recursiveLevel));
     }
 
     return tokens.join(' ');
 }
+
+function msgElementToText(element: MessageElement, msg: RawMessage, recursiveLevel: number): string {
+    if (element.textElement) {
+        return textElementToText(element.textElement);
+    }
+
+    if (element.replyElement) {
+        return replyElementToText(element.replyElement, msg, recursiveLevel);
+    }
+
+    if (element.picElement) {
+        return '[图片]';
+    }
+
+    if (element.fileElement) {
+        return `[文件 ${element.fileElement.fileName}]`;
+    }
+
+    if (element.videoElement) {
+        return '[视频]';
+    }
+
+    if (element.pttElement) {
+        return `[语音 ${element.pttElement.duration}s]`;
+    }
+
+    if (element.arkElement) {
+        return '[卡片消息]';
+    }
+
+    if (element.faceElement) {
+        return `[表情 ${element.faceElement.faceText ?? ''}]`;
+    }
+
+    if (element.marketFaceElement) {
+        return element.marketFaceElement.faceName;
+    }
+
+    if (element.markdownElement) {
+        return '[Markdown 消息]';
+    }
+
+    if (element.multiForwardMsgElement) {
+        return '[转发消息]';
+    }
+
+    if (element.elementType === ElementType.GreyTip) {
+        return '[灰条消息]';
+    }
+
+    return `[未实现 (ElementType = ${element.elementType})]`;
+}
+
+function textElementToText(textElement: any): string {
+    if (textElement.atType === NTMsgAtType.ATTYPEUNKNOWN) {
+        const originalContentLines = textElement.content.split('\n');
+        return `${originalContentLines[0]}${originalContentLines.length > 1 ? ' ...' : ''}`;
+    } else if (textElement.atType === NTMsgAtType.ATTYPEALL) {
+        return `@全体成员`;
+    } else if (textElement.atType === NTMsgAtType.ATTYPEONE) {
+        return `${textElement.content} (${textElement.atUid})`;
+    }
+    return '';
+}
+
+function replyElementToText(replyElement: any, msg: RawMessage, recursiveLevel: number): string {
+    const recordMsgOrNull = msg.records.find(
+        record => replyElement.sourceMsgIdInRecords === record.msgId,
+    );
+    return `[回复消息 ${recordMsgOrNull &&
+        recordMsgOrNull.peerUin != '284840486' && recordMsgOrNull.peerUin != '1094950020'
+        ?
+        rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
+        `未找到消息记录 (MsgId = ${replyElement.sourceMsgIdInRecords})`
+    }]`;
+}

src/common/lru-cache.ts

@@ -1,6 +1,6 @@
 export class LRUCache<K, V> {
     private capacity: number;
-    private cache: Map<K, V>;
+    public cache: Map<K, V>;
 
     constructor(capacity: number) {
         this.capacity = capacity;
@@ -24,8 +24,19 @@ export class LRUCache<K, V> {
         } else if (this.cache.size >= this.capacity) {
             // If the cache is full, remove the least recently used key (the first one in the map)
             const firstKey = this.cache.keys().next().value;
-            this.cache.delete(firstKey);
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
+            }
         }
         this.cache.set(key, value);
     }
+    public resetCapacity(newCapacity: number): void {
+        this.capacity = newCapacity;
+        while (this.cache.size > this.capacity) {
+            const firstKey = this.cache.keys().next().value;
+            if (firstKey !== undefined) {
+                this.cache.delete(firstKey);
+            }
+        }
+    }
 }

src/common/message-unique.ts

@@ -2,8 +2,8 @@ import { Peer } from '@/core';
 import crypto from 'crypto';
 
 export class LimitedHashTable<K, V> {
-    private keyToValue: Map<K, V> = new Map();
-    private valueToKey: Map<V, K> = new Map();
+    private readonly keyToValue: Map<K, V> = new Map();
+    private readonly valueToKey: Map<V, K> = new Map();
     private maxSize: number;
 
     constructor(maxSize: number) {
@@ -23,8 +23,10 @@ export class LimitedHashTable<K, V> {
         }
         while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
             const oldestKey = this.keyToValue.keys().next().value;
-            this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
-            this.keyToValue.delete(oldestKey);
+            if (oldestKey !== undefined) {
+                this.valueToKey.delete(this.keyToValue.get(oldestKey) as V);
+                this.keyToValue.delete(oldestKey);
+            }
         }
     }
 
@@ -73,8 +75,8 @@ export class LimitedHashTable<K, V> {
 }
 
 class MessageUniqueWrapper {
-    private msgDataMap: LimitedHashTable<string, number>;
-    private msgIdMap: LimitedHashTable<string, number>;
+    private readonly msgDataMap: LimitedHashTable<string, number>;
+    private readonly msgIdMap: LimitedHashTable<string, number>;
 
     constructor(maxMap: number = 1000) {
         this.msgIdMap = new LimitedHashTable<string, number>(maxMap);

src/common/path.ts

@@ -1,6 +1,7 @@
 import path, { dirname } from 'path';
 import { fileURLToPath } from 'url';
 import fs from 'fs';
+import os from 'os';
 
 export class NapCatPathWrapper {
     binaryPath: string;
@@ -11,17 +12,23 @@ export class NapCatPathWrapper {
 
     constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
         this.binaryPath = mainPath;
-        this.logsPath = path.join(this.binaryPath, 'logs');
-        this.configPath = path.join(this.binaryPath, 'config');
-        this.cachePath = path.join(this.binaryPath, 'cache');
+        let writePath: string;
+        if (os.platform() === 'darwin') {
+            writePath = path.join(os.homedir(), 'Library', 'Application Support', 'QQ', 'NapCat');
+        } else {
+            writePath = this.binaryPath;
+        }
+        this.logsPath = path.join(writePath, 'logs');
+        this.configPath = path.join(writePath, 'config');
+        this.cachePath = path.join(writePath, 'cache');
         this.staticPath = path.join(this.binaryPath, 'static');
-        if (fs.existsSync(this.logsPath)) {
+        if (!fs.existsSync(this.logsPath)) {
             fs.mkdirSync(this.logsPath, { recursive: true });
         }
-        if (fs.existsSync(this.configPath)) {
+        if (!fs.existsSync(this.configPath)) {
             fs.mkdirSync(this.configPath, { recursive: true });
         }
-        if (fs.existsSync(this.cachePath)) {
+        if (!fs.existsSync(this.cachePath)) {
             fs.mkdirSync(this.cachePath, { recursive: true });
         }
     }

src/common/proxy-handler.ts

@@ -1,4 +1,4 @@
-import { LogWrapper } from './log';
+import { LogWrapper } from '@/common/log';
 
 export function proxyHandlerOf(logger: LogWrapper) {
     return {

src/common/qq-basic-info.ts

@@ -1,9 +1,9 @@
-import path from 'node:path';
 import fs from 'node:fs';
 import { systemPlatform } from '@/common/system';
-import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import { getDefaultQQVersionConfigInfo, getQQPackageInfoPath, getQQVersionConfigPath, parseAppidFromMajor } from './helper';
 import AppidTable from '@/core/external/appid.json';
-import { LogWrapper } from './log';
+import { LogWrapper } from '@/common/log';
+import { getMajorPath } from '@/core';
 
 export class QQBasicInfoWrapper {
     QQMainPath: string | undefined;
@@ -20,14 +20,16 @@ export class QQBasicInfoWrapper {
         //基础目录获取
         this.context = context;
         this.QQMainPath = process.execPath;
-        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
         this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
+
         //基础信息获取 无快更则启用默认模板填充
         this.isQuickUpdate = !!this.QQVersionConfigPath;
         this.QQVersionConfig = this.isQuickUpdate
             ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
             : getDefaultQQVersionConfigInfo();
+
+        this.QQPackageInfoPath = getQQPackageInfoPath(this.QQMainPath, this.QQVersionConfig?.curVersion);
         this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
         const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
         this.QQVersionAppid = IQQVersionAppid;
@@ -52,13 +54,26 @@ export class QQBasicInfoWrapper {
     }
 
     //此方法不要直接使用
-    getQUAInternal() {
-        return systemPlatform === 'linux'
-            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
-            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+    getQUAFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: `V1_WIN_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            darwin: `V1_MAC_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+            linux: `V1_LNX_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`,
+        };
+        return platformMapping[systemPlatform] ?? (platformMapping.win32)!;
+    }
+
+    getAppIdFallback() {
+        const platformMapping: Partial<Record<NodeJS.Platform, string>> = {
+            win32: '537246092',
+            darwin: '537246140',
+            linux: '537246140',
+        };
+        return platformMapping[systemPlatform] ?? '537246092';
     }
 
     getAppidV2(): { appid: string; qua: string } {
+        // 通过已有表 性能好
         const appidTbale = AppidTable as unknown as QQAppidTableType;
         const fullVersion = this.getFullQQVesion();
         if (fullVersion) {
@@ -67,10 +82,25 @@ export class QQBasicInfoWrapper {
                 return data;
             }
         }
-
-        // else
+        // 通过Major拉取 性能差
+        try {
+            const majorAppid = this.getAppidV2ByMajor(fullVersion);
+            if (majorAppid) {
+                this.context.logger.log(`[QQ版本兼容性检测] 当前版本Appid未内置 通过Major获取 为了更好的性能请尝试更新NapCat`);
+                return { appid: majorAppid, qua: this.getQUAFallback() };
+            }
+        } catch (error) {
+            this.context.logger.log(`[QQ版本兼容性检测] 通过Major 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        }
+        // 最终兜底为老版本
         this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
         this.context.logger.log(`[QQ版本兼容性检测] ${fullVersion} 版本兼容性不佳，可能会导致一些功能无法正常使用`,);
-        return { appid: systemPlatform === 'linux' ? '537243600' : '537243441', qua: this.getQUAInternal() };
+        return { appid: this.getAppIdFallback(), qua: this.getQUAFallback() };
     }
+    getAppidV2ByMajor(QQVersion: string) {
+        const majorPath = getMajorPath(QQVersion);
+        const appid = parseAppidFromMajor(majorPath);
+        return appid;
+    }
+
 }

src/common/request.ts

@@ -8,49 +8,48 @@ export class RequestUtil {
         const client = url.startsWith('https') ? https : http;
         return new Promise((resolve, reject) => {
             const req = client.get(url, (res) => {
-                let cookies: { [key: string]: string } = {};
-                const handleRedirect = (res: http.IncomingMessage) => {
-                    //console.log(res.headers.location);
-                    if (res.statusCode === 301 || res.statusCode === 302) {
-                        if (res.headers.location) {
-                            const redirectUrl = new URL(res.headers.location, url);
-                            RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
-                                // 合并重定向过程中的cookies
-                                cookies = { ...cookies, ...redirectCookies };
-                                resolve(cookies);
-                            }).catch((err) => {
-                                reject(err);
-                            });
-                        } else {
-                            resolve(cookies);
-                        }
-                    } else {
-                        resolve(cookies);
-                    }
-                };
-                res.on('data', () => {
-                }); // Necessary to consume the stream
+                const cookies: { [key: string]: string } = {};
+
+                res.on('data', () => { }); // Necessary to consume the stream
                 res.on('end', () => {
-                    handleRedirect(res);
+                    this.handleRedirect(res, url, cookies)
+                        .then(resolve)
+                        .catch(reject);
                 });
+
                 if (res.headers['set-cookie']) {
-                    //console.log(res.headers['set-cookie']);
-                    res.headers['set-cookie'].forEach((cookie) => {
-                        const parts = cookie.split(';')[0].split('=');
-                        const key = parts[0];
-                        const value = parts[1];
-                        if (key && value && key.length > 0 && value.length > 0) {
-                            cookies[key] = value;
-                        }
-                    });
+                    this.extractCookies(res.headers['set-cookie'], cookies);
                 }
             });
-            req.on('error', (error: any) => {
+
+            req.on('error', (error: Error) => {
                 reject(error);
             });
         });
     }
 
+    private static async handleRedirect(res: http.IncomingMessage, url: string, cookies: { [key: string]: string }): Promise<{ [key: string]: string }> {
+        if (res.statusCode === 301 || res.statusCode === 302) {
+            if (res.headers.location) {
+                const redirectUrl = new URL(res.headers.location, url);
+                const redirectCookies = await this.HttpsGetCookies(redirectUrl.href);
+                // 合并重定向过程中的cookies
+                return { ...cookies, ...redirectCookies };
+            }
+        }
+        return cookies;
+    }
+
+    private static extractCookies(setCookieHeaders: string[], cookies: { [key: string]: string }) {
+        setCookieHeaders.forEach((cookie) => {
+            const parts = cookie.split(';')[0].split('=');
+            const key = parts[0];
+            const value = parts[1];
+            if (key && value && key.length > 0 && value.length > 0) {
+                cookies[key] = value;
+            }
+        });
+    }
 
     // 请求和回复都是JSON data传原始内容 自动编码json
     static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: {
@@ -61,7 +60,7 @@ export class RequestUtil {
         const options = {
             hostname: option.hostname,
             port: option.port,
-            path: option.href,
+            path: option.pathname + option.search,
             method: method,
             headers: headers,
         };
@@ -88,13 +87,13 @@ export class RequestUtil {
                         } else {
                             reject(new Error(`Unexpected status code: ${res.statusCode}`));
                         }
-                    } catch (parseError) {
-                        reject(parseError);
+                    } catch (parseError: unknown) {
+                        reject(new Error((parseError as Error).message));
                     }
                 });
             });
 
-            req.on('error', (error: any) => {
+            req.on('error', (error: Error) => {
                 reject(error);
             });
             if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
@@ -133,62 +132,4 @@ export class RequestUtil {
             Buffer.from(footer, 'utf8'),
         ]);
     }
-
-    static async uploadImageForOpenPlatform(filePath: string, cookies: string): Promise<string> {
-        return new Promise(async (resolve, reject) => {
-            type retType = { retcode: number, result?: { url: string } };
-            try {
-                const options = {
-                    hostname: 'cgi.connect.qq.com',
-                    port: 443,
-                    path: '/qqconnectopen/upload_share_image',
-                    method: 'POST',
-                    headers: {
-                        'Referer': 'https://cgi.connect.qq.com',
-                        'Cookie': cookies,
-                        'Accept': '*/*',
-                        'Connection': 'keep-alive',
-                        'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW',
-                    },
-                };
-                const req = https.request(options, async (res) => {
-                    let responseBody = '';
-
-                    res.on('data', (chunk: string | Buffer) => {
-                        responseBody += chunk.toString();
-                    });
-
-                    res.on('end', () => {
-                        try {
-                            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
-                                const responseJson = JSON.parse(responseBody) as retType;
-                                resolve(responseJson.result!.url!);
-                            } else {
-                                reject(new Error(`Unexpected status code: ${res.statusCode}`));
-                            }
-                        } catch (parseError) {
-                            reject(parseError);
-                        }
-
-                    });
-
-                });
-
-                req.on('error', (error) => {
-                    reject(error);
-                    console.log('Error during upload:', error);
-                });
-
-                const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
-                // req.setHeader('Content-Length', Buffer.byteLength(body));
-                // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
-                req.write(body);
-                req.end();
-                return;
-            } catch (error) {
-                reject(error);
-            }
-            return undefined;
-        });
-    }
 }

src/common/system.ts

@@ -1,12 +1,8 @@
 import os from 'node:os';
 import path from 'node:path';
-import { networkInterfaces } from 'os';
-import { randomUUID } from 'crypto';
 
 // 缓解Win7设备兼容性问题
 let osName: string;
-// 设备ID
-let machineId: Promise<string>;
 
 try {
     osName = os.hostname();
@@ -14,54 +10,6 @@ try {
     osName = 'NapCat'; // + crypto.randomUUID().substring(0, 4);
 }
 
-const invalidMacAddresses = new Set([
-    '00:00:00:00:00:00',
-    'ff:ff:ff:ff:ff:ff',
-    'ac:de:48:00:11:22',
-]);
-
-function validateMacAddress(candidate: string): boolean {
-    // eslint-disable-next-line no-useless-escape
-    const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
-    return !invalidMacAddresses.has(tempCandidate);
-}
-
-export async function getMachineId(): Promise<string> {
-    if (!machineId) {
-        machineId = (async () => {
-            const id = await getMacMachineId();
-            return id ?? randomUUID(); // fallback, generate a UUID
-        })();
-    }
-
-    return machineId;
-}
-
-export function getMac(): string {
-    const ifaces = networkInterfaces();
-    for (const name in ifaces) {
-        const networkInterface = ifaces[name];
-        if (networkInterface) {
-            for (const { mac } of networkInterface) {
-                if (validateMacAddress(mac)) {
-                    return mac;
-                }
-            }
-        }
-    }
-
-    throw new Error('Unable to retrieve mac address (unexpected format)');
-}
-
-async function getMacMachineId(): Promise<string | undefined> {
-    try {
-        const crypto = await import('crypto');
-        const macAddress = getMac();
-        return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
-    } catch (err) {
-        return undefined;
-    }
-}
 
 const homeDir = os.homedir();
 

src/common/version.ts

@@ -1 +1 @@
-export const napCatVersion = '2.2.41';
+export const napCatVersion = '4.2.5';

src/core/adapters/NodeIDependsAdapter.ts

@@ -1,14 +1,15 @@
+import { MsfChangeReasonType, MsfStatusType } from "@/core/types/adapter";
+
 export class NodeIDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number) {
-        // console.log(arg1, arg2);
-        // if (arg1 == 2 && arg2 == 2) {
-        //   log("NapCat丢失网络连接,请检查网络")
-        // }
+    onMSFStatusChange(statusType: MsfStatusType, changeReasonType: MsfChangeReasonType) {
+
     }
 
     onMSFSsoError(args: unknown) {
+
     }
 
     getGroupCode(args: unknown) {
+
     }
 }

src/core/apis/cache.ts

@@ -1,63 +0,0 @@
-import {
-    CacheFileListItem,
-    CacheFileType,
-    ChatCacheListItemBasic,
-    ChatType,
-    InstanceContext,
-    NapCatCore,
-} from '@/core';
-
-export class NTQQCacheApi {
-    context: InstanceContext;
-    core: NapCatCore;
-
-    constructor(context: InstanceContext, core: NapCatCore) {
-        this.context = context;
-        this.core = core;
-    }
-
-    async setCacheSilentScan(isSilent: boolean = true) {
-        return '';
-    }
-
-    getCacheSessionPathList() {
-        return '';
-    }
-
-    clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        // 参数未验证
-        return this.context.session.getStorageCleanService().clearCacheDataByKeys(cacheKeys);
-    }
-
-    addCacheScannedPaths(pathMap: object = {}) {
-        return this.context.session.getStorageCleanService().addCacheScanedPaths(pathMap);
-    }
-
-    scanCache() {
-        //return (await this.context.session.getStorageCleanService().scanCache()).size;
-    }
-
-    getHotUpdateCachePath() {
-        // 未实现
-        return '';
-    }
-
-    getDesktopTmpPath() {
-        // 未实现
-        return '';
-    }
-
-    getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return this.context.session.getStorageCleanService().getChatCacheInfo(type, pageSize, 1, pageIndex);
-    }
-
-    getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        // const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
-        // 需要五个参数
-        // return napCatCore.session.getStorageCleanService().getFileCacheInfo();
-    }
-
-    async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return this.context.session.getStorageCleanService().clearChatCacheInfo(chats, fileKeys);
-    }
-}

src/core/apis/collection.ts

@@ -1,4 +1,4 @@
-import { InstanceContext, NapCatCore } from '..';
+import { InstanceContext, NapCatCore } from '@/core';
 
 export class NTQQCollectionApi {
     context: InstanceContext;

src/core/apis/file.ts

@@ -5,12 +5,14 @@ import {
     IMAGE_HTTP_HOST_NT,
     Peer,
     PicElement,
+    PicSubType,
     PicType,
+    RawMessage,
     SendFileElement,
     SendPicElement,
     SendPttElement,
     SendVideoElement,
-} from '@/core/entities';
+} from '@/core/types';
 import path from 'path';
 import fs from 'fs';
 import fsPromises from 'fs/promises';
@@ -18,22 +20,29 @@ import { InstanceContext, NapCatCore, SearchResultItem } from '@/core';
 import * as fileType from 'file-type';
 import imageSize from 'image-size';
 import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-import { RkeyManager } from '../helper/rkey';
-import { calculateFileMD5, isGIF } from '@/common/file';
+import { RkeyManager } from '@/core/helper/rkey';
+import { calculateFileMD5 } from '@/common/file';
 import pathLib from 'node:path';
 import { defaultVideoThumbB64, getVideoInfo } from '@/common/video';
 import ffmpeg from 'fluent-ffmpeg';
 import { encodeSilk } from '@/common/audio';
+import { SendMessageContext } from '@/onebot/api';
+import { getFileTypeForSendType } from '../helper/msg';
 
 export class NTQQFileApi {
     context: InstanceContext;
     core: NapCatCore;
     rkeyManager: RkeyManager;
+    packetRkey: Array<{ rkey: string; time: number; type: number; ttl: bigint }> | undefined;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey', this.context.logger);
+        this.rkeyManager = new RkeyManager([
+            'https://rkey.napneko.icu/rkeys'
+        ],
+        this.context.logger
+        );
     }
 
     async copyFile(filePath: string, destPath: string) {
@@ -71,7 +80,7 @@ export class NTQQFileApi {
             file_uuid: '',
         });
 
-        await this.copyFile(filePath, mediaPath!);
+        await this.copyFile(filePath, mediaPath);
         const fileSize = await this.getFileSize(filePath);
         return {
             md5: fileMd5,
@@ -82,7 +91,7 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendFileElement(filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
+    async createValidSendFileElement(context: SendMessageContext, filePath: string, fileName: string = '', folderId: string = '',): Promise<SendFileElement> {
         const {
             fileName: _fileName,
             path,
@@ -91,6 +100,7 @@ export class NTQQFileApi {
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
+        context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.FILE,
             elementId: '',
@@ -98,17 +108,18 @@ export class NTQQFileApi {
                 fileName: fileName || _fileName,
                 folderId: folderId,
                 filePath: path,
-                fileSize: (fileSize).toString(),
+                fileSize: fileSize.toString(),
             },
         };
     }
 
-    async createValidSendPicElement(picPath: string, summary: string = '', subType: 0 | 1 = 0,): Promise<SendPicElement> {
+    async createValidSendPicElement(context: SendMessageContext, picPath: string, summary: string = '', subType: PicSubType = 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');
         }
         const imageSize = await this.core.apis.FileApi.getImageSize(picPath);
+        context.deleteAfterSentFiles.push(path);
         return {
             elementType: ElementType.PIC,
             elementId: '',
@@ -120,7 +131,7 @@ export class NTQQFileApi {
                 fileName: fileName,
                 sourcePath: path,
                 original: true,
-                picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
+                picType: await getFileTypeForSendType(picPath),
                 picSubType: subType,
                 fileUuid: '',
                 fileSubId: '',
@@ -130,40 +141,59 @@ export class NTQQFileApi {
         };
     }
 
-    async createValidSendVideoElement(filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
+    async createValidSendVideoElement(context: SendMessageContext, filePath: string, fileName: string = '', diyThumbPath: string = ''): Promise<SendVideoElement> {
         const logger = this.core.context.logger;
+        let videoInfo = {
+            width: 1920,
+            height: 1080,
+            time: 15,
+            format: 'mp4',
+            size: 0,
+            filePath,
+        };
+        try {
+            videoInfo = await getVideoInfo(filePath, logger);
+        } catch (e) {
+            logger.logError.bind(logger)('获取视频信息失败，将使用默认值', e);
+        }
+
+        let fileExt = 'mp4';
+        try {
+            const tempExt = (await fileType.fileTypeFromFile(filePath))?.ext;
+            if (tempExt) fileExt = tempExt;
+        } catch (e) {
+            this.context.logger.logError.bind(logger)('获取文件类型失败', e);
+        }
+        const newFilePath = filePath + '.' + fileExt;
+        fs.copyFileSync(filePath, newFilePath);
+        context.deleteAfterSentFiles.push(newFilePath);
+        filePath = newFilePath;
         const { fileName: _fileName, path, fileSize, md5 } = await this.core.apis.FileApi.uploadFile(filePath, ElementType.VIDEO);
         if (fileSize === 0) {
             throw new Error('文件异常，大小为0');
         }
+        videoInfo.size = fileSize;
         let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`);
         thumb = pathLib.dirname(thumb);
-        let videoInfo = {
-            width: 1920, height: 1080,
-            time: 15,
-            format: 'mp4',
-            size: fileSize,
-            filePath,
-        };
-        try {
-            videoInfo = await getVideoInfo(path, logger);
-        } catch (e) {
-            logger.logError('获取视频信息失败，将使用默认值', e);
-        }
+
         const thumbPath = new Map();
         const _thumbPath = await new Promise<string | undefined>((resolve, reject) => {
             const thumbFileName = `${md5}_0.png`;
             const thumbPath = pathLib.join(thumb, thumbFileName);
             ffmpeg(filePath)
                 .on('error', (err) => {
-                    logger.logDebug('获取视频封面失败，使用默认封面', err);
-                    if (diyThumbPath) {
-                        fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
+                    try {
+                        logger.logDebug('获取视频封面失败，使用默认封面', err);
+                        if (diyThumbPath) {
+                            fsPromises.copyFile(diyThumbPath, thumbPath).then(() => {
+                                resolve(thumbPath);
+                            }).catch(reject);
+                        } else {
+                            fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
                             resolve(thumbPath);
-                        }).catch(reject);
-                    } else {
-                        fs.writeFileSync(thumbPath, Buffer.from(defaultVideoThumbB64, 'base64'));
-                        resolve(thumbPath);
+                        }
+                    } catch (error) {
+                        logger.logError.bind(logger)('获取视频封面失败，使用默认封面失败', error);
                     }
                 })
                 .screenshots({
@@ -179,11 +209,13 @@ export class NTQQFileApi {
         const thumbSize = _thumbPath ? (await fsPromises.stat(_thumbPath)).size : 0;
         thumbPath.set(0, _thumbPath);
         const thumbMd5 = _thumbPath ? await calculateFileMD5(_thumbPath) : '';
+        context.deleteAfterSentFiles.push(path);
+        const uploadName = (fileName || _fileName).toLocaleLowerCase().endsWith('.' + fileExt.toLocaleLowerCase()) ? (fileName || _fileName) : (fileName || _fileName) + '.' + fileExt;
         return {
             elementType: ElementType.VIDEO,
             elementId: '',
             videoElement: {
-                fileName: fileName || _fileName,
+                fileName: uploadName,
                 filePath: path,
                 videoMd5: md5,
                 thumbMd5,
@@ -207,7 +239,9 @@ export class NTQQFileApi {
             throw new Error('文件异常，大小为0');
         }
         if (converted) {
-            fsPromises.unlink(silkPath);
+            fsPromises.unlink(silkPath).then().catch(
+                (e) => this.context.logger.logError.bind(this.context.logger)('删除临时文件失败', e)
+            );
         }
         return {
             elementType: ElementType.PTT,
@@ -216,7 +250,7 @@ export class NTQQFileApi {
                 fileName: fileName,
                 filePath: path,
                 md5HexStr: md5,
-                fileSize: fileSize,
+                fileSize: fileSize.toString(),
                 duration: duration ?? 1,
                 formatType: 1,
                 voiceType: 1,
@@ -245,9 +279,55 @@ export class NTQQFileApi {
         return fileTransNotifyInfo.filePath;
     }
 
+    async downloadRawMsgMedia(msg: RawMessage[]) {
+        const res = await Promise.all(
+            msg.map(m =>
+                Promise.all(
+                    m.elements
+                        .filter(element =>
+                            element.elementType === ElementType.PIC ||
+                            element.elementType === ElementType.VIDEO ||
+                            element.elementType === ElementType.PTT ||
+                            element.elementType === ElementType.FILE
+                        )
+                        .map(element =>
+                            this.downloadMedia(m.msgId, m.chatType, m.peerUid, element.elementId, '', '', 1000 * 60 * 2, true)
+                        )
+                )
+            )
+        );
+        msg.forEach((m, msgIndex) => {
+            const elementResults = res[msgIndex];
+            let elementIndex = 0;
+            m.elements.forEach(element => {
+                if (
+                    element.elementType === ElementType.PIC ||
+                    element.elementType === ElementType.VIDEO ||
+                    element.elementType === ElementType.PTT ||
+                    element.elementType === ElementType.FILE
+                ) {
+                    switch (element.elementType) {
+                    case ElementType.PIC:
+                            element.picElement!.sourcePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.VIDEO:
+                            element.videoElement!.filePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.PTT:
+                            element.pttElement!.filePath = elementResults[elementIndex];
+                        break;
+                    case ElementType.FILE:
+                            element.fileElement!.filePath = elementResults[elementIndex];
+                        break;
+                    }
+                    elementIndex++;
+                }
+            });
+        });
+    }
+
     async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
-        //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
-        // 用于下载收到的消息中的图片等
+        // 用于下载文件
         if (sourcePath && fs.existsSync(sourcePath)) {
             if (force) {
                 try {
@@ -275,7 +355,7 @@ export class NTQQFileApi {
                 filePath: thumbPath,
             }],
             () => true,
-            (arg) => arg.msgId === msgId,
+            (arg) => arg.msgElementId === elementId && arg.msgId === msgId,
             1,
             timeout,
         );
@@ -284,79 +364,18 @@ export class NTQQFileApi {
 
     async getImageSize(filePath: string): Promise<ISizeCalculationResult> {
         return new Promise((resolve, reject) => {
-            imageSize(filePath, (err, dimensions) => {
+            imageSize(filePath, (err: Error | null, dimensions) => {
                 if (err) {
-                    reject(err);
+                    reject(new Error(err.message));
+                } else if (!dimensions) {
+                    reject(new Error('获取图片尺寸失败'));
                 } else {
-                    if (!dimensions) {
-                        reject(new Error('获取图片尺寸失败'));
-                    } else {
-                        resolve(dimensions);
-                    }
+                    resolve(dimensions);
                 }
             });
         });
     }
 
-    async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-        let GroupData;
-        let BuddyData;
-        if (peer.chatType === ChatType.KCHATTYPEGROUP) {
-            GroupData =
-                [{
-                    groupCode: peer.peerUid,
-                    isConf: false,
-                    hasModifyConfGroupFace: true,
-                    hasModifyConfGroupName: true,
-                    groupName: 'NapCat.Cached',
-                    remark: 'NapCat.Cached',
-                }];
-        } else if (peer.chatType === ChatType.KCHATTYPEC2C) {
-            BuddyData = [{
-                category_name: 'NapCat.Cached',
-                peerUid: peer.peerUid,
-                peerUin: peer.peerUid,
-                remark: 'NapCat.Cached',
-            }];
-        } else {
-            return undefined;
-        }
-
-        return this.context.session.getSearchService().addSearchHistory({
-            type: 4,
-            contactList: [],
-            id: -1,
-            groupInfos: [],
-            msgs: [],
-            fileInfos: [
-                {
-                    chatType: peer.chatType,
-                    buddyChatInfo: BuddyData || [],
-                    discussChatInfo: [],
-                    groupChatInfo: GroupData || [],
-                    dataLineChatInfo: [],
-                    tmpChatInfo: [],
-                    msgId: msgId,
-                    msgSeq: msgSeq,
-                    msgTime: Math.floor(Date.now() / 1000).toString(),
-                    senderUid: senderUid,
-                    senderNick: 'NapCat.Cached',
-                    senderRemark: 'NapCat.Cached',
-                    senderCard: 'NapCat.Cached',
-                    elemId: elemId,
-                    elemType: elemType,
-                    fileSize: fileSize,
-                    filePath: '',
-                    fileName: fileName,
-                    hits: [{
-                        start: 12,
-                        end: 14,
-                    }],
-                },
-            ],
-        });
-    }
-
     async searchForFile(keys: string[]): Promise<SearchResultItem | undefined> {
         const randomResultId = 100000 + Math.floor(Math.random() * 10000);
         let searchId = 0;
@@ -394,35 +413,78 @@ export class NTQQFileApi {
         return fileData.filePath!;
     }
 
-    async getImageUrl(element: PicElement) {
+    async getImageUrl(element: PicElement): Promise<string> {
         if (!element) {
             return '';
         }
-        const url: string = element.originImageUrl!;  // 没有域名
+
+        const url: string = element.originImageUrl ?? '';
+
         const md5HexStr = element.md5HexStr;
         const fileMd5 = element.md5HexStr;
-
-        if (url) {
-            const parsedUrl = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
-            const imageAppid = parsedUrl.searchParams.get('appid');
-            const isNTFlavoredPic = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNTFlavoredPic) {
-                let rkey = parsedUrl.searchParams.get('rkey');
-                if (rkey) {
-                    return IMAGE_HTTP_HOST_NT + url;
-                }
-                const rkeyData = await this.rkeyManager.getRkey();
-                rkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-                return IMAGE_HTTP_HOST_NT + url + `${rkey}`;
-            } else {
-                // 老的图片url，不需要rkey
-                return IMAGE_HTTP_HOST + url;
-            }
-        } else if (fileMd5 || md5HexStr) {
-            // 没有url，需要自己拼接
-            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr)!.toUpperCase()}/0`;
+        const parsedUrl = new URL(IMAGE_HTTP_HOST + url);
+        const imageAppid = parsedUrl.searchParams.get('appid');
+        const isNTV2 = imageAppid && ['1406', '1407'].includes(imageAppid);
+        const imageFileId = parsedUrl.searchParams.get('fileid');
+        if (url && isNTV2 && imageFileId) {
+            const rkeyData = await this.getRkeyData();
+            return this.getImageUrlFromParsedUrl(imageFileId, imageAppid, rkeyData);
         }
-        this.context.logger.logDebug('图片url获取失败', element);
+        return this.getImageUrlFromMd5(fileMd5, md5HexStr);
+    }
+
+    private async getRkeyData() {
+        const rkeyData = {
+            private_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qEc3Rbib9LP4',
+            group_rkey: 'CAQSKAB6JWENi5LM_xp9vumLbuThJSaYf-yzMrbZsuq7Uz2qffcqm614gds',
+            online_rkey: false
+        };
+
+        try {
+            if (this.core.apis.PacketApi.available) {
+                const rkey_expired_private = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                const rkey_expired_group = !this.packetRkey || this.packetRkey[0].time + Number(this.packetRkey[0].ttl) < Date.now() / 1000;
+                if (rkey_expired_private || rkey_expired_group) {
+                    this.packetRkey = await this.core.apis.PacketApi.pkt.operation.FetchRkey();
+                }
+                if (this.packetRkey && this.packetRkey.length > 0) {
+                    rkeyData.group_rkey = this.packetRkey[1].rkey.slice(6);
+                    rkeyData.private_rkey = this.packetRkey[0].rkey.slice(6);
+                    rkeyData.online_rkey = true;
+                }
+            }
+        } catch (error: any) {
+            this.context.logger.logError.bind(this.context.logger)('获取rkey失败', error.message);
+        }
+
+        if (!rkeyData.online_rkey) {
+            try {
+                const tempRkeyData = await this.rkeyManager.getRkey();
+                rkeyData.group_rkey = tempRkeyData.group_rkey;
+                rkeyData.private_rkey = tempRkeyData.private_rkey;
+                rkeyData.online_rkey = tempRkeyData.expired_time > Date.now() / 1000;
+            } catch (e) {
+                this.context.logger.logError.bind(this.context.logger)('获取rkey失败 Fallback Old Mode', e);
+            }
+        }
+
+        return rkeyData;
+    }
+
+    private getImageUrlFromParsedUrl(imageFileId: string, appid: string, rkeyData: any): string {
+        const rkey = appid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
+        if (rkeyData.online_rkey) {
+            return IMAGE_HTTP_HOST_NT + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
+        }
+        return IMAGE_HTTP_HOST + `/download?appid=${appid}&fileid=${imageFileId}&rkey=${rkey}`;
+    }
+
+    private getImageUrlFromMd5(fileMd5: string | undefined, md5HexStr: string | undefined): string {
+        if (fileMd5 || md5HexStr) {
+            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 ?? md5HexStr ?? '').toUpperCase()}/0`;
+        }
+
+        this.context.logger.logDebug('图片url获取失败', { fileMd5, md5HexStr });
         return '';
     }
 }

src/core/apis/friend.ts

@@ -1,4 +1,4 @@
-import { FriendV2 } from '@/core/entities';
+import { FriendV2 } from '@/core/types';
 import { BuddyListReqType, InstanceContext, NapCatCore } from '@/core';
 import { LimitedHashTable } from '@/common/message-unique';
 
@@ -6,19 +6,16 @@ export class NTQQFriendApi {
     context: InstanceContext;
     core: NapCatCore;
 
-    // friends: Map<string, Friend> = new Map<string, FriendV2>();
-
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        // if (!this.context.basicInfoWrapper.requireMinNTQQBuild('26702')) {
-        //     this.getFriends(true);
-        // }
     }
-
+    async setBuddyRemark(uid: string, remark: string) {
+        return this.context.session.getBuddyService().setBuddyRemark({ uid, remark });
+    }
     async getBuddyV2SimpleInfoMap(refresh = false) {
         const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL) : await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
+        const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL);
         const uids = buddyListV2.data.flatMap(item => item.buddyUids);
         return await this.core.eventWrapper.callNoListenerEvent(
             'NodeIKernelProfileService/getCoreAndBaseInfo',
@@ -27,7 +24,7 @@ export class NTQQFriendApi {
         );
     }
 
-    async getBuddyV2(refresh = false): Promise<FriendV2[]> {
+    async getBuddy(refresh = false): Promise<FriendV2[]> {
         return Array.from((await this.getBuddyV2SimpleInfoMap(refresh)).values());
     }
 
@@ -37,15 +34,17 @@ export class NTQQFriendApi {
         data.forEach((value) => retMap.set(value.uin!, value.uid!));
         return retMap;
     }
-
-    async getBuddyV2ExWithCate(refresh = false) {
-        const categoryMap: Map<string, any> = new Map();
+    async delBuudy(uid: string, tempBlock = false, tempBothDel = false) {
+        return this.context.session.getBuddyService().delBuddy({
+            friendUid: uid,
+            tempBlock: tempBlock,
+            tempBothDel: tempBothDel
+        });
+    }
+    async getBuddyV2ExWithCate() {
         const buddyService = this.context.session.getBuddyService();
-        const buddyListV2 = refresh ? (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data : (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
+        const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data;
         const uids = buddyListV2.flatMap(item => {
-            item.buddyUids.forEach(uid => {
-                categoryMap.set(uid, { categoryId: item.categoryId, categoryName: item.categroyName });
-            });
             return item.buddyUids;
         });
         const data = await this.core.eventWrapper.callNoListenerEvent(
@@ -59,7 +58,7 @@ export class NTQQFriendApi {
             categoryName: category.categroyName,
             categoryMbCount: category.categroyMbCount,
             onlineCount: category.onlineCount,
-            buddyList: category.buddyUids.map(uid => data.get(uid)!).filter(value => value),
+            buddyList: category.buddyUids.map(uid => data.get(uid)).filter(value => !!value),
         }));
     }
 

src/core/apis/group.ts

@@ -1,17 +1,17 @@
 import {
-    ChatType,
     GeneralCallResult,
     Group,
     GroupMember,
-    GroupMemberRole,
-    GroupRequestOperateTypes,
+    NTGroupMemberRole,
+    NTGroupRequestOperateTypes,
     InstanceContext,
     KickMemberV2Req,
     MemberExtSourceType,
     NapCatCore,
 } from '@/core';
-import { isNumeric, runAllWithTimeout } from '@/common/helper';
+import { isNumeric, solveAsyncProblem } from '@/common/helper';
 import { LimitedHashTable } from '@/common/message-unique';
+import { NTEventWrapper } from '@/common/event';
 
 export class NTQQGroupApi {
     context: InstanceContext;
@@ -20,19 +20,30 @@ export class NTQQGroupApi {
     groupMemberCache: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>();
     groups: Group[] = [];
     essenceLRU = new LimitedHashTable<number, string>(1000);
+    session: any;
 
     constructor(context: InstanceContext, core: NapCatCore) {
         this.context = context;
         this.core = core;
-        this.initCache().then().catch(context.logger.logError);
     }
-
+    async initApi() {
+        this.initCache().then().catch(this.context.logger.logError.bind(this.context.logger));
+    }
     async initCache() {
         this.groups = await this.getGroups();
         for (const group of this.groups) {
             this.groupCache.set(group.groupCode, group);
         }
         this.context.logger.logDebug(`加载${this.groups.length}个群组缓存完成`);
+        // process.pid 调试点
+    }
+
+    async getCoreAndBaseInfo(uids: string[]) {
+        return await this.core.eventWrapper.callNoListenerEvent(
+            'NodeIKernelProfileService/getCoreAndBaseInfo',
+            'nodeStore',
+            uids,
+        );
     }
 
     async fetchGroupEssenceList(groupCode: string) {
@@ -43,9 +54,13 @@ export class NTQQGroupApi {
             pageLimit: 300,
         }, pskey);
     }
-
-    async clearGroupNotifiesUnreadCount(unk: boolean) {
-        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(unk);
+    async getGroupShutUpMemberList(groupCode: string) {
+        const data = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onShutUpMemberListChanged', (group_id) => group_id === groupCode, 1, 1000);
+        this.context.session.getGroupService().getGroupShutUpMemberList(groupCode);
+        return (await data)[1];
+    }
+    async clearGroupNotifiesUnreadCount(uk: boolean) {
+        return this.context.session.getGroupService().clearGroupNotifiesUnreadCount(uk);
     }
 
     async setGroupAvatar(gc: string, filePath: string) {
@@ -61,9 +76,9 @@ export class NTQQGroupApi {
         return groupList;
     }
 
-    async getGroupExtFE0Info(GroupCode: string[], forced = true) {
+    async getGroupExtFE0Info(groupCode: string[], forced = true) {
         return this.context.session.getGroupService().getGroupExt0xEF0Info(
-            GroupCode,
+            groupCode,
             [],
             {
                 bindGuildId: 1,
@@ -121,8 +136,8 @@ export class NTQQGroupApi {
         return group;
     }
 
-    async getGroupMemberAll(GroupCode: string, forced = false) {
-        return this.context.session.getGroupService().getAllMemberList(GroupCode, forced);
+    async getGroupMemberAll(groupCode: string, forced = false) {
+        return this.context.session.getGroupService().getAllMemberList(groupCode, forced);
     }
 
     async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
@@ -131,15 +146,12 @@ export class NTQQGroupApi {
         let members = this.groupMemberCache.get(groupCodeStr);
         if (!members) {
             try {
-                members = await this.getGroupMembersV2(groupCodeStr);
-                // 更新群成员列表
+                members = await this.getGroupMembers(groupCodeStr);
                 this.groupMemberCache.set(groupCodeStr, members);
             } catch (e) {
                 return null;
             }
         }
-
-        // log('getGroupMember', members);
         function getMember() {
             let member: GroupMember | undefined;
             if (isNumeric(memberUinOrUidStr)) {
@@ -152,13 +164,14 @@ export class NTQQGroupApi {
 
         let member = getMember();
         if (!member) {
-            members = await this.getGroupMembersV2(groupCodeStr);
+            members = await this.getGroupMembers(groupCodeStr);
             member = getMember();
         }
         return member;
     }
-    async getGroupRecommendContactArkJson(GroupCode: string) {
-        return this.context.session.getGroupService().getGroupRecommendContactArkJson(GroupCode);
+
+    async getGroupRecommendContactArkJson(groupCode: string) {
+        return this.context.session.getGroupService().getGroupRecommendContactArkJson(groupCode);
     }
 
     async CreatGroupFileFolder(groupCode: string, folderName: string) {
@@ -174,7 +187,6 @@ export class NTQQGroupApi {
     }
 
     async addGroupEssence(GroupCode: string, msgId: string) {
-        // 需要 ob11msgId -> msgId + (peer) -> msgSeq + msgRandom
         const MsgData = await this.context.session.getMsgService().getMsgsIncludeSelf({
             chatType: 2,
             guildId: '',
@@ -185,7 +197,6 @@ export class NTQQGroupApi {
             msgRandom: parseInt(MsgData.msgList[0].msgRandom),
             msgSeq: parseInt(MsgData.msgList[0].msgSeq),
         };
-        // GetMsgByShortID(shortID); -> MsgService.getMsgs(Peer,MsgId,1,false); -> 组出参数
         return this.context.session.getGroupService().addGroupEssence(param);
     }
 
@@ -203,7 +214,6 @@ export class NTQQGroupApi {
             groupCode: GroupCode,
             needDeleteLocalMsg: needDeleteLocalMsg,
         };
-        //应该是直接返回不需要Listener的 未经测试 需测试再发布
         return this.context.session.getGroupService().quitGroupV2(param);
     }
 
@@ -246,9 +256,9 @@ export class NTQQGroupApi {
     async getGroupMemberV2(GroupCode: string, uid: string, forced = false) {
         const Listener = this.core.eventWrapper.registerListen(
             'NodeIKernelGroupListener/onMemberInfoChange',
+            (params, _, members) => params === GroupCode && members.size > 0,
             1,
             forced ? 5000 : 250,
-            (params) => params === GroupCode,
         );
         const retData = await (
             this.core.eventWrapper
@@ -266,55 +276,131 @@ export class NTQQGroupApi {
         return member;
     }
 
-    async getGroupMembersV2(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
-        const groupService = this.context.session.getGroupService();
-        const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
-        const listener = this.core.eventWrapper.registerListen(
-            'NodeIKernelGroupListener/onMemberListChange',
+    async searchGroup(groupCode: string) {
+        const [, ret] = await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelSearchService/searchGroup',
+            'NodeIKernelSearchListener/onSearchGroupResult',
+            [{
+                keyWords: groupCode,
+                groupNum: 25,
+                exactSearch: false,
+                penetrate: ''
+            }],
+            (ret) => ret.result === 0,
+            (params) => !!params.groupInfos.find(g => g.groupCode === groupCode),
             1,
-            500,
-            (params) => params.sceneId === sceneId,
+            5000
         );
-        try {
-            const [membersFromFunc, membersFromListener] = await Promise.allSettled([
-                groupService.getNextMemberList(sceneId, undefined, num),
-                listener,
-            ]);
-            if (membersFromFunc.status === 'fulfilled' && membersFromListener.status === 'fulfilled') {
-                return new Map([
-                    ...membersFromFunc.value.result.infos,
-                    ...membersFromListener.value[0].infos,
-                ]);
-            }
-            if (membersFromFunc.status === 'fulfilled') {
-                return membersFromFunc.value.result.infos;
-            }
-            if (membersFromListener.status === 'fulfilled') {
-                return membersFromListener.value[0].infos;
-            }
-            throw new Error('获取群成员列表失败');
-        } finally {
-            groupService.destroyMemberListScene(sceneId);
+        return ret.groupInfos.find(g => g.groupCode === groupCode);
+    }
+
+    async getGroupMemberEx(GroupCode: string, uid: string, forced = false, retry = 2) {
+        const data = await solveAsyncProblem((eventWrapper: NTEventWrapper, GroupCode: string, uid: string, forced = false) => {
+            return eventWrapper.callNormalEventV2(
+                'NodeIKernelGroupService/getMemberInfo',
+                'NodeIKernelGroupListener/onMemberInfoChange',
+                [GroupCode, [uid], forced],
+                (ret) => ret.result === 0,
+                (params, _, members) => params === GroupCode && members.size > 0 && members.has(uid),
+                1,
+                forced ? 2500 : 250
+            );
+        }, this.core.eventWrapper, GroupCode, uid, forced);
+        if (data && data[3] instanceof Map && data[3].has(uid)) {
+            return data[3].get(uid);
         }
+        if (retry > 0) {
+            const trydata = await this.getGroupMemberEx(GroupCode, uid, true, retry - 1) as GroupMember | undefined;
+            if (trydata) return trydata;
+        }
+        return undefined;
+    }
+
+    async tryGetGroupMembersV2(groupQQ: string, modeListener = false, num = 30, timeout = 100): Promise<{
+        infos: Map<string, GroupMember>;
+        finish: boolean;
+        hasNext: boolean | undefined;
+    }> {
+        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
+        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', (params) => params.sceneId === sceneId, 0, timeout)
+            .catch(() => { });
+        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
+        if (result.errCode !== 0) {
+            throw new Error('获取群成员列表出错,' + result.errMsg);
+        }
+        let resMode2;
+        if (modeListener) {
+            const ret = (await once)?.[0];
+            if (ret) {
+                resMode2 = ret;
+            }
+        }
+        this.context.session.getGroupService().destroyMemberListScene(sceneId);
+        return {
+            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
+            finish: result.result.finish,
+            hasNext: resMode2?.hasNext,
+        };
+    }
+
+    async GetGroupMembersV3(groupQQ: string, num = 3000, timeout = 2500): Promise<{
+        infos: Map<string, GroupMember>;
+        finish: boolean;
+        hasNext: boolean | undefined;
+        listenerMode: boolean;
+    }> {
+        const sceneId = this.context.session.getGroupService().createMemberListScene(groupQQ, 'groupMemberList_MainWindow_1');
+        const once = this.core.eventWrapper.registerListen('NodeIKernelGroupListener/onMemberListChange', (params) => params.sceneId === sceneId, 0, timeout)
+            .catch(() => { });
+        const result = await this.context.session.getGroupService().getNextMemberList(sceneId, undefined, num);
+        if (result.errCode !== 0) {
+            throw new Error('获取群成员列表出错,' + result.errMsg);
+        }
+        let resMode2;
+        if (result.result.finish && result.result.infos.size === 0) {
+            const ret = (await once)?.[0];
+            if (ret) {
+                resMode2 = ret;
+            }
+        }
+        this.context.session.getGroupService().destroyMemberListScene(sceneId);
+        return {
+            infos: new Map([...(resMode2?.infos ?? []), ...result.result.infos]),
+            finish: result.result.finish,
+            hasNext: resMode2?.hasNext,
+            listenerMode: resMode2?.hasNext !== undefined
+        };
+    }
+
+    async getGroupMembersV2(groupQQ: string, num = 3000, no_cache: boolean = false): Promise<Map<string, GroupMember>> {
+        if (no_cache) {
+            return (await this.getGroupMemberAll(groupQQ, true)).result.infos;
+        }
+        let res = await this.GetGroupMembersV3(groupQQ, num);
+        let ret = res.infos;
+        if (res.infos.size === 0 && !res.listenerMode) {
+            res = await this.GetGroupMembersV3(groupQQ, num);
+            ret = res.infos;
+        }
+        if (res.infos.size === 0) {
+            ret = (await this.getGroupMemberAll(groupQQ)).result.infos;
+        }
+        return ret;
     }
 
     async getGroupMembers(groupQQ: string, num = 3000): Promise<Map<string, GroupMember>> {
         const groupService = this.context.session.getGroupService();
         const sceneId = groupService.createMemberListScene(groupQQ, 'groupMemberList_MainWindow');
-        const result = await groupService.getNextMemberList(sceneId!, undefined, num);
+        const result = await groupService.getNextMemberList(sceneId, undefined, num);
         if (result.errCode !== 0) {
             throw new Error('获取群成员列表出错,' + result.errMsg);
         }
-
-        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`); //, Array.from(result.result.infos.values()));
+        this.context.logger.logDebug(`获取群(${groupQQ})成员列表结果:`, `members: ${result.result.infos.size}`);
         return result.result.infos;
     }
 
-    async getGroupFileCount(Gids: Array<string>) {
-        return this.context.session.getRichMediaService().batchGetGroupFileCount(Gids);
-    }
-
-    async getGroupIgnoreNotifies() {
+    async getGroupFileCount(group_ids: Array<string>) {
+        return this.context.session.getRichMediaService().batchGetGroupFileCount(group_ids);
     }
 
     async getArkJsonGroupShare(GroupCode: string) {
@@ -331,7 +417,7 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().uploadGroupBulletinPic(GroupCode, _Pskey, imageurl);
     }
 
-    async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
+    async handleGroupRequest(flag: string, operateType: NTGroupRequestOperateTypes, reason?: string) {
         const flagitem = flag.split('|');
         const groupCode = flagitem[0];
         const seq = flagitem[1];
@@ -340,12 +426,12 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().operateSysNotify(
             false,
             {
-                'operateType': operateType, // 2 拒绝
-                'targetMsg': {
-                    'seq': seq,  // 通知序列号
-                    'type': type,
-                    'groupCode': groupCode,
-                    'postscript': reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
+                operateType: operateType,
+                targetMsg: {
+                    seq: seq,  // 通知序列号
+                    type: type,
+                    groupCode: groupCode,
+                    postscript: reason ?? ' ', // 仅传空值可能导致处理失败，故默认给个空格
                 },
             });
     }
@@ -371,7 +457,7 @@ export class NTQQGroupApi {
         return this.context.session.getGroupService().modifyMemberCardName(groupQQ, memberUid, cardName);
     }
 
-    async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
+    async setMemberRole(groupQQ: string, memberUid: string, role: NTGroupMemberRole) {
         return this.context.session.getGroupService().modifyMemberRole(groupQQ, memberUid, role);
     }
 
@@ -397,11 +483,10 @@ export class NTQQGroupApi {
     }
 
     async getGroupRemainAtTimes(GroupCode: string) {
-        this.context.session.getGroupService().getGroupRemainAtTimes(GroupCode);
+        return this.context.session.getGroupService().getGroupRemainAtTimes(GroupCode);
     }
 
     async getMemberExtInfo(groupCode: string, uin: string) {
-        // 仅NTQQ 9.9.11 24568测试 容易炸开谨慎使用
         return this.context.session.getGroupService().getMemberExtInfo(
             {
                 groupCode: groupCode,

src/core/apis/index.ts

@@ -4,6 +4,4 @@ export * from './group';
 export * from './msg';
 export * from './user';
 export * from './webapi';
-export * from './sign';
-export * from './system';
-export * from './cache';
+export * from './system';

src/core/apis/msg.ts

@@ -1,11 +1,9 @@
-import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/entities';
-import { InstanceContext, NapCatCore } from '@/core';
+import { ChatType, GetFileListParam, Peer, RawMessage, SendMessageElement, SendStatusType } from '@/core/types';
+import { GroupFileInfoUpdateItem, InstanceContext, NapCatCore } from '@/core';
 import { GeneralCallResult } from '@/core/services/common';
 
 export class NTQQMsgApi {
-    // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
-    // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
-    // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
+
 
     context: InstanceContext;
     core: NapCatCore;
@@ -14,32 +12,28 @@ export class NTQQMsgApi {
         this.context = context;
         this.core = core;
     }
-
+    getMsgByClientSeqAndTime(peer: Peer, replyMsgClientSeq: string, replyMsgTime: string) {
+        // https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType 可以用过特殊方式拉取
+        return this.context.session.getMsgService().getMsgByClientSeqAndTime(peer, replyMsgClientSeq, replyMsgTime);
+    }
     async getAioFirstViewLatestMsgs(peer: Peer, MsgCount: number) {
         return this.context.session.getMsgService().getAioFirstViewLatestMsgs(peer, MsgCount);
     }
 
-    async getLatestDbMsgs(peer: Peer, MsgCount: number) {
-        return this.context.session.getMsgService().getLatestDbMsgs(peer, MsgCount);
-    }
-
-    async FetchLongMsg(peer: Peer, msgId: string) {
-        return this.context.session.getMsgService().fetchLongMsg(peer, msgId);
-    }
-
     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 M likiowa
+        //注意此处emojiType 可选值一般为1-2 2好像是unicode表情dec值 大部分情况 Taged Mlikiowa
         return this.context.session.getMsgService().getMsgEmojiLikesList(peer, msgSeq, emojiId, emojiType, '', false, count);
     }
 
     async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set: boolean = true) {
-        // nt_qq//global//nt_data//Emoji//emoji-resource//sysface_res/apng/ 下可以看到所有QQ表情预览
-        // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
-        // 其实以官方文档为准是最好的，https://bot.q.qq.com/wiki/develop/api-v2/openapi/emoji/model.html#EmojiType
         emojiId = emojiId.toString();
         return this.context.session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiId.length > 3 ? '2' : '1', set);
     }
@@ -93,6 +87,18 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
+    async queryMsgsWithFilterExWithSeqV3(peer: Peer, msgSeq: string, SendersUid: string[]) {
+        return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
+            chatInfo: peer,
+            filterMsgType: [],
+            filterSendersUid: SendersUid,
+            filterMsgToTime: '0',
+            filterMsgFromTime: '0',
+            isReverseOrder: false,
+            isIncludeCurrent: true,
+            pageLimit: 1,
+        });
+    }
     async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
         return await this.context.session.getMsgService().queryMsgsWithFilterEx('0', '0', msgSeq, {
             chatInfo: peer,
@@ -105,16 +111,9 @@ export class NTQQMsgApi {
             pageLimit: 1,
         });
     }
-    async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, z: boolean) {
-        return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, z);
-    }
-    async getMsgBySeqList(peer: Peer, msgSeqList: string[]) {
-        //坏的
-        return await this.context.session.getMsgService().getMsgsBySeqList(peer, msgSeqList);
-    }
-    async getMsgBySeqExFirstMsg(peer: Peer, rootMsgId: string, replyMsgId: string) {
-        let reply = await this.context.session.getMsgService().getSourceOfReplyMsgV2(peer, rootMsgId, replyMsgId);
-        console.log(reply);
+    // 客户端还在用别慌
+    async getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, isReverseOrder: boolean) {
+        return await this.context.session.getMsgService().getMsgsBySeqAndCount(peer, seq, count, desc, isReverseOrder);
     }
     async getMsgExBySeq(peer: Peer, msgSeq: string) {
         const DateNow = Math.floor(Date.now() / 1000);
@@ -137,19 +136,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, // Todo: 应当通过 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) {
@@ -157,11 +166,16 @@ export class NTQQMsgApi {
         return this.context.session.getMsgService().getMsgsIncludeSelf(peer, msgId, count, isReverseOrder);
     }
 
-    async recallMsg(peer: Peer, msgIds: string[]) {
-        await this.context.session.getMsgService().recallMsg({
-            chatType: peer.chatType,
-            peerUid: peer.peerUid,
-        }, msgIds);
+    async recallMsg(peer: Peer, msgId: string) {
+        await this.core.eventWrapper.callNormalEventV2(
+            'NodeIKernelMsgService/recallMsg',
+            'NodeIKernelMsgListener/onMsgInfoListUpdate',
+            [peer, [msgId]],
+            () => true,
+            (updatedList) => updatedList.find(m => m.msgId === msgId && m.recallTime !== '0') !== undefined,
+            1,
+            1000,
+        );
     }
 
     async PrepareTempChat(toUserUid: string, GroupCode: string, nickname: string) {
@@ -190,12 +204,12 @@ export class NTQQMsgApi {
     async sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete = true, timeout = 10000) {
         //唉？！我有个想法
         if (peer.chatType === ChatType.KCHATTYPETEMPC2CFROMGROUP && peer.guildId && peer.guildId !== '') {
-            const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid!);
+            const member = await this.core.apis.GroupApi.getGroupMember(peer.guildId, peer.peerUid);
             if (member) {
                 await this.PrepareTempChat(peer.peerUid, peer.guildId, member.nick);
             }
         }
-        const msgId = await this.generateMsgUniqueId(peer.chatType, await this.getServerTime());
+        const msgId = await this.generateMsgUniqueId(peer.chatType);
         peer.guildId = msgId;
         const [, msgList] = await this.core.eventWrapper.callNormalEventV2(
             'NodeIKernelMsgService/sendMsg',
@@ -221,12 +235,8 @@ export class NTQQMsgApi {
         return msgList.find(msgRecord => msgRecord.guildId === msgId);
     }
 
-    async generateMsgUniqueId(chatType: number, time: string) {
-        return this.context.session.getMsgService().generateMsgUniqueId(chatType, time);
-    }
-
-    async getServerTime() {
-        return this.context.session.getMSFService().getServerTime();
+    async generateMsgUniqueId(chatType: number) {
+        return this.context.session.getMsgService().generateMsgUniqueId(chatType, this.context.session.getMSFService().getServerTime());
     }
 
     async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {

src/core/apis/packet.ts

@@ -0,0 +1,66 @@
+import * as os from 'os';
+import offset from '@/core/external/offset.json';
+import { InstanceContext, NapCatCore } from "@/core";
+import { LogWrapper } from "@/common/log";
+import { PacketClientSession } from "@/core/packet/clientSession";
+import { napCatVersion } from "@/common/version";
+
+interface OffsetType {
+    [key: string]: {
+        recv: string;
+        send: string;
+    };
+}
+
+const typedOffset: OffsetType = offset;
+
+export class NTQQPacketApi {
+    context: InstanceContext;
+    core: NapCatCore;
+    logger: LogWrapper;
+    qqVersion: string | undefined;
+    pkt!: PacketClientSession;
+    errStack: string[] = [];
+
+    constructor(context: InstanceContext, core: NapCatCore) {
+        this.context = context;
+        this.core = core;
+        this.logger = core.context.logger;
+    }
+    async initApi() {
+        await this.InitSendPacket(this.context.basicInfoWrapper.getFullQQVesion())
+            .then()
+            .catch((err) => {
+                this.logger.logError.bind(this.core.context.logger);
+                this.errStack.push(err);
+            });
+    }
+    get available(): boolean {
+        return this.pkt?.available ?? false;
+    }
+
+    get clientLogStack() {
+        return this.pkt?.clientLogStack + '\n' + this.errStack.join('\n');
+    }
+
+    async InitSendPacket(qqVer: string) {
+        this.qqVersion = qqVer;
+        const table = typedOffset[qqVer + '-' + os.arch()];
+        if (!table) {
+            const err = `[Core] [Packet] PacketBackend 不支持当前QQ版本架构：${qqVer}-${os.arch()}，
+            请参照 https://github.com/NapNeko/NapCatQQ/releases/tag/v${napCatVersion} 配置正确的QQ版本！`;
+            this.logger.logError(err);
+            this.errStack.push(err);
+            return false;
+        }
+        if (this.core.configLoader.configData.packetBackend === 'disable') {
+            const err = '[Core] [Packet] 已禁用PacketBackend，NapCat.Packet将不会加载！';
+            this.logger.logError(err);
+            this.errStack.push(err);
+            return false;
+        }
+        this.pkt = new PacketClientSession(this.core);
+        await this.pkt.init(process.pid, table.recv, table.send);
+        return true;
+    }
+}

src/core/apis/sign.ts

@@ -1,5 +1,3 @@
-import { RequestUtil } from '@/common/request';
-import { MiniAppLuaJsonType } from '@/core';
 import { InstanceContext, NapCatCore } from '..';
 
 export class NTQQMusicSignApi {
@@ -10,215 +8,6 @@ export class NTQQMusicSignApi {
         this.context = context;
         this.core = core;
     }
-
-    async signMiniApp(CardData: MiniAppLuaJsonType) {
-        // {
-        //   "app": "com.tencent.miniapp.lua",
-        //   "bizsrc": "tianxuan.imgJumpArk",
-        //   "view": "miniapp",
-        //   "prompt": "hi! 这里有我的日常故事，只想讲给你听",
-        //   "config": {
-        //     "type": "normal",
-        //     "forward": 1,
-        //     "autosize": 0
-        //   },
-        //   "meta": {
-        //     "miniapp": {
-        //       "title": "hi! 这里有我的日常故事，只想讲给你听",
-        //       "preview": "https:\/\/tianquan.gtimg.cn\/qqAIAgent\/item\/7\/square.png",
-        //       "jumpUrl": "https:\/\/club.vip.qq.com\/transfer?open_kuikly_info=%7B%22version%22%3A%20%221%22%2C%22src_type%22%3A%20%22web%22%2C%22kr_turbo_display%22%3A%20%221%22%2C%22page_name%22%3A%20%22vas_ai_persona_moments%22%2C%22bundle_name%22%3A%20%22vas_ai_persona_moments%22%7D&page_name=vas_ai_persona_moments&enteranceId=share&robot_uin=3889008584",
-        //       "tag": "QQ智能体",
-        //       "tagIcon": "https:\/\/tianquan.gtimg.cn\/shoal\/qqAIAgent\/3e9d70c9-d98c-45b8-80b4-79d82971b514.png",
-        //       "source": "QQ智能体",
-        //       "sourcelogo": "https:\/\/tianquan.gtimg.cn\/shoal\/qqAIAgent\/3e9d70c9-d98c-45b8-80b4-79d82971b514.png"
-        //     }
-        //   }
-        // }
-
-        // token : function(url,skey){
-        //   var str = skey || cookie('skey') || cookie('rv2') || '',
-        //     hash = 5381;
-        //   if(url){
-        //     var hostname = uri(url).hostname;
-        //     if(hostname.indexOf('qun.qq.com') > -1 || (hostname.indexOf('qzone.qq.com') > -1 && hostname.indexOf('qun.qzone.qq.com') === -1)){
-        //       str = cookie('p_skey') || str;
-        //     }
-        //   }
-        //   for(var i = 0, len = str.length; i < len; ++i){
-        //     hash += (hash << 5) + str.charAt(i).charCodeAt();
-        //   }
-        //   return hash & 0x7fffffff;
-        // },
-        // 
-
-        // function signToken(skey: string) {
-        //   let hash = 5381;
-        //   for (let i = 0, len = skey.length; i < len; ++i) {
-        //     hash += (hash << 5) + skey.charCodeAt(i);
-        //   }
-        //   return hash & 0x7fffffff;
-        // }
-        const signCard = {
-            'app': 'com.tencent.miniapp.lua',
-            'bizsrc': 'tianxuan.imgJumpArk',
-            'view': 'miniapp',
-            'prompt': CardData.prompt,
-            'config': {
-                'type': 'normal',
-                'forward': 1,
-                'autosize': 0,
-            },
-            'meta': {
-                'miniapp': {
-                    'title': CardData.title,
-                    'preview': (CardData.preview as string).replace(/\\/g, '\\/\\/'),
-                    'jumpUrl': (CardData.jumpUrl as string).replace(/\\/g, '\\/\\/'),
-                    'tag': CardData.tag,
-                    'tagIcon': (CardData.tagIcon as string).replace(/\\/g, '\\/\\/'),
-                    'source': CardData.source,
-                    'sourcelogo': (CardData.sourcelogo as string).replace(/\\/g, '\\/\\/'),
-                },
-            },
-        };
-        // let signCard = {
-        //   "app": "com.tencent.eventshare.lua",
-        //   "prompt": "Bot Test",
-        //   "bizsrc": "tianxuan.business",
-        //   "meta": {
-        //     "eventshare": {
-        //       "button1URL": "https://www.bilibili.com",
-        //       "button1disable": false,
-        //       "button1title": "点我前往",
-        //       "button2URL": "",
-        //       "button2disable": false,
-        //       "button2title": "",
-        //       "buttonNum": 1,
-        //       "jumpURL": "https://www.bilibili.com",
-        //       "preview": "https://tianquan.gtimg.cn/shoal/card/9930bc4e-4a92-4da3-814f-8094a2421d9c.png",
-        //       "tag": "QQ集卡",
-        //       "tagIcon": "https://tianquan.gtimg.cn/shoal/card/c034854b-102d-40be-a545-5ca90a7c49c9.png",
-        //       "title": "Bot Test"
-        //     }
-        //   },
-        //   "config": {
-        //     "autosize": 0,
-        //     "collect": 0,
-        //     "ctime": 1716568575,
-        //     "forward": 1,
-        //     "height": 336,
-        //     "reply": 0,
-        //     "round": 1,
-        //     "type": "normal",
-        //     "width": 263
-        //   },
-        //   "view": "eventshare",
-        //   "ver": "0.0.0.1"
-        // };
-        const data = (await this.core.apis.UserApi.getQzoneCookies());
-        const Bkn = this.core.apis.WebApi.getBknFromCookie(data.p_skey);
-
-        const CookieValue = 'p_skey=' + data.p_skey + '; skey=' + data.skey + '; p_uin=o' + this.core.selfInfo.uin + '; uin=o' + this.core.selfInfo.uin;
-
-        const signurl = 'https://h5.qzone.qq.com/v2/vip/tx/trpc/ark-share/GenNewSignedArk?g_tk=' + Bkn + '&ark=' + encodeURIComponent(JSON.stringify(signCard));
-        let signed_ark = '';
-        try {
-            const retData = await RequestUtil.HttpGetJson<{
-                code: number,
-                data: { signed_ark: string }
-            }>(signurl, 'GET', undefined, { Cookie: CookieValue });
-            //logDebug('MiniApp JSON 消息生成成功', retData);
-            signed_ark = retData.data.signed_ark;
-        } catch (error) {
-            this.context.logger.logDebug('MiniApp JSON 消息生成失败', error);
-        }
-        return signed_ark;
-    }
-
-    async signInternal(songname: string, singer: string, cover: string, songmid: string, songmusic: string) {
-        //curl -X POST 'https://mqq.reader.qq.com/api/mqq/share/card?accessToken&_csrfToken&source=c0003' -H 'Content-Type: application/json' -H 'Cookie: uin=o10086' -d '{"app":"com.tencent.qqreader.share","config":{"ctime":1718634110,"forward":1,"token":"9a63343c32d5a16bcde653eb97faa25d","type":"normal"},"extra":{"app_type":1,"appid":100497308,"msg_seq":14386738075403815000.0,"uin":1733139081},"meta":{"music":{"action":"","android_pkg_name":"","app_type":1,"appid":100497308,"ctime":1718634110,"desc":"周杰伦","jumpUrl":"https://i.y.qq.com/v8/playsong.html?songmid=0039MnYb0qxYhV&type=0","musicUrl":"http://ws.stream.qqmusic.qq.com/http://isure6.stream.qqmusic.qq.com/M800002202B43Cq4V4.mp3?fromtag=810033622&guid=br_xzg&trace=23fe7bcbe2336bbf&uin=553&vkey=CF0F5CE8B0FA16F3001F8A88D877A217EB5E4F00BDCEF1021EB6C48969CA33C6303987AEECE9CC840122DD2F917A59D6130D8A8CA4577C87","preview":"https://y.qq.com/music/photo_new/T002R800x800M000000MkMni19ClKG.jpg","cover":"https://y.qq.com/music/photo_new/T002R800x800M000000MkMni19ClKG.jpg","sourceMsgId":"0","source_icon":"https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0","source_url":"","tag":"QQ音乐","title":"晴天","uin":10086}},"prompt":"[分享]晴天","ver":"0.0.0.1","view":"music"}'
-        const signurl = 'https://mqq.reader.qq.com/api/mqq/share/card?accessToken&_csrfToken&source=c0003';
-        //let  = "https://y.qq.com/music/photo_new/T002R800x800M000000MkMni19ClKG.jpg";
-        const signCard = {
-            app: 'com.tencent.qqreader.share',
-            config: {
-                ctime: 1718634110,
-                forward: 1,
-                token: '9a63343c32d5a16bcde653eb97faa25d',
-                type: 'normal',
-            },
-            extra: {
-                app_type: 1,
-                appid: 100497308,
-                msg_seq: 14386738075403815000,
-                uin: 1733139081,
-            },
-            meta: {
-                music: {
-                    action: '',
-                    android_pkg_name: '',
-                    app_type: 1,
-                    appid: 100497308,
-                    ctime: 1718634110,
-                    desc: singer,
-                    jumpUrl: 'https://i.y.qq.com/v8/playsong.html?songmid=' + songmid + '&type=0',
-                    musicUrl: songmusic,
-                    preview: cover,
-                    cover: cover,
-                    sourceMsgId: '0',
-                    source_icon: 'https://p.qpic.cn/qqconnect/0/app_100497308_1626060999/100?max-age=2592000&t=0',
-                    source_url: '',
-                    tag: 'QQ音乐',
-                    title: songname,
-                    uin: 10086,
-                },
-            },
-            prompt: '[分享]' + songname,
-            ver: '0.0.0.1',
-            view: 'music',
-        };
-        //console.log(JSON.stringify(signCard, null, 2));
-        const data = await RequestUtil.HttpGetJson<{ code: number, data: { arkResult: string } }>
-        (signurl, 'POST', signCard, { 'Cookie': 'uin=o10086', 'Content-Type': 'application/json' });
-        return data;
-    }
-
-    //注意处理错误
-    async signWay03(id: string = '', mid: string = '') {
-        let signedMid;
-        if (mid == '') {
-            const MusicInfo = await RequestUtil.HttpGetJson<{
-                songinfo?: {
-                    data?: {
-                        track_info: {
-                            mid: string
-                        }
-                    }
-                }
-            }>(
-                'https://u.y.qq.com/cgi-bin/musicu.fcg?format=json&inCharset=utf8&outCharset=utf-8&notice=0&platform=yqq.json&needNewCode=0&data={"comm":{"ct":24,"cv":0},"songinfo":{"method":"get_song_detail_yqq","param":{"song_type":0,"song_mid":"","song_id":' + id + '},"module":"music.pf_song_detail_svr"}}',
-                'GET',
-                undefined,
-            );
-            signedMid = MusicInfo.songinfo?.data?.track_info.mid;
-        }
-        //第三方接口 存在速率限制 现在勉强用
-        const MusicReal = await RequestUtil.HttpGetJson<{
-            code: number,
-            data?: {
-                name: string,
-                singer: string,
-                url: string,
-                cover: string
-            }
-        }>('https://api.leafone.cn/api/qqmusic?id=' + signedMid + '&type=8', 'GET');
-        //console.log(MusicReal);
-        return { ...MusicReal.data, mid: signedMid };
-    }
-
-    async CreateMusicThirdWay1(id: string = '', mid: string = '') {
-
-    }
-
     //转换外域名为 https://qq.ugcimg.cn/v1/cpqcbu4b8870i61bde6k7cbmjgejq8mr3in82qir4qi7ielffv5slv8ck8g42novtmev26i233ujtuab6tvu2l2sjgtupfr389191v00s1j5oh5325j5eqi40774jv1i/khovifoh7jrqd6eahoiv7koh8o
     //https://cgi.connect.qq.com/qqconnectopen/openapi/change_image_url?url=https://th.bing.com/th?id=OSK.b8ed36f1fb1889de6dc84fd81c187773&w=46&h=46&c=11&rs=1&qlt=80&o=6&dpr=2&pid=SANGAM
 
@@ -232,10 +21,5 @@ export class NTQQMusicSignApi {
     //https://y.gtimg.cn/music/photo_new/T002R800x800M000000y5gq7449K9I.jpg?max_age=2592000
 
     //还有一处公告上传可以上传高质量图片 持久为qq域名
-    async SignMusicWrapper(id: string = '') {
-        const MusicInfo = await this.signWay03(id)!;
-        return await this.signInternal(MusicInfo.name!, MusicInfo.singer!, MusicInfo.cover!, MusicInfo.mid!, 'https://ws.stream.qqmusic.qq.com/' + MusicInfo.url!);
-    }
-
 }
 

src/core/apis/system.ts

@@ -22,7 +22,7 @@ export class NTQQSystemApi {
     }
 
     async getOnlineDev() {
-        return this.context.session.getMsgService().getOnLineDev();
+        this.context.session.getMsgService().getOnLineDev();
     }
 
     async getArkJsonCollection(cid: string) {

src/core/apis/user.ts

@@ -1,7 +1,6 @@
-import type { ModifyProfileParams, User } from '@/core/entities';
+import { ModifyProfileParams, User, UserDetailSource } from '@/core/types';
 import { RequestUtil } from '@/common/request';
-import { ProfileBizType, UserDetailSource } from '@/core/services';
-import { InstanceContext, NapCatCore } from '..';
+import { InstanceContext, NapCatCore, ProfileBizType } from '..';
 import { solveAsyncProblem } from '@/common/helper';
 
 export class NTQQUserApi {
@@ -12,20 +11,26 @@ export class NTQQUserApi {
         this.context = context;
         this.core = core;
     }
-
-    async getProfileLike(uid: string) {
+    //self_tind格式
+    async createUidFromTinyId(tinyId: string) {
+        return this.context.session.getMsgService().createUidFromTinyId(this.core.selfInfo.uin, tinyId);
+    }
+    async getStatusByUid(uid: string) {
+        return this.context.session.getProfileService().getStatus(uid);
+    }
+    // 默认获取自己的 type = 2 获取别人 type = 1
+    async getProfileLike(uid: string, start: number, count: number, type: number = 2) {
         return this.context.session.getProfileLikeService().getBuddyProfileLike({
             friendUids: [uid],
             basic: 1,
             vote: 1,
             favorite: 0,
             userProfile: 1,
-            type: 2,
-            start: 0,
-            limit: 20,
+            type: type,
+            start: start,
+            limit: count,
         });
     }
-
     async setLongNick(longNick: string) {
         return this.context.session.getProfileService().setLongNick(longNick);
     }
@@ -52,8 +57,7 @@ export class NTQQUserApi {
     }
 
     async setQQAvatar(filePath: string) {
-        type setQQAvatarRet = { result: number, errMsg: string };
-        const ret = await this.context.session.getProfileService().setHeader(filePath) as setQQAvatarRet;
+        const ret = await this.context.session.getProfileService().setHeader(filePath);
         return { result: ret?.result, errMsg: ret?.errMsg };
     }
 
@@ -75,7 +79,6 @@ export class NTQQUserApi {
             (profile) => profile.uid === uid,
         );
         const RetUser: User = {
-            ...profile.simpleInfo.coreInfo,
             ...profile.simpleInfo.status,
             ...profile.simpleInfo.vasInfo,
             ...profile.commonExt,
@@ -83,29 +86,42 @@ export class NTQQUserApi {
             qqLevel: profile.commonExt?.qqLevel,
             age: profile.simpleInfo.baseInfo.age,
             pendantId: '',
+            ...profile.simpleInfo.coreInfo
         };
         return RetUser;
     }
 
     async getUserDetailInfo(uid: string): Promise<User> {
-        const retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
+        let retUser = await solveAsyncProblem(async (uid) => this.fetchUserDetailInfo(uid, UserDetailSource.KDB), uid);
         if (retUser && retUser.uin !== '0') {
             return retUser;
         }
         this.context.logger.logDebug('[NapCat] [Mark] getUserDetailInfo Mode1 Failed.');
-        return this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        retUser = await this.fetchUserDetailInfo(uid, UserDetailSource.KSERVER);
+        if (retUser && retUser.uin === '0') {
+            retUser.uin = await this.core.apis.UserApi.getUidByUinV2(uid) ?? '0';
+        }
+        return retUser;
     }
 
     async modifySelfProfile(param: ModifyProfileParams) {
         return this.context.session.getProfileService().modifyDesktopMiniProfile(param);
     }
 
-    //需要异常处理
     async getCookies(domain: string) {
         const ClientKeyData = await this.forceFetchClientKey();
         const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + this.core.selfInfo.uin +
             '&clientkey=' + ClientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + this.core.selfInfo.uin + '%2Finfocenter&keyindex=19%27';
-        return await RequestUtil.HttpsGetCookies(requestUrl);
+        const data = await RequestUtil.HttpsGetCookies(requestUrl);
+        if (!data.p_skey || data.p_skey.length == 0) {
+            try {
+                const pskey = (await this.getPSkey([domain])).domainPskeyMap.get(domain);
+                if (pskey) data.p_skey = pskey;
+            } catch {
+                return data;
+            }
+        }
+        return data;
     }
 
     async getPSkey(domainList: string[]) {
@@ -156,7 +172,7 @@ export class NTQQUserApi {
         if (uid) return uid;
         uid = (await this.context.session.getUixConvertService().getUid([Uin])).uidInfo.get(Uin);
         if (uid) return uid;
-        const unverifiedUid = (await this.getUserDetailInfoByUinV2(Uin)).detail.uid;//从QQ Native 特殊转换
+        const unverifiedUid = (await this.getUserDetailInfoByUin(Uin)).detail.uid;//从QQ Native 特殊转换
         if (unverifiedUid.indexOf('*') == -1) uid = unverifiedUid;
         //if (uid) return uid;
         return uid;
@@ -192,7 +208,7 @@ export class NTQQUserApi {
         return await this.context.session.getRecentContactService().getRecentContactList();
     }
 
-    async getUserDetailInfoByUinV2(Uin: string) {
+    async getUserDetailInfoByUin(Uin: string) {
         return await this.core.eventWrapper.callNoListenerEvent(
             'NodeIKernelProfileService/getUserDetailInfoByUin',
             Uin

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;
@@ -131,20 +134,53 @@ export class NTQQWebApi {
     //   return await res.json();
     // }
 
-    async setGroupNotice(GroupCode: string, Content: string) {
+    async setGroupNotice(
+        GroupCode: string,
+        Content: string,
+        pinned: number = 0,
+        type: number = 1,
+        is_show_edit_card: number = 1,
+        tip_window_type: number = 1,
+        confirm_required: number = 1,
+        picId: string = '',
+        imgWidth: number = 540,
+        imgHeight: number = 300,
+    ) {
+        interface SetNoticeRetSuccess {
+            ec: number;
+            em: string;
+            id: number;
+            ltsm: number;
+            new_fid: string;
+            read_only: number;
+            role: number;
+            srv_code: number;
+        }
+
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        let ret: any = undefined;
+
         try {
-            ret = await RequestUtil.HttpGetJson<any>(
-                `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice${new URLSearchParams({
+            const settings = JSON.stringify({
+                is_show_edit_card: is_show_edit_card,
+                tip_window_type: tip_window_type,
+                confirm_required: confirm_required
+            });
+            const externalParam = {
+                pic: picId,
+                imgWidth: imgWidth.toString(),
+                imgHeight: imgHeight.toString(),
+            };
+            const ret: SetNoticeRetSuccess = await RequestUtil.HttpGetJson<SetNoticeRetSuccess>(
+                `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
                     bkn: this.getBknFromCookie(cookieObject),
                     qid: GroupCode,
                     text: Content,
-                    pinned: '0',
-                    type: '1',
-                    settings: '{"is_show_edit_card":1,"tip_window_type":1,"confirm_required":1}',
+                    pinned: pinned.toString(),
+                    type: type.toString(),
+                    settings: settings,
+                    ...(picId === '' ? {} : externalParam)
                 }).toString()}`,
-                'GET',
+                'POST',
                 '',
                 { 'Cookie': this.cookieToString(cookieObject) }
             );
@@ -179,108 +215,65 @@ export class NTQQWebApi {
         }
     }
 
+    private async getDataInternal(cookieObject: any, groupCode: string, type: number) {
+        let resJson;
+        try {
+            const res = await RequestUtil.HttpGetText(
+                `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({
+                    gc: groupCode,
+                    type: type.toString(),
+                }).toString()}`,
+                'GET',
+                '',
+                { 'Cookie': this.cookieToString(cookieObject) }
+            );
+            const match = /window\.__INITIAL_STATE__=(.*?);/.exec(res);
+            if (match) {
+                resJson = JSON.parse(match[1].trim());
+            }
+            return type === 1 ? resJson?.talkativeList : resJson?.actorList;
+        } catch (e) {
+            this.context.logger.logDebug('获取当前群荣耀失败', e);
+            return undefined;
+        }
+    }
+
+    private async getHonorList(cookieObject: any, groupCode: string, type: number) {
+        const data = await this.getDataInternal(cookieObject, groupCode, type);
+        if (!data) {
+            this.context.logger.logError(`获取类型 ${type} 的荣誉信息失败`);
+            return [];
+        }
+        return data.map((item: any) => ({
+            user_id: item?.uin,
+            nickname: item?.name,
+            avatar: item?.avatar,
+            description: item?.desc,
+        }));
+    }
+
     async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
         const cookieObject = await this.core.apis.UserApi.getCookies('qun.qq.com');
-        const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
-            let resJson;
-            try {
-                const res = await RequestUtil.HttpGetText(
-                    `https://qun.qq.com/interactive/honorlist?${new URLSearchParams({
-                        gc: Internal_groupCode,
-                        type: Internal_type.toString(),
-                    }).toString()}`,
-                    'GET',
-                    '',
-                    { 'Cookie': this.cookieToString(cookieObject) }
-                );
-                const match = /window\.__INITIAL_STATE__=(.*?);/.exec(res);
-                if (match) {
-                    resJson = JSON.parse(match[1].trim());
-                }
-                if (Internal_type === 1) {
-                    return resJson?.talkativeList;
-                } else {
-                    return resJson?.actorList;
-                }
-            } catch (e) {
-                this.context.logger.logDebug('获取当前群荣耀失败', e);
-            }
-            return undefined;
-        };
-
         const HonorInfo: any = { group_id: groupCode };
 
         if (getType === WebHonorType.TALKATIVE || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 1);
-            if (RetInternal) {
-                HonorInfo.current_talkative = {
-                    user_id: RetInternal[0]?.uin,
-                    avatar: RetInternal[0]?.avatar,
-                    nickname: RetInternal[0]?.name,
-                    day_count: 0,
-                    description: RetInternal[0]?.desc,
-                };
-                HonorInfo.talkative_list = [];
-                for (const talkative_ele of RetInternal) {
-                    HonorInfo.talkative_list.push({
-                        user_id: talkative_ele?.uin,
-                        avatar: talkative_ele?.avatar,
-                        description: talkative_ele?.desc,
-                        day_count: 0,
-                        nickname: talkative_ele?.name,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取龙王信息失败');
+            const talkativeList = await this.getHonorList(cookieObject, groupCode, 1);
+            if (talkativeList.length > 0) {
+                HonorInfo.current_talkative = talkativeList[0];
+                HonorInfo.talkative_list = talkativeList;
             }
         }
+
         if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 2);
-            if (RetInternal) {
-                HonorInfo.performer_list = [];
-                for (const performer_ele of RetInternal) {
-                    HonorInfo.performer_list.push({
-                        user_id: performer_ele?.uin,
-                        nickname: performer_ele?.name,
-                        avatar: performer_ele?.avatar,
-                        description: performer_ele?.desc,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取群聊之火失败');
-            }
+            HonorInfo.performer_list = await this.getHonorList(cookieObject, groupCode, 2);
         }
-        if (getType === WebHonorType.PERFORMER || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 3);
-            if (RetInternal) {
-                HonorInfo.legend_list = [];
-                for (const legend_ele of RetInternal) {
-                    HonorInfo.legend_list.push({
-                        user_id: legend_ele?.uin,
-                        nickname: legend_ele?.name,
-                        avatar: legend_ele?.avatar,
-                        desc: legend_ele?.description,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取群聊炽焰失败');
-            }
+
+        if (getType === WebHonorType.LEGEND || getType === WebHonorType.ALL) {
+            HonorInfo.legend_list = await this.getHonorList(cookieObject, groupCode, 3);
         }
+
         if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
-            const RetInternal = await getDataInternal(groupCode, 6);
-            if (RetInternal) {
-                HonorInfo.emotion_list = [];
-                for (const emotion_ele of RetInternal) {
-                    HonorInfo.emotion_list.push({
-                        user_id: emotion_ele.uin,
-                        nickname: emotion_ele.name,
-                        avatar: emotion_ele.avatar,
-                        desc: emotion_ele.description,
-                    });
-                }
-            } else {
-                this.context.logger.logError('获取快乐源泉失败');
-            }
+            HonorInfo.emotion_list = await this.getHonorList(cookieObject, groupCode, 6);
         }
 
         // 冒尖小春笋好像已经被tx扬了 R.I.P.
@@ -305,4 +298,118 @@ export class NTQQWebApi {
         }
         return (hash & 0x7FFFFFFF).toString();
     }
+    public getBknFromSKey(sKey: string) {
+        let hash = 5381;
+        for (let i = 0; i < sKey.length; i++) {
+            const code = sKey.charCodeAt(i);
+            hash = hash + (hash << 5) + code;
+        }
+        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

@@ -1,65 +0,0 @@
-import { ChatType } from './msg';
-
-export interface CacheScanResult {
-    result: number;
-    size: [ // 单位为字节
-        string, // 系统总存储空间
-        string, // 系统可用存储空间
-        string, // 系统已用存储空间
-        string, // QQ总大小
-        string, // 「聊天与文件」大小
-        string, // 未知
-        string, // 「缓存数据」大小
-        string, // 「其他数据」大小
-        string, // 未知
-    ];
-}
-
-export interface ChatCacheList {
-    pageCount: number;
-    infos: ChatCacheListItem[];
-}
-
-export interface ChatCacheListItem {
-    chatType: ChatType;
-    basicChatCacheInfo: ChatCacheListItemBasic;
-    guildChatCacheInfo: unknown[]; // TODO: 没用过频道所以不知道这里边的详细内容
-}
-
-export interface ChatCacheListItemBasic {
-    chatSize: string;
-    chatTime: string;
-    uid: string;
-    uin: string;
-    remarkName: string;
-    nickName: string;
-    chatType?: ChatType;
-    isChecked?: boolean;
-}
-
-export enum CacheFileType {
-    IMAGE = 0,
-    VIDEO = 1,
-    AUDIO = 2,
-    DOCUMENT = 3,
-    OTHER = 4,
-}
-
-export interface CacheFileList {
-    infos: CacheFileListItem[],
-}
-
-export interface CacheFileListItem {
-    fileSize: string;
-    fileTime: string;
-    fileKey: string;
-    elementId: string;
-    elementIdStr: string;
-    fileType: CacheFileType;
-    path: string;
-    fileName: string;
-    senderId: string;
-    previewPath: string;
-    senderName: string;
-    isChecked?: boolean;
-}

src/core/entities/msg.ts

@@ -1,936 +0,0 @@
-import { GroupMemberRole } from '@/core';
-
-export interface Peer {
-    chatType: ChatType;
-    peerUid: string;  // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: string;
-}
-
-export interface KickedOffLineInfo {
-    appId: number;
-    instanceId: number;
-    sameDevice: boolean;
-    tipsDesc: string;
-    tipsTitle: string;
-    kickedType: number;
-    securityKickedType: number;
-}
-
-export interface GetFileListParam {
-    sortType: number;
-    fileCount: number;
-    startIndex: number;
-    sortOrder: number;
-    showOnlinedocFolder: number;
-    folderId?: string;
-}
-
-export enum ElementType {
-    UNKNOWN = 0,
-
-    TEXT = 1,
-
-    PIC = 2,
-
-    FILE = 3,
-
-    PTT = 4,
-
-    VIDEO = 5,
-
-    FACE = 6,
-
-    REPLY = 7,
-
-    WALLET = 9,
-
-    /**
-     * “小灰条”，包括拍一拍 (Poke)、撤回提示等
-     */
-    GreyTip = 8,
-
-    ARK = 10,
-
-    MFACE = 11,
-
-    LIVEGIFT = 12,
-
-    STRUCTLONGMSG = 13,
-
-    MARKDOWN = 14,
-
-    GIPHY = 15,
-
-    MULTIFORWARD = 16,
-
-    INLINEKEYBOARD = 17,
-
-    INTEXTGIFT = 18,
-
-    CALENDAR = 19,
-
-    YOLOGAMERESULT = 20,
-
-    AVRECORD = 21,
-
-    FEED = 22,
-
-    TOFURECORD = 23,
-
-    ACEBUBBLE = 24,
-
-    ACTIVITY = 25,
-
-    TOFU = 26,
-
-    FACEBUBBLE = 27,
-
-    SHARELOCATION = 28,
-
-    TASKTOPMSG = 29,
-
-    RECOMMENDEDMSG = 43,
-
-    ACTIONBAR = 44
-}
-
-export interface ActionBarElement {
-    rows: InlineKeyboardRow[];
-    botAppid: string;
-}
-
-export interface SendActionBarElement {
-    elementType: ElementType.ACTIONBAR;
-    elementId: string;
-    actionBarElement: ActionBarElement;
-}
-
-export interface RecommendedMsgElement {
-    rows: InlineKeyboardRow[];
-    botAppid: string;
-}
-
-export interface SendRecommendedMsgElement {
-    elementType: ElementType.RECOMMENDEDMSG;
-    elementId: string;
-    recommendedMsgElement: RecommendedMsgElement;
-}
-
-export interface InlineKeyboardButton {
-    id: string;
-    label: string;
-    visitedLabel: string;
-    unsupportTips: string;
-    data: string;
-    specifyRoleIds: string[];
-    specifyTinyids: string[];
-    style: number;
-    type: number;
-    clickLimit: number;
-    atBotShowChannelList: boolean;
-    permissionType: number;
-}
-
-export interface InlineKeyboardRow {
-    buttons: InlineKeyboardButton[];
-}
-
-export interface TofuElementContent {
-    color: string;
-    tittle: string;
-}
-
-export interface TaskTopMsgElement {
-    msgTitle: string;
-    msgSummary: string;
-    iconUrl: string;
-    topMsgType: number;
-}
-
-export enum NTMsgType {
-    KMSGTYPEARKSTRUCT = 11,
-    KMSGTYPEFACEBUBBLE = 24,
-    KMSGTYPEFILE = 3,
-    KMSGTYPEGIFT = 14,
-    KMSGTYPEGIPHY = 13,
-    KMSGTYPEGRAYTIPS = 5,
-    KMSGTYPEMIX = 2,
-    KMSGTYPEMULTIMSGFORWARD = 8,
-    KMSGTYPENULL = 1,
-    KMSGTYPEONLINEFILE = 21,
-    KMSGTYPEONLINEFOLDER = 27,
-    KMSGTYPEPROLOGUE = 29,
-    KMSGTYPEPTT = 6,
-    KMSGTYPEREPLY = 9,
-    KMSGTYPESHARELOCATION = 25,
-    KMSGTYPESTRUCT = 4,
-    KMSGTYPESTRUCTLONGMSG = 12,
-    KMSGTYPETEXTGIFT = 15,
-    KMSGTYPEUNKNOWN = 0,
-    KMSGTYPEVIDEO = 7,
-    KMSGTYPEWALLET = 10
-}
-
-export interface SendTaskTopMsgElement {
-    elementType: ElementType.TASKTOPMSG;
-    elementId: string;
-    taskTopMsgElement: TaskTopMsgElement;
-}
-
-export interface TofuRecordElement {
-    type: number;
-    busiid: string;
-    busiuuid: string;
-    descriptionContent: string;
-    contentlist: TofuElementContent[],
-    background: string;
-    icon: string;
-    uinlist: string[],
-    uidlist: string[],
-    busiExtra: string;
-    updateTime: string;
-    dependedmsgid: string;
-    msgtime: string;
-    onscreennotify: boolean;
-}
-
-export interface SendTofuRecordElement {
-    elementType: ElementType.TOFURECORD;
-    elementId: string;
-    tofuRecordElement: TofuRecordElement;
-}
-
-export interface FaceBubbleElement {
-    faceCount: number;
-    faceSummary: string;
-    faceFlag: number;
-    content: string;
-    oldVersionStr: string;
-    faceType: number;
-    others: string;
-    yellowFaceInfo: {
-        index: number;
-        buf: string;
-        compatibleText: string;
-        text: string;
-    };
-}
-
-export interface SendFaceBubbleElement {
-    elementType: ElementType.FACEBUBBLE;
-    elementId: string;
-    faceBubbleElement: FaceBubbleElement;
-
-}
-
-export interface AvRecordElement {
-    type: number;
-    time: string;
-    text: string;
-    mainType: number;
-    hasRead: boolean;
-    extraType: number;
-}
-
-export interface SendavRecordElement {
-    elementType: ElementType.AVRECORD;
-    elementId: string;
-    avRecordElement: AvRecordElement;
-}
-
-export interface YoloUserInfo {
-    uid: string;
-    result: number;
-    rank: number;
-    bizId: string;
-}
-
-export interface SendInlineKeyboardElement {
-    elementType: ElementType.INLINEKEYBOARD;
-    elementId: string;
-    inlineKeyboardElement: {
-        rows: number;
-        botAppid: string;
-    };
-
-}
-
-export interface YoloGameResultElement {
-    UserInfo: YoloUserInfo[];
-}
-
-export interface SendYoloGameResultElement {
-    elementType: ElementType.YOLOGAMERESULT;
-    yoloGameResultElement: YoloGameResultElement;
-}
-
-export interface GiphyElement {
-    id: string;
-    isClip: boolean;
-    width: number;
-    height: number;
-}
-
-export interface SendGiphyElement {
-    elementType: ElementType.GIPHY;
-    elementId: string;
-    giphyElement: GiphyElement;
-}
-
-export interface SendWalletElement {
-    elementType: ElementType.UNKNOWN;//不做 设置位置
-    elementId: string;
-    walletElement: Record<string, never>;
-}
-
-export interface CalendarElement {
-    summary: string;
-    msg: string;
-    expireTimeMs: string;
-    schemaType: number;
-    schema: string;
-}
-
-export interface SendCalendarElement {
-    elementType: ElementType.CALENDAR;
-    elementId: string;
-    calendarElement: CalendarElement;
-}
-
-export interface SendliveGiftElement {
-    elementType: ElementType.LIVEGIFT;
-    elementId: string;
-    liveGiftElement: Record<string, never>;
-}
-
-export interface SendTextElement {
-    elementType: ElementType.TEXT;
-    elementId: string;
-    textElement: {
-        content: string;
-        atType: number;
-        atUid: string;
-        atTinyId: string;
-        atNtUid: string;
-    };
-}
-
-export interface SendPttElement {
-    elementType: ElementType.PTT;
-    elementId: string;
-    pttElement: {
-        fileName: string;
-        filePath: string;
-        md5HexStr: string;
-        fileSize: number;
-        duration: number;  // 单位是秒
-        formatType: number;
-        voiceType: number;
-        voiceChangeType: number;
-        canConvert2Text: boolean;
-        waveAmplitudes: number[];
-        fileSubId: string;
-        playState: number;
-        autoConvertText: number;
-    };
-}
-
-export enum PicType {
-    gif = 2000,
-    jpg = 1000
-}
-
-export enum PicSubType {
-    normal = 0, // 普通图片，大图
-    face = 1  // 表情包小图
-}
-
-export enum NTMsgAtType {
-    ATTYPEALL = 1,
-    ATTYPECATEGORY = 512,
-    ATTYPECHANNEL = 16,
-    ATTYPEME = 4,
-    ATTYPEONE = 2,
-    ATTYPEONLINE = 64,
-    ATTYPEROLE = 8,
-    ATTYPESUMMON = 32,
-    ATTYPESUMMONONLINE = 128,
-    ATTYPESUMMONROLE = 256,
-    ATTYPEUNKNOWN = 0
-}
-
-export interface SendPicElement {
-    elementType: ElementType.PIC;
-    elementId: string;
-    picElement: PicElement;
-}
-
-export interface ReplyElement {
-    sourceMsgIdInRecords?: string;
-    replayMsgSeq: string;
-    replayMsgId: string;
-    senderUin: string;
-    senderUidStr?: string;
-    replyMsgTime?: string;
-}
-
-export interface SendReplyElement {
-    elementType: ElementType.REPLY;
-    elementId: string;
-    replyElement: ReplyElement;
-}
-
-export interface SendFaceElement {
-    elementType: ElementType.FACE;
-    elementId: string;
-    faceElement: FaceElement;
-}
-
-export interface SendMarketFaceElement {
-    elementType: ElementType.MFACE;
-    marketFaceElement: MarketFaceElement;
-}
-
-export interface SendstructLongMsgElement {
-    elementType: ElementType.STRUCTLONGMSG;
-    elementId: string;
-    structLongMsgElement: StructLongMsgElement;
-}
-
-export interface StructLongMsgElement {
-    xmlContent: string;
-    resId: string;
-}
-
-export interface SendactionBarElement {
-    elementType: ElementType.ACTIONBAR;
-    elementId: string;
-    actionBarElement: {
-        rows: number;
-        botAppid: string;
-    };
-}
-
-export interface ShareLocationElement {
-    text: string;
-    ext: string;
-}
-
-export interface SendShareLocationElement {
-    elementType: ElementType.SHARELOCATION;
-    elementId: string;
-    shareLocationElement?: ShareLocationElement;
-}
-
-export interface FileElement {
-    fileMd5?: string;
-    fileName: string;
-    filePath: string;
-    fileSize: string;
-    picHeight?: number;
-    picWidth?: number;
-    folderId?: string;
-    picThumbPath?: Map<number, string>;
-    file10MMd5?: string;
-    fileSha?: string;
-    fileSha3?: string;
-    fileUuid?: string;
-    fileSubId?: string;
-    thumbFileSize?: number;
-    fileBizId?: number;
-}
-
-export interface SendFileElement {
-    elementType: ElementType.FILE;
-    elementId: string;
-    fileElement: FileElement;
-}
-
-export interface SendVideoElement {
-    elementType: ElementType.VIDEO;
-    elementId: string;
-    videoElement: VideoElement;
-}
-
-export interface SendArkElement {
-    elementType: ElementType.ARK;
-    elementId: string;
-    arkElement: ArkElement;
-}
-
-export interface SendMarkdownElement {
-    elementType: ElementType.MARKDOWN;
-    elementId: string;
-    markdownElement: MarkdownElement;
-}
-
-export type SendMessageElement = SendTextElement | SendPttElement |
-    SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement |
-    SendVideoElement | SendArkElement | SendMarkdownElement | SendShareLocationElement;
-
-export interface TextElement {
-    content: string;
-    atType: number;
-    atUid: string;
-    atTinyId: string;
-    atNtUid: string;
-}
-
-export interface MessageElement {
-    elementType: ElementType,
-    elementId: string,
-    extBufForUI: string,//"0x",
-    textElement?: TextElement;
-    faceElement?: FaceElement,
-    marketFaceElement?: MarketFaceElement,
-    replyElement?: ReplyElement,
-    picElement?: PicElement,
-    pttElement?: PttElement,
-    videoElement?: VideoElement,
-    grayTipElement?: GrayTipElement,
-    arkElement?: ArkElement,
-    fileElement?: FileElement,
-    liveGiftElement?: null,
-    markdownElement?: MarkdownElement,
-    structLongMsgElement?: StructLongMsgElement,
-    multiForwardMsgElement?: MultiForwardMsgElement,
-    giphyElement?: GiphyElement,
-    walletElement?: null,
-    inlineKeyboardElement?: InlineKeyboardElement,
-    textGiftElement?: null,//????
-    calendarElement?: CalendarElement,
-    yoloGameResultElement?: YoloGameResultElement,
-    avRecordElement?: AvRecordElement,
-    structMsgElement?: null,
-    faceBubbleElement?: FaceBubbleElement,
-    shareLocationElement?: ShareLocationElement,
-    tofuRecordElement?: TofuRecordElement,
-    taskTopMsgElement?: TaskTopMsgElement,
-    recommendedMsgElement?: RecommendedMsgElement,
-    actionBarElement?: ActionBarElement
-
-}
-
-export enum AtType {
-    notAt = 0,
-    atAll = 1,
-    atUser = 2
-}
-
-// 来自Android分析
-export enum ChatType {
-    KCHATTYPEADELIE = 42,
-    KCHATTYPEBUDDYNOTIFY = 5,
-    KCHATTYPEC2C = 1,
-    KCHATTYPECIRCLE = 113,
-    KCHATTYPEDATALINE = 8,
-    KCHATTYPEDATALINEMQQ = 134,
-    KCHATTYPEDISC = 3,
-    KCHATTYPEFAV = 41,
-    KCHATTYPEGAMEMESSAGE = 105,
-    KCHATTYPEGAMEMESSAGEFOLDER = 116,
-    KCHATTYPEGROUP = 2,
-    KCHATTYPEGROUPBLESS = 133,
-    KCHATTYPEGROUPGUILD = 9,
-    KCHATTYPEGROUPHELPER = 7,
-    KCHATTYPEGROUPNOTIFY = 6,
-    KCHATTYPEGUILD = 4,
-    KCHATTYPEGUILDMETA = 16,
-    KCHATTYPEMATCHFRIEND = 104,
-    KCHATTYPEMATCHFRIENDFOLDER = 109,
-    KCHATTYPENEARBY = 106,
-    KCHATTYPENEARBYASSISTANT = 107,
-    KCHATTYPENEARBYFOLDER = 110,
-    KCHATTYPENEARBYHELLOFOLDER = 112,
-    KCHATTYPENEARBYINTERACT = 108,
-    KCHATTYPEQQNOTIFY = 132,
-    KCHATTYPERELATEACCOUNT = 131,
-    KCHATTYPESERVICEASSISTANT = 118,
-    KCHATTYPESERVICEASSISTANTSUB = 201,
-    KCHATTYPESQUAREPUBLIC = 115,
-    KCHATTYPESUBSCRIBEFOLDER = 30,
-    KCHATTYPETEMPADDRESSBOOK = 111,
-    KCHATTYPETEMPBUSSINESSCRM = 102,
-    KCHATTYPETEMPC2CFROMGROUP = 100,
-    KCHATTYPETEMPC2CFROMUNKNOWN = 99,
-    KCHATTYPETEMPFRIENDVERIFY = 101,
-    KCHATTYPETEMPNEARBYPRO = 119,
-    KCHATTYPETEMPPUBLICACCOUNT = 103,
-    KCHATTYPETEMPWPA = 117,
-    KCHATTYPEUNKNOWN = 0,
-    KCHATTYPEWEIYUN = 40,
-}
-
-export interface PttElement {
-    canConvert2Text: boolean;
-    duration: number; // 秒数
-    fileBizId: null;
-    fileId: number; // 0
-    fileName: string; // "e4d09c784d5a2abcb2f9980bdc7acfe6.amr"
-    filePath: string; // "/Users//Library/Containers/com.tencent.qq/Data/Library/Application Support/QQ/nt_qq_a6b15c9820595d25a56c1633ce19ad40/nt_data/Ptt/2023-11/Ori/e4d09c784d5a2abcb2f9980bdc7acfe6.amr"
-    fileSize: string; // "4261"
-    fileSubId: string; // "0"
-    fileUuid: string; // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-    formatType: string; // 1
-    invalidState: number; // 0
-    md5HexStr: string; // "e4d09c784d5a2abcb2f9980bdc7acfe6"
-    playState: number; // 0
-    progress: number; // 0
-    text: string; // ""
-    transferStatus: number; // 0
-    translateStatus: number; // 0
-    voiceChangeType: number; // 0
-    voiceType: number; // 0
-    waveAmplitudes: number[];
-}
-
-export interface ArkElement {
-    bytesData: string;
-    linkInfo: null;
-    subElementType: null;
-}
-
-export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn';
-export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn';
-
-export interface PicElement {
-    md5HexStr?: string;
-    filePath?: string;
-    fileSize: number | string;//number
-    picWidth: number;
-    picHeight: number;
-    fileName: string;
-    sourcePath: string;
-    original: boolean;
-    picType: PicType;
-    picSubType?: PicSubType;
-    fileUuid: string;
-    fileSubId: string;
-    thumbFileSize: number;
-    summary: string;
-    thumbPath: Map<number, string>;
-    originImageMd5?: string;
-    originImageUrl?: string;  // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
-}
-
-export enum NTGrayTipElementSubTypeV2 {
-    GRAYTIP_ELEMENT_SUBTYPE_AIOOP = 15,
-    GRAYTIP_ELEMENT_SUBTYPE_BLOCK = 14,
-    GRAYTIP_ELEMENT_SUBTYPE_BUDDY = 5,
-    GRAYTIP_ELEMENT_SUBTYPE_BUDDYNOTIFY = 9,
-    GRAYTIP_ELEMENT_SUBTYPE_EMOJIREPLY = 3,
-    GRAYTIP_ELEMENT_SUBTYPE_ESSENCE = 7,
-    GRAYTIP_ELEMENT_SUBTYPE_FEED = 6,
-    GRAYTIP_ELEMENT_SUBTYPE_FEEDCHANNELMSG = 11,
-    GRAYTIP_ELEMENT_SUBTYPE_FILE = 10,
-    GRAYTIP_ELEMENT_SUBTYPE_GROUP = 4,
-    GRAYTIP_ELEMENT_SUBTYPE_GROUPNOTIFY = 8,
-    GRAYTIP_ELEMENT_SUBTYPE_JSON = 17,
-    GRAYTIP_ELEMENT_SUBTYPE_LOCALMSG = 13,
-    GRAYTIP_ELEMENT_SUBTYPE_PROCLAMATION = 2,
-    GRAYTIP_ELEMENT_SUBTYPE_REVOKE = 1,
-    GRAYTIP_ELEMENT_SUBTYPE_UNKNOWN = 0,
-    GRAYTIP_ELEMENT_SUBTYPE_WALLET = 16,
-    GRAYTIP_ELEMENT_SUBTYPE_XMLMSG = 12,
-}
-
-export interface GrayTipElement {
-    subElementType: NTGrayTipElementSubTypeV2;
-    revokeElement: {
-        operatorRole: string;
-        operatorUid: string;
-        operatorNick: string;
-        operatorRemark: string;
-        operatorMemRemark?: string;
-        wording: string;  // 自定义的撤回提示语
-    };
-    aioOpGrayTipElement: TipAioOpGrayTipElement;
-    groupElement: TipGroupElement;
-    xmlElement: {
-        content: string;
-        templId: string;
-    };
-    jsonGrayTipElement: {
-        busiId?: number;
-        jsonStr: string;
-    };
-}
-
-export enum FaceType {
-    normal = 1, // 小黄脸
-    normal2 = 2, // 新小黄脸, 从faceIndex 222开始？
-    dice = 3  // 骰子
-}
-
-export enum FaceIndex {
-    dice = 358,
-    RPS = 359  // 石头剪刀布
-}
-
-export interface FaceElement {
-    faceIndex: number;
-    faceType: FaceType;
-    faceText?: string;
-    packId?: string;
-    stickerId?: string;
-    sourceType?: number;
-    stickerType?: number;
-    resultId?: string;
-    surpriseId?: string;
-    randomType?: number;
-}
-
-export interface MarketFaceElement {
-    emojiPackageId: number;
-    faceName: string;
-    emojiId: string;
-    key: string;
-}
-
-export interface VideoElement {
-    filePath: string;
-    fileName: string;
-    videoMd5?: string;
-    thumbMd5?: string;
-    fileTime?: number; // second
-    thumbSize?: number; // byte
-    fileFormat?: viedo_type;  // 2表示mp4 参考下面条目
-    fileSize?: string;  // byte
-    thumbWidth?: number;
-    thumbHeight?: number;
-    busiType?: 0; //
-    subBusiType?: 0; // 未知
-    thumbPath?: Map<number, any>;
-    transferStatus?: 0; // 未知
-    progress?: 0;  // 下载进度？
-    invalidState?: 0; // 未知
-    fileUuid?: string;  // 可以用于下载链接？
-    fileSubId?: string;
-    fileBizId?: null;
-    originVideoMd5?: string;
-    import_rich_media_context?: null;
-    sourceVideoCodecFormat?: number;
-}
-
-// export enum busiType{
-//   public static final int CREATOR_SHARE_ADV_XWORLD = 21;
-//   public static final int MINI_APP_MINI_GAME = 11;
-//   public static final int OFFICIAL_ACCOUNT_ADV = 4;
-//   public static final int OFFICIAL_ACCOUNT_ADV_GAME = 8;
-//   public static final int OFFICIAL_ACCOUNT_ADV_SHOP = 9;
-//   public static final int OFFICIAL_ACCOUNT_ADV_VIP = 7;
-//   public static final int OFFICIAL_ACCOUNT_LAYER_MASK_ADV = 14;
-//   public static final int OFFICIAL_ACCOUNT_SPORT = 13;
-//   public static final int OFFICIAL_ACCOUNT_TIAN_QI = 10;
-//   public static final int PC_QQTAB_ADV = 18;
-//   public static final int QIQIAOBAN_SDK = 15;
-//   public static final int QQ_CPS = 16;
-//   public static final int QQ_WALLET_CPS = 17;
-//   public static final int QZONE_FEEDS = 0;
-//   public static final int QZONE_PHOTO_TAIL = 2;
-//   public static final int QZONE_VIDEO_LAYER = 1;
-//   public static final int REWARD_GIFT_ADV = 6;
-//   public static final int REWARD_GROUPGIFT_ADV = 12;
-//   public static final int REWARD_PERSONAL_ADV = 5;
-//   public static final int WEISEE_OFFICIAL_ACCOUNT = 3;
-//   public static final int X_WORLD_CREATOR_ADV = 20;
-//   public static final int X_WORLD_QZONE_LAYER = 22;
-//   public static final int X_WORLD_VIDEO_ADV = 19;
-
-// }
-// export enum CategoryBusiType {
-//   _KCateBusiTypeDefault = 0,
-//   _kCateBusiTypeFaceCluster = 1,
-//   _kCateBusiTypeLabelCluster = 4,
-//   _kCateBusiTypeMonthCluster = 16,
-//   _kCateBusiTypePoiCluster = 2,
-//   _kCateBusiTypeYearCluster = 8,
-// }
-export enum viedo_type {
-    VIDEO_FORMAT_AFS = 7,
-    VIDEO_FORMAT_AVI = 1,
-    VIDEO_FORMAT_MKV = 4,
-    VIDEO_FORMAT_MOD = 9,
-    VIDEO_FORMAT_MOV = 8,
-    VIDEO_FORMAT_MP4 = 2,
-    VIDEO_FORMAT_MTS = 11,
-    VIDEO_FORMAT_RM = 6,
-    VIDEO_FORMAT_RMVB = 5,
-    VIDEO_FORMAT_TS = 10,
-    VIDEO_FORMAT_WMV = 3,
-}
-
-export interface MarkdownElement {
-    content: string;
-}
-
-export interface InlineKeyboardElementRowButton {
-    id: string;
-    label: string;
-    visitedLabel: string;
-    style: 1; // 未知
-    type: 2; // 未知
-    clickLimit: 0;  // 未知
-    unsupportTips: string;
-    data: string;
-    atBotShowChannelList: boolean;
-    permissionType: number;
-    specifyRoleIds: [];
-    specifyTinyids: [];
-    isReply: false;
-    anchor: 0;
-    enter: false;
-    subscribeDataTemplateIds: [];
-}
-
-export interface InlineKeyboardElement {
-    rows: [{
-        buttons: InlineKeyboardElementRowButton[]
-    }];
-}
-
-export interface TipAioOpGrayTipElement {  // 这是什么提示来着？
-    operateType: number;
-    peerUid: string;
-    fromGrpCodeOfTmpChat: string;
-}
-
-export enum TipGroupElementType {
-    memberIncrease = 1,
-    kicked = 3, // 被移出群
-    ban = 8
-}
-
-// public final class MemberAddShowType {
-//   public static final int KOTHERADD = 0;
-//   public static final int KOTHERADDBYOTHERQRCODE = 2;
-//   public static final int KOTHERADDBYYOURQRCODE = 3;
-//   public static final int KOTHERINVITEOTHER = 5;
-//   public static final int KOTHERINVITEYOU = 6;
-//   public static final int KYOUADD = 1;
-//   public static final int KYOUADDBYOTHERQRCODE = 4;
-//   public static final int KYOUALREADYMEMBER = 8;
-//   public static final int KYOUINVITEOTHER = 7;
-// }
-export interface TipGroupElement {
-    type: TipGroupElementType;  // 1是表示有人加入群; 自己加入群也会收到这个
-    role: 0;  // 暂时不知
-    groupName: string;  // 暂时获取不到
-    memberUid: string;
-    memberNick: string;
-    memberRemark: string;
-    adminUid: string;
-    adminNick: string;
-    adminRemark: string;
-    createGroup: null;
-    memberAdd?: {
-        showType: 1;
-        otherAdd: null;
-        otherAddByOtherQRCode: null;
-        otherAddByYourQRCode: null;
-        youAddByOtherQRCode: null;
-        otherInviteOther: null;
-        otherInviteYou: null;
-        youInviteOther: null
-    };
-    shutUp?: {
-        curTime: string;
-        duration: string;  // 禁言时间，秒
-        admin: {
-            uid: string;
-            card: string;
-            name: string;
-            role: GroupMemberRole
-        };
-        member: {
-            uid: string
-            card: string;
-            name: string;
-            role: GroupMemberRole
-        }
-    };
-}
-
-export interface MultiForwardMsgElement {
-    xmlContent: string;  // xml格式的消息内容
-    resId: string;
-    fileName: string;
-}
-
-export enum SendStatusType {
-    KSEND_STATUS_FAILED = 0,
-    KSEND_STATUS_SENDING = 1,
-    KSEND_STATUS_SUCCESS = 2,
-    KSEND_STATUS_SUCCESS_NOSEQ = 3
-}
-
-export interface RawMessage {
-    parentMsgPeer: Peer;
-
-    parentMsgIdList: string[];
-
-    /**
-     * 扩展字段，与 Ob11 msg ID 有关
-     */
-    id?: number;
-
-    guildId: string;
-
-    msgRandom: string;
-
-    msgId: string;
-
-    /**
-     * 消息时间戳（秒）
-     */
-    msgTime: string;
-
-    msgSeq: string;
-
-    msgType: NTMsgType;
-
-    subMsgType: number;
-
-    senderUid: string;
-
-    /**
-     * 发送者 QQ 号
-     */
-    senderUin: string;
-
-    /**
-     * 群号 / 用户 UID
-     */
-    peerUid: string;
-
-    /**
-     * 群号 / 用户 QQ 号
-     */
-    peerUin: string;
-
-    /**
-     * 发送者昵称（如果是好友消息）
-     */
-    sendNickName: string;
-
-    /**
-     * 发送者群名片（如果是群消息）
-     */
-    sendMemberName?: string;
-
-    chatType: ChatType;
-
-    /**
-     * 消息状态，别人发的 2 是已撤回，自己发的 2 是已发送
-     */
-    sendStatus?: SendStatusType;
-
-    /**
-     * 撤回时间，"0" 是没有撤回
-     */
-    recallTime: string;
-
-    records: RawMessage[];
-
-    elements: MessageElement[];
-}