release: v2.0.37

refactor: 接口兼容

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

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

.eslintrc.cjs

@@ -1,68 +1,64 @@
 module.exports = {
-  'env': {
-    'browser': true,
-    'es2021': true,
-    'node': true
-  },
-  'ignorePatterns': ['src/core/', 'src/core.lib/','src/proto/'],
-  '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

@@ -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,ia32]
     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 }}
+              name: NapCat.Shell
               path: dist

.github/workflows/release.yml

@@ -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,ia32]
     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
@@ -112,11 +98,16 @@ jobs:
     
     - name: Compress subdirectories
       run: |
-       for dir in */; do
-          base=$(basename "$dir")
-          zip -r "${base}.zip" "$dir"
-        done 
-    
+        cd ./NapCat.Shell/
+        zip -q -r NapCat.Shell.zip *
+        cd ..
+        cd ./NapCat.Framework/
+        zip -q -r NapCat.Framework.zip *
+        cd ..
+        rm ./NapCat.Shell.zip -rf
+        rm ./NapCat.Framework.zip -rf
+        mv ./NapCat.Shell/NapCat.Shell.zip ./
+        mv ./NapCat.Framework/NapCat.Framework.zip ./
     - name: Extract version from tag
       run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_ENV
       
@@ -130,10 +121,6 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         body_path: CHANGELOG.md
         files: |
-          NapCat.win32.ia32.zip
-          NapCat.win32.x64.zip
-          NapCat.linux.x64.zip
-          NapCat.linux.arm64.zip
-#          NapCat.darwin.x64.zip
-#          NapCat.darwin.arm64.zip
+          NapCat.Framework.zip
+          NapCat.Shell.zip
         draft: true

.github/workflows/test.yml

@@ -1,69 +0,0 @@
-name: "Build Test"
-on:
-  workflow_dispatch:
-
-permissions: write-all
-
-jobs:
-  build-linux:
-    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
-      with:
-          repository: 'NapNeko/NapCatQQ'
-          submodules: true
-          ref: main
-          token: ${{ secrets.NAPCAT_BUILD }}
-    - name: Use Node.js 20.X
-      uses: actions/setup-node@v4
-      with:
-        node-version: 20.x
-    - name: Build NuCat Linux
-      run: |
-          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          npm run build:prod
-          cd dist
-          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          cd ..
-    - name: Upload Artifact
-      uses: actions/upload-artifact@v4
-      with:
-        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-        path: dist
-  build-win32:
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        target_platform: [win32]
-        target_arch: [x64,ia32]
-    steps:
-        - name: Clone Main Repository
-          uses: actions/checkout@v4
-          with:
-                repository: 'NapNeko/NapCatQQ'
-                submodules: true
-                ref: main
-                token: ${{ secrets.NAPCAT_BUILD }}
-        - name: Use Node.js 20.X
-          uses: actions/setup-node@v4
-          with:
-              node-version: 20.x
-        - name: Build NuCat Linux
-          run: |
-                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                npm run build:prod
-                cd dist
-                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                cd ..
-        - name: Upload Artifact
-          uses: actions/upload-artifact@v4
-          with:
-              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-              path: dist

.prettierrc.json

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

LICENSE

@@ -1,21 +1,343 @@
-MIT License
+   GNU GENERAL PUBLIC Without Social media promotion 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.)
+
+    d）You may use this software in accordance with the above terms, 
+    but you are not allowed to promote this project or your projects
+    based on this project on any public social media.
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+                            NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

README.md

@@ -2,32 +2,39 @@
   <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>
 
+---
+## To Be Continued
+当前版本请使用内核构建版本（版本号最后的五位数）为 26702 至 26909 的 PC NTQQ 运行。
+
+高版本QQ NapCat已完成兼容 暂时不发布 直至版本2.0.x结束。
+
 ## 项目介绍
+NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现。
 
