release: 1.8.4

.editorconfig

@@ -1,21 +1,21 @@
-# EditorConfig is awesome: https://EditorConfig.org
+# EditorConfig is awesome: https://EditorConfig.org
-
+
-# top-most EditorConfig file
+# top-most EditorConfig file
-root = true
+root = true
-
+
-# Unix-style newlines with a newline ending every file
+# Unix-style newlines with a newline ending every file
-[*]
+[*]
-end_of_line = lf
+end_of_line = lf
-insert_final_newline = true
+insert_final_newline = true
-
+
-# Matches multiple files with brace expansion notation
+# Matches multiple files with brace expansion notation
-# Set default charset
+# Set default charset
-charset = utf-8
+charset = utf-8
-
+
-# 2 space indentation
+# 2 space indentation
-[*.{cjs,mjs,js,jsx,ts,tsx,css,scss,sass,html,json}]
+[*.{cjs,mjs,js,jsx,ts,tsx,css,scss,sass,html,json}]
-indent_style = space
+indent_style = space
-indent_size = 4
+indent_size = 2
-
+
-# Unfortunately, EditorConfig doesn't support space configuration inside import braces directly.
+# 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.
+# You'll need to rely on your linter/formatter like ESLint or Prettier for that.

.env.development

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

.env.framework

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

.env.production

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

.eslintrc.cjs

@@ -1,64 +1,68 @@
 module.exports = {
-    'env': {
+  'env': {
-        'browser': true,
+    'browser': true,
-        'es2021': true,
+    'es2021': true,
+    'node': true
+  },
+  'ignorePatterns': ['src/core/', 'src/core.lib/','src/proto/'],
+  'extends': [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended'
+  ],
+  'overrides': [
+    {
+      'env': {
         'node': true
-    },
+      },
-    'ignorePatterns': ['src/proto/'],
+      'files': [
-    'extends': [
+        '.eslintrc.{js,cjs}'
-        'eslint:recommended',
+      ],
-        'plugin:@typescript-eslint/recommended'
+      'parserOptions': {
-    ],
+        'sourceType': 'script'
-    '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'],
     }
+  ],
+  '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',
+      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,9 +8,14 @@ on:
 permissions: write-all
 
 jobs:
-  Build-LiteLoader:
+  build-linux:
     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
@@ -23,22 +28,26 @@ jobs:
       uses: actions/setup-node@v4
       with:
         node-version: 20.x
-    - name: Build NuCat Framework
+    - name: Build NuCat Linux
       run: |
-          npm i
+          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          npm run build:framework
+          npm run build:prod
           cd dist
-          npm i --omit=dev 
+          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-          rm package-lock.json
           cd ..
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: NapCat.Framework
+        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
         path: dist
-  Build-Shell:
+  build-win32:
     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
@@ -51,16 +60,15 @@ jobs:
           uses: actions/setup-node@v4
           with:
               node-version: 20.x
-        - name: Build NuCat LiteLoader
+        - name: Build NuCat Linux
           run: |
-                npm i
+                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                npm run build:shell
+                npm run build:prod
                 cd dist
-                npm i --omit=dev
+                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
-                rm package-lock.json
                 cd ..
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:
-              name: NapCat.Shell
+              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
-              path: dist
+              path: dist

.github/workflows/release.yml

@@ -30,9 +30,14 @@ jobs:
               ls
               node ./script/checkVersion.cjs
               sh ./checkVersion.sh
-  Build-LiteLoader:
+  build-linux:
     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
@@ -46,21 +51,28 @@ jobs:
       with:
           node-version: 20.x
 
-    - name: Build NuCat Framework
+    - name: Build NuCat Linux
       run: |
-          npm i
+          export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
-          npm run build:framework
+          export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
+          npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+          npm run build:prod
           cd dist
-          npm i --omit=dev
+          npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
           cd ..
     - name: Upload Artifact
       uses: actions/upload-artifact@v4
       with:
-        name: NapCat.Framework
+        name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
         path: dist
-  Build-Shell:
+  build-win32:
     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
@@ -75,22 +87,24 @@ jobs:
           with:
               node-version: 20.x
           
-        - name: Build NuCat Shell
+        - name: Build NuCat Linux
           run: |
-                npm i 
+                export NAPCAT_BUILDSYS=${{ matrix.target_platform }} 
-                npm run build:shell
+                export NAPCAT_BUILDARCH=${{ matrix.target_arch }} 
+                npm i --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
+                npm run build:prod
                 cd dist
-                npm i --omit=dev
+                npm i --omit=dev --arch=${{ matrix.target_arch }} --platform=${{ matrix.target_platform }} 
                 cd ..
 
         - name: Upload Artifact
           uses: actions/upload-artifact@v4
           with:
-              name: NapCat.Shell
+              name: NapCat.${{ matrix.target_platform }}.${{ matrix.target_arch }}
               path: dist
 
   release-napcat:
-    needs: [Build-LiteLoader,Build-Shell]
+    needs: [build-win32,build-linux]
     runs-on: ubuntu-latest
     steps:
     - name: Download All Artifact
@@ -116,8 +130,10 @@ jobs:
         token: ${{ secrets.GITHUB_TOKEN }}
         body_path: CHANGELOG.md
         files: |
-          NapCat.Framework.zip
+          NapCat.win32.ia32.zip
-          NapCat.Shell.zip
+          NapCat.win32.x64.zip
+          NapCat.linux.x64.zip
+          NapCat.linux.arm64.zip
 #          NapCat.darwin.x64.zip
 #          NapCat.darwin.arm64.zip
         draft: true

.github/workflows/test.yml

@@ -0,0 +1,69 @@
+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

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

LICENSE

@@ -1,339 +1,373 @@
-                    GNU GENERAL PUBLIC LICENSE
+Mozilla Public License Version 2.0
-                       Version 2, June 1991
+==================================
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+1. Definitions
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+--------------
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
 
-                            Preamble
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
 
-  The licenses for most software are designed to take away your
+1.2. "Contributor Version"
-freedom to share and change it.  By contrast, the GNU General Public
+    means the combination of the Contributions of others (if any) used
-License is intended to guarantee your freedom to share and change free
+    by a Contributor and that particular Contributor's Contribution.
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
 
-  When we speak of free software, we are referring to freedom, not
+1.3. "Contribution"
-price.  Our General Public Licenses are designed to make sure that you
+    means Covered Software of a particular Contributor.
-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
+1.4. "Covered Software"
-anyone to deny you these rights or to ask you to surrender the rights.
+    means Source Code Form to which the initial Contributor has attached
-These restrictions translate to certain responsibilities for you if you
+    the notice in Exhibit A, the Executable Form of such Source Code
-distribute copies of the software, or if you modify it.
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
 
-  For example, if you distribute copies of such a program, whether
+1.5. "Incompatible With Secondary Licenses"
-gratis or for a fee, you must give the recipients all the rights that
+    means
-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
+    (a) that the initial Contributor has attached the notice described
-(2) offer you this license which gives you legal permission to copy,
+        in Exhibit B to the Covered Software; or
-distribute and/or modify the software.
 
-  Also, for each author's protection and ours, we want to make certain
+    (b) that the Covered Software was made available under the terms of
-that everyone understands that there is no warranty for this free
+        version 1.1 or earlier of the License, but not also under the
-software.  If the software is modified by someone else and passed on, we
+        terms of a Secondary License.
-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
+1.6. "Executable Form"
-patents.  We wish to avoid the danger that redistributors of a free
+    means any form of the work other than Source Code Form.
-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
+1.7. "Larger Work"
-modification follow.
+    means a work that combines Covered Software with other material, in
+    a separate file or files, that is not Covered Software.
 
-                    GNU GENERAL PUBLIC LICENSE
+1.8. "License"
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+    means this document.
 
-  0. This License applies to any program or other work which contains
+1.9. "Licensable"
-a notice placed by the copyright holder saying it may be distributed
+    means having the right to grant, to the maximum extent possible,
-under the terms of this General Public License.  The "Program", below,
+    whether at the time of the initial grant or subsequently, any and
-refers to any such program or work, and a "work based on the Program"
+    all of the rights conveyed by this License.
-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
+1.10. "Modifications"
-covered by this License; they are outside its scope.  The act of
+    means any of the following:
-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
+    (a) any file in Source Code Form that results from an addition to,
-source code as you receive it, in any medium, provided that you
+        deletion from, or modification of the contents of Covered
-conspicuously and appropriately publish on each copy an appropriate
+        Software; or
-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
+    (b) any new file in Source Code Form that contains any Covered
-you may at your option offer warranty protection in exchange for a fee.
+        Software.
 
-  2. You may modify your copy or copies of the Program or any portion
+1.11. "Patent Claims" of a Contributor
-of it, thus forming a work based on the Program, and copy and
+    means any patent claim(s), including without limitation, method,
-distribute such modifications or work under the terms of Section 1
+    process, and apparatus claims, in any patent Licensable by such
-above, provided that you also meet all of these conditions:
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
 
-    a) You must cause the modified files to carry prominent notices
+1.12. "Secondary License"
-    stating that you changed the files and the date of any change.
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
 
