Botanical/BotanSS
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

to es6 classes

Browse Source
This commit is contained in:
斟酌 鵬兄 2016-02-13 05:03:21 +08:00
parent 2ce457bff2
commit 0c64766ae0
5 changed files with 340 additions and 323 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
net/Http.js
View File

@ -7,7 +7,7 @@ var Cookie = cl.load( "botanss.net.components.Cookie" );
class CResponse
{
constructor( res )
constructor( res, Http )
{
this.raw = res;
this.canExit = true;
@ -19,7 +19,7 @@ class CResponse
};
this.content = "";
this.cookie = new Cookie( "", this );
this.cookie = new Cookie( "", Http );
}
@ -45,11 +45,11 @@ class CRequest
get isPost() { return this.raw.method == 'POST'; }
get remoteAddr() { return this.raw.connection.remoteAddress; }
constructor( req )
constructor( req, Http )
{
this.raw = req;
this.uri = require('url').parse( req.url );
this.cookie = new Cookie( req.headers.cookie, this )
this.cookie = new Cookie( req.headers.cookie, Http )
}
}
@ -60,8 +60,8 @@ class Http
var _self = this;
// Simple Http Model
this.response = new CResponse( res );
this.request = new CRequest( req );
this.response = new CResponse( res, this );
this.request = new CRequest( req, this );
}
}

47
net/Router.js
View File

@ -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,19 +12,26 @@ var stripURI = function( url )
return url.replace( /\/+/g, '/' ).replace( /^\//, '' );
};
var RelayPoint = function( uri, internal )
class RelayPoint
{
constructor( uri, internal )
{
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 )
var EventEmitter = require( "events" ).EventEmitter;
class Router extends EventEmitter
{
events.EventEmitter.call( this );
constructor ( http )
{
super();
this.HTTP = http;
this.routes = {};
@ -39,12 +44,10 @@ var Router = function( http )
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 )
{
addRoute( _name, _route, _action, _status )
{
this.routes[ _name ] = {
name: _name
, route: _route
@ -53,10 +56,10 @@ Router.prototype.addRoute = function( _name, _route, _action, _status )
typeof _status !== 'undefined' ? _status : true
)
};
};
}
Router.prototype.route = function()
{
route()
{
if( MaxRedirect < this.redirect_count )
throw new FatalError( "Max redirection reached" );
@ -99,11 +102,12 @@ Router.prototype.route = function()
this.setRoute( "*", currentRoute );
this.routable = false;
return false;
};
}
// Set Route
Router.prototype.setRoute = function( _route, _match )
{
// Set Route
setRoute( _route, _match )
{
var _self = this;
this.routeObj = {
route: _route
@ -132,6 +136,9 @@ Router.prototype.setRoute = function( _route, _match )
_self.emit( "Route" );
}
};
};
}
}
module.exports = Router;

148
net/WebFrame.js
View File

