[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file downloader by jodavis · Pull Request #148 · jodavis/AdaptiveRemote

jodavis · 2026-04-19T19:07:45Z

Introduce the asset abstraction and replace in-code CompiledLayout construction with JSON deserialization from a file, so the stub orchestrator exercises the same parse path as the real orchestrator will.

…ownloader Introduces the ICloudAsset/ICloudAsset<T> abstraction with BasicCloudAsset<T> and JsonCloudAsset<T>, a FileCloudAssetDownloader that reads from a stub JSON file, and dev/layout.json for both WPF and Headless hosts. CloudAssetOrchestrator now loops over IEnumerable<ICloudAsset>, downloading and parsing each asset via the injected ICloudAssetDownloader rather than constructing a hardcoded CompiledLayout in C#. This exercises the same download→parse→store path the real HTTP-backed orchestrator will use. AddScopedCloudAsset<T> now accepts an ICloudAsset<T> instance directly and co-locates the ICloudAsset singleton registration with the scoped DI accessor. CloudAssetStoreExtensions (SetLayout/GetLayout helpers) is deleted as unused. The "Info" TiVo button in layout.json is absent from the old hardcoded stub, so E2E assertions on it prove the file is being loaded and parsed correctly. https://claude.ai/code/session_01VHZuzd1UHqNKDxtkLZu7pz

github-actions · 2026-04-19T19:13:36Z

Test Results

442 tests +7 442 ✅ +7 3m 2s ⏱️ +2s
12 suites ±0 0 💤 ±0
12 files ±0 0 ❌ ±0

Results for commit 04f8521. ± Comparison against base commit c8f9fca.

♻️ This comment has been updated with latest results.

Copilot

Pull request overview

Introduces a first-pass “cloud asset” abstraction centered around ICloudAsset, adds a JSON-backed asset implementation, and switches startup initialization to load a compiled layout from a stub JSON file (rather than a hardcoded in-memory layout).

Changes:

Add BasicCloudAsset<T> and JsonCloudAsset<T> for JSON deserialization of cloud assets.
Add FileCloudAssetDownloader and rework CloudAssetOrchestrator to download/parse/store assets at startup.
Add stub compiled-layout JSON files + Development config to point CloudSettings:StubFilePath at the stub, plus new/updated E2E + unit tests.

Reviewed changes

Copilot reviewed 18 out of 18 changed files in this pull request and generated 6 comments.

Show a summary per file

File	Description
test/AdaptiveRemote.EndToEndTests.Host.Wpf/Features/Shared/LayoutButtons.feature	Adds an assertion for the new `Info` button in the expected layout.
test/AdaptiveRemote.EndToEndTests.Host.Headless/Features/Layout/StubLayout.feature	New headless E2E scenario verifying stub JSON layout loads and enables `Info`.
test/AdaptiveRemote.App.Tests/Services/CloudAssets/JsonCloudAssetTests.cs	Unit test for JSON deserialization of `CompiledLayout`.
test/AdaptiveRemote.App.Tests/Services/CloudAssets/FileCloudAssetDownloaderTests.cs	Unit tests for stub-file downloader behavior.
src/AdaptiveRemote/dev/layout.json	Adds a stub compiled layout JSON file (WPF app).
src/AdaptiveRemote/appsettings.Development.json	Adds `CloudSettings:StubFilePath` pointing at the stub layout.
src/AdaptiveRemote/AdaptiveRemote.csproj	Copies stub `dev/layout.json` to output.
src/AdaptiveRemote.Headless/dev/layout.json	Adds a stub compiled layout JSON file (headless host).
src/AdaptiveRemote.Headless/appsettings.Development.json	Adds Development config for stub file path (headless).
src/AdaptiveRemote.Headless/AdaptiveRemote.Headless.csproj	Copies stub config + `dev/layout.json` to output.
src/AdaptiveRemote.App/Services/CloudAssets/JsonCloudAsset.cs	New JSON cloud asset implementation using `JsonSerializerContext`.
src/AdaptiveRemote.App/Services/CloudAssets/FileCloudAssetDownloader.cs	New downloader that reads the “active” asset from a local stub JSON file.
src/AdaptiveRemote.App/Services/CloudAssets/CloudSettings.cs	Adds `StubFilePath` option.
src/AdaptiveRemote.App/Services/CloudAssets/CloudAssetStoreExtensions.cs	Removes layout-specific store extension methods.
src/AdaptiveRemote.App/Services/CloudAssets/CloudAssetOrchestrator.cs	Replaces hardcoded stub layout with download/parse/store orchestration for registered assets.
src/AdaptiveRemote.App/Services/CloudAssets/BasicCloudAsset.cs	New base class for `ICloudAsset<T>` implementations.
src/AdaptiveRemote.App/Configuration/HostBuilderExtensions.cs	Registers the layout asset as a `JsonCloudAsset<CompiledLayout>`.
src/AdaptiveRemote.App/Configuration/CloudAssetServiceExtensions.cs	Registers orchestrator + stub downloader and updates `AddScopedCloudAsset` registration shape.

Copilot · 2026-04-19T19:15:31Z

+  "CloudSettings": {
+    "StubFilePath": "dev/layout.json"
  }


This setting is only present in appsettings.Development.json, but the WPF/console hosts use Host.CreateDefaultBuilder (driven by DOTNET_ENVIRONMENT). The WPF/console E2E host settings shown in test hooks don’t set DOTNET_ENVIRONMENT=Development, so this CloudSettings:StubFilePath will likely be ignored and the app will fail to load assets at startup. Consider either adding CloudSettings to appsettings.json as a safe default for now, or ensuring the test hosts set the correct environment variable.

Copilot · 2026-04-19T19:15:32Z

    internal static IServiceCollection AddCloudAssetServices(this IServiceCollection services)
        => services
            .AddSingleton<ICloudAssetStore, CloudAssetStore>()
+            .AddSingleton<ICloudAssetDownloader, FileCloudAssetDownloader>()
            .AddSingleton<CloudAssetOrchestrator>()
            .AddSingleton<IPreScopeInitializer>(sp => sp.GetRequiredService<CloudAssetOrchestrator>())
            .AddHostedService(sp => sp.GetRequiredService<CloudAssetOrchestrator>());


AddCloudAssetServices registers FileCloudAssetDownloader as the only ICloudAssetDownloader, but CloudSettings.StubFilePath defaults to an empty string and src/AdaptiveRemote/appsettings.json has no CloudSettings section. In non-Development environments this makes GetActiveAsync return null and CloudAssetOrchestrator throws, preventing the app from starting. Consider making downloader selection conditional (stub downloader only when StubFilePath is configured) and/or providing a non-empty default/fallback downloader so Production startup isn't broken.

Copilot · 2026-04-19T19:15:32Z

    public int IdleCooldownSeconds { get; set; } = 30;
    public int SseMaxConsecutiveFailures { get; set; } = 10;
    public string CachePath { get; set; } = @"%LocalAppData%\AdaptiveRemote\CloudAssets";
+    public string StubFilePath { get; set; } = "";


StubFilePath defaults to an empty string, but the current DI setup always uses FileCloudAssetDownloader and CloudAssetOrchestrator treats a missing file as fatal. Unless every runtime environment provides CloudSettings:StubFilePath, this will cause startup failure. Either provide a sensible default (e.g., the bundled dev/layout.json) or change the downloader/orchestrator behavior so an unset stub path doesn't break startup.

Suggested change

public string StubFilePath { get; set; } = "";

public string StubFilePath { get; set; } = global::System.IO.Path.Combine(global::System.AppContext.BaseDirectory, "dev", "layout.json");

Copilot · 2026-04-19T19:15:32Z

+        string path = Environment.ExpandEnvironmentVariables(_settings.StubFilePath);
+        if (!_fileSystem.FileExists(path))
+        {
+            return Task.FromResult<Stream?>(null);
+        }
+        return Task.FromResult<Stream?>(_fileSystem.OpenRead(path));
+    }
+
+    public Task<Stream?> GetByIdAsync(string resourcePath, Guid id, CancellationToken ct)
+        => Task.FromResult<Stream?>(null);


