Redesign Everything

This commit is contained in:
Afshin Arani 2016-09-24 17:08:26 +03:30
parent b5472c6cd7
commit 6af7c66a81
710 changed files with 32932 additions and 302 deletions

View file

@ -39,7 +39,7 @@ namespace TLSharp.Core.Network
return confirmed ? _session.Sequence++ * 2 + 1 : _session.Sequence * 2;
}
public async Task Send(MTProtoRequest request)
public async Task Send(TeleSharp.TL.TLMethod request)
{
// TODO: refactor
if (needConfirmation.Any())
@ -48,7 +48,7 @@ namespace TLSharp.Core.Network
using (var memory = new MemoryStream())
using (var writer = new BinaryWriter(memory))
{
ackRequest.OnSend(writer);
ackRequest.SerializeBody(writer);
await Send(memory.ToArray(), ackRequest);
needConfirmation.Clear();
}
@ -58,14 +58,14 @@ namespace TLSharp.Core.Network
using (var memory = new MemoryStream())
using (var writer = new BinaryWriter(memory))
{
request.OnSend(writer);
request.SerializeBody(writer);
await Send(memory.ToArray(), request);
}
_session.Save();
}
public async Task Send(byte[] packet, MTProtoRequest request)
public async Task Send(byte[] packet, TeleSharp.TL.TLMethod request)
{
request.MessageId = _session.GetNewMessageId();
@ -132,7 +132,7 @@ namespace TLSharp.Core.Network
return new Tuple<byte[], ulong, int>(message, remoteMessageId, remoteSequence);
}
public async Task<byte[]> Receive(MTProtoRequest request)
public async Task<byte[]> Receive(TeleSharp.TL.TLMethod request)
{
while (!request.ConfirmReceived)
{
@ -148,7 +148,7 @@ namespace TLSharp.Core.Network
return null;
}
private bool processMessage(ulong messageId, int sequence, BinaryReader messageReader, MTProtoRequest request)
private bool processMessage(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request)
{
// TODO: check salt
// TODO: check sessionid
@ -225,7 +225,7 @@ namespace TLSharp.Core.Network
*/
}
private bool HandleGzipPacked(ulong messageId, int sequence, BinaryReader messageReader, MTProtoRequest request)
private bool HandleGzipPacked(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request)
{
uint code = messageReader.ReadUInt32();
byte[] packedData = GZipStream.UncompressBuffer(Serializers.Bytes.read(messageReader));
@ -238,7 +238,7 @@ namespace TLSharp.Core.Network
return true;
}
private bool HandleRpcResult(ulong messageId, int sequence, BinaryReader messageReader, MTProtoRequest request)
private bool HandleRpcResult(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request)
{
uint code = messageReader.ReadUInt32();
ulong requestId = messageReader.ReadUInt64();
@ -305,7 +305,7 @@ namespace TLSharp.Core.Network
}
using (var compressedReader = new BinaryReader(ms))
{
request.OnResponse(compressedReader);
request.deserializeResponse(compressedReader);
}
}
}
@ -317,8 +317,7 @@ namespace TLSharp.Core.Network
else
{
messageReader.BaseStream.Position -= 4;
request.OnResponse(messageReader);
request.deserializeResponse(messageReader);
}
return false;
@ -382,7 +381,7 @@ namespace TLSharp.Core.Network
return true;
}
private bool HandleBadServerSalt(ulong messageId, int sequence, BinaryReader messageReader, MTProtoRequest request)
private bool HandleBadServerSalt(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request)
{
uint code = messageReader.ReadUInt32();
ulong badMsgId = messageReader.ReadUInt64();
@ -453,7 +452,7 @@ namespace TLSharp.Core.Network
return false;
}
private bool HandleContainer(ulong messageId, int sequence, BinaryReader messageReader, MTProtoRequest request)
private bool HandleContainer(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request)
{
uint code = messageReader.ReadUInt32();
int size = messageReader.ReadInt32();

View file

@ -1,18 +1,20 @@
using System;
using System.Collections.Generic;
using System.IO;
using TeleSharp.TL;
namespace TLSharp.Core.Requests
{
public class AckRequest : MTProtoRequest
public class AckRequest : TeleSharp.TL.TLMethod
{
private readonly List<ulong> _msgs;
public AckRequest(List<ulong> msgs)
{
_msgs = msgs;
}
public override void OnSend(BinaryWriter writer)
public override void SerializeBody(BinaryWriter writer)
{
writer.Write(0x62d6b459); // msgs_ack
writer.Write(0x1cb5c415); // Vector
@ -23,17 +25,25 @@ namespace TLSharp.Core.Requests
}
}
public override void OnResponse(BinaryReader reader)
public override void DeserializeBody(BinaryReader reader)
{
//throw new NotImplementedException();
throw new NotImplementedException();
}
public override void OnException(Exception exception)
public override void deserializeResponse(BinaryReader stream)
{
throw new NotImplementedException();
}
public override bool Confirmed => false;
public override bool Responded { get; }
public override int Constructor
{
get
{
return 0x62d6b459;
}
}
}
}

