Compare commits
10
Commits
master
..
797fc74e11
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
797fc74e11 | ||
|
|
51da3ddd65 | ||
|
|
c389c89d14 | ||
|
|
79492eac16 | ||
|
|
20ba8f99b1 | ||
|
|
ca79346f26 | ||
|
|
bc25dc7b07 | ||
|
|
fc71d848e2 | ||
|
|
45d3ee1ed6 | ||
|
|
63818df4b5 |
@@ -8,5 +8,3 @@ riderModule.iml
|
|||||||
.runsettings/
|
.runsettings/
|
||||||
|
|
||||||
.sisyphus/
|
.sisyphus/
|
||||||
|
|
||||||
.env
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
using System.Runtime.CompilerServices;
|
|
||||||
using Luna.Agents.Abstractions;
|
using Luna.Agents.Abstractions;
|
||||||
using Luna.Configuration;
|
using Luna.Configuration;
|
||||||
using Luna.Providers.Abstractions;
|
using Luna.Providers.Abstractions;
|
||||||
@@ -39,9 +38,7 @@ public class LibrarianAgent(
|
|||||||
.Where(m => m.Role != ChatRole.System);
|
.Where(m => m.Role != ChatRole.System);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async IAsyncEnumerable<ChatResponseUpdate> ProcessStreamingAsync(
|
public async IAsyncEnumerable<ChatResponseUpdate> ProcessStreamingAsync(IReadOnlyList<ChatMessage> messages, CancellationToken ct = default)
|
||||||
IReadOnlyList<ChatMessage> messages,
|
|
||||||
[EnumeratorCancellation] CancellationToken ct = default)
|
|
||||||
{
|
{
|
||||||
var chatOptions = new ChatOptions
|
var chatOptions = new ChatOptions
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -42,8 +42,6 @@ public interface IChannel : IDisposable
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
||||||
|
|
||||||
Task<bool> VerifyChannelLinkAsync();
|
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Send a message to the channel
|
/// Send a message to the channel
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
|
using Luna.Channels.Tests.Stubs;
|
||||||
using Luna.Core.Abstractions;
|
using Luna.Core.Abstractions;
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@@ -94,7 +95,7 @@ public class ChannelManagerInterfaceTests
|
|||||||
|
|
||||||
stub.RegisterChannel(mockChannel.Object);
|
stub.RegisterChannel(mockChannel.Object);
|
||||||
|
|
||||||
var _ = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
Guid.NewGuid().ToString(),
|
Guid.NewGuid().ToString(),
|
||||||
Guid.NewGuid().ToString(),
|
Guid.NewGuid().ToString(),
|
||||||
"sender-1",
|
"sender-1",
|
||||||
@@ -102,11 +103,11 @@ public class ChannelManagerInterfaceTests
|
|||||||
"Hello",
|
"Hello",
|
||||||
DateTimeOffset.UtcNow);
|
DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
// var eventArgs = new ChannelMessageReceivedEventArgs
|
var eventArgs = new ChannelMessageReceivedEventArgs
|
||||||
// {
|
{
|
||||||
// Message = message,
|
Message = message,
|
||||||
// Channel = mockChannel.Object
|
Channel = mockChannel.Object
|
||||||
// };
|
};
|
||||||
|
|
||||||
Assert.That(capturedArgs, Is.Not.Null);
|
Assert.That(capturedArgs, Is.Not.Null);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,110 +1,111 @@
|
|||||||
// using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
// using Luna.Channels.Cli;
|
using Luna.Channels.Cli;
|
||||||
// using Luna.Core.Abstractions;
|
using Luna.Channels.Tests.Stubs;
|
||||||
// using Luna.Shared;
|
using Luna.Core.Abstractions;
|
||||||
// using Moq;
|
using Luna.Shared;
|
||||||
//
|
using Moq;
|
||||||
// namespace Luna.Channels.Tests;
|
|
||||||
//
|
namespace Luna.Channels.Tests;
|
||||||
// [TestFixture]
|
|
||||||
// [Category("Unit")]
|
[TestFixture]
|
||||||
// public class CliChannelTests
|
[Category("Unit")]
|
||||||
// {
|
public class CliChannelTests
|
||||||
// [Test]
|
{
|
||||||
// public void ChannelType_Returns_Cli()
|
[Test]
|
||||||
// {
|
public void ChannelType_Returns_Cli()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
//
|
var channel = new CliChannel("test-1", hubMock.Object);
|
||||||
// Assert.That(channel.ChannelType, Is.EqualTo("cli"));
|
|
||||||
// }
|
Assert.That(channel.ChannelType, Is.EqualTo("cli"));
|
||||||
//
|
}
|
||||||
// [Test]
|
|
||||||
// public void ChannelId_IsUnique_PerInstance()
|
[Test]
|
||||||
// {
|
public void ChannelId_IsUnique_PerInstance()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel1 = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
// var channel2 = new CliChannel("test-2", hubMock.Object);
|
var channel1 = new CliChannel("test-1", hubMock.Object);
|
||||||
//
|
var channel2 = new CliChannel("test-2", hubMock.Object);
|
||||||
// Assert.That(channel1.ChannelId, Is.Not.EqualTo(channel2.ChannelId));
|
|
||||||
// }
|
Assert.That(channel1.ChannelId, Is.Not.EqualTo(channel2.ChannelId));
|
||||||
//
|
}
|
||||||
// [Test]
|
|
||||||
// public void DisplayName_Returns_HumanReadable()
|
[Test]
|
||||||
// {
|
public void DisplayName_Returns_HumanReadable()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
//
|
var channel = new CliChannel("test-1", hubMock.Object);
|
||||||
// Assert.That(channel.DisplayName, Is.Not.Null.And.Not.Empty);
|
|
||||||
// }
|
Assert.That(channel.DisplayName, Is.Not.Null.And.Not.Empty);
|
||||||
//
|
}
|
||||||
// [Test]
|
|
||||||
// public async Task SendMessageAsync_Sends_ChannelMessage()
|
[Test]
|
||||||
// {
|
public async Task SendMessageAsync_Sends_ChannelMessage()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
// var message = new ChannelMessage(
|
var channel = new CliChannel("test-1", hubMock.Object);
|
||||||
// Guid.NewGuid().ToString(),
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(),
|
Guid.NewGuid().ToString(),
|
||||||
// "cli-user-1",
|
Guid.NewGuid().ToString(),
|
||||||
// "CLI User",
|
"cli-user-1",
|
||||||
// "Hello from CLI",
|
"CLI User",
|
||||||
// DateTimeOffset.UtcNow);
|
"Hello from CLI",
|
||||||
//
|
DateTimeOffset.UtcNow);
|
||||||
// await channel.SendMessageAsync(message);
|
|
||||||
// }
|
await channel.SendMessageAsync(message);
|
||||||
//
|
}
|
||||||
// [Test]
|
|
||||||
// public async Task SendStreamingMessageAsync_Consumes_Stream()
|
[Test]
|
||||||
// {
|
public async Task SendStreamingMessageAsync_Consumes_Stream()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
//
|
var channel = new CliChannel("test-1", hubMock.Object);
|
||||||
// async IAsyncEnumerable<ChatStreamUpdate> TestStream()
|
|
||||||
// {
|
async IAsyncEnumerable<ChatStreamUpdate> TestStream()
|
||||||
// yield return new ChatStreamUpdate(ChatStreamUpdateType.Text, "Hello", "assistant", false);
|
{
|
||||||
// yield return new ChatStreamUpdate(ChatStreamUpdateType.Text, " world", "assistant", false);
|
yield return new ChatStreamUpdate(ChatStreamUpdateType.Text, "Hello", "assistant", false);
|
||||||
// yield return new ChatStreamUpdate(ChatStreamUpdateType.Complete, null, "assistant", true);
|
yield return new ChatStreamUpdate(ChatStreamUpdateType.Text, " world", "assistant", false);
|
||||||
// await Task.CompletedTask;
|
yield return new ChatStreamUpdate(ChatStreamUpdateType.Complete, null, "assistant", true);
|
||||||
// }
|
await Task.CompletedTask;
|
||||||
//
|
}
|
||||||
// await channel.SendStreamingMessageAsync(TestStream());
|
|
||||||
// }
|
await channel.SendStreamingMessageAsync(TestStream());
|
||||||
//
|
}
|
||||||
// [Test]
|
|
||||||
// public void Dispose_CleansUp()
|
[Test]
|
||||||
// {
|
public void Dispose_CleansUp()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
//
|
var channel = new CliChannel("test-1", hubMock.Object);
|
||||||
// Assert.That(() => channel.Dispose(), Throws.Nothing);
|
|
||||||
// }
|
Assert.That(() => channel.Dispose(), Throws.Nothing);
|
||||||
//
|
}
|
||||||
// [Test]
|
|
||||||
// public void MessageReceived_Event_Fires_On_RaiseMessageReceived()
|
[Test]
|
||||||
// {
|
public void MessageReceived_Event_Fires_On_RaiseMessageReceived()
|
||||||
// var hubMock = new Mock<IChatHubContext>();
|
{
|
||||||
// var channel = new CliChannel("test-1", hubMock.Object);
|
var hubMock = new Mock<IChatHubContext>();
|
||||||
// ChannelMessageReceivedEventArgs? capturedArgs = null;
|
var channel = new CliChannel("test-1", hubMock.Object);
|
||||||
//
|
ChannelMessageReceivedEventArgs? capturedArgs = null;
|
||||||
// channel.MessageReceived += (_, args) =>
|
|
||||||
// {
|
channel.MessageReceived += (_, args) =>
|
||||||
// capturedArgs = args;
|
{
|
||||||
// return Task.CompletedTask;
|
capturedArgs = args;
|
||||||
// };
|
return Task.CompletedTask;
|
||||||
//
|
};
|
||||||
// var message = new ChannelMessage(
|
|
||||||
// Guid.NewGuid().ToString(),
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(),
|
Guid.NewGuid().ToString(),
|
||||||
// "cli-user-1",
|
Guid.NewGuid().ToString(),
|
||||||
// "CLI User",
|
"cli-user-1",
|
||||||
// "Hello from CLI",
|
"CLI User",
|
||||||
// DateTimeOffset.UtcNow);
|
"Hello from CLI",
|
||||||
//
|
DateTimeOffset.UtcNow);
|
||||||
// channel.RaiseMessageReceived(null, message);
|
|
||||||
//
|
channel.RaiseMessageReceived(null, message);
|
||||||
// Assert.That(capturedArgs, Is.Not.Null,
|
|
||||||
// "MessageReceived event must fire when RaiseMessageReceived is called.");
|
Assert.That(capturedArgs, Is.Not.Null,
|
||||||
// Assert.That(capturedArgs!.Message.Content, Is.EqualTo("Hello from CLI"));
|
"MessageReceived event must fire when RaiseMessageReceived is called.");
|
||||||
// }
|
Assert.That(capturedArgs!.Message.Content, Is.EqualTo("Hello from CLI"));
|
||||||
// }
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -10,21 +10,21 @@ namespace Luna.Channels.Tests;
|
|||||||
[Category("Unit")]
|
[Category("Unit")]
|
||||||
public class DependencyInjectionTests
|
public class DependencyInjectionTests
|
||||||
{
|
{
|
||||||
private ServiceCollection services = null!;
|
private ServiceCollection _services = null!;
|
||||||
|
|
||||||
[SetUp]
|
[SetUp]
|
||||||
public void SetUp()
|
public void SetUp()
|
||||||
{
|
{
|
||||||
services = [];
|
_services = new ServiceCollection();
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_RegistersIChannelManager_AsSingleton()
|
public void AddChannels_RegistersIChannelManager_AsSingleton()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
// var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var descriptor = services.FirstOrDefault(d => d.ServiceType == typeof(IChannelManager));
|
var descriptor = _services.FirstOrDefault(d => d.ServiceType == typeof(IChannelManager));
|
||||||
|
|
||||||
Assert.That(descriptor, Is.Not.Null);
|
Assert.That(descriptor, Is.Not.Null);
|
||||||
Assert.That(descriptor!.Lifetime, Is.EqualTo(ServiceLifetime.Singleton));
|
Assert.That(descriptor!.Lifetime, Is.EqualTo(ServiceLifetime.Singleton));
|
||||||
@@ -33,8 +33,8 @@ public class DependencyInjectionTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_IChannelManager_IsResolvableFromContainer()
|
public void AddChannels_IChannelManager_IsResolvableFromContainer()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var manager = provider.GetService<IChannelManager>();
|
var manager = provider.GetService<IChannelManager>();
|
||||||
|
|
||||||
@@ -44,10 +44,10 @@ public class DependencyInjectionTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_TelegramOptions_IsRegistered()
|
public void AddChannels_TelegramOptions_IsRegistered()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
// var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var descriptor = services.FirstOrDefault(d =>
|
var descriptor = _services.FirstOrDefault(d =>
|
||||||
d.ServiceType.IsGenericType &&
|
d.ServiceType.IsGenericType &&
|
||||||
d.ServiceType.GetGenericTypeDefinition() == typeof(IOptions<>) &&
|
d.ServiceType.GetGenericTypeDefinition() == typeof(IOptions<>) &&
|
||||||
d.ServiceType.GetGenericArguments()[0] == typeof(TelegramOptions));
|
d.ServiceType.GetGenericArguments()[0] == typeof(TelegramOptions));
|
||||||
@@ -59,8 +59,8 @@ public class DependencyInjectionTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_CliChannel_IsRegistered()
|
public void AddChannels_CliChannel_IsRegistered()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var channels = provider.GetServices<IChannel>().ToList();
|
var channels = provider.GetServices<IChannel>().ToList();
|
||||||
var channelTypes = channels.Select(c => c.ChannelType).ToList();
|
var channelTypes = channels.Select(c => c.ChannelType).ToList();
|
||||||
@@ -72,8 +72,8 @@ public class DependencyInjectionTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_TelegramChannel_IsRegistered()
|
public void AddChannels_TelegramChannel_IsRegistered()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var channels = provider.GetServices<IChannel>().ToList();
|
var channels = provider.GetServices<IChannel>().ToList();
|
||||||
var channelTypes = channels.Select(c => c.ChannelType).ToList();
|
var channelTypes = channels.Select(c => c.ChannelType).ToList();
|
||||||
@@ -85,11 +85,11 @@ public class DependencyInjectionTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_CalledTwice_DoesNotDuplicateSingletonRegistration()
|
public void AddChannels_CalledTwice_DoesNotDuplicateSingletonRegistration()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
//var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var descriptors = services.Where(d => d.ServiceType == typeof(IChannelManager)).ToList();
|
var descriptors = _services.Where(d => d.ServiceType == typeof(IChannelManager)).ToList();
|
||||||
|
|
||||||
Assert.That(descriptors, Has.Count.EqualTo(1),
|
Assert.That(descriptors, Has.Count.EqualTo(1),
|
||||||
"Calling AddChannels() twice must not register IChannelManager twice");
|
"Calling AddChannels() twice must not register IChannelManager twice");
|
||||||
@@ -98,8 +98,8 @@ public class DependencyInjectionTests
|
|||||||
[Test]
|
[Test]
|
||||||
public void AddChannels_SameProviderInstance_ReturnsSameIChannelManager()
|
public void AddChannels_SameProviderInstance_ReturnsSameIChannelManager()
|
||||||
{
|
{
|
||||||
services.AddChannels();
|
_services.AddChannels();
|
||||||
var provider = services.BuildServiceProvider();
|
var provider = _services.BuildServiceProvider();
|
||||||
|
|
||||||
var first = provider.GetRequiredService<IChannelManager>();
|
var first = provider.GetRequiredService<IChannelManager>();
|
||||||
var second = provider.GetRequiredService<IChannelManager>();
|
var second = provider.GetRequiredService<IChannelManager>();
|
||||||
|
|||||||
@@ -10,21 +10,21 @@ namespace Luna.Channels.Tests;
|
|||||||
[Category("Unit")]
|
[Category("Unit")]
|
||||||
public class IntegrationTests
|
public class IntegrationTests
|
||||||
{
|
{
|
||||||
private Mock<ISessionManager> sessionManagerMock = null!;
|
private Mock<ISessionManager> _sessionManagerMock = null!;
|
||||||
private Mock<IChannel> channelMock = null!;
|
private Mock<IChannel> _channelMock = null!;
|
||||||
private ChannelManagerStub manager = null!;
|
private ChannelManagerStub _manager = null!;
|
||||||
|
|
||||||
[SetUp]
|
[SetUp]
|
||||||
public void SetUp()
|
public void SetUp()
|
||||||
{
|
{
|
||||||
sessionManagerMock = new Mock<ISessionManager>();
|
_sessionManagerMock = new Mock<ISessionManager>();
|
||||||
channelMock = new Mock<IChannel>();
|
_channelMock = new Mock<IChannel>();
|
||||||
channelMock.Setup(c => c.ChannelId).Returns("test-ch-1");
|
_channelMock.Setup(c => c.ChannelId).Returns("test-ch-1");
|
||||||
channelMock.Setup(c => c.ChannelType).Returns("test");
|
_channelMock.Setup(c => c.ChannelType).Returns("test");
|
||||||
channelMock.Setup(c => c.SendStreamingMessageAsync(
|
_channelMock.Setup(c => c.SendStreamingMessageAsync(
|
||||||
It.IsAny<IAsyncEnumerable<ChatStreamUpdate>>(),
|
It.IsAny<IAsyncEnumerable<ChatStreamUpdate>>(),
|
||||||
It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
|
It.IsAny<CancellationToken>())).Returns(Task.CompletedTask);
|
||||||
manager = new ChannelManagerStub(sessionManagerMock.Object);
|
_manager = new ChannelManagerStub(_sessionManagerMock.Object);
|
||||||
}
|
}
|
||||||
|
|
||||||
private static async IAsyncEnumerable<ChatStreamUpdate> BuildStream(params ChatStreamUpdate[] updates)
|
private static async IAsyncEnumerable<ChatStreamUpdate> BuildStream(params ChatStreamUpdate[] updates)
|
||||||
@@ -42,24 +42,24 @@ public class IntegrationTests
|
|||||||
var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-1", "User One", "Hello Luna!", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-1", "User One", "Hello Luna!", DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
sessionManagerMock
|
_sessionManagerMock
|
||||||
.Setup(s => s.RouteMessagesAsync(
|
.Setup(s => s.RouteMessagesAsync(
|
||||||
message.Content,
|
message.Content,
|
||||||
message.ConversationId,
|
message.ConversationId.ToString(),
|
||||||
It.IsAny<string>(),
|
It.IsAny<string>(),
|
||||||
It.IsAny<CancellationToken>()))
|
It.IsAny<CancellationToken>()))
|
||||||
.Returns(BuildStream(new ChatStreamUpdate(ChatStreamUpdateType.Text, "Hi!", null, false)));
|
.Returns(BuildStream(new ChatStreamUpdate(ChatStreamUpdateType.Text, "Hi!", null, false)));
|
||||||
|
|
||||||
manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
_manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
||||||
|
|
||||||
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = channelMock.Object };
|
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = _channelMock.Object };
|
||||||
channelMock.Raise(c => c.MessageReceived += null, channelMock.Object, args);
|
_channelMock.Raise(c => c.MessageReceived += null, _channelMock.Object, args);
|
||||||
|
|
||||||
await Task.Delay(50);
|
await Task.Delay(50);
|
||||||
|
|
||||||
sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
_sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
||||||
message.Content,
|
message.Content,
|
||||||
message.ConversationId,
|
message.ConversationId.ToString(),
|
||||||
It.IsAny<string>(),
|
It.IsAny<string>(),
|
||||||
It.IsAny<CancellationToken>()), Times.Once);
|
It.IsAny<CancellationToken>()), Times.Once);
|
||||||
}
|
}
|
||||||
@@ -75,19 +75,19 @@ public class IntegrationTests
|
|||||||
new ChatStreamUpdate(ChatStreamUpdateType.Text, "noon.", null, false),
|
new ChatStreamUpdate(ChatStreamUpdateType.Text, "noon.", null, false),
|
||||||
new ChatStreamUpdate(ChatStreamUpdateType.Complete, null, null, true));
|
new ChatStreamUpdate(ChatStreamUpdateType.Complete, null, null, true));
|
||||||
|
|
||||||
sessionManagerMock
|
_sessionManagerMock
|
||||||
.Setup(s => s.RouteMessagesAsync(
|
.Setup(s => s.RouteMessagesAsync(
|
||||||
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||||
.Returns(responseStream);
|
.Returns(responseStream);
|
||||||
|
|
||||||
manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
_manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
||||||
|
|
||||||
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = channelMock.Object };
|
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = _channelMock.Object };
|
||||||
channelMock.Raise(c => c.MessageReceived += null, channelMock.Object, args);
|
_channelMock.Raise(c => c.MessageReceived += null, _channelMock.Object, args);
|
||||||
|
|
||||||
await Task.Delay(50);
|
await Task.Delay(50);
|
||||||
|
|
||||||
channelMock.Verify(c => c.SendStreamingMessageAsync(
|
_channelMock.Verify(c => c.SendStreamingMessageAsync(
|
||||||
It.IsAny<IAsyncEnumerable<ChatStreamUpdate>>(),
|
It.IsAny<IAsyncEnumerable<ChatStreamUpdate>>(),
|
||||||
It.IsAny<CancellationToken>()), Times.Once);
|
It.IsAny<CancellationToken>()), Times.Once);
|
||||||
}
|
}
|
||||||
@@ -98,14 +98,14 @@ public class IntegrationTests
|
|||||||
var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-3", "User Three", "/start", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-3", "User Three", "/start", DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
_manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
||||||
|
|
||||||
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = channelMock.Object, IsHandled = true };
|
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = _channelMock.Object, IsHandled = true };
|
||||||
channelMock.Raise(c => c.MessageReceived += null, channelMock.Object, args);
|
_channelMock.Raise(c => c.MessageReceived += null, _channelMock.Object, args);
|
||||||
|
|
||||||
await Task.Delay(50);
|
await Task.Delay(50);
|
||||||
|
|
||||||
sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
_sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
||||||
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()),
|
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()),
|
||||||
Times.Never);
|
Times.Never);
|
||||||
}
|
}
|
||||||
@@ -120,25 +120,25 @@ public class IntegrationTests
|
|||||||
It.IsAny<IAsyncEnumerable<ChatStreamUpdate>>(), It.IsAny<CancellationToken>()))
|
It.IsAny<IAsyncEnumerable<ChatStreamUpdate>>(), It.IsAny<CancellationToken>()))
|
||||||
.Returns(Task.CompletedTask);
|
.Returns(Task.CompletedTask);
|
||||||
|
|
||||||
sessionManagerMock
|
_sessionManagerMock
|
||||||
.Setup(s => s.RouteMessagesAsync(
|
.Setup(s => s.RouteMessagesAsync(
|
||||||
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||||
.Returns(BuildStream(new ChatStreamUpdate(ChatStreamUpdateType.Text, "ok", null, true)));
|
.Returns(BuildStream(new ChatStreamUpdate(ChatStreamUpdateType.Text, "ok", null, true)));
|
||||||
|
|
||||||
manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
_manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
||||||
manager.RegisterChannel(channel2Mock.Object);
|
_manager.RegisterChannel(channel2Mock.Object);
|
||||||
|
|
||||||
var msg1 = new ChannelMessage(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "u1", "U1", "Msg1", DateTimeOffset.UtcNow);
|
var msg1 = new ChannelMessage(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "u1", "U1", "Msg1", DateTimeOffset.UtcNow);
|
||||||
var msg2 = new ChannelMessage(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "u2", "U2", "Msg2", DateTimeOffset.UtcNow);
|
var msg2 = new ChannelMessage(Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "u2", "U2", "Msg2", DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
channelMock.Raise(c => c.MessageReceived += null, channelMock.Object,
|
_channelMock.Raise(c => c.MessageReceived += null, _channelMock.Object,
|
||||||
new ChannelMessageReceivedEventArgs { Message = msg1, Channel = channelMock.Object });
|
new ChannelMessageReceivedEventArgs { Message = msg1, Channel = _channelMock.Object });
|
||||||
channel2Mock.Raise(c => c.MessageReceived += null, channel2Mock.Object,
|
channel2Mock.Raise(c => c.MessageReceived += null, channel2Mock.Object,
|
||||||
new ChannelMessageReceivedEventArgs { Message = msg2, Channel = channel2Mock.Object });
|
new ChannelMessageReceivedEventArgs { Message = msg2, Channel = channel2Mock.Object });
|
||||||
|
|
||||||
await Task.Delay(100);
|
await Task.Delay(100);
|
||||||
|
|
||||||
sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
_sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
||||||
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()),
|
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()),
|
||||||
Times.Exactly(2));
|
Times.Exactly(2));
|
||||||
}
|
}
|
||||||
@@ -150,21 +150,21 @@ public class IntegrationTests
|
|||||||
var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-4", "User Four", "Cancel me", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-4", "User Four", "Cancel me", DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
sessionManagerMock
|
_sessionManagerMock
|
||||||
.Setup(s => s.RouteMessagesAsync(
|
.Setup(s => s.RouteMessagesAsync(
|
||||||
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), cts.Token))
|
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), cts.Token))
|
||||||
.Returns(BuildStream(new ChatStreamUpdate(ChatStreamUpdateType.Text, "x", null, true)));
|
.Returns(BuildStream(new ChatStreamUpdate(ChatStreamUpdateType.Text, "x", null, true)));
|
||||||
|
|
||||||
manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
_manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
||||||
|
|
||||||
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = channelMock.Object };
|
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = _channelMock.Object };
|
||||||
await channelMock.RaiseAsync(c => c.MessageReceived += null, channelMock.Object, args);
|
await _channelMock.RaiseAsync(c => c.MessageReceived += null, _channelMock.Object, args);
|
||||||
|
|
||||||
await Task.Delay(50, cts.Token);
|
await Task.Delay(50, cts.Token);
|
||||||
|
|
||||||
sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
_sessionManagerMock.Verify(s => s.RouteMessagesAsync(
|
||||||
message.Content,
|
message.Content,
|
||||||
message.ConversationId,
|
message.ConversationId.ToString(),
|
||||||
It.IsAny<string>(),
|
It.IsAny<string>(),
|
||||||
It.IsAny<CancellationToken>()), Times.Once);
|
It.IsAny<CancellationToken>()), Times.Once);
|
||||||
}
|
}
|
||||||
@@ -175,17 +175,17 @@ public class IntegrationTests
|
|||||||
var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-5", "User Five", "Boom", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), Guid.NewGuid().ToString(), "user-5", "User Five", "Boom", DateTimeOffset.UtcNow);
|
||||||
|
|
||||||
sessionManagerMock
|
_sessionManagerMock
|
||||||
.Setup(s => s.RouteMessagesAsync(
|
.Setup(s => s.RouteMessagesAsync(
|
||||||
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
It.IsAny<string>(), It.IsAny<string>(), It.IsAny<string>(), It.IsAny<CancellationToken>()))
|
||||||
.Throws(new InvalidOperationException("Simulated routing failure"));
|
.Throws(new InvalidOperationException("Simulated routing failure"));
|
||||||
|
|
||||||
manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
_manager.RegisterChannel(new CliChannelStub { ChannelId = "test-1" });
|
||||||
|
|
||||||
Assert.DoesNotThrowAsync(async () =>
|
Assert.DoesNotThrowAsync(async () =>
|
||||||
{
|
{
|
||||||
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = channelMock.Object };
|
var args = new ChannelMessageReceivedEventArgs { Message = message, Channel = _channelMock.Object };
|
||||||
await channelMock.RaiseAsync(c => c.MessageReceived += null, channelMock.Object, args);
|
await _channelMock.RaiseAsync(c => c.MessageReceived += null, _channelMock.Object, args);
|
||||||
await Task.Delay(50);
|
await Task.Delay(50);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ public class ChannelManagerStub : IChannelManager
|
|||||||
|
|
||||||
public void UnregisterChannel(string channelId) => throw new NotImplementedException();
|
public void UnregisterChannel(string channelId) => throw new NotImplementedException();
|
||||||
|
|
||||||
public IChannel GetChannel(string channelId) => throw new NotImplementedException();
|
public IChannel? GetChannel(string channelId) => throw new NotImplementedException();
|
||||||
|
|
||||||
public IReadOnlyList<IChannel> GetAllChannels() => throw new NotImplementedException();
|
public IReadOnlyList<IChannel> GetAllChannels() => throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,6 @@ public class CliChannelStub : IChannel
|
|||||||
public bool IsConnected => throw new NotImplementedException();
|
public bool IsConnected => throw new NotImplementedException();
|
||||||
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
||||||
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
||||||
public Task<bool> VerifyChannelLinkAsync() => throw new NotImplementedException();
|
|
||||||
|
|
||||||
public Task SendMessageAsync(ChannelMessage message, CancellationToken cancellationToken = default) => throw new NotImplementedException();
|
public Task SendMessageAsync(ChannelMessage message, CancellationToken cancellationToken = default) => throw new NotImplementedException();
|
||||||
public Task SendStreamingMessageAsync(IAsyncEnumerable<ChatStreamUpdate> messageStream, CancellationToken cancellationToken = default) => throw new NotImplementedException();
|
public Task SendStreamingMessageAsync(IAsyncEnumerable<ChatStreamUpdate> messageStream, CancellationToken cancellationToken = default) => throw new NotImplementedException();
|
||||||
public void RaiseMessageReceived(object? sender, ChannelMessage message) => throw new NotImplementedException();
|
public void RaiseMessageReceived(object? sender, ChannelMessage message) => throw new NotImplementedException();
|
||||||
|
|||||||
@@ -13,11 +13,6 @@ public class TelegramChannelStub : IChannel
|
|||||||
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
||||||
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
||||||
|
|
||||||
public Task<bool> VerifyChannelLinkAsync()
|
|
||||||
{
|
|
||||||
throw new NotImplementedException();
|
|
||||||
}
|
|
||||||
|
|
||||||
public Task SendMessageAsync(ChannelMessage message, CancellationToken cancellationToken = default) =>
|
public Task SendMessageAsync(ChannelMessage message, CancellationToken cancellationToken = default) =>
|
||||||
throw new NotImplementedException();
|
throw new NotImplementedException();
|
||||||
|
|
||||||
|
|||||||
@@ -1,345 +1,345 @@
|
|||||||
// using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
// using Luna.Channels.Telegram;
|
using Luna.Channels.Telegram;
|
||||||
// using Luna.Configuration;
|
using Luna.Configuration;
|
||||||
// using Luna.Shared;
|
using Luna.Shared;
|
||||||
// using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
// using Moq;
|
using Moq;
|
||||||
// using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
// using Telegram.Bot.Requests;
|
using Telegram.Bot.Requests;
|
||||||
// using Telegram.Bot.Types;
|
using Telegram.Bot.Types;
|
||||||
//
|
|
||||||
// namespace Luna.Channels.Tests;
|
namespace Luna.Channels.Tests;
|
||||||
//
|
|
||||||
// [TestFixture]
|
[TestFixture]
|
||||||
// [Category("Unit")]
|
[Category("Unit")]
|
||||||
// public class TelegramChannelTests
|
public class TelegramChannelTests
|
||||||
// {
|
{
|
||||||
// private Mock<ITelegramBotClient> mockBotClient = null!;
|
private Mock<ITelegramBotClient> _mockBotClient = null!;
|
||||||
// private Mock<ILogger<TelegramChannel>> mockLogger = null!;
|
private Mock<ILogger<TelegramChannel>> _mockLogger = null!;
|
||||||
// private TelegramOptions options = null!;
|
private TelegramOptions _options = null!;
|
||||||
// private TelegramChannel channel = null!;
|
private TelegramChannel _channel = null!;
|
||||||
//
|
|
||||||
// [SetUp]
|
[SetUp]
|
||||||
// public void SetUp()
|
public void SetUp()
|
||||||
// {
|
{
|
||||||
// mockBotClient = new Mock<ITelegramBotClient>();
|
_mockBotClient = new Mock<ITelegramBotClient>();
|
||||||
// mockLogger = new Mock<ILogger<TelegramChannel>>();
|
_mockLogger = new Mock<ILogger<TelegramChannel>>();
|
||||||
// options = new TelegramOptions { BotToken = "test-bot-token:ABCDEF" };
|
_options = new TelegramOptions { BotToken = "test-bot-token:ABCDEF" };
|
||||||
// channel = new TelegramChannel("100", mockBotClient.Object, mockLogger.Object, options);
|
_channel = new TelegramChannel("100", _mockBotClient.Object, _mockLogger.Object, _options);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [TearDown]
|
[TearDown]
|
||||||
// public void TearDown()
|
public void TearDown()
|
||||||
// {
|
{
|
||||||
// channel.Dispose();
|
_channel.Dispose();
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void ChannelType_Returns_Telegram()
|
public void ChannelType_Returns_Telegram()
|
||||||
// {
|
{
|
||||||
// Assert.That(channel.ChannelType, Is.EqualTo("telegram"));
|
Assert.That(_channel.ChannelType, Is.EqualTo("telegram"));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void ChannelId_IsSet_From_Constructor()
|
public void ChannelId_IsSet_From_Constructor()
|
||||||
// {
|
{
|
||||||
// Assert.That(channel.ChannelId, Is.EqualTo("100"));
|
Assert.That(_channel.ChannelId, Is.EqualTo("100"));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void ChannelId_IsUnique_Per_Instance()
|
public void ChannelId_IsUnique_Per_Instance()
|
||||||
// {
|
{
|
||||||
// var channel1 = new TelegramChannel("111", mockBotClient.Object, mockLogger.Object, options);
|
var channel1 = new TelegramChannel("111", _mockBotClient.Object, _mockLogger.Object, _options);
|
||||||
// var channel2 = new TelegramChannel("222", mockBotClient.Object, mockLogger.Object, options);
|
var channel2 = new TelegramChannel("222", _mockBotClient.Object, _mockLogger.Object, _options);
|
||||||
//
|
|
||||||
// Assert.That(channel1.ChannelId, Is.Not.EqualTo(channel2.ChannelId));
|
Assert.That(channel1.ChannelId, Is.Not.EqualTo(channel2.ChannelId));
|
||||||
//
|
|
||||||
// channel1.Dispose();
|
channel1.Dispose();
|
||||||
// channel2.Dispose();
|
channel2.Dispose();
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void DisplayName_Contains_Telegram()
|
public void DisplayName_Contains_Telegram()
|
||||||
// {
|
{
|
||||||
// Assert.That(channel.DisplayName, Does.Contain("Telegram"));
|
Assert.That(_channel.DisplayName, Does.Contain("Telegram"));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void IsConnected_Is_True_Initially()
|
public void IsConnected_Is_True_Initially()
|
||||||
// {
|
{
|
||||||
// Assert.That(channel.IsConnected, Is.True);
|
Assert.That(_channel.IsConnected, Is.True);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void IsConnected_Is_False_After_Dispose()
|
public void IsConnected_Is_False_After_Dispose()
|
||||||
// {
|
{
|
||||||
// channel.Dispose();
|
_channel.Dispose();
|
||||||
//
|
|
||||||
// Assert.That(channel.IsConnected, Is.False);
|
Assert.That(_channel.IsConnected, Is.False);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public async Task SendMessageAsync_Calls_BotClient_SendMessage()
|
public async Task SendMessageAsync_Calls_BotClient_SendMessage()
|
||||||
// {
|
{
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 1, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 1, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "100", "42", "Alice", "Hello!", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "100", "42", "Alice", "Hello!", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// await channel.SendMessageAsync(message);
|
await _channel.SendMessageAsync(message);
|
||||||
//
|
|
||||||
// mockBotClient.Verify(
|
_mockBotClient.Verify(
|
||||||
// c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
||||||
// Times.Once);
|
Times.Once);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public async Task SendMessageAsync_Handles_Network_Error_Without_Crash()
|
public async Task SendMessageAsync_Handles_Network_Error_Without_Crash()
|
||||||
// {
|
{
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ThrowsAsync(new HttpRequestException("Network error"));
|
.ThrowsAsync(new HttpRequestException("Network error"));
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "100", "42", "Alice", "Hello!", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "100", "42", "Alice", "Hello!", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// Assert.DoesNotThrowAsync(async () => await channel.SendMessageAsync(message));
|
Assert.DoesNotThrowAsync(async () => await _channel.SendMessageAsync(message));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void RaiseMessageReceived_Fires_Event_With_Correct_Mapping()
|
public void RaiseMessageReceived_Fires_Event_With_Correct_Mapping()
|
||||||
// {
|
{
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
_channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "999", "77", "Bob", "Hello Luna", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "999", "77", "Bob", "Hello Luna", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// channel.RaiseMessageReceived(message);
|
_channel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Not.Null);
|
Assert.That(captured, Is.Not.Null);
|
||||||
// Assert.That(captured!.Message.ConversationId, Is.EqualTo("999"));
|
Assert.That(captured!.Message.ConversationId, Is.EqualTo("999"));
|
||||||
// Assert.That(captured.Message.SenderId, Is.EqualTo("77"));
|
Assert.That(captured.Message.SenderId, Is.EqualTo("77"));
|
||||||
// Assert.That(captured.Message.SenderName, Is.EqualTo("Bob"));
|
Assert.That(captured.Message.SenderName, Is.EqualTo("Bob"));
|
||||||
// Assert.That(captured.Message.Content, Is.EqualTo("Hello Luna"));
|
Assert.That(captured.Message.Content, Is.EqualTo("Hello Luna"));
|
||||||
// Assert.That(captured.Channel, Is.SameAs(channel));
|
Assert.That(captured.Channel, Is.SameAs(_channel));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void RaiseMessageReceived_Maps_SenderName_And_Timestamp()
|
public void RaiseMessageReceived_Maps_SenderName_And_Timestamp()
|
||||||
// {
|
{
|
||||||
// var sentAt = new DateTimeOffset(2025, 6, 1, 12, 0, 0, TimeSpan.Zero);
|
var sentAt = new DateTimeOffset(2025, 6, 1, 12, 0, 0, TimeSpan.Zero);
|
||||||
//
|
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
_channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "123", "55", "Carol", "Hi", sentAt);
|
Guid.NewGuid().ToString(), "123", "55", "Carol", "Hi", sentAt);
|
||||||
//
|
|
||||||
// channel.RaiseMessageReceived(message);
|
_channel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Not.Null);
|
Assert.That(captured, Is.Not.Null);
|
||||||
// Assert.That(captured!.Message.SenderName, Is.EqualTo("Carol"));
|
Assert.That(captured!.Message.SenderName, Is.EqualTo("Carol"));
|
||||||
// Assert.That(captured.Message.Timestamp, Is.EqualTo(sentAt));
|
Assert.That(captured.Message.Timestamp, Is.EqualTo(sentAt));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public async Task SendStreamingMessageAsync_Sends_Initial_Then_Edits_In_Place()
|
public async Task SendStreamingMessageAsync_Sends_Initial_Then_Edits_In_Place()
|
||||||
// {
|
{
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 10, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 10, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 10, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 10, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// var updates = new List<ChatStreamUpdate>
|
var updates = new List<ChatStreamUpdate>
|
||||||
// {
|
{
|
||||||
// new(ChatStreamUpdateType.Text, "Hello ", null, false),
|
new(ChatStreamUpdateType.Text, "Hello ", null, false),
|
||||||
// new(ChatStreamUpdateType.Text, "World", null, false),
|
new(ChatStreamUpdateType.Text, "World", null, false),
|
||||||
// new(ChatStreamUpdateType.Complete, null, null, true),
|
new(ChatStreamUpdateType.Complete, null, null, true),
|
||||||
// };
|
};
|
||||||
//
|
|
||||||
// await channel.SendStreamingMessageAsync(updates.ToAsyncEnumerable());
|
await _channel.SendStreamingMessageAsync(updates.ToAsyncEnumerable());
|
||||||
//
|
|
||||||
// // First chunk sends a message, second chunk edits it
|
// First chunk sends a message, second chunk edits it
|
||||||
// mockBotClient.Verify(
|
_mockBotClient.Verify(
|
||||||
// c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
||||||
// Times.Once);
|
Times.Once);
|
||||||
//
|
|
||||||
// mockBotClient.Verify(
|
_mockBotClient.Verify(
|
||||||
// c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()),
|
c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()),
|
||||||
// Times.AtLeastOnce);
|
Times.AtLeastOnce);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public async Task SendStreamingMessageAsync_Handles_4096_Char_Limit_By_Chunking()
|
public async Task SendStreamingMessageAsync_Handles_4096_Char_Limit_By_Chunking()
|
||||||
// {
|
{
|
||||||
// var longContent = new string('A', 4097);
|
var longContent = new string('A', 4097);
|
||||||
// var updates = new List<ChatStreamUpdate>
|
var updates = new List<ChatStreamUpdate>
|
||||||
// {
|
{
|
||||||
// new(ChatStreamUpdateType.Text, longContent, null, false),
|
new(ChatStreamUpdateType.Text, longContent, null, false),
|
||||||
// new(ChatStreamUpdateType.Complete, null, null, true),
|
new(ChatStreamUpdateType.Complete, null, null, true),
|
||||||
// };
|
};
|
||||||
//
|
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 20, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 20, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 20, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 20, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// await channel.SendStreamingMessageAsync(updates.ToAsyncEnumerable());
|
await _channel.SendStreamingMessageAsync(updates.ToAsyncEnumerable());
|
||||||
//
|
|
||||||
// // Content exceeds 4096 — needs at least 2 SendMessage calls (initial + overflow)
|
// Content exceeds 4096 — needs at least 2 SendMessage calls (initial + overflow)
|
||||||
// mockBotClient.Verify(
|
_mockBotClient.Verify(
|
||||||
// c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
||||||
// Times.AtLeast(2));
|
Times.AtLeast(2));
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public async Task SendStreamingMessageAsync_Handles_IsComplete_True_With_Final_Edit()
|
public async Task SendStreamingMessageAsync_Handles_IsComplete_True_With_Final_Edit()
|
||||||
// {
|
{
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 30, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 30, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// mockBotClient
|
_mockBotClient
|
||||||
// .Setup(c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()))
|
.Setup(c => c.SendRequest(It.IsAny<EditMessageTextRequest>(), It.IsAny<CancellationToken>()))
|
||||||
// .ReturnsAsync(new Message { Id = 30, Chat = new Chat { Id = 100 } });
|
.ReturnsAsync(new Message { Id = 30, Chat = new Chat { Id = 100 } });
|
||||||
//
|
|
||||||
// var updates = new List<ChatStreamUpdate>
|
var updates = new List<ChatStreamUpdate>
|
||||||
// {
|
{
|
||||||
// new(ChatStreamUpdateType.Text, "Final answer", null, false),
|
new(ChatStreamUpdateType.Text, "Final answer", null, false),
|
||||||
// new(ChatStreamUpdateType.Complete, null, null, true),
|
new(ChatStreamUpdateType.Complete, null, null, true),
|
||||||
// };
|
};
|
||||||
//
|
|
||||||
// await channel.SendStreamingMessageAsync(updates.ToAsyncEnumerable());
|
await _channel.SendStreamingMessageAsync(updates.ToAsyncEnumerable());
|
||||||
//
|
|
||||||
// // Initial message sent
|
// Initial message sent
|
||||||
// mockBotClient.Verify(
|
_mockBotClient.Verify(
|
||||||
// c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
c => c.SendRequest(It.IsAny<SendMessageRequest>(), It.IsAny<CancellationToken>()),
|
||||||
// Times.Once);
|
Times.Once);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void AllowedUserIds_Non_Empty_Blocks_Unauthorized_User()
|
public void AllowedUserIds_Non_Empty_Blocks_Unauthorized_User()
|
||||||
// {
|
{
|
||||||
// var restrictedOptions = new TelegramOptions
|
var restrictedOptions = new TelegramOptions
|
||||||
// {
|
{
|
||||||
// BotToken = "test-token",
|
BotToken = "test-token",
|
||||||
// AllowedUserIds = ["111", "222"]
|
AllowedUserIds = ["111", "222"]
|
||||||
// };
|
};
|
||||||
// var restrictedChannel = new TelegramChannel(
|
var restrictedChannel = new TelegramChannel(
|
||||||
// "500", mockBotClient.Object, mockLogger.Object, restrictedOptions);
|
"500", _mockBotClient.Object, _mockLogger.Object, restrictedOptions);
|
||||||
//
|
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// restrictedChannel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
restrictedChannel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "500", "999", "Hacker", "attack", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "500", "999", "Hacker", "attack", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// restrictedChannel.RaiseMessageReceived(message);
|
restrictedChannel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Null, "Message from unauthorized user should be silently ignored");
|
Assert.That(captured, Is.Null, "Message from unauthorized user should be silently ignored");
|
||||||
//
|
|
||||||
// restrictedChannel.Dispose();
|
restrictedChannel.Dispose();
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void AllowedUserIds_Non_Empty_Allows_Authorized_User()
|
public void AllowedUserIds_Non_Empty_Allows_Authorized_User()
|
||||||
// {
|
{
|
||||||
// var restrictedOptions = new TelegramOptions
|
var restrictedOptions = new TelegramOptions
|
||||||
// {
|
{
|
||||||
// BotToken = "test-token",
|
BotToken = "test-token",
|
||||||
// AllowedUserIds = ["111", "222"]
|
AllowedUserIds = ["111", "222"]
|
||||||
// };
|
};
|
||||||
// var restrictedChannel = new TelegramChannel(
|
var restrictedChannel = new TelegramChannel(
|
||||||
// "500", mockBotClient.Object, mockLogger.Object, restrictedOptions);
|
"500", _mockBotClient.Object, _mockLogger.Object, restrictedOptions);
|
||||||
//
|
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// restrictedChannel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
restrictedChannel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "500", "111", "TrustedUser", "hello", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "500", "111", "TrustedUser", "hello", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// restrictedChannel.RaiseMessageReceived(message);
|
restrictedChannel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Not.Null, "Message from authorized user should be accepted");
|
Assert.That(captured, Is.Not.Null, "Message from authorized user should be accepted");
|
||||||
//
|
|
||||||
// restrictedChannel.Dispose();
|
restrictedChannel.Dispose();
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void AllowedUserIds_Empty_Accepts_All_Users()
|
public void AllowedUserIds_Empty_Accepts_All_Users()
|
||||||
// {
|
{
|
||||||
// var openOptions = new TelegramOptions
|
var openOptions = new TelegramOptions
|
||||||
// {
|
{
|
||||||
// BotToken = "test-token",
|
BotToken = "test-token",
|
||||||
// AllowedUserIds = []
|
AllowedUserIds = []
|
||||||
// };
|
};
|
||||||
// var openChannel = new TelegramChannel(
|
var openChannel = new TelegramChannel(
|
||||||
// "600", mockBotClient.Object, mockLogger.Object, openOptions);
|
"600", _mockBotClient.Object, _mockLogger.Object, openOptions);
|
||||||
//
|
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// openChannel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
openChannel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "600", "12345", "Anyone", "hello", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "600", "12345", "Anyone", "hello", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// openChannel.RaiseMessageReceived(message);
|
openChannel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Not.Null, "Message should be accepted when AllowedUserIds is empty");
|
Assert.That(captured, Is.Not.Null, "Message should be accepted when AllowedUserIds is empty");
|
||||||
//
|
|
||||||
// openChannel.Dispose();
|
openChannel.Dispose();
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void Malformed_Message_With_Null_Text_Is_Skipped()
|
public void Malformed_Message_With_Null_Text_Is_Skipped()
|
||||||
// {
|
{
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
_channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "700", "88", "Ghost", null!, DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "700", "88", "Ghost", null!, DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// channel.RaiseMessageReceived(message);
|
_channel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Null, "Message with null text should be silently skipped");
|
Assert.That(captured, Is.Null, "Message with null text should be silently skipped");
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void Malformed_Message_With_Empty_Text_Is_Skipped()
|
public void Malformed_Message_With_Empty_Text_Is_Skipped()
|
||||||
// {
|
{
|
||||||
// ChannelMessageReceivedEventArgs? captured = null;
|
ChannelMessageReceivedEventArgs? captured = null;
|
||||||
// channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
_channel.MessageReceived += (_, args) => { captured = args; return Task.CompletedTask; };
|
||||||
//
|
|
||||||
// var message = new ChannelMessage(
|
var message = new ChannelMessage(
|
||||||
// Guid.NewGuid().ToString(), "700", "88", "Ghost", "", DateTimeOffset.UtcNow);
|
Guid.NewGuid().ToString(), "700", "88", "Ghost", "", DateTimeOffset.UtcNow);
|
||||||
//
|
|
||||||
// channel.RaiseMessageReceived(message);
|
_channel.RaiseMessageReceived(message);
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Null, "Message with empty text should be silently skipped");
|
Assert.That(captured, Is.Null, "Message with empty text should be silently skipped");
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// [Test]
|
[Test]
|
||||||
// public void Dispose_Fires_ConnectionStateChanged()
|
public void Dispose_Fires_ConnectionStateChanged()
|
||||||
// {
|
{
|
||||||
// ChannelConnectionEventArgs? captured = null;
|
ChannelConnectionEventArgs? captured = null;
|
||||||
// channel.ConnectionStateChanged += (_, args) =>
|
_channel.ConnectionStateChanged += (_, args) =>
|
||||||
// {
|
{
|
||||||
// captured = args;
|
captured = args;
|
||||||
// return Task.CompletedTask;
|
return Task.CompletedTask;
|
||||||
// };
|
};
|
||||||
//
|
|
||||||
// channel.Dispose();
|
_channel.Dispose();
|
||||||
//
|
|
||||||
// Assert.That(captured, Is.Not.Null);
|
Assert.That(captured, Is.Not.Null);
|
||||||
// Assert.That(captured!.IsConnected, Is.False);
|
Assert.That(captured!.IsConnected, Is.False);
|
||||||
// Assert.That(captured.Channel, Is.SameAs(channel));
|
Assert.That(captured.Channel, Is.SameAs(_channel));
|
||||||
// }
|
}
|
||||||
// }
|
}
|
||||||
|
|||||||
@@ -1,15 +1,10 @@
|
|||||||
using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
using Luna.Core.Abstractions;
|
using Luna.Core.Abstractions;
|
||||||
using Luna.Identity.Abstractions;
|
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
|
|
||||||
namespace Luna.Channels.Cli;
|
namespace Luna.Channels.Cli;
|
||||||
|
|
||||||
public class CliChannel(
|
public class CliChannel(string channelId, IChatHubContext hubContext) : IChannel
|
||||||
string channelId,
|
|
||||||
IChatHubContext hubContext,
|
|
||||||
IUserIdentityService identityService)
|
|
||||||
: IChannel
|
|
||||||
{
|
{
|
||||||
public string ChannelId { get; } = channelId;
|
public string ChannelId { get; } = channelId;
|
||||||
public string ChannelType => Abstractions.ChannelType.Cli;
|
public string ChannelType => Abstractions.ChannelType.Cli;
|
||||||
@@ -19,26 +14,6 @@ public class CliChannel(
|
|||||||
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
||||||
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
||||||
|
|
||||||
public async Task<bool> VerifyChannelLinkAsync()
|
|
||||||
{
|
|
||||||
var currentUser = identityService.GetCurrentUser();
|
|
||||||
|
|
||||||
if (identityService.IsChannelLinked(currentUser.UserId, ChannelType))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
var pairingCode = identityService.StartChannelLink(currentUser.UserId, ChannelType);
|
|
||||||
await SendMessageAsync(new ChannelMessage(
|
|
||||||
MessageId: Guid.NewGuid().ToString(),
|
|
||||||
ConversationId: Guid.NewGuid().ToString(),
|
|
||||||
SenderId: Guid.NewGuid().ToString(),
|
|
||||||
SenderName: "luna",
|
|
||||||
Content:
|
|
||||||
$"{ChannelType} channel is not linked to current user.\nGo to web interface and execute command \"/link [pairing code]\".\nYou will have to provide following PairingCode: {pairingCode}",
|
|
||||||
Timestamp: DateTimeOffset.UtcNow));
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task SendStreamingMessageAsync(IAsyncEnumerable<ChatStreamUpdate> messageStream, CancellationToken cancellationToken = default)
|
public async Task SendStreamingMessageAsync(IAsyncEnumerable<ChatStreamUpdate> messageStream, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
await hubContext.SendStreamingResponseAsync(ChannelId, messageStream, cancellationToken);
|
await hubContext.SendStreamingResponseAsync(ChannelId, messageStream, cancellationToken);
|
||||||
|
|||||||
@@ -1,27 +1,25 @@
|
|||||||
using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
using Luna.Channels.Telegram;
|
using Luna.Channels.Telegram;
|
||||||
using Luna.Configuration;
|
using Luna.Configuration;
|
||||||
using Luna.Configuration.Extensions;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
using Microsoft.Extensions.DependencyInjection;
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
|
|
||||||
namespace Luna.Channels.Extensions;
|
namespace Luna.Channels.Extensions;
|
||||||
|
|
||||||
public static class ServiceCollectionExtensions
|
public static class ServiceCollectionExtensions
|
||||||
{
|
{
|
||||||
|
private const string TelegramBotToken = "8778257521:AAEt0ML88u2zx5AdZCi7XNKC1MhdngyCHJI";
|
||||||
|
|
||||||
extension(IServiceCollection services)
|
extension(IServiceCollection services)
|
||||||
{
|
{
|
||||||
public IServiceCollection AddChannels()
|
public IServiceCollection AddChannels()
|
||||||
{
|
{
|
||||||
services.AddSingleton<IChannelManager, ChannelManager>();
|
services.AddSingleton<IChannelManager, ChannelManager>();
|
||||||
|
|
||||||
// Telegram — BotToken is bound from configuration ("Channels:Telegram"),
|
// Telegram
|
||||||
// supplied via the Channels__Telegram__BotToken environment variable.
|
var telegramOptions = new TelegramOptions { BotToken = TelegramBotToken };
|
||||||
services.AddTelegramOptions();
|
services.AddSingleton(telegramOptions);
|
||||||
services.AddSingleton(provider => provider.GetRequiredService<IOptions<TelegramOptions>>().Value);
|
services.AddSingleton<ITelegramBotClient>(_ => new TelegramBotClient(TelegramBotToken));
|
||||||
services.AddSingleton<ITelegramBotClient>(provider =>
|
|
||||||
new TelegramBotClient(provider.GetRequiredService<TelegramOptions>().BotToken));
|
|
||||||
services.AddHostedService<TelegramAdapter>();
|
services.AddHostedService<TelegramAdapter>();
|
||||||
|
|
||||||
return services;
|
return services;
|
||||||
|
|||||||
@@ -10,7 +10,6 @@
|
|||||||
<ProjectReference Include="..\Luna.Channels.Abstractions\Luna.Channels.Abstractions.csproj" />
|
<ProjectReference Include="..\Luna.Channels.Abstractions\Luna.Channels.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Configuration\Luna.Configuration.csproj" />
|
<ProjectReference Include="..\Luna.Configuration\Luna.Configuration.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Core.Abstractions\Luna.Core.Abstractions.csproj" />
|
<ProjectReference Include="..\Luna.Core.Abstractions\Luna.Core.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Identity.Abstractions\Luna.Identity.Abstractions.csproj" />
|
|
||||||
<ProjectReference Include="..\Luna.Shared\Luna.Shared.csproj" />
|
<ProjectReference Include="..\Luna.Shared\Luna.Shared.csproj" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
using Luna.Configuration;
|
using Luna.Configuration;
|
||||||
using Luna.Identity.Abstractions;
|
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
using Microsoft.Extensions.Hosting;
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
@@ -12,7 +11,6 @@ namespace Luna.Channels.Telegram;
|
|||||||
|
|
||||||
public class TelegramAdapter(
|
public class TelegramAdapter(
|
||||||
IChannelManager channelManager,
|
IChannelManager channelManager,
|
||||||
IUserIdentityService identityService,
|
|
||||||
ITelegramBotClient botClient,
|
ITelegramBotClient botClient,
|
||||||
TelegramOptions options,
|
TelegramOptions options,
|
||||||
ILogger<TelegramAdapter> adapterLogger,
|
ILogger<TelegramAdapter> adapterLogger,
|
||||||
@@ -62,9 +60,6 @@ public class TelegramAdapter(
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (await channel.VerifyChannelLinkAsync() == false)
|
|
||||||
return;
|
|
||||||
|
|
||||||
var channelMessage = new ChannelMessage(
|
var channelMessage = new ChannelMessage(
|
||||||
MessageId: message.Id.ToString(),
|
MessageId: message.Id.ToString(),
|
||||||
ConversationId: chat.Id.ToString(),
|
ConversationId: chat.Id.ToString(),
|
||||||
@@ -91,7 +86,6 @@ public class TelegramAdapter(
|
|||||||
var channel = new TelegramChannel(
|
var channel = new TelegramChannel(
|
||||||
chatId.ToString(),
|
chatId.ToString(),
|
||||||
botClient,
|
botClient,
|
||||||
identityService,
|
|
||||||
channelLogger,
|
channelLogger,
|
||||||
options);
|
options);
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
using Luna.Configuration;
|
using Luna.Configuration;
|
||||||
using Luna.Identity.Abstractions;
|
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Telegram.Bot;
|
using Telegram.Bot;
|
||||||
@@ -12,7 +11,6 @@ namespace Luna.Channels.Telegram;
|
|||||||
public class TelegramChannel(
|
public class TelegramChannel(
|
||||||
string chatId,
|
string chatId,
|
||||||
ITelegramBotClient botClient,
|
ITelegramBotClient botClient,
|
||||||
IUserIdentityService identityService,
|
|
||||||
ILogger<TelegramChannel> logger,
|
ILogger<TelegramChannel> logger,
|
||||||
TelegramOptions options) : IChannel
|
TelegramOptions options) : IChannel
|
||||||
{
|
{
|
||||||
@@ -26,26 +24,6 @@ public class TelegramChannel(
|
|||||||
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
||||||
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
||||||
|
|
||||||
public async Task<bool> VerifyChannelLinkAsync()
|
|
||||||
{
|
|
||||||
var currentUser = identityService.GetCurrentUser();
|
|
||||||
|
|
||||||
if (identityService.IsChannelLinked(currentUser.UserId, ChannelType))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
var pairingCode = identityService.StartChannelLink(currentUser.UserId, ChannelType);
|
|
||||||
await SendMessageAsync(new ChannelMessage(
|
|
||||||
MessageId: Guid.NewGuid().ToString(),
|
|
||||||
ConversationId: Guid.NewGuid().ToString(),
|
|
||||||
SenderId: Guid.NewGuid().ToString(),
|
|
||||||
SenderName: "luna",
|
|
||||||
Content:
|
|
||||||
$"{ChannelType} channel is not linked to current user.\nGo to web interface and execute command \"/link [pairing code]\".\nYou will have to provide following PairingCode: {pairingCode}",
|
|
||||||
Timestamp: DateTimeOffset.UtcNow));
|
|
||||||
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
public async Task SendMessageAsync(ChannelMessage message, CancellationToken cancellationToken = default)
|
public async Task SendMessageAsync(ChannelMessage message, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
try
|
try
|
||||||
@@ -64,9 +42,10 @@ public class TelegramChannel(
|
|||||||
CancellationToken cancellationToken = default)
|
CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
var targetChatId = long.Parse(ChannelId);
|
var targetChatId = long.Parse(ChannelId);
|
||||||
|
int? currentMessageId = null;
|
||||||
|
|
||||||
var typingCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
|
var typingCts = CancellationTokenSource.CreateLinkedTokenSource(cancellationToken);
|
||||||
var _ = KeepTypingAsync(targetChatId, typingCts.Token);
|
var typingTask = KeepTypingAsync(targetChatId, typingCts.Token);
|
||||||
|
|
||||||
var messageBuilder = new StringBuilder();
|
var messageBuilder = new StringBuilder();
|
||||||
await foreach (var update in messageStream.WithCancellation(cancellationToken))
|
await foreach (var update in messageStream.WithCancellation(cancellationToken))
|
||||||
|
|||||||
@@ -1,11 +1,10 @@
|
|||||||
using Luna.Channels.Abstractions;
|
using Luna.Channels.Abstractions;
|
||||||
using Luna.Core.Abstractions;
|
using Luna.Core.Abstractions;
|
||||||
using Luna.Identity.Abstractions;
|
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
|
|
||||||
namespace Luna.Channels.Web;
|
namespace Luna.Channels.Web;
|
||||||
|
|
||||||
public class WebChannel(string channelId, IChatHubContext hubContext, IUserIdentityService identityService) : IChannel
|
public class WebChannel(string channelId, IChatHubContext hubContext) : IChannel
|
||||||
{
|
{
|
||||||
public string ChannelId { get; } = channelId;
|
public string ChannelId { get; } = channelId;
|
||||||
public string ChannelType => Abstractions.ChannelType.Web;
|
public string ChannelType => Abstractions.ChannelType.Web;
|
||||||
@@ -14,9 +13,6 @@ public class WebChannel(string channelId, IChatHubContext hubContext, IUserIdent
|
|||||||
|
|
||||||
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
public event ChannelMessageReceivedEventHandler? MessageReceived;
|
||||||
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
public event ChannelConnectionChangedEventHandler? ConnectionStateChanged;
|
||||||
|
|
||||||
public Task<bool> VerifyChannelLinkAsync()
|
|
||||||
=> Task.FromResult(true);
|
|
||||||
|
|
||||||
public async Task SendStreamingMessageAsync(IAsyncEnumerable<ChatStreamUpdate> messageStream, CancellationToken cancellationToken = default)
|
public async Task SendStreamingMessageAsync(IAsyncEnumerable<ChatStreamUpdate> messageStream, CancellationToken cancellationToken = default)
|
||||||
{
|
{
|
||||||
@@ -28,14 +24,8 @@ public class WebChannel(string channelId, IChatHubContext hubContext, IUserIdent
|
|||||||
await hubContext.SendResponseAsync(ChannelId, message, cancellationToken);
|
await hubContext.SendResponseAsync(ChannelId, message, cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task RaiseMessageReceivedAsync(object? sender, ChannelMessage message)
|
public void RaiseMessageReceived(object? sender, ChannelMessage message)
|
||||||
{
|
{
|
||||||
if (message.Content.StartsWith("/"))
|
|
||||||
{
|
|
||||||
await HandleCommandAsync(message.Content);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
MessageReceived?.Invoke(sender, new ChannelMessageReceivedEventArgs
|
MessageReceived?.Invoke(sender, new ChannelMessageReceivedEventArgs
|
||||||
{
|
{
|
||||||
Channel = this,
|
Channel = this,
|
||||||
@@ -43,49 +33,6 @@ public class WebChannel(string channelId, IChatHubContext hubContext, IUserIdent
|
|||||||
IsHandled = false
|
IsHandled = false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task HandleCommandAsync(string command)
|
|
||||||
{
|
|
||||||
var parts = command.Split(' ', StringSplitOptions.RemoveEmptyEntries);
|
|
||||||
var commandName = parts[0].ToLowerInvariant();
|
|
||||||
|
|
||||||
var responseText = commandName switch
|
|
||||||
{
|
|
||||||
"/link" => HandleLinkCommand(parts),
|
|
||||||
_ => $"Unknown command: {commandName}"
|
|
||||||
};
|
|
||||||
|
|
||||||
await SendMessageAsync(new ChannelMessage(
|
|
||||||
MessageId: Guid.NewGuid().ToString(),
|
|
||||||
ConversationId: Guid.NewGuid().ToString(),
|
|
||||||
SenderId: "luna",
|
|
||||||
SenderName: "Luna",
|
|
||||||
Content: responseText,
|
|
||||||
Timestamp: DateTimeOffset.UtcNow));
|
|
||||||
}
|
|
||||||
|
|
||||||
private string HandleLinkCommand(string[] parts)
|
|
||||||
{
|
|
||||||
if (parts.Length < 3)
|
|
||||||
return "Usage: /link <channel-type> <pairing-code>";
|
|
||||||
|
|
||||||
var channelType = parts[1].ToLowerInvariant();
|
|
||||||
var code = parts[2].ToUpperInvariant();
|
|
||||||
var currentUser = identityService.GetCurrentUser();
|
|
||||||
|
|
||||||
if (identityService.IsChannelLinked(currentUser.UserId, channelType))
|
|
||||||
return $"Channel {channelType} is already linked to your account.";
|
|
||||||
|
|
||||||
try
|
|
||||||
{
|
|
||||||
identityService.CompleteChannelLink(currentUser.UserId, channelType, code);
|
|
||||||
return $"Successfully linked {channelType} channel to your account.";
|
|
||||||
}
|
|
||||||
catch (InvalidOperationException ex)
|
|
||||||
{
|
|
||||||
return $"Failed to link channel: {ex.Message}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void Dispose() { }
|
public void Dispose() { }
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
using System.Text.Json;
|
||||||
|
using System.Text.Json.Serialization;
|
||||||
using System.Threading.Channels;
|
using System.Threading.Channels;
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
using Microsoft.AspNetCore.SignalR.Client;
|
using Microsoft.AspNetCore.SignalR.Client;
|
||||||
@@ -141,7 +143,7 @@ public class ChatClientService(IHostApplicationLifetime lifetime) : IHostedServi
|
|||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
await connection.InvokeAsync("OnMessageReceivedAsync", message, cancellationToken);
|
await connection.InvokeAsync("OnMessageReceived", message, cancellationToken);
|
||||||
|
|
||||||
await foreach (var update in responseChannel.Reader.ReadAllAsync(cancellationToken))
|
await foreach (var update in responseChannel.Reader.ReadAllAsync(cancellationToken))
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -6,12 +6,12 @@ namespace Luna.Configuration.Extensions;
|
|||||||
|
|
||||||
public static class ConfigurationBuilderExtensions
|
public static class ConfigurationBuilderExtensions
|
||||||
{
|
{
|
||||||
private static readonly string[] AgentConfigSearchPaths =
|
private static string[] AgentConfigSearchPaths =
|
||||||
[
|
[
|
||||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".luna", "agents")
|
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".luna", "agents")
|
||||||
];
|
];
|
||||||
|
|
||||||
private static readonly string[] ProviderConfigSearchPaths =
|
private static string[] ProviderConfigSearchPaths =
|
||||||
[
|
[
|
||||||
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".luna", "providers")
|
Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".luna", "providers")
|
||||||
];
|
];
|
||||||
@@ -34,11 +34,6 @@ public static class ConfigurationBuilderExtensions
|
|||||||
builder.Add(new ProviderOptionsConfigurationSource(searchPath));
|
builder.Add(new ProviderOptionsConfigurationSource(searchPath));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Re-applied last so environment variables take precedence over the TOML
|
|
||||||
// sources above. This is how secrets (API keys, bot tokens) are supplied —
|
|
||||||
// the embedded defaults ship with empty credentials.
|
|
||||||
builder.AddEnvironmentVariables();
|
|
||||||
|
|
||||||
return builder;
|
return builder;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,6 @@
|
|||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.5" />
|
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
|
||||||
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.5" />
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="10.0.5" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.5" />
|
<PackageReference Include="Microsoft.Extensions.Options" Version="10.0.5" />
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
|
|
||||||
ApiKey = ""
|
ApiKey = "1nv151T9Qd2Vi5p3PMrvNDQ3DIDDVmGy"
|
||||||
ApiUrl = "https://api.mistral.ai/v1/"
|
ApiUrl = "https://api.mistral.ai/v1/"
|
||||||
Models = ["mistral-small-latest"]
|
Models = ["mistral-small-latest"]
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
|
|
||||||
ApiKey = "ollama"
|
ApiKey = "apfelkuchen"
|
||||||
ApiUrl = "http://localhost:11434/"
|
ApiUrl = "http://localhost:11434/"
|
||||||
Models = ["mistral-nemo:12b"]
|
Models = ["mistral-nemo:12b"]
|
||||||
|
|
||||||
|
|||||||
@@ -2,17 +2,12 @@ using Luna.Channels.Abstractions;
|
|||||||
using Luna.Channels.Cli;
|
using Luna.Channels.Cli;
|
||||||
using Luna.Channels.Web;
|
using Luna.Channels.Web;
|
||||||
using Luna.Core.Abstractions;
|
using Luna.Core.Abstractions;
|
||||||
using Luna.Identity.Abstractions;
|
|
||||||
using Luna.Shared;
|
using Luna.Shared;
|
||||||
using Microsoft.AspNetCore.SignalR;
|
using Microsoft.AspNetCore.SignalR;
|
||||||
|
|
||||||
namespace Luna.Core.Hubs;
|
namespace Luna.Core.Hubs;
|
||||||
|
|
||||||
public class ChatHub(
|
public class ChatHub(IChannelManager channelManager, IChatHubContext hubContext) : Hub
|
||||||
IChannelManager channelManager,
|
|
||||||
IChatHubContext hubContext,
|
|
||||||
IUserIdentityService identityService)
|
|
||||||
: Hub
|
|
||||||
{
|
{
|
||||||
public override Task OnConnectedAsync()
|
public override Task OnConnectedAsync()
|
||||||
{
|
{
|
||||||
@@ -20,8 +15,8 @@ public class ChatHub(
|
|||||||
|
|
||||||
IChannel channel = clientType switch
|
IChannel channel = clientType switch
|
||||||
{
|
{
|
||||||
"web" => new WebChannel(Context.ConnectionId, hubContext, identityService),
|
"web" => new WebChannel(Context.ConnectionId, hubContext),
|
||||||
_ => new CliChannel(Context.ConnectionId, hubContext, identityService)
|
_ => new CliChannel(Context.ConnectionId, hubContext)
|
||||||
};
|
};
|
||||||
|
|
||||||
channelManager.RegisterChannel(channel);
|
channelManager.RegisterChannel(channel);
|
||||||
@@ -34,7 +29,7 @@ public class ChatHub(
|
|||||||
return base.OnDisconnectedAsync(exception);
|
return base.OnDisconnectedAsync(exception);
|
||||||
}
|
}
|
||||||
|
|
||||||
public async Task OnMessageReceivedAsync(ChannelMessage message)
|
public void OnMessageReceived(ChannelMessage message)
|
||||||
{
|
{
|
||||||
var channel = channelManager.GetChannel(Context.ConnectionId);
|
var channel = channelManager.GetChannel(Context.ConnectionId);
|
||||||
|
|
||||||
@@ -44,7 +39,7 @@ public class ChatHub(
|
|||||||
cli.RaiseMessageReceived(this, message);
|
cli.RaiseMessageReceived(this, message);
|
||||||
break;
|
break;
|
||||||
case WebChannel web:
|
case WebChannel web:
|
||||||
await web.RaiseMessageReceivedAsync(this, message);
|
web.RaiseMessageReceived(this, message);
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw new InvalidOperationException(
|
throw new InvalidOperationException(
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
<ProjectReference Include="..\Luna.Channels\Luna.Channels.csproj" />
|
<ProjectReference Include="..\Luna.Channels\Luna.Channels.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Configuration\Luna.Configuration.csproj" />
|
<ProjectReference Include="..\Luna.Configuration\Luna.Configuration.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Core.Abstractions\Luna.Core.Abstractions.csproj" />
|
<ProjectReference Include="..\Luna.Core.Abstractions\Luna.Core.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Identity\Luna.Identity.csproj" />
|
|
||||||
<ProjectReference Include="..\Luna.Memory\Luna.Memory.csproj" />
|
<ProjectReference Include="..\Luna.Memory\Luna.Memory.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Providers.Abstractions\Luna.Providers.Abstractions.csproj" />
|
<ProjectReference Include="..\Luna.Providers.Abstractions\Luna.Providers.Abstractions.csproj" />
|
||||||
<ProjectReference Include="..\Luna.Providers\Luna.Providers.csproj" />
|
<ProjectReference Include="..\Luna.Providers\Luna.Providers.csproj" />
|
||||||
|
|||||||
@@ -7,7 +7,6 @@ using Luna.Core.Abstractions;
|
|||||||
using Luna.Core.Hubs;
|
using Luna.Core.Hubs;
|
||||||
using Luna.Core.Services.Extensions;
|
using Luna.Core.Services.Extensions;
|
||||||
using Luna.Core.Tools.Extensions;
|
using Luna.Core.Tools.Extensions;
|
||||||
using Luna.Identity.Extensions;
|
|
||||||
using Luna.Memory.Extensions;
|
using Luna.Memory.Extensions;
|
||||||
using Luna.Providers.Extensions;
|
using Luna.Providers.Extensions;
|
||||||
|
|
||||||
@@ -22,7 +21,6 @@ builder.Services
|
|||||||
.AddAgents()
|
.AddAgents()
|
||||||
.AddTools()
|
.AddTools()
|
||||||
.AddMemoryStore()
|
.AddMemoryStore()
|
||||||
.AddUserIdentity()
|
|
||||||
.AddSessionManager()
|
.AddSessionManager()
|
||||||
.AddChannels();
|
.AddChannels();
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,5 @@
|
|||||||
using System.Collections.Concurrent;
|
using System.Collections.Concurrent;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.Runtime.CompilerServices;
|
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Luna.Agents.Abstractions;
|
using Luna.Agents.Abstractions;
|
||||||
using Luna.Core.Abstractions;
|
using Luna.Core.Abstractions;
|
||||||
@@ -32,7 +31,7 @@ public class SessionManager(
|
|||||||
string content,
|
string content,
|
||||||
string conversationId,
|
string conversationId,
|
||||||
string connectionId,
|
string connectionId,
|
||||||
[EnumeratorCancellation] CancellationToken ct = default)
|
CancellationToken ct = default)
|
||||||
{
|
{
|
||||||
if (!connectedClients.ContainsKey(connectionId))
|
if (!connectedClients.ContainsKey(connectionId))
|
||||||
connectedClients[connectionId] = conversationId;
|
connectedClients[connectionId] = conversationId;
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
namespace Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// Associates a channel-specific user identity with a Luna user.
|
|
||||||
/// E.g., Telegram user ID "12345" → Luna user "guid-xxx"
|
|
||||||
/// </summary>
|
|
||||||
public record ChannelLink(
|
|
||||||
string ChannelType,
|
|
||||||
string ChannelUserId,
|
|
||||||
string UserId,
|
|
||||||
DateTimeOffset LinkedAt);
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
namespace Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
public interface IPairingCodeGenerator
|
|
||||||
{
|
|
||||||
PairingCode Generate(string channelType, string userId);
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
namespace Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
public interface IUserIdentityService
|
|
||||||
{
|
|
||||||
UserIdentity GetCurrentUser();
|
|
||||||
string StartChannelLink(string userId, string channelType);
|
|
||||||
void CompleteChannelLink(string userId, string channelType, string code);
|
|
||||||
bool IsChannelLinked(string userId, string channelType);
|
|
||||||
}
|
|
||||||
@@ -1,9 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
namespace Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
/// <summary>
|
|
||||||
/// A short-lived code used to link a new channel to an existing user.
|
|
||||||
/// Generated on a trusted channel (e.g., web), confirmed from the channel being linked.
|
|
||||||
/// </summary>
|
|
||||||
public record PairingCode(
|
|
||||||
string Code,
|
|
||||||
string ChannelType,
|
|
||||||
string UserId,
|
|
||||||
DateTimeOffset CreatedAt,
|
|
||||||
TimeSpan TimeToLive);
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
namespace Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
public record UserIdentity(
|
|
||||||
string UserId,
|
|
||||||
string UserName);
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
using Luna.Identity.Abstractions;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
|
|
||||||
namespace Luna.Identity.Extensions;
|
|
||||||
|
|
||||||
public static class ServiceCollectionExtensions
|
|
||||||
{
|
|
||||||
extension(IServiceCollection services)
|
|
||||||
{
|
|
||||||
public IServiceCollection AddUserIdentity()
|
|
||||||
{
|
|
||||||
services.AddSingleton<IUserIdentityService, UserIdentityService>();
|
|
||||||
services.AddSingleton<IPairingCodeGenerator, PairingCodeGenerator>();
|
|
||||||
return services;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
<Project Sdk="Microsoft.NET.Sdk">
|
|
||||||
|
|
||||||
<PropertyGroup>
|
|
||||||
<TargetFramework>net10.0</TargetFramework>
|
|
||||||
<ImplicitUsings>enable</ImplicitUsings>
|
|
||||||
<Nullable>enable</Nullable>
|
|
||||||
</PropertyGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.5" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
<ItemGroup>
|
|
||||||
<ProjectReference Include="..\Luna.Channels.Abstractions\Luna.Channels.Abstractions.csproj" />
|
|
||||||
<ProjectReference Include="..\Luna.Identity.Abstractions\Luna.Identity.Abstractions.csproj" />
|
|
||||||
<ProjectReference Include="..\Luna.Shared\Luna.Shared.csproj" />
|
|
||||||
</ItemGroup>
|
|
||||||
|
|
||||||
</Project>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
using Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
namespace Luna.Identity;
|
|
||||||
|
|
||||||
public class PairingCodeGenerator : IPairingCodeGenerator
|
|
||||||
{
|
|
||||||
private const int TimeToLiveMinutes = 5;
|
|
||||||
private static readonly char[] CodeAlphabet = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789".ToCharArray();
|
|
||||||
|
|
||||||
public PairingCode Generate(string channelType, string userId)
|
|
||||||
=> new(
|
|
||||||
Code: GenerateCode(),
|
|
||||||
ChannelType: channelType,
|
|
||||||
UserId: userId,
|
|
||||||
CreatedAt: DateTimeOffset.UtcNow,
|
|
||||||
TimeToLive: TimeSpan.FromMinutes(TimeToLiveMinutes));
|
|
||||||
|
|
||||||
private string GenerateCode()
|
|
||||||
=> new(Enumerable.Range(0, 6)
|
|
||||||
.Select(_ => CodeAlphabet[Random.Shared.Next(CodeAlphabet.Length)])
|
|
||||||
.ToArray());
|
|
||||||
}
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
using System.Collections.Concurrent;
|
|
||||||
using Luna.Identity.Abstractions;
|
|
||||||
|
|
||||||
namespace Luna.Identity;
|
|
||||||
|
|
||||||
public class UserIdentityService(IPairingCodeGenerator pairingCodeGenerator) : IUserIdentityService
|
|
||||||
{
|
|
||||||
// Todo: User creation
|
|
||||||
private readonly UserIdentity currentUser = new(
|
|
||||||
UserId: Guid.NewGuid().ToString(),
|
|
||||||
UserName: "Erik");
|
|
||||||
|
|
||||||
private readonly ConcurrentDictionary<string, IList<PairingCode>> pairingCodes = new();
|
|
||||||
private readonly ConcurrentDictionary<string, IList<ChannelLink>> linkedChannels = new();
|
|
||||||
|
|
||||||
public UserIdentity GetCurrentUser() => currentUser;
|
|
||||||
|
|
||||||
public string StartChannelLink(string userId, string channelType)
|
|
||||||
{
|
|
||||||
if (!pairingCodes.ContainsKey(userId))
|
|
||||||
pairingCodes[userId] = new List<PairingCode>();
|
|
||||||
|
|
||||||
var existingCode = pairingCodes[userId]
|
|
||||||
.SingleOrDefault(c => c.ChannelType == channelType);
|
|
||||||
|
|
||||||
switch (existingCode)
|
|
||||||
{
|
|
||||||
case {} when !IsPairingCodeExpired(existingCode):
|
|
||||||
return existingCode.Code;
|
|
||||||
case {} when IsPairingCodeExpired(existingCode):
|
|
||||||
pairingCodes[userId].Remove(existingCode);
|
|
||||||
return CreateNewPairingCode(userId, channelType);
|
|
||||||
default:
|
|
||||||
return CreateNewPairingCode(userId, channelType);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
public void CompleteChannelLink(string userId, string channelType, string code)
|
|
||||||
{
|
|
||||||
if (!linkedChannels.ContainsKey(userId))
|
|
||||||
linkedChannels[userId] = new List<ChannelLink>();
|
|
||||||
|
|
||||||
if (linkedChannels[userId].Any(channel => channel.ChannelType == channelType && channel.UserId == userId))
|
|
||||||
throw new InvalidOperationException($"Channel {channelType} already linked to user with id {userId}");
|
|
||||||
|
|
||||||
if (!pairingCodes.TryGetValue(userId, out var userCodes))
|
|
||||||
throw new InvalidOperationException($"No active pairing codes for user with id {userId}");
|
|
||||||
|
|
||||||
var userCode = userCodes.SingleOrDefault(c => c.ChannelType == channelType && c.Code == code);
|
|
||||||
if (userCode is null)
|
|
||||||
throw new InvalidOperationException($"Pairing code {code} did not match any active codes for channel {channelType}");
|
|
||||||
|
|
||||||
if (IsPairingCodeExpired(userCode))
|
|
||||||
throw new InvalidOperationException($"Pairing code {code} is already expired");
|
|
||||||
|
|
||||||
linkedChannels[userId].Add(new ChannelLink(
|
|
||||||
ChannelType: channelType,
|
|
||||||
ChannelUserId: userId,
|
|
||||||
UserId: userId,
|
|
||||||
LinkedAt: DateTimeOffset.UtcNow));
|
|
||||||
}
|
|
||||||
|
|
||||||
public bool IsChannelLinked(string userId, string channelType)
|
|
||||||
=> linkedChannels.TryGetValue(userId, out var channelLinks)
|
|
||||||
&& channelLinks.Any(link => link.ChannelType == channelType && link.UserId == userId);
|
|
||||||
|
|
||||||
|
|
||||||
private bool IsPairingCodeExpired(PairingCode code)
|
|
||||||
=> code.CreatedAt + code.TimeToLive < DateTimeOffset.UtcNow;
|
|
||||||
|
|
||||||
private string CreateNewPairingCode(string userId, string channelType)
|
|
||||||
{
|
|
||||||
var code = pairingCodeGenerator.Generate(channelType, userId);
|
|
||||||
pairingCodes[userId].Add(code);
|
|
||||||
|
|
||||||
return code.Code;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -19,8 +19,9 @@ public static class ServiceCollectionExtensions
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Registers the <see cref="MistralProvider"/> and maps <see cref="IProvider"/> to it as a singleton.
|
/// Registers the <see cref="MistralProvider"/> and maps <see cref="Provider"/> to it as a singleton.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
/// <param name="services">The service collection.</param>
|
||||||
/// <returns>The updated service collection.</returns>
|
/// <returns>The updated service collection.</returns>
|
||||||
private IServiceCollection AddMistralProvider()
|
private IServiceCollection AddMistralProvider()
|
||||||
{
|
{
|
||||||
@@ -41,7 +42,7 @@ public static class ServiceCollectionExtensions
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Registers the <see cref="OllamaProvider"/> and maps <see cref="IProvider"/> to it as a singleton.
|
/// Registers the <see cref="OllamaProvider"/> and maps <see cref="Provider"/> to it as a singleton.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <returns></returns>
|
/// <returns></returns>
|
||||||
private IServiceCollection AddOllamaProvider()
|
private IServiceCollection AddOllamaProvider()
|
||||||
|
|||||||
@@ -0,0 +1,174 @@
|
|||||||
|
|
||||||
|
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||||
|
# Visual Studio Version 17
|
||||||
|
VisualStudioVersion = 17.0.31903.59
|
||||||
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Clients.Cli", "Luna.Clients.Cli\Luna.Clients.Cli.csproj", "{233F9016-8B53-4598-B37D-8D1841354237}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Shared", "Luna.Shared\Luna.Shared.csproj", "{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Agents.Abstractions", "Luna.Agents.Abstractions\Luna.Agents.Abstractions.csproj", "{7843C43A-EA5C-4C73-8313-ED541FABB979}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Configuration", "Luna.Configuration\Luna.Configuration.csproj", "{2E23010C-732B-40E8-BA69-21306F3153EB}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Channels.Abstractions", "Luna.Channels.Abstractions\Luna.Channels.Abstractions.csproj", "{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Memory", "Luna.Memory\Luna.Memory.csproj", "{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Providers.Abstractions", "Luna.Providers.Abstractions\Luna.Providers.Abstractions.csproj", "{D09EF397-8671-4209-9B7C-2B3359D92AEB}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Agents", "Luna.Agents\Luna.Agents.csproj", "{8373CF88-0AF3-4A59-B968-C26C2785F6E5}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Providers", "Luna.Providers\Luna.Providers.csproj", "{B969F122-E4F5-40F3-9554-51273C4CA163}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Core", "Luna.Core\Luna.Core.csproj", "{C58208B6-AF00-403A-A412-D4DD4B409AB5}"
|
||||||
|
EndProject
|
||||||
|
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Luna.Channels.Tests", "Luna.Channels.Tests\Luna.Channels.Tests.csproj", "{7FBBD74D-61AC-42C8-B745-73AC019871ED}"
|
||||||
|
EndProject
|
||||||
|
Global
|
||||||
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
|
Debug|Any CPU = Debug|Any CPU
|
||||||
|
Debug|x64 = Debug|x64
|
||||||
|
Debug|x86 = Debug|x86
|
||||||
|
Release|Any CPU = Release|Any CPU
|
||||||
|
Release|x64 = Release|x64
|
||||||
|
Release|x86 = Release|x86
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{233F9016-8B53-4598-B37D-8D1841354237}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{2F1BC65E-DF7D-47A7-8ED2-3FD152B009B6}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{7843C43A-EA5C-4C73-8313-ED541FABB979}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{2E23010C-732B-40E8-BA69-21306F3153EB}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{B99B44FC-2C24-4E44-9D47-A0B9BB0D28D7}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{CE5CCA51-AC5F-4F56-82D9-9CA698AD1CD7}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{D09EF397-8671-4209-9B7C-2B3359D92AEB}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{8373CF88-0AF3-4A59-B968-C26C2785F6E5}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{B969F122-E4F5-40F3-9554-51273C4CA163}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{C58208B6-AF00-403A-A412-D4DD4B409AB5}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Debug|x64.ActiveCfg = Debug|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Debug|x64.Build.0 = Debug|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Debug|x86.ActiveCfg = Debug|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Debug|x86.Build.0 = Debug|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Release|x64.ActiveCfg = Release|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Release|x64.Build.0 = Release|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Release|x86.ActiveCfg = Release|Any CPU
|
||||||
|
{7FBBD74D-61AC-42C8-B745-73AC019871ED}.Release|x86.Build.0 = Release|Any CPU
|
||||||
|
EndGlobalSection
|
||||||
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
|
HideSolutionNode = FALSE
|
||||||
|
EndGlobalSection
|
||||||
|
EndGlobal
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
<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/Highlighting/SweaWarningsMode/@EntryValue">ShowAndRun</s:String>
|
|
||||||
<s:String x:Key="/Default/CustomTools/CustomToolsData/@EntryValue"></s:String></wpf:ResourceDictionary>
|
|
||||||
@@ -10,8 +10,6 @@
|
|||||||
<Project Path="Luna.Configuration/Luna.Configuration.csproj" />
|
<Project Path="Luna.Configuration/Luna.Configuration.csproj" />
|
||||||
<Project Path="Luna.Core.Abstractions/Luna.Core.Abstractions.csproj" />
|
<Project Path="Luna.Core.Abstractions/Luna.Core.Abstractions.csproj" />
|
||||||
<Project Path="Luna.Core/Luna.Core.csproj" />
|
<Project Path="Luna.Core/Luna.Core.csproj" />
|
||||||
<Project Path="Luna.Identity.Abstractions/Luna.Identity.Abstractions.csproj" />
|
|
||||||
<Project Path="Luna.Identity/Luna.Identity.csproj" />
|
|
||||||
<Project Path="Luna.Memory/Luna.Memory.csproj" />
|
<Project Path="Luna.Memory/Luna.Memory.csproj" />
|
||||||
<Project Path="Luna.Providers.Abstractions/Luna.Providers.Abstractions.csproj" />
|
<Project Path="Luna.Providers.Abstractions/Luna.Providers.Abstractions.csproj" />
|
||||||
<Project Path="Luna.Providers/Luna.Providers.csproj" />
|
<Project Path="Luna.Providers/Luna.Providers.csproj" />
|
||||||
|
|||||||
@@ -129,7 +129,7 @@ export const LunaBridgeProvider: React.FC<PropsWithChildren> = ({ children }) =>
|
|||||||
timestamp: message.timestamp
|
timestamp: message.timestamp
|
||||||
}]);
|
}]);
|
||||||
|
|
||||||
await connection.invoke("OnMessageReceivedAsync", message);
|
await connection.invoke("OnMessageReceived", message);
|
||||||
}, []);
|
}, []);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
|||||||
Reference in New Issue
Block a user