v0.9.5

Edit docs.
Hy2 supports obtaining port hopping parameters from a link.
2025-10-28 20:32:42 +00:00 · 2024-06-27 15:16:27 +08:00 · 2024-06-25 16:38:43 +08:00 · 2024-06-19 14:56:59 +08:00 · 2024-06-19 10:41:55 +08:00 · 2024-06-17 11:28:12 +08:00
8 changed files with 261 additions and 331 deletions
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -1,346 +1,130 @@
 name: Publish Docker Image
-on: 
+on:
  push:
    branches: [ master ]
    tags:
      - '**'
-  workflow_dispatch:
-  pull_request:

-concurrency: 
+concurrency:
  group: ${{ github.ref }}-${{ github.workflow }}
  cancel-in-progress: true

+env:
+  REGISTRY_IMAGE: asdlokj1qpi23/subconverter
+
 jobs:
-  amd64_build:
-    name: Build AMD64 Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and export
-        id: build
-        if: github.ref == 'refs/heads/master'
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/amd64
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:latest
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-          outputs: type=image,push=true
-
-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Build release and export
-        id: build_rel
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/amd64
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-          outputs: type=image,push=true
-
-      - name: Save digest
-        if: github.ref == 'refs/heads/master'
-        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-
-      - name: Save release digest
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: digest_amd64
-          path: /tmp/digest.txt
-
-  x86_build:
-    name: Build x86 Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and export
-        id: build
-        if: github.ref == 'refs/heads/master'
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/386
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:latest
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-          outputs: type=image,push=true
-
-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Build release and export
-        id: build_rel
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/386
-          context: scripts/
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
-          outputs: type=image,push=true
-
-      - name: Save digest
-        if: github.ref == 'refs/heads/master'
-        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-
-      - name: Save release digest
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: digest_386
-          path: /tmp/digest.txt
-
-  armv7_build:
-    name: Build ARMv7 Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and export
-        id: build
-        if: github.ref == 'refs/heads/master'
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/arm/v7
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:latest
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-            THREADS=4
-          outputs: type=image,push=true
-
-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Build release and export
-        id: build_rel
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/arm/v7
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-            THREADS=4
-          outputs: type=image,push=true
-
-      - name: Save digest
-        if: github.ref == 'refs/heads/master'
-        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-
-      - name: Save release digest
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: digest_armv7
-          path: /tmp/digest.txt
-
-  arm64_build:
-    name: Build ARM64 Image
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout base
-        uses: actions/checkout@v3
-        with:
-          fetch-depth: 0
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Docker login
-        uses: docker/login-action@v2
-        with:
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_PASSWORD }}
-
-      - name: Get commit SHA
-        id: vars
-        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-
-      - name: Build and export
-        id: build
-        if: github.ref == 'refs/heads/master'
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/arm64
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:latest
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-            THREADS=4
-          outputs: type=image,push=true
-
-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Build release and export
-        id: build_rel
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: docker/build-push-action@v3
-        with:
-          platforms: linux/arm64
-          context: scripts/
-          tags: asdlokj1qpi23/subconverter:${{steps.version.outputs.result}}
-          build-args: |
-            SHA=${{ steps.vars.outputs.sha_short }}
-            THREADS=4
-          outputs: type=image,push=true
-
-      - name: Save digest
-        if: github.ref == 'refs/heads/master'
-        run: echo ${{ steps.build.outputs.digest }} > /tmp/digest.txt
-
-      - name: Save release digest
-        if: startsWith(github.ref, 'refs/tags/')
-        run: echo ${{ steps.build_rel.outputs.digest }} > /tmp/digest.txt
-
-      - name: Upload artifact
-        uses: actions/upload-artifact@v3
-        with:
-          name: digest_arm64
-          path: /tmp/digest.txt
-
  build:
-    name: Build
-    needs: [amd64_build, x86_build, armv7_build, arm64_build]
-#    needs: [amd64_build, x86_build]
-    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        include:
+          - platform: linux/amd64
+            os: ubuntu-latest
+          - platform: linux/386
+            os: ubuntu-latest
+          - platform: linux/arm/v7
+            os: ubuntu-latest
+          - platform: linux/arm64
+            os: ubuntu-latest
+    runs-on: ${{ matrix.os }}
+    name: Build ${{ matrix.platform }} Image
    steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV    
+
      - name: Checkout base
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
        with:
          fetch-depth: 0
-
-      # https://github.com/docker/setup-qemu-action
      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
+        uses: docker/setup-qemu-action@v3

-      # https://github.com/docker/setup-buildx-action
      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-        with:
