Add server-side hydration of initial config+status. Closes #1964

This commit is contained in:
Gabe Kangas
2022-09-10 15:37:07 -07:00
parent 92ef860387
commit 42ff0cdb01
6 changed files with 114 additions and 16 deletions

View File

@@ -61,6 +61,14 @@ func GetWebConfig(w http.ResponseWriter, r *http.Request) {
middleware.DisableCache(w)
w.Header().Set("Content-Type", "application/json")
configuration := getConfigResponse()
if err := json.NewEncoder(w).Encode(configuration); err != nil {
BadRequestHandler(w, err)
}
}
func getConfigResponse() webConfigResponse {
pageContent := utils.RenderPageContentMarkdown(data.GetExtraPageBodyContent())
socialHandles := data.GetSocialHandles()
for i, handle := range socialHandles {
@@ -106,7 +114,7 @@ func GetWebConfig(w http.ResponseWriter, r *http.Request) {
IndieAuthEnabled: data.GetServerURL() != "",
}
configuration := webConfigResponse{
return webConfigResponse{
Name: data.GetServerName(),
Summary: serverSummary,
OfflineMessage: data.GetCustomOfflineMessage(),
@@ -126,10 +134,6 @@ func GetWebConfig(w http.ResponseWriter, r *http.Request) {
Notifications: notificationsResponse,
Authentication: authenticationResponse,
}
if err := json.NewEncoder(w).Encode(configuration); err != nil {
BadRequestHandler(w, err)
}
}
// GetAllSocialPlatforms will return a list of all social platform types.

View File

@@ -1,10 +1,14 @@
package controllers
import (
"encoding/json"
"net/http"
"path/filepath"
"strings"
"github.com/owncast/owncast/core/data"
"github.com/owncast/owncast/router/middleware"
"github.com/owncast/owncast/static"
"github.com/owncast/owncast/utils"
)
@@ -19,6 +23,11 @@ func IndexHandler(w http.ResponseWriter, r *http.Request) {
return
}
if isIndexRequest {
renderIndexHtml(w)
return
}
// Set a cache control max-age header
middleware.SetCachingHeaders(w, r)
@@ -27,3 +36,53 @@ func IndexHandler(w http.ResponseWriter, r *http.Request) {
serveWeb(w, r)
}
func renderIndexHtml(w http.ResponseWriter) {
type serverSideContent struct {
Name string
Summary string
RequestedURL string
TagsString string
ThumbnailURL string
Thumbnail string
Image string
StatusJSON string
ServerConfigJSON string
}
status := getStatusResponse()
sb, err := json.Marshal(status)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
config := getConfigResponse()
cb, err := json.Marshal(config)
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
content := serverSideContent{
Name: data.GetServerName(),
Summary: data.GetServerSummary(),
RequestedURL: data.GetServerURL(),
TagsString: strings.Join(data.GetServerMetadataTags(), ","),
ThumbnailURL: "/thumbnail",
Thumbnail: "/thumbnail",
Image: "/logo/external",
StatusJSON: string(sb),
ServerConfigJSON: string(cb),
}
index, err := static.GetWebIndexTemplate()
if err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
if err := index.Execute(w, content); err != nil {
http.Error(w, err.Error(), http.StatusInternalServerError)
}
}

View File

@@ -13,6 +13,17 @@ import (
// GetStatus gets the status of the server.
func GetStatus(w http.ResponseWriter, r *http.Request) {
response := getStatusResponse()
w.Header().Set("Content-Type", "application/json")
middleware.DisableCache(w)
if err := json.NewEncoder(w).Encode(response); err != nil {
InternalErrorHandler(w, err)
}
}
func getStatusResponse() webStatusResponse {
status := core.GetStatus()
response := webStatusResponse{
Online: status.Online,
@@ -22,17 +33,10 @@ func GetStatus(w http.ResponseWriter, r *http.Request) {
VersionNumber: status.VersionNumber,
StreamTitle: status.StreamTitle,
}
if !data.GetHideViewerCount() {
response.ViewerCount = status.ViewerCount
}
w.Header().Set("Content-Type", "application/json")
middleware.DisableCache(w)
if err := json.NewEncoder(w).Encode(response); err != nil {
InternalErrorHandler(w, err)
}
return response
}
type webStatusResponse struct {