Changeset 42

Timestamp:

02/07/08 15:46:20 (4 years ago)

Author:

mike

Message:

updated stuff

Files:

• cometd.py (modified) (11 diffs)
• tabled.tac (modified) (2 diffs)
• web/js/jquery.comet.js (modified) (9 diffs)
• web/js/poker-client.js (modified) (3 diffs)

cometd.py

@@ -301 +301 @@
                                 print "I'm delivering foo &&&& %s" % simplejson.dumps
 
+                                print "$$$$$ delivering %s" % self.backlog
                                 self.stream.write(
                                         self.ctypeProps["envelope"] % (
@@ -322 +323 @@
                         self.stream = stream.ProducerStream()
                         self.deliver()
+
+class ClientSubscription(object):
+        
+
+        def __init__( self, channel ):
+                self.channel = channel
+                self.sendMessageCallback = None #Make sure we set this!!!
+
+
+        def messageReceived(self, message):
+                self.sendMessage(message)
+        
+        #Make sure you call this first if you override this message!!!
+        def sendMessage(self, message):
+                self.sendMessageCallback(message, self.channel)
+        
+        #Make sure you call this first if you override this message!!!
+        def subscribe(self, channel):
+                return True
+        
+        #when we get disconnected or unsubscribed
+        def unsubscribe(self):
+                pass
+
+class SubscriptionException(Exception):
+        pass
 
 class Client:
@@ -332 +359 @@
                 self.authToken = authToken
                 self.lastError = lastError
+                self.cSubscriptions = {}
+
+        #override this if you want different subscriptions to have different classes
+        def generateSubscription(self, channel):
+                return  ClientSubscription(channel)
+
+        def subscribe(self, channel):
+                if channel in self.cSubscriptions:
+                        raise SubscriptionException("Already subscribed")
+                else:
+                        cs = self.generateSubscription(channel)
+                        cs.sendMessageCallback = self.sendMessage
+                        print "TRYING TO SUBSCRIBE TO " + channel
+                        if cs.subscribe(channel):
+                                self.cSubscriptions[channel] = cs
+                                return True
+                        else:
+                                del(cs)
+                                return False
+        
+        #when we get disconnected or unsubscribed
+        def unSubscribe(self, channel):
+                if channel in self.cSubscriptions:
+                        cs = self.clientSubscription(channel, self.sendMessage)
+                        cs.unsubscribe(channel)
+                        del(self.cSubscriptions[channel])
+                else:
+                        raise SubscriptionException("Not subscribed yet and trying to unsubscribe")
 
         def setConnection(self, conn):
+                print "Setting Connection &&&&&&&&&&&&&& %s" % conn
                 self.connection = conn
 
         def messageReceived(self, message, channel):
-                self.sendMessage(message,channel)
-                pass
+                if channel in self.cSubscriptions:
+                        self.cSubscriptions[channel].messageReceived(message)
+                else:
+                        raise SubscriptionException("Not subscribed yet and trying to send message")
 
         def sendMessage(self, message, channel):
@@ -432 +490 @@
 
                 ctr = 0
-                if verbose: log.msg("messages:", type(messages), ":",  simplejson.dumps(messages))
+                if verbose: log.msg("messages:", type(messages), ":",  simplejson.dumps(messages), " :", messages)
                 aStream = None
                 print( messages)
@@ -442 +500 @@
                         client = None
                         localResp = []
-                        if "clientId" in m and m["clientId"] in self.clients:
+                        if "clientId" in m and m["clientId"] in self.clients\
+                                        and self.clients[m["clientId"]].connection is not None:
                                 client = self.clients[m["clientId"]]
                         else:
@@ -465 +524 @@
 
                         chan = m["channel"]
+                        print "CHAN: !!!!!!!!!!!!!!!!! %s " % chan
                         if chan == "/meta/handshake" and ctr == 0:
                                 # looks like we'll need to create a Connection
@@ -620 +680 @@
                 # get the client and the channel here
                 # self._subscribe()
+                print "self.subscribe ^^^^^^^^^^^^^^^^"
                 if not self._checkClient(request, message):
                         # FIXME: we should probably send advice here instead of just raw failure
@@ -646 +707 @@
                 # FIXME: should we be calling client.deliver and having *that* dispatch
                 # down to the correct connection object?
+                print "Sending Message: with %s %s"  % (self.clients, client)
                 client.connection.deliver(resp)
                 # return { "successful": True }
@@ -679 +741 @@
         def _globbing_unsubscribe(self, client, chan):
                 "remove a subscription"
+                client.unsubscribe(chan)
 
                 cparts = chan.split("/")[1:]
@@ -700 +763 @@
                 if verbose: log.msg(cparts)
                 root = self.subscriptions
-                for part in cparts: # create parts of the topic tree that don't yet exist
-                        if not part in root:
-                                if verbose:
-                                        log.msg("creating part: ", part)
-                                root[part] = { "__cometd_subscribers": None }
-                                # root[part] = weakref.WeakValueDictionary()
-                                root[part]["__cometd_subscribers"] = weakref.WeakValueDictionary()
-
-                        root = root[part] 
-
-                root["__cometd_subscribers"][client.id] = client
+                # make sure the subscription was successful
+                if client.subscribe( chan ):
+                        for part in cparts: # create parts of the topic tree that don't yet exist
+                                if not part in root:
+                                        if verbose:
+                                                log.msg("creating part: ", part)
+                                        root[part] = { "__cometd_subscribers": None }
+                                        # root[part] = weakref.WeakValueDictionary()
+                                        root[part]["__cometd_subscribers"] = weakref.WeakValueDictionary()
+
+                                root = root[part] 
+
+                        root["__cometd_subscribers"][client.id] = client
 
         def _globbing_route(self, request, message):
@@ -758 +823 @@
                                 subs[client].connection.deliver(message)
                 return { "successful": True }
-
 # vim:ts=4:noet:

tabled.tac

@@ -85 +85 @@
 clientChannels = [ r"\/poker" ]
 
-class WebClient(cometd.Client,BasePokerTableHandler):
+class PokerSubscription(cometd.ClientSubscription, BasePokerTableHandler):
+    def __init__(self, channel):
+        BasePokerTableHandler.__init__(self)
+        cometd.ClientSubscription.__init__(self, channel)
+
+    def messageReceived(self,message):
+        self.dataReceived(message)
+
+    def sendMessageViaTransport(self,data):
+        self.sendMessage(data)
+
+class WebClient(cometd.Client):
     
-    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,channel):
-        self.dataReceived(message)
-
-    def sendMessageViaTransport(self,data):
-        cometd.Client.sendMessage(self,data,"/poker")
+    def generateSubscription(self, channel):
+        return PokerSubscription( channel )
+
+    def subscribe(self, channel):
+        #we only want poker channels
+        print "SUB ---------------- CHAN " + channel
+        if channel == "/poker":
+            return cometd.Client.subscribe(self,channel)
+        else: return False
 
 
@@ -217 +227 @@
 print "Listening on localhost:%d(tcp) %d(http)" % (port, port2)
 
-
+# vim:filetype=python

web/js/jquery.comet.js

@@ -18 +18 @@
                 this.connectionType = (this._bXD) ? 'callback-polling' : 'long-polling';
 
-                this.startup = function(oReturn)
+                this.startup = function(oReturn, fCallback)
                 {
                         if(this._comet._bConnected) return;
-                        this.tunnelInit();
-                };
-
-                this.tunnelInit = function()
+                        this.tunnelInit(fCallback);
+                };
+
+                this.tunnelInit = function(fCallback)
                 {
                         var msgConnect = 
@@ -34 +34 @@
                         };
 