-NapCatQQ 是基于 PC NTQQ 本体实现一套无头 Bot 框架。
-
-名字寓意 瞌睡猫QQ，像睡着了一样在后台低占用运行的无需GUI界面的NTQQ。
+## 项目优势
+- [x] **多种启动方式**：支持以无头、LiteLoader 插件、仅 QQ GUI 三种方式启动
+- [x] **低占用**：无头模式占用资源极低，适合在服务器上运行
+- [x] **超多接口**：在实现大部分Onebot接口上扩展了一套私有API
+- [x] **WebUI**：自带 WebUI 支持，远程管理更加便捷
 
 ## 如何使用
 
 可前往 [Release](https://github.com/NapNeko/NapCatQQ/releases/) 页面下载最新版本
 
-**首次使用** 请务必前往 [官方文档](https://napneko.github.io/) 查看使用文档与教程
-
-
-## 项目声明
-
-* 请不要在无关地方宣传NapCatQQ，本项目只是用于学习 node 相关知识，切勿用于违法用途
-
-* NapCat 不会收集用户隐私信息，但是未来可能会为了更好的利于 NapCat 的优化会收集一些设备信息，如 cpu 架构，系统版本等
+**首次使用**请务必前往[官方文档](https://napneko.github.io/)查看使用教程。
 
 ## 相关链接
+[QQ Group](https://qm.qq.com/q/VfjAq5HIMS)
+
 [Telegram Link](https://t.me/+nLZEnpne-pQ1OWFl)
 
 ## 鸣谢名单
+感谢 [LLOneBot](https://github.com/LLOneBot/LLOneBot) 提供初始版本基础
 
-[Lagrange](https://github.com/LagrangeDev/Lagrange.Core)
+感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持
 
-<!-- 
-QQ群：545402644
--->
+---
+
+## 使用许可
+
+任何使用本仓库代码的地方，都应当严格遵守[本仓库开源许可](./LICENSE)。**此外，禁止任何项目未经授权二次分发或基于 [core](./src/core) 部分代码开发。**

docs/changelogs/CHANGELOG.v1.6.6.md

@@ -1,17 +0,0 @@
-# v1.6.5
-
-QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
-## 使用前警告
-1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
-2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
-3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
-## 其余·备注
-启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
-
-## 修复与优化
-1. 修复了一些问题
-
-## 新增与调整
-没有哦
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.3.md

@@ -1,17 +0,0 @@
-# v1.3.3
-
-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)

docs/changelogs/old/CHANGELOG.v1.3.5.md

@@ -1,18 +0,0 @@
-# v1.3.5
-
-QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
-
-## 修复与优化
-* 优化启动脚本
-* 修复非管理时群成员减少事件上报 **无法获取操作者与操作类型**
-* 修复快速重启进程清理问题
-* 优化配置文件格式 支持自动更新配置 但仍然建议 **备份配置**
-* 修复正向反向ws多个客户端周期多次心跳问题
-
-## 新增与调整
-* 支持WebUi热重载
-* 新增启动输出WEBUI秘钥
-* 新增群荣誉信息 /get_group_honor_info
-* 支持获取群系统消息 /get_group_system_msg
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.6.md

@@ -1,11 +0,0 @@
-# v1.3.6
-
-QQ Version: Windows 9.9.9-23424 / Linux 3.2.7-23361
-
-## 修复与优化
-* 修复戳一戳多次上报问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.8.md

@@ -1,15 +0,0 @@
-# v1.3.8
-
-QQ Version: Windows 9.9.9-23873 / Linux 3.2.7-23361
-
-## 修复与优化
-* 优化打包后体积问题
-* 修复QQ等级获取
-* 兼容 9.7.x 版本换行符 统一为 \n
-* 修复处理加群请求 字段异常情况
-* 修复退群通知问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.3.9.md

@@ -1,11 +0,0 @@
-# v1.3.9
-
-QQ Version: Windows 9.9.10-23873 / Linux 3.2.7-23361
-
-## 修复与优化
-* 修复QQ等级获取与兼容性问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.0.md

@@ -1,12 +0,0 @@
-# v1.4.0
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-
-## 新增与调整
-* 支持空间Cookies获取
-* 支持获取在线设备 API /get_online_clients
-* 支持图片OCR API： /.ocr_image /ocr_image
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.1.md

@@ -1,14 +0,0 @@
-# v1.4.1
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 提高部分Api兼容性
-* 优化日志膨胀问题
-* 在线状态刷新问题修复
-## 新增与调整
-* 支持非管理群 本地记录时间数据 (建议 **备份配置 清空配置 重新配置**)
-* 新增英译中接口 Api: /translate_en2zh
-* 新增群文件管理相关扩展接口 Api: /get_group_file_count /get_group_file_list /set_group_file_folder /del_group_file /del_group_file_folder
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.2.md

@@ -1,12 +0,0 @@
-# v1.4.2
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 修复获取群文件列表Api
-* 修复退群通知问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.3.md

@@ -1,11 +0,0 @@
-# v1.4.3
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 修复名片通知
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.4.md

@@ -1,10 +0,0 @@
-# v1.4.4
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 更新
-* **重大更新：**更新了版本号
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
-

docs/changelogs/old/CHANGELOG.v1.4.5.md

@@ -1,12 +0,0 @@
-# v1.4.5
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 紧急修复二维扫码问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
-

docs/changelogs/old/CHANGELOG.v1.4.6.md

@@ -1,12 +0,0 @@
-# v1.4.6
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 优化整体稳定性
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)
-

docs/changelogs/old/CHANGELOG.v1.4.7.md

@@ -1,11 +0,0 @@
-# v1.4.7
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 临时扩展 Api: GoCQHTTPUploadGroupFile folder_id字段 用于选择文件夹
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.8.md

@@ -1,12 +0,0 @@
-# v1.4.8
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 优化Guid的生成方式
-* 支持临时消息获取群来源
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.4.9.md

@@ -1,11 +0,0 @@
-# v1.4.9
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 修复接口调用问题 接口标准化 API：set_group_add_request
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.0.md

@@ -1,11 +0,0 @@
-# v1.5.0
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 修正各Api默认值
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.1.md

@@ -1,12 +0,0 @@
-# v1.5.1
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 支持 新Api: set_self_profile 可设置个性签名
-* 修复 Api: get_group_system_msg
-* 整理日志、添加颜色、使用统一的日志函数以提高日志可读性
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.2.md

@@ -1,13 +0,0 @@
-# v1.5.2
-
-QQ Version: Windows 9.9.10-24108 / Linux 3.2.7-23361
-
-## 修复与优化
-* 替换Uid/Uin为内部实现
-* 增加HttpApi调用稳定性
-* 修复 GetMsg 兼容性
-
-## 新增与调整
-* 支持真正意义上的陌生人信息获取 Api: GoCQHTTP_GetStrangerInfo
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.3.md

@@ -1,15 +0,0 @@
-# v1.5.3
-
-QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-23568
-
-## 修复与优化
-* 修复引用消息id问题
-* 修复添加好友的通知
-
-## 新增与调整
-* 扩展群分享Json生成
-* 扩展关于收藏的一系列接口
-* 支持专属群头衔获取
-* 支持视频获取直链
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.4.md

@@ -1,11 +0,0 @@
-# v1.5.4
-
-QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-23568
-
-## 修复与优化
-* 紧急修复视频与文件问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.5.md

@@ -1,11 +0,0 @@
-# v1.5.5
-
-QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-23568
-
-## 修复与优化
-* 紧急修复一些问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.6.md

@@ -1,11 +0,0 @@
-# v1.5.6
-
-QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-24568
-
-## 修复与优化
-* 修复一些问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.7.md

@@ -1,11 +0,0 @@
-# v1.5.7
-
-QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-24568
-
-## 修复与优化
-* 修复一些问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.8.md

@@ -1,14 +0,0 @@
-# v1.5.8
-
-QQ Version: Windows 9.9.11-24568 / Linux 3.2.9-24568
-
-## 修复与优化
-* 修复视频文件残留问题
-* 重构 getcookies接口 支持大部分常见域 
-
-## 新增与调整
-* 日志大小限制
-* 支持 QQ音乐 卡片 无签名支持时 启用内置方法（缺点没有封面 限速1min/条）
-* 支持Window X86-32机器
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.5.9.md

@@ -1,12 +0,0 @@
-# v1.5.9
-
-QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
-
-## 修复与优化
-* 优化缓存问题
-* 修复poke异常上报
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.0.md

@@ -1,11 +0,0 @@
-# v1.6.0
-
-QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
-
-## 修复与优化
-
-
-## 新增与调整
-* 新增图片subtype属性 区分表情图片与商城图片
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.1.md

@@ -1,11 +0,0 @@
-# v1.6.1
-
-QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
-
-## 修复与优化
-
-
-## 新增与调整
-* 修复poke异常事件
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.2.md

@@ -1,13 +0,0 @@
-# v1.6.2
-
-QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
-
-## 修复与优化
-* 修复获取Cookies异常崩溃问题
-* 尝试修复成员退群缓存问题
-* 修复自身退群后群缓存清理问题
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.3.md

@@ -1,13 +0,0 @@
-# v1.6.3
-
-QQ Version: Windows 9.9.11-24815 / Linux 3.2.9-24815
-
-## 修复与优化
-* 修复带有groupid的私聊消息异常发送到群聊消息
-* 尝试修复rws热重载失效问题
-* 尝试修复进群事件无法正常获取uin
-
-## 新增与调整
-
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.4.md

@@ -1,18 +0,0 @@
-# v1.6.4
-
-QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
-## 使用前警告
-1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
-2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
-3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
-## 其余·备注
-启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
-
-## 修复与优化
-1. 支持Win平台 9.9.12
-2. 修复部分发送图片下载异常情况
-
-## 新增与调整
-没有哦
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/changelogs/old/CHANGELOG.v1.6.5.md

@@ -1,18 +0,0 @@
-# v1.6.5
-
-QQ Version: Windows 9.9.12-26000 / Linux 3.2.9-26000
-## 使用前警告
-1. 在最近版本由于QQ本体大幅变动，为了保证NapCat可用性，NapCat近期启动与安装方式将将大幅变动，请关注文档和社群获取。
-2. 在Core上完全执行开源，请不要用于违法用途，如此可能造成NapCat完全停止更新。
-3. 针对原启动方式的围堵，NapCat研发了多种方式，除此其余理论与扩展的分析和思路将部分展示于Docs，以便各位参与开发与维护NapCat。
-## 其余·备注
-启动方式: WayBoot.03 （Electron Main进程为Node 直接注入代码 同理项目: LiteLoader）
-
-## 修复与优化
-1. 优化了WrapperNative载入代码
-2. 优化缓存
-
-## 新增与调整
-没有哦
-
-新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

docs/develop/Image.NTAndroid.md

@@ -1,48 +0,0 @@
-    public static final int C2C_PIC_DOWNLOAD = 1004;
-    public static final String C2C_PIC_DOWNLOAD_DOMAIN = "c2cpicdw.qpic.cn";
-    public static final String C2C_PIC_DOWNLOAD_QUIC_DOMAIN = "c2cpicdw.quic.qpic.cn";
-    public static final int FLAG_NOT_UPLOAD = 3;
-    public static final int FLAG_UPLOADINFO_ERROR = 4;
-    public static final int GROUP_PIC_DOWNLOAD = 1000;
-    public static final String GROUP_PIC_DOWNLOAD_DOMAIN = "gchat.qpic.cn";
-    public static final String GROUP_PIC_DOWNLOAD_QUIC_DOMAIN = "gchat.quic.qpic.cn";
-    public static final String GUILD_PIC_DOWNLOAD_DOMAIN = "gchat.qpic.cn/qmeetpic";
-    public static final boolean NEW_STORE_FLAG = true;
-    public static final String PTT_VIDEO_DOWNLOAD_DOMAIN = "grouptalk.c2c.qq.com";
-
-     protected static final int AVIF_DECODE_EXCEPTION = 4;
-    protected static final int AVIF_DECODE_FAIL = 1;
-    protected static final int AVIF_DECODE_FAIL_SO_FAIL = 2;
-    protected static final int AVIF_DECODE_FAIL_UNKNOWN = 6;
-    protected static final int AVIF_DECODE_FILETYPE_ERROR = 5;
-    protected static final int AVIF_DECODE_OOM = 3;
-    protected static final int AVIF_DECODE_RENAME_FAIL = 7;
-    protected static final int AVIF_DECODE_SUC = 0;
-    public static final String AVIF_FILE_SUFFIX = ".avif";
-    public static final int AVIF_REQ_APPRUNTIME_NULL = 12;
-    public static final int AVIF_REQ_CODEC_UNSURPPORT = 5;
-    protected static final int AVIF_REQ_DENSITY_UNSURPPORT = 10;
-    protected static final int AVIF_REQ_FLASH_PHOTO = 9;
-    protected static final int AVIF_REQ_HAS_TMP_AVIF = 7;
-    protected static final int AVIF_REQ_INVALID_MSG_RECORD = 2;
-    protected static final int AVIF_REQ_IS_RAW_PHOTO = 3;
-    protected static final int AVIF_REQ_OUTPUTSTREAM_UNSURPPORT = 11;
-    protected static final int AVIF_REQ_OVERSIZE = 6;
-    protected static final int AVIF_REQ_RETRY = 1;
-    public static final int AVIF_REQ_SO_DOWNLOAD_FAILED = 8;
-    protected static final int AVIF_REQ_SUC = 0;
-    public static final int AVIF_REQ_SWITCH_CLOSE = 4;
-    public static final String C2C_PIC_DOWNLOAD_ERROR_CODE = "C2CPicDownloadErrorCode";
-    static final int DOWNLOAD_ST_COMPLETE = 1;
-    static final int DOWNLOAD_ST_HEAD = 2;
-    static final int DOWNLOAD_ST_LEFT = 4;
-    static final int DOWNLOAD_ST_PART = 3;
-    private static final int ENCRYPT_APPID = 1600000226;
-    public static final String GROUP_PIC_DOWNLOAD_ERROR_CODE = "GroupPicDownloadErrorCode";
-    public static final String KEY_PIC_DOWNLOAD_ERROR_CODE = "param_detail_code";
-    protected static final int QUIC_FAIL_IP_LIST_EMPTY = 1;
-    protected static final int QUIC_FAIL_REQUEST_HTTPS = 3;
-    protected static final int QUIC_FAIL_REQUEST_QUIC = 2;
-    protected static final int QUIC_FAIL_SO_LOAD = 4;
-    public static final String REPORT_TAG_DIRECT_DOWNLOAD_FAIL = "report_direct_download_fail";
-    public static final String REQ_PARAM_AVIF = "tp=avif";

docs/develop/Msg常量NTAndroid.md

@@ -1,444 +0,0 @@
-```java
-MsgConstant
- int ARKSTRUCTELEMENTSUBTYPETENCENTDOCFROMMINIAPP = 1;
- int ARKSTRUCTELEMENTSUBTYPETENCENTDOCFROMPLUSPANEL = 2;
- int ARKSTRUCTELEMENTSUBTYPEUNKNOWN = 0;
- int ATTYPEALL = 1;
- int ATTYPECATEGORY = 512;
- int ATTYPECHANNEL = 16;
- int ATTYPEME = 4;
- int ATTYPEONE = 2;
- int ATTYPEONLINE = 64;
- int ATTYPEROLE = 8;
- int ATTYPESUMMON = 32;
- int ATTYPESUMMONONLINE = 128;
- int ATTYPESUMMONROLE = 256;
- int ATTYPEUNKNOWN = 0;
- int CALENDARELEMSUBTYPECOMMON = 3;
- int CALENDARELEMSUBTYPESTRONG = 1;
- int CALENDARELEMSUBTYPEUNKNOWN = 0;
- int CALENDARELEMSUBTYPEWEAK = 2;
- int FACEBUBBLEELEMSUBTYPENORMAL = 1;
- int FACEBUBBLEELEMSUBTYPEUNKNOWN = 0;
- int FETCHLONGMSGERRCODEMSGEXPIRED = 196;
- int FILEELEMENTSUBTYPEAI = 16;
- int FILEELEMENTSUBTYPEAPP = 11;
- int FILEELEMENTSUBTYPEAUDIO = 3;
- int FILEELEMENTSUBTYPEDOC = 4;
- int FILEELEMENTSUBTYPEEMOTICON = 15;
- int FILEELEMENTSUBTYPEEXCEL = 6;
- int FILEELEMENTSUBTYPEFOLDER = 13;
- int FILEELEMENTSUBTYPEHTML = 10;
- int FILEELEMENTSUBTYPEIPA = 14;
- int FILEELEMENTSUBTYPENORMAL = 0;
- int FILEELEMENTSUBTYPEPDF = 7;
- int FILEELEMENTSUBTYPEPIC = 1;
- int FILEELEMENTSUBTYPEPPT = 5;
- int FILEELEMENTSUBTYPEPSD = 12;
- int FILEELEMENTSUBTYPETXT = 8;
- int FILEELEMENTSUBTYPEVIDEO = 2;
- int FILEELEMENTSUBTYPEZIP = 9;
- int GRAYTIPELEMENTSUBTYPEAIOOP = 15;
- int GRAYTIPELEMENTSUBTYPEBLOCK = 14;
- int GRAYTIPELEMENTSUBTYPEBUDDY = 5;
- int GRAYTIPELEMENTSUBTYPEBUDDYNOTIFY = 9;
- int GRAYTIPELEMENTSUBTYPEEMOJIREPLY = 3;
- int GRAYTIPELEMENTSUBTYPEESSENCE = 7;
- int GRAYTIPELEMENTSUBTYPEFEED = 6;
- int GRAYTIPELEMENTSUBTYPEFEEDCHANNELMSG = 11;
- int GRAYTIPELEMENTSUBTYPEFILE = 10;
- int GRAYTIPELEMENTSUBTYPEGROUP = 4;
- int GRAYTIPELEMENTSUBTYPEGROUPNOTIFY = 8;
- int GRAYTIPELEMENTSUBTYPEJSON = 17;
- int GRAYTIPELEMENTSUBTYPELOCALMSG = 13;
- int GRAYTIPELEMENTSUBTYPEPROCLAMATION = 2;
- int GRAYTIPELEMENTSUBTYPEREVOKE = 1;
- int GRAYTIPELEMENTSUBTYPEUNKNOWN = 0;
- int GRAYTIPELEMENTSUBTYPEWALLET = 16;
- int GRAYTIPELEMENTSUBTYPEXMLMSG = 12;
- int INLINEKEYBOARDBUTTONRENDERSTYLEBLUEBLACKGROUND = 4;
- int INLINEKEYBOARDBUTTONRENDERSTYLEBLUEBORDER = 1;
- int INLINEKEYBOARDBUTTONRENDERSTYLEGRAYBORDER = 0;
- int INLINEKEYBOARDBUTTONRENDERSTYLENOBORDER = 2;
- int INLINEKEYBOARDBUTTONRENDERSTYLEREDCHARACTER = 3;
- int INPUTSTATUSTYPECANCEL = 2;
- int INPUTSTATUSTYPESPEAK = 3;
- int INPUTSTATUSTYPETEXT = 1;
- int KACTIVITYMSG = 22;
- int KADDLOCALMSGEXTINFOTYPEPROLOGUEMSG = 1;
- int KANONYMOUSATMEMSGTYPEINMSGBOX = 1001;
- int KANONYMOUSFLAGFROMOTHERPEOPLE = 1;
- int KANONYMOUSFLAGFROMOWN = 2;
- int KANONYMOUSFLAGINVALID = 0;
- int KAPPCHANNELMSG = 16;
- int KATALLMSGTYPEINMSGBOX = 2000;
- int KATMEMSGTYPEINMSGBOX = 1000;
- int KATTRIBUTETYPEADELIEMSG = 16;
- int KATTRIBUTETYPEEXTENDBUSINESS = 13;
- int KATTRIBUTETYPEFEEDBACKSTATE = 17;
- int KATTRIBUTETYPEGROUPHONOR = 2;
- int KATTRIBUTETYPEKINGHONOR = 3;
- int KATTRIBUTETYPELONGMSG = 8;
- int KATTRIBUTETYPEMEMORYSTATEMSGINFO = 18;
- int KATTRIBUTETYPEMSG = 0;
- int KATTRIBUTETYPEMSGBOXEVENTTYPE = 14;
- int KATTRIBUTETYPEPERSONAL = 1;
- int KATTRIBUTETYPEPUBLICACCOUNT = 4;
- int KATTRIBUTETYPEQQCONNECT = 12;
- int KATTRIBUTETYPESENDMSGRSPTRANSSVRINFO = 15;
- int KATTRIBUTETYPESHAREDMSGINFO = 5;
- int KATTRIBUTETYPETEMPCHATGAMESESSION = 6;
- int KATTRIBUTETYPETOROBOTMSG = 9;
- int KATTRIBUTETYPEUININFO = 7;
- int KATTRIBUTETYPEZPLAN = 11;
- int KAUTOREPLYTEXTNONEINDEX = -1;
- int KAVRECORDMSG = 19;
- int KBUSINESSTYPGUILD = 1;
- int KBUSINESSTYPNT = 0;
- int KCHATTYPEADELIE = 42;
- int KCHATTYPEBUDDYNOTIFY = 5;
- int KCHATTYPEC2C = 1;
- int KCHATTYPECIRCLE = 113;
- int KCHATTYPEDATALINE = 8;
- int KCHATTYPEDATALINEMQQ = 134;
- int KCHATTYPEDISC = 3;
- int KCHATTYPEFAV = 41;
- int KCHATTYPEGAMEMESSAGE = 105;
- int KCHATTYPEGAMEMESSAGEFOLDER = 116;
- int KCHATTYPEGROUP = 2;
- int KCHATTYPEGROUPBLESS = 133;
- int KCHATTYPEGROUPGUILD = 9;
- int KCHATTYPEGROUPHELPER = 7;
- int KCHATTYPEGROUPNOTIFY = 6;
- int KCHATTYPEGUILD = 4;
- int KCHATTYPEGUILDMETA = 16;
- int KCHATTYPEMATCHFRIEND = 104;
- int KCHATTYPEMATCHFRIENDFOLDER = 109;
- int KCHATTYPENEARBY = 106;
- int KCHATTYPENEARBYASSISTANT = 107;
- int KCHATTYPENEARBYFOLDER = 110;
- int KCHATTYPENEARBYHELLOFOLDER = 112;
- int KCHATTYPENEARBYINTERACT = 108;
- int KCHATTYPEQQNOTIFY = 132;
- int KCHATTYPERELATEACCOUNT = 131;
- int KCHATTYPESERVICEASSISTANT = 118;
- int KCHATTYPESERVICEASSISTANTSUB = 201;
- int KCHATTYPESQUAREPUBLIC = 115;
- int KCHATTYPESUBSCRIBEFOLDER = 30;
- int KCHATTYPETEMPADDRESSBOOK = 111;
- int KCHATTYPETEMPBUSSINESSCRM = 102;
- int KCHATTYPETEMPC2CFROMGROUP = 100;
- int KCHATTYPETEMPC2CFROMUNKNOWN = 99;
- int KCHATTYPETEMPFRIENDVERIFY = 101;
- int KCHATTYPETEMPNEARBYPRO = 119;
- int KCHATTYPETEMPPUBLICACCOUNT = 103;
- int KCHATTYPETEMPWPA = 117;
- int KCHATTYPEUNKNOWN = 0;
- int KCHATTYPEWEIYUN = 40;
- int KCOMMONREDENVELOPEMSGTYPEINMSGBOX = 1007;
- int KDOWNSOURCETYPEAIOINNER = 1;
- int KDOWNSOURCETYPEBIGSCREEN = 2;
- int KDOWNSOURCETYPEHISTORY = 3;
- int KDOWNSOURCETYPEUNKNOWN = 0;
- int KELEMTYPEACTIVITY = 25;
- int KELEMTYPEACTIVITYSTATE = 41;
- int KELEMTYPEACTIVITYSUBTYPECREATEMOBATEAM = 12;
- int KELEMTYPEACTIVITYSUBTYPEDISBANDMOBATEAM = 11;
- int KELEMTYPEACTIVITYSUBTYPEFEEDSQUARE = 10001;
- int KELEMTYPEACTIVITYSUBTYPEFINISHGAME = 16;
- int KELEMTYPEACTIVITYSUBTYPEFINISHMATCHTEAM = 14;
- int KELEMTYPEACTIVITYSUBTYPEHOTCHAT = 10000;
- int KELEMTYPEACTIVITYSUBTYPEMINIGAME = 18;
- int KELEMTYPEACTIVITYSUBTYPEMUSICPLAY = 17;
- int KELEMTYPEACTIVITYSUBTYPENEWSMOBA = 9;
- int KELEMTYPEACTIVITYSUBTYPENOLIVE = 2;
- int KELEMTYPEACTIVITYSUBTYPENOSCREENSHARE = 7;
- int KELEMTYPEACTIVITYSUBTYPENOVOICE = 3;
- int KELEMTYPEACTIVITYSUBTYPEONLIVE = 1;
- int KELEMTYPEACTIVITYSUBTYPEONSCREENSHARE = 6;
- int KELEMTYPEACTIVITYSUBTYPEONVOICE = 4;
- int KELEMTYPEACTIVITYSUBTYPESTARTMATCHTEAM = 13;
- int KELEMTYPEACTIVITYSUBTYPETARTGAME = 15;
- int KELEMTYPEACTIVITYSUBTYPEUNKNOWN = 0;
- int KELEMTYPEADELIEACTIONBAR = 44;
- int KELEMTYPEADELIERECOMMENDEDMSG = 43;
- int KELEMTYPEARKSTRUCT = 10;
- int KELEMTYPEAVRECORD = 21;
- int KELEMTYPECALENDAR = 19;
- int KELEMTYPEFACE = 6;
- int KELEMTYPEFACEBUBBLE = 27;
- int KELEMTYPEFEED = 22;
- int KELEMTYPEFILE = 3;
- int KELEMTYPEGIPHY = 15;
- int KELEMTYPEGRAYTIP = 8;
- int KELEMTYPEINLINEKEYBOARD = 17;
- int KELEMTYPEINTEXTGIFT = 18;
- int KELEMTYPELIVEGIFT = 12;
- int KELEMTYPEMARKDOWN = 14;
- int KELEMTYPEMARKETFACE = 11;
- int KELEMTYPEMULTIFORWARD = 16;
- int KELEMTYPEONLINEFILE = 23;
- int KELEMTYPEPIC = 2;
- int KELEMTYPEPROLOGUE = 46;
- int KELEMTYPEPTT = 4;
- int KELEMTYPEREPLY = 7;
- int KELEMTYPESHARELOCATION = 28;
- int KELEMTYPESTRUCTLONGMSG = 13;
- int KELEMTYPETASKTOPMSG = 29;
- int KELEMTYPETEXT = 1;
- int KELEMTYPETOFU = 26;
- int KELEMTYPEUNKNOWN = 0;
- int KELEMTYPEVIDEO = 5;
- int KELEMTYPEWALLET = 9;
- int KELEMTYPEYOLOGAMERESULT = 20;
- int KENTERAIO = 1;
- int KEXITAIO = 2;
- int KFEEDBACKBUTTONTYPEDISLIKE = 2;
- int KFEEDBACKBUTTONTYPELIKE = 1;
- int KFEEDBACKBUTTONTYPEPROMPTCLICK = 5;
- int KFEEDBACKBUTTONTYPEREGENERATE = 4;
- int KFEEDBACKBUTTONTYPEUNKNOWN = 0;
- int KFEEDBACKOPTLIKE = 1;
- int KFEEDBACKOPTUNKNOWN = 0;
- int KFEEDBACKOPTUNLIKE = 2;
- int KFRIENDNEWADDEDMSGTYPEINMSGBOX = 1008;
- int KGAMEBOXNEWMSGTYPEINMSGBOX = 3000;
- int KGIFTATMEMSGTYPEINMSGBOX = 1005;
- int KGROUPFILEATALLMSGTYPEINMSGBOX = 2001;
- int KGROUPHOMEWORK = 20000;
- int KGROUPHOMEWORKTASK = 20001;
- int KGROUPKEYWORDMSGTYPEINMSGBOX = 2006;
- int KGROUPMANNOUNCEATALLMSGTYPEINMSGBOX = 2004;
- int KGROUPTASKATALLMSGTYPEINMSGBOX = 2003;
- int KGROUPUNREADTYPEINMSGBOX = 2007;
- int KGUILDCHANNELLIST = 10;
- int KHIGHLIGHTWORDINTEMPCHATTYPEINMSGBOX = 1009;
- int KHOMEWORKREMINDER = 10000;
- int KLIKEORDISLIKESTATEDISLIKE = 2;
- int KLIKEORDISLIKESTATELIKE = 1;
- int KLIKEORDISLIKESTATENONESELECTED = 0;
- int KMARKETFACE = 17;
- int KMEMORYSTATEMSGTYPEADELIEWELCOME = 1;
- int KMEMORYSTATEMSGTYPEUNKNOWN = 0;
- int KMINIPROGRAMNOTICE = 114;
- int KMSGSUBTYPEARKGROUPANNOUNCE = 3;
- int KMSGSUBTYPEARKGROUPANNOUNCECONFIRMREQUIRED = 4;
- int KMSGSUBTYPEARKGROUPGIFTATME = 5;
- int KMSGSUBTYPEARKGROUPTASKATALL = 6;
- int KMSGSUBTYPEARKMULTIMSG = 7;
- int KMSGSUBTYPEARKNORMAL = 0;
- int KMSGSUBTYPEARKTENCENTDOCFROMMINIAPP = 1;
- int KMSGSUBTYPEARKTENCENTDOCFROMPLUSPANEL = 2;
- int KMSGSUBTYPEEMOTICON = 15;
- int KMSGSUBTYPEFILEAPP = 11;
- int KMSGSUBTYPEFILEAUDIO = 3;
- int KMSGSUBTYPEFILEDOC = 4;
- int KMSGSUBTYPEFILEEXCEL = 6;
- int KMSGSUBTYPEFILEFOLDER = 13;
- int KMSGSUBTYPEFILEHTML = 10;
- int KMSGSUBTYPEFILEIPA = 14;
- int KMSGSUBTYPEFILENORMAL = 0;
- int KMSGSUBTYPEFILEPDF = 7;
- int KMSGSUBTYPEFILEPIC = 1;
- int KMSGSUBTYPEFILEPPT = 5;
- int KMSGSUBTYPEFILEPSD = 12;
- int KMSGSUBTYPEFILETXT = 8;
- int KMSGSUBTYPEFILEVIDEO = 2;
- int KMSGSUBTYPEFILEZIP = 9;
- int KMSGSUBTYPELINK = 5;
- int KMSGSUBTYPEMARKETFACE = 1;
- int KMSGSUBTYPEMIXEMOTICON = 7;
- int KMSGSUBTYPEMIXFACE = 3;
- int KMSGSUBTYPEMIXMARKETFACE = 2;
- int KMSGSUBTYPEMIXPIC = 1;
- int KMSGSUBTYPEMIXREPLY = 4;
- int KMSGSUBTYPEMIXTEXT = 0;
- int KMSGSUBTYPETENCENTDOC = 6;
- int KMSGTYPEARKSTRUCT = 11;
- int KMSGTYPEFACEBUBBLE = 24;
- int KMSGTYPEFILE = 3;
- int KMSGTYPEGIFT = 14;
- int KMSGTYPEGIPHY = 13;
- int KMSGTYPEGRAYTIPS = 5;
- int KMSGTYPEMIX = 2;
- int KMSGTYPEMULTIMSGFORWARD = 8;
- int KMSGTYPENULL = 1;
- int KMSGTYPEONLINEFILE = 21;
- int KMSGTYPEONLINEFOLDER = 27;
- int KMSGTYPEPROLOGUE = 29;
- int KMSGTYPEPTT = 6;
- int KMSGTYPEREPLY = 9;
- int KMSGTYPESHARELOCATION = 25;
- int KMSGTYPESTRUCT = 4;
- int KMSGTYPESTRUCTLONGMSG = 12;
- int KMSGTYPETEXTGIFT = 15;
- int KMSGTYPEUNKNOWN = 0;
- int KMSGTYPEVIDEO = 7;
- int KMSGTYPEWALLET = 10;
- int KNEEDCONFIRMGROUPMANNOUNCEATALLMSGTYPEINMSGBOX = 2005;
- int KNOTPASSTHROUGHEVENTTYPEUPPERBOUNDARY = 9999;
- int KPTTFORMATTYPEAMR = 0;
- int KPTTFORMATTYPESILK = 1;
- int KPTTTRANSLATESTATUSFAIL = 3;
- int KPTTTRANSLATESTATUSSUC = 2;
- int KPTTTRANSLATESTATUSTRANSLATING = 1;
- int KPTTTRANSLATESTATUSUNKNOWN = 0;
- int KPTTVIPLEVELTYPENONE = 0;
- int KPTTVIPLEVELTYPEQQVIP = 0;
- int KPTTVIPLEVELTYPESVIP = 0;
- int KPTTVOICECHANGETYPEBEASTMACHINE = 7;
- int KPTTVOICECHANGETYPEBOY = 2;
- int KPTTVOICECHANGETYPECATCHCOLD = 13;
- int KPTTVOICECHANGETYPEECHO = 5;
- int KPTTVOICECHANGETYPEFATGUY = 16;
- int KPTTVOICECHANGETYPEFLASHING = 9;
- int KPTTVOICECHANGETYPEGIRL = 1;
- int KPTTVOICECHANGETYPEHORRIBLE = 3;
- int KPTTVOICECHANGETYPEKINDERGARTEN = 6;
- int KPTTVOICECHANGETYPEMEDAROT = 15;
- int KPTTVOICECHANGETYPENONE = 0;
- int KPTTVOICECHANGETYPEOPTIMUSPRIME = 8;
- int KPTTVOICECHANGETYPEOUTOFDATE = 14;
- int KPTTVOICECHANGETYPEPAPI = 11;
- int KPTTVOICECHANGETYPEQUICK = 4;
- int KPTTVOICECHANGETYPESTUTTER = 10;
- int KPTTVOICECHANGETYPETRAPPEDBEAST = 12;
- int KPTTVOICETYPEINTERCOM = 1;
- int KPTTVOICETYPESOUNDRECORD = 2;
- int KPTTVOICETYPEUNKNOW = 0;
- int KPTTVOICETYPEVOICECHANGE = 3;
- int KPUBLICACCOUNTTIANSHUHIGHLIGHTWORDTYPEINMSGBOX = 1010;
- int KREPLYABSELEMTYPEFACE = 2;
- int KREPLYABSELEMTYPEPIC = 3;
- int KREPLYABSELEMTYPETEXT = 1;
- int KREPLYABSELEMTYPEUNKNOWN = 0;
- int KREPLYATMEMSGTYPEINMSGBOX = 1002;
- int KRMDOWNTYPEORIG = 1;
- int KRMDOWNTYPETHUMB = 2;
- int KRMDOWNTYPEUNKNOWN = 0;
- int KRMFILETHUMBSIZE128 = 128;
- int KRMFILETHUMBSIZE320 = 320;
- int KRMFILETHUMBSIZE384 = 384;
- int KRMFILETHUMBSIZE750 = 750;
- int KRMPICAIOTHUMBSIZE = 0;
- int KRMPICTHUMBSIZE198 = 198;
- int KRMPICTHUMBSIZE720 = 720;
- int KRMPICTYPEBMP = 3;
- int KRMPICTYPECHECKOTHER = 900;
- int KRMPICTYPEGIF = 2;
- int KRMPICTYPEJPG = 0;
- int KRMPICTYPENEWPICAPNG = 2001;
- int KRMPICTYPENEWPICBMP = 1005;
- int KRMPICTYPENEWPICGIF = 2000;
- int KRMPICTYPENEWPICJPEG = 1000;
- int KRMPICTYPENEWPICPNG = 1001;
- int KRMPICTYPENEWPICPROGERSSIVJPEG = 1003;
- int KRMPICTYPENEWPICSHARPP = 1004;
- int KRMPICTYPENEWPICWEBP = 1002;
- int KRMPICTYPEPNG = 1;
- int KRMPICTYPEUNKOWN = 0;
- int KRMTHUMBSIZEZERO = 0;
- int KRMTRNASFERSTATUSDOWNLOADING = 3;
- int KRMTRNASFERSTATUSFAIL = 5;
- int KRMTRNASFERSTATUSINIT = 1;
- int KRMTRNASFERSTATUSSUC = 4;
- int KRMTRNASFERSTATUSUNKOW = 0;
- int KRMTRNASFERSTATUSUPLOADING = 2;
- int KRMTRNASFERSTATUSUSERCANCEL = 6;
- int KSEEKINGPARTNERFLAGSEEKING = 1;
- int KSEEKINGPARTNERFLAGUNKNOWN = 0;
- int KSENDSTATUSFAILED = 0;
- int KSENDSTATUSSENDING = 1;
- int KSENDSTATUSSUCCESS = 2;
- int KSENDSTATUSSUCCESSNOSEQ = 3;
- int KSENDTYPEDROPPED = 6;
- int KSENDTYPELOCAL = 3;
- int KSENDTYPEOTHERDEVICE = 2;
- int KSENDTYPERECV = 0;
- int KSENDTYPESELF = 1;
- int KSENDTYPESELFFORWARD = 4;
- int KSENDTYPESELFMULTIFORWARD = 5;
- int KSESSIONTYPEADDRESSBOOK = 5;
- int KSESSIONTYPEC2C = 1;
- int KSESSIONTYPEDISC = 3;
- int KSESSIONTYPEFAV = 41;
- int KSESSIONTYPEGROUP = 2;
- int KSESSIONTYPEGROUPBLESS = 52;
- int KSESSIONTYPEGUILD = 4;
- int KSESSIONTYPEGUILDMETA = 16;
- int KSESSIONTYPENEARBYPRO = 54;
- int KSESSIONTYPEQQNOTIFY = 51;
- int KSESSIONTYPERELATEACCOUNT = 50;
- int KSESSIONTYPESERVICEASSISTANT = 19;
- int KSESSIONTYPESUBSCRIBEFOLDER = 30;
- int KSESSIONTYPETYPEBUDDYNOTIFY = 7;
- int KSESSIONTYPETYPEGROUPHELPER = 9;
- int KSESSIONTYPETYPEGROUPNOTIFY = 8;
- int KSESSIONTYPEUNKNOWN = 0;
- int KSESSIONTYPEWEIYUN = 40;
- int KSPECIALCAREMSGTYPEINMSGBOX = 1006;
- int KSPECIFIEDREDENVELOPEATMEMSGTYPEINMSGBOX = 1004;
- int KSPECIFIEDREDENVELOPEATONEMSGTYPEINMSGBOX = 1003;
- int KTENCENTDOCTYPEADDON = 110;
- int KTENCENTDOCTYPEDOC = 0;
- int KTENCENTDOCTYPEDRAWING = 89;
- int KTENCENTDOCTYPEDRIVE = 101;
- int KTENCENTDOCTYPEFILE = 100;
- int KTENCENTDOCTYPEFLOWCHART = 91;
- int KTENCENTDOCTYPEFOLDER = 3;
- int KTENCENTDOCTYPEFORM = 2;
- int KTENCENTDOCTYPEMIND = 90;
- int KTENCENTDOCTYPENOTES = 5;
- int KTENCENTDOCTYPEPDF = 6;
- int KTENCENTDOCTYPEPROGRAM = 7;
- int KTENCENTDOCTYPESHEET = 1;
- int KTENCENTDOCTYPESLIDE = 4;
- int KTENCENTDOCTYPESMARTCANVAS = 8;
- int KTENCENTDOCTYPESMARTSHEET = 9;
- int KTENCENTDOCTYPESPEECH = 102;
- int KTENCENTDOCTYPEUNKNOWN = 10;
- int KTOFURECORDMSG = 23;
- int KTOPMSGTYPETASK = 1;
- int KTOPMSGTYPEUNKNOWN = 0;
- int KTRIGGERTYPEAUTO = 1;
- int KTRIGGERTYPEMANUAL = 0;
- int KUNKNOWN = 0;
- int KUNKNOWNTYPEINMSGBOX = 0;
- int KUNREADCNTUPTYPEALLDIRECTSESSION = 4;
- int KUNREADCNTUPTYPEALLFEEDSINGUILD = 6;
- int KUNREADCNTUPTYPEALLGUILD = 3;
- int KUNREADCNTUPTYPECATEGORY = 5;
- int KUNREADCNTUPTYPECHANNEL = 1;
- int KUNREADCNTUPTYPECONTACT = 0;
- int KUNREADCNTUPTYPEGUILD = 2;
- int KUNREADCNTUPTYPEGUILDGROUP = 7;
- int KUNREADSHOWTTYPEGRAYPOINT = 2;
- int KUNREADSHOWTYPEREDPOINT = 1;
- int KUNREADSHOWTYPESMALLGRAYPOINT = 4;
- int KUNREADSHOWTYPESMALLREDPOINT = 3;
- int KUNREADSHOWTYPEUNKNOWN = 0;
- int KVASGIFTCOINTYPECOIN = 0;
- int KVASGIFTCOINTYPEMARKETCOIN = 1;
- int KYOLOGAMERESULTMSG = 18;
- int PIC_800_RECOMMENDED = 7;
- int PIC_AIGC_EMOJI = 14;
- int PIC_ALBUM_GIF = 11;
- int PIC_COMMERCIAL_ADVERTISING = 9;
- int PIC_FIND = 10;
- int PIC_HOT = 2;
- int PIC_HOT_EMOJI = 13;
- int PIC_NORMAL = 0;
- int PIC_PK = 3;
- int PIC_QQZONE = 5;
- int PIC_SELFIE_GIF = 8;
- int PIC_SEND_FROM_TAB_SEARCH_BOX = 12;
- int PIC_USER = 1;
- int PIC_WISDOM_FIGURE = 4;
- int REPLYORIGINALMSGSTATEHASRECALL = 1;
- int REPLYORIGINALMSGSTATEUNKNOWN = 0;
- int SHARELOCATIONELEMSUBTYPENORMAL = 1;
- int SHARELOCATIONELEMSUBTYPEUNKNOWN = 0;
- int TEXTELEMENTSUBTYPELINK = 1;
- int TEXTELEMENTSUBTYPETENCENTDOC = 2;
- int TEXTELEMENTSUBTYPEUNKNOWN = 0;
-```

docs/develop/NC 1.6.X的计划.md

@@ -1,16 +0,0 @@
-# 开发方向
-方向一 NativeCall/Hook:
-1. 崩溃检测机制的实现
-2. Api_Caller 的Hook 可以拿到Event/Handler 进一步提升NC 即时的拦截与处理一些事件比如ReCall拦截
-3. Node包装层 进一步分析，拿到脱离自带Listener/Adapter，可以拿到一些更加底层的数据变动 或许包括更多二进制数据
-
-方向二 全新的无头启动 Way01
-1. 基于Node启动原理，借助导出符号获取函数地址 再次还原NodeMain
-
-方向三 发包与收包
-1. 参考 方向一/3 大概可以收包
-2. 发包 （暂时没有计划）
-
-方向四 版本控制
-1. 根据不同版本进行逻辑控制
-2. 某些参数的自动提取

docs/develop/碎碎的研究记录.md

@@ -1 +0,0 @@
-getMsgUniqueId 传入时间 产出一个唯一ID 发送消息作为一个参数

manifest.json

@@ -0,0 +1,33 @@
+{
+  "manifest_version": 4,
+  "type": "extension",
+  "name": "NapCatQQ",
+  "slug": "NapCat.Framework",
+  "description": "高性能的 OneBot 11 协议实现",
+  "version": "2.0.37",
+  "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

@@ -2,27 +2,19 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "1.6.6",
+  "version": "2.0.37",
   "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:framework": "vite build --mode framework",
+    "build:shell": "vite build --mode shell",
     "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": {
     "@babel/core": "^7.24.7",
-    "@babel/preset-typescript": "^7.24.7",
-    "vite-plugin-babel": "^1.2.0",
     "@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",
@@ -31,10 +23,10 @@
     "@types/express": "^4.17.21",
     "@types/figlet": "^1.5.8",
     "@types/fluent-ffmpeg": "^2.1.24",
-    "@types/node": "^20.11.30",
+    "@types/jest": "^29.5.12",
+    "@types/node": "^22.0.1",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/uuid": "^10.0.0",
-    "@types/ws": "^8.5.10",
+    "@types/ws": "^8.5.12",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
     "eslint": "^8.57.0",
@@ -47,14 +39,16 @@
     "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.0.0",
+    "commander": "^12.1.0",
     "cors": "^2.8.5",
     "express": "^5.0.0-beta.2",
     "fast-xml-parser": "^4.3.6",
@@ -65,8 +59,7 @@
     "log4js": "^6.9.1",
     "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.6.1",
-    "sqlite3": "^5.1.7",
-    "uuid": "^10.0.0",
-    "ws": "^8.16.0"
+    "strtok3": "8.0.1",
+    "ws": "^8.18.0"
   }
 }

script/BootWay.03.ps1

@@ -42,4 +42,4 @@ if (!(Test-Path $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 $params}"
+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/BootWay05_init.bat

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

script/BootWay05_run.bat

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

script/BootWay05_run.utf8.bat

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

script/NapCat.164.bat

@@ -1,28 +0,0 @@
-@echo off
-chcp 65001
-:: 检查是否有管理员权限
-net session >nul 2>&1
-if %errorlevel% neq 0 (
-    echo 请求管理员权限...
-    powershell -Command "Start-Process '%~f0' -Verb runAs"
-    exit /b
-)
-:: 如果有管理员权限，继续执行
-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"
-
-echo !QQPath!
-"!QQPath!" --enable-logging  %*
-
-pause

script/NapCat.Way01.bat

@@ -1,3 +0,0 @@
-REM 全新启动脚本 基于 Hook Native 预计版本1.6.0左右发布
-@echo off
-pause

script/checkVersion.cjs

@@ -11,7 +11,7 @@ try {
 
   // 验证 targetVersion 格式
   if (!targetVersion || typeof targetVersion !== 'string') {
-    console.error("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
+    console.log("[NapCat] [CheckVersion] 目标版本格式不正确或未设置！");
     return;
   }
 
@@ -38,5 +38,5 @@ try {
     writeScriptToFile(safeScriptContent);
   }
 } catch (error) {
-  console.error("[NapCat] [CheckVersion] 检测过程中发生错误：", 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/index.js

@@ -1,20 +0,0 @@
-// --------------------
-// 2024.7.3 9.9.12 BootWay.03 其余方法暂不公开（此方案为临时方案 Win平台已验证）
-// 缺陷 （已知）
-// 1.与非入侵式不同 现在破坏本体代码
-// 2.重启代码与正常启动代码失效 
-// 3.Win需要补丁
-// 4.更新后丢失内容 需要重写此文件
-// 5.安装难度上升与周围基础设施失效
-// --------------------
-
-const path = require('path');
-const CurrentPath = path.dirname(__filename)
-const hasNapcatParam = process.argv.includes('--enable-logging');
-if (hasNapcatParam) {
-    (async () => {
-        await import("file://" + path.join(CurrentPath, './napcat/napcat.mjs'));
-    })();
-} else {
-    require('./launcher.node').load('external_index', module);
-}

script/napcat-9912-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!"
-cd /d !QQPath!
-echo !QQPath!
-QQ.exe --enable-logging %*

script/napcat-9912-utf8.ps1

@@ -1,41 +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) + "\"
-    }
-    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"
-}
-
-Set-Location -Path $QQpath
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& chcp 65001;& ./QQ.exe --enable-logging $params}"

script/napcat-9912.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!
-cd /d !QQPath!
-echo !QQPath!
-QQ.exe --enable-logging %*

script/napcat-9912.ps1

@@ -1,41 +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) + "\"
-    }
-    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"
-}
-
-Set-Location -Path $QQpath
-Start-Process powershell -ArgumentList "-noexit", "-noprofile", "-command &{& ./QQ.exe --enable-logging $params}"

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.mjs %*

script/napcat-utf8.ps1

@@ -1,43 +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 "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)' $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.mjs %*

script/napcat.ps1

@@ -1,43 +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 "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 &{& '$($commandInfo.Path)' $Bootfile $params}"

script/napcat.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-get_script_dir() {
-  local script_path="${1:-$0}"
-  local script_dir
-  script_path=$(readlink -f "$script_path")
-  script_dir=$(dirname "$script_path")
-
-  echo "$script_dir"
-}
-
-SCRIPT_DIR=$(get_script_dir)
-
-export ELECTRON_RUN_AS_NODE=1
-
-if ! [ -x /opt/QQ/qq ]; then
-    echo "Error: /opt/QQ/qq is not executable or does not exist." >&2
-    exit 1
-fi
-
-/opt/QQ/qq "${SCRIPT_DIR}/napcat.mjs" "$@"

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.37';
+
+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,124 +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);
-      }).on('error', (err) => {
-        logError('HTTP服务启动失败', err.toString());
-      });
-    } catch (e: any) {
-      logError('HTTP服务启动失败, 请检查监听的ip地址和端口', e.stack.toString());
-    }
-  }
-}

