diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 8b53428..0fa3d14 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -12,7 +12,7 @@ body: id: version attributes: label: ipcheck version - placeholder: ipcheck 0.6.0 + placeholder: ipcheck 0.6.1 validations: required: true - type: dropdown diff --git a/CHANGELOG.md b/CHANGELOG.md index 2c56ed8..35d7709 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,13 @@ All notable changes to ipcheck are documented here. The project follows [Semantic Versioning](https://semver.org/). +## [0.6.1] - 2026-07-22 + +### Changed + +- Relicensed the project from Apache-2.0 to the simpler permissive MIT License. +- Documented and tested that unsupported system languages fall back to English. + ## [0.6.0] - 2026-07-22 ### Added @@ -80,6 +87,7 @@ All notable changes to ipcheck are documented here. The project follows - Homebrew and direct-download packaging. - Median/P95 TTFB, jitter, reference bandwidth, and macOS `networkQuality`. +[0.6.1]: https://github.com/jacklv-coder/ipcheck/compare/v0.6.0...v0.6.1 [0.6.0]: https://github.com/jacklv-coder/ipcheck/compare/v0.5.0...v0.6.0 [0.5.0]: https://github.com/jacklv-coder/ipcheck/compare/v0.4.0...v0.5.0 [0.4.0]: https://github.com/jacklv-coder/ipcheck/compare/v0.3.0...v0.4.0 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 0256d64..4142f48 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -53,4 +53,4 @@ A new built-in probe should: 4. Distinguish network reachability from an invalid protocol route. 5. Add stub tests for success, timeout, proxy authentication, and redaction. -By contributing, you agree that your contribution is licensed under Apache-2.0. +By contributing, you agree that your contribution is licensed under the MIT License. diff --git a/LICENSE b/LICENSE index e4e998e..de1af5b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,203 +1,21 @@ -Copyright 2026 ipcheck Contributors - - 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 [yyyy] [name of copyright owner] - - 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. +MIT License + +Copyright (c) 2026 Jintao (jacklv-coder) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/README.md b/README.md index aa67c05..b357d9d 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ a direct answer plus a rule-based readiness score. ```text $ ipcheck -ipcheck v0.6.0 — AI coding network diagnostics +ipcheck v0.6.1 — AI coding network diagnostics Developer verdict Ready to code? YES @@ -74,7 +74,7 @@ brew install ipcheck ```bash mkdir -p "$HOME/.local/bin" -curl -fsSL https://raw.githubusercontent.com/jacklv-coder/ipcheck/v0.6.0/bin/ipcheck \ +curl -fsSL https://raw.githubusercontent.com/jacklv-coder/ipcheck/v0.6.1/bin/ipcheck \ -o "$HOME/.local/bin/ipcheck" chmod +x "$HOME/.local/bin/ipcheck" ``` @@ -119,7 +119,8 @@ ipcheck --no-upload ``` The human and Markdown reports default to the terminal/system language. -English and Simplified Chinese are currently supported. Override detection with +English and Simplified Chinese are currently supported. Any unsupported system +language falls back to English. Override detection with `--lang en`, `--lang zh`, or `IPCHECK_LANG=en|zh`. JSON field names, enum values, and diagnostic reasons remain stable English for automation. Progress is written to stderr only for human output and can be controlled with @@ -259,4 +260,4 @@ for release history. ## License -Apache-2.0 +MIT diff --git a/README.zh-CN.md b/README.zh-CN.md index f8bb890..e490168 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -17,7 +17,7 @@ ```text $ ipcheck -ipcheck v0.6.0 — AI 编程网络诊断 +ipcheck v0.6.1 — AI 编程网络诊断 开发建议 现在适合开发吗？适合 @@ -68,7 +68,7 @@ brew install ipcheck ```bash mkdir -p "$HOME/.local/bin" -curl -fsSL https://raw.githubusercontent.com/jacklv-coder/ipcheck/v0.6.0/bin/ipcheck \ +curl -fsSL https://raw.githubusercontent.com/jacklv-coder/ipcheck/v0.6.1/bin/ipcheck \ -o "$HOME/.local/bin/ipcheck" chmod +x "$HOME/.local/bin/ipcheck" ``` @@ -110,7 +110,8 @@ ipcheck --no-progress --no-color ipcheck --no-upload ``` -终端和 Markdown 报告默认跟随终端/系统语言，目前支持中文和英文。可以使用 +终端和 Markdown 报告默认跟随终端/系统语言，目前支持中文和英文；任何尚未 +支持的系统语言都会回退到英文。可以使用 `--lang zh`、`--lang en`，或 `IPCHECK_LANG=zh|en` 明确指定。JSON 的字段名、 枚举值和诊断原因始终保持英文，方便自动化脚本稳定解析。实时进度只会在普通 终端报告中写入 stderr，可通过 `IPCHECK_PROGRESS=auto|always|never` 控制。 @@ -237,4 +238,4 @@ JSON 包含 `schema_version`、每个客户端与端点的独立结论、隐私 ## 许可证 -Apache-2.0 +MIT diff --git a/bin/ipcheck b/bin/ipcheck index c4f21a2..710bd73 100755 --- a/bin/ipcheck +++ b/bin/ipcheck @@ -10,7 +10,7 @@ unset LC_ALL LC_NUMERIC=C export LC_NUMERIC -VERSION="0.6.0" +VERSION="0.6.1" SCHEMA_VERSION=1 SAMPLES=3 TIMEOUT=15 diff --git a/package.json b/package.json index 086a569..b890e50 100644 --- a/package.json +++ b/package.json @@ -1,9 +1,9 @@ { "name": "@jacklv-coder/ipcheck", "private": true, - "version": "0.6.0", + "version": "0.6.1", "description": "Diagnose proxy, latency, and API routes used by Codex and Claude Code.", - "license": "Apache-2.0", + "license": "MIT", "author": "Jintao", "homepage": "https://github.com/jacklv-coder/ipcheck#readme", "repository": { diff --git a/test/smoke.sh b/test/smoke.sh index e2a0f87..ab53c95 100755 --- a/test/smoke.sh +++ b/test/smoke.sh @@ -104,11 +104,23 @@ chmod +x "$STUB_DIR/curl" MINIMAL_BIN="$STUB_DIR/minimal-bin" mkdir -p "$MINIMAL_BIN" -for utility in bash awk sed sort mktemp rm tr date head; do +for utility in bash awk sed sort mktemp rm tr date head env; do ln -s "$(command -v "$utility")" "$MINIMAL_BIN/$utility" done ln -s "$STUB_DIR/curl" "$MINIMAL_BIN/curl" +MAC_LANG_BIN="$STUB_DIR/mac-lang-bin" +mkdir -p "$MAC_LANG_BIN" +cat > "$MAC_LANG_BIN/uname" <<'EOF' +#!/usr/bin/env bash +printf 'Darwin\n' +EOF +cat > "$MAC_LANG_BIN/defaults" <<'EOF' +#!/usr/bin/env bash +printf '(\n "%s"\n)\n' "${IPCHECK_TEST_APPLE_LANG:-en}" +EOF +chmod +x "$MAC_LANG_BIN/uname" "$MAC_LANG_BIN/defaults" + cat > "$STUB_DIR/networkQuality" <<'EOF' #!/usr/bin/env bash cat <<'JSON' @@ -173,7 +185,7 @@ run_ipcheck_direct() { bash -n "$PROJECT_DIR/bin/ipcheck" "$PROJECT_DIR/bin/ipcheck" --help | grep -q '^ipcheck - diagnose Codex and Claude Code' -[ "$("$PROJECT_DIR/bin/ipcheck" --version)" = "ipcheck 0.6.0" ] +[ "$("$PROJECT_DIR/bin/ipcheck" --version)" = "ipcheck 0.6.1" ] : > "$CURL_LOG" report=$(ANTHROPIC_AUTH_TOKEN="runtime-secret-must-never-appear" run_ipcheck --samples 3 --no-bandwidth --json) @@ -286,6 +298,18 @@ printf '%s\n' "$chinese_human" | grep -q '首字节延迟（TTFB）' english_override=$(LANG=zh_CN.UTF-8 IPCHECK_LANG=en run_ipcheck --samples 1 --no-bandwidth --no-progress --endpoint https://language.invalid) printf '%s\n' "$english_override" | grep -q 'Ready to code? YES' +unsupported_language=$(PATH="$MINIMAL_BIN" LC_ALL='' LC_MESSAGES='' LANG=ja_JP.UTF-8 IPCHECK_LANG=auto run_ipcheck --samples 1 --no-bandwidth --no-progress --endpoint https://language.invalid) +printf '%s\n' "$unsupported_language" | grep -q 'Ready to code? YES' +if printf '%s\n' "$unsupported_language" | grep -q '现在适合开发吗'; then + printf 'unsupported system language did not fall back to English\n' >&2 + exit 1 +fi + +mac_unsupported_language=$(PATH="$MAC_LANG_BIN:$MINIMAL_BIN" LC_ALL=C IPCHECK_LANG=auto IPCHECK_TEST_APPLE_LANG=ja-JP run_ipcheck --samples 1 --no-bandwidth --no-progress --endpoint https://language.invalid) +printf '%s\n' "$mac_unsupported_language" | grep -q 'Ready to code? YES' +mac_chinese_language=$(PATH="$MAC_LANG_BIN:$MINIMAL_BIN" LC_ALL=C IPCHECK_LANG=auto IPCHECK_TEST_APPLE_LANG=zh-Hans run_ipcheck --samples 1 --no-bandwidth --no-progress --endpoint https://language.invalid) +printf '%s\n' "$mac_chinese_language" | grep -q '现在适合开发吗？适合' + progress_log="$STUB_DIR/progress.log" IPCHECK_PROGRESS=always IPCHECK_LANG=en run_ipcheck --samples 2 --no-bandwidth --endpoint https://progress.invalid >/dev/null 2>"$progress_log" grep -q 'sample 1/2' "$progress_log"