runApp and uninstall should use appId + install app if not installed …

…on runApp user request

change remote-simulator-client runApp and uninstall methods to use appId
(an in the install method) and use the appId to check if the application
is already installed in the DOMApllicationRegistry.webapps on the b2g side.

If an app in not installed try to install and run it again.

addon/lib/remote-simulator-client.js

@@ -219,10 +219,10 @@ const RemoteSimulatorClient = Class({
   },
 
   // send a runApp request to the remote simulator actor
-  runApp: function(appOrigin, onResponse) {
+  runApp: function(appId, onResponse) {
     let remote = this._remote;
 
-    remote.client.request({to: remote.simulator, type: "runApp", origin: appOrigin},
+    remote.client.request({to: remote.simulator, type: "runApp", appId: appId},
                           onResponse);
   },
 
@@ -235,10 +235,10 @@ const RemoteSimulatorClient = Class({
                                 onResponse);
   },
 
-  uninstall: function(appOrigin, onResponse) {
+  uninstall: function(appId, onResponse) {
     this._remote.client.request({ to: this._remote.simulator,
                                   type: "uninstallApp",
-                                  origin: appOrigin,
+                                  appId: appId,
                                 },
                                 onResponse);
   },

addon/lib/simulator.js

@@ -131,7 +131,7 @@ let simulator = module.exports = {
           simulator.error(error);
         } else {
           simulator.sendListApps();
-          simulator.runApp(app.origin);
+          simulator.runApp(app);
         }
       });
     }
@@ -353,7 +353,7 @@ let simulator = module.exports = {
     apps[id] = config;
 
     simulator.run(function() {
-      simulator.remoteSimulator.uninstall(config.origin, function() {
+      simulator.remoteSimulator.uninstall(config.xkey, function() {
         // app uninstall completed
         // TODO: add success/error detection and report to the user
         simulator.sendListApps();
@@ -379,7 +379,7 @@ let simulator = module.exports = {
         simulator.error(error);
       } else {
         simulator.sendListApps();
-        simulator.runApp(app.origin);
+        simulator.runApp(app);
       }
     });
   },
@@ -570,7 +570,7 @@ let simulator = module.exports = {
         simulator.error(error);
       } else {
         simulator.sendListApps();
-        simulator.runApp(app.origin);
+        simulator.runApp(app);
       }
     });
   },
@@ -692,9 +692,9 @@ let simulator = module.exports = {
     }
   },
 
-  runApp: function(appOrigin, next) {
+  runApp: function(app, next) {
     this.run(function () {
-      simulator.remoteSimulator.runApp(appOrigin, next);
+      simulator.remoteSimulator.runApp(app.xkey, next);
     });
   },
 
@@ -764,13 +764,26 @@ let simulator = module.exports = {
             simulator.error(error);
           } else {
             simulator.sendListApps();
-            simulator.runApp(app.origin);
+            simulator.runApp(app);
           }
         });
         break;
       case "runApp":
-        let appOrigin = this.apps[message.id].origin;
-        simulator.runApp(appOrigin);
+        let app = this.apps[message.id];
+        simulator.runApp(app, function (res) {
+          if (res.success === false) {
+            if (res.error === 'app-not-installed') {
+              // install and run if not installed
+              simulator.onMessage({
+                name: "updateApp",
+                id: message.id
+              });
+            } else {
+              // print error message
+              simulator.error("Run app failed: "+res.message);
+            }
+          }
+        });
         break;
       case "removeApp":
         this.removeApp(message.id);

prosthesis/content/dbg-simulator-actors.js

@@ -61,12 +61,18 @@ SimulatorActor.prototype = {
   },
 
   onRunApp: function(aRequest) {
-    log("simulator actor received a 'runApp' command:" + aRequest.origin);
+    log("simulator actor received a 'runApp' command:" + aRequest.appId);
     let window = this.simulatorWindow;
     let homescreen = XPCNativeWrapper.unwrap(this.homescreenWindow);
     let WindowManager = homescreen.WindowManager;
-    let Applications = homescreen.Applications;
-    let appOrigin = aRequest.origin;
+    let DOMApplicationRegistry = window.DOMApplicationRegistry;
+    let appId = aRequest.appId;
+
+    if (!DOMApplicationRegistry.webapps[appId]) {
+      return { success: false, error: 'app-not-installed', message: 'App not installed.'}
+    }
+
+    let appOrigin = DOMApplicationRegistry.webapps[appId].origin;
 
     let runnable = {
       run: function() {
@@ -173,19 +179,30 @@ SimulatorActor.prototype = {
     Services.tm.currentThread.dispatch(runnable,
                                        Ci.nsIThread.DISPATCH_NORMAL);
     return {
-      message: "runApp request received: " + appOrigin
+      message: "runApp request received: " + appOrigin,
+      success: true
     };
   },
 
   onUninstallApp: function(aRequest) {
-    log("simulator actor received 'uninstallApp' command: " + aRequest.origin);
+    log("simulator actor received 'uninstallApp' command: " + aRequest.appId);
     let window = this.simulatorWindow;
+    let DOMApplicationRegistry = window.DOMApplicationRegistry;
+    let appId = aRequest.appId;
+
+    if (!DOMApplicationRegistry.webapps[appId]) {
+      return { success: false, error: 'app-not-installed', message: 'App not installed.'}
+    }
+
+    let appOrigin = DOMApplicationRegistry.webapps[appId].origin;
+
+    log("uninstalling app by origin:"+appOrigin);
 
     let runnable = {
       run: function() {
         try {
           let mgmt = window.navigator.mozApps.mgmt;
-          let req = mgmt.uninstall({origin: aRequest.origin});
+          let req = mgmt.uninstall({origin: appOrigin});
           req.onsuccess = function () {
             log("uninstallApp success: " + req.result);
           }
@@ -201,7 +218,8 @@ SimulatorActor.prototype = {
     Services.tm.currentThread.dispatch(runnable,
                                        Ci.nsIThread.DISPATCH_NORMAL);
     return {
-      message: "uninstallApp request received"
+      message: "uninstallApp request received",
+      success: true
     };
   },