@@ -11,22 +11,19 @@ import (
11
11
"strings"
12
12
13
13
"github.com/posit-dev/publisher/internal/logging"
14
- "github.com/posit-dev/publisher/internal/project"
15
14
"github.com/posit-dev/publisher/internal/services/middleware"
16
-
17
- "github.com/pkg/browser"
18
15
)
19
16
20
17
type Service struct {
21
- handler http.HandlerFunc
22
- listen string
23
- path string
24
- keyFile string
25
- certFile string
26
- openBrowser bool
27
- openBrowserAt string
28
- addr net.Addr
29
- log logging.Logger
18
+ handler http.HandlerFunc
19
+ listen string
20
+ path string
21
+ // keyFile string
22
+ // certFile string
23
+ // openBrowser bool
24
+ // openBrowserAt string
25
+ addr net.Addr
26
+ log logging.Logger
30
27
}
31
28
32
29
var errTlsRequiredFiles error = errors .New ("TLS requires both a private key file and a certificate chain file" )
@@ -35,10 +32,10 @@ func newHTTPService(
35
32
handler http.HandlerFunc ,
36
33
listen string ,
37
34
path string ,
38
- keyFile string ,
39
- certFile string ,
40
- openBrowser bool ,
41
- openBrowserAt string ,
35
+ // keyFile string,
36
+ // certFile string,
37
+ // openBrowser bool,
38
+ // openBrowserAt string,
42
39
accessLog bool ,
43
40
log logging.Logger ) * Service {
44
41
@@ -48,35 +45,20 @@ func newHTTPService(
48
45
handler = middleware .PanicRecovery (log , handler )
49
46
50
47
return & Service {
51
- handler : handler ,
52
- listen : listen ,
53
- path : path ,
54
- keyFile : keyFile ,
55
- certFile : certFile ,
56
- openBrowser : openBrowser ,
57
- openBrowserAt : openBrowserAt ,
58
- addr : nil ,
59
- log : log ,
60
- }
61
- }
62
-
63
- func (svc * Service ) isTLS () (bool , error ) {
64
- if svc .keyFile != "" && svc .certFile != "" {
65
- return true , nil
66
- } else if svc .keyFile != "" || svc .certFile != "" {
67
- // It's an error to only provide one of the files
68
- return false , errTlsRequiredFiles
69
- } else {
70
- return false , nil
48
+ handler : handler ,
49
+ listen : listen ,
50
+ path : path ,
51
+ // keyFile: keyFile,
52
+ // certFile: certFile,
53
+ // openBrowser: openBrowser,
54
+ // openBrowserAt: openBrowserAt,
55
+ addr : nil ,
56
+ log : log ,
71
57
}
72
58
}
73
59
74
60
func (svc * Service ) getURL () * url.URL {
75
61
scheme := "http"
76
- isTLS , _ := svc .isTLS ()
77
- if isTLS {
78
- scheme = "https"
79
- }
80
62
path , fragment , _ := strings .Cut (svc .path , "#" )
81
63
appURL := & url.URL {
82
64
Scheme : scheme ,
@@ -88,11 +70,6 @@ func (svc *Service) getURL() *url.URL {
88
70
}
89
71
90
72
func (svc * Service ) Run () error {
91
- isTLS , err := svc .isTLS ()
92
- if err != nil {
93
- return err
94
- }
95
-
96
73
// Open listener first so the browser can connect
97
74
listener , err := net .Listen ("tcp" , svc .listen )
98
75
if err != nil {
@@ -105,17 +82,7 @@ func (svc *Service) Run() error {
105
82
svc .log .Info ("UI server running" , "url" , appURL .String ())
106
83
fmt .Println (appURL .String ())
107
84
108
- if project .DevelopmentBuild () && svc .openBrowserAt != "" {
109
- browser .OpenURL (svc .openBrowserAt )
110
- } else if svc .openBrowser {
111
- browser .OpenURL (appURL .String ())
112
- }
113
-
114
- if isTLS {
115
- err = http .ServeTLS (listener , svc .handler , svc .certFile , svc .keyFile )
116
- } else {
117
- err = http .Serve (listener , svc .handler )
118
- }
85
+ err = http .Serve (listener , svc .handler )
119
86
if err != nil && err != http .ErrServerClosed {
120
87
return fmt .Errorf ("UI server error: %s" , err )
121
88
}
0 commit comments