Skip to content

CMClient.handlemulti Fix #363

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LossyDragon merged 3 commits into from
Oct 13, 2025
Merged

CMClient.handlemulti Fix #363

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
55e8fcd
Try and fix handleMulti again to fix a rare error.
LossyDragon Oct 7, 2025
71d0141
Tweak the loop.
LossyDragon Oct 10, 2025
a694f55
Finish removing BinaryReader from CMClient.
LossyDragon Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 17 additions & 16 deletions src/main/java/in/dragonbra/javasteam/steam/CMClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@
import in.dragonbra.javasteam.util.event.ScheduledFunction;
import in.dragonbra.javasteam.util.log.LogManager;
import in.dragonbra.javasteam.util.log.Logger;
import in.dragonbra.javasteam.util.stream.BinaryReader;
import okio.Buffer;
import okio.BufferedSource;
import okio.GzipSource;
import okio.Okio;
import org.jetbrains.annotations.Nullable;

import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.InetAddress;
import java.net.InetSocketAddress;
import java.util.EnumSet;
import java.util.zip.GZIPInputStream;

/**
* This base client handles the underlying connection to a CM server. This class should not be use directly, but through
Expand Down Expand Up @@ -334,8 +334,8 @@ public static IPacketMsg getPacketMsg(byte[] data) {
}

int rawEMsg = 0;
try (var reader = new BinaryReader(new ByteArrayInputStream(data))) {
rawEMsg = reader.readInt();
try (var buffer = new Buffer().write(data)) {
rawEMsg = buffer.readIntLe();
} catch (IOException e) {
logger.debug("Exception while getting EMsg code", e);
}
Expand Down Expand Up @@ -374,24 +374,25 @@ private void handleMulti(IPacketMsg packetMsg) {
var msgMulti = new ClientMsgProtobuf<CMsgMulti.Builder>(CMsgMulti.class, packetMsg);
var payload = msgMulti.getBody().getMessageBody().toByteArray();

try {
InputStream inputStream;
try (var payloadBuffer = new Buffer().write(payload)) {
BufferedSource source;

if (msgMulti.getBody().getSizeUnzipped() > 0) {
inputStream = new GZIPInputStream(new ByteArrayInputStream(payload));
source = Okio.buffer(new GzipSource(payloadBuffer));
} else {
inputStream = new ByteArrayInputStream(payload);
source = payloadBuffer;
}

try (inputStream; var br = new BinaryReader(inputStream)) {
while (br.available() > 0) {
var subSize = br.readInt();
var subData = br.readBytes(subSize);
try (source) {
do {
var subSize = source.readIntLe();
var subData = source.readByteArray(subSize);
var msg = getPacketMsg(subData);

if (!onClientMsgReceived(getPacketMsg(subData))) {
if (!onClientMsgReceived(msg)) {
break;
}
}
} while (!source.exhausted());
}
} catch (IOException e) {
logger.error("error in handleMulti()", e);
Expand Down