archive
/
tailscale
mirror of https://github.com/tailscale/tailscale/
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

cmd/tsconnect: prefetch main.wasm when serving

Browse Source 
Avoids waterfalling of requests from the file (its load is triggered
from JavaScript).

Also has other cleanups to index.html, adding a <title> and moving the
<script> to being loaded sooner (but still not delaying page rendering
by using the defer attribute).

Fixes #5141
Fixes #5135

Signed-off-by: Mihai Parparita <mihai@tailscale.com>
pull/5278/head
Mihai Parparita 2 years ago committed by Mihai Parparita
parent f04bc31820
commit 52d769d35c
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File

3
cmd/tsconnect/common.go
Unescape Escape View File

@ -119,6 +119,9 @@ func runYarn(args ...string) error {
// from entry points to hashed file names. // from entry points to hashed file names.
type EsbuildMetadata struct { type EsbuildMetadata struct {
Outputs map[string]struct { Outputs map[string]struct {
Inputs map[string]struct {
BytesInOutput int64 `json:"bytesInOutput"`
} `json:"inputs,omitempty"`
EntryPoint string `json:"entryPoint,omitempty"` EntryPoint string `json:"entryPoint,omitempty"`
} `json:"outputs,omitempty"` } `json:"outputs,omitempty"`
} }

3
cmd/tsconnect/index.html
Unescape Escape View File

@ -3,7 +3,9 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" /> <meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Tailscale Connect</title>
<link rel="stylesheet" type="text/css" href="dist/index.css" /> <link rel="stylesheet" type="text/css" href="dist/index.css" />
<script src="dist/index.js" defer></script>
</head> </head>
<body class="flex flex-col h-screen overflow-hidden"> <body class="flex flex-col h-screen overflow-hidden">
<div class="bg-gray-100 border-b border-gray-200 pt-4 pb-2"> <div class="bg-gray-100 border-b border-gray-200 pt-4 pb-2">
@ -38,6 +40,5 @@
enabled. Give it a try! enabled. Give it a try!
</div> </div>
</div> </div>
<script src="dist/index.js"></script>
</body> </body>
</html> </html>

13
cmd/tsconnect/serve.go
Unescape Escape View File

@ -83,10 +83,19 @@ func generateServeIndex(distFS fs.FS) ([]byte, error) {
return nil, fmt.Errorf("Could not parse esbuild-metadata.json: %w", err) return nil, fmt.Errorf("Could not parse esbuild-metadata.json: %w", err)
} }
entryPointsToHashedDistPaths := make(map[string]string) entryPointsToHashedDistPaths := make(map[string]string)
mainWasmPath := ""
for outputPath, output := range esbuildMetadata.Outputs { for outputPath, output := range esbuildMetadata.Outputs {
if output.EntryPoint != "" { if output.EntryPoint != "" {
entryPointsToHashedDistPaths[output.EntryPoint] = path.Join("dist", outputPath) entryPointsToHashedDistPaths[output.EntryPoint] = path.Join("dist", outputPath)
} }
if path.Ext(outputPath) == ".wasm" {
for input := range output.Inputs {
if input == "src/main.wasm" {
mainWasmPath = path.Join("dist", outputPath)
break
}
}
}
} }
indexBytes := rawIndexBytes indexBytes := rawIndexBytes
@ -96,6 +105,10 @@ func generateServeIndex(distFS fs.FS) ([]byte, error) {
indexBytes = bytes.ReplaceAll(indexBytes, []byte(defaultDistPath), []byte(hashedDistPath)) indexBytes = bytes.ReplaceAll(indexBytes, []byte(defaultDistPath), []byte(hashedDistPath))
} }
} }
if mainWasmPath != "" {
mainWasmPrefetch := fmt.Sprintf("</title>\n<link rel='preload' as='fetch' crossorigin='anonymous' href='%s'>", mainWasmPath)
indexBytes = bytes.ReplaceAll(indexBytes, []byte("</title>"), []byte(mainWasmPrefetch))
}
return indexBytes, nil return indexBytes, nil
} }

Write Preview
Loading…
Cancel
Save