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

fix: revert get_friends_with_category return type

.editorconfig

@@ -15,7 +15,7 @@ charset = utf-8
 # 2 space indentation
 [*.{cjs,mjs,js,jsx,ts,tsx,css,scss,sass,html,json}]
 indent_style = space
-indent_size = 2
+indent_size = 4
 
 # Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
 # You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.env.development

@@ -1 +0,0 @@
-VITE_BUILD_TYPE = Development

.env.framework

@@ -0,0 +1,2 @@
+VITE_BUILD_TYPE = Production
+VITE_BUILD_PLATFORM = Framework

.env.production

@@ -1 +0,0 @@
-VITE_BUILD_TYPE = Production

.env.shell

@@ -0,0 +1,2 @@
+VITE_BUILD_TYPE = Production
+VITE_BUILD_PLATFORM = Shell

.eslintrc.cjs

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

.github/workflows/build.yml

@@ -1,4 +1,4 @@
-name: "Build"
+name: "Build Action"
 on:
   workflow_dispatch:
   push:
@@ -8,14 +8,9 @@ on:
 permissions: write-all
 
 jobs:
-  build-linux:
+  Build-LiteLoader:
     if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [linux]
-        target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
       uses: actions/checkout@v4
@@ -28,26 +23,22 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 20.x
-    - name: Build NuCat Linux
+    - name: Build NuCat Framework
       run: |
-          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          npm run build:prod
+          npm i
+          npm run build:framework
           cd dist
-          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm i --omit=dev 
+          rm package-lock.json
           cd ..
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+        name: NapCat.Framework
         path: dist
-  build-win32:
+  Build-Shell:
     if: ${{ startsWith(github.event.head_commit.message, 'build:') }}
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [win32]
-        target_arch: [x64]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
@@ -60,15 +51,16 @@ jobs:
           uses: actions/setup-node@v4
           with:
               node-version: 20.x
-        - name: Build NuCat Linux
+        - name: Build NuCat LiteLoader
           run: |
-                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                npm run build:prod
+                npm i
+                npm run build:shell
                 cd dist
-                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm i --omit=dev
+                rm package-lock.json
                 cd ..
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:
-              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-              path: dist
+              name: NapCat.Shell
+              path: dist

.github/workflows/release.yml

@@ -1,4 +1,4 @@
-name: "release"
+name: "Build Release"
 
 on:
   push:
@@ -30,14 +30,9 @@ jobs:
               ls
               node ./script/checkVersion.cjs
               sh ./checkVersion.sh
-  build-linux:
+  Build-LiteLoader:
     needs: [check-version]
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [linux]
-        target_arch: [x64, arm64]
     steps:
     - name: Clone Main Repository
       uses: actions/checkout@v4
@@ -51,28 +46,21 @@ jobs:
       with:
           node-version: 20.x
 
-    - name: Build NuCat Linux
+    - name: Build NuCat Framework
       run: |
-          export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
-          export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
-          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          npm run build:prod
+          npm i
+          npm run build:framework
           cd dist
-          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm i --omit=dev
           cd ..
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+        name: NapCat.Framework
         path: dist
-  build-win32:
+  Build-Shell:
     runs-on: ubuntu-latest
     needs: [check-version]
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [win32]
-        target_arch: [x64]
     steps:
         - name: Clone Main Repository
           uses: actions/checkout@v4
@@ -87,24 +75,22 @@ jobs:
           with:
               node-version: 20.x
           
-        - name: Build NuCat Linux
+        - name: Build NuCat Shell
           run: |
-                export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
-                export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
-                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                npm run build:prod
+                npm i 
+                npm run build:shell
                 cd dist
-                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm i --omit=dev
                 cd ..
 
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:
-              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
+              name: NapCat.Shell
               path: dist
 
   release-napcat:
-    needs: [build-win32,build-linux]
+    needs: [Build-LiteLoader,Build-Shell]
     runs-on: ubuntu-latest
     steps:
     - name: Download All Artifact
@@ -121,7 +107,7 @@ jobs:
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
     - name: Clone Changes Log
-      run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/CHANGELOG.md
+      run: curl -o CHANGELOG.md https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/docs/changelogs/CHANGELOG.v${{ env.VERSION }}.md
         
     - name: Create Release Draft and Upload Artifacts
       uses: softprops/action-gh-release@v1
@@ -130,9 +116,8 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         body_path: CHANGELOG.md
         files: |
-          NapCat.win32.x64.zip
-          NapCat.linux.x64.zip
-          NapCat.linux.arm64.zip
+          NapCat.Framework.zip
+          NapCat.Shell.zip
 #          NapCat.darwin.x64.zip
 #          NapCat.darwin.arm64.zip
         draft: true

.gitignore

@@ -4,8 +4,8 @@ package-lock.json
 pnpm-lock.yaml
 out/
 dist/
-src/core.lib/common/
-test
+/src/core.lib/common/
+/localdebug/
 
 # Editor
 .vscode/*
@@ -15,3 +15,4 @@ test
 # Build
 *.db
 checkVersion.sh
+bun.lockb

.gitmodules

@@ -1,4 +0,0 @@
-[submodule "src/core"]
-	path = src/core
-	url = https://github.com/NapNeko/core.git
-	branch = master

.prettierrc.json

@@ -0,0 +1,10 @@
+{
+    "trailingComma": "es5",
+    "tabWidth": 4,
+    "semi": true,
+    "singleQuote": true,
+    "bracketSpacing": true,
+    "arrowParens": "always",
+    "printWidth": 120,
+    "endOfLine": "auto"
+}

CHANGELOG.md

@@ -1,17 +0,0 @@
-# v1.3.5
-
-QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
-
-## 修复与优化
-* 尝试修复多开崩溃问题
-* 修复群列表更新问题
-* 修复兼容性问题支持Win7
-* 修复下载 http 资源缺少UA
-* 优化少量消息合并转发速度
-* 修复加载群通知时出现 getUserDetailInfo timeout 导致程序崩溃
-  
-## 新增与调整
-* 新增设置群公告 Api: /_send_group_notice
-* 新增重启实现 包括重启快速登录/普通重启 副作用: 原进程 无法清理
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

LICENSE

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

README.md

@@ -2,32 +2,33 @@
   <img src="https://socialify.git.ci/NapNeko/NapCatQQ/image?description=1&language=1&logo=https%3A%2F%2Fraw.githubusercontent.com%2FNapNeko%2FNapCatQQ%2Fmain%2Flogo.png&name=1&stargazers=1&theme=Auto" alt="NapCatQQ" width="640" height="320" />
 </div>
 
+---
+
 ## 项目介绍
+NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现。
 
-NapCatQQ 是基于 PC NTQQ 本体实现一套无头 Bot 框架。
-
-名字寓意 瞌睡猫QQ，像睡着了一样在后台低占用运行的无需GUI界面的NTQQ。
+## 项目优势
+- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
+- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
+- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
 
 ## 如何使用
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-**首次使用** 请务必前往 [官方文档](https://napneko.github.io/) 查看使用文档与教程
+**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
 
-
-## 项目声明
-
-* 请不要在无关地方宣传NapCatQQ，本项目只是用于学习 node 相关知识，切勿用于违法用途
-
-* NapCat 不会收集用户隐私信息，但是未来可能会为了更好的利于 NapCat 的优化会收集一些设备信息，如 cpu 架构，系统版本等
-  
 ## 相关链接
+
 [Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
+## 附加协议
+禁止未授权任何项目使用Core部分代码用于二次开发与分发
+
 ## 鸣谢名单
+感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
 
-[Lagrange](https://github.com/LagrangeDev/Lagrange.Core)
+感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
 
-<!-- 
-QQ群：545402644
--->
+---
+**任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**

manifest.json

@@ -0,0 +1,33 @@
+{
+  "manifest_version": 4,
+  "type": "extension",
+  "name": "NapCat",
+  "slug": "NapCat",
+  "description": "OneBot v11 protocol implementation with NapCat logic",
+  "version": "2.0.4",
+  "icon": "./logo.png",
+  "authors": [
+    {
+      "name": "MliKiowa",
+      "link": "https://github.com/MliKiowa"
+    },
+    {
+      "name": "Young",
+      "link": "https://github.com/Wesley-Young"
+    }
+  ],
+  "repository": {
+    "repo": "NapNeko/NapCatQQ",
+    "branch": "main"
+  },
+  "platform": [
+    "win32",
+    "linux",
+    "darwin"
+  ],
+  "injects": {
+    "renderer": "./renderer.js",
+    "main": "./liteloader.cjs",
+    "preload": "./preload.cjs"
+  }
+}

package.json

@@ -1,65 +1,65 @@
-{
-  "name": "napcat",
-  "private": true,
-  "type": "module",
-  "version": "1.3.2",
-  "scripts": {
-    "watch:dev": "vite --mode development",
-    "watch:prod": "vite --mode production",
-    "build:dev": "vite build --mode development",
-    "build:prod": "vite build --mode production",
-    "build": "npm run build:dev",
-    "build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
-    "build:webui": "cd ./src/webui && vite build",
-    "watch": "npm run watch:dev",
-    "debug-win": "powershell dist/napcat.ps1",
-    "lint": "eslint --fix src/**/*.{js,ts}",
-    "release": "npm run build:prod",
-    "depend": "cd dist && npm install --omit=dev"
-  },
-  "devDependencies": {
-    "@log4js-node/log4js-api": "^1.0.2",
-    "@rollup/plugin-commonjs": "^25.0.7",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
-    "@types/cors": "^2.8.17",
-    "@types/express": "^4.17.21",
-    "@types/figlet": "^1.5.8",
-    "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/node": "^20.11.30",
-    "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^9.0.8",
-    "@types/ws": "^8.5.10",
-    "@typescript-eslint/eslint-plugin": "^7.4.0",
-    "@typescript-eslint/parser": "^7.4.0",
-    "eslint": "^8.57.0",
-    "eslint-import-resolver-typescript": "^3.6.1",
-    "eslint-plugin-import": "^2.29.1",
-    "i": "^0.3.7",
-    "javascript-obfuscator": "^4.1.0",
-    "protobufjs-cli": "^1.1.2",
-    "rollup": "^4.13.2",
-    "rollup-plugin-dts": "^6.1.0",
-    "rollup-plugin-obfuscator": "^1.1.0",
-    "typescript": "^5.3.3",
-    "vite": "^5.2.6",
-    "vite-plugin-cp": "^4.0.8",
-    "vite-plugin-dts": "^3.8.2",
-    "vite-tsconfig-paths": "^4.3.2"
-  },
-  "dependencies": {
-    "commander": "^12.0.0",
-    "cors": "^2.8.5",
-    "express": "^5.0.0-beta.2",
-    "fast-xml-parser": "^4.3.6",
-    "file-type": "^19.0.0",
-    "fluent-ffmpeg": "^2.1.2",
-    "image-size": "^1.1.1",
-    "log4js": "^6.9.1",
-    "qrcode-terminal": "^0.12.0",
-    "silk-wasm": "^3.3.4",
-    "sqlite3": "^5.1.7",
-    "uuid": "^9.0.1",
-    "ws": "^8.16.0"
-  }
-}
+{
+  "name": "napcat",
+  "private": true,
+  "type": "module",
+  "version": "2.0.4",
+  "scripts": {
+    "build:framework": "vite build --mode framework",
+    "build:shell": "vite build --mode shell",
+    "build:webui": "cd ./src/webui && vite build",
+    "lint": "eslint --fix src/**/*.{js,ts}",
+    "depend": "cd dist && npm install --omit=dev"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.24.7",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.24.7",
+    "@babel/preset-typescript": "^7.24.7",
+    "@log4js-node/log4js-api": "^1.0.2",
+    "@protobuf-ts/plugin": "^2.9.4",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/cors": "^2.8.17",
+    "@types/express": "^4.17.21",
+    "@types/figlet": "^1.5.8",
+    "@types/fluent-ffmpeg": "^2.1.24",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.0.1",
+    "@types/qrcode-terminal": "^0.12.2",
+    "@types/ws": "^8.5.12",
+    "@typescript-eslint/eslint-plugin": "^7.4.0",
+    "@typescript-eslint/parser": "^7.4.0",
+    "eslint": "^8.57.0",
+    "eslint-import-resolver-typescript": "^3.6.1",
+    "eslint-plugin-import": "^2.29.1",
+    "i": "^0.3.7",
+    "javascript-obfuscator": "^4.1.0",
+    "rollup": "^4.13.2",
+    "rollup-plugin-dts": "^6.1.0",
+    "rollup-plugin-obfuscator": "^1.1.0",
+    "typescript": "^5.3.3",
+    "vite": "^5.2.6",
+    "vite-plugin-babel": "^1.2.0",
+    "vite-plugin-cp": "^4.0.8",
+    "vite-plugin-dts": "^3.8.2",
+    "vite-tsconfig-paths": "^4.3.2"
+  },
+  "dependencies": {
+    "ajv": "^8.13.0",
+    "async-mutex": "^0.5.0",
+    "chalk": "^5.3.0",
+    "commander": "^12.1.0",
+    "cors": "^2.8.5",
+    "express": "^5.0.0-beta.2",
+    "fast-xml-parser": "^4.3.6",
+    "file-type": "^19.0.0",
+    "fluent-ffmpeg": "^2.1.2",
+    "image-size": "^1.1.1",
+    "json-schema-to-ts": "^3.1.0",
+    "log4js": "^6.9.1",
+    "qrcode-terminal": "^0.12.0",
+    "silk-wasm": "^3.6.1",
+    "strtok3": "8.0.1",
+    "ws": "^8.18.0"
+  }
+}

script/BootWay.03.ps1

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

script/BootWay05.bat

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

script/BootWay05.ps1

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

script/BootWay05.utf8.bat

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

script/checkVersion.cjs

@@ -1,13 +1,42 @@
-let fs = require("fs");
-let process = require("process")
+const fs = require("fs");
+const process = require("process");
+
 console.log("[NapCat] [CheckVersion] 开始检测当前仓库版本...");
-let currentVersion = require("../package.json").version;
-let targetVersion = process.env.VERSION;
-console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, " targetVersion:", targetVersion);
-// fs.mkdirSync("./dist");
-if (currentVersion === targetVersion) {
-    fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\necho \"CheckVersion Is Done\"")
-} else {
-    let runscript = "sed -i 's/\"version\": \"" + currentVersion + "\"/\"version\": \"" + targetVersion + "\"/g' package.json";
-    fs.writeFileSync("./checkVersion.sh", "#!/bin/bashe\ngit config --global user.email \"bot@test.wumiao.wang\"\n git config --global user.name \"Version\"\n" + runscript + "\ngit add .\n git commit -m \"chore:version change\"\n git push -u origin main")
-}
+try {
+  const packageJson = require("../package.json");
+  const currentVersion = packageJson.version;
+  const targetVersion = process.env.VERSION;
+
+  console.log("[NapCat] [CheckVersion] currentVersion:", currentVersion, "targetVersion:", targetVersion);
+
+  // 验证 targetVersion 格式
+  if (!targetVersion || typeof targetVersion !== 'string') {
+    console.log("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
+    return;
+  }
+
+  // 写入脚本文件的统一函数
+  const writeScriptToFile = (content) => {
+    fs.writeFileSync("./checkVersion.sh", content, { flag: 'w' });
+    console.log("[NapCat] [CheckVersion] checkVersion.sh 文件已更新。");
+  };
+
+  if (currentVersion === targetVersion) {
+    // 不需要更新版本，写入一个简单的脚本
+    const simpleScript = "#!/bin/bash\necho \"CheckVersion Is Done\"";
+    writeScriptToFile(simpleScript);
+  } else {
+    // 更新版本，构建安全的sed命令
+    const safeScriptContent = `
+    #!/bin/bash
+    git config --global user.email "bot@test.wumiao.wang"
+    git config --global user.name "Version"
+    sed -i "s/\\\"version\\\": \\\"${currentVersion}\\\"/\\\"version\\\": \\\"${targetVersion}\\\"/g" package.json
+    git add .
+    git commit -m "chore:version change"
+    git push -u origin main`;
+    writeScriptToFile(safeScriptContent);
+  }
+} catch (error) {
+  console.log("[NapCat] [CheckVersion] 检测过程中发生错误：", error);
+}

script/copy-core.cjs

@@ -1,32 +0,0 @@
-let fs = require('fs');
-let path = require('path');
-
-const coreDistDir = path.join(path.resolve(__dirname, '../'), 'src/core/dist/core/src');
-const coreLibDir = path.join(path.resolve(__dirname, '../'), 'src/core.lib/src');
-
-function copyDir(currentPath, outputDir) {
-  fs.readdir(currentPath, { withFileTypes: true }, (err, entries) => {
-    if (err?.errno === -4058) return;
-
-    entries.forEach(entry => {
-      const localBasePath = path.join(currentPath, entry.name);
-      const outputLocalBasePath = path.join(outputDir, entry.name);
-
-      if (entry.isDirectory()) {
-        // 如果是目录，递归调用
-        if (!fs.existsSync(outputLocalBasePath)) {
-          fs.mkdirSync(outputLocalBasePath, { recursive: true });
-        }
-        copyDir(localBasePath, outputLocalBasePath);
-      }
-      else{
-        // 如果是文件，直接复制
-        fs.copyFile(localBasePath, outputLocalBasePath, (err) => {
-          if (err) throw err;
-        });
-      }
-    });
-  });
-}
-
-copyDir(coreDistDir, coreLibDir);

script/gen-version.ts

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

script/napcat-custom.bat

@@ -1,3 +0,0 @@
-chcp 65001
-set ELECTRON_RUN_AS_NODE=1
-"H:\Program Files\QQNT最新版\QQ.exe" %~dp0/napcat.cjs %*

script/napcat-gc.ps1

@@ -1,15 +0,0 @@
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        throw "Error getting UninstallString: $_"
-    }
-}
-$params = $args -join " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path (Get-Location) "\dist\inject.cjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$QQpath' --expose-gc $Bootfile $params}"

script/napcat-log.ps1

