From 774a05f8dc536345ad5abdd640c9eecb4aaa9573 Mon Sep 17 00:00:00 2001
From: Eric House <xwords@eehouse.org>
Date: Sat, 19 Sep 2020 22:52:21 -0700
Subject: [PATCH] in log script, print sender as well as addressee

---
 xwords4/relay/scripts/mqtt-showinplay.py | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/xwords4/relay/scripts/mqtt-showinplay.py b/xwords4/relay/scripts/mqtt-showinplay.py
index 08fc58564..d3b9e141a 100755
--- a/xwords4/relay/scripts/mqtt-showinplay.py
+++ b/xwords4/relay/scripts/mqtt-showinplay.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python3
 
-import argparse, re
+import argparse, re, struct
 import paho.mqtt.client as mqtt
 
 g_topics = [
@@ -18,7 +18,8 @@ def on_connect(client, userdata, flags, rc):
 def on_message(client, obj, msg):
     match = sDevIDPat.match(msg.topic)
     if match:
-        print('on_message(): for: {}, len: {}'.format(match.group(1), len(msg.payload)))
+        (sender, gameID) = getSender(msg.payload)
+        print('on_message(): from {} to {}, len: {}'.format(sender, match.group(1), len(msg.payload)))
 
 def on_publish(client, obj, mid):
     print("mid: " + str(mid))
@@ -29,6 +30,16 @@ def on_subscribe(client, obj, mid, granted_qos):
 def on_log(client, obj, level, string):
     print(string)
 
+def getSender(payload):
+    result = None
+    got = struct.unpack_from('>bqI', payload)
+    if 0 == got[0] or 1 == got[0]:
+        devID = '{:016X}'.format(got[1])
+        gameID = 1 == got[0] and got[2] or 0
+        result = (devID, gameID)
+    # print('getSender() => {}'.format(result))
+    return result
+
 def makeClient():
     mqttc = mqtt.Client()
     # Assign event callbacks