src/common/server/websocket.ts

@@ -1,105 +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
-      }).on('error', () => {
-      });
-      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,36 +0,0 @@
-import { sleep } from '@/common/utils/helper';
-import { logError } from './log';
-type AsyncQueueTask = (() => void) | (()=>Promise<void>);
-// 2024.7.13 废弃
-
-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);
-        logError(e);
-      }
-      this.tasks.shift();
-      await sleep(100);
-    }
-  }
-}

src/common/utils/ConfigBase.ts

@@ -1,73 +1,67 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import { log, logDebug, logError } from '@/common/utils/log';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import type { NapCatCore } from '@/core';
 
+export abstract class ConfigBase<T> {
+    name: string;
+    coreContext: NapCatCore;
+    configPath: string;
+    configData: T = {} as T;
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-const configDir = path.resolve(__dirname, 'config');
-fs.mkdirSync(configDir, { recursive: true });
-
-
-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/EventTask.ts

@@ -1,181 +0,0 @@
-import { NodeIQQNTWrapperSession } from '@/core/wrapper';
-import { randomUUID } from 'crypto';
-
-interface Internal_MapKey {
-  timeout: number,
-  createtime: number,
-  func: (...arg: any[]) => any,
-}
-
-export class ListenerClassBase {
-  [key: string]: string;
-}
-
-export interface ListenerIBase {
-  // eslint-disable-next-line @typescript-eslint/no-misused-new
-  new(listener: any): ListenerClassBase;
-}
-
-export class NTEventWrapper {
-
-  private ListenerMap: { [key: string]: ListenerIBase } | undefined;//ListenerName-Unique -> Listener构造函数
-  private WrapperSession: NodeIQQNTWrapperSession | undefined;//WrapperSession
-  private ListenerManger: 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() {
-
-  }
-  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);
-      }
-    });
-  }
-  init({ ListenerMap, WrapperSession }: { ListenerMap: { [key: string]: typeof ListenerClassBase }, WrapperSession: NodeIQQNTWrapperSession }) {
-    this.ListenerMap = ListenerMap;
-    this.WrapperSession = WrapperSession;
-  }
-  CreatEventFunction<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;
-    }
-
-  }
-  CreatListenerFunction<T>(listenerMainName: string, uniqueCode: string = ''): T {
-    const ListenerType = this.ListenerMap![listenerMainName];
-    let Listener = this.ListenerManger.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.CreatEventFunction<(listener: T) => number>(Service);
-      addfunc!(Listener as T);
-      //console.log(addfunc!(Listener as T));
-      this.ListenerManger.set(listenerMainName + uniqueCode, Listener);
-    }
-    return Listener as T;
-  }
-  //统一回调清理事件
-  async DispatcherListener(ListenerMainName: string, ListenerSubName: string, ...args: any[]) {
-    //console.log(ListenerMainName, this.EventTask.get(ListenerMainName), ListenerSubName, this.EventTask.get(ListenerMainName)?.get(ListenerSubName));
-    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;
-      }
-      task.func(...args);
-    });
-  }
-  async CallNoListenerEvent<EventType extends (...args: any[]) => Promise<any>,>(EventName = '', timeout: number = 3000, ...args: Parameters<EventType>) {
-    return new Promise<Awaited<ReturnType<EventType>>>(async (resolve, reject) => {
-      const EventFunc = this.CreatEventFunction<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);
-    });
-  }
-  async CallNormalEvent<EventType extends (...args: any[]) => Promise<any>, ListenerType extends (...args: any[]) => void>(EventName = '', ListenerName = '', waitTimes = 1, timeout: number = 3000, ...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 < waitTimes) {
-          reject(new Error('NTEvent EventName:' + EventName + ' ListenerName:' + ListenerName + ' timeout'));
-        } else {
-          resolve([retEvent as Awaited<ReturnType<EventType>>, ...retData!]);
-        }
-      };
-      const Timeouter = setTimeout(databack, timeout);
-
-      const ListenerNameList = ListenerName.split('/');
-      const ListenerMainName = ListenerNameList[0];
-      const ListenerSubName = ListenerNameList[1];
-      const eventCallbak = {
-        timeout: timeout,
-        createtime: Date.now(),
-        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.CreatListenerFunction(ListenerMainName);
-      const EventFunc = this.CreatEventFunction<EventType>(EventName);
-      //console.log("测试打点", args);
-      retEvent = await EventFunc!(...(args as any[]));
-    });
-  }
-}
-export const NTEventDispatch = new NTEventWrapper();
-
-// 示例代码 快速创建事件
-// 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/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/LRUCache.ts

