Skip to content

Commit

Permalink
Merge branch 'major_data_refactor'
Browse files Browse the repository at this point in the history
  • Loading branch information
@soshimozi
soshimozi committed Nov 1, 2011
2 parents 066f958 + c07420e commit e839eac
Show file tree
Hide file tree
Showing 165 changed files with 1,476 additions and 15,590 deletions.
16 changes: 10 additions & 6 deletions ConsoleApplication1/ConsoleApplication1.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,17 @@
<None Include="app.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SocketService.Client.API\SocketService.Client.API.csproj">
<Project>{5C1838A8-CD45-450F-9065-1ED7CF6557C5}</Project>
<Name>SocketService.Client.API</Name>
</ProjectReference>
<ProjectReference Include="..\SocketService.Framework.Client\SocketService.Framework.Client.csproj">
<ProjectReference Include="..\SocketService.Client.Core\SocketService.Client.Core.csproj">
<Project>{93FD4F32-5214-40E3-8E36-5B4E354F10C4}</Project>
<Name>SocketService.Framework.Client</Name>
<Name>SocketService.Client.Core</Name>
</ProjectReference>
<ProjectReference Include="..\SocketService.Event\SocketService.Event.csproj">
<Project>{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}</Project>
<Name>SocketService.Event</Name>
</ProjectReference>
<ProjectReference Include="..\SocketService.Shared\SocketService.Shared.csproj">
<Project>{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}</Project>
<Name>SocketService.Shared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Expand Down
146 changes: 81 additions & 65 deletions ConsoleApplication1/Program.cs
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,60 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Net.Sockets;
using System.Threading;
using System.Security.Cryptography;
using System.Collections;
using System.IO;
using System.Runtime.Serialization.Formatters.Binary;
using System.IO.Compression;
using SocketService.Client.API;
using SocketService.Framework.SharedObjects;
using SocketService.Framework.Request;
using SocketService.Client.API.Event;
using SocketService.Client.API.Data;
using SocketService.Client.Core;
using SocketService.Client.Core.Request;
using SocketService.Event;
using SocketService.Shared.Response;

