From 109a31e1f4803a54ab42b9c871473a38a2004399 Mon Sep 17 00:00:00 2001
From: Ian Gulliver <ian@isinglasstheater.org>
Date: Sun, 18 May 2014 11:47:23 +0300
Subject: [PATCH] Much more careful tracking of current createChannel state, so
 we don't issue duplicate RPCs or create duplicate channels.

---
 static/cosmopolite.js | 62 ++++++++++++++++++++++++++++++++++---------
 1 file changed, 49 insertions(+), 13 deletions(-)

diff --git a/static/cosmopolite.js b/static/cosmopolite.js
index 7919fbf..e033ae1 100644
--- a/static/cosmopolite.js
+++ b/static/cosmopolite.js
@@ -33,11 +33,12 @@ String.prototype.hashCode = function() {
  * @param {string=} urlPrefix Absolute URL prefix for generating API URL
  * @param {string=} namespace Prefix for localStorage entries.
  */
-Cosmopolite = function(callbacks, urlPrefix, namespace) {
+var Cosmopolite = function(callbacks, urlPrefix, namespace) {
   this.callbacks_ = callbacks || {};
   this.urlPrefix_ = urlPrefix || '/cosmopolite';
   this.namespace_ = namespace || 'cosmopolite';
 
+  this.channelState_ = this.ChannelState.DOWN;
   this.shutdown_ = false;
 
   this.rpcQueue_ = [];
@@ -70,6 +71,20 @@ Cosmopolite = function(callbacks, urlPrefix, namespace) {
   }, this);
 };
 
+
+/**
+ * Channel states
+ * @enum {number}
+ * @const
+ * @private
+ */
+Cosmopolite.prototype.ChannelState = {
+  DOWN: 1,
+  PENDING: 2,
+  UP: 3,
+};
+
+
 /**
  * Shutdown this instance.
  *
@@ -417,6 +432,12 @@ Cosmopolite.prototype.sendRPCs_ = function(commands, delay) {
  * Send RPCs to create a server -> client channel and (re-)subscribe to subjects
  */
 Cosmopolite.prototype.createChannel_ = function() {
+  if (this.channelState_ == this.ChannelState.DOWN) {
+    this.channelState_ = this.ChannelState.PENDING;
+  } else {
+    return;
+  }
+
   var rpcs = [
     {
       'command':   'createChannel',
@@ -451,6 +472,13 @@ Cosmopolite.prototype.onCreateChannel_ = function(data) {
   if (this.shutdown_) {
     return;
   }
+
+  if (this.channelState_ == this.ChannelState.PENDING) {
+    this.channelState_ = this.ChannelState.OPEN;
+  } else {
+    return;
+  }
+
   var channel = new goog.appengine.Channel(data['token']);
   console.log(this.loggingPrefix_(), 'opening channel:', data['token']);
   this.socket_ = channel.open({
@@ -476,9 +504,17 @@ Cosmopolite.prototype.onSocketOpen_ = function() {
  */
 Cosmopolite.prototype.onSocketClose_ = function() {
   console.log(this.loggingPrefix_(), 'channel closed');
+
   if (this.shutdown_) {
     return;
   }
+
+  if (this.channelState_ == this.ChannelState.OPEN) {
+    this.channelState_ = this.ChannelState.DOWN;
+  } else {
+    return;
+  }
+
   this.createChannel_();
 };
 
@@ -491,6 +527,18 @@ Cosmopolite.prototype.onSocketMessage_ = function(msg) {
   this.onServerEvent_(JSON.parse(msg.data));
 };
 
+/**
+ * Callback from channel library for error on channel
+ *
+ * @param {!string} msg Descriptive text
+ */
+Cosmopolite.prototype.onSocketError_ = function(msg) {
+  console.log(this.loggingPrefix_(), 'socket error:', msg);
+  if (this.socket_) {
+    this.socket_.close();
+  }
+};
+
 /**
  * Callback on receiving a 'login' event from the server
  *
@@ -575,17 +623,5 @@ Cosmopolite.prototype.onServerEvent_ = function(e) {
   }
 };
 
-/**
- * Callback from channel library for error on channel
- *
- * @param {!string} msg Descriptive text
- */
-Cosmopolite.prototype.onSocketError_ = function(msg) {
-  console.log(this.loggingPrefix_(), 'socket error:', msg);
-  if (this.socket_) {
-    this.socket_.close();
-  }
-};
-
 /* Exported values */
 window.Cosmopolite = Cosmopolite;