@@ -1,161 +0,0 @@
-import { logError, logDebug } from '@/common/utils/log';
-
-type group_id = number;
-type user_id = number;
-
-class cacheNode<T> {
-  value: T;
-  groupId: group_id;
-  userId: user_id;
-  prev: cacheNode<T> | null;
-  next: cacheNode<T> | null;
-  timestamp: number;
-
-  constructor(groupId: group_id, userId: user_id, value: T) {
-    this.groupId = groupId;
-    this.userId = userId;
-    this.value = value;
-    this.prev = null;
-    this.next = null;
-    this.timestamp = Date.now();
-  }
-}
-
-type cache<T, K = { [key: user_id]: cacheNode<T> }> = { [key: group_id]: K };
-type removeObject<T> = cache<T, { userId: user_id, value: T }[]>
-class LRU<T> {
-  private maxAge: number;
-  private maxSize: number;
-  private currentSize: number;
-  private cache: cache<T>;
-  private head: cacheNode<T> | null = null;
-  private tail: cacheNode<T> | null = null;
-  private onFuncs: ((node: removeObject<T>) => void)[] = [];
-
-  constructor(maxAge: number = 6e4 * 3, maxSize: number = 1e4) {
-    this.maxAge = maxAge;
-    this.maxSize = maxSize;
-    this.cache = Object.create(null);
-    this.currentSize = 0;
-
-    if (maxSize == 0) return;
-    setInterval(() => this.removeExpired(), this.maxAge);
-  }
-
-  // 移除LRU节点
-  private removeLRUNode(node: cacheNode<T>) {
-    logDebug(
-      'removeLRUNode',
-      node.groupId,
-      node.userId,
-      node.value,
-      this.currentSize
-    );
-    node.prev = node.next = null;
-    delete this.cache[node.groupId][node.userId];
-    this.removeNode(node);
-    this.onFuncs.forEach((func) => func({ [node.groupId]: [node] }));
-    this.currentSize--;
-  }
-
-  public on(func: (node: removeObject<T>) => void) {
-    this.onFuncs.push(func);
-  }
-
-  private removeExpired() {
-    const now = Date.now();
-    let current = this.tail;
-    let totalNodeNum = 0;
-
-    const removeObject: cache<T, { userId: user_id, value: T }[]> = {};
-
-    while (current && now - current.timestamp > this.maxAge) {
-      // 收集节点
-      if (!removeObject[current.groupId]) removeObject[current.groupId] = [];
-      removeObject[current.groupId].push({ userId: current.userId, value: current.value });
-      // 删除LRU节点
-      delete this.cache[current.groupId][current.userId];
-      current = current.prev;
-      totalNodeNum++;
-      this.currentSize--;
-    }
-
-    if (!totalNodeNum) return;
-
-    // 跟新链表指向
-    if (current) { current.next = null; } else { this.head = null; }
-    this.tail = current;
-
-    this.onFuncs.forEach(func => func(removeObject));
-  }
-
-  private addNode(node: cacheNode<T>) {
-    node.next = this.head;
-    if (this.head) this.head.prev = node;
-    if (!this.tail) this.tail = node;
-    this.head = node;
-  }
-
-  private removeNode(node: cacheNode<T>) {
-    if (node.prev) node.prev.next = node.next;
-    if (node.next) node.next.prev = node.prev;
-    if (node === this.head) this.head = node.next;
-    if (node === this.tail) this.tail = node.prev;
-  }
-
-  private moveToHead(node: cacheNode<T>) {
-    if (this.head === node) return;
-
-    this.removeNode(node);
-    this.addNode(node);
-    node.prev = null;
-  }
-
-  public set(groupId: group_id, userId: user_id, value: T) {
-    if (!this.cache[groupId]) {
-      this.cache[groupId] = Object.create(null);
-    }
-
-    const groupObject = this.cache[groupId];
-
-    if (groupObject[userId]) {
-      const node = groupObject[userId];
-      node.value = value;
-      node.timestamp = Date.now();
-      this.moveToHead(node);
-    } else {
-      const node = new cacheNode(groupId, userId, value);
-      groupObject[userId] = node;
-      this.currentSize++;
-      this.addNode(node);
-      if (this.currentSize > this.maxSize) {
-        const tail = this.tail!;
-        this.removeLRUNode(tail);
-      }
-    }
-  }
-  public get(groupId: group_id): { userId: user_id; value: T }[];
-  public get(groupId: group_id, userId: user_id): null | { userId: user_id; value: T };
-  public get(groupId: group_id, userId?: user_id): any {
-    const groupObject = this.cache[groupId];
-    if (!groupObject) return userId === undefined ? [] : null;
-
-    if (userId === undefined) {
-      return Object.entries(groupObject).map(([userId, { value }]) => ({
-        userId: Number(userId),
-        value,
-      }));
-    }
-
-    if (groupObject[userId]) {
-      return { userId, value: groupObject[userId].value };
-    }
-
-    return null;
-
-  }
-}
-
-
-
-export default LRU;

