Changeset 26

Timestamp:

02/04/08 20:13:25 (4 years ago)

Author:

mike

Message:

Got some stuff working for the web client

Files:

• tabled.py (modified) (11 diffs)
• web/client.html (modified) (1 diff)
• web/js/poker-client.js (added)

tabled.py

@@ -8 +8 @@
 import getopt
 import cjson
+import simplejson
 from twisted.internet.protocol import Factory
 from twisted.internet import reactor
@@ -13 +14 @@
 from twisted.internet import defer
 from twisted.web2 import server, http, resource, channel
+from twisted.web2.http_headers import Headers, MimeType
 
+encodejson = simplejson.dumps
+decodejson = simplejson.loads
 tables = {}
 class BasePokerTableHandler:
@@ -22 +26 @@
     def sendMessage(self, data):
         try:
-            self.sendMessageViaTransport( cjson.encode(data) )
+            self.sendMessageViaTransport( encodejson(data) )
         except cjson.EncodeError,e:
             print data
@@ -36 +40 @@
     def dataRecieved(self,line):
         try:
-            decoded = cjson.decode(line)
+            decoded = decodejson(line)
             if decoded == None or "method" not in decoded:
-                self.sendMessageViaTransport( cjson.encode(
+                self.sendMessageViaTransport( encodejson(
                     protocol.MakeError(101,"Messages must contain methods")) )
                 return
@@ -44 +48 @@
             if method == "connect":
                 if self.table or self.id:
-                    self.sendMessageViaTransport( cjson.encode(
+                    self.sendMessageViaTransport( encodejson(
                         protocol.MakeError(103,"Already connected")) )
                     return
@@ -54 +58 @@
                 self.table = tables[table_name]
                 if self.table.isFull():
-                    self.sendMessageViaTransport( cjson.encode(
+                    self.sendMessageViaTransport( encodejson(
                         protocol.MakeError(104,"Table is full")))
                     return
@@ -67 +71 @@
                 self.table.action(self.id, decoded["action"],value)
             else:
-                self.sendMessageViaTransport( cjson.encode(protocol.MakeError(102,"Unknown Method")) )
-            print method
+                self.sendMessageViaTransport( encodejson(protocol.MakeError(102,"Unknown Method")) )
         except cjson.DecodeError:
-            self.sendString( cjson.encode(protocol.MakeError( 100, "Message must be in JSON")) )
+            self.sendMessageViaTransport( encodejson(protocol.MakeError( 100, "Message must be in JSON")) )
             print line
             return
@@ -96 +99 @@
         self.__waitingRequest=None
         self.__messageQueue=[]
+        self.jsoncallback = None
 
     def sendMessageViaTransport(self, data):
         self.__messageQueue.append(data)
-        self.checkWaiting()
+        #for json callbacks
+        #else: self.__messageQueue.append(str("%s(%s)" % (self.jsoncallback, data)))
 
     def sendMessage(self, data):
@@ -105 +110 @@
         data["token"] = makeToken( self.id, self.table.name )
         BasePokerTableHandler.sendMessage(self,data)
+        self.checkWaiting()
 
     def checkWaiting(self):
         if self.__waitingRequest != None and len(self.__messageQueue) > 0:
+            print "SENDING RESPONSE TO HTTP"
             self.__waitingRequest.callback(self.__messageQueue.pop(0))
             self.__waitingRequest = None
 
+    def __doResponse(self,resp):
+        return http.Response(stream=
+                str("%s(%s)" % (self.jsoncallback,resp)),
+                headers = {"content-type": MimeType.fromString("text/javascript")})
+
     def doRenderStuff(self,nargs):
+        if "jsoncallback" in nargs:
+            self.jsoncallback = nargs["jsoncallback"]
+            print "json callback set to %s" % self.jsoncallback
+
         d = defer.Deferred()
         #yeah, i know we're going to unparse
-        d.addCallback( lambda resp: http.Response(stream=resp) )
+        d.addCallback( self.__doResponse )
+        if self.__waitingRequest != None:
+            print "WE ALREADY HAVE A REQUEST,WTF"
+        print "ADDING REQUEST"
         self.__waitingRequest = d
 
         if "method" in nargs and not nargs["method"] == "get_update":
-           self.dataRecieved(cjson.encode(nargs))
+           self.dataRecieved(encodejson(nargs))
 
-        self.checkWaiting()
 
         return d
@@ -132 +150 @@
         self.__webHandlers = {}
 
-
-       
-
     def render(self, ctx):
         nargs = {}
         for k,v in ctx.args.items(): nargs[k] = v[0]
+        handler = None
         print nargs
-        handler = None
+
+
+
         if "token" in nargs: handler =  self.__webHandlers[nargs["token"]]
         elif "method" in nargs and nargs["method"] == "connect":
@@ -145 +163 @@
             handler = PokerTableWebHandler()
             self.__webHandlers[token] = handler
-        else: return http.Response(stream=cjson.encode(protocol.error(200,"Require either token or connect")))
+        else: return http.Response(stream=encodejson(protocol.error(200,"Require either token or connect")))
 
         return handler.doRenderStuff(nargs)

web/client.html

@@ -3 +3 @@
         <title>Mike's Poker Client</title>
     </head>
+     <script type="text/javascript" src="js/jquery-1.2.2.js"></script>
+     <script type="text/javascript" src="js/poker-client.js"></script>
     <body>
-        <form>Connect to:
-            <table><tr><td>host:</td>
+        <form id="connect_form">Connect to:
+            <table>
+                <tr><td>host:</td><td><input name="host" value="http://localhost:8080" type="input"/></td></tr>
+                <tr><td>login:</td><td><input name="user_id" value="guest" type="input"/></td></tr>
+                <tr><td>player name:</td><td><input name="client_id" value="" type="input"/></td></tr>
+                <tr><td>game name:</td><td><input name="table_name" value="" type="input"/></td></tr>
+                <tr><td></td><td><input id="connect" value="connect" type="submit"/></td></tr>
+            </table>
+        </form>
+        <div id="status">
+            
+        </div>
     </body>
 </html>