Reduce UI commands down to only what is used by VSCode extension

Author: sagerb

cmd/publisher/commands/ui.go

@@ -11,13 +11,7 @@ import (
 )
 
 type UICmd struct {
-	Path          util.Path `help:"Path to project directory containing files to publish." arg:"" default:"."`
-	Interactive   bool      `short:"i" help:"Launch a browser to show the UI."`
-	OpenBrowserAt string    `help:"Network address to use when launching the browser." placeholder:"HOST[:PORT]" hidden:""`
-	Theme         string    `help:"UI theme, 'light' or 'dark'." hidden:""`
-	Listen        string    `help:"Network address to listen on." placeholder:"HOST[:PORT]" default:"localhost:0"`
-	TLSKeyFile    string    `help:"Path to TLS private key file for the UI server."`
-	TLSCertFile   string    `help:"Path to TLS certificate chain file for the UI server."`
+	Listen string `help:"Network address to listen on." placeholder:"HOST[:PORT]" default:"localhost:0"`
 }
 
 func (cmd *UICmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIContext) error {
@@ -31,7 +25,8 @@ func (cmd *UICmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIContext) err
 	log := events.NewLoggerWithSSE(args.Verbose, emitter)
 	ctx.Logger.Info("created SSE logger")
 
-	absPath, err := cmd.Path.Abs()
+	path := util.NewPath(".", nil)
+	absPath, err := path.Abs()
 	if err != nil {
 		return err
 	}
@@ -40,13 +35,13 @@ func (cmd *UICmd) Run(args *cli_types.CommonArgs, ctx *cli_types.CLIContext) err
 	// for better error handling and startup performance.
 	svc := api.NewService(
 		"/",
-		cmd.Interactive,
-		cmd.OpenBrowserAt,
-		cmd.Theme,
+		// cmd.Interactive,
+		// cmd.OpenBrowserAt,
+		// cmd.Theme,
 		cmd.Listen,
 		true,
-		cmd.TLSKeyFile,
-		cmd.TLSCertFile,
+		// cmd.TLSKeyFile,
+		// cmd.TLSCertFile,
 		absPath,
 		ctx.Accounts,
 		log,

internal/services/api/api_service.go

@@ -23,13 +23,13 @@ const APIPrefix string = "api"
 
 func NewService(
 	fragment string,
-	interactive bool,
-	openBrowserAt string,
-	theme string,
+	// interactive bool,
+	// openBrowserAt string,
+	// theme string,
 	listen string,
 	accessLog bool,
-	tlsKeyFile string,
-	tlsCertFile string,
+	// tlsKeyFile string,
+	// tlsCertFile string,
 	dir util.AbsolutePath,
 	lister accounts.AccountList,
 	log logging.Logger,
@@ -42,10 +42,10 @@ func NewService(
 		handler,
 		listen,
 		fragment,
-		tlsKeyFile,
-		tlsCertFile,
-		interactive,
-		openBrowserAt,
+		// tlsKeyFile,
+		// tlsCertFile,
+		// interactive,
+		// openBrowserAt,
 		accessLog,
 		log,
 	)

internal/services/api/http_service.go

@@ -11,22 +11,19 @@ import (
 	"strings"
 
 	"github.com/posit-dev/publisher/internal/logging"
-	"github.com/posit-dev/publisher/internal/project"
 	"github.com/posit-dev/publisher/internal/services/middleware"
-
-	"github.com/pkg/browser"
 )
 
 type Service struct {
-	handler       http.HandlerFunc
-	listen        string
-	path          string
-	keyFile       string
-	certFile      string
-	openBrowser   bool
-	openBrowserAt string
-	addr          net.Addr
-	log           logging.Logger
+	handler http.HandlerFunc
+	listen  string
+	path    string
+	// keyFile       string
+	// certFile      string
+	// openBrowser   bool
+	// openBrowserAt string
+	addr net.Addr
+	log  logging.Logger
 }
 
 var errTlsRequiredFiles error = errors.New("TLS requires both a private key file and a certificate chain file")
@@ -35,10 +32,10 @@ func newHTTPService(
 	handler http.HandlerFunc,
 	listen string,
 	path string,
-	keyFile string,
-	certFile string,
-	openBrowser bool,
-	openBrowserAt string,
+	// keyFile string,
+	// certFile string,
+	// openBrowser bool,
+	// openBrowserAt string,
 	accessLog bool,
 	log logging.Logger) *Service {
 
@@ -48,35 +45,20 @@ func newHTTPService(
 	handler = middleware.PanicRecovery(log, handler)
 
 	return &Service{
-		handler:       handler,
-		listen:        listen,
-		path:          path,
-		keyFile:       keyFile,
-		certFile:      certFile,
-		openBrowser:   openBrowser,
-		openBrowserAt: openBrowserAt,
-		addr:          nil,
-		log:           log,
-	}
-}
-
-func (svc *Service) isTLS() (bool, error) {
-	if svc.keyFile != "" && svc.certFile != "" {
-		return true, nil
-	} else if svc.keyFile != "" || svc.certFile != "" {
-		// It's an error to only provide one of the files
-		return false, errTlsRequiredFiles
-	} else {
-		return false, nil
+		handler: handler,
+		listen:  listen,
+		path:    path,
+		// keyFile:       keyFile,
+		// certFile:      certFile,
+		// openBrowser:   openBrowser,
+		// openBrowserAt: openBrowserAt,
+		addr: nil,
+		log:  log,
 	}
 }
 
 func (svc *Service) getURL() *url.URL {
 	scheme := "http"
-	isTLS, _ := svc.isTLS()
-	if isTLS {
-		scheme = "https"
-	}
 	path, fragment, _ := strings.Cut(svc.path, "#")
 	appURL := &url.URL{
 		Scheme:   scheme,
@@ -88,11 +70,6 @@ func (svc *Service) getURL() *url.URL {
 }
 
 func (svc *Service) Run() error {
-	isTLS, err := svc.isTLS()
-	if err != nil {
-		return err
-	}
-
 	// Open listener first so the browser can connect
 	listener, err := net.Listen("tcp", svc.listen)
 	if err != nil {
@@ -105,17 +82,7 @@ func (svc *Service) Run() error {
 	svc.log.Info("UI server running", "url", appURL.String())
 	fmt.Println(appURL.String())
 
-	if project.DevelopmentBuild() && svc.openBrowserAt != "" {
-		browser.OpenURL(svc.openBrowserAt)
-	} else if svc.openBrowser {
-		browser.OpenURL(appURL.String())
-	}
-
-	if isTLS {
-		err = http.ServeTLS(listener, svc.handler, svc.certFile, svc.keyFile)
-	} else {
-		err = http.Serve(listener, svc.handler)
-	}
+	err = http.Serve(listener, svc.handler)
 	if err != nil && err != http.ErrServerClosed {
 		return fmt.Errorf("UI server error: %s", err)
 	}