@@ -1,17 +0,0 @@
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        return "D:\QQ.exe"
-    }
-}
-$params = $args -join " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-$argumentList = '-noexit', '-noprofile', "-command `"$QQpath`" `"$Bootfile`" $params"
-Start-Process powershell -ArgumentList $argumentList -RedirectStandardOutput "log.txt" -RedirectStandardError "error.txt"
-powershell Get-Content -Wait -Encoding UTF8 log.txt

script/napcat-utf8.bat

@@ -1,18 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-chcp 65001
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set "RetString=%%b"
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in ("!RetString!") do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-set "QQPath=!pathWithoutUninstall!QQ.exe"
-set ELECTRON_RUN_AS_NODE=1
-echo !QQPath!
-"!QQPath!" ./napcat.cjs %*

script/napcat-utf8.ps1

@@ -1,15 +0,0 @@
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        return "D:\QQ.exe"
-    }
-}
-$params = $args -join " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& '$QQpath' $Bootfile $params}"

script/napcat.bat

@@ -1,17 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-:loop_read
-for /f "tokens=2*" %%a in ('reg query "HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ" /v "UninstallString"') do (
-    set "RetString=%%b"
-    goto :napcat_boot
-)
-
-:napcat_boot
-for %%a in ("!RetString!") do (
-    set "pathWithoutUninstall=%%~dpa"
-)
-
-set "QQPath=!pathWithoutUninstall!QQ.exe"
-set ELECTRON_RUN_AS_NODE=1
-echo !QQPath!
-"!QQPath!" ./napcat.cjs %*

script/napcat.ps1

@@ -1,15 +0,0 @@
-function Get-QQpath {
-    try {
-        $key = Get-ItemProperty -Path "HKLM:\SOFTWARE\WOW6432Node\Microsoft\Windows\CurrentVersion\Uninstall\QQ"
-        $uninstallString = $key.UninstallString
-        return [System.IO.Path]::GetDirectoryName($uninstallString) + "\QQ.exe"
-    }
-    catch {
-        return "D:\QQ.exe"
-    }
-}
-$params = $args -join " "
-$QQpath = Get-QQpath
-$Bootfile = Join-Path $PSScriptRoot "napcat.cjs"
-$env:ELECTRON_RUN_AS_NODE = 1
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& '$QQpath' $Bootfile $params}"

script/napcat.sh

@@ -1,4 +0,0 @@
-#!/bin/bash
-SCRIPT_DIR=$(realpath $(dirname "${BASH_SOURCE[0]}"))
-export ELECTRON_RUN_AS_NODE=1
-/opt/QQ/qq ${SCRIPT_DIR}/napcat.cjs $@

src/common/framework/event-legacy.ts

@@ -0,0 +1,263 @@
+import { NodeIQQNTWrapperSession } from '@/core/wrapper/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+    timeout: number;
+    createtime: number;
+    func: (...arg: any[]) => any;
+    checker: ((...args: any[]) => boolean) | undefined;
+}
+
+export type ListenerClassBase = Record<string, string>;
+
+export interface ListenerIBase {
+    // eslint-disable-next-line @typescript-eslint/no-misused-new
+    new(listener: any): ListenerClassBase;
+}
+
+export class LegacyNTEventWrapper {
+    private listenerMapping: Record<string, ListenerIBase>; //ListenerName-Unique -> Listener构造函数
+    private WrapperSession: NodeIQQNTWrapperSession | undefined; //WrapperSession
+    private listenerManager: Map<string, ListenerClassBase> = new Map<string, ListenerClassBase>(); //ListenerName-Unique -> Listener实例
+    private EventTask = new Map<string, Map<string, Map<string, Internal_MapKey>>>(); //tasks ListenerMainName -> ListenerSubName-> uuid -> {timeout,createtime,func}
+
+    constructor(
+        listenerMapping: Record<string, ListenerIBase>,
+        wrapperSession: NodeIQQNTWrapperSession,
+    ) {
+        this.listenerMapping = listenerMapping;
+        this.WrapperSession = wrapperSession;
+    }
+
+    createProxyDispatch(ListenerMainName: string) {
+        // eslint-disable-next-line @typescript-eslint/no-this-alias
+        const current = this;
+        return new Proxy(
+            {},
+            {
+                get(target: any, prop: any, receiver: any) {
+                    // console.log('get', prop, typeof target[prop]);
+                    if (typeof target[prop] === 'undefined') {
+                        // 如果方法不存在，返回一个函数，这个函数调用existentMethod
+                        return (...args: any[]) => {
+                            current.dispatcherListener.apply(current, [ListenerMainName, prop, ...args]).then();
+                        };
+                    }
+                    // 如果方法存在，正常返回
+                    return Reflect.get(target, prop, receiver);
+                },
+            },
+        );
+    }
+
+    createEventFunction<T extends (...args: any) => any>(eventName: string): T | undefined {
+        const eventNameArr = eventName.split('/');
+        type eventType = {
+            [key: string]: () => { [key: string]: (...params: Parameters<T>) => Promise<ReturnType<T>> };
+        };
+        if (eventNameArr.length > 1) {
+            const serviceName = 'get' + eventNameArr[0].replace('NodeIKernel', '');
+            const eventName = eventNameArr[1];
+            //getNodeIKernelGroupListener,GroupService
+            //console.log('2', eventName);
+            const services = (this.WrapperSession as unknown as eventType)[serviceName]();
+            let event = services[eventName];
+            //重新绑定this
+            event = event.bind(services);
+            if (event) {
+                return event as T;
+            }
+            return undefined;
+        }
+    }
+
+    createListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
+        const ListenerType = this.listenerMapping![listenerMainName];
+        let Listener = this.listenerManager.get(listenerMainName + uniqueCode);
+        if (!Listener && ListenerType) {
+            Listener = new ListenerType(this.createProxyDispatch(listenerMainName));
+            const ServiceSubName = listenerMainName.match(/^NodeIKernel(.*?)Listener$/)![1];
+            const Service = 'NodeIKernel' + ServiceSubName + 'Service/addKernel' + ServiceSubName + 'Listener';
+            const addfunc = this.createEventFunction<(listener: T) => number>(Service);
+            addfunc!(Listener as T);
+            //console.log(addfunc!(Listener as T));
+            this.listenerManager.set(listenerMainName + uniqueCode, Listener);
+        }
+        return Listener as T;
+    }
+
+    //统一回调清理事件
+    async dispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
+        //console.log("[EventDispatcher]",ListenerMainName, ListenerSubName, ...args);
+        this.EventTask.get(ListenerMainName)
+            ?.get(ListenerSubName)
+            ?.forEach((task, uuid) => {
+                //console.log(task.func, uuid, task.createtime, task.timeout);
+                if (task.createtime + task.timeout < Date.now()) {
+                    this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.delete(uuid);
+                    return;
+                }
+                if (task.checker && task.checker(...args)) {
+                    task.func(...args);
+                }
+            });
+    }
+
+    async callNoListenerEvent<EventType extends (...args: any[]) => Promise<any> | any>(
+        EventName = '',
+        timeout: number = 3000,
+        ...args: Parameters<EventType>
+    ) {
+        return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
+            const EventFunc = this.createEventFunction<EventType>(EventName);
+            let complete = false;
+            setTimeout(() => {
+                if (!complete) {
+                    reject(new Error('NTEvent EventName:' + EventName + ' timeout'));
+                }
+            }, timeout);
+            const retData = await EventFunc!(...args);
+            complete = true;
+            resolve(retData);
+        });
+    }
+
+    async RegisterListen<ListenerType extends (...args: any[]) => void>(
+        ListenerName = '',
+        waitTimes = 1,
+        timeout = 5000,
+        checker: (...args: Parameters<ListenerType>) => boolean,
+    ) {
+        return new Promise<Parameters<ListenerType>>((resolve, reject) => {
+            const ListenerNameList = ListenerName.split('/');
+            const ListenerMainName = ListenerNameList[0];
+            const ListenerSubName = ListenerNameList[1];
+            const id = randomUUID();
+            let complete = 0;
+            let retData: Parameters<ListenerType> | undefined = undefined;
+            const databack = () => {
+                if (complete == 0) {
+                    reject(new Error(' ListenerName:' + ListenerName + ' timeout'));
+                } else {
+                    resolve(retData!);
+                }
+            };
+            const timeoutRef = setTimeout(databack, timeout);
+            const eventCallbak = {
+                timeout: timeout,
+                createtime: Date.now(),
+                checker: checker,
+                func: (...args: Parameters<ListenerType>) => {
+                    complete++;
+                    retData = args;
+                    if (complete >= waitTimes) {
+                        clearTimeout(timeoutRef);
+                        databack();
+                    }
+                },
+            };
+            if (!this.EventTask.get(ListenerMainName)) {
+                this.EventTask.set(ListenerMainName, new Map());
+            }
+            if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
+                this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+            }
+            this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+            this.createListenerFunction(ListenerMainName);
+        });
+    }
+
+    async CallNormalEvent<
+        EventType extends (...args: any[]) => Promise<any>,
+        ListenerType extends (...args: any[]) => void
+    >(
+        EventName = '',
+        ListenerName = '',
+        waitTimes = 1,
+        timeout: number = 3000,
+        checker: (...args: Parameters<ListenerType>) => boolean,
+        ...args: Parameters<EventType>
+    ) {
+        return new Promise<[EventRet: Awaited<ReturnType<EventType>>, ...Parameters<ListenerType>]>(
+            async (resolve, reject) => {
+                const id = randomUUID();
+                let complete = 0;
+                let retData: Parameters<ListenerType> | undefined = undefined;
+                let retEvent: any = {};
+                const databack = () => {
+                    if (complete == 0) {
+                        reject(
+                            new Error(
+                                'Timeout: NTEvent EventName:' +
+                                EventName +
+                                ' ListenerName:' +
+                                ListenerName +
+                                ' EventRet:\n' +
+                                JSON.stringify(retEvent, null, 4) +
+                                '\n',
+                            ),
+                        );
+                    } else {
+                        resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
+                    }
+                };
+
+                const ListenerNameList = ListenerName.split('/');
+                const ListenerMainName = ListenerNameList[0];
+                const ListenerSubName = ListenerNameList[1];
+
+                const Timeouter = setTimeout(databack, timeout);
+
+                const eventCallbak = {
+                    timeout: timeout,
+                    createtime: Date.now(),
+                    checker: checker,
+                    func: (...args: any[]) => {
+                        complete++;
+                        //console.log('func', ...args);
+                        retData = args as Parameters<ListenerType>;
+                        if (complete >= waitTimes) {
+                            clearTimeout(Timeouter);
+                            databack();
+                        }
+                    },
+                };
+                if (!this.EventTask.get(ListenerMainName)) {
+                    this.EventTask.set(ListenerMainName, new Map());
+                }
+                if (!this.EventTask.get(ListenerMainName)?.get(ListenerSubName)) {
+                    this.EventTask.get(ListenerMainName)?.set(ListenerSubName, new Map());
+                }
+                this.EventTask.get(ListenerMainName)?.get(ListenerSubName)?.set(id, eventCallbak);
+                this.createListenerFunction(ListenerMainName);
+                const EventFunc = this.createEventFunction<EventType>(EventName);
+                retEvent = await EventFunc!(...(args as any[]));
+            },
+        );
+    }
+}
+
+// 示例代码 快速创建事件
+// let NTEvent = new NTEventWrapper();
+// let TestEvent = NTEvent.CreatEventFunction<(force: boolean) => Promise<Number>>('NodeIKernelProfileLikeService/GetTest');
+// if (TestEvent) {
+//     TestEvent(true);
+// }
+
+// 示例代码 快速创建监听Listener类
+// let NTEvent = new NTEventWrapper();
+// NTEvent.CreatListenerFunction<NodeIKernelMsgListener>('NodeIKernelMsgListener', 'core')
+
+// 调用接口
+//let NTEvent = new NTEventWrapper();
+//let ret = await NTEvent.CallNormalEvent<(force: boolean) => Promise<Number>, (data1: string, data2: number) => void>('NodeIKernelProfileLikeService/GetTest', 'NodeIKernelMsgListener/onAddSendMsg', 1, 3000, true);
+
+// 注册监听 解除监听
+// NTEventDispatch.RigisterListener('NodeIKernelMsgListener/onAddSendMsg','core',cb);
+// NTEventDispatch.UnRigisterListener('NodeIKernelMsgListener/onAddSendMsg','core');
+
+// let GetTest = NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode);
+// GetTest('test');
+
+// always模式
+// NTEventDispatch.CreatEvent('NodeIKernelProfileLikeService/GetTest','NodeIKernelMsgListener/onAddSendMsg',Mode,(...args:any[])=>{ console.log(args) });

src/common/framework/event.ts

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

src/common/framework/napcat.ts

@@ -0,0 +1,30 @@
+import path, { dirname } from 'path';
+import { fileURLToPath } from 'url';
+import fs from 'fs';
+
+export const napcat_version = '2.0.4';
+
+export class NapCatPathWrapper {
+    binaryPath: string;
+    logsPath: string;
+    configPath: string;
+    cachePath: string;
+    staticPath: string;
+
+    constructor(mainPath: string = dirname(fileURLToPath(import.meta.url))) {
+        this.binaryPath = mainPath;
+        this.logsPath = path.join(this.binaryPath, 'logs');
+        this.configPath = path.join(this.binaryPath, 'config');
+        this.cachePath = path.join(this.binaryPath, 'cache');
+        this.staticPath = path.join(this.binaryPath, 'static');
+        if (fs.existsSync(this.logsPath)) {
+            fs.mkdirSync(this.logsPath, { recursive: true });
+        }
+        if (fs.existsSync(this.configPath)) {
+            fs.mkdirSync(this.configPath, { recursive: true });
+        }
+        if (fs.existsSync(this.cachePath)) {
+            fs.mkdirSync(this.cachePath, { recursive: true });
+        }
+    }
+}

src/common/server/http.ts

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

src/common/server/websocket.ts

@@ -1,104 +0,0 @@
-import { WebSocket, WebSocketServer } from 'ws';
-import urlParse from 'url';
-import { IncomingMessage } from 'node:http';
-import { log } from '@/common/utils/log';
-
-class WebsocketClientBase {
-  private wsClient: WebSocket | undefined;
-
-  constructor() {
-  }
-
-  send(msg: string) {
-    if (this.wsClient && this.wsClient.readyState == WebSocket.OPEN) {
-      this.wsClient.send(msg);
-    }
-  }
-
-  onMessage(msg: string) {
-
-  }
-}
-
-export class WebsocketServerBase {
-  private ws: WebSocketServer | null = null;
-  public token: string = '';
-
-  constructor() {
-  }
-
-  start(port: number, host: string = '') {
-    try {
-      this.ws = new WebSocketServer({
-        port ,
-        host: '',
-        maxPayload: 1024 * 1024 * 1024
-      });
-      log(`ws服务启动成功, ${host}:${port}`);
-    } catch (e: any) {
-      throw Error('ws服务启动失败, 请检查监听的ip和端口' + e.toString());
-    }
-    this.ws.on('connection', (wsClient, req) => {
-      const url: string = req.url!.split('?').shift() || '/';
-      this.authorize(wsClient, req);
-      this.onConnect(wsClient, url, req);
-      wsClient.on('message', async (msg) => {
-        this.onMessage(wsClient, url, msg.toString());
-      });
-    });
-  }
-
-  stop() {
-    this.ws && this.ws.close((err) => {
-      log('ws server close failed!', err);
-    });
-    this.ws = null;
-  }
-
-  restart(port: number) {
-    this.stop();
-    this.start(port);
-  }
-
-  authorize(wsClient: WebSocket, req: IncomingMessage) {
-    const url = req.url!.split('?').shift();
-    log('ws connect', url);
-    let clientToken: string = '';
-    const authHeader = req.headers['authorization'];
-    if (authHeader) {
-      clientToken = authHeader.split('Bearer ').pop() || '';
-      log('receive ws header token', clientToken);
-    } else {
-      const parsedUrl = urlParse.parse(req.url || '/', true);
-      const urlToken = parsedUrl.query.access_token;
-      if (urlToken) {
-        if (Array.isArray(urlToken)) {
-          clientToken = urlToken[0];
-        } else {
-          clientToken = urlToken;
-        }
-        log('receive ws url token', clientToken);
-      }
-    }
-    if (this.token && clientToken != this.token) {
-      this.authorizeFailed(wsClient);
-      return wsClient.close();
-    }
-  }
-
-  authorizeFailed(wsClient: WebSocket) {
-
-  }
-
-  onConnect(wsClient: WebSocket, url: string, req: IncomingMessage) {
-
-  }
-
-  onMessage(wsClient: WebSocket, url: string, msg: string) {
-
-  }
-
-  sendHeart() {
-
-  }
-}

src/common/utils/AsyncQueue.ts

@@ -1,35 +0,0 @@
-import { sleep } from '@/common/utils/helper';
-
-type AsyncQueueTask = (() => void) | (()=>Promise<void>);
-
-
-export class AsyncQueue {
-  private tasks: (AsyncQueueTask)[] = [];
-
-  public addTask(task: AsyncQueueTask) {
-    this.tasks.push(task);
-    // console.log('addTask', this.tasks.length);
-    if (this.tasks.length === 1) {
-      this.runQueue().then().catch(()=>{});
-    }
-  }
-
-  private async runQueue() {
-    // console.log('runQueue', this.tasks.length);
-    while (this.tasks.length > 0) {
-      const task = this.tasks[0];
-      // console.log('typeof task', typeof task);
-      try {
-        const taskRet = task();
-        // console.log('type of taskRet', typeof taskRet, taskRet);
-        if (taskRet instanceof Promise) {
-          await taskRet;
-        }
-      } catch (e) {
-        console.error(e);
-      }
-      this.tasks.shift();
-      await sleep(100);
-    }
-  }
-}

src/common/utils/ConfigBase.ts

@@ -1,67 +1,67 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { log, logDebug, logError } from '@/common/utils/log';
+import type { NapCatCore } from '@/core';
 
-const configDir = path.resolve(__dirname, 'config');
-fs.mkdirSync(configDir, { recursive: true });
+export abstract class ConfigBase<T> {
+    name: string;
+    coreContext: NapCatCore;
+    configPath: string;
+    configData: T = {} as T;
 
-
-export class ConfigBase<T>{
-
-  constructor() {
-  }
-
-  protected getKeys(): string[] | null {
-    // 决定 key 在json配置文件中的顺序
-    return null;
-  }
-
-  getConfigDir(){
-    const configDir = path.resolve(__dirname, 'config');
-    fs.mkdirSync(configDir, { recursive: true });
-    return configDir;
-  }
-  getConfigPath(): string {
-    throw new Error('Method not implemented.');
-  }
-
-  read() {
-    const configPath = this.getConfigPath();
-    if (!fs.existsSync(configPath)) {
-      try{
-        fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
-        log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
-      }
-      catch (e: any) {
-        logError(`创建配置文件 ${configPath} 时发生错误:`, e.message);
-      }
-      return this;
+    protected constructor(name: string, coreContext: NapCatCore, configPath: string) {
+        this.name = name;
+        this.coreContext = coreContext;
+        this.configPath = configPath;
+        fs.mkdirSync(this.configPath, { recursive: true });
+        this.read();
     }
-    try {
-      const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-      logDebug(`配置文件${configPath}已加载`, data);
-      Object.assign(this, data);
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-expect-error
-      this.save(this); // 保存一次，让新版本的字段写入
-      return this;
-    } catch (e: any) {
-      if (e instanceof SyntaxError) {
-        logError(`配置文件 ${configPath} 格式错误，请检查配置文件:`, e.message);
-      } else {
-        logError(`读取配置文件 ${configPath} 时发生错误:`, e.message);
-      }
-      return this;
-    }
-  }
 
-  save(config: T) {
-    Object.assign(this, config);
-    const configPath = this.getConfigPath();
-    try {
-      fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
-    } catch (e: any) {
-      logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+    protected getKeys(): string[] | null {
+        // 决定 key 在json配置文件中的顺序
+        return null;
+    }
+
+    getConfigPath(pathName: string | undefined): string {
+        const suffix = pathName ? `_${pathName}` : '';
+        const filename = `${this.name}${suffix}.json`;
+        return path.join(this.configPath, filename);
+    }
+
+    read(): T {
+        const logger = this.coreContext.context.logger;
+        const configPath = this.getConfigPath(this.coreContext.selfInfo.uin);
+        if (!fs.existsSync(configPath)) {
+            try {
+                fs.writeFileSync(configPath, fs.readFileSync(this.getConfigPath(undefined), 'utf-8'));
+                logger.log(`[Core] [Config] 配置文件创建成功!\n`);
+            } catch (e: any) {
+                logger.logError(`[Core] [Config] 创建配置文件时发生错误:`, e.message);
+            }
+        }
+        try {
+            this.configData = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
+            logger.logDebug(`[Core] [Config] 配置文件${configPath}加载`, this.configData);
+            return this.configData;
+        } catch (e: any) {
+            if (e instanceof SyntaxError) {
+                logger.logError(`[Core] [Config] 配置文件格式错误，请检查配置文件:`, e.message);
+            } else {
+                logger.logError(`[Core] [Config] 读取配置文件时发生错误:`, e.message);
+            }
+            return {} as T;
+        }
+    }
+
+
+    save(newConfigData: T = this.configData as T) {
+        const logger = this.coreContext.context.logger;
+        const selfInfo = this.coreContext.selfInfo;
+        this.configData = newConfigData;
+        const configPath = this.getConfigPath(selfInfo.uin);
+        try {
+            fs.writeFileSync(configPath, JSON.stringify(newConfigData, this.getKeys(), 2));
+        } catch (e: any) {
+            logger.logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
+        }
     }
-  }
 }

src/common/utils/LRU.ts

@@ -0,0 +1,31 @@
+export class LRUCache<K, V> {
+    private capacity: number;
+    private cache: Map<K, V>;
+
+    constructor(capacity: number) {
+        this.capacity = capacity;
+        this.cache = new Map<K, V>();
+    }
+
+    public get(key: K): V | undefined {
+        const value = this.cache.get(key);
+        if (value !== undefined) {
+            // Move the accessed key to the end to mark it as most recently used
+            this.cache.delete(key);
+            this.cache.set(key, value);
+        }
+        return value;
+    }
+
+    public put(key: K, value: V): void {
+        if (this.cache.has(key)) {
+            // If the key already exists, move it to the end to mark it as most recently used
+            this.cache.delete(key);
+        } else if (this.cache.size >= this.capacity) {
+            // If the cache is full, remove the least recently used key (the first one in the map)
+            const firstKey = this.cache.keys().next().value;
+            this.cache.delete(firstKey);
+        }
+        this.cache.set(key, value);
+    }
+}

src/common/utils/MessageUnique.ts

@@ -0,0 +1,150 @@
+import { Peer } from '@/core';
+import crypto from 'crypto';
+
+export class LimitedHashTable<K, V> {
+    private keyToValue: Map<K, V> = new Map();
+    private valueToKey: Map<V, K> = new Map();
+    private maxSize: number;
+
+    constructor(maxSize: number) {
+        this.maxSize = maxSize;
+    }
+
+    resize(count: number) {
+        this.maxSize = count;
+    }
+
+    set(key: K, value: V): void {
+        // const isExist = this.keyToValue.get(key);
+        // if (isExist && isExist === value) {
+        //   return;
+        // }
+        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();
+        }
+        // console.log('---------------');
+        // console.log(this.keyToValue);
+        // console.log(this.valueToKey);
+        // console.log('---------------');
+        while (this.keyToValue.size > this.maxSize || this.valueToKey.size > this.maxSize) {
+            //console.log(this.keyToValue.size > this.maxSize, this.valueToKey.size > this.maxSize);
+            const oldestKey = this.keyToValue.keys().next().value;
+            this.valueToKey.delete(this.keyToValue.get(oldestKey)!);
+            this.keyToValue.delete(oldestKey);
+        }
+    }
+
+    getValue(key: K): V | undefined {
+        return this.keyToValue.get(key);
+    }
+
+    getKey(value: V): K | undefined {
+        return this.valueToKey.get(value);
+    }
+
+    deleteByValue(value: V): void {
+        const key = this.valueToKey.get(value);
+        if (key !== undefined) {
+            this.keyToValue.delete(key);
+            this.valueToKey.delete(value);
+        }
+    }
+
+    deleteByKey(key: K): void {
+        const value = this.keyToValue.get(key);
+        if (value !== undefined) {
+            this.keyToValue.delete(key);
+            this.valueToKey.delete(value);
+        }
+    }
+
+    getKeyList(): K[] {
+        return Array.from(this.keyToValue.keys());
+    }
+
+    //获取最近刚写入的几个值
+    getHeads(size: number): { key: K; value: V }[] | undefined {
+        const keyList = this.getKeyList();
+        if (keyList.length === 0) {
+            return undefined;
+        }
+        const result: { key: K; value: V }[] = [];
+        const listSize = Math.min(size, keyList.length);
+        for (let i = 0; i < listSize; i++) {
+            const key = keyList[listSize - i];
+            result.push({ key, value: this.keyToValue.get(key)! });
+        }
+        return result;
+    }
+}
+
+class MessageUniqueWrapper {
+    private msgDataMap: LimitedHashTable<string, number>;
+    private msgIdMap: LimitedHashTable<string, number>;
+
+    constructor(maxMap: number = 1000) {
+        this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
+        this.msgDataMap = new LimitedHashTable<string, number>(maxMap);
+    }
+
+    getRecentMsgIds(Peer: Peer, size: number): string[] {
+        const heads = this.msgIdMap.getHeads(size);
+        if (!heads) {
+            return [];
+        }
+        const data = heads.map((t) => 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 | undefined {
+        const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
+        const hash = crypto.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);
+        return shortId;
+    }
+
+    getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | 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 };
+        }
+        return undefined;
+    }
+
+    getShortIdByMsgId(msgId: string): number | undefined {
+        return this.msgIdMap.getValue(msgId);
+    }
+
+    getPeerByMsgId(msgId: string) {
+        const shortId = this.msgIdMap.getValue(msgId);
+        if (!shortId) return undefined;
+        return this.getMsgIdAndPeerByShortId(shortId);
+    }
+
+    resize(maxSize: number): void {
+        this.msgIdMap.resize(maxSize);
+        this.msgDataMap.resize(maxSize);
+    }
+}
+
+export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();

src/common/utils/QQBasicInfo.ts

@@ -1,72 +1,81 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import os from 'node:os';
 import { systemPlatform } from '@/common/utils/system';
+import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
+import AppidTable from '@/core/external/appid.json';
+import { LogWrapper } from './log';
 
-export const exePath = process.execPath;
+export class QQBasicInfoWrapper {
+    QQMainPath: string | undefined;
+    QQPackageInfoPath: string | undefined;
+    QQVersionConfigPath: string | undefined;
+    isQuickUpdate: boolean | undefined;
+    QQVersionConfig: QQVersionConfigType | undefined;
+    QQPackageInfo: QQPackageInfoType | undefined;
+    QQVersionAppid: string | undefined;
+    QQVersionQua: string | undefined;
+    context: { logger: LogWrapper };
 
-export const pkgInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'package.json');
-let configVersionInfoPath;
+    constructor(context: { logger: LogWrapper }) {
+        //基础目录获取
+        this.context = context;
+        this.QQMainPath = process.execPath;
+        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
+        this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
-if (os.platform() !== 'linux') {
-  configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
-} else {
-  const userPath = os.homedir();
-  const appDataPath = path.resolve(userPath, './.config/QQ');
-  configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+        //基础信息获取 无快更则启用默认模板填充
+        this.isQuickUpdate = !!this.QQVersionConfigPath;
+        this.QQVersionConfig = this.isQuickUpdate
+            ? JSON.parse(fs.readFileSync(this.QQVersionConfigPath!).toString())
+            : getDefaultQQVersionConfigInfo();
+        this.QQPackageInfo = JSON.parse(fs.readFileSync(this.QQPackageInfoPath).toString());
+        const { appid: IQQVersionAppid, qua: IQQVersionQua } = this.getAppidV2();
+        this.QQVersionAppid = IQQVersionAppid;
+        this.QQVersionQua = IQQVersionQua;
+    }
+
+    //基础函数
+    getQQBuildStr() {
+        return this.isQuickUpdate ? this.QQVersionConfig?.buildId : this.QQPackageInfo?.buildVersion;
+    }
+
+    getFullQQVesion() {
+        const version = this.isQuickUpdate ? this.QQVersionConfig?.curVersion : this.QQPackageInfo?.version;
+        if (!version) throw new Error('QQ版本获取失败');
+        return version;
+    }
+
+    requireMinNTQQBuild(buildStr: string) {
+        const currentBuild = parseInt(this.getQQBuildStr() || '0');
+        if (currentBuild == 0) throw new Error('QQBuildStr获取失败');
+        return currentBuild >= parseInt(buildStr);
+    }
+
+    //此方法不要直接使用
+    getQUAInternal() {
+        return systemPlatform === 'linux'
+            ? `V1_LNX_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`
+            : `V1_WIN_NQ_${this.getFullQQVesion()}_${this.getQQBuildStr()}_GW_B`;
+    }
+
+    getAppidV2(): { appid: string; qua: string } {
+        const appidTbale = AppidTable as unknown as QQAppidTableType;
+        try {
+            const fullVersion = this.getFullQQVesion();
+            if (!fullVersion) throw new Error('QQ版本获取失败');
+            const data = appidTbale[fullVersion];
+            if (data) {
+                return data;
+            }
+        } catch (e) {
+            this.context.logger.log(`[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常`);
+        }
+        // 以下是兜底措施
+        this.context.logger.log(
+            `[QQ版本兼容性检测] ${this.getFullQQVesion()} 版本兼容性不佳，可能会导致一些功能无法正常使用`,
+        );
+        return { appid: systemPlatform === 'linux' ? '537237950' : '537237765', qua: this.getQUAInternal() };
+    }
 }
 
-if (typeof configVersionInfoPath !== 'string') {
-  throw new Error('Something went wrong when load QQ info path');
-}
-
-export { configVersionInfoPath };
-
-type QQPkgInfo = {
-  version: string;
-  buildVersion: string;
-  platform: string;
-  eleArch: string;
-}
-type QQVersionConfigInfo = {
-  baseVersion: string;
-  curVersion: string;
-  prevVersion: string;
-  onErrorVersions: Array<any>;
-  buildId: string;
-}
-
-let _qqVersionConfigInfo: QQVersionConfigInfo = {
-  'baseVersion': '9.9.9-23361',
-  'curVersion': '9.9.9-23361',
-  'prevVersion': '',
-  'onErrorVersions': [],
-  'buildId': '23361'
-};
-
-if (fs.existsSync(configVersionInfoPath)) {
-  try {
-    const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
-    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
-  } catch (e) {
-    console.error('Load QQ version config info failed, Use default version', e);
-  }
-}
-
-export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
-
-export const qqPkgInfo: QQPkgInfo = require(pkgInfoPath);
-// platform_type: 3,
-// app_type: 4,
-// app_version: '9.9.9-23159',
-// qua: 'V1_WIN_NQ_9.9.9_23159_GW_B',
-// appid: '537213764',
-// platVer: '10.0.26100',
-// clientVer: '9.9.9-23159',
-
-let _appid: string = '537213803';  // 默认为 Windows 平台的 appid
-if (systemPlatform === 'linux') {
-  _appid = '537213827';
-}
-// todo: mac 平台的 appid
-export const appid = _appid;
+export let QQBasicInfo: QQBasicInfoWrapper | undefined;

src/common/utils/audio.ts

@@ -1,135 +1,90 @@
 import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isWav } from 'silk-wasm';
+import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
 import fsPromise from 'fs/promises';
-import { log, logError } from './log';
 import path from 'node:path';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 import { spawn } from 'node:child_process';
-import { getTempDir } from '@/common/utils/file';
+import { LogWrapper } from './log';
+
+export async function encodeSilk(filePath: string, TEMP_DIR: string, logger: LogWrapper) {
+    async function guessDuration(pttPath: string) {
+        const pttFileInfo = await fsPromise.stat(pttPath);
+        let duration = pttFileInfo.size / 1024 / 3;  // 3kb/s
+        duration = Math.floor(duration);
+        duration = Math.max(1, duration);
+        logger.log('通过文件大小估算语音的时长:', duration);
+        return duration;
+    }
 
-let TEMP_DIR = './';
-setTimeout(() => {
-  TEMP_DIR = getTempDir();
-}, 100);
-export async function encodeSilk(filePath: string) {
-  function getFileHeader(filePath: string) {
-    // 定义要读取的字节数
-    const bytesToRead = 7;
     try {
-      const buffer = fs.readFileSync(filePath, {
-        encoding: null,
-        flag: 'r',
-      });
-
-      const fileHeader = buffer.toString('hex', 0, bytesToRead);
-      return fileHeader;
-    } catch (err) {
-      console.error('读取文件错误:', err);
-      return;
-    }
-  }
-
-  async function isWavFile(filePath: string) {
-    return isWav(fs.readFileSync(filePath));
-  }
-
-  async function guessDuration(pttPath: string) {
-    const pttFileInfo = await fsPromise.stat(pttPath);
-    let duration = pttFileInfo.size / 1024 / 3;  // 3kb/s
-    duration = Math.floor(duration);
-    duration = Math.max(1, duration);
-    log('通过文件大小估算语音的时长:', duration);
-    return duration;
-  }
-
-  // function verifyDuration(oriDuration: number, guessDuration: number) {
-  //     // 单位都是秒
-  //     if (oriDuration - guessDuration > 10) {
-  //         return guessDuration
-  //     }
-  //     oriDuration = Math.max(1, oriDuration)
-  //     return oriDuration
-  // }
-  // async function getAudioSampleRate(filePath: string) {
-  //     try {
-  //         const mm = await import('music-metadata');
-  //         const metadata = await mm.parseFile(filePath);
-  //         log(`${filePath}采样率`, metadata.format.sampleRate);
-  //         return metadata.format.sampleRate;
-  //     } catch (error) {
-  //         log(`${filePath}采样率获取失败`, error.stack);
-  //         // console.error(error);
-  //     }
-  // }
-
-  try {
-    const pttPath = path.join(TEMP_DIR, uuidv4());
-    if (getFileHeader(filePath) !== '02232153494c4b') {
-      log(`语音文件${filePath}需要转换成silk`);
-      const _isWav = await isWavFile(filePath);
-      const pcmPath = pttPath + '.pcm';
-      let sampleRate = 0;
-      const convert = () => {
-        return new Promise<Buffer>((resolve, reject) => {
-          // todo: 通过配置文件获取ffmpeg路径
-          const ffmpegPath = process.env.FFMPEG_PATH || 'ffmpeg';
-          const cp = spawn(ffmpegPath, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
-          cp.on('error', err => {
-            log('FFmpeg处理转换出错: ', err.message);
-            return reject(err);
-          });
-          cp.on('exit', (code, signal) => {
-            const EXIT_CODES = [0, 255];
-            if (code == null || EXIT_CODES.includes(code)) {
-              sampleRate = 24000;
-              const data = fs.readFileSync(pcmPath);
-              fs.unlink(pcmPath, (err) => {
-              });
-              return resolve(data);
+        const file = await fsPromise.readFile(filePath);
+        const pttPath = path.join(TEMP_DIR, randomUUID());
+        if (!isSilk(file)) {
+            logger.log(`语音文件${filePath}需要转换成silk`);
+            const _isWav = isWav(file);
+            const pcmPath = pttPath + '.pcm';
+            let sampleRate = 0;
+            const convert = () => {
+                return new Promise<Buffer>((resolve, reject) => {
+                    // todo: 通过配置文件获取ffmpeg路径
+                    const ffmpegPath = process.env.FFMPEG_PATH || 'ffmpeg';
+                    const cp = spawn(ffmpegPath, ['-y', '-i', filePath, '-ar', '24000', '-ac', '1', '-f', 's16le', pcmPath]);
+                    cp.on('error', err => {
+                        logger.log('FFmpeg处理转换出错: ', err.message);
+                        return reject(err);
+                    });
+                    cp.on('exit', (code, signal) => {
+                        const EXIT_CODES = [0, 255];
+                        if (code == null || EXIT_CODES.includes(code)) {
+                            sampleRate = 24000;
+                            const data = fs.readFileSync(pcmPath);
+                            fs.unlink(pcmPath, (err) => {
+                            });
+                            return resolve(data);
+                        }
+                        logger.log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
+                        reject(Error('FFmpeg处理转换失败'));
+                    });
+                });
+            };
+            let input: Buffer;
+            if (!_isWav) {
+                input = await convert();
+            } else {
+                input = file;
+                const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
+                const { fmt } = getWavFileInfo(input);
+                // log(`wav文件信息`, fmt)
+                if (!allowSampleRate.includes(fmt.sampleRate)) {
+                    input = await convert();
+                }
+            }
+            const silk = await encode(input, sampleRate);
+            fs.writeFileSync(pttPath, silk.data);
+            logger.log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
+            return {
+                converted: true,
+                path: pttPath,
+                duration: silk.duration / 1000,
+            };
+        } else {
+            const silk = file;
+            let duration = 0;
+            try {
+                duration = getDuration(silk) / 1000;
+            } catch (e: any) {
+                logger.log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack);
+                duration = await guessDuration(filePath);
             }
-            log(`FFmpeg exit: code=${code ?? 'unknown'} sig=${signal ?? 'unknown'}`);
-            reject(Error('FFmpeg处理转换失败'));
-          });
-        });
-      };
-      let input: Buffer;
-      if (!_isWav) {
-        input = await convert();
-      } else {
-        input = fs.readFileSync(filePath);
-        const allowSampleRate = [8000, 12000, 16000, 24000, 32000, 44100, 48000];
-        const { fmt } = getWavFileInfo(input);
-        // log(`wav文件信息`, fmt)
-        if (!allowSampleRate.includes(fmt.sampleRate)) {
-          input = await convert();
-        }
-      }
-      const silk = await encode(input, sampleRate);
-      fs.writeFileSync(pttPath, silk.data);
-      log(`语音文件${filePath}转换成功!`, pttPath, '时长:', silk.duration);
-      return {
-        converted: true,
-        path: pttPath,
-        duration: silk.duration / 1000
-      };
-    } else {
-      const silk = fs.readFileSync(filePath);
-      let duration = 0;
-      try {
-        duration = getDuration(silk) / 1000;
-      } catch (e: any) {
-        log('获取语音文件时长失败, 使用文件大小推测时长', filePath, e.stack);
-        duration = await guessDuration(filePath);
-      }
 
-      return {
-        converted: false,
-        path: filePath,
-        duration,
-      };
+            return {
+                converted: false,
+                path: filePath,
+                duration,
+            };
+        }
+    } catch (error: any) {
+        logger.logError('convert silk failed', error.stack);
+        return {};
     }
-  } catch (error: any) {
-    logError('convert silk failed', error.stack);
-    return {};
-  }
 }

src/common/utils/cpmodule.ts

@@ -1,19 +0,0 @@
-import * as os from 'os';
-import path from 'node:path';
-import fs from 'fs';
-
-export function getModuleWithArchName(moduleName: string) {
-  const systemPlatform = os.platform();
-  const cpuArch = os.arch();
-  return `${moduleName}-${systemPlatform}-${cpuArch}.node`;
-}
-
-export function cpModule(moduleName: string) {
-  const currentDir = path.resolve(__dirname);
-  const fileName = `./${getModuleWithArchName(moduleName)}`;
-  try {
-    fs.copyFileSync(path.join(currentDir, fileName), path.join(currentDir, `${moduleName}.node`));
-  } catch (e) {
-
-  }
-}

src/common/utils/file.ts

@@ -1,273 +1,301 @@
 import fs from 'fs';
-import fsPromise from 'fs/promises';
-import crypto from 'crypto';
+import fsPromise, { stat } from 'fs/promises';
+import crypto, { randomUUID } from 'crypto';
 import util from 'util';
 import path from 'node:path';
-import { log } from './log';
-import { dbUtil } from '@/core/utils/db';
 import * as fileType from 'file-type';
-import { v4 as uuidv4 } from 'uuid';
-import { napCatCore } from '@/core';
-
-export const getNapCatDir = () => {
-  const p = path.join(napCatCore.dataPath, 'NapCat');
-  fs.mkdirSync(p, { recursive: true });
-  return p;
-};
-export const getTempDir = () => {
-  const p = path.join(getNapCatDir(), 'temp');
-  // 创建临时目录
-  if (!fs.existsSync(p)) {
-    fs.mkdirSync(p, { recursive: true });
-  }
-  return p;
-};
-
+import { LogWrapper } from './log';
 
 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';
+    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> {
-  return new Promise((resolve, reject) => {
-    const startTime = Date.now();
+    return new Promise((resolve, reject) => {
+        const startTime = Date.now();
 
-    function check() {
-      if (fs.existsSync(path)) {
-        resolve();
-      } else if (Date.now() - startTime > timeout) {
-        reject(new Error(`文件不存在: ${path}`));
-      } else {
-        setTimeout(check, 100);
-      }
+        function check() {
+            if (fs.existsSync(path)) {
+                resolve();
+            } else if (Date.now() - startTime > timeout) {
+                reject(new Error(`文件不存在: ${path}`));
+            } else {
+                setTimeout(check, 100);
+            }
+        }
+
+        check();
+    });
+}
+
+// 定义一个异步函数来检查文件是否存在
+export async function checkFileReceived2(path: string, timeout: number = 3000): Promise<void> {
+    // 使用 Promise.race 来同时进行文件状态检查和超时计时
+    // Promise.race 会返回第一个解决（resolve）或拒绝（reject）的 Promise
+    await Promise.race([
+        checkFile(path),
+        timeoutPromise(timeout, `文件不存在: ${path}`),
+    ]);
+}
+
+// 转换超时时间至 Promise
+function timeoutPromise(timeout: number, errorMsg: string): Promise<void> {
+    return new Promise((_, reject) => {
+        setTimeout(() => {
+            reject(new Error(errorMsg));
+        }, timeout);
+    });
+}
+
+// 异步检查文件是否存在
+async function checkFile(path: string): Promise<void> {
+    try {
+        await stat(path);
+    } catch (error: any) {
+        if (error.code === 'ENOENT') {
+            // 如果文件不存在，则抛出一个错误
+            throw new Error(`文件不存在: ${path}`);
+        } else {
+            // 对于 stat 调用的其他错误，重新抛出
+            throw error;
+        }
     }
-
-    check();
-  });
+    // 如果文件存在，则无需做任何事情，Promise 解决（resolve）自身
 }
 
 export async function file2base64(path: string) {
-  const readFile = util.promisify(fs.readFile);
-  const result = {
-    err: '',
-    data: ''
-  };
-  try {
-    // 读取文件内容
-    // if (!fs.existsSync(path)){
-    //     path = path.replace("\\Ori\\", "\\Thumb\\");
-    // }
+    const readFile = util.promisify(fs.readFile);
+    const result = {
+        err: '',
+        data: '',
+    };
     try {
-      await checkFileReceived(path, 5000);
-    } catch (e: any) {
-      result.err = e.toString();
-      return result;
+        // 读取文件内容
+        // if (!fs.existsSync(path)){
+        //     path = path.replace("\\Ori\\", "\\Thumb\\");
+        // }
+        try {
+            await checkFileReceived(path, 5000);
+        } catch (e: any) {
+            result.err = e.toString();
+            return result;
+        }
+        const data = await readFile(path);
+        // 转换为Base64编码
+        result.data = data.toString('base64');
+    } catch (err: any) {
+        result.err = err.toString();
     }
-    const data = await readFile(path);
-    // 转换为Base64编码
-    result.data = data.toString('base64');
-  } catch (err: any) {
-    result.err = err.toString();
-  }
-  return result;
+    return result;
 }
 
 
 export function calculateFileMD5(filePath: string): Promise<string> {
-  return new Promise((resolve, reject) => {
-    // 创建一个流式读取器
-    const stream = fs.createReadStream(filePath);
-    const hash = crypto.createHash('md5');
+    return new Promise((resolve, reject) => {
+        // 创建一个流式读取器
+        const stream = fs.createReadStream(filePath);
+        const hash = crypto.createHash('md5');
 
-    stream.on('data', (data: Buffer) => {
-      // 当读取到数据时，更新哈希对象的状态
-      hash.update(data);
-    });
+        stream.on('data', (data: Buffer) => {
+            // 当读取到数据时，更新哈希对象的状态
+            hash.update(data);
+        });
 
-    stream.on('end', () => {
-      // 文件读取完成，计算哈希
-      const md5 = hash.digest('hex');
-      resolve(md5);
-    });
+        stream.on('end', () => {
+            // 文件读取完成，计算哈希
+            const md5 = hash.digest('hex');
+            resolve(md5);
+        });
 
-    stream.on('error', (err: Error) => {
-      // 处理可能的读取错误
-      reject(err);
+        stream.on('error', (err: Error) => {
+            // 处理可能的读取错误
+            reject(err);
+        });
     });
-  });
 }
 
 export interface HttpDownloadOptions {
-  url: string;
-  headers?: Record<string, string> | string;
+    url: string;
+    headers?: Record<string, string> | string;
 }
 
 export async function httpDownload(options: string | HttpDownloadOptions): Promise<Buffer> {
-  const chunks: Buffer[] = [];
-  let url: string;
-  let headers: Record<string, string> = {
-    'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36'
-  };
-  if (typeof options === 'string') {
-    url = options;
-  } else {
-    url = options.url;
-    if (options.headers) {
-      if (typeof options.headers === 'string') {
-        headers = JSON.parse(options.headers);
-      } else {
-        headers = options.headers;
-      }
+    const chunks: Buffer[] = [];
+    let url: string;
+    let headers: Record<string, string> = {
+        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/94.0.4606.71 Safari/537.36',
+    };
+    if (typeof options === 'string') {
+        url = options;
+        const host = new URL(url).hostname;
+        headers['Host'] = host;
+    } else {
+        url = options.url;
+        if (options.headers) {
+            if (typeof options.headers === 'string') {
+                headers = JSON.parse(options.headers);
+            } else {
+                headers = options.headers;
+            }
+        }
     }
-  }
-  const fetchRes = await fetch(url, { headers });
-  if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
+    const fetchRes = await fetch(url, { headers }).catch((err) => {
+        if (err.cause) {
+            throw err.cause;
+        }
+        throw err;
+    });
+    if (!fetchRes.ok) throw new Error(`下载文件失败: ${fetchRes.statusText}`);
 
-  const blob = await fetchRes.blob();
-  const buffer = await blob.arrayBuffer();
-  return Buffer.from(buffer);
+    const blob = await fetchRes.blob();
+    const buffer = await blob.arrayBuffer();
+    return Buffer.from(buffer);
 }
 
 type Uri2LocalRes = {
-  success: boolean,
-  errMsg: string,
-  fileName: string,
-  ext: string,
-  path: string,
-  isLocal: boolean
+    success: boolean,
+    errMsg: string,
+    fileName: string,
+    ext: string,
+    path: string,
+    isLocal: boolean
 }
 
-export async function uri2local(uri: string, fileName: string | null = null): Promise<Uri2LocalRes> {
-  const res = {
-    success: false,
-    errMsg: '',
-    fileName: '',
-    ext: '',
-    path: '',
-    isLocal: false
-  };
-  if (!fileName) {
-    fileName = uuidv4();
-  }
-  let filePath = path.join(getTempDir(), fileName);
-  let url = null;
-  try {
-    url = new URL(uri);
-  } catch (e: any) {
-    res.errMsg = `uri ${uri} 解析失败,` + e.toString() + ` 可能${uri}不存在`;
-    return res;
-  }
-
-  // log("uri protocol", url.protocol, uri);
-  if (url.protocol == 'base64:') {
-    // base64转成文件
-    const base64Data = uri.split('base64://')[1];
+export async function uri2local(TempDir: string, UriOrPath: string, fileName: string | null = null): Promise<Uri2LocalRes> {
+    const res = {
+        success: false,
+        errMsg: '',
+        fileName: '',
+        ext: '',
+        path: '',
+        isLocal: false,
+    };
+    if (!fileName) fileName = randomUUID();
+    let filePath = path.join(TempDir, fileName);//临时目录
+    let url = null;
+    //区分path和uri
     try {
-      const buffer = Buffer.from(base64Data, 'base64');
-      fs.writeFileSync(filePath, buffer);
-
-    } catch (e: any) {
-      res.errMsg = 'base64文件下载失败,' + e.toString();
-      return res;
-    }
-  } else if (url.protocol == 'http:' || url.protocol == 'https:') {
-    // 下载文件
-    let buffer: Buffer | null = null;
-    try {
-      buffer = await httpDownload(uri);
-    } catch (e: any) {
-      res.errMsg = `${url}下载失败,` + e.toString();
-      return res;
+        if (fs.existsSync(UriOrPath)) url = new URL('file://' + UriOrPath);
+    } catch (error: any) {
     }
     try {
-      const pathInfo = path.parse(decodeURIComponent(url.pathname));
-      if (pathInfo.name) {
-        fileName = pathInfo.name;
-        if (pathInfo.ext) {
-          fileName += pathInfo.ext;
-          // res.ext = pathInfo.ext
-        }
-      }
-      fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
-      res.fileName = fileName;
-      filePath = path.join(getTempDir(), uuidv4() + fileName);
-      fs.writeFileSync(filePath, buffer);
-    } catch (e: any) {
-      res.errMsg = `${url}下载失败,` + e.toString();
-      return res;
-    }
-  } else {
-    let pathname: string;
-    if (url.protocol === 'file:') {
-      // await fs.copyFile(url.pathname, filePath);
-      pathname = decodeURIComponent(url.pathname);
-      if (process.platform === 'win32') {
-        filePath = pathname.slice(1);
-      } else {
-        filePath = pathname;
-      }
-    } else {
-      const cache = await dbUtil.getFileCacheByName(uri);
-      if (cache) {
-        filePath = cache.path;
-      } else {
-        filePath = uri;
-      }
+        url = new URL(UriOrPath);
+    } catch (error: any) {
     }
 
-    res.isLocal = true;
-  }
-  // else{
-  //     res.errMsg = `不支持的file协议,` + url.protocol
-  //     return res
-  // }
-  // if (isGIF(filePath) && !res.isLocal) {
-  //     await fs.rename(filePath, filePath + ".gif");
-  //     filePath += ".gif";
-  // }
-  if (!res.isLocal && !res.ext) {
-    try {
-      const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
-      if (ext) {
-        log('获取文件类型', ext, filePath);
-        fs.renameSync(filePath, filePath + `.${ext}`);
-        filePath += `.${ext}`;
-        res.fileName += `.${ext}`;
-        res.ext = ext;
-      }
-    } catch (e) {
-      // log("获取文件类型失败", filePath,e.stack)
+    //验证url
+    if (!url) {
+        res.errMsg = `UriOrPath ${UriOrPath} 解析失败,可能${UriOrPath}不存在`;
+        return res;
     }
-  }
-  res.success = true;
-  res.path = filePath;
-  return res;
-}
 
-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 {
+    if (url.protocol == 'base64:') {
+        // base64转成文件
+        const base64Data = UriOrPath.split('base64://')[1];
         try {
-          await fsPromise.copyFile(srcPath, dstPath);
-        } catch (error) {
-          console.error(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
-          // 这里可以决定是否要继续复制其他文件
+            const buffer = Buffer.from(base64Data, 'base64');
+            fs.writeFileSync(filePath, buffer);
+        } catch (e: any) {
+            res.errMsg = 'base64文件下载失败,' + e.toString();
+            return res;
         }
-      }
+    } else if (url.protocol == 'http:' || url.protocol == 'https:') {
+        // 下载文件
+        let buffer: Buffer | null = null;
+        try {
+            buffer = await httpDownload(UriOrPath);
+        } catch (e: any) {
+            res.errMsg = `${url}下载失败,` + e.toString();
+            return res;
+        }
+        try {
+            const pathInfo = path.parse(decodeURIComponent(url.pathname));
+            if (pathInfo.name) {
+                fileName = pathInfo.name;
+                if (pathInfo.ext) {
+                    fileName += pathInfo.ext;
+                    // res.ext = pathInfo.ext
+                }
+            }
+            fileName = fileName.replace(/[/\\:*?"<>|]/g, '_');
+            res.fileName = fileName;
+            filePath = path.join(TempDir, randomUUID() + fileName);
+            fs.writeFileSync(filePath, buffer);
+        } catch (e: any) {
+            res.errMsg = `${url}下载失败,` + e.toString();
+            return res;
+        }
+    } else {
+        let pathname: string;
+        if (url.protocol === 'file:') {
+            // await fs.copyFile(url.pathname, filePath);
+            pathname = decodeURIComponent(url.pathname);
+            if (process.platform === 'win32') {
+                filePath = pathname.slice(1);
+            } else {
+                filePath = pathname;
+            }
+        } else {
+            // 26702执行forword file文件操作 不应该在这里乱来
+            // const cache = await dbUtil.getFileCacheByName(uri);
+            // if (cache) {
+            //   filePath = cache.path;
+            // } else {
+            //   filePath = uri;
+            // }
+        }
+        res.isLocal = true;
+    }
+    // else{
+    //     res.errMsg = `不支持的file协议,` + url.protocol
+    //     return res
+    // }
+    // if (isGIF(filePath) && !res.isLocal) {
+    //     await fs.rename(filePath, filePath + ".gif");
+    //     filePath += ".gif";
+    // }
+    if (!res.isLocal && !res.ext) {
+        try {
+            const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
+            if (ext) {
+                fs.renameSync(filePath, filePath + `.${ext}`);
+                filePath += `.${ext}`;
+                res.fileName += `.${ext}`;
+                res.ext = ext;
+            }
+        } catch (e) {
+            // log("获取文件类型失败", filePath,e.stack)
+        }
+    }
+    res.success = true;
+    res.path = filePath;
+    return res;
+}
+
+export async function copyFolder(sourcePath: string, destPath: string, logger: LogWrapper) {
+    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, logger);
+            } else {
+                try {
+                    await fsPromise.copyFile(srcPath, dstPath);
+                } catch (error) {
+                    logger.logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
+                    // 这里可以决定是否要继续复制其他文件
+                }
+            }
+        }
+    } catch (error) {
+        logger.logError('复制文件夹时出错:', error);
     }
-  } catch (error) {
-    console.error('复制文件夹时出错:', error);
-  }
 }

src/common/utils/helper.ts

@@ -1,37 +1,165 @@
 import crypto from 'node:crypto';
+import path from 'node:path';
+import fs from 'fs';
+import * as fsPromise from 'node:fs/promises';
+import os from 'node:os';
+import { QQLevel } from '@/core';
+
+//下面这个类是用于将uid+msgid合并的类
+
+export class UUIDConverter {
+    static encode(highStr: string, lowStr: string): string {
+        const high = BigInt(highStr);
+        const low = BigInt(lowStr);
+        const highHex = high.toString(16).padStart(16, '0');
+        const lowHex = low.toString(16).padStart(16, '0');
+        const combinedHex = highHex + lowHex;
+        const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
+            12,
+            16,
+        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
+        return uuid;
+    }
+
+    static decode(uuid: string): { high: string; low: string } {
+        const hex = uuid.replace(/-/g, '');
+        const high = BigInt('0x' + hex.substring(0, 16));
+        const low = BigInt('0x' + hex.substring(16));
+        return { high: high.toString(), low: low.toString() };
+    }
+}
 
 export function sleep(ms: number): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
+    const timeoutPromise = new Promise<T>((_, reject) =>
+        setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms),
+    );
+    return Promise.race([promise, timeoutPromise]);
+}
+
+export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
+    const wrappedTasks = tasks.map((task) =>
+        PromiseTimer(task, timeout).then(
+            (result) => ({ status: 'fulfilled', value: result }),
+            (error) => ({ status: 'rejected', reason: error }),
+        ),
+    );
+    const results = await Promise.all(wrappedTasks);
+    return results
+        .filter((result) => result.status === 'fulfilled')
+        .map((result) => (result as { status: 'fulfilled'; value: T }).value);
 }
 
 export function getMd5(s: string) {
-
-  const h = crypto.createHash('md5');
-  h.update(s);
-  return h.digest('hex');
+    const h = crypto.createHash('md5');
+    h.update(s);
+    return h.digest('hex');
 }
 
 export function isNull(value: any) {
-  return value === undefined || value === null;
+    return value === undefined || value === null;
 }
 
 export function isNumeric(str: string) {
-  return /^\d+$/.test(str);
+    return /^\d+$/.test(str);
 }
 
 export function truncateString(obj: any, maxLength = 500) {
-  if (obj !== null && typeof obj === 'object') {
-    Object.keys(obj).forEach(key => {
-      if (typeof obj[key] === 'string') {
-        // 如果是字符串且超过指定长度，则截断
-        if (obj[key].length > maxLength) {
-          obj[key] = obj[key].substring(0, maxLength) + '...';
-        }
-      } else if (typeof obj[key] === 'object') {
-        // 如果是对象或数组，则递归调用
-        truncateString(obj[key], maxLength);
-      }
-    });
-  }
-  return obj;
+    if (obj !== null && typeof obj === 'object') {
+        Object.keys(obj).forEach((key) => {
+            if (typeof obj[key] === 'string') {
+                // 如果是字符串且超过指定长度，则截断
+                if (obj[key].length > maxLength) {
+                    obj[key] = obj[key].substring(0, maxLength) + '...';
+                }
+            } else if (typeof obj[key] === 'object') {
+                // 如果是对象或数组，则递归调用
+                truncateString(obj[key], maxLength);
+            }
+        });
+    }
+    return obj;
+}
+
+export function isEqual(obj1: any, obj2: any) {
+    if (obj1 === obj2) return true;
+    if (obj1 == null || obj2 == null) return false;
+    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
+
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
+
+    if (keys1.length !== keys2.length) return false;
+
+    for (const key of keys1) {
+        if (!isEqual(obj1[key], obj2[key])) return false;
+    }
+    return true;
+}
+
+export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+    if (os.platform() === 'linux') {
+        return {
+            baseVersion: '3.2.12-26702',
+            curVersion: '3.2.12-26702',
+            prevVersion: '',
+            onErrorVersions: [],
+            buildId: '26702',
+        };
+    }
+    return {
+        baseVersion: '9.9.15-26702',
+        curVersion: '9.9.15-26702',
+        prevVersion: '',
+        onErrorVersions: [],
+        buildId: '26702',
+    };
+}
+
+export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
+    let configVersionInfoPath;
+    if (os.platform() !== 'linux') {
+        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+    } else {
+        const userPath = os.homedir();
+        const appDataPath = path.resolve(userPath, './.config/QQ');
+        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+    }
+    if (typeof configVersionInfoPath !== 'string') {
+        return undefined;
+    }
+    if (!fs.existsSync(configVersionInfoPath)) {
+        return undefined;
+    }
+    return configVersionInfoPath;
+}
+
+export async function deleteOldFiles(directoryPath: string, daysThreshold: number) {
+    try {
+        const files = await fsPromise.readdir(directoryPath);
+
+        for (const file of files) {
+            const filePath = path.join(directoryPath, file);
+            const stats = await fsPromise.stat(filePath);
+            const lastModifiedTime = stats.mtimeMs;
+            const currentTime = Date.now();
+            const timeDifference = currentTime - lastModifiedTime;
+            const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
+
+            if (daysDifference > daysThreshold) {
+                await fsPromise.unlink(filePath); // Delete the file
+                //console.log(`Deleted: ${filePath}`);
+            }
+        }
+    } catch (error) {
+        //console.error('Error deleting files:', error);
+    }
+}
+
+export function calcQQLevel(level: QQLevel) {
+    const { crownNum, sunNum, moonNum, starNum } = level;
+    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }

src/common/utils/log.ts

@@ -1,117 +1,138 @@
 import log4js, { Configuration } from 'log4js';
 import { truncateString } from '@/common/utils/helper';
 import path from 'node:path';
-import { SelfInfo } from '@/core';
+import chalk from 'chalk';
 
 export enum LogLevel {
-  DEBUG = 'debug',
-  INFO = 'info',
-  WARN = 'warn',
-  ERROR = 'error',
-  FATAL = 'fatal',
+    DEBUG = 'debug',
+    INFO = 'info',
+    WARN = 'warn',
+    ERROR = 'error',
+    FATAL = 'fatal',
 }
 
-const logDir = path.join(path.resolve(__dirname), 'logs');
-
 function getFormattedTimestamp() {
-  const now = new Date();
-  const year = now.getFullYear();
-  const month = (now.getMonth() + 1).toString().padStart(2, '0');
-  const day = now.getDate().toString().padStart(2, '0');
-  const hours = now.getHours().toString().padStart(2, '0');
-  const minutes = now.getMinutes().toString().padStart(2, '0');
-  const seconds = now.getSeconds().toString().padStart(2, '0');
-  const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
-  return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
+    const now = new Date();
+    const year = now.getFullYear();
+    const month = (now.getMonth() + 1).toString().padStart(2, '0');
+    const day = now.getDate().toString().padStart(2, '0');
+    const hours = now.getHours().toString().padStart(2, '0');
+    const minutes = now.getMinutes().toString().padStart(2, '0');
+    const seconds = now.getSeconds().toString().padStart(2, '0');
+    const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
+    return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
 }
 
-const filename = `${getFormattedTimestamp()}.log`;
-const logPath = path.join(logDir, filename);
+export class LogWrapper {
+    fileLogEnabled = true;
+    consoleLogEnabled = true;
+    logConfig: Configuration;
+    loggerConsole: log4js.Logger;
+    loggerFile: log4js.Logger;
+    loggerDefault: log4js.Logger;
+    // eslint-disable-next-line no-control-regex
+    colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
 
-const logConfig: Configuration = {
-  appenders: {
-    FileAppender: { // 输出到文件的appender
-      type: 'file',
-      filename: logPath, // 指定日志文件的位置和文件名
-      maxLoogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
-      layout: {
-        type: 'pattern',
-        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
-      }
-    },
-    ConsoleAppender: { // 输出到控制台的appender
-      type: 'console',
-      layout: {
-        type: 'pattern',
-        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] - %m'
-      }
+    constructor(logDir: string) {
+        const filename = `${getFormattedTimestamp()}.log`;
+        const logPath = path.join(logDir, filename);
+        this.logConfig = {
+            appenders: {
+                FileAppender: { // 输出到文件的appender
+                    type: 'file',
+                    filename: logPath, // 指定日志文件的位置和文件名
+                    maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
+                    layout: {
+                        type: 'pattern',
+                        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m',
+                    },
+                },
+                ConsoleAppender: { // 输出到控制台的appender
+                    type: 'console',
+                    layout: {
+                        type: 'pattern',
+                        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`,
+                    },
+                },
+            },
+            categories: {
+                default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
+                file: { appenders: ['FileAppender'], level: 'debug' },
+                console: { appenders: ['ConsoleAppender'], level: 'debug' },
+            },
+        };
+        log4js.configure(this.logConfig);
+        this.loggerConsole = log4js.getLogger('console');
+        this.loggerFile = log4js.getLogger('file');
+        this.loggerDefault = log4js.getLogger('default');
+        this.setLogSelfInfo({ nick: '', uin: '', uid: '' });
     }
