From 9b50094519617b6f3ba7f15b698501286f9224d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=81=E3=82=BB?=
 <123655015+chise0713@users.noreply.github.com>
Date: Sat, 30 Dec 2023 10:08:46 +0800
Subject: [PATCH] Update warp.md (#443)

---
 docs/document/level-2/warp.md | 116 +++++++++++++++++++++++++++++++---
 1 file changed, 108 insertions(+), 8 deletions(-)

diff --git a/docs/document/level-2/warp.md b/docs/document/level-2/warp.md
index 7f7446558..8667a3e20 100644
--- a/docs/document/level-2/warp.md
+++ b/docs/document/level-2/warp.md
@@ -14,12 +14,13 @@ Xray（1.6.5+）新加入了 WireGuard 出站，虽然增加的代码和依赖
 
 ## 申请 Warp 账户
 
-1. 感谢 Cloudflare 推动自由的互联网，现在你可以免费使用 Warp 服务，连接的时候会根据出口自动选择最近的服务器
-2. 使用一台 vps，下载 [wgcf](https://github.com/ViRb3/wgcf/releases)
-3. 运行 `wgcf register` 生成 `wgcf-account.toml`
-4. 运行 `wgcf generate` 生成 `wgcf-profile.conf` 拷贝内容如下：
+### 感谢 Cloudflare 推动自由的互联网，现在你可以免费使用 Warp 服务，连接的时候会根据出口自动选择最近的服务器
+#### 方法 1：
+1. 使用一台 vps，下载 [wgcf](https://github.com/ViRb3/wgcf/releases)
+2. 运行 `wgcf register` 生成 `wgcf-account.toml`
+3. 运行 `wgcf generate` 生成 `wgcf-profile.conf` 拷贝内容如下：
 
-```
+```ini
 [Interface]
 PrivateKey = 我的私钥
 Address = 172.16.0.2/32
@@ -32,7 +33,104 @@ AllowedIPs = 0.0.0.0/0
 AllowedIPs = ::/0
 Endpoint = engage.cloudflareclient.com:2408
 ```
-
+#### 方法 2：
+1. 使用 [warp-reg.sh](https://github.com/chise0713/warp-reg.sh)，运行：
+```
+bash -c "$(curl -L warp-reg.vercel.app)"
+```
+- 输出
+```json
+{
+    "endpoint":{
+       "v4": "162.159.192.7",
+       "v6": "[2606:4700:d0::a29f:c007]",
+    },
+    "reserved_dec": [35, 74, 190],
+    "reserved_hex": "0x234abe",
+    "reserved_str": "I0q+",
+    "private_key": "yL0kApRiZW4VFfNkKAQ/nYxnMFT3AH0dfVkj1GAlr1k=",
+    "public_key": "bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=",
+    "v4": "172.16.0.2",
+    "v6": "2606:4700:110:81f3:2a5b:3cad:9d4:9ea6"
+}
+```
+2. 拷贝输出的内容
+#### 方法 3：
+1. 使用[wgcf-cli](https://github.com/ArchiveNetwork/wgcf-cli)，运行以下内容进行安装：
+```
+bash -c "$(curl -L wgcf-cli.vercel.app)"
+```
+2. 运行 `wgcf-cli -r` 进行注册，输出：
+```json
+❯ wgcf-cli -r
+{
+    "endpoint": {
+        "v4": "162.159.192.7:0",
+        "v6": "[2606:4700:d0::a29f:c007]:0"
+    },
+    "reserved_str": "6nT5",
+    "reserved_hex": "0xea74f9",
+    "reserved_dec": [
+        234,
+        116,
+        249
+    ],
+    "private_key": "WIAKvgUlq5fBazhttCvjhEGpu8MmGHcb1H0iHSGlU0Q=",
+    "public_key": "bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=",
+    "addresses": {
+        "v4": "172.16.0.2",
+        "v6": "2606:4700:110:8d9c:3c4e:2190:59d1:2d3c"
+    }
+}
+```
+- 完整文件将会保存到工作目录的 `wgcf.json` 内。
+3. 如果你还拥有一个 warp-plus 的密钥，你还可以运行 `wgcf-cli -l [密钥]` 进行绑定
+- （密钥可以在[我们群](https://t.me/projectXray/)里发送 `/keyget@getwarpplusbot` 获取）输出：
+```json
+❯ wgcf-cli -l 9zs5I61a-l9j8m7T5-4pC6k20X
+{
+    "id": "cd7f4695-e9ef-4bb0-b412-5f4d84919db7",
+    "created": "0001-01-01T00:00:00Z",
+    "updated": "2023-12-14T12:32:18.689777921Z",
+    "premium_data": 0,
+    "quota": 0,
+    "warp_plus": true,
+    "referral_count": 0,
+    "referral_renewal_countdown": 0,
+    "role": "child"
+}
+```
+4. 运行 `wgcf-cli -g xray` 来生成一个WireGurad出站，他会将内容保存到 `wgcf.json.xray.json` 内
+- 示例文件：
+```json
+{
+    "protocol": "wireguard",
+    "settings": {
+        "secretKey": "6CRVRLgFwGajnikoVOPTDNZnDhx3EydhPsMgpxHfBCY=",
+        "address": [
+            "172.16.0.2/32",
+            "2606:4700:110:857a:6a95:fe27:1870:2a9d/128"
+        ],
+        "peers": [
+            {
+                "publicKey": "bmXOC+F1FxEMF9dyiK2H5/1SUtzH0JuVo51h2wPfgyo=",
+                "allowedIPs": [
+                    "0.0.0.0/0",
+                    "::/0"
+                ],
+                "endpoint": "162.159.192.1:2408"
+            }
+        ],
+        "reserved": [
+            240,
+            25,
+            146
+        ],
+        "mtu": 1280
+    },
+    "tag": "wireguard"
+}
+```
 ## 在服务端分流回国流量至 warp
 
 在现有出站中新增一个 WireGurad 出站
@@ -48,7 +146,8 @@ Endpoint = engage.cloudflareclient.com:2408
         "publicKey": "Warp公钥",
         "endpoint": "engage.cloudflareclient.com:2408"
       }
-    ]
+    ],
+    "reserved":[0, 0, 0], // 如果你有的话，粘贴reserved到这里
   },
   "tag": "wireguard-1"
 }
@@ -89,7 +188,8 @@ Endpoint = engage.cloudflareclient.com:2408
                   "publicKey":"Warp公钥",
                   "endpoint":"engage.cloudflareclient.com:2408"
                }
-            ]
+            ],
+            "reserved":[0, 0, 0], // 如果你有的话，粘贴reserved到这里
          },
          "streamSettings":{
             "sockopt":{