Timerix/dtlauncher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

it can be compiled, but doesn't work

Browse Source
This commit is contained in:
Timerix22
2021-10-30 13:46:48 +03:00
parent 17915621f3
commit 538db682f3
32 changed files with 108 additions and 1984 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
dtlauncher-client-win/App.xaml.cs
View File

@@ -1,6 +1,5 @@
using System;
using System.Diagnostics;
using System.Net.Sockets;
using System.Windows;
namespace dtlauncher_client_win

15
dtlauncher-client-win/LauncherWindow.xaml.cs
View File

@@ -1,9 +1,9 @@
using DTLib;
using System;
using System;
using System.Net.Sockets;
using System.Text;
using System.Windows;
using static DTLib.Filework;
using DTLib;
using DTLib.Filesystem;
namespace dtlauncher_client_win
{
@@ -29,8 +29,9 @@ namespace dtlauncher_client_win
mainSocket = _socket;
logfile = _logfile;
LogBox.Text += _log;
PublicLog.Log += Log;
this.Closed += AppClose;
PublicLog.LogEvent += Log;
PublicLog.LogNoTimeEvent += Log;
Closed += AppClose;
// переключение вкладок кнопками
var green = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(44, 220, 17));
var white = new System.Windows.Media.SolidColorBrush(System.Windows.Media.Color.FromRgb(240, 240, 240));
@@ -62,7 +63,7 @@ namespace dtlauncher_client_win
SettingsButton.Foreground = green;
};
// считывание дескрипторов программ
var descriptors = Directory.GetFiles("descriptors", "*.desc");
string[] descriptors = Directory.GetFiles("descriptors", "*.desc");
programsArray = new ProgramLabel[descriptors.Length];
Log(descriptors.Length + " descriptors found\n");
for (int i = 0; i < descriptors.Length; i++)
@@ -86,7 +87,7 @@ namespace dtlauncher_client_win
public void Log(string msg)
{
if (LogBox.Text[LogBox.Text.Length - 1] == '\n') msg = "[" + DateTime.Now.ToString() + "]: " + msg;
Filework.LogToFile(logfile, msg);
OldFilework.LogToFile(logfile, msg);
LogBox.Text += msg;
}

36
dtlauncher-client-win/LoginWindow.xaml.cs
View File

