Bugfix operation in "server/hybrid" modes

go.embed asset handling in  production build
call the OnStartup() callback when running the null frontend
structure the app_hybrid_server.go to follow the structure and code of app_production.go

v2/go.mod

@@ -1,6 +1,8 @@
 module github.com/wailsapp/wails/v2
 
-go 1.20
+go 1.21
+
+toolchain go1.22.1
 
 require (
  github.com/Masterminds/semver v1.5.0

v2/go.sum

@@ -14,6 +14,7 @@ github.com/MarvinJWendt/testza v0.2.12/go.mod h1:JOIegYyV7rX+7VZ9r77L/eH6CfJHHzX
 github.com/MarvinJWendt/testza v0.3.0/go.mod h1:eFcL4I0idjtIx8P9C6KkAuLgATNKpX4/2oUqKc6bF2c=
 github.com/MarvinJWendt/testza v0.4.2/go.mod h1:mSdhXiKH8sg/gQehJ63bINcCKp7RtYewEjXsvsVUPbE=
 github.com/MarvinJWendt/testza v0.4.3 h1:u2XaM4IqGp9dsdUmML8/Z791fu4yjQYzOiufOtJwTII=
+github.com/MarvinJWendt/testza v0.4.3/go.mod h1:CpXaOfceNEYnLDtNIyTrPPcCpDJYqzZnu2aiA2Wp33U=
 github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww=
 github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y=
 github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
@@ -28,7 +29,9 @@ github.com/acarl005/stripansi v0.0.0-20180116102854-5a71ef0e047d/go.mod h1:asat6
 github.com/alecthomas/chroma v0.10.0 h1:7XDcGkCQopCNKjZHfYrNLraA+M7e0fMiJ/Mfikbfjek=
 github.com/alecthomas/chroma v0.10.0/go.mod h1:jtJATyUxlIORhUOFNA9NZDWGAQ8wpxQQqNSB4rjA/1s=
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFIImctFaOjnTIavg87rW78vTPkQqLI8=
+github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
+github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
 github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk=
 github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
 github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
@@ -52,6 +55,7 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
 github.com/dlclark/regexp2 v1.4.0 h1:F1rxgk7p4uKjwIQxBs9oAXe5CqrXlCduYEJvrF4u93E=
 github.com/dlclark/regexp2 v1.4.0/go.mod h1:2pZnwuY/m+8K6iRw6wQdMtk+rH5tNGR1i55kozfMjCc=
 github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a h1:mATvB/9r/3gvcejNsXKSkQ6lcIaNec2nyfOdlTBR2lU=
+github.com/elazarl/goproxy v0.0.0-20230808193330-2592e75ae04a/go.mod h1:Ro8st/ElPeALwNFlcTpWmkr6IoMFfkjXAvTHpevnDsM=
 github.com/emirpasic/gods v1.18.1 h1:FXtiHYKDGKCW2KzwZKx0iC0PQmdlorYgdFG9jPXJ1Bc=
 github.com/emirpasic/gods v1.18.1/go.mod h1:8tpGGwCnJ5H4r6BWwaV6OrWmMoPhUl5jm/FMNAnJvWQ=
 github.com/flytam/filenamify v1.0.0 h1:ewx6BY2dj7U6h2zGPJmt33q/BjkSf/YsY/woQvnUNIs=
@@ -61,11 +65,13 @@ github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
 github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
 github.com/gliderlabs/ssh v0.3.5 h1:OcaySEmAQJgyYcArR+gGGTHCyE7nvhEMTlYY+Dp8CpY=
+github.com/gliderlabs/ssh v0.3.5/go.mod h1:8XB4KraRrX39qHhT6yxPsHedjA08I/uBVwj4xC+/+z4=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376 h1:+zs/tPmkDkHx3U66DAb0lQFJrpS6731Oaa12ikc+DiI=
 github.com/go-git/gcfg v1.5.1-0.20230307220236-3a3c6141e376/go.mod h1:an3vInlBmSxCcxctByoQdvwPiA7DTK7jaaFDBTtu0ic=
 github.com/go-git/go-billy/v5 v5.5.0 h1:yEY4yhzCDuMGSv83oGxiBotRzhwhNr8VZyphhiu+mTU=
 github.com/go-git/go-billy/v5 v5.5.0/go.mod h1:hmexnoNsr2SJU1Ju67OaNz5ASJY3+sHgFRpCtpDCKow=
 github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399 h1:eMje31YglSBqCdIqdhKBW8lokaMrL3uTkpGYlE2OOT4=
+github.com/go-git/go-git-fixtures/v4 v4.3.2-0.20231010084843-55a94097c399/go.mod h1:1OCfN199q1Jm3HZlxleg+Dw/mwps2Wbk9frAWm+4FII=
 github.com/go-git/go-git/v5 v5.11.0 h1:XIZc1p+8YzypNr34itUfSvYJcv+eYdTnTvOZ2vD3cA4=
 github.com/go-git/go-git/v5 v5.11.0/go.mod h1:6GFcX2P3NM7FPBfpePbpLd21XxsgdAt+lKqXmCUiUCY=
 github.com/go-ole/go-ole v1.2.5/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0=
@@ -78,6 +84,7 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4er
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 h1:El6M4kTTCOh6aBiKaUGG7oYTSPP8MxqL4YI3kZKwcP4=
 github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510/go.mod h1:pupxD2MaaD3pAXIBCelhxNneeOaAeabZDe5s4K6zSpQ=
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
@@ -105,11 +112,14 @@ github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa02
 github.com/klauspost/cpuid/v2 v2.0.10/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/klauspost/cpuid/v2 v2.0.12/go.mod h1:g2LTdtYhdyuGPqyWyv7qRAmj1WBqxuObKfj5c0PQa7c=
 github.com/klauspost/cpuid/v2 v2.1.0 h1:eyi1Ad2aNJMW95zcSbmGg7Cg6cq3ADwLpMAP96d8rF0=
+github.com/klauspost/cpuid/v2 v2.1.0/go.mod h1:RVVoqg1df56z8g3pUjL/3lE5UfnlrJX8tyFgg4nqhuY=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE=
+github.com/kr/pretty v0.3.1/go.mod h1:hoEshYVHaxMs3cyo3Yncou5ZscifuDolrwPKZanG3xk=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/labstack/echo/v4 v4.10.2 h1:n1jAhnq/elIFTHr1EYpiYtyKgx4RW9ccVgkqByZaN2M=
 github.com/labstack/echo/v4 v4.10.2/go.mod h1:OEyqf2//K1DFdE57vw2DRgWY0M7s65IVQO2FzvI4J5k=
 github.com/labstack/gommon v0.4.0 h1:y7cvthEAEbU0yHOf4axH8ZG2NH8knB9iNSoTO8dyIk8=
@@ -161,6 +171,7 @@ github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S
 github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
 github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
 github.com/onsi/gomega v1.27.10 h1:naR28SdDFlqrG6kScpT8VWpu1xWY5nJRCF3XaYyBjhI=
+github.com/onsi/gomega v1.27.10/go.mod h1:RsS8tutOdbdgzbPtzzATp12yT7kM5I5aElG3evPbQ0M=
 github.com/pjbgf/sha1cd v0.3.0 h1:4D5XXmUUBUl/xQ6IjCkEAbqXskkq/4O7LmGn0AqMDs4=
 github.com/pjbgf/sha1cd v0.3.0/go.mod h1:nZ1rrWOcGJ5uZgEEVL1VUM9iRQiZvWdbZjkKyFzPPsI=
 github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 h1:KoWmjvw+nsYOo29YJK9vDA65RGE3NrOnUtO7a+RF9HU=
@@ -183,6 +194,7 @@ github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJ
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
 github.com/rivo/uniseg v0.4.4/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
+github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06 h1:OkMGxebDjyw0ULyrTYWeN0UNCCkmCWfjPnIA2W6oviI=
 github.com/sabhiram/go-gitignore v0.0.0-20210923224102-525f6e181f06/go.mod h1:+ePHsJ1keEjQtpvf9HHw0f4ZeJ0TLRsxhunSI2hYJSs=
 github.com/samber/lo v1.38.1 h1:j2XEAqXKb09Am4ebOg31SpvzUTTs6EN3VfgeLUhPdXM=
@@ -271,6 +283,7 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
+golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -330,6 +343,7 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
 gopkg.in/warnings.v0 v0.1.2 h1:wFXVbFY8DY5/xOe1ECiWdKCzZlxgshcYVNkBHstARME=
 gopkg.in/warnings.v0 v0.1.2/go.mod h1:jksf8JmL6Qr/oQM2OXTHunEvvTAsrWBLb6OOjuVWRNI=
 gopkg.in/yaml.v1 v1.0.0-20140924161607-9f9df34309c0/go.mod h1:WDnlLJ4WF5VGsH/HVa3CI79GS0ol3YnhVnKP89i0kNg=

v2/internal/app/app_hybrid_server.go

@@ -5,23 +5,16 @@ package app
 
 import (
  "context"
- "embed"
  "fmt"
- iofs "io/fs"
- "os"
- "path/filepath"
-
  "github.com/wailsapp/wails/v2/internal/binding"
  "github.com/wailsapp/wails/v2/internal/frontend"
  "github.com/wailsapp/wails/v2/internal/frontend/desktop"
  "github.com/wailsapp/wails/v2/internal/frontend/devserver"
  "github.com/wailsapp/wails/v2/internal/frontend/dispatcher"
  "github.com/wailsapp/wails/v2/internal/frontend/hybrid"
  "github.com/wailsapp/wails/v2/internal/frontend/runtime"
- "github.com/wailsapp/wails/v2/internal/fs"
  "github.com/wailsapp/wails/v2/internal/logger"
  "github.com/wailsapp/wails/v2/internal/menumanager"
- "github.com/wailsapp/wails/v2/internal/project"
  "github.com/wailsapp/wails/v2/pkg/options"
 )
 
@@ -42,6 +35,10 @@ type App struct {
  ctx context.Context
 }
 
+func (a *App) Shutdown() {
+ a.frontend.Quit()
+}
+
 func (a *App) Run() error {
  err := a.frontend.Run(a.ctx)
  if a.shutdownCallback != nil {
@@ -50,75 +47,49 @@ func (a *App) Run() error {
  return err
 }
 
-func (a *App) Shutdown() {
- if a.shutdownCallback != nil {
- a.shutdownCallback(a.ctx)
- }
- a.frontend.Quit()
-}
-
 // CreateApp creates the app!
 func CreateApp(appoptions *options.App) (*App, error) {
- // Set up logger
- myLogger := logger.New(appoptions.Logger)
- myLogger.SetLogLevel(appoptions.LogLevel)
+ var err error
 
- // If no assetdir has been defined, let's try to infer it from the project root and the asset FS.
- assetdir, err := tryInferAssetDirFromFS(appoptions.Assets)
- if err != nil {
- return nil, err
- }
+ ctx := context.Background()
 
- host := "localhost"
- port := int32(3112)
+ host, port := "localhost", int32(3112)
  if appoptions.Server != nil {
  host = appoptions.Server.Host
  port = appoptions.Server.Port
  }
 
  serverURI := fmt.Sprintf("%s:%d", host, port)
- ctx := context.Background()
  ctx = context.WithValue(ctx, "starturl", serverURI)
-
- // This is to enable a backend server
- // ctx = context.WithValue(ctx, "frontenddevserverurl", serverURI)
-
- myLogger.Info("Frontend available at '%s'", serverURI)
-
- // configure devserver
  ctx = context.WithValue(ctx, "devserver", fmt.Sprintf("%s:%d", host, port))
 
- // Let's override the assets to serve from on disk, if needed
- absdir, err := filepath.Abs(assetdir)
- if err != nil {
- return nil, err
- }
-
- myLogger.Info("Serving assets from disk: %s", absdir)
- appoptions.Assets = os.DirFS(absdir)
+ // Merge default options
+ options.MergeDefaults(appoptions)
 
- ctx = context.WithValue(ctx, "assetdir", assetdir)
+ debug := IsDebug()
+ ctx = context.WithValue(ctx, "debug", debug)
 
- // Attach logger to context
+ // Set up logger
+ myLogger := logger.New(appoptions.Logger)
+ myLogger.Info("Frontend available at 'http://%s'", serverURI)
+ if IsDebug() {
+ myLogger.SetLogLevel(appoptions.LogLevel)
+ } else {
+ myLogger.SetLogLevel(appoptions.LogLevelProduction)
+ }
  ctx = context.WithValue(ctx, "logger", myLogger)
- ctx = context.WithValue(ctx, "buildtype", "hybrid")
 
- // Preflight checks
+ // Preflight Checks
  err = PreflightChecks(appoptions, myLogger)
  if err != nil {
  return nil, err
  }
 
- // Merge default options
-
- options.MergeDefaults(appoptions)
-
- var menuManager *menumanager.Manager
+ // Create the menu manager
+ menuManager := menumanager.NewManager()
 
  // Process the application menu
  if appoptions.Menu != nil {
- // Create the menu manager
- menuManager = menumanager.NewManager()
  err = menuManager.SetApplicationMenu(appoptions.Menu)
  if err != nil {
  return nil, err
@@ -128,13 +99,15 @@ func CreateApp(appoptions *options.App) (*App, error) {
  // Create binding exemptions - Ugly hack. There must be a better way
  bindingExemptions := []interface{}{appoptions.OnStartup, appoptions.OnShutdown, appoptions.OnDomReady}
  appBindings := binding.NewBindings(myLogger, appoptions.Bind, bindingExemptions)
-
- err = generateBindings(appBindings)
- if err != nil {
- return nil, err
- }
  eventHandler := runtime.NewEvents(myLogger)
  ctx = context.WithValue(ctx, "events", eventHandler)
+ // Attach logger to context
+ if debug {
+ ctx = context.WithValue(ctx, "buildtype", "debug")
+ } else {
+ ctx = context.WithValue(ctx, "buildtype", "production")
+ }
+
  messageDispatcher := dispatcher.NewDispatcher(ctx, myLogger, appBindings, eventHandler)
  appFrontend := hybrid.NewFrontend(ctx, appoptions, myLogger, appBindings, messageDispatcher)
  eventHandler.AddFrontend(appFrontend)
@@ -146,64 +119,10 @@ func CreateApp(appoptions *options.App) (*App, error) {
  menuManager: menuManager,
  startupCallback: appoptions.OnStartup,
  shutdownCallback: appoptions.OnShutdown,
+ debug: debug,
+ options: appoptions,
  }
 
- result.options = appoptions
-
  return result, nil
 
 }
-
-func generateBindings(bindings *binding.Bindings) error {
-
- cwd, err := os.Getwd()
- if err != nil {
- return err
- }
- projectConfig, err := project.Load(cwd)
- if err != nil {
- return err
- }
-
- targetDir := filepath.Join(projectConfig.WailsJSDir, "wailsjs", "go")
- err = os.RemoveAll(targetDir)
- if err != nil {
- return err
- }
- _ = fs.MkDirs(targetDir)
-
- err = bindings.GenerateGoBindings(targetDir)
- if err != nil {
- return err
- }
- return nil
-}
-
-func tryInferAssetDirFromFS(assets iofs.FS) (string, error) {
- if _, isEmbedFs := assets.(embed.FS); !isEmbedFs {
- // We only infer the assetdir for embed.FS assets
- return "", nil
- }
-
- path, err := fs.FindPathToFile(assets, "index.html")
- if err != nil {
- return "", err
- }
-
- path, err = filepath.Abs(path)
- if err != nil {
- return "", err
- }
-
- if _, err := os.Stat(filepath.Join(path, "index.html")); err != nil {
- if os.IsNotExist(err) {
- err = fmt.Errorf(
- "inferred assetdir '%s' does not exist or does not contain an 'index.html' file, "+
- "please specify it with -assetdir or set it in wails.json",
- path)
- }
- return "", err
- }
-
- return path, nil
-}

v2/internal/frontend/desktop/null/frontend.go

@@ -11,14 +11,17 @@ import (
 // Frontend implements an empty Frontend that simply waits until the context is done.
 type Frontend struct {
  // Context
- ctx context.Context
+ ctx context.Context
+ frontendOptions *options.App
+
  done bool
 }
 
 // NewFrontend returns an initialized Frontend
-func NewFrontend(ctx context.Context) *Frontend {
+func NewFrontend(ctx context.Context, appoptions *options.App) *Frontend {
  return &Frontend{
- ctx: ctx,
+ frontendOptions: appoptions,
+ ctx: ctx,
  }
 }
 
@@ -73,19 +76,25 @@ func (f *Frontend) WindowSetDarkTheme() {
 }
 
 // Run waits until the context is done and then exits
-func (f *Frontend) Run(ctx context.Context) error {
+func (f *Frontend) Run(ctx context.Context) (err error) {
+ err = nil
+ go func() {
+ if f.frontendOptions.OnStartup != nil {
+ f.frontendOptions.OnStartup(f.ctx)
+ }
+ }()
  for {
  select {
  case <-ctx.Done():
- break
+ return
  default:
  time.Sleep(1 * time.Millisecond)
  }
  if f.done {
- break
+ return
  }
  }
- return nil
+
 }
 
 // WindowCenter does nothing

v2/internal/frontend/hybrid/server.go

@@ -17,5 +17,5 @@ import (
 // New returns a new Server frontend
 // A server Frontend implementation contains a devserver.Frontend wrapping a null.Frontend
 func NewFrontend(ctx context.Context, appoptions *options.App, logger *logger.Logger, appBindings *binding.Bindings, dispatcher frontend.Dispatcher) frontend.Frontend {
- return devserver.NewFrontend(ctx, appoptions, logger, appBindings, dispatcher, nil, null.NewFrontend(ctx))
+ return devserver.NewFrontend(ctx, appoptions, logger, appBindings, dispatcher, nil, null.NewFrontend(ctx, appoptions))
 }