From eefb8054e012925b77ad0c103a716b97d4354a57 Mon Sep 17 00:00:00 2001 From: Cyd Date: Sat, 11 Jul 2026 17:21:00 -0500 Subject: [PATCH] Catalog: launch-key convention, TeslaRel410 product, drop vPOD entry - Adopt the launch-key convention (documented in the Apps.xml header): fresh Guid = product id, first Launch key reuses it, each extra entry increments the last hex digit (wrapping F->0). Never a -1 suffix: keys parse as System.Guid and silently collapse to Guid.Empty. - Rewrite BT411 LC/MR + RIOJoy keys to the convention. RP4.11 LC/MR stay pinned to the original console's hardcoded Guids (SiteManagement constants + diff tests). - Remove vPOD from the shipped catalog: dev tool, never a console-deployed product (README documents the ad-hoc Add Product path instead). - Add TeslaRel410 (DOSBox-X preservation pods): six entries, BT/RP 4.10 x GameClient/LC/MR, all C:\Games\TeslaPod410\pod-launch.exe with mode bt/rp. LC/MR boot identically (role assigned via egg hostType) and no {res} token (output size fixed per rig at postinstall). - CatalogTests: now 5 products / 14 entries; full diff suite 106/106. Co-Authored-By: Claude Fable 5 --- Console/RedPlanet/Apps.xml | 76 +++++++++++++------ .../TeslaConsole.DiffTests/CatalogTests.cs | 63 ++++++++++----- vPOD/README.md | 10 ++- 3 files changed, 101 insertions(+), 48 deletions(-) diff --git a/Console/RedPlanet/Apps.xml b/Console/RedPlanet/Apps.xml index edf6281..1a0e419 100644 --- a/Console/RedPlanet/Apps.xml +++ b/Console/RedPlanet/Apps.xml @@ -27,6 +27,15 @@ To add a product, append a with one . exe must live under the install directory the package extracts to (currently C:\Games\...). + + Key convention: generate one fresh Guid for the product id; the first + reuses it as its key, and each additional increments the + LAST HEX DIGIT of that Guid (+1, +2, ..., wrapping F->0). Do NOT append + "-1"/"-2" to the string: keys are parsed as System.Guid and a suffixed + string silently collapses to Guid.Empty. Exception: Red Planet 4.11's LC/MR + keys predate the convention and are pinned to the original console's + hardcoded Guids (SiteManagement.RPLCAppGuid/RPMRAppGuid + the diff tests); + do not change them. --> - - - - - + - - - + + + diff --git a/Console/tests/TeslaConsole.DiffTests/CatalogTests.cs b/Console/tests/TeslaConsole.DiffTests/CatalogTests.cs index 278c30a..ec6108f 100644 --- a/Console/tests/TeslaConsole.DiffTests/CatalogTests.cs +++ b/Console/tests/TeslaConsole.DiffTests/CatalogTests.cs @@ -25,15 +25,15 @@ namespace TeslaConsole.DiffTests => _fx.Recovered.Run("CatalogEntry", new[] { _catalog, launchKey, w, h }); [Fact] - public void Catalog_Has_Five_Products_And_Eleven_Entries() - => Assert.Equal("products=5;entries=11", + public void Catalog_Has_Five_Products_And_Fourteen_Entries() + => Assert.Equal("products=5;entries=14", _fx.Recovered.Run("CatalogSummary", new[] { _catalog })); [Fact] public void RioJoy_Matches_Expected() => Assert.Equal( - @"RIOJoy|fe83e212-45df-48f9-848e-0b3cee0692a3|C:\Games\RIOJoy\app\RioJoy.Tray.exe||C:\Games\RIOJoy\app|True", - Entry("FE83E212-45DF-48F9-848E-0B3CEE0692A3")); + @"RIOJoy|87fbc2e6-6359-4ef4-96a5-df157823cff6|C:\Games\RIOJoy\app\RioJoy.Tray.exe||C:\Games\RIOJoy\app|True", + Entry("87FBC2E6-6359-4EF4-96A5-DF157823CFF6")); // Each expected string is "DisplayName|LaunchKey|Exe|Args|WorkingDirectory|AutoRestart" // and matches exactly what the old hardcoded PodInfo_InstallProductCompleted emitted. @@ -92,39 +92,60 @@ namespace TeslaConsole.DiffTests [Fact] public void BattleTech_LiveCamera_Matches_Expected() => Assert.Equal( - @"BattleTech 4.11 LC|d393711a-eda0-48b2-82a0-89df12b768af|C:\Games\BT411\btl4.exe|-net 1501 -lc|C:\Games\BT411|True", - Entry("D393711A-EDA0-48B2-82A0-89DF12B768AF")); + @"BattleTech 4.11 LC|f4c957fd-72f7-4c5f-8971-28095007e8d0|C:\Games\BT411\btl4.exe|-net 1501 -lc|C:\Games\BT411|True", + Entry("F4C957FD-72F7-4C5F-8971-28095007E8D0")); [Fact] public void BattleTech_MissionReview_Matches_Expected() => Assert.Equal( - @"BattleTech 4.11 MR|2e9b8628-9c20-42fb-b070-e9c38d521082|C:\Games\BT411\btl4.exe|-net 1501 -mr|C:\Games\BT411|True", - Entry("2E9B8628-9C20-42FB-B070-E9C38D521082")); + @"BattleTech 4.11 MR|f4c957fd-72f7-4c5f-8971-28095007e8d1|C:\Games\BT411\btl4.exe|-net 1501 -mr|C:\Games\BT411|True", + Entry("F4C957FD-72F7-4C5F-8971-28095007E8D1")); - // vPOD (Virtual Pod) — the game-client stand-in for testing the consoles. + // TeslaRel410 — the DOSBox-X preservation pods. All six entries launch + // pod-launch.exe; the mode arg ("bt"/"rp") selects the game, LC/MR boot + // identically (the console assigns the role via the egg hostType), and + // {res} is intentionally absent (output size is fixed per rig). [Fact] - public void VPod_GameClient_Matches_Expected() + public void Rel410_BT_GameClient_Matches_Expected() => Assert.Equal( - @"vPOD|0041c870-6e5e-4f3b-9782-f94f2f76f21d|C:\Games\vPOD\vPOD.exe|-net 1501|C:\Games\vPOD|True", - Entry("0041C870-6E5E-4F3B-9782-F94F2F76F21D")); + @"BT4.10|135019c7-2c2f-4c38-96be-c7db39994ab0|C:\Games\TeslaPod410\pod-launch.exe|bt|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB0")); [Fact] - public void VPod_GameClient_With_Resolution_Matches_Expected() + public void Rel410_BT_Resolution_Choice_Has_No_Effect() => Assert.Equal( - @"vPOD|0041c870-6e5e-4f3b-9782-f94f2f76f21d|C:\Games\vPOD\vPOD.exe|-net 1501 -res 1024 768|C:\Games\vPOD|True", - Entry("0041C870-6E5E-4F3B-9782-F94F2F76F21D", "1024", "768")); + @"BT4.10|135019c7-2c2f-4c38-96be-c7db39994ab0|C:\Games\TeslaPod410\pod-launch.exe|bt|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB0", "1024", "768")); [Fact] - public void VPod_LiveCamera_Matches_Expected() + public void Rel410_BT_LiveCamera_Matches_Expected() => Assert.Equal( - @"vPOD LC|ea0d4129-8950-428d-8399-e6a77d2d566a|C:\Games\vPOD\vPOD.exe|-net 1501 -lc|C:\Games\vPOD|True", - Entry("EA0D4129-8950-428D-8399-E6A77D2D566A")); + @"BT4.10 LC|135019c7-2c2f-4c38-96be-c7db39994ab1|C:\Games\TeslaPod410\pod-launch.exe|bt|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB1")); [Fact] - public void VPod_MissionReview_Matches_Expected() + public void Rel410_BT_MissionReview_Matches_Expected() => Assert.Equal( - @"vPOD MR|fc7ce34e-f4fe-4218-84cd-b13a6fa58e57|C:\Games\vPOD\vPOD.exe|-net 1501 -mr|C:\Games\vPOD|True", - Entry("FC7CE34E-F4FE-4218-84CD-B13A6FA58E57")); + @"BT4.10 MR|135019c7-2c2f-4c38-96be-c7db39994ab2|C:\Games\TeslaPod410\pod-launch.exe|bt|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB2")); + + [Fact] + public void Rel410_RP_GameClient_Matches_Expected() + => Assert.Equal( + @"RP4.10|135019c7-2c2f-4c38-96be-c7db39994ab3|C:\Games\TeslaPod410\pod-launch.exe|rp|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB3")); + + [Fact] + public void Rel410_RP_LiveCamera_Matches_Expected() + => Assert.Equal( + @"RP4.10 LC|135019c7-2c2f-4c38-96be-c7db39994ab4|C:\Games\TeslaPod410\pod-launch.exe|rp|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB4")); + + [Fact] + public void Rel410_RP_MissionReview_Matches_Expected() + => Assert.Equal( + @"RP4.10 MR|135019c7-2c2f-4c38-96be-c7db39994ab5|C:\Games\TeslaPod410\pod-launch.exe|rp|C:\Games\TeslaPod410|True", + Entry("135019C7-2C2F-4C38-96BE-C7DB39994AB5")); } } diff --git a/vPOD/README.md b/vPOD/README.md index 2771656..6176430 100644 --- a/vPOD/README.md +++ b/vPOD/README.md @@ -153,16 +153,18 @@ An end-to-end loopback test of this server against the console's real ## Deploying from the console (Manage Site → Install Product) -vPOD is a catalog product (`Console\RedPlanet\Apps.xml`, id `0041C870-…`) with Game -Client / Live Camera / Mission Review entries, so it appears in **Manage Site → -Install Product** like any game. Build the deployable package first: +vPOD is **not** in the shipped catalog (`Console\RedPlanet\Apps.xml`) — it was +removed 2026-07-11 since it is a dev tool, never a console-deployed product. To +push it to a pod for testing, add it locally via Site Management → **Add New +Product...** (or hand-edit Apps.xml) and build the deployable package first: ``` pwsh -File pack.ps1 # produces dist\vPOD.zip ``` The zip lays out `vPOD\vPOD.exe` (+ `Munga Net.dll`) so the launcher extracts it -to `C:\Games\vPOD` and the catalog entry launches `C:\Games\vPOD\vPOD.exe`. +to `C:\Games\vPOD` and a launch entry pointing at `C:\Games\vPOD\vPOD.exe` works +as-is. ## Testing locally against the console