bump version

Update LICENSE

.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:

.gitignore

@@ -11,5 +11,6 @@ node_modules
 dist
 out
 
-.idea/
 .DS_Store
+.idea
+.vscode

LICENSE

@@ -1,25 +1,339 @@
-MIT Without Public Social Media Promotion 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
+                            Preamble
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all
+  The licenses for most software are designed to take away your
-copies or substantial portions of the Software.
+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
+  When we speak of free software, we are referring to freedom, not
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+price.  Our General Public Licenses are designed to make sure that you
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+have the freedom to distribute copies of free software (and charge for
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+this service if you wish), that you receive source code or can get it
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+if you want it, that you can change the software or use pieces of it
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+in new free programs; and that you know you can do these things.
-SOFTWARE.
 
-You may use this software in accordance with the above terms, but you are not 
+  To protect your rights, we need to make restrictions that forbid
-allowed to promote this project or your projects based on this project on any 
+anyone to deny you these rights or to ask you to surrender the rights.
-public social media.
+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,6 +1,6 @@
 # LLOneBot
 
-LiteLoaderQQNT 插件，实现 OneBot 11 协议，用于 QQ 机器人开发
+LiteLoaderQQNT 插件，实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发
 
 > [!CAUTION]\
 > 请不要在 QQ 官方群聊和任何影响力较大的简中互联网平台（包括但不限于: 哔哩哔哩，微博，知乎，抖音等）发布和讨论任何与本插件存在相关性的信息
@@ -23,9 +23,13 @@ TG 群：<https://t.me/+nLZEnpne-pQ1OWFl>
 
 [![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)
+
 ## 鸣谢
 
-- [NapCatQQ](https://github.com/NapNeko/NapCatQQ)
+- [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)

electron.vite.config.ts

@@ -31,7 +31,6 @@ const config: ElectronViteConfig = {
     resolve: {
       alias: {
         '@': path.resolve(__dirname, './src'),
-        './lib-cov/fluent-ffmpeg': './lib/fluent-ffmpeg',
       },
     },
     plugins: [
@@ -40,6 +39,7 @@ const config: ElectronViteConfig = {
           ...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' },
         ],
       }),
     ],

manifest.json

@@ -3,13 +3,17 @@
   "type": "extension",
   "name": "LLOneBot",
   "slug": "LLOneBot",
-  "description": "实现 OneBot 11 协议，用于 QQ 机器人开发",
+  "description": "实现 OneBot 11 和 Satori 协议，用于 QQ 机器人开发",
-  "version": "3.31.10",
+  "version": "4.4.0",
   "icon": "./icon.webp",
   "authors": [
     {
       "name": "linyuchen",
       "link": "https://github.com/linyuchen"
+    },
+    {
+      "name": "idranme",
+      "link": "https://github.com/idranme"
     }
   ],
   "repository": {

package.json

@@ -7,39 +7,43 @@
   "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"
+    "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": "MIT",
   "dependencies": {
-    "@minatojs/driver-sqlite": "^4.5.0",
+    "@minatojs/driver-sqlite": "^4.6.0",
-    "compressing": "^1.10.1",
+    "@satorijs/element": "^3.1.7",
-    "cordis": "^3.18.0",
+    "@satorijs/protocol": "^1.4.2",
+    "compare-versions": "^6.1.1",
+    "cordis": "^3.18.1",
     "cors": "^2.8.5",
-    "cosmokit": "^1.6.2",
+    "cosmokit": "^1.6.3",
-    "express": "^4.19.2",
+    "express": "^5.0.1",
-    "fast-xml-parser": "^4.5.0",
-    "file-type": "^19.4.1",
     "fluent-ffmpeg": "^2.1.3",
-    "minato": "^3.5.1",
+    "minato": "^3.6.1",
-    "silk-wasm": "^3.6.1",
+    "protobufjs": "^7.4.0",
+    "silk-wasm": "^3.6.3",
+    "ts-case-convert": "^2.1.0",
     "ws": "^8.18.0"
   },
   "devDependencies": {
     "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
+    "@types/express": "^5.0.0",
-    "@types/fluent-ffmpeg": "^2.1.26",
+    "@types/fluent-ffmpeg": "^2.1.27",
     "@types/node": "^20.14.15",
-    "@types/ws": "^8.5.12",
+    "@types/ws": "^8.5.13",
     "electron": "^31.4.0",
     "electron-vite": "^2.3.0",
-    "typescript": "^5.5.4",
+    "protobufjs-cli": "^1.1.3",
-    "vite": "^5.4.3",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.10",
     "vite-plugin-cp": "^4.0.8"
   },
-  "packageManager": "yarn@4.4.1"
+  "packageManager": "yarn@4.5.1"
 }

scripts/gen-manifest.ts

@@ -6,13 +6,17 @@ const manifest = {
   type: 'extension',
   name: 'LLOneBot',
   slug: 'LLOneBot',
-  description: '实现 OneBot 11 协议，用于 QQ 机器人开发',
+  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: {
@@ -35,4 +39,4 @@ const manifest = {
   }
 }
 
-writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))
+writeFileSync('manifest.json', JSON.stringify(manifest, null, 2))

src/common/channels.ts

@@ -1,6 +1,5 @@
 export const CHANNEL_GET_CONFIG = 'llonebot_get_config'
 export const CHANNEL_SET_CONFIG = 'llonebot_set_config'
-export const CHANNEL_SET_CONFIG_CONFIRMED = 'llonebot_set_config_confirmed'
 export const CHANNEL_LOG = 'llonebot_log'
 export const CHANNEL_ERROR = 'llonebot_error'
 export const CHANNEL_UPDATE = 'llonebot_update'

src/common/config.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs'
 import path from 'node:path'
-import { Config, OB11Config } from './types'
+import { Config, OB11Config, SatoriConfig } from './types'
 import { selfInfo, DATA_DIR } from './globalVars'
 import { mergeNewProperties } from './utils/misc'
 
@@ -22,6 +22,7 @@ export class ConfigUtil {
 
   reloadConfig(): Config {
     const ob11Default: OB11Config = {
+      enable: true,
       httpPort: 3000,
       httpHosts: [],
       httpSecret: '',
@@ -33,18 +34,24 @@ export class ConfigUtil {
       enableWsReverse: false,
       messagePostFormat: 'array',
       enableHttpHeart: false,
-      enableQOAutoQuote: false,
+      listenLocalhost: 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: false,
+      log: true,
-      reportSelfMessage: false,
       autoDeleteFile: false,
       autoDeleteFileSecond: 60,
       musicSignUrl: '',
@@ -67,6 +74,7 @@ export class ConfigUtil {
       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
     }
@@ -80,8 +88,8 @@ export class ConfigUtil {
   private checkOldConfig(
     currentConfig: OB11Config,
     oldConfig: Config,
-    currentKey: 'httpPort' | 'httpHosts' | 'wsPort',
+    currentKey: 'httpPort' | 'httpHosts' | 'wsPort' | 'reportSelfMessage',
-    oldKey: 'http' | 'hosts' | 'wsPort',
+    oldKey: 'http' | 'hosts' | 'wsPort' | 'reportSelfMessage',
   ) {
     // 迁移旧的配置到新配置，避免用户重新填写配置
     const oldValue = oldConfig[oldKey]

src/common/globalVars.ts

@@ -19,4 +19,4 @@ export const selfInfo: SelfInfo = {
   uin: '',
   nick: '',
   online: true,
-}
+}

src/common/types.ts

@@ -1,4 +1,5 @@
 export interface OB11Config {
+  enable: boolean
   httpPort: number
   httpHosts: string[]
   httpSecret?: string
@@ -10,23 +11,30 @@ export interface OB11Config {
   enableWsReverse?: boolean
   messagePostFormat?: 'array' | 'string'
   enableHttpHeart?: boolean
-  enableQOAutoQuote: boolean  // 快速操作回复自动引用原消息
+  /**
+   * 快速操作回复自动引用原消息
+   * @deprecated
+   */
+  enableQOAutoQuote?: boolean
   listenLocalhost: boolean
+  reportSelfMessage: boolean
 }
 
-export interface CheckVersion {
+export interface SatoriConfig {
-  result: boolean
+  enable: boolean
-  version: string
+  listen: string
+  port: number
+  token: string
 }
 
 export interface Config {
   enableLLOB: boolean
+  satori: SatoriConfig
   ob11: OB11Config
   token?: string
   heartInterval: number // ms
   enableLocalFile2Url?: boolean // 开启后，本地文件路径图片会转成http链接, 语音会转成base64
   debug?: boolean
-  reportSelfMessage?: boolean
   log?: boolean
   autoDeleteFile?: boolean
   autoDeleteFileSecond?: number
@@ -41,6 +49,13 @@ export interface Config {
   hosts?: string[]
   /** @deprecated */
   wsPort?: string
+  /** @deprecated */
+  reportSelfMessage?: boolean
+}
+
+export interface CheckVersion {
+  result: boolean
+  version: string
 }
 
 export interface LLOneBotError {
@@ -70,4 +85,4 @@ export interface FileCacheV2 {
   chatType: number
   elementId: string
   elementType: number
-}
+}

src/common/utils/audio.ts

@@ -53,55 +53,50 @@ function convert(ctx: Context, input: Input, options: FFmpegOptions, outputPath?
 }
 
 export async function encodeSilk(ctx: Context, filePath: string) {
-  try {
+  const file = await fsPromise.readFile(filePath)
-    const file = await fsPromise.readFile(filePath)
+  if (!isSilk(file)) {
-    if (!isSilk(file)) {
+    ctx.logger.info(`语音文件${filePath}需要转换成silk`)
-      ctx.logger.info(`语音文件${filePath}需要转换成silk`)
+    let result: EncodeResult
-      let result: EncodeResult
+    const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
-      const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000]
+    if (isWav(file) && allowSampleRate.includes(getWavFileInfo(file).fmt.sampleRate)) {
-      if (isWav(file) && allowSampleRate.includes(getWavFileInfo(file).fmt.sampleRate)) {
+      result = await encode(file, 0)
-        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
+      const input = await convert(ctx, filePath, {
-      let duration = 1
+        output: [
-      try {
+          '-ar 24000',
-        duration = getDuration(silk) / 1000
+          '-ac 1',
-      } catch (e) {
+          '-f s16le'
-        ctx.logger.warn('获取语音文件时长失败, 默认为1秒', filePath, (e as Error).stack)
+        ]
-      }
+      })
-      return {
+      result = await encode(input, 24000)
-        converted: false,
+    }
-        path: filePath,
+    const pttPath = path.join(TEMP_DIR, randomUUID())
-        duration,
+    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,
     }
-  } catch (err) {
-    ctx.logger.error('convert silk failed', (err as Error).stack)
-    return {}
   }
 }
 
 type OutFormat = 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
 
-export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat: OutFormat = 'mp3') {
+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))
@@ -115,4 +110,4 @@ export async function decodeSilk(ctx: Context, inputFilePath: string, outFormat:
       '-ac 1'
     ]
   }, outFilePath)
-}
+}

src/common/utils/file.ts

@@ -4,14 +4,7 @@ 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 isGIF(path: string) {
-  const buffer = Buffer.alloc(4)
-  const fd = fs.openSync(path, 'r')
-  fs.readSync(fd, buffer, 0, 4, 0)
-  fs.closeSync(fd)
-  return buffer.toString() === 'GIF8'
-}
 
 // 定义一个异步函数来检查文件是否存在
 export function checkFileReceived(path: string, timeout: number = 3000): Promise<void> {
@@ -34,9 +27,10 @@ export function checkFileReceived(path: string, timeout: number = 3000): Promise
 
 export function calculateFileMD5(filePath: string): Promise<string> {
   return new Promise((resolve, reject) => {
+    const hash = createHash('md5')
+
     // 创建一个流式读取器
     const stream = fs.createReadStream(filePath)
-    const hash = createHash('md5')
 
     stream.on('data', (data: Buffer) => {
       // 当读取到数据时，更新哈希对象的状态
@@ -90,17 +84,26 @@ interface FetchFileRes {
 }
 
 export async function fetchFile(url: string, headersInit?: Record<string, string>): Promise<FetchFileRes> {
-  const headers: Record<string, string> = {
+  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
-  }
+  })
-  const raw = await fetch(url, { headers }).catch((err) => {
+  let raw = await fetch(url, { headers }).catch((err) => {
     if (err.cause) {
       throw err.cause
     }
     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()),
@@ -116,12 +119,15 @@ type Uri2LocalRes = {
   isLocal: boolean
 }
 
-export async function uri2local(uri: string, filename?: string): Promise<Uri2LocalRes> {
+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 fileUri = uri.replace('%', '%25').replace('#', '%23')
+    const filePath = fileURLToPath(fileUri)
     const fileName = path.basename(filePath)
+    // console.log('fileURLToPath', filePath)
+    // console.log('fileName', fileName)
     return { success: true, errMsg: '', fileName, path: filePath, isLocal: true }
   }
 
@@ -134,13 +140,20 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
     try {
       const res = await fetchFile(uri)
       const match = res.url.match(/.+\/([^/?]*)(?=\?)?/)
+      let filename: string
       if (match?.[1]) {
-        filename ??= match[1].replace(/[/\\:*?"<>|]/g, '_')
+        filename = match[1].replace(/[/\\:*?"<>|]/g, '_')
       } else {
-        filename ??= randomUUID()
+        filename = randomUUID()
       }
-      const filePath = path.join(TEMP_DIR, filename)
+      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) {
       const errMsg = `${uri} 下载失败, ${(e as Error).message}`
@@ -149,10 +162,16 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
   }
 
   if (type === FileUriType.OneBotBase64) {
-    filename ??= randomUUID()
+    let filename = randomUUID()
-    const filePath = path.join(TEMP_DIR, filename)
+    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}`
+    }
     return { success: true, errMsg: '', fileName: filename, path: filePath, isLocal: false }
   }
 
@@ -160,36 +179,19 @@ export async function uri2local(uri: string, filename?: string): Promise<Uri2Loc
     // 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) {
-      filename ??= randomUUID()
+      let filename = randomUUID()
       const [, _type, base64] = capture
-      const filePath = path.join(TEMP_DIR, filename)
+      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 }
     }
   }
 
   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 (const 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/legacyLog.ts

@@ -2,24 +2,7 @@ import fs from 'fs'
 import path from 'node:path'
 import { getConfigUtil } from '../config'
 import { LOG_DIR } from '../globalVars'
-import { Dict } from 'cosmokit'
+import { inspect } from 'node:util'
-
-function truncateString(obj: Dict | null, 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 const logFileName = `llonebot-${new Date().toLocaleString('zh-CN')}.log`.replace(/\//g, '-').replace(/:/g, '-')
 
@@ -29,12 +12,16 @@ export function log(...msg: unknown[]) {
   }
   let logMsg = ''
   for (const msgItem of msg) {
-    // 判断是否是对象
     if (typeof msgItem === 'object') {
-      logMsg += JSON.stringify(truncateString(msgItem)) + ' '
+      logMsg += inspect(msgItem, {
-      continue
+        depth: 10,
+        compact: true,
+        breakLength: Infinity,
+        maxArrayLength: 220
+      }) + ' '
+    } else {
+      logMsg += msgItem + ' '
     }
-    logMsg += msgItem + ' '
   }
   const currentDateTime = new Date().toLocaleString()
   logMsg = `${currentDateTime} ${logMsg}\n\n`

src/common/utils/messageUnique.ts

@@ -1,163 +0,0 @@
-import fsPromise from 'node:fs/promises'
-import fs from 'node:fs'
-import path from 'node:path'
-import Database, { Tables } from 'minato'
-import SQLite from '@minatojs/driver-sqlite'
-import { Peer } from '@/ntqqapi/types'
-import { createHash } from 'node:crypto'
-import { LimitedHashTable } from './table'
-import { DATA_DIR } from '../globalVars'
-import { FileCacheV2 } from '../types'
-
-interface SQLiteTables extends Tables {
-  message: {
-    shortId: number
-    msgId: string
-    chatType: number
-    peerUid: string
-  }
-  file_v2: FileCacheV2
-}
-
-interface MsgIdAndPeerByShortId {
-  MsgId: string
-  Peer: Peer
-}
-
-// forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/common/utils/MessageUnique.ts#L84
-class MessageUniqueWrapper {
-  private msgDataMap: LimitedHashTable<string, number>
-  private msgIdMap: LimitedHashTable<string, number>
-  private db: Database<SQLiteTables> | undefined
-
-  constructor(maxMap: number = 1000) {
-    this.msgIdMap = new LimitedHashTable<string, number>(maxMap)
-    this.msgDataMap = new LimitedHashTable<string, number>(maxMap)
-  }
-
-  async init(uin: string) {
-    const dbDir = path.join(DATA_DIR, 'database')
-    if (!fs.existsSync(dbDir)) {
-      await fsPromise.mkdir(dbDir)
-    }
-    const database = new Database<SQLiteTables>()
-    await database.connect(SQLite, {
-      path: path.join(dbDir, `${uin}.db`)
-    })
-    database.extend('message', {
-      shortId: 'integer(10)',
-      chatType: 'unsigned',
-      msgId: 'string(24)',
-      peerUid: 'string(24)'
-    }, {
-      primary: 'shortId'
-    })
-    database.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']
-    })
-    this.db = database
-  }
-
-  async getRecentMsgIds(Peer: Peer, size: number): Promise<string[]> {
-    const heads = this.msgIdMap.getHeads(size)
-    if (!heads) {
-      return []
-    }
-    const data: (MsgIdAndPeerByShortId | undefined)[] = []
-    for (const t of heads) {
-      data.push(await MessageUnique.getMsgIdAndPeerByShortId(t.value))
-    }
-    const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid)
-    return ret.map((t) => t?.MsgId).filter((t) => t !== undefined)
-  }
-
-  createMsg(peer: Peer, msgId: string): number {
-    const key = `${msgId}|${peer.chatType}|${peer.peerUid}`
-    const hash = createHash('md5').update(key).digest()
-    //设置第一个bit为0 保证shortId为正数
-    hash[0] &= 0x7f
-    const shortId = hash.readInt32BE(0)
-    //减少性能损耗
-    // const isExist = this.msgIdMap.getKey(shortId)
-    // if (isExist && isExist === msgId) {
-    //   return shortId
-    // }
-    this.msgIdMap.set(msgId, shortId)
-    this.msgDataMap.set(key, shortId)
-    this.db?.upsert('message', [{
-      msgId,
-      shortId,
-      chatType: peer.chatType,
-      peerUid: peer.peerUid
-    }], 'shortId').then()
-    return shortId
-  }
-
-  async getMsgIdAndPeerByShortId(shortId: number): Promise<MsgIdAndPeerByShortId | undefined> {
-    const data = this.msgDataMap.getKey(shortId)
-    if (data) {
-      const [msgId, chatTypeStr, peerUid] = data.split('|')
-      const peer: Peer = {
-        chatType: parseInt(chatTypeStr),
-        peerUid,
-        guildId: '',
-      }
-      return { MsgId: msgId, Peer: peer }
-    }
-    const items = await this.db?.get('message', { shortId })
-    if (items?.length) {
-      const { msgId, chatType, peerUid } = items[0]
-      return {
-        MsgId: msgId,
-        Peer: {
-          chatType,
-          peerUid,
-          guildId: '',
-        }
-      }
-    }
-    return undefined
-  }
-
-  getShortIdByMsgId(msgId: string): number | undefined {
-    return this.msgIdMap.getValue(msgId)
-  }
-
-  async getPeerByMsgId(msgId: string) {
-    const shortId = this.msgIdMap.getValue(msgId)
-    if (!shortId) return undefined
-    return await this.getMsgIdAndPeerByShortId(shortId)
-  }
-
-  resize(maxSize: number): void {
-    this.msgIdMap.resize(maxSize)
-    this.msgDataMap.resize(maxSize)
-  }
-
-  addFileCache(data: FileCacheV2) {
-    return this.db?.upsert('file_v2', [data], 'fileUuid')
-  }
-
-  getFileCacheByName(fileName: string) {
-    return this.db?.get('file_v2', { fileName }, {
-      sort: { msgTime: 'desc' }
-    })
-  }
-
-  getFileCacheById(fileUuid: string) {
-    return this.db?.get('file_v2', { fileUuid })
-  }
-}
-
-export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper()

src/common/utils/misc.ts

@@ -1,5 +1,5 @@
 import { QQLevel } from '@/ntqqapi/types'
-import { Dict } from 'cosmokit'
+import { Dict, isNullable } from 'cosmokit'
 
 export function isNumeric(str: string) {
   return /^\d+$/.test(str)
@@ -12,8 +12,9 @@ export function calcQQLevel(level: QQLevel) {
 
 /** QQ Build Version  */
 export function getBuildVersion(): number {
-  const version: string = globalThis.LiteLoader.versions.qqnt
+  //const version: string = globalThis.LiteLoader.versions.qqnt
-  return +version.split('-')[1]
+  //return +version.split('-')[1]
+  return +globalThis.LiteLoader.package.qqnt.buildVersion
 }
 
 /** 在保证老对象已有的属性不变化的情况下将新对象的属性复制到老对象 */
@@ -32,4 +33,15 @@ export function mergeNewProperties(newObj: Dict, oldObj: Dict) {
       }
     }
   })
-}
+}
+
+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/table.ts

@@ -16,12 +16,11 @@ export class LimitedHashTable<K, V> {
     this.keyToValue.set(key, value)
     this.valueToKey.set(value, key)
     while (this.keyToValue.size !== this.valueToKey.size) {
-      console.log('keyToValue.size !== valueToKey.size Error Atom')
       this.keyToValue.clear()
       this.valueToKey.clear()
     }
     while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
-      const oldestKey = this.keyToValue.keys().next().value
+      const oldestKey = this.keyToValue.keys().next().value!
       this.valueToKey.delete(this.keyToValue.get(oldestKey)!)
       this.keyToValue.delete(oldestKey)
     }
@@ -56,7 +55,7 @@ export class LimitedHashTable<K, V> {
   }
 
   //获取最近刚写入的几个值
-  getHeads(size: number): { key: K; value: V }[] | undefined {
+  getHeads(size: number): { key: K, value: V }[] | undefined {
     const keyList = this.getKeyList()
     if (keyList.length === 0) {
       return undefined

src/common/utils/upgrade.ts

@@ -1,98 +1,73 @@
 import path from 'node:path'
-import compressing from 'compressing'
 import { writeFile } from 'node:fs/promises'
 import { version } from '../../version'
-import { copyFolder, log, fetchFile } from '.'
+import { log, fetchFile } from '.'
-import { PLUGIN_DIR, TEMP_DIR } from '../globalVars'
+import { TEMP_DIR } from '../globalVars'
+import { compare } from 'compare-versions'
 
-const downloadMirrorHosts = ['https://mirror.ghproxy.com/']
+const downloadMirrorHosts = ['https://ghp.ci/']
-const checkVersionMirrorHosts = ['https://kkgithub.com']
+const releasesMirrorHosts = ['https://kkgithub.com']
 
 export async function checkNewVersion() {
-  const latestVersionText = await getRemoteVersion()
+  const latestVersion = await getRemoteVersion()
-  const latestVersion = latestVersionText.split('.')
+  log('LLOneBot latest version', latestVersion)
-  //log('llonebot last version', latestVersion)
+  if (latestVersion === '') {
-  const currentVersion: string[] = version.split('.')
+    return { result: false, version: latestVersion }
-  //log('llonebot current version', currentVersion)
+  }
-  for (const k of [0, 1, 2]) {
+  if (compare(latestVersion, version, '>')) {
-    if (parseInt(latestVersion[k]) > parseInt(currentVersion[k])) {
+    return { result: true, version: latestVersion }
-      log('')
-      return { result: true, version: latestVersionText }
-    } else if (parseInt(latestVersion[k]) < parseInt(currentVersion[k])) {
-      break
-    }
   }
   return { result: false, version: version }
 }
 
-export async function upgradeLLOneBot() {
+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 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 res = await fetchFile(mirrorGithub + downloadUrl)
         await writeFile(filePath, res.data)
-        downloadSuccess = true
+        return globalThis.LiteLoader.api.plugin.install(filePath)
-        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)
-    const uncompressedPromise = async function () {
-      return new Promise<boolean>(resolve => {
-        compressing.zip
-          .uncompress(filePath, temp_ver_dir)
-          .then(() => {
-            resolve(true)
-          })
-          .catch(reason => {
-            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
   }
   return false
 }
 
 export async function getRemoteVersion() {
-  let Version = ''
+  for (const mirror of releasesMirrorHosts) {
-  for (let i = 0; i < checkVersionMirrorHosts.length; i++) {
+    const version = await getRemoteVersionByReleasesMirror(mirror)
-    const mirrorGithub = checkVersionMirrorHosts[i]
+    if (version) {
-    const tVersion = await getRemoteVersionByMirror(mirrorGithub)
+      return version
-    if (tVersion && tVersion != '') {
+    }
-      Version = tVersion
+  }
-      break
+  for (const mirror of downloadMirrorHosts) {
+    const version = await getRemoteVersionByDownloadMirror(mirror)
+    if (version) {
+      return version
     }
   }
-  return Version
-}
-
-export async function getRemoteVersionByMirror(mirrorGithub: string) {
-  let releasePage = 'error'
-
-  try {
-    releasePage = (await fetchFile(mirrorGithub + '/LLOneBot/LLOneBot/releases')).data.toString()
-    // log("releasePage", releasePage);
-    if (releasePage === 'error') return ''
-    return releasePage.match(new RegExp('(?<=(tag/v)).*?(?=("))'))?.[0]
-  } catch { }
   return ''
 }
+
+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())
+  }
+}
+
+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

@@ -6,4 +6,4 @@ declare global {
   var LiteLoader: Dict
   var authData: Dict | undefined
   var navigation: Dict | undefined
-}
+}

src/main/log.ts

@@ -14,25 +14,22 @@ export default class Log {
 
   constructor(ctx: Context, cfg: Config) {
     Logger.targets.splice(0, Logger.targets.length)
-    if (!cfg.enable) {
+    let enable = cfg.enable
-      return
-    }
     const file = path.join(LOG_DIR, cfg.filename)
-    /*const refreshNick = ctx.debounce(() => {
-      const ntUserApi = ctx.get('ntUserApi')
-      if (ntUserApi && !selfInfo.nick) {
-        ntUserApi.getSelfNick(true)
-      }
-    }, 1000)*/
     const target: Logger.Target = {
       colors: 0,
       record: (record: Logger.Record) => {
+        if (!enable) {
+          return
+        }
         const dateTime = new Date(record.timestamp).toLocaleString()
-        const userInfo = selfInfo.uin ? `${selfInfo.nick}(${selfInfo.uin})` : ''
+        const content = `${dateTime} [${record.type}] ${selfInfo.nick}(${selfInfo.uin}) | ${record.name} ${record.content}\n\n`
-        const content = `${dateTime} [${record.type}] ${userInfo} | ${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,8 +1,11 @@
 import path from 'node:path'
-import fs from 'node:fs'
 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 {
@@ -12,15 +15,12 @@ import {
   CHANNEL_LOG,
   CHANNEL_SELECT_FILE,
   CHANNEL_SET_CONFIG,
-  CHANNEL_UPDATE,
+  CHANNEL_UPDATE
-  CHANNEL_SET_CONFIG_CONFIRMED
 } from '../common/channels'
-import { getBuildVersion } from '../common/utils'
+import { startHook } from '../ntqqapi/hook'
-import { hookNTQQApiCall, hookNTQQApiReceive } from '../ntqqapi/hook'
 import { checkNewVersion, upgradeLLOneBot } from '../common/utils/upgrade'
 import { getConfigUtil } from '../common/config'
 import { checkFfmpeg } from '../common/utils/video'
-import { getSession } from '../ntqqapi/wrapper'
 import { Context } from 'cordis'
 import { llonebotError, selfInfo, LOG_DIR, DATA_DIR, TEMP_DIR } from '../common/globalVars'
 import { log, logFileName } from '../common/utils/legacyLog'
@@ -34,10 +34,12 @@ import {
   NTQQWebApi,
   NTQQWindowApi
 } from '../ntqqapi/api'
+import { existsSync, mkdirSync } from 'node:fs'
+import { NTQQSystemApi } from '@/ntqqapi/api/system'
 
 declare module 'cordis' {
   interface Events {
-    'llonebot/config-updated': (input: LLOBConfig) => void
+    'llob/config-updated': (input: LLOBConfig) => void
   }
 }
 
@@ -45,14 +47,38 @@ let mainWindow: BrowserWindow | null = null
 
 // 加载插件时触发
 function onLoad() {
-  if (!fs.existsSync(DATA_DIR)) {
+  if (!existsSync(DATA_DIR)) {
-    fs.mkdirSync(DATA_DIR, { recursive: true })
+    mkdirSync(DATA_DIR, { recursive: true })
   }
 
-  if (!fs.existsSync(LOG_DIR)) {
+  if (!existsSync(LOG_DIR)) {
-    fs.mkdirSync(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()
   })
@@ -111,7 +137,9 @@ function onLoad() {
       if (!ask) {
         getConfigUtil().setConfig(config)
         log('配置已更新', config)
-        checkFfmpeg(config.ffmpeg).then()
+        if (started) {
+          ctx.parallel('llob/config-updated', config)
+        }
         resolve(true)
         return
       }
@@ -128,7 +156,9 @@ function onLoad() {
           if (result.response === 0) {
             getConfigUtil().setConfig(config)
             log('配置已更新', config)
-            checkFfmpeg(config.ffmpeg).then()
+            if (started) {
+              ctx.parallel('llob/config-updated', config)
+            }
             resolve(true)
           }
         })
@@ -143,78 +173,66 @@ function onLoad() {
     log(arg)
   })
 
-  async function start() {
+  const intervalId = setInterval(async () => {
-    log('process pid', process.pid)
-    const config = getConfigUtil().getConfig()
-    if (!config.enableLLOB) {
-      llonebotError.otherError = 'LLOneBot 未启动'
-      log('LLOneBot 开关设置为关闭，不启动LLOneBot')
-      return
-    }
-    if (!fs.existsSync(TEMP_DIR)) {
-      fs.mkdirSync(TEMP_DIR)
-    }
-    const ctx = new Context()
-    ctx.plugin(Log, {
-      enable: config.log!,
-      filename: logFileName
-    })
-    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(Core, config)
-    ctx.plugin(OneBot11Adapter, {
-      ...config.ob11,
-      heartInterval: config.heartInterval,
-      token: config.token!,
-      debug: config.debug!,
-      reportSelfMessage: config.reportSelfMessage!,
-      msgCacheExpire: config.msgCacheExpire!,
-      musicSignUrl: config.musicSignUrl,
-      enableLocalFile2Url: config.enableLocalFile2Url!,
-      ffmpeg: config.ffmpeg,
-    })
-    ctx.start()
-    ipcMain.on(CHANNEL_SET_CONFIG_CONFIRMED, (event, config: LLOBConfig) => {
-      ctx.parallel('llonebot/config-updated', config)
-    })
-  }
-
-  const buildVersion = getBuildVersion()
-
-  const intervalId = setInterval(() => {
     const self = Object.assign(selfInfo, {
       uin: globalThis.authData?.uin,
       uid: globalThis.authData?.uid,
       online: true
     })
-    if (self.uin && (buildVersion >= 27187 || getSession())) {
+    if (self.uin) {
       clearInterval(intervalId)
-      start()
+      log('process pid', process.pid)
+      const config = getConfigUtil().getConfig()
+
+      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,
+        })
+      }
+
+      ctx.start()
+      started = true
+      llonebotError.otherError = ''
     }
-  }, 600)
+  }, 500)
 }
 
 // 创建窗口时触发
 function onBrowserWindowCreated(window: BrowserWindow) {
-  if (![2, 4].includes(window.id)) {
-    return
-  }
   if (window.id === 2) {
     mainWindow = window
   }
-  //log('window create', window.webContents.getURL().toString())
-  try {
-    hookNTQQApiCall(window, window.id !== 2)
-    hookNTQQApiReceive(window, window.id !== 2)
-  } catch (e) {
-    log('LLOneBot hook error: ', String(e))
-  }
 }
 
 try {

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

@@ -13,18 +13,14 @@ import {
   PicElement,
 } from '../types'
 import path from 'node:path'
-import fs from 'node:fs'
+import { existsSync } from 'node:fs'
 import { ReceiveCmdS } from '../hook'
 import { RkeyManager } from '@/ntqqapi/helper/rkey'
-import { getSession } from '@/ntqqapi/wrapper'
+import { RichMediaDownloadCompleteNotify, RichMediaUploadCompleteNotify, RMBizType, Peer } from '@/ntqqapi/types/msg'
-import { Peer } from '@/ntqqapi/types/msg'
 import { calculateFileMD5 } from '@/common/utils/file'
-import { fileTypeFromFile } from 'file-type'
+import { copyFile, stat, unlink } from 'node:fs/promises'
-import fsPromise from 'node:fs/promises'
-import { OnRichMediaDownloadCompleteParams } from '@/ntqqapi/listeners'
 import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
-import { TEMP_DIR } from '@/common/globalVars'
 
 declare module 'cordis' {
   interface Context {
@@ -38,56 +34,45 @@ export class NTQQFileApi extends Service {
 
   constructor(protected ctx: Context) {
     super(ctx, 'ntFileApi', true)
-    this.rkeyManager = new RkeyManager(ctx, 'http://napcat-sign.wumiao.wang:2082/rkey')
+    this.rkeyManager = new RkeyManager(ctx, 'https://llob.linyuchen.net/rkey')
   }
 
-  async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
+  async getVideoUrl(peer: Peer, msgId: string, elementId: string): Promise<string | undefined> {
-    const session = getSession()
+    const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
-    if (session) {
+      peer,
-      return (await session.getRichMediaService().getVideoPlayUrlV2(
+      msgId,
-        peer,
+      elemId: elementId,
-        msgId,
+      videoCodecFormat: 0,
-        elementId,
+      exParams: {
-        0,
+        downSourceType: 1,
-        { downSourceType: 1, triggerType: 1 }
+        triggerType: 1
-      )).urlResult.domainUrl[0]?.url
-    } else {
-      const data = await invoke('nodeIKernelRichMediaService/getVideoPlayUrlV2', [{
-        peer,
-        msgId,
-        elemId: elementId,
-        videoCodecFormat: 0,
-        exParams: {
-          downSourceType: 1,
-          triggerType: 1
-        },
-      }, null])
-      if (data.result !== 0) {
-        this.ctx.logger.warn('getVideoUrl', data)
       }
-      return data.urlResult.domainUrl[0]?.url
+    }])
+    if (data.result !== 0) {
+      this.ctx.logger.warn('getVideoUrl', data)
     }
+    return data.urlResult.domainUrl[0]?.url
   }
 
   async getFileType(filePath: string) {
-    return fileTypeFromFile(filePath)
+    return await invoke<{
+      ext: string
+      mime: string
+    }>(NTMethod.FILE_TYPE, [filePath], {
+      className: NTClass.FS_API
+    })
   }
 
-  // 上传文件到QQ的文件夹
+  /** 上传文件到 QQ 的文件夹 */
-  async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType = 0) {
+  async uploadFile(filePath: string, elementType = ElementType.Pic, elementSubType = 0) {
     const fileMd5 = await calculateFileMD5(filePath)
-    let ext = (await this.getFileType(filePath))?.ext || ''
+    let fileName = path.basename(filePath)
-    if (ext) {
+    if (!fileName.includes('.')) {
-      ext = '.' + ext
+      const ext = (await this.getFileType(filePath))?.ext
+      fileName += ext ? '.' + ext : ''
     }
-    let fileName = `${path.basename(filePath)}`
+    const mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
-    if (fileName.indexOf('.') === -1) {
+      path_info: {
-      fileName += ext
-    }
-    const session = getSession()
-    let mediaPath: string
-    if (session) {
-      mediaPath = session?.getMsgService().getRichMediaFilePathForGuild({
         md5HexStr: fileMd5,
         fileName: fileName,
         elementType: elementType,
@@ -95,30 +80,16 @@ export class NTQQFileApi extends Service {
         thumbSize: 0,
         needCreate: true,
         downloadType: 1,
-        file_uuid: ''
+        file_uuid: '',
-      })
+      },
-    } else {
+    }])
-      mediaPath = await invoke(NTMethod.MEDIA_FILE_PATH, [{
+    await copyFile(filePath, mediaPath)
-        path_info: {
+    const fileSize = (await stat(filePath)).size
-          md5HexStr: fileMd5,
-          fileName: fileName,
-          elementType: elementType,
-          elementSubType,
-          thumbSize: 0,
-          needCreate: true,
-          downloadType: 1,
-          file_uuid: '',
-        },
-      }])
-    }
-    await fsPromise.copyFile(filePath, mediaPath)
-    const fileSize = (await fsPromise.stat(filePath)).size
     return {
       md5: fileMd5,
       fileName,
       path: mediaPath,
       fileSize,
-      ext
     }
   }
 
@@ -127,57 +98,52 @@ export class NTQQFileApi extends Service {
     chatType: ChatType,
     peerUid: string,
     elementId: string,
-    thumbPath: string,
+    thumbPath = '',
-    sourcePath: string,
+    sourcePath = '',
     timeout = 1000 * 60 * 2,
     force = false
   ) {
     // 用于下载收到的消息中的图片等
-    if (sourcePath && fs.existsSync(sourcePath)) {
+    if (sourcePath && existsSync(sourcePath)) {
       if (force) {
         try {
-          await fsPromise.unlink(sourcePath)
+          await unlink(sourcePath)
         } catch { }
       } else {
         return sourcePath
       }
     }
-    const data = await invoke<{ notifyInfo: OnRichMediaDownloadCompleteParams }>(
+    const data = await invoke<{ notifyInfo: RichMediaDownloadCompleteNotify }>(
       'nodeIKernelMsgService/downloadRichMedia',
-      [
+      [{
-        {
+        getReq: {
-          getReq: {
+          fileModelId: '0',
-            fileModelId: '0',
+          downloadSourceType: 0,
-            downloadSourceType: 0,
+          triggerType: 1,
-            triggerType: 1,
+          msgId: msgId,
-            msgId: msgId,
+          chatType: chatType,
-            chatType: chatType,
+          peerUid: peerUid,
-            peerUid: peerUid,
+          elementId: elementId,
-            elementId: elementId,
+          thumbSize: 0,
-            thumbSize: 0,
+          downloadType: 1,
-            downloadType: 1,
+          filePath: thumbPath,
-            filePath: thumbPath,
-          },
         },
-        null,
+      }],
-      ],
       {
         cbCmd: ReceiveCmdS.MEDIA_DOWNLOAD_COMPLETE,
         cmdCB: payload => payload.notifyInfo.msgId === msgId,
         timeout
       }
     )
-    let filePath = data.notifyInfo.filePath
+    return data.notifyInfo.filePath
-    if (filePath.startsWith('\\')) {
-      const downloadPath = TEMP_DIR
-      filePath = path.join(downloadPath, filePath)
-      // 下载路径是下载文件夹的相对路径
-    }
-    return filePath
   }
 
   async getImageSize(filePath: string) {
-    return await invoke<{ width: number; height: number }>(
+    return await invoke<{
+      width: number
+      height: number
+      type: string
+    }>(
       NTMethod.IMAGE_SIZE,
       [filePath],
       {
@@ -197,8 +163,8 @@ export class NTQQFileApi extends Service {
     if (url) {
       const parsedUrl = new URL(IMAGE_HTTP_HOST + url) //临时解析拼接
       const imageAppid = parsedUrl.searchParams.get('appid')
-      const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid)
+      const isNTPic = imageAppid && ['1406', '1407'].includes(imageAppid)
-      if (isNewPic) {
+      if (isNTPic) {
         let rkey = parsedUrl.searchParams.get('rkey')
         if (rkey) {
           return IMAGE_HTTP_HOST_NT + url
@@ -217,6 +183,56 @@ export class NTQQFileApi extends Service {
     this.ctx.logger.error('图片url获取失败', element)
     return ''
   }
+
+  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
+  }
+
+  async ocrImage(path: string) {
+    return await invoke(
+      'nodeIKernelNodeMiscService/wantWinScreenOCR',
+      [
+        { url: path },
+        { timeout: 5000 }
+      ]
+    )
+  }
+
+  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
+  }
 }
 
 export class NTQQFileCacheApi extends Service {
@@ -225,21 +241,19 @@ export class NTQQFileCacheApi extends Service {
   }
 
   async setCacheSilentScan(isSilent: boolean = true) {
-    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }, null])
+    return await invoke<GeneralCallResult>(NTMethod.CACHE_SET_SILENCE, [{ isSilent }])
   }
 
   getCacheSessionPathList() {
-    return invoke<
+    return invoke<Array<{
-      {
+      key: string
-        key: string
+      value: string
-        value: string
+    }>>(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
-      }[]
-    >(NTMethod.CACHE_PATH_SESSION, [], { className: NTClass.OS_API })
   }
 
   scanCache() {
-    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { classNameIsRegister: true })
+    invoke<GeneralCallResult>(ReceiveCmdS.CACHE_SCAN_FINISH, [], { registerEvent: true })
-    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [null, null], { timeout: 300 * Time.second })
+    return invoke<CacheScanResult>(NTMethod.CACHE_SCAN, [], { timeout: 300 * Time.second })
   }
 
   getHotUpdateCachePath() {
@@ -259,13 +273,13 @@ export class NTQQFileCacheApi extends Service {
       pageSize: pageSize,
       order: 1,
       lastRecord: _lastRecord,
-    }, null])
+    }])
   }
 
   async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
     return await invoke<GeneralCallResult>(NTMethod.CACHE_CHAT_CLEAR, [{
       chats,
       fileKeys,
-    }, null])
+    }])
   }
 }

src/ntqqapi/api/friend.ts

@@ -1,9 +1,6 @@
-import { Friend, FriendV2, SimpleInfo, CategoryFriend } from '../types'
+import { Friend, SimpleInfo, CategoryFriend } from '../types'
 import { ReceiveCmdS } from '../hook'
 import { invoke, NTMethod, NTClass } from '../ntcall'
-import { getSession } from '@/ntqqapi/wrapper'
-import { BuddyListReqType } from '../services'
-import { Dict, pick } from 'cosmokit'
 import { Service, Context } from 'cordis'
 
 declare module 'cordis' {
@@ -19,174 +16,114 @@ export class NTQQFriendApi extends Service {
 
   /** 大于或等于 26702 应使用 getBuddyV2 */
   async getFriends() {
-    const data = await invoke<{
+    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 _friends: Friend[] = []
+    const uids = data.buddyCategory.flatMap(item => item.buddyUids)
-    for (const item of data.data) {
+    return Object.values(data.userSimpleInfos).filter(v => uids.includes(v.uid!))
-      _friends.push(...item.buddyList)
-    }
-    return _friends
   }
 
-  async handleFriendRequest(flag: string, accept: boolean) {
+  /** uid -> uin */
-    const data = flag.split('|')
-    if (data.length < 2) {
-      return
-    }
-    const friendUid = data[0]
-    const reqTime = data[1]
-    const session = getSession()
-    if (session) {
-      return session.getBuddyService().approvalFriendRequest({
-        friendUid,
-        reqTime,
-        accept
-      })
-    } else {
-      return await invoke(NTMethod.HANDLE_FRIEND_REQUEST, [{
-        approvalInfo: {
-          friendUid,
-          reqTime,
-          accept,
-        },
-      }])
-    }
-  }
-
-  async getBuddyV2(refresh = false): Promise<FriendV2[]> {
-    const session = getSession()
-    if (session) {
-      const uids: string[] = []
-      const buddyService = session.getBuddyService()
-      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
-      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-      return Array.from(data.values())
-    } else {
-      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 session = getSession()
+    const data = await invoke<{
-    if (session) {
+      buddyCategory: CategoryFriend[]
-      const uids: string[] = []
+      userSimpleInfos: Record<string, SimpleInfo>
-      const buddyService = session.getBuddyService()
+    }>(
-      const buddyListV2 = await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)
+      'getBuddyList',
-      uids.push(...buddyListV2.data.flatMap(item => item.buddyUids))
+      [refresh],
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
+      {
-      for (const [, item] of data) {
+        className: NTClass.NODE_STORE_API,
-        if (retMap.size > 5000) {
+        cbCmd: ReceiveCmdS.FRIENDS,
-          break
+        afterFirstCmd: false,
-        }
-        retMap.set(item.uid!, item.uin!)
       }
-    } else {
+    )
-      const data = await invoke<{
+    for (const item of Object.values(data.userSimpleInfos)) {
-        buddyCategory: CategoryFriend[]
+      if (retMap.size > 5000) {
-        userSimpleInfos: Record<string, SimpleInfo>
+        break
-      }>(
-        '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!)
       }
+      retMap.set(item.uid!, item.uin!)
     }
     return retMap
   }
 
-  async getBuddyV2ExWithCate(refresh = false) {
+  async getBuddyV2WithCate(refresh = false) {
-    const session = getSession()
+    const data = await invoke<{
-    if (session) {
+      buddyCategory: CategoryFriend[]
-      const uids: string[] = []
+      userSimpleInfos: Record<string, SimpleInfo>
-      const categoryMap: Map<string, Dict> = new Map()
+    }>(
-      const buddyService = session.getBuddyService()
+      'getBuddyList',
-      const buddyListV2 = (await buddyService.getBuddyListV2('0', BuddyListReqType.KNOMAL)).data
+      [refresh],
-      uids.push(
+      {
-        ...buddyListV2.flatMap(item => {
+        className: NTClass.NODE_STORE_API,
-          item.buddyUids.forEach(uid => {
+        cbCmd: ReceiveCmdS.FRIENDS,
-            categoryMap.set(uid, { categoryId: item.categoryId, categroyName: item.categroyName })
+        afterFirstCmd: false,
-          })
-          return item.buddyUids
-        }))
-      const data = await session.getProfileService().getCoreAndBaseInfo('nodeStore', uids)
-      return Array.from(data).map(([key, value]) => {
-        const category = categoryMap.get(key)
-        return category ? { ...value, categoryId: category.categoryId, categroyName: category.categroyName } : value
-      })
-    } else {
-      const data = await invoke<{
-        buddyCategory: CategoryFriend[]
-        userSimpleInfos: Record<string, SimpleInfo>
-      }>(
-        'getBuddyList',
-        [refresh],
-        {
-          className: NTClass.NODE_STORE_API,
-          cbCmd: ReceiveCmdS.FRIENDS,
-          afterFirstCmd: false,
-        }
-      )
-      const category: Map<number, Pick<CategoryFriend, 'buddyUids' | 'categroyName'>> = new Map()
-      for (const item of data.buddyCategory) {
-        category.set(item.categoryId, pick(item, ['buddyUids', 'categroyName']))
       }
-      return Object.values(data.userSimpleInfos)
+    )
-        .filter(v => v.baseInfo && category.get(v.baseInfo.categoryId)?.buddyUids.includes(v.uid!))
+    return data
-        .map(value => {
-          return {
-            ...value,
-            categoryId: value.baseInfo.categoryId,
-            categroyName: category.get(value.baseInfo.categoryId)?.categroyName
-          }
-        })
-    }
   }
 
   async isBuddy(uid: string): Promise<boolean> {
-    const session = getSession()
+    return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }])
-    if (session) {
+  }
-      return session.getBuddyService().isBuddy(uid)
+
-    } else {
+  async getBuddyRecommendContact(uin: string) {
-      return await invoke('nodeIKernelBuddyService/isBuddy', [{ uid }, null])
+    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,13 +1,21 @@
 import { ReceiveCmdS } from '../hook'
-import { Group, GroupMember, GroupMemberRole, GroupNotifies, GroupRequestOperateTypes, GetFileListParam } from '../types'
+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 { getSession } from '../wrapper'
-import { OnGroupFileInfoUpdateParams } from '../listeners'
-import { NodeIKernelGroupService } from '../services'
 import { Service, Context } from 'cordis'
-import { isNumeric } from '@/common/utils/misc'
 
 declare module 'cordis' {
   interface Context {
@@ -18,8 +26,6 @@ declare module 'cordis' {
 export class NTQQGroupApi extends Service {
   static inject = ['ntWindowApi']
 
-  public groupMembers: Map<string, Map<string, GroupMember>> = new Map<string, Map<string, GroupMember>>()
-
   constructor(protected ctx: Context) {
     super(ctx, 'ntGroupApi', true)
   }
@@ -40,56 +46,45 @@ export class NTQQGroupApi extends Service {
     return result.groupList
   }
 
-  async getGroupMembers(groupCode: string, num = 3000): Promise<Map<string, GroupMember>> {
+  async getGroupMembers(groupCode: string, num = 3000) {
-    const session = getSession()
+    const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{
-    let result: Awaited<ReturnType<NodeIKernelGroupService['getNextMemberList']>>
+      groupCode,
-    if (session) {
+      scene: 'groupMemberList_MainWindow'
-      const groupService = session.getGroupService()
+    }])
-      const sceneId = groupService.createMemberListScene(groupCode, 'groupMemberList_MainWindow')
+    const data = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }])
-      result = await groupService.getNextMemberList(sceneId, undefined, num)
+    if (data.errCode !== 0) {
-    } else {
+      throw new Error('获取群成员列表出错,' + data.errMsg)
-      const sceneId = await invoke(NTMethod.GROUP_MEMBER_SCENE, [{ groupCode, scene: 'groupMemberList_MainWindow' }])
-      result = await invoke(NTMethod.GROUP_MEMBERS, [{ sceneId, num }, null])
     }
-    if (result.errCode !== 0) {
+    return data.result.infos
-      throw ('获取群成员列表出错,' + result.errMsg)
-    }
-    return result.result.infos
   }
 
-  async getGroupMember(groupCode: string | number, memberUinOrUid: string | number) {
+  async getGroupMember(groupCode: string, uid: string, forceUpdate = false) {
-    const groupCodeStr = groupCode.toString()
+    await invoke('nodeIKernelGroupListener/onMemberInfoChange', [], {
-    const memberUinOrUidStr = memberUinOrUid.toString()
+      registerEvent: true
-    if (!this.groupMembers.has(groupCodeStr)) {
+    })
-      try {
+
-        // 更新群成员列表
+    const data = await invoke<{
-        this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
+      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
       }
-      catch (e) {
+    )
-        return null
+    return data.members.get(uid)!
-      }
-    }
-    let members = this.groupMembers.get(groupCodeStr)!
-    const getMember = () => {
-      let member: GroupMember | undefined = undefined
-      if (isNumeric(memberUinOrUidStr)) {
-        member = Array.from(members.values()).find(member => member.uin === memberUinOrUidStr)
-      } else {
-        member = members.get(memberUinOrUidStr)
-      }
-      return member
-    }
-    let member = getMember()
-    if (!member) {
-      this.groupMembers.set(groupCodeStr, await this.getGroupMembers(groupCodeStr))
-      members = this.groupMembers.get(groupCodeStr)!
-      member = getMember()
-    }
-    return member
   }
 
   async getGroupIgnoreNotifies() {
-    await this.getSingleScreenNotifies(14)
+    await this.getSingleScreenNotifies(false, 14)
     return await this.ctx.ntWindowApi.openWindow<GeneralCallResult & GroupNotifies>(
       NTQQWindows.GroupNotifyFilterWindow,
       [],
@@ -97,17 +92,18 @@ export class NTQQGroupApi extends Service {
     )
   }
 
-  async getSingleScreenNotifies(num: number) {
+  async getSingleScreenNotifies(doubt: boolean, number: number, startSeq = '') {
-    invoke(ReceiveCmdS.GROUP_NOTIFY, [], { classNameIsRegister: true })
+    await invoke(ReceiveCmdS.GROUP_NOTIFY, [], { registerEvent: true })
-    return (await invoke<GroupNotifies>(
-      'nodeIKernelGroupService/getSingleScreenNotifies',
-      [{ doubt: false, startSeq: '', number: num }, null],
-      {
 
+    const data = await invoke<GroupNotifies>(
+      'nodeIKernelGroupService/getSingleScreenNotifies',
+      [{ doubt, startSeq, number }],
+      {
         cbCmd: ReceiveCmdS.GROUP_NOTIFY,
         afterFirstCmd: false,
       }
-    )).notifies
+    )
+    return data.notifies
   }
 
   async handleGroupRequest(flag: string, operateType: GroupRequestOperateTypes, reason?: string) {
@@ -115,177 +111,243 @@ export class NTQQGroupApi extends Service {
     const groupCode = flagitem[0]
     const seq = flagitem[1]
     const type = parseInt(flagitem[2])
-    const session = getSession()
+    const doubt = flagitem[3] === '1'
-    if (session) {
+    return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
-      return session.getGroupService().operateSysNotify(
+      doubt,
-        false,
+      operateMsg: {
-        {
+        operateType,
-          'operateType': operateType, // 2 拒绝
+        targetMsg: {
-          'targetMsg': {
+          seq,
-            'seq': seq,  // 通知序列号
+          type,
-            'type': type,
+          groupCode,
-            'groupCode': groupCode,
+          postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-            'postscript': reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-          }
-        })
-    } else {
-      return await invoke(NTMethod.HANDLE_GROUP_REQUEST, [{
-        doubt: false,
-        operateMsg: {
-          operateType,
-          targetMsg: {
-            seq,
-            type,
-            groupCode,
-            postscript: reason || ' ' // 仅传空值可能导致处理失败，故默认给个空格
-          },
         },
-      }, null])
+      },
-    }
+    }])
   }
 
   async quitGroup(groupCode: string) {
-    const session = getSession()
+    return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }])
-    if (session) {
-      return session.getGroupService().quitGroup(groupCode)
-    } else {
-      return await invoke(NTMethod.QUIT_GROUP, [{ groupCode }, null])
-    }
   }
 
-  async kickMember(
+  async kickMember(groupCode: string, kickUids: string[], refuseForever = false, kickReason = '') {
-    groupCode: string,
+    return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, kickReason }])
-    kickUids: string[],
-    refuseForever = false,
-    kickReason = '',
-  ) {
-    const session = getSession()
-    if (session) {
-      return session.getGroupService().kickMember(groupCode, kickUids, refuseForever, kickReason)
-    } else {
-      return await invoke(NTMethod.KICK_MEMBER, [{ groupCode, kickUids, refuseForever, kickReason }])
-    }
   }
 
+  /** timeStamp为秒数, 0为解除禁言 */
   async banMember(groupCode: string, memList: Array<{ uid: string, timeStamp: number }>) {
-    // timeStamp为秒数, 0为解除禁言
+    return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
-    const session = getSession()
-    if (session) {
-      return session.getGroupService().setMemberShutUp(groupCode, memList)
-    } else {
-      return await invoke(NTMethod.MUTE_MEMBER, [{ groupCode, memList }])
-    }
   }
 
   async banGroup(groupCode: string, shutUp: boolean) {
-    const session = getSession()
+    return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }])
-    if (session) {
-      return session.getGroupService().setGroupShutUp(groupCode, shutUp)
-    } else {
-      return await invoke(NTMethod.MUTE_GROUP, [{ groupCode, shutUp }, null])
-    }
   }
 
   async setMemberCard(groupCode: string, memberUid: string, cardName: string) {
-    const session = getSession()
+    return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }])
-    if (session) {
-      return session.getGroupService().modifyMemberCardName(groupCode, memberUid, cardName)
-    } else {
-      return await invoke(NTMethod.SET_MEMBER_CARD, [{ groupCode, uid: memberUid, cardName }, null])
-    }
   }
 
   async setMemberRole(groupCode: string, memberUid: string, role: GroupMemberRole) {
-    const session = getSession()
+    return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }])
-    if (session) {
-      return session.getGroupService().modifyMemberRole(groupCode, memberUid, role)
-    } else {
-      return await invoke(NTMethod.SET_MEMBER_ROLE, [{ groupCode, uid: memberUid, role }, null])
-    }
   }
 
   async setGroupName(groupCode: string, groupName: string) {
-    const session = getSession()
+    return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }])
-    if (session) {
-      return session.getGroupService().modifyGroupName(groupCode, groupName, false)
-    } else {
-      return await invoke(NTMethod.SET_GROUP_NAME, [{ groupCode, groupName }, null])
-    }
   }
 
   async getGroupRemainAtTimes(groupCode: string) {
-    return await invoke<
+    return await invoke(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }])
-      GeneralCallResult & {
-        atInfo: {
-          canAtAll: boolean
-          RemainAtAllCountForUin: number
-          RemainAtAllCountForGroup: number
-          atTimesMsg: string
-          canNotAtAllMsg: ''
-        }
-      }
-    >(NTMethod.GROUP_AT_ALL_REMAIN_COUNT, [{ groupCode }, null])
   }
 
-  /** 27187 TODO */
   async removeGroupEssence(groupCode: string, msgId: string) {
-    const session = getSession()
+    const ntMsgApi = this.ctx.get('ntMsgApi')!
-    // 代码没测过
+    const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-    // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
+    return await invoke('nodeIKernelGroupService/removeGroupEssence', [{
-    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+      req: {
-    const param = {
+        groupCode: groupCode,
-      groupCode: groupCode,
+        msgRandom: Number(data?.msgList[0].msgRandom),
-      msgRandom: Number(data?.msgList[0].msgRandom),
+        msgSeq: Number(data?.msgList[0].msgSeq)
-      msgSeq: Number(data?.msgList[0].msgSeq)
+      }
-    }
+    }])
-    // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
-    return session?.getGroupService().removeGroupEssence(param)
   }
 
-  /** 27187 TODO */
   async addGroupEssence(groupCode: string, msgId: string) {
-    const session = getSession()
+    const ntMsgApi = this.ctx.get('ntMsgApi')!
-    // 代码没测过
+    const data = await ntMsgApi.getMsgHistory({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
-    // 需要 ob11msgid->msgId + (peer) -> msgSeq + msgRandom
+    return await invoke('nodeIKernelGroupService/addGroupEssence', [{
-    const data = await session?.getMsgService().getMsgsIncludeSelf({ chatType: 2, guildId: '', peerUid: groupCode }, msgId, 1, false)
+      req: {
-    const param = {
+        groupCode: groupCode,
-      groupCode: groupCode,
+        msgRandom: Number(data?.msgList[0].msgRandom),
-      msgRandom: Number(data?.msgList[0].msgRandom),
+        msgSeq: Number(data?.msgList[0].msgSeq)
-      msgSeq: Number(data?.msgList[0].msgSeq)
+      }
-    }
+    }])
-    // GetMsgByShoretID(ShoretID) -> MsgService.getMsgs(Peer,MsgId,1,false) -> 组出参数
-    return session?.getGroupService().addGroupEssence(param)
   }
 
   async createGroupFileFolder(groupId: string, folderName: string) {
-    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }, null])
+    return await invoke('nodeIKernelRichMediaService/createGroupFolder', [{ groupId, folderName }])
   }
 
   async deleteGroupFileFolder(groupId: string, folderId: string) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }, null])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFolder', [{ groupId, folderId }])
   }
 
-  async deleteGroupFile(groupId: string, fileIdList: string[]) {
+  async deleteGroupFile(groupId: string, fileIdList: string[], busIdList: number[]) {
-    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList: [102], fileIdList }, null])
+    return await invoke('nodeIKernelRichMediaService/deleteGroupFile', [{ groupId, busIdList, fileIdList }])
   }
 
   async getGroupFileList(groupId: string, fileListForm: GetFileListParam) {
-    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { classNameIsRegister: true })
+    invoke('nodeIKernelMsgListener/onGroupFileInfoUpdate', [], { registerEvent: true })
-    const data = await invoke<{ fileInfo: OnGroupFileInfoUpdateParams }>(
+    const data = await invoke<{ fileInfo: GroupFileInfo }>(
       'nodeIKernelRichMediaService/getGroupFileList',
-      [
+      [{
-        {
+        groupId,
-          groupId,
+        fileListForm
-          fileListForm
+      }],
-        },
-        null,
-      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onGroupFileInfoUpdate',
         afterFirstCmd: false,
         cmdCB: (payload, result) => payload.fileInfo.reqId === result
       }
     )
-    return data.fileInfo.item
+    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
+        }
+      }],
+      {
+        cbCmd: 'nodeIKernelGroupListener/onGetGroupBulletinListResult',
+        cmdCB: payload => payload.groupCode === groupCode,
+        afterFirstCmd: false
+      }
+    )
+  }
+
+  async setGroupAvatar(groupCode: string, path: string) {
+    return await invoke('nodeIKernelGroupService/setHeader', [{ path, groupCode }])
+  }
+
+  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/msg.ts

