From 884e776d3ee961d197641d45853c6fd3bff65995 Mon Sep 17 00:00:00 2001
From: Daniel Howard <dhoward@svexpertise.com>
Date: Tue, 29 Apr 2014 13:11:13 -0700
Subject: [PATCH] Update to run on node v0.10.26.

---
 package.json               | 17 +++++++++++++++++
 server/app.js              | 24 +++++++++++-------------
 server/dev/app.js          | 13 ++++++++++---
 server/dev/views/chat.jade |  9 +++++----
 4 files changed, 43 insertions(+), 20 deletions(-)
 create mode 100644 package.json

diff --git a/package.json b/package.json
new file mode 100644
index 0000000..d5b6810
--- /dev/null
+++ b/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "AjaxIM",
+  "description": "instant messaging framework",
+  "author": "ajaximrpg <ajaximrpg@svexpertise.com>",
+  "version": "4.0.0",
+  "dependencies": {
+    "express": ">= 4.0.0",
+    "connect": ">= 2.14.0",
+    "method-override": ">= 1.0.0",
+    "cookie-parser": ">= 1.0.0",
+    "body-parser": ">= 1.0.0",
+    "express-error-handler": ">= 0.5.0",
+    "morgan": ">= 1.0.0",
+    "cookie": ">= 0.1.0",
+    "jade": ">= 1.3.0"
+  }
+}
diff --git a/server/app.js b/server/app.js
index c5f04a5..24d28d6 100755
--- a/server/app.js
+++ b/server/app.js
@@ -54,9 +54,9 @@ try {
 
 var app = express();
 //app.set('env', 'development');
-app.use(express.methodOverride());
-app.use(express.cookieParser());
-app.use(express.bodyParser());
+app.use(require('method-override')());
+app.use(require('cookie-parser')());;
+app.use(require('body-parser')());;
 app.use(require('./middleware/im')({
    maxAge: 15 * 60 * 1000,
    reapInterval: 60 * 1000,
@@ -66,22 +66,20 @@ app.use(require('./middleware/im')({
 app.set('root', __dirname);
 
 if ('development' == app.get('env')) {
-    app.set('view engine', 'jade');
     app.set('views', __dirname + '/dev/views');
-
-    app.stack.unshift({
-        route: '/dev',
-        handle: function(req, res, next) {
-            req.dev = true;
-            next();
-        }
+    app.set('view engine', 'jade');
+    
+    app.use(function(req, res, next) {
+        req.dev = true;
+        next();
     });
+    app._router.stack.unshift(app._router.stack.pop());
 
-    app.use(express.logger());
+    app.use(require("morgan")());
     require('./dev/app')('/dev', app);
     app.use(express.static(
                 require('path').join(__dirname, '../client')));
-    app.use(express.errorHandler({dumpExceptions: true, showStack: true}));
+    app.use(require('express-error-handler')({dumpExceptions: true, showStack: true}));
 }
 
 app.listen(APP_PORT, APP_HOST);
diff --git a/server/dev/app.js b/server/dev/app.js
index 3bd153e..63ccc1d 100644
--- a/server/dev/app.js
+++ b/server/dev/app.js
@@ -3,14 +3,21 @@ var cookie = require('cookie');
 module.exports = function(route, app) {
     app.get(route+'/', function(req, res) {
         res.render('chat', {
-            locals: {}
         });
     });
 
     app.get(route+'/cookie', function(req, res) {
+        var uid = function(n) {
+           var d = new Date().getTime();
+           var uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+               var r = (d + Math.random()*16)%16 | 0;
+               d = Math.floor(d/16);
+               return (c=='x' ? r : (r&0x7|0x8)).toString(16);
+           });
+           return uuid;
+        };
         res.setHeader('Set-Cookie',
-            cookie.serialize('sessionid', require('connect').utils.uid(40),
-                                                {path: '/'})
+            cookie.serialize('sessionid', uid(40), {path: '/'})
         );
         res.send('cookie set');
     });
diff --git a/server/dev/views/chat.jade b/server/dev/views/chat.jade
index 4733d06..7775fc8 100644
--- a/server/dev/views/chat.jade
+++ b/server/dev/views/chat.jade
@@ -1,5 +1,5 @@
-!!! 5
-html
+doctype html
+html(lang="en")
   head
     title Ajax IM
     script(src='/js/jquery-1.4.1.js', type='text/javascript')
@@ -8,6 +8,7 @@ html
     script(src='/js/cookies.js', type='text/javascript')
     script(src='/js/dateformat.js', type='text/javascript')
     script(src='/js/im.js', type='text/javascript')
-    script(type='text/javascript')
+    script(type='text/javascript').
       $(function(){var im = AjaxIM.init({theme: "/themes/default"});});
-  body Hello.
\ No newline at end of file
+  body.
+    Hello.
\ No newline at end of file