-  },
-  categories: {
-    default: { appenders: ['FileAppender', 'ConsoleAppender'], level: 'debug' }, // 默认情况下同时输出到文件和控制台
-    file: { appenders: ['FileAppender'], level: 'debug' },
-    console: { appenders: ['ConsoleAppender'], level: 'debug' }
-  }
-};
 
-log4js.configure(logConfig);
-
-
-export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
-  logConfig.categories.file.level = fileLogLevel;
-  logConfig.categories.console.level = consoleLogLevel;
-  log4js.configure(logConfig);
-}
-
-export function setLogSelfInfo(selfInfo: SelfInfo) {
-  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-  // @ts-expect-error
-  logConfig.appenders.FileAppender.layout.pattern = logConfig.appenders.ConsoleAppender.layout.pattern =
-    `%d{yyyy-MM-dd hh:mm:ss} [%p] ${selfInfo.nick}(${selfInfo.uin}) %m`;
-  log4js.configure(logConfig);
-}
-
-let fileLogEnabled = true;
-let consoleLogEnabled = true;
-export function enableFileLog(enable: boolean) {
-  fileLogEnabled = enable;
-}
-export function enableConsoleLog(enable: boolean) {
-  consoleLogEnabled = enable;
-}
-
-function formatMsg(msg: any[]){
-  let logMsg = '';
-  for (const msgItem of msg) {
-    // 判断是否是对象
-    if (typeof msgItem === 'object') {
-      const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
-      logMsg += JSON.stringify(truncateString(obj)) + ' ';
-      continue;
+    setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
+        this.logConfig.categories.file.level = fileLogLevel;
+        this.logConfig.categories.console.level = consoleLogLevel;
+        log4js.configure(this.logConfig);
     }
-    logMsg += msgItem + ' ';
-  }
-  return '\n' + logMsg + '\n';
-}
 