-                        this.openTunnel(msgConnect);
-                };
-
-                this.openTunnel = function(oMsg)
+                        this.openTunnel(msgConnect,fCallback);
+                };
+
+                this.openTunnel = function(oMsg, fCallback)
                 {
                         $.comet._bPolling = true;
-
-                        this._send($.comet._sUrl, oMsg, function(sReturn)
-                        {
+                        var fc = fCallback;
+                        this._send($.comet._sUrl, [oMsg], function(sReturn)
+                        {
+                                if( fc ) { fc(); }
                                 var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')) : sReturn;
                                 $.comet._bPolling = false;
@@ -134 +135 @@
                                         type: 'post',
                                         beforeSend: function(oXhr) { oXhr.setRequestHeader('Connection', 'Keep-Alive'); },
-                                        data: { message: JSON.stringify([oMsg]) },
+                                        data: { message: JSON.stringify(oMsg) },
                                         success: fCallback
                                 });
@@ -146 +147 @@
                                         data: 
                                         { 
-                                                message: JSON.stringify([$.extend(oMsg,{connectionType: 'callback-polling' })]) 
+                                                message: JSON.stringify($.extend(oMsg,{connectionType: 'callback-polling' })) 
                                         },
                                         success: fCallback
@@ -178 +179 @@
                 this._bTrigger = true; // this sends $.event.trigger(channel, data)
 
-                this.init = function(sUrl)
+                this.init = function(sUrl,fCallback)
                 {
                         this._sUrl = (sUrl) ? sUrl : '/cometd';
@@ -190 +191 @@
                         var oMsg = $.extend(msgHandshake, {id: this._nNextId++});
 
-                        this._oTransport._send(this._sUrl, oMsg, $.comet._finishInit);
-                };
-
-                this._finishInit = function(sReturn)
+                        this._oTransport._send(this._sUrl, [oMsg], function(sReturn){
+                                        $.comet._finishInit(sReturn, fCallback)});
+                };
+
+                this._finishInit = function(sReturn, fCallback)
                 {
                         var oReturn = (typeof sReturn != "object") ? (eval('(' + sReturn + ')')[0]) : sReturn[0];
@@ -211 +213 @@
                                 $.comet._oTransport.version = $.comet.version;
                                 $.comet.clientId = oReturn.clientId;
-                                $.comet._oTransport.startup(oReturn);
+                                $.comet._oTransport.startup(oReturn,fCallback);
                                 $.comet.endBatch();
                         }
-                };
-
-                this._sendMessage = function(oMsg)
+
+                };
+                //batch mode defaults to null
+                this._sendMessage = function(oMsg, batchMode)
                 {
                         if($.comet._nBatch <= 0)
@@ -231 +234 @@
                                         oMsg.id = $.comet._nNextId++;
                                 }
