From 1be70981a0bf2841db7c027e275fbbfb22b21097 Mon Sep 17 00:00:00 2001 From: fscarmen <62703343+fscarmen@users.noreply.github.com> Date: Wed, 21 Jun 2023 23:51:09 +0800 Subject: [PATCH] Update README.md --- README.md | 204 ++++++++++++++++++++++++++++++++---------------------- 1 file changed, 123 insertions(+), 81 deletions(-) diff --git a/README.md b/README.md index 5ac4f1a..ebe9d94 100644 --- a/README.md +++ b/README.md @@ -12,8 +12,8 @@ - [Cloudflare api 运行脚本](README.md#cloudflare-api-运行脚本) - [通过 warp 解锁 chatGPT 的方法](README.md#通过-warp-解锁-chatgpt-的方法) - [刷 Netflix 解锁 WARP IP 的方法](README.md#刷-Netflix-解锁-WARP-IP-的方法) -- [Netflix 分流到 WARP Client Proxy、WireProxy 的方法](README.md#Netflix-分流到-WARP-Client-ProxyWireProxy-的方法) -- [Netflix,Google 分流到 Client WARP 网络接口的方法](README.md#netflixgoogle-分流到-client-warp-网络接口的方法) +- [指定网站分流到 "socks5" 的 xray 配置模板（适用于 WARP Client Proxy 和 WireProxy）](README.md#Netflix-分流到-WARP-Client-ProxyWireProxy-的方法) +- [指定网站分流到 "interface" 的 xray 配置模板（适用于 WARP Client Warp 和 warp-go 非全局）](README.md#netflixgoogle-分流到-client-warp-网络接口的方法) - [WARP+ License 及 ID 获取](README.md#warp-license-及-id-获取) - [WARP Teams 获取并用于 Linux 的方法](README.md#WARP-Teams-获取并用于-Linux-的方法) - [WARP 网络接口数据，临时、永久关闭和开启](README.md#warp-网络接口数据临时永久关闭和开启) @@ -23,33 +23,39 @@ * * * ## 更新信息 +2023.6.21 menu.sh V2.52 1. Client proxy mode supports warp dualstack; 2. Client warp mode supports warp dualstack; 3. Speed up script startup; 1. Client Proxy 模式支持 warp 双栈; 2. Client warp 模式支持 warp 双栈; 3. 加快脚本启动速度 + +2023.6.18 menu.sh V2.51 Client supports Debian 12 (bookworm); Client 支持 Debian 12 (bookworm) + +2023.5.20 menu.sh V2.50 1. Client supports IPv6 only VPS; 2. Support 4 ways to upgrade to teams account including token (Easily available at https://web--public--warp-team-api--coia-mfs4.code.run); 3. Use api to delete warp account while uninstalling; 1. Client 支持 IPv6 only VPS 安装; 2. 支持包括 token 等4种方式升级为 teams 账户 (可通过 https://web--public--warp-team-api--coia-mfs4.code.run 轻松获取); 3. 卸载的同时使用 api 删除 warp 账户 + 2023.5.15 Cloudflare api Thanks to badafans open source project and patient guidance. Now released in linux using the Cloudflare WARP api. badafans open source project link: https://github.com/badafans/warp-reg Use method 感谢大神 badafans的开源项目及耐心指导，现发布在linux下使用的Cloudflare WARP api，badafans的开源项目链接：https://github.com/badafans/warp-reg 使用方法 ``` -wget -N https://raw.githubusercontent.com/fscarmen/warp/master/api.sh && bash api.sh [option] +wget -N https://raw.githubusercontent.com/fscarmen/warp/main/api.sh && bash api.sh [option] ``` 2023.5.10 warp-go V1.1.4 1. Docking the warp-go official account pool api, wiki: https://docs.zeroteam.top/apis/warp; 2. Change non-global from ipv4 only to dualstacks; 3. Fix the bug that the native IPv6 cannot login when using dualstacks; 4. Update the Best-enpoint app; 5. Change ip api; 1. 对接 warp-go 官方账户池 api，wiki: https://docs.zeroteam.top/apis/warp; 2. 非全局从ipv4 only 改为双栈; 3. 修复双栈时使用原生 IPv6 不能登陆的 bug; 4. 更新最佳 Endpoint 应用; 5. 更换 ip api 2023.3.26 warp-go V1.1.3 / menu.sh 2.49 1. Change the best Warp endpoint to standard ports [500,1701,2408,4500]; 2. Upgrade the Netflix unlocking section; 1. warp endpoint 优选改为标准端口 [500,1701,2408,4500]; 2. 升级奈飞解锁部分 -2023.3.14 warp-go V1.1.2 / menu.sh 2.48 To speed up WARP, automatically find the most suitable endpoint for local use and apply it to wgcf, warp-go and client. Thanks to an anonymous and enthusiastic user for the tool; 为了提速 WARP，自动寻找最适合本机使用的 endpoint，应用在 wgcf, warp-go 和 client，感谢匿名的热心网友提供的工具 - -2023.3.2 warp-go V1.1.1 1. warp-go v1.0.8 is supported. Allowing custom MTU values in the configuration file /opt/warp-go/warp.conf; 2. Singbox configuration exports reseved using 3-numeric-array instead of a string; 1. 支持 warp-go v1.0.8 , 允许在配置文件 /opt/warp-go/warp.conf 自定义 MTU 值; 2. Singbox配置导出 reseved 使用三个数字的数组代替字符串 - -2023.2.22 [Unlock chatGPT without installing warp; 不安装 warp 就能解锁 chatGPT 的方法](README.md#通过-warp-解锁-chatgpt-的方法) - -2023.2.7 menu.sh V2.47 Iptables + dnsmasq + ipset solution supports chatGPT. Install via the 12 option in the menu or `bash menu.sh e`; Iptables + dnsmasq + ipset 方案支持 chatGPT. 安装方式: 菜单 12 选项或者 `bash menu.sh e` - -2022.12.17 warp-go V1.1.0 Support OpenWrt system; 支持 OpenWrt 系统 -
历史更新 history（点击即可展开或收起）
+>2023.3.14 warp-go V1.1.2 / menu.sh 2.48 To speed up WARP, automatically find the most suitable endpoint for local use and apply it to wgcf, warp-go and client. Thanks to an anonymous and enthusiastic user for the tool; 为了提速 WARP，自动寻找最适合本机使用的 endpoint，应用在 wgcf, warp-go 和 client，感谢匿名的热心网友提供的工具 +> +>2023.3.2 warp-go V1.1.1 1. warp-go v1.0.8 is supported. Allowing custom MTU values in the configuration file /opt/warp-go/warp.conf; 2. Singbox configuration exports reseved using 3-numeric-array instead of a string; 1. 支持 warp-go v1.0.8 , 允许在配置文件 /opt/warp-go/warp.conf 自定义 MTU 值; 2. Singbox配置导出 reseved 使用三个数字的数组代替字符串 +> +>2023.2.22 [Unlock chatGPT without installing warp; 不安装 warp 就能解锁 chatGPT 的方法](README.md#通过-warp-解锁-chatgpt-的方法) +> +>2023.2.7 menu.sh V2.47 Iptables + dnsmasq + ipset solution supports chatGPT. Install via the 12 option in the menu or `bash menu.sh e`; Iptables + dnsmasq + ipset 方案支持 chatGPT. 安装方式: 菜单 12 选项或者 `bash menu.sh e` +> +>2022.12.17 warp-go V1.1.0 Support OpenWrt system; 支持 OpenWrt 系统 +> >2022.12.10 warp-go V1.0.9 1.Export wireguard and sing-box config file with [warp-go e]; 2.Teams token website change to https://web--public--warp-team-api--coia-mfs4.code.run 1. 使用 [warp-go e] 导出 wireguard 和 sing-box 配置文件; 2.获取 teams token 网站更换为: https://web--public--warp-team-api--coia-mfs4.code.run > >2022.10.19 menu V2.46 / warp-go V1.0.8 Switch the IPv4 / IPv6 priority by [warp s 4/6/d] or [warp-go s 4/6/d]; 通过 [warp s 4/6/d] 或者 [warp-go 4/6/d]来切换 IPv4 / IPv6 的优先级别 @@ -220,7 +226,7 @@ wget -N https://raw.githubusercontent.com/fscarmen/warp/master/api.sh && bash ap 首次运行 ``` -wget -N https://raw.githubusercontent.com/fscarmen/warp/main/menu.sh && bash menu.sh [option] [lisence] +wget -N https://raw.githubusercontent.com/fscarmen/warp/main/menu.sh && bash menu.sh [option] [lisence/url/token] ``` 再次运行 ``` @@ -275,17 +281,23 @@ warp i jp "tag":"WARP", "protocol":"wireguard", "settings":{ - "secretKey":"cKE7LmCF61IhqqABGhvJ44jWXp8fKymcMAEVAzbDF2k=", + "secretKey":"YFYOAdbw1bKTHlNNi+aEjBM3BO7unuFC5rOkMRAz9XY=", "address":[ "172.16.0.2/32", - "fd01:5ca1:ab1e:823e:e094:eb1c:ff87:1fab/128" + "2606:4700:110:8a36:df92:102a:9602:fa18/128" ], "peers":[ { "publicKey":"bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=", + "allowedIPs":[ + "0.0.0.0/0", + "::/0" + ], "endpoint":"engage.cloudflareclient.com:2408" } - ] + ], + "reserved":[78, 135, 76], + "mtu":1280 } } ], @@ -344,50 +356,71 @@ kill -9 $(pgrep -f warp) ##杀掉正在运行的进程 * 如果长时间仍然未刷出解锁IP，可以查查 CloudFlare 当地是否在维护调路由：https://www.cloudflarestatus.com/ -## Netflix 分流到 WARP Client Proxy、WireProxy 的方法 - -感谢 vpsxb admin 原创教程: [继续解锁奈飞（七）-WARP socks5 client分流](https://vpsxb.net/1069/) +## 指定网站分流到 socks5 的 xray 配置模板 (适用于 WARP Client Proxy 和 WireProxy) -先安装 WARP Client，假设使用默认的 40000 端口 +本地 socks5://127.0.0.1:40000 并安装 [mack-a 八合一脚本](https://github.com/mack-a/v2ray-agent) 为例。编辑 ```/etc/v2ray-agent/xray/conf/10_ipv4_outbounds.json``` ``` { - "outbounds": [ - { - "protocol": "freedom" - }, - { - "tag": "media-unlock", - "protocol": "socks", - "settings": { - "servers": [ - { - "address": "127.0.0.1", - "port": 40000, - "users": [] - } - ] - } - } - ], - "routing": { - "domainStrategy": "AsIs", - "rules": [ - { - "type": "field", - "domain": [ - "geosite:netflix", - "domain:ip.gs" - ], - "outboundTag": "media-unlock" - } + "outbounds": [ + { + "tag": "warp", + "protocol": "socks", + "settings": { + "servers": [ + { + "address": "127.0.0.1", + "port": 40000 + } ] + } + }, + { + "tag": "WARP-socks5-v4", + "protocol": "freedom", + "settings": { + "domainStrategy": "UseIPv4" + }, + "proxySettings": { + "tag": "warp" + } + }, + { + "tag": "WARP-socks5-v6", + "protocol": "freedom", + "settings": { + "domainStrategy": "UseIPv6" + }, + "proxySettings": { + "tag": "warp" + } } + ], + "routing": { + "rules": [ + { + "type": "field", + "domain": [ + "openai", + "ip.gs" + ], + "outboundTag": "WARP-socks5-v4" + }, + { +"type": "field", + "domain": [ + "p3terx.com", +"netflix" + ], + "outboundTag": "WARP-socks5-v6" + } + ] + } } ``` -## Netflix,Google 分流到 Client WARP 网络接口的方法 +## 指定网站分流到 "interface" 的 xray 配置模板（适用于 WARP Client Warp 和 warp-go 非全局） 感谢 LUDAN 老师提供的网络接口分流配置模板，注意：172.16.0.2 为 CloudFlareWARP 网络接口的 IP @@ -395,47 +428,59 @@ kill -9 $(pgrep -f warp) ##杀掉正在运行的进程 { "outbounds":[ { - "tag":"INTERNET_OUT", + "protocol":"freedom" + }, + { + "tag":"CloudflareWARP-v4", "protocol":"freedom", "settings":{ - "domainStrategy":"UseIP" + "domainStrategy":"UseIPv4" + }, + "streamSettings":{ + "sockopt":{ + "interface":"CloudflareWARP", + "tcpFastOpen":true + } } }, { - "tag":"CLI_OUT", + "tag":"CloudflareWARP-v6", "protocol":"freedom", "settings":{ - "domainStrategy":"UseIPv4" + "domainStrategy":"UseIPv6" }, - "sendThrough":"172.16.0.2" + "streamSettings":{ + "sockopt":{ + "interface":"CloudflareWARP", + "tcpFastOpen":true + } + } } ], "routing":{ + "domainStrategy":"AsIs", "rules":[ { "type":"field", - "outboundTag":"CLI_OUT", "domain":[ "geosite:google", - "geosite:netflix", - "domain:ip.gs" - ] + "domain:ip.gs", + "domain:openai.com", + "domain:ai.com" + ], + "outboundTag":"CloudflareWARP-v4" }, { "type":"field", - "outboundTag":"INTERNET_OUT", - "network":"udp,tcp" + "domain":[ + "geosite:netflix", + "domain:p3terx.com" + ], + "outboundTag":"CloudflareWARP-v6" } ] - }, - "dns":{ - "servers":[ - "1.1.1.1", - "1.0.0.1" - ] } } - ``` ## warp-go 运行脚本 @@ -464,13 +509,14 @@ warp-go [option] [lisence] ## Cloudflare api 运行脚本 ``` -wget -N https://raw.githubusercontent.com/fscarmen/warp/master/api.sh && bash api.sh [option] +wget -N https://raw.githubusercontent.com/fscarmen/warp/main/api.sh && bash api.sh [option] ``` | [option] 变量 | 具体动作说明 | | -------------| ------------- | | -h/--help | 帮助 | | -f/--file | 保存账户注册信息的文件 (默认: warp-account.conf) | | -r/--registe | 注册账户 | + | -t/--token | -r 注册时，使用 team token 注册，快速获取: https://web--public--warp-team-api--coia-mfs4.code.run | | -d/--device | 获取账户注册信息，包括 plus 流量等 | | -a/--app | 获取 app 信息 | | -b/--bind | 获取绑定设备信息，包括子设备 | @@ -500,16 +546,12 @@ WireGuard 网络接口数据，查看 ```wg``` ## WARP Teams 获取并用于 Linux 的方法 -* 感谢 TonyLCH 提供的资讯 [#26](https://github.com/fscarmen/warp/issues/26) ，由于Team是无限制的，省去了刷 WARP+ 流量。方法大体： - 1.安装通安卓模拟器，并在上面安装 1.1.1.1 apk连上 - 2.连上 teams 后抓包，把获取到的信息替换到wgcf.conf配置文件里 +* 通过 Coia 的网站，填入 teams 的组织名、邮箱和验证码获取 token: `https://web--public--warp-team-api--coia-mfs4.code.run/` - 具体原创文章:[Cloudflare for Teams Wireguard Config](https://parkercs.tech/cloudflare-for-teams-wireguard-config/) - -* Download 下载: - 1、 Android Studio: [MAC](https://redirector.gvt1.com/edgedl/android/studio/install/2020.3.1.26/android-studio-2020.3.1.26-mac.dmg) [WIN](https://redirector.gvt1.com/edgedl/android/studio/install/2020.3.1.26/android-studio-2020.3.1.26-windows.exe) - 2、 Android platform-tools: [MAC](https://dl.google.com/android/repository/platform-tools-latest-darwin.zip) [WIN](https://dl.google.com/android/repository/platform-tools-latest-windows.zip) - 3、 1.1.1.1: Faster & Safer Internet V6.10: [Android](https://apkpure.com/cn/1-1-1-1-faster-safer-internet/com.cloudflare.onedotonedotonedotone/download/2158-APK-d58edfa7c40ff1891244c556b872f18d?from=versions%2Fversion) +* 在 vps 里运行以下指令获取 teams 配置的全部信息，保存在文件 `warp-account.conf` +``` +bash <(wget -qO- https://raw.githubusercontent.com/fscarmen/warp/main/api.sh) -r -t +``` ## WARP原理 @@ -551,7 +593,7 @@ EUserv是 LXC 非完整虚拟化 VPS 主机，共享宿主机内核，不能更 * 猫大: https://github.com/Oreomeow * Luminous: https://luotianyi.vc/5252.html * Hiram: https://hiram.wang/cloudflare-wrap-vps -* Cloudflare: https://developers.cloudflare.com/warp-client/setting-up/linux +* Cloudflare: https://pkg.cloudflareclient.com/ https://blog.cloudflare.com/announcing-warp-for-linux-and-proxy-mode/ https://blog.cloudflare.com/argo-v2/ * WireGuard: https://lists.zx2c4.com/pipermail/wireguard/2017-December/002201.html @@ -580,7 +622,7 @@ https://github.com/acacia233/Project-WARP-Unlock https://ip.gs/ https://ip.sb/ * 统计PV网:https://hits.seeyoufarm.com/ -* Coia 的网页版提出 Teams Token: https://warp-team-api.herokuapp.com/ +* Coia 的网页版提出 Teams Token: https://web--public--warp-team-api--coia-mfs4.code.run CloudFlare WARP 全球站点和服务状态: * Operational = 正常。Re-routed = 检修状态: https://www.cloudflarestatus.com/