allow multiple docker providers, added file provider support

.gitignore

@@ -1,5 +1,7 @@
 compose.yml
 go-proxy.yml
+config.yml
+providers.yml
 bin/go-proxy.bak
 logs/
 log/

Dockerfile

@@ -6,6 +6,7 @@ RUN apk add --no-cache bash tzdata
 RUN mkdir /app
 COPY bin/go-proxy entrypoint.sh /app/
 COPY templates/ /app/templates
+COPY config.default.yml /app/config.yml
 
 RUN chmod +x /app/go-proxy /app/entrypoint.sh
 ENV DOCKER_HOST unix:///var/run/docker.sock

README.md

@@ -22,6 +22,9 @@ In the examples domain `x.y.z` is used, replace them with your domain
 
 ## Features
 
+- auto detect reverse proxies from docker
+- additional reverse proxies from provider yaml file
+- allow multiple docker / file providers by custom `config.yml` file
 - subdomain matching **(domain name doesn't matter)**
 - path matching
 - HTTP proxy
@@ -39,13 +42,13 @@ In the examples domain `x.y.z` is used, replace them with your domain
 
 ## How to use
 
-1. Clone the repo git clone `https://github.com/yusing/go-proxy`
+1. Download and extract the latest release
 
 2. Copy content from [compose.example.yml](compose.example.yml) and create your own `compose.yml`
 
 3. Add networks to make sure it is in the same network with other containers, or make sure `proxy.<alias>.host` is reachable
 
-4. Modify the path to your SSL certs. See [Getting SSL Certs](#getting-ssl-certs)
+4. (Optional) Mount your SSL certs. See [Getting SSL Certs](#getting-ssl-certs)
 
 5. Start `go-proxy` with `docker compose up -d` or `make up`.
 

compose.example.yml

@@ -3,28 +3,45 @@ services:
   app:
     build: .
     container_name: go-proxy
-    hostname: go-proxy # set hostname to prevent adding itself to proxy list
     restart: always
     networks: # ^also add here
       - default
-    environment:
+    # environment:
-      - VERBOSITY=1 # LOG LEVEL (optional, defaults to 1)
+      # - VERBOSITY=1 # LOG LEVEL (optional, defaults to 1)
-      - DEBUG=1 # (optional enable only for debug)
+      # - DEBUG=1 # (optional, enable only for debug)
     ports:
       - 80:80 # http
-      - 443:443 # https
+      # - 443:443 # optional, https
-      - 8443:8443 # panel
+      - 8080:8080 # http panel
-      - 20000:20100/tcp # tcp (optional, if you have proxy.<app>.scheme == tcp)
+      # - 8443:8443 # optional, https panel
-      - 20000:20100/udp # tcp (optional, if you have proxy.<app>.scheme == udp)
+
+      # optional, if you declared any tcp/udp proxy, set a range you want to use
+      # - 20000:20100/tcp
+      # - 20000:20100/udp
     volumes:
-      - /path/to/cert.pem:/certs/cert.crt:ro
+      # if you want https
-      - /path/to/privkey.pem:/certs/priv.key:ro
+      # - /path/to/cert.pem:/app/certs/cert.crt:ro
-      - ./log:/app/log # path to logs
+      # - /path/to/privkey.pem:/app/certs/priv.key:ro
+
+      # path to logs
+      - ./log:/app/log
+
+      # if you use default config, or declared local docker provider
+      # otherwise comment this line
       - /var/run/docker.sock:/var/run/docker.sock:ro
+
+      # to use custom config
+      # - path/to/config.yml:/app/config.yml
+
+      # mount file provider yaml files
+      # - path/to/provider1.yml:/app/provider1.yml
+      # - path/to/provider2.yml:/app/provider2.yml
+      # etc.
     dns:
       - 127.0.0.1 # workaround for "lookup: no such host"
     extra_hosts:
-      - host.docker.internal:host-gateway # required if you have containers in `host` network_mode
+      # required if you use local docker provider and have containers in `host` network_mode
+      - host.docker.internal:host-gateway
     logging:
       driver: 'json-file'
       options:

config.default.yml

@@ -0,0 +1,10 @@
+providers:
+  local:
+    kind: docker
+    value: FROM_ENV
+  # provider1:
+  #   kind: file
+  #   value: provider1.yml
+  # provider2:
+  #   kind: file
+  #   value: provider2.yml

entrypoint.sh

@@ -8,8 +8,8 @@ if [ -z "$VERBOSITY" ]; then
 fi
 echo "starting with verbosity $VERBOSITY" > log/go-proxy.log
 if [ "$DEBUG" == "1" ]; then
-    /app/go-proxy -v=$VERBOSITY -log_dir=log --stderrthreshold=0 2>> log/go-proxy.log &
+    /app/go-proxy -v=$VERBOSITY --log_dir=log --stderrthreshold=0 2>> log/go-proxy.log &
     tail -f /dev/null
 else
-    /app/go-proxy -v=$VERBOSITY -log_dir=log --stderrthreshold=0 2>> log/go-proxy.log
+    /app/go-proxy -v=$VERBOSITY --logtostderr=1
 fi

go.mod

@@ -2,24 +2,17 @@ module github.com/yusing/go-proxy
 
 go 1.21.7
 
-require github.com/docker/docker v25.0.4+incompatible
-
-require github.com/golang/glog v1.2.0
-
 require (
-	github.com/containerd/log v0.1.0 // indirect
+	github.com/docker/docker v25.0.4+incompatible
-	github.com/moby/term v0.5.0 // indirect
+	github.com/fsnotify/fsnotify v1.7.0
-	github.com/morikuni/aec v1.0.0 // indirect
+	github.com/golang/glog v1.2.0
-	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
+	golang.org/x/net v0.22.0
-	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1
-	golang.org/x/mod v0.16.0 // indirect
-	golang.org/x/time v0.5.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
-	gotest.tools/v3 v3.5.1 // indirect
 )
 
 require (
 	github.com/Microsoft/go-winio v0.6.1 // indirect
+	github.com/containerd/log v0.1.0 // indirect
 	github.com/distribution/reference v0.5.0 // indirect
 	github.com/docker/go-connections v0.5.0 // indirect
 	github.com/docker/go-units v0.5.0 // indirect
@@ -27,13 +20,20 @@ require (
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
+	github.com/moby/term v0.5.0 // indirect
+	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/opencontainers/go-digest v1.0.0 // indirect
 	github.com/opencontainers/image-spec v1.1.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.49.0 // indirect
 	go.opentelemetry.io/otel v1.24.0 // indirect
+	go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.24.0 // indirect
 	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	go.opentelemetry.io/otel/sdk v1.24.0 // indirect
 	go.opentelemetry.io/otel/trace v1.24.0 // indirect
-	golang.org/x/net v0.22.0
+	golang.org/x/mod v0.16.0 // indirect
 	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/time v0.5.0 // indirect
+	golang.org/x/tools v0.19.0 // indirect
+	gotest.tools/v3 v3.5.1 // indirect
 )

go.sum

@@ -1,5 +1,7 @@
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 h1:UQHMgLO+TxOElx5B5HZ4hJQsoJ/PvUvKRhJHDQXO8P8=
 github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1/go.mod h1:xomTg63KZ2rFqZQzSB4Vz2SUXa1BpHTVz9L5PTmPC4E=
+github.com/Microsoft/go-winio v0.4.14 h1:+hMXMk01us9KgxGb7ftKQt2Xpf5hH/yky+TDA+qxleU=
+github.com/Microsoft/go-winio v0.4.14/go.mod h1:qXqCSQ3Xa7+6tgxaGTIe4Kpcdsi+P8jBhyzoq1bpyYA=
 github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
 github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
 github.com/cenkalti/backoff/v4 v4.2.1 h1:y4OZtCnogmCPw98Zjyt5a6+QwPLGkiQsYW5oUqylYbM=
@@ -10,8 +12,6 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
 github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
-github.com/docker/docker v25.0.3+incompatible h1:D5fy/lYmY7bvZa0XTZ5/UJPljor41F+vdyJG5luQLfQ=
-github.com/docker/docker v25.0.3+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/docker v25.0.4+incompatible h1:XITZTrq+52tZyZxUOtFIahUf3aH367FLxJzt9vZeAF8=
 github.com/docker/docker v25.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
 github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
@@ -20,6 +20,8 @@ github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4
 github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
 github.com/felixge/httpsnoop v1.0.4 h1:NFTV2Zj1bL4mc9sqWACXbQFVBBg2W3GPvqp8/ESS2Wg=
 github.com/felixge/httpsnoop v1.0.4/go.mod h1:m8KPJKqk1gH5J9DgRY2ASl2lWCfGKXixSwevea8zH2U=
+github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
+github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
 github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
 github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
@@ -37,6 +39,7 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0 h1:Wqo399gCIufwto+VfwCSvsnfGpF
 github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.0/go.mod h1:qmOFXW2epJhM0qSnUUYpldc7gVz2KMQwJ/QYCDIa7XU=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
+github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -45,12 +48,16 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8
 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
 github.com/opencontainers/image-spec v1.1.0 h1:8SG7/vwALn54lVB/0yZ/MMwhFrPYtpEHQb2IpWsCzug=
 github.com/opencontainers/image-spec v1.1.0/go.mod h1:W4s4sFTMaBeK1BQLXbG4AdM2szdn85PY75RI83NrTrM=
+github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
+github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
@@ -87,10 +94,10 @@ golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
 golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
@@ -118,6 +125,8 @@ google.golang.org/grpc v1.61.1 h1:kLAiWrZs7YeDM6MumDe7m3y4aM6wacLzM1Y/wiLP9XY=
 google.golang.org/grpc v1.61.1/go.mod h1:VUbo7IFqmF1QtCAstipjG0GIoq49KvMe9+h1jFLBNJs=
 google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I=
 google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gotest.tools/v3 v3.5.1 h1:EENdUnS3pdur5nybKYIh2Vfgc8IUNBjxDPSjtiJcOzU=

providers.example.yml

@@ -0,0 +1,11 @@
+app: # alias
+  # optional
+  scheme: http
+  # required, proxy target
+  host: 10.0.0.1
+  # optional
+  port: 80
+  # optional, defaults to empty
+  path:
+  # optional
+  path_mode:

src/go-proxy/config.go

@@ -0,0 +1,74 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/fsnotify/fsnotify"
+	"github.com/golang/glog"
+	"gopkg.in/yaml.v3"
+)
+
+type Config struct {
+	Providers map[string]*Provider `yaml:",flow"`
+}
+
+var config *Config
+
+func ReadConfig() (*Config, error) {
+	config := Config{}
+	data, err := os.ReadFile(configPath)
+
+	if err != nil {
+		return nil, fmt.Errorf("unable to read config file: %v", err)
+	}
+
+	err = yaml.Unmarshal(data, &config)
+
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse config file: %v", err)
+	}
+
+	for name, p := range config.Providers {
+		p.name = name
+	}
+
+	return &config, nil
+}
+
+func ListenConfigChanges() {
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		glog.Errorf("[Config] unable to create file watcher: %v", err)
+	}
+	defer watcher.Close()
+
+	if err = watcher.Add(configPath); err != nil {
+		glog.Errorf("[Config] unable to watch file: %v", err)
+		return
+	}
+
+	for {
+		select {
+		case event, ok := <-watcher.Events:
+			if !ok {
+				return
+			}
+			switch {
+			case event.Has(fsnotify.Write):
+				glog.Infof("[Config] file change detected")
+				for _, p := range config.Providers {
+					p.StopAllRoutes()
+				}
+				config, err = ReadConfig()
+				if err != nil {
+					glog.Fatalf("[Config] unable to read config: %v", err)
+				}
+			case event.Has(fsnotify.Remove), event.Has(fsnotify.Rename):
+				glog.Fatalf("[Config] file renamed / deleted")
+			}
+		case err := <-watcher.Errors:
+			glog.Errorf("[Config] File watcher error: %s", err)
+		}
+	}
+}

src/go-proxy/constants.go

@@ -34,14 +34,14 @@ var (
 )
 
 var (
-	StreamSchemes = []string{TCPStreamType, UDPStreamType} // TODO: support "tcp:udp", "udp:tcp"
+	StreamSchemes = []string{StreamType_TCP, StreamType_UDP} // TODO: support "tcp:udp", "udp:tcp"
 	HTTPSchemes   = []string{"http", "https"}
 	ValidSchemes  = append(StreamSchemes, HTTPSchemes...)
 )
 
 const (
-	UDPStreamType = "udp"
+	StreamType_UDP = "udp"
-	TCPStreamType = "tcp"
+	StreamType_TCP = "tcp"
 )
 
 const (
@@ -50,8 +50,20 @@ const (
 	ProxyPathMode_RemovedPath = ""
 )
 
+const (
+	ProviderKind_Docker = "docker"
+	ProviderKind_File   = "file"
+)
+
+const (
+	certPath = "certs/cert.crt"
+	keyPath  = "certs/priv.key"
+)
+
+const configPath = "config.yml"
+
 const StreamStopListenTimeout = 1 * time.Second
 
-const templateFile = "/app/templates/panel.html"
+const templateFile = "templates/panel.html"
 
 const udpBufferSize = 1500

src/go-proxy/docker_provider.go

@@ -2,25 +2,21 @@ package main
 
 import (
 	"fmt"
-	"os"
 	"reflect"
 	"sort"
 	"strings"
-	"sync"
 
 	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/filters"
 	"github.com/docker/docker/client"
-	"github.com/golang/glog"
 	"golang.org/x/net/context"
 )
 
-var dockerClient *client.Client
+func (p *Provider) getContainerProxyConfigs(container types.Container, clientHost string) []*ProxyConfig {
-var defaultHost = os.Getenv("DEFAULT_HOST")
-
-func buildContainerRoute(container types.Container) {
 	var aliases []string
-	var wg sync.WaitGroup
+
+	cfgs := make([]*ProxyConfig, 0)
 
 	container_name := strings.TrimPrefix(container.Names[0], "/")
 	aliases_label, ok := container.Labels["proxy.aliases"]
@@ -31,7 +27,7 @@ func buildContainerRoute(container types.Container) {
 	}
 
 	for _, alias := range aliases {
-		config := NewProxyConfig()
+		config := NewProxyConfig(p)
 		prefix := fmt.Sprintf("proxy.%s.", alias)
 		for label, value := range container.Labels {
 			if strings.HasPrefix(label, prefix) {
@@ -39,13 +35,13 @@ func buildContainerRoute(container types.Container) {
 				field = utils.snakeToCamel(field)
 				prop := reflect.ValueOf(&config).Elem().FieldByName(field)
 				if prop.Kind() == 0 {
-					glog.Infof("[Build] %s: ignoring unknown field %s", alias, field)
+					p.Logf("Build", "ignoring unknown field %s", alias, field)
 					continue
 				}
 				prop.Set(reflect.ValueOf(value))
 			}
 		}
-		if config.Port == "" && defaultHost != "" {
+		if config.Port == "" && clientHost != "" {
 			for _, port := range container.Ports {
 				config.Port = fmt.Sprintf("%d", port.PublicPort)
 				break
@@ -67,8 +63,7 @@ func buildContainerRoute(container types.Container) {
 		}
 		if config.Port == "" {
 			// no ports exposed or specified
-			glog.Infof("[Build] %s has no port exposed", alias)
+			continue
-			return
 		}
 		if config.Scheme == "" {
 			if strings.HasSuffix(config.Port, "443") {
@@ -88,13 +83,13 @@ func buildContainerRoute(container types.Container) {
 			}
 		}
 		if !isValidScheme(config.Scheme) {
-			glog.Infof("%s: unsupported scheme: %s, using http", container_name, config.Scheme)
+			p.Warningf("Build", "unsupported scheme: %s, using http", container_name, config.Scheme)
 			config.Scheme = "http"
 		}
 		if config.Host == "" {
 			switch {
-			case defaultHost != "":
+			case clientHost != "":
-				config.Host = defaultHost
+				config.Host = clientHost
 			case container.HostConfig.NetworkMode == "host":
 				config.Host = "host.docker.internal"
 			case config.LoadBalance == "true":
@@ -116,32 +111,79 @@ func buildContainerRoute(container types.Container) {
 			config.Host = container_name
 		}
 		config.Alias = alias
-		config.UpdateId()
 
-		wg.Add(1)
+		cfgs = append(cfgs, &config)
-		go func() {
-			CreateRoute(&config)
-			wg.Done()
-		}()
 	}
-	wg.Wait()
+	return cfgs
 }
 
-func buildRoutes() {
+func (p *Provider) getDockerProxyConfigs() ([]*ProxyConfig, error) {
-	InitRoutes()
+	var clientHost string
-	containerSlice, err := dockerClient.ContainerList(context.Background(), container.ListOptions{})
+	var opts []client.Opt
-	if err != nil {
+	var err error
-		glog.Fatal(err)
+
-	}
+	if p.Value == clientUrlFromEnv {
-	hostname, err := os.Hostname()
+		clientHost = ""
-	if err != nil {
+		opts = []client.Opt{
-		hostname = "go-proxy"
+			client.WithHostFromEnv(),
-	}
+			client.WithAPIVersionNegotiation(),
-	for _, container := range containerSlice {
+		}
-		if container.Names[0] == hostname { // skip self
+	} else {
-			glog.Infof("[Build] Skipping %s", container.Names[0])
+		url, err := client.ParseHostURL(p.Value)
-			continue
+		if err != nil {
+			return nil, fmt.Errorf("unable to parse docker host url: %v", err)
+		}
+		clientHost = url.Host
+		opts = []client.Opt{
+			client.WithHost(clientHost),
+			client.WithAPIVersionNegotiation(),
+		}
+	}
+
+	p.dockerClient, err = client.NewClientWithOpts(opts...)
+	if err != nil {
+		return nil, fmt.Errorf("unable to create docker client: %v", err)
+	}
+
+	containerSlice, err := p.dockerClient.ContainerList(context.Background(), container.ListOptions{})
+	if err != nil {
+		return nil, fmt.Errorf("unable to list containers: %v", err)
+	}
+
+	cfgs := make([]*ProxyConfig, 0)
+
+	for _, container := range containerSlice {
+		cfgs = append(cfgs, p.getContainerProxyConfigs(container, clientHost)...)
+	}
+
+	return cfgs, nil
+}
+
+func (p *Provider) grWatchDockerChanges() {
+	p.stopWatching = make(chan struct{})
+
+	filter := filters.NewArgs(
+		filters.Arg("type", "container"),
+		filters.Arg("event", "start"),
+		filters.Arg("event", "die"), // 'stop' already triggering 'die'
+	)
+	msgChan, errChan := p.dockerClient.Events(context.Background(), types.EventsOptions{Filters: filter})
+
+	for {
+		select {
+		case <-p.stopWatching:
+			return
+		case msg := <-msgChan:
+			// TODO: handle actor only
+			p.Logf("Event", "%s %s caused rebuild", msg.Action, msg.Actor.Attributes["name"])
+			p.StopAllRoutes()
+			p.BuildStartRoutes()
+		case err := <-errChan:
+			p.Logf("Event", "error %s", err)
+			msgChan, errChan = p.dockerClient.Events(context.Background(), types.EventsOptions{Filters: filter})
 		}
-		buildContainerRoute(container)
 	}
 }
+
+// var dockerUrlRegex = regexp.MustCompile(`^(?P<scheme>\w+)://(?P<host>[^:]+)(?P<port>:\d+)?(?P<path>/.*)?$`)
+const clientUrlFromEnv = "FROM_ENV"

src/go-proxy/file_provider.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"fmt"
+	"os"
+
+	"github.com/fsnotify/fsnotify"
+	"gopkg.in/yaml.v3"
+)
+
+func (p *Provider) getFileProxyConfigs() ([]*ProxyConfig, error) {
+	path := p.Value
+
+	if _, err := os.Stat(path); err == nil {
+		data, err := os.ReadFile(path)
+		if err != nil {
+			return nil, fmt.Errorf("unable to read config file %q: %v", path, err)
+		}
+		configMap := make(map[string]ProxyConfig, 0)
+		configs := make([]*ProxyConfig, 0)
+		err = yaml.Unmarshal(data, &configMap)
+		if err != nil {
+			return nil, fmt.Errorf("unable to parse config file %q: %v", path, err)
+		}
+
+		for alias, cfg := range configMap {
+			cfg.Alias = alias
+			err = cfg.SetDefault()
+			if err != nil {
+				return nil, err
+			}
+			configs = append(configs, &cfg)
+		}
+		return configs, nil
+	} else if !os.IsNotExist(err) {
+		return nil, fmt.Errorf("file not found: %s", path)
+	} else {
+		return nil, err
+	}
+}
+
+func (p *Provider) grWatchFileChanges() {
+	watcher, err := fsnotify.NewWatcher()
+	if err != nil {
+		p.Errorf("Watcher", "unable to create file watcher: %v", err)
+	}
+	defer watcher.Close()
+
+	if err = watcher.Add(p.Value); err != nil {
+		p.Errorf("Watcher", "unable to watch file %q: %v", p.Value, err)
+		return
+	}
+
+	for {
+		select {
+		case <-p.stopWatching:
+			return
+		case event, ok := <-watcher.Events:
+			if !ok {
+				return
+			}
+			switch {
+			case event.Has(fsnotify.Write):
+				p.Logf("Watcher", "file change detected", p.name)
+				p.StopAllRoutes()
+				p.BuildStartRoutes()
+			case event.Has(fsnotify.Remove), event.Has(fsnotify.Rename):
+				p.Logf("Watcher", "file renamed / deleted", p.name)
+				p.StopAllRoutes()
+			}
+		case err := <-watcher.Errors:
+			p.Errorf("Watcher", "File watcher error: %s", p.name, err)
+		}
+	}
+}

src/go-proxy/http_route.go

@@ -13,6 +13,7 @@ import (
 )
 
 type HTTPRoute struct {
+	Alias    string
 	Url      *url.URL
 	Path     string
 	PathMode string
@@ -31,7 +32,6 @@ func isValidProxyPathMode(mode string) bool {
 func NewHTTPRoute(config *ProxyConfig) (*HTTPRoute, error) {
 	url, err := url.Parse(fmt.Sprintf("%s://%s:%s", config.Scheme, config.Host, config.Port))
 	if err != nil {
-		glog.Infoln(err)
 		return nil, err
 	}
 
@@ -43,6 +43,7 @@ func NewHTTPRoute(config *ProxyConfig) (*HTTPRoute, error) {
 	}
 
 	route := &HTTPRoute{
+		Alias:    config.Alias,
 		Url:      url,
 		Path:     config.Path,
 		Proxy:    proxy,
@@ -158,6 +159,15 @@ func httpProxyHandler(w http.ResponseWriter, r *http.Request) {
 	route.Proxy.ServeHTTP(w, r)
 }
 
+func (r *HTTPRoute) RemoveFromRoutes() {
+	routes.HTTPRoutes.Delete(r.Alias)
+}
+
+// dummy implementation for Route interface
+func (r *HTTPRoute) SetupListen()   {}
+func (r *HTTPRoute) Listen()        {}
+func (r *HTTPRoute) StopListening() {}
+
 // TODO: default + per proxy
 var transport = &http.Transport{
 	Proxy: http.ProxyFromEnvironment,

src/go-proxy/main.go

@@ -4,54 +4,18 @@ import (
 	"flag"
 	"net/http"
 	"runtime"
+	"sync"
 	"time"
 
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/client"
 	"github.com/golang/glog"
-	"golang.org/x/net/context"
 )
 
 func main() {
 	var err error
+	var wg sync.WaitGroup
+
 	flag.Parse()
 	runtime.GOMAXPROCS(runtime.NumCPU())
-	time.Now().Zone()
-
-	dockerClient, err = client.NewClientWithOpts(client.FromEnv, client.WithAPIVersionNegotiation())
-	if err != nil {
-		glog.Fatal(err)
-	}
-
-	buildRoutes()
-	glog.Infof("[Build] built %v reverse proxies", CountRoutes())
-	BeginListenStreams()
-
-	go func() {
-		filter := filters.NewArgs(
-			filters.Arg("type", "container"),
-			filters.Arg("event", "start"),
-			filters.Arg("event", "die"), // stop seems like triggering die
-			// filters.Arg("event", "stop"),
-		)
-		msgChan, errChan := dockerClient.Events(context.Background(), types.EventsOptions{Filters: filter})
-
-		for {
-			select {
-			case msg := <-msgChan:
-				// TODO: handle actor only
-				glog.Infof("[Event] %s %s caused rebuild", msg.Action, msg.Actor.Attributes["name"])
-				EndListenStreams()
-				buildRoutes()
-				glog.Infof("[Build] rebuilt %v reverse proxies", CountRoutes())
-				BeginListenStreams()
-			case err := <-errChan:
-				glog.Infof("[Event] %s", err)
-				msgChan, errChan = dockerClient.Events(context.Background(), types.EventsOptions{Filters: filter})
-			}
-		}
-	}()
 
 	go func() {
 		for range time.Tick(100 * time.Millisecond) {
@@ -59,26 +23,61 @@ func main() {
 		}
 	}()
 
+	if config, err = ReadConfig(); err != nil {
+		glog.Fatal("unable to read config: ", err)
+	}
+
+	wg.Add(len(config.Providers))
+	for _, p := range config.Providers {
+		go func(p *Provider) {
+			p.BuildStartRoutes()
+			wg.Done()
+		}(p)
+	}
+	wg.Wait()
+
+	go ListenConfigChanges()
+
 	mux := http.NewServeMux()
 	mux.HandleFunc("/", httpProxyHandler)
 
+	var certAvailable = utils.fileOK(certPath) && utils.fileOK(keyPath)
+
 	go func() {
-		glog.Infoln("Starting HTTP server on port 80")
+		glog.Infoln("starting http server on port 80")
-		err := http.ListenAndServe(":80", http.HandlerFunc(redirectToTLS))
+		if certAvailable {
+			err = http.ListenAndServe(":80", http.HandlerFunc(redirectToTLS))
+		} else {
+			err = http.ListenAndServe(":80", mux)
+		}
 		if err != nil {
 			glog.Fatal("HTTP server error", err)
 		}
 	}()
 	go func() {
-		glog.Infoln("Starting HTTPS panel on port 8443")
+		glog.Infoln("starting http panel on port 8080")
-		err := http.ListenAndServeTLS(":8443", "/certs/cert.crt", "/certs/priv.key", http.HandlerFunc(panelHandler))
+		err := http.ListenAndServe(":8080", http.HandlerFunc(panelHandler))
 		if err != nil {
 			glog.Fatal("HTTP server error", err)
 		}
 	}()
-	glog.Infoln("Starting HTTPS server on port 443")
+
-	err = http.ListenAndServeTLS(":443", "/certs/cert.crt", "/certs/priv.key", mux)
+	if certAvailable {
-	if err != nil {
+		go func() {
-		glog.Fatal("HTTPS Server error: ", err)
+			glog.Infoln("starting https panel on port 8443")
+			err := http.ListenAndServeTLS(":8443", certPath, keyPath, http.HandlerFunc(panelHandler))
+			if err != nil {
+				glog.Fatal("http server error", err)
+			}
+		}()
+		go func() {
+			glog.Infoln("starting https server on port 443")
+			err = http.ListenAndServeTLS(":443", certPath, keyPath, mux)
+			if err != nil {
+				glog.Fatal("https server error: ", err)
+			}
+		}()
 	}
+
+	<-make(chan struct{})
 }

src/go-proxy/map.go

@@ -2,11 +2,19 @@ package main
 
 import "sync"
 
-type SafeMapInterface[KT comparable, VT interface{}] interface {
+type safeMap[KT comparable, VT interface{}] struct {
+	SafeMap[KT, VT]
+	m              map[KT]VT
+	mutex          sync.Mutex
+	defaultFactory func() VT
+}
+
+type SafeMap[KT comparable, VT interface{}] interface {
 	Set(key KT, value VT)
 	Ensure(key KT)
 	Get(key KT) VT
-	TryGet(key KT) (VT, bool)
+	UnsafeGet(key KT) (VT, bool)
+	Delete(key KT)
 	Clear()
 	Size() int
 	Contains(key KT) bool
@@ -14,32 +22,25 @@ type SafeMapInterface[KT comparable, VT interface{}] interface {
 	Iterator() map[KT]VT
 }
 
-type SafeMap[KT comparable, VT interface{}] struct {
+func NewSafeMap[KT comparable, VT interface{}](df ...func() VT) SafeMap[KT, VT] {
-	SafeMapInterface[KT, VT]
-	m              map[KT]VT
-	mutex          sync.Mutex
-	defaultFactory func() VT
-}
-
-func NewSafeMap[KT comparable, VT interface{}](df ...func() VT) *SafeMap[KT, VT] {
 	if len(df) == 0 {
-		return &SafeMap[KT, VT]{
+		return &safeMap[KT, VT]{
 			m: make(map[KT]VT),
 		}
 	}
-	return &SafeMap[KT, VT]{
+	return &safeMap[KT, VT]{
 		m:              make(map[KT]VT),
 		defaultFactory: df[0],
 	}
 }
 
-func (m *SafeMap[KT, VT]) Set(key KT, value VT) {
+func (m *safeMap[KT, VT]) Set(key KT, value VT) {
 	m.mutex.Lock()
 	m.m[key] = value
 	m.mutex.Unlock()
 }
 
-func (m *SafeMap[KT, VT]) Ensure(key KT) {
+func (m *safeMap[KT, VT]) Ensure(key KT) {
 	m.mutex.Lock()
 	if _, ok := m.m[key]; !ok {
 		m.m[key] = m.defaultFactory()
@@ -47,39 +48,45 @@ func (m *SafeMap[KT, VT]) Ensure(key KT) {
 	m.mutex.Unlock()
 }
 
-func (m *SafeMap[KT, VT]) Get(key KT) VT {
+func (m *safeMap[KT, VT]) Get(key KT) VT {
 	m.mutex.Lock()
 	value := m.m[key]
 	m.mutex.Unlock()
 	return value
 }
 
-func (m *SafeMap[KT, VT]) UnsafeGet(key KT) (VT, bool) {
+func (m *safeMap[KT, VT]) UnsafeGet(key KT) (VT, bool) {
 	value, ok := m.m[key]
 	return value, ok
 }
 
-func (m *SafeMap[KT, VT]) Clear() {
+func (m *safeMap[KT, VT]) Delete(key KT) {
+	m.mutex.Lock()
+	delete(m.m, key)
+	m.mutex.Unlock()
+}
+
+func (m *safeMap[KT, VT]) Clear() {
 	m.mutex.Lock()
 	m.m = make(map[KT]VT)
 	m.mutex.Unlock()
 }
 
-func (m *SafeMap[KT, VT]) Size() int {
+func (m *safeMap[KT, VT]) Size() int {
 	m.mutex.Lock()
 	size := len(m.m)
 	m.mutex.Unlock()
 	return size
 }
 
-func (m *SafeMap[KT, VT]) Contains(key KT) bool {
+func (m *safeMap[KT, VT]) Contains(key KT) bool {
 	m.mutex.Lock()
 	_, ok := m.m[key]
 	m.mutex.Unlock()
 	return ok
 }
 
-func (m *SafeMap[KT, VT]) ForEach(fn func(key KT, value VT)) {
+func (m *safeMap[KT, VT]) ForEach(fn func(key KT, value VT)) {
 	m.mutex.Lock()
 	for k, v := range m.m {
 		fn(k, v)
@@ -87,6 +94,6 @@ func (m *SafeMap[KT, VT]) ForEach(fn func(key KT, value VT)) {
 	m.mutex.Unlock()
 }
 
-func (m *SafeMap[KT, VT]) Iterator() map[KT]VT {
+func (m *safeMap[KT, VT]) Iterator() map[KT]VT {
 	return m.m
 }

src/go-proxy/path_pool_map.go

@@ -6,7 +6,7 @@ import (
 )
 
 type pathPoolMap struct {
-	*SafeMap[string, *httpLoadBalancePool]
+	SafeMap[string, *httpLoadBalancePool]
 }
 
 func newPathPoolMap() pathPoolMap {
@@ -21,7 +21,8 @@ func (m pathPoolMap) Add(path string, route *HTTPRoute) {
 }
 
 func (m pathPoolMap) FindMatch(pathGot string) (*HTTPRoute, error) {
-	for pathWant, v := range m.m {
+	pool := m.Iterator()
+	for pathWant, v := range pool {
 		if strings.HasPrefix(pathGot, pathWant) {
 			return v.Pick(), nil
 		}

src/go-proxy/provider.go

@@ -0,0 +1,99 @@
+package main
+
+import (
+	"fmt"
+	"sync"
+
+	"github.com/docker/docker/client"
+	"github.com/golang/glog"
+)
+
+type Provider struct {
+	Kind  string // docker, file
+	Value string
+
+	name         string
+	stopWatching chan struct{}
+	routes       SafeMap[string, Route] // id -> Route
+	dockerClient *client.Client
+}
+
+func (p *Provider) GetProxyConfigs() ([]*ProxyConfig, error) {
+	switch p.Kind {
+	case ProviderKind_Docker:
+		return p.getDockerProxyConfigs()
+	case ProviderKind_File:
+		return p.getFileProxyConfigs()
+	default:
+		// this line should never be reached
+		return nil, fmt.Errorf("unknown provider kind %q", p.Kind)
+	}
+}
+
+func (p *Provider) StopAllRoutes() {
+	close(p.stopWatching)
+	if p.dockerClient != nil {
+		p.dockerClient.Close()
+	}
+
+	var wg sync.WaitGroup
+	wg.Add(p.routes.Size())
+
+	for _, route := range p.routes.Iterator() {
+		go func(r Route) {
+			r.StopListening()
+			r.RemoveFromRoutes()
+			wg.Done()
+		}(route)
+	}
+	wg.Wait()
+	p.routes = NewSafeMap[string, Route]()
+}
+
+func (p *Provider) BuildStartRoutes() {
+	p.stopWatching = make(chan struct{})
+	p.routes = NewSafeMap[string, Route]()
+
+	cfgs, err := p.GetProxyConfigs()
+	if err != nil {
+		p.Logf("Build", "unable to get proxy configs: %v", p.name, err)
+		return
+	}
+
+	for _, cfg := range cfgs {
+		r, err := NewRoute(cfg)
+		if err != nil {
+			p.Logf("Build", "error creating route %q: %v", p.name, cfg.Alias, err)
+			continue
+		}
+		r.SetupListen()
+		r.Listen()
+		p.routes.Set(cfg.GetID(), r)
+	}
+	p.WatchChanges()
+	p.Logf("Build", "built %d routes", p.routes.Size())
+}
+
+func (p *Provider) WatchChanges() {
+	switch p.Kind {
+	case ProviderKind_Docker:
+		go p.grWatchDockerChanges()
+	case ProviderKind_File:
+		go p.grWatchFileChanges()
+	default:
+		// this line should never be reached
+		p.Errorf("unknown provider kind %q", p.Kind)
+	}
+}
+
+func (p* Provider) Logf(t string, s string, args ...interface{}) {
+	glog.Infof("[%s] %s provider %q: " + s, append([]interface{}{t, p.Kind, p.name}, args...)...)
+}
+
+func (p* Provider) Errorf(t string, s string, args ...interface{}) {
+	glog.Errorf("[%s] %s provider %q: " + s, append([]interface{}{t, p.Kind, p.name}, args...)...)
+}
+
+func (p* Provider) Warningf(t string, s string, args ...interface{}) {
+	glog.Warningf("[%s] %s provider %q: " + s, append([]interface{}{t, p.Kind, p.name}, args...)...)
+}

src/go-proxy/proxy_config.go

@@ -3,20 +3,40 @@ package main
 import "fmt"
 
 type ProxyConfig struct {
-	id          string
 	Alias       string
 	Scheme      string
 	Host        string
 	Port        string
-	LoadBalance string
+	LoadBalance string // docker provider only
 	Path        string // http proxy only
-	PathMode    string // http proxy only
+	PathMode    string `yaml:"path_mode"` // http proxy only
+
+	provider 	*Provider
 }
 
-func NewProxyConfig() ProxyConfig {
+func NewProxyConfig(provider *Provider) ProxyConfig {
-	return ProxyConfig{}
+	return ProxyConfig{
+		provider: provider,
+	}
 }
 
-func (cfg *ProxyConfig) UpdateId() {
+// used by `GetFileProxyConfigs`
-	cfg.id = fmt.Sprintf("%s-%s-%s-%s-%s", cfg.Alias, cfg.Scheme, cfg.Host, cfg.Port, cfg.Path)
+func (cfg *ProxyConfig) SetDefault() error {
+	if cfg.Alias == "" {
+		return fmt.Errorf("alias is required")
+	}
+	if cfg.Scheme == "" {
+		cfg.Scheme = "http"
+	}
+	if cfg.Host == "" {
+		return fmt.Errorf("host is required for %q", cfg.Alias)
+	}
+	if cfg.Port == "" {
+		cfg.Port = "80"
+	}
+	return nil
+}
+
+func (cfg *ProxyConfig) GetID() string {
+	return fmt.Sprintf("%s-%s-%s-%s-%s", cfg.Alias, cfg.Scheme, cfg.Host, cfg.Port, cfg.Path)
 }

src/go-proxy/route.go

@@ -1,66 +1,69 @@
 package main
 
 import (
+	"fmt"
 	"sync"
-
-	"github.com/golang/glog"
 )
 
 type Routes struct {
-	HTTPRoutes   *SafeMap[string, pathPoolMap] // id -> (path -> routes)
+	HTTPRoutes   SafeMap[string, pathPoolMap] // alias -> (path -> routes)
-	StreamRoutes *SafeMap[string, StreamRoute] // id -> target
+	StreamRoutes SafeMap[string, StreamRoute] // id    -> target
 	Mutex        sync.Mutex
 }
 
-var routes = Routes{}
+type Route interface {
+	SetupListen()
+	Listen()
+	StopListening()
+	RemoveFromRoutes()
+}
 
-func isValidScheme(scheme string) bool {
+var routes = initRoutes()
+
+func isValidScheme(s string) bool {
 	for _, v := range ValidSchemes {
-		if v == scheme {
+		if v == s {
 			return true
 		}
 	}
 	return false
 }
 
-func isStreamScheme(scheme string) bool {
+func isStreamScheme(s string) bool {
 	for _, v := range StreamSchemes {
-		if v == scheme {
+		if v == s {
 			return true
 		}
 	}
 	return false
 }
 
-func InitRoutes() {
+func initRoutes() *Routes {
-	utils.resetPortsInUse()
+	r := Routes{}
-	routes.HTTPRoutes = NewSafeMap[string](newPathPoolMap)
+	r.HTTPRoutes = NewSafeMap[string](newPathPoolMap)
-	routes.StreamRoutes = NewSafeMap[string, StreamRoute]()
+	r.StreamRoutes = NewSafeMap[string, StreamRoute]()
+	return &r
 }
 
-func CountRoutes() int {
+func NewRoute(cfg *ProxyConfig) (Route, error) {
-	return routes.HTTPRoutes.Size() + routes.StreamRoutes.Size()
+	if isStreamScheme(cfg.Scheme) {
-}
+		id := cfg.GetID()
-
+		if routes.StreamRoutes.Contains(id) {
-func CreateRoute(config *ProxyConfig) {
+			return nil, fmt.Errorf("duplicated %s stream %s, ignoring", cfg.Scheme, id)
-	if isStreamScheme(config.Scheme) {
-		if routes.StreamRoutes.Contains(config.id) {
-			glog.Infof("[Build] Duplicated %s stream %s, ignoring", config.Scheme, config.id)
-			return
 		}
-		route, err := NewStreamRoute(config)
+		route, err := NewStreamRoute(cfg)
 		if err != nil {
-			glog.Infoln(err)
+			return nil, err
-			return
 		}
-		routes.StreamRoutes.Set(config.id, route)
+		routes.StreamRoutes.Set(id, route)
+		return route, nil
 	} else {
-		routes.HTTPRoutes.Ensure(config.Alias)
+		routes.HTTPRoutes.Ensure(cfg.Alias)
-		route, err := NewHTTPRoute(config)
+		route, err := NewHTTPRoute(cfg)
 		if err != nil {
-			glog.Infoln(err)
+			return nil, err
-			return
 		}
-		routes.HTTPRoutes.Get(config.Alias).Add(config.Path, route)
+		routes.HTTPRoutes.Get(cfg.Alias).Add(cfg.Path, route)
+		return route, nil
 	}
 }

src/go-proxy/stream_route.go

@@ -12,9 +12,7 @@ import (
 )
 
 type StreamRoute interface {
-	SetupListen()
+	Route
-	Listen()
-	StopListening()
 	Logf(string, ...interface{})
 	PrintError(error)
 	ListeningUrl() string
@@ -22,6 +20,7 @@ type StreamRoute interface {
 
 	closeListeners()
 	closeChannel()
+	unmarkPort()
 	wait()
 }
 
@@ -29,17 +28,18 @@ type StreamRouteBase struct {
 	Alias           string // to show in panel
 	Type            string
 	ListeningScheme string
-	ListeningPort   string
+	ListeningPort   int
 	TargetScheme    string
 	TargetHost      string
-	TargetPort      string
+	TargetPort      int
 
+	id        string
 	wg        sync.WaitGroup
 	stopChann chan struct{}
 }
 
 func newStreamRouteBase(config *ProxyConfig) (*StreamRouteBase, error) {
-	var streamType string = TCPStreamType
+	var streamType string = StreamType_TCP
 	var srcPort string
 	var dstPort string
 	var srcScheme string
@@ -56,8 +56,7 @@ func newStreamRouteBase(config *ProxyConfig) (*StreamRouteBase, error) {
 		dstPort = port_split[1]
 	}
 
-	port, hasName := NamePortMap[dstPort]
+	if port, hasName := NamePortMap[dstPort]; hasName {
-	if hasName {
 		dstPort = port
 	}
 
@@ -71,7 +70,7 @@ func newStreamRouteBase(config *ProxyConfig) (*StreamRouteBase, error) {
 
 	utils.markPortInUse(srcPortInt)
 
-	_, err = strconv.Atoi(dstPort)
+	dstPortInt, err := strconv.Atoi(dstPort)
 	if err != nil {
 		return nil, fmt.Errorf(
 			"[Build] %s: Unrecognized stream target port %s, ignoring",
@@ -93,11 +92,12 @@ func newStreamRouteBase(config *ProxyConfig) (*StreamRouteBase, error) {
 		Alias:           config.Alias,
 		Type:            streamType,
 		ListeningScheme: srcScheme,
-		ListeningPort:   srcPort,
+		ListeningPort:   srcPortInt,
 		TargetScheme:    dstScheme,
 		TargetHost:      config.Host,
-		TargetPort:      dstPort,
+		TargetPort:      dstPortInt,
 
+		id:        config.GetID(),
 		wg:        sync.WaitGroup{},
 		stopChann: make(chan struct{}),
 	}, nil
@@ -105,9 +105,9 @@ func newStreamRouteBase(config *ProxyConfig) (*StreamRouteBase, error) {
 
 func NewStreamRoute(config *ProxyConfig) (StreamRoute, error) {
 	switch config.Scheme {
-	case TCPStreamType:
+	case StreamType_TCP:
 		return NewTCPRoute(config)
-	case UDPStreamType:
+	case StreamType_UDP:
 		return NewUDPRoute(config)
 	default:
 		return nil, errors.New("unknown stream type")
@@ -138,26 +138,30 @@ func (route *StreamRouteBase) Logf(format string, v ...interface{}) {
 }
 
 func (route *StreamRouteBase) ListeningUrl() string {
-	return fmt.Sprintf("%s:%s", route.ListeningScheme, route.ListeningPort)
+	return fmt.Sprintf("%s:%v", route.ListeningScheme, route.ListeningPort)
 }
 
 func (route *StreamRouteBase) TargetUrl() string {
-	return fmt.Sprintf("%s://%s:%s", route.TargetScheme, route.TargetHost, route.TargetPort)
+	return fmt.Sprintf("%s://%s:%v", route.TargetScheme, route.TargetHost, route.TargetPort)
 }
 
 func (route *StreamRouteBase) SetupListen() {
-	if route.ListeningPort == "0" {
+	if route.ListeningPort == 0 {
 		freePort, err := utils.findUseFreePort(20000)
 		if err != nil {
 			route.PrintError(err)
 			return
 		}
-		route.ListeningPort = fmt.Sprintf("%d", freePort)
+		route.ListeningPort = freePort
 		route.Logf("Assigned free port %s", route.ListeningPort)
 	}
 	route.Logf("Listening on %s", route.ListeningUrl())
 }
 
+func (route *StreamRouteBase) RemoveFromRoutes() {
+	routes.StreamRoutes.Delete(route.id)
+}
+
 func (route *StreamRouteBase) wait() {
 	route.wg.Wait()
 }
@@ -166,6 +170,10 @@ func (route *StreamRouteBase) closeChannel() {
 	close(route.stopChann)
 }
 
+func (route *StreamRouteBase) unmarkPort() {
+	utils.unmarkPortInUse(route.ListeningPort)
+}
+
 func stopListening(route StreamRoute) {
 	route.Logf("Stopping listening")
 	route.closeChannel()
@@ -176,6 +184,7 @@ func stopListening(route StreamRoute) {
 	go func() {
 		route.wait()
 		close(done)
+		route.unmarkPort()
 	}()
 
 	select {
@@ -187,30 +196,3 @@ func stopListening(route StreamRoute) {
 		return
 	}
 }
-
-func allStreamsDo(msg string, fn ...func(StreamRoute)) {
-	glog.Infof("[Stream] %s", msg)
-
-	var wg sync.WaitGroup
-
-	for _, route := range routes.StreamRoutes.Iterator() {
-		wg.Add(1)
-		go func(r StreamRoute) {
-			for _, f := range fn {
-				f(r)
-			}
-			wg.Done()
-		}(route)
-	}
-
-	wg.Wait()
-	glog.Infof("[Stream] Finished %s", msg)
-}
-
-func BeginListenStreams() {
-	allStreamsDo("Start", StreamRoute.SetupListen, StreamRoute.Listen)
-}
-
-func EndListenStreams() {
-	allStreamsDo("Stop", StreamRoute.StopListening)
-}

src/go-proxy/tcp_route.go

@@ -24,7 +24,7 @@ func NewTCPRoute(config *ProxyConfig) (StreamRoute, error) {
 	if err != nil {
 		return nil, err
 	}
-	if base.TargetScheme != TCPStreamType {
+	if base.TargetScheme != StreamType_TCP {
 		return nil, fmt.Errorf("tcp to %s not yet supported", base.TargetScheme)
 	}
 	return &TCPRoute{
@@ -35,7 +35,7 @@ func NewTCPRoute(config *ProxyConfig) (StreamRoute, error) {
 }
 
 func (route *TCPRoute) Listen() {
-	in, err := net.Listen("tcp", ":"+route.ListeningPort)
+	in, err := net.Listen("tcp", fmt.Sprintf(":%v", route.ListeningPort))
 	if err != nil {
 		route.PrintError(err)
 		return
@@ -97,7 +97,7 @@ func (route *TCPRoute) grHandleConnection(clientConn net.Conn) {
 	ctx, cancel := context.WithTimeout(context.Background(), tcpDialTimeout)
 	defer cancel()
 
-	serverAddr := fmt.Sprintf("%s:%s", route.TargetHost, route.TargetPort)
+	serverAddr := fmt.Sprintf("%s:%v", route.TargetHost, route.TargetPort)
 	dialer := &net.Dialer{}
 	serverConn, err := dialer.DialContext(ctx, route.TargetScheme, serverAddr)
 	if err != nil {

src/go-proxy/udp_route.go

@@ -32,7 +32,7 @@ func NewUDPRoute(config *ProxyConfig) (StreamRoute, error) {
 		return nil, err
 	}
 
-	if base.TargetScheme != UDPStreamType {
+	if base.TargetScheme != StreamType_UDP {
 		return nil, fmt.Errorf("udp to %s not yet supported", base.TargetScheme)
 	}
 
@@ -44,13 +44,13 @@ func NewUDPRoute(config *ProxyConfig) (StreamRoute, error) {
 }
 
 func (route *UDPRoute) Listen() {
-	source, err := net.ListenPacket(route.ListeningScheme, fmt.Sprintf(":%s", route.ListeningPort))
+	source, err := net.ListenPacket(route.ListeningScheme, fmt.Sprintf(":%v", route.ListeningPort))
 	if err != nil {
 		route.PrintError(err)
 		return
 	}
 
-	target, err := net.Dial(route.TargetScheme, fmt.Sprintf("%s:%s", route.TargetHost, route.TargetPort))
+	target, err := net.Dial(route.TargetScheme, fmt.Sprintf("%s:%v", route.TargetHost, route.TargetPort))
 	if err != nil {
 		route.PrintError(err)
 		source.Close()

src/go-proxy/utils.go

@@ -6,6 +6,7 @@ import (
 	"io"
 	"net"
 	"net/http"
+	"os"
 	"path"
 	"path/filepath"
 	"regexp"
@@ -53,20 +54,18 @@ func (u *Utils) findUseFreePort(startingPort int) (int, error) {
 	return -1, fmt.Errorf("unable to find free port: %v", err)
 }
 
-func (u *Utils) resetPortsInUse() {
-	u.portsInUseMutex.Lock()
-	for port := range u.PortsInUse {
-		u.PortsInUse[port] = false
-	}
-	u.portsInUseMutex.Unlock()
-}
-
 func (u *Utils) markPortInUse(port int) {
 	u.portsInUseMutex.Lock()
 	u.PortsInUse[port] = true
 	u.portsInUseMutex.Unlock()
 }
 
+func (u *Utils) unmarkPortInUse(port int) {
+	u.portsInUseMutex.Lock()
+	delete(u.PortsInUse, port)
+	u.portsInUseMutex.Unlock()
+}
+
 func (*Utils) healthCheckHttp(targetUrl string) error {
 	// try HEAD first
 	// if HEAD is not allowed, try GET
@@ -189,3 +188,8 @@ func (*Utils) respJSSubPath(r *http.Response, p string) error {
 	r.Body = io.NopCloser(strings.NewReader(js))
 	return nil
 }
+
+func (*Utils) fileOK(path string) bool {
+	_, err := os.Stat(path)
+	return err == nil
+}