Skip to content
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

Fix issue with large messages over network connection #96

Merged
merged 1 commit into from
Dec 23, 2023
Merged

Fix issue with large messages over network connection #96

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
60 changes: 35 additions & 25 deletions src/SimConnectSocket.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,10 +61,13 @@ interface SimConnectMessage {
class SimConnectSocket extends Duplex {
private readonly _socket: Socket;

private _readingPaused;
private _dataBuffer: Buffer;

private _readingPaused: boolean;

constructor() {
super({ objectMode: true });
this._dataBuffer = Buffer.from([]);
this._readingPaused = false;
this._socket = new Socket();
this._socket.setNoDelay(false);
Expand All @@ -88,7 +91,7 @@ class SimConnectSocket extends Duplex {
this._socket.destroy();
}

_wrapSocket() {
private _wrapSocket() {
this._socket.on('close', hadError => this.emit('close', hadError));
this._socket.on('connect', () => this.emit('connect'));
this._socket.on('drain', () => this.emit('drain'));
Expand All @@ -101,33 +104,40 @@ class SimConnectSocket extends Duplex {
this._socket.on('readable', this._onReadable.bind(this));
}

_onReadable() {
private _onReadable() {
while (!this._readingPaused) {
// Read message length header
const lenBuf = this._socket.read(HEADER_LENGTH);
if (!lenBuf) return;
const bodyLength = lenBuf.readInt32LE() - HEADER_LENGTH;

// Read message body
const body: Buffer = this._socket.read(bodyLength);
if (!body) {
// Put header back in read buffer
this._socket.unshift(lenBuf);
return;
}
const chunk: Buffer | null = this._socket.read();
if (chunk === null) break;

this._dataBuffer = Buffer.concat([this._dataBuffer, chunk]);

while (this._dataBuffer.length >= HEADER_LENGTH) {
const totalMessageSize: number = this._dataBuffer.readInt32LE(0);

const message: SimConnectMessage = {
// Mandatory fields
protocolVersion: body.readInt32LE(0),
packetTypeId: body.readInt32LE(4),
data: new RawBuffer(body.slice(8)),
};
if (this._dataBuffer.length >= totalMessageSize) {
const messageBody: Buffer = this._dataBuffer.slice(
HEADER_LENGTH,
totalMessageSize
);

// Add object to read buffer
const pushOk = this.push(message);
const simConnectMessage: SimConnectMessage = {
protocolVersion: messageBody.readInt32LE(0),
packetTypeId: messageBody.readInt32LE(4),
data: new RawBuffer(messageBody.slice(8)),
};

// Pause reading if consumer is slow
if (!pushOk) this._readingPaused = true;
const pushOk = this.push(simConnectMessage);

if (!pushOk) {
this._readingPaused = true;
break; // Pause reading if consumer is slow
}

this._dataBuffer = this._dataBuffer.slice(totalMessageSize); // Remove processed message from the buffer
} else {
break; // Not enough data for a complete SimConnect message, break out of the loop
}
}
}
}

Expand Down