Skip to content

Commit e865a01

Browse files
author
Elad Zelingher
committed
Add constructor to WebSocket4NetConnection that receives a WebSocket.
1 parent 47dbeb3 commit e865a01

File tree

14 files changed

+46
-2
lines changed

14 files changed

+46
-2
lines changed

‎src/Samples/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
<Reference Include="Microsoft.CSharp" />
5858
<Reference Include="System.Data" />
5959
<Reference Include="System.Xml" />
60+
<Reference Include="WebSocket4Net, Version=0.10.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\packages\WebSocket4Net.0.10\lib\net45\WebSocket4Net.dll</HintPath>
63+
</Reference>
6064
</ItemGroup>
6165
<ItemGroup>
6266
<Compile Include="Program.cs" />

‎src/Samples/WampSharp.CraClientSample/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net45" />
55
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
66
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net45" />
7+
<package id="WebSocket4Net" version="0.10" targetFramework="net45" />
78
</packages>

‎src/Samples/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<Reference Include="Microsoft.CSharp" />
4949
<Reference Include="System.Data" />
5050
<Reference Include="System.Xml" />
51+
<Reference Include="WebSocket4Net, Version=0.10.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>..\..\packages\WebSocket4Net.0.10\lib\net45\WebSocket4Net.dll</HintPath>
54+
</Reference>
5155
</ItemGroup>
5256
<ItemGroup>
5357
<Compile Include="Program.cs" />

‎src/Samples/WampSharp.RpcClientSample/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<packages>
33
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net45" />
44
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net45" />
5+
<package id="WebSocket4Net" version="0.10" targetFramework="net45" />
56
</packages>

‎src/WampSharp.Default/WampChannelFactoryExtensions.cs‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using WampSharp.Core.Serialization;
33
using WampSharp.Newtonsoft;
44
using WampSharp.WebSocket4Net;
5+
using WebSocket4Net;
56

67
namespace WampSharp
78
{
@@ -12,9 +13,16 @@ public static IWampChannel<JToken> CreateChannel(this IWampChannelFactory<JToken
1213
return factory.CreateChannel(address, new JTokenMessageParser());
1314
}
1415

15-
public static IWampChannel<TMessage> CreateChannel<TMessage>(this IWampChannelFactory<TMessage> factory, string address, IWampMessageParser<TMessage> parser)
16+
public static IWampChannel<TMessage> CreateChannel<TMessage>(this IWampChannelFactory<TMessage> factory,
17+
string address, IWampMessageParser<TMessage> parser)
1618
{
1719
return factory.CreateChannel(new WebSocket4NetConnection<TMessage>(address, parser));
1820
}
21+
22+
public static IWampChannel<JToken> CreateChannel(this IWampChannelFactory<JToken> factory, string address,
23+
WebSocket socket)
24+
{
25+
return factory.CreateChannel(new WebSocket4NetConnection<JToken>(socket, new JTokenMessageParser()));
26+
}
1927
}
2028
}

‎src/WampSharp.Default/WebSocket4Net/WebSocket4NetConnection.cs‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,16 @@ public class WebSocket4NetConnection<TMessage> : IControlledWampConnection<TMess
2222
#endregion
2323

2424
public WebSocket4NetConnection(string serverAddress,
25+
IWampMessageParser<TMessage> messageFormatter) :
26+
this(new WebSocket(serverAddress, "wamp"), messageFormatter)
27+
{
28+
}
29+
30+
public WebSocket4NetConnection(WebSocket webSocket,
2531
IWampMessageParser<TMessage> messageFormatter)
2632
{
2733
mMessageFormatter = messageFormatter;
28-
mWebSocket = new WebSocket(serverAddress, "wamp");
34+
mWebSocket = webSocket;
2935
mWebSocket.Opened += WebSocketOnOpened;
3036
mWebSocket.Closed += WebSocketOnClosed;
3137
mWebSocket.MessageReceived += WebSocketOnMessageReceived;

‎src/WampSharpFw4/Samples/WampSharp.CraClientSample/WampSharp.CraClientSample.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@
5757
<Reference Include="Microsoft.CSharp" />
5858
<Reference Include="System.Data" />
5959
<Reference Include="System.Xml" />
60+
<Reference Include="WebSocket4Net, Version=0.10.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
61+
<SpecificVersion>False</SpecificVersion>
62+
<HintPath>..\..\packages\WebSocket4Net.0.10\lib\net40\WebSocket4Net.dll</HintPath>
63+
</Reference>
6064
</ItemGroup>
6165
<ItemGroup>
6266
<Compile Include="..\..\..\Samples\WampSharp.CraClientSample\Program.cs">

‎src/WampSharpFw4/Samples/WampSharp.CraClientSample/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<package id="Rx-Core" version="2.1.30214.0" targetFramework="net40" />
55
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net40" />
66
<package id="Rx-Linq" version="2.1.30214.0" targetFramework="net40" />
7+
<package id="WebSocket4Net" version="0.10" targetFramework="net40" />
78
</packages>

‎src/WampSharpFw4/Samples/WampSharp.RpcClientSample/WampSharp.RpcClientSample.csproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@
4848
<Reference Include="Microsoft.CSharp" />
4949
<Reference Include="System.Data" />
5050
<Reference Include="System.Xml" />
51+
<Reference Include="WebSocket4Net, Version=0.10.0.0, Culture=neutral, PublicKeyToken=eb4e154b696bf72a, processorArchitecture=MSIL">
52+
<SpecificVersion>False</SpecificVersion>
53+
<HintPath>..\..\packages\WebSocket4Net.0.10\lib\net40\WebSocket4Net.dll</HintPath>
54+
</Reference>
5155
</ItemGroup>
5256
<ItemGroup>
5357
<Compile Include="..\..\..\Samples\WampSharp.RpcClientSample\Program.cs">

‎src/WampSharpFw4/Samples/WampSharp.RpcClientSample/packages.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,5 @@
22
<packages>
33
<package id="Newtonsoft.Json" version="5.0.6" targetFramework="net40" />
44
<package id="Rx-Interfaces" version="2.1.30214.0" targetFramework="net40" />
5+
<package id="WebSocket4Net" version="0.10" targetFramework="net40" />
56
</packages>

0 commit comments

Comments
 (0)