e2m/dispatch
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Create sessions on boot requests instead of websocket handshakes

Browse Source
This commit is contained in:
Ken-Håvard Lieng 2018-11-17 11:52:36 +01:00
parent da87dccb53
commit 90785aba20
8 changed files with 141 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
assets/bindata.go
View File

File diff suppressed because one or more lines are too long

5
client/js/boot.js
View File

@ -1,9 +1,6 @@
/* eslint-disable no-underscore-dangle */ /* eslint-disable no-underscore-dangle */
// This entrypoint gets inlined in the index page cached by service workers window.__init__ = fetch('/init', {
// and is responsible for fetching the data we would otherwise embed
window.__env__ = fetch('/data', {
credentials: 'same-origin' credentials: 'same-origin'
}).then(res => { }).then(res => {
if (res.ok) { if (res.ok) {

11
client/js/modules/initialState.js
View File

@ -70,11 +70,8 @@ function loadState({ store }, env) {
}); });
} }
export default function initialState(ctx) { export default async function initialState(ctx) {
if (window.__env__) { const env = await window.__init__;
window.__env__.then(env => loadState(ctx, env)); ctx.socket.connect();
} else { loadState(ctx, env);
const env = JSON.parse(document.getElementById('env').innerHTML);
loadState(ctx, env);
}
} }

2
client/js/utils/Socket.js
View File

