feat: support use working directory from environment variable

Author: Hintay

prefix_dialer.go

@@ -4,27 +4,29 @@ import (
 	"errors"
 	"net"
 	"os"
+	"path"
 	"strings"
 	"syscall"
 )
 
 // PrefixDialer uses github.com/Microsoft/go-winio.{DialPipe,ListenPipe} on windows and net.{Dial,Listen} on other platforms.
 type PrefixDialer struct {
-	Prefix string
+	Prefix           string
+	WorkingDirectory string
 }
 
 var _ Dialer = PrefixDialer{}
 
 func (pd PrefixDialer) Listen(name string) (net.Listener, error) {
-	return listen(pd.Prefix + name)
+	return listen(path.Join(pd.WorkingDirectory, pd.Prefix+name))
 }
 
 func (pd PrefixDialer) Dial(name string) (net.Conn, error) {
 	var builder strings.Builder
 	builder.WriteString(pd.Prefix)
 	builder.WriteString(name)
 
-	c, err := dial(builder.String())
+	c, err := dial(path.Join(pd.WorkingDirectory, builder.String()))
 
 	// attempt to remove the file if nobody is listening
 	if err != nil && errorIsNobodyListening(err) {
@@ -43,3 +45,21 @@ func errorIsNobodyListening(err error) bool {
 	}
 	return false
 }
+
+func (cfg Config) NewPrefixDialer(prefix string) PrefixDialer {
+	// convert name to uppercase with underline
+	name := strings.ToUpper(strings.ReplaceAll(cfg.Name, "-", "_"))
+	if name == "" {
+		name = "RISEFRONT"
+	}
+	workingDirectory := os.Getenv(name + "_WORKING_DIR")
+
+	if workingDirectory == "" {
+		workingDirectory = getWorkingDir()
+	}
+
+	return PrefixDialer{
+		Prefix:           prefix,
+		WorkingDirectory: workingDirectory,
+	}
+}

risefront.go

@@ -73,7 +73,7 @@ func New(ctx context.Context, cfg Config) error {
 	}
 
 	if cfg.Dialer == nil {
-		cfg.Dialer = PrefixDialer{}
+		cfg.Dialer = cfg.NewPrefixDialer("")
 	}
 	if cfg.Network == "" {
 		cfg.Network = "tcp"

socket.go

@@ -3,28 +3,24 @@
 package risefront
 
 import (
-	"log"
 	"net"
 	"os"
-	"path"
 
 	"golang.org/x/sys/unix"
 )
 
-var workingDirectory string
-
-func init() {
-	workingDirectory, _ = os.Getwd()
-	if unix.Access(workingDirectory, unix.W_OK) != nil {
-		log.Println("The current working directory is not writable, using temp dir")
-		workingDirectory = os.TempDir()
-	}
-}
-
 func listen(name string) (net.Listener, error) {
-	return net.Listen("unix", path.Join(workingDirectory, name))
+	return net.Listen("unix", name)
 }
 
 func dial(name string) (net.Conn, error) {
-	return net.Dial("unix", path.Join(workingDirectory, name))
+	return net.Dial("unix", name)
+}
+
+func getWorkingDir() string {
+	dir, _ := os.Getwd()
+	if unix.Access(dir, unix.W_OK) != nil {
+		return os.TempDir()
+	}
+	return dir
 }

socket_windows.go

@@ -15,3 +15,8 @@ func listen(name string) (net.Listener, error) {
 func dial(name string) (net.Conn, error) {
 	return winio.DialPipe(`\\.\pipe\`+name, nil)
 }
+
+func getWorkingDir() string {
+	// Windows does not need it for named pipes
+	return ""
+}