Fix app launcher

Author: RedCarrottt

app-launcher/http-server.js

@@ -14,10 +14,12 @@
  */
 
 var http = require('http');
+var Util = require('./util.js');
 
-function HTTPServer(entries, isVerbose = false) {
+function HTTPServer(entries, onDefaultEntryHandler, isVerbose = false) {
   // Initialize properties
   this.mEntries = [];
+  this.mOnDefaultEntryHandler = onDefaultEntryHandler;
   this.mServer = http.createServer();
 
   // Initial http server entries
@@ -65,7 +67,7 @@ HTTPServer.prototype._onHTTPRequest = function (request, response, data) {
     }
   }
   if (!entryFound) {
-    responseParams = onGetControlpadPage(request, data);
+    responseParams = this.mOnDefaultEntryHandler(request, data);
   }
   response.setHeader('Content-Length', responseParams.message.length);
   response.writeHead(responseParams.code);

app-launcher/index.js

@@ -64,10 +64,14 @@ var onGetControlpadPage = function (request, data) {
     return html;
   };
 
-  var results = {message: RESULT_FAILED, code: 404};
+  var results = {message: 'Not found ' + request.url, code: 404};
 
   var urlTokens = Util.parseUrl(request.url);
-  var controlpadDir = path.join(Util.getAntRootDir(), 'controlpad');
+  var controlpadDir = path.join(
+    Util.getAntRootDir(),
+    'app-launcher',
+    'controlpad'
+  );
   if (urlTokens.length == 0) {
     var filePath = path.join(controlpadDir, '/index.html');
 
@@ -81,7 +85,6 @@ var onGetControlpadPage = function (request, data) {
     for (var i = 0; i < urlTokens.length; i++) {
       filePath = path.join(filePath, urlTokens[i]);
     }
-    console.log('read: ' + filePath);
     if (fs.existsSync(filePath)) {
       results.message = fs.readFileSync(filePath);
       results.code = 200;
@@ -396,7 +399,11 @@ var mainLoop = function () {
   console.log('ANT app launcher daemon start');
 
   // Initialize app manager and HTTP server
-  gHTTPServer = new HTTPServer(gInitialHTTPServerEntries, gConfig.isVerbose);
+  gHTTPServer = new HTTPServer(
+    gInitialHTTPServerEntries,
+    onGetControlpadPage,
+    gConfig.isVerbose
+  );
   gAppManager = new AppManager(onAppAdded, onAppRemoved);
   gCompanionAdapter = new CompanionAdapter();
 

app-launcher/util.js

@@ -47,4 +47,4 @@ Util.prototype.getIPAddress = function (nameHead) {
   return undefined;
 };
 
-module.exports = Util;
+module.exports = new Util();

scripts/prepare-ubuntu.sh

@@ -19,6 +19,7 @@ then
   ${SUDO} apt-get install -y cmake git glib-2.0 \
     libdbus-1-dev libdbus-glib-1-2 libdbus-glib-1-dev python
   ${SUDO} apt-get install -y software-properties-common
+  ${SUDO} apt-get install -y libcurl3
   ${SUDO} apt-get install -y libcurl4-openssl-dev
   ${SUDO} apt-get install -y libtar-dev
   ${SUDO} apt-get install -y