Web Services

.vscode/tasks.json

@@ -10,7 +10,8 @@
             ],
             "options": {
                 "cwd": "${workspaceFolder}"
-            }
+            },
+            "problemMatcher": []
         },
         {
             "label": "build-launchpad",

Launchpad.ahk

@@ -13,8 +13,7 @@ appVersion := "{{VERSION}}"
 
 Launchpad(Map(
     "appName", "Launchpad",
-    "developer", "Volantis Development",
     "version", appVersion,
-    "trayIcon", "Resources\Graphics\Launchpad.ico",
+    "trayIcon", "Resources\Graphics\launchpad.ico",
     "console", true
 ))

Launchpad.services.json

@@ -1,9 +1,14 @@
 {
     "parameters": {
+        "app.website_url": "https://launchpad.games",
+        "app.custom_tray_menu": true,
+        "app.developer": "Volantis Development",
+        "app.has_settings": true,
+        "app.settings_window": "SettingsWindow",
+        "app.show_about_menu_item": true,
+        "app.about_window": "AboutWindow",
+        "app.show_website_menu_item": true,
         "backups_config": {},
-        "config.api_authentication": false,
-        "config.api_auto_login": false,
-        "config.api_endpoint": "",
         "config.assets_dir": "@@{data_dir}\\Launcher Assets",
         "config.auto_backup_config_files": true,
         "config.backups_to_keep": 5,
@@ -12,7 +17,6 @@
         "config.clean_launchers_on_build": false,
         "config.clean_launchers_on_exit": true,
         "config.create_desktop_shortcuts": true,
-        "config.data_source_key": "local",
         "config.default_launcher_theme": "",
         "config.destination_dir": "@@{data_dir}\\Launchers",
         "config.launcher_double_click_action": "Edit",
@@ -22,7 +26,6 @@
         "config.platforms_file": "@@{data_dir}\\Platforms.json",
         "config.platforms_view_mode": "Report",
         "config.tasks_view_mode": "Report",
-        "config.player_name": "",
         "config.rebuild_existing_launchers": false,
         "config.tasks_file": "@@{data_dir}\\Tasks.json",
         "config.use_advanced_launcher_editor": false,
@@ -33,27 +36,29 @@
             "storage_config_storage_parent_key": "Games",
             "storage_config_path_parameter": "config.launcher_file",
             "manager_view_mode_parameter": "config.launcher_view_mode",
-            "default_icon": "Game",
+            "default_icon": "game",
             "allow_add": true,
             "allow_edit": true,
             "allow_delete": true,
             "manager_gui": "MainWindow"
         },
-        "entity_type.managed_game": {
+        "entity_type.game_process": {
             "name_singular": "Managed Game",
             "name_plural": "Managed Games",
-            "entity_class": "ManagedGameEntity",
+            "entity_class": "GameProcessEntity",
             "storage_config_storage_parent_key": "Games",
             "storage_config_path_parameter": "config.launcher_file",
-            "parent_entity_type": "launcher"
+            "parent_entity_type": "launcher",
+            "parent_entity_storage": true
         },
-        "entity_type.managed_launcher": {
+        "entity_type.launcher_process": {
             "name_singular": "Managed Launcher",
             "name_plural": "Managed Launchers",
-            "entity_class": "ManagedLauncherEntity",
+            "entity_class": "LauncherProcessEntity",
             "storage_config_storage_parent_key": "Games",
             "storage_config_path_parameter": "config.launcher_file",
-            "parent_entity_type": "launcher"
+            "parent_entity_type": "launcher",
+            "parent_entity_storage": true
         },
         "entity_type.platform": {
             "name_singular": "Platform",
@@ -65,8 +70,8 @@
             "storage_config_storage_parent_key": "Platforms",
             "storage_config_path_parameter": "config.platforms_file",
             "manager_view_mode_parameter": "config.platforms_view_mode",
-            "default_icon": "Platform",
-            "manager_gui": "ManagePlatformsWindow",
+            "default_icon": "platform",
+            "manager_gui": "PlatformsWindow",
             "manager_link_in_tools_menu": true
         },
         "entity_type.task": {
@@ -112,10 +117,6 @@
             "class": "LaunchpadConfig",
             "arguments": ["@config_storage.app_config", "@{}", "@@config_key"]
         },
-        "data_source.local": {
-            "class": "LocalDataSource",
-            "arguments": ["@manager.cache", "local"]
-        },
         "ini_migrator": {
             "class": "LaunchpadIniMigrator",
             "arguments": ["@{App}", "@manager.gui"]
@@ -132,10 +133,6 @@
             "class": "BuilderManager",
             "arguments": ["@entity_manager.launcher", "@{}", "@manager.event", "@notifier"]
         },
-        "manager.data_source": {
-            "class": "DataSourceManager",
-            "arguments": ["@{}", "@manager.event", "@notifier", "@@config.data_source_key"]
-        },
         "state.app": {
             "class": "LaunchpadAppState",
             "arguments": ["@{App}", "@@state_path"]

LaunchpadOverlay/LaunchpadOverlay.rc

@@ -52,7 +52,7 @@ END
 
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
-IDI_ICON1               ICON                    "E:\\Tools\\Launchpad\\Resources\\Graphics\\Launchpad.ico"
+IDI_ICON1               ICON                    "E:\\Tools\\Launchpad\\Resources\\Graphics\\launchpad.ico"
 
 #endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////

LaunchpadTest.ahk

@@ -13,7 +13,7 @@
 
 appVersion := "1.0.0"
 
-TraySetIcon("Resources\Graphics\Launchpad.ico")
+TraySetIcon("Resources\Graphics\launchpad.ico")
 
 HtmlResultViewer("Launchpad Test")
     .ViewResults(SimpleTestRunner(FilesystemTestLoader().GetTests()).RunTests())

Lib/Launchpad/App/Launchpad.ahk

@@ -1,38 +1,13 @@
 class Launchpad extends AppBase {
-    customTrayMenu := true
     detectGames := false
-    isSetup := false
-
-    CheckForUpdates(notify := true) {
-        updateAvailable := false
-
-        if (this.Version != "{{VERSION}}" && this.Service("manager.data_source").GetDefaultDataSource()) {
-            dataSource := this.Service("manager.data_source").GetDefaultDataSource()
-            releaseInfoStr := dataSource.ReadItem("release-info")
-
-            if (releaseInfoStr) {
-                data := JsonData()
-                releaseInfo := data.FromString(&releaseInfoStr)
-
-                if (releaseInfo && releaseInfo["data"].Has("version") && releaseInfo["data"]["version"] && this.Service("version_checker").VersionIsOutdated(releaseInfo["data"]["version"], this.Version)) {
-                    updateAvailable := true
-                    this.Service("manager.gui").Dialog(Map("type", "UpdateAvailableWindow"), releaseInfo)
-                }
-            }
-        }
-
-        if (!updateAvailable && notify) {
-            this.Service("notifier").Info("You're running the latest version of Launchpad. Shiny!")
-        }
-    }
 
     UpdateIncludes() {
         this.RunAhkScript(this.appDir . "\Scripts\UpdateIncludes.ahk")
         this.RestartApp()
     }
 
     InitializeApp(config) {
-        eventMgr := this.Service("manager.event")
+        eventMgr := this["manager.event"]
         eventMgr.Register(EntityEvents.ENTITY_CREATED, "LaunchpadEntityCreated", ObjBindMethod(this, "OnEntityCreated"))
         eventMgr.Register(EntityEvents.ENTITY_UPDATED, "LaunchpadEntityUpdated", ObjBindMethod(this, "OnEntityUpdated"))
         eventMgr.Register(EntityEvents.ENTITY_DELETED, "LaunchpadEntityDeleted", ObjBindMethod(this, "OnEntityDeleted"))
@@ -109,89 +84,127 @@
 
     RunApp(config) {
         this.MigrateConfiguration()
-
-        if (this.Config["api_auto_login"] && this.Services.Has("Auth")) {
-            this.Service("Auth").Login()
-        }
 
         super.RunApp(config)
 
-        this.Service("entity_manager.platform").LoadComponents()
-        this.Service("entity_manager.launcher").LoadComponents()
-        this.Service("entity_manager.backup").LoadComponents()
+        this["entity_manager.platform"].LoadComponents()
+        this["entity_manager.launcher"].LoadComponents()
+        this["entity_manager.backup"].LoadComponents()
 
         this.OpenApp()
 
         if (this.detectGames) {
-            this.Service("entity_manager.platform").DetectGames()
+            this["entity_manager.platform"].DetectGames()
         }
     }
 
     MigrateConfiguration() {
-        configFile := this.Parameter("previous_config_file")
+        configFile := this.Parameter["previous_config_file"]
 
         if (configFile && FileExist(configFile)) {
-            response := this.Service("manager.gui").Dialog(Map(
+            response := this["manager.gui"].Dialog(Map(
                 "title", "Migrate settings?",
                 "text", this.appName . " uses a new configuration file format, and has detected that you have a previous configuration file.`n`nWould you like to automatically migrate your settings?`n`nChoose Yes to migrate your previous configuration. Choose no to simply delete it and start from scratch."
             ))
 
             if (response == "Yes") {
-                this.Service("ini_migrator").Migrate(configFile, this.Config)
+                this["ini_migrator"].Migrate(configFile, this.Config)
             } else {
                 FileDelete(configFile)
             }
         }
     }
 
     InitialSetup(config) {
-        result := this.Service("manager.gui").Dialog(Map("type", "SetupWindow"))
+        result := this["manager.gui"].Dialog(Map("type", "SetupWindow"))
 
         if (result == "Exit") {
             this.ExitApp()
         } else if (result == "Detect") {
             this.detectGames := true
         }
 
-        this.isSetup := true
         super.InitialSetup(config)
     }
 
     UpdateStatusIndicators() {
-        if (this.Service("manager.gui").Has("MainWindow")) {
-            this.Service("manager.gui")["MainWindow"].UpdateStatusIndicator()
+        if (this["manager.gui"].Has("MainWindow")) {
+            serviceMgr := this.container["entity_manager.web_service"]
+            webServices := serviceMgr.EntityQuery(EntityQuery.RESULT_TYPE_ENTITIES)
+                .Condition(IsTrueCondition(), "Enabled")
+                .Condition(IsTrueCondition(), "StatusIndicator")
+                .Execute()
+
+                windowObj := this["manager.gui"]["MainWindow"]
+
+            for serviceId, webService in webServices {
+                windowObj.UpdateStatusIndicator(webService)
+            }
         }
     }
 
     ExitApp() {
         if (this.isSetup && this.Config["clean_launchers_on_exit"]) {
-            this.Service("manager.builder").CleanLaunchers()
+            this["manager.builder"].CleanLaunchers()
         }
 
         if (this.isSetup && this.Config["flush_cache_on_exit"]) {
-            this.Service("manager.cache").FlushCaches(false, false)
+            this["manager.cache"].FlushCaches(false, false)
         }
 
         super.ExitApp()
     }
 
-    OpenWebsite() {
-        Run("https://launchpad.games")
+    RestartApp() {
+        if (this.Services.Has("manager.gui")) {
+            guiMgr := this["manager.gui"]
+
+            if (guiMgr.Has("MainWindow")) {
+                guiMgr.StoreWindowState(this["manager.gui"]["MainWindow"])
+            }
+        }
+
+        super.RestartApp()
     }
 
-    ProvideFeedback() {
-        this.Service("manager.gui").Dialog(Map("type", "FeedbackWindow"))
+    AddMainMenuEarlyItems(menuItems, showOpenItem := false) {
+        menuItems := super.AddMainMenuEarlyItems(menuItems, showOpenItem)
+
+        launchersItems := []
+        launchersItems.Push(Map("label", "&Clean Launchers", "name", "CleanLaunchers"))
+        launchersItems.Push(Map("label", "&Reload Launchers", "name", "ReloadLaunchers"))
+
+        menuItems.Push(Map("label", "&Launchers", "name", "LaunchersMenu", "childItems", launchersItems))
+
+        return menuItems
     }
 
-    RestartApp() {
-        if (this.Services.Has("manager.gui")) {
-            guiMgr := this.Service("manager.gui")
+    HandleMainMenuClick(result) {
+        if (result == "CleanLaunchers") {
+            this["manager.builder"].CleanLaunchers()
+        } else if (result == "ReloadLaunchers") {
+            this["entity_manager.launcher"].LoadComponents(true)
+            guiMgr := this["manager.gui"]
 
             if (guiMgr.Has("MainWindow")) {
-                guiMgr.StoreWindowState(this.Service("manager.gui")["MainWindow"])
+                guiMgr["MainWindow"].UpdateListView()
             }
+        } else if (result == "ManageModules") {
+            this["manager.gui"].OpenWindow("ManageModulesWindow")
+        } else if (result == "FlushCache") {
+            this["manager.cache"].FlushCaches(true, true)
+        } else {
+            super.HandleMainMenuClick(result)
         }
 
-        super.RestartApp()
+        return result
+    }
+
+    GetToolsMenuItems() {
+        toolsItems := super.GetToolsMenuItems()
+        toolsItems.Push(Map("label", "&Modules", "name", "ManageModules"))
+        toolsItems.Push(Map("label", "&Flush Cache", "name", "FlushCache"))
+
+        return toolsItems
     }
 }

Lib/Launchpad/Builder/BuildFile/CopyableBuildFile.ahk

@@ -56,7 +56,7 @@ class CopyableBuildFile extends BuildFileBase {
         filePath := FileSelect(1,, this.launcherEntityObj.Id . ": " . this.RequestMessage, this.SelectFilter)
 
         if (filePath == "") {
-            this.app.Service("notifier").Warning("No file selected. Skipping build file.")
+            this.app["notifier"].Warning("No file selected. Skipping build file.")
         }
 
         return filePath

Lib/Launchpad/Builder/BuildFile/GameAhkFile.ahk

@@ -14,9 +14,9 @@ class GameAhkFile extends ComposableBuildFile {
             "launcherName", this.launcherEntityObj.Id . " - Launchpad",
             "appVersion", appVersion,
             "appDir", this.appDir,
-            "gameConfig", this.launcherEntityObj["ManagedGame"].FieldData,
+            "gameConfig", this.launcherEntityObj["GameProcess"].FieldData,
             "launchpadLauncherConfig", this.launcherEntityObj.FieldData,
-            "launcherConfig", this.launcherEntityObj["ManagedLauncher"].FieldData,
+            "launcherConfig", this.launcherEntityObj["LauncherProcess"].FieldData,
             "launcherId", this.launcherEntityObj.Id,
             "themesDir", this.launcherEntityObj["ThemesDir"],
             "resourcesDir", this.launcherEntityObj["ResourcesDir"],
@@ -35,7 +35,7 @@ class GameAhkFile extends ComposableBuildFile {
     GetPlatforms() {
         platforms := Map()
 
-        for key, platform in this.app.Service("entity_manager.platform").GetActivePlatforms(EntityQuery.RESULT_TYPE_ENTITIES) {
+        for key, platform in this.app["entity_manager.platform"].GetActivePlatforms(EntityQuery.RESULT_TYPE_ENTITIES) {
             platforms[key] := platform.FieldData
         }
 

Lib/Launchpad/Builder/BuildFile/IconFile.ahk

@@ -53,15 +53,15 @@ class IconFile extends CopyableBuildFile {
         }
 
         if (iconsCount == 0) {
-            this.app.Service("notifier").Warning("No icons could be extracted from %exeFile%. Please try another file.")
+            this.app["notifier"].Warning("No icons could be extracted from %exeFile%. Please try another file.")
             iconFilePath := ""
             this.Cleanup()
         } else {
             if (iconsCount > 1) {
                 iconFilePath := FileSelect(, iconsDir, "Select the correct icon from the extracted files", "Icons (*.ico)")
 
                 if (iconFilePath == "") {
-                    this.app.Service("notifier").Warning("Canceled icon selection. Please try again.")
+                    this.app["notifier"].Warning("Canceled icon selection. Please try again.")
                     this.Cleanup()
                 }
             }