alfred/melonvpn-original-cs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Destroy all open notifications on close and save daemon restarting state

Browse Source
This commit is contained in:
Melon 2021-03-23 16:49:13 +00:00
parent 97e29b19ab
commit 42c5823fc1
8 changed files with 157 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MelonVPNClient/MainWindow.cs
View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using System.IO;
using System.Net.NetworkInformation;
using System.Reflection;
@ -24,7 +25,8 @@ public partial class MainWindow : Window
private Button restartToggleBtn;
private bool ConnectedToVPN;
private bool IsHidden;
private bool RestartMode = false;
private bool RestartMode;
private List<NotificationThreadMap> CurrentNotifications;
public static readonly string MelonIconImg = "MiniMelonVPNIcon.png";
public static readonly string MelonOnlineImg = "MiniMelonVPNOnline.png";
@ -33,6 +35,8 @@ public partial class MainWindow : Window
Build();
CurrentNotifications = new List<NotificationThreadMap>();
Title = "Melon VPN";
UpdateIcon(MelonIconImg);
SetSizeRequest(300, 300);
@ -280,25 +284,26 @@ public partial class MainWindow : Window
{
string msg = (current ? "Connected to" : "Disconnected from") + " the VPN";
string icon = "/usr/lib/melon-vpn/MiniMelonVPN" + (current ? "Online" : "Icon") + ".png";
Notification pop = new Notification("Melon VPN", msg, icon);
pop.Show();
CloseNotificationAfterWait(pop, 1000);
Notification notification = new Notification("Melon VPN", msg, icon);
notification.Show();
CloseNotificationAfterWait(notification, 1000);
}
}
void CloseNotificationAfterWait(Notification pop, int timeout)
void CloseNotificationAfterWait(Notification notification, int timeout)
{
// Close the notification after a wait
// so it doesn't hang around
Thread wait = new Thread(() =>
Thread closeTimer = new Thread(() =>
{
Thread.Sleep(timeout);
pop.Close();
notification.Close();
})
{
IsBackground = true
};
wait.Start();
CurrentNotifications.Add(new NotificationThreadMap(notification, closeTimer));
closeTimer.Start();
}
void SendToTray()
@ -357,6 +362,9 @@ public partial class MainWindow : Window
wrapper.Join();
}
// Destroy of all temporary notifications and the close timers
foreach(NotificationThreadMap map in CurrentNotifications) map.Dispose();
// Destroy the tray icon first
if (trayIcon != null) trayIcon.Dispose();
Application.Quit();

10
MelonVPNClient/MelonVPNClient.csproj
View File

@ -19,6 +19,15 @@
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PlatformTarget>x86</PlatformTarget>
<CustomCommands>
<CustomCommands>
<Command>
<type>AfterBuild</type>
<command>cp "${SolutionDir}/MelonVPNClient/net-libs/libappindicator3sharpglue-12.10.0.so" "${TargetDir}/libappindicator3sharpglue-12.10.0.so"</command>
<workingdir>${SolutionDir}</workingdir>
</Command>
</CustomCommands>
</CustomCommands>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
<Optimize>true</Optimize>
@ -88,6 +97,7 @@
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="PopupMenu.cs" />
<Compile Include="NotificationThreadMap.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\MelonVPNCore\MelonVPNCore.csproj">

24
MelonVPNClient/NotificationThreadMap.cs Normal file
View File

@ -0,0 +1,24 @@
using System;
using System.Threading;
using Notify;
namespace MelonVPNClient
{
public class NotificationThreadMap : IDisposable
{
private readonly Notification notification;
private readonly Thread thread;
public NotificationThreadMap(Notification notification, Thread thread)
{
this.notification = notification;
this.thread = thread;
}
public void Dispose()
{
thread.Abort();
notification.Close();
}
}
}

BIN
MelonVPNClient/net-libs/libappindicator3sharpglue-12.10.0.so Normal file
View File

Binary file not shown.

51
MelonVPNCore/DaemonSocketServer.cs
View File

