meta-json-schema 1.18.3-beta → 1.18.4-beta3

package/.github/workflows/release_on_tag.yml

@@ -0,0 +1,44 @@
+name: Release On Tag
+
+on:
+  push:
+    tags:
+      - "v*.*.*"
+
+jobs:
+  bundle_on_commit:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout Repository
+        uses: actions/checkout@v4
+
+      - uses: actions/checkout@v4
+      - name: Configure Git Credentials
+        run: |
+          git config user.name github-actions[bot]
+          git config user.email 41898282+github-actions[bot]@users.noreply.github.com
+
+      - name: Install Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: "20"
+
+      - name: Bundle
+        run: npm install && npm run release
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          body_path: ${{ github.workspace }}/CHANGELOG
+          prerelease: false
+          make_latest: true
+          files: |
+            schemas/*
+
+      - name: Commit and Push
+        run: |
+          git add -f schemas
+          git commit -m "Release On Tag"
+          git push --force origin HEAD:main

package/.github/workflows/workflow_runs_cleaner.yml

@@ -0,0 +1,18 @@
+name: Clean Workflow Runs
+
+on:
+  schedule:
+    - cron: "0 0 * * *"
+  workflow_dispatch:
+
+jobs:
+  delete-workflow-runs:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Delete workflow runs
+        uses: dongchengjie/workflow-runs-cleaner@v1
+        with:
+          repository: ${{ github.repository }}
+          token: ${{ secrets.GITHUB_TOKEN }}
+          maintain-span: "3d"

package/.vscode/extensions.json

@@ -1,3 +1,3 @@
 {
-  "recommendations": ["redhat.vscode-yaml"]
+  "recommendations": ["redhat.vscode-yaml", "usernamehw.errorlens"]
 }

package/.vscode/settings.json

@@ -1,18 +1,30 @@
 {
   "json.schemas": [
     {
+      // src 目录的JSON文件使用JSON Schema Draft 07
       "url": "http://json-schema.org/draft-07/schema",
       "fileMatch": ["/src/**/*.json"]
     }
   ],
   "yaml.schemas": {
+    // test/clash-meta  目录的 YAML 文件使用编译后的 meta-json-schema.json
     ".temp/meta-json-schema.json": "test/clash-meta/**/*.yaml",
+    // test/clash-verge 目录的 YAML 文件使用编译后的 clash-verge-merge-json-schema.json
     ".temp/clash-verge-merge-json-schema.json": "test/clash-verge/**/*.yaml"
   },
+  // 使用两空格缩进
   "editor.tabSize": 2,
+  // 在 workspace 中排除下列文件
   "files.exclude": {
     ".gitattributes": true,
     ".gitignore": true,
-    "package-lock.json": true
+    "package-lock.json": true,
+    "CHANGELOG": true
+  },
+  // 搜索排除下列目录
+  "search.exclude": {
+    "node_modules": true, // 忽略模块目录
+    ".temp": true, // 忽略编译输出目录
+    "schemas": true // 忽略构建发布目录
   }
 }

package/CHANGELOG.md

@@ -1,3 +1,34 @@
+## v1.18.4-beta3
+
+### Changes
+
+- 新增: `dns` 新增配置项 `use-system-hosts`
+- 调整: 调整部分配置描述
+- 移除: Clash Verge Merge 配置移除`prepend-rule-providers`、`prepend-proxy-providers`、`append-rule-providers`、`append-proxy-providers`
+
+### Bugs Fixes
+
+- 修复: cipher 缺少 `none`
+- 修复: `default-nameserver`类型错误
+
+---
+
+## v1.18.4
+
+### Changes
+
+- 新增: `proxy-providers` 新增配置项 `header`
+- 调整: `proxy-providers`,`proxy-group` 配置项 `health-check`的`interval` 和 `timeout` 属性类型变更(`integer` --> `string`), 支持配置时间单位
+- 新增: 新增配置项`external-controller-unix`,允许使用Unix Socket访问API
+
+### Bugs Fixes
+
+- 字符串数组类型错误
+- 监听地址支持`:port`
+- sniffer的http ports类型错误
+
+---
+
 ## v1.18.3
 
 ### Features

package/README.md