-    b) You must cause any work that you distribute or publish, that in
+1.13. "Source Code Form"
-    whole or in part contains or is derived from the Program or any
+    means the form of the work preferred for making modifications.
-    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
+1.14. "You" (or "Your")
-    when run, you must cause it, when started running for such
+    means an individual or a legal entity exercising rights under this
-    interactive use in the most ordinary way, to print or display an
+    License. For legal entities, "You" includes any entity that
-    announcement including an appropriate copyright notice and a
+    controls, is controlled by, or is under common control with You. For
-    notice that there is no warranty (or else, saying that you provide
+    purposes of this definition, "control" means (a) the power, direct
-    a warranty) and that users may redistribute the program under
+    or indirect, to cause the direction or management of such entity,
-    these conditions, and telling the user how to view a copy of this
+    whether by contract or otherwise, or (b) ownership of more than
-    License.  (Exception: if the Program itself is interactive but
+    fifty percent (50%) of the outstanding shares or beneficial
-    does not normally print such an announcement, your work based on
+    ownership of such entity.
-    the Program is not required to print an announcement.)
 
-These requirements apply to the modified work as a whole.  If
+2. License Grants and Conditions
-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
+2.1. Grants
-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
+Each Contributor hereby grants You a world-wide, royalty-free,
-with the Program (or with a work based on the Program) on a volume of
+non-exclusive license:
-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,
+(a) under intellectual property rights (other than patent or trademark)
-under Section 2) in object code or executable form under the terms of
+    Licensable by such Contributor to use, reproduce, make available,
-Sections 1 and 2 above provided that you also do one of the following:
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
 
-    a) Accompany it with the complete corresponding machine-readable
+(b) under Patent Claims of such Contributor to make, use, sell, offer
-    source code, which must be distributed under the terms of Sections
+    for sale, have made, import, and otherwise transfer either its
-    1 and 2 above on a medium customarily used for software interchange; or,
+    Contributions or its Contributor Version.
 
-    b) Accompany it with a written offer, valid for at least three
+2.2. Effective Date
-    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
+The licenses granted in Section 2.1 with respect to any Contribution
-    to distribute corresponding source code.  (This alternative is
+become effective for each Contribution on the date the Contributor first
-    allowed only for noncommercial distribution and only if you
+distributes such Contribution.
-    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
+2.3. Limitations on Grant Scope
-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
+The licenses granted in this Section 2 are the only rights granted under
-access to copy from a designated place, then offering equivalent
+this License. No additional rights or licenses will be implied from the
-access to copy the source code from the same place counts as
+distribution or licensing of Covered Software under this License.
-distribution of the source code, even though third parties are not
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
-compelled to copy the source along with the object code.
+Contributor:
 
-  4. You may not copy, modify, sublicense, or distribute the Program
+(a) for any code that a Contributor has removed from Covered Software;
-except as expressly provided under this License.  Any attempt
+    or
-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
+(b) for infringements caused by: (i) Your and any other third party's
-signed it.  However, nothing else grants you permission to modify or
+    modifications of Covered Software, or (ii) the combination of its
-distribute the Program or its derivative works.  These actions are
+    Contributions with other software (except as part of its Contributor
-prohibited by law if you do not accept this License.  Therefore, by
+    Version); or
-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
+(c) under Patent Claims infringed by Covered Software in the absence of
-Program), the recipient automatically receives a license from the
+    its Contributions.
-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
+This License does not grant any rights in the trademarks, service marks,
-infringement or for any other reason (not limited to patent issues),
+or logos of any Contributor (except as may be necessary to comply with
-conditions are imposed on you (whether by court order, agreement or
+the notice requirements in Section 3.4).
-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
+2.4. Subsequent Licenses
-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
+No Contributor makes additional grants as a result of Your choice to
-patents or other property right claims or to contest validity of any
+distribute the Covered Software under a subsequent version of this
-such claims; this section has the sole purpose of protecting the
+License (see Section 10.2) or under the terms of a Secondary License (if
-integrity of the free software distribution system, which is
+permitted under the terms of Section 3.3).
-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
+2.5. Representation
-be a consequence of the rest of this License.
 
-  8. If the distribution and/or use of the Program is restricted in
+Each Contributor represents that the Contributor believes its
-certain countries either by patents or by copyrighted interfaces, the
+Contributions are its original creation(s) or it has sufficient rights
-original copyright holder who places the Program under this License
+to grant the rights to its Contributions conveyed by 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
+2.6. Fair Use
-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
+This License is not intended to limit any rights You have under
-specifies a version number of this License which applies to it and "any
+applicable copyright doctrines of fair use, fair dealing, or other
-later version", you have the option of following the terms and conditions
+equivalents.
-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
+2.7. Conditions
-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
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+3. Responsibilities
-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
+3.1. Distribution of Source Form
-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
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
 
-            How to Apply These Terms to Your New Programs
+3.2. Distribution of Executable Form
 
-  If you develop a new program, and you want it to be of the greatest
+If You distribute Covered Software in Executable Form then:
-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
+(a) such Covered Software must also be made available in Source Code
-to attach them to the start of each source file to most effectively
+    Form, as described in Section 3.1, and You must inform recipients of
-convey the exclusion of warranty; and each file should have at least
+    the Executable Form how they can obtain a copy of such Source Code
-the "copyright" line and a pointer to where the full notice is found.
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
 
-    <one line to give the program's name and a brief idea of what it does.>
+(b) You may distribute such Executable Form under the terms of this
-    Copyright (C) <year>  <name of author>
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
 
-    This program is free software; you can redistribute it and/or modify
+3.3. Distribution of a Larger Work
-    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,
+You may create and distribute a Larger Work under terms of Your choice,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
+provided that You also comply with the requirements of this License for
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+the Covered Software. If the Larger Work is a combination of Covered
-    GNU General Public License for more details.
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
 
-    You should have received a copy of the GNU General Public License along
+3.4. Notices
-    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.
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
 
-If the program is interactive, make it output a short notice like this
+3.5. Application of Additional Terms
-when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) year name of author
+You may choose to offer, and to charge a fee for, warranty, support,
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+indemnity or liability obligations to one or more recipients of Covered
-    This is free software, and you are welcome to redistribute it
+Software. However, You may do so only on Your own behalf, and not on
-    under certain conditions; type `show c' for details.
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
 
-The hypothetical commands `show w' and `show c' should show the appropriate
+4. Inability to Comply Due to Statute or Regulation
-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
+If it is impossible for You to comply with any of the terms of this
-school, if any, to sign a "copyright disclaimer" for the program, if
+License with respect to some or all of the Covered Software due to
-necessary.  Here is a sample; alter the names:
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
 
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+5. Termination
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+--------------
 
-  <signature of Ty Coon>, 1 April 1989
+5.1. The rights granted under this License will terminate automatically
-  Ty Coon, President of Vice
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
 
-This General Public License does not permit incorporating your program into
+5.2. If You initiate litigation against any entity by asserting a patent
-proprietary programs.  If your program is a subroutine library, you may
+infringement claim (excluding declaratory judgment actions,
-consider it more useful to permit linking proprietary applications with the
+counter-claims, and cross-claims) alleging that a Contributor Version
-library.  If this is what you want to do, use the GNU Lesser General
+directly or indirectly infringes any patent, then the rights granted to
-Public License instead of this License.
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.

README.md

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

docs/changelogs/CHANGELOG.v1.8.4.md