@ -1,5 +1,6 @@
using System;
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Net.Sockets;
using System.Text;
@ -9,12 +10,19 @@ namespace MelonVPNCore
{
public static class DaemonSocketServer
{
private static Process currentVpnProcess = null;
private static bool shouldBeRunning = false;
private static bool shouldRestart = false;
private static bool isRestarting = false;
private static int startingTime = 3000;
private static int restartDelay = 250;
private static Process currentVpnProcess;
private static bool shouldBeRunning;
private static bool shouldRestart;
private static bool isRestarting;
private const int startingTime = 3000;
private const int restartDelay = 250;
private static DaemonConfig config;
public const string daemonConfigPath = "/etc/melon-vpn/daemon.cfg";
private static void SaveConfig()
{
File.WriteAllText(daemonConfigPath, config.ToJson());
}
public static void StartServer()
{
@ -22,11 +30,13 @@ namespace MelonVPNCore
IPAddress ipAddress = host.AddressList[0];
IPEndPoint localEndPoint = new IPEndPoint(ipAddress, 22035);
if (File.Exists(daemonConfigPath)) config = DaemonConfig.FromJson(File.ReadAllText(daemonConfigPath));
else config = new DaemonConfig();
try
{
Socket listener = new Socket(ipAddress.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
listener.Bind(localEndPoint);
listener.Listen(32);
string lastClientUpdate = Messages.EOF;
@ -53,17 +63,19 @@ namespace MelonVPNCore
else if (data == Messages.RestartOnMsg)
{
shouldRestart = true;
SaveConfig();
Client.SendDataMessage(DataMessage.RestartOn, true);
}
else if (data == Messages.RestartOffMsg)
{
shouldRestart = false;
SaveConfig();
Client.SendDataMessage(DataMessage.RestartOff, true);
}
else if (data == Messages.StatusMsg)
{
Console.WriteLine("Status requested");
if (isProcessOnline(currentVpnProcess) || shouldBeRunning)
if (IsProcessOnline(currentVpnProcess) || shouldBeRunning)
{
if (isRestarting)
{
@ -88,7 +100,7 @@ namespace MelonVPNCore
}
else if (data == Messages.StartMsg)
{
if (! isProcessOnline(currentVpnProcess))
if (! IsProcessOnline(currentVpnProcess))
{
shouldBeRunning = true;
Console.WriteLine("Starting VPN");
@ -125,7 +137,7 @@ namespace MelonVPNCore
{
shouldBeRunning = false;
bool haderr = false;
if (isProcessOnline(currentVpnProcess))
if (IsProcessOnline(currentVpnProcess))
{
Console.WriteLine("Stopping VPN");
try
@ -169,23 +181,10 @@ namespace MelonVPNCore
}
}
public static bool isProcessOnline(Process p)
public static bool IsProcessOnline(Process p)
{
if (p == null)
{
return false;
}
else
{
if (p.HasExited)
{
return false;
}
else
{
return true;
}
}
if (p == null) return false;
return !p.HasExited;
}
static void CurrentVpnProcess_Exited(object sender, EventArgs e)

80
MelonVPNCore/Json.cs Normal file
View File

@ -0,0 +1,80 @@
using System;
using System.Globalization;
using Newtonsoft.Json;
using Newtonsoft.Json.Converters;
namespace MelonVPNCore
{
// I hate overhead but this code is just nice xD
// Base json class with type property FromJson and ToJson methods
public class JsonBase
{
[JsonProperty("type")]
public string Type { get; set; }
// Convert from json string to WSJson class
public static JsonBase FromJson(string json) => JsonConvert.DeserializeObject<JsonBase>(json, Converter.Settings);
// Convert any class into a json string
public string ToJson() => JsonConvert.SerializeObject(this, Converter.Settings);
// Converter with settings
internal static class Converter
{
public static readonly JsonSerializerSettings Settings = new JsonSerializerSettings
{
MetadataPropertyHandling = MetadataPropertyHandling.Ignore,
DateParseHandling = DateParseHandling.None,
Converters =
{
new IsoDateTimeConverter{DateTimeStyles=DateTimeStyles.AssumeUniversal }
}
};
}
}
// Base class for custom json with a type argument
public class JsonBase<T> : JsonBase
{
// Convert from json string to T class
public static new T FromJson(string json) => JsonConvert.DeserializeObject<T>(json, Converter.Settings);
// Used to convert json property into type long
internal class ParseStringConverter : JsonConverter
{
public override bool CanConvert(Type objectType) { return objectType == typeof(long) || objectType == typeof(long); }
public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
if (reader.TokenType == JsonToken.Null) return null;
var value = serializer.Deserialize<string>(reader);
if (long.TryParse(value, out long l)) return l;
throw new Exception("Cannot unmarshal type long");
}
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
if (value == null)
{
serializer.Serialize(writer, null);
return;
}
var v = (long)value;
serializer.Serialize(writer, v.ToString());
return;
}
public static readonly ParseStringConverter Singleton = new ParseStringConverter();
}
}
// Class for the daemon config
public class DaemonConfig : JsonBase<DaemonConfig>
{
public DaemonConfig() => Type = "DaemonConfig";
[JsonProperty("restart")]
public string ShouldRestart { get; set; }
}
}

1
MelonVPNCore/MelonVPNCore.csproj
View File

@ -35,6 +35,7 @@
<Compile Include="GUISocketServer.cs" />
<Compile Include="ClientListParser.cs" />
<Compile Include="ConnectedClient.cs" />
<Compile Include="Json.cs" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />

1
install-components
View File

@ -43,6 +43,7 @@ sudo cp MelonVPNClient/bin/Release/MelonVPNClient.exe /usr/lib/melon-vpn/
sudo cp MelonVPNClient/bin/Release/MelonVPNClient.exe.config /usr/lib/melon-vpn/
sudo cp MelonVPNClient/bin/Release/MiniMelonVPNIcon.png /usr/lib/melon-vpn/
sudo cp MelonVPNClient/bin/Release/MiniMelonVPNOnline.png /usr/lib/melon-vpn/
sudo cp MelonVPNClient/bin/Release/MelonVPNDesktopIcon.png /usr/lib/melon-vpn/
# copy app indicator icons
mkdir -p ~/.local/share/icons/hicolor/128x128/apps/