cheatengine 5.8.20 → 5.8.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cheatengine",
-  "version": "5.8.20",
+  "version": "5.8.21",
   "description": "Cheat Engine MCP Server - AI-assisted reverse engineering bridge",
   "main": "ce_mcp_server.js",
   "bin": {

package/src/pipe-client.js

@@ -86,30 +86,32 @@ class PipeClient extends EventEmitter {
   _handleData(data) {
     this.responseBuffer = Buffer.concat([this.responseBuffer, data]);
     
-    // Try to parse response
-    if (this.pendingResponse && this.responseBuffer.length >= 4) {
-      const respLen = this.responseBuffer.readUInt32LE(0);
-      
-      if (respLen === 0 || respLen > Config.MAX_RESPONSE_SIZE) {
-        this.pendingResponse.reject(new Error(`Invalid response size: ${respLen}`));
-        this.pendingResponse = null;
-        this.responseBuffer = Buffer.alloc(0);
-        return;
-      }
+    // Try to parse response only if we have a pending request
+    if (!this.pendingResponse || this.responseBuffer.length < 4) {
+      return;
+    }
+    
+    const respLen = this.responseBuffer.readUInt32LE(0);
+    
+    if (respLen === 0 || respLen > Config.MAX_RESPONSE_SIZE) {
+      this.pendingResponse.reject(new Error(`Invalid response size: ${respLen}`));
+      this.pendingResponse = null;
+      this.responseBuffer = Buffer.alloc(0);
+      return;
+    }
 
-      if (this.responseBuffer.length >= 4 + respLen) {
-        const respData = this.responseBuffer.slice(4, 4 + respLen);
-        this.responseBuffer = this.responseBuffer.slice(4 + respLen);
-        
-        try {
-          const decoded = this._decodeResponse(respData);
-          const result = JSON.parse(decoded);
-          this.pendingResponse.resolve(result);
-        } catch (err) {
-          this.pendingResponse.reject(err);
-        }
-        this.pendingResponse = null;
+    if (this.responseBuffer.length >= 4 + respLen) {
+      const respData = this.responseBuffer.slice(4, 4 + respLen);
+      this.responseBuffer = this.responseBuffer.slice(4 + respLen);
+      
+      try {
+        const decoded = this._decodeResponse(respData);
+        const result = JSON.parse(decoded);
+        this.pendingResponse.resolve(result);
+      } catch (err) {
+        this.pendingResponse.reject(err);
       }
+      this.pendingResponse = null;
     }
   }
 
@@ -258,7 +260,27 @@ class PipeClient extends EventEmitter {
   _waitForResponse() {
     return new Promise((resolve, reject) => {
       this.pendingResponse = { resolve, reject };
-      this.responseBuffer = Buffer.alloc(0);
+      
+      // Check if we already have data in buffer (race condition fix)
+      if (this.responseBuffer.length >= 4) {
+        const respLen = this.responseBuffer.readUInt32LE(0);
+        if (respLen > 0 && respLen <= Config.MAX_RESPONSE_SIZE && this.responseBuffer.length >= 4 + respLen) {
+          const respData = this.responseBuffer.slice(4, 4 + respLen);
+          this.responseBuffer = this.responseBuffer.slice(4 + respLen);
+          
+          try {
+            const decoded = this._decodeResponse(respData);
+            const result = JSON.parse(decoded);
+            this.pendingResponse = null;
+            resolve(result);
+            return;
+          } catch (err) {
+            this.pendingResponse = null;
+            reject(err);
+            return;
+          }
+        }
+      }
     });
   }