Merge pull request #36 from euforic/TIMOB-14267

[TIMOB-14267] LiveView - Running multiple instances of the application on iOS and Android, iOS instances lose connection to LiveView Server
tidev · Jun 27, 2013 · 5375660 · 5375660
2 parents ba550f8 + db5f310
commit 5375660
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 16 deletions.
diff --git a/build/liveview.js b/build/liveview.js
@@ -387,8 +387,13 @@ Module._includeNative = function(){
  * @api private
  */
 
-Module.patch = function (globalCtx, port, url) {
-  Module._url = url || 'FSERVER_HOST';
+Module.patch = function (globalCtx, url, port) {
+
+  var defaultURL = (process.platform === 'android' && process.hardware === 'sdk')
+    ? '10.0.2.2'
+    : 'FSERVER_HOST';
+
+  Module._url = url || defaultURL;
   Module._port = port || 8324;
   Module._requireNative = globalCtx.require;
   Module.evtServer && Module.evtServer.close();
@@ -543,7 +548,6 @@ Module.prototype._getRemoteSource = function(file,timeout){
   request.cache = false;
   request.open("GET", file);
   request.send();
-
   while(!rsp){
     if (request.readyState === 4 ) {
       if (request.status !== 200) {
@@ -553,7 +557,7 @@ Module.prototype._getRemoteSource = function(file,timeout){
       rsp = request.responseText;
     } else if ((expireTime -  (new Date()).getTime()) <= 0) {
       rsp = true;
-      throw new Error('[LiveView]', 'File Server unavailable. Host Unreachable');
+      throw new Error('[LiveView] File Server unavailable. Host Unreachable');
     }
   }
 

diff --git a/build/liveview.min.js b/build/liveview.min.js
diff --git a/hook/lvhook.js b/hook/lvhook.js
@@ -155,11 +155,6 @@ exports.init = function(logger, config, cli) {
 				iface(function(interfaces) {
 					var names = Object.keys(interfaces).sort(),
 						ipAddr;
-
-					if (cli.argv.platform == 'android' && cli.argv.target == 'emulator') {
-						// android emulator is special
-						ipAddr = '10.0.2.2';
-					} else {
 						// note: this finds the first physical interface which may not necessarily be the default gateway interface
 						for (var i = 0; i < names.length; i++) {
 							if (interfaces[names[i]].macAddress) {
@@ -173,7 +168,6 @@ exports.init = function(logger, config, cli) {
 								break;
 							}
 						}
-					}
 
 					if (ipAddr) {
 						fs.writeFileSync(liveviewJS, fs.readFileSync(liveviewJS).toString().replace(/FSERVER_HOST/g, ipAddr).replace(/TCP_HOST/g, ipAddr));

diff --git a/lib/platform/require.js b/lib/platform/require.js
@@ -73,8 +73,13 @@ Module._includeNative = function(){
  * @api private
  */
 
-Module.patch = function (globalCtx, port, url) {
-  Module._url = url || 'FSERVER_HOST';
+Module.patch = function (globalCtx, url, port) {
+
+  var defaultURL = (process.platform === 'android' && process.hardware === 'sdk')
+    ? '10.0.2.2'
+    : 'FSERVER_HOST';
+
+  Module._url = url || defaultURL;
   Module._port = port || 8324;
   Module._requireNative = globalCtx.require;
   Module.evtServer && Module.evtServer.close();
@@ -229,7 +234,6 @@ Module.prototype._getRemoteSource = function(file,timeout){
   request.cache = false;
   request.open("GET", file);
   request.send();
-
   while(!rsp){
     if (request.readyState === 4 ) {
       if (request.status !== 200) {
@@ -239,7 +243,7 @@ Module.prototype._getRemoteSource = function(file,timeout){
       rsp = request.responseText;
     } else if ((expireTime -  (new Date()).getTime()) <= 0) {
       rsp = true;
-      throw new Error('[LiveView]', 'File Server unavailable. Host Unreachable');
+      throw new Error('[LiveView] File Server unavailable. Host Unreachable');
     }
   }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "liveview",
-  "version": "0.1.25",
+  "version": "0.1.26",
   "description": "Titanium Live Realtime App Development",
   "main": "index.js",
   "private": true,