From 2d5bb586ecb014e60456322396819f8997943cbf Mon Sep 17 00:00:00 2001
From: problematicconsumer <problematicconsumer@protonmail.com>
Date: Fri, 19 Jan 2024 17:55:58 +0330
Subject: [PATCH] Change builder

---
 config/config.go | 20 +++++++++++++-------
 custom/custom.go | 12 +++++++++---
 2 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/config/config.go b/config/config.go
index 72ee15f..96704c7 100644
--- a/config/config.go
+++ b/config/config.go
@@ -15,12 +15,15 @@ import (
 )
 
 func BuildConfigJson(configOpt ConfigOptions, input option.Options) (string, error) {
-	options := BuildConfig(configOpt, input)
+	options, err := BuildConfig(configOpt, input)
+	if err != nil {
+		return "", err
+	}
 	var buffer bytes.Buffer
 	json.NewEncoder(&buffer)
 	encoder := json.NewEncoder(&buffer)
 	encoder.SetIndent("", "  ")
-	err := encoder.Encode(options)
+	err = encoder.Encode(options)
 	if err != nil {
 		return "", err
 	}
@@ -28,9 +31,9 @@ func BuildConfigJson(configOpt ConfigOptions, input option.Options) (string, err
 }
 
 // TODO include selectors
-func BuildConfig(configOpt ConfigOptions, input option.Options) option.Options {
+func BuildConfig(configOpt ConfigOptions, input option.Options) (*option.Options, error) {
 	if configOpt.ExecuteAsIs {
-		return applyOverrides(configOpt, input)
+		return applyOverrides(configOpt, input), nil
 	}
 
 	fmt.Printf("config options: %+v\n", configOpt)
@@ -326,6 +329,9 @@ func BuildConfig(configOpt ConfigOptions, input option.Options) option.Options {
 	var tags []string
 	for _, out := range input.Outbounds {
 		outbound, serverDomain, err := patchOutbound(out, configOpt)
+		if err != nil {
+			return nil, err
+		}
 		if err == nil {
 			if serverDomain != "" {
 				directDNSDomains = append(directDNSDomains, serverDomain)
@@ -395,10 +401,10 @@ func BuildConfig(configOpt ConfigOptions, input option.Options) option.Options {
 		options.DNS.Rules = append([]option.DNSRule{{Type: C.RuleTypeDefault, DefaultOptions: dnsRule}}, options.DNS.Rules...)
 	}
 
-	return options
+	return &options, nil
 }
 
-func applyOverrides(overrides ConfigOptions, options option.Options) option.Options {
+func applyOverrides(overrides ConfigOptions, options option.Options) *option.Options {
 	if overrides.EnableClashApi {
 		options.Experimental.ClashAPI = &option.ClashAPIOptions{
 			ExternalController: fmt.Sprintf("%s:%d", "127.0.0.1", overrides.ClashApiPort),
@@ -421,7 +427,7 @@ func applyOverrides(overrides ConfigOptions, options option.Options) option.Opti
 	}
 	options.Inbounds = inbounds
 
-	return options
+	return &options
 }
 
 func removeDuplicateStr(strSlice []string) []string {
diff --git a/custom/custom.go b/custom/custom.go
index 32c64d8..ba822a8 100644
--- a/custom/custom.go
+++ b/custom/custom.go
@@ -6,6 +6,7 @@ package main
 import "C"
 import (
 	"encoding/json"
+	"fmt"
 	"io"
 	"os"
 	"time"
@@ -15,6 +16,7 @@ import (
 	"github.com/hiddify/libcore/config"
 	"github.com/sagernet/sing-box/experimental/libbox"
 	"github.com/sagernet/sing-box/log"
+	"github.com/sagernet/sing-box/option"
 )
 
 var box *libbox.BoxService
@@ -144,16 +146,20 @@ func startService(delayStart bool) error {
 	if err != nil {
 		return stopAndAlert(EmptyConfiguration, err)
 	}
-	options = config.BuildConfig(*configOptions, options)
+	var patchedOptions *option.Options
+	patchedOptions, err = config.BuildConfig(*configOptions, options)
+	if err != nil {
+		return fmt.Errorf("error building config: %w", err)
+	}
 
-	config.SaveCurrentConfig(sWorkingPath, options)
+	config.SaveCurrentConfig(sWorkingPath, *patchedOptions)
 
 	err = startCommandServer(*logFactory)
 	if err != nil {
 		return stopAndAlert(StartCommandServer, err)
 	}
 
-	instance, err := NewService(options)
+	instance, err := NewService(*patchedOptions)
 	if err != nil {
 		return stopAndAlert(CreateService, err)
 	}