mirror of
https://gitlab.com/fscarmen/warp.git
synced 2026-06-15 03:25:42 +08:00
Modify the WARP API URL to warp.cloudflare.now.cc
This commit is contained in:
@@ -42,9 +42,9 @@
|
||||
>
|
||||
>2024.9.14 menu.sh v3.1.2 / warp-go.sh v1.2.2 1. 由于官方禁止了克隆 Warp+ license,故去掉生成 license 的功能; 2. 去掉不必要的依赖 python3
|
||||
>
|
||||
>2024.7.25 menu.sh v3.1.1 / warp-go.sh v1.2.1 1. 支持使用自建 warp api: https://warp.cloudflare.nyc.mn/?run=pluskey,生成 1920 PB WARP+ license 升级为 Plus 账户; 2. Client 对 WARP+ 支持不够,只能使用 IPv4,不能使用 IPv6; 3. 优化安装程序,缩短脚本运行时间
|
||||
>2024.7.25 menu.sh v3.1.1 / warp-go.sh v1.2.1 1. 支持使用自建 warp api: https://warp.cloudflare.now.cc/?run=pluskey,生成 1920 PB WARP+ license 升级为 Plus 账户; 2. Client 对 WARP+ 支持不够,只能使用 IPv4,不能使用 IPv6; 3. 优化安装程序,缩短脚本运行时间
|
||||
>
|
||||
>2024.7.18 menu.sh v3.1.0 / warp-go.sh v1.2.0 1. 使用自建 warp api: https://warp.cloudflare.nyc.mn/ ,升级为 Teams 账户,不需要提前获取 Token; 2. 由于 Client 的设置需要到 Cloudflare 控制后台设置,处理不好会导致 vps 失去联系,所以 Client 并没有升级为 Teams 账户的处理
|
||||
>2024.7.18 menu.sh v3.1.0 / warp-go.sh v1.2.0 1. 使用自建 warp api: https://warp.cloudflare.now.cc/ ,升级为 Teams 账户,不需要提前获取 Token; 2. 由于 Client 的设置需要到 Cloudflare 控制后台设置,处理不好会导致 vps 失去联系,所以 Client 并没有升级为 Teams 账户的处理
|
||||
>
|
||||
>2024.7.8 menu.sh v3.0.10 / warp-go.sh v1.1.9 1. 发布 warp api,可以注册账户,加入 Zero Trust,查账户信息等所有的操作; 2. 脚本更新 warp api
|
||||
>
|
||||
@@ -292,18 +292,18 @@ warp-go [option] [lisence]
|
||||
|
||||
| run 参数 | 作用描述 | 参数 | 示例 |
|
||||
|---|---|---|---|
|
||||
| | 使用指南 | | `https://warp.cloudflare.nyc.mn/` |
|
||||
| `register` | 注册新设备 | `team_token(可选)`, `format(可选)` | `https://warp.cloudflare.nyc.mn/?run=register&team_token=<Your-Team-Token>&format=<json\|yaml\|client\|wireguard\|warp-go\|\|clash\|xray\|sing-box\|qrencode>` |
|
||||
| `device` | 获取特定设备的详细信息 | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=device&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `app` | 获取客户端配置 | `token` | `https://warp.cloudflare.nyc.mn/?run=app&token=<Your-Token>` |
|
||||
| `bind` | 将设备绑定到帐户 | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=bind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `name` | 设置设备名称 | `device_id`, `token`, `device_name` | `https://warp.cloudflare.nyc.mn/?run=name&device_id=<Your-Device-ID>&token=<Your-Token>&device_name=<Your-Device-Name>` |
|
||||
| `license` | 设置设备许可证 | `device_id`, `token`, `license` | `https://warp.cloudflare.nyc.mn/?run=license&device_id=<Your-Device-ID>&token=<Your-Token>&license=<Your-License>` |
|
||||
| `unbind` | 从帐户中取消绑定设备 | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=unbind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `cancel` | 取消设备注册 | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=cancel&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `id` | Client ID 与 Reserved 转换 | `convert` | `https://warp.cloudflare.nyc.mn/?run=id&convert=<4-char-string\|Numbers1,Numbers2,Numbers3>` |
|
||||
| `token` | 获取 Zero Trust token | `organization`, `email`, `code` | step1: `https://warp.cloudflare.nyc.mn/?organization=<Your-Organization>&email=<Your-Email>` </br> step2: `https://warp.cloudflare.nyc.mn/?organization=<Your-Organization>&A=<A-Value>&S=<S-Value>&N=<N-Value>&code=<Your-Code>` |
|
||||
| `key` | 生成一对 WireGuard 公私钥 | `format(可选)` | `https://warp.cloudflare.nyc.mn/?run=key&format=<json\|yaml>` |
|
||||
| | 使用指南 | | `https://warp.cloudflare.now.cc/` |
|
||||
| `register` | 注册新设备 | `team_token(可选)`, `format(可选)` | `https://warp.cloudflare.now.cc/?run=register&team_token=<Your-Team-Token>&format=<json\|yaml\|client\|wireguard\|warp-go\|\|clash\|xray\|sing-box\|qrencode>` |
|
||||
| `device` | 获取特定设备的详细信息 | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=device&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `app` | 获取客户端配置 | `token` | `https://warp.cloudflare.now.cc/?run=app&token=<Your-Token>` |
|
||||
| `bind` | 将设备绑定到帐户 | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=bind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `name` | 设置设备名称 | `device_id`, `token`, `device_name` | `https://warp.cloudflare.now.cc/?run=name&device_id=<Your-Device-ID>&token=<Your-Token>&device_name=<Your-Device-Name>` |
|
||||
| `license` | 设置设备许可证 | `device_id`, `token`, `license` | `https://warp.cloudflare.now.cc/?run=license&device_id=<Your-Device-ID>&token=<Your-Token>&license=<Your-License>` |
|
||||
| `unbind` | 从帐户中取消绑定设备 | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=unbind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `cancel` | 取消设备注册 | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=cancel&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `id` | Client ID 与 Reserved 转换 | `convert` | `https://warp.cloudflare.now.cc/?run=id&convert=<4-char-string\|Numbers1,Numbers2,Numbers3>` |
|
||||
| `token` | 获取 Zero Trust token | `organization`, `email`, `code` | step1: `https://warp.cloudflare.now.cc/?organization=<Your-Organization>&email=<Your-Email>` </br> step2: `https://warp.cloudflare.now.cc/?organization=<Your-Organization>&cf_appsession=<App-Session-Value>&cf_session=<Session-Value>&nonce=<Nonce-Value>&code=<Your-Code>` |
|
||||
| `key` | 生成一对 WireGuard 公私钥 | `format(可选)` | `https://warp.cloudflare.now.cc/?run=key&format=<json\|yaml>` |
|
||||
|
||||
### Shell-API 运行脚本
|
||||
```
|
||||
@@ -619,7 +619,7 @@ https://github.com/acacia233/Project-WARP-Unlock
|
||||
* 所有的热心网友们
|
||||
|
||||
服务提供(排名不分先后):
|
||||
* fscarmen 的 Warp API: https://warp.cloudflare.nyc.mn/
|
||||
* fscarmen 的 Warp API: https://warp.cloudflare.now.cc/
|
||||
* fscarmen 的 Zero Trust Token API: https://warp-token.cloudflare.now.cc/
|
||||
* CloudFlare Warp(+): https://1.1.1.1/
|
||||
* WGCF 项目原作者: https://github.com/ViRb3/wgcf/
|
||||
|
||||
+16
-16
@@ -42,11 +42,11 @@ English | [中文](README.md)
|
||||
>
|
||||
>2024.9.14 menu.sh v3.1.2 / warp-go.sh v1.2.2 1. Remove the function of generating licenses from the previous version because cloning Warp+ licenses is officially prohibited; 2. Remove unnecessary dependencies on python3;
|
||||
>
|
||||
>2024.7.25 menu.sh v3.1.1 / warp-go.sh v1.2.1 1. Support using the self-built WARP API at https://warp.cloudflare.nyc.mn/?run=pluskey to generate a 1920 PB WARP+ license for upgrading to a Plus account; 2. Client lacks sufficient support for WARP+, only able to use IPv4 and not IPv6; 3. Optimize the installer to further reduce script runtime;
|
||||
>2024.7.25 menu.sh v3.1.1 / warp-go.sh v1.2.1 1. Support using the self-built WARP API at https://warp.cloudflare.now.cc/?run=pluskey to generate a 1920 PB WARP+ license for upgrading to a Plus account; 2. Client lacks sufficient support for WARP+, only able to use IPv4 and not IPv6; 3. Optimize the installer to further reduce script runtime;
|
||||
>
|
||||
>2024.7.18 menu.sh v3.1.0 / warp-go.sh v1.2.0 1. Use self-built warp api: https://warp.cloudflare.nyc.mn/ to upgrade to Teams account, no need to prepare Token in advance, only need to enter organization, email and verification code when the script is running to complete, the efficiency is greatly increased; 2. Because the Client's settings need to be set up in the Cloudflare dashboard, which can cause the vps to lose contact if not handled properly, the Client's is not upgraded to a Teams account, and the user can look up the information to set it up on their own;
|
||||
>2024.7.18 menu.sh v3.1.0 / warp-go.sh v1.2.0 1. Use self-built warp api: https://warp.cloudflare.now.cc/ to upgrade to Teams account, no need to prepare Token in advance, only need to enter organization, email and verification code when the script is running to complete, the efficiency is greatly increased; 2. Because the Client's settings need to be set up in the Cloudflare dashboard, which can cause the vps to lose contact if not handled properly, the Client's is not upgraded to a Teams account, and the user can look up the information to set it up on their own;
|
||||
>
|
||||
>2024.7.8 menu.sh v3.0.10 / warp-go.sh v1.1.9 1. Publish warp api, you can register account, join Zero Trust, check account information and all other operations. Detailed instructions: https://warp.cloudflare.nyc.mn/ ; 2. Scripts to update the warp api;
|
||||
>2024.7.8 menu.sh v3.0.10 / warp-go.sh v1.1.9 1. Publish warp api, you can register account, join Zero Trust, check account information and all other operations. Detailed instructions: https://warp.cloudflare.now.cc/ ; 2. Scripts to update the warp api;
|
||||
>
|
||||
>2024.6.30 menu.sh v3.0.9 1. By multithreading, parallel processing of optimal MTU, optimal endpoint, downloading wireguard-go and installing dependencies, the script runtime is reduced by more than half; 2. Reverse proxy http://ip-api.com/json and https://hits.seeyoufarm.com with cloudflare worker for better dual-stack support and faster fetching; 3. DNS Priority: Cloudflare 1.1.1.1 > Google 8.8.8.8;
|
||||
>
|
||||
@@ -327,18 +327,18 @@ warp-go [option] [lisence]
|
||||
|
||||
| run parameter | Description | Parameters | Example |
|
||||
|---|---|---|---|
|
||||
| | User Guide | | `https://warp.cloudflare.nyc.mn/` |
|
||||
| `register` | Register new device | `team_token (optional)`, `format (optional)` | `https://warp.cloudflare.nyc.mn/?run=register&team_token=<Your-Team-Token>&format=<json\|yaml\|client\|wireguard\|warp-go\|\|clash\|xray\|sing-box\|qrencode>` |
|
||||
| `device` | Get detailed information of a specific device | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=device&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `app` | Get client configuration | `token` | `https://warp.cloudflare.nyc.mn/?run=app&token=<Your-Token>` |
|
||||
| `bind` | Bind device to account | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=bind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `name` | Set device name | `device_id`, `token`, `device_name` | `https://warp.cloudflare.nyc.mn/?run=name&device_id=<Your-Device-ID>&token=<Your-Token>&device_name=<Your-Device-Name>` |
|
||||
| `license` | Set device license | `device_id`, `token`, `license` | `https://warp.cloudflare.nyc.mn/?run=license&device_id=<Your-Device-ID>&token=<Your-Token>&license=<Your-License>` |
|
||||
| `unbind` | Unbind device from account | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=unbind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `cancel` | Cancel device registration | `device_id`, `token` | `https://warp.cloudflare.nyc.mn/?run=cancel&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `id` | Client ID and Reserved conversion | `convert` | `https://warp.cloudflare.nyc.mn/?run=id&convert=<4-char-string\|Numbers1,Numbers2,Numbers3>` |
|
||||
| `token` | Get Zero Trust token | `organization`, `email`, `code` | step1: `https://warp.cloudflare.nyc.mn/?organization=<Your-Organization>&email=<Your-Email>` </br> step2: `https://warp.cloudflare.nyc.mn/?organization=<Your-Organization>&A=<A-Value>&S=<S-Value>&N=<N-Value>&code=<Your-Code>` |
|
||||
| `key` | Generate a pair of WireGuard public and private keys | `format (optional)` | `https://warp.cloudflare.nyc.mn/?run=key&format=<json\|yaml>` |
|
||||
| | User Guide | | `https://warp.cloudflare.now.cc/` |
|
||||
| `register` | Register new device | `team_token (optional)`, `format (optional)` | `https://warp.cloudflare.now.cc/?run=register&team_token=<Your-Team-Token>&format=<json\|yaml\|client\|wireguard\|warp-go\|\|clash\|xray\|sing-box\|qrencode>` |
|
||||
| `device` | Get detailed information of a specific device | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=device&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `app` | Get client configuration | `token` | `https://warp.cloudflare.now.cc/?run=app&token=<Your-Token>` |
|
||||
| `bind` | Bind device to account | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=bind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `name` | Set device name | `device_id`, `token`, `device_name` | `https://warp.cloudflare.now.cc/?run=name&device_id=<Your-Device-ID>&token=<Your-Token>&device_name=<Your-Device-Name>` |
|
||||
| `license` | Set device license | `device_id`, `token`, `license` | `https://warp.cloudflare.now.cc/?run=license&device_id=<Your-Device-ID>&token=<Your-Token>&license=<Your-License>` |
|
||||
| `unbind` | Unbind device from account | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=unbind&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `cancel` | Cancel device registration | `device_id`, `token` | `https://warp.cloudflare.now.cc/?run=cancel&device_id=<Your-Device-ID>&token=<Your-Token>` |
|
||||
| `id` | Client ID and Reserved conversion | `convert` | `https://warp.cloudflare.now.cc/?run=id&convert=<4-char-string\|Numbers1,Numbers2,Numbers3>` |
|
||||
| `token` | Get Zero Trust token | `organization`, `email`, `code` | step1: `https://warp.cloudflare.now.cc/?organization=<Your-Organization>&email=<Your-Email>` </br> step2: `https://warp.cloudflare.now.cc/?organization=<Your-Organization>&cf_appsession=<App-Session-Value>&cf_session=<Session-Value>&nonce=<Nonce-Value>&code=<Your-Code>` |
|
||||
| `key` | Generate a pair of WireGuard public and private keys | `format (optional)` | `https://warp.cloudflare.now.cc/?run=key&format=<json\|yaml>` |
|
||||
|
||||
### Shell-API Script Usage
|
||||
```
|
||||
@@ -650,7 +650,7 @@ https://github.com/acacia233/Project-WARP-Unlock
|
||||
* All enthusiastic netizens
|
||||
|
||||
Service providers (in no particular order):
|
||||
* fscarmen's Warp API: https://warp.cloudflare.nyc.mn/
|
||||
* fscarmen's Warp API: https://warp.cloudflare.now.cc/
|
||||
* fscarmen's Zero Trust Token API: https://warp-token.cloudflare.nyc.mn/
|
||||
* CloudFlare Warp(+): https://1.1.1.1/
|
||||
* Original author of WGCF project: https://github.com/ViRb3/wgcf/
|
||||
|
||||
@@ -70,7 +70,7 @@ register_account() {
|
||||
PRIVATE_KEY=$(echo $KEY_PAIR | sed 's/.*priv:\(.*\)pub.*/\1/' | xxd -r -p | base64)
|
||||
PUBLIC_KEY=$(echo $KEY_PAIR | sed 's/.*pub://' | xxd -r -p | base64)
|
||||
else
|
||||
WG_API=$(curl -m5 -sSL "https://warp.cloudflare.nyc.mn/?run=key&format=yaml")
|
||||
WG_API=$(curl -m5 -sSL "https://warp.cloudflare.now.cc/?run=key&format=yaml")
|
||||
PRIVATE_KEY=$(awk 'NR==2 {print $2}' <<<"$WG_API")
|
||||
PUBLIC_KEY=$(awk 'NR==1 {print $2}' <<<"$WG_API")
|
||||
fi
|
||||
|
||||
@@ -470,7 +470,7 @@ warp_api(){
|
||||
|
||||
case "$RUN" in
|
||||
register )
|
||||
local ACCOUNT=$(curl --retry 50 --retry-delay 1 --max-time 2 --silent --location --fail "https://warp.cloudflare.nyc.mn/?run=register")
|
||||
local ACCOUNT=$(curl --retry 50 --retry-delay 1 --max-time 2 --silent --location --fail "https://warp.cloudflare.now.cc/?run=register")
|
||||
grep -q '"id"' <<< "$ACCOUNT" && echo "$ACCOUNT" ||
|
||||
echo '{
|
||||
"id": "b0fe9b24-3396-486e-a12d-c194dbbb7bfb",
|
||||
|
||||
+1
-1
@@ -402,7 +402,7 @@ warp_api(){
|
||||
|
||||
case "$RUN" in
|
||||
register )
|
||||
local ACCOUNT=$(curl --retry 500 --retry-delay 1 --max-time 2 --silent --location --fail "https://warp.cloudflare.nyc.mn/?run=register")
|
||||
local ACCOUNT=$(curl --retry 500 --retry-delay 1 --max-time 2 --silent --location --fail "https://warp.cloudflare.now.cc/?run=register")
|
||||
grep -q '"id"' <<< "$ACCOUNT" && echo "$ACCOUNT"
|
||||
;;
|
||||
cancel )
|
||||
|
||||
Reference in New Issue
Block a user