diff --git a/WFA-JS b/WFA-JS index 7bbd8f6..57296ed 160000 --- a/WFA-JS +++ b/WFA-JS @@ -1 +1 @@ -Subproject commit 7bbd8f6eb31959f819d3affc7e14edb8e35a54af +Subproject commit 57296ed3033bfb5a3333a51dcac8c877e425ecaa diff --git a/app/app.go b/app/app.go index 037293f..62a5897 100644 --- a/app/app.go +++ b/app/app.go @@ -53,24 +53,28 @@ func ServeStatic(router *gin.Engine, m *minify.M) { router.GET("/css/*css", func(c *gin.Context) { path, _ := c.Params.Get("css") data := css[fmt.Sprintf("css%s", path)] + c.Header("Content-Encoding", data.MimeType.Encoding) c.Data(200, data.MimeType.Type, []byte(data.Data)) }) images := common.MinifyStatic(m, web.Images_fs) router.GET("/images/*image", func(c *gin.Context) { path, _ := c.Params.Get("image") data := images[fmt.Sprintf("images%s", path)] + c.Header("Content-Encoding", data.MimeType.Encoding) c.Data(200, data.MimeType.Type, []byte(data.Data)) }) modules := common.MinifyStatic(m, web.Modules_fs) router.GET("/modules/*module", func(c *gin.Context) { path, _ := c.Params.Get("module") data := modules[fmt.Sprintf("modules%s", path)] + c.Header("Content-Encoding", data.MimeType.Encoding) c.Data(200, data.MimeType.Type, []byte(data.Data)) }) scripts := common.MinifyStatic(m, web.Scripts_fs) router.GET("/scripts/*script", func(c *gin.Context) { path, _ := c.Params.Get("script") data := scripts[fmt.Sprintf("scripts%s", path)] + c.Header("Content-Encoding", data.MimeType.Encoding) c.Data(200, data.MimeType.Type, []byte(data.Data)) }) } diff --git a/app/common/meta_debug.go b/app/common/meta_debug.go index e31203b..1af17cf 100644 --- a/app/common/meta_debug.go +++ b/app/common/meta_debug.go @@ -11,6 +11,7 @@ import ( // defines mime type and associated minifier type MimeType struct { Type string + Encoding string Minifier func(m *minify.M, w io.Writer, r io.Reader, params map[string]string) error } @@ -44,6 +45,11 @@ var MimeTypes = map[string]MimeType{ Type: "application/wasm", Minifier: nil, }, + "gz": { + Type: "application/wasm", + Encoding: "gzip", + Minifier: nil, + }, "*": { Type: "text/plain", Minifier: nil, diff --git a/app/common/meta_release.go b/app/common/meta_release.go index fd736bd..8d23226 100644 --- a/app/common/meta_release.go +++ b/app/common/meta_release.go @@ -15,6 +15,7 @@ import ( // defines mime type and associated minifier type MimeType struct { Type string + Encoding string Minifier func(m *minify.M, w io.Writer, r io.Reader, params map[string]string) error } @@ -48,6 +49,11 @@ var MimeTypes = map[string]MimeType{ Type: "application/wasm", Minifier: nil, }, + "gz": { + Type: "application/wasm", + Encoding: "gzip", + Minifier: nil, + }, "*": { Type: "text/plain", Minifier: nil, diff --git a/web/modules/wfa.wasm b/web/modules/wfa.wasm deleted file mode 100644 index c49810b..0000000 Binary files a/web/modules/wfa.wasm and /dev/null differ diff --git a/web/modules/wfa.wasm.gz b/web/modules/wfa.wasm.gz new file mode 100755 index 0000000..8606f42 Binary files /dev/null and b/web/modules/wfa.wasm.gz differ diff --git a/web/scripts/index.js b/web/scripts/index.js index a989c11..58a4cd5 100644 --- a/web/scripts/index.js +++ b/web/scripts/index.js @@ -10,7 +10,7 @@ var wfa; async function init () { setAppearance(); - wfa = await wfaInit("modules/wfa.wasm"); + wfa = await wfaInit("modules/wfa.wasm.gz"); initInstances(); document.querySelector("#instance-add").addEventListener("click", handleInstanceAddButton);