-function _log(level: LogLevel, ...args: any[]){
-  if (consoleLogEnabled){
-    log4js.getLogger('console')[level](formatMsg(args));
-  }
-  if (fileLogEnabled){
-    log4js.getLogger('file')[level](formatMsg(args));
-  }
-}
+    setLogSelfInfo(selfInfo: { nick: string, uin: string, uid: string }) {
+        const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
+        this.loggerConsole.addContext('userInfo', userInfo);
+        this.loggerFile.addContext('userInfo', userInfo);
+        this.loggerDefault.addContext('userInfo', userInfo);
+    }
 
-export function log(...args: any[]) {
-  // info 等级
-  _log(LogLevel.INFO, ...args);
-}
+    setFileLogEnabled(isEnabled: boolean) {
+        this.fileLogEnabled = isEnabled;
+    }
 
-export function logDebug(...args: any[]) {
-  _log(LogLevel.DEBUG, ...args);
-}
+    setConsoleLogEnabled(isEnabled: boolean) {
+        this.consoleLogEnabled = isEnabled;
+    }
 
-export function logError(...args: any[]) {
-  _log(LogLevel.ERROR, ...args);
+    formatMsg(msg: any[]) {
+        let logMsg = '';
+        for (const msgItem of msg) {
+            if (msgItem instanceof Error) { // 判断是否是错误
+                logMsg += msgItem.stack + ' ';
+                continue;
+            } else if (typeof msgItem === 'object') { // 判断是否是对象
+                const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
+                logMsg += JSON.stringify(truncateString(obj)) + ' ';
+                continue;
+            }
+            logMsg += msgItem + ' ';
+        }
+        return logMsg;
+    }
+
+
+    _log(level: LogLevel, ...args: any[]) {
+        if (this.consoleLogEnabled) {
+            this.loggerConsole[level](this.formatMsg(args));
+        }
+        if (this.fileLogEnabled) {
+            this.loggerFile[level](this.formatMsg(args).replace(this.colorEscape, ''));
+        }
+    }
+
+    log(...args: any[]) {
+        // info 等级
+        this._log(LogLevel.INFO, ...args);
+    }
+
+    logDebug(...args: any[]) {
+        this._log(LogLevel.DEBUG, ...args);
+    }
+
+    logError(...args: any[]) {
+        this._log(LogLevel.ERROR, ...args);
+    }
+
+    logWarn(...args: any[]) {
+        this._log(LogLevel.WARN, ...args);
+    }
+
+    logFatal(...args: any[]) {
+        this._log(LogLevel.FATAL, ...args);
+    }
 }

src/common/utils/proxy-handler.ts

@@ -0,0 +1,21 @@
+import { LogWrapper } from './log';
+
+export function proxyHandlerOf(logger: LogWrapper) {
+    return {
+        get(target: any, prop: any, receiver: any) {
+            // console.log('get', prop, typeof target[prop]);
+            if (typeof target[prop] === 'undefined') {
+                // 如果方法不存在，返回一个函数，这个函数调用existentMethod
+                return (..._args: unknown[]) => {
+                    logger.logDebug(`${target.constructor.name} has no method ${prop}`);
+                };
+            }
+            // 如果方法存在，正常返回
+            return Reflect.get(target, prop, receiver);
+        },
+    };
+}
+
+export function proxiedListenerOf<T extends object>(listener: T, logger: LogWrapper) {
+    return new Proxy<T>(listener, proxyHandlerOf(logger));
+}

src/common/utils/qqlevel.ts

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

src/common/utils/reboot.ts