@@ -1,7 +1,5 @@
 import { invoke, NTMethod } from '../ntcall'
-import { GeneralCallResult } from '../services'
+import { RawMessage, SendMessageElement, Peer, ChatType } from '../types'
-import { RawMessage, SendMessageElement, Peer, ChatType2 } from '../types'
-import { getSession } from '@/ntqqapi/wrapper'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -11,16 +9,6 @@ declare module 'cordis' {
   }
 }
 
-function generateMsgId() {
-  const timestamp = Math.floor(Date.now() / 1000)
-  const random = Math.floor(Math.random() * Math.pow(2, 32))
-  const buffer = Buffer.alloc(8)
-  buffer.writeUInt32BE(timestamp, 0)
-  buffer.writeUInt32BE(random, 4)
-  const msgId = BigInt('0x' + buffer.toString('hex')).toString()
-  return msgId
-}
-
 export class NTQQMsgApi extends Service {
   static inject = ['ntUserApi']
 
@@ -28,99 +16,81 @@ export class NTQQMsgApi extends Service {
     super(ctx, 'ntMsgApi', true)
   }
 
-  async getTempChatInfo(chatType: ChatType2, peerUid: string) {
+  async getTempChatInfo(chatType: ChatType, peerUid: string) {
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }])
-    if (session) {
-      return session.getMsgService().getTempChatInfo(chatType, peerUid)
-    } else {
-      return await invoke('nodeIKernelMsgService/getTempChatInfo', [{ chatType, peerUid }, null])
-    }
   }
 
-  async setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, setEmoji: boolean = true) {
+  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/sysface_res/apng/ 下可以看到所有QQ表情预览
-    // nt_qq\global\nt_data\Emoji\emoji-resource\face_config.json 里面有所有表情的id, 自带表情id是QSid, 标准emoji表情id是QCid
+    // 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 session = getSession()
     const emojiType = emojiId.length > 3 ? '2' : '1'
-    if (session) {
+    return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }])
-      return session.getMsgService().setMsgEmojiLikes(peer, msgSeq, emojiId, emojiType, setEmoji)
-    } else {
-      return await invoke(NTMethod.EMOJI_LIKE, [{ peer, msgSeq, emojiId, emojiType, setEmoji }, null])
-    }
   }
 
   async getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string) {
-    const session = getSession()
+    return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }])
-    if (session) {
-      return session.getMsgService().getMultiMsg(peer, rootMsgId, parentMsgId)
-    } else {
-      return await invoke(NTMethod.GET_MULTI_MSG, [{ peer, rootMsgId, parentMsgId }, null])
-    }
   }
 
   async activateChat(peer: Peer) {
-    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 20 }, null])
+    return await invoke(NTMethod.ACTIVE_CHAT_PREVIEW, [{ peer, cnt: 1 }])
   }
 
-  async activateChatAndGetHistory(peer: Peer) {
+  async activateChatAndGetHistory(peer: Peer, cnt: number) {
-    return await invoke<GeneralCallResult>(NTMethod.ACTIVE_CHAT_HISTORY, [{ peer, cnt: 20 }, null])
+    // 消息从旧到新
+    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 }, null])
+    return await invoke('nodeIKernelMsgService/getAioFirstViewLatestMsgs', [{ peer, cnt }])
   }
 
-  async getMsgsByMsgId(peer: Peer | undefined, msgIds: string[] | undefined) {
+  async getMsgsByMsgId(peer: Peer, msgIds: string[]) {
     if (!peer) throw new Error('peer is not allowed')
     if (!msgIds) throw new Error('msgIds is not allowed')
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }])
-    if (session) {
-      return session.getMsgService().getMsgsByMsgId(peer, msgIds)
-    } else {
-      return await invoke('nodeIKernelMsgService/getMsgsByMsgId', [{ peer, msgIds }, null])
-    }
   }
 
-  async getMsgHistory(peer: Peer, msgId: string, cnt: number, isReverseOrder: boolean = false) {
+  async getMsgHistory(peer: Peer, msgId: string, cnt: number, queryOrder = false) {
-    const session = getSession()
+    // 默认情况下消息时间从新到旧
-    // 消息时间从旧到新
+    return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder }])
-    if (session) {
-      return session.getMsgService().getMsgsIncludeSelf(peer, msgId, cnt, isReverseOrder)
-    } else {
-      return await invoke(NTMethod.HISTORY_MSG, [{ peer, msgId, cnt, queryOrder: isReverseOrder }, null])
-    }
   }
 
   async recallMsg(peer: Peer, msgIds: string[]) {
-    const session = getSession()
+    return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }])
-    if (session) {
-      return session.getMsgService().recallMsg(peer, msgIds)
-    } else {
-      return await invoke(NTMethod.RECALL_MSG, [{ peer, msgIds }, null])
-    }
   }
 
   async sendMsg(peer: Peer, msgElements: SendMessageElement[], timeout = 10000) {
-    const msgId = generateMsgId()
+    const uniqueId = await this.generateMsgUniqueId(peer.chatType)
-    peer.guildId = msgId
+    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',
-          msgId: '0',
+        peer,
-          peer,
+        msgElements,
-          msgElements,
+        msgAttributeInfos
-          msgAttributeInfos: new Map()
+      }],
-        },
-        null
-      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.guildId === msgId && msgRecord.sendStatus === 2) {
+            if (msgRecord.msgAttrs.get(0)?.attrId === uniqueId && msgRecord.sendStatus === 2) {
+              sentMsgId = msgRecord.msgId
               return true
             }
           }
@@ -129,22 +99,38 @@ export class NTQQMsgApi extends Service {
         timeout
       }
     )
