feat(desktop): pass instance id as flag or environment variable

.env.dist

@@ -1 +1,2 @@
-ARCAST_DESKTOP_ADDITIONAL_CHROME_ARGS=
+ARCAST_DESKTOP_ADDITIONAL_CHROME_ARGS=
+ARCAST_DESKTOP_INSTANCE_ID=

.gitignore

@@ -1,4 +1,6 @@
 /bin
 /dist
 /.env
-/tools
+/tools
+.mktools/
+/.gitea-release

Makefile

@@ -5,6 +5,9 @@ GITCHLOG_ARGS ?=
 SHELL := /bin/bash
 JDK_PATH ?= /usr/lib/jvm/java-11-openjdk
 
+MKT_GITEA_RELEASE_PROJECT := arcast
+MKT_GITEA_RELEASE_ORG := arcad
+
 GOTEST_ARGS ?= -short
 
 watch: tools/modd/bin/modd deps ## Watching updated files - live reload
@@ -58,3 +61,34 @@ tools/modd/bin/modd:
 tools/gogio/bin/gogio:
 	mkdir -p tools/gogio/bin
 	GOBIN=$(PWD)/tools/gogio/bin go install gioui.org/cmd/gogio@latest
+
+gitea-release: .mktools build
+	rm -rf .gitea-release
+	mkdir -p .gitea-release
+
+	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
+
+	MKT_GITEA_RELEASE_PROJECT="arcast" \
+		MKT_GITEA_RELEASE_ORG="arcad" \
+		MKT_GITEA_RELEASE_BASE_URL="https://forge.cadoles.com" \
+		MKT_GITEA_RELEASE_VERSION="$(MKT_PROJECT_VERSION)" \
+		MKT_GITEA_RELEASE_NAME="$(MKT_PROJECT_VERSION)" \
+		MKT_GITEA_RELEASE_COMMITISH_TARGET="$$(git rev-parse HEAD)" \
+		MKT_GITEA_RELEASE_IS_DRAFT="false" \
+		MKT_GITEA_RELEASE_IS_PRERELEASE="false" \
+		MKT_GITEA_RELEASE_BODY="" \
+		MKT_GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
+		$(MAKE) mkt-gitea-release
+
+
+.PHONY: mktools
+mktools:
+	rm -rf .mktools
+	curl -q https://forge.cadoles.com/Cadoles/mktools/raw/branch/master/install.sh | $(SHELL)
+
+.mktools:
+	$(MAKE) mktools
+
+-include .mktools/*.mk

README.md

@@ -12,7 +12,7 @@ Le client en ligne de commande vous permet de contrôler votre flotte de serveur
 
 #### Dernière version
 
-- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcast_client_linux_amd64)
+- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_client_linux_amd64)
 
 ### Application Android
 
@@ -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/arcast_player_linux_amd64)
+- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_amd64)

android/app/libs/.gitignore

@@ -0,0 +1 @@
+/mobile.aar

cmd/desktop/main.go

@@ -9,6 +9,6 @@ func main() {
 	command.Main(
 		"arcast",
 		"Arcast desktop player",
-		player.Root(),
+		player.Root().Subcommands...,
 	)
 }

internal/command/player/run.go

@@ -21,13 +21,20 @@ func Run() *cli.Command {
 				EnvVars: []string{"ARCAST_DESKTOP_ADDITIONAL_CHROME_ARGS"},
 				Value:   cli.NewStringSlice("incognito"),
 			},
-			&cli.IntFlag{
-				Name:  "window-height",
-				Value: defaults.Height,
+			&cli.StringFlag{
+				Name:    "instance-id",
+				EnvVars: []string{"ARCAST_DESKTOP_INSTANCE_ID"},
+				Value:   "",
 			},
 			&cli.IntFlag{
-				Name:  "window-width",
-				Value: defaults.Width,
+				Name:    "window-height",
+				EnvVars: []string{"ARCAST_DESKTOP_WINDOW_HEIGHT"},
+				Value:   defaults.Height,
+			},
+			&cli.IntFlag{
+				Name:    "window-width",
+				EnvVars: []string{"ARCAST_DESKTOP_WINDOW_WIDTH"},
+				Value:   defaults.Width,
 			},
 		},
 		Action: func(ctx *cli.Context) error {
@@ -57,7 +64,12 @@ func Run() *cli.Command {
 				}
 			}()
 
-			server := server.New(browser)
+			instanceID := ctx.String("instance-id")
+			if instanceID == "" {
+				instanceID = server.NewRandomInstanceID()
+			}
+
+			server := server.New(browser, server.WithInstanceID(instanceID))
 
 			if err := server.Start(); err != nil {
 				return errors.Wrap(err, "could not start server")

modd.conf

@@ -4,5 +4,5 @@ modd.conf
 .env {
     prep: make build-client
     prep: make build-desktop
-    daemon: make run RUN_CMD="bin/desktop --debug --log-level debug player run"
+    daemon: make run RUN_CMD="bin/desktop --debug --log-level debug run"
 }