@@ -0,0 +1,12 @@
+# v1.8.4
+
+QQ Version: Windows 9.9.15-26702 / Linux 3.2.12-26702
+
+## 启动的方式
+Way03/Way05
+
+## 新增与调整
+1. 支持主动临时消息
+
+
+新增的 API 详细见[API文档](https://napneko.github.io/zh-CN/develop/extends_api)

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

@@ -0,0 +1,17 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,15 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,14 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,10 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,13 @@
+# 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

@@ -0,0 +1,15 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,14 @@
+# 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

@@ -0,0 +1,12 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,11 @@
+# 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

@@ -0,0 +1,13 @@
+# 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

@@ -0,0 +1,13 @@
+# 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

@@ -0,0 +1,18 @@
+# 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

@@ -0,0 +1,18 @@
+# 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/changelogs/old/CHANGELOG.v1.6.6.md

@@ -0,0 +1,17 @@
+# v1.6.6
+
+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/develop/Image.NTAndroid.md

@@ -0,0 +1,49 @@
+
+    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

@@ -0,0 +1,444 @@
+```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

@@ -0,0 +1,16 @@
+# 开发方向
+方向一 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

@@ -0,0 +1,8 @@
+# Api方向
+## getMsgUniqueId √ 已应用
+getMsgUniqueId 传入时间 产出一个唯一ID 发送消息作为一个参数
+
+# Native方向
+## magic_load
+## api_caller
+## NodeMain

manifest.json

@@ -1,33 +0,0 @@
-{
-  "manifest_version": 4,
-  "type": "extension",
-  "name": "NapCat",
-  "slug": "NapCat",
-  "description": "OneBot v11 protocol implementation with NapCat logic",
-  "version": "2.0.2",
-  "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,12 +2,19 @@
   "name": "napcat",
   "private": true,
   "type": "module",
-  "version": "2.0.2",
+  "version": "1.8.4",
   "scripts": {
-    "build:framework": "vite build --mode framework",
+    "watch:dev": "vite --mode development",
-    "build:shell": "vite build --mode shell",
+    "watch:prod": "vite --mode production",
+    "build:dev": "vite build --mode development",
+    "build:prod": "vite build --mode production",
+    "build": "npm run build:dev",
+    "build:core": "cd ./src/core && npm run build && cd ../.. && node ./script/copy-core.cjs",
     "build:webui": "cd ./src/webui && vite build",
+    "watch": "npm run watch:dev",
+    "debug-win": "powershell dist/napcat.ps1",
     "lint": "eslint --fix src/**/*.{js,ts}",
+    "release": "npm run build:prod",
     "depend": "cd dist && npm install --omit=dev"
   },
   "devDependencies": {
@@ -24,9 +31,9 @@
     "@types/figlet": "^1.5.8",
     "@types/fluent-ffmpeg": "^2.1.24",
     "@types/jest": "^29.5.12",
-    "@types/node": "^22.0.1",
+    "@types/node": "^22.0.0",
     "@types/qrcode-terminal": "^0.12.2",
-    "@types/ws": "^8.5.12",
+    "@types/ws": "^8.5.10",
     "@typescript-eslint/eslint-plugin": "^7.4.0",
     "@typescript-eslint/parser": "^7.4.0",
     "eslint": "^8.57.0",
@@ -46,9 +53,8 @@
   },
   "dependencies": {
     "ajv": "^8.13.0",
-    "async-mutex": "^0.5.0",
     "chalk": "^5.3.0",
-    "commander": "^12.1.0",
+    "commander": "^12.0.0",
     "cors": "^2.8.5",
     "express": "^5.0.0-beta.2",
     "fast-xml-parser": "^4.3.6",
@@ -59,7 +65,6 @@
     "log4js": "^6.9.1",
     "qrcode-terminal": "^0.12.0",
     "silk-wasm": "^3.6.1",
-    "strtok3": "8.0.1",
+    "ws": "^8.16.0"
-    "ws": "^8.18.0"
   }
 }

script/NapCat.164.bat

@@ -0,0 +1,28 @@
+@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

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

script/checkVersion.cjs

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

script/copy-core.cjs

@@ -0,0 +1,32 @@
+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

@@ -0,0 +1,21 @@
+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

@@ -0,0 +1,20 @@
+// --------------------
+// 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

@@ -0,0 +1,18 @@
+@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

@@ -0,0 +1,41 @@
+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

@@ -0,0 +1,17 @@
+@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

@@ -0,0 +1,41 @@
+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

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

script/napcat-gc.ps1

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,17 @@
+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

@@ -0,0 +1,18 @@
+@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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,17 @@
+@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

@@ -0,0 +1,43 @@
+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

@@ -0,0 +1,21 @@
+#!/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

@@ -1,263 +0,0 @@
-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

@@ -1,140 +0,0 @@
-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

@@ -1,30 +0,0 @@
-import path, { dirname } from 'path';
-import { fileURLToPath } from 'url';
-import fs from 'fs';
-
-export const napcat_version = '2.0.2';
-
-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

@@ -0,0 +1,132 @@
+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;
+
+  public get server(): http.Server | null {
+    return this._server;
+  }
+
+  private set server(value: http.Server | null) {
+    this._server = value;
+  }
+
+  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: Error): 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);
+      }
+    });
+  }
+
+  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

@@ -0,0 +1,127 @@
+import { WebSocket, WebSocketServer } from 'ws';
+import http from 'http';
+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 | http.Server, host: string = '') {
+    if (port instanceof http.Server) {
+      try {
+        const wss = new WebSocketServer({
+          noServer: true,
+          maxPayload: 1024 * 1024 * 1024
+        }).on('error', () => {
+        });
+        this.ws = wss;
+        port.on('upgrade', function upgrade(request, socket, head) {
+          wss.handleUpgrade(request, socket, head, function done(ws) {
+            wss.emit('connection', ws, request);
+          });
+        });
+        log('ws服务启动成功, 绑定到HTTP服务');
+      } catch (e: any) {
+        throw Error('ws服务启动失败, 可能是绑定的HTTP服务异常' + e.toString());
+      }
+    } else {
+      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() {
+    if (this.ws) {
+      this.ws.close((err) => {
+        if (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/ConfigBase.ts

@@ -1,67 +1,89 @@
 import path from 'node:path';
 import fs from 'node:fs';
-import type { NapCatCore } from '@/core';
+import { log, logDebug, logError } from '@/common/utils/log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+import { selfInfo } from '@/core/data';
 
-export abstract class ConfigBase<T> {
-    name: string;
-    coreContext: NapCatCore;
-    configPath: string;
-    configData: T = {} as T;
 
-    protected constructor(name: string, coreContext: NapCatCore, configPath: string) {
+const __filename = fileURLToPath(import.meta.url);
-        this.name = name;
+const __dirname = dirname(__filename);
-        this.coreContext = coreContext;
+
-        this.configPath = configPath;
+const configDir = path.resolve(__dirname, 'config');
-        fs.mkdirSync(this.configPath, { recursive: true });
+fs.mkdirSync(configDir, { recursive: true });
-        this.read();
+
+
+export class ConfigBase<T> {
+  public name: string = 'default_config';
+  private pathName: string | null = null; // 本次读取的文件路径
+  constructor() {
+  }
+
+  protected getKeys(): string[] | null {
+    // 决定 key 在json配置文件中的顺序
+    return null;
+  }
+
+  getConfigDir() {
+    const configDir = path.resolve(__dirname, 'config');
+    fs.mkdirSync(configDir, { recursive: true });
+    return configDir;
+  }
+  getConfigPath(pathName: string | null): string {
+    const suffix = pathName ? `_${pathName}` : '';
+    const filename = `${this.name}${suffix}.json`;
+    return path.join(this.getConfigDir(), filename);
+  }
+  read() {
+    // 尝试加载当前账号配置
+    if (this.read_from_file(selfInfo.uin, false)) return this;
+    // 尝试加载默认配置
+    return this.read_from_file('', true);
+  }
+  read_from_file(pathName: string, createIfNotExist: boolean) {
+    const configPath = this.getConfigPath(pathName);
+    if (!fs.existsSync(configPath)) {
+      if (!createIfNotExist) return null;
+      this.pathName = pathName; // 记录有效的设置文件
+      try {
+        fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
+        log(`配置文件${configPath}已创建\n如果修改此文件后需要重启 NapCat 生效`);
+      }
+      catch (e: any) {
+        logError(`创建配置文件 ${configPath} 时发生错误:`, e.message);
+      }
+      return this;
     }
 
-    protected getKeys(): string[] | null {
+    try {
-        // 决定 key 在json配置文件中的顺序
+      const data = JSON.parse(fs.readFileSync(configPath, 'utf-8'));
-        return null;
+      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;
     }
+  }
 
-    getConfigPath(pathName: string | undefined): string {
+  save(config: T, overwrite: boolean = false) {
-        const suffix = pathName ? `_${pathName}` : '';
+    Object.assign(this, config);
-        const filename = `${this.name}${suffix}.json`;
+    if (overwrite) {
-        return path.join(this.configPath, filename);
+      // 用户要求强制写入，则变更当前文件为目标文件
+      this.pathName = `${selfInfo.uin}`;
     }
-
+    const configPath = this.getConfigPath(this.pathName);
-    read(): T {
+    try {
-        const logger = this.coreContext.context.logger;
+      fs.writeFileSync(configPath, JSON.stringify(this, this.getKeys(), 2));
-        const configPath = this.getConfigPath(this.coreContext.selfInfo.uin);
+    } catch (e: any) {
-        if (!fs.existsSync(configPath)) {
+      logError(`保存配置文件 ${configPath} 时发生错误:`, e.message);
-            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

@@ -0,0 +1,227 @@
+import { NodeIQQNTWrapperSession } from '@/core/wrapper';
+import { randomUUID } from 'crypto';
+
+interface Internal_MapKey {
+  timeout: number,
+  createtime: number,
+  func: (...arg: any[]) => any,
+  checker: ((...args: any[]) => boolean) | undefined,
+}
+
+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("[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.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 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 Timeouter = setTimeout(databack, timeout);
+      const eventCallbak = {
+        timeout: timeout,
+        createtime: Date.now(),
+        checker: checker,
+        func: (...args: Parameters<ListenerType>) => {
+          complete++;
+          retData = args;
+          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);
+    });
+  }
+  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.CreatListenerFunction(ListenerMainName);
+      const EventFunc = this.CreatEventFunction<EventType>(EventName);
+      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

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

src/common/utils/MessageUnique.ts

@@ -1,150 +1,144 @@
 import { Peer } from '@/core';
-import crypto from 'crypto';
+import crypto, { randomInt, randomUUID } from 'crypto';
+import { logError } from './log';
 
 export class LimitedHashTable<K, V> {
-    private keyToValue: Map<K, V> = new Map();
+  private keyToValue: Map<K, V> = new Map();
-    private valueToKey: Map<V, K> = new Map();
+  private valueToKey: Map<V, K> = new Map();
-    private maxSize: number;
+  private maxSize: number;
 
-    constructor(maxSize: number) {
+  constructor(maxSize: number) {
-        this.maxSize = maxSize;
+    this.maxSize = maxSize;
-    }
+  }
+  resize(count: number) {
+    this.maxSize = count;
+  }
 
-    resize(count: number) {
+  set(key: K, value: V): void {
-        this.maxSize = count;
+    // 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);
+    }
+  }
 
-    set(key: K, value: V): void {
+  getValue(key: K): V | undefined {
-        // const isExist = this.keyToValue.get(key);
+    return 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 {
+  getKey(value: V): K | undefined {
-        return this.keyToValue.get(key);
+    return this.valueToKey.get(value);
-    }
+  }
 
-    getKey(value: V): K | undefined {
+  deleteByValue(value: V): void {
-        return this.valueToKey.get(value);
+    const key = this.valueToKey.get(value);
+    if (key !== undefined) {
+      this.keyToValue.delete(key);
+      this.valueToKey.delete(value);
     }
+  }
 
-    deleteByValue(value: V): void {
+  deleteByKey(key: K): void {
-        const key = this.valueToKey.get(value);
+    const value = this.keyToValue.get(key);
-        if (key !== undefined) {
+    if (value !== undefined) {
-            this.keyToValue.delete(key);
+      this.keyToValue.delete(key);
-            this.valueToKey.delete(value);
+      this.valueToKey.delete(value);
-        }
     }
+  }
 
-    deleteByKey(key: K): void {
+  getKeyList(): K[] {
-        const value = this.keyToValue.get(key);
+    return Array.from(this.keyToValue.keys());
-        if (value !== undefined) {
+  }
-            this.keyToValue.delete(key);
+  //获取最近刚写入的几个值
-            this.valueToKey.delete(value);
+  getHeads(size: number): { key: K; value: V }[] | undefined {
-        }
+    const keyList = this.getKeyList();
+    if (keyList.length === 0) {
+      return undefined;
     }
-
+    const result: { key: K; value: V }[] = [];
-    getKeyList(): K[] {
+    const listSize = Math.min(size, keyList.length);
-        return Array.from(this.keyToValue.keys());
+    for (let i = 0; i < listSize; i++) {
-    }
+      const key = keyList[listSize - i];
-
+      result.push({ key, value: this.keyToValue.get(key)! });
-    //获取最近刚写入的几个值
-    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;
     }
+    return result;
+  }
 }
 
 class MessageUniqueWrapper {
-    private msgDataMap: LimitedHashTable<string, number>;
+  private msgDataMap: LimitedHashTable<string, number>;
-    private msgIdMap: LimitedHashTable<string, number>;
+  private msgIdMap: LimitedHashTable<string, number>;
-
+  constructor(maxMap: number = 1000) {
-    constructor(maxMap: number = 1000) {
+    this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
-        this.msgIdMap = new LimitedHashTable<string, number>(maxMap);
+    this.msgDataMap = 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;
+  }
 
-    getRecentMsgIds(Peer: Peer, size: number): string[] {
+  getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | undefined {
-        const heads = this.msgIdMap.getHeads(size);
+    const data = this.msgDataMap.getKey(shortId);
-        if (!heads) {
+    if (data) {
-            return [];
+      const [msgId, chatTypeStr, peerUid] = data.split('|');
-        }
+      const peer: Peer = {
-        const data = heads.map((t) => MessageUnique.getMsgIdAndPeerByShortId(t.value));
+        chatType: parseInt(chatTypeStr),
-        const ret = data.filter((t) => t?.Peer.chatType === Peer.chatType && t?.Peer.peerUid === Peer.peerUid);
+        peerUid,
-        return ret.map((t) => t?.MsgId).filter((t) => t !== undefined);
+        guildId: '',
+      };
+      return { MsgId: msgId, Peer: peer };
     }
+    return undefined;
+  }
 
-    createMsg(peer: Peer, msgId: string): number | undefined {
+  getShortIdByMsgId(msgId: string): number | undefined {
-        const key = `${msgId}|${peer.chatType}|${peer.peerUid}`;
+    return this.msgIdMap.getValue(msgId);
-        const hash = crypto.createHash('md5').update(key).digest();
+  }
-        //设置第一个bit为0 保证shortId为正数
+  getPeerByMsgId(msgId: string) {
-        hash[0] &= 0x7f;
+    const shortId = this.msgIdMap.getValue(msgId);
-        const shortId = hash.readInt32BE(0);
+    if (!shortId) return undefined;
-        //减少性能损耗
+    return this.getMsgIdAndPeerByShortId(shortId);
-        // const isExist = this.msgIdMap.getKey(shortId);
+  }
-        // if (isExist && isExist === msgId) {
+  resize(maxSize: number): void {
-        //   return shortId;
+    this.msgIdMap.resize(maxSize);
-        // }
+    this.msgDataMap.resize(maxSize);
-        this.msgIdMap.set(msgId, shortId);
+  }
-        this.msgDataMap.set(key, shortId);
-        return shortId;
-    }
-
-    getMsgIdAndPeerByShortId(shortId: number): { MsgId: string; Peer: Peer } | undefined {
-        const data = this.msgDataMap.getKey(shortId);
-        if (data) {
-            const [msgId, chatTypeStr, peerUid] = data.split('|');
-            const peer: Peer = {
-                chatType: parseInt(chatTypeStr),
-                peerUid,
-                guildId: '',
-            };
-            return { MsgId: msgId, Peer: peer };
-        }
-        return undefined;
-    }
-
-    getShortIdByMsgId(msgId: string): number | undefined {
-        return this.msgIdMap.getValue(msgId);
-    }
-
-    getPeerByMsgId(msgId: string) {
-        const shortId = this.msgIdMap.getValue(msgId);
-        if (!shortId) return undefined;
-        return this.getMsgIdAndPeerByShortId(shortId);
-    }
-
-    resize(maxSize: number): void {
-        this.msgIdMap.resize(maxSize);
-        this.msgDataMap.resize(maxSize);
-    }
 }
 
-export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();
+export const MessageUnique: MessageUniqueWrapper = new MessageUniqueWrapper();

src/common/utils/Packet.ts

@@ -0,0 +1,17 @@
+// 方案一 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

@@ -3,79 +3,55 @@ import fs from 'node:fs';
 import { systemPlatform } from '@/common/utils/system';
 import { getDefaultQQVersionConfigInfo, getQQVersionConfigPath } from './helper';
 import AppidTable from '@/core/external/appid.json';
-import { LogWrapper } from './log';
+import { log } from './log';
 
-export class QQBasicInfoWrapper {
+//基础目录获取
-    QQMainPath: string | undefined;
+export const QQMainPath = process.execPath;
-    QQPackageInfoPath: string | undefined;
+export const QQPackageInfoPath: string = path.join(path.dirname(QQMainPath), 'resources', 'app', 'package.json');
-    QQVersionConfigPath: string | undefined;
+export const QQVersionConfigPath: string | undefined = getQQVersionConfigPath(QQMainPath);
-    isQuickUpdate: boolean | undefined;
-    QQVersionConfig: QQVersionConfigType | undefined;
-    QQPackageInfo: QQPackageInfoType | undefined;
-    QQVersionAppid: string | undefined;
-    QQVersionQua: string | undefined;
-    context: { logger: LogWrapper };
 
-    constructor(context: { logger: LogWrapper }) {
+//基础信息获取 无快更则启用默认模板填充
-        //基础目录获取
+export const isQuickUpdate: boolean = !!QQVersionConfigPath;
-        this.context = context;
+export const QQVersionConfig: QQVersionConfigType = isQuickUpdate ? JSON.parse(fs.readFileSync(QQVersionConfigPath!).toString()) : getDefaultQQVersionConfigInfo();
-        this.QQMainPath = process.execPath;
+export const QQPackageInfo: QQPackageInfoType = JSON.parse(fs.readFileSync(QQPackageInfoPath).toString());
-        this.QQPackageInfoPath = path.join(path.dirname(this.QQMainPath), 'resources', 'app', 'package.json');
+export const { appid: QQVersionAppid, qua: QQVersionQua } = getAppidV2();
-        this.QQVersionConfigPath = getQQVersionConfigPath(this.QQMainPath);
 
-        //基础信息获取 无快更则启用默认模板填充
+//基础函数
-        this.isQuickUpdate = !!this.QQVersionConfigPath;
+export function getQQBuildStr() {
-        this.QQVersionConfig = this.isQuickUpdate
+  return isQuickUpdate ? QQVersionConfig.buildId : QQPackageInfo.buildVersion;
-            ? 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() };
-    }
 }
-
+export function getFullQQVesion() {
-export let QQBasicInfo: QQBasicInfoWrapper | undefined;
+  return isQuickUpdate ? QQVersionConfig.curVersion : QQPackageInfo.version;
+}
+export function requireMinNTQQBuild(buildStr: string) {
+  return parseInt(getQQBuildStr()) >= parseInt(buildStr);
+}
+//此方法不要直接使用
+export function getQUAInternal() {
+  return systemPlatform === 'linux' ? `V1_LNX_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B` : `V1_WIN_NQ_${getFullQQVesion()}_${getQQBuildStr()}_GW_B`;
+}
+export function getAppidV2(): { appid: string, qua: string } {
+  const appidTbale = AppidTable as unknown as QQAppidTableType;
+  try {
+    const data = appidTbale[getFullQQVesion()];
+    if (data) {
+      return data;
+    }
+  }
+  catch (e) {
+    log('[QQ版本兼容性检测] 获取Appid异常 请检测NapCat/QQNT是否正常');
+  }
+  // 以下是兜底措施
+  log(`[QQ版本兼容性检测] ${getFullQQVesion()} 版本兼容性不佳，可能会导致一些功能无法正常使用`);
+  return { appid: systemPlatform === 'linux' ? '537237950' : '537237765', qua: getQUAInternal() };
+}
+// 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',

src/common/utils/audio.ts

@@ -1,90 +1,136 @@
 import fs from 'fs';
-import { encode, getDuration, getWavFileInfo, isSilk, isWav } from 'silk-wasm';
+import { encode, getDuration, getWavFileInfo, isWav, isSilk } from 'silk-wasm';
 import fsPromise from 'fs/promises';
+import { log, logError } from './log';
 import path from 'node:path';
 import { randomUUID } from 'crypto';
 import { spawn } from 'node:child_process';
-import { LogWrapper } from './log';
+import { getTempDir } from '@/common/utils/file';
-
-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 file = await fsPromise.readFile(filePath);
+      const buffer = fs.readFileSync(filePath, {
-        const pttPath = path.join(TEMP_DIR, randomUUID());
+        encoding: null,
-        if (!isSilk(file)) {
+        flag: 'r',
-            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);
-            }
 
-            return {
+      const fileHeader = buffer.toString('hex', 0, bytesToRead);
-                converted: false,
+      return fileHeader;
-                path: filePath,
+    } catch (err) {
-                duration,
+      logError('读取文件错误:', err);
-            };
+      return;
-        }
-    } catch (error: any) {
-        logger.logError('convert silk failed', error.stack);
-        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, randomUUID());
+    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);
+            }
+            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,
+      };
+    }
+  } catch (error: any) {
+    logError('convert silk failed', error.stack);
+    return {};
+  }
 }

src/common/utils/cpmodule.ts

@@ -0,0 +1,23 @@
+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/file.ts

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

src/common/utils/helper.ts

@@ -1,165 +1,405 @@
 import crypto from 'node:crypto';
 import path from 'node:path';
 import fs from 'fs';
+import { log, logDebug } from './log';
+import { dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
 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);
 
 //下面这个类是用于将uid+msgid合并的类
-
 export class UUIDConverter {
-    static encode(highStr: string, lowStr: string): string {
+  static encode(highStr: string, lowStr: string): string {
-        const high = BigInt(highStr);
+    const high = BigInt(highStr);
-        const low = BigInt(lowStr);
+    const low = BigInt(lowStr);
-        const highHex = high.toString(16).padStart(16, '0');
+    const highHex = high.toString(16).padStart(16, '0');
-        const lowHex = low.toString(16).padStart(16, '0');
+    const lowHex = low.toString(16).padStart(16, '0');
-        const combinedHex = highHex + lowHex;
+    const combinedHex = highHex + lowHex;
-        const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(
+    const uuid = `${combinedHex.substring(0, 8)}-${combinedHex.substring(8, 12)}-${combinedHex.substring(12, 16)}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
-            12,
+    return uuid;
-            16,
+  }
-        )}-${combinedHex.substring(16, 20)}-${combinedHex.substring(20)}`;
+  static decode(uuid: string): { high: string, low: string } {
-        return uuid;
+    const hex = uuid.replace(/-/g, '');
-    }
+    const high = BigInt('0x' + hex.substring(0, 16));
-
+    const low = BigInt('0x' + hex.substring(16));
-    static decode(uuid: string): { high: string; low: string } {
+    return { high: high.toString(), low: low.toString() };
-        const hex = uuid.replace(/-/g, '');
+  }
-        const high = BigInt('0x' + hex.substring(0, 16));
-        const low = BigInt('0x' + hex.substring(16));
-        return { high: high.toString(), low: low.toString() };
-    }
 }
 
+
 export function sleep(ms: number): Promise<void> {
-    return new Promise((resolve) => setTimeout(resolve, ms));
+  return new Promise(resolve => setTimeout(resolve, ms));
 }
 
 export function PromiseTimer<T>(promise: Promise<T>, ms: number): Promise<T> {
-    const timeoutPromise = new Promise<T>((_, reject) =>
+  const timeoutPromise = new Promise<T>((_, reject) =>
-        setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms),
+    setTimeout(() => reject(new Error('PromiseTimer: Operation timed out')), ms)
-    );
+  );
-    return Promise.race([promise, timeoutPromise]);
+  return Promise.race([promise, timeoutPromise]);
 }
-
 export async function runAllWithTimeout<T>(tasks: Promise<T>[], timeout: number): Promise<T[]> {
-    const wrappedTasks = tasks.map((task) =>
+  const wrappedTasks = tasks.map(task =>
-        PromiseTimer(task, timeout).then(
+    PromiseTimer(task, timeout).then(
-            (result) => ({ status: 'fulfilled', value: result }),
+      result => ({ status: 'fulfilled', value: result }),
-            (error) => ({ status: 'rejected', reason: error }),
+      error => ({ status: 'rejected', reason: error })
-        ),
+    )
-    );
+  );
-    const results = await Promise.all(wrappedTasks);
+  const results = await Promise.all(wrappedTasks);
-    return results
+  return results
-        .filter((result) => result.status === 'fulfilled')
+    .filter(result => result.status === 'fulfilled')
-        .map((result) => (result as { status: 'fulfilled'; value: T }).value);
+    .map(result => (result as { status: 'fulfilled'; value: T }).value);
 }
 
 export function getMd5(s: string) {
-    const h = crypto.createHash('md5');
+
-    h.update(s);
+  const h = crypto.createHash('md5');
-    return h.digest('hex');
+  h.update(s);
+  return h.digest('hex');
 }
 
 export function isNull(value: any) {
-    return value === undefined || value === null;
+  return value === undefined || value === null;
 }
 
 export function isNumeric(str: string) {
-    return /^\d+$/.test(str);
+  return /^\d+$/.test(str);
 }
 
 export function truncateString(obj: any, maxLength = 500) {
-    if (obj !== null && typeof obj === 'object') {
+  if (obj !== null && typeof obj === 'object') {
-        Object.keys(obj).forEach((key) => {
+    Object.keys(obj).forEach(key => {
-            if (typeof obj[key] === 'string') {
+      if (typeof obj[key] === 'string') {
-                // 如果是字符串且超过指定长度，则截断
+        // 如果是字符串且超过指定长度，则截断
-                if (obj[key].length > maxLength) {
+        if (obj[key].length > maxLength) {
-                    obj[key] = obj[key].substring(0, maxLength) + '...';
+          obj[key] = obj[key].substring(0, maxLength) + '...';
-                }
+        }
-            } else if (typeof obj[key] === 'object') {
+      } else if (typeof obj[key] === 'object') {
-                // 如果是对象或数组，则递归调用
+        // 如果是对象或数组，则递归调用
-                truncateString(obj[key], maxLength);
+        truncateString(obj[key], maxLength);
-            }
+      }
-        });
+    });
-    }
+  }
-    return obj;
+  return obj;
+}
+export function simpleDecorator(target: any, context: any) {
 }
 
-export function isEqual(obj1: any, obj2: any) {
+// export function CacheClassFunc(ttl: number = 3600 * 1000, customKey: string = '') {
-    if (obj1 === obj2) return true;
+//   const cache = new Map<string, { expiry: number; value: any }>();
-    if (obj1 == null || obj2 == null) return false;
+//   return function CacheClassFuncDecorator(originalMethod: Function, context: ClassMethodDecoratorContext) {
-    if (typeof obj1 !== 'object' || typeof obj2 !== 'object') return obj1 === obj2;
+//     async function CacheClassFuncDecoratorInternal(this: any, ...args: any[]) {
-
+//       const key = `${customKey}${String(context.name)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
-    const keys1 = Object.keys(obj1);
+//       const cachedValue = cache.get(key);
-    const keys2 = Object.keys(obj2);
+//       if (cachedValue && cachedValue.expiry > Date.now()) {
-
+//         return cachedValue.value;
-    if (keys1.length !== keys2.length) return false;
+//       }
-
+//       const result = originalMethod.call(this, ...args);
-    for (const key of keys1) {
+//       cache.set(key, { expiry: Date.now() + ttl, value: result });
-        if (!isEqual(obj1[key], obj2[key])) return false;
+//       return result;
-    }
+//     }
-    return true;
+//     return CacheClassFuncDecoratorInternal;
-}
+//   }
-
+// }
-export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+export function CacheClassFuncAsync(ttl: number = 3600 * 1000, customKey: string = '') {
-    if (os.platform() === 'linux') {
+  //console.log('CacheClassFuncAsync', ttl, customKey);
-        return {
+  function logExecutionTime(target: any, methodName: string, descriptor: PropertyDescriptor) {
-            baseVersion: '3.2.12-26702',
+    //console.log('logExecutionTime', target, methodName, descriptor);
-            curVersion: '3.2.12-26702',
+    const cache = new Map<string, { expiry: number; value: any }>();
-            prevVersion: '',
+    const originalMethod = descriptor.value;
-            onErrorVersions: [],
+    descriptor.value = async function (...args: any[]) {
-            buildId: '26702',
+      const key = `${customKey}${String(methodName)}.(${args.map(arg => JSON.stringify(arg)).join(', ')})`;
-        };
+      cache.forEach((value, key) => {
-    }
+        if (value.expiry < Date.now()) {
-    return {
+          cache.delete(key);
-        baseVersion: '9.9.15-26702',
+        }
-        curVersion: '9.9.15-26702',
+      });
-        prevVersion: '',
+      const cachedValue = cache.get(key);
-        onErrorVersions: [],
+      if (cachedValue && cachedValue.expiry > Date.now()) {
-        buildId: '26702',
+        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 CacheClassFuncAsyncExtend(ttl: number = 3600 * 1000, customKey: string = '', checker: any = (...data: any[]) => { return true; }) {
+  //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);
+      if (!checker(...args, result)) {
+        return result;//丢弃缓存
+      }
+      // 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 (!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;
+}
+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 fsPromise.readdir(path.join(__dirname, 'config'));
+  for (const file of configFiles) {
+    if (file.match(/^onebot11_\d+.json$/)) {
+      const CurrentConfig = JSON.parse(await fsPromise.readFile(path.join(__dirname, 'config', file), 'utf8'));
+      if (isValidOldConfig(CurrentConfig)) {
+        log('正在迁移旧配置到新配置 File:', file);
+        const NewConfig = migrateConfig(CurrentConfig);
+        await fsPromise.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;
+
+  const keys1 = Object.keys(obj1);
+  const keys2 = Object.keys(obj2);
+
+  if (keys1.length !== keys2.length) return false;
+
+  for (const key of keys1) {
+    if (!isEqual(obj1[key], obj2[key])) return false;
+  }
+  return true;
+}
+export function getDefaultQQVersionConfigInfo(): QQVersionConfigType {
+  if (os.platform() === 'linux') {
+    return {
+      baseVersion: '3.2.12-26702',
+      curVersion: '3.2.12-26702',
+      prevVersion: '',
+      onErrorVersions: [],
+      buildId: '26702'
+    };
+  }
+  return {
+    baseVersion: '9.9.15-26702',
+    curVersion: '9.9.15-26702',
+    prevVersion: '',
+    onErrorVersions: [],
+    buildId: '26702'
+  };
+}
+export async function promisePipeline(promises: Promise<any>[], callback: (result: any) => boolean): Promise<void> {
+  let callbackCalled = false;
+  for (const promise of promises) {
+    if (callbackCalled) break;
+    try {
+      const result = await promise;
+      if (!callbackCalled) {
+        callbackCalled = callback(result);
+      }
+    } catch (error) {
+      console.error('Error in promise pipeline:', error);
+    }
+  }
 }
 
 export function getQQVersionConfigPath(exePath: string = ''): string | undefined {
-    let configVersionInfoPath;
+  let configVersionInfoPath;
-    if (os.platform() !== 'linux') {
+  if (os.platform() !== 'linux') {
-        configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
+    configVersionInfoPath = path.join(path.dirname(exePath), 'resources', 'app', 'versions', 'config.json');
-    } else {
+  } else {
-        const userPath = os.homedir();
+    const userPath = os.homedir();
-        const appDataPath = path.resolve(userPath, './.config/QQ');
+    const appDataPath = path.resolve(userPath, './.config/QQ');
-        configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
+    configVersionInfoPath = path.resolve(appDataPath, './versions/config.json');
-    }
+  }
-    if (typeof configVersionInfoPath !== 'string') {
+  if (typeof configVersionInfoPath !== 'string') {
-        return undefined;
+    return undefined;
-    }
+  }
-    if (!fs.existsSync(configVersionInfoPath)) {
+  if (!fs.existsSync(configVersionInfoPath)) {
-        return undefined;
+    return undefined;
-    }
+  }
-    return configVersionInfoPath;
+  return configVersionInfoPath;
 }
-
 export async function deleteOldFiles(directoryPath: string, daysThreshold: number) {
-    try {
+  try {
-        const files = await fsPromise.readdir(directoryPath);
+    const files = await fsPromise.readdir(directoryPath);
 
-        for (const file of files) {
+    for (const file of files) {
-            const filePath = path.join(directoryPath, file);
+      const filePath = path.join(directoryPath, file);
-            const stats = await fsPromise.stat(filePath);
+      const stats = await fsPromise.stat(filePath);
-            const lastModifiedTime = stats.mtimeMs;
+      const lastModifiedTime = stats.mtimeMs;
-            const currentTime = Date.now();
+      const currentTime = Date.now();
-            const timeDifference = currentTime - lastModifiedTime;
+      const timeDifference = currentTime - lastModifiedTime;
-            const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
+      const daysDifference = timeDifference / (1000 * 60 * 60 * 24);
 
-            if (daysDifference > daysThreshold) {
+      if (daysDifference > daysThreshold) {
-                await fsPromise.unlink(filePath); // Delete the file
+        await fsPromise.unlink(filePath); // Delete the file
-                //console.log(`Deleted: ${filePath}`);
+        //console.log(`Deleted: ${filePath}`);
-            }
+      }
-        }
-    } catch (error) {
-        //console.error('Error deleting files:', error);
     }
-}
+  } catch (error) {
-
+    //console.error('Error deleting files:', error);
-export function calcQQLevel(level: QQLevel) {
+  }
-    const { crownNum, sunNum, moonNum, starNum } = level;
-    return crownNum * 64 + sunNum * 16 + moonNum * 4 + starNum;
 }

src/common/utils/log.ts

@@ -1,138 +1,138 @@
 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);
+
 export enum LogLevel {
-    DEBUG = 'debug',
+  DEBUG = 'debug',
-    INFO = 'info',
+  INFO = 'info',
-    WARN = 'warn',
+  WARN = 'warn',
-    ERROR = 'error',
+  ERROR = 'error',
-    FATAL = 'fatal',
+  FATAL = 'fatal',
 }
 
+const logDir = path.join(path.resolve(__dirname), 'logs');
+
 function getFormattedTimestamp() {
-    const now = new Date();
+  const now = new Date();
-    const year = now.getFullYear();
+  const year = now.getFullYear();
-    const month = (now.getMonth() + 1).toString().padStart(2, '0');
+  const month = (now.getMonth() + 1).toString().padStart(2, '0');
-    const day = now.getDate().toString().padStart(2, '0');
+  const day = now.getDate().toString().padStart(2, '0');
-    const hours = now.getHours().toString().padStart(2, '0');
+  const hours = now.getHours().toString().padStart(2, '0');
-    const minutes = now.getMinutes().toString().padStart(2, '0');
+  const minutes = now.getMinutes().toString().padStart(2, '0');
-    const seconds = now.getSeconds().toString().padStart(2, '0');
+  const seconds = now.getSeconds().toString().padStart(2, '0');
-    const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
+  const milliseconds = now.getMilliseconds().toString().padStart(3, '0');
-    return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
+  return `${year}-${month}-${day}_${hours}-${minutes}-${seconds}.${milliseconds}`;
 }
 
-export class LogWrapper {
+const filename = `${getFormattedTimestamp()}.log`;
-    fileLogEnabled = true;
+const logPath = path.join(logDir, filename);
-    consoleLogEnabled = true;
-    logConfig: Configuration;
-    loggerConsole: log4js.Logger;
-    loggerFile: log4js.Logger;
-    loggerDefault: log4js.Logger;
-    // eslint-disable-next-line no-control-regex
-    colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
 
-    constructor(logDir: string) {
+const logConfig: Configuration = {
-        const filename = `${getFormattedTimestamp()}.log`;
+  appenders: {
-        const logPath = path.join(logDir, filename);
+    FileAppender: { // 输出到文件的appender
-        this.logConfig = {
+      type: 'file',
-            appenders: {
+      filename: logPath, // 指定日志文件的位置和文件名
-                FileAppender: { // 输出到文件的appender
+      maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
-                    type: 'file',
+      layout: {
-                    filename: logPath, // 指定日志文件的位置和文件名
+        type: 'pattern',
-                    maxLogSize: 10485760, // 日志文件的最大大小（单位：字节），这里设置为10MB
+        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m'
-                    layout: {
+      }
-                        type: 'pattern',
+    },
-                        pattern: '%d{yyyy-MM-dd hh:mm:ss} [%p] %X{userInfo} | %m',
+    ConsoleAppender: { // 输出到控制台的appender
-                    },
+      type: 'console',
-                },
+      layout: {
-                ConsoleAppender: { // 输出到控制台的appender
+        type: 'pattern',
-                    type: 'console',
+        pattern: `%d{yyyy-MM-dd hh:mm:ss} [%[%p%]] ${chalk.magenta('%X{userInfo}')} | %m`
-                    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' }
+  }
+};
 
-    setFileAndConsoleLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
+log4js.configure(logConfig);
-        this.logConfig.categories.file.level = fileLogLevel;
+const loggerConsole = log4js.getLogger('console');
-        this.logConfig.categories.console.level = consoleLogLevel;
+const loggerFile = log4js.getLogger('file');
-        log4js.configure(this.logConfig);
+const loggerDefault = log4js.getLogger('default');
-    }
 
-    setLogSelfInfo(selfInfo: { nick: string, uin: string, uid: string }) {
+export function setLogLevel(fileLogLevel: LogLevel, consoleLogLevel: LogLevel) {
-        const userInfo = `${selfInfo.nick}(${selfInfo.uin})`;
+  logConfig.categories.file.level = fileLogLevel;
-        this.loggerConsole.addContext('userInfo', userInfo);
+  logConfig.categories.console.level = consoleLogLevel;
-        this.loggerFile.addContext('userInfo', userInfo);
+  log4js.configure(logConfig);
-        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);
-    }
 }
+
+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 (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;
+}
+
+// eslint-disable-next-line no-control-regex
+const colorEscape = /\x1B[@-_][0-?]*[ -/]*[@-~]/g;
+
+function _log(level: LogLevel, ...args: any[]) {
+  if (consoleLogEnabled) {
+    loggerConsole[level](formatMsg(args));
+  }
+  if (fileLogEnabled) {
+    loggerFile[level](formatMsg(args).replace(colorEscape, ''));
+  }
+}
+
+export function log(...args: any[]) {
+  // info 等级
+  _log(LogLevel.INFO, ...args);
+}
+
+export function logDebug(...args: any[]) {
+  _log(LogLevel.DEBUG, ...args);
+}
+
+export function logError(...args: any[]) {
+  _log(LogLevel.ERROR, ...args);
+}
+
+export function logWarn(...args: any[]) {
+  _log(LogLevel.WARN, ...args);
+}
+
+export function logFatal(...args: any[]) {
+  _log(LogLevel.FATAL, ...args);
+}

src/common/utils/proxy-handler.ts

@@ -1,21 +0,0 @@
-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

@@ -0,0 +1,7 @@
+// 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

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

src/common/utils/system.ts

@@ -9,65 +9,66 @@ 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',
+  '00:00:00:00:00:00',
-    'ff:ff:ff:ff:ff:ff',
+  'ff:ff:ff:ff:ff:ff',
-    'ac:de:48:00:11:22',
+  'ac:de:48:00:11:22'
 ]);
 
 function validateMacAddress(candidate: string): boolean {
-    // eslint-disable-next-line no-useless-escape
+  // eslint-disable-next-line no-useless-escape
-    const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
+  const tempCandidate = candidate.replace(/\-/g, ':').toLowerCase();
-    return !invalidMacAddresses.has(tempCandidate);
+  return !invalidMacAddresses.has(tempCandidate);
 }
 
 export async function getMachineId(): Promise<string> {
-    if (!machineId) {
+  if (!machineId) {
-        machineId = (async () => {
+    machineId = (async () => {
-            const id = await getMacMachineId();
+      const id = await getMacMachineId();
-            return id || randomUUID(); // fallback, generate a UUID
+      return id || randomUUID(); // fallback, generate a UUID
-        })();
+    })();
-    }
+  }
 
-    return machineId;
+  return machineId;
 }
 
 export function getMac(): string {
-    const ifaces = networkInterfaces();
+  const ifaces = networkInterfaces();
-    for (const name in ifaces) {
+  for (const name in ifaces) {
-        const networkInterface = ifaces[name];
+    const networkInterface = ifaces[name];
-        if (networkInterface) {
+    if (networkInterface) {
-            for (const { mac } of networkInterface) {
+      for (const { mac } of networkInterface) {
-                if (validateMacAddress(mac)) {
+        if (validateMacAddress(mac)) {
-                    return 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 {
+  try {
-        const crypto = await import('crypto');
+    const crypto = await import('crypto');
-        const macAddress = getMac();
+    const macAddress = getMac();
-        return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
+    return crypto.createHash('sha256').update(macAddress, 'utf8').digest('hex');
-    } catch (err) {
+  } catch (err) {
-        return undefined;
+    return undefined;
-    }
+  }
 }
 
 const homeDir = os.homedir();
 
+
 export const systemPlatform = os.platform();
 export const cpuArch = os.arch();
 export const systemVersion = os.release();
 export const hostname = osName;
 export const downloadsPath = path.join(homeDir, 'Downloads');
-export const systemName = os.type();
+export const systemName = os.type();

src/common/utils/type.ts

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

src/common/utils/types.ts

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

src/common/utils/version.ts

@@ -0,0 +1,25 @@
+import { logDebug } from './log';
+import { RequestUtil } from './request';
+export async function checkVersion(): Promise<string> {
+  return new Promise(async (resolve, reject) => {
+    const MirrorList =
+      [
+        'https://jsd.cdn.zzko.cn/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://fastly.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://gcore.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json',
+        'https://cdn.jsdelivr.net/gh/NapNeko/NapCatQQ@main/package.json'
+      ];
+    let version = undefined;
+    for (const url of MirrorList) {
+      try {
+        version = (await RequestUtil.HttpGetJson<{ version: string }>(url)).version;
+      } catch (e) {
+        logDebug('检测更新异常',e);
+      }
+      if (version) {
+        resolve(version);
+      }
+    }
+    reject('get verison error!');
+  });
+}

src/core/.eslintrc.cjs

@@ -0,0 +1,67 @@
+module.exports = {
+  'root': true,
+  'env': {
+    'es2021': true,
+    'node': true
+  },
+  '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',
+      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'],
+  }
+};

src/core/.gitignore

@@ -0,0 +1,5 @@
+.idea/
+node_modules/
+dist/
+lib/
+package-lock.json

src/core/README.md

@@ -0,0 +1,3 @@
+# @napneko/core
+
+此仓库目前只用于隐藏源码，目前无法进行单独打包，只是作为 NapCatQQ 的 git submodule 引用。

src/core/adapters/NodeIDependsAdapter.ts

@@ -1,27 +0,0 @@
-interface IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number): void;
-
-    onMSFSsoError(args: unknown): void;
-
-    getGroupCode(args: unknown): void;
-}
-
-export interface NodeIDependsAdapter extends IDependsAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IDependsAdapter): NodeIDependsAdapter;
-}
-
-export class DependsAdapter implements IDependsAdapter {
-    onMSFStatusChange(arg1: number, arg2: number) {
-        // console.log(arg1, arg2);
-        // if (arg1 == 2 && arg2 == 2) {
-        //   log("NapCat丢失网络连接,请检查网络")
-        // }
-    }
-
-    onMSFSsoError(args: unknown) {
-    }
-
-    getGroupCode(args: unknown) {
-    }
-}

src/core/adapters/NodeIDispatcherAdapter.ts

@@ -1,23 +0,0 @@
-interface IDispatcherAdapter {
-    dispatchRequest(arg: unknown): void;
-
-    dispatchCall(arg: unknown): void;
-
-    dispatchCallWithJson(arg: unknown): void;
-}
-
-export interface NodeIDispatcherAdapter extends IDispatcherAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IDispatcherAdapter): NodeIDispatcherAdapter;
-}
-
-export class DispatcherAdapter implements IDispatcherAdapter {
-    dispatchRequest(arg: unknown) {
-    }
-
-    dispatchCall(arg: unknown) {
-    }
-
-    dispatchCallWithJson(arg: unknown) {
-    }
-}

src/core/adapters/NodeIGlobalAdapter.ts

@@ -1,48 +0,0 @@
-interface IGlobalAdapter {
-    onLog(...args: unknown[]): void;
-
-    onGetSrvCalTime(...args: unknown[]): void;
-
-    onShowErrUITips(...args: unknown[]): void;
-
-    fixPicImgType(...args: unknown[]): void;
-
-    getAppSetting(...args: unknown[]): void;
-
-    onInstallFinished(...args: unknown[]): void;
-
-    onUpdateGeneralFlag(...args: unknown[]): void;
-
-    onGetOfflineMsg(...args: unknown[]): void;
-}
-
-export interface NodeIGlobalAdapter extends IGlobalAdapter {
-    // eslint-disable-next-line @typescript-eslint/no-misused-new
-    new(adapter: IGlobalAdapter): NodeIGlobalAdapter;
-}
-
-export class GlobalAdapter implements IGlobalAdapter {
-    onLog(...args: unknown[]) {
-    }
-
-    onGetSrvCalTime(...args: unknown[]) {
-    }
-
-    onShowErrUITips(...args: unknown[]) {
-    }
-
-    fixPicImgType(...args: unknown[]) {
-    }
-
-    getAppSetting(...args: unknown[]) {
-    }
-
-    onInstallFinished(...args: unknown[]) {
-    }
-
-    onUpdateGeneralFlag(...args: unknown[]) {
-    }
-
-    onGetOfflineMsg(...args: unknown[]) {
-    }
-}

src/core/apis/file.ts

@@ -1,380 +0,0 @@
-import {
-    CacheFileListItem,
-    CacheFileType,
-    ChatCacheListItemBasic,
-    ChatType,
-    ElementType,
-    IMAGE_HTTP_HOST,
-    IMAGE_HTTP_HOST_NT,
-    Peer,
-    PicElement,
-} from '@/core/entities';
-import path from 'path';
-import fs from 'fs';
-import fsPromises from 'fs/promises';
-import { InstanceContext, NapCatCore, OnRichMediaDownloadCompleteParams } from '@/core';
-import * as fileType from 'file-type';
-import imageSize from 'image-size';
-import { ISizeCalculationResult } from 'image-size/dist/types/interface';
-import { NodeIKernelSearchService } from '../services/NodeIKernelSearchService';
-import { RkeyManager } from '../helper/rkey';
-import { calculateFileMD5 } from '@/common/utils/file';
-
-
-export class NTQQFileApi {
-    context: InstanceContext;
-    core: NapCatCore;
-    rkeyManager: RkeyManager;
-
-    constructor(context: InstanceContext, core: NapCatCore) {
-        this.context = context;
-        this.core = core;
-        this.rkeyManager = new RkeyManager('http://napcat-sign.wumiao.wang:2082/rkey', this.context.logger);
-    }
-
-    async getFileType(filePath: string) {
-        return fileType.fileTypeFromFile(filePath);
-    }
-
-    async copyFile(filePath: string, destPath: string) {
-        await this.core.util.copyFile(filePath, destPath);
-    }
-
-    async getFileSize(filePath: string): Promise<number> {
-        return await this.core.util.getFileSize(filePath);
-    }
-
-    async getVideoUrl(peer: Peer, msgId: string, elementId: string) {
-        return (await this.context.session.getRichMediaService().getVideoPlayUrlV2(peer, msgId, elementId, 0, {
-            downSourceType: 1,
-            triggerType: 1,
-        })).urlResult.domainUrl;
-    }
-
-    // 上传文件到QQ的文件夹
-    async uploadFile(filePath: string, elementType: ElementType = ElementType.PIC, elementSubType: number = 0) {
-        // napCatCore.wrapper.util.
-        const fileMd5 = await calculateFileMD5(filePath);
-        let ext: string = (await this.getFileType(filePath))?.ext as string || '';
-        if (ext) {
-            ext = '.' + ext;
-        }
-        let fileName = `${path.basename(filePath)}`;
-        if (fileName.indexOf('.') === -1) {
-            fileName += ext;
-        }
-        const mediaPath = this.context.session.getMsgService().getRichMediaFilePathForGuild({
-            md5HexStr: fileMd5,
-            fileName: fileName,
-            elementType: elementType,
-            elementSubType,
-            thumbSize: 0,
-            needCreate: true,
-            downloadType: 1,
-            file_uuid: '',
-        });
-        await this.copyFile(filePath, mediaPath!);
-        const fileSize = await this.getFileSize(filePath);
-        return {
-            md5: fileMd5,
-            fileName,
-            path: mediaPath,
-            fileSize,
-            ext,
-        };
-    }
-
-    async downloadMediaByUuid() {
-        //napCatCore.session.getRichMediaService().downloadFileForFileUuid();
-    }
-
-    async downloadMedia(msgId: string, chatType: ChatType, peerUid: string, elementId: string, thumbPath: string, sourcePath: string, timeout = 1000 * 60 * 2, force: boolean = false) {
-        //logDebug('receive downloadMedia task', msgId, chatType, peerUid, elementId, thumbPath, sourcePath, timeout, force);
-        // 用于下载收到的消息中的图片等
-        if (sourcePath && fs.existsSync(sourcePath)) {
-            if (force) {
-                try {
-                    await fsPromises.unlink(sourcePath);
-                } catch (e) {
-                    //
-                }
-            } else {
-                return sourcePath;
-            }
-        }
-        const data = await this.core.eventWrapper.CallNormalEvent<
-            (
-                params: {
-                    fileModelId: string,
-                    downloadSourceType: number,
-                    triggerType: number,
-                    msgId: string,
-                    chatType: ChatType,
-                    peerUid: string,
-                    elementId: string,
-                    thumbSize: number,
-                    downloadType: number,
-                    filePath: string
-                }) => Promise<unknown>,
-            (fileTransNotifyInfo: OnRichMediaDownloadCompleteParams) => void
-        >(
-            'NodeIKernelMsgService/downloadRichMedia',
-            'NodeIKernelMsgListener/onRichMediaDownloadComplete',
-            1,
-            timeout,
-            (arg: OnRichMediaDownloadCompleteParams) => {
-                if (arg.msgId === msgId) {
-                    return true;
-                }
-                return false;
-            },
-            {
-                fileModelId: '0',
-                downloadSourceType: 0,
-                triggerType: 1,
-                msgId: msgId,
-                chatType: chatType,
-                peerUid: peerUid,
-                elementId: elementId,
-                thumbSize: 0,
-                downloadType: 1,
-                filePath: thumbPath,
-            },
-        );
-        let msg = await this.core.apis.MsgApi.getMsgsByMsgId({
-            guildId: '',
-            chatType: chatType,
-            peerUid: peerUid,
-        }, [msgId]);
-        if (msg.msgList.length === 0) {
-            return data[1].filePath;
-        }
-        //获取原始消息
-        let FileElements = msg?.msgList[0]?.elements?.find(e => e.elementId === elementId);
-        if (!FileElements) {
-            //失败则就乱来 Todo
-            return data[1].filePath;
-        }
-        //从原始消息获取文件路径
-        let filePath =
-            FileElements?.fileElement?.filePath ||
-            FileElements?.pttElement?.filePath ||
-            FileElements?.videoElement?.filePath ||
-            FileElements?.picElement?.sourcePath;
-        return filePath;
-    }
-
-    async getImageSize(filePath: string): Promise<ISizeCalculationResult | undefined> {
-        return new Promise((resolve, reject) => {
-            imageSize(filePath, (err, dimensions) => {
-                if (err) {
-                    reject(err);
-                } else {
-                    resolve(dimensions);
-                }
-            });
-        });
-    }
-
-    async addFileCache(peer: Peer, msgId: string, msgSeq: string, senderUid: string, elemId: string, elemType: string, fileSize: string, fileName: string) {
-        let GroupData;
-        let BuddyData;
-        if (peer.chatType === ChatType.group) {
-            GroupData =
-                [{
-                    groupCode: peer.peerUid,
-                    isConf: false,
-                    hasModifyConfGroupFace: true,
-                    hasModifyConfGroupName: true,
-                    groupName: 'NapCat.Cached',
-                    remark: 'NapCat.Cached',
-                }];
-        } else if (peer.chatType === ChatType.friend) {
-            BuddyData = [{
-                category_name: 'NapCat.Cached',
-                peerUid: peer.peerUid,
-                peerUin: peer.peerUid,
-                remark: 'NapCat.Cached',
-            }];
-        } else {
-            return undefined;
-        }
-
-        return this.context.session.getSearchService().addSearchHistory({
-            type: 4,
-            contactList: [],
-            id: -1,
-            groupInfos: [],
-            msgs: [],
-            fileInfos: [
-                {
-                    chatType: peer.chatType,
-                    buddyChatInfo: BuddyData || [],
-                    discussChatInfo: [],
-                    groupChatInfo: GroupData || [],
-                    dataLineChatInfo: [],
-                    tmpChatInfo: [],
-                    msgId: msgId,
-                    msgSeq: msgSeq,
-                    msgTime: Math.floor(Date.now() / 1000).toString(),
-                    senderUid: senderUid,
-                    senderNick: 'NapCat.Cached',
-                    senderRemark: 'NapCat.Cached',
-                    senderCard: 'NapCat.Cached',
-                    elemId: elemId,
-                    elemType: elemType,
-                    fileSize: fileSize,
-                    filePath: '',
-                    fileName: fileName,
-                    hits: [{
-                        start: 12,
-                        end: 14,
-                    }],
-                },
-            ],
-        });
-    }
-
-    async searchfile(keys: string[]) {
-        type EventType = NodeIKernelSearchService['searchFileWithKeywords'];
-
-        interface OnListener {
-            searchId: string,
-            hasMore: boolean,
-            resultItems: {
-                chatType: ChatType,
-                buddyChatInfo: any[],
-                discussChatInfo: any[],
-                groupChatInfo:
-                {
-                    groupCode: string,
-                    isConf: boolean,
-                    hasModifyConfGroupFace: boolean,
-                    hasModifyConfGroupName: boolean,
-                    groupName: string,
-                    remark: string
-                }[],
-                dataLineChatInfo: any[],
-                tmpChatInfo: any[],
-                msgId: string,
-                msgSeq: string,
-                msgTime: string,
-                senderUid: string,
-                senderNick: string,
-                senderRemark: string,
-                senderCard: string,
-                elemId: string,
-                elemType: number,
-                fileSize: string,
-                filePath: string,
-                fileName: string,
-                hits:
-                {
-                    start: number,
-                    end: number
-                }[]
-            }[]
-        }
-
-        const Event = this.core.eventWrapper.createEventFunction<EventType>('NodeIKernelSearchService/searchFileWithKeywords');
-        let id = '';
-        const Listener = this.core.eventWrapper.RegisterListen<(params: OnListener) => void>
-            (
-                'NodeIKernelSearchListener/onSearchFileKeywordsResult',
-                1,
-                20000,
-                (params) => id !== '' && params.searchId == id,
-            );
-        id = await Event!(keys, 12);
-        const [ret] = (await Listener);
-        return ret;
-    }
-
-    async getImageUrl(element: PicElement) {
-        if (!element) {
-            return '';
-        }
-        const url: string = element.originImageUrl!;  // 没有域名
-        const md5HexStr = element.md5HexStr;
-        const fileMd5 = element.md5HexStr;
-        const fileUuid = element.fileUuid;
-
-        if (url) {
-            const UrlParse = new URL(IMAGE_HTTP_HOST + url);//临时解析拼接
-            const imageAppid = UrlParse.searchParams.get('appid');
-            const isNewPic = imageAppid && ['1406', '1407'].includes(imageAppid);
-            if (isNewPic) {
-                let UrlRkey = UrlParse.searchParams.get('rkey');
-                if (UrlRkey) {
-                    return IMAGE_HTTP_HOST_NT + url;
-                }
-                const rkeyData = await this.rkeyManager.getRkey();
-                UrlRkey = imageAppid === '1406' ? rkeyData.private_rkey : rkeyData.group_rkey;
-                return IMAGE_HTTP_HOST_NT + url + `${UrlRkey}`;
-            } else {
-                // 老的图片url，不需要rkey
-                return IMAGE_HTTP_HOST + url;
-            }
-        } else if (fileMd5 || md5HexStr) {
-            // 没有url，需要自己拼接
-            return `${IMAGE_HTTP_HOST}/gchatpic_new/0/0-0-${(fileMd5 || md5HexStr)!.toUpperCase()}/0`;
-        }
-        this.context.logger.logDebug('图片url获取失败', element);
-        return '';
-    }
-}
-
-export class NTQQFileCacheApi {
-    context: InstanceContext;
-    core: NapCatCore;
-
-    constructor(context: InstanceContext, core: NapCatCore) {
-        this.context = context;
-        this.core = core;
-    }
-
-    async setCacheSilentScan(isSilent: boolean = true) {
-        return '';
-    }
-
-    getCacheSessionPathList() {
-        return '';
-    }
-
-    clearCache(cacheKeys: Array<string> = ['tmp', 'hotUpdate']) {
-        // 参数未验证
-        return this.context.session.getStorageCleanService().clearCacheDataByKeys(cacheKeys);
-    }
-
-    addCacheScannedPaths(pathMap: object = {}) {
-        return this.context.session.getStorageCleanService().addCacheScanedPaths(pathMap);
-    }
-
-    scanCache() {
-        //return (await this.context.session.getStorageCleanService().scanCache()).size;
-    }
-
-    getHotUpdateCachePath() {
-        // 未实现
-        return '';
-    }
-
-    getDesktopTmpPath() {
-        // 未实现
-        return '';
-    }
-
-    getChatCacheList(type: ChatType, pageSize: number = 1000, pageIndex: number = 0) {
-        return this.context.session.getStorageCleanService().getChatCacheInfo(type, pageSize, 1, pageIndex);
-    }
-
-    getFileCacheInfo(fileType: CacheFileType, pageSize: number = 1000, lastRecord?: CacheFileListItem) {
-        const _lastRecord = lastRecord ? lastRecord : { fileType: fileType };
-        //需要五个参数
-        //return napCatCore.session.getStorageCleanService().getFileCacheInfo();
-    }
-
-    async clearChatCache(chats: ChatCacheListItemBasic[] = [], fileKeys: string[] = []) {
-        return this.context.session.getStorageCleanService().clearChatCacheInfo(chats, fileKeys);
-    }
-}