feat: embed optional apps in player server

.env.dist

@@ -1,3 +1,3 @@
 ARCAST_DESKTOP_ADDITIONAL_CHROME_ARGS=
 ARCAST_DESKTOP_INSTANCE_ID=
-ARCAST_DESKTOP_APPS=true
+ARCAST_DESKTOP_WEB_APPS=true

Makefile

@@ -4,7 +4,6 @@ GORELEASER_ARGS ?= release --snapshot --rm-dist
 GITCHLOG_ARGS ?=
 SHELL := /bin/bash
 JDK_PATH ?= /usr/lib/jvm/java-11-openjdk
-GOARCH ?= amd64
 
 MKT_GITEA_RELEASE_PROJECT := arcast
 MKT_GITEA_RELEASE_ORG := arcad
@@ -23,9 +22,9 @@ test-go: deps
 build: build-desktop build-android build-client ## Build artefacts
 
 build-desktop: deps ## Build executable
-	CGO_ENABLED=0 GOARCH=$(GOARCH) go build \
+	CGO_ENABLED=0 go build \
 		-v \
-		-o ./bin/desktop_$(GOARCH) \
+		-o ./bin/desktop \
 		./cmd/desktop
 
 build-client: deps ## Build executable
@@ -36,14 +35,9 @@ build-client: deps ## Build executable
 
 build-android: tools/gogio/bin/gogio deps ## Build executable
 	mkdir -p dist
-	CGO_ENABLED=1 GOOS=android CGO_CFLAGS="-I${JDK_PATH}/include -I${JDK_PATH}/include/linux -w" tools/gogio/bin/gogio -target android -buildmode archive -o android/app/libs/mobile.aar -x ./cmd/mobile
+	GOOS=android CGO_CFLAGS="-I${JDK_PATH}/include -I${JDK_PATH}/include/linux -w" tools/gogio/bin/gogio -target android -buildmode archive -o android/app/libs/mobile.aar -x ./cmd/mobile
 	( cd android && ./gradlew assembleDebug )
 
-release-android: tools/gogio/bin/gogio deps ## Build executable
-	mkdir -p dist
-	CGO_ENABLED=1 GOOS=android CGO_CFLAGS="-I${JDK_PATH}/include -I${JDK_PATH}/include/linux -w" tools/gogio/bin/gogio -target android -buildmode archive -o android/app/libs/mobile.aar -x ./cmd/mobile
-	( cd android && ./gradlew assemble )
-
 install-android: build-android
 	adb install android/app/build/outputs/apk/debug/app-debug.apk
 	adb shell monkey -p com.cadoles.arcast_player -c android.intent.category.LAUNCHER 1
@@ -72,14 +66,7 @@ gitea-release: .mktools build
 	rm -rf .gitea-release
 	mkdir -p .gitea-release
 
-	cp ./bin/desktop_amd64 .gitea-release/arcad_player_linux_amd64
-
-	$(MAKE) GOARCH=arm build-desktop
-	cp ./bin/desktop_arm .gitea-release/arcad_player_linux_arm
-
-	$(MAKE) GOARCH=arm64 build-desktop
-	cp ./bin/desktop_arm64 .gitea-release/arcad_player_linux_arm64
-
+	cp ./bin/desktop .gitea-release/arcad_player_linux_amd64
 	cp ./bin/client .gitea-release/arcad_client_linux_amd64
 	cp ./android/app/build/outputs/apk/debug/app-debug.apk .gitea-release/arcast_player_debug.apk
 

README.md