View file

@ -26,7 +26,7 @@ namespace TLSharp.Core
public Session Load(string sessionUserId)
{
var sessionFileName = $"{sessionUserId}.dat";
if (!System.IO.File.Exists(sessionFileName))
if (!File.Exists(sessionFileName))
return null;
using (var stream = new FileStream(sessionFileName, FileMode.Open))
@ -67,7 +67,7 @@ namespace TLSharp.Core
public int TimeOffset { get; set; }
public long LastMessageId { get; set; }
public int SessionExpires { get; set; }
public TeleSharp.TL.User User { get; set; }
public TLUser TLUser { get; set; }
private Random random;
private ISessionStore _store;
@ -91,11 +91,11 @@ namespace TLSharp.Core
Serializers.String.write(writer, ServerAddress);
writer.Write(Port);
if (User != null)
if (TLUser != null)
{
writer.Write(1);
writer.Write(SessionExpires);
Serializer.Serialize(User, typeof(TeleSharp.TL.User), writer);
ObjectUtils.SerializeObject(TLUser, writer);
}
else
{
@ -123,11 +123,11 @@ namespace TLSharp.Core
var isAuthExsist = reader.ReadInt32() == 1;
int sessionExpires = 0;
User user = null;
TLUser TLUser = null;
if (isAuthExsist)
{
sessionExpires = reader.ReadInt32();
user = (User)Deserializer.Deserialize(typeof(User), reader);
TLUser = (TLUser)ObjectUtils.DeserializeObject(reader);
}
var authData = Serializers.Bytes.read(reader);
@ -141,7 +141,7 @@ namespace TLSharp.Core
LastMessageId = lastMessageId,
TimeOffset = timeOffset,
SessionExpires = sessionExpires,
User = user,
TLUser = TLUser,
SessionUserId = sessionUserId,
ServerAddress = serverAddress,
Port = port

View file

@ -30,10 +30,6 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="BigMath, Version=0.5.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\BigMath.0.5.0\lib\portable-net45+netcore45+wpa81+wp8+MonoAndroid1+MonoTouch1\BigMath.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Ionic.ZLib, Version=2.0.0.14, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\MarkerMetro.Unity.Ionic.Zlib.2.0.0.14\lib\net35\Ionic.ZLib.dll</HintPath>
<Private>True</Private>
@ -46,10 +42,6 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="TeleSharp.TL, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\TeleSharp.TL.1.0.0-CI00000\lib\net452\TeleSharp.TL.dll</HintPath>
<Private>True</Private>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Include="Auth\Authenticator.cs" />
@ -71,11 +63,6 @@
<Compile Include="Network\TcpTransport.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Requests\AckRequest.cs" />
<Compile Include="Requests\AuthSendCodeRequest.cs" />
<Compile Include="Requests\DownloadFileRequest.cs" />
<Compile Include="Requests\AuthSignInRequest.cs" />
<Compile Include="Requests\InitConnectionRequest.cs" />
<Compile Include="Requests\MTProtoRequest.cs" />
<Compile Include="Session.cs" />
<Compile Include="TelegramClient.cs" />
<Compile Include="Utils\Helpers.cs" />
@ -83,6 +70,12 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\TeleSharp.TL\TeleSharp.TL.csproj">
<Project>{d6144517-91d2-4880-86df-e9ff5d7f383a}</Project>
<Name>TeleSharp.TL</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.

View file

@ -4,13 +4,15 @@ using System.Linq;
using System.Text;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using TeleSharp.TL;
using TLSharp.Core.Auth;
using TLSharp.Core.MTProto;
using TLSharp.Core.MTProto.Crypto;
using TLSharp.Core.Network;
using TLSharp.Core.Requests;
using TeleSharp.TL;
using MD5 = System.Security.Cryptography.MD5;
using TeleSharp.TL.Help;
using TeleSharp.TL.Auth;
namespace TLSharp.Core
{
@ -22,12 +24,11 @@ namespace TLSharp.Core
private string _apiHash = "";
private int _apiId = 0;
private Session _session;
private List<TeleSharp.TL.DcOption> dcOptions;
public enum sms_type { numeric_code_via_sms = 0, numeric_code_via_telegram = 5 }
private List<TLDcOption> dcOptions;
public TelegramClient(ISessionStore store, string sessionUserId, int apiId, string apiHash)
{
TLContext.Init();
_apiHash = apiHash;
_apiId = apiId;
if (_apiId == 0)
@ -35,7 +36,6 @@ namespace TLSharp.Core
if (string.IsNullOrEmpty(_apiHash))
throw new InvalidOperationException("Your API_ID is invalid. Do a configuration first https://github.com/sochix/TLSharp#quick-configuration");
_session = Session.TryLoadOrCreateNew(store, sessionUserId);
_transport = new TcpTransport(_session.ServerAddress, _session.Port);
}
@ -53,12 +53,13 @@ namespace TLSharp.Core
if (!reconnect)
{
var request = new InitConnectionRequest(_apiId);
var config = new TLRequestGetConfig() ;
var request = new TLRequestInitConnection() { api_id = _apiId, app_version = "1.0.0", device_model = "PC", lang_code = "en", query= config, system_version = "Win 10.0" };
var invokewithLayer = new TLRequestInvokeWithLayer() { layer = 53, query = request };
await _sender.Send(invokewithLayer);
await _sender.Receive(invokewithLayer);
await _sender.Send(request);
await _sender.Receive(request);
dcOptions = (request.Configs).dc_options;
dcOptions = ((TLConfig)invokewithLayer.Response).dc_options.lists;
}
return true;
@ -69,30 +70,41 @@ namespace TLSharp.Core
if (dcOptions == null || !dcOptions.Any())
throw new InvalidOperationException($"Can't reconnect. Establish initial connection first.");
var dc = dcOptions.Cast<DcOption>().First(d => d.id == dcId);
var dc = dcOptions.First(d => d.id == dcId);
_transport = new TcpTransport(dc.ip_address, dc.port.Value);
_transport = new TcpTransport(dc.ip_address, dc.port);
_session.ServerAddress = dc.ip_address;
_session.Port = dc.port.Value;
_session.Port = dc.port;
await Connect(true);
}
public bool IsUserAuthorized()
{
return _session.User != null;
return _session.TLUser != null;
}
public async Task<string> SendCodeRequest(string phoneNumber, sms_type tokenDestination = sms_type.numeric_code_via_telegram)
public async Task<bool> IsPhoneRegistered(string phoneNumber)
{
if (_sender == null)
throw new InvalidOperationException("Not connected!");
var authCheckPhoneRequest = new TLRequestCheckPhone() { phone_number = phoneNumber };
await _sender.Send(authCheckPhoneRequest);
await _sender.Receive(authCheckPhoneRequest);
return authCheckPhoneRequest.Response.phone_registered;
}
public async Task<string> SendCodeRequest(string phoneNumber)
{
var completed = false;
AuthSendCodeRequest request = null;
TLRequestSendCode request = null;
while (!completed)
{
request = new AuthSendCodeRequest(phoneNumber, (int)tokenDestination, _apiId, _apiHash, "en");
request = new TLRequestSendCode() { phone_number = phoneNumber, api_id = _apiId, api_hash = _apiHash };
try
{
await _sender.Send(request);
@ -113,261 +125,43 @@ namespace TLSharp.Core
}
}
return request._phoneCodeHash;
return request.Response.phone_code_hash;
}
public async Task<TeleSharp.TL.User> MakeAuth(string phoneNumber, string phoneCodeHash, string code)
public async Task<TLUser> MakeAuth(string phoneNumber, string phoneCodeHash, string code)
{
var request = new AuthSignInRequest(phoneNumber, phoneCodeHash, code);
var request = new TLRequestSignIn() { phone_number = phoneNumber, phone_code_hash = phoneCodeHash, phone_code = code };
await _sender.Send(request);
await _sender.Receive(request);
OnUserAuthenticated(request.user, request.SessionExpires);
OnUserAuthenticated(((TLUser)request.Response.user));
return request.user;
return ((TLUser)request.Response.user);
}
//public async Task<User> SignUp(string phoneNumber, string phoneCodeHash, string code, string firstName, string lastName)
//{
// var request = new AuthSignUpRequest(phoneNumber, phoneCodeHash, code, firstName, lastName);
// await _sender.Send(request);
// await _sender.Receive(request);
// OnUserAuthenticated(request.user, request.SessionExpires);
// return request.user;
//}
private void OnUserAuthenticated(TeleSharp.TL.User user, int sessionExpiration)
public async Task<TLUser> SignUp(string phoneNumber, string phoneCodeHash, string code, string firstName, string lastName)
{
_session.User = user;
_session.SessionExpires = sessionExpiration;
var request = new TLRequestSignUp() { phone_number = phoneNumber, phone_code = code, phone_code_hash = phoneCodeHash, first_name = firstName, last_name = lastName };
await _sender.Send(request);
await _sender.Receive(request);
OnUserAuthenticated(((TLUser)request.Response.user));
return ((TLUser)request.Response.user);
}
public async Task<T> SendRequest<T>(TLMethod methodtoExceute)
{
await _sender.Send(methodtoExceute);
await _sender.Receive(methodtoExceute);
return (T)Convert.ChangeType(typeof(TLMethod).GetProperty("Response").GetValue(methodtoExceute),typeof(T));
}
private void OnUserAuthenticated(TLUser TLUser)
{
_session.TLUser = TLUser;
_session.SessionExpires = int.MaxValue;
_session.Save();
}
//public async Task<InputFile> UploadFile(string name, byte[] data)
//{
// var partSize = 65536;
// var file_id = DateTime.Now.Ticks;
// var partedData = new Dictionary<int, byte[]>();
// var parts = Convert.ToInt32(Math.Ceiling(Convert.ToDouble(data.Length) / Convert.ToDouble(partSize)));
// var remainBytes = data.Length;
// for (int i = 0; i < parts; i++)
// {
// partedData.Add(i, data
// .Skip(i * partSize)
// .Take(remainBytes < partSize ? remainBytes : partSize)
// .ToArray());
// remainBytes -= partSize;
// }
// for (int i = 0; i < parts; i++)
// {
// var saveFilePartRequest = new Upload_SaveFilePartRequest(file_id, i, partedData[i]);
// await _sender.Send(saveFilePartRequest);
// await _sender.Receive(saveFilePartRequest);
// if (saveFilePartRequest.Done == false)
// throw new InvalidOperationException($"File part {i} does not uploaded");
// }
// string md5_checksum;
// using (var md5 = MD5.Create())
// {
// var hash = md5.ComputeHash(data);
// var hashResult = new StringBuilder(hash.Length * 2);
// for (int i = 0; i < hash.Length; i++)
// hashResult.Append(hash[i].ToString("x2"));
// md5_checksum = hashResult.ToString();
// }
// var inputFile = new InputFileConstructor(file_id, parts, name, md5_checksum);
// return inputFile;
//}
//public async Task<bool> SendMediaMessage(int contactId, InputFile file)
//{
// var request = new Message_SendMediaRequest(
// new InputPeerContactConstructor(contactId),
// new InputMediaUploadedPhotoConstructor(file));
// await _sender.Send(request);
// await _sender.Receive(request);
// return true;
//}
//public async Task<int?> ImportContactByPhoneNumber(string phoneNumber)
//{
// if (!validateNumber(phoneNumber))
// throw new InvalidOperationException("Invalid phone number. It should be only digit string, from 5 to 20 digits.");
// var request = new ImportContactRequest(new InputPhoneContactConstructor(0, phoneNumber, "My Test Name", String.Empty));
// await _sender.Send(request);
// await _sender.Receive(request);
// var importedUser = (ImportedContactConstructor)request.imported.FirstOrDefault();
// return importedUser?.user_id;
//}
//public async Task<int?> ImportByUserName(string username)
//{
// if (string.IsNullOrEmpty(username))
// throw new InvalidOperationException("Username can't be null");
// var request = new ImportByUserName(username);
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.id;
//}
//public async Task SendMessage(int id, string message)
//{
// var request = new SendMessageRequest(new InputPeerContactConstructor(id), message);
// await _sender.Send(request);
// await _sender.Receive(request);
//}
//public async Task<List<Message>> GetMessagesHistoryForContact(int user_id, int offset, int limit, int max_id = -1)
//{
// var request = new GetHistoryRequest(new InputPeerContactConstructor(user_id), offset, max_id, limit);
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.messages;
//}
//public async Task<Tuple<storage_FileType, byte[]>> GetFile(long volume_id, int local_id, long secret, int offset, int limit)
//{
// var request = new GetFileRequest(new InputFileLocationConstructor(volume_id, local_id, secret), offset, limit);
// await _sender.Send(request);
// await _sender.Receive(request);
// return Tuple.Create(request.type, request.bytes);
//}
//public async Task<MessageDialogs> GetDialogs(int offset, int limit, int max_id = 0)
//{
// var request = new GetDialogsRequest(offset, max_id, limit);
// await _sender.Send(request);
// await _sender.Receive(request);
// return new MessageDialogs
// {
// Dialogs = request.dialogs,
// Messages = request.messages,
// Chats = request.chats,
// Users = request.users,
// };
//}
//public async Task<UserFull> GetUserFull(int user_id)
//{
// var request = new GetUserFullRequest(user_id);
// await _sender.Send(request);
// await _sender.Receive(request);
// return request._userFull;
//}
//private bool validateNumber(string number)
//{
// var regex = new Regex("^\\d{7,20}$");
// return regex.IsMatch(number);
//}
//public async Task<ContactsContacts> GetContacts(IList<int> contactIds = null)
//{
// var request = new GetContactsRequest(contactIds);
// await _sender.Send(request);
// await _sender.Receive(request);
// return new ContactsContacts
// {
// Contacts = request.Contacts,
// Users = request.Users,
// };
//}
//public async Task<Messages_statedMessageConstructor> CreateChat(string title, List<string> userPhonesToInvite)
//{
// var userIdsToInvite = new List<int>();
// foreach (var userPhone in userPhonesToInvite)
// {
// var uid = await ImportContactByPhoneNumber(userPhone);
// if (!uid.HasValue)
// throw new InvalidOperationException($"Failed to retrieve contact {userPhone}");
// userIdsToInvite.Add(uid.Value);
// }
// return await CreateChat(title, userIdsToInvite);
//}
//public async Task<Messages_statedMessageConstructor> CreateChat(string title, List<int> userIdsToInvite)
//{
// var request = new CreateChatRequest(userIdsToInvite.Select(uid => new InputUserContactConstructor(uid)).ToList(), title);
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.message;
//}
//public async Task<Messages_statedMessageConstructor> AddChatUser(int chatId, int userId)
//{
// var request = new AddChatUserRequest(chatId, new InputUserContactConstructor(userId));
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.message;
//}
//public async Task<Messages_statedMessageConstructor> DeleteChatUser(int chatId, int userId)
//{
// var request = new DeleteChatUserRequest(chatId, new InputUserContactConstructor(userId));
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.message;
//}
//public async Task<Messages_statedMessageConstructor> LeaveChat(int chatId)
//{
// return await DeleteChatUser(chatId, ((UserSelfConstructor) _session.User).id);
//}
//public async Task<updates_State> GetUpdatesState()
//{
// var request = new GetUpdatesStateRequest();
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.updates;
//}
//public async Task<updates_Difference> GetUpdatesDifference(int lastPts, int lastDate, int lastQts)
//{
// var request = new GetUpdatesDifferenceRequest(lastPts, lastDate, lastQts);
// await _sender.Send(request);
// await _sender.Receive(request);
// return request.updatesDifference;
//}
}
}

View file

@ -1,7 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="BigMath" version="0.5.0" targetFramework="net452" />
<package id="DotNetZip" version="1.9.3" targetFramework="net451" />
<package id="MarkerMetro.Unity.Ionic.Zlib" version="2.0.0.14" targetFramework="net452" />
<package id="TeleSharp.TL" version="1.0.0-CI00000" targetFramework="net452" />
</packages>