From 12d7e19f325a640d280eddef95bccee920d96b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Fri, 19 Aug 2022 15:42:29 +0800
Subject: [PATCH] Allow read config from stdin

---
 cmd/sing-box/cmd_check.go | 13 ++-----------
 cmd/sing-box/cmd_run.go   | 25 +++++++++++++++++++++----
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/cmd/sing-box/cmd_check.go b/cmd/sing-box/cmd_check.go
index 3a5193d6..e0bc3cae 100644
--- a/cmd/sing-box/cmd_check.go
+++ b/cmd/sing-box/cmd_check.go
@@ -2,13 +2,9 @@ package main
 
 import (
 	"context"
-	"os"
 
 	"github.com/sagernet/sing-box"
-	"github.com/sagernet/sing-box/common/json"
 	"github.com/sagernet/sing-box/log"
-	"github.com/sagernet/sing-box/option"
-	E "github.com/sagernet/sing/common/exceptions"
 
 	"github.com/spf13/cobra"
 )
@@ -30,14 +26,9 @@ func init() {
 }
 
 func check() error {
-	configContent, err := os.ReadFile(configPath)
+	options, err := readConfig()
 	if err != nil {
-		return E.Cause(err, "read config")
-	}
-	var options option.Options
-	err = json.Unmarshal(configContent, &options)
-	if err != nil {
-		return E.Cause(err, "decode config")
+		return err
 	}
 	ctx, cancel := context.WithCancel(context.Background())
 	_, err = box.New(ctx, options)
diff --git a/cmd/sing-box/cmd_run.go b/cmd/sing-box/cmd_run.go
index 8e3cff99..199ac423 100644
--- a/cmd/sing-box/cmd_run.go
+++ b/cmd/sing-box/cmd_run.go
@@ -2,6 +2,7 @@ package main
 
 import (
 	"context"
+	"io"
 	"net/http"
 	"os"
 	"os/signal"
@@ -32,15 +33,31 @@ func init() {
 	mainCommand.AddCommand(commandRun)
 }
 
-func run() error {
-	configContent, err := os.ReadFile(configPath)
+func readConfig() (option.Options, error) {
+	var (
+		configContent []byte
+		err           error
+	)
+	if configPath == "stdin" {
+		configContent, err = io.ReadAll(os.Stdin)
+	} else {
+		configContent, err = os.ReadFile(configPath)
+	}
 	if err != nil {
-		return E.Cause(err, "read config")
+		return option.Options{}, E.Cause(err, "read config")
 	}
 	var options option.Options
 	err = json.Unmarshal(configContent, &options)
 	if err != nil {
-		return E.Cause(err, "decode config")
+		return option.Options{}, E.Cause(err, "decode config")
+	}
+	return options, nil
+}
+
+func run() error {
+	options, err := readConfig()
+	if err != nil {
+		return err
 	}
 	if disableColor {
 		if options.Log == nil {