Move trie use into store

Author: pseudomuto

lib/configproxy.js

@@ -17,8 +17,7 @@ var http = require('http'),
     util = require('util'),
     URL = require('url'),
     querystring = require('querystring'),
-    store = require('./store.js'),
-    trie = require('./trie.js');
+    store = require('./store.js');
 
 function bound (that, method) {
     // bind a method, to ensure `this=that` when it is called
@@ -103,7 +102,6 @@ function ConfigurableProxy (options) {
     this.options = options || {};
 
     this._routes = store.MemoryStore();
-    this.trie = new trie.URLTrie();
     this.auth_token = this.options.auth_token;
     this.includePrefix = options.includePrefix === undefined ? true : options.includePrefix;
     this.host_routing = this.options.host_routing;
@@ -189,20 +187,18 @@ util.inherits(ConfigurableProxy, EventEmitter);
 
 ConfigurableProxy.prototype.add_route = function (path, data) {
     // add a route to the routing table
-    path = trie.trim_prefix(path);
+    path = this._routes.cleanPath(path);
     if (this.host_routing && path !== '/') {
         data.host = path.split('/')[1];
     }
     this._routes.add(path, data);
-    this.trie.add(path, data);
     this.update_last_activity(path);
 };
 
 ConfigurableProxy.prototype.remove_route = function (path) {
     // remove a route from the routing table
     if (this._routes.hasRoute(path)) {
         this._routes.remove(path);
-        this.trie.remove(path);
     }
 };
 
@@ -274,7 +270,7 @@ ConfigurableProxy.prototype.target_for_req = function (req) {
     var timer = this.statsd.createTimer('find_target_for_req');
     // return proxy target for a given url path
     var base_path = (this.host_routing) ? '/' + parse_host(req) : '';
-    var route = this.trie.get(trie.string_to_path(base_path + decodeURIComponent(req.url)));
+    var route = this._routes.getTarget(base_path + decodeURIComponent(req.url));
     timer.stop();
     if (route) {
         return {

lib/store.js

@@ -1,12 +1,23 @@
+var trie = require("./trie.js");
+
 function MemoryStore () {
   var routes = {};
+  var urls   = new trie.URLTrie()
 
   return {
     get: function (path) { return routes[path]; },
+    getTarget: function(path) { return urls.get(path); },
     getAll: function () { return routes; },
-    add: function (path, data) { routes[path] = data; },
+    cleanPath: function(path) { return trie.trim_prefix(path); },
+    add: function (path, data) {
+      routes[path] = data;
+      urls.add(path, data);
+    },
     update: function(path, data) { Object.assign(routes[path], data) },
-    remove: function (path) { delete routes[path]; },
+    remove: function (path) {
+      delete routes[path];
+      urls.remove(path);
+    },
     hasRoute: function (path) { return routes.hasOwnProperty(path); }
   };
 }