Changeset 36

Timestamp:

02/06/08 20:20:32 (4 years ago)

Author:

mike

Message:

got cometd to work!

Files:

• cometd.py (modified) (6 diffs)
• tabled.py (modified) (10 diffs)
• web/js/jquery.comet.js (modified) (1 diff)
• web/js/poker-client.js (modified) (7 diffs)

cometd.py

@@ -255 +255 @@
                 self.stream = stream.ProducerStream()
                 self.id = getIdStr()
-
+                print "MAKING CONEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEECTION"
                 self.jsonp = False
                 self.jsonpCallback = None
@@ -274 +274 @@
                         }
                 }
-
+                print "RESP RESP RESP \n%s\nRESP RESP" % resp
                 if verbose: log.msg(self.ctypeProps["preamble"])
                 self.stream.write(self.ctypeProps["preamble"])
@@ -301 +301 @@
                                 if self.jsonp: # FIXME: hack!
                                         self.stream.write(self.jsonpCallback+"(")
+                                print "I'm delivering foo &&&& %s" % simplejson.dumps
 
                                 self.stream.write(
-                                        self.ctypeProps["envelope"] % (
                                                 simplejson.dumps(self.backlog),
-                                        )
                                 )
 
@@ -333 +332 @@
                 self.authToken = authToken
                 self.lastError = lastError
+                print "HEY We're MAKING CLIENT WHAT WHAT $$$$$$$$$$$ %s %s" % (self.id,self.authToken)
 
         def setConnection(self, conn):
@@ -344 +344 @@
         def sendMessage(self, message):
                 if self.connection is not None:
+                        print "Sending ---- Delivering"
                         self.connection.deliver(message)
                 else:
@@ -529 +530 @@
 
                 rstr = simplejson.dumps([ resp ])
-                if verbose: log.msg("initHandshake response:", rstr)
 
                 # accomidation for JSONP handshakes
                 if "jsonp" in request.args:
                         rstr = request.args["jsonp"][0]+"("+rstr+");"
+                if verbose: log.msg("initHandshake response:", rstr)
 
                 return buildResponse(rstr, type="text/plain")

tabled.py

@@ -23 +23 @@
     def __init__(self):
         self.table = None
-        self.id = None
+        self.__id = None
     
-    def sendMessage(self, data):
+    def sendData(self, data):
         self.sendMessageViaTransport( data )
         d = defer.Deferred()
-        d.addCallback(self.sendMessage)
-        self.table.addDeferred(self.id, d)
+        d.addCallback(self.sendData)
+        self.table.addDeferred(self.__id, d)
 
     def sendMessageViaTransport(self,data):
@@ -35 +35 @@
         pass
 
-    def dataRecieved(self,data):
+    def dataReceived(self,data):
 
         if data == None or "method" not in data:
@@ -43 +43 @@
         else: method = data["method"]
         if method == "connect":
-            if self.table or self.id:
+            if self.table or self.__id:
                 self.sendMessageViaTransport( 
                     protocol.MakeError(103,"Already connected"))
@@ -58 +58 @@
                 return
             else:
-                self.id = data['client_id']
+                self.__id = data['client_id']
                 d = defer.Deferred()
-                d.addCallback(self.sendMessage)
+                d.addCallback(self.sendData)
                 self.table.addPlayer(data, d)
         elif method == "action":
@@ -66 +66 @@
             if value == "null": value = None
             if value != None: value = float(value)
-            self.table.action(self.id, data["action"],value)
+            self.table.action(self.__id, data["action"],value)
         else:
             self.sendMessageViaTransport( protocol.MakeError(102,"Unknown Method")) 
@@ -77 +77 @@
 
     def stringReceived(self, data):
-        self.dataRecieved(decodejson(data))
+        self.dataReceived(decodejson(data))
         
     def connectionLost(self, reason):
@@ -85 +85 @@
 
 class WebClient(cometd.Client,BasePokerTableHandler):
+    
+    def __init__(self, id=None, authSuccessful=False, authToken=None, lastError=""):
+        cometd.Client.__init__(self,id,authSuccessful,authToken,lastError)
+        print "INITIALIZING WEB CLIENT (((("
+        BasePokerTableHandler.__init__(self)
 
     def messageReceived(self,message):
-        print "FFFFFFFFFFFFFFFFFFFFFFFFF"
-        print "FFFFFFFFFFFFFFFFFFFFFFFFF"
-        print "FFFFFFFFFFFFFFFFFFFFFFFFF"
-        self.dataRecieved(message)
+        print "########### Hey we recieved a message %s" % message
+        self.dataReceived(message["data"])
 
     def sendMessageViaTransport(self,data):
-        self.sendMessage(data)
+        print "##########3Sending Message %s"  % data
+        cometd.Client.sendMessage(self,{"data":data,"channel":"/poker"})
+
 
 
@@ -144 +149 @@
 
         if "method" in nargs and not nargs["method"] == "get_update":
-            self.dataRecieved(encodejson(nargs))
+            self.dataReceived(encodejson(nargs))
 
         self.checkWaiting()
