diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml index 2ddc4831..133e3699 100644 --- a/.github/ISSUE_TEMPLATE/bug-report.yml +++ b/.github/ISSUE_TEMPLATE/bug-report.yml @@ -13,6 +13,8 @@ body: - Stapxs QQ Lite（All） - Stapxs QQ Lite（Web） - Stapxs QQ Lite（Electron） + - Stapxs QQ Lite (Android) + - Stapxs QQ Lite (iOS/iPadOS) - 其他 - type: textarea attributes: diff --git a/.github/workflows/build-app.yml b/.github/workflows/build-app.yml index 3fff9692..c4c27632 100644 --- a/.github/workflows/build-app.yml +++ b/.github/workflows/build-app.yml @@ -18,7 +18,6 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - persist-credentials: false # 初始化一些流程需要的环境变量 - name: Init Env id: step_init @@ -30,13 +29,13 @@ jobs: name: 构建 Web 版本（根目录） runs-on: ubuntu-latest needs: init + steps: # 拉取代码 - name: Checkout uses: actions/checkout@v4 with: submodules: recursive - persist-credentials: false # 设置 Node.js 版本 - name: Load Node.js uses: actions/setup-node@v4 @@ -60,6 +59,40 @@ jobs: name: ${{ needs.init.outputs.version }}-web path: Stapxs.QQ.Lite-${{ needs.init.outputs.version }}-web.zip + # ======================= 构建 Docker 版本 ======================== + + build-docker: + name: 构建 Docker 版本 + runs-on: ubuntu-latest + needs: + - init + - build-root-web + + steps: + # 拉取代码（不需要子模块，只是获取 dockerfile） + - name: Checkout + uses: actions/checkout@v4 + # 下载上一步构建的结果 + - name: Download Artifacts + uses: actions/download-artifact@v4 + with: + name: ${{ needs.init.outputs.version }}-web + # 解压（不输出细节） + - name: Unzip + run: unzip -q Stapxs.QQ.Lite-${{ needs.init.outputs.version }}-web.zip + # 登录到 Docker Hub + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: stapxs + password: ${{ secrets.DOCKER_PASSWORD }} + # 使用 buildx 构建 amd64 和 arm64 架构的镜像 + # 推送到 Docker Hub；不保留历史版本直接推送 latest + - name: Build Docker Image + run: | + docker buildx create --use + docker buildx build --platform linux/amd64,linux/arm64 -t stapxs/qq-web:latest --push . + # ==================== 构建 Github Pages 版本 ===================== build-pages: name: 构建 Github Pages 版本 @@ -71,7 +104,6 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - persist-credentials: false # 设置 Node.js 版本 - name: Load Node.js uses: actions/setup-node@v4 @@ -112,7 +144,6 @@ jobs: uses: actions/checkout@v4 with: submodules: recursive - persist-credentials: false # 设置 Node.js 版本 - name: Load Node.js uses: actions/setup-node@v4 diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..8eec171f --- /dev/null +++ b/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022-2024 Stapx Steve, and other contributors. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/dockerfile b/dockerfile new file mode 100644 index 00000000..ee5a06f7 --- /dev/null +++ b/dockerfile @@ -0,0 +1,13 @@ +# ssqq quick start nginx dockerfile +# 请确保项目已经构建完成存在 dist 目录 + +FROM nginx:alpine + +RUN rm -rf /usr/share/nginx/html/* +COPY dist /usr/share/nginx/html + +# 修改nginx配置文件，将端口改为8080，以免影响已有用户的配置 +RUN sed -i 's/listen 80;/listen 8080;/' /etc/nginx/conf.d/default.conf + +EXPOSE 8080 +CMD ["nginx", "-g", "daemon off;"] diff --git a/src/renderer/src/assets/css/append/append_new.css b/src/renderer/src/assets/css/append/append_new.css index e2c110ff..89941f00 100644 --- a/src/renderer/src/assets/css/append/append_new.css +++ b/src/renderer/src/assets/css/append/append_new.css @@ -288,8 +288,8 @@ body { .contributors-card > div > div { min-width: 25px; min-height: 25px; - margin-top: 0; - margin-bottom: 0; + margin-top: 5px; + margin-bottom: 5px; } .contributors-card { width: calc(100% - 20px); diff --git a/src/renderer/src/assets/css/options.css b/src/renderer/src/assets/css/options.css index 97745a33..9dcdba6b 100644 --- a/src/renderer/src/assets/css/options.css +++ b/src/renderer/src/assets/css/options.css @@ -157,6 +157,8 @@ .contributors-card > div { flex-wrap: wrap; display: flex; + align-items: center; + justify-content: space-between; } .contributors-card > div > div { background-size: 100%; diff --git a/ssqq.npx-web-quick-start/index.ts b/ssqq.npx-web-quick-start/index.ts index d7761c33..3379ddd3 100644 --- a/ssqq.npx-web-quick-start/index.ts +++ b/ssqq.npx-web-quick-start/index.ts @@ -1,5 +1,6 @@ #!/usr/bin/env node +import * as path from 'path' import * as http from 'http' import * as fs from 'fs' import Logger from 'log4js' @@ -43,53 +44,64 @@ if(argv['help'] || !hostname || !port) { } logger.info('正在初始化...') -let localVersion = '0.0.1' -// 检查是否存在 dist 文件夹 -if (fs.existsSync('./dist')) { - try { - // 获取文件夹中的 package.json - const packageJson = fs.readFileSync('./dist/package.json', 'utf-8') - localVersion = JSON.parse(packageJson).version - logger.info(`本地版本号为: ${localVersion}`) - } catch (err) { - logger.error(`读取 package.json 失败: ${err}`) + +if(!argv['skip-update']) { + let localVersion = '0.0.1' + // 检查是否存在 dist 文件夹 + if (fs.existsSync('./dist')) { + try { + // 获取文件夹中的 package.json + const packageJson = fs.readFileSync('./dist/package.json', 'utf-8') + localVersion = JSON.parse(packageJson).version + logger.info(`本地版本号为: ${localVersion}`) + } catch (err) { + logger.error(`读取 package.json 失败: ${err}`) + } } -} -// 检查更新 -checkUpdate(localVersion) + // 检查更新 + checkUpdate(localVersion) +} +const mimeTypes = { + '.html': 'text/html', + '.js': 'application/javascript', + '.css': 'text/css', + '.json': 'application/json', + '.png': 'image/png', + '.jpg': 'image/jpeg', + '.gif': 'image/gif', + '.svg': 'image/svg+xml', + '.ico': 'image/x-icon', + '.woff': 'font/woff', + '.woff2': 'font/woff2', + '.ttf': 'font/ttf', + '.eot': 'application/vnd.ms-fontobject', +} // 创建服务 const server = http.createServer((req, res) => { - const url = req.url - if (url === '/') { - // 根路径下的请求映射到 dist 文件夹下的 index.html - fs.readFile('./dist/index.html', (err, data) => { - if (err) { - logger.error(`读取 index.html 失败: ${err}`) - res.statusCode = 404 - res.end() - } else { - res.statusCode = 200 - res.setHeader('Content-Type', 'text/html') - res.end(data) - } - }) - } else { - // 其他路径直接映射到 dist 文件夹下 - fs.readFile(`./dist${url}`, (err, data) => { - if (err) { - logger.error(`读取 ${url} 失败: ${err}`) - res.statusCode = 404 - res.end() - } else { - res.statusCode = 200 - res.end(data) - } - }) + let filePath = `./dist${req.url}` + if (req.url === '/') { + filePath = './dist/index.html' } + + const ext = path.extname(filePath) + const contentType = mimeTypes[ext] || 'application/octet-stream' + + fs.readFile(filePath, (err, data) => { + if (err) { + logger.error(`读取 ${filePath} 失败: ${err.message}`) + res.statusCode = 404 + res.setHeader('Content-Type', 'text/plain') + res.end('404 Not Found') + } else { + res.statusCode = 200 + res.setHeader('Content-Type', contentType) + res.end(data) + } + }) }) server.listen(port, hostname, () => { logger.info(`服务于 http://${hostname}:${port} 运行`) -}) \ No newline at end of file +}) diff --git a/ssqq.npx-web-quick-start/package.json b/ssqq.npx-web-quick-start/package.json index 2fa27ea9..50ef2299 100644 --- a/ssqq.npx-web-quick-start/package.json +++ b/ssqq.npx-web-quick-start/package.json @@ -1,15 +1,16 @@ { "name": "ssqq-web", - "version": "1.0.3", + "version": "1.0.4", "description": "一个兼容 OneBot 的非官方网页版 QQ 客户端，Web 端快速启动包。", "main": "index.ts", "bin": { "ssqq-web": "bin/index.js" }, "scripts": { - "start": "tsc && node index.js", + "start": "tsc && node bin/index.js -- hostname=0.0.0.0 port=8080", + "start:local": "tsc && node bin/index.js -- hostname=0.0.0.0 port=8080 skip-update", "build": "tsc", - "test": "tsc && node index.js help" + "test": "tsc && node bin/index.js help" }, "repository": "https://github.com/Stapxs/Stapxs-QQ-Lite-2.0", "author": "Stapx Steve [林槐]",