wpstudio/hiring-test-one
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fixed when using --directory with '.' or '..'

Browse Source
This commit is contained in:
Lloyd Brookes
2014-03-06 14:00:50 +01:00
parent 58a559b2b9
commit 62e30373a2
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.jshintrc
View File

@ -14,5 +14,5 @@
"quotmark": "double", "quotmark": "double",
"trailing": true, "trailing": true,
"undef": true, "undef": true,
"unused": "strict" "unused": true
} }

25
ws.js
View File

@ -3,7 +3,6 @@
require("console-dope"); require("console-dope");
var connect = require("connect"), var connect = require("connect"),
http = require("http"), http = require("http"),
util = require("util"),
fs = require("fs"), fs = require("fs"),
Thing = require("nature").Thing, Thing = require("nature").Thing,
w = require("wodge"), w = require("wodge"),
@ -17,14 +16,6 @@ function halt(message){
process.exit(1); process.exit(1);
} }
function handleServerError(err){
if (err.code === "EADDRINUSE"){
halt("port " + argv.port + " is already is use");
} else {
halt(err.message);
}
}
/** /**
parse command-line args parse command-line args
*/ */
@ -37,7 +28,7 @@ var argv = new Thing()
.on("error", function(err){ .on("error", function(err){
halt(err.message); halt(err.message);
}); });
/* /*
Set default options from "package.json", ".local-web-server.json" or "~/.local-web-server.json", in that order Set default options from "package.json", ".local-web-server.json" or "~/.local-web-server.json", in that order
*/ */
@ -114,20 +105,26 @@ if (argv.help){
/** /**
static file server including directory browsing support static file server including directory browsing support
*/ */
app.use(connect.static(argv.directory)) app.use(connect.static(path.resolve(argv.directory)))
.use(connect.directory(argv.directory, { icons: true })); .use(connect.directory(path.resolve(argv.directory), { icons: true }));
/** /**
launch server launch server
*/ */
var server = http.createServer(app) var server = http.createServer(app)
.on("error", handleServerError) .on("error", function(err){
if (err.code === "EADDRINUSE"){
halt("port " + argv.port + " is already is use");
} else {
halt(err.message);
}
})
.listen(argv.port); .listen(argv.port);
/* /*
write status to stderr so stdout can be piped to disk ($ ws > log.txt) write status to stderr so stdout can be piped to disk ($ ws > log.txt)
*/ */
if (argv.directory === process.cwd()){ if (path.resolve(argv.directory) === process.cwd()){
console.error("serving at %underline{%s}", "http://localhost:" + argv.port); console.error("serving at %underline{%s}", "http://localhost:" + argv.port);
} else { } else {
console.error("serving %underline{%s} at %underline{%s}", argv.directory, "http://localhost:" + argv.port); console.error("serving %underline{%s} at %underline{%s}", argv.directory, "http://localhost:" + argv.port);