src/common/utils/MessageUnique.ts

@@ -1,53 +1,150 @@
+import { Peer } from '@/core';
 import crypto from 'crypto';
 
-class LimitedHashTable<K, V> {
-  private keyToValue: Map<K, V> = new Map();
-  private valueToKey: Map<V, K> = new Map();
-  private maxSize: number;
-  private KeyQueneList: K[] = [];
-  private ValueQueneList: V[] = [];
-  constructor(maxSize: number) {
-    this.maxSize = maxSize;
-  }
-  set(key: K, value: V): void {
-    this.keyToValue.set(key, value);
-    this.valueToKey.set(value, key);
-    if (this.KeyQueneList.length >= this.maxSize || this.ValueQueneList.length >= this.maxSize) {
-      this.KeyQueneList.shift();
-      this.ValueQueneList.shift();
+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;
     }
-  }
 
-  getValue(key: K): V | undefined {
-    return this.keyToValue.get(key);
-  }
-
-  getKey(value: V): K | undefined {
-    return this.valueToKey.get(value);
-  }
-
-  delete(key: K): void {
-    const value = this.keyToValue.get(key);
-    if (value !== undefined) {
-      this.keyToValue.delete(key);
-      this.valueToKey.delete(value);
+    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 msgIdMap: LimitedHashTable<number, string> = new LimitedHashTable(1000);
-  createMsg(MsgId: string) {
-    const ShortId = parseInt(crypto.createHash('sha1').update('2345').digest('hex').slice(0, 8), 16);
-    this.msgIdMap.set(ShortId, MsgId);
-    return ShortId;
-  }
-  getMsgIdByShortId(ShortId: number) {
-    return this.msgIdMap.getValue(ShortId);
-  }
-  getShortIdByMsgId(MsgId: string) {
-    return this.msgIdMap.getKey(MsgId);
-  }
+    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 = new MessageUniqueWrapper();
+export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();

src/common/utils/Packet.ts

@@ -1,17 +0,0 @@
-// 方案一 MiniApp发包方案
-// 前置条件： 处于GUI环境 存在MiniApp
-
-import { NTQQSystemApi } from '@/core';
-
-// 前排提示： 开发验证仅Win平台开展
-export class MiniAppUtil {
-  static async RunMiniAppWithGUI() {
-    //process.env.ELECTRON_RUN_AS_NODE = undefined;//没用还是得自己用cpp之类的语言写个程序转发参数
-    return NTQQSystemApi.BootMiniApp(process.execPath, 'miniapp://open/1007?url=https%3A%2F%2Fm.q.qq.com%2Fa%2Fs%2Fedd0a83d3b8afe233dfa07adaaf8033f%3Fscene%3D1007%26min_refer%3D10001');
-  }
-}
-// 方案二 MiniApp发包方案 替代MiniApp方案
-// 前置条件： 无
-export class MojoMiniAppUtil{
-
-}

src/common/utils/QQBasicInfo.ts

@@ -1,77 +1,81 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import os from 'node:os';
 import { systemPlatform } from '@/common/utils/system';
-import { logError } from '@/common/utils/log';
+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.12-25765',
-  'curVersion': '9.9.12-25765',
-  'prevVersion': '',
-  'onErrorVersions': [],
-  'buildId': '25765'
-};
-
-if (fs.existsSync(configVersionInfoPath)) {
-  try {
-    const _ =JSON.parse(fs.readFileSync(configVersionInfoPath).toString());
-    _qqVersionConfigInfo = Object.assign(_qqVersionConfigInfo, _);
-  } catch (e) {
-    logError('Load QQ version config info failed, Use default version', e);
-  }
-}
-
-export const qqVersionConfigInfo: QQVersionConfigInfo = _qqVersionConfigInfo;
-//V1_WIN_NQ_9.9.12_25765_GW_B
-export const qqPkgInfo: QQPkgInfo = JSON.parse(fs.readFileSync(pkgInfoPath).toString());
-// platform_type: 3,
-// app_type: 4,
-// app_version: '9.9.12-25765',
-// qua: 'V1_WIN_NQ_9.9.12_25765_GW_B',
-// appid: '537234702',
-// platVer: '10.0.26100',
-// clientVer: '9.9.9-25765',
-
-// Linux
-// app_version: '3.2.9-25765',
-// qua: 'V1_LNX_NQ_3.2.10_25765_GW_B',
-
-let _appid: string = '537234702';  // 默认为 Windows 平台的 appid
-if (systemPlatform === 'linux') {
-  _appid = '537234773';
-}
-// todo: mac 平台的 appid
-export const appid = _appid;
+export let QQBasicInfo: QQBasicInfoWrapper | undefined;

src/common/utils/audio.ts

@@ -1,136 +1,90 @@
 import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isWav, isSilk } 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) {
-      logError('读取文件错误:', 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 file = await fsPromise.readFile(filePath);
-    const pttPath = path.join(TEMP_DIR, uuidv4());
-    if (!isSilk(file)) {
-      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 => {
-            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 = 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);
-      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) {
-        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,23 +0,0 @@
-import * as os from 'os';
-import path from 'node:path';
-import fs from 'fs';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-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) {
-    console.error(e);
-  }
-}

src/common/utils/db.ts

@@ -1,477 +0,0 @@
-import { ElementType, FileElement, PicElement, PttElement, RawMessage, VideoElement } from '../../core/src/entities';
-
-import sqlite3 from 'sqlite3';
-import { log, logDebug, logError } from '@/common/utils/log';
-import { NTQQMsgApi } from '@/core';
-import LRU from '@/common/utils/LRUCache';
-
-export interface IRember {
-  last_sent_time: number;
-  join_time: number;
-  user_id: number;
-}
-
-
-type DBMsg = {
-  id: number,
-  shortId: number,
-  longId: string,
-  seq: number,
-  peerUid: string,
-  chatType: number,
-}
-
-type DBFile = {
-  name: string;  // 文件名
-  path: string;
-  url: string;
-  size: number;
-  uuid: string;
-  msgId: string;
-  elementId: string;
-  element: PicElement | VideoElement | FileElement | PttElement;
-  elementType: ElementType.PIC | ElementType.VIDEO | ElementType.FILE | ElementType.PTT;
-}
-
-
-class DBUtilBase {
-  protected db: sqlite3.Database | undefined;
-
-  async init(dbPath: string) {
-    if (this.db) {
-      return;
-    }
-    return new Promise<void>((resolve, reject) => {
-      this.db = new sqlite3.Database(dbPath, sqlite3.OPEN_READWRITE | sqlite3.OPEN_CREATE, (err) => {
-        if (err) {
-          logError('Could not connect to database', err);
-          reject(err);
-          return;
-        }
-        this.createTable();
-        resolve();
-      });
-    });
-  }
-
-  protected createTable() {
-    throw new Error('Method not implemented.');
-  }
-
-  close() {
-    this.db?.close();
-  }
-}
-
-class DBUtil extends DBUtilBase {
-  private msgCache: Map<string | number, RawMessage> = new Map<string | number, RawMessage>();
-  private globalMsgShortId = -2147483640;
-  private groupIds: number[] = [];
-  private LURCache = new LRU<number>();
-  private LastSentCache = new (class {
-    private cache: { gid: number; uid: number }[] = [];
-    private maxSize: number;
-
-    constructor(maxSize: number = 50000) {
-      this.maxSize = maxSize;
-    }
-
-    get(gid: number, uid: number): boolean {
-      const exists = this.cache.some(
-        (entry) => entry.gid === gid && entry.uid === uid
-      );
-      if (!exists) {
-        this.cache.push({ gid, uid });
-        if (this.cache.length > this.maxSize) {
-          this.cache.shift();
-        }
-      }
-
-      return exists;
-    }
-  })();
-
-  constructor() {
-    super();
-    const interval = 1000 * 60 * 10;  // 10分钟清理一次缓存
-    setInterval(() => {
-      logDebug('清理消息缓存');
-      this.msgCache.forEach((msg, key) => {
-        if ((Date.now() - parseInt(msg.msgTime) * 1000) > interval) {
-          this.msgCache.delete(key);
-        }
-      });
-    }, interval);
-  }
-
-  async init(dbPath: string) {
-    await super.init(dbPath);
-    this.globalMsgShortId = await this.getCurrentMaxShortId();
-
-
-    // 初始化群缓存列表
-    this.db!.serialize(() => {
-      const sql = 'SELECT * FROM sqlite_master WHERE type=\'table\'';
-      this.db!.all(sql, [], (err, rows: { name: string }[]) => {
-        if (err) return logError(err);
-        rows.forEach((row) => this.groupIds.push(parseInt(row.name)));
-        //logDebug(`已加载 ${groupIds.length} 个群`);
-      });
-    });
-
-
-    this.LURCache.on(async (nodeObject) => {
-
-      Object.entries(nodeObject).forEach(async ([_groupId, datas]) => {
-        const userIds = datas.map(v => v.userId);
-        const groupId = Number(_groupId);
-        logDebug('插入发言时间', _groupId);
-
-        await this.createGroupInfoTimeTableIfNotExist(groupId);
-
-        const needCreatUsers = await this.getNeedCreatList(groupId, userIds);
-        const updateList = needCreatUsers.length > 0 ? datas.filter(user => !needCreatUsers.includes(user.userId)) : datas;
-        const insertList = needCreatUsers.map(userId => datas.find(e => userId == e.userId)!);
-
-        logDebug('updateList', updateList);
-        logDebug('insertList', insertList);
-
-        if (insertList.length) {
-          const insertSql = `INSERT INTO "${groupId}" (last_sent_time, user_id) VALUES ${insertList.map(() => '(?, ?)').join(', ')};`;
-
-          this.db!.all(insertSql, insertList.map(v => [v.value, v.userId]).flat(), err => {
-            if (err) {
-              logError(`群 ${groupId} 插入失败`);
-              logError(`更新Sql : ${insertSql}`);
-            }
-          });
-        }
-
-        if (updateList.length) {
-          const updateSql =
-            `UPDATE "${groupId}" SET last_sent_time = CASE ` +
-            updateList.map(v => `WHEN user_id = ${v.userId} THEN ${v.value}`).join(' ') +
-            ' ELSE last_sent_time END WHERE user_id IN ' +
-            `(${updateList.map(v => v.userId).join(', ')});`;
-
-          this.db!.all(updateSql, [], err => {
-            if (err) {
-              logError(`群 ${groupId} 跟新失败`);
-              logError(`更新Sql : ${updateSql}`);
-            }
-          });
-        }
-
-      });
-
-
-    });
-  }
-  async getNeedCreatList(groupId: number, userIds: number[]) {
-
-    // 获取缓存中没有的
-    const unhas = userIds.filter(userId => !this.LastSentCache.get(groupId, userId));
-
-    if (unhas.length == 0) {
-      logDebug('缓存全部命中');
-      return [];
-    }
-
-    logDebug('缓存未全部命中');
-
-    const sql = `SELECT * FROM "${groupId}" WHERE user_id IN (${unhas.map(() => '?').join(',')})`;
-
-    return new Promise<number[]>((resolve) => {
-      this.db!.all(sql, unhas, (err, rows: { user_id: number }[]) => {
-        const has = rows.map(v => v.user_id);
-        const needCreatUsers = unhas.filter(userId => !has.includes(userId));
-
-        if (needCreatUsers.length == 0) {
-          logDebug('数据库全部命中');
-        } else {
-          logDebug('数据库未全部命中');
-        }
-
-        resolve(needCreatUsers);
-      });
-    });
-
-
-  }
-  async createGroupInfoTimeTableIfNotExist(groupId: number) {
-    const createTableSQL = (groupId: number) =>
-      `CREATE TABLE IF NOT EXISTS "${groupId}" (
-            user_id INTEGER,
-            last_sent_time INTEGER,
-            join_time INTEGER,
-            PRIMARY KEY (user_id)
-        );`;
-
-    if (this.groupIds.includes(groupId)) {
-      return;
-    }
-    return new Promise((resolve, reject) => {
-      const sql = createTableSQL(groupId);
-      this.db!.all(sql, (err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        this.groupIds.push(groupId);
-        resolve(true);
-      });
-    });
-  }
-  protected createTable() {
-    // 消息记录
-    const createTableSQL = `
-            CREATE TABLE IF NOT EXISTS msgs (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                shortId INTEGER NOT NULL UNIQUE,
-                longId TEXT NOT NULL UNIQUE,
-                seq INTEGER NOT NULL,
-                peerUid TEXT NOT NULL,
-                chatType INTEGER NOT NULL
-            )`;
-    this.db!.run(createTableSQL, function (err) {
-      if (err) {
-        logError('Could not create table msgs', err.stack);
-      }
-    });
-
-    // 文件缓存
-    const createFileTableSQL = `
-            CREATE TABLE IF NOT EXISTS files (
-                id INTEGER PRIMARY KEY AUTOINCREMENT,
-                name TEXT NOT NULL,
-                path TEXT NOT NULL,
-                url TEXT,
-                size INTEGER NOT NULL,
-                uuid TEXT,
-                elementType INTEGER,
-                element TEXT NOT NULL,
-                elementId TEXT NOT NULL,
-                msgId TEXT NOT NULL
-            )`;
-    this.db!.run(createFileTableSQL, function (err) {
-      if (err) {
-        logError('Could not create table files', err);
-      }
-    });
-  }
-
-  private async getCurrentMaxShortId() {
-    return new Promise<number>((resolve, reject) => {
-      this.db!.get('SELECT MAX(shortId) as maxId FROM msgs', (err, row: { maxId: number }) => {
-        if (err) {
-          logDebug('Could not get max short id, Use default -2147483640', err);
-          return resolve(-2147483640);
-        }
-        logDebug('数据库中消息最大短id', row?.maxId);
-        resolve(row?.maxId ?? -2147483640);
-      });
-    });
-  }
-
-  private async getMsg(query: string, params: any[]) {
-    const stmt = this.db!.prepare(query);
-    return new Promise<RawMessage | null>((resolve, reject) => {
-      stmt.get(...params, (err: any, row: DBMsg) => {
-        // log("getMsg", row, err);
-        if (err) {
-          logError('Could not get msg', err, query, params);
-          return resolve(null);
-        }
-        if (!row) {
-          // logDebug('不存在数据库中的消息，不进行处理', query, params);
-          resolve(null);
-          return;
-        }
-        const msgId = row.longId;
-        NTQQMsgApi.getMsgsByMsgId({ peerUid: row.peerUid, chatType: row.chatType }, [msgId]).then(res => {
-          const msg = res.msgList[0];
-          if (!msg) {
-            resolve(null);
-            return;
-          }
-          msg.id = row.shortId;
-          resolve(msg);
-        }).catch(e => {
-          resolve(null);
-        });
-      });
-    });
-  }
-
-  async getMsgByShortId(shortId: number): Promise<RawMessage | null> {
-    if (this.msgCache.has(shortId)) {
-      return this.msgCache.get(shortId)!;
-    }
-    const getStmt = 'SELECT * FROM msgs WHERE shortId = ?';
-    return this.getMsg(getStmt, [shortId]);
-  }
-
-  async getMsgByLongId(longId: string): Promise<RawMessage | null> {
-    if (this.msgCache.has(longId)) {
-      return this.msgCache.get(longId)!;
-    }
-    return this.getMsg('SELECT * FROM msgs WHERE longId = ?', [longId]);
-  }
-
-  async getMsgBySeq(peerUid: string, seq: string): Promise<RawMessage | null> {
-    const stmt = 'SELECT * FROM msgs WHERE peerUid = ? AND seq = ?';
-    return this.getMsg(stmt, [peerUid, seq]);
-  }
-
-  async addMsg(msg: RawMessage, update = true): Promise<number> {
-    const existMsg = await this.getMsgByLongId(msg.msgId);
-    if (existMsg) {
-      // logDebug('消息已存在，更新数据库', msg.msgId);
-      if (update) this.updateMsg(msg).then();
-      return existMsg.id!;
-    }
-    const stmt = this.db!.prepare('INSERT INTO msgs (shortId, longId, seq, peerUid, chatType) VALUES (?, ?, ?, ?, ?)');
-    // const runAsync = promisify(stmt.run.bind(stmt));
-    const shortId = ++this.globalMsgShortId;
-    msg.id = shortId;
-    //logDebug(`记录消息到数据库, 消息长id: ${msg.msgId}, 短id: ${msg.id}`);
-    this.msgCache.set(shortId, msg);
-    this.msgCache.set(msg.msgId, msg);
-    stmt.run(this.globalMsgShortId, msg.msgId, msg.msgSeq.toString(), msg.peerUid, msg.chatType, (err: any) => {
-      if (err) {
-        if (err.errno === 19) {
-          this.getMsgByLongId(msg.msgId).then((msg: RawMessage | null) => {
-            if (msg) {
-              this.msgCache.set(shortId, msg);
-              this.msgCache.set(msg.msgId, msg);
-              // logDebug('获取消息短id成功', msg.id);
-            } else {
-              logError('db could not get msg by long id', err);
-            }
-          }).catch(e => logError('db getMsgByLongId error', e));
-        } else {
-          logError('db could not add msg', err);
-        }
-      }
-    });
-    return shortId;
-  }
-
-  async updateMsg(msg: RawMessage) {
-    const existMsg = this.msgCache.get(msg.msgId);
-    if (existMsg) {
-      Object.assign(existMsg, msg);
-    }
-    //logDebug(`更新消息, shortId:${msg.id}, seq: ${msg.msgSeq}, msgId: ${msg.msgId}`);
-    const stmt = this.db!.prepare('UPDATE msgs SET seq=? WHERE longId=?');
-    stmt.run(msg.msgSeq, msg.msgId, (err: any) => {
-      if (err) {
-        logError('updateMsg db error', err);
-      }
-    });
-
-  }
-
-  async addFileCache(file: DBFile) {
-    const stmt = this.db!.prepare('INSERT INTO files (name, path, url, size, uuid, elementType ,element, elementId, msgId) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)');
-    return new Promise((resolve, reject) => {
-      stmt.run(file.name, file.path, file.url, file.size, file.uuid,
-        file.elementType,
-        JSON.stringify(file.element),
-        file.elementId,
-        file.msgId,
-        function (err: any) {
-          if (err) {
-            logError('db could not add file', err);
-            reject(err);
-          }
-          resolve(null);
-        });
-    });
-  }
-
-  private async getFileCache(query: string, params: any[]) {
-    const stmt = this.db!.prepare(query);
-    return new Promise<DBFile | null>((resolve, reject) => {
-      stmt.get(...params, (err: any, row: DBFile & { element: string }) => {
-        if (err) {
-          logError('db could not get file cache', err);
-          reject(err);
-        }
-        if (row) {
-          row.element = JSON.parse(row.element);
-        }
-        resolve(row);
-      });
-    });
-  }
-
-  async getFileCacheByName(name: string): Promise<DBFile | null> {
-    return this.getFileCache('SELECT * FROM files WHERE name = ?', [name]);
-  }
-
-  async getFileCacheByUuid(uuid: string): Promise<DBFile | null> {
-    return this.getFileCache('SELECT * FROM files WHERE uuid = ?', [uuid]);
-  }
-
-  // todo: 是否所有的文件都有uuid？语音消息有没有uuid？
-  async updateFileCache(file: DBFile) {
-    const stmt = this.db!.prepare('UPDATE files SET path = ?, url = ? WHERE uuid = ?');
-    return new Promise((resolve, reject) => {
-      stmt.run(file.path, file.url, file.uuid, function (err: any) {
-        if (err) {
-          logError('db could not update file cache', err);
-          reject(err);
-        }
-        resolve(null);
-      });
-    });
-  }
-
-  async getLastSentTimeAndJoinTime(
-    groupId: number
-  ): Promise<IRember[]> {
-    logDebug('读取发言时间', groupId);
-    return new Promise<IRember[]>((resolve, reject) => {
-      this.db!.all(`SELECT * FROM "${groupId}" `, (err, rows: IRember[]) => {
-        const cache = this.LURCache.get(groupId).map(e => ({ user_id: e.userId, last_sent_time: e.value }));
-        if (err) {
-          logError('查询发言时间失败', groupId);
-          return resolve(cache.map(e => ({ ...e, join_time: 0 })));
-        }
-        Object.assign(rows, cache);
-        logDebug('查询发言时间成功', groupId, rows);
-        resolve(rows);
-      });
-    });
-  }
-
-  insertLastSentTime(
-    groupId: number,
-    userId: number,
-    time: number
-  ) {
-    this.LURCache.set(groupId, userId, time);
-  }
-  async insertJoinTime(
-    groupId: number,
-    userId: number,
-    time: number
-  ) {
-    await this.createGroupInfoTimeTableIfNotExist(groupId);
-    this.db!.all(
-      `INSERT OR REPLACE INTO "${groupId}"  (user_id, last_sent_time, join_time) VALUES (?,?,?)`,
-      [userId, time, time],
-      (err) => {
-        if (err)
-          logError(err),
-          Promise.reject(),
-          logError('插入入群时间失败', userId, groupId);
-      }
-    );
-
-  }
-}
-
-
-export const dbUtil = new DBUtil();

src/common/utils/file.ts

@@ -1,313 +1,267 @@
 import fs from 'fs';
-import fsPromise, { stat } from 'fs/promises';
-import crypto from 'crypto';
+import { stat } from 'fs/promises';
+import crypto, { randomUUID } from 'crypto';
 import util from 'util';
 import path from 'node:path';
-import { log, logError } from './log';
-import { dbUtil } from '@/common/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;
-};
-
 
 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();
