Skip to content

Aspirify local dev #1365

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Meir017 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Aspirify local dev #1365

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4e20e1c
Aspirify local dev
Meir017 Jun 1, 2025
914805d
complete setup without running the setup.ps1 script
Meir017-msft Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions source/AppHost/AppHost.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
using System.Numerics;

var builder = DistributedApplication.CreateBuilder(args);

var webappPort = builder.AddParameter("webapp-port", "44200");

var storage = builder.AddAzureStorage("storage")
.RunAsEmulator(options => options.WithLifetime(ContainerLifetime.Persistent).WithBlobPort(10000));
var storageBlob = storage.AddBlobs("cache");
var blobContainer = storageBlob.AddBlobContainer("edge");

var containerManager = builder.AddProject<Projects.Container_Manager>("container-manager");

var installWebApp = builder.AddExecutable("install-webapp", "npm", "../WebApp", "install");
var buildWebApp = builder.AddExecutable("build-webapp", "npm", "../WebApp", "run", "build")
.WithParentRelationship(installWebApp)
.WaitForCompletion(installWebApp);
var webapp = builder.AddNpmApp("webapp", "../WebApp", scriptName: "start:fast")
.WaitForCompletion(buildWebApp)
.WithHttpEndpoint(env: "PORT")
.WithEnvironment("PORT", webappPort)
.WithEnvironment("test", blobContainer).WaitFor(blobContainer);
installWebApp.WithParentRelationship(webapp);

var webappServer = builder.AddProject<Projects.WebApp_Server>("webapp-server")
.WaitFor(webapp)
.WaitFor(containerManager)
.WithEnvironment("SHARPLAB_LOCAL_SECRETS_PublicStorageConnectionString", storageBlob).WaitFor(storageBlob);

builder.Build().Run();
24 changes: 24 additions & 0 deletions source/AppHost/AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project Sdk="Microsoft.NET.Sdk">

<Sdk Name="Aspire.AppHost.Sdk" Version="9.3.0" />

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<UserSecretsId>9cc6fba6-3727-4501-b54b-d61cf8eae623</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="9.3.0" />
<PackageReference Include="Aspire.Hosting.Azure.Storage" Version="9.3.0" />
<PackageReference Include="Aspire.Hosting.NodeJs" Version="9.3.0" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\WebApp.Server\WebApp.Server.csproj" />
<ProjectReference Include="..\Container.Manager\Container.Manager.csproj" />
</ItemGroup>

</Project>
13 changes: 13 additions & 0 deletions source/AppHost/Readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# Aspire Setup

run:

```bash
git submodule update --init --recursive
```

# Aspire AppHost

```bash
dotnet run --project source/AppHost
```
8 changes: 8 additions & 0 deletions source/AppHost/appsettings.Development.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning"
}
}
}
9 changes: 9 additions & 0 deletions source/AppHost/appsettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.AspNetCore": "Warning",
"Aspire.Hosting.Dcp": "Warning"
}
}
}
1 change: 1 addition & 0 deletions source/Container.Manager/Container.Manager.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<ProjectReference Include="..\#external\Fragile\Fragile\Fragile.csproj" />
<ProjectReference Include="..\Container.Warmup\Container.Warmup.csproj" />
<ProjectReference Include="..\Container\Container.csproj" />
<ProjectReference Include="..\ServiceDefaults\ServiceDefaults.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
7 changes: 7 additions & 0 deletions source/Container.Manager/Internal/ExecutionManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using System;
using System.Diagnostics;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Extensions.Hosting;

