Changeset 8579

Timestamp:

05/11/07 16:42:01 (19 months ago)

Author:

alex

Message:

client is working again. Needs advices (ticket 2520). Refs #2520

Files:

• dojox/trunk/io/cometd.js (modified) (13 diffs)

dojox/trunk/io/cometd.js

@@ -73 +73 @@
                 var bindArgs = {
                         url: this.url,
-                        handleAs: "text/json",
+                        handleAs: "json",
                         content: { "message": dojo.toJson([props]) },
                         jsonpParam: "jsonp" // usually ignored
@@ -105 +105 @@
                 }
                 d.addCallback(dojo.hitch(this, "finishInit"));
+                d.addErrback(function(e){ console.debug("handshake error!:", e); });
                 return d;
         }
 
-        this.finishInit = function(type, data, evt, request){
+        this.finishInit = function(data){
                 data = data[0];
                 this.handshakeReturn = data;
@@ -150 +151 @@
         this._deliver = function(message){
                 // dipatch events along the specified path
-                if(!message["channel"]){
-                        console.debug("cometd error: no channel for message!");
-                        return;
-                }
                 if(!this.currentTransport){
                         this.backlog.push(["deliver", message]);
                         return;
                 }
+                if(!message["channel"]){
+                        if(message["success"] !== true){
+                                console.debug("cometd error: no channel for message!", message);
+                                return;
+                        }
+                }
                 this.lastMessage = message;
                 // check to see if we got a /meta channel message that we care about
-                if(     (message.channel.length > 5)&&
+                if(     (message["channel"]) &&
+                        (message.channel.length > 5)&&
                         (message.channel.substr(0, 5) == "/meta")){
                         // check for various meta topic actions that we need to respond to
@@ -186 +190 @@
                         // dispatch the message to any locally subscribed listeners
                         var tname = (this.globalTopicChannels[message.channel]) ? message.channel : "/cometd"+message.channel;
-                        dojo.publish(tname, message);
+                        dojo.publish(tname, [ message ]);
                 }
         }
@@ -268 +272 @@
                                                                 /*obj*/                                 message){
                 console.debug(channel);
-                console.debugShallow(message);
+                console.debug(message);
         }
 
@@ -301 +305 @@
                         // destroy the local topic?
                         var tname = (useLocalTopics) ? channel : "/cometd"+channel;
-                        dojo.event.topic.unsubscribe(tname, objOrFunc, funcName);
+                        dojo.unsubscribe(tname, objOrFunc, funcName);
                 }
                 return this.currentTransport.sendMessage({
@@ -311 +315 @@
         this.unsubscribed = function(/*string*/                         channel, 
                                                                 /*obj*/                                 message){
-                console.debug(channel);
-                console.debugShallow(message);
+                console.debug(channel, message);
         }
 
@@ -455 +458 @@
                                 case "/meta/connect":
                                         if(!message.successful){
-                                                dojo.debug("cometd connection error:", message.error);
+                                                console.debug("cometd connection error:", message.error);
                                                 return;
                                         }
@@ -464 +467 @@
                                 case "/meta/reconnect":
                                         if(!message.successful){
-                                                dojo.debug("cometd reconnection error:", message.error);
+                                                console.debug("cometd reconnection error:", message.error);
                                                 return;
                                         }
@@ -471 +474 @@
                                 case "/meta/subscribe":
                                         if(!message.successful){
-                                                dojo.debug("cometd subscription error for channel", message.channel, ":", message.error);
+                                                console.debug("cometd subscription error for channel", message.channel, ":", message.error);
                                                 return;
                                         }
                                         // this.subscribed(message.channel);
-                                        dojo.debug(message.channel);
+                                        console.debug(message.channel);
                                         break;
                         }
@@ -482 +485 @@
 
         this.openTunnelWith = function(content, url){
-                dojo.xhrPost({
+                console.debug("openTunnelWith:", content, (url||cometd.url));
+                var d = dojo.xhrPost({
                         url: (url||cometd.url),
                         content: content,
-                        handleAs: "text/json",
-                }).addCallback(dojo.hitch(this, function(data){
-                                // console.debug(evt.responseText);
-                                cometd.deliver(data);
-                                this.connected = false;
-                                this.tunnelCollapse();
-                })).addErrback(function(){ 
-                        console.debug("tunnel opening failed"); 
+                        handleAs: "json",
+                });
+                d.addCallback(dojo.hitch(this, function(data){
+                        // console.debug(evt.responseText);
+                        console.debug(data);
+                        cometd.deliver(data);
+                        this.connected = false;
+                        this.tunnelCollapse();
+                }));
+                d.addErrback(function(err){ 
+                        console.debug("tunnel opening failed:", err);
                 });
                 this.connected = true;
@@ -545 +552 @@
                 // FIXME: open up the connection here
                 this.openTunnelWith({
-                        message: dojo.json.serialize([
+                        message: dojo.toJson([
                                 {
                                         channel:        "/meta/connect",
@@ -563 +570 @@
                         this.connected = false;
                         this.openTunnelWith({
-                                message: dojo.json.serialize([
+                                message: dojo.toJson([
                                         {
                                                 channel:        "/meta/reconnect",