Compare commits
3 Commits
cbbadd547d
...
30da1680f2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
30da1680f2 | ||
|
|
ad9a9021cc | ||
|
|
4f6c1e2060 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -1,5 +1,6 @@
|
|||||||
bin/
|
bin/
|
||||||
obj/
|
obj/
|
||||||
|
publish/
|
||||||
.vs/
|
.vs/
|
||||||
.vscode/
|
.vscode/
|
||||||
*.user
|
*.user
|
||||||
|
|||||||
22
README.md
22
README.md
@@ -18,3 +18,25 @@ dotnet run --project .\WirelessTextSyncer.Windows\WirelessTextSyncer.Windows.csp
|
|||||||
|
|
||||||
The initial server listens on `ws://0.0.0.0:8181`.
|
The initial server listens on `ws://0.0.0.0:8181`.
|
||||||
|
|
||||||
|
## Release Build
|
||||||
|
|
||||||
|
Build a Windows x64 single-file executable:
|
||||||
|
|
||||||
|
```powershell
|
||||||
|
dotnet publish .\WirelessTextSyncer.Windows\WirelessTextSyncer.Windows.csproj `
|
||||||
|
-c Release `
|
||||||
|
-r win-x64 `
|
||||||
|
--self-contained true `
|
||||||
|
-p:PublishSingleFile=true `
|
||||||
|
-p:EnableCompressionInSingleFile=true `
|
||||||
|
-p:IncludeNativeLibrariesForSelfExtract=true `
|
||||||
|
-o .\publish\win-x64-single
|
||||||
|
```
|
||||||
|
|
||||||
|
The runnable app is written to:
|
||||||
|
|
||||||
|
```text
|
||||||
|
publish\win-x64-single\WirelessTextSyncer.Windows.exe
|
||||||
|
```
|
||||||
|
|
||||||
|
This build includes the .NET runtime, so the target Windows machine does not need .NET installed. The generated `.pdb` file is only for debugging and is not required to run the app.
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ public sealed class SyncMessageTests
|
|||||||
public void ReplaceAllAppendsSubmittedText()
|
public void ReplaceAllAppendsSubmittedText()
|
||||||
{
|
{
|
||||||
var keyboard = new RecordingKeyboardInjectionService();
|
var keyboard = new RecordingKeyboardInjectionService();
|
||||||
var handler = new SyncMessageHandler(keyboard);
|
var handler = new SyncMessageHandler(keyboard, new RecordingAudioControlService());
|
||||||
|
|
||||||
handler.Handle(new SyncMessage
|
handler.Handle(new SyncMessage
|
||||||
{
|
{
|
||||||
@@ -59,6 +59,33 @@ public sealed class SyncMessageTests
|
|||||||
keyboard.Calls);
|
keyboard.Calls);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void DeserializeAndroidSetMuteMessage()
|
||||||
|
{
|
||||||
|
var message = JsonSerializer.Deserialize<SyncMessage>(
|
||||||
|
"""{"action":"setMute","muted":true}""",
|
||||||
|
new JsonSerializerOptions(JsonSerializerDefaults.Web));
|
||||||
|
|
||||||
|
Assert.IsNotNull(message);
|
||||||
|
Assert.AreEqual(SyncAction.SetMute, message.Action);
|
||||||
|
Assert.AreEqual(true, message.Muted);
|
||||||
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void SetMuteForwardsToAudioService()
|
||||||
|
{
|
||||||
|
var audio = new RecordingAudioControlService();
|
||||||
|
var handler = new SyncMessageHandler(new RecordingKeyboardInjectionService(), audio);
|
||||||
|
|
||||||
|
handler.Handle(new SyncMessage
|
||||||
|
{
|
||||||
|
Action = SyncAction.SetMute,
|
||||||
|
Muted = true
|
||||||
|
});
|
||||||
|
|
||||||
|
CollectionAssert.AreEqual(new[] { "mute:True" }, audio.Calls);
|
||||||
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
public void DiscoveryResponseContainsServiceEndpoint()
|
public void DiscoveryResponseContainsServiceEndpoint()
|
||||||
{
|
{
|
||||||
@@ -74,6 +101,20 @@ public sealed class SyncMessageTests
|
|||||||
Assert.AreEqual(8181, root.GetProperty("port").GetInt32());
|
Assert.AreEqual(8181, root.GetProperty("port").GetInt32());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
[TestMethod]
|
||||||
|
public void WebSocketServiceInfoContainsDeviceName()
|
||||||
|
{
|
||||||
|
using var server = new WebSocketServerService(new SyncMessageHandler(new RecordingKeyboardInjectionService(), new RecordingAudioControlService()), "Desktop-WIN11");
|
||||||
|
|
||||||
|
using var document = JsonDocument.Parse(server.BuildServiceInfoJson());
|
||||||
|
var root = document.RootElement;
|
||||||
|
|
||||||
|
Assert.AreEqual("wirelessTextSyncer.service", root.GetProperty("type").GetString());
|
||||||
|
Assert.AreEqual(1, root.GetProperty("version").GetInt32());
|
||||||
|
Assert.AreEqual("Desktop-WIN11", root.GetProperty("name").GetString());
|
||||||
|
Assert.AreEqual(8181, root.GetProperty("port").GetInt32());
|
||||||
|
}
|
||||||
|
|
||||||
private sealed class RecordingKeyboardInjectionService : IKeyboardInjectionService
|
private sealed class RecordingKeyboardInjectionService : IKeyboardInjectionService
|
||||||
{
|
{
|
||||||
public List<string> Calls { get; } = [];
|
public List<string> Calls { get; } = [];
|
||||||
@@ -98,4 +139,16 @@ public sealed class SyncMessageTests
|
|||||||
Calls.Add("enter");
|
Calls.Add("enter");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private sealed class RecordingAudioControlService : IAudioControlService
|
||||||
|
{
|
||||||
|
public List<string> Calls { get; } = [];
|
||||||
|
|
||||||
|
public bool IsMuted => Calls.Count > 0 && Calls[^1] == "mute:True";
|
||||||
|
|
||||||
|
public void SetMute(bool muted)
|
||||||
|
{
|
||||||
|
Calls.Add($"mute:{muted}");
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,5 +9,6 @@ public enum SyncAction
|
|||||||
ReplaceAll,
|
ReplaceAll,
|
||||||
Backspace,
|
Backspace,
|
||||||
Enter,
|
Enter,
|
||||||
Ping
|
Ping,
|
||||||
|
SetMute
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ public sealed class SyncActionJsonConverter : JsonConverter<SyncAction>
|
|||||||
"backspace" => SyncAction.Backspace,
|
"backspace" => SyncAction.Backspace,
|
||||||
"enter" => SyncAction.Enter,
|
"enter" => SyncAction.Enter,
|
||||||
"ping" => SyncAction.Ping,
|
"ping" => SyncAction.Ping,
|
||||||
|
"setMute" => SyncAction.SetMute,
|
||||||
_ => throw new JsonException($"Unsupported sync action: {value}")
|
_ => throw new JsonException($"Unsupported sync action: {value}")
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -35,6 +36,7 @@ public sealed class SyncActionJsonConverter : JsonConverter<SyncAction>
|
|||||||
SyncAction.Backspace => "backspace",
|
SyncAction.Backspace => "backspace",
|
||||||
SyncAction.Enter => "enter",
|
SyncAction.Enter => "enter",
|
||||||
SyncAction.Ping => "ping",
|
SyncAction.Ping => "ping",
|
||||||
|
SyncAction.SetMute => "setMute",
|
||||||
_ => throw new JsonException($"Unsupported sync action: {value}")
|
_ => throw new JsonException($"Unsupported sync action: {value}")
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -9,4 +9,7 @@ public sealed record SyncMessage
|
|||||||
|
|
||||||
[JsonPropertyName("text")]
|
[JsonPropertyName("text")]
|
||||||
public string? Text { get; init; }
|
public string? Text { get; init; }
|
||||||
|
|
||||||
|
[JsonPropertyName("muted")]
|
||||||
|
public bool? Muted { get; init; }
|
||||||
}
|
}
|
||||||
|
|||||||
52
WirelessTextSyncer.Windows/Services/AudioControlService.cs
Normal file
52
WirelessTextSyncer.Windows/Services/AudioControlService.cs
Normal file
@@ -0,0 +1,52 @@
|
|||||||
|
using System.Runtime.InteropServices;
|
||||||
|
using NAudio.CoreAudioApi;
|
||||||
|
|
||||||
|
namespace WirelessTextSyncer.Windows.Services;
|
||||||
|
|
||||||
|
public sealed class AudioControlService : IAudioControlService, IDisposable
|
||||||
|
{
|
||||||
|
private readonly MMDeviceEnumerator enumerator = new();
|
||||||
|
private bool disposed;
|
||||||
|
|
||||||
|
public bool IsMuted
|
||||||
|
{
|
||||||
|
get
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var device = enumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||||
|
return device.AudioEndpointVolume.Mute;
|
||||||
|
}
|
||||||
|
catch (COMException exception)
|
||||||
|
{
|
||||||
|
AppLogger.Error("Failed to read audio mute state.", exception);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void SetMute(bool muted)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
using var device = enumerator.GetDefaultAudioEndpoint(DataFlow.Render, Role.Multimedia);
|
||||||
|
device.AudioEndpointVolume.Mute = muted;
|
||||||
|
AppLogger.Info($"Audio mute set to {muted}.");
|
||||||
|
}
|
||||||
|
catch (COMException exception)
|
||||||
|
{
|
||||||
|
AppLogger.Error($"Failed to set audio mute to {muted}.", exception);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Dispose()
|
||||||
|
{
|
||||||
|
if (disposed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
disposed = true;
|
||||||
|
enumerator.Dispose();
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
namespace WirelessTextSyncer.Windows.Services;
|
||||||
|
|
||||||
|
public interface IAudioControlService
|
||||||
|
{
|
||||||
|
bool IsMuted { get; }
|
||||||
|
|
||||||
|
void SetMute(bool muted);
|
||||||
|
}
|
||||||
@@ -5,11 +5,13 @@ namespace WirelessTextSyncer.Windows.Services;
|
|||||||
public sealed class SyncMessageHandler
|
public sealed class SyncMessageHandler
|
||||||
{
|
{
|
||||||
private readonly IKeyboardInjectionService keyboard;
|
private readonly IKeyboardInjectionService keyboard;
|
||||||
|
private readonly IAudioControlService audio;
|
||||||
private string remoteText = string.Empty;
|
private string remoteText = string.Empty;
|
||||||
|
|
||||||
public SyncMessageHandler(IKeyboardInjectionService keyboard)
|
public SyncMessageHandler(IKeyboardInjectionService keyboard, IAudioControlService audio)
|
||||||
{
|
{
|
||||||
this.keyboard = keyboard;
|
this.keyboard = keyboard;
|
||||||
|
this.audio = audio;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Handle(SyncMessage message)
|
public void Handle(SyncMessage message)
|
||||||
@@ -38,11 +40,21 @@ public sealed class SyncMessageHandler
|
|||||||
break;
|
break;
|
||||||
case SyncAction.Ping:
|
case SyncAction.Ping:
|
||||||
break;
|
break;
|
||||||
|
case SyncAction.SetMute:
|
||||||
|
HandleSetMute(message);
|
||||||
|
break;
|
||||||
default:
|
default:
|
||||||
throw new InvalidOperationException($"Unsupported sync action: {message.Action}");
|
throw new InvalidOperationException($"Unsupported sync action: {message.Action}");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void HandleSetMute(SyncMessage message)
|
||||||
|
{
|
||||||
|
var muted = message.Muted ?? false;
|
||||||
|
AppLogger.Info($"SetMute received muted={muted}.");
|
||||||
|
audio.SetMute(muted);
|
||||||
|
}
|
||||||
|
|
||||||
private void AppendSubmittedText(string text)
|
private void AppendSubmittedText(string text)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(text))
|
if (string.IsNullOrEmpty(text))
|
||||||
|
|||||||
@@ -17,14 +17,16 @@ public sealed class WebSocketServerService : IDisposable
|
|||||||
|
|
||||||
private readonly TimeSpan heartbeatInterval = TimeSpan.FromSeconds(5);
|
private readonly TimeSpan heartbeatInterval = TimeSpan.FromSeconds(5);
|
||||||
private readonly SyncMessageHandler messageHandler;
|
private readonly SyncMessageHandler messageHandler;
|
||||||
|
private readonly string deviceName;
|
||||||
private readonly List<IWebSocketConnection> clients = [];
|
private readonly List<IWebSocketConnection> clients = [];
|
||||||
private readonly object clientsLock = new();
|
private readonly object clientsLock = new();
|
||||||
private WebSocketServer? server;
|
private WebSocketServer? server;
|
||||||
private System.Threading.Timer? heartbeatTimer;
|
private System.Threading.Timer? heartbeatTimer;
|
||||||
|
|
||||||
public WebSocketServerService(SyncMessageHandler messageHandler)
|
public WebSocketServerService(SyncMessageHandler messageHandler, string? deviceName = null)
|
||||||
{
|
{
|
||||||
this.messageHandler = messageHandler;
|
this.messageHandler = messageHandler;
|
||||||
|
this.deviceName = string.IsNullOrWhiteSpace(deviceName) ? Environment.MachineName : deviceName;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Port { get; private set; } = 8181;
|
public int Port { get; private set; } = 8181;
|
||||||
@@ -45,6 +47,18 @@ public sealed class WebSocketServerService : IDisposable
|
|||||||
|
|
||||||
public event EventHandler? StatusChanged;
|
public event EventHandler? StatusChanged;
|
||||||
|
|
||||||
|
public string BuildServiceInfoJson()
|
||||||
|
{
|
||||||
|
return JsonSerializer.Serialize(
|
||||||
|
new ServiceInfoMessage(
|
||||||
|
DiscoveryResponderService.ServiceResponseType,
|
||||||
|
1,
|
||||||
|
deviceName,
|
||||||
|
LocalIpAddress,
|
||||||
|
Port),
|
||||||
|
JsonOptions);
|
||||||
|
}
|
||||||
|
|
||||||
public void Start(int port)
|
public void Start(int port)
|
||||||
{
|
{
|
||||||
Port = port;
|
Port = port;
|
||||||
@@ -72,6 +86,7 @@ public sealed class WebSocketServerService : IDisposable
|
|||||||
}
|
}
|
||||||
|
|
||||||
AppLogger.Info($"Client connected: {socket.ConnectionInfo.ClientIpAddress}:{socket.ConnectionInfo.ClientPort}");
|
AppLogger.Info($"Client connected: {socket.ConnectionInfo.ClientIpAddress}:{socket.ConnectionInfo.ClientPort}");
|
||||||
|
_ = SendServiceInfoAsync(socket);
|
||||||
StatusChanged?.Invoke(this, EventArgs.Empty);
|
StatusChanged?.Invoke(this, EventArgs.Empty);
|
||||||
};
|
};
|
||||||
socket.OnClose = () =>
|
socket.OnClose = () =>
|
||||||
@@ -155,6 +170,19 @@ public sealed class WebSocketServerService : IDisposable
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private async Task SendServiceInfoAsync(IWebSocketConnection client)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
await client.Send(BuildServiceInfoJson());
|
||||||
|
}
|
||||||
|
catch (Exception exception)
|
||||||
|
{
|
||||||
|
AppLogger.Error("Failed to send WebSocket service info.", exception);
|
||||||
|
RemoveClient(client, "service info failure");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private void RemoveClient(IWebSocketConnection client, string reason)
|
private void RemoveClient(IWebSocketConnection client, string reason)
|
||||||
{
|
{
|
||||||
var removed = false;
|
var removed = false;
|
||||||
@@ -215,4 +243,6 @@ public sealed class WebSocketServerService : IDisposable
|
|||||||
|
|
||||||
return address?.ToString() ?? "127.0.0.1";
|
return address?.ToString() ?? "127.0.0.1";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private sealed record ServiceInfoMessage(string Type, int Version, string Name, string Host, int Port);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ namespace WirelessTextSyncer.Windows.Tray;
|
|||||||
public sealed class TrayApplicationContext : ApplicationContext
|
public sealed class TrayApplicationContext : ApplicationContext
|
||||||
{
|
{
|
||||||
private readonly KeyboardInjectionService keyboard;
|
private readonly KeyboardInjectionService keyboard;
|
||||||
|
private readonly AudioControlService audio;
|
||||||
private readonly WebSocketServerService server;
|
private readonly WebSocketServerService server;
|
||||||
private readonly DiscoveryResponderService discovery;
|
private readonly DiscoveryResponderService discovery;
|
||||||
private readonly NotifyIcon notifyIcon;
|
private readonly NotifyIcon notifyIcon;
|
||||||
@@ -21,7 +22,8 @@ public sealed class TrayApplicationContext : ApplicationContext
|
|||||||
AppLogger.Info("Tray application starting.");
|
AppLogger.Info("Tray application starting.");
|
||||||
uiContext = SynchronizationContext.Current ?? new WindowsFormsSynchronizationContext();
|
uiContext = SynchronizationContext.Current ?? new WindowsFormsSynchronizationContext();
|
||||||
keyboard = new KeyboardInjectionService();
|
keyboard = new KeyboardInjectionService();
|
||||||
var handler = new SyncMessageHandler(keyboard);
|
audio = new AudioControlService();
|
||||||
|
var handler = new SyncMessageHandler(keyboard, audio);
|
||||||
|
|
||||||
server = new WebSocketServerService(handler);
|
server = new WebSocketServerService(handler);
|
||||||
server.StatusChanged += (_, _) => uiContext.Post(_ => UpdateTrayStatus(), null);
|
server.StatusChanged += (_, _) => uiContext.Post(_ => UpdateTrayStatus(), null);
|
||||||
@@ -62,6 +64,7 @@ public sealed class TrayApplicationContext : ApplicationContext
|
|||||||
connectedIcon.Dispose();
|
connectedIcon.Dispose();
|
||||||
waitIcon.Dispose();
|
waitIcon.Dispose();
|
||||||
discovery.Dispose();
|
discovery.Dispose();
|
||||||
|
audio.Dispose();
|
||||||
server.Dispose();
|
server.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Fleck" Version="1.2.0" />
|
<PackageReference Include="Fleck" Version="1.2.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.8" />
|
||||||
|
<PackageReference Include="NAudio" Version="2.2.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
Reference in New Issue
Block a user