@ -1,14 +1,18 @@
"use strict";
var cl = global.botanLoader;
var Dragonfly = global.Dragonfly;
var CondStream = cl.load( "botanss.utils.CondStream" );
var FatalError = cl.load( "botanss.errors.FatalError" );
var Framework = function( garden )
class WebFrame
{
constructor( Http )
{
var _self = this;
this.HTTP = garden;
this.HTTP = Http;
this.result = 0;
this.planted = false;
this.requestStr = "";
@ -16,12 +20,12 @@ var Framework = function( garden )
var Router = cl.load( "botanss.net.Router" );
var router = new Router( garden );
var router = new Router( Http );
router.addRoute( "302", false, "302" );
router.addRoute( "403", false, "403" );
router.addRoute( "404", false, "404" );
router.addRoute( "500", false, "500" );
router.addListener( "Route", this.parseResult.bind( this ) );
router.addListener( "Route", this.__parse.bind( this ) );
this.router = router;
@ -55,23 +59,23 @@ var Framework = function( garden )
_self.plantResult();
}
}
};
}
Framework.prototype.run = function()
{
run()
{
var _self = this;
var method = "GET";
if( this.HTTP.request.isPost )
{
_self.requestStr = new CondStream( "/tmp/", 2048 );
this.requestStr = new CondStream( "/tmp/", 2048 );
this.HTTP.request.raw.addListener(
"data" , ( x ) => _self.requestStr.write( x )
);
this.HTTP.request.raw.addListener(
"end", () => _self.requestStr.end( () => _self.parseResult() )
"end", () => _self.requestStr.end( () => _self.__parse() )
);
method = "POST";
@ -87,18 +91,71 @@ Framework.prototype.run = function()
if( method == "GET" )
{
_self.queryStr = url.split( "?" )[1];
_self.parseResult();
this.queryStr = url.split( "?" )[1];
this.__parse();
}
}
};
Framework.prototype.addHandler = function( name, method )
{
addHandler( name, method )
{
this.handlers[ name ] = method.bind( this );
};
}
Framework.prototype.parseResult = function()
{
plantResult()
{
if( this.planted ) return;
this.planted = true;
if( this.HTTP )
{
if( !( this.result instanceof Buffer ) )
{
this.result = new Buffer( this.result + "" );
}
this.HTTP.response.headers["Content-Length"] = this.result.length;
this.HTTP.response.write( this.result );
this.HTTP.response.end();
Dragonfly.Debug( "Result Planted" );
}
// Release resources
if( this.requestStr )
{
this.requestStr.discard();
}
}
// This won't handle path exists
// throwing an error is better than handling it
// Need to handle it somewhere else
plantFile( path, name )
{
if( this.planted ) return;
var _self = this;
this.planted = true;
var resp = this.HTTP.response;
if( !name )
{
var p = require( "path" );
name = p.basename( path );
}
resp.headers[ "Content-Disposition" ] = "attachment; filename=\"" + name + "\"";
var fs = require( "fs" );
Dragonfly.Debug( "Stream out: " + path );
var rs = fs.createReadStream( path );
rs.addListener( "data", ( x ) => resp.write( x ) );
rs.addListener( "end", () => resp.end() );
}
__parse()
{
if( this.router.routable )
{
var method = this.router.route();
@ -121,60 +178,7 @@ Framework.prototype.parseResult = function()
throw new FatalError( "Relay handler \"" + method + "\" is not defined" );
}
};
Framework.prototype.plantResult = function()
{
if( this.planted ) return;
this.planted = true;
if( this.HTTP )
{
if( !( this.result instanceof Buffer ) )
{
this.result = new Buffer( this.result + "" );
}
}
this.HTTP.response.headers["Content-Length"] = this.result.length;
this.HTTP.response.write( this.result );
this.HTTP.response.end();
Dragonfly.Debug( "Result Planted" );
}
// Release resources
if( this.requestStr )
{
this.requestStr.discard();
}
};
// This won't handle path exists
// throwing an error is better than handling it
// Need to handle it somewhere else
Framework.prototype.plantFile = function( path, name )
{
if( this.planted ) return;
var _self = this;
this.planted = true;
var resp = this.HTTP.response;
if( !name )
{
var p = require( "path" );
name = p.basename( path );
}
resp.headers[ "Content-Disposition" ] = "attachment; filename=\"" + name + "\"";
var fs = require( "fs" );
Dragonfly.Debug( "Stream out: " + path );
var rs = fs.createReadStream( path );
rs.addListener( "data", ( x ) => resp.write( x ) );
rs.addListener( "end", () => resp.end() );
};
module.exports = Framework;
module.exports = WebFrame;

28
net/components/Cookie.js
View File

@ -1,25 +1,24 @@
"use strict";
var cl = global.botanLoader;
var util = require( "util" );
var WebParam = cl.load( "botanss.utils.WebParam" );
var Cookie = function( cookieStr, HTTP )
class Cookie extends WebParam
{
WebParam.call( this, cookieStr );
constructor( cookieStr, HTTP )
{
super( cookieStr );
this.HTTP = HTTP;
};
}
util.inherits( Cookie, WebParam );
Cookie.prototype.seth = function( name, value )
{
seth( name, value )
{
this.set( name, value );
this.HTTP.response.headers[ "Set-Cookie" ] = this.toString();
};
}
Cookie.prototype.toString = function()
{
toString()
{
var cookieStr = "";
var p = "";
var e = "";
@ -38,6 +37,7 @@ Cookie.prototype.toString = function()
}
cookieStr += "Path=" + p + ";" + ( e ? ( " Expires=" + e + ";" ) : "" );
return cookieStr;
};
}
}
module.exports = Cookie;

28
utils/WebParam.js
View File

@ -1,5 +1,9 @@
var WebParam = function( paramStr )
"use strict";
class WebParam
{
constructor( paramStr )
{
var list = {};
paramStr && paramStr.split( ";" ).forEach( function( param )
@ -9,27 +13,29 @@ var WebParam = function( paramStr )
} );
this.param = list;
};
}
WebParam.prototype.set = function( name, value )
{
set( name, value )
{
this.param[ name ] = value;
};
}
WebParam.prototype.get = function( name )
{
get( name )
{
return this.param[ name ];
};
}
WebParam.prototype.toString = function()
{
toString()
{
var paramStr = "";
for( var i in param )
{
paramStr += i + "=" + param[i] + ";";
}
return paramStr;
};
}
}
WebParam.ExtractHeader = function( hstr )
{