namespace SharpLab.Container.Manager.Internal {
public class ExecutionManager {
Expand Down Expand Up @@ -30,6 +32,7 @@ CancellationToken cancellationToken
) {
// Note that _containers are never accessed through multiple threads for the same session id,
// so atomicity is not required within same session id
using var activity = SharpLabActivities.Source.StartActivity("Container Execution", ActivityKind.Internal);
using var allocationCancellation = CancellationFactory.ContainerAllocation(cancellationToken);
if (_containerPool.GetSessionContainer(sessionId) is not {} container) {
if (_crashSuspensionManager.GetSuspension(sessionId) is {} suspension)
Expand All @@ -51,6 +54,10 @@ CancellationToken cancellationToken
cancellationToken
);

if (!result.IsSuccess) {
activity?.SetStatus(ActivityStatusCode.Error, result.FailureMessage.ToString());
}

if (container.HasExited())
return RemoveContainerAndSetSuspension(sessionId, result);

Expand Down
18 changes: 12 additions & 6 deletions source/Container.Manager/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System.Runtime.Versioning;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Builder;
using Microsoft.Extensions.Hosting;
using SharpLab.Container.Manager.Internal;

Expand All @@ -8,11 +8,17 @@ namespace SharpLab.Container.Manager {
public class Program {
public static void Main(string[] args) {
DotEnv.Load();
CreateHostBuilder(args).Build().Run();
}

public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
var builder = WebApplication.CreateBuilder(args);
builder.AddServiceDefaults();

var startup = new Startup();
startup.ConfigureServices(builder.Services);

var app = builder.Build();
app.MapDefaultEndpoints();
startup.Configure(app);
app.Run();
}
}
}
85 changes: 85 additions & 0 deletions source/Server/Autofac.Extras.FileSystemRegistration/DirectoryModuleRegistrar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,85 @@
using System;
using System.IO;
using System.Linq;
using System.Reflection;
using Autofac.Core;
using Autofac.Core.Registration;
using JetBrains.Annotations;

namespace Autofac.Extras.FileSystemRegistration.Internal {
public class DirectoryModuleRegistrar : IDirectoryModuleRegistrar {
private readonly ContainerBuilder _builder;
private readonly string[] _directoryPaths;

private string _filePattern = "*.*";
private Func<FileInfo, bool> _fileFilter = f => f.Extension.Equals(".dll", StringComparison.InvariantCultureIgnoreCase)
|| f.Extension.Equals(".exe", StringComparison.InvariantCultureIgnoreCase);
private Func<Assembly, bool> _assemblyFilter = a => true;

public DirectoryModuleRegistrar([NotNull] ContainerBuilder builder, params string[] directoryPaths)
{
ArgumentNullException.ThrowIfNull(builder);
_builder = builder;
_directoryPaths = directoryPaths;

var callback = _builder.RegisterCallback(DiscoverModules);
RegistrarData = new ModuleRegistrarData(callback);
}

public ModuleRegistrarData RegistrarData { get; }

public IDirectoryModuleRegistrar WhereFileMatches(string filePattern)
{
ArgumentNullException.ThrowIfNull(filePattern);

_filePattern = filePattern;
return this;
}

public IDirectoryModuleRegistrar WhereFile(Func<FileInfo, bool> filter) {
ArgumentNullException.ThrowIfNull(filter);

_fileFilter = filter;
return this;
}

public IDirectoryModuleRegistrar WhereAssembly(Func<Assembly, bool> filter) {
ArgumentNullException.ThrowIfNull(filter);

_assemblyFilter = filter;
return this;
}

private void DiscoverModules(IComponentRegistryBuilder registry) {
var files = _directoryPaths.Select(p => new DirectoryInfo(p))
.SelectMany(d => d.GetFiles(_filePattern))
.Where(_fileFilter);

var registrar = new ImmediateModuleRegistrar(registry, this.RegistrarData);
foreach (var file in files) {
var assembly = LoadAssemblySafe(file);
if (assembly == null || !_assemblyFilter(assembly))
continue;

registrar.RegisterAssemblyModules(assembly);
}
}

[CanBeNull]
private static Assembly? LoadAssemblySafe(FileInfo file) {
try {
return Assembly.LoadFrom(file.FullName);
}
catch (BadImageFormatException) {
return null;
}
}

[NotNull]
public IModuleRegistrar RegisterModule([NotNull] IModule module) {
ArgumentNullException.ThrowIfNull(module);
_builder.RegisterCallback(module.Configure);
return this;
}
}
}
13 changes: 13 additions & 0 deletions source/Server/Autofac.Extras.FileSystemRegistration/IDirectoryModuleRegistrar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
using System;
using System.IO;
using System.Reflection;
using Autofac.Core.Registration;
using JetBrains.Annotations;

namespace Autofac.Extras.FileSystemRegistration.Internal {
public interface IDirectoryModuleRegistrar : IModuleRegistrar {
[NotNull] IDirectoryModuleRegistrar WhereFileMatches([NotNull] string filePattern);
[NotNull] IDirectoryModuleRegistrar WhereFile([NotNull] Func<FileInfo, bool> filter);
[NotNull] IDirectoryModuleRegistrar WhereAssembly([NotNull] Func<Assembly, bool> filter);
}
}
29 changes: 29 additions & 0 deletions source/Server/Autofac.Extras.FileSystemRegistration/ImmediateModuleRegistrar.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
using System;
using Autofac.Core;
using Autofac.Core.Registration;
using JetBrains.Annotations;

namespace Autofac.Extras.FileSystemRegistration.Internal
{
public class ImmediateModuleRegistrar : IModuleRegistrar
{
private readonly IComponentRegistryBuilder _registry;

public ImmediateModuleRegistrar([NotNull] IComponentRegistryBuilder registry, ModuleRegistrarData registrarData)
{
ArgumentNullException.ThrowIfNull(registry);
ArgumentNullException.ThrowIfNull(registrarData);

_registry = registry;
RegistrarData = registrarData;
}

public ModuleRegistrarData RegistrarData { get; }

public IModuleRegistrar RegisterModule(IModule module)
{
module.Configure(_registry);
return this;
}
}
}
22 changes: 22 additions & 0 deletions source/Server/Autofac.Extras.FileSystemRegistration/RegistrationExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using System;
using System.IO;
using System.Reflection;
using Autofac.Extras.FileSystemRegistration.Internal;
using JetBrains.Annotations;

namespace Autofac.Extras.FileSystemRegistration {
[PublicAPI]
public static class RegistrationExtensions {
[PublicAPI, NotNull]
public static IDirectoryModuleRegistrar RegisterAssemblyModulesInDirectories([NotNull] this ContainerBuilder builder, params string[] directoryPaths) {
return new DirectoryModuleRegistrar(builder, directoryPaths);
}

[PublicAPI, NotNull]
public static IDirectoryModuleRegistrar RegisterAssemblyModulesInDirectoryOf([NotNull] this ContainerBuilder builder, Assembly assembly) {
if (assembly == null) throw new ArgumentNullException("assembly");
var directoryPath = Path.GetDirectoryName(new Uri(assembly.Location).LocalPath);
return builder.RegisterAssemblyModulesInDirectories(directoryPath!);
}
}
}
2 changes: 1 addition & 1 deletion source/Server/Caching/CachingModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ namespace SharpLab.Server.Caching;
public class CachingModule : Module {
protected override void Load(ContainerBuilder builder) {
var webAppName = EnvironmentHelper.GetRequiredEnvironmentVariable("SHARPLAB_WEBAPP_NAME");
var branchId = webAppName.StartsWith("sl-") ? webAppName : null;
var branchId = webAppName.StartsWith("sl-") ? webAppName : "default";

builder.RegisterType<ResultCacheBuilder>()
.As<IResultCacheBuilder>()
Expand Down
4 changes: 3 additions & 1 deletion source/Server/Integration/Azure/AzureModule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ private void RegisterCacheStore(ContainerBuilder builder) {
builder
.Register(c => {
var connectionString = c.Resolve<ISecretsClient>().GetSecret("PublicStorageConnectionString");
return new BlobContainerClient(connectionString, "cache");
var client = new BlobContainerClient(connectionString, "cache");
client.CreateIfNotExists();
return client;
})
.Named<BlobContainerClient>(cacheClientName)
.SingleInstance();
Expand Down
22 changes: 15 additions & 7 deletions source/Server/Program.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,26 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Hosting;
using Autofac.Extensions.DependencyInjection;
using SharpLab.Server.Common;
using Microsoft.AspNetCore.Builder;
using Autofac;

namespace SharpLab.Server {
public class Program {
public static void Main(string[] args) {
DotEnv.Load();
CreateHostBuilder(args).Build().Run();
}

public static IHostBuilder CreateHostBuilder(string[] args) =>
Host.CreateDefaultBuilder(args)
.UseServiceProviderFactory(new AutofacServiceProviderFactory())
.ConfigureWebHostDefaults(webBuilder => webBuilder.UseStartup<Startup>());
var builder = WebApplication.CreateBuilder(args);
builder.AddServiceDefaults();
builder.Host.UseServiceProviderFactory(new AutofacServiceProviderFactory());

var startup = new Startup();
startup.ConfigureServices(builder.Services);
builder.Host.ConfigureContainer<ContainerBuilder>(startup.ConfigureContainer);

var app = builder.Build();
app.MapDefaultEndpoints();
startup.Configure(app, app.Environment);
app.Run();
}
}
}
5 changes: 2 additions & 3 deletions source/Server/Server.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,7 @@
<ItemGroup>
<PackageReference Include="Argument" Version="1.3.1" />
<PackageReference Include="AshMind.Extensions" Version="3.0.0-pre-20190808-01" />
<PackageReference Include="Autofac" Version="4.9.2" />
Copy link
Copy Markdown
Author

@Meir017 Meir017 Jun 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the old version of Autofac togather with the new AddServiceDefaults failed to start with the error

Unhandled exception. System.ArgumentNullException: Value cannot be null. (Parameter 'instance')
at Autofac.RegistrationExtensions.RegisterInstance[T](ContainerBuilder builder, T instance)
at Autofac.Extensions.DependencyInjection.AutofacRegistration.Register(ContainerBuilder builder, IEnumerable`1 descriptors, Object lifetimeScopeTagForSingletons)
at Autofac.Extensions.DependencyInjection.AutofacRegistration.Populate(ContainerBuilder builder, IEnumerable`1 descriptors, Object lifetimeScopeTagForSingletons)
at Autofac.Extensions.DependencyInjection.AutofacRegistration.Populate(ContainerBuilder builder, IEnumerable`1 descriptors)
at Autofac.Extensions.DependencyInjection.AutofacServiceProviderFactory.CreateBuilder(IServiceCollection services)
Microsoft.AspNetCore.Builder.ConfigureHostBuilder.ServiceProviderFactoryAdapter`1.CreateBuilder(IServiceCollection services)
at Microsoft.Extensions.Hosting.HostApplicationBuilder.<>c__DisplayClass30_0`1.<ConfigureContainer>b__0()
at Microsoft.Extensions.Hosting.HostApplicationBuilder.Build()
at Microsoft.AspNetCore.Builder.WebApplicationBuilder.Build()
at SharpLab.Server.Program.Main(String[] args) in C:\github\sharplab\source\Server\Program.cs:line 27

Copy link
Copy Markdown
Author

@Meir017 Meir017 Jun 1, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updating Autofac to a recent version broke the dependency on Autofac.Extras.FileSystemRegistration So I copied the source-files of that library into a folder in this component

<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="5.0.0" />
<PackageReference Include="Autofac.Extras.FileSystemRegistration" Version="1.0.0-pre-03" />
<PackageReference Include="Autofac.Extensions.DependencyInjection" Version="10.0.0" />
<PackageReference Include="Azure.Identity" Version="1.13.1" />
<PackageReference Include="Azure.Security.KeyVault.Secrets" Version="4.1.0" />
<PackageReference Include="Azure.Storage.Blobs" Version="12.19.1" />
Expand Down Expand Up @@ -72,6 +70,7 @@
<ProjectReference Include="..\#external\Mobius.ILasm\Mobius.ILASM\Mobius.ILasm.csproj" />
<ProjectReference Include="..\#external\SourcePath\Roslyn\Roslyn.csproj" />
<ProjectReference Include="..\Runtime\Runtime.csproj" />
<ProjectReference Include="..\ServiceDefaults\ServiceDefaults.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading