Clean up outline-fetch

Jigsaw-Code · Oct 14, 2023 · 11b8cea · 11b8cea
1 parent b0f7b4f
commit 11b8cea
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 5 deletions.
diff --git a/x/examples/outline-fetch/README.md → x/examples/fetch/README.md b/x/examples/outline-fetch/README.md → x/examples/fetch/README.md
@@ -5,7 +5,7 @@ This app illustrates how to use different transports to fetch a URL in Go.
 Direct fetch:
 
 ```sh
-$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest https://ipinfo.io
+$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/fetch@latest https://ipinfo.io
 {
   ...
   "city": "Amsterdam",
@@ -18,7 +18,7 @@ $ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest http
 Using a Shadowsocks server:
 
 ```sh
-$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest -transport ss://[redacted]@[redacted]:80 https://ipinfo.io
+$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/fetch@latest -transport ss://[redacted]@[redacted]:80 https://ipinfo.io
 {
   ...
   "region": "New Jersey",
@@ -31,7 +31,7 @@ $ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest -tra
 Using a SOCKS5 server:
 
 ```sh
-$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest -transport socks5://[redacted]:5703 https://ipinfo.io
+$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/fetch@latest -transport socks5://[redacted]:5703 https://ipinfo.io
 {
   ... 
   "city": "Berlin",
@@ -44,7 +44,7 @@ $ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest -tra
 Using packet splitting:
 
 ```sh
-$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/outline-fetch@latest -transport split:3  https://ipinfo.io
+$ go run github.com/Jigsaw-Code/outline-sdk/x/examples/fetch@latest -transport split:3  https://ipinfo.io
 {
   ...
   "city": "Amsterdam",

diff --git a/x/examples/outline-fetch/main.go → x/examples/fetch/main.go b/x/examples/outline-fetch/main.go → x/examples/fetch/main.go
@@ -23,18 +23,36 @@ import (
 	"net"
 	"net/http"
 	"os"
+	"path"
 	"strings"
 
 	"github.com/Jigsaw-Code/outline-sdk/x/config"
 )
 
+var debugLog log.Logger = *log.New(io.Discard, "", 0)
+
+func init() {
+	flag.Usage = func() {
+		fmt.Fprintf(flag.CommandLine.Output(), "Usage: %s [flags...] <url>\n", path.Base(os.Args[0]))
+		flag.PrintDefaults()
+	}
+}
+
 func main() {
+	verboseFlag := flag.Bool("v", false, "Enable debug output")
 	transportFlag := flag.String("transport", "", "Transport config")
+
 	flag.Parse()
 
+	if *verboseFlag {
+		debugLog = *log.New(os.Stderr, "[DEBUG] ", log.LstdFlags|log.Lmicroseconds|log.Lshortfile)
+	}
+
 	url := flag.Arg(0)
 	if url == "" {
-		log.Fatal("Need to pass the URL to fetch in the command-line")
+		log.Print("Need to pass the URL to fetch in the command-line")
+		flag.Usage()
+		os.Exit(1)
 	}
 
 	dialer, err := config.NewStreamDialer(*transportFlag)
@@ -55,6 +73,12 @@ func main() {
 	}
 	defer resp.Body.Close()
 
+	if *verboseFlag {
+		for k, v := range resp.Header {
+			debugLog.Printf("%v: %v", k, v)
+		}
+	}
+
 	_, err = io.Copy(os.Stdout, resp.Body)
 	if err != nil {
 		log.Fatalf("Read of page body failed: %v", err)