1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
|
diff --git a/internal/server/http/serve.go b/internal/server/http/serve.go
new file mode 100644
index 0000000000000000000000000000000000000000..da04e00df3d2973938cfb8c366dc9bc43cbde915
--- /dev/null
+++ b/internal/server/http/serve.go
@@ -0,0 +1,37 @@
+package http
+
+import (
+ "mime"
+ "net/http"
+ "path"
+ "strings"
+ templates "webinterface"
+
+ "git.sr.ht/~poldi1405/glog"
+)
+
+func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+ if r.ProtoMajor == 2 && strings.Contains(r.Header.Get("Content-Type"), "application/grpc") {
+ glog.Debug("handling as gRPC request")
+ s.grpc.ServeHTTP(w, r)
+ return
+ }
+
+ glog.Tracef("path: %q", r.URL.Path)
+ switch r.URL.Path {
+ case "/":
+ glog.Debug("serving index")
+ s.templates[TemplateIndex].Execute(w, nil)
+ default:
+ data, err := templates.Templates.ReadFile(path.Join("dist", r.URL.Path))
+ if err == nil {
+ glog.Debug("static asset found")
+ w.Header().Add("Content-Type", mime.TypeByExtension(path.Ext(r.URL.Path)))
+ w.Write(data)
+ return
+ }
+
+ glog.Debug("serving room interface")
+ s.templates[TemplateRoom].Execute(w, nil)
+ }
+}
diff --git a/internal/server/http/wrapper.go b/internal/server/http/wrapper.go
new file mode 100644
index 0000000000000000000000000000000000000000..eb4dbd4ef563e631eeafddcb5479142466226bd4
--- /dev/null
+++ b/internal/server/http/wrapper.go
@@ -0,0 +1,39 @@
+package http
+
+import (
+ "fmt"
+ "html/template"
+ "net/http"
+ templates "webinterface"
+)
+
+type Server struct {
+ grpc http.Handler
+ templates []*template.Template
+}
+
+const (
+ TemplateIndex = iota
+ TemplateRoom
+)
+
+var templateList = []string{
+ "dist/index.html",
+ "dist/room.html",
+}
+
+func NewServer(g http.Handler) (*Server, error) {
+ srv := &Server{
+ grpc: g,
+ }
+
+ for _, tmpl := range templateList {
+ parsed, err := template.ParseFS(templates.Templates, tmpl)
+ if err != nil {
+ return nil, fmt.Errorf("failed to parse %q: %w", tmpl, err)
+ }
+ srv.templates = append(srv.templates, parsed)
+ }
+
+ return srv, nil
+}
diff --git a/server.go b/server.go
index 4f6c9a9a379773398dc4d09ae373626fac47ff9a..17a2af6b4f0fd49c8270d151226fe7ec1aece761 100644
--- a/server.go
+++ b/server.go
@@ -4,8 +4,11 @@ // SPDX-FileCopyrightText: © Moritz Poldrack & AUTHORS
// SPDX-License-Identifier: AGPL-3.0-or-later
import (
+ "context"
+ "errors"
"fmt"
"net"
+ "net/http"
"os"
"os/signal"
"sync"
@@ -14,35 +17,26 @@
"git.sr.ht/~mpldr/uniview/internal/config"
"git.sr.ht/~mpldr/uniview/internal/mansion"
"git.sr.ht/~mpldr/uniview/internal/server"
+ wraphttp "git.sr.ht/~mpldr/uniview/internal/server/http"
"git.sr.ht/~mpldr/uniview/protocol"
"git.sr.ht/~poldi1405/glog"
"google.golang.org/grpc"
)
-func serverShutdown(signals <-chan os.Signal, srv *grpc.Server, rooms *mansion.Mansion) {
+var shutdown []func()
+
+func serverShutdown(signals <-chan os.Signal) {
sig := <-signals
glog.Infof("received %s, shutting down", sig)
var wg sync.WaitGroup
- wg.Add(2)
- go func() {
- defer wg.Done()
- awaitStop := make(chan struct{})
- go func() {
- srv.GracefulStop()
- close(awaitStop)
- }()
- select {
- case <-awaitStop:
- case <-time.After(5 * time.Second):
- srv.Stop()
- }
- }()
-
- go func() {
- defer wg.Done()
- rooms.Close()
- }()
+ for _, f := range shutdown {
+ wg.Add(1)
+ go func(f func()) {
+ defer wg.Done()
+ f()
+ }(f)
+ }
wg.Wait()
}
@@ -50,13 +44,14 @@
func startServer() error {
sigs := make(chan os.Signal, 8)
- srv := grpc.NewServer()
roomMan := mansion.New()
- protocol.RegisterUniViewServer(srv, &server.Server{
+ shutdown = append(shutdown, roomMan.Close)
+
+ grpcsrv := grpc.NewServer()
+ protocol.RegisterUniViewServer(grpcsrv, &server.Server{
Rooms: roomMan,
})
- go serverShutdown(sigs, srv, roomMan)
- signal.Notify(sigs, os.Interrupt)
+ shutdown = append(shutdown, grpcShutdown(grpcsrv))
glog.Debugf("starting listener on %s", config.Server.General.Bind)
lis, err := net.Listen("tcp", config.Server.General.Bind)
@@ -64,5 +59,46 @@ if err != nil {
return fmt.Errorf("failed to start listener: %w", err)
}
- return srv.Serve(lis)
+ handler, err := wraphttp.NewServer(grpcsrv)
+ if err != nil {
+ return fmt.Errorf("failed to wrap gRPC: %w", err)
+ }
+
+ go serverShutdown(sigs)
+ signal.Notify(sigs, os.Interrupt)
+
+ srv := &http.Server{
+ Addr: config.Server.General.Bind,
+ Handler: handler,
+ }
+ shutdown = append(shutdown, httpShutdown(srv.Shutdown))
+
+ err = srv.Serve(lis)
+ if err != nil && !errors.Is(err, http.ErrServerClosed) {
+ return err
+ }
+ return nil
+}
+
+func httpShutdown(srv func(context.Context) error) func() {
+ return func() {
+ ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
+ defer cancel()
+ srv(ctx)
+ }
+}
+
+func grpcShutdown(srv *grpc.Server) func() {
+ return func() {
+ awaitStop := make(chan struct{})
+ go func() {
+ srv.GracefulStop()
+ close(awaitStop)
+ }()
+ select {
+ case <-awaitStop:
+ case <-time.After(5 * time.Second):
+ srv.Stop()
+ }
+ }
}
|