Fix issue where directories don't have a slash on the end and allow specifying a different port

author: Elliott Sprehn 2010-10-21 19:24:03 -0700
committer: Misko Hevery 2010-10-23 14:22:54 -0700
commit: 64063b5d41c5ebac2835a83d9da40974da4d4820 (patch)
tree: 0a87a79ae12841c3020850109b84a4dcaf203119 /lib
parent: 833e0ae343651a35ccce0940b048e0b5022adc7b (diff)
download: angular.js-64063b5d41c5ebac2835a83d9da40974da4d4820.tar.bz2
1 files changed, 98 insertions, 41 deletions
diff --git a/lib/nodeserver/server.js b/lib/nodeserver/server.js
index f05185fa..08f13a99 100644
--- a/lib/nodeserver/server.js
+++ b/lib/nodeserver/server.js
@@ -4,13 +4,15 @@ var sys = require('sys'),
     url = require('url'),
     events = require('events');
 
-function main() {
+var DEFAULT_PORT = 8000;
+
+function main(argv) {
   new HttpServer({
     'GET': (function() { 
       var servlet = new StaticServlet();
       return servlet.handleRequest.bind(servlet)
     })()
-  }).start(8000); 
+  }).start(Number(argv[2]) || DEFAULT_PORT);
 }
 
 function escapeHtml(value) {
@@ -44,11 +46,15 @@ HttpServer.prototype.parseUrl_ = function(urlString) {
 };
 
 HttpServer.prototype.handleRequest_ = function(req, res) {
-  sys.puts(req.method + ' ' + req.url);
+  var logEntry = req.method + ' ' + req.url;
+  if (req.headers['user-agent']) {
+    logEntry += ' ' + req.headers['user-agent'];
+  }
+  sys.puts(logEntry);
   req.url = this.parseUrl_(req.url);
   var handler = this.handlers[req.method];
   if (!handler) {
-    res.writeHead(501, 'Not Implemented');
+    res.writeHead(501);
     res.end();
   } else {
     handler.call(this, req, res);
@@ -79,51 +85,79 @@ StaticServlet.prototype.handleRequest = function(req, res) {
   var path = ('./' + req.url.pathname).replace('//','/');
   var parts = path.split('/');
   if (parts[parts.length-1].charAt(0) === '.')
-    return self.sendForbidden_(res, path);
+    return self.sendForbidden_(req, res, path);
   fs.stat(path, function(err, stat) {
     if (err) 
-      return self.sendMissing_(res, path);
+      return self.sendMissing_(req, res, path);
     if (stat.isDirectory())
-      return self.sendDirectory_(res, path);
-    return self.sendFile_(res, path);
+      return self.sendDirectory_(req, res, path);
+    return self.sendFile_(req, res, path);
   });
 }
 
-StaticServlet.prototype.sendError_ = function(res, error) {
-  res.writeHead(500, 'Internal Server Error', {
+StaticServlet.prototype.sendError_ = function(req, res, error) {
+  res.writeHead(500, {
       'Content-Type': 'text/html'
   });
   res.write('<!doctype html>\n');
   res.write('<title>Internal Server Error</title>\n');
-  res.write('<h1>500 Internal Server Error</h1>');
+  res.write('<h1>Internal Server Error</h1>');
   res.write('<pre>' + escapeHtml(sys.inspect(error)) + '</pre>');
   sys.puts('500 Internal Server Error');
   sys.puts(sys.inspect(error));
 };
 
-StaticServlet.prototype.sendMissing_ = function(res, path) {
-  res.writeHead(404, 'Not Found', {
+StaticServlet.prototype.sendMissing_ = function(req, res, path) {
+  path = path.substring(1);
+  res.writeHead(404, {
       'Content-Type': 'text/html'
   });
   res.write('<!doctype html>\n');
   res.write('<title>404 Not Found</title>\n');
-  res.write('<h1>404 Not Found</h1>');
+  res.write('<h1>Not Found</h1>');
+  res.write(
+    '<p>The requested URL ' + 
+    escapeHtml(path) + 
+    ' was not found on this server.</p>'
+  );
   res.end();
   sys.puts('404 Not Found: ' + path);
 };
 
-StaticServlet.prototype.sendForbidden_ = function(res, path) {
-  res.writeHead(403, 'Forbidden', {
+StaticServlet.prototype.sendForbidden_ = function(req, res, path) {
+  path = path.substring(1);
+  res.writeHead(403, {
       'Content-Type': 'text/html'
   });
   res.write('<!doctype html>\n');
   res.write('<title>403 Forbidden</title>\n');
-  res.write('<h1>403 Forbidden</h1>');
+  res.write('<h1>Forbidden</h1>');
+  res.write(
+    '<p>You do not have permission to access ' + 
+    escapeHtml(path) + ' on this server.</p>'
+  );
   res.end();
   sys.puts('403 Forbidden: ' + path);
 };
 
-StaticServlet.prototype.sendFile_ = function(res, path) {
+StaticServlet.prototype.sendRedirect_ = function(req, res, redirectUrl) {
+  res.writeHead(301, {
+      'Content-Type': 'text/html',
+      'Location': redirectUrl
+  });
+  res.write('<!doctype html>\n');
+  res.write('<title>301 Moved Permanently</title>\n');
+  res.write('<h1>Moved Permanently</h1>');
+  res.write(
+    '<p>The document has moved <a href="' + 
+    redirectUrl + 
+    '">here</a>.</p>'
+  );
+  res.end();
+  sys.puts('401 Moved Permanently: ' + redirectUrl);
+};
+
+StaticServlet.prototype.sendFile_ = function(req, res, path) {
   var self = this;
   var file = fs.createReadStream(path);
   res.writeHead(200, {
@@ -135,38 +169,61 @@ StaticServlet.prototype.sendFile_ = function(res, path) {
     res.end();
   });
   file.on('error', function(error) {
-    self.sendError_(res, error);
+    self.sendError_(req, res, error);
   });
 };
 
-StaticServlet.prototype.sendDirectory_ = function(res, path) {
+StaticServlet.prototype.sendDirectory_ = function(req, res, path) {
   var self = this;
+  if (path.match(/[^\/]$/)) {
+    req.url.pathname += '/';
+    var redirectUrl = url.format(url.parse(url.format(req.url)));
+    return self.sendRedirect_(req, res, redirectUrl);
+  }
   fs.readdir(path, function(err, files) {
     if (err) 
-      return self.sendError_(res, error);
-    res.writeHead(200, {
-      'Content-Type': 'text/html'
+      return self.sendError_(req, res, error);
+
+    if (!files.length)
+      return self.writeDirectoryIndex_(req, res, path, []);
+
+    var remaining = files.length;
+    files.forEach(function(fileName, index) {
+      fs.stat(path + '/' + fileName, function(err, stat) {
+        if (err)
+          return self.sendError_(req, res, err);
+        if (stat.isDirectory()) {
+          files[index] = fileName + '/';
+        }
+        if (!(--remaining))
+          return self.writeDirectoryIndex_(req, res, path, files);
+      });
     });
-    path = path.substring(2);
-    res.write('<!doctype html>\n');
-    res.write('<title>' + escapeHtml(path) + '</title>\n');
-    res.write('<style>\n');
-    res.write('  ol { list-style-type: none; font-size: 1.2em; }\n');
-    res.write('</style>\n');
-    res.write('<h1>Directory: ' + escapeHtml(path) + '</h1>');
-    res.write('<ol>');
-    files.sort();
-    for (var i=0; i < files.length; ++i) {
-      if (files[i].charAt(0) !== '.') {
-        res.write('<li><a href="' + 
-          escapeHtml(files[i]) + '">' + 
-          escapeHtml(files[i]) + '</a></li>');
-      }
+  });
+};
+
+StaticServlet.prototype.writeDirectoryIndex_ = function(req, res, path, files) {
+  path = path.substring(1);
+  res.writeHead(200, {
+    'Content-Type': 'text/html'
+  });
+  res.write('<!doctype html>\n');
+  res.write('<title>' + escapeHtml(path) + '</title>\n');
+  res.write('<style>\n');
+  res.write('  ol { list-style-type: none; font-size: 1.2em; }\n');
+  res.write('</style>\n');
+  res.write('<h1>Directory: ' + escapeHtml(path) + '</h1>');
+  res.write('<ol>');
+  files.forEach(function(fileName) {
+    if (fileName.charAt(0) !== '.') {
+      res.write('<li><a href="' +
+        escapeHtml(fileName) + '">' +
+        escapeHtml(fileName) + '</a></li>');
     }
-    res.write('</ol>');
-    res.end();
   });
+  res.write('</ol>');
+  res.end();
 };
 
 // Must be last, 
-main();
+main(process.argv);
author	Elliott Sprehn	2010-10-21 19:24:03 -0700
committer	Misko Hevery	2010-10-23 14:22:54 -0700
commit	64063b5d41c5ebac2835a83d9da40974da4d4820 (patch)
tree	0a87a79ae12841c3020850109b84a4dcaf203119 /lib
parent	833e0ae343651a35ccce0940b048e0b5022adc7b (diff)
download	angular.js-64063b5d41c5ebac2835a83d9da40974da4d4820.tar.bz2