-          config-inline: |
-            [worker.oci]
-              max-parallelism = 1
+        uses: docker/setup-buildx-action@v3

-      - name: Download artifact
-        uses: actions/download-artifact@v3
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
        with:
-          path: /tmp/images/
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=raw,value=latest,enable={{is_default_branch}}

      - name: Docker login
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
        with:
          username: ${{ secrets.DOCKER_USERNAME }}
          password: ${{ secrets.DOCKER_PASSWORD }}

-      - name: Replace tag without `v`
-        if: startsWith(github.ref, 'refs/tags/')
-        uses: actions/github-script@v6
-        id: version
-        with:
-          script: |
-            return context.payload.ref.replace(/\/?refs\/tags\/v/, '')
-          result-encoding: string
-
-      - name: Merge and push manifest on master branch
+      - name: Get commit SHA
        if: github.ref == 'refs/heads/master'
-        run: python scripts/merge_manifest.py
+        id: vars
+        run: echo "sha_short=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT

-      - name: Merge and push manifest on release
-        if: startsWith(github.ref, 'refs/tags/')
-        run: python scripts/merge_manifest.py ${{steps.version.outputs.result}}
+      - name: Build and export
+        id: build
+        uses: docker/build-push-action@v5
+        with:
+          platforms: ${{ matrix.platform }}
+          context: scripts/
+          labels: ${{ steps.meta.outputs.labels }}
+          build-args: |
+            SHA=${{ steps.vars.outputs.sha_short }}
+          outputs: type=image,name=${{ env.REGISTRY_IMAGE }},push-by-digest=true,name-canonical=true,push=true
+
+      - name: Export digest
+        run: |
+          rm -rf /tmp/digests
+          mkdir -p /tmp/digests
+          digest="${{ steps.build.outputs.digest }}"
+          touch "/tmp/digests/${digest#sha256:}"
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: digest-${{ env.PLATFORM_PAIR }}
+          path: /tmp/digests/*
+          if-no-files-found: error
+          retention-days: 1
+
+  merge:
+    name: Merge
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download digests
+        uses: actions/download-artifact@v4
+        with:
+          path: /tmp/digests
+          pattern: digest-*
+          merge-multiple: true
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Docker meta
+        id: meta
+        uses: docker/metadata-action@v5
+        with:
+          images: ${{ env.REGISTRY_IMAGE }}
+          tags: |
+            type=semver,pattern={{version}}
+            type=raw,value=latest,enable={{is_default_branch}}
+
+      - name: Docker login
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKER_PASSWORD }}
+
+      - name: Create manifest list and push
+        working-directory: /tmp/digests
+        run: |
+          docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \
+            $(printf '${{ env.REGISTRY_IMAGE }}@sha256:%s ' *)      
+
+      - name: Inspect image
+        run: |
+          docker buildx imagetools inspect ${{ env.REGISTRY_IMAGE }}:${{ steps.meta.outputs.version }}
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ services:
 | Surge 2                           |     ✓     |      ✓       | surge&ver=2    |
 | Surge 3                           |     ✓     |      ✓       | surge&ver=3    |
 | Surge 4                           |     ✓     |      ✓       | surge&ver=4    |
+| Surge 5                           |     ✓     |      ✓       | surge&ver=5    |
 | V2Ray                             |     ✓     |      ✓       | v2ray          |
 | Telegram-liked HTTP/Socks 5 links |     ✓     |      ×       | Only as source |
 | Singbox                           |     ✓      |      ✓       | singbox        |
--- a/scripts/rules_config.conf
+++ b/scripts/rules_config.conf
@@ -13,8 +13,8 @@ dest=base/config/
 keep_tree=false

 [DivineEngine]
-url=https://github.com/DivineEngine/Profiles
-checkout=f4d75f7d48a3f42129e030bef751d4d22bca02da
+url=https://github.com/asdlokj1qpi23/DivineEngine.git
+checkout=e5043a1cee1678254b424267bdcfccbcb574bad6
 match=Surge/Ruleset/**

 [NobyDa]
--- a/scripts/rules_config_bak.conf
+++ b/scripts/rules_config_bak.conf
@@ -0,0 +1,23 @@
+[ACL4SSR]
+name=ACL4SSR
+url=https://github.com/ACL4SSR/ACL4SSR
+checkout=1dc5c92b0c8ceaaecbc66530c309961f53e52c8c
+match=Clash/*.list|Clash/Ruleset/**
+
+[ACL4SSR_config]
+name=ACL4SSR
+url=https://github.com/ACL4SSR/ACL4SSR
+checkout=1dc5c92b0c8ceaaecbc66530c309961f53e52c8c
+match=Clash/config/**
+dest=base/config/
+keep_tree=false
+
+[DivineEngine]
+url=https://github.com/DivineEngine/Profiles
+checkout=f4d75f7d48a3f42129e030bef751d4d22bca02da
+match=Surge/Ruleset/**
+
+[NobyDa]
+url=https://github.com/NobyDa/Script
+checkout=ae4c12f23de8078e02c373c9969b19af28257fcb
+match=Surge/*.list
--- a/src/generator/config/subexport.cpp
+++ b/src/generator/config/subexport.cpp
@@ -236,9 +236,8 @@ proxyToClash(std::vector<Proxy> &nodes, YAML::Node &yamlnode, const ProxyGroupCo
        tribool tfo = ext.tfo;
        udp.define(x.UDP);
        xudp.define(x.XUDP);
-        scv.define(x.AllowInsecure);
+        scv = x.AllowInsecure;
        tfo.define(x.TCPFastOpen);
-
        singleproxy["name"] = x.Remark;
        singleproxy["server"] = x.Hostname;
        singleproxy["port"] = x.Port;
@@ -484,6 +483,8 @@ proxyToClash(std::vector<Proxy> &nodes, YAML::Node &yamlnode, const ProxyGroupCo
                    singleproxy["obfs"] = x.OBFSParam;
                if (!x.OBFSPassword.empty())
                    singleproxy["obfs-password"] = x.OBFSPassword;
+                if (!x.Ports.empty())
+                    singleproxy["ports"] = x.Ports;
                break;
            case ProxyType::VLESS:
                singleproxy["type"] = "vless";
@@ -1433,6 +1434,23 @@ void proxyToQuanX(std::vector<Proxy> &nodes, INIReader &ini, std::vector<Ruleset
                } else if (tlssecure)
                    proxyStr += ", obfs=over-tls, obfs-host=" + host;
                break;
+            case ProxyType::VLESS:
+                if (method == "auto")
+                    method = "chacha20-ietf-poly1305";
+                proxyStr = "vless = " + hostname + ":" + port + ", method=" + method + ", password=" + id;
+                if (x.AlterId != 0)
+                    proxyStr += ", aead=false";
+                if (tlssecure && !tls13.is_undef())
+                    proxyStr += ", tls13=" + std::string(tls13 ? "true" : "false");
+                if (transproto == "ws") {
+                    if (tlssecure)
+                        proxyStr += ", obfs=wss";
+                    else
+                        proxyStr += ", obfs=ws";
+                    proxyStr += ", obfs-host=" + host + ", obfs-uri=" + path;
+                } else if (tlssecure)
+                    proxyStr += ", obfs=over-tls, obfs-host=" + host;
+                break;
            case ProxyType::Shadowsocks:
                proxyStr = "shadowsocks = " + hostname + ":" + port + ", method=" + method + ", password=" + password;
                if (!plugin.empty()) {
@@ -1964,14 +1982,48 @@ proxyToLoon(std::vector<Proxy> &nodes, const std::string &base_conf, std::vector
                    proxy += ", keepalive=" + std::to_string(x.KeepAlive);
                proxy += ", peers=[{" + generatePeer(x, true) + "}]";
                break;
+            case ProxyType::Hysteria2:
+                proxy = "Hysteria2," + hostname + "," + port + ",\"" + password + "\"";
+                if(!x.ServerName.empty()){
+                    proxy += ",sni="+x.ServerName;
+                }
+                if(!x.UpMbps.empty()){
+                    std::string search = " Mbps";
+                    size_t pos = x.UpMbps.find(search);
+                    if (pos != std::string::npos) {
+                        x.UpMbps.replace(pos, search.length(), "");
+                    } else{
+                        search = "Mbps";
+                        pos = x.UpMbps.find(search);
+                        if (pos != std::string::npos) {
+                            x.UpMbps.replace(pos, search.length(), "");
+                        }
+                    }
+                    proxy += ",download-bandwidth="+x.UpMbps;
+                }else{
+                    proxy += ",download-bandwidth=100";
+                }
+                if (!scv.is_undef())
+                    proxy += ",skip-cert-verify=" + std::string(scv.get() ? "true" : "false");
+                break;
            default:
                continue;
        }

-        if (ext.tfo)
+        if (ext.tfo){
            proxy += ",fast-open=true";
-        if (ext.udp)
+        } else {
+            if (x.Type == ProxyType::Hysteria2){
+                proxy += ",fast-open=false";
+            }
+        }
+        if (ext.udp){
            proxy += ",udp=true";
+        } else {
+            if (x.Type == ProxyType::Hysteria2){
+                proxy += ",udp=true";
+            }
+        }


        if (ext.nodelist)
--- a/src/parser/subparser.cpp
+++ b/src/parser/subparser.cpp
@@ -223,7 +223,7 @@ void hysteria2Construct(Proxy &node, const std::string &group, const std::string
                        const std::string &port, const std::string &password, const std::string &host,
                        const std::string &up, const std::string &down, const std::string &alpn,
                        const std::string &obfsParam, const std::string &obfsPassword, const std::string &sni,
-                        const std::string &publicKey,
+                        const std::string &publicKey, const std::string &ports,
                        tribool udp, tribool tfo,
                        tribool scv) {
    commonConstruct(node, ProxyType::Hysteria2, group, remarks, add, port, udp, tfo, scv, tribool());
@@ -236,6 +236,7 @@ void hysteria2Construct(Proxy &node, const std::string &group, const std::string
    node.OBFSPassword = obfsPassword;
    node.ServerName = sni;
    node.PublicKey = publicKey;
+    node.Ports = ports;
 }

 void explodeVmess(std::string vmess, Proxy &node) {
@@ -1355,9 +1356,10 @@ void explodeClash(Node yamlnode, std::vector<Proxy> &nodes) {
                singleproxy["obfs-password"] >>= obfsPassword;
                singleproxy["sni"] >>= host;
                singleproxy["alpn"][0] >>= alpn;
+                singleproxy["ports"] >> ports;
                sni = host;
                hysteria2Construct(node, group, ps, server, port, password, host, up, down, alpn, obfsParam,
-                                   obfsPassword, sni, public_key, udp, tfo, scv);
+                                   obfsPassword, sni, public_key, ports, udp, tfo, scv);
                break;
            default:
                continue;
@@ -1445,7 +1447,7 @@ void explodeStdHysteria(std::string hysteria, Proxy &node) {
 }

 void explodeStdHysteria2(std::string hysteria2, Proxy &node) {
-    std::string add, port, password, host, insecure, up, down, alpn, obfsParam, obfsPassword, remarks, sni;
+    std::string add, port, password, host, insecure, up, down, alpn, obfsParam, obfsPassword, remarks, sni ,ports;
    std::string addition;
    tribool scv;
    hysteria2 = hysteria2.substr(12);
@@ -1486,11 +1488,12 @@ void explodeStdHysteria2(std::string hysteria2, Proxy &node) {
    obfsPassword = getUrlArg(addition, "obfs-password");
    host = getUrlArg(addition, "sni");
    sni = getUrlArg(addition, "sni");
+    ports = getUrlArg(addition, "ports");
    if (remarks.empty())
        remarks = add + ":" + port;

    hysteria2Construct(node, HYSTERIA2_DEFAULT_GROUP, remarks, add, port, password, host, up, down, alpn, obfsParam,
-                       obfsPassword, host, "", tribool(), tribool(), scv);
+                       obfsPassword, host, "", ports, tribool(), tribool(), scv);
    return;
 }

@@ -2236,6 +2239,73 @@ bool explodeSurge(std::string surge, std::vector<Proxy> &nodes) {
                        vmessConstruct(node, V2RAY_DEFAULT_GROUP, remarks, server, port, "", id, aead, net, method,
                                       path, host, "", tls, "", udp, tfo, scv, tls13);
                        break;
+                    case "vless"_hash: //quantumult x style vless link
+                        server = trim(configs[0].substr(0, configs[0].rfind(":")));
+                        port = trim(configs[0].substr(configs[0].rfind(":") + 1));
+                        if (port == "0")
+                            continue;
+                        net = "tcp";
+
+                        for (i = 1; i < configs.size(); i++) {
+                            vArray = split(trim(configs[i]), "=");
+                            if (vArray.size() != 2)
+                                continue;
+                            itemName = trim(vArray[0]);
+                            itemVal = trim(vArray[1]);
+                            switch (hash_(itemName)) {
+                                case "method"_hash:
+                                    method = itemVal;
+                                    break;
+                                case "password"_hash:
+                                    id = itemVal;
+                                    break;
+                                case "tag"_hash:
+                                    remarks = itemVal;
+                                    break;
+                                case "obfs"_hash:
+                                    switch (hash_(itemVal)) {
+                                        case "ws"_hash:
+                                            net = "ws";
+                                            break;
+                                        case "over-tls"_hash:
+                                            tls = "tls";
+                                            break;
+                                        case "wss"_hash:
+                                            net = "ws";
+                                            tls = "tls";
+                                            break;
+                                    }
+                                    break;
+                                case "obfs-host"_hash:
+                                    host = itemVal;
+                                    break;
+                                case "obfs-uri"_hash:
+                                    path = itemVal;
+                                    break;
+                                case "over-tls"_hash:
+                                    tls = itemVal == "true" ? "tls" : "";
+                                    break;
+                                case "udp-relay"_hash:
+                                    udp = itemVal;
+                                    break;
+                                case "fast-open"_hash:
+                                    tfo = itemVal;
+                                    break;
+                                case "tls13"_hash:
+                                    tls13 = itemVal;
+                                    break;
+                                case "aead"_hash:
+                                    aead = itemVal == "true" ? "0" : "1";
+                                default:
+                                    continue;
+                            }
+                        }
+                        if (remarks.empty())
+                            remarks = server + ":" + port;
+                        vlessConstruct(node, XRAY_DEFAULT_GROUP, remarks, server, port, "", id, aead, net, method,
+                                       "chrome", "", path, host, "",
+                                       tls, "", "", fp, sni, udp, tfo, scv, tls13);
+                        break;
                    case "trojan"_hash: //quantumult x style trojan link
                        server = trim(configs[0].substr(0, configs[0].rfind(':')));
                        port = trim(configs[0].substr(configs[0].rfind(':') + 1));
@@ -2690,7 +2760,7 @@ void explodeSingbox(rapidjson::Value &outbounds, std::vector<Proxy> &nodes) {
                            obfsPassword = GetMember(obfsOpt, "password");
                        }
                        hysteria2Construct(node, group, ps, server, port, password, host, up, down, alpn, obfsParam,
-                                           obfsPassword, sni,public_key, udp, tfo, scv);
+                                           obfsPassword, sni, public_key, "", udp, tfo, scv);
                        break;
                    default:
                        continue;
--- a/src/parser/subparser.h
+++ b/src/parser/subparser.h
@@ -31,7 +31,7 @@ void hysteria2Construct(Proxy &node, const std::string &group, const std::string
                        const std::string &port, const std::string &password, const std::string &host,
                        const std::string &up, const std::string &down, const std::string &alpn,
                        const std::string &obfsParam, const std::string &obfsPassword, const std::string &sni,
-                        const std::string &publicKey,
+                        const std::string &publicKey, const std::string &ports,
                        tribool udp, tribool tfo,
                        tribool scv);

--- a/src/version.h
+++ b/src/version.h
@@ -1,6 +1,6 @@
 #ifndef VERSION_H_INCLUDED
 #define VERSION_H_INCLUDED

-#define VERSION "v0.9.3"
+#define VERSION "v0.9.5"

 #endif // VERSION_H_INCLUDED
Author	SHA1	Message	Date
asdlokj1qpi23	4d0ed9a105	v0.9.5	2024-06-27 15:16:27 +08:00
asdlokj1qpi23	63eee92062	Edit docs.	2024-06-25 16:38:43 +08:00
asdlokj1qpi23	b9b864cf51	Hy2 supports obtaining port hopping parameters from a link.	2024-06-19 14:56:59 +08:00
asdlokj1qpi23	bdd6bbf67a	Fix Issue.Add default value.(#22 )	2024-06-19 10:41:55 +08:00
asdlokj1qpi23	8a18d3564b	Fix Issue.(#22 )	2024-06-17 11:28:12 +08:00
asdlokj1qpi23	2ee7c3aa04	Fix Actions Issue.(#22 )	2024-06-14 09:30:37 +08:00
asdlokj1qpi23	598f6ac414	Fix Bug.(#22 )	2024-06-13 17:30:34 +08:00
asdlokj1qpi23	6c296bfbf2	Add Hy2 for Loon.(#22 )	2024-06-13 17:29:22 +08:00
asdlokj1qpi23	43fc751a2d	fix bugs.(#16 )	2024-05-22 09:41:37 +08:00
asdlokj1qpi23	99c1ef8b1a	Support vless for quanx.(#16 )	2024-05-17 09:59:48 +08:00
asdlokj1qpi23	53b561bce7	Fix github actions.	2024-05-09 16:50:20 +08:00
asdlokj1qpi23	469feaf0f5	Fix github actions.	2024-05-09 16:34:20 +08:00
asdlokj1qpi23	0895a16876	Fix the bug related to certificate validation in the Hysteria2 protocol.(#17 )	2024-05-09 15:34:06 +08:00
asdlokj1qpi23	a8292b1fc6	Add support for Hysteria2 ports.	2024-03-13 18:12:36 +08:00
asdlokj1qpi23	1ff018c47b	update docker actions	2024-03-13 10:23:15 +08:00