-
-                                $.comet._oTransport._send($.comet._sUrl, oMsg);
+                                if( batchMode )
+                                        $.comet._oTransport._send($.comet._sUrl, oMsg);
+                                else
+                                        $.comet._oTransport._send($.comet._sUrl, [oMsg]);
                         }
                         else
@@ -244 +249 @@
                 this.endBatch = function() {
                         if(--this._nBatch == 0)
-                        {
-                                this._sendMessage(this._aMessageQueue);
+                        {       
+                                if( this._aMessageQueue.length > 0 )
+                                        this._sendMessage(this._aMessageQueue, true);
 
                                 this._aMessageQueue = [];

web/js/poker-client.js

@@ -61 +61 @@
         }
         //Do status generating code here
-        var player_names = []
-
-
-                if( stat.table_info ) {
-                        ti = stat.table_info;
-                        player_names = ti.player_names;
-                        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 );
-                                                }
+        var player_names = [];
+
+
+        if( stat.table_info ) {
+                ti = stat.table_info;
+                player_names = ti.player_names;
+                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 );
                                         }
-                                players[pn].updatePublic( ti.players[pn] );
-                        }
-                }
+                                }
+                        players[pn].updatePublic( ti.players[pn] );
+                }
+        }
         if( stat.game_state ) {
                 gs = stat.game_state;
@@ -174 +174 @@
         //$("form#connect_form").hide();
                 //
-                $.comet.init("/cometd");
-                $.comet.subscribe("/poker", processStatus);
+                $.comet.init("/cometd", function() {
+                        $.comet.subscribe("/poker", processStatus);})
 
                 sel = $('selector');
@@ -200 +200 @@
         });
 
+