From b3bb5241228506ecb9465752a576be4fe5cb6823 Mon Sep 17 00:00:00 2001
From: Lloyd Brookes <lloyd.brookes@gmail.com>
Date: Fri, 3 Jan 2014 18:04:44 +0000
Subject: [PATCH] updated deps, better error handling, compression

---
 package.json       |  9 ++++-----
 server.js => ws.js | 33 +++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 11 deletions(-)
 rename server.js => ws.js (55%)

diff --git a/package.json b/package.json
index c33a027..dae0216 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,14 @@
 {
   "name": "local-web-server",
   "version": "0.1.5",
-  "description": "Local web server",
+  "description": "Launch a lightweight static web server. Zero configuration.",
   "bin": {
-    "ws": "./server.js"
+    "ws": "./ws.js"
   },
   "repository": "https://github.com/75lb/local-web-server",
   "author": "Lloyd Brookes",
-  "license": "BSD",
   "dependencies": {
-    "connect": "~2.11.0",
-    "nature": "~0.1.0"
+    "connect": "~2.12.0",
+    "nature": "~0.2.0"
   }
 }
diff --git a/server.js b/ws.js
similarity index 55%
rename from server.js
rename to ws.js
index e561b02..c71816f 100755
--- a/server.js
+++ b/ws.js
@@ -1,17 +1,28 @@
 #!/usr/bin/env node 
-var connect = require('connect'),
+var connect = require("connect"),
+    http = require("http"),
     Thing = require("nature").Thing;
 
-var usage = "usage: ws [--port|-p <port>] [--log-format|-p dev|default|short|tiny]";
+function red(txt){ return "\x1b[31m" + txt + "\x1b[0m"; }
+function green(txt){ return "\x1b[32m" + txt + "\x1b[0m"; }
+function halt(message){
+    console.log(red("Error ") + message);
+    console.log(usage);
+    process.exit(1);
+}
+
+var usage = "usage: ws [--port|-p <port>] [--log-format|-f dev|default|short|tiny]";
 var options = new Thing()
     .define({ name: "port", alias: "p", type: "number", defaultOption: true, default: 8000 })
     .define({ name: "log-format", alias: "f", type: "string", default: "dev" })
     .define({ name: "help", alias: "h", type: "boolean" })
+    .on("error", function(err){
+        halt(err.message);
+    })
     .set(process.argv);
 
 if (!options.valid){
-    console.log(usage);
-    throw new Error(options.validationMessages);
+    halt(options.validationMessages)
 
 } else if (options.help){
     console.log(usage);
@@ -26,10 +37,20 @@ if (!options.valid){
                 .replace("GMT", "").replace(" (BST)", "");
     });
 
-    connect()
+    var app = connect()
         .use(connect.logger(options["log-format"]))
+        .use(connect.compress())
         .use(connect.static(process.cwd()))
-        .use(connect.directory(process.cwd()))
+        .use(connect.directory(process.cwd(), { icons: true }));
+        
+    http.createServer(app)
+        .on("error", function(err){
+            if (err.code === "EADDRINUSE"){
+                halt("port " + options.port + " is already is use")
+            } else {
+                halt(err.message);
+            }
+        })
         .listen(options.port);
 
     process.stderr.write("serving at http://localhost:" + options.port + "\n");