From 1a61b94a11a8ac85151c1404b9c8d29b4a2a392c Mon Sep 17 00:00:00 2001
From: 50501AZ Webmaster <webmaster@fiftyfiftyonearizona.org>
Date: Tue, 5 Aug 2025 14:50:49 -0700
Subject: [PATCH] Fixed issue where the echoed request would be returned
 instead of the actual request result

---
 subprocess/subprocess.go | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/subprocess/subprocess.go b/subprocess/subprocess.go
index d8167ae..76469d7 100644
--- a/subprocess/subprocess.go
+++ b/subprocess/subprocess.go
@@ -21,6 +21,10 @@ var f *os.File;
 var fLock sync.RWMutex;
 var reader *bufio.Scanner;
 
+// This is here to ignore lines written to STDIN echoed back through STDOUT
+var ignoreEcho map[string]bool = make(map[string]bool);
+var ignoreEchoMutex sync.RWMutex;
+
 func SetupCMD(binaryLocation string) error {
 	// Avoid double set-up
 	if cmdStarted {return errors.New("cmd already started")};
@@ -64,6 +68,13 @@ func readCMD() {
 		// Read the line
 		line := reader.Text();
 		
+		// Check for echo
+		ignoreEchoMutex.Lock();
+		_, exists := ignoreEcho[line];
+		if exists {delete(ignoreEcho, line)}
+		ignoreEchoMutex.Unlock();
+		if exists {continue}
+		
 		// Unmarshal the JSON
 		var unmarshaledJSON any;
 		if err := json.Unmarshal([]byte(line), &unmarshaledJSON); err != nil {continue}
@@ -74,22 +85,26 @@ func readCMD() {
 		
 		// Get method
 		method, ok := unmarshaledJSONMap["method"];
-		if !ok {continue}
-		
-		// Redirect to handlers based off method
-		if method == "receive" {
+		if ok && method == "receive" {
 			handleIncoming(line, unmarshaledJSONMap);
-		} else {
-			handleResponse(line, unmarshaledJSONMap);
+			continue;
 		}
+	
+		handleResponse(line, unmarshaledJSONMap);
 	}
 }
 
 /* Write a line into the subprocess */
 func writeCMD(line string) (ok bool) {
+	// Write into ignoreEcho map so reader can skip the echoed line
+	ignoreEchoMutex.Lock();
+	ignoreEcho[line] = true;
+	ignoreEchoMutex.Unlock();
+
 	fLock.Lock();
 	if line[len(line)-1] != '\n' {line += "\n"}
 	f.WriteString(line);
 	fLock.Unlock();
+	
 	return true;
 }
\ No newline at end of file