-  });
+        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.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);
-  });
+    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;
-    }
-  }
-  // 如果文件存在，则无需做任何事情，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\\");
-    // }
     try {
-      await checkFileReceived(path, 5000);
-    } catch (e: any) {
-      result.err = e.toString();
-      return result;
+        await stat(path);
+    } catch (error: any) {
+        if (error.code === 'ENOENT') {
+            // 如果文件不存在，则抛出一个错误
+            throw new Error(`文件不存在: ${path}`);
+        } else {
+            // 对于 stat 调用的其他错误，重新抛出
+            throw error;
+        }
     }
-    const data = await readFile(path);
-    // 转换为Base64编码
-    result.data = data.toString('base64');
-  } catch (err: any) {
-    result.err = err.toString();
-  }
-  return result;
+    // 如果文件存在，则无需做任何事情，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\\");
+        // }
+        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();
+    }
+    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;
-    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 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 }).catch((err) => {
-    if (err.cause) {
-      throw err.cause;
-    }
-    throw err;
-  });
-  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 checkFileV2(filePath: string) {
     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;
-    }
-    try {
-      const pathInfo = path.parse(decodeURIComponent(url.pathname));
-      if (pathInfo.name) {
-        fileName = pathInfo.name;
-        if (pathInfo.ext) {
-          fileName += pathInfo.ext;
-          // res.ext = pathInfo.ext
+        const ext: string | undefined = (await fileType.fileTypeFromFile(filePath))?.ext;
+        if (ext) {
+            fs.renameSync(filePath, filePath + `.${ext}`);
+            filePath += `.${ext}`;
+            return { success: true, ext: ext, path: filePath };
         }
-      }
-      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;
-      }
-    }
-
-    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)
+        // log("获取文件类型失败", filePath,e.stack)
     }