GetActiveAsync uses StubFilePath verbatim (after env var expansion). With a relative path like dev/layout.json, the lookup depends on the process working directory, which can differ between dotnet run, test hosts, and deployed installs. Consider resolving relative paths against a stable base (e.g., AppContext.BaseDirectory or content root) and failing fast with a clear exception when StubFilePath is empty/whitespace.

Suggested change

string path = Environment.ExpandEnvironmentVariables(_settings.StubFilePath);

if (!_fileSystem.FileExists(path))

{

return Task.FromResult<Stream?>(null);

}

return Task.FromResult<Stream?>(_fileSystem.OpenRead(path));

}

public Task<Stream?> GetByIdAsync(string resourcePath, Guid id, CancellationToken ct)

=> Task.FromResult<Stream?>(null);

string path = GetResolvedStubFilePath();

if (!_fileSystem.FileExists(path))

{

return Task.FromResult<Stream?>(null);

}

return Task.FromResult<Stream?>(_fileSystem.OpenRead(path));

}

public Task<Stream?> GetByIdAsync(string resourcePath, Guid id, CancellationToken ct)

=> Task.FromResult<Stream?>(null);

private string GetResolvedStubFilePath()

{

if (string.IsNullOrWhiteSpace(_settings.StubFilePath))

{

throw new InvalidOperationException("CloudSettings.StubFilePath must be configured with a non-empty file path.");

}

string expandedPath = Environment.ExpandEnvironmentVariables(_settings.StubFilePath);

if (string.IsNullOrWhiteSpace(expandedPath))

{

throw new InvalidOperationException("CloudSettings.StubFilePath resolved to an empty file path after environment variable expansion.");

}

return Path.IsPathRooted(expandedPath)

? Path.GetFullPath(expandedPath)

: Path.GetFullPath(expandedPath, AppContext.BaseDirectory);

}

