From 461ca9cbd5bb0e1407a49a940d69c789a86660dd Mon Sep 17 00:00:00 2001
From: Nova <mahdi.zrei@gmail.com>
Date: Fri, 5 Dec 2025 01:28:52 +0330
Subject: [PATCH] Directly import our fork for clash2sing

---
 core/server/go.mod    |  4 +---
 core/server/go.sum    |  4 ++--
 core/server/server.go | 14 +++++---------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/core/server/go.mod b/core/server/go.mod
index 8b8930c..adcdff7 100644
--- a/core/server/go.mod
+++ b/core/server/go.mod
@@ -15,7 +15,7 @@ require (
 	github.com/sagernet/sing-box v1.12.12
 	github.com/sagernet/sing-tun v0.7.3
 	github.com/spf13/cobra v1.10.1
-	github.com/xmdhs/clash2singbox v0.1.5-0.20251129070952-d3d41337d2c1
+	github.com/throneproj/clash2singbox v0.1.5-0.20251204215643-2a0d5666be7e
 	golang.org/x/sys v0.37.0
 	google.golang.org/protobuf v1.36.10
 	gopkg.in/yaml.v3 v3.0.1
@@ -25,8 +25,6 @@ replace github.com/sagernet/sing-box => github.com/throneproj/sing-box v1.11.16-
 
 replace github.com/sagernet/wireguard-go => github.com/throneproj/wireguard-go v0.0.1-beta.7.0.20250728063157-408bba78ad26
 
-replace github.com/xmdhs/clash2singbox => github.com/throneproj/clash2singbox v0.1.5-0.20251130124907-02ead6993794
-
 replace github.com/chai2010/protorpc => ../protorpc
 
 require (
diff --git a/core/server/go.sum b/core/server/go.sum
index b425de0..2f1ca30 100644
--- a/core/server/go.sum
+++ b/core/server/go.sum
@@ -216,8 +216,8 @@ github.com/tc-hib/winres v0.2.1 h1:YDE0FiP0VmtRaDn7+aaChp1KiF4owBiJa5l964l5ujA=
 github.com/tc-hib/winres v0.2.1/go.mod h1:C/JaNhH3KBvhNKVbvdlDWkbMDO9H4fKKDaN7/07SSuk=
 github.com/tevino/abool/v2 v2.1.0 h1:7w+Vf9f/5gmKT4m4qkayb33/92M+Um45F2BkHOR+L/c=
 github.com/tevino/abool/v2 v2.1.0/go.mod h1:+Lmlqk6bHDWHqN1cbxqhwEAwMPXgc8I1SDEamtseuXY=
-github.com/throneproj/clash2singbox v0.1.5-0.20251130124907-02ead6993794 h1:U0zcOKETHWz2N/V721V498cpRgHwm1EBrutxmRSAjjc=
-github.com/throneproj/clash2singbox v0.1.5-0.20251130124907-02ead6993794/go.mod h1:v5Kl3ZsY7KkoK7uY9oC56uEdXRp0upRxNEWX9Us8siA=
+github.com/throneproj/clash2singbox v0.1.5-0.20251204215643-2a0d5666be7e h1:/gc+y8oQeTVgbi5q3CRIx0A21fFnL7cCZB05su+AhL0=
+github.com/throneproj/clash2singbox v0.1.5-0.20251204215643-2a0d5666be7e/go.mod h1:3m4//Gs1k6NveUCrrRU6BSzOk4jy+nx3vKbSQJoZssQ=
 github.com/throneproj/sing-box v1.11.16-0.20251027170654-efe4b5f5b1e4 h1:tQumipJlxqgMXvbuOJR8qMU4HoM0qbcU6RPA0DeAV9M=
 github.com/throneproj/sing-box v1.11.16-0.20251027170654-efe4b5f5b1e4/go.mod h1:4hUwNgXeaqRWAuYxixxVBOEGRFIamyw12lrpx8hbZBc=
 github.com/throneproj/wireguard-go v0.0.1-beta.7.0.20250728063157-408bba78ad26 h1:bBzqh7xTshvPjTFz4URNj/xbPA/d0BOwUM2R83FEMGU=
diff --git a/core/server/server.go b/core/server/server.go
index 3e6baba..d59c877 100644
--- a/core/server/server.go
+++ b/core/server/server.go
@@ -7,32 +7,28 @@ import (
 	"Core/internal/process"
 	"Core/internal/sys"
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"github.com/google/shlex"
 	"github.com/sagernet/sing-box/adapter"
-	"github.com/sagernet/sing-box/common/settings"
 	"github.com/sagernet/sing-box/experimental/clashapi"
 	E "github.com/sagernet/sing/common/exceptions"
-	"github.com/sagernet/sing/common/metadata"
 	"github.com/sagernet/sing/service"
+	"github.com/throneproj/clash2singbox/convert"
+	"github.com/throneproj/clash2singbox/model"
+	"github.com/throneproj/clash2singbox/model/clash"
+	"gopkg.in/yaml.v3"
 	"log"
 	"os"
 	"runtime"
 	"strings"
 	"time"
-	"encoding/json"
-	"github.com/xmdhs/clash2singbox/convert"
-	"github.com/xmdhs/clash2singbox/model"
-	"github.com/xmdhs/clash2singbox/model/clash"
-	"gopkg.in/yaml.v3"
 )
 
 var boxInstance *boxbox.Box
 var extraProcess *process.Process
 var needUnsetDNS bool
-var systemProxyController settings.SystemProxy
-var systemProxyAddr metadata.Socksaddr
 var instanceCancel context.CancelFunc
 var debug bool