mirror of
https://gitlab.crans.org/nounous/ghostream.git
synced 2024-12-23 00:22:19 +00:00
Pack also statics during compilation
This commit is contained in:
parent
c64506dc7c
commit
48c8ff8987
@ -13,7 +13,6 @@ RUN go generate && go build -o ./out/ghostream .
|
|||||||
FROM alpine:3.12
|
FROM alpine:3.12
|
||||||
RUN apk add ca-certificates libressl libstdc++ libgcc
|
RUN apk add ca-certificates libressl libstdc++ libgcc
|
||||||
COPY --from=build_base /code/out/ghostream /app/ghostream
|
COPY --from=build_base /code/out/ghostream /app/ghostream
|
||||||
COPY --from=build_base /code/web/static /app/web/static
|
|
||||||
COPY --from=build_base /usr/local/lib64/libsrt.so.1 /lib/libsrt.so.1
|
COPY --from=build_base /usr/local/lib64/libsrt.so.1 /lib/libsrt.so.1
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
# 8080 for Web and Websocket, 2112 for prometheus monitoring and 9710 for SRT
|
# 8080 for Web and Websocket, 2112 for prometheus monitoring and 9710 for SRT
|
||||||
|
86
web/handler.go
Normal file
86
web/handler.go
Normal file
@ -0,0 +1,86 @@
|
|||||||
|
package web
|
||||||
|
|
||||||
|
import (
|
||||||
|
"encoding/json"
|
||||||
|
"log"
|
||||||
|
"net/http"
|
||||||
|
|
||||||
|
"github.com/markbates/pkger"
|
||||||
|
"github.com/pion/webrtc/v3"
|
||||||
|
"gitlab.crans.org/nounous/ghostream/internal/monitoring"
|
||||||
|
)
|
||||||
|
|
||||||
|
// Handle WebRTC session description exchange via POST
|
||||||
|
func viewerPostHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Limit response body to 128KB
|
||||||
|
r.Body = http.MaxBytesReader(w, r.Body, 131072)
|
||||||
|
|
||||||
|
// Decode client description
|
||||||
|
dec := json.NewDecoder(r.Body)
|
||||||
|
dec.DisallowUnknownFields()
|
||||||
|
remoteDescription := webrtc.SessionDescription{}
|
||||||
|
if err := dec.Decode(&remoteDescription); err != nil {
|
||||||
|
http.Error(w, "The JSON WebRTC offer is malformed", http.StatusBadRequest)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Exchange session descriptions with WebRTC stream server
|
||||||
|
remoteSdpChan <- remoteDescription
|
||||||
|
localDescription := <-localSdpChan
|
||||||
|
|
||||||
|
// Send server description as JSON
|
||||||
|
jsonDesc, err := json.Marshal(localDescription)
|
||||||
|
if err != nil {
|
||||||
|
http.Error(w, "An error occurred while formating response", http.StatusInternalServerError)
|
||||||
|
log.Println("An error occurred while sending session description", err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
w.Header().Set("Content-Type", "application/json")
|
||||||
|
w.Write(jsonDesc)
|
||||||
|
|
||||||
|
// Increment monitoring
|
||||||
|
monitoring.WebSessions.Inc()
|
||||||
|
}
|
||||||
|
|
||||||
|
func viewerGetHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Render template
|
||||||
|
data := struct {
|
||||||
|
Path string
|
||||||
|
Cfg *Options
|
||||||
|
}{Path: r.URL.Path[1:], Cfg: cfg}
|
||||||
|
if err := templates.ExecuteTemplate(w, "base", data); err != nil {
|
||||||
|
log.Println(err.Error())
|
||||||
|
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Increment monitoring
|
||||||
|
monitoring.WebViewerServed.Inc()
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle site index and viewer pages
|
||||||
|
// POST requests are used to exchange WebRTC session descriptions
|
||||||
|
func viewerHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Validation on path
|
||||||
|
if validPath.FindStringSubmatch(r.URL.Path) == nil {
|
||||||
|
http.NotFound(w, r)
|
||||||
|
log.Print(r.URL.Path)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Route depending on HTTP method
|
||||||
|
switch r.Method {
|
||||||
|
case http.MethodGet:
|
||||||
|
viewerGetHandler(w, r)
|
||||||
|
case http.MethodPost:
|
||||||
|
viewerPostHandler(w, r)
|
||||||
|
default:
|
||||||
|
http.Error(w, "Sorry, only GET and POST methods are supported.", http.StatusBadRequest)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func staticHandler() http.Handler {
|
||||||
|
// Set up static files server
|
||||||
|
staticFs := http.FileServer(pkger.Dir("/web/static"))
|
||||||
|
return http.StripPrefix("/static/", staticFs)
|
||||||
|
}
|
84
web/web.go
84
web/web.go
@ -1,7 +1,6 @@
|
|||||||
package web
|
package web
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"encoding/json"
|
|
||||||
"html/template"
|
"html/template"
|
||||||
"io/ioutil"
|
"io/ioutil"
|
||||||
"log"
|
"log"
|
||||||
@ -12,7 +11,6 @@ import (
|
|||||||
|
|
||||||
"github.com/markbates/pkger"
|
"github.com/markbates/pkger"
|
||||||
"github.com/pion/webrtc/v3"
|
"github.com/pion/webrtc/v3"
|
||||||
"gitlab.crans.org/nounous/ghostream/internal/monitoring"
|
|
||||||
)
|
)
|
||||||
|
|
||||||
// Options holds web package configuration
|
// Options holds web package configuration
|
||||||
@ -38,86 +36,6 @@ var (
|
|||||||
validPath = regexp.MustCompile("^\\/[a-z0-9_-]*\\/?$")
|
validPath = regexp.MustCompile("^\\/[a-z0-9_-]*\\/?$")
|
||||||
)
|
)
|
||||||
|
|
||||||
// Handle WebRTC session description exchange via POST
|
|
||||||
func viewerPostHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Limit response body to 128KB
|
|
||||||
r.Body = http.MaxBytesReader(w, r.Body, 131072)
|
|
||||||
|
|
||||||
// Decode client description
|
|
||||||
dec := json.NewDecoder(r.Body)
|
|
||||||
dec.DisallowUnknownFields()
|
|
||||||
remoteDescription := webrtc.SessionDescription{}
|
|
||||||
if err := dec.Decode(&remoteDescription); err != nil {
|
|
||||||
http.Error(w, "The JSON WebRTC offer is malformed", http.StatusBadRequest)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Exchange session descriptions with WebRTC stream server
|
|
||||||
remoteSdpChan <- remoteDescription
|
|
||||||
localDescription := <-localSdpChan
|
|
||||||
|
|
||||||
// Send server description as JSON
|
|
||||||
jsonDesc, err := json.Marshal(localDescription)
|
|
||||||
if err != nil {
|
|
||||||
http.Error(w, "An error occurred while formating response", http.StatusInternalServerError)
|
|
||||||
log.Println("An error occurred while sending session description", err)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
w.Header().Set("Content-Type", "application/json")
|
|
||||||
w.Write(jsonDesc)
|
|
||||||
|
|
||||||
// Increment monitoring
|
|
||||||
monitoring.WebSessions.Inc()
|
|
||||||
}
|
|
||||||
|
|
||||||
func viewerGetHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Render template
|
|
||||||
data := struct {
|
|
||||||
Path string
|
|
||||||
Cfg *Options
|
|
||||||
}{Path: r.URL.Path[1:], Cfg: cfg}
|
|
||||||
if err := templates.ExecuteTemplate(w, "base", data); err != nil {
|
|
||||||
log.Println(err.Error())
|
|
||||||
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Increment monitoring
|
|
||||||
monitoring.WebViewerServed.Inc()
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle site index and viewer pages
|
|
||||||
// POST requests are used to exchange WebRTC session descriptions
|
|
||||||
func viewerHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
// Validation on path
|
|
||||||
if validPath.FindStringSubmatch(r.URL.Path) == nil {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
log.Print(r.URL.Path)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
// Route depending on HTTP method
|
|
||||||
switch r.Method {
|
|
||||||
case http.MethodGet:
|
|
||||||
viewerGetHandler(w, r)
|
|
||||||
case http.MethodPost:
|
|
||||||
viewerPostHandler(w, r)
|
|
||||||
default:
|
|
||||||
http.Error(w, "Sorry, only GET and POST methods are supported.", http.StatusBadRequest)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle static files
|
|
||||||
// We do not use http.FileServer as we do not want directory listing
|
|
||||||
func staticHandler(w http.ResponseWriter, r *http.Request) {
|
|
||||||
path := "./web/" + r.URL.Path
|
|
||||||
if f, err := os.Stat(path); err == nil && !f.IsDir() {
|
|
||||||
http.ServeFile(w, r, path)
|
|
||||||
} else {
|
|
||||||
http.NotFound(w, r)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Load templates with pkger
|
// Load templates with pkger
|
||||||
// templates will be packed in the compiled binary
|
// templates will be packed in the compiled binary
|
||||||
func loadTemplates() error {
|
func loadTemplates() error {
|
||||||
@ -162,7 +80,7 @@ func Serve(rSdpChan chan webrtc.SessionDescription, lSdpChan chan webrtc.Session
|
|||||||
// Set up HTTP router and server
|
// Set up HTTP router and server
|
||||||
mux := http.NewServeMux()
|
mux := http.NewServeMux()
|
||||||
mux.HandleFunc("/", viewerHandler)
|
mux.HandleFunc("/", viewerHandler)
|
||||||
mux.HandleFunc("/static/", staticHandler)
|
mux.Handle("/static/", staticHandler())
|
||||||
log.Printf("HTTP server listening on %s", cfg.ListenAddress)
|
log.Printf("HTTP server listening on %s", cfg.ListenAddress)
|
||||||
log.Fatal(http.ListenAndServe(cfg.ListenAddress, mux))
|
log.Fatal(http.ListenAndServe(cfg.ListenAddress, mux))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user