@@ -1,4 +1,8 @@
-## 用法
+### 🧩 VSCode 插件
+
+VS Code 扩展商店搜索 `Meta JSON Schema` 或 `ClashMeta.meta-json-schema`，安装扩展后即可获取 `Clash.Meta`的语法支持。
+
+## 💡 用法
 
 <details>
 <summary>Visual Studio Code中使用</summary>
@@ -35,16 +39,16 @@
     2.  配置`vite.config.ts`。
 
     ```javascript
-    import { defineConfig } from 'vite';
-    import monacoEditor from 'vite-plugin-monaco-editor';
+    import { defineConfig } from "vite";
+    import monacoEditor from "vite-plugin-monaco-editor";
     export default defineConfig({
       plugins: [
         monacoEditor({
-          languageWorkers: ['editorWorkerService'],
+          languageWorkers: ["editorWorkerService"],
           customWorkers: [
             {
-              label: 'yaml',
-              entry: 'monaco-yaml/yaml.worker'
+              label: "yaml",
+              entry: "monaco-yaml/yaml.worker"
             }
           ]
         })
@@ -55,16 +59,16 @@
     3.  代码中配置schema（请根据需求自行修改`fileMatch`）。
 
     ```javascript
-    import * as monaco from 'monaco-editor';
-    import { configureMonacoYaml } from 'monaco-yaml';
+    import * as monaco from "monaco-editor";
+    import { configureMonacoYaml } from "monaco-yaml";
 
     configureMonacoYaml(monaco, {
       validate: true,
       enableSchemaRequest: true,
       schemas: [
         {
-          uri: 'https://fastly.jsdelivr.net/gh/dongchengjie/airport@main/meta-json-schema.json',
-          fileMatch: ['**/*.clash.yaml']
+          uri: "https://fastly.jsdelivr.net/gh/dongchengjie/airport@main/meta-json-schema.json",
+          fileMatch: ["**/*.clash.yaml"]
         }
       ]
     });
@@ -78,7 +82,7 @@
 
 - <a href="https://dongchengjie.github.io/meta-json-schema/?schema=https://raw.githubusercontent.com/dongchengjie/meta-json-schema/main/schemas/clash-verge-merge-json-schema.json" target="_blank">clash-verge-merge-json-schema</a>
 
-## 开发
+## 🖥️ 开发
 
 1.  下载代码
 
@@ -140,11 +144,11 @@ npm run release
 interface JSONSchema {
   // 自定义Snippet建议(数组)
   defaultSnippets?: {
-    label?: string; // 标题
-    description?: string; // 描述
-    markdownDescription?: string; // 描述(markdown格式)
-    body?: any; // 内容
-    bodyText?: string; // 内容文本
+    label: string; // 标签文本(索引)
+    description?: string; // 标签描述(需要点击展开)
+    markdownDescription?: string; // 标签描述(需要点击展开，markdown格式，优先级高于description,)
+    body: any; // 实际取值内容
+    bodyText?: string; // 实际取值内容文本(暂无作用)
   }[];
   errorMessage?: string; // 错误信息
   patternErrorMessage?: string; // 格式错误信息(优先级高于errorMessage)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meta-json-schema",
-  "version": "1.18.3-beta",
+  "version": "1.18.4-beta3",
   "keywords": [
     "clash",
     "clash.meta",
@@ -9,6 +9,7 @@
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
+  "license": "MIT",
   "config": {
     "watches": [
       "./src/meta-json-schema.json",

package/scripts/release.mjs

@@ -1,5 +1,7 @@
-import bundle from './util/bundle.mjs';
-import { pkg, resolve } from './util/env.mjs';
+import bundle from "./util/bundle.mjs";
+import { pkg, resolve } from "./util/env.mjs";
+import { writeToFileSync } from "./util/file.mjs";
+import fs from "fs";
 
 (async () => {
   // 读取release配置
@@ -13,4 +15,15 @@ import { pkg, resolve } from './util/env.mjs';
       await bundle(source, target, optimization, true);
     }
   }
+
+  // 提取CHANGELOG
+  const changelogs = fs.readFileSync(resolve("CHANGELOG.md"), "utf8");
+  writeToFileSync(
+    resolve("CHANGELOG"),
+    changelogs
+      .split("---")
+      .map(log => log.trim())
+      .filter(log => log.startsWith(`## v${pkg.version}`))
+      .filter(Boolean)?.[0] ?? ""
+  );
 })();

package/src/clash-verge-merge-json-schema.json

@@ -7,9 +7,7 @@
   "definitions": {
     "meta-json-schema": { "$ref": "./meta-json-schema.json" },
     "proxies": { "$ref": "./modules/config/proxies.json" },
-    "proxy-providers": { "$ref": "./modules/config/proxy-providers.json" },
     "proxy-groups": { "$ref": "./modules/config/proxy-groups.json" },
-    "rule-providers": { "$ref": "./modules/rules/provider/provider.json" },
     "rules": { "$ref": "./modules/config/rules.json" }
   },
   "allOf": [
@@ -21,25 +19,11 @@
         "prepend-rules": { "title": "前置规则配置", "$ref": "#/definitions/rules" }
       }
     },
-    {
-      "type": "object",
-      "title": "前置规则集合配置",
-      "properties": {
-        "prepend-rule-providers": { "title": "前置规则集合配置", "$ref": "#/definitions/rule-providers" }
-      }
-    },
     {
       "type": "object",
       "title": "前置代理节点配置",
       "properties": {
-        "prepend-proxies": { "title": "prepend-proxies", "$ref": "#/definitions/proxies" }
-      }
-    },
-    {
-      "type": "object",
-      "title": "前置代理集合配置",
-      "properties": {
-        "prepend-proxy-providers": { "title": "前置代理集合配置", "$ref": "#/definitions/proxy-providers" }
+        "prepend-proxies": { "title": "前置代理节点配置", "$ref": "#/definitions/proxies" }
       }
     },
     {
@@ -56,13 +40,6 @@
         "append-rules": { "title": "后置规则配置", "$ref": "#/definitions/rules" }
       }
     },