-    return data.msgList.find(msgRecord => msgRecord.guildId === msgId)
+
+    return data.msgList.find(msgRecord => msgRecord.msgId === sentMsgId)
   }
 
   async forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]) {
-    const session = getSession()
+    const uniqueId = await this.generateMsgUniqueId(destPeer.chatType)
-    if (session) {
+    destPeer.guildId = uniqueId
-      return session.getMsgService().forwardMsg(msgIds, srcPeer, [destPeer], [])
+    const data = await invoke<{ msgList: RawMessage[] }>(
-    } else {
+      'nodeIKernelMsgService/forwardMsgWithComment',
-      return await invoke(NTMethod.FORWARD_MSG, [{
+      [{
         msgIds,
         srcContact: srcPeer,
         dstContacts: [destPeer],
         commentElements: [],
         msgAttributeInfos: new Map(),
-      }, null])
+      }],
-    }
+      {
+        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> {
@@ -155,66 +141,46 @@ export class NTQQMsgApi extends Service {
     const selfUid = selfInfo.uid
     const data = await invoke<{ msgList: RawMessage[] }>(
       'nodeIKernelMsgService/multiForwardMsgWithComment',
-      [
+      [{
-        {
+        msgInfos,
-          msgInfos,
+        srcContact: srcPeer,
-          srcContact: srcPeer,
+        dstContact: destPeer,
-          dstContact: destPeer,
+        commentElements: [],
-          commentElements: [],
+        msgAttributeInfos: new Map(),
-          msgAttributeInfos: new Map(),
+      }],
-        },
-        null,
-      ],
       {
         cbCmd: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
         afterFirstCmd: false,
         cmdCB: payload => {
           for (const msgRecord of payload.msgList) {
-            if (msgRecord.peerUid == destPeer.peerUid && msgRecord.senderUid == selfUid) {
+            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
-        },
+        }
       }
     )
-    for (const msg of data.msgList) {
+    return data.msgList.find(msgRecord => {
-      const arkElement = msg.elements.find(ele => ele.arkElement)
+      const { arkElement } = msgRecord.elements[0]
-      if (!arkElement) {
+      if (arkElement?.bytesData.includes('com.tencent.multimsg')) {
-        continue
+        return true
       }
-      const forwardData = JSON.parse(arkElement.arkElement.bytesData)
+    })!
-      if (forwardData.app != 'com.tencent.multimsg') {
-        continue
-      }
-      if (msg.peerUid == destPeer.peerUid && msg.senderUid == selfUid) {
-        return msg
-      }
-    }
-    throw new Error('转发消息超时')
-  }
-
-  async getMsgsBySeqAndCount(peer: Peer, msgSeq: string, count: number, desc: boolean, z: boolean) {
-    const session = getSession()
-    if (session) {
-      return await session.getMsgService().getMsgsBySeqAndCount(peer, msgSeq, count, desc, z)
-    } else {
-      return await invoke('nodeIKernelMsgService/getMsgsBySeqAndCount', [{
-        peer,
-        cnt: count,
-        msgSeq,
-        queryOrder: desc
-      }, null])
-    }
   }
 
   async getSingleMsg(peer: Peer, msgSeq: string) {
-    const session = getSession()
+    return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }])
-    if (session) {
-      return await session.getMsgService().getSingleMsg(peer, msgSeq)
-    } else {
-      return await invoke('nodeIKernelMsgService/getSingleMsg', [{ peer, msgSeq }, null])
-    }
   }
 
   async queryFirstMsgBySeq(peer: Peer, msgSeq: string) {
@@ -232,10 +198,10 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }, null])
+    }])
   }
 
