Simplified http handler. /deep/base/path/urls/irc.network.com URLs now working

diff --git a/client/build.js b/client/build.js
index 01ea6c488faf39bc46c0158f31ac88d75ae8ea5f..e7c4b2eada5dc7dfb859974d52a2703aa23a064c 100644 (file)
--- a/client/build.js
+++ b/client/build.js
@@ -221,7 +221,7 @@ fs.readdir(__dirname + '/src/translations', function (err, translation_files) {
  */\r
 \r
 var index_src = fs.readFileSync(__dirname + '/src/index.html.tmpl', FILE_ENCODING)\r
-    .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '/kiwi')\r
+    .replace(new RegExp('<%base_path%>', 'g'), config.get().http_base_path || '')\r
     .replace(new RegExp('<%build_version%>', 'g'), package_json.version);\r
 \r
 fs.writeFile(__dirname + '/index.html', index_src, { encoding: FILE_ENCODING }, function (err) {\r

diff --git a/client/src/models/application.js b/client/src/models/application.js
index 43af0b4b26558e5d5d4a863b304da27bfdca0314..4b828f26acadff9d1f3c44b4255a4d675dafb29f 100644 (file)
--- a/client/src/models/application.js
+++ b/client/src/models/application.js
@@ -16,7 +16,7 @@
             }\r
 \r
             // The base url to the kiwi server\r
-            this.set('base_path', options.base_path ? options.base_path : '/kiwi');\r
+            this.set('base_path', options.base_path ? options.base_path : '');\r
 \r
             // Path for the settings.json file\r
             this.set('settings_path', options.settings_path ?\r

diff --git a/server/httphandler.js b/server/httphandler.js
index f491ddebd5f1d6b0b22e44a2da6452277af689ca..477992bfafd7e409b455ae0407ca26456c2e7a10 100644 (file)
--- a/server/httphandler.js
+++ b/server/httphandler.js
@@ -20,25 +20,22 @@ module.exports.HttpHandler = HttpHandler;
 
 HttpHandler.prototype.serve = function (request, response) {
     // The incoming requests base path (ie. /kiwiclient)
-    var base_path = global.config.http_base_path || '/kiwi',
-        base_path_regex;
+    var base_path = global.config.http_base_path || '',
+        whitelisted_folders = ['assets', 'src'];
 
-    // Trim of any trailing slashes
+    // Trim off any trailing slashes
     if (base_path.substr(base_path.length - 1) === '/') {
         base_path = base_path.substr(0, base_path.length - 1);
     }
 
-    // Build the regex to match the base_path
-    base_path_regex = base_path.replace(/[-/\\^$*+?.()|[\]{}]/g, '\\$&');
-
-    // Any asset request to head into the asset dir
-    request.url = request.url.replace(base_path + '/assets/', '/assets/');
-
-    // Any src request to head into the src dir
-    request.url = request.url.replace(base_path + '/src/', '/src/');
+    // Map any whitelisted folders to the local directories
+    whitelisted_folders.forEach(function(folder) {
+        request.url = request.url.replace(base_path + '/' + folder + '/', '/' + folder + '/');
+    });
 
-    // Any requests for /client to load the index file
-    if (request.url.match(new RegExp('^' + base_path_regex + '([/$]|$)', 'i'))) {
+    // Any requests for /base_path/* to load the index file
+    console.log(request.url, base_path);
+    if (request.url.toLowerCase().indexOf(base_path.toLowerCase()) === 0) {
         request.url = '/index.html';
     }