namespace ConsoleApplication1
{
class Program
{
ClientEngine _engine = new ClientEngine();
Server _server = new Server();
readonly ClientEngine _engine = new ClientEngine();
readonly Server _server = new Server();

private long _loginState = 0;
private AutoResetEvent _loginReceievedEvent = new AutoResetEvent(false);
private AutoResetEvent _connectedReceivedEvent = new AutoResetEvent(false);
private long _loginState;
private readonly AutoResetEvent _loginReceievedEvent = new AutoResetEvent(false);
private readonly AutoResetEvent _connectedReceivedEvent = new AutoResetEvent(false);

private bool _connectionSuccessful = false;
private bool _connectionSuccessful;

private string _userName = string.Empty;

static void Main(string[] args)
{
Program p = new Program();
var p = new Program();
p.Run(args);
}

public void Run(string[] args)
{

_engine.ServerMessageRecieved += new EventHandler<ServerMessageReceivedArgs>(engine_ServerMessageRecieved);
_engine.LoginResponseReceived += new EventHandler<LoginResponseEventArgs>(engine_LoginResponseReceived);
_engine.GetRoomVariableResponseRecieved += new EventHandler<GetRoomVariableResponseArgs>(engine_GetRoomVariableResponseRecieved);
_engine.JoinRoom += new EventHandler<JoinRoomEventArgs>(engine_JoinRoom);
_engine.ServerMessageRecieved +=
(o, receivedArgs) => {
if (receivedArgs != null)
EngineServerMessageRecieved(receivedArgs);
};

_engine.LoginResponseReceived +=
(o, eventArgs) => {
if (eventArgs != null)
EngineLoginResponseReceived(eventArgs);
};

_engine.GetRoomVariableResponseRecieved +=
(o, responseArgs) => {
if (responseArgs != null)
engine_GetRoomVariableResponseRecieved(responseArgs);
};

_engine.JoinRoom += (o, eventArgs) => { if (eventArgs != null) EngineJoinRoom(eventArgs); };

_server.ConnectionResponse +=
(o, eventArgs) => {
if (eventArgs != null)
ServerConnectionResponse(eventArgs);
};

_server.ConnectionResponse += new EventHandler<ConnectionEventArgs>(server_ConnectionResponse);
_engine.AddServer(_server);

Console.WriteLine("Connecting to server...");
Expand All @@ -54,14 +64,12 @@ public void Run(string[] args)
_server.Connect("127.0.0.1", 4000);
_connectedReceivedEvent.WaitOne(-1);

if (!_connectionSuccessful)
{
Console.WriteLine("Could not connect to server. Retrying in 5 seconds.");
Thread.Sleep(5000);
}
if (_connectionSuccessful) continue;
Console.WriteLine("Could not connect to server. Retrying in 5 seconds.");
Thread.Sleep(5000);
}

bool success = false;
bool success;
do
{
Console.Write("Enter your user name: ");
Expand Down Expand Up @@ -127,23 +135,28 @@ public void Run(string[] args)
_engine.StopEngine();
}

void server_ConnectionResponse(object sender, ConnectionEventArgs e)
void ServerConnectionResponse(ConnectionEventArgs e = null)
{
if (e == null) throw new ArgumentNullException("e");
_connectionSuccessful = e.IsSuccessful;
_connectedReceivedEvent.Set();
}

private void Login(string userName)
{
LoginRequest request = new LoginRequest();
request.LoginName = userName;
var request = new LoginRequest {LoginName = userName};

_server.SendRequestEncrypted(request);
_server.SendRequest(request);
}


private void GetRoomVariableRequest(string room, string varname)
{
if( string.IsNullOrEmpty(room) || string.IsNullOrEmpty(varname))
{

}

//GetRoomVariableRequest grvr = new GetRoomVariableRequest();
//grvr.RoomName = room;
//grvr.VariableName = varname;
Expand All @@ -153,68 +166,71 @@ private void GetRoomVariableRequest(string room, string varname)

private void JoinRoom(string roomName)
{
CreateRoomRequest crr = new CreateRoomRequest();
var crr = new CreateRoomRequest {RoomName = roomName};

crr.RoomName = roomName;
_server.SendRequestEncrypted(crr);
_server.SendRequest(crr);
}

void engine_JoinRoom(object sender, JoinRoomEventArgs e)
void EngineJoinRoom(JoinRoomEventArgs e = null)
{
Room room = _engine.Managers.RoomManager.FindById(e.Event.RoomId);
if (e == null) throw new ArgumentNullException("e");

var room = _engine.Managers.RoomManager.FindById(e.Event.RoomId);
Console.WriteLine("You have entered {0}.", room.Name);
Console.WriteLine("Users:");
foreach (User user in room.Users)
foreach (var user in room.Users)
{
Console.WriteLine("{1}{0}", user.UserName, user.IsMe ? "*" : "");
}
}

private void CreateRoomVariable()
{
//Console.Write("Room: ");
//string room = Console.ReadLine();
////Console.Write("Room: ");
////string room = Console.ReadLine();

Console.WriteLine();
Console.Write("Name: ");
string name = Console.ReadLine();
//Console.WriteLine();
//Console.Write("Name: ");
//string name = Console.ReadLine();

Console.WriteLine();
Console.Write("Value: ");
string stringValue = Console.ReadLine();
//Console.WriteLine();
//Console.Write("Value: ");
//string stringValue = Console.ReadLine();

SharedObject value = new SharedObject();
value.SetElementValue("__default__", stringValue, SharedObjectDataType.String);
//var value = new SharedObject();
//value.SetElementValue("__default__", stringValue, SharedObjectDataType.String);

SharedObject[] valueArray = new SharedObject[1];
SharedObject arrayObject = new SharedObject();
arrayObject.SetElementValue("value", 123, SharedObjectDataType.Integer);
valueArray[0] = arrayObject;
//var valueArray = new SharedObject[1];
//var arrayObject = new SharedObject();
//arrayObject.SetElementValue("value", 123, SharedObjectDataType.Integer);
//valueArray[0] = arrayObject;

value.SetElementValue("arrayTest", valueArray, SharedObjectDataType.BzObjectArray);
//value.SetElementValue("arrayTest", valueArray, SharedObjectDataType.BzObjectArray);

CreateRoomVariableRequest crvr = new CreateRoomVariableRequest();
//long roomId = _engine.Managers.UserManager.Me.Room.RoomId;
//var crvr = new CreateRoomVariableRequest {Name = name, Value = value, RoomId = roomId };
//crvr.RoomId = room; get my room id
crvr.Name = name;
crvr.Value = value;

_server.SendRequestEncrypted(crvr);
//_server.SendRequestEncrypted(crvr);
}

void engine_GetRoomVariableResponseRecieved(object sender, GetRoomVariableResponseArgs e)
void engine_GetRoomVariableResponseRecieved(GetRoomVariableResponseArgs e)
{
if (e == null) throw new ArgumentNullException("e");
}

void engine_LoginResponseReceived(object sender, LoginResponseEventArgs e)
void EngineLoginResponseReceived(LoginResponseEventArgs e = null)
{
int state = e.LoginResponse.Success ? 1 : 0;
if (e == null) throw new ArgumentNullException("e");
var state = e.Response.Success ? 1 : 0;
Interlocked.Exchange(ref _loginState, state);

_loginReceievedEvent.Set();
}

void engine_ServerMessageRecieved(object sender, ServerMessageReceivedArgs e)
void EngineServerMessageRecieved(ServerMessageReceivedArgs e = null)
{
if (e == null) throw new ArgumentNullException("e");
DispatchMessage(e.Message);
}

Expand Down
1 change: 0 additions & 1 deletion ConsoleApplication1/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using System.Reflection;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
Expand Down
62 changes: 37 additions & 25 deletions SocketServer.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,17 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
TraceAndTestImpact.testsettings = TraceAndTestImpact.testsettings
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Framework", "SocketService.Framework\SocketService.Framework.csproj", "{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Framework.Client", "SocketService.Framework.Client\SocketService.Framework.Client.csproj", "{93FD4F32-5214-40E3-8E36-5B4E354F10C4}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Event", "SocketService.Event\SocketService.Event.csproj", "{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Crypto", "SocketService.Framework.Crypto\SocketService.Crypto.csproj", "{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Core", "SocketService.Core\SocketService.Core.csproj", "{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication1", "ConsoleApplication1\ConsoleApplication1.csproj", "{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Shared", "SocketService.Shared\SocketService.Shared.csproj", "{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Client.Core", "SocketService.Client.Core\SocketService.Client.Core.csproj", "{93FD4F32-5214-40E3-8E36-5B4E354F10C4}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Client.API", "SocketService.Client.API\SocketService.Client.API.csproj", "{5C1838A8-CD45-450F-9065-1ED7CF6557C5}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SocketService.Core.Crypto", "SocketService.Core.Crypto\SocketService.Core.Crypto.csproj", "{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}"
EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
Expand All @@ -48,6 +50,26 @@ Global
{3B89D58C-5E4E-4F7A-B256-2DE189684322}.Release|Mixed Platforms.Build.0 = Release|x86
{3B89D58C-5E4E-4F7A-B256-2DE189684322}.Release|x86.ActiveCfg = Release|x86
{3B89D58C-5E4E-4F7A-B256-2DE189684322}.Release|x86.Build.0 = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|Any CPU.ActiveCfg = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|x86.ActiveCfg = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|x86.Build.0 = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|Any CPU.ActiveCfg = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|Mixed Platforms.Build.0 = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|x86.ActiveCfg = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|x86.Build.0 = Release|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Debug|Any CPU.ActiveCfg = Debug|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Debug|Mixed Platforms.Build.0 = Debug|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Debug|x86.ActiveCfg = Debug|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Debug|x86.Build.0 = Debug|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Release|Any CPU.ActiveCfg = Release|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Release|Mixed Platforms.ActiveCfg = Release|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Release|Mixed Platforms.Build.0 = Release|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Release|x86.ActiveCfg = Release|x86
{656E34AF-78EA-4ED0-B67C-B3EA28E002C9}.Release|x86.Build.0 = Release|x86
{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand All @@ -58,6 +80,16 @@ Global
{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{A0CAE0A0-EFA9-452B-98FB-5FE3172FCD1B}.Release|x86.ActiveCfg = Release|Any CPU
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Debug|Any CPU.ActiveCfg = Debug|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Debug|Mixed Platforms.Build.0 = Debug|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Debug|x86.ActiveCfg = Debug|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Debug|x86.Build.0 = Debug|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Release|Any CPU.ActiveCfg = Release|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Release|Mixed Platforms.ActiveCfg = Release|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Release|Mixed Platforms.Build.0 = Release|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Release|x86.ActiveCfg = Release|x86
{7C9013CF-CEC4-4F7D-B80D-C6FA2E243CF1}.Release|x86.Build.0 = Release|x86
{93FD4F32-5214-40E3-8E36-5B4E354F10C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{93FD4F32-5214-40E3-8E36-5B4E354F10C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
{93FD4F32-5214-40E3-8E36-5B4E354F10C4}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
Expand All @@ -78,26 +110,6 @@ Global
{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{4138075A-49CD-4A46-92CB-DFF64A0BB0B6}.Release|x86.ActiveCfg = Release|Any CPU
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|Any CPU.ActiveCfg = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|x86.ActiveCfg = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Debug|x86.Build.0 = Debug|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|Any CPU.ActiveCfg = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|Mixed Platforms.Build.0 = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|x86.ActiveCfg = Release|x86
{0E8F0B30-5C79-47A4-9F35-932CBBEC0139}.Release|x86.Build.0 = Release|x86
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Debug|x86.ActiveCfg = Debug|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Release|Any CPU.Build.0 = Release|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{5C1838A8-CD45-450F-9065-1ED7CF6557C5}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Loading

0 comments on commit e839eac

Please sign in to comment.