feat: support inline proxy provider

dongchengjie · Dec 26, 2024 · 043aa79 · 043aa79
1 parent cbefc26
commit 043aa79
Show file tree

Hide file tree

Showing 13 changed files with 1,274 additions and 1,179 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,12 @@
 ### changes
 
 - 新增：rule-providers 新增 `inline` 内联规则配置
+- 新增：proxy-providers 新增 `inline` 内联proxies配置
+- 调整: outbound 的 `header` 配置项宽松，不再限制value的类型为 string
+
+### Bugs Fixes
+
+- 修复: `tuic` V4 的 `token` 配置项类型错误
 
 ---
 

diff --git a/src/modules/adapter/outbound/http.json b/src/modules/adapter/outbound/http.json
@@ -87,8 +87,7 @@
           "type": "object",
           "title": "请求头",
           "description": "请求头",
-          "markdownDescription": "请求头",
-          "additionalProperties": { "type": "string" }
+          "markdownDescription": "请求头"
         }
       }
     },

diff --git a/src/modules/adapter/outbound/mieru.json b/src/modules/adapter/outbound/mieru.json
@@ -76,7 +76,8 @@
           "markdownEnumDescriptions": ["默认", "禁用", "低", "中", "高"],
           "title": "多路复用级别",
           "description": "多路复用级别",
-          "markdownDescription": "多路复用级别"
+          "markdownDescription": "多路复用级别",
+          "default": "MULTIPLEXING_LOW"
         }
       },
       "anyOf": [{ "required": ["port"] }, { "required": ["port-range"] }],

diff --git a/src/modules/adapter/outbound/shadowsocks.json b/src/modules/adapter/outbound/shadowsocks.json
@@ -67,8 +67,7 @@
           "type": "object",
           "title": "请求头",
           "description": "请求头",
-          "markdownDescription": "请求头",
-          "additionalProperties": { "type": "string" }
+          "markdownDescription": "请求头"
         },
         "skip-cert-verify": {
           "$ref": "#/definitions/compatible/boolean",

diff --git a/src/modules/adapter/outbound/vless.json b/src/modules/adapter/outbound/vless.json
@@ -120,8 +120,7 @@
           "type": "object",
           "title": "ws请求头",
           "description": "ws请求头",
-          "markdownDescription": "ws请求头",
-          "additionalProperties": { "type": "string" }
+          "markdownDescription": "ws请求头"
         },
         "fingerprint": {
           "$ref": "#/definitions/enums/fingerprint",

diff --git a/src/modules/adapter/outbound/vmess.json b/src/modules/adapter/outbound/vmess.json
@@ -31,8 +31,7 @@
           "type": "object",
           "title": "请求头",
           "description": "请求头",
-          "markdownDescription": "请求头",
-          "additionalProperties": { "type": "string" }
+          "markdownDescription": "请求头"
         }
       }
     },
@@ -83,8 +82,7 @@
           "type": "object",
           "title": "请求头",
           "description": "请求头",
