fix: 发送文件包含特殊字符的处理

Update LICENSE

.editorconfig

@@ -0,0 +1,9 @@
+root = true
+
+[*]
+insert_final_newline = true
+indent_style = space
+indent_size = 2
+end_of_line = lf
+charset = utf-8
+trim_trailing_whitespace = true

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -7,9 +7,6 @@ body:
     attributes:
       value: |
         欢迎来到 LLOneBot 的 Issue Tracker！请填写以下表格来提交 Bug。
-        在提交新的 Bug 反馈前，请确保您：
-        * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法
-        * 不与现有的某一 issue 重复
   - type: input
     id: system-version
     attributes:
@@ -40,8 +37,6 @@ body:
       label: OneBot 客户端
       description: 连接至 LLOneBot 的客户端版本信息
       placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT
-    validations:
-      required: true
   - type: textarea
     id: what-happened
     attributes:
@@ -78,4 +73,4 @@ body:
     attributes:
       label: OneBot 客户端运行日志
       description: 粘贴 OneBot 客户端的相关日志内容到此处
-      render: shell
+      render: shell

.github/workflows/publish.yml

@@ -1,39 +1,43 @@
-name: "publish"
+name: Publish
 on:
   push:
     tags:
-      - "v*"
+      - 'v*'
 
 jobs:
   build-and-publish:
     runs-on: ubuntu-latest
     steps:
-    - name: checkout
-      uses: actions/checkout@v3
+      - name: Checkout
+        uses: actions/checkout@v4
 
-    - name: setup node
-      uses: actions/setup-node@v2
-      with:
-        node-version: 18
+      - name: Setup node
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20
 
-    - name: install dependenies
-      run: |
-        export ELECTRON_SKIP_BINARY_DOWNLOAD=1
-        npm install
+      - name: Install dependenies
+        run: |
+          export ELECTRON_SKIP_BINARY_DOWNLOAD=1
+          npm install
 
-    - name: build
-      run: npm run build
+      - name: Build
+        run: npm run build
 
-    - name: zip
-      run: |
-        sudo apt install zip -y
-        cp manifest.json ./dist/manifest.json
-        cd ./dist/
-        zip -r ../LLOneBot.zip ./* 
-    
-    - name: publish
-      uses: ncipollo/release-action@v1
-      with:
-        artifacts: "LLOneBot.zip"
-        draft: true
-        token: ${{ secrets.RELEASE_TOKEN }}
+      - name: Compress
+        run: |
+          sudo apt install zip -y
+          cd ./dist/
+          zip -r ../LLOneBot.zip ./*
+
+      - name: Extract version from tag
+        id: get-version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> "$GITHUB_OUTPUT"
+
+      - name: Release
+        uses: ncipollo/release-action@v1
+        with:
+          artifacts: 'LLOneBot.zip'
+          draft: true
+          token: ${{ secrets.RELEASE_TOKEN }}
+          name: LLOneBot v${{ steps.get-version.outputs.VERSION }}

.gitignore

@@ -1,6 +1,16 @@
-node_modules/
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/sdks
+!.yarn/versions
+
 package-lock.json
-dist/
-out/
-.idea/
-.DS_Store
+yarn.lock
+node_modules
+dist
+out
+
+.DS_Store
+.idea
+.vscode

.prettierrc.yml

@@ -0,0 +1,4 @@
+semi: false
+singleQuote: true
+trailingComma: all
+printWidth: 120

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

LICENSE

@@ -1,21 +1,339 @@
-MIT License
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 2, June 1991
 
-Copyright (c) 2024 LLOneBot
+ 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.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  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.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  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.
+
+  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.)
+
+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.

NapCatQQ-LICENSE

@@ -0,0 +1,343 @@
+ GNU GENERAL PUBLIC Without Social media promotion LICENSE
+                       Version 2, June 1991
+
+ 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.
+
+                            Preamble
+
+  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.
+
+  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.
+
+  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.

README.md

@@ -1,8 +1,11 @@
+# LLOneBot
 
-# LLOneBot API
-LiteLoaderQQNT插件，使你的NTQQ支持OneBot11协议进行QQ机器人开发
+LiteLoaderQQNT 插件，实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发
 
-TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
+> [!CAUTION]\
+> 请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论任何与本插件存在相关性的信息
+
+TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 安装方法
 
@@ -10,43 +13,28 @@ TG群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 ## 设置界面
 
-<img src="./doc/image/setting.png" width="500px" alt="图片名称"/>
+<img src="./doc/image/setting.png" width="400px" alt="设置界面"/>
 
-## HTTP 调用示例
-
-![](doc/image/example.jpg)
-
-## 支持的 api 和功能详情
+## 支持的 API
 
 见 <https://llonebot.github.io/zh-CN/develop/api>
 
-
-## TODO
-- [x] 重构摆脱LLAPI，目前调用LLAPI只能在renderer进程调用，需重构成在main进程调用
-- [x] 支持正、反向websocket（感谢@disymayufei的PR）
-- [x] 转发消息记录 
-- [x] 好友点赞api
-- [x] 群管理功能，禁言、踢人，改群名片等
-- [x] 视频消息
-- [x] 文件消息
-- [x] 群禁言事件上报
-- [x] 优化加群成功事件上报
-- [x] 清理缓存api
-- [ ] 无头模式
-- [ ] 框架对接文档
-
-## onebot11文档
-<https://11.onebot.dev/>
-
 ## Stargazers over time
+
 [![Stargazers over time](https://starchart.cc/LLOneBot/LLOneBot.svg?variant=adaptive)](https://starchart.cc/LLOneBot/LLOneBot)
 
+## 贡献者
+
+[![Contributors](https://contributors-img.web.app/image?repo=LLOneBot/LLOneBot)](https://github.com/LOneBot/LLOneBot/graphs/contributors)
 
 ## 鸣谢
-* [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
-* [LLAPI](https://github.com/Night-stars-1/LiteLoaderQQNT-Plugin-LLAPI)
-* [chronocat](https://github.com/chrononeko/chronocat/)
-* [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
+
+- [NapCatQQ](https://github.com/NapNeko/NapCatQQ)，依照开源协议参考了其部分代码
+- [LiteLoaderQQNT](https://liteloaderqqnt.github.io/guide/install.html)
+- [Chronocat](https://github.com/chrononeko/chronocat)
+- [koishi-plugin-adapter-onebot](https://github.com/koishijs/koishi-plugin-adapter-onebot)
+- [silk-wasm](https://github.com/idranme/silk-wasm)
 
 ## 友链
-* [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core) 一款用C#实现的NTQQ纯协议跨平台QQ机器人框架
+
+- [Lagrange.Core](https://github.com/LagrangeDev/Lagrange.Core): An Implementation of NTQQ Protocol

electron.vite.config.ts

@@ -1,73 +1,81 @@
-import cp from 'vite-plugin-cp';
-import "./scripts/gen-version"
+import cp from 'vite-plugin-cp'
+import path from 'node:path'
+import './scripts/gen-manifest'
+import type { ElectronViteConfig } from 'electron-vite'
 
-const external = ["silk-wasm", "ws",
-    "level", "classic-level", "abstract-level", "level-supports", "level-transcoder",
-    "module-error", "catering", "node-gyp-build"];
+const external = [
+  'silk-wasm',
+  'ws',
+  '@minatojs/sql.js',
+]
 
 function genCpModule(module: string) {
-    return {src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false}
+  return { src: `./node_modules/${module}`, dest: `dist/node_modules/${module}`, flatten: false }
 }
 
-let config = {
-    main: {
-        build: {
-            outDir: "dist/main",
-            emptyOutDir: true,
-            lib: {
-                formats: ["cjs"],
-                entry: {"main": "src/main/main.ts"},
-            },
-            rollupOptions: {
-                external,
-                input: "src/main/main.ts",
-            }
-        },
-        resolve: {
-            alias: {
-                './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg'
-            },
-        },
-        plugins: [cp({
-            targets: [
-                ...external.map(genCpModule),
-                {src: './manifest.json', dest: 'dist'}, {src: './icon.jpg', dest: 'dist'},
-                {src: './src/ntqqapi/external/ccpoke/poke-win32-x64.node', dest: 'dist/main/ccpoke/'},
-            ]
-        })]
+const config: ElectronViteConfig = {
+  main: {
+    build: {
+      outDir: 'dist/main',
+      emptyOutDir: true,
+      lib: {
+        formats: ['cjs'],
+        entry: { main: 'src/main/main.ts' },
+      },
+      rollupOptions: {
+        external,
+        input: 'src/main/main.ts',
+      },
+      minify: true,
     },
-    preload: {
-        // vite config options
-        build: {
-            outDir: "dist/preload",
-            emptyOutDir: true,
-            lib: {
-                formats: ["cjs"],
-                entry: {"preload": "src/preload.ts"},
-            },
-            rollupOptions: {
-                // external: externalAll,
-                input: "src/preload.ts",
-            }
-        },
-        resolve: {}
+    resolve: {
+      alias: {
+        '@': path.resolve(__dirname, './src'),
+      },
     },
-    renderer: {
-        // vite config options
-        build: {
-            outDir: "dist/renderer",
-            emptyOutDir: true,
-            lib: {
-                formats: ["es"],
-                entry: {"renderer": "src/renderer/index.ts"},
-            },
-            rollupOptions: {
-                // external: externalAll,
-                input: "src/renderer/index.ts",
-            }
-        },
-        resolve: {}
-    }
+    plugins: [
+      cp({
+        targets: [
+          ...external.map(genCpModule),
+          { src: './manifest.json', dest: 'dist' },
+          { src: './icon.webp', dest: 'dist' },
+          // { src: './src/ntqqapi/native/napcat-protocol-packet/Moehoo/*', dest: 'dist/main/Moehoo' },
+        ],
+      }),
+    ],
+  },
+  preload: {
+    // vite config options
+    build: {
+      outDir: 'dist/preload',
+      emptyOutDir: true,
+      lib: {
+        formats: ['cjs'],
+        entry: { preload: 'src/preload.ts' },
+      },
+      rollupOptions: {
+        // external: externalAll,
+        input: 'src/preload.ts',
+      },
+    },
+    resolve: {},
+  },
+  renderer: {
+    // vite config options
+    build: {
+      outDir: 'dist/renderer',
+      emptyOutDir: true,
+      lib: {
+        formats: ['es'],
+        entry: { renderer: 'src/renderer/index.ts' },
+      },
+      rollupOptions: {
+        // external: externalAll,
+        input: 'src/renderer/index.ts',
+      },
+    },
+    resolve: {},
+  },
 }
 
-export default config;
+export default config

manifest.json

@@ -1,19 +1,23 @@
 {
   "manifest_version": 4,
   "type": "extension",
-  "name": "LLOneBot v3.20.1",
+  "name": "LLOneBot",
   "slug": "LLOneBot",
-  "description": "使你的NTQQ支持OneBot11协议进行QQ机器人开发, 不支持商店在线更新",
-  "version": "3.20.1",
-  "icon": "./icon.jpg",
+  "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
+  "version": "4.4.1",
+  "icon": "./icon.webp",
   "authors": [
     {
       "name": "linyuchen",
       "link": "https://github.com/linyuchen"
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
     }
   ],
   "repository": {
-    "repo": "linyuchen/LiteLoaderQQNT-OneBotApi",
+    "repo": "LLOneBot/LLOneBot",
     "branch": "main",
     "release": {
       "tag": "latest",

package.json

@@ -2,44 +2,48 @@
   "name": "llonebot",
   "version": "1.0.0",
   "type": "module",
-  "description": "NTQQLiteLoaderOneBotApi",
+  "description": "",
   "main": "dist/main.js",
   "scripts": {
     "build": "electron-vite build",
     "build-mac": "npm run build && npm run deploy-mac",
-    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/LiteLoaderQQNT/plugins/LLOneBot/",
+    "deploy-mac": "cp -r dist/* ~/Library/Containers/com.tencent.qq/Data/Documents/LiteLoaderQQNT/plugins/LLOneBot/",
     "build-win": "npm run build && npm run deploy-win",
-    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %USERPROFILE%\\documents\\LiteLoaderQQNT\\plugins\\LLOneBot\\\""
+    "deploy-win": "cmd /c \"xcopy /C /S /Y dist\\* %LITELOADERQQNT_PROFILE%\\plugins\\LLOneBot\\\"",
+    "format": "prettier -cw .",
+    "check": "tsc",
+    "compile:proto": "pbjs --no-create --no-convert --no-delimited --no-verify -t static-module -w es6 -p src/ntqqapi/proto -o src/ntqqapi/proto/compiled.js profileLikeTip.proto groupNotify.proto message.proto richMedia.proto && pbts -o src/ntqqapi/proto/compiled.d.ts src/ntqqapi/proto/compiled.js"
   },
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
-    "compressing": "^1.10.0",
-    "express": "^4.18.2",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "level": "^8.0.1",
-    "silk-wasm": "^3.3.4",
-    "utf-8-validate": "^6.0.3",
-    "uuid": "^9.0.1",
-    "ws": "^8.16.0"
+    "@minatojs/driver-sqlite": "^4.6.0",
+    "@satorijs/element": "^3.1.7",
+    "@satorijs/protocol": "^1.4.2",
+    "compare-versions": "^6.1.1",
+    "cordis": "^3.18.1",
+    "cors": "^2.8.5",
+    "cosmokit": "^1.6.3",
+    "express": "^5.0.1",
+    "fluent-ffmpeg": "^2.1.3",
+    "minato": "^3.6.1",
+    "protobufjs": "^7.4.0",
+    "silk-wasm": "^3.6.3",
+    "ts-case-convert": "^2.1.0",
+    "ws": "^8.18.0"
   },
   "devDependencies": {
-    "@types/express": "^4.17.20",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/node": "^20.11.24",
-    "@types/uuid": "^9.0.8",
-    "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.4.0",
-    "electron": "^29.0.1",
-    "electron-vite": "^2.0.0",
-    "eslint": "^8.0.1",
-    "eslint-plugin-import": "^2.25.2",
-    "eslint-plugin-n": "^15.0.0 || ^16.0.0 ",
-    "eslint-plugin-promise": "^6.0.0",
-    "ts-node": "^10.9.2",
-    "typescript": "*",
-    "vite": "^5.1.4",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^5.0.0",
+    "@types/fluent-ffmpeg": "^2.1.27",
+    "@types/node": "^20.14.15",
+    "@types/ws": "^8.5.13",
+    "electron": "^31.4.0",
+    "electron-vite": "^2.3.0",
+    "protobufjs-cli": "^1.1.3",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.10",
     "vite-plugin-cp": "^4.0.8"
-  }
+  },
+  "packageManager": "yarn@4.5.1"
 }

scripts/gen-manifest.ts

@@ -0,0 +1,42 @@
+import { version } from '../src/version'
+import { writeFileSync } from 'node:fs'
+
+const manifest = {
+  manifest_version: 4,
+  type: 'extension',
+  name: 'LLOneBot',
+  slug: 'LLOneBot',
+  description: '实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发',
+  version,
+  icon: './icon.webp',
+  authors: [
+    {
+      name: 'linyuchen',
+      link: 'https://github.com/linyuchen'
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
+    }
+  ],
+  repository: {
+    repo: 'LLOneBot/LLOneBot',
+    branch: 'main',
+    release: {
+      tag: 'latest',
+      name: 'LLOneBot.zip'
+    }
+  },
+  platform: [
+    'win32',
+    'linux',
+    'darwin'
+  ],
+  injects: {
+    renderer: './renderer/index.js',
+    main: './main/main.cjs',
+    preload: './preload/preload.cjs'
+  }
+}
+
+writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))

scripts/gen-version.ts

@@ -1,22 +0,0 @@
-import fs from 'fs'
-import path from 'path'
-import { version } from '../src/version'
-
-const manifestPath = path.join(__dirname, '../manifest.json')
-
-function readManifest (): any {
-    if (fs.existsSync(manifestPath)) {
-        return JSON.parse(fs.readFileSync(manifestPath, 'utf-8'))
-    }
-}
-
-function writeManifest (manifest: any) {
-    fs.writeFileSync(manifestPath, JSON.stringify(manifest, null, 2))
-}
-
-const manifest = readManifest()
-if (version !== manifest.version) {
-    manifest.version = version
-    manifest.name = `LLOneBot v${version}`
-    writeManifest(manifest)
-}

scripts/test/test_db.ts

@@ -1,17 +0,0 @@
-import {Level} from "level"
-
-const db = new Level(process.env["level_db_path"], {valueEncoding: 'json'});
-
-async function getGroupNotify() {
-    let keys = await db.keys().all();
-    let result = []
-    for (const key of keys) {
-        // console.log(key)
-        if (key.startsWith("group_notify_")) {
-            result.push(key)
-        }
-    }
-    return result
-}
-
-getGroupNotify().then(console.log)

src/common/config.ts

@@ -1,97 +1,106 @@
-import fs from "fs";
-import {Config, OB11Config} from './types';
-
-import {mergeNewProperties} from "./utils/helper";
-import path from "node:path";
-import {selfInfo} from "./data";
-import {DATA_DIR} from "./utils";
-
-export const HOOK_LOG = false;
-
-export const ALLOW_SEND_TEMP_MSG = false;
+import fs from 'node:fs'
+import path from 'node:path'
+import { Config, OB11Config, SatoriConfig } from './types'
+import { selfInfo, DATA_DIR } from './globalVars'
+import { mergeNewProperties } from './utils/misc'
 
 export class ConfigUtil {
-    private readonly configPath: string;
-    private config: Config | null = null;
+  private readonly configPath: string
+  private config: Config | null = null
 
-    constructor(configPath: string) {
-        this.configPath = configPath;
+  constructor(configPath: string) {
+    this.configPath = configPath
+  }
+
+  getConfig(cache = true) {
+    if (this.config && cache) {
+      return this.config
     }
 
-    getConfig(cache = true) {
-        if (this.config && cache) {
-            return this.config;
-        }
+    return this.reloadConfig()
+  }
 
-        return this.reloadConfig();
+  reloadConfig(): Config {
+    const ob11Default: OB11Config = {
+      enable: true,
+      httpPort: 3000,
+      httpHosts: [],
+      httpSecret: '',
+      wsPort: 3001,
+      wsHosts: [],
+      enableHttp: true,
+      enableHttpPost: true,
+      enableWs: true,
+      enableWsReverse: false,
+      messagePostFormat: 'array',
+      enableHttpHeart: false,
+      listenLocalhost: false,
+      reportSelfMessage: false
+    }
+    const satoriDefault: SatoriConfig = {
+      enable: true,
+      port: 5600,
+      listen: '0.0.0.0',
+      token: ''
+    }
+    const defaultConfig: Config = {
+      enableLLOB: true,
+      satori: satoriDefault,
+      ob11: ob11Default,
+      heartInterval: 60000,
+      token: '',
+      enableLocalFile2Url: false,
+      debug: false,
+      log: true,
+      autoDeleteFile: false,
+      autoDeleteFileSecond: 60,
+      musicSignUrl: '',
+      msgCacheExpire: 120
     }
 
-    reloadConfig(): Config {
-        let ob11Default: OB11Config = {
-            httpPort: 3000,
-            httpHosts: [],
-            httpSecret: "",
-            wsPort: 3001,
-            wsHosts: [],
-            enableHttp: true,
-            enableHttpPost: true,
-            enableWs: true,
-            enableWsReverse: false,
-            messagePostFormat: "array",
-        }
-        let defaultConfig: Config = {
-            ob11: ob11Default,
-            heartInterval: 60000,
-            token: "",
-            enableLocalFile2Url: false,
-            debug: false,
-            log: false,
-            reportSelfMessage: false,
-            autoDeleteFile: false,
-            autoDeleteFileSecond: 60,
-            enablePoke: false
-        };
-
-        if (!fs.existsSync(this.configPath)) {
-            this.config = defaultConfig;
-            return this.config;
-        } else {
-            const data = fs.readFileSync(this.configPath, "utf-8");
-            let jsonData: Config = defaultConfig;
-            try {
-                jsonData = JSON.parse(data)
-            } catch (e) {
-                this.config = defaultConfig;
-                return this.config;
-            }
-            mergeNewProperties(defaultConfig, jsonData);
-            this.checkOldConfig(jsonData.ob11, jsonData, "httpPort", "http");
-            this.checkOldConfig(jsonData.ob11, jsonData, "httpHosts", "hosts");
-            this.checkOldConfig(jsonData.ob11, jsonData, "wsPort", "wsPort");
-            // console.log("get config", jsonData);
-            this.config = jsonData;
-            return this.config;
-        }
+    if (!fs.existsSync(this.configPath)) {
+      this.config = defaultConfig
+      return this.config
+    } else {
+      const data = fs.readFileSync(this.configPath, 'utf-8')
+      let jsonData: Config = defaultConfig
+      try {
+        jsonData = JSON.parse(data)
+      } catch (e) {
+        this.config = defaultConfig
+        return this.config
+      }
+      mergeNewProperties(defaultConfig, jsonData)
+      this.checkOldConfig(jsonData.ob11, jsonData, 'httpPort', 'http')
+      this.checkOldConfig(jsonData.ob11, jsonData, 'httpHosts', 'hosts')
+      this.checkOldConfig(jsonData.ob11, jsonData, 'wsPort', 'wsPort')
+      this.checkOldConfig(jsonData.ob11, jsonData, 'reportSelfMessage', 'reportSelfMessage')
+      this.config = jsonData
+      return this.config
     }
+  }
 
-    setConfig(config: Config) {
-        this.config = config;
-        fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), "utf-8")
-    }
+  setConfig(config: Config) {
+    this.config = config
+    fs.writeFileSync(this.configPath, JSON.stringify(config, null, 2), 'utf-8')
+  }
 
-    private checkOldConfig(currentConfig: Config | OB11Config,
-                           oldConfig: Config | OB11Config,
-                           currentKey: string, oldKey: string) {
-        // 迁移旧的配置到新配置，避免用户重新填写配置
-        const oldValue = oldConfig[oldKey];
-        if (oldValue) {
-            currentConfig[currentKey] = oldValue;
-            delete oldConfig[oldKey];
-        }
+  private checkOldConfig(
+    currentConfig: OB11Config,
+    oldConfig: Config,
+    currentKey: 'httpPort' | 'httpHosts' | 'wsPort' | 'reportSelfMessage',
+    oldKey: 'http' | 'hosts' | 'wsPort' | 'reportSelfMessage',
+  ) {
+    // 迁移旧的配置到新配置，避免用户重新填写配置
+    const oldValue = oldConfig[oldKey]
+    if (oldValue) {
+      Object.assign(currentConfig, { [currentKey]: oldValue })
+      delete oldConfig[oldKey]
     }
+  }
 }
 
 export function getConfigUtil() {
-    const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
-    return new ConfigUtil(configFilePath)
-}
+  const configFilePath = path.join(DATA_DIR, `config_${selfInfo.uin}.json`)
+  return new ConfigUtil(configFilePath)
+}

src/common/data.ts

@@ -1,104 +0,0 @@
-import {
-    type Friend,
-    type FriendRequest,
-    type Group,
-    type GroupMember,
-    type SelfInfo
-} from '../ntqqapi/types'
-import {type FileCache, type LLOneBotError} from './types'
-import {NTQQGroupApi} from "../ntqqapi/api/group";
-import {log} from "./utils/log";
-import {isNumeric} from "./utils/helper";
-
-export const selfInfo: SelfInfo = {
-    uid: '',
-    uin: '',
-    nick: '',
-    online: true
-}
-export let groups: Group[] = []
-export let friends: Friend[] = []
-export let friendRequests: Map<number, FriendRequest> = new Map<number, FriendRequest>()
-export const llonebotError: LLOneBotError = {
-    ffmpegError: '',
-    httpServerError: '',
-    wsServerError: '',
-    otherError: 'LLOnebot未能正常启动，请检查日志查看错误'
-}
-
-
-export async function getFriend(uinOrUid: string): Promise<Friend | undefined> {
-    let filterKey = isNumeric(uinOrUid) ? "uin" : "uid"
-    let filterValue = uinOrUid
-    let friend = friends.find(friend => friend[filterKey] === filterValue.toString())
-    // if (!friend) {
-    //     try {
-    //         friends = (await NTQQApi.getFriends(true))
-    //         friend = friends.find(friend => friend[filterKey] === filterValue.toString())
-    //     } catch (e) {
-    //         // log("刷新好友列表失败", e.stack.toString())
-    //     }
-    // }
-    return friend
-}
-
-export async function getGroup(qq: string): Promise<Group | undefined> {
-    let group = groups.find(group => group.groupCode === qq.toString())
-    if (!group) {
-        try {
-            const _groups = await NTQQGroupApi.getGroups(true);
-            group = _groups.find(group => group.groupCode === qq.toString())
-            if (group) {
-                groups.push(group)
-            }
-        } catch (e) {
-        }
-
-    }
-    return group
-}
-
-export async function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number) {
-    groupQQ = groupQQ.toString()
-    memberUinOrUid = memberUinOrUid.toString()
-    const group = await getGroup(groupQQ)
-    if (group) {
-        const filterKey = isNumeric(memberUinOrUid) ? "uin" : "uid"
-        const filterValue = memberUinOrUid
-        let filterFunc: (member: GroupMember) => boolean = member => member[filterKey] === filterValue
-        let member = group.members?.find(filterFunc)
-        if (!member) {
-            try {
-                const _members = await NTQQGroupApi.getGroupMembers(groupQQ)
-                if (_members.length > 0) {
-                    group.members = _members
-                }
-            } catch (e) {
-                // log("刷新群成员列表失败", e.stack.toString())
-            }
-
-            member = group.members?.find(filterFunc)
-        }
-        return member
-    }
-    return null
-}
-
-export async function refreshGroupMembers(groupQQ: string) {
-    const group = groups.find(group => group.groupCode === groupQQ)
-    if (group) {
-        group.members = await NTQQGroupApi.getGroupMembers(groupQQ)
-    }
-}
-
-export const uidMaps: Record<string, string> = {} // 一串加密的字符串(uid) -> qq号
-
-export function getUidByUin(uin: string) {
-    for (const key in uidMaps) {
-        if (uidMaps[key] === uin) {
-            return key
-        }
-    }
-}
-
-export let tempGroupCodeMap: Record<string, string> = {}  // peerUid => 群号

src/common/db.ts

@@ -1,277 +0,0 @@
-import {Level} from "level";
-import {type GroupNotify, RawMessage} from "../ntqqapi/types";
-import {DATA_DIR} from "./utils";
-import {selfInfo} from "./data";
-import {FileCache} from "./types";
-import {log} from "./utils/log";
-
-type ReceiveTempUinMap = Record<string, string>;
-
-class DBUtil {
-    public readonly DB_KEY_PREFIX_MSG_ID = "msg_id_";
-    public readonly DB_KEY_PREFIX_MSG_SHORT_ID = "msg_short_id_";
-    public readonly DB_KEY_PREFIX_MSG_SEQ_ID = "msg_seq_id_";
-    public readonly DB_KEY_PREFIX_FILE = "file_";
-    public readonly DB_KEY_PREFIX_GROUP_NOTIFY = "group_notify_";
-    private readonly DB_KEY_RECEIVED_TEMP_UIN_MAP = "received_temp_uin_map";
-    public db: Level;
-    public cache: Record<string, RawMessage | string | FileCache | GroupNotify | ReceiveTempUinMap> = {}  // <msg_id_ | msg_short_id_ | msg_seq_id_><id>: RawMessage
-    private currentShortId: number;
-
-    /*
-    * 数据库结构
-    * msg_id_101231230999: {} // 长id: RawMessage
-    * msg_short_id_1: 101231230999  // 短id: 长id
-    * msg_seq_id_1: 101231230999  // 序列id: 长id
-    * file_7827DBAFJFW2323.png: {} // 文件名: FileCache
-    * */
-
-    constructor() {
-        let initCount = 0;
-        new Promise((resolve, reject) => {
-            const initDB = () => {
-                initCount++;
-                // if (initCount > 50) {
-                //     return reject("init db fail")
-                // }
-
-                try {
-                    if (!selfInfo.uin) {
-                        setTimeout(initDB, 300);
-                        return
-                    }
-                    const DB_PATH = DATA_DIR + `/msg_${selfInfo.uin}`;
-                    this.db = new Level(DB_PATH, {valueEncoding: 'json'});
-                    console.log("llonebot init db success")
-                    resolve(null)
-                } catch (e) {
-                    console.log("init db fail", e.stack.toString())
-                    setTimeout(initDB, 300);
-                }
-            }
-            initDB();
-        }).then()
-
-        const expiredMilliSecond = 1000 * 60 * 60;
-
-        setInterval(() => {
-            // this.cache = {}
-            // 清理时间较久的缓存
-            const now = Date.now()
-            for (let key in this.cache) {
-                let message: RawMessage = this.cache[key] as RawMessage;
-                if (message?.msgTime){
-                    if ((now - (parseInt(message.msgTime) * 1000)) > expiredMilliSecond) {
-                        delete this.cache[key]
-                        // log("clear cache", key, message.msgTime);
-                    }
-                }
-            }
-        }, expiredMilliSecond)
-    }
-
-    public async getReceivedTempUinMap(): Promise<ReceiveTempUinMap> {
-        try{
-            this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = JSON.parse(await this.db.get(this.DB_KEY_RECEIVED_TEMP_UIN_MAP));
-        }catch (e) {
-        }
-        return (this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] || {}) as ReceiveTempUinMap;
-    }
-    public setReceivedTempUinMap(data: ReceiveTempUinMap) {
-        this.cache[this.DB_KEY_RECEIVED_TEMP_UIN_MAP] = data;
-        this.db.put(this.DB_KEY_RECEIVED_TEMP_UIN_MAP, JSON.stringify(data)).then();
-    }
-    private addCache(msg: RawMessage) {
-        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
-        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + msg.msgShortId
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq
-        this.cache[longIdKey] = this.cache[shortIdKey] = msg
-    }
-
-    public clearCache() {
-        this.cache = {}
-    }
-
-    async getMsgByShortId(shortMsgId: number): Promise<RawMessage> {
-        const shortMsgIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
-        if (this.cache[shortMsgIdKey]) {
-            // log("getMsgByShortId cache", shortMsgIdKey, this.cache[shortMsgIdKey])
-            return this.cache[shortMsgIdKey] as RawMessage
-        }
-        try {
-            const longId = await this.db.get(shortMsgIdKey);
-            const msg = await this.getMsgByLongId(longId)
-            this.addCache(msg)
-            return msg
-        } catch (e) {
-            log("getMsgByShortId db error", e.stack.toString())
-        }
-    }
-
-    async getMsgByLongId(longId: string): Promise<RawMessage> {
-        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + longId;
-        if (this.cache[longIdKey]) {
-            return this.cache[longIdKey] as RawMessage
-        }
-        try {
-            const data = await this.db.get(longIdKey)
-            const msg = JSON.parse(data)
-            this.addCache(msg)
-            return msg
-        } catch (e) {
-            // log("getMsgByLongId db error", e.stack.toString())
-        }
-    }
-
-    async getMsgBySeqId(seqId: string): Promise<RawMessage> {
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + seqId;
-        if (this.cache[seqIdKey]) {
-            return this.cache[seqIdKey] as RawMessage
-        }
-        try {
-            const longId = await this.db.get(seqIdKey);
-            const msg = await this.getMsgByLongId(longId)
-            this.addCache(msg)
-            return msg
-        } catch (e) {
-            log("getMsgBySeqId db error", e.stack.toString())
-        }
-    }
-
-    async addMsg(msg: RawMessage) {
-        // 有则更新，无则添加
-        // log("addMsg", msg.msgId, msg.msgSeq, msg.msgShortId);
-        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
-        let existMsg = this.cache[longIdKey] as RawMessage
-        if (!existMsg) {
-            try {
-                existMsg = await this.getMsgByLongId(msg.msgId)
-            } catch (e) {
-                // log("addMsg getMsgByLongId error", e.stack.toString())
-            }
-        }
-        if (existMsg) {
-            // log("消息已存在", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId)
-            this.updateMsg(msg).then()
-            return existMsg.msgShortId
-        }
-        this.addCache(msg);
-
-        const shortMsgId = await this.genMsgShortId();
-        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + shortMsgId;
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq;
-        msg.msgShortId = shortMsgId;
-        // log("新增消息记录", msg.msgId)
-        this.db.put(shortIdKey, msg.msgId).then().catch();
-        this.db.put(longIdKey, JSON.stringify(msg)).then().catch();
-        try {
-            await this.db.get(seqIdKey)
-        } catch (e) {
-            // log("新的seqId", seqIdKey)
-            this.db.put(seqIdKey, msg.msgId).then().catch();
-        }
-        if (!this.cache[seqIdKey]) {
-            this.cache[seqIdKey] = msg;
-        }
-        return shortMsgId
-        // log(`消息入库 ${seqIdKey}: ${msg.msgId}, ${shortMsgId}: ${msg.msgId}`);
-    }
-
-    async updateMsg(msg: RawMessage) {
-        const longIdKey = this.DB_KEY_PREFIX_MSG_ID + msg.msgId
-        let existMsg = this.cache[longIdKey] as RawMessage
-        if (!existMsg) {
-            try {
-                existMsg = await this.getMsgByLongId(msg.msgId)
-            } catch (e) {
-                existMsg = msg
-            }
-        }
-
-        Object.assign(existMsg, msg)
-        this.db.put(longIdKey, JSON.stringify(existMsg)).then().catch();
-        const shortIdKey = this.DB_KEY_PREFIX_MSG_SHORT_ID + existMsg.msgShortId;
-        const seqIdKey = this.DB_KEY_PREFIX_MSG_SEQ_ID + msg.msgSeq;
-        if (!this.cache[seqIdKey]) {
-            this.cache[seqIdKey] = existMsg;
-        }
-        this.db.put(shortIdKey, msg.msgId).then().catch();
-        try {
-            await this.db.get(seqIdKey)
-        } catch (e) {
-            this.db.put(seqIdKey, msg.msgId).then().catch();
-            // log("更新seqId error", e.stack, seqIdKey);
-        }
-        // log("更新消息", existMsg.msgSeq, existMsg.msgShortId, existMsg.msgId);
-    }
-
-
-    private async genMsgShortId(): Promise<number> {
-        const key = "msg_current_short_id";
-        if (this.currentShortId === undefined) {
-            try {
-                let id: string = await this.db.get(key);
-                this.currentShortId = parseInt(id);
-            } catch (e) {
-                this.currentShortId = -2147483640
-            }
-        }
-
-        this.currentShortId++;
-        this.db.put(key, this.currentShortId.toString()).then().catch();
-        return this.currentShortId;
-    }
-
-    async addFileCache(fileNameOrUuid: string, data: FileCache) {
-        const key = this.DB_KEY_PREFIX_FILE + fileNameOrUuid;
-        if (this.cache[key]) {
-            return
-        }
-        let cacheDBData = {...data}
-        delete cacheDBData['downloadFunc']
-        this.cache[fileNameOrUuid] = data;
-        try {
-            await this.db.put(key, JSON.stringify(cacheDBData));
-        } catch (e) {
-            log("addFileCache db error", e.stack.toString())
-        }
-    }
-
-    async getFileCache(fileNameOrUuid: string): Promise<FileCache | undefined> {
-        const key = this.DB_KEY_PREFIX_FILE + (fileNameOrUuid);
-        if (this.cache[key]) {
-            return this.cache[key] as FileCache
-        }
-        try {
-            let data = await this.db.get(key);
-            return JSON.parse(data);
-        } catch (e) {
-            // log("getFileCache db error", e.stack.toString())
-        }
-    }
-
-    async addGroupNotify(notify: GroupNotify) {
-        const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + notify.seq;
-        let existNotify = this.cache[key] as GroupNotify
-        if (existNotify) {
-            return
-        }
-        this.cache[key] = notify;
-        this.db.put(key, JSON.stringify(notify)).then().catch();
-    }
-
-    async getGroupNotify(seq: string): Promise<GroupNotify | undefined> {
-        const key = this.DB_KEY_PREFIX_GROUP_NOTIFY + seq;
-        if (this.cache[key]) {
-            return this.cache[key] as GroupNotify
-        }
-        try {
-            let data = await this.db.get(key);
-            return JSON.parse(data);
-        } catch (e) {
-            // log("getGroupNotify db error", e.stack.toString())
-        }
-    }
-}
-
-export const dbUtil = new DBUtil();

src/common/globalVars.ts

@@ -0,0 +1,22 @@
+import { LLOneBotError } from './types'
+import { SelfInfo } from '../ntqqapi/types'
+import path from 'node:path'
+
+export const llonebotError: LLOneBotError = {
+  ffmpegError: '',
+  httpServerError: '',
+  wsServerError: '',
+  otherError: 'LLOneBot 未能正常启动，请检查日志查看错误',
+}
+
+export const DATA_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.data
+export const TEMP_DIR: string = path.join(DATA_DIR, 'temp')
+export const PLUGIN_DIR: string = global.LiteLoader.plugins['LLOneBot'].path.plugin
+export const LOG_DIR = path.join(DATA_DIR, 'logs')
+
+export const selfInfo: SelfInfo = {
+  uid: '',
+  uin: '',
+  nick: '',
+  online: true,
+}

src/common/server/http.ts

@@ -1,114 +0,0 @@
-import express, {Express, Request, Response} from "express";
-import http from "http";
-import {log} from "../utils/log";
-import {getConfigUtil} from "../config";
-import {llonebotError} from "../data";
-
-type RegisterHandler = (res: Response, payload: any) => Promise<any>
-
-export abstract class HttpServerBase {
-    name: string = "LLOneBot";
-    private readonly expressAPP: Express;
-    private server: http.Server = null;
-
-    constructor() {
-        this.expressAPP = express();
-        this.expressAPP.use(express.urlencoded({extended: true, limit: "5000mb"}));
-        this.expressAPP.use((req, res, next) => {
-            // 兼容处理没有带content-type的请求
-            // log("req.headers['content-type']", req.headers['content-type'])
-            req.headers['content-type'] = 'application/json';
-            const originalJson = express.json({limit: "5000mb"});
-            // 调用原始的express.json()处理器
-            originalJson(req, res, (err) => {
-                if (err) {
-                    log("Error parsing JSON:", err);
-                    return res.status(400).send("Invalid JSON");
-                }
-                next();
-            });
-        });
-    }
-
-    authorize(req: Request, res: Response, next: () => void) {
-        let serverToken = getConfigUtil().getConfig().token;
-        let clientToken = ""
-        const authHeader = req.get("authorization")
-        if (authHeader) {
-            clientToken = authHeader.split("Bearer ").pop()
-            log("receive http header token", clientToken)
-        } else if (req.query.access_token) {
-            if (Array.isArray(req.query.access_token)) {
-                clientToken = req.query.access_token[0].toString();
-            } else {
-                clientToken = req.query.access_token.toString();
-            }
-            log("receive http url token", clientToken)
-        }
-
-        if (serverToken && clientToken != serverToken) {
-            return res.status(403).send(JSON.stringify({message: 'token verify failed!'}));
-        }
-        next();
-    };
-
-    start(port: number) {
-        try {
-            this.expressAPP.get('/', (req: Request, res: Response) => {
-                res.send(`${this.name}已启动`);
-            })
-            this.listen(port);
-            llonebotError.httpServerError = ""
-        } catch (e) {
-            log("HTTP服务启动失败", e.toString())
-            llonebotError.httpServerError = "HTTP服务启动失败, " + e.toString()
-        }
-    }
-
-    stop() {
-        llonebotError.httpServerError = ""
-        if (this.server) {
-            this.server.close()
-            this.server = null;
-        }
-    }
-
-    restart(port: number) {
-        this.stop()
-        this.start(port)
-    }
-
-    abstract handleFailed(res: Response, payload: any, err: any): void
-
-    registerRouter(method: "post" | "get" | string, url: string, handler: RegisterHandler) {
-        if (!url.startsWith("/")) {
-            url = "/" + url
-        }
-
-        if (!this.expressAPP[method]) {
-            const err = `${this.name} register router failed，${method} not exist`;
-            log(err);
-            throw err;
-        }
-        this.expressAPP[method](url, this.authorize, async (req: Request, res: Response) => {
-            let payload = req.body;
-            if (method == "get") {
-                payload = req.query
-            }
-            log("收到http请求", url, payload);
-            try {
-                res.send(await handler(res, payload))
-            } catch (e) {
-                this.handleFailed(res, payload, e.stack.toString())
-            }
-        });
-    }
-
-    protected listen(port: number) {
-        this.server = this.expressAPP.listen(port, "0.0.0.0", () => {
-            const info = `${this.name} started 0.0.0.0:${port}`
-            console.log(info);
-            log(info);
-        });
-    }
-}

src/common/server/websocket.ts

@@ -1,104 +0,0 @@
-import {WebSocket, WebSocketServer} from "ws";
-import urlParse from "url";
-import {IncomingMessage} from "node:http";
-import {log} from "../utils/log";
-import {getConfigUtil} from "../config";
-import {llonebotError} from "../data";
-
-class WebsocketClientBase {
-    private wsClient: WebSocket
-
-    constructor() {
-    }
-
-    send(msg: string) {
-        if (this.wsClient && this.wsClient.readyState == WebSocket.OPEN) {
-            this.wsClient.send(msg);
-        }
-    }
-
-    onMessage(msg: string) {
-
-    }
-}
-
-export class WebsocketServerBase {
-    private ws: WebSocketServer = null;
-
-    constructor() {
-        console.log(`llonebot websocket service started`)
-    }
-
-    start(port: number) {
-        try {
-            this.ws = new WebSocketServer({port});
-            llonebotError.wsServerError = ''
-        }catch (e) {
-            llonebotError.wsServerError = "正向ws服务启动失败, " + e.toString()
-        }
-        this.ws.on("connection", (wsClient, req) => {
-            const url = req.url.split("?").shift()
-            this.authorize(wsClient, req);
-            this.onConnect(wsClient, url, req);
-            wsClient.on("message", async (msg) => {
-                this.onMessage(wsClient, url, msg.toString())
-            })
-        })
-    }
-
-    stop() {
-        llonebotError.wsServerError = ''
-        this.ws.close((err) => {
-            log("ws server close failed!", err)
-        });
-        this.ws = null;
-    }
-
-    restart(port: number) {
-        this.stop();
-        this.start(port);
-    }
-
-    authorize(wsClient: WebSocket, req) {
-        let token = getConfigUtil().getConfig().token;
-        const url = req.url.split("?").shift();
-        log("ws connect", url)
-        let clientToken: string = ""
-        const authHeader = req.headers['authorization'];
-        if (authHeader) {
-            clientToken = authHeader.split("Bearer ").pop()
-            log("receive ws header token", clientToken);
-        } else {
-            const parsedUrl = urlParse.parse(req.url, true);
-            const urlToken = parsedUrl.query.access_token;
-            if (urlToken) {
-                if (Array.isArray(urlToken)) {
-                    clientToken = urlToken[0]
-                } else {
-                    clientToken = urlToken
-                }
-                log("receive ws url token", clientToken);
-            }
-        }
-        if (token && clientToken != token) {
-            this.authorizeFailed(wsClient)
-            return wsClient.close()
-        }
-    }
-
-    authorizeFailed(wsClient: WebSocket) {
-
-    }
-
-    onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
-
-    }
-
-    onMessage(wsClient: WebSocket, url: string, msg: string) {
-
-    }
-
-    sendHeart() {
-
-    }
-}

src/common/types.ts

@@ -1,4 +1,5 @@
 export interface OB11Config {
+  enable: boolean
   httpPort: number
   httpHosts: string[]
   httpSecret?: string
@@ -9,23 +10,52 @@ export interface OB11Config {
   enableWs?: boolean
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
+  enableHttpHeart?: boolean
+  /**
+   * 快速操作回复自动引用原消息
+   * @deprecated
+   */
+  enableQOAutoQuote?: boolean
+  listenLocalhost: boolean
+  reportSelfMessage: boolean
 }
-export interface CheckVersion {
-  result: boolean,
-  version: string
+
+export interface SatoriConfig {
+  enable: boolean
+  listen: string
+  port: number
+  token: string
 }
+
 export interface Config {
+  enableLLOB: boolean
+  satori: SatoriConfig
   ob11: OB11Config
   token?: string
-  heartInterval?: number // ms
+  heartInterval: number // ms
   enableLocalFile2Url?: boolean // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
   debug?: boolean
-  reportSelfMessage?: boolean
   log?: boolean
   autoDeleteFile?: boolean
   autoDeleteFileSecond?: number
   ffmpeg?: string // ffmpeg路径
-  enablePoke?: boolean
+  musicSignUrl?: string
+  ignoreBeforeLoginMsg?: boolean
+  /** 单位为秒 */
+  msgCacheExpire?: number
+  /** @deprecated */
+  http?: string
+  /** @deprecated */
+  hosts?: string[]
+  /** @deprecated */
+  wsPort?: string
+  /** @deprecated */
+  reportSelfMessage?: boolean
+}
+
+export interface CheckVersion {
+  result: boolean
+  version: string
 }
 
 export interface LLOneBotError {
@@ -37,10 +67,22 @@ export interface LLOneBotError {
 
 export interface FileCache {
   fileName: string
-  filePath: string
   fileSize: string
-  fileUuid?: string
-  url?: string
-  msgId?: string
-  downloadFunc?: () => Promise<void>
+  msgId: string
+  peerUid: string
+  chatType: number
+  elementId: string
+  elementType: number
+}
+
+export interface FileCacheV2 {
+  fileName: string
+  fileSize: string
+  fileUuid: string
+  msgId: string
+  msgTime: number
+  peerUid: string
+  chatType: number
+  elementId: string
+  elementType: number
 }

src/common/utils/audio.ts

@@ -1,137 +1,113 @@
-import fs from "fs";
-import {encode, getDuration, getWavFileInfo, isWav} from "silk-wasm";
-import fsPromise from "fs/promises";
-import {log} from "./log";
-import path from "node:path";
-import {DATA_DIR, TEMP_DIR} from "./index";
-import {v4 as uuidv4} from "uuid";
-import {getConfigUtil} from "../config";
-import ffmpeg from "fluent-ffmpeg";
+import path from 'node:path'
+import ffmpeg from 'fluent-ffmpeg'
+import fsPromise from 'node:fs/promises'
+import { decode, encode, getDuration, getWavFileInfo, isWav, isSilk, EncodeResult } from 'silk-wasm'
+import { TEMP_DIR } from '../globalVars'
+import { randomUUID } from 'node:crypto'
+import { Readable } from 'node:stream'
+import { Context } from 'cordis'
 
-export async function encodeSilk(filePath: string) {
-    function getFileHeader(filePath: string) {
-        // 定义要读取的字节数
-        const bytesToRead = 7;
-        try {
-            const buffer = fs.readFileSync(filePath, {
-                encoding: null,
-                flag: "r",
-            });
+interface FFmpegOptions {
+  input?: string[]
+  output?: string[]
+}
 
-            const fileHeader = buffer.toString("hex", 0, bytesToRead);
-            return fileHeader;
-        } catch (err) {
-            console.error("读取文件错误:", err);
-            return;
-        }
-    }
+type Input = string | Readable
 
-    async function isWavFile(filePath: string) {
-        return isWav(fs.readFileSync(filePath));
-    }
-
-    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)
-        log(`通过文件大小估算语音的时长:`, duration)
-        return duration
-    }
-
-    // function verifyDuration(oriDuration: number, guessDuration: number) {
-    //     // 单位都是秒
-    //     if (oriDuration - guessDuration > 10) {
-    //         return guessDuration
-    //     }
-    //     oriDuration = Math.max(1, oriDuration)
-    //     return oriDuration
-    // }
-    // async function getAudioSampleRate(filePath: string) {
-    //     try {
-    //         const mm = await import('music-metadata');
-    //         const metadata = await mm.parseFile(filePath);
-    //         log(`${filePath}采样率`, metadata.format.sampleRate);
-    //         return metadata.format.sampleRate;
-    //     } catch (error) {
-    //         log(`${filePath}采样率获取失败`, error.stack);
-    //         // console.error(error);
-    //     }
-    // }
-
-    try {
-        const pttPath = path.join(TEMP_DIR, uuidv4());
-        if (getFileHeader(filePath) !== "02232153494c4b") {
-            log(`语音文件${filePath}需要转换成silk`)
-            const _isWav = await isWavFile(filePath);
-            const wavPath = pttPath + ".wav"
-            const convert = async () => {
-                return await new Promise((resolve, reject) => {
-                    const ffmpegPath = getConfigUtil().getConfig().ffmpeg;
-                    if (ffmpegPath) {
-                        ffmpeg.setFfmpegPath(ffmpegPath);
-                    }
-                    ffmpeg(filePath).toFormat("wav")
-                        .audioChannels(1)
-                        .audioFrequency(24000)
-                        .on('end', function () {
-                        log('wav转换完成');
-                    })
-                        .on('error', function (err) {
-                            log(`wav转换出错: `, err.message,);
-                            reject(err);
-                        })
-                        .save(wavPath)
-                        .on("end", () => {
-                            filePath = wavPath
-                            resolve(wavPath);
-                        });
-                })
-            }
-            let wav: Buffer
-            if (!_isWav) {
-                log(`语音文件${filePath}正在转换成wav`)
-                await convert()
-            } else {
-                wav = fs.readFileSync(filePath)
-                const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
-                const {fmt} = getWavFileInfo(wav)
-                // log(`wav文件信息`, fmt)
-                if (!allowSampleRate.includes(fmt.sampleRate)) {
-                    wav = undefined
-                    await convert()
-                }
-            }
-            wav ||= fs.readFileSync(filePath);
-            const silk = await encode(wav, 0);
-            fs.writeFileSync(pttPath, silk.data);
-            fs.unlink(wavPath, (err) => {
-            });
-            // const gDuration = await guessDuration(pttPath)
-            log(`语音文件${filePath}转换成功!`, pttPath, `时长:`, silk.duration)
-            return {
-                converted: true,
-                path: pttPath,
-                duration: silk.duration / 1000
-            };
+function convert(ctx: Context, input: Input, options: FFmpegOptions): Promise<Buffer>
+function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath: string): Promise<string>
+function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?: string): Promise<Buffer | string> {
+  return new Promise((resolve, reject) => {
+    const chunks: Buffer[] = []
+    let command = ffmpeg(input)
+      .on('error', err => {
+        ctx.logger.error(`FFmpeg处理转换出错: `, err.message)
+        reject(err)
+      })
+      .on('end', () => {
+        if (!outputPath) {
+          resolve(Buffer.concat(chunks))
         } else {
-            const silk = fs.readFileSync(filePath);
-            let duration = 0;
-            try {
-                duration = getDuration(silk) / 1000
-            } catch (e) {
-                log("获取语音文件时长失败, 使用文件大小推测时长", filePath, e.stack)
-                duration = await guessDuration(filePath);
-            }
-
-            return {
-                converted: false,
-                path: filePath,
-                duration: duration,
-            };
+          resolve(outputPath)
         }
-    } catch (error) {
-        log("convert silk failed", error.stack);
-        return {};
+      })
+    if (options.input) {
+      command = command.inputOptions(options.input)
     }
-}
+    if (options.output) {
+      command = command.outputOptions(options.output)
+    }
+    const ffmpegPath: string | undefined = ctx.config.ffmpeg
+    if (ffmpegPath) {
+      command = command.setFfmpegPath(ffmpegPath)
+    }
+    if (!outputPath) {
+      const stream = command.pipe()
+      stream.on('data', chunk => {
+        chunks.push(chunk)
+      })
+    } else {
+      command.save(outputPath)
+    }
+  })
+}
+
+export async function encodeSilk(ctx: Context, filePath: string) {
+  const file = await fsPromise.readFile(filePath)
+  if (!isSilk(file)) {
+    ctx.logger.info(`语音文件${filePath}需要转换成silk`)
+    let result: EncodeResult
+    const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
+    if (isWav(file) && allowSampleRate.includes(getWavFileInfo(file).fmt.sampleRate)) {
+      result = await encode(file, 0)
+    } else {
+      const input = await convert(ctx, filePath, {
+        output: [
+          '-ar 24000',
+          '-ac 1',
+          '-f s16le'
+        ]
+      })
+      result = await encode(input, 24000)
+    }
+    const pttPath = path.join(TEMP_DIR, randomUUID())
+    await fsPromise.writeFile(pttPath, result.data)
+    ctx.logger.info(`语音文件${filePath}转换成功!`, pttPath, `时长:`, result.duration)
+    return {
+      converted: true,
+      path: pttPath,
+      duration: result.duration / 1000,
+    }
+  } else {
+    const silk = file
+    let duration = 1
+    try {
+      duration = getDuration(silk) / 1000
+    } catch (e) {
+      ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, (e as Error).stack)
+    }
+    return {
+      converted: false,
+      path: filePath,
+      duration,
+    }
+  }
+}
+
+type OutFormat = 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
+
+export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat: OutFormat) {
+  const silk = await fsPromise.readFile(inputFilePath)
+  const { data } = await decode(silk, 24000)
+  const tmpPath = path.join(TEMP_DIR, path.basename(inputFilePath))
+  const outFilePath = tmpPath + `.${outFormat}`
+  const pcmFilePath = tmpPath + '.pcm'
+  await fsPromise.writeFile(pcmFilePath, data)
+  return convert(ctx, pcmFilePath, {
+    input: [
+      '-f s16le',
+      '-ar 24000',
+      '-ac 1'
+    ]
+  }, outFilePath)
+}

src/common/utils/file.ts

@@ -1,258 +1,196 @@
-import fs from "fs";
-import fsPromise from "fs/promises";
-import crypto from "crypto";
-import util from "util";
-import path from "node:path";
-import {v4 as uuidv4} from "uuid";
-import {log, TEMP_DIR} from "./index";
-import {dbUtil} from "../db";
-import * as fileType from "file-type";
-import {net} from "electron";
-
-
-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'
-}
+import fs from 'node:fs'
+import fsPromise from 'node:fs/promises'
+import path from 'node:path'
+import { TEMP_DIR } from '../globalVars'
+import { randomUUID, createHash } from 'node:crypto'
+import { fileURLToPath } from 'node:url'
+import { Context } from 'cordis'
 
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
-    return new Promise((resolve, reject) => {
-        const startTime = Date.now();
+  return new Promise((resolve, reject) => {
+    const startTime = Date.now()
 
-        function check() {
-            if (fs.existsSync(path)) {
-                resolve();
-            } else if (Date.now() - startTime > timeout) {
-                reject(new Error(`文件不存在: ${path}`));
-            } else {
-                setTimeout(check, 100);
-            }
-        }
-
-        check();
-    });
-}
-
-export async function file2base64(path: string) {
-    const readFile = util.promisify(fs.readFile);
-    let result = {
-        err: "",
-        data: ""
+    function check() {
+      if (fs.existsSync(path)) {
+        resolve()
+      } else if (Date.now() - startTime > timeout) {
+        reject(new Error(`文件不存在: ${path}`))
+      } else {
+        setTimeout(check, 200)
+      }
     }
-    try {
-        // 读取文件内容
-        // if (!fs.existsSync(path)){
-        //     path = path.replace("\\Ori\\", "\\Thumb\\");
-        // }
-        try {
-            await checkFileReceived(path, 5000);
-        } catch (e: any) {
-            result.err = e.toString();
-            return result;
-        }
-        const data = await readFile(path);
-        // 转换为Base64编码
-        result.data = data.toString('base64');
-    } catch (err) {
-        result.err = err.toString();
-    }
-    return result;
+
+    check()
+  })
 }
 
-
-
 export function calculateFileMD5(filePath: string): Promise<string> {
-    return new Promise((resolve, reject) => {
-        // 创建一个流式读取器
-        const stream = fs.createReadStream(filePath);
-        const hash = crypto.createHash('md5');
+  return new Promise((resolve, reject) => {
+    const hash = createHash('md5')
 
-        stream.on('data', (data: Buffer) => {
-            // 当读取到数据时，更新哈希对象的状态
-            hash.update(data);
-        });
+    // 创建一个流式读取器
+    const stream = fs.createReadStream(filePath)
 
-        stream.on('end', () => {
-            // 文件读取完成，计算哈希
-            const md5 = hash.digest('hex');
-            resolve(md5);
-        });
+    stream.on('data', (data: Buffer) => {
+      // 当读取到数据时，更新哈希对象的状态
+      hash.update(data)
+    })
 
-        stream.on('error', (err: Error) => {
-            // 处理可能的读取错误
-            reject(err);
-        });
-    });
+    stream.on('end', () => {
+      // 文件读取完成，计算哈希
+      const md5 = hash.digest('hex')
+      resolve(md5)
+    })
+
+    stream.on('error', (err: Error) => {
+      // 处理可能的读取错误
+      reject(err)
+    })
+  })
 }
 
-export interface HttpDownloadOptions {
-    url: string;
-    headers?: Record<string, string> | string;
+export enum FileUriType {
+  Unknown = 0,
+  FileURL = 1,
+  RemoteURL = 2,
+  OneBotBase64 = 3,
+  DataURL = 4,
+  Path = 5
 }
-export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-    let chunks: Buffer[] = [];
-    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"
-    };
-    if (typeof options === "string") {
-        url = options;
-    } else {
-        url = options.url;
-        if (options.headers) {
-            if (typeof options.headers === "string") {
-                headers = JSON.parse(options.headers);
-            } else {
-                headers = options.headers;
-            }
-        }
+
+export function checkUriType(uri: string): { type: FileUriType } {
+  if (uri.startsWith('base64://')) {
+    return { type: FileUriType.OneBotBase64 }
+  }
+  if (uri.startsWith('data:')) {
+    return { type: FileUriType.DataURL }
+  }
+  if (uri.startsWith('http://') || uri.startsWith('https://')) {
+    return { type: FileUriType.RemoteURL }
+  }
+  if (uri.startsWith('file://')) {
+    return { type: FileUriType.FileURL }
+  }
+  try {
+    if (fs.existsSync(uri)) return { type: FileUriType.Path }
+  } catch { }
+  return { type: FileUriType.Unknown }
+}
+
+interface FetchFileRes {
+  data: Buffer
+  url: string
+}
+
+export async function fetchFile(url: string, headersInit?: Record<string, string>): Promise<FetchFileRes> {
+  const headers = new Headers({
+    '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',
+    'Host': new URL(url).hostname,
+    ...headersInit
+  })
+  let raw = await fetch(url, { headers }).catch((err) => {
+    if (err.cause) {
+      throw err.cause
     }
-    const fetchRes = await net.fetch(url, headers);
-    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`)
-
-    const blob = await fetchRes.blob();
-    let buffer = await blob.arrayBuffer();
-    return Buffer.from(buffer);
+    throw err
+  })
+  if (raw.status === 403 && !headers.has('Referer')) {
+    headers.set('Referer', url)
+    raw = await fetch(url, { headers }).catch((err) => {
+      if (err.cause) {
+        throw err.cause
+      }
+      throw err
+    })
+  }
+  if (!raw.ok) throw new Error(`statusText: ${raw.statusText}`)
+  return {
+    data: Buffer.from(await raw.arrayBuffer()),
+    url: raw.url
+  }
 }
 
 type Uri2LocalRes = {
-    success: boolean,
-    errMsg: string,
-    fileName: string,
-    ext: string,
-    path: string,
-    isLocal: boolean
+  success: boolean
+  errMsg: string
+  fileName: string
+  path: string
+  isLocal: boolean
 }
 
-export async function uri2local(uri: string, fileName: string = null): Promise<Uri2LocalRes> {
-    let res = {
-        success: false,
-        errMsg: "",
-        fileName: "",
-        ext: "",
-        path: "",
-        isLocal: false
-    }
-    if (!fileName) {
-        fileName = uuidv4();
-    }
-    let filePath = path.join(TEMP_DIR, fileName)
-    let url = null;
+export async function uri2local(ctx: Context, uri: string, needExt?: boolean): Promise<Uri2LocalRes> {
+  const { type } = checkUriType(uri)
+
+  if (type === FileUriType.FileURL) {
+    const filePath = fileURLToPath(uri)
+    const fileName = path.basename(filePath)
+    // console.log('fileURLToPath', filePath)
+    // console.log('fileName', fileName)
+    return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
+  }
+
+  if (type === FileUriType.Path) {
+    const fileName = path.basename(uri)
+    return { success: true, errMsg: '', fileName, path: uri, isLocal: true }
+  }
+
+  if (type === FileUriType.RemoteURL) {
     try {
-        url = new URL(uri);
+      const res = await fetchFile(uri)
+      const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
+      let filename: string
+      if (match?.[1]) {
+        filename = match[1].replace(/[/\\:*?"<>|]/g, '_')
+      } else {
+        filename = randomUUID()
+      }
+      let filePath = path.join(TEMP_DIR, filename)
+      await fsPromise.writeFile(filePath, res.data)
+      if (needExt && !path.extname(filePath)) {
+        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        filename += `.${ext}`
+        await fsPromise.rename(filePath, `${filePath}.${ext}`)
+        filePath = `${filePath}.${ext}`
+      }
+      return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
     } catch (e) {
-        res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`
-        return res
+      const errMsg = `${uri} 下载失败, ${(e as Error).message}`
+      return { success: false, errMsg, fileName: '', path: '', isLocal: false }
     }
+  }
 
-    // log("uri protocol", url.protocol, uri);
-    if (url.protocol == "base64:") {
-        // base64转成文件
-        let base64Data = uri.split("base64://")[1]
-        try {
-            const buffer = Buffer.from(base64Data, 'base64');
-            fs.writeFileSync(filePath, buffer);
-
-        } catch (e: any) {
-            res.errMsg = `base64文件下载失败,` + e.toString()
-            return res
-        }
-    } else if (url.protocol == "http:" || url.protocol == "https:") {
-        // 下载文件
-        let buffer: Buffer = null;
-        try {
-            buffer = await httpDownload(uri);
-        } catch (e) {
-            res.errMsg = `${url}下载失败,` + e.toString()
-            return res
-        }
-        try {
-            const pathInfo = path.parse(decodeURIComponent(url.pathname))
-            if (pathInfo.name) {
-                fileName = pathInfo.name
-                if (pathInfo.ext) {
-                    fileName += pathInfo.ext
-                    // res.ext = pathInfo.ext
-                }
-            }
-            res.fileName = fileName
-            filePath = path.join(TEMP_DIR, uuidv4() + fileName)
-            fs.writeFileSync(filePath, buffer);
-        } catch (e: any) {
-            res.errMsg = `${url}下载失败,` + e.toString()
-            return res
-        }
-    } else {
-        let pathname: string;
-        if (url.protocol === "file:") {
-            // await fs.copyFile(url.pathname, filePath);
-            pathname = decodeURIComponent(url.pathname)
-            if (process.platform === "win32") {
-                filePath = pathname.slice(1)
-            } else {
-                filePath = pathname
-            }
-        } else {
-            const cache = await dbUtil.getFileCache(uri);
-            if (cache) {
-                filePath = cache.filePath
-            } else {
-                filePath = uri;
-            }
-        }
-
-        res.isLocal = true
+  if (type === FileUriType.OneBotBase64) {
+    let filename = randomUUID()
+    let filePath = path.join(TEMP_DIR, filename)
+    const base64 = uri.replace(/^base64:\/\//, '')
+    await fsPromise.writeFile(filePath, base64, 'base64')
+    if (needExt) {
+      const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+      filename += `.${ext}`
+      await fsPromise.rename(filePath, `${filePath}.${ext}`)
+      filePath = `${filePath}.${ext}`
     }
-    // else{
-    //     res.errMsg = `不支持的file协议,` + url.protocol
-    //     return res
-    // }
-    // if (isGIF(filePath) && !res.isLocal) {
-    //     await fs.rename(filePath, filePath + ".gif");
-    //     filePath += ".gif";
-    // }
-    if (!res.isLocal && !res.ext) {
-        try {
-            let ext: string = (await fileType.fileTypeFromFile(filePath)).ext
-            if (ext) {
-                log("获取文件类型", ext, filePath)
-                fs.renameSync(filePath, filePath + `.${ext}`)
-                filePath += `.${ext}`
-                res.fileName += `.${ext}`
-                res.ext = ext
-            }
-        } catch (e) {
-            // log("获取文件类型失败", filePath,e.stack)
-        }
+    return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
+  }
+
+  if (type === FileUriType.DataURL) {
+    // https://developer.mozilla.org/en-US/docs/Web/HTTP/Basics_of_HTTP/MIME_types/Common_types
+    const capture = /^data:([\w/.+-]+);base64,(.*)$/.exec(uri)
+    if (capture) {
+      let filename = randomUUID()
+      const [, _type, base64] = capture
+      let filePath = path.join(TEMP_DIR, filename)
+      await fsPromise.writeFile(filePath, base64, 'base64')
+      if (needExt) {
+        const ext = (await ctx.ntFileApi.getFileType(filePath)).ext
+        filename += `.${ext}`
+        await fsPromise.rename(filePath, `${filePath}.${ext}`)
+        filePath = `${filePath}.${ext}`
+      }
+      return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
     }
-    res.success = true
-    res.path = filePath
-    return res
+  }
+
+  return { success: false, errMsg: '未知文件类型', fileName: '', path: '', isLocal: false }
 }
-
-export async function copyFolder(sourcePath: string, destPath: string) {
-    try {
-        const entries = await fsPromise.readdir(sourcePath, {withFileTypes: true});
-        await fsPromise.mkdir(destPath, {recursive: true});
-        for (let entry of entries) {
-            const srcPath = path.join(sourcePath, entry.name);
-            const dstPath = path.join(destPath, entry.name);
-            if (entry.isDirectory()) {
-                await copyFolder(srcPath, dstPath);
-            } else {
-                try {
-                    await fsPromise.copyFile(srcPath, dstPath);
-                } catch (error) {
-                    console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
-                    // 这里可以决定是否要继续复制其他文件
-                }
-            }
-        }
-    } catch (error) {
-        console.error('复制文件夹时出错:', error);
-    }
-}

src/common/utils/helper.ts

@@ -1,68 +0,0 @@
-export function truncateString(obj: any, maxLength = 500) {
-    if (obj !== null && typeof obj === 'object') {
-        Object.keys(obj).forEach(key => {
-            if (typeof obj[key] === 'string') {
-                // 如果是字符串且超过指定长度，则截断
-                if (obj[key].length > maxLength) {
-                    obj[key] = obj[key].substring(0, maxLength) + '...';
-                }
-            } else if (typeof obj[key] === 'object') {
-                // 如果是对象或数组，则递归调用
-                truncateString(obj[key], maxLength);
-            }
-        });
-    }
-    return obj;
-}
-
-export function isNumeric(str: string) {
-    return /^\d+$/.test(str);
-}
-
-export function sleep(ms: number): Promise<void> {
-    return new Promise(resolve => setTimeout(resolve, ms));
-}
-
-// 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象
-export function mergeNewProperties(newObj: any, oldObj: any) {
-    Object.keys(newObj).forEach(key => {
-        // 如果老对象不存在当前属性，则直接复制
-        if (!oldObj.hasOwnProperty(key)) {
-            oldObj[key] = newObj[key];
-        } else {
-            // 如果老对象和新对象的当前属性都是对象，则递归合并
-            if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
-                mergeNewProperties(newObj[key], oldObj[key]);
-            } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
-                // 属性冲突，有一方不是对象，直接覆盖
-                oldObj[key] = newObj[key];
-            }
-        }
-    });
-}
-
-export function isNull(value: any) {
-    return value === undefined || value === null;
-}
-
-/**
- * 将字符串按最大长度分割并添加换行符
- * @param str 原始字符串
- * @param maxLength 每行的最大字符数
- * @returns 处理后的字符串，超过长度的地方将会换行
- */
-export function wrapText(str: string, maxLength: number): string {
-    // 初始化一个空字符串用于存放结果
-    let result: string = '';
-
-    // 循环遍历字符串，每次步进maxLength个字符
-    for (let i = 0; i < str.length; i += maxLength) {
-        // 从i开始，截取长度为maxLength的字符串段，并添加到结果字符串
-        // 如果不是第一段，先添加一个换行符
-        if (i > 0) result += '\n';
-        result += str.substring(i, i + maxLength);
-    }
-
-    return result;
-}
-

src/common/utils/index.ts

@@ -1,18 +1,7 @@
-import path from "node:path";
-import fs from "fs";
-
 export * from './file'
-export * from './helper'
-export * from './log'
-export * from './qqlevel'
-export * from './qqpkg'
+export * from './misc'
+export * from './legacyLog'
+export * from './misc'
 export * from './upgrade'
-export const DATA_DIR = global.LiteLoader.plugins["LLOneBot"].path.data;
-export const TEMP_DIR = path.join(DATA_DIR, "temp");
-export const PLUGIN_DIR = global.LiteLoader.plugins["LLOneBot"].path.plugin;
-if (!fs.existsSync(TEMP_DIR)) {
-    fs.mkdirSync(TEMP_DIR, {recursive: true});
-}
-export {getVideoInfo} from "./video";
-export {checkFfmpeg} from "./video";
-export {encodeSilk} from "./audio";
+export { getVideoInfo, checkFfmpeg } from './video'
+export { encodeSilk } from './audio'

src/common/utils/legacyLog.ts

@@ -0,0 +1,29 @@
+import fs from 'fs'
+import path from 'node:path'
+import { getConfigUtil } from '../config'
+import { LOG_DIR } from '../globalVars'
+import { inspect } from 'node:util'
+
+export const logFileName = `llonebot-${new Date().toLocaleString('zh-CN')}.log`.replace(/\//g, '-').replace(/:/g, '-')
+
+export function log(...msg: unknown[]) {
+  if (!getConfigUtil().getConfig().log) {
+    return
+  }
+  let logMsg = ''
+  for (const msgItem of msg) {
+    if (typeof msgItem === 'object') {
+      logMsg += inspect(msgItem, {
+        depth: 10,
+        compact: true,
+        breakLength: Infinity,
+        maxArrayLength: 220
+      }) + ' '
+    } else {
+      logMsg += msgItem + ' '
+    }
+  }
+  const currentDateTime = new Date().toLocaleString()
+  logMsg = `${currentDateTime} ${logMsg}\n\n`
+  fs.appendFile(path.join(LOG_DIR, logFileName), logMsg, () => { })
+}

src/common/utils/log.ts

@@ -1,37 +0,0 @@
-import {selfInfo} from "../data";
-import fs from "fs";
-import path from "node:path";
-import {DATA_DIR, truncateString} from "./index";
-import {getConfigUtil} from "../config";
-
-const date = new Date();
-const logFileName = `llonebot-${date.toLocaleString("zh-CN")}.log`.replace(/\//g, "-").replace(/:/g, "-");
-const logDir = path.join(DATA_DIR, "logs");
-if (!fs.existsSync(logDir)) {
-    fs.mkdirSync(logDir, {recursive: true});
-}
-
-export function log(...msg: any[]) {
-    if (!getConfigUtil().getConfig().log) {
-        return //console.log(...msg);
-    }
-
-    const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ""
-    let logMsg = "";
-    for (let msgItem of msg) {
-        // 判断是否是对象
-        if (typeof msgItem === "object") {
-            let obj = JSON.parse(JSON.stringify(msgItem));
-            logMsg += JSON.stringify(truncateString(obj)) + " ";
-            continue;
-        }
-        logMsg += msgItem + " ";
-    }
-    let currentDateTime = new Date().toLocaleString();
-    logMsg = `${currentDateTime} ${userInfo}: ${logMsg}\n\n`
-    // sendLog(...msg);
-    // console.log(msg)
-    fs.appendFile(path.join(logDir, logFileName), logMsg, (err: any) => {
-
-    })
-}

src/common/utils/misc.ts

@@ -0,0 +1,47 @@
+import { QQLevel } from '@/ntqqapi/types'
+import { Dict, isNullable } from 'cosmokit'
+
+export function isNumeric(str: string) {
+  return /^\d+$/.test(str)
+}
+
+export function calcQQLevel(level: QQLevel) {
+  const { crownNum, sunNum, moonNum, starNum } = level
+  return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
+}
+
+/** QQ Build Version  */
+export function getBuildVersion(): number {
+  //const version: string = globalThis.LiteLoader.versions.qqnt
+  //return +version.split('-')[1]
+  return +globalThis.LiteLoader.package.qqnt.buildVersion
+}
+
+/** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
+export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
+  Object.keys(newObj).forEach((key) => {
+    // 如果老对象不存在当前属性，则直接复制
+    if (!oldObj.hasOwnProperty(key)) {
+      oldObj[key] = newObj[key]
+    } else {
+      // 如果老对象和新对象的当前属性都是对象，则递归合并
+      if (typeof oldObj[key] === 'object' && typeof newObj[key] === 'object') {
+        mergeNewProperties(newObj[key], oldObj[key])
+      } else if (typeof oldObj[key] === 'object' || typeof newObj[key] === 'object') {
+        // 属性冲突，有一方不是对象，直接覆盖
+        oldObj[key] = newObj[key]
+      }
+    }
+  })
+}
+
+export function filterNullable<T>(array: T[]) {
+  return array.filter(e => !isNullable(e)) as NonNullable<T>[]
+}
+
+export function parseBool(value: string) {
+  if (['', 'true', '1'].includes(value)) {
+    return true
+  }
+  return false
+}

src/common/utils/qqlevel.ts

@@ -1,7 +0,0 @@
-// QQ等级换算
-import {QQLevel} from "../../ntqqapi/types";
-
-export function calcQQLevel(level: QQLevel) {
-    const {crownNum, sunNum, moonNum, starNum} = level
-    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum
-}

src/common/utils/qqpkg.ts

@@ -1,12 +0,0 @@
-import path from "path";
-
-type QQPkgInfo = {
-    version: string;
-    buildVersion: string;
-    platform: string;
-    eleArch: string;
-}
-
-export const qqPkgInfo: QQPkgInfo = require(path.join(process.resourcesPath, "app/package.json"))
-
-export const isQQ998: boolean = qqPkgInfo.buildVersion >= "22106"

src/common/utils/request.ts

@@ -0,0 +1,104 @@
+import https from 'node:https'
+import http from 'node:http'
+import { Dict } from 'cosmokit'
+
+export class RequestUtil {
+  // 适用于获取服务器下发cookies时获取，仅GET
+  static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
+    const client = url.startsWith('https') ? https : http
+    return new Promise((resolve, reject) => {
+      client.get(url, (res) => {
+        let cookies: { [key: string]: string } = {}
+        const handleRedirect = (res: http.IncomingMessage) => {
+          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
+                //log('redirectCookies', redirectCookies)
+                cookies = { ...cookies, ...redirectCookies }
+                resolve(cookies)
+              })
+            } else {
+              resolve(cookies)
+            }
+          } else {
+            resolve(cookies)
+          }
+        }
+        res.on('data', () => { }) // Necessary to consume the stream
+        res.on('end', () => {
+          handleRedirect(res)
+        })
+        if (res.headers['set-cookie']) {
+          //log('set-cookie', url, 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
+            }
+          })
+        }
+      }).on('error', (err) => {
+        reject(err)
+      })
+    })
+  }
+
+  // 请求和回复都是JSON data传原始内容 自动编码json
+  static async HttpGetJson<T>(url: string, method: string = 'GET', data?: unknown, headers: Record<string, string> = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+    const option = new URL(url)
+    const protocol = url.startsWith('https://') ? https : http
+    const options = {
+      hostname: option.hostname,
+      port: option.port,
+      path: option.href,
+      method: method,
+      headers: headers
+    }
+    return new Promise((resolve, reject) => {
+      const req = protocol.request(options, (res: Dict) => {
+        let responseBody = ''
+        res.on('data', (chunk: string | Buffer) => {
+          responseBody += chunk.toString()
+        })
+
+        res.on('end', () => {
+          try {
+            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+              if (isJsonRet) {
+                const responseJson = JSON.parse(responseBody)
+                resolve(responseJson as T)
+              } else {
+                resolve(responseBody as T)
+              }
+            } else {
+              reject(new Error(`Unexpected status code: ${res.statusCode}`))
+            }
+          } catch (parseError) {
+            reject(parseError)
+          }
+        })
+      })
+
+      req.on('error', (error) => {
+        reject(error)
+      })
+      if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
+        if (isArgJson) {
+          req.write(JSON.stringify(data))
+        } else {
+          req.write(data)
+        }
+      }
+      req.end()
+    })
+  }
+
+  // 请求返回都是原始内容
+  static async HttpGetText(url: string, method: string = 'GET', data?: unknown, headers: Record<string, string> = {}) {
+    return this.HttpGetJson<string>(url, method, data, headers, false, false)
+  }
+}

src/common/utils/sign.ts

@@ -0,0 +1,37 @@
+import { Context } from 'cordis'
+
+export interface IdMusicSignPostData {
+  type: 'qq' | '163'
+  id: string | number
+}
+
+export interface CustomMusicSignPostData {
+  type: 'custom'
+  url: string
+  audio: string
+  title: string
+  image?: string
+  singer?: string
+}
+
+export type MusicSignPostData = IdMusicSignPostData | CustomMusicSignPostData
+
+export class MusicSign {
+  private readonly url: string
+
+  constructor(protected ctx: Context, url: string) {
+    this.url = url
+  }
+
+  async sign(postData: MusicSignPostData): Promise<string> {
+    const resp = await fetch(this.url, {
+      method: 'POST',
+      headers: { 'Content-Type': 'application/json' },
+      body: JSON.stringify(postData),
+    })
+    if (!resp.ok) throw new Error(resp.statusText)
+    const data = await resp.text()
+    this.ctx.logger.info('音乐消息生成成功', data)
+    return data
+  }
+}

src/common/utils/table.ts

@@ -0,0 +1,71 @@
+// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/MessageUnique.ts#L5
+export class LimitedHashTable<K, V> {
+  private keyToValue: Map<K, V> = new Map()
+  private valueToKey: Map<V, K> = new Map()
+  private maxSize: number
+
+  constructor(maxSize: number) {
+    this.maxSize = maxSize
+  }
+
+  resize(count: number) {
+    this.maxSize = count
+  }
+
+  set(key: K, value: V): void {
+    this.keyToValue.set(key, value)
+    this.valueToKey.set(value, key)
+    while (this.keyToValue.size !== this.valueToKey.size) {
+      this.keyToValue.clear()
+      this.valueToKey.clear()
+    }
+    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)
+    }
+  }
+
+  getValue(key: K): V | undefined {
+    return this.keyToValue.get(key)
+  }
+
+  getKey(value: V): K | undefined {
+    return this.valueToKey.get(value)
+  }
+
+  deleteByValue(value: V): void {
+    const key = this.valueToKey.get(value)
+    if (key !== undefined) {
+      this.keyToValue.delete(key)
+      this.valueToKey.delete(value)
+    }
+  }
+
+  deleteByKey(key: K): void {
+    const value = this.keyToValue.get(key)
+    if (value !== undefined) {
+      this.keyToValue.delete(key)
+      this.valueToKey.delete(value)
+    }
+  }
+
+  getKeyList(): K[] {
+    return Array.from(this.keyToValue.keys())
+  }
+
+  //获取最近刚写入的几个值
+  getHeads(size: number): { key: K, value: V }[] | undefined {
+    const keyList = this.getKeyList()
+    if (keyList.length === 0) {
+      return undefined
+    }
+    const result: { key: K; value: V }[] = []
+    const listSize = Math.min(size, keyList.length)
+    for (let i = 0; i < listSize; i++) {
+      const key = keyList[listSize - i]
+      result.push({ key, value: this.keyToValue.get(key)! })
+    }
+    return result
+  }
+}

src/common/utils/upgrade.ts

@@ -1,98 +1,73 @@
-import { version } from "../../version";
-import * as path from "node:path";
-import * as fs from "node:fs";
-import { copyFolder, httpDownload, log, PLUGIN_DIR, TEMP_DIR } from ".";
-import compressing from "compressing";
+import path from 'node:path'
+import { writeFile } from 'node:fs/promises'
+import { version } from '../../version'
+import { log, fetchFile } from '.'
+import { TEMP_DIR } from '../globalVars'
+import { compare } from 'compare-versions'
 
-
-const downloadMirrorHosts = ["https://mirror.ghproxy.com/"];
-const checkVersionMirrorHosts = ["https://521github.com"];
+const downloadMirrorHosts = ['https://ghp.ci/']
+const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
-    const latestVersionText = await getRemoteVersion();
-    const latestVersion = latestVersionText.split(".");
-    log("llonebot last version", latestVersion);
-    const currentVersion: string[] = version.split(".");
-    log("llonebot current version", currentVersion);
-    for (let k of [0, 1, 2]) {
-        if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
-            log("")
-            return { result: true, version: latestVersionText };
-        }
-        else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
-            break;
-        }
-    }
-    return { result: false, version: version };
+  const latestVersion = await getRemoteVersion()
+  log('LLOneBot latest version', latestVersion)
+  if (latestVersion === '') {
+    return { result: false, version: latestVersion }
+  }
+  if (compare(latestVersion, version, '>')) {
+    return { result: true, version: latestVersion }
+  }
+  return { result: false, version: version }
 }
 
-export async function upgradeLLOneBot() {
-    const latestVersion = await getRemoteVersion();
-    if (latestVersion && latestVersion != "") {
-        const downloadUrl = "https://github.com/LLOneBot/LLOneBot/releases/download/v" + latestVersion + "/LLOneBot.zip";
-        const filePath = path.join(TEMP_DIR, "./update-" + latestVersion + ".zip");
-        let downloadSuccess = false;
-        // 多镜像下载
-        for (const mirrorGithub of downloadMirrorHosts) {
-            try {
-                const buffer = await httpDownload(mirrorGithub + downloadUrl);
-                fs.writeFileSync(filePath, buffer)
-                downloadSuccess = true;
-                break;
-            } catch (e) {
-                log("llonebot upgrade error", e);
-            }
-        }
-        if (!downloadSuccess) {
-            log("llonebot upgrade error", "download failed");
-            return false;
-        }
-        const temp_ver_dir = path.join(TEMP_DIR, "LLOneBot" + latestVersion);
-        let uncompressedPromise = async function () {
-            return new Promise<boolean>((resolve, reject) => {
-                compressing.zip.uncompress(filePath, temp_ver_dir).then(() => {
-                    resolve(true);
-                }).catch((reason: any) => {
-                    log("llonebot upgrade failed, ", reason);
-                    if (reason?.errno == -4082) {
-                        resolve(true);
-                    }
-                    resolve(false);
-                });
-            });
-        }
-        const uncompressedResult = await uncompressedPromise();
-        // 复制文件
-        await copyFolder(temp_ver_dir, PLUGIN_DIR);
-
-        return uncompressedResult;
+export async function upgradeLLOneBot(): Promise<boolean> {
+  const latestVersion = await getRemoteVersion()
+  if (latestVersion && latestVersion != '') {
+    const downloadUrl = `https://github.com/LLOneBot/LLOneBot/releases/download/v${latestVersion}/LLOneBot.zip`
+    const filePath = path.join(TEMP_DIR, './update-' + latestVersion + '.zip')
+    // 多镜像下载
+    for (const mirrorGithub of downloadMirrorHosts) {
+      try {
+        const res = await fetchFile(mirrorGithub + downloadUrl)
+        await writeFile(filePath, res.data)
+        return globalThis.LiteLoader.api.plugin.install(filePath)
+      } catch (e) {
+        log('llonebot upgrade error', e)
+      }
     }
-    return false;
+  }
+  return false
 }
 
 export async function getRemoteVersion() {
-    let Version = "";
-    for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
-        let mirrorGithub = checkVersionMirrorHosts[i];
-        let tVersion = await getRemoteVersionByMirror(mirrorGithub);
-        if (tVersion && tVersion != "") {
-            Version = tVersion;
-            break;
-        }
+  for (const mirror of releasesMirrorHosts) {
+    const version = await getRemoteVersionByReleasesMirror(mirror)
+    if (version) {
+      return version
     }
-    return Version;
+  }
+  for (const mirror of downloadMirrorHosts) {
+    const version = await getRemoteVersionByDownloadMirror(mirror)
+    if (version) {
+      return version
+    }
+  }
+  return ''
 }
 
-export async function getRemoteVersionByMirror(mirrorGithub: string) {
-    let releasePage = "error";
+export async function getRemoteVersionByDownloadMirror(mirrorGithub: string) {
+  try {
+    const source = 'https://raw.githubusercontent.com/LLOneBot/LLOneBot/main/src/version.ts'
+    const page = (await fetchFile(mirrorGithub + source)).data.toString()
+    return page.match(/(\d+\.\d+\.\d+)/)?.[0]
+  } catch (e) {
+    log(e?.toString())
+  }
+}
 
-    try {
-        releasePage = (await httpDownload(mirrorGithub + "/LLOneBot/LLOneBot/releases")).toString();
-        // log("releasePage", releasePage);
-        if (releasePage === "error") return "";
-        return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))[0];
-    } catch {
-    }
-    return "";
-
-}
+export async function getRemoteVersionByReleasesMirror(mirrorGithub: string) {
+  try {
+    const page = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
+    return page.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
+  } catch { }
+}

src/common/utils/window.ts

@@ -0,0 +1,9 @@
+import { BrowserWindow } from 'electron'
+import { log } from '@/common/utils'
+
+export function getAllWindowIds(): number[] {
+  const allWindows = BrowserWindow.getAllWindows();
+  const ids = allWindows.map(window => window.id);
+  log('getAllWindowIds', ids);
+  return ids;
+}

src/global.d.ts

@@ -1,8 +1,9 @@
-import { type LLOneBot } from './preload'
+import type { LLOneBot } from './preload'
+import { Dict } from 'cosmokit'
 
 declare global {
-  interface Window {
-    llonebot: LLOneBot
-    LiteLoader: any
-  }
+  var llonebot: LLOneBot
+  var LiteLoader: Dict
+  var authData: Dict | undefined
+  var navigation: Dict | undefined
 }

src/main/ipcsend.ts

@@ -1,13 +0,0 @@
-import {webContents} from 'electron';
-
-
-function sendIPCMsg(channel: string, ...data: any) {
-    let contents = webContents.getAllWebContents();
-    for (const content of contents) {
-        try {
-            content.send(channel, ...data)
-        } catch (e) {
-            console.log("llonebot send ipc msg to render error:", e)
-        }
-    }
-}

src/main/log.ts

@@ -0,0 +1,35 @@
+import path from 'node:path'
+import { Context, Logger } from 'cordis'
+import { appendFile } from 'node:fs'
+import { LOG_DIR, selfInfo } from '@/common/globalVars'
+import { noop } from 'cosmokit'
+
+interface Config {
+  enable: boolean
+  filename: string
+}
+
+export default class Log {
+  static name = 'logger'
+
+  constructor(ctx: Context, cfg: Config) {
+    Logger.targets.splice(0, Logger.targets.length)
+    let enable = cfg.enable
+    const file = path.join(LOG_DIR, cfg.filename)
+    const target: Logger.Target = {
+      colors: 0,
+      record: (record: Logger.Record) => {
+        if (!enable) {
+          return
+        }
+        const dateTime = new Date(record.timestamp).toLocaleString()
+        const content = `${dateTime} [${record.type}] ${selfInfo.nick}(${selfInfo.uin}) | ${record.name} ${record.content}\n\n`
+        appendFile(file, content, noop)
+      },
+    }
+    Logger.targets.push(target)
+    ctx.on('llob/config-updated', input => {
+      enable = input.log!
+    })
+  }
+}

src/main/main.ts

@@ -1,467 +1,245 @@
-// 运行在 Electron 主进程 下的插件入口
-
-import {BrowserWindow, dialog, ipcMain} from 'electron';
-import * as fs from 'node:fs';
-import {Config} from "../common/types";
+import path from 'node:path'
+import Log from './log'
+import Core from '../ntqqapi/core'
+import OneBot11Adapter from '../onebot11/adapter'
+import SatoriAdapter from '../satori/adapter'
+import Database from 'minato'
+import SQLiteDriver from '@minatojs/driver-sqlite'
+import Store from './store'
+import { BrowserWindow, dialog, ipcMain } from 'electron'
+import { Config as LLOBConfig } from '../common/types'
 import {
-    CHANNEL_CHECK_VERSION,
-    CHANNEL_ERROR,
-    CHANNEL_GET_CONFIG,
-    CHANNEL_LOG,
-    CHANNEL_SELECT_FILE,
-    CHANNEL_SET_CONFIG,
-    CHANNEL_UPDATE,
-} from "../common/channels";
-import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {DATA_DIR} from "../common/utils";
+  CHANNEL_CHECK_VERSION,
+  CHANNEL_ERROR,
+  CHANNEL_GET_CONFIG,
+  CHANNEL_LOG,
+  CHANNEL_SELECT_FILE,
+  CHANNEL_SET_CONFIG,
+  CHANNEL_UPDATE
+} from '../common/channels'
+import { startHook } from '../ntqqapi/hook'
+import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
+import { getConfigUtil } from '../common/config'
+import { checkFfmpeg } from '../common/utils/video'
+import { Context } from 'cordis'
+import { llonebotError, selfInfo, LOG_DIR, DATA_DIR, TEMP_DIR } from '../common/globalVars'
+import { log, logFileName } from '../common/utils/legacyLog'
 import {
-    friendRequests,
-    getFriend,
-    getGroup,
-    getGroupMember,
-    llonebotError,
-    refreshGroupMembers,
-    selfInfo,
-    uidMaps
-} from "../common/data";
-import {hookNTQQApiCall, hookNTQQApiReceive, ReceiveCmdS, registerReceiveHook} from "../ntqqapi/hook";
-import {OB11Constructor} from "../onebot11/constructor";
-import {
-    ChatType,
-    FriendRequestNotify,
-    GroupMemberRole,
-    GroupNotifies,
-    GroupNotifyTypes,
-    RawMessage
-} from "../ntqqapi/types";
-import {ob11HTTPServer} from "../onebot11/server/http";
-import {OB11FriendRecallNoticeEvent} from "../onebot11/event/notice/OB11FriendRecallNoticeEvent";
-import {OB11GroupRecallNoticeEvent} from "../onebot11/event/notice/OB11GroupRecallNoticeEvent";
-import {postOB11Event} from "../onebot11/server/postOB11Event";
-import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
-import {OB11GroupAdminNoticeEvent} from "../onebot11/event/notice/OB11GroupAdminNoticeEvent";
-import {OB11GroupRequestEvent} from "../onebot11/event/request/OB11GroupRequest";
-import {OB11FriendRequestEvent} from "../onebot11/event/request/OB11FriendRequest";
-import * as path from "node:path";
-import {dbUtil} from "../common/db";
-import {setConfig} from "./setConfig";
-import {NTQQUserApi} from "../ntqqapi/api/user";
-import {NTQQGroupApi} from "../ntqqapi/api/group";
-import {registerPokeHandler} from "../ntqqapi/external/ccpoke";
-import {OB11FriendPokeEvent, OB11GroupPokeEvent} from "../onebot11/event/notice/OB11PokeEvent";
-import {checkNewVersion, upgradeLLOneBot} from "../common/utils/upgrade";
-import {log} from "../common/utils/log";
-import {getConfigUtil} from "../common/config";
-import {checkFfmpeg} from "../common/utils/video";
+  NTQQFileApi,
+  NTQQFileCacheApi,
+  NTQQFriendApi,
+  NTQQGroupApi,
+  NTQQMsgApi,
+  NTQQUserApi,
+  NTQQWebApi,
+  NTQQWindowApi
+} from '../ntqqapi/api'
+import { existsSync, mkdirSync } from 'node:fs'
+import { NTQQSystemApi } from '@/ntqqapi/api/system'
 
+declare module 'cordis' {
+  interface Events {
+    'llob/config-updated': (input: LLOBConfig) => void
+  }
+}
 
-let running = false;
-
-let mainWindow: BrowserWindow | null = null;
+let mainWindow: BrowserWindow | null = null
 
 // 加载插件时触发
 function onLoad() {
-    log("llonebot main onLoad");
-    ipcMain.handle(CHANNEL_CHECK_VERSION, async (event, arg) => {
+  if (!existsSync(DATA_DIR)) {
+    mkdirSync(DATA_DIR, { recursive: true })
+  }
 
-        return checkNewVersion();
-    });
-    ipcMain.handle(CHANNEL_UPDATE, async (event, arg) => {
-        return upgradeLLOneBot();
-    });
-    ipcMain.handle(CHANNEL_SELECT_FILE, async (event, arg) => {
-        const selectPath = new Promise<string>((resolve, reject) => {
-            dialog
-                .showOpenDialog({
-                    title: "请选择ffmpeg",
-                    properties: ["openFile"],
-                    buttonLabel: "确定",
-                })
-                .then((result) => {
-                    log("选择文件", result);
-                    if (!result.canceled) {
-                        const _selectPath = path.join(result.filePaths[0]);
-                        resolve(_selectPath);
-                        // let config = getConfigUtil().getConfig()
-                        // config.ffmpeg = path.join(result.filePaths[0]);
-                        // getConfigUtil().setConfig(config);
-                    }
-                    resolve("")
-                })
-                .catch((err) => {
-                    reject(err);
-                });
+  if (!existsSync(LOG_DIR)) {
+    mkdirSync(LOG_DIR)
+  }
+
+  if (!existsSync(TEMP_DIR)) {
+    mkdirSync(TEMP_DIR)
+  }
+
+  const dbDir = path.join(DATA_DIR, 'database')
+  if (!existsSync(dbDir)) {
+    mkdirSync(dbDir)
+  }
+
+  const ctx = new Context()
+
+  ctx.plugin(NTQQFileApi)
+  ctx.plugin(NTQQFileCacheApi)
+  ctx.plugin(NTQQFriendApi)
+  ctx.plugin(NTQQGroupApi)
+  ctx.plugin(NTQQMsgApi)
+  ctx.plugin(NTQQUserApi)
+  ctx.plugin(NTQQWebApi)
+  ctx.plugin(NTQQWindowApi)
+  ctx.plugin(Database)
+  ctx.plugin(NTQQSystemApi)
+
+  let started = false
+
+  ipcMain.handle(CHANNEL_CHECK_VERSION, async () => {
+    return checkNewVersion()
+  })
+
+  ipcMain.handle(CHANNEL_UPDATE, async () => {
+    return upgradeLLOneBot()
+  })
+
+  ipcMain.handle(CHANNEL_SELECT_FILE, async () => {
+    const selectPath = new Promise<string>((resolve, reject) => {
+      dialog
+        .showOpenDialog({
+          title: '请选择ffmpeg',
+          properties: ['openFile'],
+          buttonLabel: '确定',
+        })
+        .then((result) => {
+          log('选择文件', result)
+          if (!result.canceled) {
+            const _selectPath = path.join(result.filePaths[0])
+            resolve(_selectPath)
+          } else {
+            resolve('')
+          }
+        })
+        .catch((err) => {
+          reject(err)
         })
-        try {
-            return await selectPath;
-        } catch (e) {
-            log("选择文件出错", e)
-            return ""
-        }
     })
-    if (!fs.existsSync(DATA_DIR)) {
-        fs.mkdirSync(DATA_DIR, {recursive: true});
+    try {
+      return await selectPath
+    } catch (e) {
+      log('选择文件出错', e)
+      return ''
     }
-    ipcMain.handle(CHANNEL_ERROR, async (event, arg) => {
-        const ffmpegOk = await checkFfmpeg(getConfigUtil().getConfig().ffmpeg)
-        llonebotError.ffmpegError = ffmpegOk ? "" : "没有找到ffmpeg,音频只能发送wav和silk,视频尺寸可能异常"
-        let {httpServerError, wsServerError, otherError, ffmpegError} = llonebotError;
-        let error = `${otherError}\n${httpServerError}\n${wsServerError}\n${ffmpegError}`
-        error = error.replace("\n\n", "\n")
-        error = error.trim();
-        return error;
+  })
+
+  ipcMain.handle(CHANNEL_ERROR, async () => {
+    const ffmpegOk = await checkFfmpeg(getConfigUtil().getConfig().ffmpeg)
+    llonebotError.ffmpegError = ffmpegOk ? '' : '没有找到 FFmpeg, 音频只能发送 WAV 和 SILK, 视频尺寸可能异常'
+    const { httpServerError, wsServerError, otherError, ffmpegError } = llonebotError
+    let error = `${otherError}\n${httpServerError}\n${wsServerError}\n${ffmpegError}`
+    error = error.replace('\n\n', '\n')
+    error = error.trim()
+    log('查询 LLOneBot 错误信息', error)
+    return error
+  })
+
+  ipcMain.handle(CHANNEL_GET_CONFIG, async () => {
+    const config = getConfigUtil().getConfig()
+    return config
+  })
+
+  ipcMain.handle(CHANNEL_SET_CONFIG, (_event, ask: boolean, config: LLOBConfig) => {
+    return new Promise<boolean>(resolve => {
+      if (!ask) {
+        getConfigUtil().setConfig(config)
+        log('配置已更新', config)
+        if (started) {
+          ctx.parallel('llob/config-updated', config)
+        }
+        resolve(true)
+        return
+      }
+      dialog
+        .showMessageBox(mainWindow!, {
+          type: 'question',
+          buttons: ['确认', '取消'],
+          defaultId: 0, // 默认选中的按钮，0 代表第一个按钮，即 "确认"
+          title: '确认保存',
+          message: '是否保存？',
+          detail: 'LLOneBot配置已更改，是否保存？',
+        })
+        .then((result) => {
+          if (result.response === 0) {
+            getConfigUtil().setConfig(config)
+            log('配置已更新', config)
+            if (started) {
+              ctx.parallel('llob/config-updated', config)
+            }
+            resolve(true)
+          }
+        })
+        .catch((err) => {
+          log('保存设置询问弹窗错误', err)
+          resolve(false)
+        })
     })
-    ipcMain.handle(CHANNEL_GET_CONFIG, async (event, arg) => {
-        const config = getConfigUtil().getConfig()
-        return config;
-    })
-    ipcMain.on(CHANNEL_SET_CONFIG, (event, ask: boolean, config: Config) => {
-        if (!ask) {
-            setConfig(config).then();
-            return
-        }
-        dialog.showMessageBox(mainWindow, {
-            type: 'question',
-            buttons: ['确认', '取消'],
-            defaultId: 0, // 默认选中的按钮，0 代表第一个按钮，即 "确认"
-            title: '确认保存',
-            message: '是否保存？',
-            detail: 'LLOneBot配置已更改，是否保存？'
-        }).then(result => {
-            if (result.response === 0) {
-                setConfig(config).then();
-            } else {
-            }
-        }).catch(err => {
-            log("保存设置询问弹窗错误", err);
-        });
+  })
+
+  ipcMain.on(CHANNEL_LOG, (_event, arg) => {
+    log(arg)
+  })
+
+  const intervalId = setInterval(async () => {
+    const self = Object.assign(selfInfo, {
+      uin: globalThis.authData?.uin,
+      uid: globalThis.authData?.uid,
+      online: true
     })
+    if (self.uin) {
+      clearInterval(intervalId)
+      log('process pid', process.pid)
+      const config = getConfigUtil().getConfig()
 
-    ipcMain.on(CHANNEL_LOG, (event, arg) => {
-        log(arg);
-    })
+      if (config.enableLLOB && (config.satori.enable || config.ob11.enable)) {
+        startHook()
+        await ctx.sleep(600)
+      } else {
+        llonebotError.otherError = 'LLOneBot 未启动'
+        log('LLOneBot 开关设置为关闭，不启动 LLOneBot')
+        return
+      }
+      ctx.plugin(Log, {
+        enable: config.log!,
+        filename: logFileName
+      })
+      ctx.plugin(SQLiteDriver, {
+        path: path.join(dbDir, `${selfInfo.uin}.db`)
+      })
+      ctx.plugin(Store, {
+        msgCacheExpire: config.msgCacheExpire! * 1000
+      })
+      ctx.plugin(Core, config)
+      if (config.ob11.enable) {
+        ctx.plugin(OneBot11Adapter, {
+          ...config.ob11,
+          heartInterval: config.heartInterval,
+          token: config.token!,
+          debug: config.debug!,
+          musicSignUrl: config.musicSignUrl,
+          enableLocalFile2Url: config.enableLocalFile2Url!,
+          ffmpeg: config.ffmpeg,
+        })
+      }
+      if (config.satori.enable) {
+        ctx.plugin(SatoriAdapter, {
+          ...config.satori,
+          ffmpeg: config.ffmpeg,
+        })
+      }
 
-    async function postReceiveMsg(msgList: RawMessage[]) {
-        const {debug, reportSelfMessage} = getConfigUtil().getConfig();
-        for (let message of msgList) {
-
-            // log("收到新消息", message.msgId, message.msgSeq)
-            // if (message.senderUin !== selfInfo.uin){
-            message.msgShortId = await dbUtil.addMsg(message);
-            // }
-
-            OB11Constructor.message(message).then((msg) => {
-                if (debug) {
-                    msg.raw = message;
-                } else {
-                    if (msg.message.length === 0) {
-                        return
-                    }
-                }
-                const isSelfMsg = msg.user_id.toString() == selfInfo.uin
-                if (isSelfMsg && !reportSelfMessage) {
-                    return
-                }
-                if (isSelfMsg) {
-                    msg.target_id = parseInt(message.peerUin);
-                }
-                postOB11Event(msg);
-                // log("post msg", msg)
-            }).catch(e => log("constructMessage error: ", e.stack.toString()));
-            OB11Constructor.GroupEvent(message).then(groupEvent => {
-                if (groupEvent) {
-                    // log("post group event", groupEvent);
-                    postOB11Event(groupEvent);
-                }
-            })
-        }
+      ctx.start()
+      started = true
+      llonebotError.otherError = ''
     }
-
-    async function startReceiveHook() {
-        if (getConfigUtil().getConfig().enablePoke) {
-            registerPokeHandler((id, isGroup) => {
-                log(`收到戳一戳消息了！是否群聊：${isGroup}，id:${id}`)
-                let pokeEvent: OB11FriendPokeEvent | OB11GroupPokeEvent;
-                if (isGroup) {
-                    pokeEvent = new OB11GroupPokeEvent(parseInt(id));
-                } else {
-                    pokeEvent = new OB11FriendPokeEvent(parseInt(id));
-                }
-                postOB11Event(pokeEvent);
-            })
-        }
-        registerReceiveHook<{
-            msgList: Array<RawMessage>
-        }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], async (payload) => {
-            try {
-                await postReceiveMsg(payload.msgList);
-            } catch (e) {
-                log("report message error: ", e.stack.toString());
-            }
-        })
-        registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.UPDATE_MSG], async (payload) => {
-            for (const message of payload.msgList) {
-                // log("message update", message.sendStatus, message.msgId, message.msgSeq)
-                if (message.recallTime != "0") { //todo: 这个判断方法不太好，应该使用灰色消息元素来判断
-                    // 撤回消息上报
-                    const oriMessage = await dbUtil.getMsgByLongId(message.msgId)
-                    if (!oriMessage) {
-                        continue
-                    }
-                    oriMessage.recallTime = message.recallTime
-                    dbUtil.updateMsg(oriMessage).then();
-                    if (message.chatType == ChatType.friend) {
-                        const friendRecallEvent = new OB11FriendRecallNoticeEvent(parseInt(message.senderUin), oriMessage.msgShortId);
-                        postOB11Event(friendRecallEvent);
-                    } else if (message.chatType == ChatType.group) {
-                        let operatorId = message.senderUin
-                        for (const element of message.elements) {
-                            const operatorUid = element.grayTipElement?.revokeElement.operatorUid
-                            const operator = await getGroupMember(message.peerUin, operatorUid)
-                            operatorId = operator.uin
-                        }
-                        const groupRecallEvent = new OB11GroupRecallNoticeEvent(
-                            parseInt(message.peerUin),
-                            parseInt(message.senderUin),
-                            parseInt(operatorId),
-                            oriMessage.msgShortId
-                        )
-                        postOB11Event(groupRecallEvent);
-                    }
-                    // 不让入库覆盖原来消息，不然就获取不到撤回的消息内容了
-                    continue
-                }
-                dbUtil.updateMsg(message).then();
-            }
-        })
-        registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, async (payload) => {
-            const {reportSelfMessage} = getConfigUtil().getConfig();
-            if (!reportSelfMessage) {
-                return
-            }
-            // log("reportSelfMessage", payload)
-            try {
-                await postReceiveMsg([payload.msgRecord]);
-            } catch (e) {
-                log("report self message error: ", e.stack.toString());
-            }
-        })
-        registerReceiveHook<{
-            "doubt": boolean,
-            "oldestUnreadSeq": string,
-            "unreadCount": number
-        }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
-            if (payload.unreadCount) {
-                // log("开始获取群通知详情")
-                let notify: GroupNotifies;
-                try {
-                    notify = await NTQQGroupApi.getGroupNotifies();
-                } catch (e) {
-                    // log("获取群通知详情失败", e);
-                    return
-                }
-
-                const notifies = notify.notifies.slice(0, payload.unreadCount)
-                // log("获取群通知详情完成", notifies, payload);
-
-                for (const notify of notifies) {
-                    try {
-                        notify.time = Date.now();
-                        // const notifyTime = parseInt(notify.seq) / 1000
-                        // log(`加群通知时间${notifyTime}`, `LLOneBot启动时间${startTime}`);
-                        // if (notifyTime < startTime) {
-                        //     continue;
-                        // }
-                        let existNotify = await dbUtil.getGroupNotify(notify.seq);
-                        if (existNotify) {
-                            continue
-                        }
-                        log("收到群通知", notify);
-                        await dbUtil.addGroupNotify(notify);
-                        // let member2: GroupMember;
-                        // if (notify.user2.uid) {
-                        //     member2 = await getGroupMember(notify.group.groupCode, null, notify.user2.uid);
-                        // }
-                        if ([GroupNotifyTypes.ADMIN_SET, GroupNotifyTypes.ADMIN_UNSET].includes(notify.type)) {
-                            const member1 = await getGroupMember(notify.group.groupCode, notify.user1.uid);
-                            log("有管理员变动通知");
-                            refreshGroupMembers(notify.group.groupCode).then()
-                            let groupAdminNoticeEvent = new OB11GroupAdminNoticeEvent()
-                            groupAdminNoticeEvent.group_id = parseInt(notify.group.groupCode);
-                            log("开始获取变动的管理员")
-                            if (member1) {
-                                log("变动管理员获取成功")
-                                groupAdminNoticeEvent.user_id = parseInt(member1.uin);
-                                groupAdminNoticeEvent.sub_type = notify.type == GroupNotifyTypes.ADMIN_UNSET ? "unset" : "set";
-                                // member1.role = notify.type == GroupNotifyTypes.ADMIN_SET ? GroupMemberRole.admin : GroupMemberRole.normal;
-                                postOB11Event(groupAdminNoticeEvent, true);
-                            } else {
-                                log("获取群通知的成员信息失败", notify, getGroup(notify.group.groupCode));
-                            }
-                        } else if (notify.type == GroupNotifyTypes.MEMBER_EXIT) {
-                            // log("有成员退出通知");
-                            // const member1 = await getGroupMember(notify.group.groupCode, null, notify.user1.uid);
-                            // let groupDecreaseEvent = new OB11GroupDecreaseEvent(parseInt(notify.group.groupCode), parseInt(member1.uin))
-                            // postEvent(groupDecreaseEvent, true);
-                        } else if ([GroupNotifyTypes.JOIN_REQUEST].includes(notify.type)) {
-                            log("有加群请求");
-                            let groupRequestEvent = new OB11GroupRequestEvent();
-                            groupRequestEvent.group_id = parseInt(notify.group.groupCode);
-                            let requestQQ = ""
-                            try {
-                                requestQQ = (await NTQQUserApi.getUserDetailInfo(notify.user1.uid)).uin;
-                            } catch (e) {
-                                log("获取加群人QQ号失败", e)
-                            }
-                            groupRequestEvent.user_id = parseInt(requestQQ) || 0;
-                            groupRequestEvent.sub_type = "add"
-                            groupRequestEvent.comment = notify.postscript;
-                            groupRequestEvent.flag = notify.seq;
-                            postOB11Event(groupRequestEvent);
-                        } else if (notify.type == GroupNotifyTypes.INVITE_ME) {
-                            log("收到邀请我加群通知")
-                            let groupInviteEvent = new OB11GroupRequestEvent();
-                            groupInviteEvent.group_id = parseInt(notify.group.groupCode);
-                            let user_id = (await getFriend(notify.user2.uid))?.uin
-                            if (!user_id) {
-                                user_id = (await NTQQUserApi.getUserDetailInfo(notify.user2.uid))?.uin
-                            }
-                            groupInviteEvent.user_id = parseInt(user_id);
-                            groupInviteEvent.sub_type = "invite";
-                            groupInviteEvent.flag = notify.seq;
-                            postOB11Event(groupInviteEvent);
-                        }
-                    } catch (e) {
-                        log("解析群通知失败", e.stack.toString());
-                    }
-                }
-
-            } else if (payload.doubt) {
-                // 可能有群管理员变动
-            }
-        })
-
-        registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, async (payload) => {
-            for (const req of payload.data.buddyReqs) {
-                if (req.isUnread && !friendRequests[req.sourceId] && (parseInt(req.reqTime) > startTime / 1000)) {
-                    friendRequests[req.sourceId] = req;
-                    log("有新的好友请求", req);
-                    let friendRequestEvent = new OB11FriendRequestEvent();
-                    try {
-                        let requester = await NTQQUserApi.getUserDetailInfo(req.friendUid)
-                        friendRequestEvent.user_id = parseInt(requester.uin);
-                    } catch (e) {
-                        log("获取加好友者QQ号失败", e);
-                    }
-                    friendRequestEvent.flag = req.sourceId.toString();
-                    friendRequestEvent.comment = req.extWords;
-                    postOB11Event(friendRequestEvent);
-                }
-            }
-        })
-    }
-
-    let startTime = 0;
-
-    async function start() {
-        log("llonebot pid", process.pid)
-        llonebotError.otherError = "";
-        startTime = Date.now();
-        dbUtil.getReceivedTempUinMap().then(m => {
-            for (const [key, value] of Object.entries(m)) {
-                uidMaps[value] = key;
-            }
-        })
-        startReceiveHook().then();
-        // NTQQGroupApi.getGroups(true).then(_groups => {
-        //     _groups.map(group => {
-        //         if (!groups.find(g => g.groupCode == group.groupCode)) {
-        //             groups.push(group)
-        //         }
-        //     })
-        // })
-        const config = getConfigUtil().getConfig()
-        if (config.ob11.enableHttp) {
-            ob11HTTPServer.start(config.ob11.httpPort)
-        }
-        if (config.ob11.enableWs) {
-            ob11WebsocketServer.start(config.ob11.wsPort);
-        }
-        if (config.ob11.enableWsReverse) {
-            ob11ReverseWebsockets.start();
-        }
-
-        log("LLOneBot start")
-    }
-
-    let getSelfNickCount = 0;
-    const init = async () => {
-        try {
-            log("start get self info")
-            const _ = await NTQQUserApi.getSelfInfo();
-            log("get self info api result:", _);
-            Object.assign(selfInfo, _);
-            selfInfo.nick = selfInfo.uin;
-        } catch (e) {
-            log("retry get self info", e);
-        }
-        if (!selfInfo.uin) {
-            selfInfo.uin = globalThis.authData?.uin;
-            selfInfo.uid = globalThis.authData?.uid;
-            selfInfo.nick = selfInfo.uin;
-        }
-        log("self info", selfInfo, globalThis.authData);
-        if (selfInfo.uin) {
-            async function getUserNick() {
-                try {
-                    getSelfNickCount++;
-                    const userInfo = (await NTQQUserApi.getUserDetailInfo(selfInfo.uid));
-                    log("self info", userInfo);
-                    if (userInfo) {
-                        selfInfo.nick = userInfo.nick;
-                        return
-                    }
-                } catch (e) {
-                    log("get self nickname failed", e.stack);
-                }
-                if (getSelfNickCount < 10) {
-                    return setTimeout(getUserNick, 1000);
-                }
-            }
-
-            getUserNick().then()
-            start().then();
-        } else {
-            setTimeout(init, 1000)
-        }
-    }
-    setTimeout(init, 1000);
+  }, 500)
 }
 
-
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-    if (selfInfo.uid) {
-        return
-    }
-    mainWindow = window;
-    log("window create", window.webContents.getURL().toString())
-    try {
-        hookNTQQApiCall(window);
-        hookNTQQApiReceive(window);
-    } catch (e) {
-        log("LLOneBot hook error: ", e.toString())
-    }
+  if (window.id === 2) {
+    mainWindow = window
+  }
 }
 
 try {
-    onLoad();
-} catch (e: any) {
-    console.log(e.toString())
+  onLoad()
+} catch (e) {
+  console.log(e)
 }
 
-
 // 这两个函数都是可选的
-export {
-    onBrowserWindowCreated
-}
+export { onBrowserWindowCreated }

src/main/setConfig.ts

@@ -1,56 +0,0 @@
-import {Config} from "../common/types";
-import {ob11HTTPServer} from "../onebot11/server/http";
-import {ob11WebsocketServer} from "../onebot11/server/ws/WebsocketServer";
-import {ob11ReverseWebsockets} from "../onebot11/server/ws/ReverseWebsocket";
-import {llonebotError} from "../common/data";
-import {getConfigUtil} from "../common/config";
-import {checkFfmpeg} from "../common/utils";
-
-export async function setConfig(config: Config) {
-    let oldConfig = getConfigUtil().getConfig();
-    getConfigUtil().setConfig(config)
-    if (config.ob11.httpPort != oldConfig.ob11.httpPort && config.ob11.enableHttp) {
-        ob11HTTPServer.restart(config.ob11.httpPort);
-    }
-    // 判断是否启用或关闭HTTP服务
-    if (!config.ob11.enableHttp) {
-        ob11HTTPServer.stop();
-    } else {
-        ob11HTTPServer.start(config.ob11.httpPort);
-    }
-    // 正向ws端口变化，重启服务
-    if (config.ob11.wsPort != oldConfig.ob11.wsPort) {
-        ob11WebsocketServer.restart(config.ob11.wsPort);
-        llonebotError.wsServerError = ''
-    }
-    // 判断是否启用或关闭正向ws
-    if (config.ob11.enableWs != oldConfig.ob11.enableWs) {
-        if (config.ob11.enableWs) {
-            ob11WebsocketServer.start(config.ob11.wsPort);
-        } else {
-            ob11WebsocketServer.stop();
-        }
-    }
-    // 判断是否启用或关闭反向ws
-    if (config.ob11.enableWsReverse != oldConfig.ob11.enableWsReverse) {
-        if (config.ob11.enableWsReverse) {
-            ob11ReverseWebsockets.start();
-        } else {
-            ob11ReverseWebsockets.stop();
-        }
-    }
-    if (config.ob11.enableWsReverse) {
-        // 判断反向ws地址有变化
-        if (config.ob11.wsHosts.length != oldConfig.ob11.wsHosts.length) {
-            ob11ReverseWebsockets.restart();
-        } else {
-            for (const newHost of config.ob11.wsHosts) {
-                if (!oldConfig.ob11.wsHosts.includes(newHost)) {
-                    ob11ReverseWebsockets.restart();
-                    break;
-                }
-            }
-        }
-    }
-    checkFfmpeg(config.ffmpeg).then()
-}

src/main/store.ts

@@ -0,0 +1,154 @@
+import { Peer, RawMessage } from '@/ntqqapi/types'
+import { createHash } from 'node:crypto'
+import { LimitedHashTable } from '@/common/utils/table'
+import { FileCacheV2 } from '@/common/types'
+import { Context, Service } from 'cordis'
+
+declare module 'cordis' {
+  interface Context {
+    store: Store
+  }
+  interface Tables {
+    message: {
+      shortId: number
+      msgId: string
+      chatType: number
+      peerUid: string
+    }
+    file_v2: FileCacheV2
+  }
+}
+
+interface MsgInfo {
+  msgId: string
+  peer: Peer
+}
+
+class Store extends Service {
+  static inject = ['database', 'model']
+  private cache: LimitedHashTable<string, number>
+  private messages: Map<string, RawMessage>
+
+  constructor(protected ctx: Context, public config: Store.Config) {
+    super(ctx, 'store', true)
+    this.cache = new LimitedHashTable(1000)
+    this.messages = new Map()
+    this.initDatabase()
+  }
+
+  private async initDatabase() {
+    this.ctx.model.extend('message', {
+      shortId: 'integer(10)',
+      chatType: 'unsigned',
+      msgId: 'string(24)',
+      peerUid: 'string(24)'
+    }, {
+      primary: 'shortId'
+    })
+    this.ctx.model.extend('file_v2', {
+      fileName: 'string',
+      fileSize: 'string',
+      fileUuid: 'string(128)',
+      msgId: 'string(24)',
+      msgTime: 'unsigned(10)',
+      peerUid: 'string(24)',
+      chatType: 'unsigned',
+      elementId: 'string(24)',
+      elementType: 'unsigned',
+    }, {
+      primary: 'fileUuid',
+      indexes: ['fileName']
+    })
+  }
+
+  createMsgShortId(peer: Peer, msgId: string): number {
+    // OneBot 11 要求 message_id 为 int32
+    const cacheKey = `${msgId}|${peer.chatType}|${peer.peerUid}`
+    const hash = createHash('md5').update(cacheKey).digest()
+    hash[0] &= 0x7f //保证shortId为正数
+    const shortId = hash.readInt32BE()
+    this.cache.set(cacheKey, shortId)
+    this.ctx.database.upsert('message', [{
+      msgId,
+      shortId,
+      chatType: peer.chatType,
+      peerUid: peer.peerUid
+    }], 'shortId').then()
+    return shortId
+  }
+
+  async getMsgInfoByShortId(shortId: number): Promise<MsgInfo | undefined> {
+    const data = this.cache.getKey(shortId)
+    if (data) {
+      const [msgId, chatTypeStr, peerUid] = data.split('|')
+      return {
+        msgId,
+        peer: {
+          chatType: +chatTypeStr,
+          peerUid,
+          guildId: ''
+        }
+      }
+    }
+    const items = await this.ctx.database.get('message', { shortId })
+    if (items?.length) {
+      const { msgId, chatType, peerUid } = items[0]
+      return {
+        msgId,
+        peer: {
+          chatType,
+          peerUid,
+          guildId: ''
+        }
+      }
+    }
+  }
+
+  async getShortIdByMsgId(msgId: string): Promise<number | undefined> {
+    return (await this.ctx.database.get('message', { msgId }))[0]?.shortId
+  }
+
+  getShortIdByMsgInfo(peer: Peer, msgId: string) {
+    const cacheKey = `${msgId}|${peer.chatType}|${peer.peerUid}`
+    return this.cache.getValue(cacheKey)
+  }
+
+  addFileCache(data: FileCacheV2) {
+    return this.ctx.database.upsert('file_v2', [data], 'fileUuid')
+  }
+
+  getFileCacheByName(fileName: string) {
+    return this.ctx.database.get('file_v2', { fileName }, {
+      sort: { msgTime: 'desc' }
+    })
+  }
+
+  getFileCacheById(fileUuid: string) {
+    return this.ctx.database.get('file_v2', { fileUuid })
+  }
+
+  async addMsgCache(msg: RawMessage) {
+    const expire = this.config.msgCacheExpire
+    if (expire === 0) {
+      return
+    }
+    const id = msg.msgId
+    this.messages.set(id, msg)
+    setTimeout(() => {
+      this.messages.delete(id)
+    }, expire)
+  }
+
+  getMsgCache(msgId: string) {
+    return this.messages.get(msgId)
+  }
+}
+
+namespace Store {
+  export interface Config {
+    /** 单位为毫秒 */
+    msgCacheExpire: number
+  }
+}
+
+export default Store

src/ntqqapi/api/file.ts

@@ -1,236 +1,285 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
+import { invoke, NTClass, NTMethod } from '../ntcall'
+import { GeneralCallResult } from '../services'
 import {
-    CacheFileList,
-    CacheFileListItem,
-    CacheFileType,
-    CacheScanResult,
-    ChatCacheList,
-    ChatCacheListItemBasic,
-    ChatType,
-    ElementType
-} from "../types";
-import path from "path";
-import fs from "fs";
-import {ReceiveCmdS} from "../hook";
-import {log} from "../../common/utils/log";
-
-export class NTQQFileApi {
-    static async getFileType(filePath: string) {
-        return await callNTQQApi<{ ext: string }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_TYPE, args: [filePath]
-        })
-    }
-
-    static async getFileMd5(filePath: string) {
-        return await callNTQQApi<string>({
-            className: NTQQApiClass.FS_API,
-            methodName: NTQQApiMethod.FILE_MD5,
-            args: [filePath]
-        })
-    }
-
-    static async copyFile(filePath: string, destPath: string) {
-        return await callNTQQApi<string>({
-            className: NTQQApiClass.FS_API,
-            methodName: NTQQApiMethod.FILE_COPY,
-            args: [{
-                fromPath: filePath,
-                toPath: destPath
-            }]
-        })
-    }
-
-    static async getFileSize(filePath: string) {
-        return await callNTQQApi<number>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.FILE_SIZE, args: [filePath]
-        })
-    }
-
-    // 上传文件到QQ的文件夹
-    static async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
-        const md5 = await NTQQFileApi.getFileMd5(filePath);
-        let ext = (await NTQQFileApi.getFileType(filePath))?.ext
-        if (ext) {
-            ext = "." + ext
-        } else {
-            ext = ""
-        }
-        let fileName = `${path.basename(filePath)}`;
-        if (fileName.indexOf(".") === -1) {
-            fileName += ext;
-        }
-        const mediaPath = await callNTQQApi<string>({
-            methodName: NTQQApiMethod.MEDIA_FILE_PATH,
-            args: [{
-                path_info: {
-                    md5HexStr: md5,
-                    fileName: fileName,
-                    elementType: elementType,
-                    elementSubType,
-                    thumbSize: 0,
-                    needCreate: true,
-                    downloadType: 1,
-                    file_uuid: ""
-                }
-            }]
-        })
-        log("media path", mediaPath)
-        await NTQQFileApi.copyFile(filePath, mediaPath);
-        const fileSize = await NTQQFileApi.getFileSize(filePath);
-        return {
-            md5,
-            fileName,
-            path: mediaPath,
-            fileSize,
-            ext
-        }
-    }
-
-    static async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, isFile: boolean = false) {
-        // 用于下载收到的消息中的图片等
-        if (sourcePath && fs.existsSync(sourcePath)) {
-            return sourcePath
-        }
-        const apiParams = [
-            {
-                getReq: {
-                    fileModelId: "0",
-                    downloadSourceType: 0,
-                    triggerType: 1,
-                    msgId: msgId,
-                    chatType: chatType,
-                    peerUid: peerUid,
-                    elementId: elementId,
-                    thumbSize: 0,
-                    downloadType: 1,
-                    filePath: thumbPath,
-                },
-            },
-            null,
-        ]
-        // log("需要下载media", sourcePath);
-        await callNTQQApi({
-            methodName: NTQQApiMethod.DOWNLOAD_MEDIA,
-            args: apiParams,
-            cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
-            cmdCB: (payload: { notifyInfo: { filePath: string, msgId: string } }) => {
-                log("media 下载完成判断", payload.notifyInfo.msgId, msgId);
-                return payload.notifyInfo.msgId == msgId;
-            }
-        })
-        return sourcePath
-    }
-
-    static async getImageSize(filePath: string) {
-        return await callNTQQApi<{ width: number, height: number }>({
-            className: NTQQApiClass.FS_API, methodName: NTQQApiMethod.IMAGE_SIZE, args: [filePath]
-        })
-    }
+  CacheFileList,
+  CacheFileListItem,
+  CacheFileType,
+  CacheScanResult,
+  ChatCacheListItemBasic,
+  ChatType,
+  ElementType,
+  IMAGE_HTTP_HOST,
+  IMAGE_HTTP_HOST_NT,
+  PicElement,
+} from '../types'
+import path from 'node:path'
+import { existsSync } from 'node:fs'
+import { ReceiveCmdS } from '../hook'
+import { RkeyManager } from '@/ntqqapi/helper/rkey'
+import { RichMediaDownloadCompleteNotify, RichMediaUploadCompleteNotify, RMBizType, Peer } from '@/ntqqapi/types/msg'
+import { calculateFileMD5 } from '@/common/utils/file'
+import { copyFile, stat, unlink } from 'node:fs/promises'
+import { Time } from 'cosmokit'
+import { Service, Context } from 'cordis'
 
+declare module 'cordis' {
+  interface Context {
+    ntFileApi: NTQQFileApi
+    ntFileCacheApi: NTQQFileCacheApi
+  }
 }
 
-export class NTQQFileCacheApi {
-    static async setCacheSilentScan(isSilent: boolean = true) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.CACHE_SET_SILENCE,
-            args: [{
-                isSilent
-            }, null]
-        });
+export class NTQQFileApi extends Service {
+  private rkeyManager: RkeyManager
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntFileApi', true)
+    this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
+  }
+
+  async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string | undefined> {
+    const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
+      peer,
+      msgId,
+      elemId: elementId,
+      videoCodecFormat: 0,
+      exParams: {
+        downSourceType: 1,
+        triggerType: 1
+      }
+    }])
+    if (data.result !== 0) {
+      this.ctx.logger.warn('getVideoUrl', data)
     }
+    return data.urlResult.domainUrl[0]?.url
+  }
 
-    static getCacheSessionPathList() {
-        return callNTQQApi<{
-            key: string,
-            value: string
-        }[]>({
-            className: NTQQApiClass.OS_API,
-            methodName: NTQQApiMethod.CACHE_PATH_SESSION,
-        });
+  async getFileType(filePath: string) {
+    return await invoke<{
+      ext: string
+      mime: string
+    }>(NTMethod.FILE_TYPE, [filePath], {
+      className: NTClass.FS_API
+    })
+  }
+
+  /** 上传文件到 QQ 的文件夹 */
+  async uploadFile(filePath: string, elementType = ElementType.Pic, elementSubType = 0) {
+    const fileMd5 = await calculateFileMD5(filePath)
+    let fileName = path.basename(filePath)
+    if (!fileName.includes('.')) {
+      const ext = (await this.getFileType(filePath))?.ext
+      fileName += ext ? '.' + ext : ''
     }
-
-    static clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        return callNTQQApi<any>({ // TODO: 目前还不知道真正的返回值是什么
-            methodName: NTQQApiMethod.CACHE_CLEAR,
-            args: [{
-                keys: cacheKeys
-            }, null]
-        });
+    const mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
+      path_info: {
+        md5HexStr: fileMd5,
+        fileName: fileName,
+        elementType: elementType,
+        elementSubType,
+        thumbSize: 0,
+        needCreate: true,
+        downloadType: 1,
+        file_uuid: '',
+      },
+    }])
+    await copyFile(filePath, mediaPath)
+    const fileSize = (await stat(filePath)).size
+    return {
+      md5: fileMd5,
+      fileName,
+      path: mediaPath,
+      fileSize,
     }
+  }
 
-    static addCacheScannedPaths(pathMap: object = {}) {
-        return callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.CACHE_ADD_SCANNED_PATH,
-            args: [{
-                pathMap: {...pathMap},
-            }, null]
-        });
+  async downloadMedia(
+    msgId: string,
+    chatType: ChatType,
+    peerUid: string,
+    elementId: string,
+    thumbPath = '',
+    sourcePath = '',
+    timeout = 1000 * 60 * 2,
+    force = false
+  ) {
+    // 用于下载收到的消息中的图片等
+    if (sourcePath && existsSync(sourcePath)) {
+      if (force) {
+        try {
+          await unlink(sourcePath)
+        } catch { }
+      } else {
+        return sourcePath
+      }
     }
+    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
+      'nodeIKernelMsgService/downloadRichMedia',
+      [{
+        getReq: {
+          fileModelId: '0',
+          downloadSourceType: 0,
+          triggerType: 1,
+          msgId: msgId,
+          chatType: chatType,
+          peerUid: peerUid,
+          elementId: elementId,
+          thumbSize: 0,
+          downloadType: 1,
+          filePath: thumbPath,
+        },
+      }],
+      {
+        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+        cmdCB: payload => payload.notifyInfo.msgId === msgId,
+        timeout
+      }
+    )
+    return data.notifyInfo.filePath
+  }
 
-    static scanCache() {
-        callNTQQApi<GeneralCallResult>({
-            methodName: ReceiveCmdS.CACHE_SCAN_FINISH,
-            classNameIsRegister: true,
-        }).then();
-        return callNTQQApi<CacheScanResult>({
-            methodName: NTQQApiMethod.CACHE_SCAN,
-            args: [null, null],
-            timeoutSecond: 300,
-        });
+  async getImageSize(filePath: string) {
+    return await invoke<{
+      width: number
+      height: number
+      type: string
+    }>(
+      NTMethod.IMAGE_SIZE,
+      [filePath],
+      {
+        className: NTClass.FS_API,
+      }
+    )
+  }
+
+  async getImageUrl(element: PicElement) {
+    if (!element) {
+      return ''
     }
+    const url: string = element.originImageUrl!  // 没有域名
+    const md5HexStr = element.md5HexStr
+    const fileMd5 = element.md5HexStr
 
-    static getHotUpdateCachePath() {
-        return callNTQQApi<string>({
-            className: NTQQApiClass.HOTUPDATE_API,
-            methodName: NTQQApiMethod.CACHE_PATH_HOT_UPDATE
-        });
+    if (url) {
+      const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
+      const imageAppid = parsedUrl.searchParams.get('appid')
+      const isNTPic = imageAppid && ['1406', '1407'].includes(imageAppid)
+      if (isNTPic) {
+        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`
     }
+    this.ctx.logger.error('图片url获取失败', element)
+    return ''
+  }
 
-    static getDesktopTmpPath() {
-        return callNTQQApi<string>({
-            className: NTQQApiClass.BUSINESS_API,
-            methodName: NTQQApiMethod.CACHE_PATH_DESKTOP_TEMP
-        });
-    }
+  async downloadFileForModelId(peer: Peer, fileModelId: string, timeout = 2 * Time.minute) {
+    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
+      'nodeIKernelRichMediaService/downloadFileForModelId',
+      [{
+        peer,
+        fileModelIdList: [fileModelId],
+        save_path: ''
+      }],
+      {
+        cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
+        cmdCB: payload => payload.notifyInfo.fileModelId === fileModelId,
+        timeout,
+        afterFirstCmd: false
+      }
+    )
+    return data.notifyInfo.filePath
+  }
 
-    static getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return new Promise<ChatCacheList>((res, rej) => {
-            callNTQQApi<ChatCacheList>({
-                methodName: NTQQApiMethod.CACHE_CHAT_GET,
-                args: [{
-                    chatType: type,
-                    pageSize,
-                    order: 1,
-                    pageIndex
-                }, null]
-            }).then(list => res(list))
-                .catch(e => rej(e));
-        });
-    }
+  async ocrImage(path: string) {
+    return await invoke(
+      'nodeIKernelNodeMiscService/wantWinScreenOCR',
+      [
+        { url: path },
+        { timeout: 5000 }
+      ]
+    )
+  }
 
-    static getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        const _lastRecord = lastRecord ? lastRecord : {fileType: fileType};
+  async uploadRMFileWithoutMsg(filePath: string, bizType: RMBizType, peerUid: string) {
+    const data = await invoke<{
+      notifyInfo: RichMediaUploadCompleteNotify
+    }>(
+      'nodeIKernelRichMediaService/uploadRMFileWithoutMsg',
+      [{
+        params: {
+          filePath,
+          bizType,
+          peerUid,
+          useNTV2: true
+        }
+      }],
+      {
+        cbCmd: ReceiveCmdS.MEDIA_UPLOAD_COMPLETE,
+        cmdCB: payload => payload.notifyInfo.filePath === filePath,
+        timeout: 10 * Time.second,
+      }
+    )
+    return data.notifyInfo
+  }
+}
 
-        return callNTQQApi<CacheFileList>({
-            methodName: NTQQApiMethod.CACHE_FILE_GET,
-            args: [{
-                fileType: fileType,
-                restart: true,
-                pageSize: pageSize,
-                order: 1,
-                lastRecord: _lastRecord,
-            }, null]
-        })
-    }
+export class NTQQFileCacheApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntFileCacheApi', true)
+  }
 
-    static async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.CACHE_CHAT_CLEAR,
-            args: [{
-                chats,
-                fileKeys
-            }, null]
-        });
-    }
+  async setCacheSilentScan(isSilent: boolean = true) {
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }])
+  }
 
-}
+  getCacheSessionPathList() {
+    return invoke<Array<{
+      key: string
+      value: string
+    }>>(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
+  }
+
+  scanCache() {
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { registerEvent: true })
+    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [], { timeout: 300 * Time.second })
+  }
+
+  getHotUpdateCachePath() {
+    return invoke<string>(NTMethod.CACHE_PATH_HOT_UPDATE, [], { className: NTClass.HOTUPDATE_API })
+  }
+
+  getDesktopTmpPath() {
+    return invoke<string>(NTMethod.CACHE_PATH_DESKTOP_TEMP, [], { className: NTClass.BUSINESS_API })
+  }
+
+  getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
+    const _lastRecord = lastRecord ? lastRecord : { fileType: fileType }
+
+    return invoke<CacheFileList>(NTMethod.CACHE_FILE_GET, [{
+      fileType: fileType,
+      restart: true,
+      pageSize: pageSize,
+      order: 1,
+      lastRecord: _lastRecord,
+    }])
+  }
+
+  async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_CHAT_CLEAR, [{
+      chats,
+      fileKeys,
+    }])
+  }
+}

src/ntqqapi/api/friend.ts

@@ -1,61 +1,129 @@
-import {Friend, FriendRequest} from "../types";
-import {ReceiveCmdS} from "../hook";
-import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
-import {friendRequests} from "../../common/data";
+import { Friend, SimpleInfo, CategoryFriend } from '../types'
+import { ReceiveCmdS } from '../hook'
+import { invoke, NTMethod, NTClass } from '../ntcall'
+import { Service, Context } from 'cordis'
 
-export class NTQQFriendApi{
-    static async getFriends(forced = false) {
-        const data = await callNTQQApi<{
-            data: {
-                categoryId: number,
-                categroyName: string,
-                categroyMbCount: number,
-                buddyList: Friend[]
-            }[]
-        }>(
-            {
-                methodName: NTQQApiMethod.FRIENDS,
-                args: [{force_update: forced}, undefined],
-                cbCmd: ReceiveCmdS.FRIENDS
-            })
-        let _friends: Friend[] = [];
-        for (const fData of data.data) {
-            _friends.push(...fData.buddyList)
-        }
-        return _friends
-    }
-    static async likeFriend(uid: string, count = 1) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.LIKE_FRIEND,
-            args: [{
-                doLikeUserInfo: {
-                    friendUid: uid,
-                    sourceId: 71,
-                    doLikeCount: count,
-                    doLikeTollCount: 0
-                }
-            }, null]
-        })
-    }
-    static async handleFriendRequest(sourceId: number, accept: boolean,) {
-        const request: FriendRequest = friendRequests[sourceId]
-        if (!request) {
-            throw `sourceId ${sourceId}, 对应的好友请求不存在`
-        }
-        const result = await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.HANDLE_FRIEND_REQUEST,
-            args: [
-                {
-                    "approvalInfo": {
-                        "friendUid": request.friendUid,
-                        "reqTime": request.reqTime,
-                        accept
-                    }
-                }
-            ]
-        })
-        delete friendRequests[sourceId];
-        return result;
-    }
+declare module 'cordis' {
+  interface Context {
+    ntFriendApi: NTQQFriendApi
+  }
+}
 
-}
+export class NTQQFriendApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntFriendApi', true)
+  }
+
+  /** 大于或等于 26702 应使用 getBuddyV2 */
+  async getFriends() {
+    const res = await invoke<{
+      data: {
+        categoryId: number
+        categroyName: string
+        categroyMbCount: number
+        buddyList: Friend[]
+      }[]
+    }>('getBuddyList', [], {
+      className: NTClass.NODE_STORE_API,
+      cbCmd: ReceiveCmdS.FRIENDS,
+      afterFirstCmd: false
+    })
+    return res.data.flatMap(e => e.buddyList)
+  }
+
+  async handleFriendRequest(friendUid: string, reqTime: string, accept: boolean) {
+    return await invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
+      approvalInfo: {
+        friendUid,
+        reqTime,
+        accept,
+      },
+    }])
+  }
+
+  async getBuddyV2(refresh = false): Promise<SimpleInfo[]> {
+    const data = await invoke<{
+      buddyCategory: CategoryFriend[]
+      userSimpleInfos: Record<string, SimpleInfo>
+    }>(
+      'getBuddyList',
+      [refresh],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      }
+    )
+    const uids = data.buddyCategory.flatMap(item => item.buddyUids)
+    return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
+  }
+
+  /** uid -> uin */
+  async getBuddyIdMap(refresh = false): Promise<Map<string, string>> {
+    const retMap: Map<string, string> = new Map()
+    const data = await invoke<{
+      buddyCategory: CategoryFriend[]
+      userSimpleInfos: Record<string, SimpleInfo>
+    }>(
+      'getBuddyList',
+      [refresh],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      }
+    )
+    for (const item of Object.values(data.userSimpleInfos)) {
+      if (retMap.size > 5000) {
+        break
+      }
+      retMap.set(item.uid!, item.uin!)
+    }
+    return retMap
+  }
+
+  async getBuddyV2WithCate(refresh = false) {
+    const data = await invoke<{
+      buddyCategory: CategoryFriend[]
+      userSimpleInfos: Record<string, SimpleInfo>
+    }>(
+      'getBuddyList',
+      [refresh],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.FRIENDS,
+        afterFirstCmd: false,
+      }
+    )
+    return data
+  }
+
+  async isBuddy(uid: string): Promise<boolean> {
+    return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }])
+  }
+
+  async getBuddyRecommendContact(uin: string) {
+    const ret = await invoke('nodeIKernelBuddyService/getBuddyRecommendContactArkJson', [{ uin }])
+    return ret.arkMsg
+  }
+
+  async setBuddyRemark(uid: string, remark = '') {
+    return await invoke('nodeIKernelBuddyService/setBuddyRemark', [{
+      remarkParams: { uid, remark }
+    }])
+  }
+
+  async delBuddy(friendUid: string) {
+    return await invoke('nodeIKernelBuddyService/delBuddy', [{
+      delInfo: {
+        friendUid,
+        tempBlock: false,
+        tempBothDel: true
+      }
+    }])
+  }
+
+  async setBuddyCategory(uid: string, categoryId: number) {
+    return await invoke('nodeIKernelBuddyService/setBuddyCategory', [{ uid, categoryId }])
+  }
+}

src/ntqqapi/api/group.ts

@@ -1,205 +1,353 @@
-import {ReceiveCmdS} from "../hook";
-import {Group, GroupMember, GroupMemberRole, GroupNotifies, GroupNotify, GroupRequestOperateTypes} from "../types";
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
-import {uidMaps} from "../../common/data";
-import {dbUtil} from "../../common/db";
-import {log} from "../../common/utils/log";
-import {NTQQWindowApi, NTQQWindows} from "./window";
+import { ReceiveCmdS } from '../hook'
+import {
+  Group,
+  GroupMember,
+  GroupMemberRole,
+  GroupNotifies,
+  GroupRequestOperateTypes,
+  GetFileListParam,
+  PublishGroupBulletinReq,
+  GroupAllInfo,
+  GroupFileInfo,
+  GroupBulletinListResult,
+  GroupMsgMask
+} from '../types'
+import { invoke, NTClass, NTMethod } from '../ntcall'
+import { GeneralCallResult } from '../services'
+import { NTQQWindows } from './window'
+import { Service, Context } from 'cordis'
 
-export class NTQQGroupApi{
-    static async getGroups(forced = false) {
-        let cbCmd = ReceiveCmdS.GROUPS
-        if (process.platform != "win32") {
-            cbCmd = ReceiveCmdS.GROUPS_STORE
+declare module 'cordis' {
+  interface Context {
+    ntGroupApi: NTQQGroupApi
+  }
+}
+
+export class NTQQGroupApi extends Service {
+  static inject = ['ntWindowApi']
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntGroupApi', true)
+  }
+
+  async getGroups(): Promise<Group[]> {
+    const result = await invoke<{
+      updateType: number
+      groupList: Group[]
+    }>(
+      'getGroupList',
+      [],
+      {
+        className: NTClass.NODE_STORE_API,
+        cbCmd: ReceiveCmdS.GROUPS_STORE,
+        afterFirstCmd: false,
+      }
+    )
+    return result.groupList
+  }
+
+  async getGroupMembers(groupCode: string, num = 3000) {
+    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
+      groupCode,
+      scene: 'groupMemberList_MainWindow'
+    }])
+    const data = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }])
+    if (data.errCode !== 0) {
+      throw new Error('获取群成员列表出错,' + data.errMsg)
+    }
+    return data.result.infos
+  }
+
+  async getGroupMember(groupCode: string, uid: string, forceUpdate = false) {
+    await invoke('nodeIKernelGroupListener/onMemberInfoChange', [], {
+      registerEvent: true
+    })
+
+    const data = await invoke<{
+      groupCode: string
+      members: Map<string, GroupMember>
+    }>(
+      'nodeIKernelGroupService/getMemberInfo',
+      [{
+        groupCode,
+        uids: [uid],
+        forceUpdate
+      }],
+      {
+        cbCmd: 'nodeIKernelGroupListener/onMemberInfoChange',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.members.has(uid),
+        timeout: 2000
+      }
+    )
+    return data.members.get(uid)!
+  }
+
+  async getGroupIgnoreNotifies() {
+    await this.getSingleScreenNotifies(false, 14)
+    return await this.ctx.ntWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
+      NTQQWindows.GroupNotifyFilterWindow,
+      [],
+      ReceiveCmdS.GROUP_NOTIFY,
+    )
+  }
+
+  async getSingleScreenNotifies(doubt: boolean, number: number, startSeq = '') {
+    await invoke(ReceiveCmdS.GROUP_NOTIFY, [], { registerEvent: true })
+
+    const data = await invoke<GroupNotifies>(
+      'nodeIKernelGroupService/getSingleScreenNotifies',
+      [{ doubt, startSeq, number }],
+      {
+        cbCmd: ReceiveCmdS.GROUP_NOTIFY,
+        afterFirstCmd: false,
+      }
+    )
+    return data.notifies
+  }
+
+  async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
+    const flagitem = flag.split('|')
+    const groupCode = flagitem[0]
+    const seq = flagitem[1]
+    const type = parseInt(flagitem[2])
+    const doubt = flagitem[3] === '1'
+    return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
+      doubt,
+      operateMsg: {
+        operateType,
+        targetMsg: {
+          seq,
+          type,
+          groupCode,
+          postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
+        },
+      },
+    }])
+  }
+
+  async quitGroup(groupCode: string) {
+    return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }])
+  }
+
+  async kickMember(groupCode: string, kickUids: string[], refuseForever = false, kickReason = '') {
+    return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, kickReason }])
+  }
+
+  /** timeStamp为秒数, 0为解除禁言 */
+  async banMember(groupCode: string, memList: Array<{ uid: string, timeStamp: number }>) {
+    return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
+  }
+
+  async banGroup(groupCode: string, shutUp: boolean) {
+    return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }])
+  }
+
+  async setMemberCard(groupCode: string, memberUid: string, cardName: string) {
+    return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }])
+  }
+
+  async setMemberRole(groupCode: string, memberUid: string, role: GroupMemberRole) {
+    return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }])
+  }
+
+  async setGroupName(groupCode: string, groupName: string) {
+    return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }])
+  }
+
+  async getGroupRemainAtTimes(groupCode: string) {
+    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }])
+  }
+
+  async removeGroupEssence(groupCode: string, msgId: string) {
+    const ntMsgApi = this.ctx.get('ntMsgApi')!
+    const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    return await invoke('nodeIKernelGroupService/removeGroupEssence', [{
+      req: {
+        groupCode: groupCode,
+        msgRandom: Number(data?.msgList[0].msgRandom),
+        msgSeq: Number(data?.msgList[0].msgSeq)
+      }
+    }])
+  }
+
+  async addGroupEssence(groupCode: string, msgId: string) {
+    const ntMsgApi = this.ctx.get('ntMsgApi')!
+    const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+    return await invoke('nodeIKernelGroupService/addGroupEssence', [{
+      req: {
+        groupCode: groupCode,
+        msgRandom: Number(data?.msgList[0].msgRandom),
+        msgSeq: Number(data?.msgList[0].msgSeq)
+      }
+    }])
+  }
+
+  async createGroupFileFolder(groupId: string, folderName: string) {
+    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }])
+  }
+
+  async deleteGroupFileFolder(groupId: string, folderId: string) {
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }])
+  }
+
+  async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }])
+  }
+
+  async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { registerEvent: true })
+    const data = await invoke<{ fileInfo: GroupFileInfo }>(
+      'nodeIKernelRichMediaService/getGroupFileList',
+      [{
+        groupId,
+        fileListForm
+      }],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
+        afterFirstCmd: false,
+        cmdCB: (payload, result) => payload.fileInfo.reqId === result
+      }
+    )
+    return data.fileInfo
+  }
+
+  async publishGroupBulletin(groupCode: string, req: PublishGroupBulletinReq) {
+    const ntUserApi = this.ctx.get('ntUserApi')!
+    const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
+    return await invoke('nodeIKernelGroupService/publishGroupBulletin', [{ groupCode, psKey, req }])
+  }
+
+  async uploadGroupBulletinPic(groupCode: string, path: string) {
+    const ntUserApi = this.ctx.get('ntUserApi')!
+    const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
+    return await invoke('nodeIKernelGroupService/uploadGroupBulletinPic', [{ groupCode, psKey, path }])
+  }
+
+  async getGroupRecommendContact(groupCode: string) {
+    const ret = await invoke('nodeIKernelGroupService/getGroupRecommendContactArkJson', [{ groupCode }])
+    return ret.arkJson
+  }
+
+  async queryCachedEssenceMsg(groupCode: string, msgSeq = '0', msgRandom = '0') {
+    return await invoke('nodeIKernelGroupService/queryCachedEssenceMsg', [{
+      key: {
+        groupCode,
+        msgSeq: +msgSeq,
+        msgRandom: +msgRandom
+      }
+    }])
+  }
+
+  async getGroupHonorList(groupCode: string) {
+    // 还缺点东西
+    return await invoke('nodeIKernelGroupService/getGroupHonorList', [{
+      req: {
+        groupCode: [+groupCode]
+      }
+    }])
+  }
+
+  async getGroupAllInfo(groupCode: string) {
+    invoke('nodeIKernelGroupListener/onGroupAllInfoChange', [], {
+      registerEvent: true
+    })
+
+    return await invoke<{ groupAll: GroupAllInfo }>(
+      'nodeIKernelGroupService/getGroupAllInfo',
+      [{
+        groupCode,
+        source: 4
+      }],
+      {
+        cbCmd: 'nodeIKernelGroupListener/onGroupAllInfoChange',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.groupAll.groupCode === groupCode
+      }
+    )
+  }
+
+  async getGroupBulletinList(groupCode: string) {
+    invoke('nodeIKernelGroupListener/onGetGroupBulletinListResult', [], {
+      registerEvent: true
+    })
+
+    const ntUserApi = this.ctx.get('ntUserApi')!
+    const psKey = (await ntUserApi.getPSkey(['qun.qq.com'])).domainPskeyMap.get('qun.qq.com')!
+    return await invoke<{
+      groupCode: string
+      context: string
+      result: GroupBulletinListResult
+    }>(
+      'nodeIKernelGroupService/getGroupBulletinList',
+      [{
+        groupCode,
+        psKey,
+        context: '',
+        req: {
+          startIndex: -1,
+          num: 20,
+          needInstructionsForJoinGroup: 1,
+          needPublisherInfo: 1
         }
-        const result = await callNTQQApi<{
-            updateType: number,
-            groupList: Group[]
-        }>({methodName: NTQQApiMethod.GROUPS, args: [{force_update: forced}, undefined], cbCmd})
-        return result.groupList
-    }
-    static async getGroupMembers(groupQQ: string, num = 3000): Promise<GroupMember[]> {
-        const sceneId = await callNTQQApi({
-            methodName: NTQQApiMethod.GROUP_MEMBER_SCENE,
-            args: [{
-                groupCode: groupQQ,
-                scene: "groupMemberList_MainWindow"
-            }]
-        })
-        // log("get group member sceneId", sceneId);
-        try {
-            const result = await callNTQQApi<{
-                result: { infos: any }
-            }>({
-                methodName: NTQQApiMethod.GROUP_MEMBERS,
-                args: [{
-                    sceneId: sceneId,
-                    num: num
-                },
-                    null
-                ]
-            })
-            // log("members info", typeof result.result.infos, Object.keys(result.result.infos))
-            const values = result.result.infos.values()
+      }],
+      {
+        cbCmd: 'nodeIKernelGroupListener/onGetGroupBulletinListResult',
+        cmdCB: payload => payload.groupCode === groupCode,
+        afterFirstCmd: false
+      }
+    )
+  }
 
-            const members: GroupMember[] = Array.from(values)
-            for (const member of members) {
-                uidMaps[member.uid] = member.uin;
-            }
-            // log(uidMaps);
-            // log("members info", values);
-            log(`get group ${groupQQ} members success`)
-            return members
-        } catch (e) {
-            log(`get group ${groupQQ} members failed`, e)
-            return []
-        }
-    }
-    static async getGroupNotifies() {
-        // 获取管理员变更
-        // 加群通知，退出通知，需要管理员权限
-        callNTQQApi<GeneralCallResult>({
-            methodName: ReceiveCmdS.GROUP_NOTIFY,
-            classNameIsRegister: true,
-        }).then()
-        return await callNTQQApi<GroupNotifies>({
-            methodName: NTQQApiMethod.GET_GROUP_NOTICE,
-            cbCmd: ReceiveCmdS.GROUP_NOTIFY,
-            afterFirstCmd: false,
-            args: [
-                {"doubt": false, "startSeq": "", "number": 14},
-                null
-            ]
-        });
-    }
-    static async getGroupIgnoreNotifies() {
-        await NTQQGroupApi.getGroupNotifies();
-        return await NTQQWindowApi.openWindow(NTQQWindows.GroupNotifyFilterWindow,[], ReceiveCmdS.GROUP_NOTIFY);
-    }
-    static async handleGroupRequest(seq: string, operateType: GroupRequestOperateTypes, reason?: string) {
-        const notify: GroupNotify = await dbUtil.getGroupNotify(seq)
-        if (!notify) {
-            throw `${seq}对应的加群通知不存在`
-        }
-        // delete groupNotifies[seq];
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.HANDLE_GROUP_REQUEST,
-            args: [
-                {
-                    "doubt": false,
-                    "operateMsg": {
-                        "operateType": operateType, // 2 拒绝
-                        "targetMsg": {
-                            "seq": seq,  // 通知序列号
-                            "type": notify.type,
-                            "groupCode": notify.group.groupCode,
-                            "postscript": reason
-                        }
-                    }
-                },
-                null
-            ]
-        });
-    }
-    static async quitGroup(groupQQ: string) {
-        await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.QUIT_GROUP,
-            args: [
-                {"groupCode": groupQQ},
-                null
-            ]
-        })
-    }
-    static async kickMember(groupQQ: string, kickUids: string[], refuseForever: boolean = false, kickReason: string = '') {
-        return await callNTQQApi<GeneralCallResult>(
-            {
-                methodName: NTQQApiMethod.KICK_MEMBER,
-                args: [
-                    {
-                        groupCode: groupQQ,
-                        kickUids,
-                        refuseForever,
-                        kickReason,
-                    }
-                ]
-            }
-        )
-    }
-    static async banMember(groupQQ: string, memList: Array<{ uid: string, timeStamp: number }>) {
-        // timeStamp为秒数, 0为解除禁言
-        return await callNTQQApi<GeneralCallResult>(
-            {
-                methodName: NTQQApiMethod.MUTE_MEMBER,
-                args: [
-                    {
-                        groupCode: groupQQ,
-                        memList,
-                    }
-                ]
-            }
-        )
-    }
-    static async banGroup(groupQQ: string, shutUp: boolean) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.MUTE_GROUP,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    shutUp
-                }, null
-            ]
-        })
-    }
-    static async setMemberCard(groupQQ: string, memberUid: string, cardName: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_MEMBER_CARD,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    uid: memberUid,
-                    cardName
-                }, null
-            ]
-        })
-    }
-    static async setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_MEMBER_ROLE,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    uid: memberUid,
-                    role
-                }, null
-            ]
-        })
-    }
-    static async setGroupName(groupQQ: string, groupName: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_GROUP_NAME,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    groupName
-                }, null
-            ]
-        })
-    }
+  async setGroupAvatar(groupCode: string, path: string) {
+    return await invoke('nodeIKernelGroupService/setHeader', [{ path, groupCode }])
+  }
 
-    // 头衔不可用
-    static async setGroupTitle(groupQQ: string, uid: string, title: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_GROUP_TITLE,
-            args: [
-                {
-                    groupCode: groupQQ,
-                    uid,
-                    title
-                }, null
-            ]
-        })
-    }
-    static publishGroupBulletin(groupQQ: string, title: string, content: string) {
+  async searchMember(groupCode: string, keyword: string) {
+    await invoke('nodeIKernelGroupListener/onSearchMemberChange', [], {
+      registerEvent: true
+    })
+    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
+      groupCode,
+      scene: 'groupMemberList_MainWindow'
+    }])
+    const data = await invoke<{
+      sceneId: string
+      keyword: string
+      infos: Map<string, GroupMember>
+    }>(
+      'nodeIKernelGroupService/searchMember',
+      [{ sceneId, keyword }],
+      {
+        cbCmd: 'nodeIKernelGroupListener/onSearchMemberChange',
+        cmdCB: payload => {
+          return payload.sceneId === sceneId && payload.keyword === keyword
+        },
+        afterFirstCmd: false
+      }
+    )
+    return data.infos
+  }
 
-    }
-}
+  async getGroupFileCount(groupId: string) {
+    return await invoke(
+      'nodeIKernelRichMediaService/batchGetGroupFileCount',
+      [{ groupIds: [groupId] }]
+    )
+  }
+
+  async getGroupFileSpace(groupId: string) {
+    return await invoke(
+      'nodeIKernelRichMediaService/getGroupSpace',
+      [{ groupId }]
+    )
+  }
+
+  async setGroupMsgMask(groupCode: string, msgMask: GroupMsgMask) {
+    return await invoke('nodeIKernelGroupService/setGroupMsgMask', [{ groupCode, msgMask }])
+  }
+
+  async setGroupRemark(groupCode: string, groupRemark = '') {
+    return await invoke('nodeIKernelGroupService/modifyGroupRemark', [{ groupCode, groupRemark }])
+  }
+}

src/ntqqapi/api/index.ts

@@ -1,7 +1,7 @@
-export * from "./file";
-export * from "./friend";
-export * from "./group";
-export * from "./msg";
-export * from "./user";
-export * from "./webapi";
-export * from "./window";
+export * from './file'
+export * from './friend'
+export * from './group'
+export * from './msg'
+export * from './user'
+export * from './webapi'
+export * from './window'

src/ntqqapi/api/msg.ts

@@ -1,211 +1,287 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiMethod} from "../ntcall";
-import {ChatType, RawMessage, SendMessageElement} from "../types";
-import {dbUtil} from "../../common/db";
-import {selfInfo} from "../../common/data";
-import {ReceiveCmdS, registerReceiveHook} from "../hook";
-import {log} from "../../common/utils/log";
-import {sleep} from "../../common/utils/helper";
-import {isQQ998} from "../../common/utils";
+import { invoke, NTMethod } from '../ntcall'
+import { RawMessage, SendMessageElement, Peer, ChatType } from '../types'
+import { Service, Context } from 'cordis'
+import { selfInfo } from '@/common/globalVars'
 
-export let sendMessagePool: Record<string, ((sendSuccessMsg: RawMessage) => void) | null> = {}// peerUid: callbackFunnc
-
-export interface Peer {
-    chatType: ChatType
-    peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
-    guildId?: ""
+declare module 'cordis' {
+  interface Context {
+    ntMsgApi: NTQQMsgApi
+  }
 }
 
-export class NTQQMsgApi {
-    static async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
-        return await callNTQQApi<GeneralCallResult & {msgList: RawMessage[]}>({
-            methodName: NTQQApiMethod.GET_MULTI_MSG,
-            args: [{
-                peer,
-                rootMsgId,
-                parentMsgId
-            }, null]
-        })
-    }
+export class NTQQMsgApi extends Service {
+  static inject = ['ntUserApi']
 
-    static async activateGroupChat(groupCode: string) {
-        // await this.fetchRecentContact();
-        // await sleep(500);
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.ADD_ACTIVE_CHAT,
-            args: [{peer:{peerUid: groupCode, chatType: ChatType.group}, cnt: 20}, null]
-        })
-    }
-    static async getMsgHistory(peer: Peer, msgId: string, count: number) {
-        return await callNTQQApi<GeneralCallResult & {msgList: RawMessage[]}>({
-            methodName: isQQ998 ? NTQQApiMethod.HISTORY_MSG_998 : NTQQApiMethod.HISTORY_MSG,
-            args: [{
-                peer,
-                msgId,
-                cnt: count,
-                queryOrder: true,
-            }, null]
-        })
-    }
-    static async fetchRecentContact(){
-        await callNTQQApi({
-            methodName: NTQQApiMethod.RECENT_CONTACT,
-            args: [
-                {
-                    fetchParam: {
-                        anchorPointContact: {
-                            contactId: '',
-                            sortField: '',
-                            pos: 0,
-                        },
-                        relativeMoveCount: 0,
-                        listType: 2,  // 1普通消息，2群助手内的消息
-                        count: 200,
-                        fetchOld: true,
-                    },
-                }
-            ]
-        })
-    }
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntMsgApi', true)
+  }
 
-    static async recallMsg(peer: Peer, msgIds: string[]) {
-        return await callNTQQApi({
-            methodName: NTQQApiMethod.RECALL_MSG,
-            args: [{
-                peer,
-                msgIds
-            }, null]
-        })
-    }
+  async getTempChatInfo(chatType: ChatType, peerUid: string) {
+    return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }])
+  }
 
-    static async sendMsg(peer: Peer, msgElements: SendMessageElement[],
-                         waitComplete = true, timeout = 10000) {
-        const peerUid = peer.peerUid
+  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean) {
+    // 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
+    const emojiType = emojiId.length > 3 ? '2' : '1'
+    return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }])
+  }
 
-        // 等待上一个相同的peer发送完
-        let checkLastSendUsingTime = 0;
-        const waitLastSend = async () => {
-            if (checkLastSendUsingTime > timeout) {
-                throw ("发送超时")
+  async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
+    return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }])
+  }
+
+  async activateChat(peer: Peer) {
+    return await invoke(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }])
+  }
+
+  async activateChatAndGetHistory(peer: Peer, cnt: number) {
+    // 消息从旧到新
+    return await invoke(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt, msgId: '0', queryOrder: true }])
+  }
+
+  async getAioFirstViewLatestMsgs(peer: Peer, cnt: number) {
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }])
+  }
+
+  async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
+    if (!peer) throw new Error('peer is not allowed')
+    if (!msgIds) throw new Error('msgIds is not allowed')
+    return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }])
+  }
+
+  async getMsgHistory(peer: Peer, msgId: string, cnt: number, queryOrder = false) {
+    // 默认情况下消息时间从新到旧
+    return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder }])
+  }
+
+  async recallMsg(peer: Peer, msgIds: string[]) {
+    return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }])
+  }
+
+  async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
+    const uniqueId = await this.generateMsgUniqueId(peer.chatType)
+    const msgAttributeInfos = new Map()
+    msgAttributeInfos.set(0, {
+      attrType: 0,
+      attrId: uniqueId,
+      vasMsgInfo: {
+        msgNamePlateInfo: {},
+        bubbleInfo: {},
+        avatarPendantInfo: {},
+        vasFont: {},
+        iceBreakInfo: {}
+      }
+    })
+
+    let sentMsgId: string
+    const data = await invoke<{ msgList: RawMessage[] }>(
+      'nodeIKernelMsgService/sendMsg',
+      [{
+        msgId: '0',
+        peer,
+        msgElements,
+        msgAttributeInfos
+      }],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
+            if (msgRecord.msgAttrs.get(0)?.attrId === uniqueId && msgRecord.sendStatus === 2) {
+              sentMsgId = msgRecord.msgId
+              return true
             }
-            let lastSending = sendMessagePool[peer.peerUid]
-            if (lastSending) {
-                // log("有正在发送的消息，等待中...")
-                await sleep(500);
-                checkLastSendUsingTime += 500;
-                return await waitLastSend();
-            } else {
-                return;
+          }
+          return false
+        },
+        timeout
+      }
+    )
+
+    return data.msgList.find(msgRecord => msgRecord.msgId === sentMsgId)
+  }
+
+  async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
+    const uniqueId = await this.generateMsgUniqueId(destPeer.chatType)
+    destPeer.guildId = uniqueId
+    const data = await invoke<{ msgList: RawMessage[] }>(
+      'nodeIKernelMsgService/forwardMsgWithComment',
+      [{
+        msgIds,
+        srcContact: srcPeer,
+        dstContacts: [destPeer],
+        commentElements: [],
+        msgAttributeInfos: new Map(),
+      }],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
+            if (msgRecord.guildId === uniqueId && msgRecord.sendStatus === 2) {
+              return true
             }
+          }
+          return false
+        },
+        timeout: 3000
+      }
+    )
+    delete destPeer.guildId
+    return data.msgList.filter(msgRecord => msgRecord.guildId === uniqueId)
+  }
+
+  async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage> {
+    const senderShowName = await this.ctx.ntUserApi.getSelfNick(true)
+    const msgInfos = msgIds.map(id => {
+      return { msgId: id, senderShowName }
+    })
+    const selfUid = selfInfo.uid
+    const data = await invoke<{ msgList: RawMessage[] }>(
+      'nodeIKernelMsgService/multiForwardMsgWithComment',
+      [{
+        msgInfos,
+        srcContact: srcPeer,
+        dstContact: destPeer,
+        commentElements: [],
+        msgAttributeInfos: new Map(),
+      }],
+      {
+        cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+        afterFirstCmd: false,
+        cmdCB: payload => {
+          for (const msgRecord of payload.msgList) {
+            if (
+              msgRecord.msgType === 11 &&
+              msgRecord.subMsgType === 7 &&
+              msgRecord.peerUid === destPeer.peerUid &&
+              msgRecord.senderUid === selfUid
+            ) {
+              const element = msgRecord.elements[0]
+              const data = JSON.parse(element.arkElement!.bytesData)
+              if (data.app !== 'com.tencent.multimsg' || !data.meta.detail.resid) {
+                continue
+              }
+              return true
+            }
+          }
+          return false
         }
-        await waitLastSend();
+      }
+    )
+    return data.msgList.find(msgRecord => {
+      const { arkElement } = msgRecord.elements[0]
+      if (arkElement?.bytesData.includes('com.tencent.multimsg')) {
+        return true
+      }
+    })!
+  }
 
-        let sentMessage: RawMessage = null;
-        sendMessagePool[peerUid] = async (rawMessage: RawMessage) => {
-            delete sendMessagePool[peerUid];
-            sentMessage = rawMessage;
-        }
+  async getSingleMsg(peer: Peer, msgSeq: string) {
+    return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }])
+  }
 
-        let checkSendCompleteUsingTime = 0;
-        const checkSendComplete = async (): Promise<RawMessage> => {
-            if (sentMessage) {
-                if (waitComplete) {
-                    if ((await dbUtil.getMsgByLongId(sentMessage.msgId)).sendStatus == 2) {
-                        return sentMessage
-                    }
-                } else {
-                    return sentMessage
-                }
-                // log(`给${peerUid}发送消息成功`)
-            }
-            checkSendCompleteUsingTime += 500
-            if (checkSendCompleteUsingTime > timeout) {
-                throw ('发送超时')
-            }
-            await sleep(500)
-            return await checkSendComplete()
-        }
+  async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
+    return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
+      msgId: '0',
+      msgTime: '0',
+      msgSeq,
+      params: {
+        chatInfo: peer,
+        filterMsgType: [],
+        filterSendersUid: [],
+        filterMsgToTime: '0',
+        filterMsgFromTime: '0',
+        isReverseOrder: true,
+        isIncludeCurrent: true,
+        pageLimit: 1,
+      }
+    }])
+  }
 
-        callNTQQApi({
-            methodName: NTQQApiMethod.SEND_MSG,
-            args: [{
-                msgId: "0",
-                peer, msgElements,
-                msgAttributeInfos: new Map(),
-            }, null]
-        }).then()
-        return await checkSendComplete()
+  async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[] = []) {
+    return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
+      msgId: '0',
+      msgTime: '0',
+      msgSeq,
+      params: {
+        chatInfo: peer,
+        filterMsgType: [],
+        filterSendersUid,
+        filterMsgToTime: filterMsgTime,
+        filterMsgFromTime: filterMsgTime,
+        isReverseOrder: true,
+        isIncludeCurrent: true,
+        pageLimit: 1,
+      }
+    }])
+  }
+
+  async setMsgRead(peer: Peer) {
+    return await invoke('nodeIKernelMsgService/setMsgRead', [{ peer }])
+  }
+
+  async getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, count: number) {
+    return await invoke('nodeIKernelMsgService/getMsgEmojiLikesList', [{
+      peer,
+      msgSeq,
+      emojiId,
+      emojiType,
+      cnt: count
+    }])
+  }
+
+  async fetchFavEmojiList(count: number) {
+    return await invoke('nodeIKernelMsgService/fetchFavEmojiList', [{
+      resId: '',
+      count,
+      backwardFetch: true,
+      forceRefresh: true
+    }])
+  }
+
+  async generateMsgUniqueId(chatType: number) {
+    const time = await this.getServerTime()
+    const uniqueId = await invoke('nodeIKernelMsgService/generateMsgUniqueId', [{ chatType, time }])
+    if (typeof uniqueId === 'string') {
+      return uniqueId
+    } else {
+      const random = Math.trunc(Math.random() * 100)
+      return `${Date.now()}${random}`
     }
+  }
 
-    static async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.FORWARD_MSG,
-            args: [
-                {
-                    msgIds: msgIds,
-                    srcContact: srcPeer,
-                    dstContacts: [
-                        destPeer
-                    ],
-                    commentElements: [],
-                    msgAttributeInfos: new Map()
-                },
-                null,
-            ]
-        })
-    }
+  async queryMsgsById(chatType: ChatType, msgId: string) {
+    const msgTime = this.getMsgTimeFromId(msgId)
+    return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
+      msgId,
+      msgTime: '0',
+      msgSeq: '0',
+      params: {
+        chatInfo: {
+          peerUid: '',
+          chatType
+        },
+        filterMsgToTime: msgTime,
+        filterMsgFromTime: msgTime,
+        isIncludeCurrent: true,
+        pageLimit: 1,
+      }
+    }])
+  }
 
-    static async multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-        const msgInfos = msgIds.map(id => {
-            return {msgId: id, senderShowName: selfInfo.nick}
-        })
-        const apiArgs = [
-            {
-                msgInfos,
-                srcContact: srcPeer,
-                dstContact: destPeer,
-                commentElements: [],
-                msgAttributeInfos: new Map()
-            },
-            null,
-        ]
-        return await new Promise<RawMessage>((resolve, reject) => {
-            let complete = false
-            setTimeout(() => {
-                if (!complete) {
-                    reject("转发消息超时");
-                }
-            }, 5000)
-            registerReceiveHook(ReceiveCmdS.SELF_SEND_MSG, async (payload: { msgRecord: RawMessage }) => {
-                const msg = payload.msgRecord
-                // 需要判断它是转发的消息，并且识别到是当前转发的这一条
-                const arkElement = msg.elements.find(ele => ele.arkElement)
-                if (!arkElement) {
-                    // log("收到的不是转发消息")
-                    return
-                }
-                const forwardData: any = JSON.parse(arkElement.arkElement.bytesData)
-                if (forwardData.app != 'com.tencent.multimsg') {
-                    return
-                }
-                if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfInfo.uid) {
-                    complete = true
-                    await dbUtil.addMsg(msg)
-                    resolve(msg)
-                    log('转发消息成功：', payload)
-                }
-            })
-            callNTQQApi<GeneralCallResult>({
-                methodName: NTQQApiMethod.MULTI_FORWARD_MSG,
-                args: apiArgs
-            }).then(result => {
-                log("转发消息结果:", result, apiArgs)
-                if (result.result !== 0) {
-                    complete = true;
-                    reject("转发消息失败," + JSON.stringify(result));
-                }
-            })
-        })
-    }
+  getMsgTimeFromId(msgId: string) {
+    // 小概率相差1毫秒
+    return String(BigInt(msgId) >> 32n)
+  }
 
+  async getServerTime() {
+    return await invoke('nodeIKernelMSFService/getServerTime', [])
+  }
 
-}
+  async fetchUnitedCommendConfig(groups: string[]) {
+    return await invoke('nodeIKernelUnitedConfigService/fetchUnitedCommendConfig', [{ groups }])
+  }
+}

src/ntqqapi/api/system.ts

@@ -0,0 +1,38 @@
+import { Context, Service } from 'cordis'
+import { invoke, NTClass } from '@/ntqqapi/ntcall'
+
+declare module 'cordis' {
+  interface Context {
+    ntSystemApi: NTQQSystemApi
+  }
+}
+
+export class NTQQSystemApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntSystemApi', true)
+  }
+
+  async restart() {
+    // todo: 调用此接口后会将 NTQQ 设置里面的自动登录和无需手机确认打开，重启后将状态恢复到之前的状态
+
+    // 设置自动登录
+    await this.setSettingAutoLogin(true)
+    // 退出账号
+    invoke('quitAccount', [], {
+      className: NTClass.BUSINESS_API
+    }).then()
+    invoke('notifyQQClose', [{ type: 1 }], { className: NTClass.QQ_EX_API }).then()
+    // 等待登录界面，模拟点击登录按钮？还是直接调用登录方法？
+  }
+
+  async getSettingAutoLogin() {
+    // 查询是否自动登录
+    return invoke('nodeIKernelNodeMiscService/queryAutoRun', [])
+  }
+
+  async setSettingAutoLogin(state: boolean) {
+    await invoke('nodeIKernelSettingService/setNeedConfirmSwitch', [{ state: 1 }]) // 1：不需要手机确认，2：需要手机确认
+
+    await invoke('nodeIKernelSettingService/setAutoLoginSwitch', [{ state }])
+  }
+}

src/ntqqapi/api/user.ts

@@ -1,103 +1,301 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
-import {SelfInfo, User} from "../types";
-import {ReceiveCmdS} from "../hook";
-import {uidMaps} from "../../common/data";
-import {NTQQWindowApi, NTQQWindows} from "./window";
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfo, UserDetailSource, ProfileBizType, SimpleInfo } from '../types'
+import { invoke, NTClass } from '../ntcall'
+import { getBuildVersion } from '@/common/utils'
+import { RequestUtil } from '@/common/utils/request'
+import { isNullable, pick, Time } from 'cosmokit'
+import { Service, Context } from 'cordis'
+import { selfInfo } from '@/common/globalVars'
 
+declare module 'cordis' {
+  interface Context {
+    ntUserApi: NTQQUserApi
+  }
+}
 
-export class NTQQUserApi{
-    static async setQQAvatar(filePath: string) {
-        return await callNTQQApi<GeneralCallResult>({
-            methodName: NTQQApiMethod.SET_QQ_AVATAR,
-            args: [{
-                path:filePath
-            }, null],
-            timeoutSecond: 10 // 10秒不一定够
-        });
-    }
+export class NTQQUserApi extends Service {
+  static inject = ['ntFriendApi', 'ntGroupApi']
 
-    static async getSelfInfo() {
-        return await callNTQQApi<SelfInfo>({
-            className: NTQQApiClass.GLOBAL_DATA,
-            methodName: NTQQApiMethod.SELF_INFO, timeoutSecond: 2
-        })
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntUserApi', true)
+  }
+
+  async setSelfAvatar(path: string) {
+    return await invoke(
+      'nodeIKernelProfileService/setHeader',
+      [{ path }],
+      {
+        timeout: 10 * Time.second // 10秒不一定够
+      }
+    )
+  }
+
+  async fetchUserDetailInfo(uid: string) {
+    const result = await invoke<{ info: UserDetailInfo }>(
+      'nodeIKernelProfileService/fetchUserDetailInfo',
+      [{
+        callFrom: 'BuddyProfileStore',
+        uid: [uid],
+        source: UserDetailSource.KSERVER,
+        bizList: [ProfileBizType.KALL]
+      }],
+      {
+        cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.info.uid === uid,
+      }
+    )
+    const { info } = result
+    const ret: User = {
+      ...info.simpleInfo.coreInfo,
+      ...info.simpleInfo.status,
+      ...info.simpleInfo.vasInfo,
+      ...info.commonExt,
+      ...info.simpleInfo.baseInfo,
+      qqLevel: info.commonExt?.qqLevel,
+      pendantId: ''
     }
-    static async getUserInfo(uid: string) {
-        const result = await callNTQQApi<{ profiles: Map<string, User> }>({
-            methodName: NTQQApiMethod.USER_INFO,
-            args: [{force: true, uids: [uid]}, undefined],
-            cbCmd: ReceiveCmdS.USER_INFO
-        })
-        return result.profiles.get(uid)
+    return ret
+  }
+
+  async getUserDetailInfo(uid: string) {
+    if (getBuildVersion() >= 26702) {
+      return this.fetchUserDetailInfo(uid)
     }
-    static async getUserDetailInfo(uid: string) {
-        const result = await callNTQQApi<{ info: User }>({
-            methodName: NTQQApiMethod.USER_DETAIL_INFO,
-            cbCmd: ReceiveCmdS.USER_DETAIL_INFO,
-            afterFirstCmd: false,
-            cmdCB: (payload) => {
-                const success = payload.info.uid == uid
-                // log("get user detail info", success, uid, payload)
-                return success
-            },
-            args: [
-                {
-                    uid
-                },
-                null
-            ]
-        })
-        const info = result.info
-        if (info?.uin) {
-            uidMaps[info.uid] = info.uin
+    const result = await invoke<{ info: User }>(
+      'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
+      [{
+        uid,
+        bizList: [0]
+      }],
+      {
+        cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+        afterFirstCmd: false,
+        cmdCB: (payload) => payload.info.uid === uid,
+      }
+    )
+    return result.info
+  }
+
+  async getCookies(domain: string) {
+    const clientKeyData = await this.forceFetchClientKey()
+    if (clientKeyData?.result !== 0) {
+      throw new Error('获取clientKey失败')
+    }
+    const uin = selfInfo.uin
+    const requestUrl = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + uin + '&clientkey=' + clientKeyData.clientKey + '&u1=https%3A%2F%2F' + domain + '%2F' + uin + '%2Finfocenter&keyindex=19%27'
+    const cookies: { [key: string]: string } = await RequestUtil.HttpsGetCookies(requestUrl)
+    return cookies
+  }
+
+  async getPSkey(domains: string[]) {
+    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }])
+  }
+
+  async like(uid: string, count = 1) {
+    return await invoke(
+      'nodeIKernelProfileLikeService/setBuddyProfileLike',
+      [{
+        doLikeUserInfo: {
+          friendUid: uid,
+          sourceId: 71,
+          doLikeCount: count,
+          doLikeTollCount: 0
         }
-        return info
-    }
+      }]
+    )
+  }
 
-    static async getPSkey() {
-        return await callNTQQApi<string>({
-            className: NTQQApiClass.GROUP_HOME_WORK,
-            methodName: NTQQApiMethod.UPDATE_SKEY,
-            args: [
-                {
-                    domain: "qun.qq.com"
-                }
-            ]
-        })
+  async getUidByUinV1(uin: string, groupCode?: string) {
+    let uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
+    if (!uid) {
+      const friends = await this.ctx.ntFriendApi.getFriends()
+      uid = friends.find(item => item.uin === uin)?.uid
     }
-    static async getSkey(groupName: string, groupCode: string): Promise<{data: string}> {
-        return await NTQQWindowApi.openWindow<{data: string}>(NTQQWindows.GroupHomeWorkWindow, [{
-            groupName,
-            groupCode,
-            "source": "funcbar"
-        }], ReceiveCmdS.SKEY_UPDATE, 1);
-        // return await callNTQQApi<string>({
-        //     className: NTQQApiClass.GROUP_HOME_WORK,
-        //     methodName: NTQQApiMethod.UPDATE_SKEY,
-        //     args: [
-        //         {
-        //             domain: "qun.qq.com"
-        //         }
-        //     ]
-        // })
-        // return await callNTQQApi<GeneralCallResult>({
-        //     methodName: NTQQApiMethod.GET_SKEY,
-        //     args: [
-        //         {
-        //             "domains": [
-        //                 "qzone.qq.com",
-        //                 "qlive.qq.com",
-        //                 "qun.qq.com",
-        //                 "gamecenter.qq.com",
-        //                 "vip.qq.com",
-        //                 "qianbao.qq.com",
-        //                 "qidian.qq.com"
-        //             ],
-        //             "isForNewPCQQ": false
-        //         },
-        //         null
-        //     ]
-        // })
+    if (!uid && groupCode) {
+      let member = await this.ctx.ntGroupApi.searchMember(groupCode, uin)
+      if (member.size === 0) {
+        await this.ctx.ntGroupApi.getGroupMembers(groupCode, 1)
+        await this.ctx.sleep(30)
+        member = await this.ctx.ntGroupApi.searchMember(groupCode, uin)
+      }
+      uid = Array.from(member.values()).find(e => e.uin === uin)?.uid
     }
+    if (!uid) {
+      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid
+      if (!unveifyUid.includes('*')) {
+        uid = unveifyUid
+      }
+    }
+    return uid
+  }
 
-}
+  async getUidByUinV2(uin: string) {
+    let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uinList: [uin] }])).uids.get(uin)
+    if (uid) return uid
+    uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
+    if (uid) return uid
+    uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
+    if (uid) return uid
+    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid
+    //if (!unveifyUid.includes('*')) return unveifyUid
+    return unveifyUid
+  }
+
+  async getUidByUin(uin: string, groupCode?: string) {
+    if (getBuildVersion() >= 26702) {
+      return this.getUidByUinV2(uin)
+    }
+    return this.getUidByUinV1(uin, groupCode)
+  }
+
+  async getUserDetailInfoByUinV2(uin: string) {
+    return await invoke<UserDetailInfoByUinV2>(
+      'nodeIKernelProfileService/getUserDetailInfoByUin',
+      [{ uin }]
+    )
+  }
+
+  async getUserDetailInfoByUin(uin: string) {
+    return await invoke<UserDetailInfoByUin>(
+      'nodeIKernelProfileService/getUserDetailInfoByUin',
+      [{ uin }]
+    )
+  }
+
+  async getUinByUidV1(uid: string) {
+    const ret = await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])
+    let uin = ret.uinInfo.get(uid)
+    if (!uin) {
+      uin = (await this.getUserDetailInfo(uid)).uin
+    }
+    return uin
+  }
+
+  async getUinByUidV2(uid: string) {
+    let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uidList: [uid] }])).uins.get(uid)
+    if (uin && uin !== '0') return uin
+    uin = (await invoke('nodeIKernelProfileService/getUinByUid', [{ callFrom: 'FriendsServiceImpl', uid: [uid] }])).get(uid)
+    if (uin) return uin
+    uin = (await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])).uinInfo.get(uid)
+    if (uin) return uin
+    uin = (await this.ctx.ntFriendApi.getBuddyIdMap()).get(uid)
+    if (uin) return uin
+    uin = (await this.getUserDetailInfo(uid)).uin
+    return uin
+  }
+
+  async getUinByUid(uid: string) {
+    if (getBuildVersion() >= 26702) {
+      return this.getUinByUidV2(uid)
+    }
+    return this.getUinByUidV1(uid)
+  }
+
+  async forceFetchClientKey() {
+    return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ url: '' }])
+  }
+
+  async getSelfNick(refresh = true) {
+    if ((refresh || !selfInfo.nick) && selfInfo.uid) {
+      const data = await this.getUserSimpleInfo(selfInfo.uid)
+      selfInfo.nick = data.nick
+    }
+    return selfInfo.nick
+  }
+
+  async setSelfStatus(status: number, extStatus: number, batteryStatus: number) {
+    return await invoke('nodeIKernelMsgService/setStatus', [{
+      statusReq: {
+        status,
+        extStatus,
+        batteryStatus,
+      }
+    }])
+  }
+
+  async getProfileLike(uid: string) {
+    return await invoke('nodeIKernelProfileLikeService/getBuddyProfileLike', [{
+      req: {
+        friendUids: [uid],
+        basic: 1,
+        vote: 1,
+        favorite: 0,
+        userProfile: 1,
+        type: 2,
+        start: 0,
+        limit: 20,
+      }
+    }])
+  }
+
+  async getUserSimpleInfoV2(uid: string, force = true) {
+    const data = await invoke<{ profiles: Record<string, SimpleInfo> }>(
+      'nodeIKernelProfileService/getUserSimpleInfo',
+      [{
+        uids: [uid],
+        force
+      }],
+      {
+        cbCmd: 'onProfileSimpleChanged',
+        afterFirstCmd: false,
+        cmdCB: payload => !isNullable(payload.profiles[uid]),
+      }
+    )
+    return data.profiles[uid].coreInfo
+  }
+
+  async getUserSimpleInfo(uid: string, force = true) {
+    if (getBuildVersion() >= 26702) {
+      return this.getUserSimpleInfoV2(uid, force)
+    }
+    const data = await invoke<{ profiles: Map<string, User> }>(
+      'nodeIKernelProfileService/getUserSimpleInfo',
+      [{
+        uids: [uid],
+        force
+      }],
+      {
+        cbCmd: 'nodeIKernelProfileListener/onProfileSimpleChanged',
+        afterFirstCmd: false,
+        cmdCB: payload => payload.profiles.has(uid),
+      }
+    )
+    const profile = data.profiles.get(uid)!
+    return pick(profile, ['nick', 'remark', 'uid', 'uin'])
+  }
+
+  async getCoreAndBaseInfo(uids: string[]) {
+    return await invoke(
+      'nodeIKernelProfileService/getCoreAndBaseInfo',
+      [{
+        uids,
+        callFrom: 'nodeStore'
+      }]
+    )
+  }
+
+  async getRobotUinRange() {
+    const data = await invoke(
+      'nodeIKernelRobotService/getRobotUinRange',
+      [{
+        req: {
+          justFetchMsgConfig: '1',
+          type: 1,
+          version: 0,
+          aioKeywordVersion: 0
+        }
+      }]
+    )
+    return data.response.robotUinRanges
+  }
+
+  async quitAccount() {
+    return await invoke(
+      'quitAccount',
+      [],
+      {
+        className: NTClass.BUSINESS_API,
+      }
+    )
+  }
+}

src/ntqqapi/api/webapi.ts

@@ -1,86 +1,156 @@
-import {groups} from "../../common/data";
-import {log} from "../../common/utils";
-import {NTQQUserApi} from "./user";
+import { RequestUtil } from '@/common/utils/request'
+import { Service, Context } from 'cordis'
+import { Dict } from 'cosmokit'
 
-export class WebApi{
-    private static bkn: string;
-    private static skey: string;
-    private static pskey: string;
-    private static cookie: string
-    private defaultHeaders: Record<string,string> = {
-        "User-Agent": "QQ/8.9.28.635 CFNetwork/1312 Darwin/21.0.0"
+declare module 'cordis' {
+  interface Context {
+    ntWebApi: NTQQWebApi
+  }
+}
+
+export enum WebHonorType {
+  ALL = 'all',
+  TALKACTIVE = 'talkative',
+  PERFROMER = 'performer',
+  LEGEND = 'legend',
+  STORONGE_NEWBI = 'strong_newbie',
+  EMOTION = 'emotion'
+}
+
+export class NTQQWebApi extends Service {
+  static inject = ['ntUserApi']
+
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntWebApi', true)
+  }
+
+  genBkn(sKey: string) {
+    sKey = sKey || ''
+    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()
+  }
 
-    constructor() {
-
-    }
-
-    public async addGroupDigest(groupCode: string, msgSeq: string){
-        const url = `https://qun.qq.com/cgi-bin/group_digest/cancel_digest?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&msg_seq=${msgSeq}&msg_random=444021292`
-        const res = await this.request(url)
-        return await res.json()
-    }
-
-    public async getGroupDigest(groupCode: string){
-        const url = `https://qun.qq.com/cgi-bin/group_digest/digest_list?random=665&X-CROSS-ORIGIN=fetch&group_code=${groupCode}&page_start=0&page_limit=20`
-        const res = await this.request(url)
-        log(res.headers)
-        return await res.json()
-    }
-
-    private genBkn(sKey: string){
-        sKey = sKey || "";
-        let hash = 5381;
-
-        for (let i = 0; i < sKey.length; i++) {
-            const code = sKey.charCodeAt(i);
-            hash = hash + (hash << 5) + code;
+  async getGroupHonorInfo(groupCode: string, getType: string) {
+    const getDataInternal = async (groupCode: string, type: number) => {
+      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + groupCode + '&type=' + type
+      let resJson
+      try {
+        const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
+        const match = res.match(/window\.__INITIAL_STATE__=(.*?);/)
+        if (match) {
+          resJson = JSON.parse(match[1].trim())
         }
-
-        return (hash & 0x7FFFFFFF).toString();
-    }
-    private async init(){
-        if (!WebApi.bkn) {
-            const group = groups[0];
-            WebApi.skey = (await NTQQUserApi.getSkey(group.groupName, group.groupCode)).data;
-            WebApi.bkn = this.genBkn(WebApi.skey);
-            let cookie = await NTQQUserApi.getPSkey();
-            const pskeyRegex = /p_skey=([^;]+)/;
-            const match = cookie.match(pskeyRegex);
-            const pskeyValue = match ? match[1] : null;
-            WebApi.pskey = pskeyValue;
-            if (cookie.indexOf("skey=;") !== -1) {
-                cookie = cookie.replace("skey=;", `skey=${WebApi.skey};`);
-            }
-            WebApi.cookie = cookie;
-            // for(const kv of WebApi.cookie.split(";")){
-            //     const [key, value] = kv.split("=");
-            // }
-            //     log("set cookie", key, value)
-            //     await session.defaultSession.cookies.set({
-            //         url: 'https://qun.qq.com', // 你要请求的域名
-            //         name: key.trim(),
-            //         value: value.trim(),
-            //         expirationDate: Date.now() / 1000 + 300000, // Cookie 过期时间，例如设置为当前时间之后的300秒
-            //     });
-            // }
+        if (type === 1) {
+          return resJson?.talkativeList
+        } else {
+          return resJson?.actorList
         }
+      } catch (e) {
+        this.ctx.logger.error('获取当前群荣耀失败', url, e)
+      }
+      return undefined
     }
 
-    private async request(url: string, method: "GET" | "POST" = "GET", headers: Record<string, string> = {}){
+    const honorInfo: Dict = { group_id: groupCode }
+    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
+    const cookieStr = this.cookieToString(cookieObject)
 
-        await this.init();
-        url += "&bkn=" + WebApi.bkn;
-        let _headers: Record<string, string> = {
-            ...this.defaultHeaders, ...headers,
-            "Cookie": WebApi.cookie,
-            credentials: 'include'
+    if (getType === WebHonorType.TALKACTIVE || getType === WebHonorType.ALL) {
+      try {
+        const RetInternal = await getDataInternal(groupCode, 1)
+        if (!RetInternal) {
+          throw new Error('获取龙王信息失败')
         }
-        log("request", url, _headers)
-        const options = {
-            method: method,
-            headers: _headers
+        honorInfo.current_talkative = {
+          user_id: RetInternal[0]?.uin,
+          avatar: RetInternal[0]?.avatar,
+          nickname: RetInternal[0]?.name,
+          day_count: 0,
+          description: RetInternal[0]?.desc
         }
-        return fetch(url, options)
+        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
+          })
+        }
+      } catch (e) {
+        this.ctx.logger.error(e)
+      }
     }
-}
+    if (getType === WebHonorType.PERFROMER || getType === WebHonorType.ALL) {
+      try {
+        const RetInternal = await getDataInternal(groupCode, 2)
+        if (!RetInternal) {
+          throw new Error('获取群聊之火失败')
+        }
+        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
+          })
+        }
+      } catch (e) {
+        this.ctx.logger.error(e)
+      }
+    }
+    if (getType === WebHonorType.PERFROMER || getType === WebHonorType.ALL) {
+      try {
+        const RetInternal = await getDataInternal(groupCode, 3)
+        if (!RetInternal) {
+          throw new Error('获取群聊炽焰失败')
+        }
+        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
+          })
+        }
+      } catch (e) {
+        this.ctx.logger.error('获取群聊炽焰失败', e)
+      }
+    }
+    if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
+      try {
+        const RetInternal = await getDataInternal(groupCode, 6)
+        if (!RetInternal) {
+          throw new Error('获取快乐源泉失败')
+        }
+        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
+          })
+        }
+      } catch (e) {
+        this.ctx.logger.error('获取快乐源泉失败', e)
+      }
+    }
+    //冒尖小春笋好像已经被tx扬了
+    if (getType === WebHonorType.EMOTION || getType === WebHonorType.ALL) {
+      honorInfo.strong_newbie_list = []
+    }
+    return honorInfo
+  }
+
+  private cookieToString(cookieObject: Dict) {
+    return Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
+  }
+}

src/ntqqapi/api/window.ts

@@ -1,49 +1,63 @@
-import {callNTQQApi, GeneralCallResult, NTQQApiClass, NTQQApiMethod} from "../ntcall";
-import {ReceiveCmd} from "../hook";
-import {BrowserWindow} from "electron";
+import { invoke, NTClass, NTMethod } from '../ntcall'
+import { GeneralCallResult } from '../services'
+import { ReceiveCmdS } from '../hook'
+import { BrowserWindow } from 'electron'
+import { Service, Context } from 'cordis'
 
-export interface NTQQWindow{
-    windowName: string,
-    windowUrlHash: string,
+declare module 'cordis' {
+  interface Context {
+    ntWindowApi: NTQQWindowApi
+  }
 }
 
-export class NTQQWindows{
-    static GroupHomeWorkWindow: NTQQWindow = {
-        windowName: "GroupHomeWorkWindow",
-        windowUrlHash: "#/group-home-work"
-    }
-    static GroupNotifyFilterWindow: NTQQWindow = {
-        windowName: "GroupNotifyFilterWindow",
-        windowUrlHash: "#/group-notify-filter"
-    }
-    static GroupEssenceWindow: NTQQWindow = {
-        windowName: "GroupEssenceWindow",
-        windowUrlHash: "#/group-essence"
-    }
+export interface NTQQWindow {
+  windowName: string
+  windowUrlHash: string
 }
 
-export class NTQQWindowApi{
+export namespace NTQQWindows {
+  export const GroupHomeWorkWindow: NTQQWindow = {
+    windowName: 'GroupHomeWorkWindow',
+    windowUrlHash: '#/group-home-work',
+  }
+  export const GroupNotifyFilterWindow: NTQQWindow = {
+    windowName: 'GroupNotifyFilterWindow',
+    windowUrlHash: '#/group-notify-filter',
+  }
+  export const GroupEssenceWindow: NTQQWindow = {
+    windowName: 'GroupEssenceWindow',
+    windowUrlHash: '#/group-essence',
+  }
+}
 
-    // 打开窗口并获取对应的下发事件
-    static async openWindow<R=GeneralCallResult>(ntQQWindow: NTQQWindow, args: any[], cbCmd: ReceiveCmd=null, autoCloseSeconds: number=2){
-        const result = await callNTQQApi<R>({
-            className: NTQQApiClass.WINDOW_API,
-            methodName: NTQQApiMethod.OPEN_EXTRA_WINDOW,
-            cbCmd,
-            afterFirstCmd: false,
-            args: [
-                ntQQWindow.windowName,
-                ...args
-            ]
-        })
-        setTimeout(() => {
-            for (const w of BrowserWindow.getAllWindows()) {
-                // log("close window", w.webContents.getURL())
-                if (w.webContents.getURL().indexOf(ntQQWindow.windowUrlHash) != -1) {
-                    w.close();
-                }
-            }
-        }, autoCloseSeconds * 1000);
-        return result;
-    }
-}
+export class NTQQWindowApi extends Service {
+  constructor(protected ctx: Context) {
+    super(ctx, 'ntWindowApi', true)
+  }
+
+  /** 打开窗口并获取对应的下发事件 */
+  async openWindow<R = GeneralCallResult>(
+    ntQQWindow: NTQQWindow,
+    args: unknown[],
+    cbCmd: ReceiveCmdS | undefined,
+    autoCloseSeconds: number = 2,
+  ) {
+    const result = await invoke<R>(
+      NTMethod.OPEN_EXTRA_WINDOW,
+      [ntQQWindow.windowName, ...args],
+      {
+        className: NTClass.WINDOW_API,
+        cbCmd,
+        afterFirstCmd: false,
+      }
+    )
+    setTimeout(() => {
+      for (const w of BrowserWindow.getAllWindows()) {
+        if (w.webContents.getURL().indexOf(ntQQWindow.windowUrlHash) != -1) {
+          w.close()
+        }
+      }
+    }, autoCloseSeconds * 1000)
+    return result
+  }
+}

src/ntqqapi/constructor.ts

@@ -1,252 +0,0 @@
-import {
-    AtType,
-    ElementType,
-    PicType,
-    SendArkElement,
-    SendFaceElement,
-    SendFileElement,
-    SendPicElement,
-    SendPttElement,
-    SendReplyElement,
-    SendTextElement,
-    SendVideoElement
-} from "./types";
-import {promises as fs} from "node:fs";
-import ffmpeg from "fluent-ffmpeg"
-import {NTQQFileApi} from "./api/file";
-import {calculateFileMD5, isGIF} from "../common/utils/file";
-import {log} from "../common/utils/log";
-import {defaultVideoThumb, getVideoInfo} from "../common/utils/video";
-import {encodeSilk} from "../common/utils/audio";
-
-
-export class SendMsgElementConstructor {
-    static text(content: string): SendTextElement {
-        return {
-            elementType: ElementType.TEXT,
-            elementId: "",
-            textElement: {
-                content,
-                atType: AtType.notAt,
-                atUid: "",
-                atTinyId: "",
-                atNtUid: "",
-            },
-        };
-    }
-
-    static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement {
-        return {
-            elementType: ElementType.TEXT,
-            elementId: "",
-            textElement: {
-                content: `@${atName}`,
-                atType,
-                atUid,
-                atTinyId: "",
-                atNtUid,
-            },
-        };
-    }
-
-    static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
-        return {
-            elementType: ElementType.REPLY,
-            elementId: "",
-            replyElement: {
-                replayMsgSeq: msgSeq, // raw.msgSeq
-                replayMsgId: msgId,  // raw.msgId
-                senderUin: senderUin,
-                senderUinStr: senderUinStr,
-            }
-        }
-    }
-
-    static async pic(picPath: string, summary: string = "", subType: 0|1=0): Promise<SendPicElement> {
-        const {md5, fileName, path, fileSize, ext} = await NTQQFileApi.uploadFile(picPath, ElementType.PIC, subType);
-        if (fileSize === 0) {
-            throw "文件异常，大小为0";
-        }
-        const imageSize = await NTQQFileApi.getImageSize(picPath);
-        const picElement = {
-            md5HexStr: md5,
-            fileSize: fileSize.toString(),
-            picWidth: imageSize.width,
-            picHeight: imageSize.height,
-            fileName: md5 + ext,
-            sourcePath: path,
-            original: true,
-            picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
-            picSubType: subType,
-            fileUuid: "",
-            fileSubId: "",
-            thumbFileSize: 0,
-            summary
-        };
-        log("图片信息", picElement)
-        return {
-            elementType: ElementType.PIC,
-            elementId: "",
-            picElement,
-        };
-    }
-
-    static async file(filePath: string, fileName: string = ""): Promise<SendFileElement> {
-        const {md5, fileName: _fileName, path, fileSize} = await NTQQFileApi.uploadFile(filePath, ElementType.FILE);
-        if (fileSize === 0) {
-            throw "文件异常，大小为0";
-        }
-        let element: SendFileElement = {
-            elementType: ElementType.FILE,
-            elementId: "",
-            fileElement: {
-                fileName: fileName || _fileName,
-                "filePath": path,
-                "fileSize": (fileSize).toString(),
-            }
-        }
-
-        return element;
-    }
-
-    static async video(filePath: string, fileName: string = "", diyThumbPath: string = ""): Promise<SendVideoElement> {
-        let {fileName: _fileName, path, fileSize, md5} = await NTQQFileApi.uploadFile(filePath, ElementType.VIDEO);
-        if (fileSize === 0) {
-            throw "文件异常，大小为0";
-        }
-        const pathLib = require("path");
-        let thumb = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
-        thumb = pathLib.dirname(thumb)
-        // log("thumb 目录", thumb)
-        let videoInfo = {
-            width: 1920, height: 1080,
-            time: 15,
-            format: "mp4",
-            size: fileSize,
-            filePath
-        };
-        try {
-            videoInfo = await getVideoInfo(path);
-            log("视频信息", videoInfo)
-        } catch (e) {
-            log("获取视频信息失败", e)
-        }
-        const createThumb = new Promise<string>((resolve, reject) => {
-            const thumbFileName = `${md5}_0.png`
-            const thumbPath = pathLib.join(thumb, thumbFileName)
-            ffmpeg(filePath)
-                .on("end", () => {
-                })
-                .on("error", (err) => {
-                    log("获取视频封面失败，使用默认封面", err)
-                    if (diyThumbPath) {
-                        fs.copyFile(diyThumbPath, thumbPath).then(() => {
-                            resolve(thumbPath);
-                        }).catch(reject)
-                    } else {
-                        fs.writeFile(thumbPath, defaultVideoThumb).then(() => {
-                            resolve(thumbPath);
-                        }).catch(reject)
-                    }
-                })
-                .screenshots({
-                    timestamps: [0],
-                    filename: thumbFileName,
-                    folder: thumb,
-                    size: videoInfo.width + "x" + videoInfo.height
-                }).on("end", () => {
-                resolve(thumbPath);
-            });
-        })
-        let thumbPath = new Map()
-        const _thumbPath = await createThumb;
-        const thumbSize = (await fs.stat(_thumbPath)).size;
-        // log("生成缩略图", _thumbPath)
-        thumbPath.set(0, _thumbPath)
-        const thumbMd5 = await calculateFileMD5(_thumbPath);
-        let element: SendVideoElement = {
-            elementType: ElementType.VIDEO,
-            elementId: "",
-            videoElement: {
-                fileName: fileName || _fileName,
-                filePath: path,
-                videoMd5: md5,
-                thumbMd5,
-                fileTime: videoInfo.time,
-                thumbPath: thumbPath,
-                thumbSize,
-                thumbWidth: videoInfo.width,
-                thumbHeight: videoInfo.height,
-                fileSize: "" + fileSize,
-                // fileUuid: "",
-                // transferStatus: 0,
-                // progress: 0,
-                // invalidState: 0,
-                // fileSubId: "",
-                // fileBizId: null,
-                // originVideoMd5: "",
-                // fileFormat: 2,
-                // import_rich_media_context: null,
-                // sourceVideoCodecFormat: 2
-            }
-        }
-        return element;
-    }
-
-    static async ptt(pttPath: string): Promise<SendPttElement> {
-        const {converted, path: silkPath, duration} = await encodeSilk(pttPath);
-        // log("生成语音", silkPath, duration);
-        const {md5, fileName, path, fileSize} = await NTQQFileApi.uploadFile(silkPath, ElementType.PTT);
-        if (fileSize === 0) {
-            throw "文件异常，大小为0";
-        }
-        if (converted) {
-            fs.unlink(silkPath).then();
-        }
-        return {
-            elementType: ElementType.PTT,
-            elementId: "",
-            pttElement: {
-                fileName: fileName,
-                filePath: path,
-                md5HexStr: md5,
-                fileSize: fileSize,
-                // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
-                duration: duration,
-                formatType: 1,
-                voiceType: 1,
-                voiceChangeType: 0,
-                canConvert2Text: true,
-                waveAmplitudes: [
-                    0, 18, 9, 23, 16, 17, 16, 15, 44, 17, 24, 20, 14, 15, 17,
-                ],
-                fileSubId: "",
-                playState: 1,
-                autoConvertText: 0,
-            }
-        };
-    }
-
-    static face(faceId: number): SendFaceElement {
-        return {
-            elementType: ElementType.FACE,
-            elementId: "",
-            faceElement: {
-                faceIndex: faceId,
-                faceType: 1
-            }
-        }
-    }
-
-    static ark(data: any): SendArkElement {
-        return {
-            elementType: ElementType.ARK,
-            elementId: "",
-            arkElement: {
-                bytesData: data,
-                linkInfo: null,
-                subElementType: null
-            }
-        }
-    }
-}

src/ntqqapi/core.ts

@@ -0,0 +1,263 @@
+import { unlink } from 'node:fs/promises'
+import { Service, Context } from 'cordis'
+import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
+import { Config as LLOBConfig } from '../common/types'
+import { isNumeric } from '../common/utils/misc'
+import { NTMethod } from './ntcall'
+import {
+  RawMessage,
+  GroupNotify,
+  FriendRequestNotify,
+  FriendRequest,
+  GroupMember,
+  CategoryFriend,
+  SimpleInfo,
+  ChatType,
+  BuddyReqType,
+  GrayTipElementSubType
+} from './types'
+import { selfInfo } from '../common/globalVars'
+import { version } from '../version'
+import { invoke } from './ntcall'
+import { Native } from './native/crychic'
+
+declare module 'cordis' {
+  interface Context {
+    app: Core
+  }
+  interface Events {
+    'nt/message-created': (input: RawMessage) => void
+    'nt/message-deleted': (input: RawMessage) => void
+    'nt/message-sent': (input: RawMessage) => void
+    'nt/group-notify': (input: { notify: GroupNotify, doubt: boolean }) => void
+    'nt/friend-request': (input: FriendRequest) => void
+    'nt/group-member-info-updated': (input: { groupCode: string, members: GroupMember[] }) => void
+    'nt/system-message-created': (input: Uint8Array) => void
+  }
+}
+
+class Core extends Service {
+  static inject = ['ntMsgApi', 'ntFriendApi', 'ntGroupApi', 'store']
+  public startTime = 0
+  public native
+
+  constructor(protected ctx: Context, public config: Core.Config) {
+    super(ctx, 'app', true)
+    this.native = new Native(ctx)
+  }
+
+  public start() {
+    this.startTime = Date.now()
+    this.registerListener()
+    this.ctx.logger.info(`LLOneBot/${version}`)
+    this.ctx.on('llob/config-updated', input => {
+      Object.assign(this.config, input)
+    })
+  }
+
+  private registerListener() {
+    registerReceiveHook<{
+      data?: CategoryFriend[]
+      userSimpleInfos?: Map<string, SimpleInfo> //V2
+      buddyCategory?: CategoryFriend[] //V2
+    }>(ReceiveCmdS.FRIENDS, (payload) => {
+      let uids: string[] = []
+      if (payload.buddyCategory) {
+        uids = payload.buddyCategory.flatMap(item => item.buddyUids)
+      } else if (payload.data) {
+        uids = payload.data.flatMap(item => item.buddyList.map(e => e.uid))
+      }
+      for (const uid of uids) {
+        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.C2C })
+      }
+      this.ctx.logger.info('好友列表变动', uids.length)
+    })
+
+    // 自动清理新消息文件
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+      if (!this.config.autoDeleteFile) {
+        return
+      }
+      for (const message of payload.msgList) {
+        for (const msgElement of message.elements) {
+          setTimeout(() => {
+            const picPath = msgElement.picElement?.sourcePath
+            const picThumbPath = [...(msgElement.picElement?.thumbPath ?? []).values()]
+            const pttPath = msgElement.pttElement?.filePath
+            const filePath = msgElement.fileElement?.filePath
+            const videoPath = msgElement.videoElement?.filePath
+            const videoThumbPath = [...(msgElement.videoElement?.thumbPath ?? []).values()]
+            const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
+            if (msgElement.picElement) {
+              pathList.push(...Object.values(msgElement.picElement.thumbPath))
+            }
+            for (const path of pathList) {
+              if (path) {
+                unlink(path).then(() => this.ctx.logger.info('删除文件成功', path))
+              }
+            }
+          }, this.config.autoDeleteFileSecond! * 1000)
+        }
+      }
+    })
+
+    registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
+      Object.assign(selfInfo, { online: info.info.status !== 20 })
+    })
+
+    const activatedPeerUids: string[] = []
+    registerReceiveHook<{
+      changedRecentContactLists: {
+        listType: number
+        sortedContactList: string[]
+        changedList: {
+          id: string // peerUid
+          chatType: ChatType
+        }[]
+      }[]
+    }>(ReceiveCmdS.RECENT_CONTACT, async (payload) => {
+      for (const recentContact of payload.changedRecentContactLists) {
+        for (const contact of recentContact.changedList) {
+          if (activatedPeerUids.includes(contact.id)) continue
+          activatedPeerUids.push(contact.id)
+          const peer = { peerUid: contact.id, chatType: contact.chatType }
+          if (contact.chatType === ChatType.TempC2CFromGroup) {
+            this.ctx.ntMsgApi.activateChatAndGetHistory(peer, 2).then(res => {
+              for (const msg of res.msgList) {
+                if (Date.now() / 1000 - Number(msg.msgTime) > 3) {
+                  continue
+                }
+                if (msg.senderUin && msg.senderUin !== '0') {
+                  this.ctx.store.addMsgCache(msg)
+                }
+                this.ctx.parallel('nt/message-created', msg)
+              }
+            })
+          } else {
+            this.ctx.ntMsgApi.activateChat(peer)
+          }
+        }
+      }
+    })
+
+    registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
+      const peerUid = payload[0] as string
+      this.ctx.logger.info('激活的聊天窗口被删除，准备重新激活', peerUid)
+      let chatType = ChatType.C2C
+      if (isNumeric(peerUid)) {
+        chatType = ChatType.Group
+      }
+      else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
+        chatType = ChatType.TempC2CFromGroup
+      }
+      const peer = { peerUid, chatType }
+      await this.ctx.sleep(1000)
+      this.ctx.ntMsgApi.activateChat(peer).then((r) => {
+        this.ctx.logger.info('重新激活聊天窗口', peer, { result: r.result, errMsg: r.errMsg })
+      })
+    })
+
+    registerReceiveHook<{
+      groupCode: string
+      dataSource: number
+      members: Set<GroupMember>
+    }>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
+      const groupCode = payload.groupCode
+      const members = Array.from(payload.members.values())
+      this.ctx.parallel('nt/group-member-info-updated', { groupCode, members })
+    })
+
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
+      const startTime = this.startTime / 1000
+      for (const message of payload.msgList) {
+        // 过滤启动之前的消息
+        if (parseInt(message.msgTime) < startTime) {
+          continue
+        }
+        if (message.senderUin && message.senderUin !== '0') {
+          this.ctx.store.addMsgCache(message)
+        }
+        this.ctx.parallel('nt/message-created', message)
+      }
+    })
+
+    const sentMsgIds = new Map<string, boolean>()
+    const recallMsgIds: string[] = [] // 避免重复上报
+
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.UPDATE_MSG], payload => {
+      for (const msg of payload.msgList) {
+        if (
+          msg.recallTime !== '0' &&
+          msg.msgType === 5 &&
+          msg.subMsgType === 4 &&
+          msg.elements[0]?.grayTipElement?.subElementType === GrayTipElementSubType.Revoke &&
+          !recallMsgIds.includes(msg.msgId)
+        ) {
+          recallMsgIds.shift()
+          recallMsgIds.push(msg.msgId)
+          this.ctx.parallel('nt/message-deleted', msg)
+        } else if (sentMsgIds.get(msg.msgId)) {
+          if (msg.sendStatus === 2) {
+            sentMsgIds.delete(msg.msgId)
+            this.ctx.parallel('nt/message-sent', msg)
+          }
+        }
+      }
+    })
+
+    registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
+      sentMsgIds.set(payload.msgRecord.msgId, true)
+    })
+
+    const groupNotifyIgnore: string[] = []
+    registerReceiveHook<{
+      doubt: boolean
+      oldestUnreadSeq: string
+      unreadCount: number
+    }>(ReceiveCmdS.UNREAD_GROUP_NOTIFY, async (payload) => {
+      if (payload.unreadCount) {
+        let notifies: GroupNotify[]
+        try {
+          notifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(payload.doubt, payload.unreadCount)
+        } catch (e) {
+          return
+        }
+        for (const notify of notifies) {
+          const notifyTime = Math.trunc(+notify.seq / 1000)
+          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startTime) {
+            continue
+          }
+          groupNotifyIgnore.push(notify.seq)
+          this.ctx.parallel('nt/group-notify', { notify, doubt: payload.doubt })
+        }
+      }
+    })
+
+    registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
+      for (const req of payload.data.buddyReqs) {
+        if (!!req.isInitiator || (req.isDecide && req.reqType !== BuddyReqType.MeInitiatorWaitPeerConfirm)) {
+          continue
+        }
+        if (+req.reqTime < this.startTime / 1000) {
+          continue
+        }
+        this.ctx.parallel('nt/friend-request', req)
+      }
+    })
+
+    invoke('nodeIKernelMsgListener/onRecvSysMsg', [], { registerEvent: true })
+
+    registerReceiveHook<{
+      msgBuf: number[]
+    }>('nodeIKernelMsgListener/onRecvSysMsg', payload => {
+      this.ctx.parallel('nt/system-message-created', Uint8Array.from(payload.msgBuf))
+    })
+  }
+}
+
+namespace Core {
+  export interface Config extends LLOBConfig {
+  }
+}
+
+export default Core

src/ntqqapi/entities.ts

@@ -0,0 +1,352 @@
+import ffmpeg from 'fluent-ffmpeg'
+import faceConfig from './helper/face_config.json'
+import pathLib from 'node:path'
+import {
+  AtType,
+  ElementType,
+  FaceIndex,
+  PicType,
+  SendArkElement,
+  SendFaceElement,
+  SendFileElement,
+  SendMarketFaceElement,
+  SendPicElement,
+  SendPttElement,
+  SendReplyElement,
+  SendTextElement,
+  SendVideoElement,
+} from './types'
+import { stat, writeFile, copyFile, unlink, access } from 'node:fs/promises'
+import { calculateFileMD5 } from '../common/utils/file'
+import { defaultVideoThumb, getVideoInfo } from '../common/utils/video'
+import { encodeSilk } from '../common/utils/audio'
+import { Context } from 'cordis'
+import { isNullable } from 'cosmokit'
+
+export namespace SendElement {
+  export function text(content: string): SendTextElement {
+    return {
+      elementType: ElementType.Text,
+      elementId: '',
+      textElement: {
+        content,
+        atType: AtType.Unknown,
+        atUid: '',
+        atTinyId: '',
+        atNtUid: '',
+      },
+    }
+  }
+
+  export function at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
+    return {
+      elementType: ElementType.Text,
+      elementId: '',
+      textElement: {
+        content: display,
+        atType,
+        atUid,
+        atTinyId: '',
+        atNtUid,
+      },
+    }
+  }
+
+  export function reply(msgSeq: string, msgId: string, senderUin: string): SendReplyElement {
+    return {
+      elementType: ElementType.Reply,
+      elementId: '',
+      replyElement: {
+        replayMsgSeq: msgSeq,
+        replayMsgId: msgId,
+        senderUin: senderUin,
+        senderUinStr: senderUin,
+      },
+    }
+  }
+
+  export async function pic(ctx: Context, picPath: string, summary = '', subType: 0 | 1 = 0, isFlashPic?: boolean): Promise<SendPicElement> {
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.Pic, subType)
+    if (fileSize === 0) {
+      throw '文件异常，大小为 0'
+    }
+    const imageSize = await ctx.ntFileApi.getImageSize(picPath)
+    const picElement = {
+      md5HexStr: md5,
+      fileSize: fileSize.toString(),
+      picWidth: imageSize.width,
+      picHeight: imageSize.height,
+      fileName: fileName,
+      sourcePath: path,
+      original: true,
+      picType: imageSize.type === 'gif' ? PicType.GIF : PicType.JPEG,
+      picSubType: subType,
+      fileUuid: '',
+      fileSubId: '',
+      thumbFileSize: 0,
+      summary,
+      isFlashPic,
+    }
+    ctx.logger.info('图片信息', picElement)
+    return {
+      elementType: ElementType.Pic,
+      elementId: '',
+      picElement,
+    }
+  }
+
+  export async function file(ctx: Context, filePath: string, fileName: string, folderId = ''): Promise<SendFileElement> {
+    const fileSize = (await stat(filePath)).size.toString()
+    if (fileSize === '0') {
+      ctx.logger.warn(`文件${fileName}异常，大小为 0`)
+      throw new Error('文件异常，大小为 0')
+    }
+    const element: SendFileElement = {
+      elementType: ElementType.File,
+      elementId: '',
+      fileElement: {
+        fileName,
+        folderId,
+        filePath,
+        fileSize,
+      },
+    }
+    return element
+  }
+
+  export async function video(ctx: Context, filePath: string, fileName = '', diyThumbPath = ''): Promise<SendVideoElement> {
+    await access(filePath)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.Video)
+
+    if (fileSize === 0) {
+      throw new Error('文件异常，大小为 0')
+    }
+    const maxMB = 100
+    if (fileSize > 1024 * 1024 * maxMB) {
+      throw new Error(`视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`)
+    }
+    const thumbDir = pathLib.dirname(path.replaceAll('\\', '/').replace(`/Ori/`, `/Thumb/`))
+    let videoInfo = {
+      width: 1920,
+      height: 1080,
+      time: 15,
+      format: 'mp4',
+      size: fileSize,
+      filePath,
+    }
+    try {
+      videoInfo = await getVideoInfo(ctx, path)
+      ctx.logger.info('视频信息', videoInfo)
+    } catch (e) {
+      ctx.logger.info('获取视频信息失败', e)
+    }
+    const createThumb = new Promise<string>((resolve, reject) => {
+      const thumbFileName = `${md5}_0.png`
+      const thumbPath = pathLib.join(thumbDir, thumbFileName)
+      ctx.logger.info('开始生成视频缩略图', filePath)
+      let completed = false
+
+      function useDefaultThumb() {
+        if (completed) return
+        ctx.logger.info('获取视频封面失败，使用默认封面')
+        writeFile(thumbPath, defaultVideoThumb)
+          .then(() => {
+            resolve(thumbPath)
+          })
+          .catch(reject)
+      }
+
+      setTimeout(useDefaultThumb, 5000)
+      ffmpeg(filePath)
+        .on('error', () => {
+          if (diyThumbPath) {
+            copyFile(diyThumbPath, thumbPath)
+              .then(() => {
+                completed = true
+                resolve(thumbPath)
+              })
+              .catch(reject)
+          } else {
+            useDefaultThumb()
+          }
+        })
+        .screenshots({
+          timestamps: [0],
+          filename: thumbFileName,
+          folder: thumbDir,
+          size: videoInfo.width + 'x' + videoInfo.height,
+        })
+        .on('end', () => {
+          ctx.logger.info('生成视频缩略图', thumbPath)
+          completed = true
+          resolve(thumbPath)
+        })
+    })
+    const thumbPath = new Map()
+    const _thumbPath = await createThumb
+    ctx.logger.info('生成视频缩略图', _thumbPath)
+    const thumbSize = (await stat(_thumbPath)).size
+    thumbPath.set(0, _thumbPath)
+    const thumbMd5 = await calculateFileMD5(_thumbPath)
+    const element: SendVideoElement = {
+      elementType: ElementType.Video,
+      elementId: '',
+      videoElement: {
+        fileName: fileName || _fileName,
+        filePath: path,
+        videoMd5: md5,
+        thumbMd5,
+        fileTime: videoInfo.time,
+        thumbPath: thumbPath,
+        thumbSize,
+        thumbWidth: videoInfo.width,
+        thumbHeight: videoInfo.height,
+        fileSize: String(fileSize),
+      },
+    }
+    ctx.logger.info('videoElement', element)
+    return element
+  }
+
+  export async function ptt(ctx: Context, pttPath: string): Promise<SendPttElement> {
+    const { converted, path: silkPath, duration } = await encodeSilk(ctx, pttPath)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.Ptt)
+    if (fileSize === 0) {
+      throw new Error('文件异常，大小为 0')
+    }
+    if (converted) {
+      unlink(silkPath)
+    }
+    return {
+      elementType: ElementType.Ptt,
+      elementId: '',
+      pttElement: {
+        fileName: fileName,
+        filePath: path,
+        md5HexStr: md5,
+        fileSize: String(fileSize),
+        duration: duration,
+        formatType: 1,
+        voiceType: 1,
+        voiceChangeType: 0,
+        canConvert2Text: true,
+        waveAmplitudes: [0, 18, 9, 23, 16, 17, 16, 15, 44, 17, 24, 20, 14, 15, 17],
+        fileSubId: '',
+        playState: 1,
+        autoConvertText: 0,
+      },
+    }
+  }
+
+  export function face(faceId: number, faceType?: number): SendFaceElement {
+    // 从face_config.json中获取表情名称
+    const sysFaces = faceConfig.sysface
+    const face = sysFaces.find(face => face.QSid === String(faceId))
+    if (!faceType) {
+      if (faceId < 222) {
+        faceType = 1
+      } else {
+        faceType = 2
+      }
+      if (face?.AniStickerType) {
+        faceType = 3
+      }
+    }
+    return {
+      elementType: ElementType.Face,
+      elementId: '',
+      faceElement: {
+        faceIndex: faceId,
+        faceType,
+        faceText: face?.QDes,
+        stickerId: face?.AniStickerId,
+        stickerType: face?.AniStickerType,
+        packId: face?.AniStickerPackId,
+        sourceType: 1,
+      },
+    }
+  }
+
+  export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
+    return {
+      elementType: ElementType.MarketFace,
+      elementId: '',
+      marketFaceElement: {
+        imageWidth: 300,
+        imageHeight: 300,
+        emojiPackageId,
+        emojiId,
+        key,
+        faceName: summary || '[商城表情]',
+      },
+    }
+  }
+
+  export function dice(resultId?: string | number): SendFaceElement {
+    // 实际测试并不能控制结果
+    // 随机1到6
+    if (isNullable(resultId)) resultId = Math.floor(Math.random() * 6) + 1
+    return {
+      elementType: ElementType.Face,
+      elementId: '',
+      faceElement: {
+        faceIndex: FaceIndex.Dice,
+        faceType: 3,
+        faceText: '[骰子]',
+        packId: '1',
+        stickerId: '33',
+        sourceType: 1,
+        stickerType: 2,
+        resultId: resultId.toString(),
+        surpriseId: '',
+        // "randomType": 1,
+      },
+    }
+  }
+
+  // 猜拳(石头剪刀布)表情
+  export function rps(resultId?: string | number): SendFaceElement {
+    // 实际测试并不能控制结果
+    if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
+    return {
+      elementType: ElementType.Face,
+      elementId: '',
+      faceElement: {
+        faceIndex: FaceIndex.RPS,
+        faceText: '[包剪锤]',
+        faceType: 3,
+        packId: '1',
+        stickerId: '34',
+        sourceType: 1,
+        stickerType: 2,
+        resultId: resultId.toString(),
+        surpriseId: '',
+        // "randomType": 1,
+      },
+    }
+  }
+
+  export function ark(data: string): SendArkElement {
+    return {
+      elementType: ElementType.Ark,
+      elementId: '',
+      arkElement: {
+        bytesData: data,
+        linkInfo: null,
+        subElementType: null,
+      },
+    }
+  }
+
+  export function shake(): SendFaceElement {
+    return {
+      elementType: ElementType.Face,
+      elementId: '',
+      faceElement: {
+        faceIndex: 1,
+        faceType: 5,
+        pokeType: 1,
+      },
+    }
+  }
+}

src/ntqqapi/external/ccpoke/index.ts

@@ -1,28 +0,0 @@
-import {log} from "../../../common/utils/log";
-
-let pokeEngine: any = null
-
-type PokeHandler = (id: string, isGroup: boolean)=>void
-
-let pokeRecords: Record<string, number> = {}
-export function registerPokeHandler(handler: PokeHandler){
-    if(!pokeEngine){
-        try {
-            pokeEngine = require("./ccpoke/poke-win32-x64.node")
-            pokeEngine.performHooks();
-        }catch (e) {
-            log("戳一戳引擎加载失败", e)
-            return
-        }
-    }
-    pokeEngine.setHandlerForPokeHook((id: string, isGroup: boolean)=>{
-        let existTime = pokeRecords[id]
-        if (existTime){
-            if (Date.now() - existTime < 1500){
-                return
-            }
-        }
-        pokeRecords[id] = Date.now()
-        handler(id, isGroup);
-    })
-}

src/ntqqapi/helper/rkey.ts

@@ -0,0 +1,48 @@
+import { Context } from 'cordis'
+
+interface ServerRkeyData {
+  group_rkey: string
+  private_rkey: string
+  expired_time: number
+}
+
+export class RkeyManager {
+  private serverUrl: string = ''
+  private rkeyData: ServerRkeyData = {
+    group_rkey: '',
+    private_rkey: '',
+    expired_time: 0
+  }
+
+  constructor(protected ctx: Context, serverUrl: string) {
+    this.serverUrl = serverUrl
+  }
+
+  async getRkey() {
+    if (this.isExpired()) {
+      try {
+        await this.refreshRkey()
+      } catch (e) {
+        this.ctx.logger.error('获取rkey失败', e)
+      }
+    }
+    return this.rkeyData
+  }
+
+  isExpired(): boolean {
+    const now = new Date().getTime() / 1000
+    return now > this.rkeyData.expired_time
+  }
+
+  async refreshRkey() {
+    this.rkeyData = await this.fetchServerRkey()
+  }
+
+  async fetchServerRkey(): Promise<ServerRkeyData> {
+    const response = await fetch(this.serverUrl)
+    if (!response.ok) {
+      throw new Error(response.statusText)
+    }
+    return response.json()
+  }
+}

src/ntqqapi/hook.ts

@@ -1,408 +1,134 @@
-import {BrowserWindow} from 'electron';
-import {NTQQApiClass} from "./ntcall";
-import {NTQQMsgApi, sendMessagePool} from "./api/msg"
-import {ChatType, Group, GroupMember, RawMessage, User} from "./types";
-import {friends, getGroupMember, groups, selfInfo, tempGroupCodeMap, uidMaps} from "../common/data";
-import {OB11GroupDecreaseEvent} from "../onebot11/event/notice/OB11GroupDecreaseEvent";
-import {v4 as uuidv4} from "uuid"
-import {postOB11Event} from "../onebot11/server/postOB11Event";
-import {getConfigUtil, HOOK_LOG} from "../common/config";
-import fs from "fs";
-import {dbUtil} from "../common/db";
-import {NTQQGroupApi} from "./api/group";
-import {log} from "../common/utils/log";
-import {sleep} from "../common/utils/helper";
-import {OB11GroupCardEvent} from "../onebot11/event/notice/OB11GroupCardEvent";
+import { NTMethod } from './ntcall'
+import { log } from '@/common/utils'
+import { randomUUID } from 'node:crypto'
+import { ipcMain } from 'electron'
+import { Dict } from 'cosmokit'
 
-export let hookApiCallbacks: Record<string, (apiReturn: any) => void> = {}
+export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
-export let ReceiveCmdS = {
-    UPDATE_MSG: "nodeIKernelMsgListener/onMsgInfoListUpdate",
-    UPDATE_ACTIVE_MSG: "nodeIKernelMsgListener/onActiveMsgInfoUpdate",
-    NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
-    NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
-    SELF_SEND_MSG: "nodeIKernelMsgListener/onAddSendMsg",
-    USER_INFO: "nodeIKernelProfileListener/onProfileSimpleChanged",
-    USER_DETAIL_INFO: "nodeIKernelProfileListener/onProfileDetailInfoChanged",
-    GROUPS: "nodeIKernelGroupListener/onGroupListUpdate",
-    GROUPS_STORE: "onGroupListUpdate",
-    GROUP_MEMBER_INFO_UPDATE: "nodeIKernelGroupListener/onMemberInfoChange",
-    FRIENDS: "onBuddyListChange",
-    MEDIA_DOWNLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaDownloadComplete",
-    UNREAD_GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated",
-    GROUP_NOTIFY: "nodeIKernelGroupListener/onGroupSingleScreenNotifies",
-    FRIEND_REQUEST: "nodeIKernelBuddyListener/onBuddyReqChange",
-    SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
-    CACHE_SCAN_FINISH: "nodeIKernelStorageCleanListener/onFinishScan",
-    MEDIA_UPLOAD_COMPLETE: "nodeIKernelMsgListener/onRichMediaUploadComplete",
-    SKEY_UPDATE: "onSkeyUpdate"
+export enum ReceiveCmdS {
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
+  FRIENDS = 'onBuddyListChange',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
 }
 
-export type ReceiveCmd = typeof ReceiveCmdS[keyof typeof ReceiveCmdS]
+const logHook = false
 
-interface NTQQApiReturnData<PayloadType = unknown> extends Array<any> {
-    0: {
-        "type": "request",
-        "eventName": NTQQApiClass,
-        "callbackId"?: string
-    },
-    1:
-        {
-            cmdName: ReceiveCmd,
-            cmdType: "event",
-            payload: PayloadType
-        }[]
-}
+const receiveHooks: Map<string, {
+  method: ReceiveCmdS[]
+  hookFunc: (payload: any) => void | Promise<void>
+}> = new Map()
 
-let receiveHooks: Array<{
-    method: ReceiveCmd[],
-    hookFunc: ((payload: any) => void | Promise<void>)
-    id: string
+const callHooks: Array<{
+  method: NTMethod[]
+  hookFunc: (callParams: unknown[]) => void | Promise<void>
 }> = []
 
-export function hookNTQQApiReceive(window: BrowserWindow) {
-    const originalSend = window.webContents.send;
-    const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
-        // console.log("hookNTQQApiReceive", channel, args)
-        let isLogger = false
-        try {
-            isLogger = args[0]?.eventName?.startsWith("ns-LoggerApi")
-        } catch (e) {
+export function startHook() {
+  log('start hook')
 
-        }
-        if (!isLogger) {
-            try {
-                HOOK_LOG && log(`received ntqq api message: ${channel}`, args)
-            }catch (e) {
-                log("hook log error", e, args)
+  const senderExclude = Symbol()
+
+  ipcMain.emit = new Proxy(ipcMain.emit, {
+    apply(target, thisArg, args: [channel: string, ...args: any]) {
+      if (args[2]?.eventName?.startsWith('ns-LoggerApi')) {
+        return target.apply(thisArg, args)
+      }
+      if (logHook) {
+        log('request', args)
+      }
+      const event = args[1]
+      if (event.sender && !event.sender[senderExclude]) {
+        event.sender[senderExclude] = true
+        event.sender.send = new Proxy(event.sender.send, {
+          apply(target, thisArg, args: [channel: string, meta: Dict, data: Dict[]]) {
+            if (args[1]?.eventName?.startsWith('ns-LoggerApi')) {
+              return target.apply(thisArg, args)
             }
-        }
-        try {
-            if (args?.[1] instanceof Array) {
-                for (let receiveData of args?.[1]) {
-                    const ntQQApiMethodName = receiveData.cmdName;
-                    // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
-                    for (let hook of receiveHooks) {
-                        if (hook.method.includes(ntQQApiMethodName)) {
-                            new Promise((resolve, reject) => {
-                                try {
-                                    let _ = hook.hookFunc(receiveData.payload)
-                                    if (hook.hookFunc.constructor.name === "AsyncFunction") {
-                                        (_ as Promise<void>).then()
-                                    }
-                                } catch (e) {
-                                    log("hook error", e, receiveData.payload)
-                                }
-                            }).then()
-                        }
+            if (logHook) {
+              log('received', args)
+            }
+
+            const callbackId = args[1]?.callbackId
+            if (callbackId) {
+              if (hookApiCallbacks[callbackId]) {
+                Promise.resolve(hookApiCallbacks[callbackId](args[2]))
+                delete hookApiCallbacks[callbackId]
+              }
+            } else if (args[2]) {
+              if (['IPC_DOWN_2', 'IPC_DOWN_3'].includes(args[0])) {
+                for (const receiveData of args[2]) {
+                  for (const hook of receiveHooks.values()) {
+                    if (hook.method.includes(receiveData.cmdName)) {
+                      Promise.resolve(hook.hookFunc(receiveData.payload))
                     }
+                  }
                 }
+              }
             }
-            if (args[0]?.callbackId) {
-                // log("hookApiCallback", hookApiCallbacks, args)
-                const callbackId = args[0].callbackId;
-                if (hookApiCallbacks[callbackId]) {
-                    // log("callback found")
-                    new Promise((resolve, reject) => {
-                        hookApiCallbacks[callbackId](args[1]);
-                    }).then()
-                    delete hookApiCallbacks[callbackId];
-                }
-            }
-        }catch (e) {
-            log("hookNTQQApiReceive error", e.stack.toString(), args)
+            return target.apply(thisArg, args)
+          }
+        })
+      }
+
+      if (args[3]?.length) {
+        const method = args[3][0]
+        const callParams = args[3].slice(1)
+        for (const hook of callHooks) {
+          if (hook.method.includes(method)) {
+            Promise.resolve(hook.hookFunc(callParams))
+          }
         }
-        originalSend.call(window.webContents, channel, ...args);
-    }
-    window.webContents.send = patchSend;
+      }
+      return target.apply(thisArg, args)
+    },
+  })
 }
 
-export function hookNTQQApiCall(window: BrowserWindow) {
-    // 监听调用NTQQApi
-    let webContents = window.webContents as any;
-    const ipc_message_proxy = webContents._events["-ipc-message"]?.[0] || webContents._events["-ipc-message"];
-
-    const proxyIpcMsg = new Proxy(ipc_message_proxy, {
-        apply(target, thisArg, args) {
-            // console.log(thisArg, args);
-            let isLogger = false
-            try {
-                isLogger = args[3][0].eventName.startsWith("ns-LoggerApi")
-            } catch (e) {
-
-            }
-            if (!isLogger) {
-                try{
-                    HOOK_LOG && log("call NTQQ api", thisArg, args);
-                }catch (e) {
-                    
-                }
-            }
-            return target.apply(thisArg, args);
-        },
-    });
-    if (webContents._events["-ipc-message"]?.[0]) {
-        webContents._events["-ipc-message"][0] = proxyIpcMsg;
-    } else {
-        webContents._events["-ipc-message"] = proxyIpcMsg;
-    }
-
-    const ipc_invoke_proxy = webContents._events["-ipc-invoke"]?.[0] || webContents._events["-ipc-invoke"];
-    const proxyIpcInvoke = new Proxy(ipc_invoke_proxy, {
-        apply(target, thisArg, args) {
-            // console.log(args);
-            HOOK_LOG && log("call NTQQ invoke api", thisArg, args)
-            args[0]["_replyChannel"]["sendReply"] = new Proxy(args[0]["_replyChannel"]["sendReply"], {
-                apply(sendtarget, sendthisArg, sendargs) {
-                    sendtarget.apply(sendthisArg, sendargs);
-                }
-            });
-            let ret = target.apply(thisArg, args);
-            try {
-                HOOK_LOG && log("call NTQQ invoke api return", ret)
-            }catch (e) {
-                
-            }
-            return ret;
-        }
-    });
-    if (webContents._events["-ipc-invoke"]?.[0]) {
-        webContents._events["-ipc-invoke"][0] = proxyIpcInvoke;
-    } else {
-        webContents._events["-ipc-invoke"] = proxyIpcInvoke;
-    }
+export function registerReceiveHook<PayloadType>(
+  method: string | string[],
+  hookFunc: (payload: PayloadType) => void,
+): string {
+  const id = randomUUID()
+  if (!Array.isArray(method)) {
+    method = [method]
+  }
+  receiveHooks.set(id, {
+    method: method as ReceiveCmdS[],
+    hookFunc,
+  })
+  return id
 }
 
-export function registerReceiveHook<PayloadType>(method: ReceiveCmd | ReceiveCmd[], hookFunc: (payload: PayloadType) => void): string {
-    const id = uuidv4()
-    if (!Array.isArray(method)) {
-        method = [method]
-    }
-    receiveHooks.push({
-        method,
-        hookFunc,
-        id
-    })
-    return id;
+export function registerCallHook(
+  method: NTMethod | NTMethod[],
+  hookFunc: (callParams: unknown[]) => void | Promise<void>,
+): void {
+  if (!Array.isArray(method)) {
+    method = [method]
+  }
+  callHooks.push({
+    method,
+    hookFunc,
+  })
 }
 
 export function removeReceiveHook(id: string) {
-    const index = receiveHooks.findIndex(h => h.id === id)
-    receiveHooks.splice(index, 1);
+  receiveHooks.delete(id)
 }
-
-let activatedGroups: string[] = [];
-async function updateGroups(_groups: Group[], needUpdate: boolean = true) {
-    for (let group of _groups) {
-        log("update group", group)
-        if (!activatedGroups.includes(group.groupCode)) {
-            NTQQMsgApi.activateGroupChat(group.groupCode).then((r) => {
-                activatedGroups.push(group.groupCode);
-                // log(`激活群聊天窗口${group.groupName}(${group.groupCode})`, r)
-                // if (r.result !== 0) {
-                //     setTimeout(() => NTQQMsgApi.activateGroupChat(group.groupCode).then(r => log(`再次激活群聊天窗口${group.groupName}(${group.groupCode})`, r)), 500);
-                // }else {
-                // }
-            }).catch(log)
-        }
-        let existGroup = groups.find(g => g.groupCode == group.groupCode);
-        if (existGroup) {
-            Object.assign(existGroup, group);
-        } else {
-            groups.push(group);
-            existGroup = group;
-        }
-
-        if (needUpdate) {
-            const members = await NTQQGroupApi.getGroupMembers(group.groupCode);
-
-            if (members) {
-                existGroup.members = members;
-            }
-        }
-    }
-}
-
-async function processGroupEvent(payload: {groupList: Group[]}) {
-    try {
-        const newGroupList = payload.groupList;
-        for (const group of newGroupList) {
-            let existGroup = groups.find(g => g.groupCode == group.groupCode);
-            if (existGroup) {
-                if (existGroup.memberCount > group.memberCount) {
-                    log(`群(${group.groupCode})成员数量减少${existGroup.memberCount} -> ${group.memberCount}`);
-                    const oldMembers = existGroup.members;
-
-                    await sleep(200);  // 如果请求QQ API的速度过快，通常无法正确拉取到最新的群信息，因此这里人为引入一个延时
-                    const newMembers = await NTQQGroupApi.getGroupMembers(group.groupCode);
-
-                    group.members = newMembers;
-                    const newMembersSet = new Set<string>();  // 建立索引降低时间复杂度
-
-                    for (const member of newMembers) {
-                        newMembersSet.add(member.uin);
-                    }
-
-                    for (const member of oldMembers) {
-                        if (!newMembersSet.has(member.uin) && member.uin != selfInfo.uin) {
-                            postOB11Event(new OB11GroupDecreaseEvent(parseInt(group.groupCode), parseInt(member.uin), parseInt(member.uin), "leave"));
-                            break;
-                        }
-                    }
-                }
-
-            }
-        }
-
-        updateGroups(newGroupList, false).then();
-    } catch (e) {
-        updateGroups(payload.groupList).then();
-        log("更新群信息错误", e.stack.toString());
-    }
-}
-
-// 群列表变动
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS, (payload) => {
-    // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动", payload.updateType, payload.groupList)
-    if (payload.updateType != 2) {
-        updateGroups(payload.groupList).then();
-    } else {
-        if (process.platform == "win32") {
-            processGroupEvent(payload).then();
-        }
-    }
-})
-registerReceiveHook<{ groupList: Group[], updateType: number }>(ReceiveCmdS.GROUPS_STORE, (payload) => {
-    // updateType 3是群列表变动，2是群成员变动
-    // log("群列表变动", payload.updateType, payload.groupList)
-    if (payload.updateType != 2) {
-        updateGroups(payload.groupList).then();
-    } else {
-        if (process.platform != "win32") {
-            processGroupEvent(payload).then();
-        }
-    }
-})
-
-registerReceiveHook<{groupCode: string, dataSource: number, members: Set<GroupMember>}>(ReceiveCmdS.GROUP_MEMBER_INFO_UPDATE, async (payload) => {
-    const groupCode = payload.groupCode;
-    const members = Array.from(payload.members.values());
-    // log("群成员信息变动", groupCode, members)
-    for(const member of members) {
-        const existMember = await getGroupMember(groupCode, member.uin);
-        if (existMember){
-            Object.assign(existMember, member);
-        }
-    }
-    // const existGroup = groups.find(g => g.groupCode == groupCode);
-    // if (existGroup) {
-    //     log("对比群成员", existGroup.members, members)
-    //     for (const member of members) {
-    //         const existMember = existGroup.members.find(m => m.uin == member.uin);
-    //         if (existMember) {
-    //             log("对比群名片", existMember.cardName, member.cardName)
-    //             if (existMember.cardName != member.cardName) {
-    //                 postOB11Event(new OB11GroupCardEvent(parseInt(existGroup.groupCode), parseInt(member.uin), member.cardName, existMember.cardName));
-    //             }
-    //             Object.assign(existMember, member);
-    //         }
-    //     }
-    // }
-})
-
-// 好友列表变动
-registerReceiveHook<{
-    data: { categoryId: number, categroyName: string, categroyMbCount: number, buddyList: User[] }[]
-}>(ReceiveCmdS.FRIENDS, payload => {
-    for (const fData of payload.data) {
-        const _friends = fData.buddyList;
-        for (let friend of _friends) {
-            let existFriend = friends.find(f => f.uin == friend.uin)
-            if (!existFriend) {
-                friends.push(friend)
-            } else {
-                Object.assign(existFriend, friend)
-            }
-        }
-    }
-})
-
-registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
-    // 保存一下uid
-    for (const message of payload.msgList) {
-        const uid = message.senderUid;
-        const uin = message.senderUin;
-        if (uid && uin) {
-            if (message.chatType === ChatType.temp){
-                dbUtil.getReceivedTempUinMap().then(receivedTempUinMap=>{
-                    if (!receivedTempUinMap[uin]){
-                        receivedTempUinMap[uin] = uid;
-                        dbUtil.setReceivedTempUinMap(receivedTempUinMap)
-                    }
-                })
-            }
-            uidMaps[uid] = uin;
-        }
-    }
-
-
-    // 自动清理新消息文件
-    const {autoDeleteFile} = getConfigUtil().getConfig();
-    if (!autoDeleteFile) {
-        return
-    }
-    for (const message of payload.msgList) {
-        // log("收到新消息，push到历史记录", message.msgId)
-        // dbUtil.addMsg(message).then()
-        // 清理文件
-
-        for (const msgElement of message.elements) {
-            setTimeout(() => {
-                const picPath = msgElement.picElement?.sourcePath
-                const picThumbPath = [...msgElement.picElement?.thumbPath.values()]
-                const pttPath = msgElement.pttElement?.filePath
-                const filePath = msgElement.fileElement?.filePath
-                const videoPath = msgElement.videoElement?.filePath
-                const videoThumbPath: string[] = [...msgElement.videoElement?.thumbPath.values()]
-                const pathList = [picPath, ...picThumbPath, pttPath, filePath, videoPath, ...videoThumbPath]
-                if (msgElement.picElement) {
-                    pathList.push(...Object.values(msgElement.picElement.thumbPath))
-                }
-                const aioOpGrayTipElement = msgElement.grayTipElement?.aioOpGrayTipElement
-                if (aioOpGrayTipElement) {
-                    tempGroupCodeMap[aioOpGrayTipElement.peerUid] = aioOpGrayTipElement.fromGrpCodeOfTmpChat;
-                }
-
-                // log("需要清理的文件", pathList);
-                for (const path of pathList) {
-                    if (path) {
-                        fs.unlink(picPath, () => {
-                            log("删除文件成功", path)
-                        });
-                    }
-                }
-            }, getConfigUtil().getConfig().autoDeleteFileSecond * 1000)
-        }
-    }
-})
-
-registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, ({msgRecord}) => {
-    const message = msgRecord;
-    const peerUid = message.peerUid;
-    // log("收到自己发送成功的消息", Object.keys(sendMessagePool), message);
-    // log("收到自己发送成功的消息", message.msgId, message.msgSeq);
-    dbUtil.addMsg(message).then()
-    const sendCallback = sendMessagePool[peerUid]
-    if (sendCallback) {
-        try {
-            sendCallback(message);
-        } catch (e) {
-            log("receive self msg error", e.stack)
-        }
-    }
-})
-
-registerReceiveHook<{ info: { status: number } }>(ReceiveCmdS.SELF_STATUS, (info) => {
-    selfInfo.online = info.info.status !== 20
-})

src/ntqqapi/native/crychic/index.ts

@@ -0,0 +1,99 @@
+import { Context } from 'cordis'
+import { Dict } from 'cosmokit'
+import { getBuildVersion } from '../../../common/utils/misc'
+import { TEMP_DIR } from '../../../common/globalVars'
+import { copyFile } from 'fs/promises'
+import { ChatType, Peer } from '../../types'
+import path from 'node:path'
+import addon from './external/crychic-win32-x64.node?asset'
+
+export class Native {
+  public activated = false
+  private crychic?: Dict
+  private seq = 0
+  private cb: Map<number, (res: any) => void> = new Map()
+
+  constructor(private ctx: Context) {
+    ctx.on('ready', () => {
+      this.start()
+    })
+  }
+
+  checkPlatform() {
+    return process.platform === 'win32' && process.arch === 'x64'
+  }
+
+  checkVersion() {
+    const version = getBuildVersion()
+    // 27333—27597
+    return version >= 27333 && version < 28060
+  }
+
+  async start() {
+    if (this.crychic) {
+      return
+    }
+    if (!this.checkPlatform()) {
+      return
+    }
+    if (!this.checkVersion()) {
+      return
+    }
+    const handler = async (name: string, ...e: unknown[]) => {
+      if (name === 'cb') {
+        this.cb.get(e[0] as number)?.(e[1])
+      }
+    }
+    try {
+      const fileName = path.basename(addon)
+      const dest = path.join(TEMP_DIR, fileName)
+      try {
+        await copyFile(addon, dest)
+      } catch (e) {
+        // resource busy or locked?
+        this.ctx.logger.warn(e)
+      }
+      this.crychic = require(dest)
+      this.crychic!.setCryHandler(handler)
+      this.crychic!.init()
+      this.activated = true
+    } catch (e) {
+      this.ctx.logger.warn('crychic 加载失败', e)
+    }
+  }
+
+  async sendFriendPoke(uin: number) {
+    if (!this.crychic) return
+    this.crychic.sendFriendPoke(uin)
+    await this.ctx.ntMsgApi.fetchUnitedCommendConfig(['100243'])
+  }
+
+  async sendGroupPoke(groupCode: number, memberUin: number) {
+    if (!this.crychic) return
+    this.crychic.sendGroupPoke(memberUin, groupCode)
+    await this.ctx.ntMsgApi.fetchUnitedCommendConfig(['100243'])
+  }
+
+  uploadForward(peer: Peer, transmit: Uint8Array) {
+    return new Promise<string>(async (resolve, reject) => {
+      if (!this.crychic) return
+      let groupCode = 0
+      const uid = peer.peerUid
+      const isGroup = peer.chatType === ChatType.Group
+      if (isGroup) {
+        groupCode = +uid
+      }
+      const seq = ++this.seq
+      this.cb.set(seq, (resid: string) => {
+        this.cb.delete(seq)
+        resolve(resid)
+      })
+      setTimeout(() => {
+        this.cb.delete(seq)
+        reject(new Error('fake forward timeout'))
+      }, 5000)
+      this.crychic.uploadForward(seq, isGroup, uid, groupCode, transmit)
+      await this.ctx.ntMsgApi.fetchUnitedCommendConfig(['100243'])
+    })
+  }
+}

src/ntqqapi/ntcall.ts

@@ -1,196 +1,202 @@
-import {ipcMain} from "electron";
-import {hookApiCallbacks, ReceiveCmd, ReceiveCmdS, registerReceiveHook, removeReceiveHook} from "./hook";
+import { ipcMain } from 'electron'
+import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
+import { log } from '../common/utils'
+import { randomUUID } from 'node:crypto'
+import {
+  GeneralCallResult,
+  NodeIKernelBuddyService,
+  NodeIKernelProfileService,
+  NodeIKernelGroupService,
+  NodeIKernelProfileLikeService,
+  NodeIKernelMsgService,
+  NodeIKernelMSFService,
+  NodeIKernelUixConvertService,
+  NodeIKernelRichMediaService,
+  NodeIKernelTicketService,
+  NodeIKernelTipOffService,
+  NodeIKernelRobotService,
+  NodeIKernelNodeMiscService
+} from './services'
 
-import {v4 as uuidv4} from "uuid"
-import {log} from "../common/utils/log";
-import {NTQQWindow, NTQQWindowApi, NTQQWindows} from "./api/window";
-import {WebApi} from "./api/webapi";
-import {HOOK_LOG} from "../common/config";
-
-export enum NTQQApiClass {
-    NT_API = "ns-ntApi",
-    FS_API = "ns-FsApi",
-    OS_API = "ns-OsApi",
-    WINDOW_API = "ns-WindowApi",
-    HOTUPDATE_API = "ns-HotUpdateApi",
-    BUSINESS_API = "ns-BusinessApi",
-    GLOBAL_DATA = "ns-GlobalDataApi",
-    SKEY_API = "ns-SkeyApi",
-    GROUP_HOME_WORK = "ns-GroupHomeWork",
-    GROUP_ESSENCE = "ns-GroupEssence",
+export enum NTClass {
+  NT_API = 'ns-ntApi',
+  FS_API = 'ns-FsApi',
+  OS_API = 'ns-OsApi',
+  WINDOW_API = 'ns-WindowApi',
+  HOTUPDATE_API = 'ns-HotUpdateApi',
+  BUSINESS_API = 'ns-BusinessApi',
+  GLOBAL_DATA = 'ns-GlobalDataApi',
+  SKEY_API = 'ns-SkeyApi',
+  GROUP_HOME_WORK = 'ns-GroupHomeWork',
+  GROUP_ESSENCE = 'ns-GroupEssence',
+  NODE_STORE_API = 'ns-NodeStoreApi',
+  QQ_EX_API = 'ns-QQEXApi',
 }
 
-export enum NTQQApiMethod {
-    RECENT_CONTACT = "nodeIKernelRecentContactService/fetchAndSubscribeABatchOfRecentContact",
-    ADD_ACTIVE_CHAT = "nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat",  // 激活群助手内的聊天窗口，这样才能收到消息
-    HISTORY_MSG_998 = "nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat",
-    HISTORY_MSG = "nodeIKernelMsgService/getMsgsIncludeSelf",
-    GET_MULTI_MSG = "nodeIKernelMsgService/getMultiMsg",
+export enum NTMethod {
+  ACTIVE_CHAT_PREVIEW = 'nodeIKernelMsgService/getAioFirstViewLatestMsgsAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回最新预览消息
+  ACTIVE_CHAT_HISTORY = 'nodeIKernelMsgService/getMsgsIncludeSelfAndAddActiveChat', // 激活聊天窗口，有时候必须这样才能收到消息, 并返回历史消息
+  HISTORY_MSG = 'nodeIKernelMsgService/getMsgsIncludeSelf',
+  GET_MULTI_MSG = 'nodeIKernelMsgService/getMultiMsg',
+  DELETE_ACTIVE_CHAT = 'nodeIKernelMsgService/deleteActiveChatByUid',
+  MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
+  RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
+  EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
 
-    LIKE_FRIEND = "nodeIKernelProfileLikeService/setBuddyProfileLike",
-    SELF_INFO = "fetchAuthData",
-    FRIENDS = "nodeIKernelBuddyService/getBuddyList",
-    GROUPS = "nodeIKernelGroupService/getGroupList",
-    GROUP_MEMBER_SCENE = "nodeIKernelGroupService/createMemberListScene",
-    GROUP_MEMBERS = "nodeIKernelGroupService/getNextMemberList",
-    USER_INFO = "nodeIKernelProfileService/getUserSimpleInfo",
-    USER_DETAIL_INFO = "nodeIKernelProfileService/getUserDetailInfo",
-    FILE_TYPE = "getFileType",
-    FILE_MD5 = "getFileMd5",
-    FILE_COPY = "copyFile",
-    IMAGE_SIZE = "getImageSizeFromPath",
-    FILE_SIZE = "getFileSize",
-    MEDIA_FILE_PATH = "nodeIKernelMsgService/getRichMediaFilePathForGuild",
-    RECALL_MSG = "nodeIKernelMsgService/recallMsg",
-    SEND_MSG = "nodeIKernelMsgService/sendMsg",
-    DOWNLOAD_MEDIA = "nodeIKernelMsgService/downloadRichMedia",
-    FORWARD_MSG = "nodeIKernelMsgService/forwardMsgWithComment",
-    MULTI_FORWARD_MSG = "nodeIKernelMsgService/multiForwardMsgWithComment", // 合并转发
-    GET_GROUP_NOTICE = "nodeIKernelGroupService/getSingleScreenNotifies",
-    HANDLE_GROUP_REQUEST = "nodeIKernelGroupService/operateSysNotify",
-    QUIT_GROUP = "nodeIKernelGroupService/quitGroup",
-    // READ_FRIEND_REQUEST = "nodeIKernelBuddyListener/onDoubtBuddyReqUnreadNumChange"
-    HANDLE_FRIEND_REQUEST = "nodeIKernelBuddyService/approvalFriendRequest",
-    KICK_MEMBER = "nodeIKernelGroupService/kickMember",
-    MUTE_MEMBER = "nodeIKernelGroupService/setMemberShutUp",
-    MUTE_GROUP = "nodeIKernelGroupService/setGroupShutUp",
-    SET_MEMBER_CARD = "nodeIKernelGroupService/modifyMemberCardName",
-    SET_MEMBER_ROLE = "nodeIKernelGroupService/modifyMemberRole",
-    PUBLISH_GROUP_BULLETIN = "nodeIKernelGroupService/publishGroupBulletinBulletin",
-    SET_GROUP_NAME = "nodeIKernelGroupService/modifyGroupName",
-    SET_GROUP_TITLE = "nodeIKernelGroupService/modifyMemberSpecialTitle",
+  SELF_INFO = 'fetchAuthData',
+  FILE_TYPE = 'getFileType',
+  FILE_MD5 = 'getFileMd5',
+  FILE_COPY = 'copyFile',
+  IMAGE_SIZE = 'getImageSizeFromPath',
+  FILE_SIZE = 'getFileSize',
+  CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
+  CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
+  CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
+  OPEN_EXTRA_WINDOW = 'openExternalWindow',
 
-    CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
-    CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
-    CACHE_PATH_HOT_UPDATE = 'getHotUpdateCachePath',
-    CACHE_PATH_DESKTOP_TEMP = 'getDesktopTmpPath',
-    CACHE_PATH_SESSION = 'getCleanableAppSessionPathList',
-    CACHE_SCAN = 'nodeIKernelStorageCleanService/scanCache',
-    CACHE_CLEAR = 'nodeIKernelStorageCleanService/clearCacheDataByKeys',
+  GROUP_MEMBER_SCENE = 'nodeIKernelGroupService/createMemberListScene',
+  GROUP_MEMBERS = 'nodeIKernelGroupService/getNextMemberList',
+  HANDLE_GROUP_REQUEST = 'nodeIKernelGroupService/operateSysNotify',
+  QUIT_GROUP = 'nodeIKernelGroupService/quitGroup',
+  GROUP_AT_ALL_REMAIN_COUNT = 'nodeIKernelGroupService/getGroupRemainAtTimes',
+  KICK_MEMBER = 'nodeIKernelGroupService/kickMember',
+  MUTE_MEMBER = 'nodeIKernelGroupService/setMemberShutUp',
+  MUTE_GROUP = 'nodeIKernelGroupService/setGroupShutUp',
+  SET_MEMBER_CARD = 'nodeIKernelGroupService/modifyMemberCardName',
+  SET_MEMBER_ROLE = 'nodeIKernelGroupService/modifyMemberRole',
+  SET_GROUP_NAME = 'nodeIKernelGroupService/modifyGroupName',
 
-    CACHE_CHAT_GET = 'nodeIKernelStorageCleanService/getChatCacheInfo',
-    CACHE_FILE_GET = 'nodeIKernelStorageCleanService/getFileCacheInfo',
-    CACHE_CHAT_CLEAR = 'nodeIKernelStorageCleanService/clearChatCacheInfo',
+  HANDLE_FRIEND_REQUEST = 'nodeIKernelBuddyService/approvalFriendRequest',
 
-    OPEN_EXTRA_WINDOW = 'openExternalWindow',
-
-    SET_QQ_AVATAR = 'nodeIKernelProfileService/setHeader',
-    GET_SKEY = "nodeIKernelTipOffService/getPskey",
-    UPDATE_SKEY = "updatePskey"
+  CACHE_SET_SILENCE = 'nodeIKernelStorageCleanService/setSilentScan',
+  CACHE_ADD_SCANNED_PATH = 'nodeIKernelStorageCleanService/addCacheScanedPaths',
+  CACHE_SCAN = 'nodeIKernelStorageCleanService/scanCache',
+  CACHE_CLEAR = 'nodeIKernelStorageCleanService/clearCacheDataByKeys',
+  CACHE_CHAT_GET = 'nodeIKernelStorageCleanService/getChatCacheInfo',
+  CACHE_FILE_GET = 'nodeIKernelStorageCleanService/getFileCacheInfo',
+  CACHE_CHAT_CLEAR = 'nodeIKernelStorageCleanService/clearChatCacheInfo',
 }
 
-enum NTQQApiChannel {
-    IPC_UP_2 = "IPC_UP_2",
-    IPC_UP_3 = "IPC_UP_3",
-    IPC_UP_1 = "IPC_UP_1",
+export enum NTChannel {
+  IPC_UP_1 = 'IPC_UP_1',
+  IPC_UP_2 = 'IPC_UP_2',
+  IPC_UP_3 = 'IPC_UP_3',
+  IPC_UP_4 = 'IPC_UP_4'
 }
 
-interface NTQQApiParams {
-    methodName: NTQQApiMethod | string,
-    className?: NTQQApiClass,
-    channel?: NTQQApiChannel,
-    classNameIsRegister?: boolean
-    args?: unknown[],
-    cbCmd?: ReceiveCmd | null,
-    cmdCB?: (payload: any) => boolean;
-    afterFirstCmd?: boolean,  // 是否在methodName调用完之后再去hook cbCmd
-    timeoutSecond?: number,
+interface NTService {
+  nodeIKernelBuddyService: NodeIKernelBuddyService
+  nodeIKernelProfileService: NodeIKernelProfileService
+  nodeIKernelGroupService: NodeIKernelGroupService
+  nodeIKernelProfileLikeService: NodeIKernelProfileLikeService
+  nodeIKernelMsgService: NodeIKernelMsgService
+  nodeIKernelMSFService: NodeIKernelMSFService
+  nodeIKernelUixConvertService: NodeIKernelUixConvertService
+  nodeIKernelRichMediaService: NodeIKernelRichMediaService
+  nodeIKernelTicketService: NodeIKernelTicketService
+  nodeIKernelTipOffService: NodeIKernelTipOffService
+  nodeIKernelRobotService: NodeIKernelRobotService
+  nodeIKernelNodeMiscService: NodeIKernelNodeMiscService
 }
 
-export function callNTQQApi<ReturnType>(params: NTQQApiParams) {
-    let {
-        className, methodName, channel, args,
-        cbCmd, timeoutSecond: timeout,
-        classNameIsRegister, cmdCB, afterFirstCmd
-    } = params;
-    className = className ?? NTQQApiClass.NT_API;
-    channel = channel ?? NTQQApiChannel.IPC_UP_2;
-    args = args ?? [];
-    timeout = timeout ?? 5;
-    afterFirstCmd = afterFirstCmd ?? true;
-    const uuid = uuidv4();
-    HOOK_LOG && log("callNTQQApi", channel, className, methodName, args, uuid)
-    return new Promise((resolve: (data: ReturnType) => void, reject) => {
-        // log("callNTQQApiPromise", channel, className, methodName, args, uuid)
-        const _timeout = timeout * 1000
-        let success = false
-        let eventName = className + "-" + channel[channel.length - 1];
-        if (classNameIsRegister) {
-            eventName += "-register";
-        }
-        const apiArgs = [methodName, ...args]
-        if (!cbCmd) {
-            // QQ后端会返回结果，并且可以根据uuid识别
-            hookApiCallbacks[uuid] = (r: ReturnType) => {
-                success = true
-                resolve(r)
-            };
-        } else {
-            // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
-            const secondCallback = () => {
-                const hookId = registerReceiveHook<ReturnType>(cbCmd, (payload) => {
-                    // log(methodName, "second callback", cbCmd, payload, cmdCB);
-                    if (!!cmdCB) {
-                        if (cmdCB(payload)) {
-                            removeReceiveHook(hookId);
-                            success = true
-                            resolve(payload);
-                        }
-                    } else {
-                        removeReceiveHook(hookId);
-                        success = true
-                        resolve(payload);
-                    }
-                })
-            }
-            !afterFirstCmd && secondCallback();
-            hookApiCallbacks[uuid] = (result: GeneralCallResult) => {
-                log(`${methodName} callback`, result)
-                if (result?.result == 0 || result === undefined) {
-                    afterFirstCmd && secondCallback();
-                } else {
-                    success = true
-                    reject(`ntqq api call failed, ${result.errMsg}`);
-                }
-            }
-        }
-        setTimeout(() => {
-            // log("ntqq api timeout", success, channel, className, methodName)
-            if (!success) {
-                log(`ntqq api timeout ${channel}, ${eventName}, ${methodName}`, apiArgs);
-                reject(`ntqq api timeout ${channel}, ${eventName}, ${methodName}, ${apiArgs}`)
-            }
-        }, _timeout)
-
-        ipcMain.emit(
-            channel,
-            {
-                sender: {
-                    send: (..._args: unknown[]) => {
-                    },
-                },
-            },
-            {type: 'request', callbackId: uuid, eventName},
-            apiArgs
-        )
-    })
+interface InvokeOptions<ReturnType> {
+  className?: NTClass
+  channel?: NTChannel
+  registerEvent?: boolean
+  cbCmd?: string | string[]
+  cmdCB?: (payload: ReturnType, result: unknown) => boolean
+  afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
+  timeout?: number
 }
 
+let channel: NTChannel
 
-export interface GeneralCallResult {
-    result: number,  // 0: success
-    errMsg: string
+function getChannel() {
+  if (channel) {
+    return channel
+  }
+  if (ipcMain.eventNames().includes(NTChannel.IPC_UP_2)) {
+    return channel = NTChannel.IPC_UP_2
+  } else {
+    return channel = NTChannel.IPC_UP_3
+  }
 }
 
+export function invoke<
+  R extends Awaited<ReturnType<Extract<NTService[S][M], (...args: any) => unknown>>>,
+  S extends keyof NTService = any,
+  M extends keyof NTService[S] & string = any
+>(method: Extract<unknown, `${S}/${M}`> | string, args: unknown[], options: InvokeOptions<R> = {}) {
+  const className = options.className ?? NTClass.NT_API
+  const channel = options.channel ?? getChannel()
+  const timeout = options.timeout ?? 5000
+  const afterFirstCmd = options.afterFirstCmd ?? true
+  let eventName = className + '-' + channel[channel.length - 1]
+  if (options.registerEvent) {
+    eventName += '-register'
+  }
+  return new Promise<R>((resolve, reject) => {
+    const apiArgs = [method, ...args]
+    const callbackId = randomUUID()
+    let eventId: string
 
-export class NTQQApi {
-    static async call(className: NTQQApiClass, cmdName: string, args: any[],) {
-        return await callNTQQApi<GeneralCallResult>({
-            className,
-            methodName: cmdName,
-            args: [
-                ...args,
-            ]
-        })
+    const timeoutId = setTimeout(() => {
+      if (eventId) {
+        removeReceiveHook(eventId)
+      }
+      log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, args)
+      reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${JSON.stringify(args)}`)
+    }, timeout)
+
+    if (!options.cbCmd) {
+      // QQ后端会返回结果，并且可以根据uuid识别
+      hookApiCallbacks[callbackId] = res => {
+        clearTimeout(timeoutId)
+        resolve(res)
+      }
     }
-}
+    else {
+      let result: unknown
+      // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
+      const secondCallback = () => {
+        eventId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
+          if (options.cmdCB) {
+            if (!options.cmdCB(payload, result)) {
+              return
+            }
+          }
+          removeReceiveHook(eventId)
+          clearTimeout(timeoutId)
+          resolve(payload)
+        })
+      }
+      !afterFirstCmd && secondCallback()
+      hookApiCallbacks[callbackId] = (res: GeneralCallResult) => {
+        result = res
+        if (res?.result === 0 || ['undefined', 'number'].includes(typeof res)) {
+          afterFirstCmd && secondCallback()
+        }
+        else {
+          clearTimeout(timeoutId)
+          if (eventId) {
+            removeReceiveHook(eventId)
+          }
+          log('ntqq api call failed,', method, args, res)
+          reject(`ntqq api call failed, ${method}, ${JSON.stringify(res)}`)
+        }
+      }
+    }
+
+    ipcMain.emit(
+      channel,
+      {
+        sender: {
+          send: () => {
+          },
+        },
+      },
+      { type: 'request', callbackId, eventName },
+      apiArgs,
+    )
+  })
+}

src/ntqqapi/proto/groupNotify.proto

@@ -0,0 +1,14 @@
+syntax = "proto3";
+package SysMsg;
+
+message GroupMemberChange {
+  uint32 groupCode = 1;
+  string memberUid = 3;
+  uint32 type = 4;  // 130:主动 131:被动
+  string adminUid = 5;
+}
+
+message GroupInvite {
+  uint32 groupCode = 1;
+  string operatorUid = 5;
+}

src/ntqqapi/proto/message.proto

@@ -0,0 +1,134 @@
+syntax = "proto3";
+package Msg;
+
+message RoutingHead {
+  optional uint64 fromUin = 1;
+  optional string fromUid = 2;
+  optional uint32 fromAppid = 3;
+  optional uint32 fromInstid = 4;
+  optional uint64 toUin = 5;
+  optional string toUid = 6;
+  optional C2c c2c = 7;
+  optional Group group = 8;
+}
+
+message C2c {
+  optional string friendName = 6;
+}
+
+message Group {
+  optional uint64 groupCode = 1;
+  optional uint32 groupType = 2;
+  optional uint64 groupInfoSeq = 3;
+  optional string groupCard = 4;
+  optional uint32 groupCardType = 5;
+  optional uint32 groupLevel = 6;
+  optional string groupName = 7;
+  optional string extGroupKeyInfo = 8;
+  optional uint32 msgFlag = 9;
+}
+
+message ContentHead {
+  optional uint64 msgType = 1;
+  optional uint64 subType = 2;
+  optional uint32 c2cCmd = 3;
+  optional uint64 random = 4;
+  optional uint64 msgSeq = 5;
+  optional uint64 msgTime = 6;
+  optional uint32 pkgNum = 7;
+  optional uint32 pkgIndex = 8;
+  optional uint32 divSeq = 9;
+  optional uint32 autoReply = 10;
+  optional uint64 ntMsgSeq = 11;
+  optional uint64 msgUid = 12;
+  optional ContentHeadField15 field15 = 15;
+}
+
+message ContentHeadField15 {
+  optional uint32 field1 = 1;
+  optional uint32 field2 = 2;
+  optional uint32 field3 = 3;
+  optional string field4 = 4;
+  optional string field5 = 5;
+}
+
+message Message {
+  optional RoutingHead routingHead = 1;
+  optional ContentHead contentHead = 2;
+  optional MessageBody body = 3;
+}
+
+message MessageBody {
+  optional RichText richText = 1;
+  optional bytes msgContent = 2;
+  optional bytes msgEncryptContent = 3;
+}
+
+message RichText {
+  optional Attr attr = 1;
+  repeated Elem elems = 2;
+}
+
+message Elem {
+  optional Text text = 1;
+  optional Face face = 2;
+  optional LightAppElem lightApp = 51;
+  optional CommonElem commonElem = 53;
+}
+
+message Text {
+  optional string str = 1;
+  optional string link = 2;
+  optional bytes attr6Buf = 3;
+  optional bytes attr7Buf = 4;
+  optional bytes buf = 11;
+  optional bytes pbReserve = 12;
+}
+
+message Face {
+  optional uint32 index = 1;
+  optional bytes old = 2;
+  optional bytes buf = 11;
+}
+
+message LightAppElem {
+  optional bytes data = 1;
+  optional bytes msgResid = 2;
+}
+
+message CommonElem {
+  required uint32 serviceType = 1;
+  optional bytes pbElem = 2;
+  optional uint32 businessType = 3;
+}
+
+message Attr {
+  optional int32 codePage = 1;
+  optional int32 time = 2;
+  optional int32 random = 3;
+  optional int32 color = 4;
+  optional int32 size = 5;
+  optional int32 effect = 6;
+  optional int32 charSet = 7;
+  optional int32 pitchAndFamily = 8;
+  optional string fontName = 9;
+  optional bytes reserveData = 10;
+}
+
+message MarkdownElem {
+  string content = 1;
+}
+
+message PbMultiMsgItem {
+  string fileName = 1;
+  PbMultiMsgNew buffer = 2;
+}
+
+message PbMultiMsgNew {
+  repeated Message msg = 1;
+}
+
+message PbMultiMsgTransmit {
+  repeated Message msg = 1;
+  repeated PbMultiMsgItem pbItemList = 2;
+}

src/ntqqapi/proto/profileLikeTip.proto

@@ -0,0 +1,24 @@
+syntax = "proto3";
+package SysMsg;
+
+message LikeDetail {
+  string txt = 1;
+  uint32 uin = 3;
+  string nickname = 5;
+}
+
+message LikeMsg {
+  uint32 count = 1;
+  uint32 time = 2;
+  LikeDetail detail = 3;
+}
+
+message ProfileLikeSubTip {
+  LikeMsg msg = 14;
+}
+
+message ProfileLikeTip {
+  uint32 msgType = 1;
+  uint32 subType = 2;
+  ProfileLikeSubTip content = 203;
+}

src/ntqqapi/proto/richMedia.proto

@@ -0,0 +1,76 @@
+syntax = "proto3";
+package RichMedia;
+
+message MsgInfo {
+  repeated MsgInfoBody msgInfoBody = 1;
+  ExtBizInfo extBizInfo = 2;
+}
+
+message MsgInfoBody {
+  IndexNode index = 1;
+  PicInfo pic = 2;
+  bool fileExist = 5;
+}
+
+message IndexNode {
+  FileInfo info = 1;
+  string fileUuid = 2;
+  uint32 storeID = 3;
+  uint32 uploadTime = 4;
+  uint32 expire = 5;
+  uint32 type = 6; //0
+}
+
+message FileInfo {
+  uint32 fileSize = 1;
+  string md5HexStr = 2;
+  string sha1HexStr = 3;
+  string fileName = 4;
+  FileType fileType = 5;
+  uint32 width = 6;
+  uint32 height = 7;
+  uint32 time = 8;
+  uint32 original = 9;
+}
+
+message FileType {
+  uint32 type = 1;
+  uint32 picFormat = 2;
+  uint32 videoFormat = 3;
+  uint32 pttFormat = 4;
+}
+
+message PicInfo {
+  string urlPath = 1;
+  PicUrlExtParams ext = 2;
+  string domain = 3;
+}
+
+message PicUrlExtParams {
+  string originalParam = 1;
+  string bigParam = 2;
+  string thumbParam = 3;
+}
+
+message ExtBizInfo {
+  PicExtBizInfo pic = 1;
+  VideoExtBizInfo video = 2;
+  uint32 busiType = 10;
+}
+
+message PicExtBizInfo {
+  uint32 bizType = 1;
+  string summary = 2;
+}
+
+message VideoExtBizInfo {
+  bytes pbReserve = 3;
+}
+
+message PicFileIdInfo {
+  bytes sha1 = 2;
+  uint32 size = 3;
+  uint32 appid = 4;
+  uint32 time = 5;
+  uint32 expire = 10;
+}

src/ntqqapi/services/NodeIKernelBuddyService.ts

@@ -0,0 +1,27 @@
+import { BuddyListReqType } from '@/ntqqapi/types'
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelBuddyService {
+  getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
+    data: {
+      categoryId: number
+      categorySortId: number
+      categroyName: string
+      categroyMbCount: number
+      onlineCount: number
+      buddyUids: string[]
+    }[]
+  }>
+
+  setBuddyRemark(arg: unknown): Promise<GeneralCallResult>
+
+  isBuddy(uid: string): boolean
+
+  approvalFriendRequest(arg: {
+    friendUid: string
+    reqTime: string
+    accept: boolean
+  }): Promise<void>
+
+  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>
+}

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -0,0 +1,130 @@
+import {
+  GroupMember,
+  GroupMemberRole,
+  GroupNotifyType,
+  GroupRequestOperateTypes,
+} from '@/ntqqapi/types'
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelGroupService {
+  getGroupHonorList(req: { groupCode: number[] }): Promise<{
+    errCode: number
+    errMsg: string
+    groupMemberHonorList: {
+      honorList: {
+        groupCode: string
+        id: number[]
+        isGray: number
+      }[]
+      cacheTs: number
+      honorInfos: unknown[]
+      joinTime: number
+    }
+  }>
+
+  getUinByUids(uins: string[]): Promise<{
+    errCode: number
+    errMsg: string
+    uins: Map<string, string>
+  }>
+
+  getUidByUins(uins: string[]): Promise<{
+    errCode: number
+    errMsg: string
+    uids: Map<string, string>
+  }>
+
+  queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<{
+    items: {
+      groupCode: string
+      msgSeq: number
+      msgRandom: number
+      msgSenderUin: string
+      msgSenderNick: string
+      opType: number
+      opUin: string
+      opNick: string
+      opTime: number
+      grayTipSeq: string
+    }[]
+  }>
+
+  setHeader(uid: string, path: string): unknown
+
+  createMemberListScene(groupCode: string, scene: string): string
+
+  getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
+    errCode: number
+    errMsg: string
+    result: {
+      ids: {
+        uid: string
+        index: number
+      }[]
+      infos: Map<string, GroupMember>
+      finish: boolean
+      hasRobot: boolean
+    }
+  }>
+
+  kickMember(groupCode: string, memberUids: string[], refuseForever: boolean, kickReason: string): Promise<void>
+
+  modifyMemberRole(groupCode: string, uid: string, role: GroupMemberRole): void
+
+  modifyMemberCardName(groupCode: string, uid: string, cardName: string): void
+
+  modifyGroupName(groupCode: string, groupName: string, arg: false): void
+
+  quitGroup(groupCode: string): void
+
+  getSingleScreenNotifies(force: boolean, startSeq: string, num: number): Promise<GeneralCallResult>
+
+  operateSysNotify(
+    doubt: boolean,
+    operateMsg: {
+      operateType: GroupRequestOperateTypes // 2 拒绝
+      targetMsg: {
+        seq: string  // 通知序列号
+        type: GroupNotifyType
+        groupCode: string
+        postscript: string
+      }
+    }
+  ): Promise<void>
+
+  publishGroupBulletin(groupCode: string, pskey: string, data: unknown): Promise<GeneralCallResult>
+
+  uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<{
+    errCode: number
+    errMsg: string
+    picInfo?: {
+      id: string
+      width: number
+      height: number
+    }
+  }>
+
+  getGroupRemainAtTimes(groupCode: string): Promise<GeneralCallResult & {
+    atInfo: {
+      canAtAll: boolean
+      RemainAtAllCountForUin: number
+      RemainAtAllCountForGroup: number
+      atTimesMsg: string
+      canNotAtAllMsg: ''
+    }
+  }>
+
+  setGroupShutUp(groupCode: string, shutUp: boolean): void
+
+  setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>
+
+  getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>
+
+  addGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+
+  removeGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
+
+  setHeader(args: unknown[]): Promise<GeneralCallResult>
+
+  searchMember(sceneId: string, keyword: string): Promise<void>
+}

src/ntqqapi/services/NodeIKernelMSFService.ts

@@ -0,0 +1,3 @@
+export interface NodeIKernelMSFService {
+  getServerTime(): string
+}

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -0,0 +1,100 @@
+import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelMsgService {
+  generateMsgUniqueId(chatType: number, time: string): string
+
+  sendMsg(msgId: string, peer: Peer, msgElements: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
+
+  recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
+
+  setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise<GeneralCallResult>
+
+  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult & {
+    detailErr: Map<unknown, unknown>
+  }>
+
+  forwardMsgWithComment(...args: unknown[]): Promise<GeneralCallResult>
+
+  multiForwardMsgWithComment(...args: unknown[]): unknown
+
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getAioFirstViewLatestMsgsAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getMsgsIncludeSelfAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getMsgsByMsgId(peer: Peer, ids: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getSingleMsg(peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
+    msgList: RawMessage[]
+  }>
+
+  setMsgRead(peer: Peer): Promise<GeneralCallResult>
+
+  getRichMediaFilePathForGuild(arg: {
+    md5HexStr: string
+    fileName: string
+    elementType: ElementType
+    elementSubType: number
+    thumbSize: 0
+    needCreate: true
+    downloadType: 1
+    file_uuid: ''
+  }): string
+
+  fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
+    emojiInfoList: {
+      uin: string
+      emoId: number
+      emoPath: string
+      isExist: boolean
+      resId: string
+      url: string
+      md5: string
+      emoOriginalPath: string
+      thumbPath: string
+      RomaingType: string
+      isAPNG: false
+      isMarkFace: false
+      eId: string
+      epId: string
+      ocrWord: string
+      modifyWord: string
+      exposeNum: number
+      clickNum: number
+      desc: string
+    }[]
+  }>
+
+  downloadRichMedia(...args: unknown[]): unknown
+
+  setMsgEmojiLikes(...args: unknown[]): Promise<GeneralCallResult>
+
+  getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{
+    result: number
+    errMsg: string
+    emojiLikesList: {
+      tinyId: string
+      nickName: string
+      headUrl: string
+    }[]
+    cookie: string
+    isLastPage: boolean
+    isFirstPage: boolean
+  }>
+
+  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+
+  getTempChatInfo(chatType: number, uid: string): Promise<TmpChatInfoApi>
+
+  sendSsoCmdReqByContend(ssoCmd: string, content: string): Promise<GeneralCallResult & { rsp: string }>
+}

src/ntqqapi/services/NodeIKernelNodeMiscService.ts

@@ -0,0 +1,17 @@
+export interface NodeIKernelNodeMiscService {
+  wantWinScreenOCR(...args: unknown[]): Promise<{
+    code: number
+    errMsg: string
+    result: {
+      text: string
+      [key: `pt${number}`]: {
+        x: string
+        y: string
+      }
+      charBox: unknown[]
+      score: ''
+    }[]
+  }>
+
+  queryAutoRun(): Promise<boolean>
+}

src/ntqqapi/services/NodeIKernelProfileLikeService.ts

@@ -0,0 +1,25 @@
+import { BuddyProfileLikeReq } from '../types'
+import { GeneralCallResult } from './common'
+import { Dict } from 'cosmokit'
+
+export interface NodeIKernelProfileLikeService {
+  setBuddyProfileLike(...args: unknown[]): GeneralCallResult & { succCounts: number }
+
+  getBuddyProfileLike(req: BuddyProfileLikeReq): Promise<GeneralCallResult & {
+    info: {
+      userLikeInfos: {
+        uid: string
+        time: string
+        favoriteInfo: {
+          total_count: number
+          last_time: number
+          today_count: number
+          userInfos: Dict[]
+        }
+        voteInfo: Dict
+      }[]
+      friendMaxVotes: number
+      start: number
+    }
+  }>
+}

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -0,0 +1,18 @@
+import { SimpleInfo } from '../types'
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelProfileService {
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>
+
+  getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>
+
+  getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>
+
+  fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>
+
+  setHeader(arg: string): Promise<GeneralCallResult>
+
+  getUserDetailInfoWithBizInfo(uid: string, biz: unknown[]): Promise<GeneralCallResult>
+
+  getUserDetailInfoByUin(uin: string): Promise<unknown>
+}

src/ntqqapi/services/NodeIKernelRichMediaService.ts

@@ -0,0 +1,59 @@
+import { GetFileListParam, Peer } from '../types'
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelRichMediaService {
+  getVideoPlayUrlV2(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, exParams: { downSourceType: number, triggerType: number }): Promise<GeneralCallResult & {
+    urlResult: {
+      v4IpUrl: []
+      v6IpUrl: []
+      domainUrl: {
+        url: string
+        isHttps: boolean
+        httpsDomain: string
+      }[]
+      videoCodecFormat: number
+    }
+  }>
+
+  deleteGroupFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
+
+  createGroupFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: unknown[] } }>
+
+  getGroupFileList(groupCode: string, params: GetFileListParam): Promise<GeneralCallResult & {
+    groupSpaceResult: {
+      retCode: number
+      retMsg: string
+      clientWording: string
+      totalSpace: number
+      usedSpace: number
+      allUpload: boolean
+    }
+  }>
+
+  moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
+
+  deleteGroupFile(groupCode: string, params: Array<number>, files: Array<string>): Promise<GeneralCallResult & {
+    transGroupFileResult: {
+      result: unknown
+      successFileIdList: Array<unknown>
+      failFileIdList: Array<unknown>
+    }
+  }>
+
+  batchGetGroupFileCount(groupIds: string[]): Promise<GeneralCallResult & {
+    groupCodes: string[]
+    groupFileCounts: number[]
+  }>
+
+  getGroupSpace(groupId: string): Promise<GeneralCallResult & {
+    groupSpaceResult: {
+      retCode: number
+      retMsg: string
+      clientWording: string
+      totalSpace: string
+      usedSpace: string
+      allUpload: boolean
+    }
+  }>
+}
+

src/ntqqapi/services/NodeIKernelRobotService.ts

@@ -0,0 +1,13 @@
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelRobotService {
+  getRobotUinRange(req: unknown): Promise<GeneralCallResult & {
+    response: {
+      version: number
+      robotUinRanges: {
+        minUin: string
+        maxUin: string
+      }[]
+    }
+  }>
+}

src/ntqqapi/services/NodeIKernelTicketService.ts

@@ -0,0 +1,10 @@
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelTicketService {
+  forceFetchClientKey(arg: string): Promise<GeneralCallResult & {
+    url: string
+    keyIndex: string
+    clientKey: string
+    expireTime: string
+  }>
+}

src/ntqqapi/services/NodeIKernelTipOffService.ts

@@ -0,0 +1,5 @@
+import { GeneralCallResult } from './common'
+
+export interface NodeIKernelTipOffService {
+  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }>
+}

src/ntqqapi/services/NodeIKernelUixConvertService.ts

@@ -0,0 +1,5 @@
+export interface NodeIKernelUixConvertService {
+  getUin(uid: string[]): Promise<{ uinInfo: Map<string, string> }>
+
+  getUid(uin: string[]): Promise<{ uidInfo: Map<string, string> }>
+}

src/ntqqapi/services/common.ts

@@ -0,0 +1,8 @@
+export enum GeneralCallResultStatus {
+  OK = 0
+}
+
+export interface GeneralCallResult {
+  result: GeneralCallResultStatus
+  errMsg: string
+}

src/ntqqapi/services/index.ts

@@ -0,0 +1,13 @@
+export * from './common'
+export * from './NodeIKernelBuddyService'
+export * from './NodeIKernelProfileService'
+export * from './NodeIKernelGroupService'
+export * from './NodeIKernelProfileLikeService'
+export * from './NodeIKernelMsgService'
+export * from './NodeIKernelMSFService'
+export * from './NodeIKernelUixConvertService'
+export * from './NodeIKernelRichMediaService'
+export * from './NodeIKernelTicketService'
+export * from './NodeIKernelTipOffService'
+export * from './NodeIKernelRobotService'
+export * from './NodeIKernelNodeMiscService'

src/ntqqapi/types/cache.ts

@@ -1,65 +1,66 @@
-import {ChatType} from "./msg";
+import { ChatType } from './msg'
 
 export interface CacheScanResult {
-    result: number,
-    size: [ // 单位为字节
-        string, // 系统总存储空间
-        string, // 系统可用存储空间
-        string, // 系统已用存储空间
-        string, // QQ总大小
-        string, // 「聊天与文件」大小
-        string, // 未知
-        string, // 「缓存数据」大小
-        string, // 「其他数据」大小
-        string, // 未知
-    ]
+  result: number
+  size: [
+    // 单位为字节
+    string, // 系统总存储空间
+    string, // 系统可用存储空间
+    string, // 系统已用存储空间
+    string, // QQ总大小
+    string, // 「聊天与文件」大小
+    string, // 未知
+    string, // 「缓存数据」大小
+    string, // 「其他数据」大小
+    string, // 未知
+  ]
 }
 
 export interface ChatCacheList {
-    pageCount: number,
-    infos: ChatCacheListItem[]
+  pageCount: number
+  infos: ChatCacheListItem[]
 }
 
 export interface ChatCacheListItem {
-    chatType: ChatType,
-    basicChatCacheInfo: ChatCacheListItemBasic,
-    guildChatCacheInfo: unknown[] // TODO: 没用过频道所以不知道这里边的详细内容
+  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
+  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,
+  IMAGE = 0,
+  VIDEO = 1,
+  AUDIO = 2,
+  DOCUMENT = 3,
+  OTHER = 4,
 }
 
 export interface CacheFileList {
-    infos: CacheFileListItem[],
+  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,
+  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/ntqqapi/types/group.ts

@@ -1,55 +1,190 @@
-import {QQLevel, Sex} from "./user";
-
 export interface Group {
-    groupCode: string,
-    maxMember: number,
-    memberCount: number,
-    groupName: string,
-    groupStatus: 0,
-    memberRole: 2,
-    isTop: boolean,
-    toppedTimestamp: "0",
-    privilegeFlag: number, //65760
-    isConf: boolean,
-    hasModifyConfGroupFace: boolean,
-    hasModifyConfGroupName: boolean,
-    remarkName: string,
-    hasMemo: boolean,
-    groupShutupExpireTime: string, //"0",
-    personShutupExpireTime: string, //"0",
-    discussToGroupUin: string, //"0",
-    discussToGroupMaxMsgSeq: number,
-    discussToGroupTime: number,
-    groupFlagExt: number, //1073938496,
-    authGroupType: number, //0,
-    groupCreditLevel: number, //0,
-    groupFlagExt3: number, //0,
-    groupOwnerId: {
-        "memberUin": string, //"0",
-        "memberUid": string, //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
-    },
-    members: GroupMember[]  // 原始数据是没有这个的，为了方便自己加了这个字段
+  groupCode: string
+  maxMember: number
+  memberCount: number
+  groupName: string
+  groupStatus: 0
+  memberRole: 2
+  isTop: boolean
+  toppedTimestamp: '0'
+  privilegeFlag: number //65760
+  isConf: boolean
+  hasModifyConfGroupFace: boolean
+  hasModifyConfGroupName: boolean
+  remarkName: string
+  hasMemo: boolean
+  groupShutupExpireTime: string
+  personShutupExpireTime: string
+  discussToGroupUin: string
+  discussToGroupMaxMsgSeq: number
+  discussToGroupTime: number
+  groupFlagExt: number //1073938496,
+  authGroupType: number //0,
+  groupCreditLevel: number //0,
+  groupFlagExt3: number //0,
+  groupOwnerId: {
+    memberUin: string
+    memberUid: string
+  }
+  createTime: string
 }
 
 export enum GroupMemberRole {
-    normal = 2,
-    admin = 3,
-    owner = 4
+  Normal = 2,
+  Admin = 3,
+  Owner = 4,
 }
 
 export interface GroupMember {
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: GroupMemberRole; // 群主:4, 管理员:3，群员:2
-    shutUpTime: number; // 禁言时间，单位是什么暂时不清楚
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    isRobot: boolean;
-    sex?: Sex
-    qqLevel?: QQLevel
-}
+  uid: string
+  qid: string
+  uin: string
+  nick: string
+  remark: string
+  cardType: number
+  cardName: string
+  role: GroupMemberRole
+  avatarPath: string
+  shutUpTime: number
+  isDelete: boolean
+  isSpecialConcerned: boolean
+  isSpecialShield: boolean
+  isRobot: boolean
+  groupHonor: Uint8Array
+  memberRealLevel: number
+  memberLevel: number
+  globalGroupLevel: number
+  globalGroupPoint: number
+  memberTitleId: number
+  memberSpecialTitle: string
+  specialTitleExpireTime: string
+  userShowFlag: number
+  userShowFlagNew: number
+  richFlag: number
+  mssVipType: number
+  bigClubLevel: number
+  bigClubFlag: number
+  autoRemark: string
+  creditLevel: number
+  joinTime: number
+  lastSpeakTime: number
+  memberFlag: number
+  memberFlagExt: number
+  memberMobileFlag: number
+  memberFlagExt2: number
+  isSpecialShielded: boolean
+  cardNameId: number
+}
+
+export interface PublishGroupBulletinReq {
+  text: string
+  picInfo?: {
+    id: string
+    width: number
+    height: number
+  }
+  oldFeedsId: ''
+  pinned: number
+  confirmRequired: number
+}
+
+export interface GroupAllInfo {
+  groupCode: string
+  ownerUid: string
+  groupFlag: number
+  groupFlagExt: number
+  maxMemberNum: number
+  memberNum: number
+  groupOption: number
+  classExt: number
+  groupName: string
+  fingerMemo: string
+  groupQuestion: string
+  certType: number
+  shutUpAllTimestamp: number
+  shutUpMeTimestamp: number //解除禁言时间
+  groupTypeFlag: number
+  privilegeFlag: number
+  groupSecLevel: number
+  groupFlagExt3: number
+  isConfGroup: number
+  isModifyConfGroupFace: number
+  isModifyConfGroupName: number
+  noFigerOpenFlag: number
+  noCodeFingerOpenFlag: number
+  groupFlagExt4: number
+  groupMemo: string
+  cmdUinMsgSeq: number
+  cmdUinJoinTime: number
+  cmdUinUinFlag: number
+  cmdUinMsgMask: number
+  groupSecLevelInfo: number
+  cmdUinPrivilege: number
+  cmdUinFlagEx2: number
+  appealDeadline: number
+  remarkName: number
+  isTop: boolean
+  richFingerMemo: string
+  groupAnswer: string
+  joinGroupAuth: string
+  isAllowModifyConfGroupName: number
+}
+
+export interface GroupBulletinListResult {
+  groupCode: string
+  srvCode: number
+  readOnly: number
+  role: number
+  inst: unknown[]
+  feeds: {
+    uin: string
+    feedId: string
+    publishTime: string
+    msg: {
+      text: string
+      textFace: string
+      pics: {
+        id: string
+        width: number
+        height: number
+      }[]
+      title: string
+    }
+    type: number
+    fn: number
+    cn: number
+    vn: number
+    settings: {
+      isShowEditCard: number
+      remindTs: number
+      tipWindowType: number
+      confirmRequired: number
+    }
+    pinned: number
+    readNum: number
+    is_read: number
+    is_all_confirm: number
+  }[]
+  groupInfo: {
+    groupCode: string
+    classId: number
+  }
+  gln: number
+  tst: number
+  publisherInfos: {
+    uin: string
+    nick: string
+    avatar: string
+  }[]
+  server_time: string
+  svrt: string
+  nextIndex: number
+  jointime: string
+}
+
+export enum GroupMsgMask {
+  AllowNotify = 1,  // 允许提醒
+  AllowNotNotify = 4,  // 接受消息不提醒
+  BoxNotNotify = 2,  // 收进群助手不提醒
+  NotAllow = 3,  // 屏蔽
+}

src/ntqqapi/types/index.ts

@@ -1,7 +1,5 @@
-
-export * from './user';
-export * from './group';
-export * from './msg';
-export * from './notify';
-export * from './cache';
-
+export * from './user'
+export * from './group'
+export * from './msg'
+export * from './notify'
+export * from './cache'

src/ntqqapi/types/msg.ts

@@ -1,408 +1,618 @@
-import {GroupMemberRole} from "./group";
-import exp from "constants";
+import { GroupMemberRole } from './group'
+import { GeneralCallResult } from '../services'
 
 export enum ElementType {
-    TEXT = 1,
-    PIC = 2,
-    FILE = 3,
-    PTT = 4,
-    VIDEO = 5,
-    FACE = 6,
-    REPLY = 7,
-    ARK = 10,
+  Text = 1,
+  Pic = 2,
+  File = 3,
+  Ptt = 4,
+  Video = 5,
+  Face = 6,
+  Reply = 7,
+  GrayTip = 8,
+  Ark = 10,
+  MarketFace = 11,
+  LiveGift = 12,
+  StructLongMsg = 13,
+  Markdown = 14,
+  Giphy = 15,
+  MultiForward = 16,
+  InlineKeyboard = 17,
+  Calendar = 19,
+  YoloGameResult = 20,
+  AvRecord = 21,
+  TofuRecord = 23,
+  FaceBubble = 27,
+  ShareLocation = 28,
+  TaskTopMsg = 29,
+  RecommendedMsg = 43,
+  ActionBar = 44
 }
 
 export interface SendTextElement {
-    elementType: ElementType.TEXT,
-    elementId: "",
-    textElement: {
-        content: string,
-        atType: number,
-        atUid: string,
-        atTinyId: string,
-        atNtUid: string,
-    }
+  elementType: ElementType.Text
+  elementId: ''
+  textElement: TextElement
 }
 
 export interface SendPttElement {
-    elementType: ElementType.PTT,
-    elementId: "",
-    pttElement: {
-        fileName: string,
-        filePath: string,
-        md5HexStr: string,
-        fileSize: number,
-        duration: number,  // 单位是秒
-        formatType: number,
-        voiceType: number,
-        voiceChangeType: number,
-        canConvert2Text: boolean,
-        waveAmplitudes: number[],
-        fileSubId: "",
-        playState: number,
-        autoConvertText: number,
-    }
-}
-
-export enum PicType {
-    gif = 2000,
-    jpg = 1000
-}
-
-export enum PicSubType {
-    normal = 0, // 普通图片，大图
-    face = 1  // 表情包小图
+  elementType: ElementType.Ptt
+  elementId: ''
+  pttElement: Partial<PttElement>
 }
 
 export interface SendPicElement {
-    elementType: ElementType.PIC,
-    elementId: "",
-    picElement: {
-        md5HexStr: string,
-        fileSize: number | string,
-        picWidth: number,
-        picHeight: number,
-        fileName: string,
-        sourcePath: string,
-        original: boolean,
-        picType: PicType,
-        picSubType: PicSubType,
-        fileUuid: string,
-        fileSubId: string,
-        thumbFileSize: number,
-        summary: string,
-    },
+  elementType: ElementType.Pic
+  elementId: ''
+  picElement: Partial<PicElement>
 }
 
 export interface SendReplyElement {
-    elementType: ElementType.REPLY,
-    elementId: "",
-    replyElement: {
-        replayMsgSeq: string,
-        replayMsgId: string,
-        senderUin: string,
-        senderUinStr: string,
-    }
+  elementType: ElementType.Reply
+  elementId: ''
+  replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
-    elementType: ElementType.FACE,
-    elementId: "",
-    faceElement: FaceElement
+  elementType: ElementType.Face
+  elementId: ''
+  faceElement: FaceElement
 }
 
-export interface FileElement {
-    "fileMd5"?: "",
-    "fileName": string,
-    "filePath": string,
-    "fileSize": string,
-    "picHeight"?: number,
-    "picWidth"?: number,
-    "picThumbPath"?: {},
-    "file10MMd5"?: "",
-    "fileSha"?: "",
-    "fileSha3"?: "",
-    "fileUuid"?: "",
-    "fileSubId"?: "",
-    "thumbFileSize"?: number,
-    fileBizId?: number
+export interface SendMarketFaceElement {
+  elementType: ElementType.MarketFace
+  elementId: ''
+  marketFaceElement: MarketFaceElement
 }
 
 export interface SendFileElement {
-    elementType: ElementType.FILE
-    elementId: "",
-    fileElement: FileElement
+  elementType: ElementType.File
+  elementId: ''
+  fileElement: FileElement
 }
 
 export interface SendVideoElement {
-    elementType: ElementType.VIDEO
-    elementId: "",
-    videoElement: VideoElement
+  elementType: ElementType.Video
+  elementId: ''
+  videoElement: VideoElement
 }
 
 export interface SendArkElement {
-    elementType: ElementType.ARK,
-    elementId: "",
-    arkElement: ArkElement
-
+  elementType: ElementType.Ark
+  elementId: ''
+  arkElement: Partial<ArkElement>
 }
 
-export type SendMessageElement = SendTextElement | SendPttElement |
-    SendPicElement | SendReplyElement | SendFaceElement | SendFileElement | SendVideoElement | SendArkElement
+export type SendMessageElement =
+  | SendTextElement
+  | SendPttElement
+  | SendPicElement
+  | SendReplyElement
+  | SendFaceElement
+  | SendMarketFaceElement
+  | SendFileElement
+  | SendVideoElement
+  | SendArkElement
 
 export enum AtType {
-    notAt = 0,
-    atAll = 1,
-    atUser = 2
+  Unknown,
+  All,
+  One,
 }
 
-export enum ChatType {
-    friend = 1,
-    group = 2,
-    temp = 100
+export interface TextElement {
+  content: string
+  atType: AtType
+  atUid: string
+  atTinyId: string
+  atNtUid: string
+}
+
+export interface ReplyElement {
+  replayMsgSeq: string
+  replayMsgId: string
+  senderUin: string
+  senderUinStr: string
+  sourceMsgIdInRecords: string
+  senderUid: string
+  senderUidStr: string
+  sourceMsgIsIncPic: boolean // 原消息是否有图片
+  sourceMsgText: string
+  replyMsgTime: string
+}
+
+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 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[];
+  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: number // 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[]
+  autoConvertText: number
 }
 
 export interface ArkElement {
-    bytesData: string;
-    linkInfo: null,
-    subElementType: null
+  bytesData: string
+  linkInfo: null
+  subElementType: null
 }
 
-export const IMAGE_HTTP_HOST = "https://gchat.qpic.cn"
+export const IMAGE_HTTP_HOST = 'https://gchat.qpic.cn'
+export const IMAGE_HTTP_HOST_NT = 'https://multimedia.nt.qq.com.cn'
+
+export enum PicType {
+  GIF = 2000,
+  JPEG = 1000,
+}
+
+export enum PicSubType {
+  Normal = 0, // 普通图片，大图
+  Face = 1, // 表情包小图
+}
 
 export interface PicElement {
-    originImageUrl: string;  // http url, 没有host，host是https://gchat.qpic.cn/
-    sourcePath: string; // 图片本地路径
-    thumbPath: Map<number, string>;
-    picWidth: number;
-    picHeight: number;
-    fileSize: number;
-    fileName: string;
-    fileUuid: string;
-    md5HexStr?: string;
+  picSubType: PicSubType
+  picType: PicType  // 有这玩意儿吗
+  originImageUrl: string // http url, 没有host，host是https://gchat.qpic.cn/, 带download参数的是https://multimedia.nt.qq.com.cn
+  originImageMd5?: string
+  sourcePath: string // 图片本地路径
+  thumbPath: Map<number, string>
+  picWidth: number
+  picHeight: number
+  fileSize: string
+  fileName: string
+  fileUuid: string
+  md5HexStr?: string
 }
 
-export enum GrayTipElementSubType {
-    INVITE_NEW_MEMBER = 12,
-    MEMBER_NEW_TITLE = 17
-}
-
-export interface GrayTipElement {
-    subElementType: GrayTipElementSubType;
-    revokeElement: {
-        operatorRole: string;
-        operatorUid: string;
-        operatorNick: string;
-        operatorRemark: string;
-        operatorMemRemark?: string;
-        wording: string;  // 自定义的撤回提示语
-    }
-    aioOpGrayTipElement: TipAioOpGrayTipElement,
-    groupElement: TipGroupElement,
-    xmlElement: {
-        content: string;
-    },
-    jsonGrayTipElement: {
-        jsonStr: string;
-    }
-}
-
-export interface FaceElement {
-    faceIndex: number,
-    faceType: 1
-}
-
-export interface MarketFaceElement {
-    "itemType": 6,
-    "faceInfo": 1,
-    "emojiPackageId": 203875,
-    "subType": 3,
-    "mediaType": 0,
-    "imageWidth": 200,
-    "imageHeight": 200,
-    "faceName": string,
-    "emojiId": "094d53bd1c9ac5d35d04b08e8a6c992c",
-    "key": "a8b1dd0aebc8d910",
-    "param": null,
-    "mobileParam": null,
-    "sourceType": null,
-    "startTime": null,
-    "endTime": null,
-    "emojiType": 1,
-    "hasIpProduct": null,
-    "voiceItemHeightArr": null,
-    "sourceName": null,
-    "sourceJumpUrl": null,
-    "sourceTypeName": null,
-    "backColor": null,
-    "volumeColor": null,
-    "staticFacePath": "E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c_aio.png",
-    "dynamicFacePath": "E:\\SystemDocuments\\QQ\\721011692\\nt_qq\\nt_data\\Emoji\\marketface\\203875\\094d53bd1c9ac5d35d04b08e8a6c992c",
-    "supportSize": [
-        {
-            "width": 300,
-            "height": 300
-        },
-        {
-            "width": 200,
-            "height": 200
-        }
-    ],
-    "apngSupportSize": null
-}
-
-export interface VideoElement {
-    "filePath": string,
-    "fileName": string,
-    "videoMd5"?: string,
-    "thumbMd5"?: string
-    "fileTime"?: number, // second
-    "thumbSize"?: number, // byte
-    "fileFormat"?: number,  // 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"?: "",
-    "fileBizId"?: null,
-    "originVideoMd5"?: "",
-    "import_rich_media_context"?: null,
-    "sourceVideoCodecFormat"?: number
-}
-
-export interface MarkdownElement {
-    content: string,
-}
-
-export interface InlineKeyboardElementRowButton{
-    "id": "",
-    "label": string,
-    "visitedLabel": string,
-    "style": 1, // 未知
-    "type": 2, // 未知
-    "clickLimit": 0,  // 未知
-    "unsupportTips": "请升级新版手机QQ",
-    "data": string,
-    "atBotShowChannelList": false,
-    "permissionType": 2,
-    "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 interface TipAioOpGrayTipElement {
+  operateType: number
+  peerUid: string
+  fromGrpCodeOfTmpChat: string
 }
 
 export enum TipGroupElementType {
-    memberIncrease = 1,
-    kicked = 3, // 被移出群
-    ban = 8
+  MemberIncrease = 1,
+  Kicked = 3, // 被移出群
+  Ban = 8,
 }
 
 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
-        }
+  type: TipGroupElementType // 1是表示有人加入群, 自己加入群也会收到这个
+  role: number
+  groupName: string // 暂时获取不到
+  memberUid: string
+  memberNick: string
+  memberRemark: string
+  adminUid: string
+  adminNick: string
+  adminRemark: string
+  createGroup: null
+  memberAdd?: {
+    showType: number
+    otherAdd?: {
+      uid: string
+      name: string
     }
+    otherAddByOtherQRCode?: unknown
+    otherAddByYourQRCode?: unknown
+    youAddByOtherQRCode?: unknown
+    otherInviteOther?: unknown
+    otherInviteYou?: unknown
+    youInviteOther?: unknown
+  }
+  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 GrayTipElementSubType {
+  Revoke = 1,
+  Proclamation = 2,
+  EmojiReply = 3,
+  Group = 4,
+  Buddy = 5,
+  Feed = 6,
+  Essence = 7,
+  GroupNotify = 8,
+  BuddyNotify = 9,
+  File = 10,
+  FeedChannelMsg = 11,
+  XmlMsg = 12,
+  LocalMsg = 13,
+  Block = 14,
+  AioOp = 15,
+  Wallet = 16,
+  JSON = 17,
+}
+
+export interface GrayTipElement {
+  subElementType: GrayTipElementSubType
+  revokeElement?: {
+    operatorRole: string
+    operatorUid: string
+    operatorNick: string
+    operatorRemark: string
+    operatorMemRemark?: string
+    origMsgSenderUid?: string
+    isSelfOperate?: boolean
+    wording: string // 自定义的撤回提示语
+  }
+  aioOpGrayTipElement?: TipAioOpGrayTipElement
+  groupElement?: TipGroupElement
+  xmlElement?: {
+    templId: string
+    content: string
+    templParam: Map<string, string>
+    members: Map<string, string> // uid -> remark
+  }
+  jsonGrayTipElement?: {
+    busiId: string
+    jsonStr: string
+    xmlToJsonParam?: {
+      templParam: Map<string, string>
+    }
+  }
+}
+
+export enum FaceIndex {
+  Dice = 358,
+  RPS = 359, // 石头剪刀布
+}
+
+export interface FaceElement {
+  faceIndex: number
+  faceType: number
+  faceText?: string
+  packId?: string
+  stickerId?: string
+  sourceType?: number
+  stickerType?: number
+  resultId?: string
+  surpriseId?: string
+  randomType?: number
+  pokeType?: number
+}
+
+export interface MarketFaceElement {
+  emojiPackageId: number
+  faceName?: string
+  emojiId: string
+  key: string
+  imageWidth?: number
+  imageHeight?: number
+  supportSize?: {
+    width: number
+    height: number
+  }[]
+}
+
+export interface VideoElement {
+  filePath: string
+  fileName: string
+  videoMd5?: string
+  thumbMd5?: string
+  fileTime?: number // second
+  thumbSize?: number // byte
+  fileFormat?: number // 2表示mp4？
+  fileSize?: string // byte
+  thumbWidth?: number
+  thumbHeight?: number
+  busiType?: 0 // 未知
+  subBusiType?: 0 // 未知
+  thumbPath?: Map<number, string>
+  transferStatus?: 0 // 未知
+  progress?: 0 // 下载进度？
+  invalidState?: 0 // 未知
+  fileUuid?: string // 可以用于下载链接？
+  fileSubId?: ''
+  fileBizId?: null
+  originVideoMd5?: ''
+  import_rich_media_context?: null
+  sourceVideoCodecFormat?: number
+}
+
+export interface MarkdownElement {
+  content: string
+}
+
+export interface InlineKeyboardElementRowButton {
+  id: ''
+  label: string
+  visitedLabel: string
+  style: 1 // 未知
+  type: 2 // 未知
+  clickLimit: 0 // 未知
+  unsupportTips: '请升级新版手机QQ'
+  data: string
+  atBotShowChannelList: false
+  permissionType: 2
+  specifyRoleIds: []
+  specifyTinyids: []
+  isReply: false
+  anchor: 0
+  enter: false
+  subscribeDataTemplateIds: []
+}
+
+export interface InlineKeyboardElement {
+  rows: [
+    {
+      buttons: InlineKeyboardElementRowButton[]
+    },
+  ]
+}
+
+export interface StructLongMsgElement {
+  xmlContent: string
+  resId: string
+}
+
+export interface MultiForwardMsgElement {
+  xmlContent: string // xml格式的消息内容
+  resId: string
+  fileName: string
+}
+
+export enum ChatType {
+  C2C = 1,
+  Group = 2,
+  TempC2CFromGroup = 100,
 }
 
 export interface RawMessage {
-    msgId: string;
-    msgShortId?: number;  // 自己维护的消息id
-    msgTime: string; // 时间戳，秒
-    msgSeq: string;
-    senderUid: string;
-    senderUin?: string; // 发送者QQ号
-    peerUid: string; // 群号 或者 QQ uid
-    peerUin: string; // 群号 或者 发送者QQ号
-    sendNickName: string;
-    sendMemberName?: string; // 发送者群名片
-    chatType: ChatType;
-    sendStatus?: number;  // 消息状态，别人发的2是已撤回，自己发的2是已发送
-    recallTime: string; // 撤回时间, "0"是没有撤回
-    elements: {
-        elementId: string,
-        elementType: ElementType;
-        replyElement: {
-            senderUid: string; // 原消息发送者QQ号
-            sourceMsgIsIncPic: boolean; // 原消息是否有图片
-            sourceMsgText: string;
-            replayMsgSeq: string; // 源消息的msgSeq，可以通过这个找到源消息的msgId
-        };
-        textElement: {
-            atType: AtType;
-            atUid: string; // QQ号
-            content: string;
-            atNtUid: string; // uid号
-        };
-        picElement: PicElement;
-        pttElement: PttElement;
-        arkElement: ArkElement;
-        grayTipElement: GrayTipElement;
-        faceElement: FaceElement;
-        videoElement: VideoElement;
-        fileElement: FileElement;
-        marketFaceElement: MarketFaceElement;
-        inlineKeyboardElement: InlineKeyboardElement;
-        markdownElement: MarkdownElement;
-        multiForwardMsgElement: MultiForwardMsgElement;
-    }[];
-}
+  msgId: string
+  msgType: number
+  subMsgType: number
+  msgTime: string // 时间戳，秒
+  msgSeq: string
+  msgRandom: string
+  senderUid: string
+  senderUin: string // 发送者QQ号
+  peerUid: string // 群号 或者 QQ uid
+  peerUin: string // 群号 或者 发送者QQ号
+  guildId: string
+  sendNickName: string
+  sendMemberName?: string // 发送者群名片
+  sendRemarkName?: string // 发送者好友备注
+  chatType: ChatType
+  sendStatus?: number // 消息状态，别人发的2是已撤回，自己发的2是已发送
+  recallTime: string // 撤回时间, "0"是没有撤回
+  records: RawMessage[]
+  elements: MessageElement[]
+  peerName: string
+  multiTransInfo?: {
+    status: number
+    msgId: number
+    friendFlag: number
+    fromFaceUrl: string
+  }
+  emojiLikesList: {
+    emojiId: string
+    emojiType: string
+    likesCnt: string
+    isClicked: boolean
+  }[]
+  msgAttrs: Map<number, {
+    attrType: number
+    attrId: string
+  }>
+  isOnlineMsg: boolean
+}
+
+export interface Peer {
+  chatType: ChatType
+  peerUid: string  // 如果是群聊uid为群号，私聊uid就是加密的字符串
+  guildId?: 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?: unknown
+  markdownElement?: MarkdownElement
+  structLongMsgElement?: StructLongMsgElement
+  multiForwardMsgElement?: MultiForwardMsgElement
+  giphyElement?: unknown
+  inlineKeyboardElement?: InlineKeyboardElement
+  textGiftElement?: unknown
+  calendarElement?: unknown
+  yoloGameResultElement?: unknown
+  avRecordElement?: unknown
+  structMsgElement?: unknown
+  faceBubbleElement?: unknown
+  shareLocationElement?: unknown
+  tofuRecordElement?: unknown
+  taskTopMsgElement?: unknown
+  recommendedMsgElement?: unknown
+  actionBarElement?: unknown
+}
+
+export interface RichMediaDownloadCompleteNotify {
+  fileModelId: string
+  msgElementId: string
+  msgId: string
+  fileId: string
+  fileProgress: string  // '0'
+  fileSpeed: string  // '0'
+  fileErrCode: string  // '0'
+  fileErrMsg: string
+  fileDownType: number  // 暂时未知
+  thumbSize: number
+  filePath: string
+  totalSize: string
+  trasferStatus: number
+  step: number
+  commonFileInfo: unknown
+  fileSrvErrCode: string
+  clientMsg: string
+  businessId: number
+  userTotalSpacePerDay: unknown
+  userUsedSpacePerDay: unknown
+}
+
+export interface GroupFileInfo {
+  retCode: number
+  retMsg: string
+  clientWording: string
+  isEnd: boolean
+  item: {
+    peerId: string
+    type: number
+    folderInfo?: {
+      folderId: string
+      parentFolderId: string
+      folderName: string
+      createTime: number
+      modifyTime: number
+      createUin: string
+      creatorName: string
+      totalFileCount: number
+      modifyUin: string
+      modifyName: string
+      usedSpace: string
+    }
+    fileInfo?: {
+      fileModelId: string
+      fileId: string
+      fileName: string
+      fileSize: string
+      busId: number
+      uploadedSize: string
+      uploadTime: number
+      deadTime: number
+      modifyTime: number
+      downloadTimes: number
+      sha: string
+      sha3: string
+      md5: string
+      uploaderLocalPath: string
+      uploaderName: string
+      uploaderUin: string
+      parentFolderId: string
+      localPath: string
+      transStatus: number
+      transType: number
+      elementId: string
+      isFolder: boolean
+    }
+  }[]
+  allFileCount: number
+  nextIndex: number
+  reqId: number
+}
+
+export interface QueryMsgsParams {
+  chatInfo: Peer
+  filterMsgType: []
+  filterSendersUid: string[]
+  filterMsgFromTime: string
+  filterMsgToTime: string
+  pageLimit: number
+  isReverseOrder: boolean
+  isIncludeCurrent: boolean
+}
+
+export interface TmpChatInfoApi extends GeneralCallResult {
+  tmpChatInfo?: {
+    chatType: number
+    fromNick: string
+    groupCode: string
+    peerUid: string
+    sessionType: number
+    sig: string
+  }
+}
+
+export interface GetFileListParam {
+  sortType: number
+  fileCount: number
+  startIndex: number
+  sortOrder: number
+  showOnlinedocFolder: number
+  folderId?: string
+}
+
+export interface RichMediaUploadCompleteNotify {
+  fileId: string
+  fileDownType: number
+  filePath: string
+  totalSize: string
+  trasferStatus: number
+  commonFileInfo: {
+    uuid: string
+    fileName: string
+    fileSize: string
+    md5: string
+    sha: string
+  }
+}
+
+export enum RMBizType {
+  Unknown,
+  C2CFile,
+  GroupFile,
+  C2CPic,
+  GroupPic,
+  DiscPic,
+  C2CVideo,
+  GroupVideo,
+  C2CPtt,
+  GroupPtt,
+}

src/ntqqapi/types/notify.ts

@@ -1,64 +1,81 @@
-
-export enum GroupNotifyTypes {
-    INVITE_ME = 1,
-    INVITED_JOIN = 4,  // 有人接受了邀请入群
-    JOIN_REQUEST = 7,
-    ADMIN_SET = 8,
-    ADMIN_UNSET = 12,
-    MEMBER_EXIT = 11, // 主动退出?
-
+export enum GroupNotifyType {
+  InvitedByMember = 1,
+  RefuseInvited,
+  RefusedByAdminiStrator,
+  AgreedTojoinDirect, // 有人接受了邀请入群
+  InvitedNeedAdminiStratorPass, // 有人邀请了别人入群
+  AgreedToJoinByAdminiStrator,
+  RequestJoinNeedAdminiStratorPass,
+  SetAdmin,
+  KickMemberNotifyAdmin,
+  KickMemberNotifyKicked,
+  MemberLeaveNotifyAdmin, // 主动退出
+  CancelAdminNotifyCanceled, // 我被取消管理员
+  CancelAdminNotifyAdmin, // 其他人取消管理员
+  TransferGroupNotifyOldowner,
+  TransferGroupNotifyAdmin
 }
 
 export interface GroupNotifies {
-    doubt: boolean,
-    nextStartSeq: string,
-    notifies: GroupNotify[],
+  doubt: boolean
+  nextStartSeq: string
+  notifies: GroupNotify[]
 }
 
 export enum GroupNotifyStatus {
-    IGNORE = 0,
-    WAIT_HANDLE = 1,
-    APPROVE = 2,
-    REJECT = 3
+  Init, // 初始化
+  Unhandle, // 未处理
+  Agreed, // 同意
+  Refused, // 拒绝
+  Ignored // 忽略
 }
 
 export interface GroupNotify {
-    time: number;  // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
-    seq: string, // 唯一标识符，转成数字再除以1000应该就是时间戳？
-    type: GroupNotifyTypes,
-    status: GroupNotifyStatus,  // 0是已忽略？，1是未处理，2是已同意
-    group: { groupCode: string, groupName: string },
-    user1: { uid: string, nickName: string }, // 被设置管理员的人
-    user2: { uid: string, nickName: string },  // 操作者
-    actionUser: { uid: string, nickName: string }, //未知
-    actionTime: string,
-    invitationExt: {
-        srcType: number,  // 0?未知
-        groupCode: string, waitStatus: number
-    },
-    postscript: string,  // 加群用户填写的验证信息
-    repeatSeqs: [],
-    warningTips: string
+  time: number // 自己添加的字段，时间戳，毫秒, 用于判断收到短时间内收到重复的notify
+  seq: string // 唯一标识符，转成数字再除以1000应该就是时间戳？
+  type: GroupNotifyType
+  status: GroupNotifyStatus
+  group: { groupCode: string; groupName: string }
+  user1: { uid: string; nickName: string } // 被设置管理员的人
+  user2: { uid: string; nickName: string } // 操作者
+  actionUser: { uid: string; nickName: string } //未知
+  actionTime: string
+  invitationExt: {
+    srcType: number // 0?未知
+    groupCode: string
+    waitStatus: number
+  }
+  postscript: string // 加群用户填写的验证信息
+  repeatSeqs: []
+  warningTips: string
 }
 
 export enum GroupRequestOperateTypes {
-    approve = 1,
-    reject = 2
+  approve = 1,
+  reject = 2,
+}
+
+export enum BuddyReqType {
+  MsgInfo = 12,
+  MeInitiatorWaitPeerConfirm = 13,
 }
 
 export interface FriendRequest {
-    friendUid: string,
-    reqTime: string,  // 时间戳,秒
-    extWords: string,  // 申请人填写的验证消息
-    isUnread: boolean,
-    friendNick: string,
-    sourceId: number,
-    groupCode: string
+  isInitiator?: boolean
+  isDecide: boolean
+  friendUid: string
+  reqType: BuddyReqType
+  reqTime: string // 时间戳,秒
+  extWords: string // 申请人填写的验证消息
+  isUnread: boolean
+  friendNick: string
+  sourceId: number
+  groupCode: string
 }
 
 export interface FriendRequestNotify {
-    data: {
-        unreadNums: number,
-        buddyReqs: FriendRequest[]
-    }
+  data: {
+    unreadNums: number
+    buddyReqs: FriendRequest[]
+  }
 }

src/ntqqapi/types/user.ts

@@ -1,75 +1,361 @@
 export enum Sex {
-    male = 0,
-    female = 2,
-    unknown = 255,
+  Unknown = 0,
+  Male = 1,
+  Female = 2,
+  Hidden = 255
 }
 
 export interface QQLevel {
-    "crownNum": number,
-    "sunNum": number,
-    "moonNum": number,
-    "starNum": number
+  crownNum: number
+  sunNum: number
+  moonNum: number
+  starNum: number
 }
+
 export interface User {
-    uid: string; // 加密的字符串
-    uin: string; // QQ号
-    nick: string;
-    avatarUrl?: string;
-    longNick?: string; // 签名
-    remark?: string;
-    sex?: Sex;
-    qqLevel?: QQLevel,
-    qid?: string
-    "birthday_year"?: number,
-    "birthday_month"?: number,
-    "birthday_day"?: number,
-    "topTime"?: string,
-    "constellation"?: number,
-    "shengXiao"?: number,
-    "kBloodType"?: number,
-    "homeTown"?: string, //"0-0-0",
-    "makeFriendCareer"?: number,
-    "pos"?: string,
-    "eMail"?: string
-    "phoneNum"?: string,
-    "college"?: string,
-    "country"?: string,
-    "province"?: string,
-    "city"?: string,
-    "postCode"?: string,
-    "address"?: string,
-    "isBlock"?: boolean,
-    "isSpecialCareOpen"?: boolean,
-    "isSpecialCareZone"?: boolean,
-    "ringId"?: string,
-    "regTime"?: number,
-    interest?: string,
-    "labels"?: string[],
-    "isHideQQLevel"?: number,
-    "privilegeIcon"?: {
-        "jumpUrl": string,
-        "openIconList": unknown[],
-        "closeIconList": unknown[]
-    },
-    "photoWall"?: {
-        "picList": unknown[]
-    },
-    "vipFlag"?: boolean,
-    "yearVipFlag"?: boolean,
-    "svipFlag"?: boolean,
-    "vipLevel"?: number,
-    "status"?: number,
-    "qidianMasterFlag"?: number,
-    "qidianCrewFlag"?: number,
-    "qidianCrewFlag2"?: number,
-    "extStatus"?: number,
-    "recommendImgFlag"?: number,
-    "disableEmojiShortCuts"?: number,
-    "pendantId"?: string,
+  uid: string // 加密的字符串
+  uin: string // QQ号
+  nick: string
+  avatarUrl?: string
+  longNick?: string // 签名
+  remark?: string
+  sex?: Sex
+  qqLevel?: QQLevel
+  qid?: string
+  birthday_year?: number
+  birthday_month?: number
+  birthday_day?: number
+  topTime?: string
+  constellation?: number
+  shengXiao?: number
+  kBloodType?: number
+  homeTown?: string //"0-0-0",
+  makeFriendCareer?: number
+  pos?: string
+  eMail?: string
+  phoneNum?: string
+  college?: string
+  country?: string
+  province?: string
+  city?: string
+  postCode?: string
+  address?: string
+  isBlock?: boolean
+  isSpecialCareOpen?: boolean
+  isSpecialCareZone?: boolean
+  ringId?: string
+  regTime?: number
+  interest?: string
+  labels?: string[]
+  isHideQQLevel?: number
+  privilegeIcon?: {
+    jumpUrl: string
+    openIconList: unknown[]
+    closeIconList: unknown[]
+  }
+  photoWall?: {
+    picList: unknown[]
+  }
+  vipFlag?: boolean
+  yearVipFlag?: boolean
+  svipFlag?: boolean
+  vipLevel?: number
+  status?: number
+  qidianMasterFlag?: number
+  qidianCrewFlag?: number
+  qidianCrewFlag2?: number
+  extStatus?: number
+  recommendImgFlag?: number
+  disableEmojiShortCuts?: number
+  pendantId?: string
+  age?: number
 }
 
 export interface SelfInfo extends User {
-    online?: boolean;
+  online?: boolean
 }
 
-export interface Friend extends User {}
+export interface Friend extends User {
+}
+
+export interface CategoryFriend {
+  categoryId: number
+  categorySortId: number
+  categroyName: string
+  categroyMbCount: number
+  onlineCount: number
+  buddyList: User[] // V1
+  buddyUids: string[]
+}
+
+export interface CoreInfo {
+  uid: string
+  uin: string
+  nick: string
+  remark: string
+}
+
+export interface BaseInfo {
+  qid: string
+  longNick: string
+  birthday_year: number
+  birthday_month: number
+  birthday_day: number
+  age: number
+  sex: Sex
+  eMail: string
+  phoneNum: string
+  categoryId: number
+  richTime: number
+  richBuffer: Uint8Array
+}
+
+interface MusicInfo {
+  buf: string
+}
+
+interface VideoBizInfo {
+  cid: string
+  tvUrl: string
+  synchType: string
+}
+
+interface VideoInfo {
+  name: string
+}
+
+interface ExtOnlineBusinessInfo {
+  buf: string
+  customStatus: unknown
+  videoBizInfo: VideoBizInfo
+  videoInfo: VideoInfo
+}
+
+interface ExtBuffer {
+  buf: string
+}
+
+interface UserStatus {
+  uid: string
+  uin: string
+  status: number
+  extStatus: number
+  batteryStatus: number
+  termType: number
+  netType: number
+  iconType: number
+  customStatus: unknown
+  setTime: string
+  specialFlag: number
+  abiFlag: number
+  eNetworkType: number
+  showName: string
+  termDesc: string
+  musicInfo: MusicInfo
+  extOnlineBusinessInfo: ExtOnlineBusinessInfo
+  extBuffer: ExtBuffer
+}
+
+interface PrivilegeIcon {
+  jumpUrl: string
+  openIconList: unknown[]
+  closeIconList: unknown[]
+}
+
+interface VasInfo {
+  vipFlag: boolean
+  yearVipFlag: boolean
+  svipFlag: boolean
+  vipLevel: number
+  bigClub: boolean
+  bigClubLevel: number
+  nameplateVipType: number
+  grayNameplateFlag: number
+  superVipTemplateId: number
+  diyFontId: number
+  pendantId: number
+  pendantDiyId: number
+  faceId: number
+  vipFont: number
+  vipFontType: number
+  magicFont: number
+  fontEffect: number
+  newLoverDiamondFlag: number
+  extendNameplateId: number
+  diyNameplateIDs: unknown[]
+  vipStartFlag: number
+  vipDataFlag: number
+  gameNameplateId: string
+  gameLastLoginTime: string
+  gameRank: number
+  gameIconShowFlag: boolean
+  gameCardId: string
+  vipNameColorId: string
+  privilegeIcon: PrivilegeIcon
+}
+
+export interface SimpleInfo {
+  uid?: string
+  uin?: string
+  coreInfo: CoreInfo
+  baseInfo: BaseInfo
+  status: UserStatus | null
+  vasInfo: VasInfo | null
+  relationFlags: RelationFlags | null
+  otherFlags: unknown | null
+  intimate: unknown | null
+}
+
+interface RelationFlags {
+  topTime: string
+  isBlock: boolean
+  isMsgDisturb: boolean
+  isSpecialCareOpen: boolean
+  isSpecialCareZone: boolean
+  ringId: string
+  isBlocked: boolean
+  recommendImgFlag: number
+  disableEmojiShortCuts: number
+  qidianMasterFlag: number
+  qidianCrewFlag: number
+  qidianCrewFlag2: number
+  isHideQQLevel: number
+  isHidePrivilegeIcon: number
+}
+
+interface CommonExt {
+  constellation: number
+  shengXiao: number
+  kBloodType: number
+  homeTown: string
+  makeFriendCareer: number
+  pos: string
+  college: string
+  country: string
+  province: string
+  city: string
+  postCode: string
+  address: string
+  regTime: number
+  interest: string
+  labels: string[]
+  qqLevel: QQLevel
+}
+
+interface Pic {
+  picId: string
+  picTime: number
+  picUrlMap: Record<string, string>
+}
+
+interface PhotoWall {
+  picList: Pic[]
+}
+
+export interface UserDetailInfo {
+  uid: string
+  uin: string
+  simpleInfo: SimpleInfo
+  commonExt: CommonExt
+  photoWall: PhotoWall
+}
+
+export interface BuddyProfileLikeReq {
+  friendUids: string[]
+  basic: number
+  vote: number
+  favorite: number
+  userProfile: number
+  type: number
+  start: number
+  limit: number
+}
+
+export interface UserDetailInfoByUinV2 {
+  result: number
+  errMsg: string
+  detail: {
+    uid: string
+    uin: string
+    simpleInfo: SimpleInfo
+    commonExt: CommonExt
+    photoWall: null
+  }
+}
+
+export interface UserDetailInfoByUin {
+  result: number
+  errMsg: string
+  info: {
+    uid: string //这个没办法用
+    qid: string
+    uin: string
+    nick: string
+    remark: string
+    longNick: string
+    avatarUrl: string
+    birthday_year: number
+    birthday_month: number
+    birthday_day: number
+    sex: number
+    topTime: string
+    constellation: number
+    shengXiao: number
+    kBloodType: number
+    homeTown: string
+    makeFriendCareer: number
+    pos: string
+    eMail: string
+    phoneNum: string
+    college: string
+    country: string
+    province: string
+    city: string
+    postCode: string
+    address: string
+    isBlock: boolean
+    isSpecialCareOpen: boolean
+    isSpecialCareZone: boolean
+    ringId: string
+    regTime: number
+    interest: string
+    termType: number
+    labels: unknown[]
+    qqLevel: { crownNum: number, sunNum: number, moonNum: number, starNum: number }
+    isHideQQLevel: number
+    privilegeIcon: { jumpUrl: string, openIconList: unknown[], closeIconList: unknown[] }
+    isHidePrivilegeIcon: number
+    photoWall: { picList: unknown[] }
+    vipFlag: boolean
+    yearVipFlag: boolean
+    svipFlag: boolean
+    vipLevel: number
+    status: number
+    qidianMasterFlag: number
+    qidianCrewFlag: number
+    qidianCrewFlag2: number
+    extStatus: number
+    recommendImgFlag: number
+    disableEmojiShortCuts: number
+    pendantId: string
+    vipNameColorId: string
+  }
+}
+
+export enum BuddyListReqType {
+  KNOMAL,
+  KLETTER
+}
+
+export enum UserDetailSource {
+  KDB,
+  KSERVER
+}
+
+export enum ProfileBizType {
+  KALL,
+  KBASEEXTEND,
+  KVAS,
+  KQZONE,
+  KOTHER
+}

src/onebot11/action/BaseAction.ts

@@ -1,49 +1,51 @@
-import {ActionName, BaseCheckResult} from "./types"
-import {OB11Response} from "./OB11Response"
-import {OB11Return} from "../types";
+import { ActionName } from './types'
+import { OB11Response } from './OB11Response'
+import { OB11Return } from '../types'
+import { Context, Schema } from 'cordis'
+import type Adapter from '../adapter'
 
-import {log} from "../../common/utils/log";
+abstract class BaseAction<PayloadType, ReturnDataType> {
+  abstract actionName: ActionName
+  protected ctx: Context
+  payloadSchema?: Schema<PayloadType>
 
-class BaseAction<PayloadType, ReturnDataType> {
-    actionName: ActionName
+  constructor(protected adapter: Adapter) {
+    this.ctx = adapter.ctx
+  }
 
-    protected async check(payload: PayloadType): Promise<BaseCheckResult> {
-        return {
-            valid: true,
-        }
+  public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
+    let params: PayloadType
+    try {
+      params = this.payloadSchema ? new this.payloadSchema(payload) : payload
+    } catch (e) {
+      return OB11Response.error((e as Error).message, 400)
     }
-
-    public async handle(payload: PayloadType): Promise<OB11Return<ReturnDataType | null>> {
-        const result = await this.check(payload);
-        if (!result.valid) {
-            return OB11Response.error(result.message, 400);
-        }
-        try {
-            const resData = await this._handle(payload);
-            return OB11Response.ok(resData);
-        } catch (e) {
-            log("发生错误", e)
-            return OB11Response.error(e?.toString() || e?.stack?.toString() || "未知错误，可能操作超时", 200);
-        }
+    try {
+      const resData = await this._handle(params)
+      return OB11Response.ok(resData)
+    } catch (e) {
+      this.ctx.logger.error('发生错误', e)
+      return OB11Response.error((e as Error)?.toString() || (e as Error)?.stack?.toString() || '未知错误，可能操作超时', 200)
     }
+  }
 
-    public async websocketHandle(payload: PayloadType, echo: any): Promise<OB11Return<ReturnDataType | null>> {
-        const result = await this.check(payload)
-        if (!result.valid) {
-            return OB11Response.error(result.message, 1400)
-        }
-        try {
-            const resData = await this._handle(payload)
-            return OB11Response.ok(resData, echo);
-        } catch (e) {
-            log("发生错误", e)
-            return OB11Response.error(e.stack?.toString() || e.toString(), 1200, echo)
-        }
+  public async websocketHandle(payload: PayloadType, echo: unknown): Promise<OB11Return<ReturnDataType | null>> {
+    let params: PayloadType
+    try {
+      params = this.payloadSchema ? new this.payloadSchema(payload) : payload
+    } catch (e) {
+      return OB11Response.error((e as Error).message, 1400)
     }
+    try {
+      const resData = await this._handle(params)
+      return OB11Response.ok(resData, echo)
+    } catch (e) {
+      this.ctx.logger.error('发生错误', e)
+      return OB11Response.error((e as Error)?.stack?.toString() || String(e), 1200, echo)
+    }
+  }
 
-    protected async _handle(payload: PayloadType): Promise<ReturnDataType> {
-        throw `pleas override ${this.actionName} _handle`;
-    }
+  protected abstract _handle(payload: PayloadType): Promise<ReturnDataType>
 }
 
-export default BaseAction
+export { BaseAction, Schema }

src/onebot11/action/OB11Response.ts

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

src/onebot11/action/file/GetFile.ts

@@ -1,110 +1,90 @@
-import BaseAction from "../BaseAction";
-import fs from "fs/promises";
-import {dbUtil} from "../../../common/db";
-import {getConfigUtil} from "../../../common/config";
-import {log, sleep, uri2local} from "../../../common/utils";
-import {NTQQFileApi} from "../../../ntqqapi/api/file";
-import {ActionName} from "../types";
-import {FileElement, RawMessage, VideoElement} from "../../../ntqqapi/types";
+import { BaseAction, Schema } from '../BaseAction'
+import { readFile } from 'node:fs/promises'
+import { ActionName } from '../types'
+import { Peer, ElementType } from '@/ntqqapi/types'
 
 export interface GetFilePayload {
-    file: string // 文件名或者fileUuid
+  file: string // 文件名或者fileUuid
 }
 
 export interface GetFileResponse {
-    file?: string  // path
-    url?: string
-    file_size?: string
-    file_name?: string
-    base64?: string
+  file?: string // path
+  url?: string
+  file_size?: string
+  file_name?: string
+  base64?: string
 }
 
+export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
+  payloadSchema = Schema.object({
+    file: Schema.string().required()
+  })
 
-export class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-    private getElement(msg: RawMessage): {id: string, element: VideoElement | FileElement}{
-        let element =  msg.elements.find(e=>e.fileElement)
-        if (!element){
-            element = msg.elements.find(e=>e.videoElement)
-            return {id: element.elementId, element: element.videoElement}
-        }
-        return {id: element.elementId, element: element.fileElement}
+  protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
+    const { enableLocalFile2Url } = this.adapter.config
+
+    let fileCache = await this.ctx.store.getFileCacheById(payload.file)
+    if (!fileCache?.length) {
+      fileCache = await this.ctx.store.getFileCacheByName(payload.file)
     }
-    protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
-        const cache = await dbUtil.getFileCache(payload.file)
-        const {autoDeleteFile, enableLocalFile2Url, autoDeleteFileSecond} = getConfigUtil().getConfig()
-        if (!cache) {
-            throw new Error('file not found')
+
+    if (fileCache?.length) {
+      const downloadPath = await this.ctx.ntFileApi.downloadMedia(
+        fileCache[0].msgId,
+        fileCache[0].chatType,
+        fileCache[0].peerUid,
+        fileCache[0].elementId,
+        '',
+        ''
+      )
+      const res: GetFileResponse = {
+        file: downloadPath,
+        url: downloadPath,
+        file_size: fileCache[0].fileSize,
+        file_name: fileCache[0].fileName,
+      }
+      const peer: Peer = {
+        chatType: fileCache[0].chatType,
+        peerUid: fileCache[0].peerUid,
+        guildId: ''
+      }
+      if (fileCache[0].elementType === ElementType.Pic) {
+        const msgList = await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [fileCache[0].msgId])
+        if (msgList.msgList.length === 0) {
+          throw new Error('msg not found')
         }
-        if (cache.downloadFunc) {
-            await cache.downloadFunc()
+        const msg = msgList.msgList[0]
+        const findEle = msg.elements.find(e => e.elementId === fileCache[0].elementId)
+        if (!findEle) {
+          throw new Error('element not found')
         }
+        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement!)
+      } else if (fileCache[0].elementType === ElementType.Video) {
+        res.url = await this.ctx.ntFileApi.getVideoUrl(peer, fileCache[0].msgId, fileCache[0].elementId)
+      }
+      if (enableLocalFile2Url && downloadPath && (res.file === res.url || res.url === undefined)) {
         try {
-            await fs.access(cache.filePath, fs.constants.F_OK)
+          res.base64 = await readFile(downloadPath, 'base64')
         } catch (e) {
-            log("file not found", e)
-            if (cache.url){
-                const downloadResult = await uri2local(cache.url)
-                if (downloadResult.success) {
-                    cache.filePath = downloadResult.path
-                    dbUtil.addFileCache(payload.file, cache).then()
-                } else {
-                    throw new Error("file download failed. " + downloadResult.errMsg)
-                }
-            }
-            else{
-                // 没有url的可能是私聊文件或者群文件，需要自己下载
-                log("需要调用 NTQQ 下载文件api")
-                if (cache.msgId) {
-                    let msg = await dbUtil.getMsgByLongId(cache.msgId)
-                    if (msg){
-                        log("找到了文件 msg", msg)
-                        let element = this.getElement(msg);
-                        log("找到了文件 element", element);
-                        // 构建下载函数
-                        await NTQQFileApi.downloadMedia(msg.msgId, msg.chatType, msg.peerUid,
-                            element.id, "", "", true)
-                        await sleep(1000);
-                        msg = await dbUtil.getMsgByLongId(cache.msgId)
-                        log("下载完成后的msg", msg)
-                        cache.filePath = this.getElement(msg).element.filePath
-                        dbUtil.addFileCache(payload.file, cache).then()
-                    }
-                }
-            }
-
+          throw new Error('文件下载失败. ' + e)
         }
-        let res: GetFileResponse = {
-            file: cache.filePath,
-            url: cache.url,
-            file_size: cache.fileSize,
-            file_name: cache.fileName
-        }
-        if (enableLocalFile2Url) {
-            if (!cache.url) {
-                try{
-                    res.base64 = await fs.readFile(cache.filePath, 'base64')
-                }catch (e) {
-                    throw new Error("文件下载失败. " + e)
-                }
-            }
-        }
-        // if (autoDeleteFile) {
-        //     setTimeout(() => {
-        //         fs.unlink(cache.filePath)
-        //     }, autoDeleteFileSecond * 1000)
-        // }
-        return res
+      }
+      //不手动删除？文件持久化了
+      return res
     }
+    throw new Error('file not found')
+  }
 }
 
 export default class GetFile extends GetFileBase {
-    actionName = ActionName.GetFile
+  actionName = ActionName.GetFile
+  payloadSchema = Schema.object({
+    file: Schema.string(),
+    file_id: Schema.string().required()
+  })
 
-    protected async _handle(payload: {file_id: string, file: string}): Promise<GetFileResponse> {
-        if (!payload.file_id) {
-            throw new Error('file_id 不能为空')
-        }
-        payload.file = payload.file_id
-        return super._handle(payload);
-    }
-}
+  protected async _handle(payload: { file_id: string, file: string }): Promise<GetFileResponse> {
+    payload.file = payload.file_id
+    return super._handle(payload)
+  }
+}

src/onebot11/action/file/GetImage.ts

@@ -1,7 +1,6 @@
-import {GetFileBase} from "./GetFile";
-import {ActionName} from "../types";
-
+import { GetFileBase } from './GetFile'
+import { ActionName } from '../types'
 
 export default class GetImage extends GetFileBase {
-    actionName = ActionName.GetImage
-}
+  actionName = ActionName.GetImage
+}

src/onebot11/action/file/GetRecord.ts

@@ -1,15 +1,29 @@
-import {GetFileBase, GetFilePayload, GetFileResponse} from "./GetFile";
-import {ActionName} from "../types";
+import path from 'node:path'
+import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
+import { ActionName } from '../types'
+import { decodeSilk } from '@/common/utils/audio'
+import { Schema } from '../BaseAction'
+import { stat, readFile } from 'node:fs/promises'
 
 interface Payload extends GetFilePayload {
-    out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
+  out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
 }
 
 export default class GetRecord extends GetFileBase {
-    actionName = ActionName.GetRecord
+  actionName = ActionName.GetRecord
+  payloadSchema = Schema.object({
+    file: Schema.string().required(),
+    out_format: Schema.string().default('mp3')
+  })
 
-    protected async _handle(payload: Payload): Promise<GetFileResponse> {
-        let res = super._handle(payload);
-        return res;
+  protected async _handle(payload: Payload): Promise<GetFileResponse> {
+    const res = await super._handle(payload)
+    res.file = await decodeSilk(this.ctx, res.file!, payload.out_format)
+    res.file_name = path.basename(res.file)
+    res.file_size = (await stat(res.file)).size.toString()
+    if (this.adapter.config.enableLocalFile2Url) {
+      res.base64 = await readFile(res.file, 'base64')
     }
-}
+    return res
+  }
+}

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

@@ -0,0 +1,21 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+  name: string
+  parent_id?: '/'
+}
+
+export class CreateGroupFileFolder extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_CreateGroupFileFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    name: Schema.string().required(),
+  })
+
+  async _handle(payload: Payload) {
+    await this.ctx.ntGroupApi.createGroupFileFolder(payload.group_id.toString(), payload.name)
+    return null
+  }
+}

src/onebot11/action/go-cqhttp/DelEssenceMsg.ts

@@ -0,0 +1,24 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  message_id: number | string
+}
+
+export class DeleteEssenceMsg extends BaseAction<Payload, unknown> {
+  actionName = ActionName.GoCQHTTP_DelEssenceMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
+    if (!msg) {
+      throw new Error('msg not found')
+    }
+    return await this.ctx.ntGroupApi.removeGroupEssence(
+      msg.peer.peerUid,
+      msg.msgId,
+    )
+  }
+}

src/onebot11/action/go-cqhttp/DelGroupFile.ts

@@ -0,0 +1,22 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+  file_id: string
+  busid: number | string
+}
+
+export class DelGroupFile extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_DelGroupFile
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file_id: Schema.string().required(),
+    busid: Schema.union([Number, String]).default(102)
+  })
+
+  async _handle(payload: Payload) {
+    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id], [+payload.busid])
+    return null
+  }
+}