vulcan 0.2.5 → 0.3.0

data/server/node_modules/express/node_modules/connect/lib/middleware/limit.js

@@ -43,11 +43,7 @@ module.exports = function limit(bytes){
     req._limit = true;
 
     // limit by content-length
-    if (len && len > bytes) {
-      res.statusCode = 413;
-      res.end('Request Entity Too Large');
-      return;
-    }
+    if (len && len > bytes) deny();
 
     // limit
     req.on('data', function(chunk){

data/server/node_modules/express/node_modules/connect/lib/middleware/session.js

@@ -55,10 +55,10 @@ function defaultFingerprint(req) {
 };
 
 /**
- * Paths to ignore.
+ * Paths to ignore, defaulting to `/favicon.ico`.
  */
 
-exports.ignore = [];
+exports.ignore = ['/favicon.ico'];
 
 /**
  * Setup session store with the given `options`.

data/server/node_modules/express/node_modules/connect/lib/middleware/static.js

@@ -39,7 +39,6 @@ var fs = require('fs')
  *
  *    - `maxAge`   Browser cache maxAge in milliseconds. defaults to 0
  *    - `hidden`   Allow transfer of hidden files. defaults to false
- *    - `redirect`   Redirect to trailing "/" when the pathname is a dir
  *
  * @param {String} root
  * @param {Object} options
@@ -102,7 +101,6 @@ var send = exports.send = function(req, res, next, options){
     , head = 'HEAD' == req.method
     , get = 'GET' == req.method
     , root = options.root ? normalize(options.root) : null
-    , redirect = false === options.redirect ? false : true
     , getOnly = options.getOnly
     , fn = options.callback
     , hidden = options.hidden
@@ -134,7 +132,7 @@ var send = exports.send = function(req, res, next, options){
     : utils.forbidden(res);
 
   // index.html support
-  if (normalize('/') == path[path.length - 1]) path += 'index.html';
+  if ('/' == path[path.length - 1]) path += 'index.html';
 
   // "hidden" file
   if (!hidden && '.' == basename(path)[0]) return next();
@@ -151,34 +149,13 @@ var send = exports.send = function(req, res, next, options){
         : next(err);
     // redirect directory in case index.html is present
     } else if (stat.isDirectory()) {
-      if (!redirect) return next();
       res.statusCode = 301;
       res.setHeader('Location', url.pathname + '/');
       res.end('Redirecting to ' + url.pathname + '/');
       return;
     }
 
-    // header fields
-    if (!res.getHeader('Date')) res.setHeader('Date', new Date().toUTCString());
-    if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
-    if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
-    if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
-    if (!res.getHeader('content-type')) {
-      var charset = mime.charsets.lookup(type);
-      res.setHeader('Content-Type', type + (charset ? '; charset=' + charset : ''));
-    }
-    res.setHeader('Accept-Ranges', 'bytes');
-
-    // conditional GET support
-    if (utils.conditionalGET(req)) {
-      if (!utils.modified(req, res)) {
-        req.emit('static');
-        return utils.notModified(res);
-      }
-    }
-
     var opts = {};
-    var chunkSize = stat.size;
 
     // we have a Range request
     if (ranges) {
@@ -189,7 +166,6 @@ var send = exports.send = function(req, res, next, options){
         // TODO: multiple support
         opts.start = ranges[0].start;
         opts.end = ranges[0].end;
-        chunkSize = opts.end - opts.start + 1;
         res.statusCode = 206;
         res.setHeader('Content-Range', 'bytes '
           + opts.start
@@ -203,9 +179,27 @@ var send = exports.send = function(req, res, next, options){
           ? fn(new Error('Requested Range Not Satisfiable'))
           : invalidRange(res);
       }
+    // stream the entire file
+    } else {
+      res.setHeader('Content-Length', stat.size);
+      if (!res.getHeader('Cache-Control')) res.setHeader('Cache-Control', 'public, max-age=' + (maxAge / 1000));
+      if (!res.getHeader('Last-Modified')) res.setHeader('Last-Modified', stat.mtime.toUTCString());
+      if (!res.getHeader('ETag')) res.setHeader('ETag', utils.etag(stat));
+
+      // conditional GET support
+      if (utils.conditionalGET(req)) {
+        if (!utils.modified(req, res)) {
+          return utils.notModified(res);
+        }
+      }
     }
 
-    res.setHeader('Content-Length', chunkSize);
+    // header fields
+    if (!res.getHeader('content-type')) {
+      var charset = mime.charsets.lookup(type);
+      res.setHeader('Content-Type', type + (charset ? '; charset=' + charset : ''));
+    }
+    res.setHeader('Accept-Ranges', 'bytes');
 
     // transfer
     if (head) return res.end();
@@ -219,6 +213,7 @@ var send = exports.send = function(req, res, next, options){
     if (fn) {
       function callback(err) { done || fn(err); done = true }
       req.on('close', callback);
+      req.socket.on('error', callback);
       stream.on('end', callback);
     }
   });

data/server/node_modules/express/node_modules/connect/lib/middleware/staticCache.js

@@ -10,7 +10,6 @@
  */
 
 var http = require('http')
-  , utils = require('../utils')
   , Cache = require('../cache')
   , url = require('url')
   , fs = require('fs');
@@ -34,15 +33,17 @@ var http = require('http')
  *
  * Benchmarks:
  *
- *     static(): 2700 rps
- *     node-static: 5300 rps
- *     static() + staticCache(): 7500 rps
+ *    static(): 2700 rps
+ *    node-static: 5300 rps
+ *    static() + staticCache(): 7500 rps
  *
  * Options:
  *
  *   - `maxObjects`  max cache objects [128]
  *   - `maxLength`  max cache object length 256kb
  *
+ * TODO: refactore to accept data stores (redis etc)
+ *
  * @param {Type} name
  * @return {Type}
  * @api public
@@ -55,82 +56,16 @@ module.exports = function staticCache(options){
 
   return function staticCache(req, res, next){
     var path = url.parse(req.url).pathname
-      , ranges = req.headers.range
       , hit = cache.get(path)
-      , hitCC
-      , uaCC
-      , header
-      , age;
-
-    // cache static
-    req.on('static', function(stream){
-      var headers = res._headers
-        , cc = utils.parseCacheControl(headers['cache-control'] || '')
-        , contentLength = headers['content-length']
-        , hit;
-
-      // ignore larger files
-      if (!contentLength || contentLength > maxlen) return;
-
-      // dont cache items we shouldn't be
-      if ( cc['no-cache']
-        || cc['no-store']
-        || cc['private']
-        || cc['must-revalidate']) return;
-
-      // if already in cache then validate
-      if (hit = cache.get(path)){
-        if (headers.etag == hit[0].etag) {
-          hit[0].date = new Date;
-          return;
-        } else {
-          cache.remove(path);
-        }
-      }
-
-      // validation notifiactions don't contain a steam
-      if (null == stream) return;
-
-      // add the cache object
-      var arr = cache.add(path);
-      arr.push(headers);
-
-      // store the chunks
-      stream.on('data', function(chunk){
-        arr.push(chunk);
-      });
-
-      // flag it as complete
-      stream.on('end', function(){
-        arr.complete = true;
-      });
-    });
-
-    // cache hit, doesnt support range requests
-    if (hit && hit.complete && !ranges) {
-      header = utils.merge({}, hit[0]);
-      header.Age = age = (new Date - new Date(header.date)) / 1000 | 0;
-      header.date = new Date().toUTCString();
-
-      // parse cache-controls
-      hitCC = utils.parseCacheControl(header['cache-control'] || '');
-      uaCC = utils.parseCacheControl(req.headers['cache-control'] || '');
-
-      // check if we must revalidate(bypass)
-      if (hitCC['no-cache'] || uaCC['no-cache']) return next();
-
-      // check freshness of entity
-      if (isStale(hitCC, age) || isStale(uaCC, age)) return next();
-
-      // conditional GET support
-      if (utils.conditionalGET(req)) {
-        if (!utils.modified(req, res, header)) {
-          header['content-length'] = 0;
-          res.writeHead(304, header);
-          return res.end();
-        }
-      }
-
+      , cc = req.headers['cache-control']
+      , header;
+
+    // cache hit
+    if (hit && hit.complete) {
+      // TODO: finish meeee... http caching... throttling etc
+      header = hit[0];
+      header.Age = (new Date - hit.createdAt) / 1000 | 0;
+      
       // HEAD support
       if ('HEAD' == req.method) {
         header['content-length'] = 0;
@@ -157,19 +92,31 @@ module.exports = function staticCache(options){
       return write(1);
     }
 
+    // cache static
+    req.on('static', function(stream){
+      // ignore larger files
+      var contentLength = res._headers['content-length'];
+      if (!contentLength || contentLength > maxlen) return;
+
+      // exists
+      if (cache.get(path)) return;
+
+      // add the cache object
+      var arr = cache.add(path);
+      arr.push(res._headers);
+
+      // store the chunks
+      stream.on('data', function(chunk){
+        arr.push(chunk);
+      });
+
+      // flag it as complete
+      stream.on('end', function(){
+        arr.complete = true;
+      });
+    });
+
     next();
   }
 };
 
-/**
- * Check if cache item is stale
- *
- * @param {Object} cc
- * @param {Number} age
- * @return {Boolean}
- * @api private
- */
-
-function isStale(cc, age) {
-  return cc['max-age'] && cc['max-age'] <= age;
-}

data/server/node_modules/express/node_modules/connect/lib/middleware/vhost.js

@@ -36,7 +36,7 @@ module.exports = function vhost(hostname, server){
     var host = req.headers.host.split(':')[0];
     if (req.subdomains = regexp.exec(host)) {
       req.subdomains = req.subdomains[0].split('.').slice(0, -1);
-      server.emit("request", req, res);
+      server.emit("request", req, res, next);
     } else {
       next();
     }

data/server/node_modules/express/node_modules/connect/lib/utils.js

@@ -403,21 +403,14 @@ exports.parseRange = function(size, str){
  */
 
 exports.parseCacheControl = function(str){
-  var directives = str.split(',')
+  var parts = str.split('=')
+    , key = parts.shift()
+    , val = parseInt(parts.shift(), 10)
     , obj = {};
-
-  for(var i = 0, len = directives.length; i < len; i++) {
-    var parts = directives[i].split('=')
-      , key = parts.shift().trim()
-      , val = parseInt(parts.shift(), 10);
-
-    obj[key] = isNaN(val) ? true : val;
-  }
-
+  obj[key] = isNaN(val) ? true : val;
   return obj;
 };
 
-
 /**
  * Convert array-like object to an `Array`.
  *

data/server/node_modules/express/node_modules/connect/package.json

@@ -1,25 +1,24 @@
 {
   "name": "connect",
-  "version": "1.8.5",
+  "version": "1.7.1",
   "description": "High performance middleware framework",
   "keywords": ["framework", "web", "middleware", "connect", "rack"],
   "repository": "git://github.com/senchalabs/connect.git",
   "author": "TJ Holowaychuk <tj@vision-media.ca> (http://tjholowaychuk.com)",
   "repository": "git://github.com/senchalabs/connect",
   "dependencies": {
-    "qs": ">= 0.4.0",
-    "mime": ">= 0.0.1",
-    "formidable": "1.0.x"
+    "qs": ">= 0.3.1",
+    "mime": ">= 0.0.1"
   },
   "devDependencies": {
-    "expresso": "0.9.2",
+    "expresso": "0.7.6",
     "koala": "0.1.2",
     "less": "1.1.1",
     "sass": "0.5.0",
     "markdown": "0.2.1",
     "ejs": "0.4.3",
-    "should": "0.3.2"
+    "should": "0.2.1"
   },
   "main": "index",
-  "engines": { "node": ">= 0.4.1 < 0.7.0" }
+  "engines": { "node": ">= 0.4.1 < 0.5.0" }
 }

data/server/node_modules/express/node_modules/connect/test.js

@@ -1,52 +1,39 @@
 
+/**
+ * Module dependencies.
+ */
+
 var connect = require('./')
+  , utils = connect.utils
   , http = require('http')
-  , RedisStore = require('connect-redis')(connect);
+  , fs = require('fs');
 
-var app = connect();
-app.use(connect.cookieParser('fucj'));
-app.use(connect.session({store:new RedisStore}));
-app.use(function(req, res, next){
-  req.session.views = (req.session.views || 0) + 1;
-  res.writeHead(200, {"Content-Type": "text/plain"});
-  res.end("You've viewed this page "+req.session.views+" times.");
-})
 
-http.createServer(app).listen(3000);
+connect()
+  .use(connect.cookieParser())
+  .use(connect.session({ secret: 'hey' }))
+  .use(function(req, res, next){
+    if ('/foo' == req.url) {
+      req.session.foo = 'bar';
+    }
+    res.end('hello\n')
+  })
+  .listen(3000)
 
+// Connect: 2296
+// Connect+LRU: 4900
+// node-static: 3865
 
-// var set = RedisStore.prototype.set;
-// 
-// function slow(sid){
-//   console.log('%s saving', sid);
-//   var args = arguments;
-//   setTimeout(function(self){
-//     console.log('%s saved', sid);
-//     set.apply(self, args);
-//   }, 2000, this);
-// };
-// 
-// http.createServer(connect()
-//   .use(connect.logger('dev'))
-//   .use(connect.cookieParser('keyboard cat'))
-//   .use(connect.session({ store: new RedisStore }))
-//   .use(function(req, res, next){
-//     var sess = req.session;
-//     switch (req.url) {
-//       case '/foo.js':
-//         console.log('%s foo.js sid', sess.id);
-//         RedisStore.prototype.set = set;
-//         res.end('data');
-//         break;
-//       default:
-//         console.log('%s html sid', sess.id);
-//         RedisStore.prototype.set = slow;
-//         res.setHeader('Content-Type', 'html');
-//         res.write('<html><head><script src="/foo.js"></script></head><body>');
-//         setTimeout(function(){
-//           res.end('</body></html>');
-//         }, 1000);
-//     }
-//   })).listen(3000);
+// ab -n 5000 -c 50 -k http://local/Readme.md
+
+// 472k
+// node-static: 1651rps
+// connect: 581rps
+
+// var static = require('node-static')
+//   , file = new static.Server(__dirname);
 // 
-// console.log('port 3000');
+// var send = connect.static(__dirname);
+// http.createServer(function(req, res){
+//   file.serve(req, res);
+// }).listen(3000);