github/wails
5
0
Fork 0
mirror of https://github.com/wailsapp/wails.git synced 2025-05-02 19:50:15 +08:00
Code Projects Activity

Feature/1175 default index page (#1229)

Browse Source 
* Initial commit

* Retry index.html every 500ms for 5s before defaulting to the default index page.

* Load all files using the same technique

* Remove reload script
This commit is contained in:
Lea Anthony 2022-03-09 23:49:27 +11:00 committed by GitHub
parent ba0b173e02
commit ae6da05e9d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
v2/internal/frontend/assetserver/assetserver_desktop.go
View File

@ -3,14 +3,19 @@ package assetserver
import (
"bytes"
"context"
_ "embed"
"io/fs"
"log"
"strings"
"time"
"github.com/wailsapp/wails/v2/internal/frontend/runtime"
"github.com/wailsapp/wails/v2/internal/logger"
)
//go:embed defaultindex.html
var defaultHTML []byte
type DesktopAssetServer struct {
assets fs.FS
runtimeJS []byte
@ -45,10 +50,24 @@ func (d *DesktopAssetServer) LogDebug(message string, args ...interface{}) {
}
}
func (a *DesktopAssetServer) processIndexHTML() ([]byte, error) {
indexHTML, err := fs.ReadFile(a.assets, "index.html")
// loadFile will try to load the file from disk. If there is an error
// it will retry until eventually it will give up and error.
func (d *DesktopAssetServer) loadFile(filename string) ([]byte, error) {
var result []byte
var err error
for tries := 0; tries < 50; tries++ {
result, err = fs.ReadFile(d.assets, filename)
if err != nil {
time.Sleep(100 * time.Millisecond)
}
}
return result, err
}
func (d *DesktopAssetServer) processIndexHTML() ([]byte, error) {
indexHTML, err := d.loadFile("index.html")
if err != nil {
return nil, err
indexHTML = defaultHTML
}
wailsOptions, err := extractOptions(indexHTML)
if err != nil {
@ -71,20 +90,20 @@ func (a *DesktopAssetServer) processIndexHTML() ([]byte, error) {
return indexHTML, nil
}
func (a *DesktopAssetServer) Load(filename string) ([]byte, string, error) {
func (d *DesktopAssetServer) Load(filename string) ([]byte, string, error) {
var content []byte
var err error
switch filename {
case "/":
content, err = a.processIndexHTML()
content, err = d.processIndexHTML()
case "/wails/runtime.js":
content = a.runtimeJS
content = d.runtimeJS
case "/wails/ipc.js":
content = runtime.DesktopIPC
default:
filename = strings.TrimPrefix(filename, "/")
a.LogDebug("Loading file: %s", filename)
content, err = fs.ReadFile(a.assets, filename)
d.LogDebug("Loading file: %s", filename)
content, err = d.loadFile(filename)
}
if err != nil {
return nil, "", err

39
v2/internal/frontend/assetserver/defaultindex.html Normal file
View File

File diff suppressed because one or more lines are too long