sochix/TLSharp
1
0
Fork 0
mirror of https://github.com/sochix/TLSharp.git synced 2025-12-06 08:02:00 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #901 from CheshireCaat/pr-sub

Browse source 
Code refactoring
This commit is contained in:
Andres G. Aragoneses 2020-01-27 13:34:43 +08:00 committed by GitHub
parent dc8c20df63 bdbaf76481
commit 1ccafe22a3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 177 additions and 157 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TLSharp.Core/Auth/Step1_PQRequest.cs
View file

@ -65,7 +65,7 @@ namespace TLSharp.Core.Auth
var serverNonce = binaryReader.ReadBytes(16); var serverNonce = binaryReader.ReadBytes(16);
byte[] pqbytes = Serializers.Bytes.read(binaryReader); byte[] pqbytes = Serializers.Bytes.Read(binaryReader);
var pq = new BigInteger(1, pqbytes); var pq = new BigInteger(1, pqbytes);
var vectorId = binaryReader.ReadInt32(); var vectorId = binaryReader.ReadInt32();

14
TLSharp.Core/Auth/Step2_DHExchange.cs
View file

@ -36,9 +36,9 @@ namespace TLSharp.Core.Auth
using (BinaryWriter pqInnerDataWriter = new BinaryWriter(pqInnerData)) using (BinaryWriter pqInnerDataWriter = new BinaryWriter(pqInnerData))
{ {
pqInnerDataWriter.Write(0x83c95aec); // pq_inner_data pqInnerDataWriter.Write(0x83c95aec); // pq_inner_data
Serializers.Bytes.write(pqInnerDataWriter, pq.ToByteArrayUnsigned()); Serializers.Bytes.Write(pqInnerDataWriter, pq.ToByteArrayUnsigned());
Serializers.Bytes.write(pqInnerDataWriter, pqPair.Min.ToByteArrayUnsigned()); Serializers.Bytes.Write(pqInnerDataWriter, pqPair.Min.ToByteArrayUnsigned());
Serializers.Bytes.write(pqInnerDataWriter, pqPair.Max.ToByteArrayUnsigned()); Serializers.Bytes.Write(pqInnerDataWriter, pqPair.Max.ToByteArrayUnsigned());
pqInnerDataWriter.Write(nonce); pqInnerDataWriter.Write(nonce);
pqInnerDataWriter.Write(serverNonce); pqInnerDataWriter.Write(serverNonce);
pqInnerDataWriter.Write(newNonce); pqInnerDataWriter.Write(newNonce);
@ -69,10 +69,10 @@ namespace TLSharp.Core.Auth
reqDHParamsWriter.Write(0xd712e4be); // req_dh_params reqDHParamsWriter.Write(0xd712e4be); // req_dh_params
reqDHParamsWriter.Write(nonce); reqDHParamsWriter.Write(nonce);
reqDHParamsWriter.Write(serverNonce); reqDHParamsWriter.Write(serverNonce);
Serializers.Bytes.write(reqDHParamsWriter, pqPair.Min.ToByteArrayUnsigned()); Serializers.Bytes.Write(reqDHParamsWriter, pqPair.Min.ToByteArrayUnsigned());
Serializers.Bytes.write(reqDHParamsWriter, pqPair.Max.ToByteArrayUnsigned()); Serializers.Bytes.Write(reqDHParamsWriter, pqPair.Max.ToByteArrayUnsigned());
reqDHParamsWriter.Write(targetFingerprint); reqDHParamsWriter.Write(targetFingerprint);
Serializers.Bytes.write(reqDHParamsWriter, ciphertext); Serializers.Bytes.Write(reqDHParamsWriter, ciphertext);
reqDhParamsBytes = reqDHParams.ToArray(); reqDhParamsBytes = reqDHParams.ToArray();
} }
@ -126,7 +126,7 @@ namespace TLSharp.Core.Auth
} }
*/ */
encryptedAnswer = Serializers.Bytes.read(responseReader); encryptedAnswer = Serializers.Bytes.Read(responseReader);
return new Step2_Response() return new Step2_Response()
{ {

8
TLSharp.Core/Auth/Step3_CompleteDHExchange.cs
View file

@ -62,8 +62,8 @@ namespace TLSharp.Core.Auth
// logger.debug("valid server nonce"); // logger.debug("valid server nonce");
g = dhInnerDataReader.ReadInt32(); g = dhInnerDataReader.ReadInt32();
dhPrime = new BigInteger(1, Serializers.Bytes.read(dhInnerDataReader)); dhPrime = new BigInteger(1, Serializers.Bytes.Read(dhInnerDataReader));
ga = new BigInteger(1, Serializers.Bytes.read(dhInnerDataReader)); ga = new BigInteger(1, Serializers.Bytes.Read(dhInnerDataReader));
int serverTime = dhInnerDataReader.ReadInt32(); int serverTime = dhInnerDataReader.ReadInt32();
timeOffset = serverTime - (int)(Convert.ToInt64((DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds) / 1000); timeOffset = serverTime - (int)(Convert.ToInt64((DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds) / 1000);
@ -88,7 +88,7 @@ namespace TLSharp.Core.Auth
clientDhInnerDataWriter.Write(nonce); clientDhInnerDataWriter.Write(nonce);
clientDhInnerDataWriter.Write(serverNonce); clientDhInnerDataWriter.Write(serverNonce);
clientDhInnerDataWriter.Write((long)0); // TODO: retry_id clientDhInnerDataWriter.Write((long)0); // TODO: retry_id
Serializers.Bytes.write(clientDhInnerDataWriter, gb.ToByteArrayUnsigned()); Serializers.Bytes.Write(clientDhInnerDataWriter, gb.ToByteArrayUnsigned());
using (MemoryStream clientDhInnerDataWithHash = new MemoryStream()) using (MemoryStream clientDhInnerDataWithHash = new MemoryStream())
{ {
@ -121,7 +121,7 @@ namespace TLSharp.Core.Auth
setClientDhParamsWriter.Write(0xf5045f1f); setClientDhParamsWriter.Write(0xf5045f1f);
setClientDhParamsWriter.Write(nonce); setClientDhParamsWriter.Write(nonce);
setClientDhParamsWriter.Write(serverNonce); setClientDhParamsWriter.Write(serverNonce);
Serializers.Bytes.write(setClientDhParamsWriter, clientDhInnerDataEncryptedBytes); Serializers.Bytes.Write(setClientDhParamsWriter, clientDhInnerDataEncryptedBytes);
setclientDhParamsBytes = setClientDhParams.ToArray(); setclientDhParamsBytes = setClientDhParams.ToArray();
} }

7
TLSharp.Core/DataCenter.cs
View file

@ -1,4 +1,3 @@
namespace TLSharp.Core namespace TLSharp.Core
{ {
internal class DataCenter internal class DataCenter
@ -14,8 +13,8 @@ namespace TLSharp.Core
{ {
} }
internal int? DataCenterId { get; private set; } internal int? DataCenterId { get; }
internal string Address { get; private set; } internal string Address { get; }
internal int Port { get; private set; } internal int Port { get; }
} }
} }

22
TLSharp.Core/MTProto/Serializers.cs
View file

@ -9,7 +9,7 @@ namespace TLSharp.Core.MTProto
public static class Bytes public static class Bytes
{ {
public static byte[] read(BinaryReader binaryReader) public static byte[] Read(BinaryReader binaryReader)
{ {
byte firstByte = binaryReader.ReadByte(); byte firstByte = binaryReader.ReadByte();
int len, padding; int len, padding;
@ -33,7 +33,7 @@ namespace TLSharp.Core.MTProto
return data; return data;
} }
public static BinaryWriter write(BinaryWriter binaryWriter, byte[] data) public static BinaryWriter Write(BinaryWriter binaryWriter, byte[] data)
{ {
int padding; int padding;
if (data.Length < 254) if (data.Length < 254)
@ -73,26 +73,16 @@ namespace TLSharp.Core.MTProto
public static class String public static class String
{ {
public static string read(BinaryReader reader) public static string Read(BinaryReader reader)
{ {
byte[] data = Bytes.read(reader); byte[] data = Bytes.Read(reader);
return Encoding.UTF8.GetString(data, 0, data.Length); return Encoding.UTF8.GetString(data, 0, data.Length);
} }
public static BinaryWriter write(BinaryWriter writer, string str) public static BinaryWriter Write(BinaryWriter writer, string str)
{ {
return Bytes.write(writer, Encoding.UTF8.GetBytes(str)); return Bytes.Write(writer, Encoding.UTF8.GetBytes(str));
} }
} }
public static string VectorToString<T>(List<T> list)
{
string[] tokens = new string[list.Count];
for (int i = 0; i < list.Count; i++)
{
tokens[i] = list[i].ToString();
}
return "[" + System.String.Join(", ", tokens) + "]";
}
} }
} }

6
TLSharp.Core/Network/MtProtoSender.cs
View file

@ -238,7 +238,7 @@ namespace TLSharp.Core.Network
private bool HandleGzipPacked(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request) private bool HandleGzipPacked(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request)
{ {
uint code = messageReader.ReadUInt32(); uint code = messageReader.ReadUInt32();
byte[] packedData = GZipStream.UncompressBuffer(Serializers.Bytes.read(messageReader)); byte[] packedData = GZipStream.UncompressBuffer(Serializers.Bytes.Read(messageReader));
using (MemoryStream packedStream = new MemoryStream(packedData, false)) using (MemoryStream packedStream = new MemoryStream(packedData, false))
using (BinaryReader compressedReader = new BinaryReader(packedStream)) using (BinaryReader compressedReader = new BinaryReader(packedStream))
{ {
@ -276,7 +276,7 @@ namespace TLSharp.Core.Network
if (innerCode == 0x2144ca19) if (innerCode == 0x2144ca19)
{ // rpc_error { // rpc_error
int errorCode = messageReader.ReadInt32(); int errorCode = messageReader.ReadInt32();
string errorMessage = Serializers.String.read(messageReader); string errorMessage = Serializers.String.Read(messageReader);
if (errorMessage.StartsWith("FLOOD_WAIT_")) if (errorMessage.StartsWith("FLOOD_WAIT_"))
{ {
@ -327,7 +327,7 @@ namespace TLSharp.Core.Network
try try
{ {
// gzip_packed // gzip_packed
byte[] packedData = Serializers.Bytes.read(messageReader); byte[] packedData = Serializers.Bytes.Read(messageReader);
using (var ms = new MemoryStream()) using (var ms = new MemoryStream())
{ {
using (var packedStream = new MemoryStream(packedData, false)) using (var packedStream = new MemoryStream(packedData, false))

8
TLSharp.Core/Session.cs
View file

@ -106,7 +106,7 @@ namespace TLSharp.Core
writer.Write(Salt); writer.Write(Salt);
writer.Write(LastMessageId); writer.Write(LastMessageId);
writer.Write(TimeOffset); writer.Write(TimeOffset);
Serializers.String.write(writer, DataCenter.Address); Serializers.String.Write(writer, DataCenter.Address);
writer.Write(DataCenter.Port); writer.Write(DataCenter.Port);
if (TLUser != null) if (TLUser != null)
@ -120,7 +120,7 @@ namespace TLSharp.Core
writer.Write(0); writer.Write(0);
} }
Serializers.Bytes.write(writer, AuthKey.Data); Serializers.Bytes.Write(writer, AuthKey.Data);
return stream.ToArray(); return stream.ToArray();
} }
@ -136,7 +136,7 @@ namespace TLSharp.Core
var salt = reader.ReadUInt64(); var salt = reader.ReadUInt64();
var lastMessageId = reader.ReadInt64(); var lastMessageId = reader.ReadInt64();
var timeOffset = reader.ReadInt32(); var timeOffset = reader.ReadInt32();
var serverAddress = Serializers.String.read(reader); var serverAddress = Serializers.String.Read(reader);
var port = reader.ReadInt32(); var port = reader.ReadInt32();
var isAuthExsist = reader.ReadInt32() == 1; var isAuthExsist = reader.ReadInt32() == 1;
@ -148,7 +148,7 @@ namespace TLSharp.Core
TLUser = (TLUser)ObjectUtils.DeserializeObject(reader); TLUser = (TLUser)ObjectUtils.DeserializeObject(reader);
} }
var authData = Serializers.Bytes.read(reader); var authData = Serializers.Bytes.Read(reader);
var defaultDataCenter = new DataCenter (serverAddress, port); var defaultDataCenter = new DataCenter (serverAddress, port);
return new Session(store) return new Session(store)

36
TeleSharp.Generator/Models.cs
View file

@ -1,36 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Newtonsoft.Json.Schema;
namespace TeleSharp.Generator
{
class Method
{
public int id { get; set; }
public string method { get; set; }
[Newtonsoft.Json.JsonProperty("params")]
public List<Param> Params { get; set; }
public string type { get; set; }
}
class Param
{
public string name { get; set; }
public string type { get; set; }
}
class Constructor
{
public int id { get; set; }
public string predicate { get; set; }
[Newtonsoft.Json.JsonProperty("params")]
public List<Param> Params { get; set; }
public string type { get; set; }
}
class Schema
{
public List<Constructor> constructors { get; set; }
public List<Method> methods { get; set; }
}
}

20
TeleSharp.Generator/Models/TlConstructor.cs Normal file
View file

@ -0,0 +1,20 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace TeleSharp.Generator.Models
{
internal class TlConstructor
{
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("predicate")]
public string Predicate { get; set; }
[JsonProperty("params")]
public List<TlParam> Params { get; set; }
[JsonProperty("type")]
public string Type { get; set; }
}
}

20
TeleSharp.Generator/Models/TlMethod.cs Normal file
View file

@ -0,0 +1,20 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace TeleSharp.Generator.Models
{
internal class TlMethod
{
[JsonProperty("id")]
public int Id { get; set; }
[JsonProperty("method")]
public string Method { get; set; }
[JsonProperty("params")]
public List<TlParam> Params { get; set; }
[JsonProperty("type")]
public string Type { get; set; }
}
}

13
TeleSharp.Generator/Models/TlParam.cs Normal file
View file

@ -0,0 +1,13 @@
using Newtonsoft.Json;
namespace TeleSharp.Generator.Models
{
internal class TlParam
{
[JsonProperty("name")]
public string Name { get; set; }
[JsonProperty("type")]
public string Type { get; set; }
}
}

14
TeleSharp.Generator/Models/TlSchema.cs Normal file
View file

@ -0,0 +1,14 @@
using System.Collections.Generic;
using Newtonsoft.Json;
namespace TeleSharp.Generator.Models
{
internal class TlSchema
{
[JsonProperty("constructors")]
public List<TlConstructor> Constructors { get; set; }
[JsonProperty("methods")]
public List<TlMethod> Methods { get; set; }
}
}

156
TeleSharp.Generator/Program.cs
View file

@ -3,19 +3,15 @@ using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Linq; using System.Linq;
using System.Text; using TeleSharp.Generator.Models;
using System.Threading.Tasks;
using System.CodeDom;
using System.Reflection;
using System.Text.RegularExpressions;
namespace TeleSharp.Generator namespace TeleSharp.Generator
{ {
class Program class Program
{ {
static List<String> keywords = new List<string>(new string[] { "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while", "add", "alias", "ascending", "async", "await", "descending", "dynamic", "from", "get", "global", "group", "into", "join", "let", "orderby", "partial", "partial", "remove", "select", "set", "value", "var", "where", "where", "yield" }); static List<string> keywords = new List<string>(new string[] { "abstract", "as", "base", "bool", "break", "byte", "case", "catch", "char", "checked", "class", "const", "continue", "decimal", "default", "delegate", "do", "double", "else", "enum", "event", "explicit", "extern", "false", "finally", "fixed", "float", "for", "foreach", "goto", "if", "implicit", "in", "in", "int", "interface", "internal", "is", "lock", "long", "namespace", "new", "null", "object", "operator", "out", "out", "override", "params", "private", "protected", "public", "readonly", "ref", "return", "sbyte", "sealed", "short", "sizeof", "stackalloc", "static", "string", "struct", "switch", "this", "throw", "true", "try", "typeof", "uint", "ulong", "unchecked", "unsafe", "ushort", "using", "virtual", "void", "volatile", "while", "add", "alias", "ascending", "async", "await", "descending", "dynamic", "from", "get", "global", "group", "into", "join", "let", "orderby", "partial", "partial", "remove", "select", "set", "value", "var", "where", "where", "yield" });
static List<String> interfacesList = new List<string>(); static List<string> interfacesList = new List<string>();
static List<String> classesList = new List<string>(); static List<string> classesList = new List<string>();
static void Main(string[] args) static void Main(string[] args)
{ {
@ -30,26 +26,26 @@ namespace TeleSharp.Generator
Json = File.ReadAllText(url); Json = File.ReadAllText(url);
FileStream file = File.OpenWrite("Result.cs"); FileStream file = File.OpenWrite("Result.cs");
StreamWriter sw = new StreamWriter(file); StreamWriter sw = new StreamWriter(file);
Schema schema = JsonConvert.DeserializeObject<Schema>(Json); TlSchema schema = JsonConvert.DeserializeObject<TlSchema>(Json);
foreach (var c in schema.constructors) foreach (var c in schema.Constructors)
{ {
interfacesList.Add(c.type); interfacesList.Add(c.Type);
classesList.Add(c.predicate); classesList.Add(c.Predicate);
} }
foreach (var c in schema.constructors) foreach (var c in schema.Constructors)
{ {
var list = schema.constructors.Where(x => x.type == c.type); var list = schema.Constructors.Where(x => x.Type == c.Type);
if (list.Count() > 1) if (list.Count() > 1)
{ {
string path = (GetNameSpace(c.type).Replace("TeleSharp.TL", "TL\\").Replace(".", "") + "\\" + GetNameofClass(c.type, true) + ".cs").Replace("\\\\", "\\"); string path = (GetNameSpace(c.Type).Replace("TeleSharp.TL", "TL\\").Replace(".", "") + "\\" + GetNameofClass(c.Type, true) + ".cs").Replace("\\\\", "\\");
FileStream classFile = MakeFile(path); FileStream classFile = MakeFile(path);
using (StreamWriter writer = new StreamWriter(classFile)) using (StreamWriter writer = new StreamWriter(classFile))
{ {
string nspace = (GetNameSpace(c.type).Replace("TeleSharp.TL", "TL\\").Replace(".", "")).Replace("\\\\", "\\").Replace("\\", "."); string nspace = (GetNameSpace(c.Type).Replace("TeleSharp.TL", "TL\\").Replace(".", "")).Replace("\\\\", "\\").Replace("\\", ".");
if (nspace.EndsWith(".")) if (nspace.EndsWith("."))
nspace = nspace.Remove(nspace.Length - 1, 1); nspace = nspace.Remove(nspace.Length - 1, 1);
string temp = AbsStyle.Replace("/* NAMESPACE */", "TeleSharp." + nspace); string temp = AbsStyle.Replace("/* NAMESPACE */", "TeleSharp." + nspace);
temp = temp.Replace("/* NAME */", GetNameofClass(c.type, true)); temp = temp.Replace("/* NAME */", GetNameofClass(c.Type, true));
writer.Write(temp); writer.Write(temp);
writer.Close(); writer.Close();
classFile.Close(); classFile.Close();
@ -57,47 +53,47 @@ namespace TeleSharp.Generator
} }
else else
{ {
interfacesList.Remove(list.First().type); interfacesList.Remove(list.First().Type);
list.First().type = "himself"; list.First().Type = "himself";
} }
} }
foreach (var c in schema.constructors) foreach (var c in schema.Constructors)
{ {
string path = (GetNameSpace(c.predicate).Replace("TeleSharp.TL", "TL\\").Replace(".", "") + "\\" + GetNameofClass(c.predicate, false) + ".cs").Replace("\\\\", "\\"); string path = (GetNameSpace(c.Predicate).Replace("TeleSharp.TL", "TL\\").Replace(".", "") + "\\" + GetNameofClass(c.Predicate, false) + ".cs").Replace("\\\\", "\\");
FileStream classFile = MakeFile(path); FileStream classFile = MakeFile(path);
using (StreamWriter writer = new StreamWriter(classFile)) using (StreamWriter writer = new StreamWriter(classFile))
{ {
#region About Class #region About Class
string nspace = (GetNameSpace(c.predicate).Replace("TeleSharp.TL", "TL\\").Replace(".", "")).Replace("\\\\", "\\").Replace("\\", "."); string nspace = (GetNameSpace(c.Predicate).Replace("TeleSharp.TL", "TL\\").Replace(".", "")).Replace("\\\\", "\\").Replace("\\", ".");
if (nspace.EndsWith(".")) if (nspace.EndsWith("."))
nspace = nspace.Remove(nspace.Length - 1, 1); nspace = nspace.Remove(nspace.Length - 1, 1);
string temp = NormalStyle.Replace("/* NAMESPACE */", "TeleSharp." + nspace); string temp = NormalStyle.Replace("/* NAMESPACE */", "TeleSharp." + nspace);
temp = (c.type == "himself") ? temp.Replace("/* PARENT */", "TLObject") : temp.Replace("/* PARENT */", GetNameofClass(c.type, true)); temp = (c.Type == "himself") ? temp.Replace("/* PARENT */", "TLObject") : temp.Replace("/* PARENT */", GetNameofClass(c.Type, true));
temp = temp.Replace("/*Constructor*/", c.id.ToString()); temp = temp.Replace("/*Constructor*/", c.Id.ToString());
temp = temp.Replace("/* NAME */", GetNameofClass(c.predicate, false)); temp = temp.Replace("/* NAME */", GetNameofClass(c.Predicate, false));
#endregion #endregion
#region Fields #region Fields
string fields = ""; string fields = "";
foreach (var tmp in c.Params) foreach (var tmp in c.Params)
{ {
fields += $" public {CheckForFlagBase(tmp.type, GetTypeName(tmp.type))} {CheckForKeywordAndPascalCase(tmp.name)} " + "{get;set;}" + Environment.NewLine; fields += $" public {CheckForFlagBase(tmp.Type, GetTypeName(tmp.Type))} {CheckForKeywordAndPascalCase(tmp.Name)} " + "{get;set;}" + Environment.NewLine;
} }
temp = temp.Replace("/* PARAMS */", fields); temp = temp.Replace("/* PARAMS */", fields);
#endregion #endregion
#region ComputeFlagFunc #region ComputeFlagFunc
if (!c.Params.Any(x => x.name == "Flags")) temp = temp.Replace("/* COMPUTE */", ""); if (!c.Params.Any(x => x.Name == "Flags")) temp = temp.Replace("/* COMPUTE */", "");
else else
{ {
var compute = "Flags = 0;" + Environment.NewLine; var compute = "Flags = 0;" + Environment.NewLine;
foreach (var param in c.Params.Where(x => IsFlagBase(x.type))) foreach (var param in c.Params.Where(x => IsFlagBase(x.Type)))
{ {
if (IsTrueFlag(param.type)) if (IsTrueFlag(param.Type))
{ {
compute += $"Flags = {CheckForKeywordAndPascalCase(param.name)} ? (Flags | {GetBitMask(param.type)}) : (Flags & ~{GetBitMask(param.type)});" + Environment.NewLine; compute += $"Flags = {CheckForKeywordAndPascalCase(param.Name)} ? (Flags | {GetBitMask(param.Type)}) : (Flags & ~{GetBitMask(param.Type)});" + Environment.NewLine;
} }
else else
{ {
compute += $"Flags = {CheckForKeywordAndPascalCase(param.name)} != null ? (Flags | {GetBitMask(param.type)}) : (Flags & ~{GetBitMask(param.type)});" + Environment.NewLine; compute += $"Flags = {CheckForKeywordAndPascalCase(param.Name)} != null ? (Flags | {GetBitMask(param.Type)}) : (Flags & ~{GetBitMask(param.Type)});" + Environment.NewLine;
} }
} }
temp = temp.Replace("/* COMPUTE */", compute); temp = temp.Replace("/* COMPUTE */", compute);
@ -106,8 +102,8 @@ namespace TeleSharp.Generator
#region SerializeFunc #region SerializeFunc
var serialize = ""; var serialize = "";
if (c.Params.Any(x => x.name == "Flags")) serialize += "ComputeFlags();" + Environment.NewLine + "bw.Write(Flags);" + Environment.NewLine; if (c.Params.Any(x => x.Name == "Flags")) serialize += "ComputeFlags();" + Environment.NewLine + "bw.Write(Flags);" + Environment.NewLine;
foreach (var p in c.Params.Where(x => x.name != "Flags")) foreach (var p in c.Params.Where(x => x.Name != "Flags"))
{ {
serialize += WriteWriteCode(p) + Environment.NewLine; serialize += WriteWriteCode(p) + Environment.NewLine;
} }
@ -127,44 +123,44 @@ namespace TeleSharp.Generator
classFile.Close(); classFile.Close();
} }
} }
foreach (var c in schema.methods) foreach (var c in schema.Methods)
{ {
string path = (GetNameSpace(c.method).Replace("TeleSharp.TL", "TL\\").Replace(".", "") + "\\" + GetNameofClass(c.method, false, true) + ".cs").Replace("\\\\", "\\"); string path = (GetNameSpace(c.Method).Replace("TeleSharp.TL", "TL\\").Replace(".", "") + "\\" + GetNameofClass(c.Method, false, true) + ".cs").Replace("\\\\", "\\");
FileStream classFile = MakeFile(path); FileStream classFile = MakeFile(path);
using (StreamWriter writer = new StreamWriter(classFile)) using (StreamWriter writer = new StreamWriter(classFile))
{ {
#region About Class #region About Class
string nspace = (GetNameSpace(c.method).Replace("TeleSharp.TL", "TL\\").Replace(".", "")).Replace("\\\\", "\\").Replace("\\", "."); string nspace = (GetNameSpace(c.Method).Replace("TeleSharp.TL", "TL\\").Replace(".", "")).Replace("\\\\", "\\").Replace("\\", ".");
if (nspace.EndsWith(".")) if (nspace.EndsWith("."))
nspace = nspace.Remove(nspace.Length - 1, 1); nspace = nspace.Remove(nspace.Length - 1, 1);
string temp = MethodStyle.Replace("/* NAMESPACE */", "TeleSharp." + nspace); string temp = MethodStyle.Replace("/* NAMESPACE */", "TeleSharp." + nspace);
temp = temp.Replace("/* PARENT */", "TLMethod"); temp = temp.Replace("/* PARENT */", "TLMethod");
temp = temp.Replace("/*Constructor*/", c.id.ToString()); temp = temp.Replace("/*Constructor*/", c.Id.ToString());
temp = temp.Replace("/* NAME */", GetNameofClass(c.method, false, true)); temp = temp.Replace("/* NAME */", GetNameofClass(c.Method, false, true));
#endregion #endregion
#region Fields #region Fields
string fields = ""; string fields = "";
foreach (var tmp in c.Params) foreach (var tmp in c.Params)
{ {
fields += $" public {CheckForFlagBase(tmp.type, GetTypeName(tmp.type))} {CheckForKeywordAndPascalCase(tmp.name)} " + "{get;set;}" + Environment.NewLine; fields += $" public {CheckForFlagBase(tmp.Type, GetTypeName(tmp.Type))} {CheckForKeywordAndPascalCase(tmp.Name)} " + "{get;set;}" + Environment.NewLine;
} }
fields += $" public {CheckForFlagBase(c.type, GetTypeName(c.type))} Response" + "{ get; set;}" + Environment.NewLine; fields += $" public {CheckForFlagBase(c.Type, GetTypeName(c.Type))} Response" + "{ get; set;}" + Environment.NewLine;
temp = temp.Replace("/* PARAMS */", fields); temp = temp.Replace("/* PARAMS */", fields);
#endregion #endregion
#region ComputeFlagFunc #region ComputeFlagFunc
if (!c.Params.Any(x => x.name == "Flags")) temp = temp.Replace("/* COMPUTE */", ""); if (!c.Params.Any(x => x.Name == "Flags")) temp = temp.Replace("/* COMPUTE */", "");
else else
{ {
var compute = "Flags = 0;" + Environment.NewLine; var compute = "Flags = 0;" + Environment.NewLine;
foreach (var param in c.Params.Where(x => IsFlagBase(x.type))) foreach (var param in c.Params.Where(x => IsFlagBase(x.Type)))
{ {
if (IsTrueFlag(param.type)) if (IsTrueFlag(param.Type))
{ {
compute += $"Flags = {CheckForKeywordAndPascalCase(param.name)} ? (Flags | {GetBitMask(param.type)}) : (Flags & ~{GetBitMask(param.type)});" + Environment.NewLine; compute += $"Flags = {CheckForKeywordAndPascalCase(param.Name)} ? (Flags | {GetBitMask(param.Type)}) : (Flags & ~{GetBitMask(param.Type)});" + Environment.NewLine;
} }
else else
{ {
compute += $"Flags = {CheckForKeywordAndPascalCase(param.name)} != null ? (Flags | {GetBitMask(param.type)}) : (Flags & ~{GetBitMask(param.type)});" + Environment.NewLine; compute += $"Flags = {CheckForKeywordAndPascalCase(param.Name)} != null ? (Flags | {GetBitMask(param.Type)}) : (Flags & ~{GetBitMask(param.Type)});" + Environment.NewLine;
} }
} }
temp = temp.Replace("/* COMPUTE */", compute); temp = temp.Replace("/* COMPUTE */", compute);
@ -173,8 +169,8 @@ namespace TeleSharp.Generator
#region SerializeFunc #region SerializeFunc
var serialize = ""; var serialize = "";
if (c.Params.Any(x => x.name == "Flags")) serialize += "ComputeFlags();" + Environment.NewLine + "bw.Write(Flags);" + Environment.NewLine; if (c.Params.Any(x => x.Name == "Flags")) serialize += "ComputeFlags();" + Environment.NewLine + "bw.Write(Flags);" + Environment.NewLine;
foreach (var p in c.Params.Where(x => x.name != "Flags")) foreach (var p in c.Params.Where(x => x.Name != "Flags"))
{ {
serialize += WriteWriteCode(p) + Environment.NewLine; serialize += WriteWriteCode(p) + Environment.NewLine;
} }
@ -191,7 +187,7 @@ namespace TeleSharp.Generator
#endregion #endregion
#region DeSerializeRespFunc #region DeSerializeRespFunc
var deserializeResp = ""; var deserializeResp = "";
Param p2 = new Param() { name = "Response", type = c.type }; TlParam p2 = new TlParam() { Name = "Response", Type = c.Type };
deserializeResp += WriteReadCode(p2) + Environment.NewLine; deserializeResp += WriteReadCode(p2) + Environment.NewLine;
temp = temp.Replace("/* DESERIALIZEResp */", deserializeResp); temp = temp.Replace("/* DESERIALIZEResp */", deserializeResp);
#endregion #endregion
@ -203,7 +199,7 @@ namespace TeleSharp.Generator
} }
public static string FormatName(string input) public static string FormatName(string input)
{ {
if (String.IsNullOrEmpty(input)) if (string.IsNullOrEmpty(input))
throw new ArgumentException("ARGH!"); throw new ArgumentException("ARGH!");
if (input.IndexOf('.') != -1) if (input.IndexOf('.') != -1)
{ {
@ -346,79 +342,79 @@ namespace TeleSharp.Generator
else else
return src; return src;
} }
public static string WriteWriteCode(Param p, bool flag = false) public static string WriteWriteCode(TlParam p, bool flag = false)
{ {
switch (p.type.ToLower()) switch (p.Type.ToLower())
{ {
case "#": case "#":
case "int": case "int":
return flag ? $"bw.Write({CheckForKeywordAndPascalCase(p.name)}.Value);" : $"bw.Write({CheckForKeywordAndPascalCase(p.name)});"; return flag ? $"bw.Write({CheckForKeywordAndPascalCase(p.Name)}.Value);" : $"bw.Write({CheckForKeywordAndPascalCase(p.Name)});";
case "long": case "long":
return flag ? $"bw.Write({CheckForKeywordAndPascalCase(p.name)}.Value);" : $"bw.Write({CheckForKeywordAndPascalCase(p.name)});"; return flag ? $"bw.Write({CheckForKeywordAndPascalCase(p.Name)}.Value);" : $"bw.Write({CheckForKeywordAndPascalCase(p.Name)});";
case "string": case "string":
return $"StringUtil.Serialize({CheckForKeywordAndPascalCase(p.name)},bw);"; return $"StringUtil.Serialize({CheckForKeywordAndPascalCase(p.Name)},bw);";
case "bool": case "bool":
return flag ? $"BoolUtil.Serialize({CheckForKeywordAndPascalCase(p.name)}.Value,bw);" : $"BoolUtil.Serialize({CheckForKeywordAndPascalCase(p.name)},bw);"; return flag ? $"BoolUtil.Serialize({CheckForKeywordAndPascalCase(p.Name)}.Value,bw);" : $"BoolUtil.Serialize({CheckForKeywordAndPascalCase(p.Name)},bw);";
case "true": case "true":
return $"BoolUtil.Serialize({CheckForKeywordAndPascalCase(p.name)},bw);"; return $"BoolUtil.Serialize({CheckForKeywordAndPascalCase(p.Name)},bw);";
case "bytes": case "bytes":
return $"BytesUtil.Serialize({CheckForKeywordAndPascalCase(p.name)},bw);"; return $"BytesUtil.Serialize({CheckForKeywordAndPascalCase(p.Name)},bw);";
case "double": case "double":
return flag ? $"bw.Write({CheckForKeywordAndPascalCase(p.name)}.Value);" : $"bw.Write({CheckForKeywordAndPascalCase(p.name)});"; return flag ? $"bw.Write({CheckForKeywordAndPascalCase(p.Name)}.Value);" : $"bw.Write({CheckForKeywordAndPascalCase(p.Name)});";
default: default:
if (!IsFlagBase(p.type)) if (!IsFlagBase(p.Type))
return $"ObjectUtils.SerializeObject({CheckForKeywordAndPascalCase(p.name)},bw);"; return $"ObjectUtils.SerializeObject({CheckForKeywordAndPascalCase(p.Name)},bw);";
else else
{ {
if (IsTrueFlag(p.type)) if (IsTrueFlag(p.Type))
return $""; return $"";
else else
{ {
Param p2 = new Param() { name = p.name, type = p.type.Split('?')[1] }; TlParam p2 = new TlParam() { Name = p.Name, Type = p.Type.Split('?')[1] };
return $"if ((Flags & {GetBitMask(p.type).ToString()}) != 0)" + Environment.NewLine + return $"if ((Flags & {GetBitMask(p.Type).ToString()}) != 0)" + Environment.NewLine +
WriteWriteCode(p2, true); WriteWriteCode(p2, true);
} }
} }
} }
} }
public static string WriteReadCode(Param p) public static string WriteReadCode(TlParam p)
{ {
switch (p.type.ToLower()) switch (p.Type.ToLower())
{ {
case "#": case "#":
case "int": case "int":
return $"{CheckForKeywordAndPascalCase(p.name)} = br.ReadInt32();"; return $"{CheckForKeywordAndPascalCase(p.Name)} = br.ReadInt32();";
case "long": case "long":
return $"{CheckForKeywordAndPascalCase(p.name)} = br.ReadInt64();"; return $"{CheckForKeywordAndPascalCase(p.Name)} = br.ReadInt64();";
case "string": case "string":
return $"{CheckForKeywordAndPascalCase(p.name)} = StringUtil.Deserialize(br);"; return $"{CheckForKeywordAndPascalCase(p.Name)} = StringUtil.Deserialize(br);";
case "bool": case "bool":
case "true": case "true":
return $"{CheckForKeywordAndPascalCase(p.name)} = BoolUtil.Deserialize(br);"; return $"{CheckForKeywordAndPascalCase(p.Name)} = BoolUtil.Deserialize(br);";
case "bytes": case "bytes":
return $"{CheckForKeywordAndPascalCase(p.name)} = BytesUtil.Deserialize(br);"; return $"{CheckForKeywordAndPascalCase(p.Name)} = BytesUtil.Deserialize(br);";
case "double": case "double":
return $"{CheckForKeywordAndPascalCase(p.name)} = br.ReadDouble();"; return $"{CheckForKeywordAndPascalCase(p.Name)} = br.ReadDouble();";
default: default:
if (!IsFlagBase(p.type)) if (!IsFlagBase(p.Type))
{ {
if (p.type.ToLower().Contains("vector")) if (p.Type.ToLower().Contains("vector"))
{ {
return $"{CheckForKeywordAndPascalCase(p.name)} = ({GetTypeName(p.type)})ObjectUtils.DeserializeVector<{GetTypeName(p.type).Replace("TLVector<", "").Replace(">", "")}>(br);"; return $"{CheckForKeywordAndPascalCase(p.Name)} = ({GetTypeName(p.Type)})ObjectUtils.DeserializeVector<{GetTypeName(p.Type).Replace("TLVector<", "").Replace(">", "")}>(br);";
} }
else return $"{CheckForKeywordAndPascalCase(p.name)} = ({GetTypeName(p.type)})ObjectUtils.DeserializeObject(br);"; else return $"{CheckForKeywordAndPascalCase(p.Name)} = ({GetTypeName(p.Type)})ObjectUtils.DeserializeObject(br);";
} }
else else
{ {
if (IsTrueFlag(p.type)) if (IsTrueFlag(p.Type))
return $"{CheckForKeywordAndPascalCase(p.name)} = (Flags & {GetBitMask(p.type).ToString()}) != 0;"; return $"{CheckForKeywordAndPascalCase(p.Name)} = (Flags & {GetBitMask(p.Type).ToString()}) != 0;";
else else
{ {
Param p2 = new Param() { name = p.name, type = p.type.Split('?')[1] }; TlParam p2 = new TlParam() { Name = p.Name, Type = p.Type.Split('?')[1] };
return $"if ((Flags & {GetBitMask(p.type).ToString()}) != 0)" + Environment.NewLine + return $"if ((Flags & {GetBitMask(p.Type).ToString()}) != 0)" + Environment.NewLine +
WriteReadCode(p2) + Environment.NewLine + WriteReadCode(p2) + Environment.NewLine +
"else" + Environment.NewLine + "else" + Environment.NewLine +
$"{CheckForKeywordAndPascalCase(p.name)} = null;" + Environment.NewLine; $"{CheckForKeywordAndPascalCase(p.Name)} = null;" + Environment.NewLine;
} }
} }
} }

6
TeleSharp.Generator/TeleSharp.Generator.csproj
View file

@ -47,9 +47,12 @@
<Reference Include="System.Xml" /> <Reference Include="System.Xml" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Models.cs" /> <Compile Include="Models\TlMethod.cs" />
<Compile Include="Program.cs" /> <Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" /> <Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Models\TlConstructor.cs" />
<Compile Include="Models\TlParam.cs" />
<Compile Include="Models\TlSchema.cs" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="App.config" /> <None Include="App.config" />
@ -69,6 +72,7 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory> <CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it. <!-- 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. Other similar extension points exist, see Microsoft.Common.targets.