jafea7
/
ctbrec-5.3.2-experimental
mirror of https://github.com/Jafea7/ctbrec-5.3.2-original.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix message parser 

The parser didn't take into accoun, that the arriving string can
contain several messages
This commit is contained in:
0xboobface 2018-10-24 23:40:53 +02:00
parent ff0d1b5eae
commit 0bcea4e753
1 changed files with 98 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/ctbrec/sites/mfc/MyFreeCamsClient.java
View File

@ -58,7 +58,7 @@ public class MyFreeCamsClient {
private String chatToken; private String chatToken;
private int sessionId; private int sessionId;
private EvictingQueue<String> receivedTextHistory = EvictingQueue.create(100); private EvictingQueue<String> receivedTextHistory = EvictingQueue.create(10000);
private MyFreeCamsClient() { private MyFreeCamsClient() {
moshi = new Moshi.Builder().build(); moshi = new Moshi.Builder().build();
@ -168,11 +168,7 @@ public class MyFreeCamsClient {
msgBuffer.append(text); msgBuffer.append(text);
Message message; Message message;
try { try {
message = parseMessage(msgBuffer); while( (message = parseMessage(msgBuffer)) != null) {
if (message != null) {
msgBuffer.setLength(0);
}
switch (message.getType()) { switch (message.getType()) {
case NULL: case NULL:
break; break;
@ -261,6 +257,7 @@ public class MyFreeCamsClient {
LOG.debug("Unknown message {}", message); LOG.debug("Unknown message {}", message);
break; break;
} }
}
} catch (UnsupportedEncodingException e) { } catch (UnsupportedEncodingException e) {
e.printStackTrace(); e.printStackTrace();
} catch (Throwable t) { } catch (Throwable t) {
@ -391,27 +388,30 @@ public class MyFreeCamsClient {
model.update(state, getStreamUrl(state)); model.update(state, getStreamUrl(state));
} }
private Message parseMessage(StringBuilder msg) throws UnsupportedEncodingException { private Message parseMessage(StringBuilder msgBuffer) throws UnsupportedEncodingException {
if (msg.length() < 4) { if (msgBuffer.length() < 4) {
// packet size not transmitted completely // packet size not transmitted completely
return null; return null;
} else { } else {
try { try {
int packetLength = Integer.parseInt(msg.substring(0, 4)); int packetLength = Integer.parseInt(msgBuffer.substring(0, 4));
if (packetLength > msg.length() - 4) { if (packetLength > msgBuffer.length() - 4) {
// packet not complete // packet not complete
return null; return null;
} else { } else {
msg.delete(0, 4); msgBuffer.delete(0, 4);
int type = parseNextInt(msg); StringBuilder rawMessage = new StringBuilder(msgBuffer.substring(0, packetLength));
int sender = parseNextInt(msg); int type = parseNextInt(rawMessage);
int receiver = parseNextInt(msg); int sender = parseNextInt(rawMessage);
int arg1 = parseNextInt(msg); int receiver = parseNextInt(rawMessage);
int arg2 = parseNextInt(msg); int arg1 = parseNextInt(rawMessage);
return new Message(type, sender, receiver, arg1, arg2, URLDecoder.decode(msg.toString(), "utf-8")); int arg2 = parseNextInt(rawMessage);
Message message = new Message(type, sender, receiver, arg1, arg2, URLDecoder.decode(rawMessage.toString(), "utf-8"));
msgBuffer.delete(0, packetLength);
return message;
} }
} catch(Exception e) { } catch(Exception e) {
LOG.error("StringBuilder contains invalid data {}", msg.toString(), e); LOG.error("StringBuilder contains invalid data {}", msgBuffer.toString(), e);
String logfile = "mfc_messages.log"; String logfile = "mfc_messages.log";
try(FileOutputStream fout = new FileOutputStream(logfile)) { try(FileOutputStream fout = new FileOutputStream(logfile)) {
for (String string : receivedTextHistory) { for (String string : receivedTextHistory) {
@ -423,7 +423,7 @@ public class MyFreeCamsClient {
LOG.error("Couldn't write mfc message history to " + logfile); LOG.error("Couldn't write mfc message history to " + logfile);
e1.printStackTrace(); e1.printStackTrace();
} }
msg.setLength(0); msgBuffer.setLength(0);
return null; return null;
} }
} }
@ -501,11 +501,9 @@ public class MyFreeCamsClient {
if(serverConfig.isOnNgServer(state)) { if(serverConfig.isOnNgServer(state)) {
String server = serverConfig.ngVideoServers.get(camserv.toString()); String server = serverConfig.ngVideoServers.get(camserv.toString());
streamUrl = "https://" + server + ".myfreecams.com:8444/x-hls/" + cxid + '/' + userChannel + '/' + ctxenc + "/mfc_" + phase + '_' + userChannel + ".m3u8"; streamUrl = "https://" + server + ".myfreecams.com:8444/x-hls/" + cxid + '/' + userChannel + '/' + ctxenc + "/mfc_" + phase + '_' + userChannel + ".m3u8";
//LOG.debug("{} {}", state.getNm(), streamUrl);
} else if(serverConfig.isOnWzObsVideoServer(state)) { } else if(serverConfig.isOnWzObsVideoServer(state)) {
String server = serverConfig.wzobsServers.get(camserv.toString()); String server = serverConfig.wzobsServers.get(camserv.toString());
streamUrl = "https://"+ server + ".myfreecams.com/NxServer/ngrp:mfc_" + phase + '_' + userChannel + ".f4v_mobile/playlist.m3u8"; streamUrl = "https://"+ server + ".myfreecams.com/NxServer/ngrp:mfc_" + phase + '_' + userChannel + ".f4v_mobile/playlist.m3u8";
LOG.debug("{} isOnWzObsvideo: {}", state.getNm(), streamUrl);
} else if(serverConfig.isOnHtml5VideoServer(state)) { } else if(serverConfig.isOnHtml5VideoServer(state)) {
String server = serverConfig.h5Servers.get(camserv.toString()); String server = serverConfig.h5Servers.get(camserv.toString());
streamUrl = "https://"+ server + ".myfreecams.com/NxServer/ngrp:mfc_" + userChannel + ".f4v_mobile/playlist.m3u8"; streamUrl = "https://"+ server + ".myfreecams.com/NxServer/ngrp:mfc_" + userChannel + ".f4v_mobile/playlist.m3u8";