adjust tcp listener to work with nodejs server (subscribing doesn't work yet)
This commit is contained in:
parent
8f3951cab5
commit
ee3d42d6f3
|
@ -17,7 +17,6 @@
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Xml;
|
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Net.Sockets;
|
using System.Net.Sockets;
|
||||||
|
@ -56,33 +55,6 @@ namespace SparkleLib {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void SendCommand(TcpMessagePacket pkt)
|
|
||||||
{
|
|
||||||
XmlSerializer serializer = new XmlSerializer(typeof(TcpMessagePacket));
|
|
||||||
|
|
||||||
XmlSerializerNamespaces emptyNamespace = new XmlSerializerNamespaces();
|
|
||||||
emptyNamespace.Add(String.Empty, String.Empty);
|
|
||||||
|
|
||||||
StringBuilder output = new StringBuilder();
|
|
||||||
|
|
||||||
XmlWriter writer = XmlWriter.Create(output,
|
|
||||||
new XmlWriterSettings { OmitXmlDeclaration = true });
|
|
||||||
serializer.Serialize(writer, pkt, emptyNamespace);
|
|
||||||
|
|
||||||
lock (this.mutex) {
|
|
||||||
this.socket.Send(Encoding.UTF8.GetBytes(output.ToString()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private TcpMessagePacket ReceiveCommand(byte[] input)
|
|
||||||
{
|
|
||||||
XmlSerializer serializer = new XmlSerializer(typeof(TcpMessagePacket));
|
|
||||||
|
|
||||||
MemoryStream ms = new MemoryStream(input);
|
|
||||||
|
|
||||||
TcpMessagePacket ret = (TcpMessagePacket) serializer.Deserialize(ms);
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Starts a new thread and listens to the channel
|
// Starts a new thread and listens to the channel
|
||||||
public override void Connect ()
|
public override void Connect ()
|
||||||
|
@ -101,12 +73,13 @@ namespace SparkleLib {
|
||||||
lock (this.mutex) {
|
lock (this.mutex) {
|
||||||
base.is_connecting = false;
|
base.is_connecting = false;
|
||||||
this.connected = true;
|
this.connected = true;
|
||||||
|
|
||||||
|
foreach (string channel in base.channels) {
|
||||||
|
SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
|
||||||
|
this.socket.Send (Encoding.UTF8.GetBytes ("subscribe " + channel));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach (string channel in base.channels) {
|
|
||||||
SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
|
|
||||||
this.SendCommand(new TcpMessagePacket(channel, "register"));
|
|
||||||
}
|
|
||||||
|
|
||||||
byte [] bytes = new byte [4096];
|
byte [] bytes = new byte [4096];
|
||||||
|
|
||||||
|
@ -114,9 +87,11 @@ namespace SparkleLib {
|
||||||
while (this.socket.Connected) {
|
while (this.socket.Connected) {
|
||||||
int bytes_read = this.socket.Receive (bytes);
|
int bytes_read = this.socket.Receive (bytes);
|
||||||
if (bytes_read > 0) {
|
if (bytes_read > 0) {
|
||||||
TcpMessagePacket message = this.ReceiveCommand(bytes);
|
string received = Encoding.UTF8.GetString (bytes);
|
||||||
SparkleHelpers.DebugInfo ("ListenerTcp", "Update for folder " + message.repo);
|
string folder_identifier = received.Substring (0, received.IndexOf ("!"));
|
||||||
OnAnnouncement (new SparkleAnnouncement (message.repo, message.readable));
|
string message = received.Substring (received.IndexOf ("!") + 1);
|
||||||
|
|
||||||
|
OnAnnouncement (new SparkleAnnouncement (folder_identifier, message));
|
||||||
} else {
|
} else {
|
||||||
SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket");
|
SparkleHelpers.DebugInfo ("ListenerTcp", "Error on socket");
|
||||||
lock (this.mutex) {
|
lock (this.mutex) {
|
||||||
|
@ -148,7 +123,11 @@ namespace SparkleLib {
|
||||||
if (IsConnected) {
|
if (IsConnected) {
|
||||||
SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
|
SparkleHelpers.DebugInfo ("ListenerTcp", "Subscribing to channel " + channel);
|
||||||
|
|
||||||
this.SendCommand(new TcpMessagePacket(channel, "register"));
|
string to_send = "subscribe " + folder_identifier;
|
||||||
|
|
||||||
|
lock (this.mutex) {
|
||||||
|
this.socket.Send (Encoding.UTF8.GetBytes (to_send));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -156,10 +135,11 @@ namespace SparkleLib {
|
||||||
|
|
||||||
public override void Announce (SparkleAnnouncement announcement)
|
public override void Announce (SparkleAnnouncement announcement)
|
||||||
{
|
{
|
||||||
this.SendCommand(new TcpMessagePacket(announcement.FolderIdentifier, "new_version"));
|
string message = "announce " + announcement.FolderIdentifier;
|
||||||
|
|
||||||
// Also announce to ourselves for debugging purposes
|
lock (this.mutex) {
|
||||||
// base.OnAnnouncement (announcement);
|
this.socket.Send (Encoding.UTF8.GetBytes (message));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -170,22 +150,4 @@ namespace SparkleLib {
|
||||||
base.Dispose ();
|
base.Dispose ();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Serializable,XmlRoot("packet")]
|
|
||||||
public class TcpMessagePacket
|
|
||||||
{
|
|
||||||
public string repo { get; set; }
|
|
||||||
public string command { get; set; }
|
|
||||||
public string readable { get; set; }
|
|
||||||
|
|
||||||
public TcpMessagePacket(string repo, string command) {
|
|
||||||
this.repo = repo;
|
|
||||||
this.command = command;
|
|
||||||
}
|
|
||||||
|
|
||||||
public TcpMessagePacket() {
|
|
||||||
this.repo = "none";
|
|
||||||
this.command = "invalid";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue