Open platform to collect and prioritize feedback
refactor: fail fast on SSR
goenning717ce26b2f19
diff --git a/app/pkg/web/react.go b/app/pkg/web/react.goindex c5080f5f8..f798aea9b 100644--- a/app/pkg/web/react.go+++ b/app/pkg/web/react.go@@ -17,20 +17,30 @@ type ReactRenderer struct {ctx *v8go.Context}-func NewReactRenderer(scriptPath string) *ReactRenderer {- bytes, _ := os.ReadFile(env.Path(scriptPath))+func NewReactRenderer(scriptPath string) (*ReactRenderer, error) {isolate, err := v8go.NewIsolate()if err != nil {- return &ReactRenderer{scriptPath: scriptPath}+ return nil, errors.Wrap(err, "unable to initialize v8 isolate.")}- v8ctx, _ := v8go.NewContext(isolate)- _, err = v8ctx.RunScript(string(bytes), scriptPath)+ v8ctx, err := v8go.NewContext(isolate)if err != nil {- return &ReactRenderer{scriptPath: scriptPath}+ return nil, errors.Wrap(err, "unable to initialize v8 context.")}- return &ReactRenderer{ctx: v8ctx, scriptPath: scriptPath, scriptContent: bytes}+ bytes, err := os.ReadFile(env.Path(scriptPath))+ if err != nil {+ return nil, errors.Wrap(err, "failed to read SSR script.")+ }++ if len(bytes) > 0 {+ _, err = v8ctx.RunScript(string(bytes), scriptPath)+ if err != nil {+ return nil, errors.Wrap(err, "failed to execute SSR script.")+ }+ }++ return &ReactRenderer{ctx: v8ctx, scriptPath: scriptPath, scriptContent: bytes}, nil}func (r *ReactRenderer) Render(u *url.URL, props Map) (string, error) {diff --git a/app/pkg/web/react_test.go b/app/pkg/web/react_test.goindex 4df004fc2..dba17468c 100644--- a/app/pkg/web/react_test.go+++ b/app/pkg/web/react_test.go@@ -12,7 +12,18 @@ import (func TestReactRenderer_FileNotFound(t *testing.T) {RegisterT(t)- r := web.NewReactRenderer("unknown.js")+ r, err := web.NewReactRenderer("unknown.js")+ Expect(err).IsNotNil()+ Expect(r).IsNil()+}++func TestReactRenderer_EmptyFile(t *testing.T) {+ RegisterT(t)++ r, err := web.NewReactRenderer("/app/pkg/web/testdata/empty.js")+ Expect(err).IsNil()+ Expect(r).IsNotNil()+u, _ := url.Parse("https://github.com")html, err := r.Render(u, web.Map{})Expect(html).Equals("")@@ -22,7 +33,9 @@ func TestReactRenderer_FileNotFound(t *testing.T) {func TestReactRenderer_RenderEmptyHomeHTML(t *testing.T) {RegisterT(t)- r := web.NewReactRenderer("ssr.js")+ r, err := web.NewReactRenderer("ssr.js")+ Expect(err).IsNil()+u, _ := url.Parse("https://demo.test.fider.io")html, err := r.Render(u, web.Map{"tenant": &entity.Tenant{},@@ -46,7 +59,9 @@ func TestReactRenderer_RenderEmptyHomeHTML(t *testing.T) {func TestReactRenderer_RenderEmptyHomeHTML_Portuguese(t *testing.T) {RegisterT(t)- r := web.NewReactRenderer("ssr.js")+ r, err := web.NewReactRenderer("ssr.js")+ Expect(err).IsNil()+u, _ := url.Parse("https://demo.test.fider.io")html, err := r.Render(u, web.Map{"tenant": &entity.Tenant{},diff --git a/app/pkg/web/renderer.go b/app/pkg/web/renderer.goindex 6a4be04f4..0e35dc84b 100644--- a/app/pkg/web/renderer.go+++ b/app/pkg/web/renderer.go@@ -92,10 +92,15 @@ type Renderer struct {// NewRenderer creates a new Rendererfunc NewRenderer() *Renderer {+ reactRenderer, err := NewReactRenderer("ssr.js")+ if err != nil && env.Config.Experimental_SSR_SEO {+ panic(errors.Wrap(err, "failed to initialize SSR renderer"))+ }+return &Renderer{templates: make(map[string]*template.Template),mutex: sync.RWMutex{},- reactRenderer: NewReactRenderer("ssr.js"),+ reactRenderer: reactRenderer,}}@@ -273,7 +278,7 @@ func (r *Renderer) Render(w io.Writer, statusCode int, templateName string, prop}// Only index.html template uses React, other templates are already SSR- if env.Config.Experimental_SSR_SEO && ctx.Request.IsCrawler() && templateName == "index.html" {+ if env.Config.Experimental_SSR_SEO && !ctx.Request.IsCrawler() && templateName == "index.html" {html, err := r.reactRenderer.Render(ctx.Request.URL, public)if err != nil {log.Errorf(ctx, "Failed to render react page: @{Error}", dto.Props{diff --git a/app/pkg/web/testdata/empty.js b/app/pkg/web/testdata/empty.jsnew file mode 100644index 000000000..e69de29bbdiff --git a/views/ssr.html b/views/ssr.htmlindex 5e1d8dea4..8449b205a 100644--- a/views/ssr.html+++ b/views/ssr.html@@ -1,7 +1,7 @@{{define "head"}}{{range $asset := .private.preloadAssets}}{{if $asset}}- {{range $asset.CSS}}<link rel="preload" href="{{ $.public.settings.assetsURL }}{{ . }}" as="style" />{{end}}+ {{range $asset.CSS}}<link href="{{ $.public.settings.assetsURL }}{{ . }}" rel="stylesheet" />{{end}}{{end}}{{end}}{{end}}