@@ -1,30 +0,0 @@
-import { exit } from "process";
-import { resolve } from "path";
-import { spawn } from "node:child_process";
-import { sleep } from "./helper";
-
-export async function rebootWithQuickLogin(uin: string) {
-    let batScript = resolve(__dirname, './napcat.bat');
-    let batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
-    let bashScript = resolve(__dirname, './napcat.sh');
-    if (process.platform === 'win32') {
-        let subProcess = spawn(`start ${batUtf8Script} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore'});
-        subProcess.unref();
-    } else if (process.platform === 'linux') {
-        let subProcess = spawn(`${bashScript} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
-        subProcess.unref();
-    }
-    exit(0);
-}
-export async function rebootWithNormolLogin() {
-    let batScript = resolve(__dirname, './napcat.bat');
-    let batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
-    let bashScript = resolve(__dirname, './napcat.sh');
-    if (process.platform === 'win32') {
-        spawn(`start ${batUtf8Script}`, { detached: true, windowsHide: false, env: process.env, shell: true });
-    } else if (process.platform === 'linux') {
-        spawn(`${bashScript}`, { detached: true, windowsHide: false, env: process.env, shell: true });
-    }
-    await sleep(500);
-    exit(0);
-}

src/common/utils/request.ts

@@ -1,57 +1,194 @@
-const https = require('node:https');
-export async function HttpGetCookies(url: string): Promise<Map<string, string>> {
-  return new Promise((resolve, reject) => {
-    const result: Map<string, string> = new Map<string, string>();
-    const req = https.get(url, (res: any) => {
-      res.on('data', (data: any) => {
-      });
-      res.on('end', () => {
-        try {
-          const responseCookies = res.headers['set-cookie'];
-          for (const line of responseCookies) {
-            const parts = line.split(';');
-            const [key, value] = parts[0].split('=');
-            result.set(key, value);
-          }
-        } catch (e) {
+import https from 'node:https';
+import http from 'node:http';
+import { readFileSync } from 'node:fs';
+
+export class RequestUtil {
+    // 适用于获取服务器下发cookies时获取，仅GET
+    static async HttpsGetCookies(url: string): Promise<{ [key: string]: string }> {
+        const client = url.startsWith('https') ? https : http;
+        return new Promise((resolve, reject) => {
+            const req = client.get(url, (res) => {
+                let cookies: { [key: string]: string } = {};
+                const handleRedirect = (res: http.IncomingMessage) => {
+                    //console.log(res.headers.location);
+                    if (res.statusCode === 301 || res.statusCode === 302) {
+                        if (res.headers.location) {
+                            const redirectUrl = new URL(res.headers.location, url);
+                            RequestUtil.HttpsGetCookies(redirectUrl.href).then((redirectCookies) => {
+                                // 合并重定向过程中的cookies
+                                cookies = { ...cookies, ...redirectCookies };
+                                resolve(cookies);
+                            }).catch((err) => {
+                                reject(err);
+                            });
+                        } else {
+                            resolve(cookies);
+                        }
+                    } else {
+                        resolve(cookies);
+                    }
+                };
+                res.on('data', () => {
+                }); // Necessary to consume the stream
+                res.on('end', () => {
+                    handleRedirect(res);
+                });
+                if (res.headers['set-cookie']) {
+                    //console.log(res.headers['set-cookie']);
+                    res.headers['set-cookie'].forEach((cookie) => {
+                        const parts = cookie.split(';')[0].split('=');
+                        const key = parts[0];
+                        const value = parts[1];
+                        if (key && value && key.length > 0 && value.length > 0) {
+                            cookies[key] = value;
+                        }
+                    });
+                }
+            });
+            req.on('error', (error: any) => {
+                reject(error);
+            });
+        });
+    }
+
+
+    // 请求和回复都是JSON data传原始内容 自动编码json
+    static async HttpGetJson<T>(url: string, method: string = 'GET', data?: any, headers: {
+        [key: string]: string
+    } = {}, isJsonRet: boolean = true, isArgJson: boolean = true): Promise<T> {
+        const option = new URL(url);
+        const protocol = url.startsWith('https://') ? https : http;
+        const options = {
+            hostname: option.hostname,
+            port: option.port,
+            path: option.href,
+            method: method,
+            headers: headers,
+        };
+        // headers: {
+        //       'Content-Type': 'application/json',
+        //       'Content-Length': Buffer.byteLength(postData),
+        //     },
+        return new Promise((resolve, reject) => {
+            const req = protocol.request(options, (res: any) => {
+                let responseBody = '';
+                res.on('data', (chunk: string | Buffer) => {
+                    responseBody += chunk.toString();
+                });
+
+                res.on('end', () => {
+                    try {
+                        if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                            if (isJsonRet) {
+                                const responseJson = JSON.parse(responseBody);
+                                resolve(responseJson as T);
+                            } else {
+                                resolve(responseBody as T);
+                            }
+                        } else {
+                            reject(new Error(`Unexpected status code: ${res.statusCode}`));
+                        }
+                    } catch (parseError) {
+                        reject(parseError);
+                    }
+                });
+            });
+
+            req.on('error', (error: any) => {
+                reject(error);
+            });
+            if (method === 'POST' || method === 'PUT' || method === 'PATCH') {
+                if (isArgJson) {
+                    req.write(JSON.stringify(data));
+                } else {
+                    req.write(data);
+                }
+
+            }
+            req.end();
+        });
+    }
+
+    // 请求返回都是原始内容
+    static async HttpGetText(url: string, method: string = 'GET', data?: any, headers: { [key: string]: string } = {}) {
+        return this.HttpGetJson<string>(url, method, data, headers, false, false);
+    }
+
+    static async createFormData(boundary: string, filePath: string): Promise<Buffer> {
+        let type = 'image/png';
+        if (filePath.endsWith('.jpg')) {
+            type = 'image/jpeg';
         }
-        resolve(result);
+        const formDataParts = [
+            `------${boundary}\r\n`,
+            `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
+            'Content-Type: ' + type + '\r\n\r\n',
+        ];
 
-      });
-    });
-    req.on('error', (error: any) => {
-      resolve(result);
-      // console.log(error)
-    });
-    req.end();
-  });
+        const fileContent = readFileSync(filePath);
+        const footer = `\r\n------${boundary}--`;
+        return Buffer.concat([
+            Buffer.from(formDataParts.join(''), 'utf8'),
+            fileContent,
+            Buffer.from(footer, 'utf8'),
+        ]);
+    }
 
+    static async uploadImageForOpenPlatform(filePath: string, cookies: string): Promise<string> {
+        return new Promise(async (resolve, reject) => {
+            type retType = { retcode: number, result?: { url: string } };
+            try {
+                const options = {
+                    hostname: 'cgi.connect.qq.com',
+                    port: 443,
+                    path: '/qqconnectopen/upload_share_image',
+                    method: 'POST',
+                    headers: {
+                        'Referer': 'https://cgi.connect.qq.com',
+                        'Cookie': cookies,
+                        'Accept': '*/*',
+                        'Connection': 'keep-alive',
+                        'Content-Type': 'multipart/form-data; boundary=----WebKitFormBoundary7MA4YWxkTrZu0gW',
+                    },
+                };
+                const req = https.request(options, async (res) => {
+                    let responseBody = '';
+
+                    res.on('data', (chunk: string | Buffer) => {
+                        responseBody += chunk.toString();
+                    });
+
+                    res.on('end', () => {
+                        try {
+                            if (res.statusCode && res.statusCode >= 200 && res.statusCode < 300) {
+                                const responseJson = JSON.parse(responseBody) as retType;
+                                resolve(responseJson.result!.url!);
+                            } else {
+                                reject(new Error(`Unexpected status code: ${res.statusCode}`));
+                            }
+                        } catch (parseError) {
+                            reject(parseError);
+                        }
+
+                    });
+
+                });
+
+                req.on('error', (error) => {
+                    reject(error);
+                    console.log('Error during upload:', error);
+                });
+
+                const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
+                // req.setHeader('Content-Length', Buffer.byteLength(body));
+                // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
+                req.write(body);
+                req.end();
+                return;
+            } catch (error) {
+                reject(error);
+            }
+            return undefined;
+        });
+    }
 }
-export async function HttpPostCookies(url: string): Promise<Map<string, string>> {
-  return new Promise((resolve, reject) => {
-    const result: Map<string, string> = new Map<string, string>();
-    const req = https.get(url, (res: any) => {
-      res.on('data', (data: any) => {
-      });
-      res.on('end', () => {
-        try {
-          const responseCookies = res.headers['set-cookie'];
-          for (const line of responseCookies) {
-            const parts = line.split(';');
-            const [key, value] = parts[0].split('=');
-            result.set(key, value);
-          }
-        } catch (e) {
-        }
-        resolve(result);
-
-      });
-    });
-    req.on('error', (error: any) => {
-      resolve(result);
-      // console.log(error)
-    });
-    req.end();
-  });
-
-}

src/common/utils/system.ts

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

src/common/utils/types.ts

@@ -0,0 +1,17 @@
+//QQVersionType
+type QQPackageInfoType = {
+    version: string;
+    buildVersion: string;
+    platform: string;
+    eleArch: string;
+}
+type QQVersionConfigType = {
+    baseVersion: string;
+    curVersion: string;
+    prevVersion: string;
+    onErrorVersions: Array<any>;
+    buildId: string;
+}
+type QQAppidTableType = {
+    [key: string]: { appid: string, qua: string };
+}

src/common/utils/umami.ts

@@ -1,44 +0,0 @@
-import { request } from 'node:https';
-export function postLoginStatus() {
-  const req = request(
-    {
-      hostname: 'napcat.wumiao.wang',
-      path: '/api/send',
-      port: 443,
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-        'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 Safari/537.36 Edg/124.0.0.0'
-      }
-    },
-    (res) => {
-      //let data = '';
-      res.on('data', (chunk) => {
-        //data += chunk;
-      });
-      res.on('error', (err) => {
-      });
-      res.on('end', () => {
-        //console.log('Response:', data);
-      });
-    }
-  );
-  req.on('error', (e) => {
-    // console.error('Request error:', e);
-  });
-  const StatesData = {
-    type: 'event',
-    payload: {
-      'website': '952bf82f-8f49-4456-aec5-e17db5f27f7e',
-      'hostname': 'napcat.demo.cn',
-      'screen': '1920x1080',
-      'language': 'zh-CN',
-      'title': 'OneBot.Login',
-      'url': '/login/onebot11/1.3.2',
-      'referrer': 'https://napcat.demo.cn/login?type=onebot11'
-    }
-  };
-  req.write(JSON.stringify(StatesData));
-
-  req.end();
-}

src/common/utils/version.ts

@@ -1,44 +0,0 @@
-import { get as httpsGet } from 'node:https';
-function requestMirror(url: string): Promise<string | undefined> {
-  return new Promise((resolve, reject) => {
-    httpsGet(url, (response) => {
-      let data = '';
-      response.on('data', (chunk) => {
-        data += chunk;
-      });
-
-      response.on('end', () => {
-        try {
-          const parsedData = JSON.parse(data);
-          const version = parsedData.version;
-          resolve(version);
-        } catch (error) {
-          // 解析失败或无法访问域名，跳过
-          resolve(undefined);
-        }
-      });
-    }).on('error', (error) => {
-      // 请求失败，跳过
-      resolve(undefined);
-    });
-  });
-}
-
-export async function checkVersion(): Promise<string> {
-  return new Promise(async (resolve, reject) => {
-    const MirrorList =
-            [
-              'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://cdn.jsdelivr.us/gh/NapNeko/NapCatQQ@main/package.json',
-              'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json'
-            ];
-    for (const url of MirrorList) {
-      const version = await requestMirror(url);
-      if (version) {
-        resolve(version);
-      }
-    }
-    reject('get verison error!');
-  });
-}

src/core.lib/package.json

@@ -1,22 +0,0 @@
-{
-  "name": "@napneko/core",
-  "version": "1.0.0",
-  "description": "",
-  "type": "module",
-  "main": "./index.js",
-  "files": [
-    "lib"
-  ],
-  "scripts": {
-    "lint": "eslint --fix ./src/**/*.ts",
-    "build:dev": "vite build --mode development",
-    "build:prod": "vite build --mode production",
-    "build": "npm run build:dev"
-  },
-  "author": "NapNeko",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://github.com/NapNeko/NapCatQQ/issues"
-  },
-  "homepage": "https://github.com/NapNeko/NapCatQQ#readme"
-}

src/core.lib/src/adapters/NodeIDependsAdapter.d.ts

@@ -1,14 +0,0 @@
-interface IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number): void;
-    onMSFSsoError(args: unknown): void;
-    getGroupCode(args: unknown): void;
-}
-export interface NodeIDependsAdapter extends IDependsAdapter {
-    new (adapter: IDependsAdapter): NodeIDependsAdapter;
-}
-export declare class DependsAdapter implements IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number): void;
-    onMSFSsoError(args: unknown): void;
-    getGroupCode(args: unknown): void;
-}
-export {};

src/core.lib/src/adapters/NodeIDependsAdapter.js

@@ -1 +0,0 @@
-var _0x4a2dd5=_0x12f4;function _0x12f4(_0x4f7dce,_0x480131){var _0x547d83=_0x547d();return _0x12f4=function(_0x12f42f,_0x334fdd){_0x12f42f=_0x12f42f-0x1cb;var _0x3310f6=_0x547d83[_0x12f42f];return _0x3310f6;},_0x12f4(_0x4f7dce,_0x480131);}(function(_0x9627ef,_0x2bdc4c){var _0x3f5c0b=_0x12f4,_0x5bc9a4=_0x9627ef();while(!![]){try{var _0x556f14=parseInt(_0x3f5c0b(0x1d4))/0x1*(-parseInt(_0x3f5c0b(0x1d3))/0x2)+parseInt(_0x3f5c0b(0x1d2))/0x3*(parseInt(_0x3f5c0b(0x1d7))/0x4)+-parseInt(_0x3f5c0b(0x1cc))/0x5*(-parseInt(_0x3f5c0b(0x1d1))/0x6)+parseInt(_0x3f5c0b(0x1d0))/0x7+-parseInt(_0x3f5c0b(0x1d5))/0x8*(parseInt(_0x3f5c0b(0x1cd))/0x9)+-parseInt(_0x3f5c0b(0x1d9))/0xa*(-parseInt(_0x3f5c0b(0x1ce))/0xb)+-parseInt(_0x3f5c0b(0x1d8))/0xc;if(_0x556f14===_0x2bdc4c)break;else _0x5bc9a4['push'](_0x5bc9a4['shift']());}catch(_0x559019){_0x5bc9a4['push'](_0x5bc9a4['shift']());}}}(_0x547d,0x4b59c));export class DependsAdapter{[_0x4a2dd5(0x1d6)](_0x2e3fe8,_0x39c8a2){}[_0x4a2dd5(0x1cf)](_0x34d16e){}[_0x4a2dd5(0x1cb)](_0x104a00){}}function _0x547d(){var _0x4e70b8=['15198348kbkZdd','4618720hiFSGe','getGroupCode','10RIIEqo','963hJDrHe','11cuwaTr','onMSFSsoError','1973643mhShYL','1295832JrGnte','67674WuMgex','20992AJscdr','16mTDfYR','3120SgHmrF','onMSFStatusChange','108mHyias'];_0x547d=function(){return _0x4e70b8;};return _0x547d();}

src/core.lib/src/adapters/NodeIDispatcherAdapter.d.ts

@@ -1,14 +0,0 @@
-interface IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-    dispatchCall(arg: unknown): void;
-    dispatchCallWithJson(arg: unknown): void;
-}
-export interface NodeIDispatcherAdapter extends IDispatcherAdapter {
-    new (adapter: IDispatcherAdapter): NodeIDispatcherAdapter;
-}
-export declare class DispatcherAdapter implements IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-    dispatchCall(arg: unknown): void;
-    dispatchCallWithJson(arg: unknown): void;
-}
-export {};

src/core.lib/src/adapters/NodeIDispatcherAdapter.js

@@ -1 +0,0 @@
-var _0x407b46=_0x1833;(function(_0x516f63,_0x1b3b0a){var _0x381bfc=_0x1833,_0x409fe0=_0x516f63();while(!![]){try{var _0x2be90d=-parseInt(_0x381bfc(0x100))/0x1+parseInt(_0x381bfc(0x10a))/0x2+parseInt(_0x381bfc(0x101))/0x3+-parseInt(_0x381bfc(0x109))/0x4*(parseInt(_0x381bfc(0x107))/0x5)+-parseInt(_0x381bfc(0x10b))/0x6*(-parseInt(_0x381bfc(0x106))/0x7)+-parseInt(_0x381bfc(0x102))/0x8*(-parseInt(_0x381bfc(0x104))/0x9)+parseInt(_0x381bfc(0x108))/0xa;if(_0x2be90d===_0x1b3b0a)break;else _0x409fe0['push'](_0x409fe0['shift']());}catch(_0x183fce){_0x409fe0['push'](_0x409fe0['shift']());}}}(_0x178b,0xc80ab));function _0x1833(_0x5c0970,_0xcbb3e5){var _0x178b71=_0x178b();return _0x1833=function(_0x1833c5,_0x16a140){_0x1833c5=_0x1833c5-0x100;var _0x5532ca=_0x178b71[_0x1833c5];return _0x5532ca;},_0x1833(_0x5c0970,_0xcbb3e5);}function _0x178b(){var _0x41b0ba=['2419212dHjiqm','10220fMGzmm','5351982NsIIKA','616177BJJVgt','3230223FFvyuy','16ugrmhE','dispatchRequest','420291ULsxBx','dispatchCall','7NlPUBY','10csQijM','5779080KhWrhV'];_0x178b=function(){return _0x41b0ba;};return _0x178b();}export class DispatcherAdapter{[_0x407b46(0x103)](_0x4c3547){}[_0x407b46(0x105)](_0x3b0236){}['dispatchCallWithJson'](_0x52049a){}}

src/core.lib/src/adapters/NodeIGlobalAdapter.d.ts

@@ -1,24 +0,0 @@
-interface IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-    onGetSrvCalTime(...args: unknown[]): void;
-    onShowErrUITips(...args: unknown[]): void;
-    fixPicImgType(...args: unknown[]): void;
-    getAppSetting(...args: unknown[]): void;
-    onInstallFinished(...args: unknown[]): void;
-    onUpdateGeneralFlag(...args: unknown[]): void;
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-export interface NodeIGlobalAdapter extends IGlobalAdapter {
-    new (adapter: IGlobalAdapter): NodeIGlobalAdapter;
-}
-export declare class GlobalAdapter implements IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-    onGetSrvCalTime(...args: unknown[]): void;
-    onShowErrUITips(...args: unknown[]): void;
-    fixPicImgType(...args: unknown[]): void;
-    getAppSetting(...args: unknown[]): void;
-    onInstallFinished(...args: unknown[]): void;
-    onUpdateGeneralFlag(...args: unknown[]): void;
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-export {};

src/core.lib/src/adapters/NodeIGlobalAdapter.js

@@ -1 +0,0 @@
-var _0xfcd9c0=_0x55ff;(function(_0x4fa3a3,_0x26d853){var _0x246b07=_0x55ff,_0x1637cf=_0x4fa3a3();while(!![]){try{var _0x2c5d32=-parseInt(_0x246b07(0xd1))/0x1*(parseInt(_0x246b07(0xc4))/0x2)+parseInt(_0x246b07(0xc6))/0x3*(parseInt(_0x246b07(0xd0))/0x4)+-parseInt(_0x246b07(0xce))/0x5*(-parseInt(_0x246b07(0xcb))/0x6)+-parseInt(_0x246b07(0xd2))/0x7*(-parseInt(_0x246b07(0xd3))/0x8)+-parseInt(_0x246b07(0xcf))/0x9+parseInt(_0x246b07(0xc9))/0xa+parseInt(_0x246b07(0xcd))/0xb*(-parseInt(_0x246b07(0xc5))/0xc);if(_0x2c5d32===_0x26d853)break;else _0x1637cf['push'](_0x1637cf['shift']());}catch(_0x23e1d2){_0x1637cf['push'](_0x1637cf['shift']());}}}(_0x2d86,0xab51c));function _0x2d86(){var _0xfb555e=['onInstallFinished','76350KYwdri','getAppSetting','3747271gJKCYE','365ScOdzT','3235986YqSKlS','4703528ovkWAy','11wVzoHr','5782bYsaKI','4432UYllEK','onGetOfflineMsg','onShowErrUITips','137686eYpvEa','48LqOcgW','3EsWAlU','onLog','onGetSrvCalTime','6187840yCjsae'];_0x2d86=function(){return _0xfb555e;};return _0x2d86();}function _0x55ff(_0x21415e,_0x43e0b1){var _0x2d8653=_0x2d86();return _0x55ff=function(_0x55ff6e,_0x376a11){_0x55ff6e=_0x55ff6e-0xc4;var _0x4f9ca5=_0x2d8653[_0x55ff6e];return _0x4f9ca5;},_0x55ff(_0x21415e,_0x43e0b1);}export class GlobalAdapter{[_0xfcd9c0(0xc7)](..._0x36c923){}[_0xfcd9c0(0xc8)](..._0xcf3bb8){}[_0xfcd9c0(0xd5)](..._0x36f13f){}['fixPicImgType'](..._0xfbf752){}[_0xfcd9c0(0xcc)](..._0x1b9ed1){}[_0xfcd9c0(0xca)](..._0x3b5364){}['onUpdateGeneralFlag'](..._0x3a52ef){}[_0xfcd9c0(0xd4)](..._0x3634cf){}}

src/core.lib/src/adapters/index.js

@@ -1 +0,0 @@
-function _0x8bc2(){var _0x53c92a=['3186430WGLUJl','18VlHADW','771252uuZVeE','15389100uoHgNn','2902053QrIwPp','4089380CmuSYG','21424QKMQuj','8vJYlYG','2800602WzZXQp'];_0x8bc2=function(){return _0x53c92a;};return _0x8bc2();}(function(_0x131c04,_0x20ec2c){var _0x2d59c5=_0x2e3b,_0x37fcfd=_0x131c04();while(!![]){try{var _0xc05e61=parseInt(_0x2d59c5(0x179))/0x1*(parseInt(_0x2d59c5(0x174))/0x2)+parseInt(_0x2d59c5(0x175))/0x3+-parseInt(_0x2d59c5(0x178))/0x4+-parseInt(_0x2d59c5(0x17c))/0x5+parseInt(_0x2d59c5(0x17b))/0x6+-parseInt(_0x2d59c5(0x177))/0x7*(parseInt(_0x2d59c5(0x17a))/0x8)+parseInt(_0x2d59c5(0x176))/0x9;if(_0xc05e61===_0x20ec2c)break;else _0x37fcfd['push'](_0x37fcfd['shift']());}catch(_0x1ccbe8){_0x37fcfd['push'](_0x37fcfd['shift']());}}}(_0x8bc2,0x86da5));export*from'./NodeIDependsAdapter';function _0x2e3b(_0x20303a,_0x1c8b13){var _0x8bc2b0=_0x8bc2();return _0x2e3b=function(_0x2e3b91,_0x4a970d){_0x2e3b91=_0x2e3b91-0x174;var _0x44181a=_0x8bc2b0[_0x2e3b91];return _0x44181a;},_0x2e3b(_0x20303a,_0x1c8b13);}export*from'./NodeIDispatcherAdapter';export*from'./NodeIGlobalAdapter';

src/core.lib/src/apis/file.d.ts

@@ -1,37 +0,0 @@
-import { CacheFileListItem, CacheFileType, ChatCacheListItemBasic, ChatType, ElementType } from '@/core/entities';
-import { GeneralCallResult } from '@/core';
-import * as fileType from 'file-type';
-import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-export declare class NTQQFileApi {
-    static getFileType(filePath: string): Promise<fileType.FileTypeResult | undefined>;
-    static copyFile(filePath: string, destPath: string): Promise<void>;
-    static getFileSize(filePath: string): Promise<number>;
-    static uploadFile(filePath: string, elementType?: ElementType, elementSubType?: number): Promise<{
-        md5: string;
-        fileName: string;
-        path: string;
-        fileSize: number;
-        ext: string;
-    }>;
-    static downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout?: number, force?: boolean): Promise<string>;
-    static getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined>;
-    static getImageUrl(element: {
-        originImageUrl: any;
-        md5HexStr?: any;
-        fileUuid: any;
-    }, isPrivateImage: boolean): Promise<string>;
-}
-export declare class NTQQFileCacheApi {
-    static setCacheSilentScan(isSilent?: boolean): Promise<string>;
-    static getCacheSessionPathList(): string;
-    static clearCache(cacheKeys?: Array<string>): unknown;
-    static addCacheScannedPaths(pathMap?: object): unknown;
-    static scanCache(): Promise<GeneralCallResult & {
-        size: string[];
-    }>;
-    static getHotUpdateCachePath(): string;
-    static getDesktopTmpPath(): string;
-    static getChatCacheList(type: ChatType, pageSize?: number, pageIndex?: number): unknown;
-    static getFileCacheInfo(fileType: CacheFileType, pageSize?: number, lastRecord?: CacheFileListItem): void;
-    static clearChatCache(chats?: ChatCacheListItemBasic[], fileKeys?: string[]): Promise<unknown>;
-}

src/core.lib/src/apis/friend.d.ts

@@ -1,5 +0,0 @@
-import { FriendRequest, User } from '@/core/entities';
-export declare class NTQQFriendApi {
-    static getFriends(forced?: boolean): Promise<User[]>;
-    static handleFriendRequest(request: FriendRequest, accept: boolean): Promise<void>;
-}

src/core.lib/src/apis/friend.js

@@ -1 +0,0 @@
-function _0xab17(_0x2212de,_0x173b19){const _0x229d70=_0x229d();return _0xab17=function(_0xab172a,_0x35cc2f){_0xab172a=_0xab172a-0x66;let _0x24e0fb=_0x229d70[_0xab172a];return _0x24e0fb;},_0xab17(_0x2212de,_0x173b19);}const _0x168a9c=_0xab17;(function(_0x598df1,_0x464238){const _0x50d53b=_0xab17,_0x141802=_0x598df1();while(!![]){try{const _0x4a5cd6=parseInt(_0x50d53b(0x67))/0x1+parseInt(_0x50d53b(0x80))/0x2+-parseInt(_0x50d53b(0x75))/0x3*(parseInt(_0x50d53b(0x85))/0x4)+parseInt(_0x50d53b(0x81))/0x5*(-parseInt(_0x50d53b(0x76))/0x6)+parseInt(_0x50d53b(0x78))/0x7*(parseInt(_0x50d53b(0x6a))/0x8)+-parseInt(_0x50d53b(0x86))/0x9*(parseInt(_0x50d53b(0x88))/0xa)+-parseInt(_0x50d53b(0x84))/0xb*(-parseInt(_0x50d53b(0x66))/0xc);if(_0x4a5cd6===_0x464238)break;else _0x141802['push'](_0x141802['shift']());}catch(_0x2acd54){_0x141802['push'](_0x141802['shift']());}}}(_0x229d,0xcbab6));import{BuddyListener,napCatCore}from'@/core';import{logDebug}from'@/common/utils/log';function _0x229d(){const _0x337268=['18TgiXAM','1245558eXHaRH','CMVhG','315IGwpvb','handleFriendRequest','then','mAGsp','session','getBuddyService','getBuddyList','onLoginSuccess','1127390loNPqz','35YBNgGr','qXarM','set','1441pczlVr','260516hmyMhS','153kuhDLH','onBuddyListChange','671430hjznuo','approvalFriendRequest','219588QXVdRY','574457JcxNqC','获取好友列表完成','XRCQA','50536qSAcMV','push','getFriends','获取好友列表超时','buddyList','tqFIc','reqTime','开始获取好友列表','uid','delete','addListener'];_0x229d=function(){return _0x337268;};return _0x229d();}import{uid2UinMap}from'@/core/data';import{randomUUID}from'crypto';const buddyChangeTasks=new Map(),buddyListener=new BuddyListener();buddyListener[_0x168a9c(0x87)]=_0x33462a=>{const _0x2ee1d3=_0x168a9c,_0x20fe3c={'mOMAT':function(_0x418ef9,_0x37552d){return _0x418ef9(_0x37552d);}};for(const [_0x1143bf,_0x37b48f]of buddyChangeTasks){_0x20fe3c['mOMAT'](_0x37b48f,_0x33462a),buddyChangeTasks[_0x2ee1d3(0x73)](_0x1143bf);}},setTimeout(()=>{const _0x548ece=_0x168a9c;napCatCore[_0x548ece(0x7f)](()=>{const _0x240073=_0x548ece;napCatCore[_0x240073(0x74)](buddyListener);});},0x64);export class NTQQFriendApi{static async[_0x168a9c(0x6c)](_0x2c4aac=![]){const _0x3a804c=_0x168a9c,_0x2feb23={'qXarM':function(_0x4f6251,_0x3ff1fa){return _0x4f6251(_0x3ff1fa);},'mAGsp':_0x3a804c(0x6d),'XRCQA':function(_0x315e01,_0x38f88d,_0x291d2c){return _0x315e01(_0x38f88d,_0x291d2c);},'CMVhG':function(_0xf40c1e){return _0xf40c1e();}};return new Promise((_0x243638,_0x1a63ab)=>{const _0x36bd1b=_0x3a804c,_0x5c8541={'tqFIc':function(_0x397bdf,_0xa9faf4,_0x1f6a10){return _0x397bdf(_0xa9faf4,_0x1f6a10);}};let _0x3aebd5=![];_0x2feb23[_0x36bd1b(0x69)](setTimeout,()=>{const _0x49b4eb=_0x36bd1b;!_0x3aebd5&&(_0x2feb23[_0x49b4eb(0x82)](logDebug,_0x2feb23[_0x49b4eb(0x7b)]),_0x2feb23[_0x49b4eb(0x82)](_0x1a63ab,_0x49b4eb(0x6d)));},0x1388);const _0x26cb1e=[],_0xdb413=_0x29f352=>{const _0x10ab32=_0x36bd1b;for(const _0x21b16f of _0x29f352){for(const _0x24769a of _0x21b16f[_0x10ab32(0x6e)]){_0x26cb1e[_0x10ab32(0x6b)](_0x24769a),uid2UinMap[_0x24769a[_0x10ab32(0x72)]]=_0x24769a['uin'];}}_0x3aebd5=!![],_0x5c8541[_0x10ab32(0x6f)](logDebug,_0x10ab32(0x68),_0x26cb1e),_0x243638(_0x26cb1e);};buddyChangeTasks[_0x36bd1b(0x83)](_0x2feb23[_0x36bd1b(0x77)](randomUUID),_0xdb413),napCatCore[_0x36bd1b(0x7c)]['getBuddyService']()[_0x36bd1b(0x7e)](_0x2c4aac)[_0x36bd1b(0x7a)](_0x1fc47b=>{const _0x2009ae=_0x36bd1b;_0x2feb23['XRCQA'](logDebug,_0x2009ae(0x71),_0x1fc47b);});});}static async[_0x168a9c(0x79)](_0x1bbb82,_0x178918){const _0x31ca0b=_0x168a9c;napCatCore[_0x31ca0b(0x7c)][_0x31ca0b(0x7d)]()?.[_0x31ca0b(0x89)]({'friendUid':_0x1bbb82['friendUid'],'reqTime':_0x1bbb82[_0x31ca0b(0x70)],'accept':_0x178918});}}

src/core.lib/src/apis/group.d.ts

@@ -1,32 +0,0 @@
-import { GroupMember, GroupRequestOperateTypes, GroupMemberRole, GroupNotify, Group } from '../entities';
-export declare class NTQQGroupApi {
-    static getGroups(forced?: boolean): Promise<Group[]>;
-    static getGroupMembers(groupQQ: string, num?: number): Promise<Map<string, GroupMember>>;
-    static getGroupNotifies(): Promise<void>;
-    static getGroupIgnoreNotifies(): Promise<void>;
-    static uploadGroupBulletinPic(GroupCode: string, imageurl: string): Promise<import("@/core").GeneralCallResult & {
-        errCode: number;
-        picInfo?: {
-            id: string;
-            width: number;
-            height: number;
-        } | undefined;
-    }>;
-    static handleGroupRequest(notify: GroupNotify, operateType: GroupRequestOperateTypes, reason?: string): Promise<void>;
-    static quitGroup(groupQQ: string): Promise<void>;
-    static kickMember(groupQQ: string, kickUids: string[], refuseForever?: boolean, kickReason?: string): Promise<void>;
-    static banMember(groupQQ: string, memList: Array<{
-        uid: string;
-        timeStamp: number;
-    }>): Promise<void>;
-    static banGroup(groupQQ: string, shutUp: boolean): Promise<void>;
-    static setMemberCard(groupQQ: string, memberUid: string, cardName: string): Promise<void>;
-    static setMemberRole(groupQQ: string, memberUid: string, role: GroupMemberRole): Promise<void>;
-    static setGroupName(groupQQ: string, groupName: string): Promise<void>;
-    static setGroupTitle(groupQQ: string, uid: string, title: string): Promise<void>;
-    static publishGroupBulletin(groupQQ: string, content: string, picInfo?: {
-        id: string;
-        width: number;
-        height: number;
-    } | undefined, pinned?: number, confirmRequired?: number): Promise<import("@/core").GeneralCallResult>;
-}

src/core.lib/src/apis/index.js

@@ -1 +0,0 @@
-function _0x22d0(){var _0x1445b9=['307926vJmoHw','1097362BTGKol','32czznKE','1649109GReZUx','5116712pwRzhs','7569025QAvwsy','8420713scLUeU','7334838jrQYqp','6VcMAjv'];_0x22d0=function(){return _0x1445b9;};return _0x22d0();}(function(_0x43a7a3,_0x3f0ab9){var _0x16ef72=_0x4c75,_0x220955=_0x43a7a3();while(!![]){try{var _0xc92a2d=parseInt(_0x16ef72(0x18c))/0x1+-parseInt(_0x16ef72(0x18a))/0x2*(parseInt(_0x16ef72(0x188))/0x3)+-parseInt(_0x16ef72(0x184))/0x4+parseInt(_0x16ef72(0x185))/0x5+-parseInt(_0x16ef72(0x187))/0x6+parseInt(_0x16ef72(0x186))/0x7+-parseInt(_0x16ef72(0x18b))/0x8*(-parseInt(_0x16ef72(0x189))/0x9);if(_0xc92a2d===_0x3f0ab9)break;else _0x220955['push'](_0x220955['shift']());}catch(_0x34c0f9){_0x220955['push'](_0x220955['shift']());}}}(_0x22d0,0xdca24));export*from'./file';export*from'./friend';export*from'./group';export*from'./msg';function _0x4c75(_0x33a7cd,_0x559070){var _0x22d0fd=_0x22d0();return _0x4c75=function(_0x4c7513,_0x4ae264){_0x4c7513=_0x4c7513-0x184;var _0x36952c=_0x22d0fd[_0x4c7513];return _0x36952c;},_0x4c75(_0x33a7cd,_0x559070);}export*from'./user';export*from'./webapi';

src/core.lib/src/apis/msg.d.ts

@@ -1,25 +0,0 @@
-import { Peer, RawMessage, SendMessageElement } from '@/core/entities';
-import { GeneralCallResult } from '@/core/services/common';
-export declare class NTQQMsgApi {
-    static setEmojiLike(peer: Peer, msgSeq: string, emojiId: string, set?: boolean): Promise<unknown>;
-    static getMultiMsg(peer: Peer, rootMsgId: string, parentMsgId: string): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    } | undefined>;
-    static getMsgsByMsgId(peer: Peer, msgIds: string[]): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static getMsgsBySeqAndCount(peer: Peer, seq: string, count: number, desc: boolean, unknownArg: boolean): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static activateChat(peer: Peer): Promise<void>;
-    static activateChatAndGetHistory(peer: Peer): Promise<void>;
-    static setMsgRead(peer: Peer): Promise<GeneralCallResult>;
-    static getMsgHistory(peer: Peer, msgId: string, count: number): Promise<GeneralCallResult & {
-        msgList: RawMessage[];
-    }>;
-    static fetchRecentContact(): Promise<void>;
-    static recallMsg(peer: Peer, msgIds: string[]): Promise<void>;
-    static sendMsg(peer: Peer, msgElements: SendMessageElement[], waitComplete?: boolean, timeout?: number): Promise<RawMessage>;
-    static forwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<GeneralCallResult>;
-    static multiForwardMsg(srcPeer: Peer, destPeer: Peer, msgIds: string[]): Promise<RawMessage>;
-}

src/core.lib/src/apis/sign.d.ts

@@ -1,17 +0,0 @@
-export interface IdMusicSignPostData {
-    type: 'qq' | '163';
-    id: string | number;
-}
-export interface CustomMusicSignPostData {
-    type: 'custom';
-    url: string;
-    audio: string;
-    title: string;
-    image?: string;
-    singer?: string;
-}
-export declare class MusicSign {
-    private readonly url;
-    constructor(url: string);
-    sign(postData: CustomMusicSignPostData | IdMusicSignPostData): Promise<any>;
-}

src/core.lib/src/apis/sign.js

@@ -1 +0,0 @@
-function _0x5a41(_0x246fad,_0x5417e2){var _0x1820ef=_0x1820();return _0x5a41=function(_0x5a41f8,_0x8b9441){_0x5a41f8=_0x5a41f8-0x66;var _0x17ed61=_0x1820ef[_0x5a41f8];return _0x17ed61;},_0x5a41(_0x246fad,_0x5417e2);}var _0xc2f38=_0x5a41;(function(_0x95e857,_0xca6257){var _0x1a2899=_0x5a41,_0x692df5=_0x95e857();while(!![]){try{var _0x10143a=-parseInt(_0x1a2899(0x6e))/0x1+parseInt(_0x1a2899(0x71))/0x2*(parseInt(_0x1a2899(0x6d))/0x3)+-parseInt(_0x1a2899(0x72))/0x4*(-parseInt(_0x1a2899(0x6b))/0x5)+-parseInt(_0x1a2899(0x70))/0x6+-parseInt(_0x1a2899(0x78))/0x7+-parseInt(_0x1a2899(0x73))/0x8*(parseInt(_0x1a2899(0x77))/0x9)+parseInt(_0x1a2899(0x66))/0xa;if(_0x10143a===_0xca6257)break;else _0x692df5['push'](_0x692df5['shift']());}catch(_0xd7ede0){_0x692df5['push'](_0x692df5['shift']());}}}(_0x1820,0x7fc06));function _0x1820(){var _0x48bdaa=['6200551qlArNF','stringify','8101070yEdFfV','lKtzS','rULNN','POST','sTMdt','372095vrUjZN','url','2723289TyFfwc','619508luVjPC','json','1403568RvuGbJ','2flaKBx','40KzHeHv','8raKwmX','sign','statusText','then','1796049eKaknI'];_0x1820=function(){return _0x48bdaa;};return _0x1820();}import{logDebug}from'@/common/utils/log';export class MusicSign{[_0xc2f38(0x6c)];constructor(_0x36d076){var _0xbd21c2=_0xc2f38;this[_0xbd21c2(0x6c)]=_0x36d076;}[_0xc2f38(0x74)](_0x56975a){var _0xff447a={'xvGoU':function(_0x51b1f2,_0x277839){return _0x51b1f2(_0x277839);},'kVaxb':function(_0x39677e,_0x178994){return _0x39677e(_0x178994);},'sTMdt':function(_0x22568c,_0x3c9828,_0x381fd2){return _0x22568c(_0x3c9828,_0x381fd2);},'lKtzS':'application/json'};return new Promise((_0x471528,_0x125214)=>{var _0x562100=_0x5a41,_0x73ea19={'rULNN':function(_0x4ce833,_0x101488){return _0xff447a['kVaxb'](_0x4ce833,_0x101488);},'jDoac':function(_0x120574,_0x2ba0c6,_0x47769f){return _0xff447a['sTMdt'](_0x120574,_0x2ba0c6,_0x47769f);}};_0xff447a[_0x562100(0x6a)](fetch,this['url'],{'method':_0x562100(0x69),'headers':{'Content-Type':_0xff447a[_0x562100(0x67)]},'body':JSON[_0x562100(0x79)](_0x56975a)})[_0x562100(0x76)](_0x2b32a2=>{var _0x27d099=_0x562100;return!_0x2b32a2['ok']&&_0x73ea19[_0x27d099(0x68)](_0x125214,_0x2b32a2[_0x27d099(0x75)]),_0x2b32a2[_0x27d099(0x6f)]();})[_0x562100(0x76)](_0x5a6843=>{_0x73ea19['jDoac'](logDebug,'音乐消息生成成功',_0x5a6843),_0x73ea19['rULNN'](_0x471528,_0x5a6843);})['catch'](_0x490a7b=>{_0xff447a['xvGoU'](_0x125214,_0x490a7b);});});}}

src/core.lib/src/apis/user.d.ts

@@ -1,20 +0,0 @@
-import { User } from '@/core/entities';
-import { GeneralCallResult } from '@/core';
-export declare class NTQQUserApi {
-    static setSelfOnlineStatus(status: number, extStatus: number, batteryStatus: number): Promise<GeneralCallResult>;
-    static like(uid: string, count?: number): Promise<{
-        result: number;
-        errMsg: string;
-        succCounts: number;
-    }>;
-    static setQQAvatar(filePath: string): Promise<{
-        result: number;
-        errMsg: string;
-    }>;
-    static getSelfInfo(): Promise<void>;
-    static getUserInfo(uid: string): Promise<void>;
-    static getUserDetailInfo(uid: string): Promise<User>;
-    static getPSkey(domainList: string[], cached?: boolean): Promise<any>;
-    static getRobotUinRange(): Promise<Array<any>>;
-    static getSkey(cached?: boolean): Promise<string | undefined>;
-}

src/core.lib/src/apis/webapi.d.ts

@@ -1,98 +0,0 @@
-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;
-}
-export interface WebApiGroupNoticeFeed {
-    u: number;
-    fid: string;
-    pubt: number;
-    msg: {
-        text: string;
-        text_face: string;
-        title: string;
-        pics?: {
-            id: string;
-            w: string;
-            h: string;
-        }[];
-    };
-    type: number;
-    fn: number;
-    cn: number;
-    vn: number;
-    settings: {
-        is_show_edit_card: number;
-        remind_ts: number;
-        tip_window_type: number;
-        confirm_required: number;
-    };
-    read_num: number;
-    is_read: number;
-    is_all_confirm: number;
-}
-export interface WebApiGroupNoticeRet {
-    ec: number;
-    em: string;
-    ltsm: number;
-    srv_code: number;
-    read_only: number;
-    role: number;
-    feeds: WebApiGroupNoticeFeed[];
-    group: {
-        group_id: number;
-        class_ext: number;
-    };
-    sta: number;
-    gln: number;
-    tst: number;
-    ui: any;
-    server_time: number;
-    svrt: number;
-    ad: 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: any[];
-    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;
-    };
-}
-export declare class WebApi {
-    static getGroupEssenceMsg(GroupCode: string, page_start: string): Promise<GroupEssenceMsgRet | undefined>;
-    static getGroupMembers(GroupCode: string, cached?: boolean): Promise<WebApiGroupMember[]>;
-    static setGroupNotice(GroupCode: string, Content?: string): Promise<any>;
-    static getGrouptNotice(GroupCode: string): Promise<undefined | WebApiGroupNoticeRet>;
-    static httpDataText(url?: string, method?: string, data?: string, CookiesValue?: string): Promise<string>;
-    static httpDataJson<T>(url?: string, method?: string, data?: string, CookiesValue?: string): Promise<T>;
-    static genBkn(sKey: string): string;
-}
-export {};

src/core.lib/src/apis/window.d.ts

@@ -1,11 +0,0 @@
-export interface NTQQWindow {
-    windowName: string;
-    windowUrlHash: string;
-}
-export declare class NTQQWindows {
-    static GroupHomeWorkWindow: NTQQWindow;
-    static GroupNotifyFilterWindow: NTQQWindow;
-    static GroupEssenceWindow: NTQQWindow;
-}
-export declare class NTQQWindowApi {
-}

src/core.lib/src/core.d.ts

@@ -1,36 +0,0 @@
-/// <reference types="node" />
-import { NodeIQQNTWrapperSession, NodeQQNTWrapperUtil } from '@/core/wrapper';
-import { QuickLoginResult } from '@/core/services';
-import { BuddyListener, GroupListener, MsgListener, ProfileListener } from '@/core/listeners';
-export interface OnLoginSuccess {
-    (uin: string, uid: string): void | Promise<void>;
-}
-export declare class NapCatCore {
-    readonly session: NodeIQQNTWrapperSession;
-    readonly util: NodeQQNTWrapperUtil;
-    private engine;
-    private loginService;
-    private readonly loginListener;
-    private onLoginSuccessFuncList;
-    private proxyHandler;
-    constructor();
-    get dataPath(): string;
-    get dataPathGlobal(): string;
-    private initConfig;
-    private initSession;
-    private initDataListener;
-    addListener(listener: BuddyListener | GroupListener | MsgListener | ProfileListener): number;
-    onLoginSuccess(func: OnLoginSuccess): void;
-    quickLogin(uin: string): Promise<QuickLoginResult>;
-    qrLogin(cb: (url: string, base64: string, buffer: Buffer) => Promise<void>): Promise<{
-        url: string;
-        base64: string;
-        buffer: Buffer;
-    }>;
-    passwordLogin(uin: string, password: string, proofSig?: string, proofRand?: string, proofSid?: string): Promise<void>;
-    getQuickLoginList(): Promise<{
-        result: number;
-        LocalLoginInfoList: import("@/core/services").LoginListItem[];
-    }>;
-}
-export declare const napCatCore: NapCatCore;

src/core.lib/src/data.d.ts

@@ -1,42 +0,0 @@
-import { type Friend, type FriendRequest, type Group, type GroupMember, GroupNotify, type SelfInfo, BuddyCategoryType } from './entities';
-import { WebApiGroupMember } from '@/core/apis';
-export declare const Credentials: {
-    Skey: string;
-    CreatTime: number;
-    PskeyData: Map<string, string>;
-    PskeyTime: Map<string, number>;
-};
-export declare const WebGroupData: {
-    GroupData: Map<string, WebApiGroupMember[]>;
-    GroupTime: Map<string, number>;
-};
-export declare const selfInfo: SelfInfo;
-export declare const groups: Map<string, Group>;
-export declare function deleteGroup(groupQQ: string): void;
-export declare const groupMembers: Map<string, Map<string, GroupMember>>;
-export declare const friends: Map<string, Friend>;
-export declare const friendRequests: Record<string, FriendRequest>;
-export declare const groupNotifies: Record<string, GroupNotify>;
-export declare const napCatError: {
-    ffmpegError: string;
-    httpServerError: string;
-    wsServerError: string;
-    otherError: string;
-};
-export declare function getFriend(uinOrUid: string): Promise<Friend | undefined>;
-export declare function getGroup(qq: string | number): Promise<Group | undefined>;
-export declare function getGroupMember(groupQQ: string | number, memberUinOrUid: string | number): Promise<GroupMember | null | undefined>;
-export declare const uid2UinMap: Record<string, string>;
-export declare function getUidByUin(uin: string): string | undefined;
-export declare const tempGroupCodeMap: Record<string, string>;
-export declare const rawFriends: Array<BuddyCategoryType>;
-export declare const stat: {
-    packet_received: number;
-    packet_sent: number;
-    message_received: number;
-    message_sent: number;
-    last_message_time: number;
-    disconnect_times: number;
-    lost_times: number;
-    packet_lost: number;
-};

src/core.lib/src/data.js

@@ -1 +0,0 @@
-const _0x158803=_0x2020;(function(_0x573c97,_0x55d53a){const _0x133834=_0x2020,_0x172728=_0x573c97();while(!![]){try{const _0x35ca57=parseInt(_0x133834(0x185))/0x1+-parseInt(_0x133834(0x17e))/0x2*(parseInt(_0x133834(0x186))/0x3)+parseInt(_0x133834(0x184))/0x4+-parseInt(_0x133834(0x173))/0x5+parseInt(_0x133834(0x16f))/0x6*(-parseInt(_0x133834(0x17c))/0x7)+-parseInt(_0x133834(0x17d))/0x8+parseInt(_0x133834(0x178))/0x9*(parseInt(_0x133834(0x170))/0xa);if(_0x35ca57===_0x55d53a)break;else _0x172728['push'](_0x172728['shift']());}catch(_0x15e6ce){_0x172728['push'](_0x172728['shift']());}}}(_0x7932,0x6c177));import{isNumeric}from'@/common/utils/helper';import{NTQQGroupApi}from'@/core/apis';export const Credentials={'Skey':'','CreatTime':0x0,'PskeyData':new Map(),'PskeyTime':new Map()};export const WebGroupData={'GroupData':new Map(),'GroupTime':new Map()};export const selfInfo={'uid':'','uin':'','nick':'','online':!![]};export const groups=new Map();export function deleteGroup(_0x1e3a7e){const _0x21a00e=_0x2020;groups['delete'](_0x1e3a7e),groupMembers[_0x21a00e(0x18a)](_0x1e3a7e);}export const groupMembers=new Map();function _0x2020(_0x163bda,_0x29ea77){const _0x793229=_0x7932();return _0x2020=function(_0x2020b7,_0x4f0555){_0x2020b7=_0x2020b7-0x16f;let _0xd1f694=_0x793229[_0x2020b7];return _0xd1f694;},_0x2020(_0x163bda,_0x29ea77);}export const friends=new Map();export const friendRequests={};export const groupNotifies={};export const napCatError={'ffmpegError':'','httpServerError':'','wsServerError':'','otherError':_0x158803(0x177)};export async function getFriend(_0x25e2b0){const _0x4282bd=_0x158803,_0x4f1fe4={'LcTqV':function(_0x4872d4,_0x1f5038){return _0x4872d4(_0x1f5038);}};_0x25e2b0=_0x25e2b0[_0x4282bd(0x187)]();if(_0x4f1fe4[_0x4282bd(0x176)](isNumeric,_0x25e2b0)){const _0x38eb03=Array[_0x4282bd(0x183)](friends[_0x4282bd(0x174)]());return _0x38eb03[_0x4282bd(0x175)](_0x1ac20e=>_0x1ac20e['uin']===_0x25e2b0);}else return friends[_0x4282bd(0x181)](_0x25e2b0);}function _0x7932(){const _0x235186=['getGroupMembers','kfCAH','get','NZZPT','from','1755376itPKTH','607822kekxoa','3lkFlff','toString','groupCode','ILVVP','delete','8436ommBln','10ErzDvF','forEach','uin','3261160YhydNT','values','find','LcTqV','NapCat未能正常启动，请检查日志查看错误','10267056ePYQBp','getGroups','length','set','2324ckbTNq','1400248VKmyYD','901304RVjPzs'];_0x7932=function(){return _0x235186;};return _0x7932();}export async function getGroup(_0x5689c8){const _0x2e31bc=_0x158803;let _0x2513e4=groups[_0x2e31bc(0x181)](_0x5689c8['toString']());if(!_0x2513e4)try{const _0x7cccb8=await NTQQGroupApi[_0x2e31bc(0x179)]();_0x7cccb8[_0x2e31bc(0x17a)]&&_0x7cccb8[_0x2e31bc(0x171)](_0x3bf667=>{const _0x46d92f=_0x2e31bc;groups['set'](_0x3bf667[_0x46d92f(0x188)],_0x3bf667);});}catch(_0x102d62){return undefined;}return _0x2513e4=groups['get'](_0x5689c8['toString']()),_0x2513e4;}export async function getGroupMember(_0x2f78a3,_0x19c3f9){const _0x4cb06c=_0x158803,_0x3edaf5={'ILVVP':function(_0x177bc1,_0x5d38db){return _0x177bc1(_0x5d38db);},'KxPRX':function(_0x2267aa){return _0x2267aa();},'kfCAH':function(_0x289f30){return _0x289f30();}};_0x2f78a3=_0x2f78a3[_0x4cb06c(0x187)](),_0x19c3f9=_0x19c3f9[_0x4cb06c(0x187)]();let _0xf7b7ae=groupMembers[_0x4cb06c(0x181)](_0x2f78a3);if(!_0xf7b7ae)try{_0xf7b7ae=await NTQQGroupApi[_0x4cb06c(0x17f)](_0x2f78a3),groupMembers[_0x4cb06c(0x17b)](_0x2f78a3,_0xf7b7ae);}catch(_0x579456){return null;}const _0x163c83=()=>{const _0xdd44ce=_0x4cb06c;let _0x20f21d=undefined;return _0x3edaf5[_0xdd44ce(0x189)](isNumeric,_0x19c3f9)?_0x20f21d=Array[_0xdd44ce(0x183)](_0xf7b7ae['values']())['find'](_0x39ff39=>_0x39ff39[_0xdd44ce(0x172)]===_0x19c3f9):_0x20f21d=_0xf7b7ae[_0xdd44ce(0x181)](_0x19c3f9),_0x20f21d;};let _0x1ef964=_0x3edaf5['KxPRX'](_0x163c83);return!_0x1ef964&&(_0xf7b7ae=await NTQQGroupApi['getGroupMembers'](_0x2f78a3),_0x1ef964=_0x3edaf5[_0x4cb06c(0x180)](_0x163c83)),_0x1ef964;}export const uid2UinMap={};export function getUidByUin(_0x1c3b5c){const _0x1b3b99=_0x158803,_0x2c39f2={'NZZPT':function(_0x232301,_0x436524){return _0x232301===_0x436524;}};for(const _0x350145 in uid2UinMap){if(_0x2c39f2[_0x1b3b99(0x182)](uid2UinMap[_0x350145],_0x1c3b5c))return _0x350145;}}export const tempGroupCodeMap={};export const rawFriends=[];export const stat={'packet_received':0x0,'packet_sent':0x0,'message_received':0x0,'message_sent':0x0,'last_message_time':0x0,'disconnect_times':0x0,'lost_times':0x0,'packet_lost':0x0};

src/core.lib/src/entities/cache.js

@@ -1 +0,0 @@
-function _0x16d2(_0x29dbd5,_0x56077c){var _0x56f8f3=_0x56f8();return _0x16d2=function(_0x16d251,_0x39ff6e){_0x16d251=_0x16d251-0x138;var _0x18f6b9=_0x56f8f3[_0x16d251];return _0x18f6b9;},_0x16d2(_0x29dbd5,_0x56077c);}(function(_0x18d6b9,_0x137ea5){var _0x4989e9=_0x16d2,_0x156406=_0x18d6b9();while(!![]){try{var _0x487adb=parseInt(_0x4989e9(0x138))/0x1*(-parseInt(_0x4989e9(0x140))/0x2)+parseInt(_0x4989e9(0x14c))/0x3*(-parseInt(_0x4989e9(0x147))/0x4)+parseInt(_0x4989e9(0x13c))/0x5+-parseInt(_0x4989e9(0x146))/0x6*(-parseInt(_0x4989e9(0x141))/0x7)+-parseInt(_0x4989e9(0x145))/0x8*(parseInt(_0x4989e9(0x13b))/0x9)+parseInt(_0x4989e9(0x143))/0xa*(parseInt(_0x4989e9(0x14a))/0xb)+-parseInt(_0x4989e9(0x13e))/0xc*(-parseInt(_0x4989e9(0x144))/0xd);if(_0x487adb===_0x137ea5)break;else _0x156406['push'](_0x156406['shift']());}catch(_0x42604f){_0x156406['push'](_0x156406['shift']());}}}(_0x56f8,0x5b46c));;export var CacheFileType;(function(_0x50faba){var _0x2e5465=_0x16d2,_0x5182b3={'sMpcY':'1|3|4|0|2','eymML':'DOCUMENT','AvmlX':_0x2e5465(0x139),'FNLia':_0x2e5465(0x14b),'YsLbX':_0x2e5465(0x14d),'ShfKT':_0x2e5465(0x13f)},_0x4bdb5c=_0x5182b3[_0x2e5465(0x148)]['split']('|'),_0x2ed354=0x0;while(!![]){switch(_0x4bdb5c[_0x2ed354++]){case'0':_0x50faba[_0x50faba['DOCUMENT']=0x3]=_0x5182b3[_0x2e5465(0x13d)];continue;case'1':_0x50faba[_0x50faba[_0x5182b3[_0x2e5465(0x149)]]=0x0]=_0x5182b3[_0x2e5465(0x149)];continue;case'2':_0x50faba[_0x50faba[_0x5182b3['FNLia']]=0x4]=_0x5182b3['FNLia'];continue;case'3':_0x50faba[_0x50faba[_0x5182b3[_0x2e5465(0x142)]]=0x1]=_0x5182b3[_0x2e5465(0x142)];continue;case'4':_0x50faba[_0x50faba[_0x5182b3[_0x2e5465(0x13a)]]=0x2]=_0x5182b3[_0x2e5465(0x13a)];continue;}break;}}(CacheFileType||(CacheFileType={})));function _0x56f8(){var _0x2ef13d=['81452DpXBlN','sMpcY','AvmlX','965613mygByh','OTHER','57cknZSg','VIDEO','409YheRAU','IMAGE','ShfKT','108YVShHn','2476590WJkNBR','eymML','204RliLuW','AUDIO','1098ilkOfx','4736543wSxWWo','YsLbX','20JVNTFG','268645xYaFFb','475688ZzFdCz','6vvMJfU'];_0x56f8=function(){return _0x2ef13d;};return _0x56f8();}

src/core.lib/src/entities/constructor.d.ts

@@ -1,17 +0,0 @@
-import { AtType, SendArkElement, SendFaceElement, SendFileElement, SendMarkdownElement, SendMarketFaceElement, SendPicElement, SendPttElement, SendReplyElement, SendTextElement, SendVideoElement } from './index';
-export declare const mFaceCache: Map<string, string>;
-export declare class SendMsgElementConstructor {
-    static text(content: string): SendTextElement;
-    static at(atUid: string, atNtUid: string, atType: AtType, atName: string): SendTextElement;
-    static reply(msgSeq: string, msgId: string, senderUin: string, senderUinStr: string): SendReplyElement;
-    static pic(picPath: string, summary?: string, subType?: 0 | 1): Promise<SendPicElement>;
-    static file(filePath: string, fileName?: string): Promise<SendFileElement>;
-    static video(filePath: string, fileName?: string, diyThumbPath?: string): Promise<SendVideoElement>;
-    static ptt(pttPath: string): Promise<SendPttElement>;
-    static face(faceId: number): SendFaceElement;
-    static mface(emojiPackageId: number, emojiId: string, key: string, faceName: string): SendMarketFaceElement;
-    static dice(resultId: number | null): SendFaceElement;
-    static rps(resultId: number | null): SendFaceElement;
-    static ark(data: any): SendArkElement;
-    static markdown(content: string): SendMarkdownElement;
-}

src/core.lib/src/entities/group.d.ts

@@ -1,52 +0,0 @@
-import { QQLevel, Sex } from './user';
-export interface Group {
-    groupCode: string;
-    maxMember: number;
-    memberCount: number;
-    groupName: string;
-    groupStatus: 0;
-    memberRole: 2;
-    isTop: boolean;
-    toppedTimestamp: string;
-    privilegeFlag: number;
-    isConf: boolean;
-    hasModifyConfGroupFace: boolean;
-    hasModifyConfGroupName: boolean;
-    remarkName: string;
-    hasMemo: boolean;
-    groupShutupExpireTime: string;
-    personShutupExpireTime: string;
-    discussToGroupUin: string;
-    discussToGroupMaxMsgSeq: number;
-    discussToGroupTime: number;
-    groupFlagExt: number;
-    authGroupType: number;
-    groupCreditLevel: number;
-    groupFlagExt3: number;
-    groupOwnerId: {
-        memberUin: string;
-        memberUid: string;
-    };
-}
-export declare enum GroupMemberRole {
-    normal = 2,
-    admin = 3,
-    owner = 4
-}
-export interface GroupMember {
-    memberSpecialTitle?: string;
-    avatarPath: string;
-    cardName: string;
-    cardType: number;
-    isDelete: boolean;
-    nick: string;
-    qid: string;
-    remark: string;
-    role: GroupMemberRole;
-    shutUpTime: number;
-    uid: string;
-    uin: string;
-    isRobot: boolean;
-    sex?: Sex;
-    qqLevel?: QQLevel;
-}

src/core.lib/src/entities/group.js

@@ -1 +0,0 @@
-(function(_0x44164a,_0x3126be){var _0x352529=_0x2e53,_0x3aaeee=_0x44164a();while(!![]){try{var _0x35b155=-parseInt(_0x352529(0x174))/0x1+parseInt(_0x352529(0x169))/0x2+-parseInt(_0x352529(0x170))/0x3+parseInt(_0x352529(0x171))/0x4+-parseInt(_0x352529(0x16b))/0x5+-parseInt(_0x352529(0x16f))/0x6*(parseInt(_0x352529(0x168))/0x7)+parseInt(_0x352529(0x16e))/0x8*(parseInt(_0x352529(0x167))/0x9);if(_0x35b155===_0x3126be)break;else _0x3aaeee['push'](_0x3aaeee['shift']());}catch(_0x32f5d2){_0x3aaeee['push'](_0x3aaeee['shift']());}}}(_0x48e1,0x7d68d));function _0x2e53(_0x5734f1,_0x471b48){var _0x48e17f=_0x48e1();return _0x2e53=function(_0x2e530a,_0x31e3cc){_0x2e530a=_0x2e530a-0x167;var _0x4c34d7=_0x48e17f[_0x2e530a];return _0x4c34d7;},_0x2e53(_0x5734f1,_0x471b48);}function _0x48e1(){var _0x22b627=['2342445fqUcxR','3146844oXzVgd','eKcka','normal','942491xnSDtr','36JkgrEP','38311garolA','1946564fiKdkT','hVtFE','3805595kHLCfp','deBdb','admin','3253384ZGbNfW','426ryDuCa'];_0x48e1=function(){return _0x22b627;};return _0x48e1();}export var GroupMemberRole;(function(_0x476aa){var _0x282fe6=_0x2e53,_0x106762={'eKcka':_0x282fe6(0x173),'deBdb':_0x282fe6(0x16d),'hVtFE':'owner'};_0x476aa[_0x476aa[_0x106762[_0x282fe6(0x172)]]=0x2]=_0x106762[_0x282fe6(0x172)],_0x476aa[_0x476aa[_0x106762[_0x282fe6(0x16c)]]=0x3]=_0x282fe6(0x16d),_0x476aa[_0x476aa[_0x106762[_0x282fe6(0x16a)]]=0x4]=_0x106762[_0x282fe6(0x16a)];}(GroupMemberRole||(GroupMemberRole={})));

src/core.lib/src/entities/index.js

@@ -1 +0,0 @@
-(function(_0xe531b7,_0x51a052){var _0x4d04bd=_0x2efd,_0x449c2b=_0xe531b7();while(!![]){try{var _0x250d75=-parseInt(_0x4d04bd(0x1bc))/0x1+parseInt(_0x4d04bd(0x1b9))/0x2+-parseInt(_0x4d04bd(0x1bd))/0x3*(parseInt(_0x4d04bd(0x1be))/0x4)+parseInt(_0x4d04bd(0x1b6))/0x5*(-parseInt(_0x4d04bd(0x1bf))/0x6)+parseInt(_0x4d04bd(0x1ba))/0x7*(-parseInt(_0x4d04bd(0x1bb))/0x8)+parseInt(_0x4d04bd(0x1b8))/0x9+parseInt(_0x4d04bd(0x1b5))/0xa*(parseInt(_0x4d04bd(0x1b7))/0xb);if(_0x250d75===_0x51a052)break;else _0x449c2b['push'](_0x449c2b['shift']());}catch(_0x368d19){_0x449c2b['push'](_0x449c2b['shift']());}}}(_0x1453,0x43771));export*from'./user';function _0x2efd(_0x3e6f75,_0x261fd0){var _0x145393=_0x1453();return _0x2efd=function(_0x2efd19,_0x2d10f1){_0x2efd19=_0x2efd19-0x1b5;var _0x3d2ac7=_0x145393[_0x2efd19];return _0x3d2ac7;},_0x2efd(_0x3e6f75,_0x261fd0);}export*from'./group';export*from'./msg';function _0x1453(){var _0x18fa2e=['99xlMxzq','3827664TeaRAp','633160yxtzHB','97482IHsqkZ','288cJpOdZ','89177hlyfKI','625542lHtcZK','4JPiIDY','6JVIktx','459590EkewcY','400715CJOplD'];_0x1453=function(){return _0x18fa2e;};return _0x1453();}export*from'./notify';export*from'./cache';export*from'./constructor';

src/core.lib/src/entities/msg.d.ts

@@ -1,383 +0,0 @@
-import { GroupMemberRole } from './group';
-export interface Peer {
-    chatType: ChatType;
-    peerUid: string;
-    guildId?: string;
-}
-export declare enum ElementType {
-    TEXT = 1,
-    PIC = 2,
-    FILE = 3,
-    PTT = 4,
-    VIDEO = 5,
-    FACE = 6,
-    REPLY = 7,
-    ARK = 10,
-    MFACE = 11,
-    MARKDOWN = 14
-}
-export interface SendTextElement {
-    elementType: ElementType.TEXT;
-    elementId: string;
-    textElement: {
-        content: string;
-        atType: number;
-        atUid: string;
-        atTinyId: string;
-        atNtUid: string;
-    };
-}
-export interface SendPttElement {
-    elementType: ElementType.PTT;
-    elementId: string;
-    pttElement: {
-        fileName: string;
-        filePath: string;
-        md5HexStr: string;
-        fileSize: number;
-        duration: number;
-        formatType: number;
-        voiceType: number;
-        voiceChangeType: number;
-        canConvert2Text: boolean;
-        waveAmplitudes: number[];
-        fileSubId: string;
-        playState: number;
-        autoConvertText: number;
-    };
-}
-export declare enum PicType {
-    gif = 2000,
-    jpg = 1000
-}
-export declare enum PicSubType {
-    normal = 0,// 普通图片，大图
-    face = 1
-}
-export interface SendPicElement {
-    elementType: ElementType.PIC;
-    elementId: string;
-    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;
-    elementId: string;
-    replyElement: {
-        replayMsgSeq: string;
-        replayMsgId: string;
-        senderUin: string;
-        senderUinStr: string;
-    };
-}
-export interface SendFaceElement {
-    elementType: ElementType.FACE;
-    elementId: string;
-    faceElement: FaceElement;
-}
-export interface SendMarketFaceElement {
-    elementType: ElementType.MFACE;
-    marketFaceElement: MarketFaceElement;
-}
-export interface FileElement {
-    fileMd5?: string;
-    fileName: string;
-    filePath: string;
-    fileSize: string;
-    picHeight?: number;
-    picWidth?: number;
-    picThumbPath?: Map<number, string>;
-    file10MMd5?: string;
-    fileSha?: string;
-    fileSha3?: string;
-    fileUuid?: string;
-    fileSubId?: string;
-    thumbFileSize?: number;
-    fileBizId?: number;
-}
-export interface SendFileElement {
-    elementType: ElementType.FILE;
-    elementId: string;
-    fileElement: FileElement;
-}
-export interface SendVideoElement {
-    elementType: ElementType.VIDEO;
-    elementId: string;
-    videoElement: VideoElement;
-}
-export interface SendArkElement {
-    elementType: ElementType.ARK;
-    elementId: string;
-    arkElement: ArkElement;
-}
-export interface SendMarkdownElement {
-    elementType: ElementType.MARKDOWN;
-    elementId: string;
-    markdownElement: MarkdownElement;
-}
-export type SendMessageElement = SendTextElement | SendPttElement | SendPicElement | SendReplyElement | SendFaceElement | SendMarketFaceElement | SendFileElement | SendVideoElement | SendArkElement | SendMarkdownElement;
-export declare enum AtType {
-    notAt = 0,
-    atAll = 1,
-    atUser = 2
-}
-export declare enum ChatType {
-    friend = 1,
-    group = 2,
-    chatDevice = 8,//移动设备?
-    temp = 100
-}
-export interface PttElement {
-    canConvert2Text: boolean;
-    duration: number;
-    fileBizId: null;
-    fileId: number;
-    fileName: string;
-    filePath: string;
-    fileSize: string;
-    fileSubId: string;
-    fileUuid: string;
-    formatType: string;
-    invalidState: number;
-    md5HexStr: string;
-    playState: number;
-    progress: number;
-    text: string;
-    transferStatus: number;
-    translateStatus: number;
-    voiceChangeType: number;
-    voiceType: number;
-    waveAmplitudes: number[];
-}
-export interface ArkElement {
-    bytesData: string;
-    linkInfo: null;
-    subElementType: null;
-}
-export declare const IMAGE_HTTP_HOST = "https://gchat.qpic.cn";
-export declare const IMAGE_HTTP_HOST_NT = "https://multimedia.nt.qq.com.cn";
-export interface PicElement {
-    originImageUrl: string;
-    originImageMd5?: string;
-    sourcePath: string;
-    thumbPath: Map<number, string>;
-    picWidth: number;
-    picHeight: number;
-    fileSize: number;
-    fileName: string;
-    fileUuid: string;
-    md5HexStr?: string;
-}
-export declare enum GrayTipElementSubType {
-    INVITE_NEW_MEMBER = 12,
-    MEMBER_NEW_TITLE = 17
-}
-export interface GrayTipElement {
-    subElementType: GrayTipElementSubType;
-    revokeElement: {
-        operatorRole: string;
-        operatorUid: string;
-        operatorNick: string;
-        operatorRemark: string;
-        operatorMemRemark?: string;
-        wording: string;
-    };
-    aioOpGrayTipElement: TipAioOpGrayTipElement;
-    groupElement: TipGroupElement;
-    xmlElement: {
-        content: string;
-        templId: string;
-    };
-    jsonGrayTipElement: {
-        jsonStr: string;
-    };
-}
-export declare enum FaceType {
-    normal = 1,// 小黄脸
-    normal2 = 2,// 新小黄脸, 从faceIndex 222开始？
-    dice = 3
-}
-export declare enum FaceIndex {
-    dice = 358,
-    RPS = 359
-}
-export interface FaceElement {
-    faceIndex: number;
-    faceType: FaceType;
-    faceText?: string;
-    packId?: string;
-    stickerId?: string;
-    sourceType?: number;
-    stickerType?: number;
-    resultId?: string;
-    surpriseId?: string;
-    randomType?: number;
-}
-export interface MarketFaceElement {
-    emojiPackageId: number;
-    faceName: string;
-    emojiId: string;
-    key: string;
-}
-export interface VideoElement {
-    filePath: string;
-    fileName: string;
-    videoMd5?: string;
-    thumbMd5?: string;
-    fileTime?: number;
-    thumbSize?: number;
-    fileFormat?: number;
-    fileSize?: string;
-    thumbWidth?: number;
-    thumbHeight?: number;
-    busiType?: 0;
-    subBusiType?: 0;
-    thumbPath?: Map<number, any>;
-    transferStatus?: 0;
-    progress?: 0;
-    invalidState?: 0;
-    fileUuid?: string;
-    fileSubId?: string;
-    fileBizId?: null;
-    originVideoMd5?: string;
-    import_rich_media_context?: null;
-    sourceVideoCodecFormat?: number;
-}
-export interface MarkdownElement {
-    content: string;
-}
-export interface InlineKeyboardElementRowButton {
-    id: string;
-    label: string;
-    visitedLabel: string;
-    style: 1;
-    type: 2;
-    clickLimit: 0;
-    unsupportTips: string;
-    data: string;
-    atBotShowChannelList: boolean;
-    permissionType: number;
-    specifyRoleIds: [];
-    specifyTinyids: [];
-    isReply: false;
-    anchor: 0;
-    enter: false;
-    subscribeDataTemplateIds: [];
-}
-export interface InlineKeyboardElement {
-    rows: [
-        {
-            buttons: InlineKeyboardElementRowButton[];
-        }
-    ];
-}
-export interface TipAioOpGrayTipElement {
-    operateType: number;
-    peerUid: string;
-    fromGrpCodeOfTmpChat: string;
-}
-export declare enum TipGroupElementType {
-    memberIncrease = 1,
-    kicked = 3,// 被移出群
-    ban = 8
-}
-export interface TipGroupElement {
-    type: TipGroupElementType;
-    role: 0;
-    groupName: string;
-    memberUid: string;
-    memberNick: string;
-    memberRemark: string;
-    adminUid: string;
-    adminNick: string;
-    adminRemark: string;
-    createGroup: null;
-    memberAdd?: {
-        showType: 1;
-        otherAdd: null;
-        otherAddByOtherQRCode: null;
-        otherAddByYourQRCode: null;
-        youAddByOtherQRCode: null;
-        otherInviteOther: null;
-        otherInviteYou: null;
-        youInviteOther: null;
-    };
-    shutUp?: {
-        curTime: string;
-        duration: string;
-        admin: {
-            uid: string;
-            card: string;
-            name: string;
-            role: GroupMemberRole;
-        };
-        member: {
-            uid: string;
-            card: string;
-            name: string;
-            role: GroupMemberRole;
-        };
-    };
-}
-export interface MultiForwardMsgElement {
-    xmlContent: string;
-    resId: string;
-    fileName: string;
-}
-export interface RawMessage {
-    id?: number;
-    msgId: string;
-    msgTime: string;
-    msgSeq: string;
-    msgType: number;
-    subMsgType: number;
-    senderUid: string;
-    senderUin: string;
-    peerUid: string;
-    peerUin: string;
-    sendNickName: string;
-    sendMemberName?: string;
-    chatType: ChatType;
-    sendStatus?: number;
-    recallTime: string;
-    elements: {
-        elementId: string;
-        elementType: ElementType;
-        replyElement: {
-            senderUid: string;
-            sourceMsgIsIncPic: boolean;
-            sourceMsgText: string;
-            replayMsgSeq: string;
-        };
-        textElement: {
-            atType: AtType;
-            atUid: string;
-            content: string;
-            atNtUid: string;
-        };
-        picElement: PicElement;
-        pttElement: PttElement;
-        arkElement: ArkElement;
-        grayTipElement: GrayTipElement;
-        faceElement: FaceElement;
-        videoElement: VideoElement;
-        fileElement: FileElement;
-        marketFaceElement: MarketFaceElement;
-        inlineKeyboardElement: InlineKeyboardElement;
-        markdownElement: MarkdownElement;
-        multiForwardMsgElement: MultiForwardMsgElement;
-    }[];
-}

src/core.lib/src/entities/notify.d.ts

@@ -1,69 +0,0 @@
-export declare enum GroupNotifyTypes {
-    INVITE_ME = 1,
-    INVITED_JOIN = 4,// 有人接受了邀请入群
-    JOIN_REQUEST = 7,
-    ADMIN_SET = 8,
-    KICK_MEMBER = 9,
-    MEMBER_EXIT = 11,// 主动退出
-    ADMIN_UNSET = 12,
-    ADMIN_UNSET_OTHER = 13
-}
-export interface GroupNotifies {
-    doubt: boolean;
-    nextStartSeq: string;
-    notifies: GroupNotify[];
-}
-export declare enum GroupNotifyStatus {
-    IGNORE = 0,
-    WAIT_HANDLE = 1,
-    APPROVE = 2,
-    REJECT = 3
-}
-export interface GroupNotify {
-    time: number;
-    seq: string;
-    type: GroupNotifyTypes;
-    status: GroupNotifyStatus;
-    group: {
-        groupCode: string;
-        groupName: string;
-    };
-    user1: {
-        uid: string;
-        nickName: string;
-    };
-    user2: {
-        uid: string;
-        nickName: string;
-    };
-    actionUser: {
-        uid: string;
-        nickName: string;
-    };
-    actionTime: string;
-    invitationExt: {
-        srcType: number;
-        groupCode: string;
-        waitStatus: number;
-    };
-    postscript: string;
-    repeatSeqs: [];
-    warningTips: string;
-}
-export declare enum GroupRequestOperateTypes {
-    approve = 1,
-    reject = 2
-}
-export interface FriendRequest {
-    friendUid: string;
-    reqTime: string;
-    extWords: string;
-    isUnread: boolean;
-    friendNick: string;
-    sourceId: number;
-    groupCode: string;
-}
-export interface FriendRequestNotify {
-    unreadNums: number;
-    buddyReqs: FriendRequest[];
-}

src/core.lib/src/entities/notify.js

@@ -1 +0,0 @@
-function _0x5272(_0x350aef,_0x3920b3){var _0x34b0fd=_0x34b0();return _0x5272=function(_0x527269,_0x7ff4d){_0x527269=_0x527269-0xd2;var _0x28e1a9=_0x34b0fd[_0x527269];return _0x28e1a9;},_0x5272(_0x350aef,_0x3920b3);}(function(_0x496da9,_0x6f223e){var _0x26ff8a=_0x5272,_0x39c89b=_0x496da9();while(!![]){try{var _0x40bfd1=parseInt(_0x26ff8a(0xf0))/0x1+parseInt(_0x26ff8a(0xe3))/0x2+-parseInt(_0x26ff8a(0xd4))/0x3+parseInt(_0x26ff8a(0xe5))/0x4*(parseInt(_0x26ff8a(0xdb))/0x5)+-parseInt(_0x26ff8a(0xe0))/0x6+parseInt(_0x26ff8a(0xe1))/0x7*(-parseInt(_0x26ff8a(0xd9))/0x8)+-parseInt(_0x26ff8a(0xd6))/0x9*(-parseInt(_0x26ff8a(0xe7))/0xa);if(_0x40bfd1===_0x6f223e)break;else _0x39c89b['push'](_0x39c89b['shift']());}catch(_0xa8d27c){_0x39c89b['push'](_0x39c89b['shift']());}}}(_0x34b0,0x5c45c));export var GroupNotifyTypes;(function(_0x71c7fa){var _0xec0c8c=_0x5272,_0x4b503d={'pMdsp':_0xec0c8c(0xd2),'KfBWP':'INVITED_JOIN','YPRBv':_0xec0c8c(0xed),'elPnr':_0xec0c8c(0xef),'GiWbJ':_0xec0c8c(0xf2),'oaJbb':'MEMBER_EXIT','roCpK':_0xec0c8c(0xda),'stzNa':'ADMIN_UNSET_OTHER'};_0x71c7fa[_0x71c7fa[_0x4b503d[_0xec0c8c(0xe8)]]=0x1]=_0xec0c8c(0xd2),_0x71c7fa[_0x71c7fa[_0x4b503d[_0xec0c8c(0xd7)]]=0x4]=_0x4b503d['KfBWP'],_0x71c7fa[_0x71c7fa[_0x4b503d['YPRBv']]=0x7]=_0x4b503d[_0xec0c8c(0xe9)],_0x71c7fa[_0x71c7fa[_0x4b503d[_0xec0c8c(0xd8)]]=0x8]=_0x4b503d[_0xec0c8c(0xd8)],_0x71c7fa[_0x71c7fa[_0x4b503d[_0xec0c8c(0xd3)]]=0x9]=_0x4b503d[_0xec0c8c(0xd3)],_0x71c7fa[_0x71c7fa[_0x4b503d[_0xec0c8c(0xe2)]]=0xb]=_0x4b503d[_0xec0c8c(0xe2)],_0x71c7fa[_0x71c7fa[_0x4b503d['roCpK']]=0xc]=_0x4b503d[_0xec0c8c(0xdf)],_0x71c7fa[_0x71c7fa[_0x4b503d[_0xec0c8c(0xee)]]=0xd]=_0x4b503d['stzNa'];}(GroupNotifyTypes||(GroupNotifyTypes={})));export var GroupNotifyStatus;(function(_0x15b1b9){var _0x174ac9=_0x5272,_0x18ff93={'ortpO':_0x174ac9(0xd5),'BWfdw':_0x174ac9(0xf1),'ZUjAw':_0x174ac9(0xde),'JeNTc':'REJECT'};_0x15b1b9[_0x15b1b9['IGNORE']=0x0]=_0x18ff93[_0x174ac9(0xea)],_0x15b1b9[_0x15b1b9[_0x18ff93[_0x174ac9(0xdd)]]=0x1]=_0x18ff93[_0x174ac9(0xdd)],_0x15b1b9[_0x15b1b9[_0x18ff93[_0x174ac9(0xe6)]]=0x2]=_0x18ff93[_0x174ac9(0xe6)],_0x15b1b9[_0x15b1b9[_0x174ac9(0xeb)]=0x3]=_0x18ff93['JeNTc'];}(GroupNotifyStatus||(GroupNotifyStatus={})));export var GroupRequestOperateTypes;(function(_0x29ec7e){var _0x151c67=_0x5272,_0x2c4f45={'TsdQk':'approve','wNrVF':_0x151c67(0xec)};_0x29ec7e[_0x29ec7e[_0x2c4f45[_0x151c67(0xe4)]]=0x1]=_0x2c4f45[_0x151c67(0xe4)],_0x29ec7e[_0x29ec7e[_0x2c4f45[_0x151c67(0xdc)]]=0x2]=_0x151c67(0xec);}(GroupRequestOperateTypes||(GroupRequestOperateTypes={})));function _0x34b0(){var _0x4c55c5=['70UtDMMi','pMdsp','YPRBv','ortpO','REJECT','reject','JOIN_REQUEST','stzNa','ADMIN_SET','737185AqXtFr','WAIT_HANDLE','KICK_MEMBER','INVITE_ME','GiWbJ','579345iYIUhp','IGNORE','717075ySNMYn','KfBWP','elPnr','3003992IrdDBc','ADMIN_UNSET','29615YEwIkQ','wNrVF','BWfdw','APPROVE','roCpK','3155958bLumJc','14tCHYMF','oaJbb','407374lCvNai','TsdQk','236ooSnNu','ZUjAw'];_0x34b0=function(){return _0x4c55c5;};return _0x34b0();}

src/core.lib/src/entities/user.d.ts

@@ -1,89 +0,0 @@
-export declare enum Sex {
-    male = 1,
-    female = 2,
-    unknown = 255
-}
-export interface BuddyCategoryType {
-    categoryId: number;
-    categroyName: string;
-    categroyMbCount: number;
-    buddyList: User[];
-}
-export interface BuddyProfileLikeReq {
-    friendUids: string[];
-    basic: number;
-    vote: number;
-    favorite: number;
-    userProfile: number;
-    type: number;
-    start: number;
-    limit: number;
-}
-export interface QQLevel {
-    crownNum: number;
-    sunNum: number;
-    moonNum: number;
-    starNum: number;
-}
-export interface User {
-    uid: string;
-    uin: string;
-    nick: string;
-    avatarUrl?: string;
-    longNick?: string;
-    remark?: string;
-    sex?: Sex;
-    qqLevel?: QQLevel;
-    qid?: string;
-    birthday_year?: number;
-    birthday_month?: number;
-    birthday_day?: number;
-    topTime?: string;
-    constellation?: number;
-    shengXiao?: number;
-    kBloodType?: number;
-    homeTown?: string;
-    makeFriendCareer?: number;
-    pos?: string;
-    eMail?: string;
-    phoneNum?: string;
-    college?: string;
-    country?: string;
-    province?: string;
-    city?: string;
-    postCode?: string;
-    address?: string;
-    isBlock?: boolean;
-    isSpecialCareOpen?: boolean;
-    isSpecialCareZone?: boolean;
-    ringId?: string;
-    regTime?: number;
-    interest?: string;
-    labels?: string[];
-    isHideQQLevel?: number;
-    privilegeIcon?: {
-        jumpUrl: string;
-        openIconList: unknown[];
-        closeIconList: unknown[];
-    };
-    photoWall?: {
-        picList: unknown[];
-    };
-    vipFlag?: boolean;
-    yearVipFlag?: boolean;
-    svipFlag?: boolean;
-    vipLevel?: number;
-    status?: number;
-    qidianMasterFlag?: number;
-    qidianCrewFlag?: number;
-    qidianCrewFlag2?: number;
-    extStatus?: number;
-    recommendImgFlag?: number;
-    disableEmojiShortCuts?: number;
-    pendantId?: string;
-}
-export interface SelfInfo extends User {
-    online?: boolean;
-}
-export interface Friend extends User {
-}

src/core.lib/src/entities/user.js

@@ -1 +0,0 @@
-(function(_0x3280a,_0x31ff92){var _0x134a05=_0x4e1e,_0x2bb004=_0x3280a();while(!![]){try{var _0x4dad6b=-parseInt(_0x134a05(0xb5))/0x1+-parseInt(_0x134a05(0xaf))/0x2*(parseInt(_0x134a05(0xb3))/0x3)+-parseInt(_0x134a05(0xb7))/0x4*(-parseInt(_0x134a05(0xb4))/0x5)+-parseInt(_0x134a05(0xb1))/0x6*(parseInt(_0x134a05(0xb6))/0x7)+parseInt(_0x134a05(0xbb))/0x8+-parseInt(_0x134a05(0xb0))/0x9+-parseInt(_0x134a05(0xba))/0xa*(-parseInt(_0x134a05(0xbc))/0xb);if(_0x4dad6b===_0x31ff92)break;else _0x2bb004['push'](_0x2bb004['shift']());}catch(_0x2778f5){_0x2bb004['push'](_0x2bb004['shift']());}}}(_0x4304,0x62c6e));function _0x4e1e(_0x91c316,_0xf4d96){var _0x430490=_0x4304();return _0x4e1e=function(_0x4e1e5d,_0x3faaaa){_0x4e1e5d=_0x4e1e5d-0xaf;var _0x5cf116=_0x430490[_0x4e1e5d];return _0x5cf116;},_0x4e1e(_0x91c316,_0xf4d96);}function _0x4304(){var _0x350a8d=['male','18CipHad','125aMNjeo','66413NvXFfL','14PSeYPD','105100BCWNiC','MkibG','UtMHF','10134270DaVRtl','6280848utMQVo','11lPNmHf','MnbWd','228166QAMZlT','5726079GnNBZL','1991028easFoz'];_0x4304=function(){return _0x350a8d;};return _0x4304();}export var Sex;(function(_0x440107){var _0x296e4a=_0x4e1e,_0x4d5d49={'MkibG':_0x296e4a(0xb2),'MnbWd':'female','UtMHF':'unknown'};_0x440107[_0x440107[_0x4d5d49['MkibG']]=0x1]=_0x4d5d49[_0x296e4a(0xb8)],_0x440107[_0x440107[_0x4d5d49[_0x296e4a(0xbd)]]=0x2]=_0x4d5d49['MnbWd'],_0x440107[_0x440107[_0x4d5d49[_0x296e4a(0xb9)]]=0xff]=_0x4d5d49[_0x296e4a(0xb9)];}(Sex||(Sex={})));

src/core.lib/src/external/hook.d.ts

@@ -1,8 +0,0 @@
-declare class HookApi {
-    private readonly moeHook;
-    constructor();
-    getRKey(): string;
-    isAvailable(): boolean;
-}
-export declare const hookApi: HookApi;
-export {};

src/core.lib/src/external/hook.js

@@ -1 +0,0 @@
-const _0x3a05cc=_0x27d4;(function(_0x31fea6,_0x47861a){const _0x32383f=_0x27d4,_0x37ef87=_0x31fea6();while(!![]){try{const _0x54011b=-parseInt(_0x32383f(0x13d))/0x1*(parseInt(_0x32383f(0x136))/0x2)+parseInt(_0x32383f(0x147))/0x3*(parseInt(_0x32383f(0x139))/0x4)+-parseInt(_0x32383f(0x143))/0x5*(-parseInt(_0x32383f(0x13c))/0x6)+parseInt(_0x32383f(0x146))/0x7*(-parseInt(_0x32383f(0x142))/0x8)+parseInt(_0x32383f(0x137))/0x9+-parseInt(_0x32383f(0x13f))/0xa+parseInt(_0x32383f(0x13b))/0xb;if(_0x54011b===_0x47861a)break;else _0x37ef87['push'](_0x37ef87['shift']());}catch(_0x11baeb){_0x37ef87['push'](_0x37ef87['shift']());}}}(_0x5a33,0x89a5e));function _0x27d4(_0x3f525a,_0x11f5de){const _0x5a33a0=_0x5a33();return _0x27d4=function(_0x27d4b8,_0x18b0f3){_0x27d4b8=_0x27d4b8-0x135;let _0x951670=_0x5a33a0[_0x27d4b8];return _0x951670;},_0x27d4(_0x3f525a,_0x11f5de);}import{logError}from'@/common/utils/log';import{cpModule}from'@/common/utils/cpmodule';import{qqPkgInfo}from'@/common/utils/QQBasicInfo';function _0x5a33(){const _0x3f519a=['HWSXd','5657060mvrljl','moeHook','RcJyT','137608xtgWUz','2115635ScNrKF','version','GetRkey','217oSGugk','3imFOJj','isAvailable','qsSHB','HookRkey','MoeHoo','344506AZrnht','8950887AgcdAn','加载\x20moehoo\x20失败','2082804wQWgOd','getRKey','757658yUEFZM','6ZqhHxd','2eXrUGl'];_0x5a33=function(){return _0x3f519a;};return _0x5a33();}class HookApi{[_0x3a05cc(0x140)]=null;constructor(){const _0x556fd6=_0x3a05cc,_0x2124ee={'HWSXd':function(_0xd52f27,_0x53e328){return _0xd52f27(_0x53e328);},'qsSHB':_0x556fd6(0x135),'MmmGm':'./MoeHoo.node','RcJyT':function(_0xdb6f6a,_0x326c00,_0x2f1085){return _0xdb6f6a(_0x326c00,_0x2f1085);}};try{_0x2124ee['HWSXd'](cpModule,_0x2124ee[_0x556fd6(0x149)]),this['moeHook']=_0x2124ee[_0x556fd6(0x13e)](require,_0x2124ee['MmmGm']),this['moeHook'][_0x556fd6(0x14a)](qqPkgInfo[_0x556fd6(0x144)]);}catch(_0x26bb38){_0x2124ee[_0x556fd6(0x141)](logError,_0x556fd6(0x138),_0x26bb38);}}[_0x3a05cc(0x13a)](){const _0x458fb9=_0x3a05cc;return this[_0x458fb9(0x140)]?.[_0x458fb9(0x145)]()||'';}[_0x3a05cc(0x148)](){const _0x307b44=_0x3a05cc;return!!this[_0x307b44(0x140)];}}export const hookApi=new HookApi();