-  }
-  res.success = true;
-  res.path = filePath;
-  return res;
+    return { success: false, ext: '', path: filePath };
 }
 
-export async function copyFolder(sourcePath: string, destPath: string) {
-  try {
-    const entries = await fsPromise.readdir(sourcePath, { withFileTypes: true });
-    await fsPromise.mkdir(destPath, { recursive: true });
-    for (const entry of entries) {
-      const srcPath = path.join(sourcePath, entry.name);
-      const dstPath = path.join(destPath, entry.name);
-      if (entry.isDirectory()) {
-        await copyFolder(srcPath, dstPath);
-      } else {
-        try {
-          await fsPromise.copyFile(srcPath, dstPath);
-        } catch (error) {
-          logError(`无法复制文件 '${srcPath}' 到 '${dstPath}': ${error}`);
-          // 这里可以决定是否要继续复制其他文件
-        }
-      }
-    }
-  } catch (error) {
-    logError('复制文件夹时出错:', error);
-  }
+export enum FileUriType {
+    Unknown = 0,
+    Local = 1,
+    Remote = 2,
+    Base64 = 3
+}
+
+export async function checkUriType(Uri: string) {
+    //先判断是否是本地文件
+    try {
+        if (fs.existsSync(Uri)) return { Uri: Uri, Type: FileUriType.Local };
+    } catch (error) {
+    }
+    try {
+        //再判断是否是Http
+        if (Uri.startsWith('http://') || Uri.startsWith('https://')) {
+            return { Uri: Uri, Type: FileUriType.Remote };
+        }
+        //再判断是否是Base64
+        if (Uri.startsWith('base64://')) {
+            return { Uri: Uri, Type: FileUriType.Base64 };
+        }
+        if (Uri.startsWith('file://')) {
+            let pathname: string;
+            let filePath: string;
+            // await fs.copyFile(url.pathname, filePath);
+            pathname = decodeURIComponent(new URL(Uri).pathname);
+            if (process.platform === 'win32') {
+                filePath = pathname.slice(1);
+            } else {
+                filePath = pathname;
+            }
+            return { Uri: filePath, Type: FileUriType.Local };
+        }
+    } catch (error) {
+    }
+    return { Uri: Uri, Type: FileUriType.Unknown };
+}
+
+export async function uri2local(dir: string, uri: string, filename: string | undefined = undefined): Promise<Uri2LocalRes> {
+    const { Uri: HandledUri, Type: UriType } = await checkUriType(uri);
+    //解析失败
+
+    if (UriType == FileUriType.Unknown) {
+        return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
+    }
+    //解析File协议和本地文件
+    if (UriType == FileUriType.Local) {
+        const fileExt = path.extname(HandledUri);
+        const filename = path.basename(HandledUri, fileExt);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: HandledUri, isLocal: true };
+    }
+    //接下来都要有文件名
+    if (!filename) filename = randomUUID();
+    //解析Http和Https协议
+    
+    if (UriType == FileUriType.Remote) {
+        const pathInfo = path.parse(decodeURIComponent(new URL(HandledUri).pathname));
+        if (pathInfo.name) {
+            filename = pathInfo.name;
+          if (pathInfo.ext) {
+            filename += pathInfo.ext;
+          }
+        }
+        filename = filename.replace(/[/\\:*?"<>|]/g, '_');
+        const fileExt = path.extname(HandledUri);
+        const filePath = path.join(dir, filename);
+        const buffer = await httpDownload(HandledUri);
+        fs.writeFileSync(filePath, buffer);
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+    }
+    //解析Base64
+    if (UriType == FileUriType.Base64) {
+        const base64 = HandledUri.replace(/^base64:\/\//, '');
+        const buffer = Buffer.from(base64, 'base64');
+        let filePath = path.join(dir, filename);
+        let fileExt = '';
+        fs.writeFileSync(filePath, buffer);
+        const { success, ext, path: fileTypePath } = await checkFileV2(filePath);
+        if (success) {
+            filePath = fileTypePath;
+            fileExt = ext;
+            filename = filename + '.' + ext;
+        }
+        return { success: true, errMsg: '', fileName: filename, ext: fileExt, path: filePath, isLocal: true };
+    }
+    return { success: false, errMsg: '未知文件类型', fileName: '', ext: '', path: '', isLocal: false };
 }

src/common/utils/helper.ts

@@ -1,286 +1,137 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
-import fs from 'fs/promises';
-import { log, logDebug } from './log';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import fs from 'fs';
 import * as fsPromise from 'node:fs/promises';
+import os from 'node:os';
+import { QQLevel } from '@/core';
 
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-export function sleep(ms: number): Promise<void> {
-  return new Promise(resolve => setTimeout(resolve, ms));
+//下面这个类是用于将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 getMd5(s: string) {
+export function sleep(ms: number): Promise<void> {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
 
-  const h = crypto.createHash('md5');
-  h.update(s);
-  return h.digest('hex');
+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 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;
-}
-export function simpleDecorator(target: any, context: any) {
-}
-
-// export function CacheClassFunc(ttl: number = 3600 * 1000, customKey: string = '') {
-//   const cache = new Map<string, { expiry: number; value: any }>();
-//   return function CacheClassFuncDecorator(originalMethod: Function, context: ClassMethodDecoratorContext) {
-//     async function CacheClassFuncDecoratorInternal(this: any, ...args: any[]) {
-//       const key = `${customKey}${String(context.name)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
-//       const cachedValue = cache.get(key);
-//       if (cachedValue && cachedValue.expiry > Date.now()) {
-//         return cachedValue.value;
-//       }
-//       const result = originalMethod.call(this, ...args);
-//       cache.set(key, { expiry: Date.now() + ttl, value: result });
-//       return result;
-//     }
-//     return CacheClassFuncDecoratorInternal;
-//   }
-// }
-export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = '') {
-  //console.log('CacheClassFuncAsync', ttl, customKey);
-  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
-    //console.log('logExecutionTime', target, methodName, descriptor);
-    const cache = new Map<string, { expiry: number; value: any }>();
-    const originalMethod = descriptor.value;
-    descriptor.value = async function (...args: any[]) {
-      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
-      cache.forEach((value, key) => {
-        if (value.expiry < Date.now()) {
-          cache.delete(key);
-        }
-      });
-      const cachedValue = cache.get(key);
-      if (cachedValue && cachedValue.expiry > Date.now()) {
-        return cachedValue.value;
-      }
-      // const start = Date.now();
-      const result = await originalMethod.apply(this, args);
-      // const end = Date.now();
-      // console.log(`Method ${methodName} executed in ${end - start} ms.`);
-      cache.set(key, { expiry: Date.now() + ttl, value: result });
-      return result;
-    };
-  }
-  return logExecutionTime;
-}
-
-// export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = ''): any {
-//   const cache = new Map<string, { expiry: number; value: any }>();
-
-//   // 注意：在JavaScript装饰器中，我们通常不直接处理ClassMethodDecoratorContext这样的类型，
-//   // 因为装饰器的参数通常是目标类（对于类装饰器）、属性名（对于属性装饰器）等。
-//   // 对于方法装饰器，我们关注的是方法本身及其描述符。
-//   // 但这里我们维持原逻辑，假设有一个自定义的处理上下文的方式。
-
-//   return function (originalMethod: Function): any {
-//     console.log(originalMethod);
-//     // 由于JavaScript装饰器原生不支持异步直接定义，我们保持async定义以便处理异步方法。
-//     async function decoratorWrapper(this: any, ...args: any[]): Promise<any> {
-//       console.log(...args);
-//       const key = `${customKey}${originalMethod.name}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
-//       const cachedValue = cache.get(key);
-//       // 遍历cache 清除expiry内容
-//       cache.forEach((value, key) => {
-//         if (value.expiry < Date.now()) {
-//           cache.delete(key);
-//         }
-//       });
-//       if (cachedValue && cachedValue.expiry > Date.now()) {
-//         return cachedValue.value;
-//       }
-
-//       // 直接await异步方法的结果
-//       const result = await originalMethod.apply(this, args);
-//       cache.set(key, { expiry: Date.now() + ttl, value: result });
-//       return result;
-//     }
-
-//     // 返回装饰后的方法，保持与原方法相同的名称和描述符（如果需要更精细的控制，可以考虑使用Object.getOwnPropertyDescriptor等）
-//     return decoratorWrapper;
-//   };
-// }
-
-/**
- * 函数缓存装饰器，根据方法名、参数、自定义key生成缓存键，在一定时间内返回缓存结果
- * @param ttl 超时时间，单位毫秒
- * @param customKey 自定义缓存键前缀，可为空，防止方法名参数名一致时导致缓存键冲突
- * @returns 处理后缓存或调用原方法的结果
- */
-export function cacheFunc(ttl: number, customKey: string = '') {
-  const cache = new Map<string, { expiry: number; value: any }>();
-
-  return function (target: any, propertyKey: string, descriptor: PropertyDescriptor): PropertyDescriptor {
-    const originalMethod = descriptor.value;
-    const className = target.constructor.name;  // 获取类名
-    const methodName = propertyKey;             // 获取方法名
-    descriptor.value = async function (...args: any[]) {
-      const cacheKey = `${customKey}${className}.${methodName}:${JSON.stringify(args)}`;
-      const cached = cache.get(cacheKey);
-      if (cached && cached.expiry > Date.now()) {
-        return cached.value;
-      } else {
-        const result = await originalMethod.apply(this, args);
-        cache.set(cacheKey, { value: result, expiry: Date.now() + ttl });
-        return result;
-      }
-    };
-
-    return descriptor;
-  };
-}
-export function isValidOldConfig(config: any) {
-  if (typeof config !== 'object') {
-    return false;
-  }
-  const requiredKeys = [
-    'httpHost', 'httpPort', 'httpPostUrls', 'httpSecret',
-    'wsHost', 'wsPort', 'wsReverseUrls', 'enableHttp',
-    'enableHttpHeart', 'enableHttpPost', 'enableWs', 'enableWsReverse',
-    'messagePostFormat', 'reportSelfMessage', 'enableLocalFile2Url',
-    'debug', 'heartInterval', 'token', 'musicSignUrl'
-  ];
-  for (const key of requiredKeys) {
-    if (!(key in config)) {
-      return false;
+    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);
+            }
+        });
     }
-  }
-  if (!Array.isArray(config.httpPostUrls) || !Array.isArray(config.wsReverseUrls)) {
-    return false;
-  }
-  if (config.httpPostUrls.some((url: any) => typeof url !== 'string')) {
-    return false;
-  }
-  if (config.wsReverseUrls.some((url: any) => typeof url !== 'string')) {
-    return false;
-  }
-  if (typeof config.httpPort !== 'number' || typeof config.wsPort !== 'number' || typeof config.heartInterval !== 'number') {
-    return false;
-  }
-  if (
-    typeof config.enableHttp !== 'boolean' ||
-    typeof config.enableHttpHeart !== 'boolean' ||
-    typeof config.enableHttpPost !== 'boolean' ||
-    typeof config.enableWs !== 'boolean' ||
-    typeof config.enableWsReverse !== 'boolean' ||
-    typeof config.enableLocalFile2Url !== 'boolean' ||
-    typeof config.reportSelfMessage !== 'boolean'
-  ) {
-    return false;
-  }
-  if (config.messagePostFormat !== 'array' && config.messagePostFormat !== 'string') {
-    return false;
-  }
-  return true;
+    return obj;
 }
