Updated ANSI cleaning, line processing, logging.

tcp-proxy.py

@@ -8,6 +8,7 @@ from twisted.internet import protocol
 from twisted.internet import reactor
 from twisted.python import log
 from twisted.enterprise import adbapi
+import pendulum
 
 # Connect to:
 HOST = "127.0.0.1"
@@ -16,6 +17,20 @@ PORT = 2002
 LISTEN_PORT = 9999
 LISTEN_ON = "127.0.0.1"
 
+cleaner = re.compile(r"\x1b\[[0-9;]*[A-Zm]")
+makeNL = re.compile(r"\x1b\[[0-9;]*[J]")
+
+
+def treatAsNL(line):
+    global makeNL
+    return makeNL.sub("\n", line)
+
+
+def cleanANSI(line):
+    global cleaner
+    return cleaner.sub("", line)
+    # return re.sub(r'\x1b\[([0-9,A-Z]{1,2}(;[0-9]{1,2})?(;[0-9]{3})?)?[m|K]?', '', line)
+
 
 class PlayerProtocol(protocol.Protocol):
     def __init__(self):
@@ -57,6 +72,8 @@ class PlayerProtocol(protocol.Protocol):
                     self.buffer = self.buffer[zpos + 1 :]
                     self.buffer = ""
                     # init sqlite db using the username
+                    self.factory.getUser(self.user)
+
             # else:
             # process the buffer
             # Handle backspaces by deleting previous character.
@@ -106,14 +123,21 @@ class GlueFactory(protocol.ClientFactory):
     maxDelay = 10
     protocol = PlayerProtocol
 
-    def __init__(self, queue_client, queue_twgs):
+    def __init__(self, queue_client, queue_twgs, twgs):
         self.queue_client = queue_client
         self.queue_twgs = queue_twgs
+        self.twgs = twgs
+        self.fpRaw = None
+        self.fpLines = None
 
     def closeIt(self):
         log.msg("closeIt")
         self.queue_client.put(False)
 
+    def getUser(self, user):
+        log.msg("getUser( %s )" % user)
+        self.twgs.logUser(user)
+
     # This was needed when I replaced ClientFactory with Factory.
     # def clientConnectionLost(self, connector, why):
     #     log.msg("clientconnectionlost: %s" % why)
@@ -133,23 +157,37 @@ class GlueFactory(protocol.ClientFactory):
 class TWGSServer(protocol.Protocol):
     def __init__(self):
         self.buffer = ""
+        self.fpRaw = None
+        self.fpLines = None
 
     def connectionMade(self):
         self.queue_twgs = defer.DeferredQueue()
         self.queue_client = defer.DeferredQueue()
         self.queue_client.get().addCallback(self.clientDataReceived)
 
-        factory = GlueFactory(self.queue_client, self.queue_twgs)
+        factory = GlueFactory(self.queue_client, self.queue_twgs, self)
         reactor.connectTCP(HOST, PORT, factory, 5)
 
+    def logUser(self, user):
+        now = pendulum.now()
+        filename = now.format("YYYY-MM-DD_HHmm") + "-" + user.lower()
+        self.fpRaw = open(filename + ".raw", "ab")
+        self.fpLines = open(filename + ".lines", "a")
+        # print("Log created:", now.to_rss_string(), "\n", file=self.fpRaw)
+        print("Log created:", now.to_rss_string(), "\n", file=self.fpLines)
+
     def gotLine(self, line):
         # log.msg(">>> [{0}]".format(line.decode("utf-8", "ignore")))
         log.msg(">>> [{0}]".format(line))
+        if self.fpLines is not None:
+            print(line, file=self.fpLines)
 
     def clientDataReceived(self, chunk):
         if chunk is False:
             self.transport.loseConnection()
         else:
+            if self.fpRaw is not None:
+                self.fpRaw.write(chunk)
             self.buffer += chunk.decode("utf-8", "ignore")
 
             # Process any backspaces in the buffer
@@ -158,11 +196,16 @@ class TWGSServer(protocol.Protocol):
                 part = self.buffer.partition("\x08")
                 self.buffer = part[0][:-1] + part[2]
 
+            # Treat some ANSI codes as a newline (for purposes of Lines)
+            self.buffer = treatAsNL(self.buffer)
+
             # Break the buffer into lines
-            
+
             while "\n" in self.buffer:
                 part = self.buffer.partition("\n")
                 line = part[0].replace("\r", "")
+                # Clean ANSI codes from the line
+                line = cleanANSI(line)
                 self.gotLine(line)
                 self.buffer = part[2]
 
@@ -177,6 +220,14 @@ class TWGSServer(protocol.Protocol):
     def connectionLost(self, why):
         log.msg("lost connection %s" % why)
         self.queue_twgs.put(False)
+        if self.fpRaw is not None:
+            self.fpRaw.close()
+            self.fpRaw = None
+        if self.fpLines is not None:
+            if self.buffer != "":
+                print(self.buffer, file=self.fpLines)
+            self.fpLines.close()
+            self.fpLines = None
 
     def connectionFailed(self, why):
         log.msg("connectionFailed: %s" % why)