-    {
-      "type": "object",
-      "title": "后置规则集合配置",
-      "properties": {
-        "append-rule-providers": { "title": "后置规则集合配置", "$ref": "#/definitions/rule-providers" }
-      }
-    },
     {
       "type": "object",
       "title": "后置代理节点配置",
@@ -70,13 +47,6 @@
         "append-proxies": { "title": "后置代理节点配置", "$ref": "#/definitions/proxies" }
       }
     },
-    {
-      "type": "object",
-      "title": "后置代理集合配置",
-      "properties": {
-        "append-proxy-providers": { "title": "后置代理集合配置", "$ref": "#/definitions/proxy-providers" }
-      }
-    },
     {
       "type": "object",
       "title": "后置代理组配置",

package/src/definitions/enums.json

@@ -2,6 +2,7 @@
   "cipher": {
     "description": "加密方法",
     "enum": [
+      "none",
       "auto",
       "dummy",
       "aes-128-gcm",

package/src/definitions/patterns.json

@@ -18,7 +18,7 @@
     "errorMessage": "无效的IPv4地址"
   },
   "ipv4Port": {
-    "pattern": "^(?:(?:[1-9]?[0-9]|1[0-9][0-9]|2(?:[0-4][0-9]|5[0-5]))\\.){3}(?:[1-9]?[0-9]|1[0-9][0-9]|2(?:[0-4][0-9]|5[0-5])):(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-5]{2}[0-3][0-5])$",
+    "pattern": "^((?:(?:[1-9]?[0-9]|1[0-9][0-9]|2(?:[0-4][0-9]|5[0-5]))\\.){3}(?:[1-9]?[0-9]|1[0-9][0-9]|2(?:[0-4][0-9]|5[0-5])))?:(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-5]{2}[0-3][0-5])$",
     "errorMessage": "无效的IPv4地址:端口"
   },
   "ipv4CIDR": {
@@ -30,7 +30,7 @@
     "errorMessage": "无效的IPv6地址"
   },
   "ipv6Port": {
-    "pattern": "^\\[([0-9a-fA-F]{1,4}(?::[0-9a-fA-F]{1,4}){7}|::|:(?::[0-9a-fA-F]{1,4}){1,6}|[0-9a-fA-F]{1,4}:(?::[0-9a-fA-F]{1,4}){1,5}|(?:[0-9a-fA-F]{1,4}:){2}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){3}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){4}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){5}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,6}:)\\]:(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-5]{2}[0-3][0-5])$",
+    "pattern": "^(\\[([0-9a-fA-F]{1,4}(?::[0-9a-fA-F]{1,4}){7}|::|:(?::[0-9a-fA-F]{1,4}){1,6}|[0-9a-fA-F]{1,4}:(?::[0-9a-fA-F]{1,4}){1,5}|(?:[0-9a-fA-F]{1,4}:){2}(?::[0-9a-fA-F]{1,4}){1,4}|(?:[0-9a-fA-F]{1,4}:){3}(?::[0-9a-fA-F]{1,4}){1,3}|(?:[0-9a-fA-F]{1,4}:){4}(?::[0-9a-fA-F]{1,4}){1,2}|(?:[0-9a-fA-F]{1,4}:){5}:[0-9a-fA-F]{1,4}|(?:[0-9a-fA-F]{1,4}:){1,6}:)\\])?:(?:[0-9]|[1-9][0-9]{1,3}|[1-5][0-9]{4}|6[0-5]{2}[0-3][0-5])$",
     "errorMessage": "无效的[IPv6地址]:端口"
   },
   "ipv6CIDR": {

package/src/definitions/types.json

@@ -1,155 +1,70 @@
 {
   "stringArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "compatible.json#/string" }
-      },
-      { "$ref": "compatible.json#/string" }
-    ]
+    "type": "array",
+    "items": { "$ref": "compatible.json#/string" }
   },
   "portArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/port" }