Copilot · 2026-04-19T19:15:33Z

+            foreach (ICloudAsset asset in _assets)
+            {
+                Stream stream = await _downloader.GetActiveAsync(asset.ResourcePath, stoppingToken)
+                    ?? throw new InvalidOperationException($"Failed to download asset '{asset.Name}'.");


The exception thrown when a download returns null ("Failed to download asset '{asset.Name}'.") doesn’t include enough context to diagnose configuration problems (e.g., which resourcePath was requested, whether this is the stub downloader, or what stub path was used). Consider including at least asset.ResourcePath and relevant downloader/config details in the error so failures are actionable from logs.

Suggested change

?? throw new InvalidOperationException($"Failed to download asset '{asset.Name}'.");

?? throw new InvalidOperationException(

$"Failed to download asset '{asset.Name}' for resource path '{asset.ResourcePath}'. Downloader: '{_downloader.GetType().FullName}'.");

Copilot · 2026-04-19T19:15:33Z

+    protected override async Task ExecuteAsync(CancellationToken stoppingToken)
    {
-        CompiledLayout layout = new(
-            Id: Guid.Empty,
-            RawLayoutId: Guid.Empty,
-            UserId: "stub",
-            IsActive: true,
-            Version: 1,
-            Elements:
-            [
-                new LayoutGroupDefinitionDto("DPAD",
-                [
-                    new CommandDefinitionDto(CommandType.TiVo, "Up",       "Up",       null, "Sent Up",        "Down",      "Up"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Down",     "Down",     null, "Sent Down",      "Up",        "Down"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Left",     "Left",     null, "Sent Left",      "Right",     "Left"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Right",    "Right",    null, "Sent Right",     "Left",      "Right"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Select",   "Select",   null, "Sent Select",    null,        "Select"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Back",     "Back",     null, "Sent Back",      null,        "Back"),
-                    new CommandDefinitionDto(CommandType.IR,   "Power",    "Power",    null, "Sent Power",     "Power",     "Power"),
-                    new CommandDefinitionDto(CommandType.IR,   "PowerOn",  "PowerOn",  null, "Sent PowerOn",   "PowerOff",  "PowerOn"),
-                    new CommandDefinitionDto(CommandType.IR,   "PowerOff", "PowerOff", null, "Sent PowerOff",  "PowerOn",   "PowerOff"),
-                ]),
-                new LayoutGroupDefinitionDto("WELL",
-                [
-                    new CommandDefinitionDto(CommandType.TiVo, "TiVo",    "TiVo",    null, "Sent TiVo",    null, "TiVo"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Netflix",  "Netflix",  null, "Sent Netflix",  null, "Netflix"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Guide",    "Guide",    null, "Sent Guide",    null, "Guide"),
-                ]),
-                new LayoutGroupDefinitionDto("PLAYBACK",
-                [
-                    new CommandDefinitionDto(CommandType.TiVo, "Play",   "Play",   null, "Sent Play",   "Pause",  "Play"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Pause",  "Pause",  null, "Sent Pause",  "Play",   "Pause"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Record", "Record", null, "Sent Record", null,     "Record"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Skip",   "Skip",   null, "Sent Skip",   "Replay", "Skip"),
-                    new CommandDefinitionDto(CommandType.TiVo, "Replay", "Replay", null, "Sent Replay", "Skip",   "Replay"),
-                ]),
-                new LayoutGroupDefinitionDto("CHANNELANDVOLUME",
-                [
-                    new CommandDefinitionDto(CommandType.TiVo, "ChannelUp",   "Up",   null, "Sent Channel Up",   "ChannelDown", "ChannelUp"),
-                    new CommandDefinitionDto(CommandType.TiVo, "ChannelDown", "Down", null, "Sent Channel Down", "ChannelUp",   "ChannelDown"),
-                    new CommandDefinitionDto(CommandType.IR,   "VolumeUp",    "Up",   null, "Sent Volume Up",    "VolumeDown",  "VolumeUp"),
-                    new CommandDefinitionDto(CommandType.IR,   "VolumeDown",  "Down", null, "Sent Volume Down",  "VolumeUp",    "VolumeDown"),
-                    new CommandDefinitionDto(CommandType.IR,   "Mute",        "Mute", null, "Sent Mute",         "Mute",        "Mute"),
-                ]),
-            ],
-            CssDefinitions: "",
-            CompiledAt: DateTimeOffset.UtcNow);
-
-        _store.SetLayout(layout);
-        _initCompleted.SetResult();
-
-        return Task.CompletedTask;
+        try
+        {
+            foreach (ICloudAsset asset in _assets)
+            {
+                Stream stream = await _downloader.GetActiveAsync(asset.ResourcePath, stoppingToken)
+                    ?? throw new InvalidOperationException($"Failed to download asset '{asset.Name}'.");
+                await using (stream)
+                {
+                    object value = await asset.ParseAsync(stream, stoppingToken);
+                    _store.Set(asset.Name, value);
+                }
+            }
+            _initCompleted.SetResult();
+        }
+        catch (Exception ex)
+        {
+            _initCompleted.TrySetException(ex);
+            throw;
+        }


CloudAssetOrchestrator.ExecuteAsync now contains the core initialization logic (download → parse → store) and is a startup gate via IPreScopeInitializer, but there are no unit tests covering success and failure paths (e.g., null stream, parse failure, cancellation). Adding tests would help prevent regressions since failures here block the app from reaching Ready phase.

- Rename ParseAsync → DeserializeAsync on ICloudAsset/BasicCloudAsset/JsonCloudAsset (ParseAsync was misleading; DeserializeAsync is more precise for all asset types) - Add logging to CloudAssetOrchestrator: logs each asset download (1700) and initialization failure (1701); verified in new CloudAssetOrchestratorTests - Consolidate CloudSettings with BackendSettings: remove duplicate backend credential fields (BackendBaseUrl, CognitoTokenEndpointUrl, ClientId, ClientSecret) that duplicated BackendSettings; change StubFilePath default to "dev/layout.json" so the app works without requiring ASPNETCORE_ENVIRONMENT=Development - Add [JsonConverter(typeof(JsonStringEnumConverter<CommandType>))] to CommandType so enum values serialize as names ("TiVo", "IR") rather than integers; update both layout.json files accordingly - Rewrite JsonCloudAssetTests to use a test-specific TestAsset record rather than CompiledLayout, making the tests robust to contract changes - Add CloudAssetOrchestratorTests covering success, null-stream, and parse-failure paths with log verification - Delete StubLayout.feature (headless-specific); the LayoutButtons.feature shared scenario already asserts the Info button present only in layout.json https://claude.ai/code/session_01VHZuzd1UHqNKDxtkLZu7pz

…ownloader (#148)

jodavis requested a review from Copilot April 19, 2026 19:07

Copilot started reviewing on behalf of jodavis April 19, 2026 19:08 View session

Copilot AI reviewed Apr 19, 2026

View reviewed changes

jodavis merged commit 0bc1251 into feature/ADR-162-client-side-layout-updates Apr 20, 2026
2 checks passed

jodavis deleted the claude/implement-adr-178-olGyj branch April 20, 2026 01:26

jodavis added a commit that referenced this pull request Apr 21, 2026

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file d…

c5cd0b8

…ownloader (#148)

jodavis added a commit that referenced this pull request Apr 23, 2026

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file d…

0f8649e

…ownloader (#148)

jodavis added a commit that referenced this pull request Apr 23, 2026

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file d…

b5c293a

…ownloader (#148)

jodavis added a commit that referenced this pull request Apr 29, 2026

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file d…

27c3823

…ownloader (#148)

jodavis added a commit that referenced this pull request Apr 29, 2026

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file d…

e86a1fd

…ownloader (#148)

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file downloader#148

[ADR-178] ICloudAsset abstraction, JsonCloudAsset<T>, and stub file downloader#148
jodavis merged 2 commits into
feature/ADR-162-client-side-layout-updatesfrom
claude/implement-adr-178-olGyj

jodavis commented Apr 19, 2026 •

edited

Loading

Uh oh!

github-actions Bot commented Apr 19, 2026 •

edited

Loading

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Apr 19, 2026

Uh oh!

Copilot AI Apr 19, 2026

Uh oh!

Copilot AI Apr 19, 2026

Uh oh!

Copilot AI Apr 19, 2026

Uh oh!

Copilot AI Apr 19, 2026

Uh oh!

Copilot AI Apr 19, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	public string StubFilePath { get; set; } = "";
	public string StubFilePath { get; set; } = global::System.IO.Path.Combine(global::System.AppContext.BaseDirectory, "dev", "layout.json");

	?? throw new InvalidOperationException($"Failed to download asset '{asset.Name}'.");
	?? throw new InvalidOperationException(
	$"Failed to download asset '{asset.Name}' for resource path '{asset.ResourcePath}'. Downloader: '{_downloader.GetType().FullName}'.");

Conversation

jodavis commented Apr 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

github-actions Bot commented Apr 19, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Test Results

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Apr 19, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

jodavis commented Apr 19, 2026 •

edited

Loading

github-actions Bot commented Apr 19, 2026 •

edited

Loading