added socket reconnect session re-establishment

gero3 · Nov 24, 2011 · a77853f · a77853f
1 parent acec689
commit a77853f
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 2 deletions.
diff --git a/client/core/ide.js b/client/core/ide.js
@@ -132,6 +132,19 @@ define(function(require, exports, module) {
                     workspaceId: ide.workspaceId
                 }));
             };
+
+            ide.socketReconnect = function() {
+                // on a reconnect of the socket.io connection, the server may have
+                // lost our session. Now we do an HTTP request to fetch the current
+                // session ID and update the Cloud9 config with it. Also, re-attach
+                // with the backend.
+                apf.ajax("/reconnect", {
+                    callback: function(data, state, extra) {
+                        ide.sessionId = data;
+                        ide.socketConnect();
+                    }
+                });
+            };
 
             ide.socketDisconnect = function() {
                 clearTimeout(ide.$retryTimer);
@@ -210,7 +223,7 @@ define(function(require, exports, module) {
 
             ide.socket.on("message",    ide.socketMessage);
             ide.socket.on("connect",    ide.socketConnect);
-            //ide.socket.on("reconnect",  ide.socketReconnect);
+            ide.socket.on("reconnect",  ide.socketReconnect);
             //ide.socket.on("reconnecting",  ide.socketReconnecting);
             ide.socket.on("disconnect", ide.socketDisconnect);
             var _oldsend = ide.socket.send;

diff --git a/server/cloud9/ide.js b/server/cloud9/ide.js
@@ -135,13 +135,20 @@ Ide.DEFAULT_PLUGINS = [
         var path = Url.parse(req.url).pathname;
 
         this.indexRe = this.indexRe || new RegExp("^" + util.escapeRegExp(this.options.baseUrl) + "(?:\\/(?:index.html?)?)?$");
+        this.reconnectRe = this.reconnectRe || new RegExp("^" + util.escapeRegExp(this.options.baseUrl) + "\\/reconnect$");
         this.workspaceRe = this.workspaceRe || new RegExp("^" + util.escapeRegExp(this.options.davPrefix) + "(\\/|$)");
 
         if (path.match(this.indexRe)) {
             if (req.method !== "GET")
                 return next();
             this.$serveIndex(req, res, next);
         }
+        else if (path.match(this.reconnectRe)) {
+            if (req.method !== "GET")
+                return next();
+            res.writeHead(200);
+            res.end(req.sessionID);
+        }
         else if (path.match(this.workspaceRe)) {
             if (!this.davInited) {
                 if (process.platform == "sunos") {
@@ -242,7 +249,7 @@ Ide.DEFAULT_PLUGINS = [
 
                 setTimeout(function() {
                     var now = new Date().getTime();
-                    if((now - user.last_message_time) > 10000) {
+                    if ((now - user.last_message_time) > 10000) {
                         console.log("User fully disconnected", username);
                         _self.removeUser(user);
                     }