-      },
-      { "$ref": "patterns.json#/port" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/port" }
   },
   "portRangeArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/portRange" }
-      },
-      { "$ref": "patterns.json#/portRange" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/portRange" }
   },
   "ipv4Array": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipv4" }
-      },
-      { "$ref": "patterns.json#/ipv4" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipv4" }
   },
   "ipv4PortArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipv4Port" }
-      },
-      { "$ref": "patterns.json#/ipv4Port" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipv4Port" }
   },
   "ipv4CIDRArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipv4CIDR" }
-      },
-      { "$ref": "patterns.json#/ipv4CIDR" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipv4CIDR" }
   },
   "ipv6Array": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipv6" }
-      },
-      { "$ref": "patterns.json#/ipv6" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipv6" }
   },
   "ipv6PortArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipv6Port" }
-      },
-      { "$ref": "patterns.json#/ipv6Port" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipv6Port" }
   },
   "ipv6CIDRArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipv6CIDR" }
-      },
-      { "$ref": "patterns.json#/ipv6CIDR" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipv6CIDR" }
   },
   "ipArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ip" }
-      },
-      { "$ref": "patterns.json#/ip" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ip" }
   },
   "ipPortArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipPort" }
-      },
-      { "$ref": "patterns.json#/ipPort" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipPort" }
   },
   "ipCIDRArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/ipCIDR" }
-      },
-      { "$ref": "patterns.json#/ipCIDR" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/ipCIDR" }
   },
   "serverArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/server" }
-      },
-      { "$ref": "patterns.json#/server" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/server" }
   },
   "domainArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/domain" }
-      },
-      { "$ref": "patterns.json#/domain" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/domain" }
   },
   "domainWildcardArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/domainWildcard" }
-      },
-      { "$ref": "patterns.json#/domainWildcard" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/domainWildcard" }
   },
   "urlArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/url" }
-      },
-      { "$ref": "patterns.json#/url" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/url" }
   },
   "httpUrlArray": {
-    "anyOf": [
-      {
-        "type": "array",
-        "items": { "$ref": "patterns.json#/httpUrl" }
-      },
-      { "$ref": "patterns.json#/httpUrl" }
-    ]
+    "type": "array",
+    "items": { "$ref": "patterns.json#/httpUrl" }
   }
 }

package/src/modules/adapter/outbound/base.json

