web-app-runner
Advanced tools
Comparing version 0.90.21 to 0.90.22
@@ -16,2 +16,3 @@ /** | ||
lib:'lib', | ||
bin:'bin', | ||
test: 'test' | ||
@@ -23,2 +24,3 @@ }, | ||
'<%= dirs.lib %>/*.js', | ||
'<%= dirs.bin %>/*.js', | ||
'<%= dirs.test %>/*.js', | ||
@@ -45,2 +47,3 @@ '<%= dirs.test %>/*/*.js' | ||
'<%= dirs.lib %>/*.js', | ||
'<%= dirs.bin %>/*.js', | ||
'<%= dirs.test %>/*.js', | ||
@@ -47,0 +50,0 @@ '<%= dirs.test %>/*/*.js' |
@@ -23,4 +23,4 @@ /** | ||
if (options.ip) { | ||
whiteList = options.ip.whiteList; | ||
blackList = options.ip.blackList; | ||
whiteList = options.ip.accept; | ||
blackList = options.ip.reject; | ||
@@ -27,0 +27,0 @@ if (dash.isBoolean( options.acceptUnknownVisitor )) { |
@@ -23,2 +23,3 @@ /** | ||
ipfilter = options.ipfilter, | ||
daemon = dash.isBoolean( options.daemon ) ? options.daemon : false, | ||
app = options.app; | ||
@@ -47,3 +48,3 @@ | ||
/** | ||
* start the server; if daemon is true, then run in a background thread | ||
* start the server; if app is not created, then create it. | ||
*/ | ||
@@ -60,2 +61,3 @@ this.start = function() { | ||
/** | ||
* route the default index page | ||
* | ||
@@ -100,2 +102,7 @@ * @param request | ||
if (!port) throw new Error('socket server must be constructed with a port'); | ||
if (daemon && daemon === true) { | ||
// if () | ||
server.start(); | ||
} | ||
}; | ||
@@ -137,6 +144,2 @@ | ||
if (opts.daemon && opts.daemon === true) { | ||
runner.start(); | ||
} | ||
return runner; | ||
@@ -143,0 +146,0 @@ }; |
{ | ||
"name": "web-app-runner", | ||
"version": "0.90.21", | ||
"version": "0.90.22", | ||
"description": "A simple HTTP application server that accepts or rejects connections based on authenticated attributes including ip, user agent, etc. The server can be used stand alone or as middleware for connect or express.", | ||
@@ -5,0 +5,0 @@ "main": "./index.js", |
@@ -63,7 +63,7 @@ # Web App Runner | ||
ip:{ | ||
whiteList:[ | ||
accept:[ | ||
/^127\.0\.0\.1/, | ||
/^173\.13\.151\.1/ | ||
], | ||
blackList:[ | ||
reject:[ | ||
/^193\.144\.151\.1/, | ||
@@ -87,3 +87,3 @@ /^193\.144\.151\.2/ | ||
agent:{ | ||
whiteList:[ | ||
accept:[ | ||
/chrome/[23][0-9]/, | ||
@@ -94,3 +94,3 @@ /msie 1[0-1]/, | ||
], | ||
blackList:[ | ||
reject:[ | ||
/msie [2-9]/, | ||
@@ -118,2 +118,2 @@ /safari/[2-5]/ | ||
- - - | ||
<p><small><em>Copyright © 2014, rain city software | Version 0.90.21</em></small></p> | ||
<p><small><em>Copyright © 2014, rain city software | Version 0.90.22</em></small></p> |
@@ -45,4 +45,4 @@ /** | ||
ip.whiteList = dataset.getIPWhiteList(); | ||
ip.blackList = dataset.getIPBlackList(); | ||
ip.accept = dataset.getIPWhiteList(); | ||
ip.reject = dataset.getIPBlackList(); | ||
@@ -49,0 +49,0 @@ return ip; |
Sorry, the diff of this file is not supported yet
26744
21
635