feat: exception handling for packet parsing errors

Cdm2883 · Jul 19, 2024 · 5e30cef · 5e30cef
1 parent 7abc669
commit 5e30cef
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/patches/bedrock-protocol+3.38.0.patch b/patches/bedrock-protocol+3.38.0.patch
@@ -20,10 +20,19 @@ index 7018ae3..1b38537 100644
    ping,
    createServer,
 diff --git a/node_modules/bedrock-protocol/src/relay.js b/node_modules/bedrock-protocol/src/relay.js
-index 3128a7d..6d32e10 100644
+index 3128a7d..251e385 100644
 --- a/node_modules/bedrock-protocol/src/relay.js
 +++ b/node_modules/bedrock-protocol/src/relay.js
-@@ -60,6 +60,8 @@ class RelayPlayer extends Player {
+@@ -47,6 +47,8 @@ class RelayPlayer extends Player {
+     try {
+       des = this.server.deserializer.parsePacketBuffer(packet)
+     } catch (e) {
++      if (this.$hook$readUpstream$parsing_error?.(packet, e)) return
++
+       this.server.deserializer.dumpFailedBuffer(packet, this.connection.address)
+       console.error(this.connection.address, e)
+
+@@ -60,6 +62,8 @@ class RelayPlayer extends Player {
      const params = des.data.params
      this.upInLog('->', name, params)
 
@@ -32,7 +41,7 @@ index 3128a7d..6d32e10 100644
      if (name === 'play_status' && params.status === 'login_success') return // Already sent this, this needs to be sent ASAP or client will disconnect
 
      if (debugging) { // some packet encode/decode testing stuff
-@@ -68,6 +70,8 @@ class RelayPlayer extends Player {
+@@ -68,6 +72,8 @@ class RelayPlayer extends Player {
 
      this.emit('clientbound', des.data, des)
 
@@ -41,7 +50,7 @@ index 3128a7d..6d32e10 100644
      if (!des.canceled) {
        if (name === 'start_game') {
          setTimeout(() => {
-@@ -289,4 +293,4 @@ class Relay extends Server {
+@@ -289,4 +295,4 @@ class Relay extends Server {
  }
 
  // Too many things called 'Proxy' ;)

diff --git a/src/bridgeo/relay/relay-player.ts b/src/bridgeo/relay/relay-player.ts
@@ -28,6 +28,11 @@ export class CommonRelayPlayer extends RelayPlayer {
         // @ts-expect-error
         super(...args);
 
+        if (this.server.options.ignorePacketParseError) this.$hook$readUpstream$parsing_error = buffer => {
+            this.sendBuffer(buffer);
+            return true;
+        };
+
         // TODO fix definitions
         // noinspection CommaExpressionJS
         this.$hook$readUpstream$parsed = (buffer, { data: { name } }) => (

diff --git a/src/bridgeo/relay/relay.ts b/src/bridgeo/relay/relay.ts
@@ -5,6 +5,7 @@ import CommonRelayPlayer from "@/bridgeo/relay/relay-player";
 // eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface CommonRelayOptions extends RelayOptions {
     // reuseUnchangedBuffer?: boolean;
+    ignorePacketParseError?: boolean;
 }
 
 // noinspection JSUnusedGlobalSymbols

diff --git a/src/bridgeo/utils/def/bedrock-protocol.d.ts b/src/bridgeo/utils/def/bedrock-protocol.d.ts
@@ -75,6 +75,7 @@ declare module 'bedrock-protocol' {
         on(event: 'clientbound', listener: (packet, options: PacketBufferParsed & { canceled: boolean }) => void): this;
         on(event: 'serverbound', listener: (packet, options: PacketBufferParsed & { canceled: boolean }) => void): this;
 
+        $hook$readUpstream$parsing_error?(buffer: Buffer, e);
         $hook$readUpstream$parsed?(buffer: Buffer, parsed: PacketBufferParsed & { canceled: boolean });
         $hook$readUpstream$emitted?(buffer: Buffer, parsed: PacketBufferParsed & { canceled: boolean });
     }