diff --git a/.env.universal b/.env.universal new file mode 100644 index 00000000..6949eb6a --- /dev/null +++ b/.env.universal @@ -0,0 +1,2 @@ +VITE_BUILD_TYPE = Production +VITE_BUILD_PLATFORM = Universal \ No newline at end of file diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 10d2eb1a..4853bf9b 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -10,13 +10,12 @@ body: 在提交新的 Bug 反馈前，请确保您： * 已经搜索了现有的 issues，并且没有找到可以解决您问题的方法 * 不与现有的某一 issue 重复 - * 不涉及[已经停止维护的特性](https://github.com/NapNeko/NapCatQQ?tab=readme-ov-file#挥别昨日)，例如 CQ 码 - type: input id: system-version attributes: label: 系统版本 description: 运行 QQNT 的系统版本 - placeholder: Windows 10 Pro Workstation 22H2 + placeholder: Windows 11 24H2 validations: required: true - type: input @@ -24,7 +23,7 @@ body: attributes: label: QQNT 版本 description: 可在 QQNT 的「关于」的设置页中找到 - placeholder: 9.9.7-21804 + placeholder: 9.9.16-29927 validations: required: true - type: input @@ -40,21 +39,21 @@ body: attributes: label: OneBot 客户端 description: 连接至 NapCat 的客户端版本信息 - placeholder: Overflow 2.16.0-2cf7991-SNAPSHOT + placeholder: Karin 1.0.0 validations: required: true - type: textarea id: what-happened attributes: label: 发生了什么? - description: 填写你认为的 NapCat 的不正常行为 + description: 填写你认为的 NapCat 的异常行为 validations: required: true - type: textarea id: how-reproduce attributes: label: 如何复现 - description: 填写应当如何操作才能触发这个不正常行为 + description: 填写应当如何操作才能触发这个异常行为 placeholder: | 1. xxx 2. xxx diff --git a/.github/dependabot.yml b/.github/dependabot.yml index b4179835..aff82a10 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -1,11 +1,6 @@ -# To get started with Dependabot version updates, you'll need to specify which -# package ecosystems to update and where the package manifests are located. -# Please see the documentation for all configuration options: -# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file - version: 2 updates: - - package-ecosystem: "npm" # See documentation for possible values - directory: "/" # Location of package manifests + - package-ecosystem: "npm" + directory: "/" schedule: - interval: "daily" + interval: "weekly" diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c1f673f6..cd85b93b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -18,8 +18,8 @@ jobs: node-version: 20.x - name: Build NapCat.Framework run: | - npm i && cd napcat.webui && npm i && cd .. - npm run build:framework && npm run depend + npm i && cd napcat.webui && npm i && cd .. || exit 1 + npm run build:framework && npm run depend || exit 1 rm package-lock.json - name: Upload Artifact uses: actions/upload-artifact@v4 @@ -37,8 +37,8 @@ jobs: node-version: 20.x - name: Build NapCat.Shell run: | - npm i && cd napcat.webui && npm i && cd .. - npm run build:shell && npm run depend + npm i && cd napcat.webui && npm i && cd .. || exit 1 + npm run build:shell && npm run depend || exit 1 rm package-lock.json - name: Upload Artifact uses: actions/upload-artifact@v4 diff --git a/LICENSE b/LICENSE index 6340ac9d..a79f4f97 100644 --- a/LICENSE +++ b/LICENSE @@ -1,343 +1,19 @@ - GNU GENERAL PUBLIC Without Social media promotion LICENSE - Version 2, June 1991 +Limited Redistribution License for NapCat - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. +Copyright © 2024 Mlikiowa - Preamble +1. Usage and Reproduction: + - Unauthorized use, reproduction, modification, or distribution of this code is prohibited without explicit permission from the main author of the NapCat repository. + +2. Redistribution: + - Redistribution of this code is permitted, provided that the full text of this license is included, and the source and copyright information is clearly stated. + - Minor modifications and extensions are allowed for redistribution purposes, but the modified code must not be publicly released. - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. +3. Non-Commercial Use: + - This code is not to be used for any commercial purposes. - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. +4. Additional Permissions: + - Any rights not explicitly addressed in this license must be requested from and granted by the main author of the NapCat repository. - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - - d）You may use this software in accordance with the above terms, - but you are not allowed to promote this project or your projects - based on this project on any public social media. - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. +5. Disclaimer: + - This code is provided "as is," without any express or implied warranties, including but not limited to the implied warranties of merchantability and fitness for a particular purpose. In no event shall the author be liable for any damages or other liability arising from, out of, or in connection with the use or distribution of this code. diff --git a/README.md b/README.md index 7e254631..a3486ff0 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@
- ![Logo](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Flogo.png&name=1&owner=1&pattern=Diagonal%20Stripes&stargazers=1&theme=Auto) +![NapCatQQ](https://socialify.git.ci/NapNeko/NapCatQQ/image?font=Jost&logo=https%3A%2F%2Fnapneko.github.io%2Fassets%2Fnewlogo.png&name=1&owner=1&pattern=Diagonal+Stripes&stargazers=1&theme=Auto)
@@ -30,13 +30,25 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现 [Cloudflare.Pages](https://napneko.pages.dev/) -[Server.China](https://napneko.com/) - -[Server.Other](https://napcat.cyou/) +[Server.Other](https://docs.napcat.cyou/) +[Qbot.News](https://neko.qbot.news) ## 回家旅途 -[QQ Group](https://qm.qq.com/q/VfjAq5HIMS) +[QQ Group#1](https://qm.qq.com/q/I6LU87a0Yq) + +[QQ Group#2](https://qm.qq.com/q/HaRcfrHpUk) + +[Telegram](https://t.me/MelodicMoonlight) + +> QQ Group#2 准许Bot / Telegram与QQ Group#2 为新建Group + +## 性能设计/协议标准 +NapCat 已实现90％+的 OneBot / GoCQ 标准接口，并提供兼容性保留接口，其设计理念遵守 无数据库/异步优先/后台刷新 的性能思想。 + +由此设计带来一系列好处，在开发中，获取群员列表通常小于50Ms，单条文本消息发送在320Ms以内，在1k+的群聊流畅运行，同时带来一些副作用，消息Id无法持久，无法上报撤回消息原始内容。 + +NapCat 在设计理念下遵守 OneBot 规范大多数要求并且积极改进，任何合理的标准化 Issue 与 Pr 将被接收。 ## 感谢他们 感谢 [Lagrange](https://github.com/LagrangeDev/Lagrange.Core) 对本项目的大力支持 参考部分代码 已获授权 @@ -47,12 +59,8 @@ NapCatQQ 是现代化的基于 NTQQ 的 Bot 协议端实现 --- -## 延缓Native模块与NapCat对新版QQ适配 -为未来持续与高效的使用Native模块 模块代码转为完全非Git仓库的本地保存源码 并进行相关重构 - -同时为了保证稳定 NapCat 本体通常会在3 Week+的周期进行新版本适配 - -因此此时推荐使用release指定版本 +## 特殊感谢 +[LLOneBot](https://github.com/LLOneBot/LLOneBot) 相关的开发曾参与本项目 ## 开源附加 diff --git a/external/LiteLoaderWrapper.zip b/external/LiteLoaderWrapper.zip index 1cca691c..d586a609 100644 Binary files a/external/LiteLoaderWrapper.zip and b/external/LiteLoaderWrapper.zip differ diff --git a/external/logo.png b/external/logo.png new file mode 100644 index 00000000..a87d363e Binary files /dev/null and b/external/logo.png differ diff --git a/launcher/NapCatWinBootMain.exe b/launcher/NapCatWinBootMain.exe index 813f3427..9501691c 100644 Binary files a/launcher/NapCatWinBootMain.exe and b/launcher/NapCatWinBootMain.exe differ diff --git a/launcher/qqnt.json b/launcher/qqnt.json index 50c711a4..837b4979 100644 --- a/launcher/qqnt.json +++ b/launcher/qqnt.json @@ -1,9 +1,9 @@ { "name": "qq-chat", - "version": "9.9.16-29456", - "verHash": "dd395162", - "linuxVersion": "3.2.13-29456", - "linuxVerHash": "e379390a", + "version": "9.9.17-30899", + "verHash": "ececf273", + "linuxVersion": "3.2.15-30899", + "linuxVerHash": "63c751e8", "type": "module", "private": true, "description": "QQ", @@ -18,7 +18,7 @@ "qd": "externals/devtools/cli/index.js" }, "main": "./loadNapCat.js", - "buildVersion": "29456", + "buildVersion": "30899", "isPureShell": true, "isByteCodeShell": true, "platform": "win32", diff --git a/logo.png b/logo.png index 0eef6b84..7ab58e2c 100644 Binary files a/logo.png and b/logo.png differ diff --git a/manifest.json b/manifest.json index 32671e74..c40e99b5 100644 --- a/manifest.json +++ b/manifest.json @@ -4,16 +4,12 @@ "name": "NapCatQQ", "slug": "NapCat.Framework", "description": "高性能的 OneBot 11 协议实现", - "version": "4.1.5", + "version": "4.3.5", "icon": "./logo.png", "authors": [ { - "name": "MliKiowa", - "link": "https://github.com/MliKiowa" - }, - { - "name": "Young", - "link": "https://github.com/Wesley-Young" + "name": "NapNeko", + "link": "https://github.com/NapNeko" } ], "repository": { diff --git a/napcat.webui/index.html b/napcat.webui/index.html index 1f07d8e5..de5376cf 100644 --- a/napcat.webui/index.html +++ b/napcat.webui/index.html @@ -1,13 +1,13 @@ - + - + NapCat WebUI - - -
- - + + +
+ + diff --git a/napcat.webui/package.json b/napcat.webui/package.json index 3651cf16..9080a245 100644 --- a/napcat.webui/package.json +++ b/napcat.webui/package.json @@ -5,25 +5,31 @@ "type": "module", "scripts": { "webui:lint": "eslint --fix src/**/*.{js,ts,vue}", - "webui:dev": "vite", - "webui:build": "vue-tsc -b && vite build", + "webui:dev": "vite --host", + "webui:build": "vite build", "webui:preview": "vite preview" }, "dependencies": { "eslint-plugin-prettier": "^5.2.1", + "event-source-polyfill": "^1.0.31", + "mitt": "^3.0.1", "qrcode": "^1.5.4", + "tdesign-icons-vue-next": "^0.3.3", "tdesign-vue-next": "^1.10.3", - "vue": "^3.5.12", + "vue": "^3.5.13", "vue-router": "^4.4.5" }, "devDependencies": { "@eslint/eslintrc": "^3.1.0", "@eslint/js": "^9.14.0", + "@types/event-source-polyfill": "^1.0.5", "@types/qrcode": "^1.5.5", + "@vitejs/plugin-legacy": "^5.4.3", "@vitejs/plugin-vue": "^5.1.4", "eslint-config-prettier": "^9.1.0", "eslint-plugin-vue": "^9.31.0", "globals": "^15.12.0", + "terser": "^5.36.0", "typescript": "~5.6.2", "vite": "^5.4.10", "vue-tsc": "^2.1.8" diff --git a/napcat.webui/public/logo_webui.png b/napcat.webui/public/logo_webui.png new file mode 100644 index 00000000..03aa7f5b Binary files /dev/null and b/napcat.webui/public/logo_webui.png differ diff --git a/napcat.webui/src/App.vue b/napcat.webui/src/App.vue index e5fe963f..431f07c5 100644 --- a/napcat.webui/src/App.vue +++ b/napcat.webui/src/App.vue @@ -1,7 +1,112 @@ - + + diff --git a/napcat.webui/src/assets/0xProtoNerdFont-Italic.ttf b/napcat.webui/src/assets/0xProtoNerdFont-Italic.ttf new file mode 100644 index 00000000..6c0529fb Binary files /dev/null and b/napcat.webui/src/assets/0xProtoNerdFont-Italic.ttf differ diff --git a/napcat.webui/src/assets/logo_webui.png b/napcat.webui/src/assets/logo_webui.png new file mode 100644 index 00000000..03aa7f5b Binary files /dev/null and b/napcat.webui/src/assets/logo_webui.png differ diff --git a/napcat.webui/src/backend/githubApi.ts b/napcat.webui/src/backend/githubApi.ts new file mode 100644 index 00000000..d8f6d205 --- /dev/null +++ b/napcat.webui/src/backend/githubApi.ts @@ -0,0 +1,66 @@ +export class githubApiManager { + public async GetBaseData(): Promise { + try { + const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ', { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + }); + if (ConfigResponse.status == 200) { + return await ConfigResponse.json(); + } + } catch (error) { + console.error('Error getting github data :', error); + } + return null; + } + public async GetReleasesData(): Promise { + try { + const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ/releases', { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + }); + if (ConfigResponse.status == 200) { + return await ConfigResponse.json(); + } + } catch (error) { + console.error('Error getting releases data:', error); + } + return null; + } + public async GetPullsData(): Promise { + try { + const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ/pulls', { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + }); + if (ConfigResponse.status == 200) { + return await ConfigResponse.json(); + } + } catch (error) { + console.error('Error getting Pulls data:', error); + } + return null; + } + public async GetContributors(): Promise { + try { + const ConfigResponse = await fetch('https://api.github.com/repos/NapNeko/NapCatQQ/contributors', { + method: 'GET', + headers: { + 'Content-Type': 'application/json', + }, + }); + if (ConfigResponse.status == 200) { + return await ConfigResponse.json(); + } + } catch (error) { + console.error('Error getting Pulls data:', error); + } + return null; + } +} diff --git a/napcat.webui/src/backend/log.ts b/napcat.webui/src/backend/log.ts new file mode 100644 index 00000000..32fdaac2 --- /dev/null +++ b/napcat.webui/src/backend/log.ts @@ -0,0 +1,72 @@ +import { EventSourcePolyfill } from 'event-source-polyfill'; +type LogListItem = string; +type LogListData = LogListItem[]; +let eventSourcePoly: EventSourcePolyfill | null = null; +export class LogManager { + private readonly retCredential: string; + private readonly apiPrefix: string; + + //调试时http://127.0.0.1:6099/api 打包时 ../api + constructor(retCredential: string, apiPrefix: string = '../api') { + this.retCredential = retCredential; + this.apiPrefix = apiPrefix; + } + public async GetLogList(): Promise { + try { + const ConfigResponse = await fetch(`${this.apiPrefix}/Log/GetLogList`, { + method: 'GET', + headers: { + Authorization: 'Bearer ' + this.retCredential, + 'Content-Type': 'application/json', + }, + }); + if (ConfigResponse.status == 200) { + const ConfigResponseJson = await ConfigResponse.json(); + if (ConfigResponseJson.code == 0) { + return ConfigResponseJson?.data as LogListData; + } + } + } catch (error) { + console.error('Error getting LogList:', error); + } + return [] as LogListData; + } + public async GetLog(FileName: string): Promise { + try { + const ConfigResponse = await fetch(`${this.apiPrefix}/Log/GetLog?id=${FileName}`, { + method: 'GET', + headers: { + Authorization: 'Bearer ' + this.retCredential, + 'Content-Type': 'application/json', + }, + }); + if (ConfigResponse.status == 200) { + const ConfigResponseJson = await ConfigResponse.json(); + if (ConfigResponseJson.code == 0) { + return ConfigResponseJson?.data; + } + } + } catch (error) { + console.error('Error getting LogData:', error); + } + return 'null'; + } + public async getRealTimeLogs(): Promise { + this.creatEventSource(); + return eventSourcePoly; + } + private creatEventSource() { + try { + eventSourcePoly = new EventSourcePolyfill(`${this.apiPrefix}/Log/GetLogRealTime`, { + heartbeatTimeout: 3 * 60 * 1000, + headers: { + Authorization: 'Bearer ' + this.retCredential, + Accept: 'text/event-stream', + }, + withCredentials: true, + }); + } catch (error) { + console.error('创建SSE连接出错:', error); + } + } +} diff --git a/napcat.webui/src/backend/shell.ts b/napcat.webui/src/backend/shell.ts index efc7f013..941f55fc 100644 --- a/napcat.webui/src/backend/shell.ts +++ b/napcat.webui/src/backend/shell.ts @@ -1,5 +1,5 @@ import { OneBotConfig } from '../../../src/onebot/config/config'; - +import { ResponseCode } from '../../../src/webui/src/const/status'; export class QQLoginManager { private retCredential: string; private readonly apiPrefix: string; @@ -22,8 +22,8 @@ export class QQLoginManager { }); if (ConfigResponse.status == 200) { const ConfigResponseJson = await ConfigResponse.json(); - if (ConfigResponseJson.code == 0) { - return ConfigResponseJson?.data as OneBotConfig; + if (ConfigResponseJson.code == ResponseCode.Success) { + return ConfigResponseJson.data; } } } catch (error) { @@ -74,6 +74,26 @@ export class QQLoginManager { } return false; } + public async checkQQLoginStatusWithQrcode(): Promise<{ qrcodeurl: string; isLogin: string } | undefined> { + try { + const QQLoginResponse = await fetch(`${this.apiPrefix}/QQLogin/CheckLoginStatus`, { + method: 'POST', + headers: { + Authorization: 'Bearer ' + this.retCredential, + 'Content-Type': 'application/json', + }, + }); + if (QQLoginResponse.status == 200) { + const QQLoginResponseJson = await QQLoginResponse.json(); + if (QQLoginResponseJson.code == 0) { + return QQLoginResponseJson.data; + } + } + } catch (error) { + console.error('Error checking QQ login status:', error); + } + return undefined; + } public async checkWebUiLogined(): Promise { try { diff --git a/napcat.webui/src/components/Dashboard.vue b/napcat.webui/src/components/Dashboard.vue index 7d8fcb13..b46315e5 100644 --- a/napcat.webui/src/components/Dashboard.vue +++ b/napcat.webui/src/components/Dashboard.vue @@ -1,16 +1,28 @@ + diff --git a/napcat.webui/src/components/QQLogin.vue b/napcat.webui/src/components/QQLogin.vue index 13d4b674..04c09531 100644 --- a/napcat.webui/src/components/QQLogin.vue +++ b/napcat.webui/src/components/QQLogin.vue @@ -1,40 +1,33 @@ + \ No newline at end of file diff --git a/napcat.webui/src/components/WebUiLogin.vue b/napcat.webui/src/components/WebUiLogin.vue index 956f3d60..bbcf3728 100644 --- a/napcat.webui/src/components/WebUiLogin.vue +++ b/napcat.webui/src/components/WebUiLogin.vue @@ -1,20 +1,22 @@ diff --git a/napcat.webui/src/components/webui/Nav.vue b/napcat.webui/src/components/webui/Nav.vue index ddf489bd..6b0fed57 100644 --- a/napcat.webui/src/components/webui/Nav.vue +++ b/napcat.webui/src/components/webui/Nav.vue @@ -1,16 +1,31 @@ diff --git a/napcat.webui/src/css/font.css b/napcat.webui/src/css/font.css index e00fdda5..691d9e90 100644 --- a/napcat.webui/src/css/font.css +++ b/napcat.webui/src/css/font.css @@ -3,4 +3,11 @@ src: url('../assets/Sotheby.ttf') format('truetype'); font-weight: normal; font-style: normal; -} \ No newline at end of file +} +@font-face { + font-family: 'ProtoNerdFontItalic'; + src: url('../assets/0xProtoNerdFont-Italic.ttf') format('truetype'); + font-weight: normal; + font-style: normal; +} + diff --git a/napcat.webui/src/main.ts b/napcat.webui/src/main.ts index 7e071636..5c02091c 100644 --- a/napcat.webui/src/main.ts +++ b/napcat.webui/src/main.ts @@ -19,6 +19,10 @@ import { List as TList, Alert as TAlert, Tag as TTag, + Descriptions as TDescriptionsProps, + DescriptionsItem as TDescriptionsItem, + Collapse as TCollapse, + CollapsePanel as TCollapsePanel, ListItem as TListItem, Tabs as TTabs, TabPanel as TTabPanel, @@ -27,10 +31,23 @@ import { Popup as TPopup, Dialog as TDialog, Switch as TSwitch, + Tooltip as Tooltip, + StickyTool as TStickyTool, + StickyItem as TStickyItem, + Layout as TLayout, + Content as TContent, + Footer as TFooter, + Aside as TAside, + Popconfirm as Tpopconfirm, + Empty as TEmpty, + Dropdown as TDropdown, + Typography as TTypographyText, + TreeSelect as TTreeSelect, + Loading as TLoading, + HeadMenu as THeadMenu } from 'tdesign-vue-next'; -import { router } from './router'; +import router from './router'; import 'tdesign-vue-next/es/style/index.css'; - const app = createApp(App); app.use(router); app.use(TButton); @@ -51,6 +68,10 @@ app.use(TLink); app.use(TList); app.use(TAlert); app.use(TTag); +app.use(TDescriptionsProps); +app.use(TDescriptionsItem); +app.use(TCollapse); +app.use(TCollapsePanel); app.use(TListItem); app.use(TTabs); app.use(TTabPanel); @@ -59,4 +80,18 @@ app.use(TCheckbox); app.use(TPopup); app.use(TDialog); app.use(TSwitch); +app.use(Tooltip); +app.use(TStickyTool); +app.use(TStickyItem); +app.use(TLayout); +app.use(TContent); +app.use(TFooter); +app.use(TAside); +app.use(Tpopconfirm); +app.use(TEmpty); +app.use(TDropdown); +app.use(TTypographyText); +app.use(TTreeSelect); +app.use(TLoading); +app.use(THeadMenu); app.mount('#app'); diff --git a/napcat.webui/src/pages/AboutUs.vue b/napcat.webui/src/pages/AboutUs.vue index 04bf2876..ebbfbae0 100644 --- a/napcat.webui/src/pages/AboutUs.vue +++ b/napcat.webui/src/pages/AboutUs.vue @@ -1,23 +1,101 @@