to es6 classes

2016-02-13 05:03:21 +08:00
parent 2ce457bff2
commit 0c64766ae0
5 changed files with 340 additions and 323 deletions
@@ -1,12 +1,10 @@
+"use strict";
+
 var cl = global.botanLoader;
 var Dragonfly = global.Dragonfly;

-var util = require( "util" );
-var events = require( "events" );
-
 var FatalError = cl.load( "botanss.errors.FatalError" )

-
 var MaxRedirect = 10;

 var stripURI = function( url )
@@ -14,124 +12,133 @@ var stripURI = function( url )
 	return url.replace( /\/+/g, '/' ).replace( /^\//, '' );
 };

-var RelayPoint = function( uri, internal )
+class RelayPoint
 {
-	this.direct = Boolean(
-		typeof internal !== 'undefined' ? internal : false
-	);
-
-	this.value = internal ? uri : stripURI( uri );
-	this.params = Array.prototype.slice.call( arguments, 2 );
-};
-
-var Router = function( http )
-{
-	events.EventEmitter.call( this );
-
-	this.HTTP = http;
-	this.routes = {};
-	this.routable = true;
-	this.redirect_count = 0;
-
-	// Changed when routing
-	this.inputs = [];
-	this.routeObj = {};
-	this.reRoute = false;
-
-	this.relaying = new RelayPoint( http.request.raw.url.split( "?" )[0] );
-};
-
-util.inherits( Router, events.EventEmitter );
-
-Router.prototype.addRoute = function( _name, _route, _action, _status )
-{
-	this.routes[ _name ] = {
-		name: _name
-		, route: _route
-		, action: String( _action )
-		, status: Boolean(
-			typeof _status !== 'undefined' ? _status : true
-		)
-	};
-};
-
-Router.prototype.route = function()
-{
-	if( MaxRedirect < this.redirect_count )
-		throw new FatalError( "Max redirection reached" );
-
-	this.redirect_count ++;
-	this.inputs[ this.inputs.length ] = this.relaying;
-
-	var currentRoute = this.relaying.value;
-	var r;
-
-	// Direct means reroute using route key to match the route
-	if( this.relaying.direct )
+	constructor( uri, internal )
 	{
-		if( r = this.routes[ this.relaying.value ] )
-		{
-			this.routable = false;
-			this.setRoute( r );
-			return r.action;
-		}
+		this.direct = Boolean(
+			typeof internal !== 'undefined' ? internal : false
+		);
+
+		this.value = internal ? uri : stripURI( uri );
+		this.params = Array.prototype.slice.call( arguments, 2 );
 	}
-	else
+};
+
+var EventEmitter = require( "events" ).EventEmitter;
+
+class Router extends EventEmitter
+{
+	constructor ( http )
 	{
-		// Parse RegEx rules one by one
-		for( var i in this.routes )
+		super();
+
+		this.HTTP = http;
+		this.routes = {};
+		this.routable = true;
+		this.redirect_count = 0;
+
+		// Changed when routing
+		this.inputs = [];
+		this.routeObj = {};
+		this.reRoute = false;
+
+		this.relaying = new RelayPoint( http.request.raw.url.split( "?" )[0] );
+	}
+
+	addRoute( _name, _route, _action, _status )
+	{
+		this.routes[ _name ] = {
+			name: _name
+			, route: _route
+			, action: String( _action )
+			, status: Boolean(
+				typeof _status !== 'undefined' ? _status : true
+			)
+		};
+	}
+
+	route()
+	{
+		if( MaxRedirect < this.redirect_count )
+			throw new FatalError( "Max redirection reached" );
+
+		this.redirect_count ++;
+		this.inputs[ this.inputs.length ] = this.relaying;
+
+		var currentRoute = this.relaying.value;
+		var r;
+
+		// Direct means reroute using route key to match the route
+		if( this.relaying.direct )
 		{
-			r = this.routes[i];
-			if( r.route.constructor.prototype.exec )
+			if( r = this.routes[ this.relaying.value ] )
 			{
-				var match = r.route.exec( currentRoute );
-				if( match )
+				this.routable = false;
+				this.setRoute( r );
+				return r.action;
+			}
+		}
+		else
+		{
+			// Parse RegEx rules one by one
+			for( var i in this.routes )
+			{
+				r = this.routes[i];
+				if( r.route.constructor.prototype.exec )
 				{
-					// Set routable to false
-					this.routable = false;
-					this.setRoute( r, match );
-					return r.action;
+					var match = r.route.exec( currentRoute );
+					if( match )
+					{
+						// Set routable to false
+						this.routable = false;
+						this.setRoute( r, match );
+						return r.action;
+					}
 				}
 			}
 		}
+
+		this.setRoute( "*", currentRoute );
+		this.routable = false;
+		return false;
 	}

-	this.setRoute( "*", currentRoute );
-	this.routable = false;
-	return false;
-};

-// Set Route
-Router.prototype.setRoute = function( _route, _match )
-{
-	var _self = this;
-	this.routeObj = {
-		route: _route
-		, match: _match
-		, router: _self.router
-		, inputs: _self.inputs
+	// Set Route
+	setRoute( _route, _match )
+	{
+		var _self = this;
+		this.routeObj = {
+			route: _route
+			, match: _match
+			, router: _self.router
+			, inputs: _self.inputs
+
+			// Re-route function
+			, reRoute: function( target, direct )
+			{
+				Dragonfly.Debug(
+					"Reroute: " + target
+					+ ( direct ? ", Direct" : "" )
+				);
+				_self.relaying = new RelayPoint( target, direct );
+				_self.routable = true;
+				_self.reRoute = true;
+				_self.emit( "Route" );
+			}
+			, redirect: function( target )
+			{
+				Dragonfly.Debug( "Redirect: " + target );
+				_self.relaying = new RelayPoint( "302", true, target );
+				_self.routable = true;
+				_self.reRoute = true;
+				_self.emit( "Route" );
+			}
+		};
+	}
+
+}

-		// Re-route function
-		, reRoute: function( target, direct )
-		{
-			Dragonfly.Debug(
-				"Reroute: " + target
-				+ ( direct ? ", Direct" : "" )
-			);
-			_self.relaying = new RelayPoint( target, direct );
-			_self.routable = true;
-			_self.reRoute = true;
-			_self.emit( "Route" );
-		}
-		, redirect: function( target )
-		{
-			Dragonfly.Debug( "Redirect: " + target );
-			_self.relaying = new RelayPoint( "302", true, target );
-			_self.routable = true;
-			_self.reRoute = true;
-			_self.emit( "Route" );
-		}
-	};
-};

 module.exports = Router;