ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lua - actually send a comprehensible string over sockets instead of nonsense

This commit is contained in:
zeromus 2021-03-24 02:51:43 -04:00
parent f5d21a8f68
commit b1602dae06
2 changed files with 50 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/BizHawk.Client.Common/Api/SocketServer.cs
View File

@ -67,37 +67,54 @@ namespace BizHawk.Client.Common
_soc = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
_soc.Connect(_remoteEp);
Connected = true;
_soc.ReceiveTimeout = 5;
}
public string GetInfo() => $"{_targetAddr.HostIP}:{_targetAddr.Port}";
public string ReceiveMessage(Encoding encoding = null)
public string ReceiveString(Encoding encoding = null)
{
if (!Connected)
{
Connect();
}
var receivedBytes = new byte[256];
System.IO.MemoryStream ms = new System.IO.MemoryStream();
for(; ;)
{
try
{
int receivedLength = _soc.Receive(receivedBytes, receivedBytes.Length, 0);
if (receivedLength == 0)
break;
ms.Write(receivedBytes, 0, receivedLength);
}
catch
{
ms.SetLength(0);
break;
}
}
var myencoding = encoding ?? Encoding.UTF8;
return myencoding.GetString(ms.ToArray(), 0, (int)ms.Length);
try
{
//build length of string into a string
byte[] oneByte = new byte[1];
StringBuilder sb = new StringBuilder();
for (; ; )
{
int recvd = _soc.Receive(oneByte, 1, 0);
if (oneByte[0] == (byte)' ')
break;
sb.Append((char)oneByte[0]);
}
//receive string of indicated length
int lenStringBytes = int.Parse(sb.ToString());
byte[] buf = new byte[lenStringBytes];
int todo = lenStringBytes;
int at = 0;
for (; ; )
{
int recvd = _soc.Receive(buf, at, todo, SocketFlags.None);
if (recvd == 0)
throw new InvalidOperationException("ReceiveString terminated early");
todo -= recvd;
at += recvd;
if (todo == 0)
break;
}
return myencoding.GetString(buf, 0, lenStringBytes);
}
catch
{
//not sure I like this, but that's how it was
return "";
}
}
public int SendBytes(byte[] sendBytes)
@ -140,13 +157,23 @@ namespace BizHawk.Client.Common
{
return Successful ? "Screenshot was sent" : "Screenshot could not be sent";
}
var resp = ReceiveMessage();
var resp = ReceiveString();
return resp == "" ? "Failed to get a response" : resp;
}
public int SendString(string sendString, Encoding encoding = null)
{
var sentBytes = SendBytes((encoding ?? Encoding.UTF8).GetBytes(sendString));
var payloadBytes = (encoding ?? Encoding.UTF8).GetBytes(sendString);
var strLenOfPayloadBytes = payloadBytes.Length.ToString();
var strLenOfPayloadBytesAsBytes = Encoding.ASCII.GetBytes(strLenOfPayloadBytes);
System.IO.MemoryStream ms = new System.IO.MemoryStream();
ms.Write(strLenOfPayloadBytesAsBytes, 0, strLenOfPayloadBytesAsBytes.Length);
ms.WriteByte((byte)' ');
ms.Write(payloadBytes,0,payloadBytes.Length);
int sentBytes = SendBytes(ms.ToArray());
Successful = sentBytes > 0;
return sentBytes;
}

2
src/BizHawk.Client.Common/lua/CommonLibs/CommLuaLibrary.cs
View File

@ -68,7 +68,7 @@ namespace BizHawk.Client.Common
public string SocketServerResponse()
{
CheckSocketServer();
return APIs.Comm.Sockets?.ReceiveMessage();
return APIs.Comm.Sockets?.ReceiveString();
}
[LuaMethod("socketServerSuccessful", "returns the status of the last Socket server action")]