@@ -8,20 +8,20 @@
     "enums": { "$ref": "../../../definitions/enums.json" },
     "base-option": {
       "type": "object",
-      "title": "outbound基础配置",
+      "title": "出站基础配置",
       "properties": {
         "name": {
           "$ref": "#/definitions/compatible/string",
-          "title": "outbound名称",
-          "description": "outbound名称",
-          "markdownDescription": "outbound名称"
+          "title": "出站名称",
+          "description": "出站名称",
+          "markdownDescription": "出站名称"
         },
         "type": {
           "enum": ["select", "url-test", "fallback", "load-balance", "relay"],
           "markdownEnumDescriptions": ["手动选择", "延迟选优", "故障转移", "负载均衡", "链式代理"],
-          "title": "outbound类型",
-          "description": "outbound类型",
-          "markdownDescription": "outbound类型"
+          "title": "出站类型",
+          "description": "出站类型",
+          "markdownDescription": "出站类型"
         },
         "interface-name": {
           "$ref": "#/definitions/compatible/string",
@@ -39,7 +39,7 @@
     },
     "basic-option": {
       "type": "object",
-      "title": "outbound基本配置",
+      "title": "出站基本配置",
       "properties": {
         "tfo": {
           "$ref": "#/definitions/compatible/boolean",

package/src/modules/adapter/outboundgroup/groupbase.json

@@ -9,7 +9,7 @@
     "health-check": { "$ref": "../provider/health-check.json" }
   },
   "allOf": [
-    { "title": "outbound基础配置", "required": ["name", "type"], "$ref": "#/definitions/base-option" },
+    { "title": "出站基础配置", "required": ["name", "type"], "$ref": "#/definitions/base-option" },
     {
       "allOf": [
         {
@@ -31,8 +31,8 @@
             "max-failed-times": {
               "type": "integer",
               "title": "最大失败次数",
-              "description": "在timeout时间长度内,请求失败max-failed-times次,提前主动触发健康检查",
-              "markdownDescription": "在`timeout`时间长度内,请求失败`max-failed-times`次,提前主动触发健康检查",
+              "description": "在timeout时间长度内,请求失败max-failed-times次,强制提前主动触发健康检查",
+              "markdownDescription": "在`timeout`时间长度内,请求失败`max-failed-times`次,强制提前主动触发健康检查",
               "default": 5
             },
             "disable-udp": {

package/src/modules/adapter/provider/health-check.json

@@ -2,6 +2,7 @@
   "type": "object",
   "title": "健康检查",
   "definitions": {
+    "compatible": { "$ref": "../../../definitions/compatible.json" },
     "types": { "$ref": "../../../definitions/types.json" },
     "patterns": { "$ref": "../../../definitions/patterns.json" },
     "enums": { "$ref": "../../../definitions/enums.json" }
@@ -22,18 +23,18 @@
       "default": "https://www.gstatic.com/generate_204"
     },
     "interval": {
-      "type": "integer",
+      "$ref": "#/definitions/compatible/string",
       "title": "健康检查间隔",
-      "description": "单位:s",
-      "markdownDescription": "单位:s",
-      "default": 300
+      "description": "格式: <时长>[ms或s(默认:s)]",
+      "markdownDescription": "格式: <时长>[ms或s(默认:s)]",
+      "default": "300"
     },
     "timeout": {
-      "type": "integer",
+      "$ref": "#/definitions/compatible/string",
       "title": "健康检查超时",
-      "description": "单位:ms",
-      "markdownDescription": "单位:ms",
-      "default": 5000
+      "description": "格式: <时长>[ms或s(默认:ms)]",
+      "markdownDescription": "格式: <时长>[ms或s(默认:ms)]",
+      "default": "5000"
     },
     "lazy": {
       "type": "boolean",

package/src/modules/config/controller.json

@@ -18,6 +18,12 @@
       "description": "可以使用RESTful API over HTTPS来控制内核",
       "markdownDescription": "可以使用RESTful API over HTTPS来控制内核"
     },
+    "external-controller-unix": {
+      "type": "string",
+      "title": "外部控制器(Unix Socket)监听地址",
+      "description": "从Unix Socket访问api接口不会验证secret,如果开启请自行保证安全问题(Windows版本大于17063也可以使用,即大于等于1803/RS4版本即可使用)",
+      "markdownDescription": "从Unix Socket访问api接口不会验证secret,如果开启请自行保证安全问题(Windows版本大于17063也可以使用,即大于等于1803/RS4版本即可使用)"
+    },
     "external-ui": {
       "type": "string",
       "title": "外部用户界面路径(默认:工作目录/ui)",