@ -14,8 +14,6 @@ export default class Socket {
}); });
this.handlers = []; this.handlers = [];
this.connected = false; this.connected = false;
this.connect();
} }
connect() { connect() {

12
server/index.egon
View File

@ -1,6 +1,4 @@
<%! data *indexData, cssPath string, inlineScript string, scripts []string, sw bool %> <%! cssPath string, inlineScript string, scripts []string %>
<%% import "github.com/mailru/easyjson" %%>
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en"> <html lang="en">
@ -13,9 +11,7 @@
<title>Dispatch</title> <title>Dispatch</title>
<meta name="description" content="Web-based IRC client."> <meta name="description" content="Web-based IRC client.">
<% if sw { %> <link rel="preload" href="/init" as="fetch" crossorigin>
<link rel="preload" href="/data" as="fetch" crossorigin>
<% } %>
<script> <script>
<%== inlineScript %> <%== inlineScript %>
@ -37,10 +33,6 @@
<body> <body>
<div id="root"></div> <div id="root"></div>
<% if data != nil { %>
<script id="env" type="application/json"><% easyjson.MarshalToWriter(data, w) %></script>
<% } %>
<% for _, script := range scripts { %> <% for _, script := range scripts { %>
<script src="<%== script %>"></script> <script src="<%== script %>"></script>
<% } %> <% } %>

14
server/index.egon.go
View File

@ -4,15 +4,10 @@
package server package server
import ( import (
"io" "io"
"github.com/mailru/easyjson"
) )
func IndexTemplate(w io.Writer, data *indexData, cssPath string, inlineScript string, scripts []string, sw bool) error { func IndexTemplate(w io.Writer, cssPath string, inlineScript string, scripts []string) error {
io.WriteString(w, "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta name=\"theme-color\" content=\"#f0f0f0\"><title>Dispatch</title><meta name=\"description\" content=\"Web-based IRC client.\">") io.WriteString(w, "<!DOCTYPE html><html lang=\"en\"><head><meta charset=\"utf-8\"><meta name=\"viewport\" content=\"width=device-width, initial-scale=1\"><meta name=\"theme-color\" content=\"#f0f0f0\"><title>Dispatch</title><meta name=\"description\" content=\"Web-based IRC client.\"><link rel=\"preload\" href=\"/init\" as=\"fetch\" crossorigin><script>")
if sw {
io.WriteString(w, "<link rel=\"preload\" href=\"/data\" as=\"fetch\" crossorigin>")
}
io.WriteString(w, "<script>")
io.WriteString(w, inlineScript ) io.WriteString(w, inlineScript )
io.WriteString(w, "</script><link rel=\"preload\" href=\"/font/fontello.woff2?48901973\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/RobotoMono-Regular.woff2\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/Montserrat-Regular.woff2\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/Montserrat-Bold.woff2\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/RobotoMono-Bold.woff2\" as=\"font\" type=\"font/woff2\" crossorigin>") io.WriteString(w, "</script><link rel=\"preload\" href=\"/font/fontello.woff2?48901973\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/RobotoMono-Regular.woff2\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/Montserrat-Regular.woff2\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/Montserrat-Bold.woff2\" as=\"font\" type=\"font/woff2\" crossorigin><link rel=\"preload\" href=\"/font/RobotoMono-Bold.woff2\" as=\"font\" type=\"font/woff2\" crossorigin>")
if cssPath != "" { if cssPath != "" {
@ -21,11 +16,6 @@ io.WriteString(w, cssPath )
io.WriteString(w, "\" rel=\"stylesheet\">") io.WriteString(w, "\" rel=\"stylesheet\">")
} }
io.WriteString(w, "<link rel=\"manifest\" href=\"/manifest.json\"></head><body><div id=\"root\"></div>") io.WriteString(w, "<link rel=\"manifest\" href=\"/manifest.json\"></head><body><div id=\"root\"></div>")
if data != nil {
io.WriteString(w, "<script id=\"env\" type=\"application/json\">")
easyjson.MarshalToWriter(data, w)
io.WriteString(w, "</script>")
}
for _, script := range scripts { for _, script := range scripts {
io.WriteString(w, "<script src=\"") io.WriteString(w, "<script src=\"")
io.WriteString(w, script ) io.WriteString(w, script )

47
server/serve_files.go
View File

@ -47,13 +47,11 @@ func newH2PushAsset(name string) h2PushAsset {
var ( var (
files []*File files []*File
indexStylesheet string indexStylesheet string
indexScripts []string indexScripts []string
inlineScript string inlineScript string
inlineScriptSha256 string inlineScriptSha256 string
inlineScriptSW string serviceWorker []byte
inlineScriptSWSha256 string
serviceWorker []byte
h2PushAssets []h2PushAsset h2PushAssets []h2PushAsset
h2PushCookieValue string h2PushCookieValue string
@ -82,17 +80,12 @@ func (d *Dispatch) initFileServer() {
bootloader := decompressedAsset(findAssetName("boot*.js")) bootloader := decompressedAsset(findAssetName("boot*.js"))
runtime := decompressedAsset(findAssetName("runtime*.js")) runtime := decompressedAsset(findAssetName("runtime*.js"))
inlineScript = string(runtime) inlineScript = string(bootloader) + string(runtime)
inlineScriptSW = string(bootloader) + string(runtime)
hash := sha256.New() hash := sha256.New()
hash.Write(runtime)
inlineScriptSha256 = base64.StdEncoding.EncodeToString(hash.Sum(nil))
hash.Reset()
hash.Write(bootloader) hash.Write(bootloader)
hash.Write(runtime) hash.Write(runtime)
inlineScriptSWSha256 = base64.StdEncoding.EncodeToString(hash.Sum(nil)) inlineScriptSha256 = base64.StdEncoding.EncodeToString(hash.Sum(nil))
indexStylesheet = findAssetName("main*.css") indexStylesheet = findAssetName("main*.css")
indexScripts = []string{ indexScripts = []string{
@ -148,15 +141,15 @@ func (d *Dispatch) initFileServer() {
serviceWorker = decompressedAsset("sw.js") serviceWorker = decompressedAsset("sw.js")
hash.Reset() hash.Reset()
IndexTemplate(hash, nil, indexStylesheet, inlineScriptSW, indexScripts, true) IndexTemplate(hash, indexStylesheet, inlineScript, indexScripts)
indexHash := base64.StdEncoding.EncodeToString(hash.Sum(nil)) indexHash := base64.StdEncoding.EncodeToString(hash.Sum(nil))
serviceWorker = append(serviceWorker, []byte(` serviceWorker = append(serviceWorker, []byte(`
workbox.precaching.precacheAndRoute([{ workbox.precaching.precacheAndRoute([{
revision: '`+indexHash+`', revision: '`+indexHash+`',
url: '/?sw' url: '/'
}]); }]);
workbox.routing.registerNavigationRoute('/?sw');`)...) workbox.routing.registerNavigationRoute('/');`)...)
if viper.GetBool("https.hsts.enabled") && viper.GetBool("https.enabled") { if viper.GetBool("https.hsts.enabled") && viper.GetBool("https.enabled") {
hstsHeader = "max-age=" + viper.GetString("https.hsts.max_age") hstsHeader = "max-age=" + viper.GetString("https.hsts.max_age")
@ -283,8 +276,6 @@ func (d *Dispatch) serveIndex(w http.ResponseWriter, r *http.Request) {
} }
} }
_, sw := r.URL.Query()["sw"]
if cspEnabled { if cspEnabled {
var wsSrc string var wsSrc string
if r.TLS != nil { if r.TLS != nil {
@ -293,14 +284,9 @@ func (d *Dispatch) serveIndex(w http.ResponseWriter, r *http.Request) {
wsSrc = "ws://" + r.Host wsSrc = "ws://" + r.Host
} }
inlineSha := inlineScriptSha256
if sw {
inlineSha = inlineScriptSWSha256
}
csp := []string{ csp := []string{
"default-src 'none'", "default-src 'none'",
"script-src 'self' 'sha256-" + inlineSha + "'", "script-src 'self' 'sha256-" + inlineScriptSha256 + "'",
"style-src 'self' 'unsafe-inline'", "style-src 'self' 'unsafe-inline'",
"font-src 'self'", "font-src 'self'",
"img-src 'self'", "img-src 'self'",
@ -323,21 +309,14 @@ func (d *Dispatch) serveIndex(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Strict-Transport-Security", hstsHeader) w.Header().Set("Strict-Transport-Security", hstsHeader)
} }
var data *indexData
inline := inlineScriptSW
if !sw {
data = getIndexData(r, r.URL.EscapedPath(), d.handleAuth(w, r, false, true))
inline = inlineScript
}
if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") { if strings.Contains(r.Header.Get("Accept-Encoding"), "gzip") {
w.Header().Set("Content-Encoding", "gzip") w.Header().Set("Content-Encoding", "gzip")
gzw := getGzipWriter(w) gzw := getGzipWriter(w)
IndexTemplate(gzw, data, indexStylesheet, inline, indexScripts, sw) IndexTemplate(gzw, indexStylesheet, inlineScript, indexScripts)
putGzipWriter(gzw) putGzipWriter(gzw)
} else { } else {
IndexTemplate(w, data, indexStylesheet, inline, indexScripts, sw) IndexTemplate(w, indexStylesheet, inlineScript, indexScripts)
} }
} }

6
server/server.go
View File

@ -172,7 +172,7 @@ func (d *Dispatch) ServeHTTP(w http.ResponseWriter, r *http.Request) {
return return
} }
state := d.handleAuth(w, r, true, true) state := d.handleAuth(w, r, false, false)
if state == nil { if state == nil {
log.Println("[Auth] No state") log.Println("[Auth] No state")
fail(w, http.StatusInternalServerError) fail(w, http.StatusInternalServerError)
@ -180,8 +180,8 @@ func (d *Dispatch) ServeHTTP(w http.ResponseWriter, r *http.Request) {
} }
d.upgradeWS(w, r, state) d.upgradeWS(w, r, state)
} else if strings.HasPrefix(r.URL.Path, "/data") { } else if strings.HasPrefix(r.URL.Path, "/init") {
state := d.handleAuth(w, r, false, false) state := d.handleAuth(w, r, true, true)
data := getIndexData(r, "/", state) data := getIndexData(r, "/", state)
writeJSON(w, r, data) writeJSON(w, r, data)