handling edge case where socket.read throws error due to exceeding Hi…

…ghWatermark.
stellarbeat · Feb 23, 2024 · 78d2fa2 · 78d2fa2
1 parent 808cecc
commit 78d2fa2
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 7 deletions.
diff --git a/examples/connect.js b/examples/connect.js
@@ -46,11 +46,23 @@ function connect() {
 							' for ledger ' +
 							stellarMessage.envelope().statement().slotIndex().toString()
 					);
-					/*if(stellarMessage.envelope().statement().pledges().switch() === xdr.ScpStatementType.scpStExternalize()){
-						const value = stellarMessage.envelope().statement().pledges().externalize().commit().value();
-						const closeTime = xdr.StellarValue.fromXDR(value).closeTime().toXDR().readBigUInt64BE();
-						console.log(new Date(1000 * Number(closeTime)));
-					}*/
+					if (
+						stellarMessage.envelope().statement().pledges().switch() ===
+						xdr.ScpStatementType.scpStExternalize()
+					) {
+						const value = stellarMessage
+							.envelope()
+							.statement()
+							.pledges()
+							.externalize()
+							.commit()
+							.value();
+						const closeTime = xdr.StellarValue.fromXDR(value)
+							.closeTime()
+							.toXDR()
+							.readBigUInt64BE();
+						//console.log(new Date(1000 * Number(closeTime)));
+					}
 					break;
 				default:
 					console.log(

diff --git a/src/connection/connection.ts b/src/connection/connection.ts
@@ -278,8 +278,23 @@ export class Connection extends Duplex {
 	}
 
 	protected processNextMessage(): Result<boolean, Error> {
-		//If size bytes are not available to be read, null will be returned unless the stream has ended, in which case all of the data remaining in the internal buffer will be returned.
-		const data = this.socket.read(this.lengthNextMessage);
+		//If size bytes are not available to be read,
+		// null will be returned unless the stream has ended,
+		// in which case all the data remaining in the internal buffer will be returned.
+		let data: Buffer | null = null;
+		try {
+			data = this.socket.read(this.lengthNextMessage);
+		} catch (e) {
+			this.logger.error(
+				{
+					remote: this.remoteAddress,
+					error: mapUnknownToError(e).message,
+					length: this.lengthNextMessage
+				},
+				'Error reading from socket'
+			);
+			return err(mapUnknownToError(e));
+		}
 		if (!data || data.length !== this.lengthNextMessage) {
 			this.logger.trace(
 				{