work in progress

direct/src/distributed/NetMessenger.py

@@ -3,6 +3,22 @@ from cPickle import dumps, loads
 
 from direct.showbase.Messenger import Messenger
 
+# Messages do not need to be in the MESSAGE_TYPES list.
+# This is just an optimization.  If the message is found
+# in this list, it is reduced to an integer index and
+# the message string is not sent.  Otherwise, the message
+# string is sent in the datagram.
+MESSAGE_TYPES=(
+    "avatarOnline",
+    "avatarOffline",
+)
+
+# This is the reverse look up for the recipient of the
+# datagram:
+MESSAGE_STRINGS={}
+for mt, i in MESSAGE_TYPES, range(1, len(MESSAGE_TYPES)+1):
+    MESSAGE_STRINGS[mt]=i
+
 
 class NetMessenger(Messenger):
     """
@@ -10,11 +26,15 @@ class NetMessenger(Messenger):
     are sent over the network and (possibly) handled (accepted) on a
     remote machine (server).
     """
-    def __init__(self, air, channels=(4602, 4603, 4604)):
+    def __init__(self, air, channels):
+        """
+        air is the AI Repository.
+        channels is a list of channel IDs (uint32 values)
+        """
+        Messenger.__init__(self)
         self.air=air
         self.channels=channels
-        Messenger.__init__(self)
-        for i in channels:
+        for i in self.channels:
             self.air.registerForChannel(i)
 
     def clear(self):
@@ -28,50 +48,33 @@ class NetMessenger(Messenger):
         """
         Send message to All AI and Uber Dog servers.
         """
-        self.sendChannel(4602, message, sentArgs)
-
-    def sendUD(self, message, sentArgs=[]):
-        """
-        Send message to the uber dog.
-        """
-        self.sendChannel(4603, message, sentArgs)
-
-    def sendAI(self, message, sentArgs=[]):
-        """
-        Send message to the game AI servers (non-uber dog).
-        """
-        self.sendChannel(4604, message, sentArgs)
-
-    def sendChannel(self, channel, message, sentArgs=[]):
-        """
-        Send message to a particular channel.
-        """
         datagram = PyDatagram()
         # To:
-        datagram.addChannel(channel)
+        datagram.addChannel(self.channel)
         # From:
         datagram.addChannel(self.air.ourChannel)
         if 1: # We send this just because the air expects it:
             # Add an 'A' for AI
             datagram.addUint8(ord('A'))
-            # Add the message type
-            datagram.addUint16(0)
+
+        messageType=MESSAGE_STRINGS.get(message, 0)
+        datagram.addUint16(messageType)
+
         datagram.addString(str(dumps((message, sentArgs))))
         self.air.send(datagram)
 
-    def check(self, channel):
-        """
-        returns true if this instance wants this channel data.
-        """
-        return channel in self.channels:
-
     def handle(self, pickleData):
         """
         Send pickleData from the net on the local netMessenger.
         The internal data in pickleData should have a tuple of
         (messageString, sendArgsList).
         """
-        (message, sentArgs) = loads(pickleData)
+        messageType=self.air.getMsgType()
+        if messageType:
+            message=MESSAGE_TYPES[messageType-1]
+            sentArgs=loads(pickleData)
+        else:
+            (message, sentArgs) = loads(pickleData)
         Messenger.send(self, message, sentArgs=sentArgs)