fix: server addr flag is ignored

.changeset/fix-serve-addr-flag.md

@@ -0,0 +1,6 @@
+---
+"@empirica/core": patch
+---
+
+The `serve` command would ignore the `--addr` flag to specify the address to
+listen on. This is now fixed. Thanks to @malsobay for the report. Fixes #315.

cmds/empirica/cmd/serve.go

@@ -47,10 +47,6 @@ func addServeCommand(parent *cobra.Command) error {
 			conf := getConfig()
 			conf.Server.Addr = addr
 
-			conf.Production = !devMode
-			conf.Server.Production = !devMode
-			conf.Tajriba.Server.Production = !devMode
-
 			return bundle.Serve(ctx, conf, in, clean, devMode)
 		},
 	}

internal/bundle/serve.go

@@ -42,12 +42,24 @@ func Serve(ctx context.Context, config *empirica.Config, in string, clean, devMo
 		}
 
 		var args []string
+		cmd := parts[0]
 		if len(parts) > 1 {
-			args = parts[1:]
+			if parts[0] == "npm" {
+				cmd = "empirica"
+				args = parts
+			} else {
+				args = parts[1:]
+			}
 		}
 
 		args = append(args, "--token", conf.Callbacks.Token)
 
+		addr := conf.Server.Addr
+		if strings.HasPrefix(addr, ":") {
+			addr = "http://localhost" + addr + "/query"
+		}
+		args = append(args, "--url", addr)
+
 		if conf.Callbacks.SessionToken != "" {
 			p := conf.Callbacks.SessionToken
 			if !strings.HasPrefix(p, "/") {
@@ -59,12 +71,11 @@ func Serve(ctx context.Context, config *empirica.Config, in string, clean, devMo
 			args = append(args, "--sessionTokenPath", p)
 		}
 
-		log.Trace().
-			Strs("args", args).
-			Str("cmd", parts[0]).
+		log.Debug().
+			Str("cmd", strings.Join(append([]string{cmd}, args...), " ")).
 			Msg("serve: start server command")
 
-		c := exec.CommandContext(ctx, parts[0], args...)
+		c := exec.CommandContext(ctx, cmd, args...)
 
 		p := path.Join(dir, "callbacks")
 

internal/bundle/unbundle.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 
 	"github.com/empiricaly/empirica"
+	"github.com/empiricaly/empirica/internal/server"
 	"github.com/empiricaly/empirica/internal/settings"
 	"github.com/klauspost/compress/gzip"
 	"github.com/klauspost/compress/zstd"
@@ -82,6 +83,10 @@ func prepDotEmpirica(inConf *empirica.Config, dir string, devMode bool) (*empiri
 	conf.Server.Production = !devMode
 	conf.Tajriba.Server.Production = !devMode
 
+	if conf.Server.Addr == server.DefaultAddr {
+		conf.Server.Addr = inConf.Server.Addr
+	}
+
 	if inConf.Tajriba.Store.UseMemory {
 		conf.Tajriba.Store.UseMemory = true
 	}

internal/server/config.go

@@ -26,6 +26,8 @@ func (c *Config) Validate() error {
 	return nil
 }
 
+const DefaultAddr = ":3000"
+
 // ConfigFlags helps configure cobra and viper flags.
 func ConfigFlags(cmd *cobra.Command, prefix string) error {
 	if cmd == nil {
@@ -39,7 +41,7 @@ func ConfigFlags(cmd *cobra.Command, prefix string) error {
 	viper.SetDefault(prefix, &Config{})
 
 	flag := prefix + ".addr"
-	sval := ":3000"
+	sval := DefaultAddr
 	cmd.Flags().StringP(flag, "s", sval, "Address of the server")
 	viper.SetDefault(flag, sval)