-          "markdownDescription": "请求头",
-          "additionalProperties": { "type": "string" }
+          "markdownDescription": "请求头"
         },
         "max-early-data": {
           "$ref": "#/definitions/compatible/integer",

diff --git a/src/modules/adapter/provider/provider.json b/src/modules/adapter/provider/provider.json
@@ -4,8 +4,7 @@
   "definitions": {
     "types": { "$ref": "../../../definitions/types.json" },
     "patterns": { "$ref": "../../../definitions/patterns.json" },
-    "enums": { "$ref": "../../../definitions/enums.json" },
-    "health-check": { "$ref": "./health-check.json" }
+    "enums": { "$ref": "../../../definitions/enums.json" }
   },
   "patternProperties": {
     "^default$": { "type": "null", "errorMessage": "不能使用default作为provider的名称" }
@@ -15,8 +14,8 @@
     "required": ["type"],
     "properties": {
       "type": {
-        "enum": ["file", "http"],
-        "markdownEnumDescriptions": ["本地文件", "网络文件"],
+        "enum": ["file", "http", "inline"],
+        "markdownEnumDescriptions": ["本地文件", "网络文件", "内联proxies"],
         "title": "provider类型",
         "description": "provider类型",
         "markdownDescription": "provider类型"
@@ -181,34 +180,56 @@
       },
       "header": { "type": "object", "errorMessage": "类型应为object" }
     },
-    "if": {
-      "properties": {
-        "type": { "const": "http" }
-      }
-    },
-    "then": {
-      "required": ["url"],
-      "properties": {
-        "url": {
-          "$ref": "#/definitions/patterns/httpUrl",
-          "title": "provider网络文件地址",
-          "description": "provider网络文件地址",
-          "markdownDescription": "provider网络文件地址"
-        },
-        "proxy": {
-          "type": "string",
-          "title": "使用指定代理下载/更新provider",
-          "description": "使用指定代理下载/更新provider",
-          "markdownDescription": "使用指定代理下载/更新provider"
+    "allOf": [
+      {
+        "if": { "properties": { "type": { "const": "file" } } },
+        "then": { "required": ["path"] }
+      },
+      {
+        "if": {
+          "properties": {
+            "type": { "const": "http" }
+          }
         },
-        "size-limit": {
-          "type": "integer",
-          "title": "限制下载文件大小",
-          "description": "单位:KB,0为不限制",
-          "markdownDescription": "单位:KB,0为不限制",
-          "default": 0
+        "then": {
+          "required": ["url"],
+          "properties": {
+            "url": {
+              "$ref": "#/definitions/patterns/httpUrl",
+              "title": "provider网络文件地址",
+              "description": "provider网络文件地址",
+              "markdownDescription": "provider网络文件地址"
+            },
+            "proxy": {
+              "type": "string",
+              "title": "使用指定代理下载/更新provider",
+              "description": "使用指定代理下载/更新provider",
+              "markdownDescription": "使用指定代理下载/更新provider"
+            },
+            "size-limit": {
+              "type": "integer",
+              "title": "限制下载文件大小",
+              "description": "单位:KB,0为不限制",
+              "markdownDescription": "单位:KB,0为不限制",
+              "default": 0
+            }
+          }
+        }
+      },
+      {
+        "if": { "properties": { "type": { "const": "inline" } } },
+        "then": {
+          "required": ["payload"],
+          "properties": {
+            "payload": {
+              "$ref": "#/definitions/proxies",
+              "title": "proxies内容",
+              "description": "proxies内容",
+              "markdownDescription": "proxies内容"
+            }
+          }
         }
       }
-    }
+    ]
   }
 }
diff --git a/src/modules/config/proxy-providers.json b/src/modules/config/proxy-providers.json
@@ -5,7 +5,8 @@
     "types": { "$ref": "../../definitions/types.json" },
     "patterns": { "$ref": "../../definitions/patterns.json" },
     "enums": { "$ref": "../../definitions/enums.json" },
-    "health-check": { "$ref": "../adapter/provider/health-check.json" }
+    "health-check": { "$ref": "../adapter/provider/health-check.json" },
+    "proxies": { "$ref": "../config/proxies.json" }
   },
   "$ref": "../adapter/provider/provider.json"
 }
diff --git a/src/modules/config/sniffer.json b/src/modules/config/sniffer.json
@@ -27,7 +27,7 @@
       "markdownDescription": "默认情况下只对IP进行嗅探"
     },
     "skip-domain": {
-      "$ref": "#/definitions/types/domainWildcardArray",
+      "$ref": "#/definitions/types/stringArray",
       "title": "需要跳过嗅探的域名",
       "description": "默认情况下只对IP进行嗅探",
       "markdownDescription": "默认情况下只对IP进行嗅探"
@@ -49,14 +49,14 @@
       "title": "限制嗅探类型范围",
       "description": "支持TLS,HTTP,QUIC",
       "markdownDescription": "支持`TLS`,`HTTP`,`QUIC`",
-      "deprecationMessage": "推荐使用sniff"
+      "deprecationMessage": "已废弃，使用sniff代替"
     },
     "port-whitelist": {
       "$ref": "#/definitions/types/portRangeArray",
       "title": "限制嗅探端口范围",
       "description": "要求搭配sniffing使用(格式:80 或 80-88)",
       "markdownDescription": "要求搭配`sniffing`使用(格式:`80` 或 `80-88`)",
-      "deprecationMessage": "推荐使用sniff"
+      "deprecationMessage": "已废弃，使用sniff代替"
     },
     "force-dns-mapping": {
       "type": "boolean",

diff --git a/src/modules/listener/config/tuic.json b/src/modules/listener/config/tuic.json
@@ -22,7 +22,7 @@
       "markdownDescription": "多个使用,分隔"
     },
     "token": {
-      "type": "string",
+      "$ref": "#/definitions/types/stringArray",
       "title": "Token",
       "description": "Token",
       "markdownDescription": "Token"

diff --git a/src/modules/listener/inbound/tuic.json b/src/modules/listener/inbound/tuic.json
@@ -16,7 +16,7 @@
       "required": ["certificate", "private-key"],
       "properties": {
         "token": {
-          "type": "string",
+          "$ref": "#/definitions/types/stringArray",
           "title": "TUIC V4的用户标识",
           "description": "TUIC V4的用户标识",
           "markdownDescription": "TUIC `V4`的用户标识"

diff --git a/src/modules/listener/inbound/tun.json b/src/modules/listener/inbound/tun.json
@@ -80,8 +80,7 @@
           "$ref": "#/definitions/patterns/ipv4",
           "title": "TUN接口的IPv4前缀",
           "description": "TUN接口的IPv4前缀",
-          "markdownDescription": "`TUN`接口的`IPv4`前缀",
-          "deprecationMessage": "已弃用"
+          "markdownDescription": "`TUN`接口的`IPv4`前缀"
         },
         "inet6-address": {
           "$ref": "#/definitions/patterns/ipv6",