@@ -180 +185 @@
 
 """
-
+#cometd.verbose = False
 
 port = 8007#int(sys.argv[1])
@@ -189 +194 @@
 
 comet = cometd.cometd()
+comet.ClientType = WebClient
 
 site = server.Site(comet)

web/js/jquery.comet.js

@@ -102 +102 @@
                         var fCallback = (fCallback) ? fCallback : function(sReturn)
                         {
+
                                 var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')[0]) : sReturn[0];
 

web/js/poker-client.js

@@ -1 +1 @@
 var gstatus = null;
 var host = null;
-var token = null;
 var table_name = null;
 var user_id = null;
@@ -53 +52 @@
         return root;
 }
-function processStatus( stat ) {
-    token = stat["token"];
-//gstatus.text(String(stat));
-    if(token) {
-                if( connection_state == "disconnected" ) {
-                        $("form#connect_form").hide();
-                        state = "connected";
-            gstatus.text(state);
-                }
-                //Do status generating code here
-                var player_names = []
-
-                
+function processStatus( data ) {
+        //gstatus.text(String(stat));
+        stat = data.data
+        if( connection_state == "disconnected" ) {
+                $("form#connect_form").hide();
+                state = "connected";
+                gstatus.text(state);
+        }
+        //Do status generating code here
+        var player_names = []
+
+
                 if( stat.table_info ) {
                         ti = stat.table_info;
@@ -71 +69 @@
                         for( i in player_names ) {
                                 pn = player_names[i]
-                                if( players[pn] == null ) { //if it's null let's create a new player object
-                                        newPlayer = baseplayer.clone(true);
-                                
-                                        players[pn] = new Player(newPlayer);
-                                        players[pn].id.text(pn);
-                                        if( pn == stat.you.id ) {
-                                                you = players[stat.you.id]
-                                                $("#you").append(you.pl) 
-                                        } else {
-                                                player_status.append( newPlayer );
+                                        if( players[pn] == null ) { //if it's null let's create a new player object
+                                                newPlayer = baseplayer.clone(true);
+
+                                                players[pn] = new Player(newPlayer);
+                                                players[pn].id.text(pn);
+                                                if( pn == stat.you.id ) {
+                                                        you = players[stat.you.id]
+                                                                $("#you").append(you.pl) 
+                                                } else {
+                                                        player_status.append( newPlayer );
+                                                }
                                         }
-                                }
                                 players[pn].updatePublic( ti.players[pn] );
                         }
                 }
-                if( stat.game_state ) {
-                        gs = stat.game_state;
-                        for( i in player_names ) {
-                                pn = player_names[i]
+        if( stat.game_state ) {
+                gs = stat.game_state;
+                for( i in player_names ) {
+                        pn = player_names[i]
                                 if( gs.player_actions[pn] ) { //if it's null let's create a new player object
                                         players[pn].updateActions( gs.player_actions[pn] );
                                 }
+                }
+        }
+
+        if( stat.you ) {
+                you.updatePrivate(you);
+                if( stat.you.required_action ) {
+                        for( i in stat.you.possible_actions ) {
+                                act = new Action( i, stat.you.possible_actions[i][0], stat.you.possible_actions[i][1] );
+                                action_box.append( act.form );
                         }
-                }
-
-                if( stat.you ) {
-                        you.updatePrivate(you);
-                        if( stat.you.required_action ) {
-                                for( i in stat.you.possible_actions ) {
-                                        act = new Action( i, stat.you.possible_actions[i][0], stat.you.possible_actions[i][1] );
-                                        action_box.append( act.form );
-                                }
-                                action_box.show();
-                        }
+                        action_box.show();
                 }
         }
@@ -111 +108 @@
 function makeRequest( data ) {
         $.comet.publish("/poker",data);
-        $.comet.endBatch();
+//$.comet.endBatch();
 
         //$.getJSON(host,
@@ -119 +116 @@
 }
 
-function updateStatus( statarr ) {
-        n_requests -= 1;
-        for( i in statarr ) {
-                processStatus( statarr[i] );
-                if( n_requests == 0 ) {
-                        makeRequest( {"token":token, "method":"get_update"} );
-                }
-        }
-}
 
 function Action( action, min, max ) {
@@ -176 +164 @@
                                                  return false;
                                          }
-                                         makeRequest({"method":"action", "action":this.name,"value":v,"token":token});
+                                         makeRequest({"method":"action", "action":this.name,"value":v});
                                          action_box.hide();
                                          action_box.empty();
@@ -183 +171 @@
 
 }
-
 $(document).ready(function() {
         //$("form#connect_form").hide();
                 //
-                $.comet.init("http://localhost:8080")
-                $.comet.subscribe("/poker")
-
-                sel = $('selector')
-                sel.bind("/poker", function(event, data) {alert(data)});
+                $.comet.init("http://localhost:8080");
+                $.comet.subscribe("/poker", processStatus);
+
+                sel = $('selector');
+                //sel.bind("/poker", function(event, data) {alert(data)});
                 baseplayer = $("td#baseplayer");
                 baseplayer.parent().parent().remove();