Compare commits

...

2 Commits

Author SHA1 Message Date
09dd248d24 Initial implementation of procfile
Reviewed-on: #1
2024-12-23 14:52:23 +00:00
henrik
b4b96b3f4e refactor: Refactoring of text creation 2024-12-10 21:42:22 +01:00
36 changed files with 455 additions and 460 deletions

2
.dokku/Procfile Normal file
View File

@@ -0,0 +1,2 @@
web: run-web.sh
silo: run-silo.sh

47
Dockerfile Normal file
View File

@@ -0,0 +1,47 @@
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 8080
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Pushy.Domain/Pushy.Domain.csproj", "Pushy.Domain/"]
COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"]
COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"]
COPY ["Pushy.Silo/Pushy.Silo.csproj", "Pushy.Silo/"]
COPY . .
RUN dotnet restore "Pushy.Silo/Pushy.Silo.csproj"
RUN dotnet restore "Pushy/Pushy/Pushy.csproj"
WORKDIR "/src/Pushy.Silo"
RUN dotnet build "Pushy.Silo.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/silo
WORKDIR "/src/Pushy/Pushy"
RUN dotnet build "Pushy.csproj" --no-restore -c $BUILD_CONFIGURATION -o /app/pushy
COPY .dokku/Procfile /app/.dokku/Procfile
COPY run-silo.sh /app/run-silo.sh
COPY run-web.sh /app/run-web.sh
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
WORKDIR "/src/Pushy.Silo"
RUN dotnet publish "Pushy.Silo.csproj" -c $BUILD_CONFIGURATION -o /app/publish/silo /p:UseAppHost=false
WORKDIR "/src/Pushy/Pushy"
RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish/pushy /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
COPY --from=publish /app/.dokku /app/.dokku
COPY --from=publish /app/*.sh /app/
ENTRYPOINT ["sh"]

7
GitVersion.yml Normal file
View File

@@ -0,0 +1,7 @@
branches:
main:
regex: ^master$|^main$
mode: ContinuousDelivery
develop:
regex: ^develop$
mode: ContinuousDelivery

View File

@@ -0,0 +1,7 @@
namespace Pushy.Domain;
public interface ILinkGenerator : IGrainWithGuidKey
{
[Alias("GenerateLink")]
public ValueTask<LinkResult> GenerateTextShare([Immutable] string text);
}

14
Pushy.Domain/ITextItem.cs Normal file
View File

@@ -0,0 +1,14 @@
using Orleans.Concurrency;
namespace Pushy.Domain;
public interface ITextItem : IGrainWithStringKey
{
[Alias("SetText")]
public ValueTask<TextSetResult> SetText(string text);
[ReadOnly]
[return: Immutable]
[Alias("GetText")]
ValueTask<string> GetText();
}

View File

@@ -0,0 +1,6 @@
namespace Pushy.Domain;
[Immutable]
[GenerateSerializer]
[Alias("Pushy.Grains.LinkResult")]
public record LinkResult(ITextItem? Item);

View File

@@ -0,0 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Orleans.Sdk" Version="9.0.1" />
</ItemGroup>
</Project>

6
Pushy.Domain/TextItem.cs Normal file
View File

@@ -0,0 +1,6 @@
namespace Pushy.Domain;
public sealed class TextItem
{
public string? Text { get; set; }
}

View File

@@ -0,0 +1,8 @@
namespace Pushy.Domain;
[GenerateSerializer]
public enum TextSetResult
{
Failure,
Success
}

View File

@@ -0,0 +1,38 @@
using Pushy.Domain;
namespace Pushy.Silo.Grains;
public sealed class LinkGenerator : IGrainBase, ILinkGenerator
{
private readonly ILogger<LinkGenerator> _logger;
private readonly IClusterClient _clusterClient;
public IGrainContext GrainContext { get; }
public LinkGenerator(
IGrainContext grainContext,
IClusterClient clusterClient,
ILogger<LinkGenerator> logger)
{
_clusterClient = clusterClient;
_logger = logger;
GrainContext = grainContext;
}
public async ValueTask<LinkResult> GenerateTextShare(string text)
{
string item = $"{Guid.CreateVersion7():N}"[9..];
var textGrain = _clusterClient.GetGrain<ITextItem>(item);
try
{
await textGrain.SetText(text);
return new LinkResult(textGrain);
}
catch (Exception)
{
//TODO: Write log message of why it fails?
//Swallow small change of error
return await GenerateTextShare(text);
}
}
}

View File

@@ -0,0 +1,67 @@
using Pushy.Domain;
namespace Pushy.Silo.Grains;
public sealed class TextItemGrain : IGrainBase, ITextItem, IRemindable
{
private readonly IPersistentState<TextItem> _state;
private readonly ILogger<TextItemGrain> _logger;
private IGrainReminder? _reminder;
public TextItemGrain(
IGrainContext grainContext,
[PersistentState("text")] IPersistentState<TextItem> state,
ILogger<TextItemGrain> logger)
{
_state = state;
_logger = logger;
GrainContext = grainContext;
}
public IGrainContext GrainContext { get; }
/// <inheritdoc />
public async Task OnActivateAsync(CancellationToken cancellationToken)
{
_reminder = await this.RegisterOrUpdateReminder("clear", TimeSpan.FromDays(10), TimeSpan.FromDays(10));
}
/// <inheritdoc />
public async ValueTask<TextSetResult> SetText(string text)
{
try
{
if (_state.State.Text is not null)
return TextSetResult.Failure;
_state.State.Text = text;
await _state.WriteStateAsync();
return TextSetResult.Success;
}
catch (Exception)
{
return TextSetResult.Failure;
}
}
/// <inheritdoc />
public ValueTask<string> GetText()
{
return ValueTask.FromResult(_state.State.Text ?? throw new InvalidOperationException("No text was available"));
}
/// <inheritdoc />
public async Task ReceiveReminder(string reminderName, TickStatus status)
{
if (reminderName == "clear")
{
_state.State.Text = null;
await _state.WriteStateAsync();
this.DeactivateOnIdle();
_logger.LogInformation("Text item have been cleared!");
}
}
}

28
Pushy.Silo/Program.cs Normal file
View File

@@ -0,0 +1,28 @@
using StackExchange.Redis;
var builder = Host.CreateApplicationBuilder(args);
builder.UseOrleans(silo =>
{
silo.AddActivityPropagation();
silo.UseRedisClustering(builder.Configuration.GetConnectionString("Valkey")!);
silo.UseRedisReminderService(conf =>
{
ConfigurationOptions configurationOptions =
ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
configurationOptions.DefaultDatabase = 0;
conf.ConfigurationOptions = configurationOptions;
});
silo.AddRedisGrainStorageAsDefault(options =>
{
ConfigurationOptions configurationOptions = ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
configurationOptions.DefaultDatabase = 1;
options.ConfigurationOptions = configurationOptions;
});
});
builder.Services.AddAllElasticApm();
var host = builder.Build();
host.Run();

View File

@@ -0,0 +1,12 @@
{
"$schema": "https://json.schemastore.org/launchsettings.json",
"profiles": {
"Pushy.Silo": {
"commandName": "Project",
"dotnetRunMessages": true,
"environmentVariables": {
"DOTNET_ENVIRONMENT": "Development"
}
}
}
}

View File

@@ -0,0 +1,25 @@
<Project Sdk="Microsoft.NET.Sdk.Worker">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<UserSecretsId>dotnet-Pushy.Silo-607fe096-6d3f-44f4-8e5d-8a2c875f8758</UserSecretsId>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<Title>Pushy Silo</Title>
<Authors>Henrik Lassen</Authors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0"/>
<PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Reminders.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Server" Version="9.0.1" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Pushy.Domain\Pushy.Domain.csproj" />
</ItemGroup>
</Project>

View File

@@ -0,0 +1,8 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
}
}

View File

@@ -0,0 +1,11 @@
{
"Logging": {
"LogLevel": {
"Default": "Information",
"Microsoft.Hosting.Lifetime": "Information"
}
},
"ElasticApm": {
"ServerUrl": "http://apm.home.local:8200"
}
}

View File

@@ -4,6 +4,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy", "Pushy\Pushy\Pushy.
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy.Client", "Pushy\Pushy.Client\Pushy.Client.csproj", "{E7FD5748-F854-48A7-ABE0-4E5C66B3671D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy.Silo", "Pushy.Silo\Pushy.Silo.csproj", "{7D79D5F5-95F6-40C3-8908-3853AEEBF70B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Pushy.Domain", "Pushy.Domain\Pushy.Domain.csproj", "{F8840C69-22DF-4B0A-A2A3-366DFCA059DE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Frontend", "Frontend", "{C4155A90-7E85-4BB0-BB3E-E9FBF9F6D2B3}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -18,5 +24,17 @@ Global
{E7FD5748-F854-48A7-ABE0-4E5C66B3671D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E7FD5748-F854-48A7-ABE0-4E5C66B3671D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{E7FD5748-F854-48A7-ABE0-4E5C66B3671D}.Release|Any CPU.Build.0 = Release|Any CPU
{7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7D79D5F5-95F6-40C3-8908-3853AEEBF70B}.Release|Any CPU.Build.0 = Release|Any CPU
{F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F8840C69-22DF-4B0A-A2A3-366DFCA059DE}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{1156C75D-F4F0-42CA-A007-724AC6CEC123} = {C4155A90-7E85-4BB0-BB3E-E9FBF9F6D2B3}
{E7FD5748-F854-48A7-ABE0-4E5C66B3671D} = {C4155A90-7E85-4BB0-BB3E-E9FBF9F6D2B3}
EndGlobalSection
EndGlobal

View File

@@ -1,2 +1,4 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIRemindable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fade617b5b5cd50987d2ed8207d608c80393a95d88b90c3a2e0e9335bc19c4b0_003FIRemindable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIGrainBase_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F7b522cc30a53bd25a33ab94497f733ec9a145f18911e0c8716e1c70af232e26_003FIGrainBase_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIRemindable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003Fade617b5b5cd50987d2ed8207d608c80393a95d88b90c3a2e0e9335bc19c4b0_003FIRemindable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AValkeyBuilderExtensions_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002Econfig_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FSourcesCache_003F9ff7b1765941c946e4e2bf8ebe75dee27c3248fbe7b8d772b5d9ab9bfbb6_003FValkeyBuilderExtensions_002Ecs/@EntryIndexedValue">ForceIncluded</s:String></wpf:ResourceDictionary>

View File

@@ -1,4 +1,8 @@
<Solution>
<Folder Name="/Frontend/">
<Project Path="Pushy\Pushy.Client\Pushy.Client.csproj" Type="Classic C#" />
<Project Path="Pushy\Pushy\Pushy.csproj" Type="Classic C#" />
</Folder>
<Project Path="Pushy.Domain\Pushy.Domain.csproj" Type="Classic C#" />
<Project Path="Pushy.Silo\Pushy.Silo.csproj" Type="Classic C#" />
</Solution>

View File

@@ -7,11 +7,11 @@
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<LangVersion>13</LangVersion>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.0" />
<PackageReference Include="UnitsNet" Version="5.61.0" />
</ItemGroup>
</Project>

View File

@@ -1,77 +0,0 @@
@page "/test"
@rendermode InteractiveWebAssembly
@inject PersistentComponentState ApplicationState
@inject ILogger<TestClientForm> Logger
<p>@Data - @RendererInfo.Name</p>
<EditForm Enhance FormName="TestForm" OnSubmit="Callback" Model="Item">
<InputText @bind-Value="@Item.Text"/>
<button class="btn " type="submit" disabled="@(doingStuff || !RendererInfo.IsInteractive)">
@if (doingStuff || !RendererInfo.IsInteractive)
{
<span class="loading loading-spinner"></span>
<a>Loading...</a>
}
else
{
<a>Test</a>
}
</button>
</EditForm>
@code {
private bool doingStuff = false;
private PersistingComponentStateSubscription persistingSubscription;
public sealed class FormInput
{
public required string Text { get; set; }
public required string[] Existing { get; set; }
}
[SupplyParameterFromForm] public FormInput Item { get; set; } = new()
{
Text = string.Empty,
Existing = []
};
public Guid Data = Guid.NewGuid();
protected override Task OnInitializedAsync()
{
persistingSubscription =
ApplicationState.RegisterOnPersisting(PersistData);
if (!ApplicationState.TryTakeFromJson<Guid>("TOKEN", out Data))
{
Data = Guid.NewGuid();
Logger.LogInformation("Data needs to be persisted! {Data}", Data);
}
else
{
Logger.LogInformation("Using persisted DATA");
}
return Task.CompletedTask;
}
private Task PersistData()
{
Logger.LogInformation("Persisting! {Data}", Data);
ApplicationState.PersistAsJson("TOKEN", Data);
return Task.CompletedTask;
}
private async Task Callback()
{
Item = new FormInput
{
Text = string.Empty,
Existing = [..Item.Existing, Item.Text, RendererInfo.Name]
};
}
}

View File

@@ -14,11 +14,12 @@
<link rel="stylesheet" href="@Assets["app.tailwind.css"]"/>
<link rel="stylesheet" href="@Assets["Pushy.styles.css"]"/>
<HeadOutlet/>
<ImportMap/>
</head>
<body>
<Routes/>
<script src="@Assets["_framework/blazor.web.js"]"></script>
<script src="_framework/blazor.web.js"></script>
@if (Agent.Configuration.Enabled && Environment.IsProduction())
{
<script src="@Assets["elastic-apm-rum.umd.min.js"]"></script>

View File

@@ -1,5 +1,5 @@
@page "/t/{id}"
@using Pushy.Grains
@using Pushy.Domain
@if (SharedText is null)
{

View File

@@ -1,5 +1,5 @@
@page "/"
@using Pushy.Grains
@using Pushy.Domain
@inject NavigationManager Nav
<PageTitle>Share Something!</PageTitle>
@@ -27,7 +27,7 @@
@{
string key = CreatedItems.GetPrimaryKeyString();
}
<a href="@Nav.ToAbsoluteUri($"/t/{key}")">@Nav.ToAbsoluteUri($"/t/{key}")</a>
<a class="link" href="@Nav.ToAbsoluteUri($"/t/{key}")">@Nav.ToAbsoluteUri($"/t/{key}")</a>
</div>
}
</div>
@@ -38,19 +38,21 @@
[Inject] public ILogger<Home> Logger { get; set; } = null!;
[Inject] public LinkGenerator ItemGenerator { get; set; } = null!;
[Inject] public ILinkGenerator ItemGenerator { get; set; } = null!;
[Inject] public IClusterClient ClusterClient { get; set; } = null!;
[Inject] public IGrainFactory ClusterClient { get; set; } = null!;
public ITextItem? CreatedItems;
private async Task SubmitInput()
{
ITextItem item = await ItemGenerator.GenerateTextShare(Form.InputText);
CreatedItems = item;
LinkResult result = await ItemGenerator.GenerateTextShare(Form.InputText);
if (result.Item is not null)
{
CreatedItems = result.Item;
Form = new UploadForm();
}
Logger.LogInformation("A new item was created!");
}

View File

@@ -1,23 +0,0 @@
FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
USER $APP_UID
WORKDIR /app
EXPOSE 8080
FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
ARG BUILD_CONFIGURATION=Release
WORKDIR /src
COPY ["Pushy/Pushy/Pushy.csproj", "Pushy/Pushy/"]
COPY ["Pushy/Pushy.Client/Pushy.Client.csproj", "Pushy/Pushy.Client/"]
RUN dotnet restore "Pushy/Pushy/Pushy.csproj"
COPY . .
WORKDIR "/src/Pushy/Pushy"
RUN dotnet build "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/build
FROM build AS publish
ARG BUILD_CONFIGURATION=Release
RUN dotnet publish "Pushy.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
FROM base AS final
WORKDIR /app
COPY --from=publish /app/publish .
ENTRYPOINT ["dotnet", "Pushy.dll"]

View File

@@ -1,73 +0,0 @@
using Orleans.Concurrency;
namespace Pushy.Grains;
public sealed class TextItem
{
public string? Text { get; set; }
}
public interface ITextItem : IGrainWithStringKey
{
[Alias("IsAvailable")]
public ValueTask<bool> IsAvailable();
[Alias("SetText")]
public ValueTask SetText(string text);
[ReadOnly]
[return: Immutable]
[Alias("GetText")]
ValueTask<string> GetText();
}
public sealed class TextItemGrain : Grain, ITextItem, IRemindable
{
private readonly IPersistentState<TextItem> _state;
private IGrainReminder? _reminder;
public TextItemGrain(
[PersistentState("text")] IPersistentState<TextItem> state)
{
_state = state;
}
/// <inheritdoc />
public override async Task OnActivateAsync(CancellationToken cancellationToken)
{
_reminder = await this.RegisterOrUpdateReminder("clear", TimeSpan.FromDays(10), TimeSpan.FromDays(10));
}
/// <inheritdoc />
public ValueTask<bool> IsAvailable()
{
return ValueTask.FromResult(_state.State.Text is null);
}
/// <inheritdoc />
public async ValueTask SetText(string text)
{
if(_state.State.Text is not null)
throw new InvalidOperationException("Text is already set");
_state.State.Text = text;
await _state.WriteStateAsync();
}
/// <inheritdoc />
public ValueTask<string> GetText()
{
return ValueTask.FromResult(_state.State.Text!);
}
/// <inheritdoc />
public async Task ReceiveReminder(string reminderName, TickStatus status)
{
if (reminderName == "clear")
{
_state.State.Text = null;
await _state.WriteStateAsync();
}
}
}

View File

@@ -1,32 +0,0 @@
using System.Security.Cryptography;
using System.Text;
using Pushy.Grains;
namespace Pushy;
public sealed class LinkGenerator
{
private readonly ILogger<LinkGenerator> _logger;
private readonly IClusterClient _clusterClient;
public LinkGenerator(
IClusterClient clusterClient,
ILogger<LinkGenerator> logger)
{
_clusterClient = clusterClient;
_logger = logger;
}
public async Task<ITextItem> GenerateTextShare(string text)
{
string item = $"{Guid.CreateVersion7():N}"[6..];
var sharedGrain = _clusterClient.GetGrain<ITextItem>(item);
if (await sharedGrain.IsAvailable())
{
await sharedGrain.SetText(text);
return sharedGrain;
}
return await GenerateTextShare(text);
}
}

View File

@@ -3,42 +3,43 @@ using Elastic.Extensions.Logging.Options;
using Elastic.Transport;
using Microsoft.AspNetCore.DataProtection;
using Pushy.Components;
using Pushy.Domain;
using StackExchange.Redis;
using LinkGenerator = Pushy.LinkGenerator;
var builder = WebApplication.CreateBuilder(args);
builder.UseOrleans(silo =>
string? connectionString = builder.Configuration.GetConnectionString("Valkey");
if (string.IsNullOrEmpty(connectionString))
throw new InvalidOperationException("Missing Valkey connection string");
builder.UseOrleansClient(silo =>
{
silo.UseLocalhostClustering();
silo.UseRedisReminderService(conf =>
{
ConfigurationOptions configurationOptions =
ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
configurationOptions.DefaultDatabase = 0;
conf.ConfigurationOptions = configurationOptions;
});
silo.AddRedisGrainStorageAsDefault(options =>
{
ConfigurationOptions configurationOptions = ConfigurationOptions.Parse(builder.Configuration.GetConnectionString("Valkey")!);
configurationOptions.DefaultDatabase = 1;
options.ConfigurationOptions = configurationOptions;
});
silo.UseRedisClustering(connectionString);
silo.AddActivityPropagation();
});
if (builder.Environment.IsProduction())
{
IConnectionMultiplexer multiplexer = ConnectionMultiplexer.Connect(builder.Configuration.GetConnectionString("Valkey")!);
string? elasticRawUrl = builder.Configuration["Elasticsearch:Url"];
string? elasticApiKey = builder.Configuration["Elasticsearch:ApiKey"];
if (string.IsNullOrEmpty(elasticRawUrl))
throw new InvalidOperationException(
"Missing Elasticsearch URL for logging");
if(string.IsNullOrEmpty(elasticApiKey))
throw new InvalidOperationException("Missing Elasticsearch API key");
IConnectionMultiplexer multiplexer = ConnectionMultiplexer.Connect(connectionString);
builder.Services.AddDataProtection()
.PersistKeysToStackExchangeRedis(multiplexer);
var transport = new TransportConfiguration(new StaticNodePool([new Uri("https://elastic-node-1.home.local:9200")]))
.Authentication(new ApiKey(builder.Configuration["Elasticsearch:ApiKey"]!))
.ServerCertificateValidationCallback((_, _, _, _) => true);
var transport = new TransportConfiguration(new StaticNodePool([new Uri(elasticRawUrl)]))
{
Authentication = new ApiKey(elasticApiKey),
ServerCertificateValidationCallback = (_, _, _, _) => true
};
builder.Logging.AddElasticsearch(opt =>
{
@@ -50,16 +51,18 @@ if (builder.Environment.IsProduction())
opt.Transport = new DistributedTransport(transport);
});
}
builder.Services.AddScoped<LinkGenerator>();
builder.Services.AddAllElasticApm();
builder.Services.AddScoped(service =>
service.GetRequiredService<IClusterClient>().GetGrain<ILinkGenerator>(Guid.Empty)
);
builder.Services.AddHealthChecks();
builder.Services.AddCors(policy =>
{
policy.AddDefaultPolicy(builder =>
policy.AddDefaultPolicy(cors =>
{
builder.WithOrigins("https://henrikml.dk")
cors.WithOrigins("https://henrikml.dk")
.AllowAnyHeader();
});
});

View File

@@ -5,32 +5,27 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<LangVersion>13</LangVersion>
<UserSecretsId>d8fe2296-80f7-4812-b26a-ccaa6167a6e1</UserSecretsId>
</PropertyGroup>
<PropertyGroup>
<ServerGarbageCollection>true</ServerGarbageCollection>
<ConcurrentGarbageCollection>true</ConcurrentGarbageCollection>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.30.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.12.2" />
<PackageReference Include="GitVersion.MsBuild" Version="6.0.5">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Elastic.Apm.NetCoreAll" Version="1.31.0" />
<PackageReference Include="Elastic.Extensions.Logging" Version="8.12.3" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="9.0.0" />
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="9.0.0" />
<PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="8.2.0" />
<PackageReference Include="Microsoft.Orleans.Reminders.Redis" Version="8.2.0" />
<PackageReference Include="Microsoft.Orleans.Sdk" Version="8.2.0" />
<PackageReference Include="Microsoft.Orleans.Server" Version="8.2.0" />
<PackageReference Include="Microsoft.Orleans.Clustering.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Persistence.Redis" Version="9.0.1" />
<PackageReference Include="Microsoft.Orleans.Reminders.Redis" Version="9.0.1" />
<PackageReference Include="System.Text.Json" Version="9.0.0" />
<PackageReference Include="UnitsNet" Version="5.61.0" />
<ProjectReference Include="..\..\Pushy.Domain\Pushy.Domain.csproj" />
<ProjectReference Include="..\Pushy.Client\Pushy.Client.csproj"/>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.0" />
</ItemGroup>
<ItemGroup>
<Content Include="..\..\.dockerignore">
<Link>.dockerignore</Link>
</Content>
</ItemGroup>
</Project>

View File

@@ -0,0 +1,3 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/CodeInspection/WebPathMapping/MappedPaths/=WWWROOT_005C_005FFRAMEWORK_005CBLAZOR_002EWEB_002EJS/@EntryIndexedValue"></s:String>
<s:String x:Key="/Default/CodeInspection/WebPathMapping/PathsInCorrectCasing/=WWWROOT_005C_005FFRAMEWORK_005CBLAZOR_002EWEB_002EJS/@EntryIndexedValue">wwwroot\_framework\blazor.web.js</s:String></wpf:ResourceDictionary>

View File

@@ -7,8 +7,7 @@
}
},
"AllowedHosts": "*",
"ElasticApm":
{
"ElasticApm": {
"ServerUrl": "http://apm.home.local:8200",
"TransactionNameGroups": "GET /t/*"
}

View File

@@ -625,40 +625,6 @@ html {
}
:root {
color-scheme: light;
--in: 72.06% 0.191 231.6;
--su: 64.8% 0.150 160;
--wa: 84.71% 0.199 83.87;
--er: 71.76% 0.221 22.18;
--pc: 89.824% 0.06192 275.75;
--ac: 15.352% 0.0368 183.61;
--inc: 0% 0 0;
--suc: 0% 0 0;
--wac: 0% 0 0;
--erc: 0% 0 0;
--rounded-box: 1rem;
--rounded-btn: 0.5rem;
--rounded-badge: 1.9rem;
--animation-btn: 0.25s;
--animation-input: .2s;
--btn-focus-scale: 0.95;
--border-btn: 1px;
--tab-border: 1px;
--tab-radius: 0.5rem;
--p: 49.12% 0.3096 275.75;
--s: 69.71% 0.329 342.55;
--sc: 98.71% 0.0106 342.55;
--a: 76.76% 0.184 183.61;
--n: 32.1785% 0.02476 255.701624;
--nc: 89.4994% 0.011585 252.096176;
--b1: 100% 0 0;
--b2: 96.1151% 0 0;
--b3: 92.4169% 0.00108 197.137559;
--bc: 27.8078% 0.029596 256.847952;
}
@media (prefers-color-scheme: dark) {
:root {
color-scheme: dark;
--in: 72.06% 0.191 231.6;
--su: 64.8% 0.150 160;
@@ -689,40 +655,6 @@ html {
--b2: 23.2607% 0.013807 253.100675;
--b3: 21.1484% 0.01165 254.087939;
--bc: 74.6477% 0.0216 264.435964;
}
}
[data-theme=light] {
color-scheme: light;
--in: 72.06% 0.191 231.6;
--su: 64.8% 0.150 160;
--wa: 84.71% 0.199 83.87;
--er: 71.76% 0.221 22.18;
--pc: 89.824% 0.06192 275.75;
--ac: 15.352% 0.0368 183.61;
--inc: 0% 0 0;
--suc: 0% 0 0;
--wac: 0% 0 0;
--erc: 0% 0 0;
--rounded-box: 1rem;
--rounded-btn: 0.5rem;
--rounded-badge: 1.9rem;
--animation-btn: 0.25s;
--animation-input: .2s;
--btn-focus-scale: 0.95;
--border-btn: 1px;
--tab-border: 1px;
--tab-radius: 0.5rem;
--p: 49.12% 0.3096 275.75;
--s: 69.71% 0.329 342.55;
--sc: 98.71% 0.0106 342.55;
--a: 76.76% 0.184 183.61;
--n: 32.1785% 0.02476 255.701624;
--nc: 89.4994% 0.011585 252.096176;
--b1: 100% 0 0;
--b2: 96.1151% 0 0;
--b3: 92.4169% 0.00108 197.137559;
--bc: 27.8078% 0.029596 256.847952;
}
[data-theme=dark] {
@@ -758,6 +690,39 @@ html {
--bc: 74.6477% 0.0216 264.435964;
}
[data-theme=light] {
color-scheme: light;
--in: 72.06% 0.191 231.6;
--su: 64.8% 0.150 160;
--wa: 84.71% 0.199 83.87;
--er: 71.76% 0.221 22.18;
--pc: 89.824% 0.06192 275.75;
--ac: 15.352% 0.0368 183.61;
--inc: 0% 0 0;
--suc: 0% 0 0;
--wac: 0% 0 0;
--erc: 0% 0 0;
--rounded-box: 1rem;
--rounded-btn: 0.5rem;
--rounded-badge: 1.9rem;
--animation-btn: 0.25s;
--animation-input: .2s;
--btn-focus-scale: 0.95;
--border-btn: 1px;
--tab-border: 1px;
--tab-radius: 0.5rem;
--p: 49.12% 0.3096 275.75;
--s: 69.71% 0.329 342.55;
--sc: 98.71% 0.0106 342.55;
--a: 76.76% 0.184 183.61;
--n: 32.1785% 0.02476 255.701624;
--nc: 89.4994% 0.011585 252.096176;
--b1: 100% 0 0;
--b2: 96.1151% 0 0;
--b3: 92.4169% 0.00108 197.137559;
--bc: 27.8078% 0.029596 256.847952;
}
@media (hover:hover) {
.label a:hover {
--tw-text-opacity: 1;
@@ -1572,11 +1537,6 @@ html {
mask-image: url("data:image/svg+xml,%3Csvg width='24' height='24' stroke='black' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform-origin='center'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' stroke-linecap='round'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 12 12' to='360 12 12' dur='2s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dasharray' values='0,150;42,150;42,150' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dashoffset' values='0;-16;-59' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3C/circle%3E%3C/g%3E%3C/svg%3E");
}
.loading-spinner {
-webkit-mask-image: url("data:image/svg+xml,%3Csvg width='24' height='24' stroke='black' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform-origin='center'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' stroke-linecap='round'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 12 12' to='360 12 12' dur='2s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dasharray' values='0,150;42,150;42,150' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dashoffset' values='0;-16;-59' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3C/circle%3E%3C/g%3E%3C/svg%3E");
mask-image: url("data:image/svg+xml,%3Csvg width='24' height='24' stroke='black' viewBox='0 0 24 24' xmlns='http://www.w3.org/2000/svg'%3E%3Cg transform-origin='center'%3E%3Ccircle cx='12' cy='12' r='9.5' fill='none' stroke-width='3' stroke-linecap='round'%3E%3CanimateTransform attributeName='transform' type='rotate' from='0 12 12' to='360 12 12' dur='2s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dasharray' values='0,150;42,150;42,150' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3Canimate attributeName='stroke-dashoffset' values='0;-16;-59' keyTimes='0;0.475;1' dur='1.5s' repeatCount='indefinite'/%3E%3C/circle%3E%3C/g%3E%3C/svg%3E");
}
:where(.menu li:not(.menu-title, .disabled) > *:not(ul, details, .menu-title)):not(summary, .active, .btn).focus, :where(.menu li:not(.menu-title, .disabled) > *:not(ul, details, .menu-title)):not(summary, .active, .btn):focus, :where(.menu li:not(.menu-title, .disabled) > *:not(ul, details, .menu-title)):is(summary):not(.active, .btn):focus-visible, :where(.menu li:not(.menu-title, .disabled) > details > summary:not(.menu-title)):not(summary, .active, .btn).focus, :where(.menu li:not(.menu-title, .disabled) > details > summary:not(.menu-title)):not(summary, .active, .btn):focus, :where(.menu li:not(.menu-title, .disabled) > details > summary:not(.menu-title)):is(summary):not(.active, .btn):focus-visible {
cursor: pointer;
background-color: var(--fallback-bc,oklch(var(--bc)/0.1));
@@ -2274,89 +2234,20 @@ html {
display: none;
}
.h-10 {
height: 2.5rem;
}
.h-5\/6 {
height: 83.333333%;
.h-48 {
height: 12rem;
}
.h-full {
height: 100%;
}
.h-4\/6 {
height: 66.666667%;
}
.h-\[64px\] {
height: 64px;
}
.h-16 {
height: 4rem;
}
.h-32 {
height: 8rem;
}
.h-48 {
height: 12rem;
}
.w-4 {
width: 1rem;
}
.w-16 {
width: 4rem;
}
.w-1\/2 {
width: 50%;
}
.w-64 {
width: 16rem;
}
.w-auto {
width: auto;
}
.w-max {
width: -moz-max-content;
width: max-content;
}
.w-10\/12 {
width: 83.333333%;
}
.w-11\/12 {
width: 91.666667%;
}
.w-8\/12 {
width: 66.666667%;
}
.w-4\/12 {
width: 33.333333%;
}
.w-6\/12 {
width: 50%;
}
.w-8 {
width: 2rem;
}
.flex-grow {
flex-grow: 1;
.w-auto {
width: auto;
}
.grow {
@@ -2371,14 +2262,6 @@ html {
flex-direction: column;
}
.content-center {
align-content: center;
}
.items-center {
align-items: center;
}
.justify-center {
justify-content: center;
}
@@ -2401,10 +2284,6 @@ html {
text-align: center;
}
.align-middle {
vertical-align: middle;
}
.blur {
--tw-blur: blur(8px);
filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
@@ -2413,25 +2292,3 @@ html {
.filter {
filter: var(--tw-blur) var(--tw-brightness) var(--tw-contrast) var(--tw-grayscale) var(--tw-hue-rotate) var(--tw-invert) var(--tw-saturate) var(--tw-sepia) var(--tw-drop-shadow);
}
@media (min-width: 640px) {
.sm\:w-8\/12 {
width: 66.666667%;
}
}
@media (min-width: 768px) {
.md\:w-4\/12 {
width: 33.333333%;
}
.md\:w-8\/12 {
width: 66.666667%;
}
}
@media (min-width: 1024px) {
.lg\:w-4\/12 {
width: 33.333333%;
}
}

View File

@@ -4,6 +4,9 @@ module.exports = {
theme: {
extend: {},
},
daisyui: {
themes: ['dark', 'light'],
},
plugins: [
require('daisyui')
],

View File

@@ -1,4 +1,12 @@
{
"formation": {
"web": {
"quantity": 1
},
"silo": {
"quantity": 2
}
},
"healthchecks": {
"web": [
{

3
run-silo.sh Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
cd /app/silo
dotnet Pushy.Silo.dll

3
run-web.sh Normal file
View File

@@ -0,0 +1,3 @@
#!/usr/bin/env bash
cd /app/pushy
dotnet Pushy.dll