From fba5e0952047850e6aaceb9542015041879a730b Mon Sep 17 00:00:00 2001
From: Nicolas Paton <nicolas.paton@gmail.com>
Date: Sun, 21 Jan 2024 15:57:49 +0800
Subject: [PATCH] fix: serve respect bundle version (#493)

---
 .changeset/serve-respects-version.md |   5 +
 build/download.sh                    | 178 ---------------------------
 cmds/empirica/cmd/serve.go           |  15 ++-
 cmds/proxy/cmd/root.go               |   8 +-
 internal/bundle/serve.go             |  55 ++++++++-
 internal/bundle/unbundle.go          |  12 +-
 6 files changed, 75 insertions(+), 198 deletions(-)
 create mode 100644 .changeset/serve-respects-version.md
 delete mode 100644 build/download.sh

diff --git a/.changeset/serve-respects-version.md b/.changeset/serve-respects-version.md
new file mode 100644
index 00000000..85606f62
--- /dev/null
+++ b/.changeset/serve-respects-version.md
@@ -0,0 +1,5 @@
+---
+"@empirica/core": patch
+---
+
+`empirica serve` now respects the version in the bundle.
diff --git a/build/download.sh b/build/download.sh
deleted file mode 100644
index 6d0ad939..00000000
--- a/build/download.sh
+++ /dev/null
@@ -1,178 +0,0 @@
-#!/bin/sh
-
-# This is the empirica install script!
-#
-# Are you looking at this in your web browser, and would like to install empirica?
-#
-# Just open up your terminal and type:
-#
-#   curl https://install.empirica.dev | sh
-#
-
-# We wrap this whole script in a function, so that we won't execute
-# until the entire script is downloaded.
-# That's good because it prevents our output overlapping with curl's.
-# It also means that we can't run a partially downloaded script.
-# We don't indent because it would be really confusing with the heredocs.
-run_it () {
-
-## NOTE sh NOT bash. This script should be POSIX sh only, since we don't
-## know what shell the user has. Debian uses 'dash' for 'sh', for
-## example.
-
-PREFIX="/usr/local"
-
-set -e
-set -u
-
-# Let's display everything on stderr.
-exec 1>&2
-
-UNAME=$(uname)
-
-if [ "$UNAME" = "Darwin" ] ; then
-  ### OSX ###
-  if [ "1" == "$(sysctl -n hw.cpu64bit_capable 2>/dev/null || echo 0)" ] ; then
-
-    # Can't just test uname -m = x86_64, because Snow Leopard can
-    # return other values.
-    if [ "i386" != "$(uname -p)" ] ; then
-      if [ "arm" != "$(uname -p)" ] ; then
-        echo "Only 64-bit Intel or ARM processors are supported at this time."
-        exit 1
-      else
-        PLATFORM="darwin-arm64"
-      fi
-    else
-      PLATFORM="darwin-amd64"
-    fi
-  else
-      echo "Only 64-bit processors are supported at this time."
-      exit 1
-  fi
-
-# NOTE: Windows build currently having problems
-# elif [ "$UNAME" ">" "MINGW" -a "$UNAME" "<" "MINGX" ] ; then
-#     PLATFORM="windows-arm64.exe"
-
-elif [ "$UNAME" = "Linux" ] ; then
-  ### Linux ###
-  LINUX_ARCH=$(uname -m)
-  if [ "${LINUX_ARCH}" = "x86_64" ] ; then
-    PLATFORM="linux-amd64"
-  else
-    echo "Unsupported architecture: ${LINUX_ARCH}"
-    echo "Empirica only supports x86_64 for now."
-    exit 1
-  fi
-else
-    echo "Sorry, this OS is not supported yet via this installer."
-    exit 1
-fi
-
-trap "echo Installation failed." EXIT
-
-TEMP_DIR=`mktemp -d`
-if [ -z $TEMP_DIR ] || [ ! -d $TEMP_DIR ]; then
-  echo "The installation of empirica requires a temporary directory where its files can be downloaded."
-  exit 1
-fi
-
-BIN_URL="https://install.empirica.dev/proxy/${PLATFORM}/latest/empirica"
-
-echo $BIN_URL
-
-BIN_FILE="$TEMP_DIR/.empirica-tmp"
-
-cleanUp() {
-  rm -rf "$BIN_FILE"
-}
-
-# Make sure cleanUp gets called if we exit abnormally.
-trap cleanUp EXIT
-
-# Only show progress bar animations if we have a tty
-# (Prevents tons of console junk when installing within a pipe)
-VERBOSITY="--silent";
-if [ -t 1 ]; then
-  VERBOSITY="--progress-bar"
-fi
-
-echo "Downloading empirica"
-# keep trying to curl the file until it works (resuming where possible)
-MAX_ATTEMPTS=10
-RETRY_DELAY_SECS=5
-set +e
-ATTEMPTS=0
-while [ $ATTEMPTS -lt $MAX_ATTEMPTS ]
-do
-  ATTEMPTS=$((ATTEMPTS + 1))
-
-  curl $VERBOSITY --fail --continue-at - \
-    "$BIN_URL" --output "$BIN_FILE"
-
-  if [ $? -eq 0 ]
-  then
-      break
-  fi
-
-  echo "Retrying download in $RETRY_DELAY_SECS seconds..."
-  sleep $RETRY_DELAY_SECS
-done
-set -e
-
-# bomb out if it didn't work, eg no net
-test -e "${BIN_FILE}"
-
-if cp "$BIN_FILE" "$PREFIX/bin/empirica" >/dev/null 2>&1; then
-  chmod u+x $PREFIX/bin/empirica
-  echo "Writing empirica to $PREFIX/bin/empirica for your convenience."
-
-  empirica setup
-elif type sudo >/dev/null 2>&1; then
-  echo "Writing empirica to $PREFIX/bin/empirica for your convenience."
-  echo "This may prompt for your password."
-
-  # New macs (10.9+) don't ship with /usr/local, however it is still in
-  # the default PATH. We still install there, we just need to create the
-  # directory first.
-  # XXX this means that we can run sudo too many times. we should never
-  #     run it more than once if it fails the first time
-  if [ ! -d "$PREFIX/bin" ] ; then
-      sudo mkdir -m 755 "$PREFIX" || true
-      sudo mkdir -m 755 "$PREFIX/bin" || true
-  fi
-
-  if sudo cp "$BIN_FILE" "$PREFIX/bin/empirica"; then
-  sudo chmod +x $PREFIX/bin/empirica
-  echo ""
-
-  empirica setup
-  else
-    cat <<EOF
-
-Couldn't write empirica. Please either:
-
-  (1) Run the following as root:
-        cp "$BIN_FILE" /usr/bin/empirica
-  (2) Rerun this command to try again.
-EOF
-  fi
-else
-  cat <<EOF
-
-Now you need to do the following:
-
-  Run the following as root:
-        cp "$BIN_FILE" /usr/local/bin/empirica
-EOF
-
-cleanUp
-
-fi
-
-
-trap - EXIT
-}
-
-run_it
diff --git a/cmds/empirica/cmd/serve.go b/cmds/empirica/cmd/serve.go
index 5e65c197..92df1e85 100644
--- a/cmds/empirica/cmd/serve.go
+++ b/cmds/empirica/cmd/serve.go
@@ -24,6 +24,8 @@ func addServeCommand(parent *cobra.Command) error {
 				return errors.New("missing project name")
 			}
 
+			conf := getConfig(true)
+
 			ctx := initContext()
 
 			clean, err := cmd.Flags().GetBool("clean")
@@ -47,7 +49,6 @@ func addServeCommand(parent *cobra.Command) error {
 
 			in := args[0]
 
-			conf := getConfig(true)
 			conf.Server.Addr = addr
 
 			return bundle.Serve(ctx, conf, in, clean, devMode)
@@ -63,10 +64,6 @@ func addServeCommand(parent *cobra.Command) error {
 		return nil
 	}
 
-	if err := empirica.ConfigFlags(cmd); err != nil {
-		return errors.Wrap(err, "define flags")
-	}
-
 	flag := "addr"
 	sval := ":3000"
 	cmd.Flags().String(flag, sval, "Address of the server")
@@ -77,10 +74,18 @@ func addServeCommand(parent *cobra.Command) error {
 	cmd.Flags().Bool(flag, bval, "Start in dev mode (no auth)")
 	viper.SetDefault(flag, bval)
 
+	if err := empirica.ConfigFlags(cmd); err != nil {
+		return errors.Wrap(err, "define flags")
+	}
+
 	if err := viper.BindPFlags(cmd.Flags()); err != nil {
 		return errors.Wrap(err, "bind serve flags")
 	}
 
+	if err := viper.BindPFlags(cmd.PersistentFlags()); err != nil {
+		return errors.Wrap(err, "bind persistent serve flags")
+	}
+
 	parent.AddCommand(cmd)
 
 	return nil
diff --git a/cmds/proxy/cmd/root.go b/cmds/proxy/cmd/root.go
index a3830d7c..5759373f 100644
--- a/cmds/proxy/cmd/root.go
+++ b/cmds/proxy/cmd/root.go
@@ -69,18 +69,18 @@ func root(args []string) error {
 		var er *exec.ExitError
 		if errors.As(err, &er) {
 			os.Exit(er.ExitCode())
-		} else {
-			return errors.Wrap(err, "failed to start")
 		}
+
+		return errors.Wrap(err, "failed to start")
 	}
 
 	if err := c.Wait(); err != nil {
 		var er *exec.ExitError
 		if errors.As(err, &er) {
 			os.Exit(er.ExitCode())
-		} else {
-			return errors.Wrap(err, "failed to start")
 		}
+
+		return errors.Wrap(err, "failed to start")
 	}
 
 	return nil
diff --git a/internal/bundle/serve.go b/internal/bundle/serve.go
index 2cf6df75..0ec93dd5 100644
--- a/internal/bundle/serve.go
+++ b/internal/bundle/serve.go
@@ -34,6 +34,55 @@ func Serve(ctx context.Context, config *empirica.Config, in string, clean, devMo
 		log.Fatal().Err(err).Msg("invalid config")
 	}
 
+	b, err := build.FindCurrentBinaryVersion()
+	if err != nil {
+		log.Fatal().Err(err).Msg("failed to find bundle version")
+	}
+
+	// If we are not running the correct version, restart with the correct
+	// version. The new version will automatically be picked up on restart since
+	// the version in the bundle will have already been exported to the
+	// .empirica/release file in the current dir.
+	if b.Version != build.Current().Version && os.Getenv(build.BuildSelectionEnvVar) == "" {
+		log.Info().
+			Str("from", build.Current().Version).
+			Str("to", b.Version).
+			Msg("serve: switching to empirica version in bundle")
+
+		if os.Getenv("EMPIRICA_SUBPROC") != "" {
+			log.Warn().Msg("serve: failed to run correct version of bundle, exiting...")
+
+			return nil
+		}
+
+		c := exec.CommandContext(ctx, "empirica", os.Args[1:]...)
+
+		c.Stderr = os.Stderr
+		c.Stdout = os.Stdout
+
+		c.Env = append(os.Environ(), "EMPIRICA_SUBPROC=1")
+
+		if err := c.Start(); err != nil {
+			var er *exec.ExitError
+			if errors.As(err, &er) {
+				os.Exit(er.ExitCode())
+			}
+
+			return errors.Wrap(err, "failed to start")
+		}
+
+		if err := c.Wait(); err != nil {
+			var er *exec.ExitError
+			if errors.As(err, &er) {
+				os.Exit(er.ExitCode())
+			}
+
+			return errors.Wrap(err, "failed to start")
+		}
+
+		return nil
+	}
+
 	go func(ctx context.Context) {
 		parts := strings.Split(conf.Callbacks.ServeCmd, " ")
 		if len(parts) == 0 {
@@ -90,12 +139,8 @@ func Serve(ctx context.Context, config *empirica.Config, in string, clean, devMo
 			return
 		}
 
-		log.Info().Msg("serve: server started")
-
 		if err := c.Wait(); err != nil {
 			if strings.Contains(err.Error(), "signal: killed") {
-				log.Debug().Msg("serve: restarting server")
-
 				return
 			}
 
@@ -143,7 +188,7 @@ func Serve(ctx context.Context, config *empirica.Config, in string, clean, devMo
 		log.Error().Err(err).Msg("serve: failed to get build version")
 	}
 
-	log.Info().
+	log.Debug().
 		RawJSON("build", bver).
 		Msg("tajriba: server started")
 
diff --git a/internal/bundle/unbundle.go b/internal/bundle/unbundle.go
index 1bd2d1e3..d782f665 100644
--- a/internal/bundle/unbundle.go
+++ b/internal/bundle/unbundle.go
@@ -123,14 +123,14 @@ func Unbundle(_ context.Context, config *empirica.Config, in string, clean, devM
 	dir := path.Join(os.TempDir(), hash)
 
 	if _, err := os.Stat(dir); err == nil {
-		log.Info().
+		log.Debug().
 			Str("target", dir).
-			Msg("unbundle: already installed")
+			Msg("serve: bundle already extracted")
 
 		if clean {
 			log.Info().
 				Str("target", dir).
-				Msg("unbundle: removing old installation")
+				Msg("serve: removing old bundle extraction")
 
 			if err := os.RemoveAll(dir); err != nil {
 				return "", nil, errors.Wrap(err, "remove previous installation")
@@ -145,9 +145,9 @@ func Unbundle(_ context.Context, config *empirica.Config, in string, clean, devM
 		}
 	}
 
-	log.Info().
+	log.Debug().
 		Str("target", dir).
-		Msg("unbundle: installing")
+		Msg("serve: extracting bundle")
 
 	if _, err := f.Seek(0, io.SeekStart); err != nil {
 		return "", nil, errors.Wrap(err, "rewind file")
@@ -220,7 +220,7 @@ func unbundleFile(tr *tar.Reader, header *tar.Header, dir string) error {
 		log.Trace().
 			Str("from", header.Name).
 			Str("to", target).
-			Msg("unbundle: copying file")
+			Msg("serve: copying file")
 
 		// Sanity check, we're still in our dir.
 		targetdir := path.Dir(target)