-  async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[]) {
+  async queryMsgsWithFilterExBySeq(peer: Peer, msgSeq: string, filterMsgTime: string, filterSendersUid: string[] = []) {
     return await invoke('nodeIKernelMsgService/queryMsgsWithFilterEx', [{
       msgId: '0',
       msgTime: '0',
@@ -250,6 +216,72 @@ export class NTQQMsgApi extends Service {
         isIncludeCurrent: true,
         pageLimit: 1,
       }
-    }, null])
+    }])
+  }
+
+  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}`
+    }
+  }
+
+  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,
+      }
+    }])
+  }
+
+  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,10 +1,8 @@
-import { invoke } from '../ntcall'
+import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfo, UserDetailSource, ProfileBizType, SimpleInfo } from '../types'
-import { User, UserDetailInfoByUin, UserDetailInfoByUinV2, UserDetailInfoListenerArg } from '../types'
+import { invoke, NTClass } from '../ntcall'
 import { getBuildVersion } from '@/common/utils'
-import { getSession } from '@/ntqqapi/wrapper'
 import { RequestUtil } from '@/common/utils/request'
-import { UserDetailSource, ProfileBizType } from '../services'
+import { isNullable, pick, Time } from 'cosmokit'
-import { Time } from 'cosmokit'
 import { Service, Context } from 'cordis'
 import { selfInfo } from '@/common/globalVars'
 
@@ -21,31 +19,25 @@ export class NTQQUserApi extends Service {
     super(ctx, 'ntUserApi', true)
   }
 
-  async setQQAvatar(path: string) {
+  async setSelfAvatar(path: string) {
     return await invoke(
       'nodeIKernelProfileService/setHeader',
-      [
+      [{ path }],
-        { path },
-        null,
-      ],
       {
-        timeout: 10 * Time.second, // 10秒不一定够
+        timeout: 10 * Time.second // 10秒不一定够
       }
     )
   }
 
   async fetchUserDetailInfo(uid: string) {
-    const result = await invoke<{ info: UserDetailInfoListenerArg }>(
+    const result = await invoke<{ info: UserDetailInfo }>(
       'nodeIKernelProfileService/fetchUserDetailInfo',
-      [
+      [{
-        {
+        callFrom: 'BuddyProfileStore',
-          callFrom: 'BuddyProfileStore',
+        uid: [uid],
-          uid: [uid],
+        source: UserDetailSource.KSERVER,
-          source: UserDetailSource.KSERVER,
+        bizList: [ProfileBizType.KALL]
-          bizList: [ProfileBizType.KALL]
+      }],
-        },
-        null
-      ],
       {
         cbCmd: 'nodeIKernelProfileListener/onUserDetailInfoChanged',
         afterFirstCmd: false,
@@ -71,13 +63,10 @@ export class NTQQUserApi extends Service {
     }
     const result = await invoke<{ info: User }>(
       'nodeIKernelProfileService/getUserDetailInfoWithBizInfo',
-      [
+      [{
-        {
+        uid,
-          uid,
+        bizList: [0]
-          bizList: [0]
+      }],
-        },
-        null,
-      ],
       {
         cbCmd: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
         afterFirstCmd: false,
@@ -87,17 +76,6 @@ export class NTQQUserApi extends Service {
     return result.info
   }
 
-  async getSkey(): Promise<string> {
-    const clientKeyData = await this.forceFetchClientKey()
-    if (clientKeyData?.result !== 0) {
-      throw new Error('获取clientKey失败')
-    }
-    const url = 'https://ssl.ptlogin2.qq.com/jump?ptlang=1033&clientuin=' + selfInfo.uin
-      + '&clientkey=' + clientKeyData.clientKey
-      + '&u1=https%3A%2F%2Fh5.qzone.qq.com%2Fqqnt%2Fqzoneinpcqq%2Ffriend%3Frefresh%3D0%26clientuin%3D0%26darkMode%3D0&keyindex=' + clientKeyData.keyIndex
-    return (await RequestUtil.HttpsGetCookies(url))?.skey
-  }
-
   async getCookies(domain: string) {
     const clientKeyData = await this.forceFetchClientKey()
     if (clientKeyData?.result !== 0) {
@@ -109,118 +87,78 @@ export class NTQQUserApi extends Service {
     return cookies
   }
 
-  genBkn(sKey: string) {
+  async getPSkey(domains: string[]) {
-    sKey = sKey || ''
+    return await invoke('nodeIKernelTipOffService/getPskey', [{ domains, isForNewPCQQ: true }])
-    let hash = 5381
-
-    for (let i = 0; i < sKey.length; i++) {
-      const code = sKey.charCodeAt(i)
-      hash = hash + (hash << 5) + code
-    }
-
-    return (hash & 0x7fffffff).toString()
   }
 
   async like(uid: string, count = 1) {
-    const session = getSession()
+    return await invoke(
-    if (session) {
+      'nodeIKernelProfileLikeService/setBuddyProfileLike',
-      return session.getProfileLikeService().setBuddyProfileLike({
+      [{
-        friendUid: uid,
+        doLikeUserInfo: {
-        sourceId: 71,
+          friendUid: uid,
-        doLikeCount: count,
+          sourceId: 71,
-        doLikeTollCount: 0
+          doLikeCount: count,
-      })
+          doLikeTollCount: 0
-    } else {
+        }
-      return await invoke(
+      }]
-        'nodeIKernelProfileLikeService/setBuddyProfileLike',
+    )
-        [
-          {
-            doLikeUserInfo: {
-              friendUid: uid,
-              sourceId: 71,
-              doLikeCount: count,
-              doLikeTollCount: 0
-            }
-          },
-          null,
-        ],
-      )
-    }
   }
 
-  async getUidByUinV1(uin: string) {
+  async getUidByUinV1(uin: string, groupCode?: string) {
-    const session = getSession()
+    let uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
-    // 通用转换开始尝试
-    let uid = (await session?.getUixConvertService().getUid([uin]))?.uidInfo.get(uin)
     if (!uid) {
-      for (const membersList of this.ctx.ntGroupApi.groupMembers.values()) { //从群友列表转
+      const friends = await this.ctx.ntFriendApi.getFriends()
-        for (const member of membersList.values()) {
+      uid = friends.find(item => item.uin === uin)?.uid
-          if (member.uin === uin) {
+    }
-            uid = member.uid
+    if (!uid && groupCode) {
-            break
+      let member = await this.ctx.ntGroupApi.searchMember(groupCode, uin)
-          }
+      if (member.size === 0) {
-        }
+        await this.ctx.ntGroupApi.getGroupMembers(groupCode, 1)
-        if (uid) break
+        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 //特殊转换
+      const unveifyUid = (await this.getUserDetailInfoByUin(uin)).info.uid
-      if (unveifyUid.indexOf('*') === -1) {
+      if (!unveifyUid.includes('*')) {
         uid = unveifyUid
       }
     }
-    if (!uid) {
-      const friends = await this.ctx.ntFriendApi.getFriends() //从好友列表转
-      uid = friends.find(item => item.uin === uin)?.uid
-    }
     return uid
   }
 
   async getUidByUinV2(uin: string) {
-    const session = getSession()
+    let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uinList: [uin] }])).uids.get(uin)
-    if (session) {
+    if (uid) return uid
-      let uid = (await session.getGroupService().getUidByUins([uin])).uids.get(uin)
+    uid = (await invoke('nodeIKernelProfileService/getUidByUin', [{ callFrom: 'FriendsServiceImpl', uin: [uin] }])).get(uin)
-      if (uid) return uid
+    if (uid) return uid
-      uid = (await session.getProfileService().getUidByUin('FriendsServiceImpl', [uin])).get(uin)
+    uid = (await invoke('nodeIKernelUixConvertService/getUid', [{ uins: [uin] }])).uidInfo.get(uin)
-      if (uid) return uid
+    if (uid) return uid
-      uid = (await session.getUixConvertService().getUid([uin])).uidInfo.get(uin)
+    const unveifyUid = (await this.getUserDetailInfoByUinV2(uin)).detail.uid
-      if (uid) return uid
+    //if (!unveifyUid.includes('*')) return unveifyUid
-    } else {
+    return unveifyUid
-      let uid = (await invoke('nodeIKernelGroupService/getUidByUins', [{ uin: [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 //从QQ Native 特殊转换
-    if (unveifyUid.indexOf('*') == -1) return unveifyUid
   }
 
-  async getUidByUin(uin: string) {
+  async getUidByUin(uin: string, groupCode?: string) {
     if (getBuildVersion() >= 26702) {
       return this.getUidByUinV2(uin)
     }
-    return this.getUidByUinV1(uin)
+    return this.getUidByUinV1(uin, groupCode)
   }
 
   async getUserDetailInfoByUinV2(uin: string) {
     return await invoke<UserDetailInfoByUinV2>(
       'nodeIKernelProfileService/getUserDetailInfoByUin',
-      [
+      [{ uin }]
-        { uin },
-        null,
-      ],
     )
   }
 
   async getUserDetailInfoByUin(uin: string) {
     return await invoke<UserDetailInfoByUin>(
       'nodeIKernelProfileService/getUserDetailInfoByUin',
-      [
+      [{ uin }]
-        { uin },
-        null,
-      ],
     )
   }
 
@@ -228,31 +166,21 @@ export class NTQQUserApi extends Service {
     const ret = await invoke('nodeIKernelUixConvertService/getUin', [{ uids: [uid] }])
     let uin = ret.uinInfo.get(uid)
     if (!uin) {
-      uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
+      uin = (await this.getUserDetailInfo(uid)).uin
     }
     return uin
   }
 
   async getUinByUidV2(uid: string) {
-    const session = getSession()
+    let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uidList: [uid] }])).uins.get(uid)
-    if (session) {
+    if (uin && uin !== '0') return uin
-      let uin = (await session.getGroupService().getUinByUids([uid])).uins.get(uid)
+    uin = (await invoke('nodeIKernelProfileService/getUinByUid', [{ callFrom: 'FriendsServiceImpl', uid: [uid] }])).get(uid)
-      if (uin) return uin
-      uin = (await session.getProfileService().getUinByUid('FriendsServiceImpl', [uid])).get(uid)
-      if (uin) return uin
-      uin = (await session.getUixConvertService().getUin([uid])).uinInfo.get(uid)
-      if (uin) return uin
-    } else {
-      let uin = (await invoke('nodeIKernelGroupService/getUinByUids', [{ uid: [uid] }])).uins.get(uid)
-      if (uin) 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
-    }
-    let uin = (await this.ctx.ntFriendApi.getBuddyIdMap(true)).get(uid)
     if (uin) return uin
-    uin = (await this.getUserDetailInfo(uid)).uin //从QQ Native 转换
+    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
   }
 
@@ -264,21 +192,13 @@ export class NTQQUserApi extends Service {
   }
 
   async forceFetchClientKey() {
-    const session = getSession()
+    return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ url: '' }])
-    if (session) {
-      return await session.getTicketService().forceFetchClientKey('')
-    } else {
-      return await invoke('nodeIKernelTicketService/forceFetchClientKey', [{ domain: '' }, null])
-    }
   }
 
-  async getSelfNick(refresh = false) {
+  async getSelfNick(refresh = true) {
     if ((refresh || !selfInfo.nick) && selfInfo.uid) {
-      const userInfo = await this.getUserDetailInfo(selfInfo.uid)
+      const data = await this.getUserSimpleInfo(selfInfo.uid)
-      if (userInfo) {
+      selfInfo.nick = data.nick
-        Object.assign(selfInfo, { nick: userInfo.nick })
-        return userInfo.nick
-      }
     }
     return selfInfo.nick
   }
@@ -290,6 +210,92 @@ export class NTQQUserApi extends Service {
         extStatus,
         batteryStatus,
       }
-    }, null])
+    }])
+  }
+
+  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

@@ -17,88 +17,6 @@ export enum WebHonorType {
   EMOTION = 'emotion'
 }
 
-export interface WebApiGroupMember {
-  uin: number
-  role: number
-  g: number
-  join_time: number
-  last_speak_time: number
-  lv: {
-    point: number
-    level: number
-  }
-  card: string
-  tags: string
-  flag: number
-  nick: string
-  qage: number
-  rm: number
-}
-
-interface WebApiGroupMemberRet {
-  ec: number
-  errcode: number
-  em: string
-  cache: number
-  adm_num: number
-  levelname: unknown
-  mems: WebApiGroupMember[]
-  count: number
-  svr_time: number
-  max_count: number
-  search_count: number
-  extmode: number
-}
-
-interface GroupEssenceMsg {
-  group_code: string
-  msg_seq: number
-  msg_random: number
-  sender_uin: string
-  sender_nick: string
-  sender_time: number
-  add_digest_uin: string
-  add_digest_nick: string
-  add_digest_time: number
-  msg_content: unknown[]
-  can_be_removed: true
-}
-
-export interface GroupEssenceMsgRet {
-  retcode: number
-  retmsg: string
-  data: {
-    msg_list: GroupEssenceMsg[]
-    is_end: boolean
-    group_role: number
-    config_page_url: string
-  }
-}
-
-interface SetGroupNoticeParams {
-  groupCode: string
-  content: string
-  pinned: number
-  type: number
-  isShowEditCard: number
-  tipWindowType: number
-  confirmRequired: number
-  picId: string
-  imgWidth?: number
-  imgHeight?: number
-}
-
-interface SetGroupNoticeRet {
-  ec: number
-  em: string
-  id: number
-  ltsm: number
-  new_fid: string
-  read_only: number
-  role: number
-  srv_code: number
-}
-
 export class NTQQWebApi extends Service {
   static inject = ['ntUserApi']
 
@@ -106,47 +24,6 @@ export class NTQQWebApi extends Service {
     super(ctx, 'ntWebApi', true)
   }
 
-  async getGroupMembers(groupCode: string): Promise<WebApiGroupMember[]> {
-    const memberData: Array<WebApiGroupMember> = new Array<WebApiGroupMember>()
-    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
-    const cookieStr = this.cookieToString(cookieObject)
-    const retList: Promise<WebApiGroupMemberRet>[] = []
-    const params = new URLSearchParams({
-      st: '0',
-      end: '40',
-      sort: '1',
-      gc: groupCode,
-      bkn: this.genBkn(cookieObject.skey)
-    })
-    const fastRet = await RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
-    if (!fastRet?.count || fastRet?.errcode !== 0 || !fastRet?.mems) {
-      return []
-    } else {
-      for (const member of fastRet.mems) {
-        memberData.push(member)
-      }
-    }
-    const pageNum = Math.ceil(fastRet.count / 40)
-    //遍历批量请求
-    for (let i = 2; i <= pageNum; i++) {
-      params.set('st', String((i - 1) * 40))
-      params.set('end', String(i * 40))
-      const ret = RequestUtil.HttpGetJson<WebApiGroupMemberRet>(`https://qun.qq.com/cgi-bin/qun_mgr/search_group_members?${params}`, 'POST', '', { 'Cookie': cookieStr })
-      retList.push(ret)
-    }
-    //批量等待
-    for (let i = 1; i <= pageNum; i++) {
-      const ret = await (retList[i])
-      if (!ret?.count || ret?.errcode !== 0 || !ret?.mems) {
-        continue
-      }
-      for (const member of ret.mems) {
-        memberData.push(member)
-      }
-    }
-    return memberData
-  }
-
   genBkn(sKey: string) {
     sKey = sKey || ''
     let hash = 5381
@@ -157,10 +34,9 @@ export class NTQQWebApi extends Service {
     return (hash & 0x7FFFFFFF).toString()
   }
 
-  //实现未缓存 考虑2h缓存
+  async getGroupHonorInfo(groupCode: string, getType: string) {
-  async getGroupHonorInfo(groupCode: string, getType: WebHonorType) {
+    const getDataInternal = async (groupCode: string, type: number) => {
-    const getDataInternal = async (Internal_groupCode: string, Internal_type: number) => {
+      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + groupCode + '&type=' + type
-      const url = 'https://qun.qq.com/interactive/honorlist?gc=' + Internal_groupCode + '&type=' + Internal_type.toString()
       let resJson
       try {
         const res = await RequestUtil.HttpGetText(url, 'GET', '', { 'Cookie': cookieStr })
@@ -168,7 +44,7 @@ export class NTQQWebApi extends Service {
         if (match) {
           resJson = JSON.parse(match[1].trim())
         }
-        if (Internal_type === 1) {
+        if (type === 1) {
           return resJson?.talkativeList
         } else {
           return resJson?.actorList
@@ -274,34 +150,6 @@ export class NTQQWebApi extends Service {
     return honorInfo
   }
 
-  async setGroupNotice(params: SetGroupNoticeParams): Promise<SetGroupNoticeRet> {
-    const cookieObject = await this.ctx.ntUserApi.getCookies('qun.qq.com')
-    const settings = JSON.stringify({
-      is_show_edit_card: params.isShowEditCard,
-      tip_window_type: params.tipWindowType,
-      confirm_required: params.confirmRequired
-    })
-
-    return await RequestUtil.HttpGetJson<SetGroupNoticeRet>(
-      `https://web.qun.qq.com/cgi-bin/announce/add_qun_notice?${new URLSearchParams({
-        bkn: this.genBkn(cookieObject.skey),
-        qid: params.groupCode,
-        text: params.content,
-        pinned: params.pinned.toString(),
-        type: params.type.toString(),
-        settings: settings,
-        ...(params.picId !== '' && {
-          pic: params.picId,
-          imgWidth: params.imgWidth?.toString(),
-          imgHeight: params.imgHeight?.toString(),
-        })
-      })}`,
-      'POST',
-      '',
-      { 'Cookie': this.cookieToString(cookieObject) }
-    )
-  }
-
   private cookieToString(cookieObject: Dict) {
     return Object.entries(cookieObject).map(([key, value]) => `${key}=${value}`).join('; ')
   }

src/ntqqapi/api/window.ts

@@ -1,6 +1,6 @@
 import { invoke, NTClass, NTMethod } from '../ntcall'
 import { GeneralCallResult } from '../services'
-import { ReceiveCmd } from '../hook'
+import { ReceiveCmdS } from '../hook'
 import { BrowserWindow } from 'electron'
 import { Service, Context } from 'cordis'
 
@@ -35,11 +35,11 @@ export class NTQQWindowApi extends Service {
     super(ctx, 'ntWindowApi', true)
   }
 
-  // 打开窗口并获取对应的下发事件
+  /** 打开窗口并获取对应的下发事件 */
   async openWindow<R = GeneralCallResult>(
     ntQQWindow: NTQQWindow,
     args: unknown[],
-    cbCmd: ReceiveCmd | undefined,
+    cbCmd: ReceiveCmdS | undefined,
     autoCloseSeconds: number = 2,
   ) {
     const result = await invoke<R>(
@@ -53,7 +53,6 @@ export class NTQQWindowApi extends Service {
     )
     setTimeout(() => {
       for (const w of BrowserWindow.getAllWindows()) {
-        // log("close window", w.webContents.getURL())
         if (w.webContents.getURL().indexOf(ntQQWindow.windowUrlHash) != -1) {
           w.close()
         }

src/ntqqapi/core.ts

@@ -1,9 +1,7 @@
-import fs from 'node:fs'
+import { unlink } from 'node:fs/promises'
 import { Service, Context } from 'cordis'
 import { registerCallHook, registerReceiveHook, ReceiveCmdS } from './hook'
-import { MessageUnique } from '../common/utils/messageUnique'
 import { Config as LLOBConfig } from '../common/types'
-import { llonebotError } from '../common/globalVars'
 import { isNumeric } from '../common/utils/misc'
 import { NTMethod } from './ntcall'
 import {
@@ -14,68 +12,69 @@ import {
   GroupMember,
   CategoryFriend,
   SimpleInfo,
-  User,
+  ChatType,
-  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-created': (input: RawMessage) => void
-    'nt/message-deleted': (input: RawMessage[]) => void
+    'nt/message-deleted': (input: RawMessage) => void
-    'nt/message-sent': (input: RawMessage[]) => void
+    'nt/message-sent': (input: RawMessage) => void
-    'nt/group-notify': (input: GroupNotify[]) => void
+    'nt/group-notify': (input: { notify: GroupNotify, doubt: boolean }) => void
-    'nt/friend-request': (input: FriendRequest[]) => void
+    'nt/friend-request': (input: FriendRequest) => void
-    'nt/group-member-info-updated': (input: { groupCode: string; members: GroupMember[] }) => 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']
+  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() {
-    llonebotError.otherError = ''
+    this.startTime = Date.now()
-    MessageUnique.init(selfInfo.uin)
     this.registerListener()
     this.ctx.logger.info(`LLOneBot/${version}`)
-    this.ctx.on('llonebot/config-updated', input => {
+    this.ctx.on('llob/config-updated', input => {
       Object.assign(this.config, input)
     })
   }
 
   private registerListener() {
     registerReceiveHook<{
-      data: CategoryFriend[]
+      data?: CategoryFriend[]
+      userSimpleInfos?: Map<string, SimpleInfo> //V2
+      buddyCategory?: CategoryFriend[] //V2
     }>(ReceiveCmdS.FRIENDS, (payload) => {
-      type V2data = { userSimpleInfos: Map<string, SimpleInfo> }
+      let uids: string[] = []
-      let friendList: User[] = []
+      if (payload.buddyCategory) {
-      if ('userSimpleInfos' in payload) {
+        uids = payload.buddyCategory.flatMap(item => item.buddyUids)
-        friendList = Object.values((payload as unknown as V2data).userSimpleInfos).map((v: SimpleInfo) => {
+      } else if (payload.data) {
-          return {
+        uids = payload.data.flatMap(item => item.buddyList.map(e => e.uid))
-            ...v.coreInfo,
-          }
-        })
-      } else {
-        for (const fData of payload.data) {
-          friendList.push(...fData.buddyList)
-        }
       }
-      this.ctx.logger.info('好友列表变动', friendList.length)
+      for (const uid of uids) {
-      for (const friend of friendList) {
+        this.ctx.ntMsgApi.activateChat({ peerUid: uid, chatType: ChatType.C2C })
-        this.ctx.ntMsgApi.activateChat({ peerUid: friend.uid, chatType: ChatType.friend })
       }
+      this.ctx.logger.info('好友列表变动', uids.length)
     })
 
     // 自动清理新消息文件
-    registerReceiveHook<{ msgList: Array<RawMessage> }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
+    registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], (payload) => {
       if (!this.config.autoDeleteFile) {
         return
       }
@@ -94,9 +93,7 @@ class Core extends Service {
             }
             for (const path of pathList) {
               if (path) {
-                fs.unlink(picPath, () => {
+                unlink(path).then(() => this.ctx.logger.info('删除文件成功', path))
-                  this.ctx.logger.info('删除文件成功', path)
-                })
               }
             }
           }, this.config.autoDeleteFileSecond! * 1000)
@@ -124,17 +121,19 @@ class Core extends Service {
           if (activatedPeerUids.includes(contact.id)) continue
           activatedPeerUids.push(contact.id)
           const peer = { peerUid: contact.id, chatType: contact.chatType }
-          if (contact.chatType === ChatType.temp) {
+          if (contact.chatType === ChatType.TempC2CFromGroup) {
-            this.ctx.ntMsgApi.activateChatAndGetHistory(peer).then(() => {
+            this.ctx.ntMsgApi.activateChatAndGetHistory(peer, 2).then(res => {
-              this.ctx.ntMsgApi.getMsgHistory(peer, '', 20).then(({ msgList }) => {
+              for (const msg of res.msgList) {
-                const lastTempMsg = msgList.at(-1)
+                if (Date.now() / 1000 - Number(msg.msgTime) > 3) {
-                if (Date.now() / 1000 - Number(lastTempMsg?.msgTime) < 5) {
+                  continue
-                  this.ctx.parallel('nt/message-created', [lastTempMsg!])
                 }
-              })
+                if (msg.senderUin && msg.senderUin !== '0') {
+                  this.ctx.store.addMsgCache(msg)
+                }
+                this.ctx.parallel('nt/message-created', msg)
+              }
             })
-          }
+          } else {
-          else {
             this.ctx.ntMsgApi.activateChat(peer)
           }
         }
@@ -144,12 +143,12 @@ class Core extends Service {
     registerCallHook(NTMethod.DELETE_ACTIVE_CHAT, async (payload) => {
       const peerUid = payload[0] as string
       this.ctx.logger.info('激活的聊天窗口被删除，准备重新激活', peerUid)
-      let chatType = ChatType.friend
+      let chatType = ChatType.C2C
       if (isNumeric(peerUid)) {
-        chatType = ChatType.group
+        chatType = ChatType.Group
       }
       else if (!(await this.ctx.ntFriendApi.isBuddy(peerUid))) {
-        chatType = ChatType.temp
+        chatType = ChatType.TempC2CFromGroup
       }
       const peer = { peerUid, chatType }
       await this.ctx.sleep(1000)
@@ -169,35 +168,48 @@ class Core extends Service {
     })
 
     registerReceiveHook<{ msgList: RawMessage[] }>([ReceiveCmdS.NEW_MSG, ReceiveCmdS.NEW_ACTIVE_MSG], payload => {
-      this.ctx.parallel('nt/message-created', payload.msgList)
+      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 => {
-      const list = payload.msgList.filter(v => {
+      for (const msg of payload.msgList) {
-        if (recallMsgIds.includes(v.msgId)) {
+        if (
-          return false
+          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)
+          }
         }
-        recallMsgIds.push(v.msgId)
+      }
-        return true
-      })
-      this.ctx.parallel('nt/message-deleted', list)
     })
 
     registerReceiveHook<{ msgRecord: RawMessage }>(ReceiveCmdS.SELF_SEND_MSG, payload => {
-      const { msgId, chatType, peerUid } = payload.msgRecord
+      sentMsgIds.set(payload.msgRecord.msgId, true)
-      const peer = {
-        chatType,
-        peerUid
-      }
-      MessageUnique.createMsg(peer, msgId)
-      if (!this.config.reportSelfMessage) {
-        return
-      }
-      this.ctx.parallel('nt/message-sent', [payload.msgRecord])
     })
 
-    const groupNotifyFlags: string[] = []
+    const groupNotifyIgnore: string[] = []
     registerReceiveHook<{
       doubt: boolean
       oldestUnreadSeq: string
@@ -206,24 +218,39 @@ class Core extends Service {
       if (payload.unreadCount) {
         let notifies: GroupNotify[]
         try {
-          notifies = (await this.ctx.ntGroupApi.getSingleScreenNotifies(14)).slice(0, payload.unreadCount)
+          notifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(payload.doubt, payload.unreadCount)
         } catch (e) {
           return
         }
-        const list = notifies.filter(v => {
+        for (const notify of notifies) {
-          const flag = v.group.groupCode + '|' + v.seq + '|' + v.type
+          const notifyTime = Math.trunc(+notify.seq / 1000)
-          if (groupNotifyFlags.includes(flag)) {
+          if (groupNotifyIgnore.includes(notify.seq) || notifyTime < this.startTime) {
-            return false
+            continue
           }
-          groupNotifyFlags.push(flag)
+          groupNotifyIgnore.push(notify.seq)
-          return true
+          this.ctx.parallel('nt/group-notify', { notify, doubt: payload.doubt })
-        })
+        }
-        this.ctx.parallel('nt/group-notify', list)
       }
     })
 
     registerReceiveHook<FriendRequestNotify>(ReceiveCmdS.FRIEND_REQUEST, payload => {
-      this.ctx.parallel('nt/friend-request', payload.data.buddyReqs)
+      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))
     })
   }
 }
@@ -233,4 +260,4 @@ namespace Core {
   }
 }
 
-export default Core
+export default Core

src/ntqqapi/entities.ts

@@ -1,5 +1,6 @@
 import ffmpeg from 'fluent-ffmpeg'
 import faceConfig from './helper/face_config.json'
+import pathLib from 'node:path'
 import {
   AtType,
   ElementType,
@@ -15,23 +16,21 @@ import {
   SendTextElement,
   SendVideoElement,
 } from './types'
-import { stat, writeFile, copyFile, unlink } from 'node:fs/promises'
+import { stat, writeFile, copyFile, unlink, access } from 'node:fs/promises'
-import { calculateFileMD5, isGIF } from '../common/utils/file'
+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 const mFaceCache = new Map<string, string>() // emojiId -> faceName
+export namespace SendElement {
-
-export namespace SendElementEntities {
   export function text(content: string): SendTextElement {
     return {
-      elementType: ElementType.TEXT,
+      elementType: ElementType.Text,
       elementId: '',
       textElement: {
         content,
-        atType: AtType.notAt,
+        atType: AtType.Unknown,
         atUid: '',
         atTinyId: '',
         atNtUid: '',
@@ -41,7 +40,7 @@ export namespace SendElementEntities {
 
   export function at(atUid: string, atNtUid: string, atType: AtType, display: string): SendTextElement {
     return {
-      elementType: ElementType.TEXT,
+      elementType: ElementType.Text,
       elementId: '',
       textElement: {
         content: display,
@@ -53,27 +52,23 @@ export namespace SendElementEntities {
     }
   }
 
-  export function reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement {
+  export function reply(msgSeq: string, msgId: string, senderUin: string): SendReplyElement {
     return {
-      elementType: ElementType.REPLY,
+      elementType: ElementType.Reply,
       elementId: '',
       replyElement: {
-        replayMsgSeq: msgSeq, // raw.msgSeq
+        replayMsgSeq: msgSeq,
-        replayMsgId: msgId, // raw.msgId
+        replayMsgId: msgId,
         senderUin: senderUin,
-        senderUinStr: senderUinStr,
+        senderUinStr: senderUin,
       },
     }
   }
 
-  export async function pic(ctx: Context, picPath: string, summary: string = '', subType: 0 | 1 = 0): Promise<SendPicElement> {
+  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)
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(picPath, ElementType.Pic, subType)
     if (fileSize === 0) {
-      throw '文件异常，大小为0'
+      throw '文件异常，大小为 0'
-    }
-    const maxMB = 30;
-    if (fileSize > 1024 * 1024 * 30) {
-      throw `图片过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
     }
     const imageSize = await ctx.ntFileApi.getImageSize(picPath)
     const picElement = {
@@ -84,60 +79,53 @@ export namespace SendElementEntities {
       fileName: fileName,
       sourcePath: path,
       original: true,
-      picType: isGIF(picPath) ? PicType.gif : PicType.jpg,
+      picType: imageSize.type === 'gif' ? PicType.GIF : PicType.JPEG,
       picSubType: subType,
       fileUuid: '',
       fileSubId: '',
       thumbFileSize: 0,
       summary,
+      isFlashPic,
     }
     ctx.logger.info('图片信息', picElement)
     return {
-      elementType: ElementType.PIC,
+      elementType: ElementType.Pic,
       elementId: '',
       picElement,
     }
   }
 
-  export async function file(ctx: Context, filePath: string, fileName = '', folderId = ''): Promise<SendFileElement> {
+  export async function file(ctx: Context, filePath: string, fileName: string, folderId = ''): Promise<SendFileElement> {
-    const { fileName: _fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(filePath, ElementType.FILE)
+    const fileSize = (await stat(filePath)).size.toString()
-    if (fileSize === 0) {
+    if (fileSize === '0') {
-      throw '文件异常，大小为 0'
+      ctx.logger.warn(`文件${fileName}异常，大小为 0`)
+      throw new Error('文件异常，大小为 0')
     }
     const element: SendFileElement = {
-      elementType: ElementType.FILE,
+      elementType: ElementType.File,
       elementId: '',
       fileElement: {
-        fileName: fileName || _fileName,
+        fileName,
-        folderId: folderId,
+        folderId,
-        filePath: path!,
+        filePath,
-        fileSize: fileSize.toString(),
+        fileSize,
       },
     }
     return element
   }
 
   export async function video(ctx: Context, filePath: string, fileName = '', diyThumbPath = ''): Promise<SendVideoElement> {
-    try {
+    await access(filePath)
-      await stat(filePath)
+    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.Video)
-    } catch (e) {
-      throw `文件${filePath}异常，不存在`
-    }
-    ctx.logger.info('复制视频到QQ目录', filePath)
-    const { fileName: _fileName, path, fileSize, md5 } = await ctx.ntFileApi.uploadFile(filePath, ElementType.VIDEO)
 
-    ctx.logger.info('复制视频到QQ目录完成', path)
     if (fileSize === 0) {
-      throw '文件异常，大小为0'
+      throw new Error('文件异常，大小为 0')
     }
-    const maxMB = 100;
+    const maxMB = 100
     if (fileSize > 1024 * 1024 * maxMB) {
-      throw `视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`
+      throw new Error(`视频过大，最大支持${maxMB}MB，当前文件大小${fileSize}B`)
     }
-    const pathLib = require('path')
+    const thumbDir = pathLib.dirname(path.replaceAll('\\', '/').replace(`/Ori/`, `/Thumb/`))
-    let thumbDir = path.replace(`${pathLib.sep}Ori${pathLib.sep}`, `${pathLib.sep}Thumb${pathLib.sep}`)
-    thumbDir = pathLib.dirname(thumbDir)
-    // log("thumb 目录", thumb)
     let videoInfo = {
       width: 1920,
       height: 1080,
@@ -198,11 +186,10 @@ export namespace SendElementEntities {
     const _thumbPath = await createThumb
     ctx.logger.info('生成视频缩略图', _thumbPath)
     const thumbSize = (await stat(_thumbPath)).size
-    // log("生成缩略图", _thumbPath)
     thumbPath.set(0, _thumbPath)
     const thumbMd5 = await calculateFileMD5(_thumbPath)
     const element: SendVideoElement = {
-      elementType: ElementType.VIDEO,
+      elementType: ElementType.Video,
       elementId: '',
       videoElement: {
         fileName: fileName || _fileName,
@@ -214,17 +201,7 @@ export namespace SendElementEntities {
         thumbSize,
         thumbWidth: videoInfo.width,
         thumbHeight: videoInfo.height,
-        fileSize: '' + fileSize,
+        fileSize: String(fileSize),
-        // fileUuid: "",
-        // transferStatus: 0,
-        // progress: 0,
-        // invalidState: 0,
-        // fileSubId: "",
-        // fileBizId: null,
-        // originVideoMd5: "",
-        // fileFormat: 2,
-        // import_rich_media_context: null,
-        // sourceVideoCodecFormat: 2
       },
     }
     ctx.logger.info('videoElement', element)
@@ -233,26 +210,21 @@ export namespace SendElementEntities {
 
   export async function ptt(ctx: Context, pttPath: string): Promise<SendPttElement> {
     const { converted, path: silkPath, duration } = await encodeSilk(ctx, pttPath)
-    if (!silkPath) {
+    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.Ptt)
-      throw '语音转换失败, 请检查语音文件是否正常'
-    }
-    // log("生成语音", silkPath, duration);
-    const { md5, fileName, path, fileSize } = await ctx.ntFileApi.uploadFile(silkPath, ElementType.PTT)
     if (fileSize === 0) {
-      throw '文件异常，大小为0'
+      throw new Error('文件异常，大小为 0')
     }
     if (converted) {
       unlink(silkPath)
     }
     return {
-      elementType: ElementType.PTT,
+      elementType: ElementType.Ptt,
       elementId: '',
       pttElement: {
         fileName: fileName,
         filePath: path,
         md5HexStr: md5,
-        fileSize: fileSize,
+        fileSize: String(fileSize),
-        // duration: Math.max(1, Math.round(fileSize / 1024 / 3)), // 一秒钟大概是3kb大小, 小于1秒的按1秒算
         duration: duration,
         formatType: 1,
         voiceType: 1,
@@ -266,22 +238,22 @@ export namespace SendElementEntities {
     }
   }
 
-  export function face(faceId: number): SendFaceElement {
+  export function face(faceId: number, faceType?: number): SendFaceElement {
     // 从face_config.json中获取表情名称
     const sysFaces = faceConfig.sysface
-    const emojiFaces = faceConfig.emoji
+    const face = sysFaces.find(face => face.QSid === String(faceId))
-    const face = sysFaces.find((face) => face.QSid === faceId.toString())
+    if (!faceType) {
-    faceId = parseInt(faceId.toString())
+      if (faceId < 222) {
-    // let faceType = parseInt(faceId.toString().substring(0, 1));
+        faceType = 1
-    let faceType = 1
+      } else {
-    if (faceId >= 222) {
+        faceType = 2
-      faceType = 2
+      }
-    }
+      if (face?.AniStickerType) {
-    if (face?.AniStickerType) {
+        faceType = 3
-      faceType = 3;
+      }
     }
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: faceId,
@@ -297,7 +269,8 @@ export namespace SendElementEntities {
 
   export function mface(emojiPackageId: number, emojiId: string, key: string, summary?: string): SendMarketFaceElement {
     return {
-      elementType: ElementType.MFACE,
+      elementType: ElementType.MarketFace,
+      elementId: '',
       marketFaceElement: {
         imageWidth: 300,
         imageHeight: 300,
@@ -314,10 +287,10 @@ export namespace SendElementEntities {
     // 随机1到6
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 6) + 1
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
-        faceIndex: FaceIndex.dice,
+        faceIndex: FaceIndex.Dice,
         faceType: 3,
         faceText: '[骰子]',
         packId: '1',
@@ -336,7 +309,7 @@ export namespace SendElementEntities {
     // 实际测试并不能控制结果
     if (isNullable(resultId)) resultId = Math.floor(Math.random() * 3) + 1
     return {
-      elementType: ElementType.FACE,
+      elementType: ElementType.Face,
       elementId: '',
       faceElement: {
         faceIndex: FaceIndex.RPS,
@@ -355,7 +328,7 @@ export namespace SendElementEntities {
 
   export function ark(data: string): SendArkElement {
     return {
-      elementType: ElementType.ARK,
+      elementType: ElementType.Ark,
       elementId: '',
       arkElement: {
         bytesData: data,
@@ -364,4 +337,16 @@ export namespace SendElementEntities {
       },
     }
   }
+
+  export function shake(): SendFaceElement {
+    return {
+      elementType: ElementType.Face,
+      elementId: '',
+      faceElement: {
+        faceIndex: 1,
+        faceType: 5,
+        pokeType: 1,
+      },
+    }
+  }
 }

src/ntqqapi/helper/face_config.json

@@ -1,5 +1,15 @@
 {
   "sysface": [
+    {
+      "QSid": "419",
+      "QDes": "/火车",
+      "IQLid": "419",
+      "AQLid": "419",
+      "EMCode": "10419",
+      "AniStickerType": 3,
+      "AniStickerPackId": "1",
+      "AniStickerId": "47"
+    },
     {
       "QSid": "392",
       "QDes": "/龙年快乐",
@@ -3662,4 +3672,4 @@
       "EMCode": "401016"
     }
   ]
-}
+}

src/ntqqapi/helper/rkey.ts

@@ -1,4 +1,4 @@
-import { Context } from "cordis"
+import { Context } from 'cordis'
 
 interface ServerRkeyData {
   group_rkey: string
@@ -31,30 +31,18 @@ export class RkeyManager {
 
   isExpired(): boolean {
     const now = new Date().getTime() / 1000
-    // console.log(`now: ${now}, expired_time: ${this.rkeyData.expired_time}`)
     return now > this.rkeyData.expired_time
   }
 
   async refreshRkey() {
-    //刷新rkey
     this.rkeyData = await this.fetchServerRkey()
   }
 
-  async fetchServerRkey() {
+  async fetchServerRkey(): Promise<ServerRkeyData> {
-    return new Promise<ServerRkeyData>((resolve, reject) => {
+    const response = await fetch(this.serverUrl)
-      fetch(this.serverUrl)
+    if (!response.ok) {
-        .then(response => {
+      throw new Error(response.statusText)
-          if (!response.ok) {
+    }
-            return reject(response.statusText) // 请求失败，返回错误信息
+    return response.json()
-          }
-          return response.json() // 解析 JSON 格式的响应体
-        })
-        .then(data => {
-          resolve(data)
-        })
-        .catch(error => {
-          reject(error)
-        })
-    })
   }
 }

src/ntqqapi/hook.ts

@@ -1,187 +1,117 @@
-import type { BrowserWindow } from 'electron'
+import { NTMethod } from './ntcall'
-import { NTClass, NTMethod } from './ntcall'
 import { log } from '@/common/utils'
 import { randomUUID } from 'node:crypto'
+import { ipcMain } from 'electron'
 import { Dict } from 'cosmokit'
 
 export const hookApiCallbacks: Record<string, (res: any) => void> = {}
 
-export const ReceiveCmdS = {
+export enum ReceiveCmdS {
-  RECENT_CONTACT: 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
+  RECENT_CONTACT = 'nodeIKernelRecentContactListener/onRecentContactListChangedVer2',
-  UPDATE_MSG: 'nodeIKernelMsgListener/onMsgInfoListUpdate',
+  UPDATE_MSG = 'nodeIKernelMsgListener/onMsgInfoListUpdate',
-  UPDATE_ACTIVE_MSG: 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
+  UPDATE_ACTIVE_MSG = 'nodeIKernelMsgListener/onActiveMsgInfoUpdate',
-  NEW_MSG: `nodeIKernelMsgListener/onRecvMsg`,
+  NEW_MSG = 'nodeIKernelMsgListener/onRecvMsg',
-  NEW_ACTIVE_MSG: `nodeIKernelMsgListener/onRecvActiveMsg`,
+  NEW_ACTIVE_MSG = 'nodeIKernelMsgListener/onRecvActiveMsg',
-  SELF_SEND_MSG: 'nodeIKernelMsgListener/onAddSendMsg',
+  SELF_SEND_MSG = 'nodeIKernelMsgListener/onAddSendMsg',
-  USER_INFO: 'nodeIKernelProfileListener/onProfileSimpleChanged',
+  USER_INFO = 'nodeIKernelProfileListener/onProfileSimpleChanged',
-  USER_DETAIL_INFO: 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
+  USER_DETAIL_INFO = 'nodeIKernelProfileListener/onProfileDetailInfoChanged',
-  GROUPS: 'nodeIKernelGroupListener/onGroupListUpdate',
+  GROUPS = 'nodeIKernelGroupListener/onGroupListUpdate',
-  GROUPS_STORE: 'onGroupListUpdate',
+  GROUPS_STORE = 'onGroupListUpdate',
-  GROUP_MEMBER_INFO_UPDATE: 'nodeIKernelGroupListener/onMemberInfoChange',
+  GROUP_MEMBER_INFO_UPDATE = 'nodeIKernelGroupListener/onMemberInfoChange',
-  FRIENDS: 'onBuddyListChange',
+  FRIENDS = 'onBuddyListChange',
-  MEDIA_DOWNLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
+  MEDIA_DOWNLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaDownloadComplete',
-  UNREAD_GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
+  UNREAD_GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupNotifiesUnreadCountUpdated',
-  GROUP_NOTIFY: 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
+  GROUP_NOTIFY = 'nodeIKernelGroupListener/onGroupSingleScreenNotifies',
-  FRIEND_REQUEST: 'nodeIKernelBuddyListener/onBuddyReqChange',
+  FRIEND_REQUEST = 'nodeIKernelBuddyListener/onBuddyReqChange',
-  SELF_STATUS: 'nodeIKernelProfileListener/onSelfStatusChanged',
+  SELF_STATUS = 'nodeIKernelProfileListener/onSelfStatusChanged',
-  CACHE_SCAN_FINISH: 'nodeIKernelStorageCleanListener/onFinishScan',
+  CACHE_SCAN_FINISH = 'nodeIKernelStorageCleanListener/onFinishScan',
-  MEDIA_UPLOAD_COMPLETE: 'nodeIKernelMsgListener/onRichMediaUploadComplete',
+  MEDIA_UPLOAD_COMPLETE = 'nodeIKernelMsgListener/onRichMediaUploadComplete',
-  SKEY_UPDATE: 'onSkeyUpdate',
-} as const
-
-export type ReceiveCmd = string
-
-interface NTQQApiReturnData extends Array<unknown> {
-  0: {
-    type: 'request'
-    eventName: NTClass
-    callbackId?: string
-  }
-  1: {
-    cmdName: ReceiveCmd
-    cmdType: 'event'
-    payload: unknown
-  }[]
 }
 
 const logHook = false
 
-const receiveHooks: Array<{
+const receiveHooks: Map<string, {
-  method: ReceiveCmd[]
+  method: ReceiveCmdS[]
   hookFunc: (payload: any) => void | Promise<void>
-  id: string
+}> = new Map()
-}> = []
 
 const callHooks: Array<{
   method: NTMethod[]
   hookFunc: (callParams: unknown[]) => void | Promise<void>
 }> = []
 
-export function hookNTQQApiReceive(window: BrowserWindow, onlyLog: boolean) {
+export function startHook() {
-  const originalSend = window.webContents.send
+  log('start hook')
-  const patchSend = (channel: string, ...args: NTQQApiReturnData) => {
+
-    try {
+  const senderExclude = Symbol()
-      const isLogger = args[0]?.eventName?.startsWith('ns-LoggerApi')
+
-      if (logHook && !isLogger) {
+  ipcMain.emit = new Proxy(ipcMain.emit, {
-        log(`received ntqq api message: ${channel}`, args)
+    apply(target, thisArg, args: [channel: string, ...args: any]) {
+      if (args[2]?.eventName?.startsWith('ns-LoggerApi')) {
+        return target.apply(thisArg, args)
       }
-    } catch { }
+      if (logHook) {
-    if (!onlyLog) {
+        log('request', args)
-      if (args?.[1] instanceof Array) {
+      }
-        for (const receiveData of args[1]) {
+      const event = args[1]
-          const ntQQApiMethodName = receiveData.cmdName
+      if (event.sender && !event.sender[senderExclude]) {
-          // log(`received ntqq api message: ${channel} ${ntQQApiMethodName}`, JSON.stringify(receiveData))
+        event.sender[senderExclude] = true
-          for (const hook of receiveHooks) {
+        event.sender.send = new Proxy(event.sender.send, {
-            if (hook.method.includes(ntQQApiMethodName)) {
+          apply(target, thisArg, args: [channel: string, meta: Dict, data: Dict[]]) {
-              new Promise(resolve => {
+            if (args[1]?.eventName?.startsWith('ns-LoggerApi')) {
-                try {
+              return target.apply(thisArg, args)
-                  hook.hookFunc(receiveData.payload)
+            }
-                } catch (e) {
+            if (logHook) {
-                  log('hook error', ntQQApiMethodName, (e as Error).stack?.toString())
+              log('received', args)
-                }
-                resolve(undefined)
-              }).then()
             }
-          }
-        }
-      }
-      if (args[0]?.callbackId) {
-        // log("hookApiCallback", hookApiCallbacks, args)
-        const callbackId = args[0].callbackId
-        if (hookApiCallbacks[callbackId]) {
-          new Promise(resolve => {
-            hookApiCallbacks[callbackId](args[1])
-            resolve(undefined)
-          }).then()
-          delete hookApiCallbacks[callbackId]
-        }
-      }
-    }
-    originalSend.call(window.webContents, channel, ...args)
-  }
-  window.webContents.send = patchSend
-}
 
-export function hookNTQQApiCall(window: BrowserWindow, onlyLog: boolean) {
+            const callbackId = args[1]?.callbackId
-  // 监听调用NTQQApi
+            if (callbackId) {
-  const webContents = window.webContents as Dict
+              if (hookApiCallbacks[callbackId]) {
-  const ipc_message_proxy = webContents._events['-ipc-message']?.[0] || webContents._events['-ipc-message']
+                Promise.resolve(hookApiCallbacks[callbackId](args[2]))
-
+                delete hookApiCallbacks[callbackId]
-  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 {
-          logHook && log('call NTQQ api', thisArg, args)
-        } catch (e) { }
-        if (!onlyLog) {
-          try {
-            const _args: unknown[] = args[3][1]
-            const cmdName: NTMethod = _args[0] as NTMethod
-            const callParams = _args.slice(1)
-            callHooks.forEach((hook) => {
-              if (hook.method.includes(cmdName)) {
-                new Promise(resolve => {
-                  try {
-                    hook.hookFunc(callParams)
-                  } catch (e) {
-                    log('hook call error', e, _args)
-                  }
-                  resolve(undefined)
-                }).then()
               }
-            })
+            } else if (args[2]) {
-          } catch (e) { }
+              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))
+                    }
+                  }
+                }
+              }
+            }
+            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))
+          }
         }
       }
       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) {
-      //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)
-        },
-      })
-      const 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: ReceiveCmd | ReceiveCmd[],
+  method: string | string[],
   hookFunc: (payload: PayloadType) => void,
 ): string {
   const id = randomUUID()
   if (!Array.isArray(method)) {
     method = [method]
   }
-  receiveHooks.push({
+  receiveHooks.set(id, {
-    method,
+    method: method as ReceiveCmdS[],
     hookFunc,
-    id,
   })
   return id
 }
@@ -200,6 +130,5 @@ export function registerCallHook(
 }
 
 export function removeReceiveHook(id: string) {
-  const index = receiveHooks.findIndex((h) => h.id === id)
+  receiveHooks.delete(id)
-  receiveHooks.splice(index, 1)
+}
-}

src/ntqqapi/listeners/NodeIKernelGroupListener.ts

@@ -1,58 +0,0 @@
-import { Group, GroupListUpdateType, GroupMember, GroupNotify } from '@/ntqqapi/types'
-
-export interface IGroupListener {
-  onGroupListUpdate(updateType: GroupListUpdateType, groupList: Group[]): void
-
-  onGroupExtListUpdate(...args: unknown[]): void
-
-  onGroupSingleScreenNotifies(doubt: boolean, seq: string, notifies: GroupNotify[]): void
-
-  onGroupNotifiesUpdated(dboubt: boolean, notifies: GroupNotify[]): void
-
-  onGroupNotifiesUnreadCountUpdated(...args: unknown[]): void
-
-  onGroupDetailInfoChange(...args: unknown[]): void
-
-  onGroupAllInfoChange(...args: unknown[]): void
-
-  onGroupsMsgMaskResult(...args: unknown[]): void
-
-  onGroupConfMemberChange(...args: unknown[]): void
-
-  onGroupBulletinChange(...args: unknown[]): void
-
-  onGetGroupBulletinListResult(...args: unknown[]): void
-
-  onMemberListChange(arg: {
-    sceneId: string,
-    ids: string[],
-    infos: Map<string, GroupMember>,
-    finish: boolean,
-    hasRobot: boolean
-  }): void
-
-  onMemberInfoChange(groupCode: string, changeType: number, members: Map<string, GroupMember>): void
-
-  onSearchMemberChange(...args: unknown[]): void
-
-  onGroupBulletinRichMediaDownloadComplete(...args: unknown[]): void
-
-  onGroupBulletinRichMediaProgressUpdate(...args: unknown[]): void
-
-  onGroupStatisticInfoChange(...args: unknown[]): void
-
-  onJoinGroupNotify(...args: unknown[]): void
-
-  onShutUpMemberListChanged(...args: unknown[]): void
-
-  onGroupBulletinRemindNotify(...args: unknown[]): void
-
-  onGroupFirstBulletinNotify(...args: unknown[]): void
-
-  onJoinGroupNoVerifyFlag(...args: unknown[]): void
-
-  onGroupArkInviteStateResult(...args: unknown[]): void
-  
-  // 发现于Win 9.9.9 23159
-  onGroupMemberLevelInfoChange(...args: unknown[]): void
-}

src/ntqqapi/listeners/NodeIKernelMsgListener.ts

@@ -1,268 +0,0 @@
-import { ChatType, RawMessage } from '@/ntqqapi/types'
-
-export interface OnRichMediaDownloadCompleteParams {
-  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 | null,
-  fileSrvErrCode: string,
-  clientMsg: string,
-  businessId: number,
-  userTotalSpacePerDay: unknown | null,
-  userUsedSpacePerDay: unknown | null
-}
-
-export interface OnGroupFileInfoUpdateParams {
-  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
-}
-
-// {
-//   sessionType: 1,
-//   chatType: 100,
-//   peerUid: 'u_PVQ3tl6K78xxxx',
-//   groupCode: '809079648',
-//   fromNick: '拾xxxx,
-//   sig: '0x'
-// }
-export interface TempOnRecvParams {
-  sessionType: number,//1
-  chatType: ChatType,//100
-  peerUid: string,//uid
-  groupCode: string,//gc
-  fromNick: string,//gc name
-  sig: string,
-}
-
-export interface IKernelMsgListener {
-  onAddSendMsg(msgRecord: RawMessage): void
-
-  onBroadcastHelperDownloadComplete(broadcastHelperTransNotifyInfo: unknown): void
-
-  onBroadcastHelperProgressUpdate(broadcastHelperTransNotifyInfo: unknown): void
-
-  onChannelFreqLimitInfoUpdate(contact: unknown, z: unknown, freqLimitInfo: unknown): void
-
-  onContactUnreadCntUpdate(hashMap: unknown): void
-
-  onCustomWithdrawConfigUpdate(customWithdrawConfig: unknown): void
-
-  onDraftUpdate(contact: unknown, arrayList: unknown, j2: unknown): void
-
-  onEmojiDownloadComplete(emojiNotifyInfo: unknown): void
-
-  onEmojiResourceUpdate(emojiResourceInfo: unknown): void
-
-  onFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): void
-
-  onFileMsgCome(arrayList: unknown): void
-
-  onFirstViewDirectMsgUpdate(firstViewDirectMsgNotifyInfo: unknown): void
-
-  onFirstViewGroupGuildMapping(arrayList: unknown): void
-
-  onGrabPasswordRedBag(i2: unknown, str: unknown, i3: unknown, recvdOrder: unknown, msgRecord: unknown): void
-
-  onGroupFileInfoAdd(groupItem: unknown): void
-
-  onGroupFileInfoUpdate(groupFileListResult: OnGroupFileInfoUpdateParams): void
-
-  onGroupGuildUpdate(groupGuildNotifyInfo: unknown): void
-
-  onGroupTransferInfoAdd(groupItem: unknown): void
-
-  onGroupTransferInfoUpdate(groupFileListResult: unknown): void
-
-  onGuildInteractiveUpdate(guildInteractiveNotificationItem: unknown): void
-
-  onGuildMsgAbFlagChanged(guildMsgAbFlag: unknown): void
-
-  onGuildNotificationAbstractUpdate(guildNotificationAbstractInfo: unknown): void
-
-  onHitCsRelatedEmojiResult(downloadRelateEmojiResultInfo: unknown): void
-
-  onHitEmojiKeywordResult(hitRelatedEmojiWordsResult: unknown): void
-
-  onHitRelatedEmojiResult(relatedWordEmojiInfo: unknown): void
-
-  onImportOldDbProgressUpdate(importOldDbMsgNotifyInfo: unknown): void
-
-  onInputStatusPush(inputStatusInfo: unknown): void
-
-  onKickedOffLine(kickedInfo: unknown): void
-
-  onLineDev(arrayList: unknown): void
-
-  onLogLevelChanged(j2: unknown): void
-
-  onMsgAbstractUpdate(arrayList: unknown): void
-
-  onMsgBoxChanged(arrayList: unknown): void
-
-  onMsgDelete(contact: unknown, arrayList: unknown): void
-
-  onMsgEventListUpdate(hashMap: unknown): void
-
-  onMsgInfoListAdd(arrayList: unknown): void
-
-  onMsgInfoListUpdate(msgList: RawMessage[]): void
-
-  onMsgQRCodeStatusChanged(i2: unknown): void
-
-  onMsgRecall(i2: unknown, str: unknown, j2: unknown): void
-
-  onMsgSecurityNotify(msgRecord: unknown): void
-
-  onMsgSettingUpdate(msgSetting: unknown): void
-
-  onNtFirstViewMsgSyncEnd(): void
-
-  onNtMsgSyncEnd(): void
-
-  onNtMsgSyncStart(): void
-
-  onReadFeedEventUpdate(firstViewDirectMsgNotifyInfo: unknown): void
-
-  onRecvGroupGuildFlag(i2: unknown): void
-
-  onRecvMsg(...arrayList: unknown[]): void
-
-  onRecvMsgSvrRspTransInfo(j2: unknown, contact: unknown, i2: unknown, i3: unknown, str: unknown, bArr: unknown): void
-
-  onRecvOnlineFileMsg(arrayList: unknown): void
-
-  onRecvS2CMsg(arrayList: unknown): void
-
-  onRecvSysMsg(arrayList: unknown): void
-
-  onRecvUDCFlag(i2: unknown): void
-
-  onRichMediaDownloadComplete(fileTransNotifyInfo: OnRichMediaDownloadCompleteParams): void
-
-  onRichMediaProgerssUpdate(fileTransNotifyInfo: unknown): void
-
-  onRichMediaUploadComplete(fileTransNotifyInfo: unknown): void
-
-  onSearchGroupFileInfoUpdate(searchGroupFileResult:
-    {
-      result: {
-        retCode: number,
-        retMsg: string,
-        clientWording: string
-      },
-      syncCookie: string,
-      totalMatchCount: number,
-      ownerMatchCount: number,
-      isEnd: boolean,
-      reqId: number,
-      item: Array<{
-        groupCode: string,
-        groupName: string,
-        uploaderUin: string,
-        uploaderName: string,
-        matchUin: string,
-        matchWords: Array<unknown>,
-        fileNameHits: Array<{
-          start: number,
-          end: number
-        }>,
-        fileModelId: string,
-        fileId: string,
-        fileName: string,
-        fileSize: string,
-        busId: number,
-        uploadTime: number,
-        modifyTime: number,
-        deadTime: number,
-        downloadTimes: number,
-        localPath: string
-      }>
-    }): void
-
-  onSendMsgError(j2: unknown, contact: unknown, i2: unknown, str: unknown): void
-
-  onSysMsgNotification(i2: unknown, j2: unknown, j3: unknown, arrayList: unknown): void
-
-  onTempChatInfoUpdate(tempChatInfo: TempOnRecvParams): void
-
-  onUnreadCntAfterFirstView(hashMap: unknown): void
-
-  onUnreadCntUpdate(hashMap: unknown): void
-
-  onUserChannelTabStatusChanged(z: unknown): void
-
-  onUserOnlineStatusChanged(z: unknown): void
-
-  onUserTabStatusChanged(arrayList: unknown): void
-
-  onlineStatusBigIconDownloadPush(i2: unknown, j2: unknown, str: unknown): void
-
-  onlineStatusSmallIconDownloadPush(i2: unknown, j2: unknown, str: unknown): void
-
-  // 第一次发现于Linux
-  onUserSecQualityChanged(...args: unknown[]): void
-
-  onMsgWithRichLinkInfoUpdate(...args: unknown[]): void
-
-  onRedTouchChanged(...args: unknown[]): void
-
-  // 第一次发现于Win 9.9.9 23159
-  onBroadcastHelperProgerssUpdate(...args: unknown[]): void
-}

src/ntqqapi/listeners/NodeIKernelProfileListener.ts

@@ -1,15 +0,0 @@
-import { User, UserDetailInfoListenerArg } from '@/ntqqapi/types'
-
-export interface IProfileListener {
-  onProfileSimpleChanged(...args: unknown[]): void
-
-  onUserDetailInfoChanged(arg: UserDetailInfoListenerArg): void
-
-  onProfileDetailInfoChanged(profile: User): void
-
-  onStatusUpdate(...args: unknown[]): void
-
-  onSelfStatusChanged(...args: unknown[]): void
-
-  onStrangerRemarkChanged(...args: unknown[]): void
-}

src/ntqqapi/listeners/index.ts

@@ -1,3 +0,0 @@
-export * from './NodeIKernelProfileListener'
-export * from './NodeIKernelGroupListener'
-export * from './NodeIKernelMsgListener'

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,6 +1,6 @@
 import { ipcMain } from 'electron'
 import { hookApiCallbacks, registerReceiveHook, removeReceiveHook } from './hook'
-import { log } from '../common/utils/legacyLog'
+import { log } from '../common/utils'
 import { randomUUID } from 'node:crypto'
 import {
   GeneralCallResult,
@@ -14,7 +14,8 @@ import {
   NodeIKernelRichMediaService,
   NodeIKernelTicketService,
   NodeIKernelTipOffService,
-  NodeIKernelSearchService,
+  NodeIKernelRobotService,
+  NodeIKernelNodeMiscService
 } from './services'
 
 export enum NTClass {
@@ -28,7 +29,8 @@ export enum NTClass {
   SKEY_API = 'ns-SkeyApi',
   GROUP_HOME_WORK = 'ns-GroupHomeWork',
   GROUP_ESSENCE = 'ns-GroupEssence',
-  NODE_STORE_API = 'ns-NodeStoreApi'
+  NODE_STORE_API = 'ns-NodeStoreApi',
+  QQ_EX_API = 'ns-QQEXApi',
 }
 
 export enum NTMethod {
@@ -40,7 +42,6 @@ export enum NTMethod {
   MEDIA_FILE_PATH = 'nodeIKernelMsgService/getRichMediaFilePathForGuild',
   RECALL_MSG = 'nodeIKernelMsgService/recallMsg',
   EMOJI_LIKE = 'nodeIKernelMsgService/setMsgEmojiLikes',
-  FORWARD_MSG = 'nodeIKernelMsgService/forwardMsgWithComment',
 
   SELF_INFO = 'fetchAuthData',
   FILE_TYPE = 'getFileType',
@@ -94,40 +95,63 @@ interface NTService {
   nodeIKernelRichMediaService: NodeIKernelRichMediaService
   nodeIKernelTicketService: NodeIKernelTicketService
   nodeIKernelTipOffService: NodeIKernelTipOffService
-  nodeIKernelSearchService: NodeIKernelSearchService
+  nodeIKernelRobotService: NodeIKernelRobotService
+  nodeIKernelNodeMiscService: NodeIKernelNodeMiscService
 }
 
 interface InvokeOptions<ReturnType> {
   className?: NTClass
   channel?: NTChannel
-  classNameIsRegister?: boolean
+  registerEvent?: boolean
   cbCmd?: string | string[]
   cmdCB?: (payload: ReturnType, result: unknown) => boolean
   afterFirstCmd?: boolean // 是否在methodName调用完之后再去hook cbCmd
   timeout?: number
 }
 
+let channel: NTChannel
+
+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 ?? NTChannel.IPC_UP_2
+  const channel = options.channel ?? getChannel()
   const timeout = options.timeout ?? 5000
   const afterFirstCmd = options.afterFirstCmd ?? true
   let eventName = className + '-' + channel[channel.length - 1]
-  if (options.classNameIsRegister) {
+  if (options.registerEvent) {
     eventName += '-register'
   }
   return new Promise<R>((resolve, reject) => {
     const apiArgs = [method, ...args]
     const callbackId = randomUUID()
-    let success = false
+    let eventId: string
+
+    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 => {
-        success = true
+        clearTimeout(timeoutId)
         resolve(res)
       }
     }
@@ -135,20 +159,15 @@ export function invoke<
       let result: unknown
       // 这里的callback比较特殊，QQ后端先返回是否调用成功，再返回一条结果数据
       const secondCallback = () => {
-        const hookId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
+        eventId = registerReceiveHook<R>(options.cbCmd!, (payload) => {
-          // log(methodName, "second callback", cbCmd, payload, cmdCB);
           if (options.cmdCB) {
-            if (options.cmdCB(payload, result)) {
+            if (!options.cmdCB(payload, result)) {
-              removeReceiveHook(hookId)
+              return
-              success = true
-              resolve(payload)
             }
           }
-          else {
+          removeReceiveHook(eventId)
-            removeReceiveHook(hookId)
+          clearTimeout(timeoutId)
-            success = true
+          resolve(payload)
-            resolve(payload)
-          }
         })
       }
       !afterFirstCmd && secondCallback()
@@ -158,17 +177,15 @@ export function invoke<
           afterFirstCmd && secondCallback()
         }
         else {
-          log('ntqq api call failed,', method, res)
+          clearTimeout(timeoutId)
-          reject(`ntqq api call failed, ${method}, ${res.errMsg}`)
+          if (eventId) {
+            removeReceiveHook(eventId)
+          }
+          log('ntqq api call failed,', method, args, res)
+          reject(`ntqq api call failed, ${method}, ${JSON.stringify(res)}`)
         }
       }
     }
-    setTimeout(() => {
-      if (!success) {
-        log(`ntqq api timeout ${channel}, ${eventName}, ${method}`, apiArgs)
-        reject(`ntqq api timeout ${channel}, ${eventName}, ${method}, ${apiArgs}`)
-      }
-    }, timeout)
 
     ipcMain.emit(
       channel,
@@ -182,4 +199,4 @@ export function invoke<
       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

@@ -1,125 +1,27 @@
+import { BuddyListReqType } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
 
-export enum BuddyListReqType {
-  KNOMAL,
-  KLETTER
-}
-
 export interface NodeIKernelBuddyService {
-  // 26702 以上
   getBuddyListV2(callFrom: string, reqType: BuddyListReqType): Promise<GeneralCallResult & {
-    data: Array<{
+    data: {
-      categoryId: number,
+      categoryId: number
-      categorySortId: number,
+      categorySortId: number
-      categroyName: string,
+      categroyName: string
-      categroyMbCount: number,
+      categroyMbCount: number
-      onlineCount: number,
+      onlineCount: number
-      buddyUids: Array<string>
+      buddyUids: string[]
-    }>
+    }[]
   }>
 
-  //26702 以上
+  setBuddyRemark(arg: unknown): Promise<GeneralCallResult>
-  getBuddyListFromCache(callFrom: string): Promise<Array<
-    {
-      categoryId: number,//9999应该跳过 那是兜底数据吧
-      categorySortId: number,//排序方式
-      categroyName: string,//分类名
-      categroyMbCount: number,//不懂
-      onlineCount: number,//在线数目
-      buddyUids: Array<string>//Uids
-    }>>
-
-  addKernelBuddyListener(listener: unknown): number
-
-  getAllBuddyCount(): number
-
-  removeKernelBuddyListener(listener: unknown): void
-
-  getBuddyList(nocache: boolean): Promise<GeneralCallResult>
-
-  getBuddyNick(uid: number): string
-
-  getBuddyRemark(uid: number): string
-
-  setBuddyRemark(uid: number, remark: string): void
-
-  getAvatarUrl(uid: number): string
 
   isBuddy(uid: string): boolean
 
-  getCategoryNameWithUid(uid: number): string
-
-  getTargetBuddySetting(uid: number): unknown
-
-  getTargetBuddySettingByType(uid: number, type: number): unknown
-
-  getBuddyReqUnreadCnt(): number
-
-  getBuddyReq(): unknown
-
-  delBuddyReq(uid: number): void
-
-  clearBuddyReqUnreadCnt(): void
-
-  reqToAddFriends(uid: number, msg: string): void
-
-  setSpacePermission(uid: number, permission: number): void
-
   approvalFriendRequest(arg: {
     friendUid: string
     reqTime: string
     accept: boolean
   }): Promise<void>
 
-  delBuddy(uid: number): void
+  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<GeneralCallResult & { arkMsg: string }>
-
+}
-  delBatchBuddy(uids: number[]): void
-
-  getSmartInfos(uid: number): unknown
-
-  setBuddyCategory(uid: number, category: number): void
-
-  setBatchBuddyCategory(uids: number[], category: number): void
-
-  addCategory(category: string): void
-
-  delCategory(category: string): void
-
-  renameCategory(oldCategory: string, newCategory: string): void
-
-  resortCategory(categorys: string[]): void
-
-  pullCategory(uid: number, category: string): void
-
-  setTop(uid: number, isTop: boolean): void
-
-  SetSpecialCare(uid: number, isSpecialCare: boolean): void
-
-  setMsgNotify(uid: number, isNotify: boolean): void
-
-  hasBuddyList(): boolean
-
-  setBlock(uid: number, isBlock: boolean): void
-
-  isBlocked(uid: number): boolean
-
-  modifyAddMeSetting(setting: unknown): void
-
-  getAddMeSetting(): unknown
-
-  getDoubtBuddyReq(): unknown
-
-  getDoubtBuddyUnreadNum(): number
-
-  approvalDoubtBuddyReq(uid: number, isAgree: boolean): void
-
-  delDoubtBuddyReq(uid: number): void
-
-  delAllDoubtBuddyReq(): void
-
-  reportDoubtBuddyReqUnread(): void
-
-  getBuddyRecommendContactArkJson(uid: string, phoneNumber: string): Promise<unknown>
-
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelGroupService.ts

@@ -1,254 +1,130 @@
 import {
-  GroupExtParam,
   GroupMember,
   GroupMemberRole,
   GroupNotifyType,
   GroupRequestOperateTypes,
 } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-import { Dict } from 'cosmokit'
 
 export interface NodeIKernelGroupService {
-  getMemberCommonInfo(Req: {
+  getGroupHonorList(req: { groupCode: number[] }): Promise<{
-    groupCode: string,
+    errCode: number
-    startUin: string,
+    errMsg: string
-    identifyFlag: string,
+    groupMemberHonorList: {
-    uinList: string[],
+      honorList: {
-    memberCommonFilter: {
+        groupCode: string
-      memberUin: number,
+        id: number[]
-      uinFlag: number,
+        isGray: number
-      uinFlagExt: number,
+      }[]
-      uinMobileFlag: number,
+      cacheTs: number
-      shutUpTime: number,
+      honorInfos: unknown[]
-      privilege: number,
+      joinTime: number
-    },
+    }
-    memberNum: number,
+  }>
-    filterMethod: string,
-    onlineFlag: string,
-    realSpecialTitleFlag: number
-  }): Promise<unknown>
-
-  //26702
-  getGroupMemberLevelInfo(groupCode: string): Promise<unknown>
-
-  //26702
-  getGroupHonorList(groupCodes: Array<string>): unknown
 
   getUinByUids(uins: string[]): Promise<{
-    errCode: number,
+    errCode: number
-    errMsg: string,
+    errMsg: string
     uins: Map<string, string>
   }>
 
   getUidByUins(uins: string[]): Promise<{
-    errCode: number,
+    errCode: number
-    errMsg: string,
+    errMsg: string
     uids: Map<string, string>
   }>
-  
-  //26702(其实更早 但是我不知道)
-  checkGroupMemberCache(arrayList: Array<string>): Promise<unknown>
 
-  //26702(其实更早 但是我不知道)
+  queryCachedEssenceMsg(req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<{
-  getGroupLatestEssenceList(groupCode: string): Promise<unknown>
+    items: {
-
+      groupCode: string
-  //26702(其实更早 但是我不知道) 
+      msgSeq: number
-  shareDigest(Req: {
+      msgRandom: number
-    appId: string,
+      msgSenderUin: string
-    appType: number,
+      msgSenderNick: string
-    msgStyle: number,
+      opType: number
-    recvUin: string,
+      opUin: string
-    sendType: number,
+      opNick: string
-    clientInfo: {
+      opTime: number
-      platform: number
+      grayTipSeq: string
-    },
+    }[]
-    richMsg: {
-      usingArk: boolean,
-      title: string,
-      summary: string,
-      url: string,
-      pictureUrl: string,
-      brief: string
-    }
-  }): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  isEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  queryCachedEssenceMsg(Req: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
-
-  //26702(其实更早 但是我不知道)
-  fetchGroupEssenceList(Req: { groupCode: string, pageStart: number, pageLimit: number }, Arg: unknown): Promise<unknown>
-
-  //26702
-  getAllMemberList(groupCode: string, forceFetch: boolean): Promise<{
-    errCode: number,
-    errMsg: string,
-    result: {
-      ids: Array<{
-        uid: string,
-        index: number//0
-      }>,
-      infos: Dict,
-      finish: true,
-      hasRobot: false
-    }
   }>
 
   setHeader(uid: string, path: string): unknown
 
-  addKernelGroupListener(listener: unknown): number
-
-  removeKernelGroupListener(listenerId: unknown): void
-
   createMemberListScene(groupCode: string, scene: string): string
 
-  destroyMemberListScene(SceneId: string): void
-  //About Arg (a) name: lastId 根据手Q来看为object {index:?(number),uid:string}
   getNextMemberList(sceneId: string, a: undefined, num: number): Promise<{
-    errCode: number, errMsg: string,
+    errCode: number
-    result: { ids: string[], infos: Map<string, GroupMember>, finish: boolean, hasRobot: boolean }
+    errMsg: string
+    result: {
+      ids: {
+        uid: string
+        index: number
+      }[]
+      infos: Map<string, GroupMember>
+      finish: boolean
+      hasRobot: boolean
+    }
   }>
 
-  getPrevMemberList(): unknown
-
-  monitorMemberList(): unknown
-
-  searchMember(sceneId: string, keywords: string[]): unknown
-
-  getMemberInfo(group_id: string, uids: string[], forceFetch: boolean): Promise<GeneralCallResult>
-  //getMemberInfo  [ '56729xxxx', [ 'u_4Nj08cwW5Hxxxxx' ], true ]
-
   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
 
-  getTransferableMemberInfo(groupCode: string): unknown//获取整个群的
-
-  transferGroup(uid: string): void
-
-  getGroupList(force: boolean): Promise<GeneralCallResult>
-
-  getGroupExtList(force: boolean): Promise<GeneralCallResult>
-
-  getGroupDetailInfo(groupCode: string): unknown
-
-  getMemberExtInfo(param: GroupExtParam): Promise<unknown>//req
-
-  getGroupAllInfo(): unknown
-
-  getDiscussExistInfo(): unknown
-
-  getGroupConfMember(): unknown
-
-  getGroupMsgMask(): unknown
-
-  getGroupPortrait(): void
-
   modifyGroupName(groupCode: string, groupName: string, arg: false): void
 
-  modifyGroupRemark(groupCode: string, remark: string): void
-
-  modifyGroupDetailInfo(groupCode: string, arg: unknown): void
-
-  setGroupMsgMask(groupCode: string, arg: unknown): void
-
-  changeGroupShieldSettingTemp(groupCode: string, arg: unknown): void
-
-  inviteToGroup(arg: unknown): void
-
-  inviteMembersToGroup(args: unknown[]): void
-
-  inviteMembersToGroupWithMsg(args: unknown): void
-
-  createGroup(arg: unknown): void
-
-  createGroupWithMembers(arg: unknown): void
-
   quitGroup(groupCode: string): void
 
-  destroyGroup(groupCode: string): void
+  getSingleScreenNotifies(force: boolean, startSeq: string, num: number): Promise<GeneralCallResult>
-  //获取单屏群通知列表
-  getSingleScreenNotifies(force: boolean, start_seq: string, num: number): Promise<GeneralCallResult>
-
-  clearGroupNotifies(groupCode: string): void
-
-  getGroupNotifiesUnreadCount(unknown: boolean): Promise<GeneralCallResult>
-
-  clearGroupNotifiesUnreadCount(groupCode: string): void
 
   operateSysNotify(
     doubt: boolean,
     operateMsg: {
-      operateType: GroupRequestOperateTypes, // 2 拒绝
+      operateType: GroupRequestOperateTypes // 2 拒绝
       targetMsg: {
-        seq: string,  // 通知序列号
+        seq: string  // 通知序列号
-        type: GroupNotifyType,
+        type: GroupNotifyType
-        groupCode: string,
+        groupCode: string
         postscript: string
       }
-    }): Promise<void>
+    }
-
+  ): Promise<void>
-  setTop(groupCode: string, isTop: boolean): void
-
-  getGroupBulletin(groupCode: string): unknown
-
-  deleteGroupBulletin(groupCode: string, seq: string): void
 
   publishGroupBulletin(groupCode: string, pskey: string, data: unknown): Promise<GeneralCallResult>
 
-  publishInstructionForNewcomers(groupCode: string, arg: unknown): void
+  uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<{
-
-  uploadGroupBulletinPic(groupCode: string, pskey: string, imagePath: string): Promise<GeneralCallResult & {
     errCode: number
+    errMsg: string
     picInfo?: {
-      id: string,
+      id: string
-      width: number,
+      width: number
       height: number
     }
   }>
 
-  downloadGroupBulletinRichMedia(groupCode: string): unknown
+  getGroupRemainAtTimes(groupCode: string): Promise<GeneralCallResult & {
-
+    atInfo: {
-  getGroupBulletinList(groupCode: string): unknown
+      canAtAll: boolean
-
+      RemainAtAllCountForUin: number
-  getGroupStatisticInfo(groupCode: string): unknown
+      RemainAtAllCountForGroup: number
-
+      atTimesMsg: string
-  getGroupRemainAtTimes(groupCode: string): number
+      canNotAtAllMsg: ''
-
+    }
-  getJoinGroupNoVerifyFlag(groupCode: string): unknown
+  }>
-
-  getGroupArkInviteState(groupCode: string): unknown
-
-  reqToJoinGroup(groupCode: string, arg: unknown): void
 
   setGroupShutUp(groupCode: string, shutUp: boolean): void
 
-  getGroupShutUpMemberList(groupCode: string): unknown[]
-
   setMemberShutUp(groupCode: string, memberTimes: { uid: string, timeStamp: number }[]): Promise<void>
 
-  getGroupRecommendContactArkJson(groupCode: string): unknown
+  getGroupRecommendContactArkJson(groupCode: string): Promise<GeneralCallResult & { arkJson: string }>
 
-  getJoinGroupLink(groupCode: string): unknown
+  addGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
 
-  modifyGroupExtInfo(groupCode: string, arg: unknown): void
+  removeGroupEssence(param: { groupCode: string, msgRandom: number, msgSeq: number }): Promise<unknown>
 
-  //需要提前判断是否存在 高版本新增
+  setHeader(args: unknown[]): Promise<GeneralCallResult>
-  addGroupEssence(param: {
-    groupCode: string
-    msgRandom: number,
-    msgSeq: number
-  }): Promise<unknown>
-  //需要提前判断是否存在 高版本新增
-  removeGroupEssence(param: {
-    groupCode: string
-    msgRandom: number,
-    msgSeq: number
-  }): Promise<unknown>
 
-  isNull(): boolean
+  searchMember(sceneId: string, keyword: string): Promise<void>
-}
+}

src/ntqqapi/services/NodeIKernelMsgService.ts

@@ -1,743 +1,100 @@
-import { ElementType, MessageElement, Peer, RawMessage, SendMessageElement } from '@/ntqqapi/types'
+import { ElementType, MessageElement, Peer, RawMessage, QueryMsgsParams, TmpChatInfoApi } from '@/ntqqapi/types'
 import { GeneralCallResult } from './common'
-import { Dict } from 'cosmokit'
-
-export interface QueryMsgsParams {
-  chatInfo: Peer,
-  filterMsgType: [],
-  filterSendersUid: string[],
-  filterMsgFromTime: string,
-  filterMsgToTime: string,
-  pageLimit: number,
-  isReverseOrder: boolean,
-  isIncludeCurrent: boolean
-}
-
-export interface TmpChatInfoApi {
-  errMsg: string
-  result: number
-  tmpChatInfo?: TmpChatInfo
-}
-
-export interface TmpChatInfo {
-  chatType: number
-  fromNick: string
-  groupCode: string
-  peerUid: string
-  sessionType: number
-  sig: string
-}
 
 export interface NodeIKernelMsgService {
   generateMsgUniqueId(chatType: number, time: string): string
 
-  addKernelMsgListener(nodeIKernelMsgListener: unknown): number
+  sendMsg(msgId: string, peer: Peer, msgElements: MessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
-
-  sendMsg(msgId: string, peer: Peer, msgElements: SendMessageElement[], map: Map<unknown, unknown>): Promise<GeneralCallResult>
 
   recallMsg(peer: Peer, msgIds: string[]): Promise<GeneralCallResult>
 
-  addKernelMsgImportToolListener(arg: Dict): unknown
-
-  removeKernelMsgListener(args: unknown): unknown
-
-  addKernelTempChatSigListener(...args: unknown[]): unknown
-
-  removeKernelTempChatSigListener(...args: unknown[]): unknown
-
-  setAutoReplyTextList(AutoReplyText: Array<unknown>, i2: number): unknown
-
-  getAutoReplyTextList(...args: unknown[]): unknown
-
-  getOnLineDev(): void
-
-  kickOffLine(DevInfo: Dict): unknown
-
   setStatus(args: { status: number, extStatus: number, batteryStatus: number }): Promise<GeneralCallResult>
 
-  fetchStatusMgrInfo(): unknown
+  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult & {
-
+    detailErr: Map<unknown, unknown>
-  fetchStatusUnitedConfigInfo(): unknown
+  }>
-
-  getOnlineStatusSmallIconBasePath(): unknown
-
-  getOnlineStatusSmallIconFileNameByUrl(Url: string): unknown
-
-  downloadOnlineStatusSmallIconByUrl(arg0: number, arg1: string): unknown
-
-  getOnlineStatusBigIconBasePath(): unknown
-
-  downloadOnlineStatusBigIconByUrl(arg0: number, arg1: string): unknown
-
-  getOnlineStatusCommonPath(arg: string): unknown
-
-  getOnlineStatusCommonFileNameByUrl(Url: string): unknown
-
-  downloadOnlineStatusCommonByUrl(arg0: string, arg1: string): unknown
-
-  // this.tokenType = i2
-  // this.apnsToken = bArr
-  // this.voipToken = bArr2
-  // this.profileId = str
-
-  setToken(arg: Dict): unknown
-
-  switchForeGround(): unknown
-
-  switchBackGround(arg: Dict): unknown
-
-  //hex
-  setTokenForMqq(token: string): unknown
-
-  switchForeGroundForMqq(...args: unknown[]): unknown
-
-  switchBackGroundForMqq(...args: unknown[]): unknown
-
-  getMsgSetting(...args: unknown[]): unknown
-
-  setMsgSetting(...args: unknown[]): unknown
-
-  addSendMsg(...args: unknown[]): unknown
-
-  cancelSendMsg(...args: unknown[]): unknown
-
-  switchToOfflineSendMsg(peer: Peer, MsgId: string): unknown
-
-  reqToOfflineSendMsg(...args: unknown[]): unknown
-
-  refuseReceiveOnlineFileMsg(peer: Peer, MsgId: string): unknown
-
-  resendMsg(...args: unknown[]): unknown
-
-  reeditRecallMsg(...args: unknown[]): unknown
-
-  //调用请检查除开commentElements其余参数不能为null
-  forwardMsg(msgIds: string[], srcContact: Peer, dstContacts: Peer[], commentElements: MessageElement[]): Promise<GeneralCallResult>
 
   forwardMsgWithComment(...args: unknown[]): Promise<GeneralCallResult>
 
-  forwardSubMsgWithComment(...args: unknown[]): unknown
-
-  forwardRichMsgInVist(...args: unknown[]): unknown
-
-  forwardFile(...args: unknown[]): unknown
-  //Array<Msg>, Peer from, Peer to
-  multiForwardMsg(...args: unknown[]): unknown
-
   multiForwardMsgWithComment(...args: unknown[]): unknown
 
-  deleteRecallMsg(...args: unknown[]): unknown
+  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  deleteRecallMsgForLocal(...args: unknown[]): unknown
+  getAioFirstViewLatestMsgsAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  addLocalGrayTipMsg(...args: unknown[]): unknown
+  getMsgsIncludeSelfAndAddActiveChat(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  addLocalJsonGrayTipMsg(...args: unknown[]): unknown
+  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  addLocalJsonGrayTipMsgExt(...args: unknown[]): unknown
-
-  IsLocalJsonTipValid(...args: unknown[]): unknown
-
-  addLocalAVRecordMsg(...args: unknown[]): unknown
-
-  addLocalTofuRecordMsg(...args: unknown[]): unknown
-
-  addLocalRecordMsg(Peer: Peer, msgId: string, ele: MessageElement, attr: Array<unknown> | number, front: boolean): Promise<unknown>
-
-  deleteMsg(Peer: Peer, msgIds: Array<string>): Promise<unknown>
-
-  updateElementExtBufForUI(...args: unknown[]): unknown
-
-  updateMsgRecordExtPbBufForUI(...args: unknown[]): unknown
-
-  startMsgSync(...args: unknown[]): unknown
-
-  startGuildMsgSync(...args: unknown[]): unknown
-
-  isGuildChannelSync(...args: unknown[]): unknown
-
-  getMsgUniqueId(UniqueId: string): string
-
-  isMsgMatched(...args: unknown[]): unknown
-
-  getOnlineFileMsgs(...args: unknown[]): unknown
-
-  getAllOnlineFileMsgs(...args: unknown[]): unknown
-
-  getLatestDbMsgs(peer: Peer, cnt: number): Promise<unknown>
-
-  getLastMessageList(peer: Peer[]): Promise<unknown>
-
-  getAioFirstViewLatestMsgs(peer: Peer, num: number): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  getMsgs(peer: Peer, msgId: string, count: unknown, queryOrder: boolean): Promise<unknown>
-
-  getMsgsIncludeSelf(peer: Peer, msgId: string, count: number, queryOrder: boolean): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  // this.$peer = contact
-  // this.$msgTime = j2
-  // this.$clientSeq = j3
-  // this.$cnt = i2
-
-  getMsgsWithMsgTimeAndClientSeqForC2C(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  getMsgsWithStatus(params: {
-    peer: Peer
-    msgId: string
-    msgTime: unknown
-    cnt: unknown
-    queryOrder: boolean
-    isIncludeSelf: boolean
-    appid: unknown
-  }): Promise<GeneralCallResult & { msgList: RawMessage[] }>
-
-  getMsgsBySeqRange(peer: Peer, startSeq: string, endSeq: string): 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[] }>
 
-  getRecallMsgsByMsgId(peer: Peer, MsgId: string[]): Promise<unknown>
-
   getMsgsBySeqList(peer: Peer, seqList: string[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getSingleMsg(Peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
+  getSingleMsg(peer: Peer, msgSeq: string): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  getSourceOfReplyMsg(peer: Peer, MsgId: string, SourceSeq: string): unknown
-
-  getSourceOfReplyMsgV2(peer: Peer, RootMsgId: string, ReplyMsgId: string): unknown
-
-  getMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown
-
-  getSourceOfReplyMsgByClientSeqAndTime(peer: Peer, clientSeq: string, time: string): unknown
-  //cnt clientSeq?并不是吧
-  getMsgsByTypeFilter(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilter: { type: number, subtype: Array<number> }): unknown
-
-  getMsgsByTypeFilters(peer: Peer, msgId: string, cnt: unknown, queryOrder: boolean, typeFilters: Array<{ type: number, subtype: Array<number> }>): unknown
-
-  getMsgWithAbstractByFilterParam(...args: unknown[]): unknown
-
-  queryMsgsWithFilter(...args: unknown[]): unknown
-
-  /**
-   * @deprecated 该函数已被标记为废弃，请使用新的替代方法。
-   * 使用过滤条件查询消息列表的版本2接口。
-   * 
-   * 该函数通过一系列过滤条件来查询特定聊天中的消息列表。这些条件包括消息类型、发送者、时间范围等。
-   * 函数返回一个Promise，解析为查询结果的未知类型对象。
-   * 
-   * @param MsgId 消息ID，用于特定消息的查询。
-   * @param MsgTime 消息时间，用于指定消息的时间范围。
-   * @param param 查询参数对象，包含详细的过滤条件和分页信息。
-   * @param param.chatInfo 聊天信息，包括聊天类型和对方用户ID。
-   * @param param.filterMsgType 需要过滤的消息类型数组，留空表示不过滤。
-   * @param param.filterSendersUid 需要过滤的发送者用户ID数组。
-   * @param param.filterMsgFromTime 查询消息的起始时间。
-   * @param param.filterMsgToTime 查询消息的结束时间。
-   * @param param.pageLimit 每页的消息数量限制。
-   * @param param.isReverseOrder 是否按时间顺序倒序返回消息。
-   * @param param.isIncludeCurrent 是否包含当前页码。
-   * @returns 返回一个Promise，解析为查询结果的未知类型对象。
-   */
-  queryMsgsWithFilterVer2(MsgId: string, MsgTime: string, param: QueryMsgsParams): Promise<unknown>
-
-  // this.chatType = i2
-  // this.peerUid = str
-
-  // this.chatInfo = new ChatInfo()
-  // this.filterMsgType = new ArrayList<>()
-  // this.filterSendersUid = new ArrayList<>()
-  // this.chatInfo = chatInfo
-  // this.filterMsgType = arrayList
-  // this.filterSendersUid = arrayList2
-  // this.filterMsgFromTime = j2
-  // this.filterMsgToTime = j3
-  // this.pageLimit = i2
-  // this.isReverseOrder = z
-  // this.isIncludeCurrent = z2
-  //queryMsgsWithFilterEx(0L, 0L, 0L, new QueryMsgsParams(new ChatInfo(2, str), new ArrayList(), new ArrayList(), 0L, 0L, 250, false, true))
   queryMsgsWithFilterEx(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<GeneralCallResult & {
     msgList: RawMessage[]
   }>
-  //queryMsgsWithFilterEx(this.$msgId, this.$msgTime, this.$msgSeq, this.$param)
-  queryFileMsgsDesktop(...args: unknown[]): unknown
-
-  setMsgRichInfoFlag(...args: unknown[]): unknown
-
-  queryPicOrVideoMsgs(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): Promise<unknown>
-
-  queryPicOrVideoMsgsDesktop(...args: unknown[]): unknown
-
-  queryEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>
-
-  queryTroopEmoticonMsgs(msgId: string, msgTime: string, msgSeq: string, Params: QueryMsgsParams): Promise<unknown>
-
-  queryMsgsAndAbstractsWithFilter(msgId: string, msgTime: string, megSeq: string, param: QueryMsgsParams): unknown
-
-  setFocusOnGuild(...args: unknown[]): unknown
-
-  setFocusSession(...args: unknown[]): unknown
-
-  enableFilterUnreadInfoNotify(...args: unknown[]): unknown
-
-  enableFilterMsgAbstractNotify(...args: unknown[]): unknown
-
-  onScenesChangeForSilenceMode(...args: unknown[]): unknown
-
-  getContactUnreadCnt(...args: unknown[]): unknown
-
-  getUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildUnreadCntTabInfo(...args: unknown[]): unknown
-
-  getAllGuildUnreadCntInfo(...args: unknown[]): unknown
-
-  getAllJoinGuildCnt(...args: unknown[]): unknown
-
-  getAllDirectSessionUnreadCntInfo(...args: unknown[]): unknown
-
-  getCategoryUnreadCntInfo(...args: unknown[]): unknown
-
-  getGuildFeedsUnreadCntInfo(...args: unknown[]): unknown
-
-  setUnVisibleChannelCntInfo(...args: unknown[]): unknown
-
-  setUnVisibleChannelTypeCntInfo(...args: unknown[]): unknown
-
-  setVisibleGuildCntInfo(...args: unknown[]): unknown
 
   setMsgRead(peer: Peer): Promise<GeneralCallResult>
 
-  setAllC2CAndGroupMsgRead(): Promise<unknown>
-
-  setGuildMsgRead(...args: unknown[]): unknown
-
-  setAllGuildMsgRead(...args: unknown[]): unknown
-
-  setMsgReadAndReport(...args: unknown[]): unknown
-
-  setSpecificMsgReadAndReport(...args: unknown[]): unknown
-
-  setLocalMsgRead(...args: unknown[]): unknown
-
-  setGroupGuildMsgRead(...args: unknown[]): unknown
-
-  getGuildGroupTransData(...args: unknown[]): unknown
-
-  setGroupGuildBubbleRead(...args: unknown[]): unknown
-
-  getGuildGroupBubble(...args: unknown[]): unknown
-
-  fetchGroupGuildUnread(...args: unknown[]): unknown
-
-  setGroupGuildFlag(...args: unknown[]): unknown
-
-  setGuildUDCFlag(...args: unknown[]): unknown
-
-  setGuildTabUserFlag(...args: unknown[]): unknown
-
-  setBuildMode(flag: number/*0 1 3*/): unknown
-
-  setConfigurationServiceData(...args: unknown[]): unknown
-
-  setMarkUnreadFlag(...args: unknown[]): unknown
-
-  getChannelEventFlow(...args: unknown[]): unknown
-
-  getMsgEventFlow(...args: unknown[]): unknown
-
-  getRichMediaFilePathForMobileQQSend(...args: unknown[]): unknown
-
   getRichMediaFilePathForGuild(arg: {
-    md5HexStr: string,
+    md5HexStr: string
-    fileName: string,
+    fileName: string
-    elementType: ElementType,
+    elementType: ElementType
-    elementSubType: number,
+    elementSubType: number
-    thumbSize: 0,
+    thumbSize: 0
-    needCreate: true,
+    needCreate: true
-    downloadType: 1,
+    downloadType: 1
     file_uuid: ''
   }): string
 
-  assembleMobileQQRichMediaFilePath(...args: unknown[]): unknown
-
-  getFileThumbSavePathForSend(...args: unknown[]): unknown
-
-  getFileThumbSavePath(...args: unknown[]): unknown
-
-  //猜测居多
-  translatePtt2Text(MsgId: string, Peer: Dict, MsgElement: Dict): unknown
-
-  setPttPlayedState(...args: unknown[]): unknown
-  // NodeIQQNTWrapperSession fetchFavEmojiList [
-  //   "",
-  //   48,
-  //   true,
-  //   true
-  // ]
   fetchFavEmojiList(str: string, num: number, uk1: boolean, uk2: boolean): Promise<GeneralCallResult & {
-    emojiInfoList: Array<{
+    emojiInfoList: {
-      uin: string,
+      uin: string
-      emoId: number,
+      emoId: number
-      emoPath: string,
+      emoPath: string
-      isExist: boolean,
+      isExist: boolean
-      resId: string,
+      resId: string
-      url: string,
+      url: string
-      md5: string,
+      md5: string
-      emoOriginalPath: string,
+      emoOriginalPath: string
-      thumbPath: string,
+      thumbPath: string
-      RomaingType: string,
+      RomaingType: string
-      isAPNG: false,
+      isAPNG: false
-      isMarkFace: false,
+      isMarkFace: false
-      eId: string,
+      eId: string
-      epId: string,
+      epId: string
-      ocrWord: string,
+      ocrWord: string
-      modifyWord: string,
+      modifyWord: string
-      exposeNum: number,
+      exposeNum: number
-      clickNum: number,
+      clickNum: number
       desc: string
-    }>
+    }[]
   }>
 
-  addFavEmoji(...args: unknown[]): unknown
-
-  fetchMarketEmoticonList(...args: unknown[]): unknown
-
-  fetchMarketEmoticonShowImage(...args: unknown[]): unknown
-
-  fetchMarketEmoticonAioImage(...args: unknown[]): unknown
-
-  fetchMarketEmotionJsonFile(...args: unknown[]): unknown
-
-  getMarketEmoticonPath(...args: unknown[]): unknown
-
-  getMarketEmoticonPathBySync(...args: unknown[]): unknown
-
-  fetchMarketEmoticonFaceImages(...args: unknown[]): unknown
-
-  fetchMarketEmoticonAuthDetail(...args: unknown[]): unknown
-
-  getFavMarketEmoticonInfo(...args: unknown[]): unknown
-
-  addRecentUsedFace(...args: unknown[]): unknown
-
-  getRecentUsedFaceList(...args: unknown[]): unknown
-
-  getMarketEmoticonEncryptKeys(...args: unknown[]): unknown
-
-  downloadEmojiPic(...args: unknown[]): unknown
-
-  deleteFavEmoji(...args: unknown[]): unknown
-
-  modifyFavEmojiDesc(...args: unknown[]): unknown
-
-  queryFavEmojiByDesc(...args: unknown[]): unknown
-
-  getHotPicInfoListSearchString(...args: unknown[]): unknown
-
-  getHotPicSearchResult(...args: unknown[]): unknown
-
-  getHotPicHotWords(...args: unknown[]): unknown
-
-  getHotPicJumpInfo(...args: unknown[]): unknown
-
-  getEmojiResourcePath(...args: unknown[]): unknown
-
-  JoinDragonGroupEmoji(JoinDragonGroupEmojiReq: unknown): unknown
-
-  getMsgAbstracts(...args: unknown[]): unknown
-
-  getMsgAbstract(...args: unknown[]): unknown
-
-  getMsgAbstractList(...args: unknown[]): unknown
-
-  getMsgAbstractListBySeqRange(...args: unknown[]): unknown
-
-  refreshMsgAbstracts(...args: unknown[]): unknown
-
-  refreshMsgAbstractsByGuildIds(...args: unknown[]): unknown
-
-  getRichMediaElement(...args: unknown[]): unknown
-
-  cancelGetRichMediaElement(...args: unknown[]): unknown
-
-  refuseGetRichMediaElement(...args: unknown[]): unknown
-
-  switchToOfflineGetRichMediaElement(...args: unknown[]): unknown
-
   downloadRichMedia(...args: unknown[]): unknown
 
-  getFirstUnreadMsgSeq(args: {
+  setMsgEmojiLikes(...args: unknown[]): Promise<GeneralCallResult>
-    peerUid: string
-    guildId: string
-  }): unknown
-
-  getFirstUnreadCommonMsg(...args: unknown[]): unknown
-
-  getFirstUnreadAtmeMsg(...args: unknown[]): unknown
-
-  getFirstUnreadAtallMsg(...args: unknown[]): unknown
-
-  getNavigateInfo(...args: unknown[]): unknown
-
-  getChannelFreqLimitInfo(...args: unknown[]): unknown
-
-  getRecentUseEmojiList(...args: unknown[]): unknown
-
-  getRecentEmojiList(...args: unknown[]): unknown
-
-  setMsgEmojiLikes(...args: unknown[]): unknown
 
   getMsgEmojiLikesList(peer: Peer, msgSeq: string, emojiId: string, emojiType: string, cookie: string, bForward: boolean, number: number): Promise<{
-    result: number,
+    result: number
-    errMsg: string,
+    errMsg: string
-    emojiLikesList:
+    emojiLikesList: {
-    Array<{
+      tinyId: string
-      tinyId: string,
+      nickName: string
-      nickName: string,
       headUrl: string
-    }>,
+    }[]
-    cookie: string,
+    cookie: string
-    isLastPage: boolean,
+    isLastPage: boolean
     isFirstPage: boolean
   }>
 
-  setMsgEmojiLikesForRole(...args: unknown[]): unknown
+  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & { msgList: RawMessage[] }>
 
-  clickInlineKeyboardButton(...args: unknown[]): unknown
+  getTempChatInfo(chatType: number, uid: string): Promise<TmpChatInfoApi>
 
-  setCurOnScreenMsg(...args: unknown[]): unknown
+  sendSsoCmdReqByContend(ssoCmd: string, content: string): Promise<GeneralCallResult & { rsp: string }>
-
+}
-  setCurOnScreenMsgForMsgEvent(...args: unknown[]): unknown
-
-  getMiscData(key: string): unknown
-
-  setMiscData(key: string, value: string): unknown
-
-  getBookmarkData(...args: unknown[]): unknown
-
-  setBookmarkData(...args: unknown[]): unknown
-
-  sendShowInputStatusReq(ChatType: number, EventType: number, toUid: string): Promise<unknown>
-
-  queryCalendar(...args: unknown[]): unknown
-
-  queryFirstMsgSeq(peer: Peer, ...args: unknown[]): unknown
-
-  queryRoamCalendar(...args: unknown[]): unknown
-
-  queryFirstRoamMsg(...args: unknown[]): unknown
-
-  fetchLongMsg(peer: Peer, msgId: string): unknown
-
-  fetchLongMsgWithCb(...args: unknown[]): unknown
-
-  setIsStopKernelFetchLongMsg(...args: unknown[]): unknown
-
-  insertGameResultAsMsgToDb(...args: unknown[]): unknown
-
-  getMultiMsg(...args: unknown[]): Promise<GeneralCallResult & {
-    msgList: RawMessage[]
-  }>
-
-  setDraft(...args: unknown[]): unknown
-
-  getDraft(...args: unknown[]): unknown
-
-  deleteDraft(...args: unknown[]): unknown
-
-  getRecentHiddenSesionList(...args: unknown[]): unknown
-
-  setRecentHiddenSession(...args: unknown[]): unknown
-
-  delRecentHiddenSession(...args: unknown[]): unknown
-
-  getCurHiddenSession(...args: unknown[]): unknown
-
-  setCurHiddenSession(...args: unknown[]): unknown
-
-  setReplyDraft(...args: unknown[]): unknown
-
-  getReplyDraft(...args: unknown[]): unknown
-
-  deleteReplyDraft(...args: unknown[]): unknown
-
-  getFirstUnreadAtMsg(peer: Peer): unknown
-
-  clearMsgRecords(...args: unknown[]): unknown//设置已读后调用我觉得比较好 清理记录 现在别了
-
-  IsExistOldDb(...args: unknown[]): unknown
-
-  canImportOldDbMsg(...args: unknown[]): unknown
-
-  setPowerStatus(z: boolean): unknown
-
-  canProcessDataMigration(...args: unknown[]): unknown
-
-  importOldDbMsg(...args: unknown[]): unknown
-
-  stopImportOldDbMsgAndroid(...args: unknown[]): unknown
-
-  isMqqDataImportFinished(...args: unknown[]): unknown
-
-  getMqqDataImportTableNames(...args: unknown[]): unknown
-
-  getCurChatImportStatusByUin(...args: unknown[]): unknown
-
-  getDataImportUserLevel(): unknown
-
-  getMsgQRCode(...args: unknown[]): unknown
-
-  getGuestMsgAbstracts(...args: unknown[]): unknown
-
-  getGuestMsgByRange(...args: unknown[]): unknown
-
-  getGuestMsgAbstractByRange(...args: unknown[]): unknown
-
-  registerSysMsgNotification(...args: unknown[]): unknown
-
-  unregisterSysMsgNotification(...args: unknown[]): unknown
-
-  enterOrExitAio(...args: unknown[]): unknown
-
-  // this.peerUid = ""
-  // this.peerNickname = ""
-  // this.fromGroupCode = ""
-  // this.sig = new byte[0]
-  // this.selfUid = ""
-  // this.selfPhone = ""
-  // this.chatType = i2
-  // this.peerUid = str
-  // this.peerNickname = str2
-  // this.fromGroupCode = str3
-  // this.sig = bArr
-  // this.selfUid = str4
-  // this.selfPhone = str5
-  // this.gameSession = tempChatGameSession
-  prepareTempChat(args: unknown): unknown//主动临时消息 不做
-
-  sendSsoCmdReqByContend(cmd: string, param: string): Promise<unknown>
-
-  getTempChatInfo(ChatType: number, Uid: string): Promise<TmpChatInfoApi>
-
-  setContactLocalTop(...args: unknown[]): unknown
-
-  switchAnonymousChat(...args: unknown[]): unknown
-
-  renameAnonyChatNick(...args: unknown[]): unknown
-
-  getAnonymousInfo(...args: unknown[]): unknown
-
-  updateAnonymousInfo(...args: unknown[]): unknown
-
-  sendSummonMsg(peer: Peer, MsgElement: unknown, MsgAttributeInfo: unknown): Promise<unknown>//频道的东西
-
-  outputGuildUnreadInfo(...args: unknown[]): unknown
-
-  checkMsgWithUrl(...args: unknown[]): unknown
-
-  checkTabListStatus(...args: unknown[]): unknown
-
-  getABatchOfContactMsgBoxInfo(...args: unknown[]): unknown
-
-  insertMsgToMsgBox(peer: Peer, msgId: string, arg: 2006): unknown
-
-  isHitEmojiKeyword(...args: unknown[]): unknown
-
-  getKeyWordRelatedEmoji(...args: unknown[]): unknown
-
-  recordEmoji(...args: unknown[]): unknown
-
-  fetchGetHitEmotionsByWord(args: Dict): Promise<unknown>//表情推荐？
-
-  deleteAllRoamMsgs(...args: unknown[]): unknown//漫游消息？
-
-  packRedBag(...args: unknown[]): unknown
-
-  grabRedBag(...args: unknown[]): unknown
-
-  pullDetail(...args: unknown[]): unknown
-
-  selectPasswordRedBag(...args: unknown[]): unknown
-
-  pullRedBagPasswordList(...args: unknown[]): unknown
-
-  requestTianshuAdv(...args: unknown[]): unknown
-
-  tianshuReport(...args: unknown[]): unknown
-
-  tianshuMultiReport(...args: unknown[]): unknown
-
-  GetMsgSubType(a0: number, a1: number): unknown
-
-  setIKernelPublicAccountAdapter(...args: unknown[]): unknown
-  //tempChatGameSession有关
-  createUidFromTinyId(fromTinyId: string, toTinyId: string): unknown
-
-  dataMigrationGetDataAvaiableContactList(...args: unknown[]): unknown
-
-  dataMigrationGetMsgList(...args: unknown[]): unknown
-
-  dataMigrationStopOperation(...args: unknown[]): unknown
-
-  //新的希望
-  dataMigrationImportMsgPbRecord(DataMigrationMsgInfo: Array<{
-    extensionData: string//"Hex" 
-    extraData: string //""
-    chatType: number
-    chatUin: string
-    msgType: number
-    msgTime: string
-    msgSeq: string
-    msgRandom: string
-  }>, DataMigrationResourceInfo: {
-    extraData: string
-    filePath: string
-    fileSize: string
-    msgRandom: string
-    msgSeq: string
-    msgSubType: number
-    msgType: number
-  }): unknown
-
-  dataMigrationGetResourceLocalDestinyPath(...args: unknown[]): unknown
-
-  dataMigrationSetIOSPathPrefix(...args: unknown[]): unknown
-
-  getServiceAssistantSwitch(...args: unknown[]): unknown
-
-  setServiceAssistantSwitch(...args: unknown[]): unknown
-
-  setSubscribeFolderUsingSmallRedPoint(...args: unknown[]): unknown
-
-  clearGuildNoticeRedPoint(...args: unknown[]): unknown
-
-  clearFeedNoticeRedPoint(...args: unknown[]): unknown
-
-  clearFeedSquareRead(...args: unknown[]): unknown
-
-  IsC2CStyleChatType(...args: unknown[]): unknown
-
-  IsTempChatType(uin: number): unknown//猜的
-
-  getGuildInteractiveNotification(...args: unknown[]): unknown
-
-  getGuildNotificationAbstract(...args: unknown[]): unknown
-
-  setFocusOnBase(...args: unknown[]): unknown
-
-  queryArkInfo(...args: unknown[]): unknown
-
-  queryUserSecQuality(...args: unknown[]): unknown
-
-  getGuildMsgAbFlag(...args: unknown[]): unknown
-
-  getGroupMsgStorageTime(): unknown//这是嘛啊
-
-}

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

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

src/ntqqapi/services/NodeIKernelProfileService.ts

@@ -1,106 +1,18 @@
-import { AnyCnameRecord } from 'node:dns'
 import { SimpleInfo } from '../types'
 import { GeneralCallResult } from './common'
 
-export enum UserDetailSource {
-  KDB,
-  KSERVER
-}
-
-export enum ProfileBizType {
-  KALL,
-  KBASEEXTEND,
-  KVAS,
-  KQZONE,
-  KOTHER
-}
-
 export interface NodeIKernelProfileService {
-  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>//uin->uid
+  getUidByUin(callfrom: string, uin: Array<string>): Promise<Map<string, string>>
 
   getUinByUid(callfrom: string, uid: Array<string>): Promise<Map<string, string>>
 
-  // {
-  //   coreInfo: CoreInfo,
-  //   baseInfo: BaseInfo,
-  //   status: null,
-  //   vasInfo: null,
-  //   relationFlags: null,
-  //   otherFlags: null,
-  //   intimate: null
-  // }
   getCoreAndBaseInfo(callfrom: string, uids: string[]): Promise<Map<string, SimpleInfo>>
 
   fetchUserDetailInfo(trace: string, uids: string[], arg2: number, arg3: number[]): Promise<unknown>
 
-  addKernelProfileListener(listener: unknown): number
-
-  removeKernelProfileListener(listenerId: number): void
-
-  prepareRegionConfig(...args: unknown[]): unknown
-
-  getLocalStrangerRemark(): Promise<AnyCnameRecord>
-
-  enumCountryOptions(): Array<string>
-
-  enumProvinceOptions(Country: string): Array<string>
-
-  enumCityOptions(Country: string, Province: string): unknown
-
-  enumAreaOptions(...args: unknown[]): unknown
-
-  //SimpleInfo
-  // this.uid = ""
-  // this.uid = str
-  // this.uin = j2
-  // this.isBuddy = z
-  // this.coreInfo = coreInfo
-  // this.baseInfo = baseInfo
-  // this.status = statusInfo
-  // this.vasInfo = vasInfo
-  // this.relationFlags = relationFlag
-  // this.otherFlags = otherFlag
-  // this.intimate = intimate
-
-  modifySelfProfile(...args: unknown[]): Promise<unknown>
-
-  modifyDesktopMiniProfile(param: unknown): Promise<GeneralCallResult>
-
-  setNickName(NickName: string): Promise<unknown>
-
-  setLongNick(longNick: string): Promise<unknown>
-
-  setBirthday(...args: unknown[]): Promise<unknown>
-
-  setGander(...args: unknown[]): Promise<unknown>
-
   setHeader(arg: string): Promise<GeneralCallResult>
 
-  setRecommendImgFlag(...args: unknown[]): Promise<unknown>
+  getUserDetailInfoWithBizInfo(uid: string, biz: unknown[]): Promise<GeneralCallResult>
-
-  getUserSimpleInfo(force: boolean, uids: string[],): Promise<unknown>
-
-  getUserDetailInfo(uid: string): Promise<unknown>
-
-  getUserDetailInfoWithBizInfo(uid: string, Biz: unknown[]): Promise<GeneralCallResult>
 
   getUserDetailInfoByUin(uin: string): Promise<unknown>
-
+}
-  getZplanAvatarInfos(args: string[]): Promise<unknown>
-
-  getStatus(uid: string): Promise<unknown>
-
-  startStatusPolling(isForceReset: boolean): Promise<unknown>
-
-  getSelfStatus(): Promise<unknown>
-
-  setdisableEmojiShortCuts(...args: unknown[]): unknown
-
-  getProfileQzonePicInfo(uid: string, type: number, force: boolean): Promise<unknown>
-
-  //profileService.getCoreInfo("UserRemarkServiceImpl::getStrangerRemarkByUid", arrayList)
-  getCoreInfo(name: string, arg: unknown[]): unknown
-
-  //m429253e12.getOtherFlag("FriendListInfoCache_getKernelDataAndPutCache", new ArrayList<>())
-  isNull(): boolean
-}

src/ntqqapi/services/NodeIKernelRichMediaService.ts

@@ -1,191 +1,23 @@
-import { GetFileListParam, MessageElement, Peer } from '../types'
+import { GetFileListParam, Peer } from '../types'
 import { GeneralCallResult } from './common'
 
-export enum UrlFileDownloadType {
-  KUNKNOWN,
-  KURLFILEDOWNLOADPRIVILEGEICON,
-  KURLFILEDOWNLOADPHOTOWALL,
-  KURLFILEDOWNLOADQZONE,
-  KURLFILEDOWNLOADCOMMON,
-  KURLFILEDOWNLOADINSTALLAPP
-}
-
-export enum RMBizTypeEnum {
-  KUNKNOWN,
-  KC2CFILE,
-  KGROUPFILE,
-  KC2CPIC,
-  KGROUPPIC,
-  KDISCPIC,
-  KC2CVIDEO,
-  KGROUPVIDEO,
-  KC2CPTT,
-  KGROUPPTT,
-  KFEEDCOMMENTPIC,
-  KGUILDFILE,
-  KGUILDPIC,
-  KGUILDPTT,
-  KGUILDVIDEO
-}
-
-export interface CommonFileInfo {
-  bizType: number
-  chatType: number
-  elemId: string
-  favId: string
-  fileModelId: string
-  fileName: string
-  fileSize: string
-  md5: string
-  md510m: string
-  msgId: string
-  msgTime: string
-  parent: string
-  peerUid: string
-  picThumbPath: Array<string>
-  sha: string
-  sha3: string
-  subId: string
-  uuid: string
-}
-
 export interface NodeIKernelRichMediaService {
-  //getVideoPlayUrl(peer, msgId, elemId, videoCodecFormat, VideoRequestWay.KHAND, cb)
-  // public enum VideoCodecFormatType {
-  //     KCODECFORMATH264,
-  //     KCODECFORMATH265,
-  //     KCODECFORMATH266,
-  //     KCODECFORMATAV1
-  // }
-  // public enum VideoRequestWay {
-  //     KUNKNOW,
-  //     KHAND,
-  //     KAUTO
-  // }
-  getVideoPlayUrl(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, VideoRequestWay: number): Promise<unknown>
-
-  //exParams (RMReqExParams)
-  // this.downSourceType = i2
-  // this.triggerType = i3
-  //peer, msgId, elemId, videoCodecFormat, exParams
-  // 1 0 频道在用
-  // 1 1
-  // 0 2
-
-  // public static final int KCOMMONREDENVELOPEMSGTYPEINMSGBOX = 1007
-  // public static final int KDOWNSOURCETYPEAIOINNER = 1
-  // public static final int KDOWNSOURCETYPEBIGSCREEN = 2
-  // public static final int KDOWNSOURCETYPEHISTORY = 3
-  // public static final int KDOWNSOURCETYPEUNKNOWN = 0
-
-  // public static final int KTRIGGERTYPEAUTO = 1
-  // public static final int KTRIGGERTYPEMANUAL = 0
-
   getVideoPlayUrlV2(peer: Peer, msgId: string, elemId: string, videoCodecFormat: number, exParams: { downSourceType: number, triggerType: number }): Promise<GeneralCallResult & {
     urlResult: {
-      v4IpUrl: [],
+      v4IpUrl: []
-      v6IpUrl: [],
+      v6IpUrl: []
-      domainUrl: Array<{
+      domainUrl: {
-        url: string,
+        url: string
-        isHttps: boolean,
+        isHttps: boolean
         httpsDomain: string
-      }>,
+      }[]
       videoCodecFormat: number
     }
   }>
 
-  getRichMediaFileDir(elementType: number, downType: number, isTemp: boolean): unknown
+  deleteGroupFolder(groupCode: string, folderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
 
-  // this.senderUid = ""
+  createGroupFolder(groupCode: string, folderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: unknown[] } }>
-  // this.peerUid = ""
-  // this.guildId = ""
-  // this.elem = new MsgElement()
-  // this.downloadType = i2
-  // this.thumbSize = i3
-  // this.msgId = j2
-  // this.msgRandom = j3
-  // this.msgSeq = j4
-  // this.msgTime = j5
-  // this.chatType = i4
-  // this.senderUid = str
-  // this.peerUid = str2
-  // this.guildId = str3
-  // this.elem = msgElement
-  // this.useHttps = num
-
-  getVideoPlayUrlInVisit(arg: {
-    downloadType: number,
-    thumbSize: number,
-    msgId: string,
-    msgRandom: string,
-    msgSeq: string,
-    msgTime: string,
-    chatType: number,
-    senderUid: string,
-    peerUid: string,
-    guildId: string,
-    ele: MessageElement,
-    useHttps: boolean
-  }): Promise<unknown>
-
-  //arg双端number
-  isFileExpired(arg: number): unknown
-
-  deleteGroupFolder(GroupCode: string, FolderId: string): Promise<GeneralCallResult & { groupFileCommonResult: { retCode: number, retMsg: string, clientWording: string } }>
-
-  //参数与getVideoPlayUrlInVisit一样
-  downloadRichMediaInVisit(arg: {
-    downloadType: number,
-    thumbSize: number,
-    msgId: string,
-    msgRandom: string,
-    msgSeq: string,
-    msgTime: string,
-    chatType: number,
-    senderUid: string,
-    peerUid: string,
-    guildId: string,
-    ele: MessageElement,
-    useHttps: boolean
-  }): unknown
-  //arg3为“”
-  downloadFileForModelId(peer: Peer, ModelId: string[], arg3: string): unknown
-  //第三个参数 Array<Type>
-  // this.fileId = ""
-  // this.fileName = ""
-  // this.fileId = str
-  // this.fileName = str2
-  // this.fileSize = j2
-  // this.fileModelId = j3
-
-  downloadFileForFileUuid(peer: Peer, uuid: string, arg3: {
-    fileId: string,
-    fileName: string,
-    fileSize: string,
-    fileModelId: string
-  }[]): Promise<unknown>
-
-  downloadFileByUrlList(fileDownloadTyp: UrlFileDownloadType, urlList: Array<string>): unknown
-
-  downloadFileForFileInfo(fileInfo: CommonFileInfo[], savePath: string): unknown
-
-  createGroupFolder(GroupCode: string, FolderName: string): Promise<GeneralCallResult & { resultWithGroupItem: { result: unknown, groupItem: Array<unknown> } }>
-
-  downloadFile(commonFile: CommonFileInfo, arg2: unknown, arg3: unknown, savePath: string): unknown
-
-  downloadGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  renameGroupFolder(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  deleteTransferInfo(arg1: unknown, arg2: unknown): unknown
-
-  cancelTransferTask(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  cancelUrlDownload(arg: unknown): unknown
-
-  updateOnlineVideoElemStatus(arg: unknown): unknown
-
-  getGroupSpace(arg: unknown): unknown
 
   getGroupFileList(groupCode: string, params: GetFileListParam): Promise<GeneralCallResult & {
     groupSpaceResult: {
@@ -198,29 +30,9 @@ export interface NodeIKernelRichMediaService {
     }
   }>
 
-  getGroupFileInfo(arg1: unknown, arg2: unknown): unknown
-
-  getGroupTransferList(arg1: unknown, arg2: unknown): unknown
-
-  renameGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
-
   moveGroupFile(arg1: unknown, arg2: unknown, arg3: unknown, arg4: unknown, arg5: unknown): unknown
 
-  transGroupFile(arg1: unknown, arg2: unknown): unknown
+  deleteGroupFile(groupCode: string, params: Array<number>, files: Array<string>): Promise<GeneralCallResult & {
-
-  searchGroupFile(
-    keywords: Array<string>,
-    param: {
-      groupIds: Array<string>,
-      fileType: number,
-      context: string,
-      count: number,
-      sortType: number,
-      groupNames: Array<string>
-    }): Promise<unknown>
-  searchGroupFileByWord(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>
@@ -228,39 +40,20 @@ export interface NodeIKernelRichMediaService {
     }
   }>
 
-  translateEnWordToZn(words: string[]): Promise<GeneralCallResult & { words: string[] }>
+  batchGetGroupFileCount(groupIds: string[]): Promise<GeneralCallResult & {
+    groupCodes: string[]
+    groupFileCounts: number[]
+  }>
 
-  getScreenOCR(path: string): Promise<unknown>
+  getGroupSpace(groupId: string): Promise<GeneralCallResult & {
+    groupSpaceResult: {
+      retCode: number
+      retMsg: string
+      clientWording: string
+      totalSpace: string
+      usedSpace: string
+      allUpload: boolean
+    }
+  }>
+}
 
-  batchGetGroupFileCount(Gids: Array<string>): Promise<GeneralCallResult & { groupCodes: Array<string>, groupFileCounts: Array<number> }>
-
-  queryPicDownloadSize(arg: unknown): unknown
-
-  searchGroupFile(arg1: unknown, arg2: unknown): unknown
-
-  searchMoreGroupFile(arg: unknown): unknown
-
-  cancelSearcheGroupFile(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  onlyDownloadFile(peer: Peer, arg2: unknown, arg3: Array<{
-    fileId: string,
-    fileName: string,
-    fileSize: string,
-    fileModelId: string
-  }
-  >): unknown
-
-  onlyUploadFile(arg1: unknown, arg2: unknown): unknown
-
-  isExtraLargePic(arg1: unknown, arg2: unknown, arg3: unknown): unknown
-
-  uploadRMFileWithoutMsg(arg: {
-    bizType: RMBizTypeEnum,
-    filePath: string,
-    peerUid: string,
-    transferId: string
-    useNTV2: string
-  }): Promise<unknown>
-
-  isNull(): 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/NodeIKernelSearchService.ts

@@ -1,128 +0,0 @@
-import { ChatType } from '../types'
-
-export interface NodeIKernelSearchService {
-  addKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
-
-  removeKernelSearchListener(...args: unknown[]): unknown// needs 1 arguments
-
-  searchStranger(...args: unknown[]): unknown// needs 3 arguments
-
-  searchGroup(...args: unknown[]): unknown// needs 1 arguments
-
-  searchLocalInfo(keywords: string, unknown: number/*4*/): unknown
-
-  cancelSearchLocalInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchBuddyChatInfo(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreBuddyChatInfo(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchBuddyChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchContact(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreContact(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchContact(...args: unknown[]): unknown// needs 3 arguments
-
-  searchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  resetSearchGroupChatInfoSortType(...args: unknown[]): unknown// needs 3 arguments
-
-  resetSearchGroupChatInfoFilterMembers(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreGroupChatInfo(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchGroupChatInfo(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreChatsWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatsWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatMsgs(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreChatMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatMsgs(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMsgWithKeywords(...args: unknown[]): unknown// needs 2 arguments
-
-  searchMoreMsgWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchMsgWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchFileWithKeywords(keywords: string[], source: number): Promise<string>// needs 2 arguments
-
-  searchMoreFileWithKeywords(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchFileWithKeywords(...args: unknown[]): unknown// needs 3 arguments
-
-  searchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
-
-  searchMoreAtMeChats(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchAtMeChats(...args: unknown[]): unknown// needs 3 arguments
-
-  searchChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  searchMoreChatAtMeMsgs(...args: unknown[]): unknown// needs 1 arguments
-
-  cancelSearchChatAtMeMsgs(...args: unknown[]): unknown// needs 3 arguments
-
-  addSearchHistory(param: {
-    type: number,//4
-    contactList: [],
-    id: number,//-1
-    groupInfos: [],
-    msgs: [],
-    fileInfos: [
-      {
-        chatType: ChatType,
-        buddyChatInfo: Array<{ category_name: string, peerUid: string, peerUin: string, remark: string }>,
-        discussChatInfo: [],
-        groupChatInfo: Array<
-          {
-            groupCode: string,
-            isConf: boolean,
-            hasModifyConfGroupFace: boolean,
-            hasModifyConfGroupName: boolean,
-            groupName: string,
-            remark: string
-          }>,
-        dataLineChatInfo: [],
-        tmpChatInfo: [],
-        msgId: string,
-        msgSeq: string,
-        msgTime: string,
-        senderUid: string,
-        senderNick: string,
-        senderRemark: string,
-        senderCard: string,
-        elemId: string,
-        elemType: string,//3
-        fileSize: string,
-        filePath: string,
-        fileName: string,
-        hits: Array<
-          {
-            start: 12,
-            end: 14
-          }
-        >
-      }
-    ]
-
-  }): Promise<{
-    result: number,
-    errMsg: string,
-    id?: number
-  }>
-
-  removeSearchHistory(...args: unknown[]): unknown// needs 1 arguments
-
-  searchCache(...args: unknown[]): unknown// needs 3 arguments
-
-  clearSearchCache(...args: unknown[]): unknown// needs 1 arguments
-}

src/ntqqapi/services/NodeIKernelTicketService.ts

@@ -1,11 +1,10 @@
-import { forceFetchClientKeyRetType } from './common'
+import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTicketService {
-  addKernelTicketListener(listener: unknown): void
+  forceFetchClientKey(arg: string): Promise<GeneralCallResult & {
-
+    url: string
-  removeKernelTicketListener(listenerId: unknown): void
+    keyIndex: string
-
+    clientKey: string
-  forceFetchClientKey(arg: string): Promise<forceFetchClientKeyRetType>
+    expireTime: string
-
+  }>
-  isNull(): boolean
+}
-}

src/ntqqapi/services/NodeIKernelTipOffService.ts

@@ -1,19 +1,5 @@
 import { GeneralCallResult } from './common'
 
 export interface NodeIKernelTipOffService {
-  addKernelTipOffListener(listener: unknown): void
+  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }>
-
+}
-  removeKernelTipOffListener(listenerId: unknown): void
-
-  tipOffSendJsData(args: unknown[]): Promise<unknown> //2
-
-  getPskey(domainList: string[], nocache: boolean): Promise<GeneralCallResult & { domainPskeyMap: Map<string, string> }> //2
-
-  tipOffSendJsData(args: unknown[]): Promise<unknown> //2
-
-  tipOffMsgs(args: unknown[]): Promise<unknown> //1
-
-  encodeUinAesInfo(args: unknown[]): Promise<unknown> //2
-
-  isNull(): boolean
-}

src/ntqqapi/services/common.ts

@@ -1,16 +1,8 @@
 export enum GeneralCallResultStatus {
   OK = 0
-  // ERROR = 1
 }
 
 export interface GeneralCallResult {
   result: GeneralCallResultStatus
   errMsg: string
 }
-
-export interface forceFetchClientKeyRetType extends GeneralCallResult {
-  url: string
-  keyIndex: string
-  clientKey: string
-  expireTime: string
-}

src/ntqqapi/services/index.ts

@@ -9,4 +9,5 @@ export * from './NodeIKernelUixConvertService'
 export * from './NodeIKernelRichMediaService'
 export * from './NodeIKernelTicketService'
 export * from './NodeIKernelTipOffService'
-export * from './NodeIKernelSearchService'
+export * from './NodeIKernelRobotService'
+export * from './NodeIKernelNodeMiscService'

src/ntqqapi/types/group.ts

@@ -1,12 +1,3 @@
-import { QQLevel, Sex } from './user'
-
-export enum GroupListUpdateType {
-  REFRESHALL,
-  GETALL,
-  MODIFIED,
-  REMOVE
-}
-
 export interface Group {
   groupCode: string
   maxMember: number
@@ -22,9 +13,9 @@ export interface Group {
   hasModifyConfGroupName: boolean
   remarkName: string
   hasMemo: boolean
-  groupShutupExpireTime: string //"0",
+  groupShutupExpireTime: string
-  personShutupExpireTime: string //"0",
+  personShutupExpireTime: string
-  discussToGroupUin: string //"0",
+  discussToGroupUin: string
   discussToGroupMaxMsgSeq: number
   discussToGroupTime: number
   groupFlagExt: number //1073938496,
@@ -32,36 +23,168 @@ export interface Group {
   groupCreditLevel: number //0,
   groupFlagExt3: number //0,
   groupOwnerId: {
-    memberUin: string //"0",
+    memberUin: string
-    memberUid: string //"u_fbf8N7aeuZEnUiJAbQ9R8Q"
+    memberUid: string
   }
-  members: GroupMember[] // 原始数据是没有这个的，为了方便自己加了这个字段
   createTime: string
 }
 
 export enum GroupMemberRole {
-  normal = 2,
+  Normal = 2,
-  admin = 3,
+  Admin = 3,
-  owner = 4,
+  Owner = 4,
 }
 
 export interface GroupMember {
-  memberSpecialTitle?: string
+  uid: string
-  avatarPath: string
-  cardName: string
-  cardType: number
-  isDelete: boolean
-  nick: string
   qid: string
+  uin: string
+  nick: string
   remark: string
-  role: GroupMemberRole // 群主:4, 管理员:3，群员:2
+  cardType: number
-  shutUpTime: number // 禁言时间，单位是什么暂时不清楚
+  cardName: string
-  uid: string // 加密的字符串
+  role: GroupMemberRole
-  uin: string // QQ号
+  avatarPath: string
+  shutUpTime: number
+  isDelete: boolean
+  isSpecialConcerned: boolean
+  isSpecialShield: boolean
   isRobot: boolean
-  sex?: Sex
+  groupHonor: Uint8Array
-  qqLevel?: QQLevel
+  memberRealLevel: number
-  isChangeRole: boolean
+  memberLevel: number
-  joinTime: string
+  globalGroupLevel: number
-  lastSpeakTime: string
+  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/msg.ts

@@ -1,124 +1,108 @@
 import { GroupMemberRole } from './group'
-
+import { GeneralCallResult } from '../services'
-export interface GetFileListParam {
-  sortType: number
-  fileCount: number
-  startIndex: number
-  sortOrder: number
-  showOnlinedocFolder: number
-}
 
 export enum ElementType {
-  UNKNOWN = 0,
+  Text = 1,
-  TEXT = 1,
+  Pic = 2,
-  PIC = 2,
+  File = 3,
-  FILE = 3,
+  Ptt = 4,
-  PTT = 4,
+  Video = 5,
-  VIDEO = 5,
+  Face = 6,
-  FACE = 6,
+  Reply = 7,
-  REPLY = 7,
+  GrayTip = 8,
-  WALLET = 9,
+  Ark = 10,
-  GreyTip = 8, //Poke别叫戳一搓了 官方名字拍一拍 戳一戳是另一个名字
+  MarketFace = 11,
-  ARK = 10,
+  LiveGift = 12,
-  MFACE = 11,
+  StructLongMsg = 13,
-  LIVEGIFT = 12,
+  Markdown = 14,
-  STRUCTLONGMSG = 13,
+  Giphy = 15,
-  MARKDOWN = 14,
+  MultiForward = 16,
-  GIPHY = 15,
+  InlineKeyboard = 17,
-  MULTIFORWARD = 16,
+  Calendar = 19,
-  INLINEKEYBOARD = 17,
+  YoloGameResult = 20,
-  INTEXTGIFT = 18,
+  AvRecord = 21,
-  CALENDAR = 19,
+  TofuRecord = 23,
-  YOLOGAMERESULT = 20,
+  FaceBubble = 27,
-  AVRECORD = 21,
+  ShareLocation = 28,
-  FEED = 22,
+  TaskTopMsg = 29,
-  TOFURECORD = 23,
+  RecommendedMsg = 43,
-  ACEBUBBLE = 24,
+  ActionBar = 44
-  ACTIVITY = 25,
-  TOFU = 26,
-  FACEBUBBLE = 27,
-  SHARELOCATION = 28,
-  TASKTOPMSG = 29,
-  RECOMMENDEDMSG = 43,
-  ACTIONBAR = 44
 }
 
 export interface SendTextElement {
-  elementType: ElementType.TEXT
+  elementType: ElementType.Text
   elementId: ''
   textElement: TextElement
 }
 
 export interface SendPttElement {
-  elementType: ElementType.PTT
+  elementType: ElementType.Ptt
   elementId: ''
-  pttElement: {
+  pttElement: Partial<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, // 表情包小图
 }
 
 export interface SendPicElement {
-  elementType: ElementType.PIC
+  elementType: ElementType.Pic
   elementId: ''
-  picElement: {
+  picElement: Partial<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
-  }
 }
 
 export interface SendReplyElement {
-  elementType: ElementType.REPLY
+  elementType: ElementType.Reply
   elementId: ''
-  replyElement: ReplyElement
+  replyElement: Partial<ReplyElement>
 }
 
 export interface SendFaceElement {
-  elementType: ElementType.FACE
+  elementType: ElementType.Face
   elementId: ''
   faceElement: FaceElement
 }
 
 export interface SendMarketFaceElement {
-  elementType: ElementType.MFACE
+  elementType: ElementType.MarketFace
+  elementId: ''
   marketFaceElement: MarketFaceElement
 }
 
+export interface SendFileElement {
+  elementType: ElementType.File
+  elementId: ''
+  fileElement: FileElement
+}
+
+export interface SendVideoElement {
+  elementType: ElementType.Video
+  elementId: ''
+  videoElement: VideoElement
+}
+
+export interface SendArkElement {
+  elementType: ElementType.Ark
+  elementId: ''
+  arkElement: Partial<ArkElement>
+}
+
+export type SendMessageElement =
+  | SendTextElement
+  | SendPttElement
+  | SendPicElement
+  | SendReplyElement
+  | SendFaceElement
+  | SendMarketFaceElement
+  | SendFileElement
+  | SendVideoElement
+  | SendArkElement
+
+export enum AtType {
+  Unknown,
+  All,
+  One,
+}
+
 export interface TextElement {
   content: string
-  atType: number
+  atType: AtType
   atUid: string
   atTinyId: string
   atNtUid: string
@@ -129,6 +113,12 @@ export interface ReplyElement {
   replayMsgId: string
   senderUin: string
   senderUinStr: string
+  sourceMsgIdInRecords: string
+  senderUid: string
+  senderUidStr: string
+  sourceMsgIsIncPic: boolean // 原消息是否有图片
+  sourceMsgText: string
+  replyMsgTime: string
 }
 
 export interface FileElement {
@@ -149,91 +139,6 @@ export interface FileElement {
   fileBizId?: number
 }
 
-export interface SendFileElement {
-  elementType: ElementType.FILE
-  elementId: ''
-  fileElement: FileElement
-}
-
-export interface SendVideoElement {
-  elementType: ElementType.VIDEO
-  elementId: ''
-  videoElement: VideoElement
-}
-
-export interface SendArkElement {
-  elementType: ElementType.ARK
-  elementId: ''
-  arkElement: ArkElement
-}
-
-export type SendMessageElement =
-  | SendTextElement
-  | SendPttElement
-  | SendPicElement
-  | SendReplyElement
-  | SendFaceElement
-  | SendMarketFaceElement
-  | SendFileElement
-  | SendVideoElement
-  | SendArkElement
-
-export enum AtType {
-  notAt = 0,
-  atAll = 1,
-  atUser = 2,
-}
-
-export enum ChatType {
-  friend = 1,
-  group = 2,
-  temp = 100,
-}
-
-// 来自Android分析
-export enum ChatType2 {
-  KCHATTYPEADELIE = 42,
-  KCHATTYPEBUDDYNOTIFY = 5,
-  KCHATTYPEC2C = 1,
-  KCHATTYPECIRCLE = 113,
-  KCHATTYPEDATALINE = 8,
-  KCHATTYPEDATALINEMQQ = 134,
-  KCHATTYPEDISC = 3,
-  KCHATTYPEFAV = 41,
-  KCHATTYPEGAMEMESSAGE = 105,
-  KCHATTYPEGAMEMESSAGEFOLDER = 116,
-  KCHATTYPEGROUP = 2,
-  KCHATTYPEGROUPBLESS = 133,
-  KCHATTYPEGROUPGUILD = 9,
-  KCHATTYPEGROUPHELPER = 7,
-  KCHATTYPEGROUPNOTIFY = 6,
-  KCHATTYPEGUILD = 4,
-  KCHATTYPEGUILDMETA = 16,
-  KCHATTYPEMATCHFRIEND = 104,
-  KCHATTYPEMATCHFRIENDFOLDER = 109,
-  KCHATTYPENEARBY = 106,
-  KCHATTYPENEARBYASSISTANT = 107,
-  KCHATTYPENEARBYFOLDER = 110,
-  KCHATTYPENEARBYHELLOFOLDER = 112,
-  KCHATTYPENEARBYINTERACT = 108,
-  KCHATTYPEQQNOTIFY = 132,
-  KCHATTYPERELATEACCOUNT = 131,
-  KCHATTYPESERVICEASSISTANT = 118,
-  KCHATTYPESERVICEASSISTANTSUB = 201,
-  KCHATTYPESQUAREPUBLIC = 115,
-  KCHATTYPESUBSCRIBEFOLDER = 30,
-  KCHATTYPETEMPADDRESSBOOK = 111,
-  KCHATTYPETEMPBUSSINESSCRM = 102,
-  KCHATTYPETEMPC2CFROMGROUP = 100,
-  KCHATTYPETEMPC2CFROMUNKNOWN = 99,
-  KCHATTYPETEMPFRIENDVERIFY = 101,
-  KCHATTYPETEMPNEARBYPRO = 119,
-  KCHATTYPETEMPPUBLICACCOUNT = 103,
-  KCHATTYPETEMPWPA = 117,
-  KCHATTYPEUNKNOWN = 0,
-  KCHATTYPEWEIYUN = 40,
-}
-
 export interface PttElement {
   canConvert2Text: boolean
   duration: number // 秒数
@@ -244,7 +149,7 @@ export interface PttElement {
   fileSize: string // "4261"
   fileSubId: string // "0"
   fileUuid: string // "90j3z7rmRphDPrdVgP9udFBaYar#oK0TWZIV"
-  formatType: string // 1
+  formatType: number // 1
   invalidState: number // 0
   md5HexStr: string // "e4d09c784d5a2abcb2f9980bdc7acfe6"
   playState: number // 0
@@ -255,6 +160,7 @@ export interface PttElement {
   voiceChangeType: number // 0
   voiceType: number // 0
   waveAmplitudes: number[]
+  autoConvertText: number
 }
 
 export interface ArkElement {
@@ -266,6 +172,16 @@ export interface ArkElement {
 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 {
   picSubType: PicSubType
   picType: PicType  // 有这玩意儿吗
@@ -281,15 +197,83 @@ export interface PicElement {
   md5HexStr?: string
 }
 
+export interface TipAioOpGrayTipElement {
+  operateType: number
+  peerUid: string
+  fromGrpCodeOfTmpChat: string
+}
+
+export enum TipGroupElementType {
+  MemberIncrease = 1,
+  Kicked = 3, // 被移出群
+  Ban = 8,
+}
+
+export interface TipGroupElement {
+  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 enum GrayTipElementSubType {
-  RECALL = 1,
+  Revoke = 1,
-  INVITE_NEW_MEMBER = 12,
+  Proclamation = 2,
-  MEMBER_NEW_TITLE = 17,
+  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: {
+  revokeElement?: {
     operatorRole: string
     operatorUid: string
     operatorNick: string
@@ -299,21 +283,25 @@ export interface GrayTipElement {
     isSelfOperate?: boolean
     wording: string // 自定义的撤回提示语
   }
-  aioOpGrayTipElement: TipAioOpGrayTipElement
+  aioOpGrayTipElement?: TipAioOpGrayTipElement
-  groupElement: TipGroupElement
+  groupElement?: TipGroupElement
-  xmlElement: {
+  xmlElement?: {
     templId: string
     content: string
+    templParam: Map<string, string>
+    members: Map<string, string> // uid -> remark
   }
-  jsonGrayTipElement: {
+  jsonGrayTipElement?: {
-    busiId: number
+    busiId: string
     jsonStr: string
+    xmlToJsonParam?: {
+      templParam: Map<string, string>
+    }
   }
 }
 
-
 export enum FaceIndex {
-  dice = 358,
+  Dice = 358,
   RPS = 359, // 石头剪刀布
 }
 
@@ -328,6 +316,7 @@ export interface FaceElement {
   resultId?: string
   surpriseId?: string
   randomType?: number
+  pokeType?: number
 }
 
 export interface MarketFaceElement {
@@ -337,6 +326,10 @@ export interface MarketFaceElement {
   key: string
   imageWidth?: number
   imageHeight?: number
+  supportSize?: {
+    width: number
+    height: number
+  }[]
 }
 
 export interface VideoElement {
@@ -386,6 +379,7 @@ export interface InlineKeyboardElementRowButton {
   enter: false
   subscribeDataTemplateIds: []
 }
+
 export interface InlineKeyboardElement {
   rows: [
     {
@@ -394,56 +388,9 @@ export interface InlineKeyboardElement {
   ]
 }
 
-export interface TipAioOpGrayTipElement {
+export interface StructLongMsgElement {
-  // 这是什么提示来着？
+  xmlContent: string
-  operateType: number
+  resId: string
-  peerUid: string
-  fromGrpCodeOfTmpChat: string
-}
-
-export enum TipGroupElementType {
-  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
-    }
-  }
 }
 
 export interface MultiForwardMsgElement {
@@ -452,55 +399,50 @@ export interface MultiForwardMsgElement {
   fileName: string
 }
 
+export enum ChatType {
+  C2C = 1,
+  Group = 2,
+  TempC2CFromGroup = 100,
+}
+
 export interface RawMessage {
   msgId: string
   msgType: number
   subMsgType: number
-  msgShortId?: number // 自己维护的消息id
   msgTime: string // 时间戳，秒
   msgSeq: string
   msgRandom: string
   senderUid: string
-  senderUin?: string // 发送者QQ号
+  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: {
+  elements: MessageElement[]
-    elementId: string
+  peerName: string
-    elementType: ElementType
+  multiTransInfo?: {
-    replyElement: {
+    status: number
-      sourceMsgIdInRecords: string
+    msgId: number
-      senderUid: string // 原消息发送者QQ号
+    friendFlag: number
-      sourceMsgIsIncPic: boolean // 原消息是否有图片
+    fromFaceUrl: string
-      sourceMsgText: string
+  }
-      replayMsgSeq: string // 源消息的msgSeq，可以通过这个找到源消息的msgId
+  emojiLikesList: {
-      senderUidStr: string
+    emojiId: string
-      replyMsgTime: string
+    emojiType: string
-    }
+    likesCnt: string
-    textElement: {
+    isClicked: boolean
-      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
   }[]
+  msgAttrs: Map<number, {
+    attrType: number
+    attrId: string
+  }>
+  isOnlineMsg: boolean
 }
 
 export interface Peer {
@@ -515,7 +457,7 @@ export interface MessageElement {
   extBufForUI: string //"0x"
   textElement?: TextElement
   faceElement?: FaceElement
-  marketFaceElement?: MarkdownElement
+  marketFaceElement?: MarketFaceElement
   replyElement?: ReplyElement
   picElement?: PicElement
   pttElement?: PttElement
@@ -525,12 +467,11 @@ export interface MessageElement {
   fileElement?: FileElement
   liveGiftElement?: unknown
   markdownElement?: MarkdownElement
-  structLongMsgElement?: unknown
+  structLongMsgElement?: StructLongMsgElement
   multiForwardMsgElement?: MultiForwardMsgElement
   giphyElement?: unknown
-  walletElement?: unknown
   inlineKeyboardElement?: InlineKeyboardElement
-  textGiftElement?: unknown //????
+  textGiftElement?: unknown
   calendarElement?: unknown
   yoloGameResultElement?: unknown
   avRecordElement?: unknown
@@ -541,4 +482,137 @@ export interface MessageElement {
   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,19 +1,19 @@
 export enum GroupNotifyType {
-  INVITED_BY_MEMBER = 1,
+  InvitedByMember = 1,
-  REFUSE_INVITED,
+  RefuseInvited,
-  REFUSED_BY_ADMINI_STRATOR,
+  RefusedByAdminiStrator,
-  AGREED_TOJOIN_DIRECT, // 有人接受了邀请入群
+  AgreedTojoinDirect, // 有人接受了邀请入群
-  INVITED_NEED_ADMINI_STRATOR_PASS, // 有人邀请了别人入群
+  InvitedNeedAdminiStratorPass, // 有人邀请了别人入群
-  AGREED_TO_JOIN_BY_ADMINI_STRATOR,
+  AgreedToJoinByAdminiStrator,
-  REQUEST_JOIN_NEED_ADMINI_STRATOR_PASS,
+  RequestJoinNeedAdminiStratorPass,
-  SET_ADMIN,
+  SetAdmin,
-  KICK_MEMBER_NOTIFY_ADMIN,
+  KickMemberNotifyAdmin,
-  KICK_MEMBER_NOTIFY_KICKED,
+  KickMemberNotifyKicked,
-  MEMBER_LEAVE_NOTIFY_ADMIN, // 主动退出
+  MemberLeaveNotifyAdmin, // 主动退出
-  CANCEL_ADMIN_NOTIFY_CANCELED, // 我被取消管理员
+  CancelAdminNotifyCanceled, // 我被取消管理员
-  CANCEL_ADMIN_NOTIFY_ADMIN, // 其他人取消管理员
+  CancelAdminNotifyAdmin, // 其他人取消管理员
-  TRANSFER_GROUP_NOTIFY_OLDOWNER,
+  TransferGroupNotifyOldowner,
-  TRANSFER_GROUP_NOTIFY_ADMIN
+  TransferGroupNotifyAdmin
 }
 
 export interface GroupNotifies {
@@ -23,11 +23,11 @@ export interface GroupNotifies {
 }
 
 export enum GroupNotifyStatus {
-  KINIT, // 初始化
+  Init, // 初始化
-  KUNHANDLE, // 未处理
+  Unhandle, // 未处理
-  KAGREED, // 同意
+  Agreed, // 同意
-  KREFUSED, // 拒绝
+  Refused, // 拒绝
-  KIGNORED // 忽略
+  Ignored // 忽略
 }
 
 export interface GroupNotify {
@@ -56,20 +56,8 @@ export enum GroupRequestOperateTypes {
 }
 
 export enum BuddyReqType {
-  KMEINITIATOR,
+  MsgInfo = 12,
-  KPEERINITIATOR,
+  MeInitiatorWaitPeerConfirm = 13,
-  KMEAGREED,
-  KMEAGREEDANDADDED,
-  KPEERAGREED,
-  KPEERAGREEDANDADDED,
-  KPEERREFUSED,
-  KMEREFUSED,
-  KMEIGNORED,
-  KMEAGREEANYONE,
-  KMESETQUESTION,
-  KMEAGREEANDADDFAILED,
-  KMSGINFO,
-  KMEINITIATORWAITPEERCONFIRM
 }
 
 export interface FriendRequest {
@@ -91,41 +79,3 @@ export interface FriendRequestNotify {
     buddyReqs: FriendRequest[]
   }
 }
-
-export enum MemberExtSourceType {
-  DEFAULTTYPE = 0,
-  TITLETYPE = 1,
-  NEWGROUPTYPE = 2,
-}
-
-export interface GroupExtParam {
-  groupCode: string
-  seq: string
-  beginUin: string
-  dataTime: string
-  uinList: Array<string>
-  uinNum: string
-  groupType: string
-  richCardNameVer: string
-  sourceType: MemberExtSourceType
-  memberExtFilter: {
-    memberLevelInfoUin: number
-    memberLevelInfoPoint: number
-    memberLevelInfoActiveDay: number
-    memberLevelInfoLevel: number
-    memberLevelInfoName: number
-    levelName: number
-    dataTime: number
-    userShowFlag: number
-    sysShowFlag: number
-    timeToUpdate: number
-    nickName: number
-    specialTitle: number
-    levelNameNew: number
-    userShowFlagNew: number
-    msgNeedField: number
-    cmdUinFlagExt3Grocery: number
-    memberIcon: number
-    memberInfoSeq: number
-  }
-}

src/ntqqapi/types/user.ts

@@ -1,7 +1,8 @@
 export enum Sex {
-  male = 0,
+  Unknown = 0,
-  female = 2,
+  Male = 1,
-  unknown = 255,
+  Female = 2,
+  Hidden = 255
 }
 
 export interface QQLevel {
@@ -67,6 +68,7 @@ export interface User {
   recommendImgFlag?: number
   disableEmojiShortCuts?: number
   pendantId?: string
+  age?: number
 }
 
 export interface SelfInfo extends User {
@@ -100,12 +102,12 @@ export interface BaseInfo {
   birthday_month: number
   birthday_day: number
   age: number
-  sex: number
+  sex: Sex
   eMail: string
   phoneNum: string
   categoryId: number
   richTime: number
-  richBuffer: string
+  richBuffer: Uint8Array
 }
 
 interface MusicInfo {
@@ -221,11 +223,6 @@ interface RelationFlags {
   isHidePrivilegeIcon: number
 }
 
-export interface FriendV2 extends SimpleInfo {
-  categoryId?: number
-  categroyName?: string
-}
-
 interface CommonExt {
   constellation: number
   shengXiao: number
@@ -255,7 +252,7 @@ interface PhotoWall {
   picList: Pic[]
 }
 
-export interface UserDetailInfoListenerArg {
+export interface UserDetailInfo {
   uid: string
   uin: string
   simpleInfo: SimpleInfo
@@ -300,7 +297,7 @@ export interface UserDetailInfoByUin {
     birthday_year: number
     birthday_month: number
     birthday_day: number
-    sex: number //0
+    sex: number
     topTime: string
     constellation: number
     shengXiao: number
@@ -344,3 +341,21 @@ export interface UserDetailInfoByUin {
     vipNameColorId: string
   }
 }
+
+export enum BuddyListReqType {
+  KNOMAL,
+  KLETTER
+}
+
+export enum UserDetailSource {
+  KDB,
+  KSERVER
+}
+
+export enum ProfileBizType {
+  KALL,
+  KBASEEXTEND,
+  KVAS,
+  KQZONE,
+  KOTHER
+}

src/ntqqapi/wrapper.ts

@@ -1,81 +0,0 @@
-import {
-  NodeIKernelBuddyService,
-  NodeIKernelGroupService,
-  NodeIKernelProfileService,
-  NodeIKernelProfileLikeService,
-  NodeIKernelMSFService,
-  NodeIKernelMsgService,
-  NodeIKernelUixConvertService,
-  NodeIKernelRichMediaService,
-  NodeIKernelTicketService,
-  NodeIKernelTipOffService,
-  NodeIKernelSearchService
-} from './services'
-import { constants } from 'node:os'
-import { Dict } from 'cosmokit'
-const Process = require('node:process')
-
-export interface NodeIQQNTWrapperSession {
-  getBuddyService(): NodeIKernelBuddyService
-  getGroupService(): NodeIKernelGroupService
-  getProfileService(): NodeIKernelProfileService
-  getProfileLikeService(): NodeIKernelProfileLikeService
-  getMsgService(): NodeIKernelMsgService
-  getMSFService(): NodeIKernelMSFService
-  getUixConvertService(): NodeIKernelUixConvertService
-  getRichMediaService(): NodeIKernelRichMediaService
-  getTicketService(): NodeIKernelTicketService
-  getTipOffService(): NodeIKernelTipOffService
-  getSearchService(): NodeIKernelSearchService
-}
-
-export interface WrapperApi {
-  NodeIQQNTWrapperSession?: NodeIQQNTWrapperSession
-}
-
-export interface WrapperConstructor {
-  [key: string]: unknown
-}
-
-const wrapperApi: WrapperApi = {}
-
-export const wrapperConstructor: WrapperConstructor = {}
-
-const constructor = [
-  'NodeIKernelBuddyListener',
-  'NodeIKernelGroupListener',
-  'NodeQQNTWrapperUtil',
-  'NodeIKernelMsgListener',
-  'NodeIQQNTWrapperEngine',
-  'NodeIGlobalAdapter',
-  'NodeIDependsAdapter',
-  'NodeIDispatcherAdapter',
-  'NodeIKernelSessionListener',
-  'NodeIKernelLoginService',
-  'NodeIKernelLoginListener',
-  'NodeIKernelProfileService',
-  'NodeIKernelProfileListener',
-]
-
-Process.dlopenOrig = Process.dlopen
-
-Process.dlopen = function (module: Dict, filename: string, flags = constants.dlopen.RTLD_LAZY) {
-  const dlopenRet = this.dlopenOrig(module, filename, flags)
-  for (const export_name in module.exports) {
-    module.exports[export_name] = new Proxy(module.exports[export_name], {
-      construct: (target, args) => {
-        const ret = new target(...args)
-        if (export_name === 'NodeIQQNTWrapperSession') wrapperApi.NodeIQQNTWrapperSession = ret
-        return ret
-      }
-    })
-    if (constructor.includes(export_name)) {
-      wrapperConstructor[export_name] = module.exports[export_name]
-    }
-  }
-  return dlopenRet
-}
-
-export function getSession() {
-  return wrapperApi['NodeIQQNTWrapperSession']
-}

src/onebot11/action/BaseAction.ts

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

src/onebot11/action/file/GetFile.ts

@@ -1,8 +1,7 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
-import fsPromise from 'node:fs/promises'
+import { readFile } from 'node:fs/promises'
 import { ActionName } from '../types'
 import { Peer, ElementType } from '@/ntqqapi/types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 export interface GetFilePayload {
   file: string // 文件名或者fileUuid
@@ -17,13 +16,16 @@ export interface GetFileResponse {
 }
 
 export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResponse> {
-  // forked from https://github.com/NapNeko/NapCatQQ/blob/6f6b258f22d7563f15d84e7172c4d4cbb547f47e/src/onebot11/action/file/GetFile.ts#L44
+  payloadSchema = Schema.object({
+    file: Schema.string().required()
+  })
+
   protected async _handle(payload: GetFilePayload): Promise<GetFileResponse> {
     const { enableLocalFile2Url } = this.adapter.config
 
-    let fileCache = await MessageUnique.getFileCacheById(String(payload.file))
+    let fileCache = await this.ctx.store.getFileCacheById(payload.file)
     if (!fileCache?.length) {
-      fileCache = await MessageUnique.getFileCacheByName(String(payload.file))
+      fileCache = await this.ctx.store.getFileCacheByName(payload.file)
     }
 
     if (fileCache?.length) {
@@ -46,7 +48,7 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         peerUid: fileCache[0].peerUid,
         guildId: ''
       }
-      if (fileCache[0].elementType === ElementType.PIC) {
+      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')
@@ -56,13 +58,13 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
         if (!findEle) {
           throw new Error('element not found')
         }
-        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement)
+        res.url = await this.ctx.ntFileApi.getImageUrl(findEle.picElement!)
-      } else if (fileCache[0].elementType === ElementType.VIDEO) {
+      } 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 {
-          res.base64 = await fsPromise.readFile(downloadPath, 'base64')
+          res.base64 = await readFile(downloadPath, 'base64')
         } catch (e) {
           throw new Error('文件下载失败. ' + e)
         }
@@ -76,11 +78,12 @@ export abstract class GetFileBase extends BaseAction<GetFilePayload, GetFileResp
 
 export default class GetFile extends GetFileBase {
   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> {
+  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)
   }

src/onebot11/action/file/GetImage.ts

@@ -3,11 +3,4 @@ import { ActionName } from '../types'
 
 export default class GetImage extends GetFileBase {
   actionName = ActionName.GetImage
-
-  protected async _handle(payload: { file: string }) {
-    if (!payload.file) {
-      throw new Error('参数 file 不能为空')
-    }
-    return super._handle(payload)
-  }
 }

src/onebot11/action/file/GetRecord.ts

@@ -1,8 +1,9 @@
+import path from 'node:path'
 import { GetFileBase, GetFilePayload, GetFileResponse } from './GetFile'
 import { ActionName } from '../types'
 import { decodeSilk } from '@/common/utils/audio'
-import path from 'node:path'
+import { Schema } from '../BaseAction'
-import fs from 'node:fs'
+import { stat, readFile } from 'node:fs/promises'
 
 interface Payload extends GetFilePayload {
   out_format: 'mp3' | 'amr' | 'wma' | 'm4a' | 'spx' | 'ogg' | 'wav' | 'flac'
@@ -10,14 +11,18 @@ interface Payload extends GetFilePayload {
 
 export default class GetRecord extends GetFileBase {
   actionName = ActionName.GetRecord
+  payloadSchema = Schema.object({
+    file: Schema.string().required(),
+    out_format: Schema.string().default('mp3')
+  })
 
   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 = fs.statSync(res.file).size.toString()
+    res.file_size = (await stat(res.file)).size.toString()
     if (this.adapter.config.enableLocalFile2Url) {
-      res.base64 = fs.readFileSync(res.file, 'base64')
+      res.base64 = await readFile(res.file, 'base64')
     }
     return res
   }

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -9,9 +9,13 @@ interface Payload {
 
 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

@@ -1,25 +1,24 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export class DelEssenceMsg extends BaseAction<Payload, unknown> {
+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) {
-    if (!payload.message_id) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
-      throw Error('message_id不能为空')
-    }
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
     return await this.ctx.ntGroupApi.removeGroupEssence(
-      msg.Peer.peerUid,
+      msg.peer.peerUid,
-      msg.MsgId,
+      msg.msgId,
     )
   }
 }

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

@@ -1,17 +1,22 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  group_id: string | number
+  group_id: number | string
   file_id: string
-  busid?: 102
+  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])
+    await this.ctx.ntGroupApi.deleteGroupFile(payload.group_id.toString(), [payload.file_id], [+payload.busid])
     return null
   }
-}
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -8,9 +8,13 @@ interface Payload {
 
 export class DelGroupFolder extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_DelGroupFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    folder_id: Schema.string().required()
+  })
 
   async _handle(payload: Payload) {
     await this.ctx.ntGroupApi.deleteGroupFileFolder(payload.group_id.toString(), payload.folder_id)
     return null
   }
-}
+}

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

@@ -0,0 +1,21 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  user_id: number | string
+}
+
+export class DeleteFriend extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_DeleteFriend
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const uin = payload.user_id.toString()
+    const uid = await this.ctx.ntUserApi.getUidByUin(uin)
+    if (!uid) throw new Error('无法获取用户信息')
+    await this.ctx.ntFriendApi.delBuddy(uid)
+    return null
+  }
+}

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

@@ -1,7 +1,7 @@
-import BaseAction from '../BaseAction'
 import fs from 'fs'
 import fsPromise from 'fs/promises'
 import path from 'node:path'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { calculateFileMD5, fetchFile } from '@/common/utils'
 import { TEMP_DIR } from '@/common/globalVars'
@@ -22,6 +22,11 @@ interface FileResponse {
 
 export class DownloadFile extends BaseAction<Payload, FileResponse> {
   actionName = ActionName.GoCQHTTP_DownloadFile
+  payloadSchema = Schema.object({
+    url: Schema.string(),
+    base64: Schema.string(),
+    headers: Schema.union([String, Schema.array(String)])
+  })
 
   protected async _handle(payload: Payload): Promise<FileResponse> {
     const isRandomName = !payload.name

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

@@ -1,8 +1,8 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { OB11ForwardMessage } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable } from '@/common/utils/misc'
 
 interface Payload {
   message_id: string // long msg id，gocq
@@ -15,37 +15,42 @@ interface Response {
 
 export class GetForwardMsg extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetForwardMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.string(),
+    id: Schema.string()
+  })
+
   protected async _handle(payload: Payload) {
     const msgId = payload.id || payload.message_id
     if (!msgId) {
       throw Error('message_id不能为空')
     }
-    const rootMsgId = MessageUnique.getShortIdByMsgId(msgId)
+    const rootMsgId = await this.ctx.store.getShortIdByMsgId(msgId)
-    const rootMsg = await MessageUnique.getMsgIdAndPeerByShortId(rootMsgId || +msgId)
+    const rootMsg = await this.ctx.store.getMsgInfoByShortId(rootMsgId || +msgId)
     if (!rootMsg) {
       throw Error('msg not found')
     }
-    const data = await this.ctx.ntMsgApi.getMultiMsg(rootMsg.Peer, rootMsg.MsgId, rootMsg.MsgId)
+    const data = await this.ctx.ntMsgApi.getMultiMsg(rootMsg.peer, rootMsg.msgId, rootMsg.msgId)
     if (data?.result !== 0) {
       throw Error('找不到相关的聊天记录' + data?.errMsg)
     }
-    const msgList = data.msgList
+    const messages: (OB11ForwardMessage | undefined)[] = await Promise.all(
-    const messages = await Promise.all(
+      data.msgList.map(async (msg) => {
-      msgList.map(async (msg) => {
+        const res = await OB11Entities.message(this.ctx, msg)
-        const resMsg = await OB11Entities.message(this.ctx, msg)
+        if (res) {
-        resMsg.message_id = MessageUnique.createMsg({
+          return {
-          chatType: msg.chatType,
+            content: res.message,
-          peerUid: msg.peerUid,
+            sender: {
-        }, msg.msgId)
+              nickname: res.sender.nickname,
-        return resMsg
+              user_id: res.sender.user_id
-      }),
+            },
+            time: res.time,
+            message_format: res.message_format,
+            message_type: res.message_type
+          }
+        }
+      })
     )
-    const forwardMessages = messages.map(v => {
+    return { messages: filterNullable(messages) }
-      const msg = v as Partial<OB11ForwardMessage>
-      msg.content = msg.message
-      delete msg.message
-      return msg as OB11ForwardMessage
-    })
-    return { messages: forwardMessages }
   }
 }

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
@@ -13,6 +13,9 @@ interface Response {
 
 export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupAtAllRemain
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   async _handle(payload: Payload) {
     const data = await this.ctx.ntGroupApi.getGroupRemainAtTimes(payload.group_id.toString())
@@ -22,4 +25,4 @@ export class GetGroupAtAllRemain extends BaseAction<Payload, Response> {
       remain_at_all_count_for_uin: data.atInfo.RemainAtAllCountForUin
     }
   }
-}
+}

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

@@ -0,0 +1,50 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { ChatType } from '@/ntqqapi/types'
+
+interface Payload {
+  group_id: number | string
+}
+
+interface EssenceMsg {
+  sender_id: number
+  sender_nick: string
+  sender_time: number
+  operator_id: number
+  operator_nick: string
+  operator_time: number
+  message_id: number
+}
+
+export class GetEssenceMsgList extends BaseAction<Payload, EssenceMsg[]> {
+  actionName = ActionName.GoCQHTTP_GetEssenceMsgList
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const groupCode = payload.group_id.toString()
+    const peer = {
+      guildId: '',
+      chatType: ChatType.Group,
+      peerUid: groupCode
+    }
+    const essence = await this.ctx.ntGroupApi.queryCachedEssenceMsg(groupCode)
+    const data: EssenceMsg[] = []
+    for (const item of essence.items) {
+      const { msgList } = await this.ctx.ntMsgApi.queryMsgsWithFilterExBySeq(peer, String(item.msgSeq), '0')
+      const sourceMsg = msgList.find(e => e.msgRandom === String(item.msgRandom))
+      if (!sourceMsg) continue
+      data.push({
+        sender_id: +item.msgSenderUin,
+        sender_nick: item.msgSenderNick,
+        sender_time: +sourceMsg.msgTime,
+        operator_id: +item.opUin,
+        operator_nick: item.opNick,
+        operator_time: item.opTime,
+        message_id: this.ctx.store.createMsgShortId(peer, sourceMsg.msgId)
+      })
+    }
+    return data
+  }
+}

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

@@ -0,0 +1,32 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+}
+
+interface Response {
+  file_count: number
+  limit_count: number
+  used_space: number
+  total_space: number
+}
+
+export class GetGroupFileSystemInfo extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupFileSystemInfo
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
+
+  async _handle(payload: Payload) {
+    const groupId = payload.group_id.toString()
+    const { groupFileCounts } = await this.ctx.ntGroupApi.getGroupFileCount(groupId)
+    const { groupSpaceResult } = await this.ctx.ntGroupApi.getGroupFileSpace(groupId)
+    return {
+      file_count: groupFileCounts[0],
+      limit_count: 10000,
+      used_space: +groupSpaceResult.usedSpace,
+      total_space: +groupSpaceResult.totalSpace,
+    }
+  }
+}

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

@@ -0,0 +1,82 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { pathToFileURL } from 'node:url'
+import { ChatType } from '@/ntqqapi/types'
+import { GroupFileInfo } from '@/ntqqapi/types'
+
+export interface Payload {
+  group_id: number | string
+  file_id: string
+  busid?: number
+}
+
+export interface Response {
+  url: string
+}
+
+export class GetGroupFileUrl extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupFileUrl
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file_id: Schema.string().required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const file = await this.ctx.store.getFileCacheById(payload.file_id)
+    if (file.length > 0) {
+      const { msgId, chatType, peerUid, elementId } = file[0]
+      const path = await this.ctx.ntFileApi.downloadMedia(msgId, chatType, peerUid, elementId)
+      return {
+        url: pathToFileURL(path).href
+      }
+    } else {
+      const groupId = payload.group_id.toString()
+      const modelId = await this.search(groupId, payload.file_id)
+      if (modelId) {
+        const peer = {
+          chatType: ChatType.Group,
+          peerUid: groupId,
+          guildId: ''
+        }
+        const path = await this.ctx.ntFileApi.downloadFileForModelId(peer, modelId)
+        return {
+          url: pathToFileURL(path).href
+        }
+      }
+      throw new Error('file not found')
+    }
+  }
+
+  private async search(groupId: string, fileId: string, folderId?: string) {
+    let modelId: string | undefined
+    let nextIndex: number | undefined
+    const folders: GroupFileInfo['item'] = []
+    while (nextIndex !== 0) {
+      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+        sortType: 1,
+        fileCount: 100,
+        startIndex: nextIndex ?? 0,
+        sortOrder: 2,
+        showOnlinedocFolder: 0,
+        folderId
+      })
+      const file = res.item.find(item => item.fileInfo?.fileId === fileId)
+      if (file) {
+        modelId = file.fileInfo?.fileModelId
+        break
+      }
+      folders.push(...res.item.filter(item => item.folderInfo?.totalFileCount))
+      nextIndex = res.nextIndex
+    }
+    if (!modelId) {
+      for (const item of folders) {
+        const res = await this.search(groupId, fileId, item.folderInfo?.folderId)
+        if (res) {
+          modelId = res
+          break
+        }
+      }
+    }
+    return modelId
+  }
+}

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

@@ -0,0 +1,62 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { OB11GroupFile, OB11GroupFileFolder } from '@/onebot11/types'
+import { GroupFileInfo } from '@/ntqqapi/types'
+
+interface Payload {
+  group_id: number | string
+  folder_id: string
+}
+
+interface Response {
+  files: OB11GroupFile[]
+  folders: OB11GroupFileFolder[]
+}
+
+export class GetGroupFilesByFolder extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_GetGroupFilesByFolder
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    folder_id: Schema.string().required()
+  })
+
+  async _handle(payload: Payload) {
+    const groupId = payload.group_id.toString()
+    const data: GroupFileInfo['item'] = []
+
+    let nextIndex: number | undefined
+    while (nextIndex !== 0) {
+      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+        sortType: 1,
+        fileCount: 100,
+        startIndex: nextIndex ?? 0,
+        sortOrder: 2,
+        showOnlinedocFolder: 0,
+        folderId: payload.folder_id
+      })
+      data.push(...res.item)
+      nextIndex = res.nextIndex
+    }
+
+    return {
+      files: data.filter(item => item.fileInfo)
+        .map(item => {
+          const file = item.fileInfo!
+          return {
+            group_id: +item.peerId,
+            file_id: file.fileId,
+            file_name: file.fileName,
+            busid: file.busId,
+            file_size: +file.fileSize,
+            upload_time: file.uploadTime,
+            dead_time: file.deadTime,
+            modify_time: file.modifyTime,
+            download_times: file.downloadTimes,
+            uploader: +file.uploaderUin,
+            uploader_name: file.uploaderName
+          }
+        }),
+      folders: []
+    }
+  }
+}

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

@@ -1,16 +1,16 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { OB11Message } from '../../types'
 import { ActionName } from '../types'
 import { ChatType } from '@/ntqqapi/types'
 import { OB11Entities } from '../../entities'
 import { RawMessage } from '@/ntqqapi/types'
-import { MessageUnique } from '@/common/utils/messageUnique'
+import { filterNullable, parseBool } from '@/common/utils/misc'
 
 interface Payload {
   group_id: number | string
   message_seq?: number | string
-  count?: number | string
+  count: number | string
-  reverseOrder?: boolean
+  reverseOrder: boolean
 }
 
 interface Response {
@@ -19,28 +19,27 @@ interface Response {
 
 export class GetGroupMsgHistory extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupMsgHistory
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    message_seq: Schema.union([Number, String]),
+    count: Schema.union([Number, String]).default(20),
+    reverseOrder: Schema.union([Boolean, Schema.transform(String, parseBool)]).default(false)
+  })
 
   protected async _handle(payload: Payload): Promise<Response> {
-    const count = payload.count || 20
+    const { count, reverseOrder } = payload
-    const isReverseOrder = payload.reverseOrder || true
+    const peer = { chatType: ChatType.Group, peerUid: payload.group_id.toString() }
-    const peer = { chatType: ChatType.group, peerUid: payload.group_id.toString() }
+    let msgList: RawMessage[]
-    let msgList: RawMessage[] | undefined
+    if (!payload.message_seq || +payload.message_seq === 0) {
-    // 包含 message_seq 0
-    if (!payload.message_seq) {
       msgList = (await this.ctx.ntMsgApi.getAioFirstViewLatestMsgs(peer, +count)).msgList
     } else {
-      const startMsgId = (await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_seq))?.MsgId
+      const startMsgId = (await this.ctx.store.getMsgInfoByShortId(+payload.message_seq))?.msgId
       if (!startMsgId) throw new Error(`消息${payload.message_seq}不存在`)
-      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count)).msgList
+      msgList = (await this.ctx.ntMsgApi.getMsgHistory(peer, startMsgId, +count, true)).msgList
     }
     if (!msgList?.length) throw new Error('未找到消息')
-    if (isReverseOrder) msgList.reverse()
+    if (reverseOrder) msgList.reverse()
-    await Promise.all(
+    const ob11MsgList = await Promise.all(msgList.map(msg => OB11Entities.message(this.ctx, msg)))
-      msgList.map(async msg => {
+    return { messages: filterNullable(ob11MsgList) }
-        msg.msgShortId = MessageUnique.createMsg({ chatType: msg.chatType, peerUid: msg.peerUid }, msg.msgId)
-      })
-    )
-    const ob11MsgList = await Promise.all(msgList.map((msg) => OB11Entities.message(this.ctx, msg)))
-    return { messages: ob11MsgList }
   }
 }

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

@@ -0,0 +1,48 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+
+interface Payload {
+  group_id: number | string
+}
+
+interface Notice {
+  sender_id: number
+  publish_time: number
+  message: {
+    text: string
+    images: {
+      height: string
+      width: string
+      id: string
+    }[]
+  }
+}
+
+export class GetGroupNotice extends BaseAction<Payload, Notice[]> {
+  actionName = ActionName.GoCQHTTP_GetGroupNotice
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const data = await this.ctx.ntGroupApi.getGroupBulletinList(payload.group_id.toString())
+    const result: Notice[] = []
+    for (const feed of data.result.feeds) {
+      result.push({
+        sender_id: +feed.uin,
+        publish_time: +feed.publishTime,
+        message: {
+          text: feed.msg.text,
+          images: feed.msg.pics.map(image => {
+            return {
+              height: String(image.height),
+              width: String(image.width),
+              id: image.id
+            }
+          })
+        }
+      })
+    }
+    return result
+  }
+}

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

@@ -1,10 +1,10 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 import { OB11GroupFile, OB11GroupFileFolder } from '../../types'
+import { GroupFileInfo } from '@/ntqqapi/types'
 
 interface Payload {
-  group_id: string | number
+  group_id: number | string
-  file_count: string | number
 }
 
 interface Response {
@@ -14,17 +14,26 @@ interface Response {
 
 export class GetGroupRootFiles extends BaseAction<Payload, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupRootFiles
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required()
+  })
 
   async _handle(payload: Payload) {
-    const data = await this.ctx.ntGroupApi.getGroupFileList(payload.group_id.toString(), {
+    const groupId = payload.group_id.toString()
-      sortType: 1,
+    const data: GroupFileInfo['item'] = []
-      fileCount: +(payload.file_count ?? 50),
-      startIndex: 0,
-      sortOrder: 2,
-      showOnlinedocFolder: 0,
-    })
 
-    this.ctx.logger.info(data)
+    let nextIndex: number | undefined
+    while (nextIndex !== 0) {
+      const res = await this.ctx.ntGroupApi.getGroupFileList(groupId, {
+        sortType: 1,
+        fileCount: 100,
+        startIndex: nextIndex ?? 0,
+        sortOrder: 2,
+        showOnlinedocFolder: 0,
+      })
+      data.push(...res.item)
+      nextIndex = res.nextIndex
+    }
 
     return {
       files: data.filter(item => item.fileInfo)
@@ -59,4 +68,4 @@ export class GetGroupRootFiles extends BaseAction<Payload, Response> {
         })
     }
   }
-}
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { GroupNotifyStatus } from '@/ntqqapi/types'
 import { ActionName } from '../types'
 
@@ -28,7 +28,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
   actionName = ActionName.GoCQHTTP_GetGroupSystemMsg
 
   async _handle() {
-    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(10)
+    const singleScreenNotifies = await this.ctx.ntGroupApi.getSingleScreenNotifies(false, 10)
     const data: Response = { invited_requests: [], join_requests: [] }
     for (const notify of singleScreenNotifies) {
       if (notify.type == 1) {
@@ -38,7 +38,7 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
           invitor_nick: notify.user1.nickName,
           group_id: +notify.group.groupCode,
           group_name: notify.group.groupName,
-          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
+          checked: notify.status !== GroupNotifyStatus.Unhandle,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       } else if (notify.type == 7) {
@@ -49,11 +49,11 @@ export class GetGroupSystemMsg extends BaseAction<void, Response> {
           message: notify.postscript,
           group_id: +notify.group.groupCode,
           group_name: notify.group.groupName,
-          checked: notify.status !== GroupNotifyStatus.KUNHANDLE,
+          checked: notify.status !== GroupNotifyStatus.Unhandle,
           actor: notify.user2?.uid ? Number(await this.ctx.ntUserApi.getUinByUid(notify.user2.uid)) : 0
         })
       }
     }
     return data
   }
-}
+}

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

@@ -1,58 +1,56 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { OB11User } from '../../types'
 import { OB11Entities } from '../../entities'
 import { ActionName } from '../types'
 import { getBuildVersion } from '@/common/utils'
-import { OB11UserSex } from '../../types'
 import { calcQQLevel } from '@/common/utils/misc'
 
 interface Payload {
   user_id: number | string
 }
 
-export class GetStrangerInfo extends BaseAction<Payload, OB11User> {
+interface Response extends OB11User {
-  actionName = ActionName.GoCQHTTP_GetStrangerInfo
+  reg_time: number
+  long_nick: string
+  city: string
+}
 
-  protected async _handle(payload: Payload): Promise<OB11User> {
+export class GetStrangerInfo extends BaseAction<Payload, Response> {
-    if (!(getBuildVersion() >= 26702)) {
+  actionName = ActionName.GoCQHTTP_GetStrangerInfo
-      const user_id = payload.user_id.toString()
+  payloadSchema = Schema.object({
-      const extendData = await this.ctx.ntUserApi.getUserDetailInfoByUin(user_id)
+    user_id: Schema.union([Number, String]).required()
-      const uid = (await this.ctx.ntUserApi.getUidByUin(user_id))!
+  })
-      if (!uid || uid.indexOf('*') != -1) {
+
-        const ret = {
+  protected async _handle(payload: Payload) {
-          ...extendData,
+    const uin = payload.user_id.toString()
-          user_id: parseInt(extendData.info.uin) || 0,
+    if (getBuildVersion() >= 26702) {
-          nickname: extendData.info.nick,
+      const data = await this.ctx.ntUserApi.getUserDetailInfoByUinV2(uin)
-          sex: OB11UserSex.unknown,
+      return {
-          age: (extendData.info.birthday_year == 0) ? 0 : new Date().getFullYear() - extendData.info.birthday_year,
+        user_id: parseInt(data.detail.uin) || 0,
-          qid: extendData.info.qid,
+        nickname: data.detail.simpleInfo.coreInfo.nick,
-          level: extendData.info.qqLevel && calcQQLevel(extendData.info.qqLevel) || 0,
+        sex: OB11Entities.sex(data.detail.simpleInfo.baseInfo.sex),
-          login_days: 0,
+        age: data.detail.simpleInfo.baseInfo.age,
-          uid: ''
+        qid: data.detail.simpleInfo.baseInfo.qid,
-        }
+        level: data.detail.commonExt.qqLevel && calcQQLevel(data.detail.commonExt.qqLevel) || 0,
-        return ret
+        login_days: 0,
+        reg_time: data.detail.commonExt.regTime,
+        long_nick: data.detail.simpleInfo.baseInfo.longNick,
+        city: data.detail.commonExt.city
       }
-      const data = { ...extendData, ...(await this.ctx.ntUserApi.getUserDetailInfo(uid)) }
-      return OB11Entities.stranger(data)
     } else {
-      const user_id = payload.user_id.toString()
+      const data = await this.ctx.ntUserApi.getUserDetailInfoByUin(uin)
-      const extendData = await this.ctx.ntUserApi.getUserDetailInfoByUinV2(user_id)
+      return {
-      const uid = (await this.ctx.ntUserApi.getUidByUin(user_id))!
+        user_id: parseInt(data.info.uin) || 0,
-      if (!uid || uid.indexOf('*') != -1) {
+        nickname: data.info.nick,
-        const ret = {
+        sex: OB11Entities.sex(data.info.sex),
-          ...extendData,
+        age: data.info.birthday_year === 0 ? 0 : new Date().getFullYear() - data.info.birthday_year,
-          user_id: parseInt(extendData.detail.uin) || 0,
+        qid: data.info.qid,
-          nickname: extendData.detail.simpleInfo.coreInfo.nick,
+        level: data.info.qqLevel && calcQQLevel(data.info.qqLevel) || 0,
-          sex: OB11UserSex.unknown,
+        login_days: 0,
-          age: 0,
+        reg_time: data.info.regTime,
-          level: extendData.detail.commonExt.qqLevel && calcQQLevel(extendData.detail.commonExt.qqLevel) || 0,
+        long_nick: data.info.longNick,
-          login_days: 0,
+        city: data.info.city
-          uid: ''
-        }
-        return ret
       }
-      const data = { ...extendData, ...(await this.ctx.ntUserApi.getUserDetailInfo(uid)) }
-      return OB11Entities.stranger(data)
     }
   }
 }

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

@@ -1,14 +1,22 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
 
 interface Payload {
-  message_id: number
+  message_id: number | string
 }
 
 export class MarkMsgAsRead extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_MarkMsgAsRead
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
-  protected async _handle() {
+  protected async _handle(payload: Payload) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
+    if (!msg) {
+      throw new Error('msg not found')
+    }
+    await this.ctx.ntMsgApi.setMsgRead(msg.peer)
     return null
   }
 }

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

@@ -0,0 +1,63 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { uri2local } from '@/common/utils/file'
+import { access, unlink } from 'node:fs/promises'
+
+interface Payload {
+  image: string
+}
+
+interface TextDetection {
+  text: string
+  confidence: number
+  coordinates: {
+    x: number //int32
+    y: number
+  }[]
+}
+
+interface Response {
+  texts: TextDetection[]
+  language: string
+}
+
+export class OCRImage extends BaseAction<Payload, Response> {
+  actionName = ActionName.GoCQHTTP_OCRImage
+  payloadSchema = Schema.object({
+    image: Schema.string().required()
+  })
+
+  protected async _handle(payload: Payload) {
+    const { errMsg, isLocal, path, success } = await uri2local(this.ctx, payload.image, true)
+    if (!success) {
+      throw new Error(errMsg)
+    }
+    await access(path)
+
+    const data = await this.ctx.ntFileApi.ocrImage(path)
+    if (!isLocal) {
+      unlink(path)
+    }
+
+    const texts = data.result.map(item => {
+      const ret: TextDetection = {
+        text: item.text,
+        confidence: 1,
+        coordinates: []
+      }
+      for (let i = 0; i < 4; i++) {
+        const pt = item[`pt${i + 1}`]
+        ret.coordinates.push({
+          x: parseInt(pt.x),
+          y: parseInt(pt.y)
+        })
+      }
+      return ret
+    })
+
+    return {
+      texts,
+      language: ''
+    }
+  }
+}

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

@@ -1,4 +1,4 @@
-import BaseAction from '../BaseAction'
+import { BaseAction } from '../BaseAction'
 import { handleQuickOperation, QuickOperation, QuickOperationEvent } from '../../helper/quickOperation'
 import { ActionName } from '../types'
 
@@ -9,8 +9,9 @@ interface Payload {
 
 export class HandleQuickOperation extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_HandleQuickOperation
+
   protected async _handle(payload: Payload): Promise<null> {
     handleQuickOperation(this.ctx, payload.context, payload.operation).catch(e => this.ctx.logger.error(e))
     return null
   }
-}
+}

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

@@ -1,21 +1,275 @@
-import SendMsg from '../msg/SendMsg'
+import { unlink } from 'node:fs/promises'
-import { OB11PostSendMsg } from '../../types'
+import { OB11MessageData, OB11MessageNode } from '../../types'
 import { ActionName } from '../types'
-import { convertMessage2List } from '../../helper/createMessage'
+import { BaseAction, Schema } from '../BaseAction'
+import { Peer } from '@/ntqqapi/types/msg'
+import { ChatType, ElementType, RawMessage, SendMessageElement } from '@/ntqqapi/types'
+import { selfInfo } from '@/common/globalVars'
+import { message2List, createSendElements, sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
+import { MessageEncoder } from '@/onebot11/helper/createMultiMessage'
+import { Msg } from '@/ntqqapi/proto/compiled'
 
-export class SendForwardMsg extends SendMsg {
+interface Payload {
-  actionName = ActionName.GoCQHTTP_SendForwardMsg
+  user_id?: string | number
+  group_id?: string | number
+  messages?: OB11MessageNode[]
+  message?: OB11MessageNode[]
+  message_type?: 'group' | 'private'
+}
 
-  protected async check(payload: OB11PostSendMsg) {
+interface Response {
-    if (payload.messages) payload.message = convertMessage2List(payload.messages)
+  message_id: number
-    return super.check(payload)
+  forward_id: string
+}
+
+export class SendForwardMsg extends BaseAction<Payload, Response> {
+  actionName = ActionName.SendForwardMsg
+  payloadSchema = Schema.object({
+    user_id: Schema.union([Number, String]),
+    group_id: Schema.union([Number, String]),
+    messages: Schema.array(Schema.any()),
+    message: Schema.array(Schema.any()),
+    message_type: Schema.union(['group', 'private'])
+  })
+
+  protected async _handle(payload: Payload) {
+    const messages = payload.messages ?? payload.message
+    if (!messages) {
+      throw new Error('未指定消息内容')
+    }
+    let contextMode = CreatePeerMode.Normal
+    if (payload.message_type === 'group') {
+      contextMode = CreatePeerMode.Group
+    } else if (payload.message_type === 'private') {
+      contextMode = CreatePeerMode.Private
+    }
+    const peer = await createPeer(this.ctx, payload, contextMode)
+
+    const nodes = this.parseNodeContent(messages)
+    let fake = true
+    for (const node of nodes) {
+      if (node.data.id) {
+        fake = false
+        break
+      }
+      if (node.data.content?.some(e => {
+        return !MessageEncoder.support.includes(e.type)
+      })) {
+        fake = false
+        break
+      }
+    }
+
+    if (fake && this.ctx.app.native.activated) {
+      return await this.handleFakeForwardNode(peer, nodes)
+    } else {
+      return await this.handleForwardNode(peer, nodes)
+    }
+  }
+
+  private parseNodeContent(nodes: OB11MessageNode[]) {
+    return nodes.map(e => {
+      return {
+        type: e.type,
+        data: {
+          ...e.data,
+          content: e.data.content ? message2List(e.data.content) : undefined
+        }
+      }
+    })
+  }
+
+  private async handleFakeForwardNode(peer: Peer, nodes: OB11MessageNode[]): Promise<Response> {
+    const encoder = new MessageEncoder(this.ctx, peer)
+    const raw = await encoder.generate(nodes)
+    const transmit = Msg.PbMultiMsgTransmit.encode({ pbItemList: raw.multiMsgItems }).finish()
+    const resid = await this.ctx.app.native.uploadForward(peer, transmit.subarray(1))
+    const uuid = crypto.randomUUID()
+    try {
+      const msg = await this.ctx.ntMsgApi.sendMsg(peer, [{
+        elementType: 10,
+        elementId: '',
+        arkElement: {
+          bytesData: JSON.stringify({
+            app: 'com.tencent.multimsg',
+            config: {
+              autosize: 1,
+              forward: 1,
+              round: 1,
+              type: 'normal',
+              width: 300
+            },
+            desc: '[聊天记录]',
+            extra: JSON.stringify({
+              filename: uuid,
+              tsum: raw.tsum,
+            }),
+            meta: {
+              detail: {
+                news: raw.news,
+                resid,
+                source: raw.source,
+                summary: raw.summary,
+                uniseq: uuid,
+              }
+            },
+            prompt: '[聊天记录]',
+            ver: '0.0.0.5',
+            view: 'contact'
+          })
+        }
+      }], 1800)
+      const msgShortId = this.ctx.store.createMsgShortId({
+        chatType: msg!.chatType,
+        peerUid: msg!.peerUid
+      }, msg!.msgId)
+      return { message_id: msgShortId, forward_id: resid }
+    } catch (e) {
+      this.ctx.logger.error('合并转发失败', e)
+      throw new Error(`发送伪造合并转发消息失败 (res_id: ${resid} `)
+    }
+  }
+
+  private async cloneMsg(msg: RawMessage): Promise<RawMessage | undefined> {
+    this.ctx.logger.info('克隆的目标消息', msg)
+    const sendElements: SendMessageElement[] = []
+    for (const ele of msg.elements) {
+      sendElements.push(ele as SendMessageElement)
+    }
+    if (sendElements.length === 0) {
+      this.ctx.logger.warn('需要clone的消息无法解析，将会忽略掉', msg)
+    }
+    this.ctx.logger.info('克隆消息', sendElements)
+    try {
+      const peer = {
+        chatType: ChatType.C2C,
+        peerUid: selfInfo.uid
+      }
+      const nodeMsg = await this.ctx.ntMsgApi.sendMsg(peer, sendElements)
+      await this.ctx.sleep(300)
+      return nodeMsg
+    } catch (e) {
+      this.ctx.logger.warn(e, '克隆转发消息失败,将忽略本条消息', msg)
+    }
+  }
+
+  // 返回一个合并转发的消息id
+  private async handleForwardNode(destPeer: Peer, messageNodes: OB11MessageNode[]): Promise<Response> {
+    const selfPeer = {
+      chatType: ChatType.C2C,
+      peerUid: selfInfo.uid,
+    }
+    const nodeMsgIds: { msgId: string, peer: Peer }[] = []
+    // 先判断一遍是不是id和自定义混用
+    for (const messageNode of messageNodes) {
+      // 一个node表示一个人的消息
+      const nodeId = messageNode.data.id
+      // 有nodeId表示一个子转发消息卡片
+      if (nodeId) {
+        const nodeMsg = await this.ctx.store.getMsgInfoByShortId(+nodeId)
+        if (!nodeMsg) {
+          this.ctx.logger.warn('转发消息失败，未找到消息', nodeId)
+          continue
+        }
+        nodeMsgIds.push(nodeMsg)
+      }
+      else {
+        // 自定义的消息
+        // 提取消息段，发给自己生成消息id
+        try {
+          const { sendElements, deleteAfterSentFiles } = await createSendElements(
+            this.ctx,
+            messageNode.data.content as OB11MessageData[],
+            destPeer
+          )
+          this.ctx.logger.info('开始生成转发节点', sendElements)
+          const sendElementsSplit: SendMessageElement[][] = []
+          let splitIndex = 0
+          for (const ele of sendElements) {
+            if (!sendElementsSplit[splitIndex]) {
+              sendElementsSplit[splitIndex] = []
+            }
+
+            if (ele.elementType === ElementType.File || ele.elementType === ElementType.Video) {
+              if (sendElementsSplit[splitIndex].length > 0) {
+                splitIndex++
+              }
+              sendElementsSplit[splitIndex] = [ele]
+              splitIndex++
+            }
+            else {
+              sendElementsSplit[splitIndex].push(ele)
+            }
+          }
+          this.ctx.logger.info('分割后的转发节点', sendElementsSplit)
+          for (const eles of sendElementsSplit) {
+            const nodeMsg = await sendMsg(this.ctx, selfPeer, eles, [])
+            if (!nodeMsg) {
+              this.ctx.logger.warn('转发节点生成失败', eles)
+              continue
+            }
+            nodeMsgIds.push({ msgId: nodeMsg.msgId, peer: selfPeer })
+            await this.ctx.sleep(300)
+          }
+          deleteAfterSentFiles.map(path => unlink(path))
+        } catch (e) {
+          this.ctx.logger.error('生成转发消息节点失败', e)
+        }
+      }
+    }
+
+    // 检查srcPeer是否一致，不一致则需要克隆成自己的消息, 让所有srcPeer都变成自己的，使其保持一致才能够转发
+    const nodeMsgArray: RawMessage[] = []
+    let srcPeer: Peer
+    let needSendSelf = false
+    for (const { msgId, peer } of nodeMsgIds) {
+      const nodeMsg = (await this.ctx.ntMsgApi.getMsgsByMsgId(peer, [msgId])).msgList[0]
+      srcPeer ??= { chatType: nodeMsg.chatType, peerUid: nodeMsg.peerUid }
+      if (srcPeer.peerUid !== nodeMsg.peerUid) {
+        needSendSelf = true
+      }
+      nodeMsgArray.push(nodeMsg)
+    }
+    let retMsgIds: string[] = []
+    if (needSendSelf) {
+      for (const msg of nodeMsgArray) {
+        if (msg.peerUid === selfPeer.peerUid) {
+          retMsgIds.push(msg.msgId)
+          continue
+        }
+        const clonedMsg = await this.cloneMsg(msg)
+        if (clonedMsg) retMsgIds.push(clonedMsg.msgId)
+      }
+    } else {
+      retMsgIds = nodeMsgArray.map(msg => msg.msgId)
+    }
+    if (retMsgIds.length === 0) {
+      throw Error('转发消息失败，节点为空')
+    }
+    const msg = await this.ctx.ntMsgApi.multiForwardMsg(srcPeer!, destPeer, retMsgIds)
+    const resid = JSON.parse(msg.elements[0].arkElement!.bytesData).meta.detail.resid
+    const msgShortId = this.ctx.store.createMsgShortId({
+      chatType: msg.chatType,
+      peerUid: msg.peerUid
+    }, msg.msgId)
+    return { message_id: msgShortId, forward_id: resid }
   }
 }
 
 export class SendPrivateForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendPrivateForwardMsg
+
+  protected _handle(payload: Payload) {
+    payload.message_type = 'private'
+    return super._handle(payload)
+  }
 }
 
 export class SendGroupForwardMsg extends SendForwardMsg {
   actionName = ActionName.GoCQHTTP_SendGroupForwardMsg
+
+  protected _handle(payload: Payload) {
+    payload.message_type = 'group'
+    return super._handle(payload)
+  }
 }

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

@@ -1,37 +1,58 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
+import { unlink } from 'fs/promises'
+import { checkFileReceived, uri2local } from '@/common/utils/file'
 
 interface Payload {
   group_id: number | string
   content: string
   image?: string
-  pinned?: number | string //扩展
+  pinned: number | string //扩展
-  confirm_required?: number | string //扩展
+  confirm_required: number | string //扩展
 }
 
 export class SendGroupNotice extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SendGroupNotice
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    content: Schema.string().required(),
+    image: Schema.string(),
+    pinned: Schema.union([Number, String]).default(0),
+    confirm_required: Schema.union([Number, String]).default(1)
+  })
 
   async _handle(payload: Payload) {
-    const type = 1
+    const groupCode = payload.group_id.toString()
-    const isShowEditCard = 0
+    const pinned = +payload.pinned
-    const tipWindowType = 0
+    const confirmRequired = +payload.confirm_required
-    const pinned = Number(payload.pinned ?? 0)
-    const confirmRequired = Number(payload.confirm_required ?? 1)
 
-    const result = await this.ctx.ntWebApi.setGroupNotice({
+    let picInfo: { id: string, width: number, height: number } | undefined
-      groupCode: payload.group_id.toString(),
+    if (payload.image) {
-      content: payload.content,
+      const { path, isLocal, success, errMsg } = await uri2local(this.ctx, payload.image, true)
+      if (!success) {
+        throw new Error(`设置群公告失败, 错误信息: uri2local: ${errMsg}`)
+      }
+      await checkFileReceived(path, 5000) // 文件不存在QQ会崩溃，需要提前判断
+      const result = await this.ctx.ntGroupApi.uploadGroupBulletinPic(groupCode, path)
+      if (result.errCode !== 0) {
+        throw new Error(`设置群公告失败, 错误信息: uploadGroupBulletinPic: ${result.errMsg}`)
+      }
+      if (!isLocal) {
+        unlink(path)
+      }
+      picInfo = result.picInfo
+    }
+
+    const res = await this.ctx.ntGroupApi.publishGroupBulletin(groupCode, {
+      text: encodeURIComponent(payload.content),
+      oldFeedsId: '',
       pinned,
-      type,
-      isShowEditCard,
-      tipWindowType,
       confirmRequired,
-      picId: ''
+      picInfo
     })
-    if (result.ec !== 0) {
+    if (res.result !== 0) {
-      throw new Error(`设置群公告失败, 错误信息: ${result.em}`)
+      throw new Error(`设置群公告失败, 错误信息: ${res.errMsg}`)
     }
     return null
   }
-}
+}

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

@@ -0,0 +1,19 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+
+interface Payload {
+  group_id: number | string
+}
+
+export class SendGroupSign extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SendGroupSign
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+  })
+
+  async _handle(payload: Payload) {
+    throw new Error('暂未实现群签到功能')
+    return null
+  }
+}

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

@@ -1,25 +1,22 @@
-import BaseAction from '../BaseAction'
+import { BaseAction, Schema } from '../BaseAction'
 import { ActionName } from '../types'
-import { MessageUnique } from '@/common/utils/messageUnique'
 
 interface Payload {
   message_id: number | string
 }
 
-export class SetEssenceMsg extends BaseAction<Payload, unknown> {
+export class SetEssenceMsg extends BaseAction<Payload, null> {
   actionName = ActionName.GoCQHTTP_SetEssenceMsg
+  payloadSchema = Schema.object({
+    message_id: Schema.union([Number, String]).required()
+  })
 
   protected async _handle(payload: Payload) {
-    if (!payload.message_id) {
+    const msg = await this.ctx.store.getMsgInfoByShortId(+payload.message_id)
-      throw Error('message_id不能为空')
-    }
-    const msg = await MessageUnique.getMsgIdAndPeerByShortId(+payload.message_id)
     if (!msg) {
       throw new Error('msg not found')
     }
-    return await this.ctx.ntGroupApi.addGroupEssence(
+    await this.ctx.ntGroupApi.addGroupEssence(msg.peer.peerUid, msg.msgId)
-      msg.Peer.peerUid,
+    return null
-      msg.MsgId
-    )
   }
 }

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

@@ -0,0 +1,30 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { selfInfo } from '@/common/globalVars'
+import { GroupMemberRole } from '@/ntqqapi/types'
+
+interface Payload {
+  group_id: number | string
+  user_id: number | string
+  special_title?: string
+}
+
+export class SetGroupSpecialTitle extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_SetGroupSpecialTitle
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    user_id: Schema.union([Number, String]).required(),
+    special_title: Schema.string()
+  })
+
+  async _handle(payload: Payload) {
+    const uid = await this.ctx.ntUserApi.getUidByUin(payload.user_id.toString(), payload.group_id.toString())
+    if (!uid) throw new Error(`用户${payload.user_id}的uid获取失败`)
+    const self = await this.ctx.ntGroupApi.getGroupMember(payload.group_id.toString(), selfInfo.uid, false)
+    if (self.role !== GroupMemberRole.Owner){
+      throw new Error(`不是群${payload.group_id}的群主，无法设置群头衔`)
+    }
+    throw new Error('暂未实现设置群头衔功能')
+    return null
+  }
+}

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

@@ -1,59 +0,0 @@
-import fs from 'node:fs'
-import BaseAction from '../BaseAction'
-import { ActionName } from '../types'
-import { SendElementEntities } from '@/ntqqapi/entities'
-import { SendFileElement } from '@/ntqqapi/types'
-import { uri2local } from '@/common/utils'
-import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
-
-interface UploadGroupFilePayload {
-  group_id: number | string
-  file: string
-  name: string
-  folder?: string
-  folder_id?: string
-}
-
-export class UploadGroupFile extends BaseAction<UploadGroupFilePayload, null> {
-  actionName = ActionName.GoCQHTTP_UploadGroupFile
-
-  protected async _handle(payload: UploadGroupFilePayload): Promise<null> {
-    let file = payload.file
-    if (fs.existsSync(file)) {
-      file = `file://${file}`
-    }
-    const downloadResult = await uri2local(file)
-    if (!downloadResult.success) {
-      throw new Error(downloadResult.errMsg)
-    }
-    const sendFileEle = await SendElementEntities.file(this.ctx, downloadResult.path, payload.name, payload.folder_id)
-    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
-    await sendMsg(this.ctx, peer, [sendFileEle], [])
-    return null
-  }
-}
-
-interface UploadPrivateFilePayload {
-  user_id: number | string
-  file: string
-  name: string
-}
-
-export class UploadPrivateFile extends BaseAction<UploadPrivateFilePayload, null> {
-  actionName = ActionName.GoCQHTTP_UploadPrivateFile
-
-  protected async _handle(payload: UploadPrivateFilePayload): Promise<null> {
-    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Private)
-    let file = payload.file
-    if (fs.existsSync(file)) {
-      file = `file://${file}`
-    }
-    const downloadResult = await uri2local(file)
-    if (!downloadResult.success) {
-      throw new Error(downloadResult.errMsg)
-    }
-    const sendFileEle: SendFileElement = await SendElementEntities.file(this.ctx, downloadResult.path, payload.name)
-    await sendMsg(this.ctx, peer, [sendFileEle], [])
-    return null
-  }
-}

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

@@ -0,0 +1,39 @@
+import { BaseAction, Schema } from '../BaseAction'
+import { ActionName } from '../types'
+import { SendElement } from '@/ntqqapi/entities'
+import { uri2local } from '@/common/utils'
+import { sendMsg, createPeer, CreatePeerMode } from '../../helper/createMessage'
+
+interface Payload {
+  group_id: number | string
+  file: string
+  name: string
+  folder?: string
+  folder_id?: string
+}
+
+export class UploadGroupFile extends BaseAction<Payload, null> {
+  actionName = ActionName.GoCQHTTP_UploadGroupFile
+  payloadSchema = Schema.object({
+    group_id: Schema.union([Number, String]).required(),
+    file: Schema.string().required(),
+    name: Schema.string(),
+    folder: Schema.string(),
+    folder_id: Schema.string()
+  })
+
+  protected async _handle(payload: Payload): Promise<null> {
+    const { success, errMsg, path, fileName } = await uri2local(this.ctx, payload.file)
+    if (!success) {
+      throw new Error(errMsg)
+    }
+    const name = payload.name || fileName
+    if (name.includes('/') || name.includes('\\')) {
+      throw new Error(`文件名 ${name} 不合法`)
+    }
+    const file = await SendElement.file(this.ctx, path, name, payload.folder ?? payload.folder_id)
+    const peer = await createPeer(this.ctx, payload, CreatePeerMode.Group)
+    await sendMsg(this.ctx, peer, [file], [])
+    return null
+  }
+}