Add cross-platform support via AdaptiveRemote.Core project #24
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,51 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Razor"> | ||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <RootNamespace>AdaptiveRemote</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <None Remove="Services\Conversation\static_grammar.xml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Include="Services\Conversation\static_grammar.xml" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.3.2" /> | ||
| <PackageReference Include="Azure.Identity" Version="1.11.4" /> | ||
| <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.2.0" /> | ||
| <PackageReference Include="I8Beef.TiVo" Version="1.0.0.14" /> | ||
| <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="8.0.14" /> | ||
| <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> | ||
| <PackageReference Include="Nerdbank.GitVersioning" Version="3.9.50"> | ||
| <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| <PrivateAssets>all</PrivateAssets> | ||
| </PackageReference> | ||
| <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.8.1" /> | ||
| <PackageReference Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.8.1" /> | ||
| <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.8.1" /> | ||
| <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" /> | ||
| <PackageReference Include="System.Text.Json" Version="8.0.5" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <Compile Update="Logging\LoggingMessages.Designer.cs"> | ||
| <DesignTime>True</DesignTime> | ||
| <AutoGen>True</AutoGen> | ||
| <DependentUpon>LoggingMessages.resx</DependentUpon> | ||
| </Compile> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <EmbeddedResource Update="Logging\LoggingMessages.resx"> | ||
| <Generator>ResXFileCodeGenerator</Generator> | ||
| <LastGenOutput>LoggingMessages.Designer.cs</LastGenOutput> | ||
| </EmbeddedResource> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ | |
| using Microsoft.Extensions.Configuration; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
|
|
||
| namespace AdaptiveRemote.Configuration; | ||
|
|
||
|
|
@@ -17,36 +16,18 @@ internal static IServiceCollection AddConversationServices(this IServiceCollecti | |
| .AddScopedLifecycleService<ConversationController>() | ||
| .AddScoped<ISpeechRecognition, SpeechRecognition>() | ||
| .AddScoped<ISpeechSynthesis, SpeechSynthesis>() | ||
| .AddScoped<ConversationStateMachine>() | ||
| .AddSingleton<IListeningController, ListeningController>() | ||
| .AddScoped(GetConversationViewModel); | ||
|
|
||
| internal static IServiceCollection AddConversationServices(this IServiceCollection services, IConfiguration config) | ||
| => services | ||
| .AddConversationServices() | ||
|
Owner
There was a problem hiding this comment. OptionallyAddFakeSpeechRecognition and OptionallyAddSamplesRecorder shouldn't be removed. They're not related to the "Fakes" that were added for Electron. Rather, this is simulated speech and diagnostics that are used for testing without having to speak commands out loud.
Contributor
Author
There was a problem hiding this comment. Fixed in 86c391a - restored FakeSpeechRecognitionEngine and SamplesRecorder support. The Windows project now registers |
||
| .Configure<ConversationSettings>(config); | ||
|
|
||
| private static Models.ConversationView GetConversationViewModel(IServiceProvider provider) | ||
| { | ||
| IRemoteDefinitionService definition = provider.GetRequiredService<IRemoteDefinitionService>(); | ||
| return definition.GetElement<Models.ConversationView>(); | ||
| } | ||
|
Owner
There was a problem hiding this comment. Note to self: Find out where this went |
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| using AdaptiveRemote.Models; | ||
| using AdaptiveRemote.Services; | ||
| using AdaptiveRemote.Services.Lifecycle; | ||
| using Microsoft.Extensions.DependencyInjection; | ||
| using Microsoft.Extensions.Hosting; | ||
|
|
||
| namespace AdaptiveRemote.Configuration; | ||
|
|
||
| /// <summary> | ||
| /// Public extension methods for configuring the Electron host | ||
| /// </summary> | ||
| public static class ElectronHostBuilderExtensions | ||
|
Owner
There was a problem hiding this comment. We should have one configuration path, not two different ones. What I would like to see is this:
In general, I want there to be as little code as possible in the Windows and Electron projects. Only things with Windows dependencies belong in the Windows project, and their analogs go in the Electron project. There should be no "Electron-specific" or "Windows-specific" code in the Core project. Abstractions in the Core project should be defined so they are host-agnostic and can be used exactly the same by both hosts. The goal is that the Electron app can be run in a Linux runner and we can be reasonably sure that the Windows version will run almost exactly the same way.
Contributor
Author
There was a problem hiding this comment. Fixed in 86c391a - unified configuration via |
||
| { | ||
| /// <summary> | ||
| /// Configures the application for Electron hosting with fake speech services | ||
| /// </summary> | ||
| public static IHostBuilder ConfigureElectronApp(this IHostBuilder hostBuilder) | ||
| => hostBuilder | ||
| .ConfigureTelemetry() | ||
| .AddRemoteServices() | ||
| .AddBroadlinkSupport() | ||
| .AddTiVoSupport() | ||
| .AddConversationSystem() | ||
| .AddSystemWrapperServices(); | ||
|
|
||
| /// <summary> | ||
| /// Adds the lifecycle view model and controller for Electron hosting | ||
| /// </summary> | ||
| public static IServiceCollection AddElectronLifecycle(this IServiceCollection services) | ||
| { | ||
| var lifecycleView = new LifecycleView(); | ||
| var lifecycleController = new LifecycleViewController(lifecycleView); | ||
| services.AddSingleton(lifecycleView); | ||
| services.AddSingleton<ILifecycleViewController>(lifecycleController); | ||
| return services; | ||
| } | ||
|
|
||
| /// <summary> | ||
| /// Adds the scope factory for Electron hosting | ||
| /// </summary> | ||
| public static IServiceCollection AddElectronScopeFactory(this IServiceCollection services) | ||
| => services.AddSingleton<IApplicationScopeFactory, ElectronScopeFactory>(); | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| namespace AdaptiveRemote.Services.Conversation; | ||
|
|
||
| /// <summary> | ||
| /// Platform-independent grammar interface that abstracts System.Speech.Recognition.Grammar | ||
| /// </summary> | ||
| public interface IGrammar | ||
| { | ||
| /// <summary> | ||
| /// Gets or sets the name of the grammar. | ||
| /// </summary> | ||
| string Name { get; } | ||
|
|
||
| /// <summary> | ||
| /// Gets or sets whether the grammar is enabled for recognition. | ||
| /// </summary> | ||
| bool Enabled { get; set; } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| namespace AdaptiveRemote.Services.Conversation; | ||
|
|
||
| /// <summary> | ||
| /// Loader for Grammar objects | ||
| /// </summary> | ||
| public interface IGrammarProvider | ||
| { | ||
| /// <summary> | ||
| /// Load a grammar that supports the given kind of phrases | ||
| /// </summary> | ||
| IGrammar LoadGrammar(PhraseKinds phraseKind); | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,7 @@ | ||
| namespace AdaptiveRemote.Services.Conversation; | ||
|
|
||
| [Flags] | ||
| public enum PhraseKinds | ||
| { | ||
| WakeWord = 1, | ||
| Commands = 2, | ||
|
|
||
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| using Microsoft.Extensions.DependencyInjection; | ||
|
|
||
| namespace AdaptiveRemote.Services.Lifecycle; | ||
|
|
||
| /// <summary> | ||
| /// IApplicationScopeFactory implementation for Electron/Blazor Server hosting | ||
| /// </summary> | ||
| internal class ElectronScopeFactory : IApplicationScopeFactory, IApplicationScope | ||
| { | ||
| private readonly IServiceProvider _serviceProvider; | ||
| private IServiceScope? _scope; | ||
|
|
||
| public ElectronScopeFactory(IServiceProvider serviceProvider) | ||
| { | ||
| _serviceProvider = serviceProvider; | ||
| } | ||
|
|
||
| public Task<IApplicationScope> CreateNewScopeAsync(CancellationToken cancellationToken) | ||
| { | ||
| _scope?.Dispose(); | ||
| _scope = _serviceProvider.CreateScope(); | ||
| return Task.FromResult<IApplicationScope>(this); | ||
| } | ||
|
|
||
| public async Task TryInvokeAsync(Func<IServiceProvider, CancellationToken, Task> workItem, CancellationToken cancellationToken) | ||
| { | ||
| var scopeServices = _scope?.ServiceProvider ?? _serviceProvider; | ||
| await workItem(scopeServices, cancellationToken); | ||
| } | ||
|
|
||
| public void Dispose() | ||
| { | ||
| _scope?.Dispose(); | ||
| _scope = null; | ||
| GC.SuppressFinalize(this); | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,18 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk.Web"> | ||
|
jodavis marked this conversation as resolved.
|
||
|
|
||
| <PropertyGroup> | ||
| <TargetFramework>net8.0</TargetFramework> | ||
| <Nullable>enable</Nullable> | ||
| <ImplicitUsings>enable</ImplicitUsings> | ||
| <RootNamespace>AdaptiveRemote</RootNamespace> | ||
| </PropertyGroup> | ||
|
|
||
| <ItemGroup> | ||
| <PackageReference Include="ElectronNET.API" Version="23.6.2" /> | ||
| </ItemGroup> | ||
|
|
||
| <ItemGroup> | ||
| <ProjectReference Include="..\AdaptiveRemote.Core\AdaptiveRemote.Core.csproj" /> | ||
| </ItemGroup> | ||
|
|
||
| </Project> | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like that the root namespace is still
AdaptiveRemoteand notAdaptiveRemote.Core. However, I think the generated Blazor component code is going to useAdaptiveRemote.Corefor its namespaces. If it's possible, I want that to be configured asAdaptiveRemotenamespace as well.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Already configured correctly - the Core csproj has
<RootNamespace>AdaptiveRemote</RootNamespace>which means Blazor components inComponents/folder are generated with namespaceAdaptiveRemote.Components, notAdaptiveRemote.Core.Components.