merge: PR #3 from feature/jsonsub-support

feature/jsonsub-support

Author: quyxishi

go.mod

@@ -39,7 +39,7 @@ require (
 	github.com/go-playground/validator/v10 v10.28.0 // indirect
 	github.com/goccy/go-json v0.10.5 // indirect
 	github.com/goccy/go-yaml v1.18.0 // indirect
-	github.com/gogf/gf/v2 v2.9.5 // indirect
+	github.com/gogf/gf/v2 v2.9.5
 	github.com/google/btree v1.1.2 // indirect
 	github.com/gorilla/websocket v1.5.3 // indirect
 	github.com/gvcgo/vpnparser v0.2.7

internal/api/v1/probe/handler.go

@@ -78,7 +78,17 @@ func (h *ProbeHandler) parseProbeParams(ctx *gin.Context) (out ProbeParams, ok b
 }
 
 func (h *ProbeHandler) parseXrayConf(ctx *gin.Context, params *ProbeParams) (out *core.Config, ok bool) {
-	config, err := serial.ParseURI(serial.CONFIG_BACKEND_XRAYCORE, params.Connection, &serial.ParseParams{EnableDebug: true})
+	var config string
+	var err error
+	switch params.Schema {
+	case "http://", "https://":
+		log.Println("[DEBUG] probe/handler: assuming that ctx is json subscription link")
+		config, err = serial.ParseSubscriptionURI(params.Connection, &serial.ParseSubParams{EnableDebug: true})
+	default:
+		log.Println("[DEBUG] probe/handler: assuming that ctx is direct vpn connection uri")
+		config, err = serial.ParseURI(serial.CONFIG_BACKEND_XRAYCORE, params.Connection, &serial.ParseParams{EnableDebug: true})
+	}
+
 	if err != nil {
 		ctx.String(http.StatusBadRequest, "Unable to parse uri-based config for xray-core due: %v", err)
 		return out, false

internal/serial/parse.go

@@ -1,9 +1,15 @@
 package serial
 
 import (
+	"cmp"
+	"fmt"
+	"io"
 	"log"
+	"net/http"
 	"net/url"
+	"time"
 
+	"github.com/gogf/gf/v2/encoding/gjson"
 	"github.com/quyxishi/whitebox/internal/serial/xray"
 
 	_ "github.com/xtls/xray-core/main/json"
@@ -50,3 +56,52 @@ func ParseURI(backend BackendType, uri string, params *ParseParams) (out string,
 
 	return out, nil
 }
+
+type ParseSubParams struct {
+	EnableDebug  bool // {"loglevel":"debug","access":"none","error":""}
+	FetchTimeout time.Duration
+}
+
+func ParseSubscriptionURI(json_sub_uri string, params *ParseSubParams) (out string, err error) {
+	cli := http.Client{Timeout: cmp.Or(params.FetchTimeout, 5*time.Second)}
+	resp, err := cli.Get(json_sub_uri)
+	if err != nil {
+		return "", fmt.Errorf("failed to fetch json subscription uri: %v", err)
+	}
+	if resp != nil {
+		defer func() {
+			if err := resp.Body.Close(); err != nil {
+				log.Printf("[ERROR] serial/parse: failed to close response.body instance: %v", err)
+			}
+		}()
+	}
+
+	outRaw, err := io.ReadAll(resp.Body)
+	if err != nil {
+		return "", fmt.Errorf("failed to read body from json subscription uri: %v", err)
+	}
+
+	if params.EnableDebug {
+		debugFields := []struct {
+			key string
+			val any
+		}{
+			{"log.loglevel", "debug"},
+			{"log.access", "none"},
+			{"log.error", ""},
+		}
+
+		j := gjson.New(outRaw)
+
+		for _, s := range debugFields {
+			if err := j.Set(s.key, s.val); err != nil {
+				return "", fmt.Errorf("failed to patch config with key '%s': %w", s.key, err)
+			}
+		}
+
+		outRaw = []byte(j.MustToJsonString())
+	}
+
+	out = string(outRaw)
+	return out, nil
+}

internal/serial/parse_test.go

@@ -38,6 +38,8 @@ const (
 	URI_SHADOWSOCKS_XHTTP_TLS       string = "ss://MjAyMi1ibGFrZTMtY2hhY2hhMjAtcG9seTEzMDU6SFJvWEFQRWh1M1BLQWk1bCtvWnR0MmxReDA3NUVVUktRWnpLa1BVeWlqWT0@1.2.3.4:443?type=xhttp&path=%2Fp&host=h&mode=auto&security=tls&fp=chrome&alpn=h2%2Chttp%2F1.1&ech=AF3%2BDQBZAAAgACD21HO7PNeZMft4mWQiZguw0MzGRrK2oNZjXe8gbTbfGQAkAAEAAQABAAIAAQADAAIAAQACAAIAAgADAAMAAQADAAIAAwADAApnb29nbGUuY29tAAA%3D&sni=google.com"
 
 	URI_WIREGUARD string = "wireguard://W0ludGVyZmFjZV0KUHJpdmF0ZUtleSA9IFNObk5ON0l4YzN0emxYS2FJNGY4NnEyOFYzbnhGS2YxcmNoYWt4bWdBbHM9CkFkZHJlc3MgPSAxMC4wLjAuMi8zMgpETlMgPSAxLjEuMS4xLCAxLjAuMC4xCk1UVSA9IDE0MjAKCiMgLTEKW1BlZXJdClB1YmxpY0tleSA9IHk2MTdkQ2dNM1g2bEtEanBkdDVhR2NBWmROWW5OT0FwMFMyanFUbGpmZzA9CkFsbG93ZWRJUHMgPSAwLjAuMC4wLzAsIDo6LzAKRW5kcG9pbnQgPSAxLjIuMy40OjI3Nzg5"
+
+	// URI_SUBJSON_VLESS string = "http://1.2.3.4:2096/json/l08vryrtn0gb07s4"
 )
 
 func xrayParseAndLoad(t *testing.T, uri string) {
@@ -167,3 +169,23 @@ func TestParseURI_ShadowsocksXhttpTls(t *testing.T) {
 func TestParseURI_Wireguard(t *testing.T) {
 	xrayParseAndLoad(t, URI_WIREGUARD)
 }
+
+// -- SUBJSON
+
+// func TestParseSubscriptionURI_Vless(t *testing.T) {
+// 	cfg, err := serial.ParseSubscriptionURI(URI_SUBJSON_VLESS, &serial.ParseSubParams{EnableDebug: true})
+// 	if err != nil {
+// 		t.Errorf("error occurred during parsing: %v", err)
+// 		return
+// 	}
+
+// 	t.Log(cfg)
+
+// 	_, err = core.LoadConfig("json", bytes.NewReader([]byte(cfg)))
+// 	if err != nil {
+// 		t.Errorf("unable to load xray config: %s", err.Error())
+// 		return
+// 	}
+
+// 	t.Log("successfully loaded uri-based parsed config into xray-core")
+// }