Merge pull request #32 from euforic/TIMOB-13931

[TIMOB-13931] add proper removal of closed sockets on server and reset context on client
tidev · May 25, 2013 · d1b33f3 · d1b33f3
2 parents 7af9325 + 75b4736
commit d1b33f3
Show file tree

Hide file tree

Showing 5 changed files with 87 additions and 29 deletions.
diff --git a/build/liveview.js b/build/liveview.js
@@ -238,8 +238,11 @@ Socket.prototype.close = function(serverEnded){
   self.closing = !serverEnded;
 
   if (self.closing){
-    self._proxy.close();
-    return self.emit('close');
+    self.write(function(){
+      self._proxy.close();
+      self.emit('close');
+    });
+    return
   }
 
   var retry = ~~self.retry;
@@ -260,11 +263,13 @@ Socket.prototype.write = function(data, fn) {
     data = null;
   }
 
+  data = (data) ?  ('' + data) : '';
+
+  var msg = Ti.createBuffer({value:  data});
+
   var callback = fn || function(){};
 
-  Ti.Stream.write(this._connection, Ti.createBuffer({
-    value:  '' + data
-  }), function(){
+  Ti.Stream.write(this._connection, msg, function(){
     callback([].slice(arguments));
   });
 
@@ -386,27 +391,41 @@ Module.patch = function (globalCtx, port, url) {
   Module._url = url || 'FSERVER_HOST';
   Module._port = port || 8324;
   Module._requireNative = globalCtx.require;
+  Module.evtServer && Module.evtServer.close();
+  Module.connectServer();
+  Module.require('app');
+}
 
-  /**
+/**
    * [reload description]
    * @return {[type]} [description]
    */
 
-  this.global.reload = function(){
+Module.global.reload = function(){
+  try {
+    Module.evtServer.close();
+    Module = null;
     console.log('[LiveView] Reloading App');
-    try {
-      Ti.App._restart();
-    } catch(e){
-      require('app');
-    }
-  };
+    Ti.App._restart();
+  } catch(e){
+    console.log('[LiveView] Reloading App via Legacy Method');
+    Module.require('app');
+  }
+};
+
+
+Module.connectServer = function() {
 
   var retryInterval = null;
 
-  var client = this.evtServer = new Socket({host: 'TCP_HOST', port: 8323}, function() {
+  var client = Module.evtServer = new Socket({host: 'TCP_HOST', port: 8323}, function() {
     console.log('[LiveView]', 'Connected to Event Server');
   });
 
+  client.on('close', function(){
+    console.log('[LiveView]', 'Closed Previous Event Server client');
+  });
+
   client.on('connect', function(){
     if (retryInterval) {
       clearInterval(retryInterval);

diff --git a/build/liveview.min.js b/build/liveview.min.js
diff --git a/lib/fserver.js b/lib/fserver.js
@@ -209,9 +209,29 @@ FServer.start = function(opts) {
 	evtServer.on('connection', function (client) {
 		console.log('[LiveView]'.green, 'Client connected');
 		evtServer.clients.push(client);
+
+		client.on('end', function(e){
+			console.log('[LiveView]'.green, 'Client disconnected');
+			evtServer.clients.splice(client);
+		})
+
+		client.on('data', function(e){
+			console.log('data:'+e);
+		})
+	});
+
+	evtServer.on('close', function (client) {
+		var clients = evtServer.clients;
+		var clientLen = clients.length;
+
+		for (var i = 0; i < clientLen; i++) {
+			console.log(client[i]);
+			//clients.splice(i);
+		}
 	});
 
 
+
 	evtServer.on('error', function (e) {
 	  if (e.code == 'EADDRINUSE') {
 	    console.log('Address in use, retrying...');

diff --git a/lib/platform/require.js b/lib/platform/require.js
@@ -77,27 +77,41 @@ Module.patch = function (globalCtx, port, url) {
   Module._url = url || 'FSERVER_HOST';
   Module._port = port || 8324;
   Module._requireNative = globalCtx.require;
+  Module.evtServer && Module.evtServer.close();
+  Module.connectServer();
+  Module.require('app');
+}
 
-  /**
+/**
    * [reload description]
    * @return {[type]} [description]
    */
 
-  this.global.reload = function(){
+Module.global.reload = function(){
+  try {
+    Module.evtServer.close();
+    Module = null;
     console.log('[LiveView] Reloading App');
-    try {
-      Ti.App._restart();
-    } catch(e){
-      require('app');
-    }
-  };
+    Ti.App._restart();
+  } catch(e){
+    console.log('[LiveView] Reloading App via Legacy Method');
+    Module.require('app');
+  }
+};
+
+
+Module.connectServer = function() {
 
   var retryInterval = null;
 
-  var client = this.evtServer = new Socket({host: 'TCP_HOST', port: 8323}, function() {
+  var client = Module.evtServer = new Socket({host: 'TCP_HOST', port: 8323}, function() {
     console.log('[LiveView]', 'Connected to Event Server');
   });
 
+  client.on('close', function(){
+    console.log('[LiveView]', 'Closed Previous Event Server client');
+  });
+
   client.on('connect', function(){
     if (retryInterval) {
       clearInterval(retryInterval);

diff --git a/lib/platform/socket.js b/lib/platform/socket.js
@@ -89,8 +89,11 @@ Socket.prototype.close = function(serverEnded){
   self.closing = !serverEnded;
 
   if (self.closing){
-    self._proxy.close();
-    return self.emit('close');
+    self.write(function(){
+      self._proxy.close();
+      self.emit('close');
+    });
+    return
   }
 
   var retry = ~~self.retry;
@@ -111,11 +114,13 @@ Socket.prototype.write = function(data, fn) {
     data = null;
   }
 
+  data = (data) ?  ('' + data) : '';
+
+  var msg = Ti.createBuffer({value:  data});
+
   var callback = fn || function(){};
 
-  Ti.Stream.write(this._connection, Ti.createBuffer({
-    value:  '' + data
-  }), function(){
+  Ti.Stream.write(this._connection, msg, function(){
     callback([].slice(arguments));
   });