-export function migrateConfig(oldConfig: any) {
-  const newConfig = {
-    http: {
-      enable: oldConfig.enableHttp,
-      host: oldConfig.httpHost,
-      port: oldConfig.httpPort,
-      secret: oldConfig.httpSecret,
-      enableHeart: oldConfig.enableHttpHeart,
-      enablePost: oldConfig.enableHttpPost,
-      postUrls: oldConfig.httpPostUrls,
-    },
-    ws: {
-      enable: oldConfig.enableWs,
-      host: oldConfig.wsHost,
-      port: oldConfig.wsPort,
-    },
-    reverseWs: {
-      enable: oldConfig.enableWsReverse,
-      urls: oldConfig.wsReverseUrls,
-    },
-    GroupLocalTime: {
-      Record: false,
-      RecordList: []
-    },
-    debug: oldConfig.debug,
-    heartInterval: oldConfig.heartInterval,
-    messagePostFormat: oldConfig.messagePostFormat,
-    enableLocalFile2Url: oldConfig.enableLocalFile2Url,
-    musicSignUrl: oldConfig.musicSignUrl,
-    reportSelfMessage: oldConfig.reportSelfMessage,
-    token: oldConfig.token,
 
-  };
-  return newConfig;
-}
-// 升级旧的配置到新的
-export async function UpdateConfig() {
-  const configFiles = await fs.readdir(path.join(__dirname, 'config'));
-  for (const file of configFiles) {
-    if (file.match(/^onebot11_\d+.json$/)) {
-      const CurrentConfig = JSON.parse(await fs.readFile(path.join(__dirname, 'config', file), 'utf8'));
-      if (isValidOldConfig(CurrentConfig)) {
-        log('正在迁移旧配置到新配置 File:', file);
-        const NewConfig = migrateConfig(CurrentConfig);
-        await fs.writeFile(path.join(__dirname, 'config', file), JSON.stringify(NewConfig, null, 2));
-      }
-    }
-  }
-}
 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;
+    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);
+    const keys1 = Object.keys(obj1);
+    const keys2 = Object.keys(obj2);
 
-  if (keys1.length !== keys2.length) return false;
+    if (keys1.length !== keys2.length) return false;
 
-  for (const key of keys1) {
-    if (!isEqual(obj1[key], obj2[key])) return false;
-  }
-  return true;
-}
-
-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}`);
-      }
+    for (const key of keys1) {
+        if (!isEqual(obj1[key], obj2[key])) return false;
     }
-  } catch (error) {
-    //console.error('Error deleting files:', error);
-  }
+    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 function calcQQLevel(level: QQLevel) {
+    const { crownNum, sunNum, moonNum, starNum } = level;
+    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }

src/common/utils/log.ts

@@ -1,136 +1,239 @@
 import log4js, { Configuration } from 'log4js';
 import { truncateString } from '@/common/utils/helper';
 import path from 'node:path';
-import { SelfInfo } from '@/core';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
 import chalk from 'chalk';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
+import { AtType, ChatType, ElementType, ElementWrapper, RawMessage, SelfInfo } from '@/core';
 
 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, // 指定日志文件的位置和文件名
-      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`
-      }
+    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);
-const loggerConsole = log4js.getLogger('console');
-const loggerFile = log4js.getLogger('file');
-const loggerDefault = log4js.getLogger('default');
-
-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) {
-  const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
-  loggerConsole.addContext('userInfo', userInfo);
-  loggerFile.addContext('userInfo', userInfo);
-  loggerDefault.addContext('userInfo', userInfo);
-}
-setLogSelfInfo({ nick: '', uin: '', uid: '' });
-
-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);
+    }
+
+    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);
+    }
+
+    setFileLogEnabled(isEnabled: boolean) {
+        this.fileLogEnabled = isEnabled;
+    }
+
+    setConsoleLogEnabled(isEnabled: boolean) {
+        this.consoleLogEnabled = isEnabled;
+    }
+
+    formatMsg(msg: any[]) {
+        let logMsg = '';
+        for (const msgItem of msg) {
+            if (msgItem instanceof Error) { // 判断是否是错误
+                logMsg += msgItem.stack + ' ';
+                continue;
+            } else if (typeof msgItem === 'object') { // 判断是否是对象
+                const obj = JSON.parse(JSON.stringify(msgItem, null, 2));
+                logMsg += JSON.stringify(truncateString(obj)) + ' ';
+                continue;
+            }
+            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);
+    }
+
+    logMessage(msg: RawMessage, selfInfo: SelfInfo) {
+        const isSelfSent = msg.senderUin === selfInfo.uin;
+        this.log(`${
+            isSelfSent ? '发送 ->' : '接收 <-'
+        } ${rawMessageToText(msg)}`);
     }
-    logMsg += msgItem + ' ';
-  }
-  return logMsg;
 }
 
-// eslint-disable-next-line no-control-regex
-const colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+export function rawMessageToText(msg: RawMessage, recursiveLevel = 0): string {
+    if (recursiveLevel > 2) {
+        return '...';
+    }
 
-function _log(level: LogLevel, ...args: any[]) {
-  if (consoleLogEnabled) {
-    loggerConsole[level](formatMsg(args));
-  }
-  if (fileLogEnabled) {
-    loggerFile[level](formatMsg(args).replace(colorEscape, ''));
-  }
-}
+    const tokens: string[] = [];
 
-export function log(...args: any[]) {
-  // info 等级
-  _log(LogLevel.INFO, ...args);
-}
+    if (msg.chatType == ChatType.friend) {
+        tokens.push(`私聊 (${msg.peerUin})`);
+    } else if (msg.chatType == ChatType.group) {
+        tokens.push(`群聊 (群 ${msg.peerUin} 的 ${msg.senderUin})`);
+    } else if (msg.chatType == ChatType.chatDevice) {
+        tokens.push('移动设备');
+    } else /* temp */ {
+        tokens.push(`临时消息 (${msg.peerUin})`);
+    }
 
-export function logDebug(...args: any[]) {
-  _log(LogLevel.DEBUG, ...args);
-}
+    // message content
 
-export function logError(...args: any[]) {
-  _log(LogLevel.ERROR, ...args);
-}
+    function msgElementToText(element: ElementWrapper) {
+        if (element.textElement) {
+            if (element.textElement.atType === AtType.notAt) {
+                return element.textElement.content;
+            } else if (element.textElement.atType === AtType.atAll) {
+                return `@全体成员`;
+            } else if (element.textElement.atType === AtType.atUser) {
+                return `${element.textElement.content} (${element.textElement.atUid})`;
+            }
+        }
 
-export function logWarn(...args: any[]) {
-  _log(LogLevel.WARN, ...args);
-}
+        if (element.replyElement) {
+            const recordMsgOrNull = msg.records.find(
+                record => element.replyElement!.sourceMsgIdInRecords === record.msgId
+            );
+            return `[回复消息 ${
+                recordMsgOrNull &&
+                recordMsgOrNull.peerUin != '284840486' // 非转发消息; 否则定位不到
+                    ? 
+                    rawMessageToText(recordMsgOrNull, recursiveLevel + 1) :
+                    `未找到消息记录 (MsgId = ${element.replyElement.sourceMsgIdInRecords})`
+            }]`;
+        }
 
-export function logFatal(...args: any[]) {
-  _log(LogLevel.FATAL, ...args);
+        if (element.picElement) {
+            return `[图片 ${element.picElement.fileName}]`;
+        }
+
+        if (element.fileElement) {
+            return `[文件 ${element.fileElement.fileName}]`;
+        }
+
+        if (element.videoElement) {
+            return `[视频 ${element.videoElement.fileName}]`;
+        }
+
+        if (element.pttElement) {
+            return `[语音 ${element.pttElement.duration}s]`;
+        }
+
+        if (element.arkElement) {
+            return `[卡片消息 ${element.arkElement.bytesData}]`;
+        }
+
+        if (element.faceElement) {
+            return `[表情 ${element.faceElement.faceText ?? ''}]`;
+        }
+
+        if (element.marketFaceElement) {
+            return `[商城表情 ${element.marketFaceElement.faceName}]`;
+        }
+
+        if (element.markdownElement) {
+            return `[Markdown ${element.markdownElement.content}]`;
+        }
+
+        if (element.multiForwardMsgElement) {
+            return `[转发消息]`;
+        }
+
+        if (element.elementType === ElementType.GreyTip) {
+            return `[灰条消息]`; // TODO: resolve the text
+        }
+
+        return `[未实现 (ElementType = ${element.elementType})]`;
+    }
+
+    for (const element of msg.elements) {
+        tokens.push(msgElementToText(element));
+    }
+
+    return tokens.join(' ');
 }

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,44 +0,0 @@
-import { resolve } from 'node:path';
-import { spawn } from 'node:child_process';
-import { pid, ppid, exit } from 'node:process';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
-
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-
-export async function rebootWithQuickLogin(uin: string) {
-  const batScript = resolve(__dirname, './napcat.bat');
-  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
-  const bashScript = resolve(__dirname, './napcat.sh');
-  if (process.platform === 'win32') {
-    const subProcess = spawn(`start ${batUtf8Script} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
-    subProcess.unref();
-    // 子父进程一起送走 有点效果
-    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
-    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
-  } else if (process.platform === 'linux') {
-    const subProcess = spawn(`${bashScript} -q ${uin}`, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
-    //还没兼容
-    subProcess.unref();
-    exit(0);
-  }
-  //exit(0);
-}
-export async function rebootWithNormolLogin() {
-  const batScript = resolve(__dirname, './napcat.bat');
-  const batUtf8Script = resolve(__dirname, './napcat-utf8.bat');
-  const bashScript = resolve(__dirname, './napcat.sh');
-  if (process.platform === 'win32') {
-    const subProcess = spawn(`start ${batUtf8Script} `, { detached: true, windowsHide: false, env: process.env, shell: true, stdio: 'ignore' });
-    subProcess.unref();
-    // 子父进程一起送走 有点效果
-    spawn('cmd /c taskkill /t /f /pid ' + pid.toString(), { detached: true, shell: true, stdio: 'ignore' });
-    spawn('cmd /c taskkill /t /f /pid ' + ppid.toString(), { detached: true, shell: true, stdio: 'ignore' });
-  } else if (process.platform === 'linux') {
-    const subProcess = spawn(`${bashScript}`, { detached: true, windowsHide: false, env: process.env, shell: true });
-    subProcess.unref();
-    exit(0);
-  }
-}

src/common/utils/request.ts

@@ -1,193 +1,194 @@
 import https from 'node:https';
 import http from 'node:http';
 import { readFileSync } from 'node:fs';
-import { NTQQUserApi } from '@/core';
+
 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);
+    // 适用于获取服务器下发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);
+            });
         });
-        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';
     }
-    const formDataParts = [
-      `------${boundary}\r\n`,
-      `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
-      'Content-Type: ' + type + '\r\n\r\n'
-    ];
 
-    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): Promise<string> {
-    return new Promise(async (resolve, reject) => {
-      type retType = { retcode: number, result?: { url: string } };
-      try {
-        const cookies = Object.entries(await NTQQUserApi.getCookies('connect.qq.com')).map(([key, value]) => `${key}=${value}`).join('; ');
+    // 请求和回复都是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: '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'
-          }
+            hostname: option.hostname,
+            port: option.port,
+            path: option.href,
+            method: method,
+            headers: headers,
         };
-        const req = https.request(options, async (res) => {
-          let responseBody = '';
+        // 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('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);
+                }
 
-          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.end();
         });
+    }
 
-        req.on('error', (error) => {
-          reject(error);
-          console.error('Error during upload:', error);
+    // 请求返回都是原始内容
+    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';
+        }
+        const formDataParts = [
+            `------${boundary}\r\n`,
+            `Content-Disposition: form-data; name="share_image"; filename="${filePath}"\r\n`,
+            'Content-Type: ' + type + '\r\n\r\n',
+        ];
+
+        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;
         });
-
-        const body = await RequestUtil.createFormData('WebKitFormBoundary7MA4YWxkTrZu0gW', filePath);
-        // req.setHeader('Content-Length', Buffer.byteLength(body));
-        // console.log(`Prepared data size: ${Buffer.byteLength(body)} bytes`);
-        req.write(body);
-        req.end();
-        return;
-      } catch (error) {
-        reject(error);
-      }
-      return undefined;
-    });
-  }
+    }
 }

src/common/utils/system.ts

@@ -1,7 +1,7 @@
 import os from 'node:os';
 import path from 'node:path';
 import { networkInterfaces } from 'os';
-import { v4 as uuidv4 } from 'uuid';
+import { randomUUID } from 'crypto';
 
 // 缓解Win7设备兼容性问题
 let osName: string;
@@ -9,63 +9,62 @@ let osName: string;
 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'
+    '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);
+    // 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 || uuidv4(); // fallback, generate a UUID
-    })();
-  }
+    if (!machineId) {
+        machineId = (async () => {
+            const id = await getMacMachineId();
+            return id || randomUUID(); // fallback, generate a UUID
+        })();
+    }
 
-  return machineId;
+    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;
+    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)');
+    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;
-  }
+    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();

src/common/utils/type.ts

@@ -1,31 +0,0 @@
-/**
- * 运行时类型转换与检查类
- */
-export class TypeCheck {
-  static isEmpty(value: any): boolean {
-    return value === null || value === undefined || value === '' ||
-            (Array.isArray(value) && value.length === 0) || (typeof value === 'object' && Object.keys(value).length === 0);
-  }
-}
-
-export class TypeConvert {
-  static toNumber(value: any): number {
-    const num = Number(value);
-    if (isNaN(num)) {
-      throw new Error(`无法将输入转换为数字: ${value}`);
-    }
-    return num;
-  }
-
-  static toString(value: any): string {
-    return String(value);
-  }
-
-  static toBoolean(value: any): boolean {
-    return Boolean(value);
-  }
-
-  static toArray(value: any): any[] {
-    return Array.isArray(value) ? value : [value];
-  }
-}