@@ -32,4 +32,4 @@ Avoir [Chromium](https://www.chromium.org/chromium-projects/) (ou `Google Chrome
 
 #### Dernière version
 
-- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_amd64), [`arm`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_arm), [`arm64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_arm64)
+- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_amd64)

apps/home/app.js

@@ -1,19 +0,0 @@
-fetch("/api/v1/apps")
-  .then((res) => res.json())
-  .then((res) => {
-    const defaultApp = res.data.defaultApp;
-    const apps = res.data.apps;
-
-    const container = document.createElement("div");
-    container.className = "container";
-    apps.forEach((app) => {
-      if (app.id === defaultApp || app.hidden) return;
-      const appLink = document.createElement("a");
-      appLink.className = "app-link";
-      appLink.href = `/apps/${app.id}/`;
-      appLink.innerText = app.title["fr"];
-      container.appendChild(appLink);
-    });
-
-    document.getElementById("main").replaceWith(container);
-  });

apps/lib/manifest.json

@@ -1,3 +0,0 @@
-{
-    "hidden": true
-}

cmd/mobile/main.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"sync"
 
-	"forge.cadoles.com/arcad/arcast"
 	"forge.cadoles.com/arcad/arcast/pkg/browser/gioui"
 	"forge.cadoles.com/arcad/arcast/pkg/server"
 	"gioui.org/app"
@@ -81,9 +80,7 @@ func main() {
 			server := server.New(
 				browser,
 				server.WithInstanceID(instanceID),
-				server.WithAppsEnabled(true),
-				server.WithDefautApp("home"),
-				server.WithApps(arcast.DefaultApps...),
+				server.WithWebApps(true),
 			)
 
 			if err := server.Start(); err != nil {

default_apps.go

@@ -1,70 +0,0 @@
-package arcast
-
-import (
-	"embed"
-	"encoding/json"
-	"io/fs"
-	"path/filepath"
-
-	"forge.cadoles.com/arcad/arcast/pkg/server"
-	"github.com/pkg/errors"
-)
-
-var (
-	DefaultApps []server.App
-	//go:embed apps/**
-	appsFS embed.FS
-)
-
-func init() {
-	defaultApps, err := loadApps("apps/*")
-	if err != nil {
-		panic(errors.WithStack(err))
-	}
-
-	DefaultApps = defaultApps
-}
-
-func loadApps(dirPattern string) ([]server.App, error) {
-	apps := make([]server.App, 0)
-
-	files, err := fs.Glob(appsFS, dirPattern)
-	if err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	for _, f := range files {
-		stat, err := fs.Stat(appsFS, f)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-
-		if !stat.IsDir() {
-			continue
-		}
-
-		rawManifest, err := fs.ReadFile(appsFS, filepath.Join(f, "manifest.json"))
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-
-		var app server.App
-
-		if err := json.Unmarshal(rawManifest, &app); err != nil {
-			return nil, errors.WithStack(err)
-		}
-
-		app.ID = filepath.Base(f)
-
-		fs, err := fs.Sub(appsFS, "apps/"+app.ID)
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-
-		app.FS = fs
-
-		apps = append(apps, app)
-	}
-
-	return apps, nil
-}

go.mod

@@ -60,5 +60,3 @@ require (
 	golang.org/x/net v0.19.0 // indirect
 	golang.org/x/sys v0.15.0 // indirect
 )
-
-replace github.com/zserge/lorca => github.com/Bornholm/lorca v0.0.0-20240121134933-d5e83569cb4c

go.sum

@@ -19,8 +19,6 @@ gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
 gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
 git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 h1:bGG/g4ypjrCJoSvFrP5hafr9PPB5aw8SjcOWWila7ZI=
 git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0/go.mod h1:+axXBRUTIDlCeE73IKeD/os7LoEnTKdkp8/gQOFjqyo=
-github.com/Bornholm/lorca v0.0.0-20240121134933-d5e83569cb4c h1:xG9xSpEqZYOvd1Bvx/36i3RBTA17d7XnuvoMIG+/ry8=
-github.com/Bornholm/lorca v0.0.0-20240121134933-d5e83569cb4c/go.mod h1:TUOtEogaMwy0b+p9e4NxZC1jbPRUaNaEw5DnjQF//F8=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -106,6 +104,8 @@ github.com/wlynxg/anet v0.0.1/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguH
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
+github.com/zserge/lorca v0.1.10 h1:f/xBJ3D3ipcVRCcvN8XqZnpoKcOXV8I4vwqlFyw7ruc=
+github.com/zserge/lorca v0.1.10/go.mod h1:bVmnIbIRlOcoV285KIRSe4bUABKi7R7384Ycuum6e4A=
 gitlab.com/wpetit/goweb v0.0.0-20231215190137-4a8add1d3d07 h1:0V95X1cBpdj5zyOe6oGtn/BQHlRpV8WlL3eTs3jaxiA=
 gitlab.com/wpetit/goweb v0.0.0-20231215190137-4a8add1d3d07/go.mod h1:Nfr7aZPiSN6biFumhiHbh9k8A3rKQRzR+o0bVtv78UY=
 go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=

internal/command/player/run.go

@@ -4,7 +4,6 @@ import (
 	"fmt"
 	"os"
 
-	"forge.cadoles.com/arcad/arcast"
 	"forge.cadoles.com/arcad/arcast/pkg/browser/lorca"
 	"forge.cadoles.com/arcad/arcast/pkg/server"
 	"github.com/pkg/errors"
@@ -38,8 +37,8 @@ func Run() *cli.Command {
 				Value:   defaults.Height,
 			},
 			&cli.BoolFlag{
-				Name:    "apps",
-				EnvVars: []string{"ARCAST_DESKTOP_APPS"},
+				Name:    "web-apps",
+				EnvVars: []string{"ARCAST_DESKTOP_WEB_APPS"},
 				Value:   false,
 			},
 			&cli.IntFlag{
@@ -52,7 +51,7 @@ func Run() *cli.Command {
 			windowHeight := ctx.Int("window-height")
 			windowWidth := ctx.Int("window-width")
 			chromeArgs := addFlagsPrefix(ctx.StringSlice("additional-chrome-arg")...)
-			enableApps := ctx.Bool("apps")
+			webApps := ctx.Bool("web-apps")
 			serverAddress := ctx.String("address")
 
 			browser := lorca.NewBrowser(
@@ -84,9 +83,7 @@ func Run() *cli.Command {
 
 			server := server.New(browser,
 				server.WithInstanceID(instanceID),
-				server.WithAppsEnabled(enableApps),
-				server.WithDefaultApp("home"),
-				server.WithApps(arcast.DefaultApps...),
+				server.WithWebApps(webApps),
 				server.WithAddress(serverAddress),
 			)
 

modd.conf

@@ -1,9 +1,9 @@
 **/*.go
 pkg/server/templates/**.gotmpl
-apps/**
+pkg/server/apps/**
 modd.conf
 .env {
     prep: make build-client
     prep: make build-desktop
-    daemon: make run RUN_CMD="bin/desktop_amd64 --debug --log-level debug run"
+    daemon: make run RUN_CMD="bin/desktop --debug --log-level debug run"
 }

pkg/browser/lorca/browser.go

@@ -18,10 +18,7 @@ type Browser struct {
 func (b *Browser) Start() error {
 	logger.Debug(context.Background(), "starting browser", logger.F("opts", b.opts))
 
-	ui, err := lorca.New(
-		lorca.WithWindowSize(b.opts.Width, b.opts.Height),
-		lorca.WithAdditionalCustomArgs(b.opts.ChromeArgs...),
-	)
+	ui, err := lorca.New("", "", b.opts.Width, b.opts.Height, b.opts.ChromeArgs...)
 	if err != nil {
 		return errors.WithStack(err)
 	}

pkg/browser/lorca/options.go

@@ -14,8 +14,8 @@ var DefaultChromeArgs = []string{
 
 func NewOptions(funcs ...OptionsFunc) *Options {
 	opts := &Options{
-		Width:      0,
-		Height:     0,
+		Width:      800,
+		Height:     600,
 		ChromeArgs: DefaultChromeArgs,
 	}
 

pkg/server/apps.go

@@ -1,28 +1,83 @@
 package server
 
 import (
+	"embed"
+	"encoding/json"
 	"io/fs"
 	"net/http"
-	"strings"
-	"sync"
+	"os"
+	"path/filepath"
 
-	"github.com/go-chi/chi/v5"
+	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/api"
 
 	_ "embed"
 )
 
+var (
+	apps []App
+	//go:embed apps/**
+	appsFS embed.FS
+)
+
+func init() {
+	if err := initializeAppsList(); err != nil {
+		panic(errors.WithStack(err))
+	}
+}
+
+func initializeAppsList() error {
+	files, err := fs.Glob(appsFS, "apps/*")
+	if err != nil {
+		return errors.WithStack(err)
+	}
+
+	for _, f := range files {
+		stat, err := fs.Stat(appsFS, f)
+		if err != nil {
+			return errors.WithStack(err)
+		}
+
+		if !stat.IsDir() {
+			continue
+		}
+
+		rawManifest, err := fs.ReadFile(appsFS, filepath.Join(f, "manifest.json"))
+		if err != nil {
+			if errors.Is(err, os.ErrNotExist) {
+				continue
+			}
+
+			return errors.WithStack(err)
+		}
+
+		var app App
+
+		if err := json.Unmarshal(rawManifest, &app); err != nil {
+			return errors.WithStack(err)
+		}
+
+		app.ID = filepath.Base(f)
+
+		apps = append(apps, app)
+	}
+
+	return nil
+}
+
+func (s *Server) handleDefaultApp(w http.ResponseWriter, r *http.Request) {
+	http.Redirect(w, r, "/apps/"+s.defaultWebApp, http.StatusTemporaryRedirect)
+}
+
+type AppsResponse struct {
+	Apps []App
+}
+
 type App struct {
 	ID          string            `json:"id"`
 	Title       map[string]string `json:"title"`
 	Description map[string]string `json:"description"`
 	Icon        string            `json:"icon"`
-	FS          fs.FS             `json:"-"`
-	Hidden      bool              `json:"hidden"`
-}
-
-func (s *Server) handleDefaultApp(w http.ResponseWriter, r *http.Request) {
-	http.Redirect(w, r, "/apps/"+s.defaultApp+"/", http.StatusTemporaryRedirect)
 }
 
 func (s *Server) handleApps(w http.ResponseWriter, r *http.Request) {
@@ -30,34 +85,7 @@ func (s *Server) handleApps(w http.ResponseWriter, r *http.Request) {
 		DefaultApp string `json:"defaultApp"`
 		Apps       []App  `json:"apps"`
 	}{
-		DefaultApp: s.defaultApp,
-		Apps:       s.apps,
+		DefaultApp: s.defaultWebApp,
+		Apps:       apps,
 	})
 }
-
-var (
-	indexedAppFilesystems map[string]fs.FS
-	indexAppsOnce         sync.Once
-)
-
-func (s *Server) handleAppFilesystem(w http.ResponseWriter, r *http.Request) {
-	indexAppsOnce.Do(func() {
-		indexedAppFilesystems = make(map[string]fs.FS, len(s.apps))
-		for _, app := range s.apps {
-			indexedAppFilesystems[app.ID] = app.FS
-		}
-	})
-
-	appID := chi.URLParam(r, "appID")
-
-	fs, exists := indexedAppFilesystems[appID]
-	if !exists {
-		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
-
-		return
-	}
-
-	name := strings.TrimPrefix(r.URL.Path, "/apps/"+appID)
-
-	http.ServeFileFS(w, r, fs, name)
-}

pkg/server/apps/home/app.js

@@ -0,0 +1,19 @@
+fetch('/api/v1/apps')
+    .then(res => res.json())
+    .then(res => {
+        const defaultApp = res.data.defaultApp
+        const apps = res.data.apps
+        
+        const container = document.createElement("div")
+        container.className = "container"
+        apps.forEach(app => {
+            if (app.id === defaultApp) return
+            const appLink = document.createElement("a")
+            appLink.className = "app-link"
+            appLink.href = "/apps/" + app.id
+            appLink.innerText = app.title['fr']
+            container.appendChild(appLink)
+        })
+
+        document.getElementById("main").replaceWith(container);
+    })

pkg/server/http.go

@@ -35,7 +35,7 @@ func init() {
 func (s *Server) startHTTPServer(ctx context.Context) error {
 	router := chi.NewRouter()
 
-	if s.appsEnabled {
+	if s.webApps {
 		ips, err := getLANIPv4Addrs()
 		if err != nil {
 			return errors.WithStack(err)
@@ -59,10 +59,10 @@ func (s *Server) startHTTPServer(ctx context.Context) error {
 	router.Delete("/api/v1/cast", s.handleReset)
 	router.Get("/api/v1/status", s.handleStatus)
 
-	if s.appsEnabled {
+	if s.webApps {
 		router.Get("/apps", s.handleDefaultApp)
 		router.Get("/api/v1/apps", s.handleApps)
-		router.Handle("/apps/{appID}/*", http.HandlerFunc(s.handleAppFilesystem))
+		router.Handle("/apps/*", http.FileServer(http.FS(appsFS)))
 	}
 
 	server := http.Server{
@@ -193,10 +193,10 @@ func (s *Server) handleStatus(w http.ResponseWriter, r *http.Request) {
 
 func (s *Server) handleHome(w http.ResponseWriter, r *http.Request) {
 	type templateData struct {
-		IPs  []string
-		Port int
-		ID   string
-		Apps bool
+		IPs     []string
+		Port    int
+		ID      string
+		WebApps bool
 	}
 
 	ips, err := getLANIPv4Addrs()
@@ -207,10 +207,10 @@ func (s *Server) handleHome(w http.ResponseWriter, r *http.Request) {
 	}
 
 	d := templateData{
-		ID:   s.instanceID,
-		IPs:  ips,
-		Port: s.port,
-		Apps: s.appsEnabled,
+		ID:      s.instanceID,
+		IPs:     ips,
+		Port:    s.port,
+		WebApps: s.webApps,
 	}
 
 	if err := idleTemplate.Execute(w, d); err != nil {

pkg/server/options.go

@@ -17,24 +17,22 @@ func init() {
 }
 
 type Options struct {
-	InstanceID             string
-	Address                string
-	EnableServiceDiscovery bool
-	EnableApps             bool
-	DefaultApp             string
-	Apps                   []App
+	InstanceID              string
+	Address                 string
+	DisableServiceDiscovery bool
+	WebApps                 bool
+	DefaultWebApp           string
 }
 
 type OptionFunc func(opts *Options)
 
 func NewOptions(funcs ...OptionFunc) *Options {
 	opts := &Options{
-		InstanceID:             NewRandomInstanceID(),
-		Address:                ":",
-		EnableServiceDiscovery: true,
-		EnableApps:             false,
-		DefaultApp:             "",
-		Apps:                   make([]App, 0),
+		InstanceID:              NewRandomInstanceID(),
+		Address:                 ":",
+		DisableServiceDiscovery: false,
+		WebApps:                 false,
+		DefaultWebApp:           "home",
 	}
 
 	for _, fn := range funcs {
@@ -44,21 +42,9 @@ func NewOptions(funcs ...OptionFunc) *Options {
 	return opts
 }
 
-func WithAppsEnabled(enabled bool) OptionFunc {
+func WithWebApps(enabled bool) OptionFunc {
 	return func(opts *Options) {
-		opts.EnableApps = enabled
-	}
-}
-
-func WithDefaultApp(defaultApp string) OptionFunc {
-	return func(opts *Options) {
-		opts.DefaultApp = defaultApp
-	}
-}
-
-func WithApps(apps ...App) OptionFunc {
-	return func(opts *Options) {
-		opts.Apps = apps
+		opts.WebApps = enabled
 	}
 }
 
@@ -74,9 +60,9 @@ func WithInstanceID(id string) OptionFunc {
 	}
 }
 
-func WithServiceDiscoveryEnabled(enabled bool) OptionFunc {
+func WithServiceDiscoveryDisabled(disabled bool) OptionFunc {
 	return func(opts *Options) {
-		opts.EnableServiceDiscovery = enabled
+		opts.DisableServiceDiscovery = disabled
 	}
 }
 

pkg/server/server.go

@@ -11,15 +11,13 @@ import (
 type Server struct {
 	browser browser.Browser
 
-	instanceID string
-	address    string
-	port       int
+	instanceID              string
+	address                 string
+	port                    int
+	disableServiceDiscovery bool
 
-	serviceDiscoveryEnabled bool
-
-	appsEnabled bool
-	defaultApp  string
-	apps        []App
+	webApps       bool
+	defaultWebApp string
 
 	ctx    context.Context
 	cancel context.CancelFunc
@@ -37,7 +35,7 @@ func (s *Server) Start() error {
 		return errors.WithStack(err)
 	}
 
-	if s.serviceDiscoveryEnabled {
+	if !s.disableServiceDiscovery {
 		mdnsServerCtx, cancelMDNSServer := context.WithCancel(serverCtx)
 		if err := s.startMDNServer(mdnsServerCtx); err != nil {
 			cancelHTTPServer()
@@ -76,9 +74,8 @@ func New(browser browser.Browser, funcs ...OptionFunc) *Server {
 		browser:                 browser,
 		instanceID:              opts.InstanceID,
 		address:                 opts.Address,
-		appsEnabled:             opts.EnableApps,
-		defaultApp:              opts.DefaultApp,
-		apps:                    opts.Apps,
-		serviceDiscoveryEnabled: opts.EnableServiceDiscovery,
+		webApps:                 opts.WebApps,
+		defaultWebApp:           opts.DefaultWebApp,
+		disableServiceDiscovery: opts.DisableServiceDiscovery,
 	}
 }

pkg/server/templates/idle.html.gotmpl

@@ -99,12 +99,12 @@
                 <li><code>{{ . }}:{{ $port }}</code></li>
                 {{end}}
             </ul>
-            {{if .Apps }}
+            {{if .WebApps }}
             <p>Apps:</p>
             <ul class="text-italic text-small">
                 {{ $port := .Port }}
                 {{range .IPs}}
-                <li><a target="_blank" href="http://{{ . }}:{{ $port }}/apps">http://{{ . }}:{{ $port }}/apps</a></li>
+                <li><a href="http://{{ . }}:{{ $port }}/apps">http://{{ . }}:{{ $port }}/apps</a></li>
                 {{end}}
             </ul>
             {{end}}