@@ -1,10 +1,12 @@
using DTLib;
using System;
using System;
using System.Net;
using System.Net.Sockets;
using System.Text;
using System.Windows;
using static DTLib.Filework;
using DTLib;
using DTLib.Dtsod;
using DTLib.Filesystem;
using DTLib.Network;
namespace dtlauncher_client_win
{
@@ -15,7 +17,7 @@ namespace dtlauncher_client_win
{
public Socket mainSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
public string logfile = $"logs\\client-{DateTime.Now}.log".Replace(':', '-').Replace(' ', '_');
Dtsod config;
DtsodV21 config;
public LoginWindow()
{
@@ -28,12 +30,13 @@ namespace dtlauncher_client_win
Directory.Create("installed");
Directory.Create("installscripts");
Directory.Create("launchinfo");
PublicLog.Log += Log;
PublicLog.LogEvent += Log;
PublicLog.LogNoTimeEvent += Log;
LoginButton.Click += Login;
RegisterButton.Click += Register;
Log("[" + DateTime.Now.ToString() + "]: launcher is starting\n");
config = new(File.ReadAllText("client.dtsod"));
this.Closed += AppClose;
Closed += AppClose;
}
catch (Exception e)
{
@@ -46,7 +49,7 @@ namespace dtlauncher_client_win
try
{
var hasher = new Hasher();
var filename = $"register-{LoginBox.Text}.req";
string filename = $"register-{LoginBox.Text}.req";
string content = hasher.HashCycled(hasher.Hash(LoginBox.Text.ToBytes(), PasswBox.Password.ToBytes()), 512).HashToString() + ": " + LoginBox.Text;
//File.WriteAllText(filename, hasher.HashCycled(hasher.Hash(LoginBox.Text.ToBytes(), PasswBox.Password.ToBytes()), 512).HashToString() + ": " + LoginBox.Text);
//Log($"request file created:{Directory.GetCurrentDirectory()}\\register-{LoginBox.Text}.req {hasher.Hash(LoginBox.Text.ToBytes(), PasswBox.Password.ToBytes()).Length}");
@@ -60,13 +63,13 @@ namespace dtlauncher_client_win
mainSocket.Connect(new IPEndPoint(Dns.GetHostAddresses(config["server_domain"])[0], (int)config["server_port"]));
Log("g", "connecting to server...\n");
mainSocket.ReceiveTimeout = 2000;
var recieved = mainSocket.GetPackage().ToStr();
string recieved = mainSocket.GetPackage().BytesToString();
if (recieved != "requesting hash") throw new Exception($"Login() error: invalid request <{recieved}> <{recieved.Length}>");
mainSocket.SendPackage(new byte[] { 255, 255, 255, 255, 255, 255, 255, 255 });
recieved = mainSocket.GetPackage().ToStr();
recieved = mainSocket.GetPackage().BytesToString();
if (recieved != "updater") throw new Exception($"invalid central server answer <{recieved}>");
mainSocket.SendPackage("register new user".ToBytes());
recieved = mainSocket.GetPackage().ToStr();
recieved = mainSocket.GetPackage().BytesToString();
if (recieved != "ok") throw new Exception($"invalid central server answer <{recieved}>");
mainSocket.SendPackage(content.ToBytes());
Log("g", "registration request sent\n");
@@ -97,19 +100,20 @@ namespace dtlauncher_client_win
mainSocket.Connect(new IPEndPoint(Dns.GetHostAddresses(config["server_domain"])[0], (int)config["server_port"]));
Log("g", "connecting to server...\n");
mainSocket.ReceiveTimeout = 2000;
string recieved = mainSocket.GetPackage().ToStr();
string recieved = mainSocket.GetPackage().BytesToString();
if (recieved != "requesting hash") throw new Exception($"Login() error: invalid request <{recieved}> <{recieved.Length}>");
var hasher = new Hasher();
mainSocket.SendPackage(hasher.HashCycled(hasher.Hash(LoginBox.Text.ToBytes(), PasswBox.Password.ToBytes()), 512));
recieved = mainSocket.GetPackage().ToStr();
recieved = mainSocket.GetPackage().BytesToString();
if (recieved != "success") throw new Exception($"Login() error: invalid server answer <{recieved}>");
Log("succesfully connected\n");
// вызов нового окна
PublicLog.Log -= Log;
PublicLog.LogEvent -= Log;
PublicLog.LogNoTimeEvent -= Log;
var lauWin = new LauncherWindow(mainSocket, logfile, LogBox.Text);
lauWin.Show();
this.Closed -= AppClose;
this.Close();
Closed -= AppClose;
Close();
}
catch (Exception ex)
{
@@ -122,7 +126,7 @@ namespace dtlauncher_client_win
public void Log(string msg)
{
if (LogBox.Text[LogBox.Text.Length - 1] == '\n') msg = "[" + DateTime.Now.ToString() + "]: " + msg;
LogToFile(logfile, msg);
OldFilework.LogToFile(logfile, msg);
LogBox.Text += msg;
}

13
dtlauncher-client-win/ProgramLabel.xaml.cs
View File

@@ -1,10 +1,10 @@
using DTLib;
using System;
using System;
using System.Diagnostics;
using System.IO;
using System.Windows;
using System.Windows.Controls;
using System.Windows.Media.Imaging;
using DTLib.Dtsod;
namespace dtlauncher_client_win
{
@@ -40,13 +40,10 @@ namespace dtlauncher_client_win
//public string description;
//public string installScript;
//public string installDir;
Dtsod descriptor;
Dtsod launchinfo;
DtsodV21 descriptor;
DtsodV21 launchinfo;
public ProgramLabel()
{
InitializeComponent();
}
public ProgramLabel() => InitializeComponent();
public ProgramLabel(string descriptorFile, int number, LauncherWindow window)
{

4
dtlauncher-client-win/client.dtsod
View File

@@ -1,2 +1,2 @@
server_domain: "timerix.cf";
server_port: 4000;
server_domain: "m1net.keenetic.pro";
server_port: 25001;

2
dtlauncher-client-win/dtlauncher-client-win.csproj
View File

@@ -107,7 +107,7 @@
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\DTLib\DTLib.csproj">
<ProjectReference Include="..\..\DTLib\DTLib.csproj">
<Project>{ce793497-2d5c-42d8-b311-e9b32af9cdfb}</Project>
<Name>DTLib</Name>
</ProjectReference>