roll back socket.io to 0.9.16

Author: gabehopper

lib/dispatcher.js

@@ -2,12 +2,14 @@
 (function (__dirname, module) {
     "use strict";
 
-    var redis = require('socket.io-redis'),
+    var
+        RedisStore = require('socket.io/lib/stores/redis'),
+        redis = require('socket.io/node_modules/redis'),
         fs = require('fs'),
         path = require("path"),
         socket = require("socket.io"),
 //        MongoStore = require('mong.socket.io'),
-//        MongoStore = require('socket.io-mongo'),
+        MongoStore = require('socket.io-mongo'),
         hbars = require("handlebars");
 
     function locate(dirs, file, cb, idx) {
@@ -19,7 +21,7 @@
 
         var qfile = path.join(dirs[i], file);
 
-        return fs.exists(qfile, function (exists) {
+        return path.exists(qfile, function (exists) {
             if (exists) {
                 return cb(undefined, qfile);
             }
@@ -28,7 +30,7 @@
         });
     }
 
-    function listen(app, logger, hidden) {
+    function listen(app, logger, secure, hidden) {
 
         var server = app.httpServer;
 
@@ -46,23 +48,44 @@
                 warn: logger.warn,
                 error: logger.error
             },
-            secure: hidden.secure
+            secure: secure
         });
 
-        io.on('connection', function () {
-            io.set('transports', ['websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling', 'polling']);
-
-            //io.eio.pingInterval = 60000;
-            //io.eio.pingTimeout = 60000;
-
-            io.set('log level', 1);
+        io.configure('production', function () {
+            io.enable('browser client etag');          // apply etag caching logic based on version number
+            io.enable('browser client gzip');          // gzip the file
+            io.enable('browser client minification');  // send minified client
+//            io.enable('match origin protocol');
         });
+        io.configure(function () {
 
-        io.adapter(redis({
-            host: hidden.redis.host,
-            port: hidden.redis.port
-        }));
+//            io.set('transports', ['websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']);
+            io.set('transports', ['websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']);
+            io.set('log level', 1);
 
+            if (hidden.mongo_storage) {
+                var store = new MongoStore({url: hidden.mongodb});
+            } else if (hidden.redis_storage) {
+                var pub = redis.createClient(hidden.redis.port, hidden.redis.host);
+                var sub = redis.createClient(hidden.redis.port, hidden.redis.host);
+                var client = redis.createClient(hidden.redis.port, hidden.redis.host);
+
+                var store = new RedisStore({
+                    redisClient: client,
+                    redisPub: pub,
+                    redisSub: sub
+                });
+            }
+            if(hidden.mongo_storage || hidden.redis_storage) {
+                store.on('error', hidden.logger.error);
+                io.set('store', store);
+            }
+        });
+//        io.configure('development', function () {
+////            io.set('transports', ['websocket', 'htmlfile', 'xhr-polling', 'jsonp-polling']);
+//
+//            io.set('transports', ['websocket']);
+//        });
         io.sockets.on('connection', function (client) {
             hidden.active = true;
             var topics = Object.keys(hidden.listeners);
@@ -100,11 +123,12 @@
                     if (err) {
                         throw err;
                     }
+
                     var template = hbars.compile(content);
                     var body = template({
                             secureClient: hidden.secureClient,
                             secure: hidden.secure,
-                            port: hidden.secureClient ? hidden.sslPort : hidden.listenPort
+                            port: hidden.secure ? hidden.sslPort : hidden.listenPort
                         }),
                         ctl = hidden.logger.isDebugging ? 'NO-CACHE' : 'public, max-age=' + (defaults.maxAge / 1000),
                         headers = {
@@ -147,21 +171,18 @@
             redis: lopts.redis || gopts.redis,
             secureClient: lopts.secureClient || gopts.secureClient || lopts.secure || gopts.secure || !!app.httpsServer,
             secure: lopts.secure || gopts.secure || !!app.httpsServer,
-            //listenPort: lopts.advertizedListenPort || gopts.advertizedListenPort || app.listenPort,
-            listenPort: app.listenPort || lopts.advertizedListenPort || gopts.advertizedListenPort,
+            listenPort: lopts.advertizedListenPort || gopts.advertizedListenPort || app.listenPort,
             sslPort: lopts.advertizedSslPort || gopts.advertizedSslPort || app.sslPort,
             logger: app.logger,
             listeners: {},
             active: false,
             mongo_storage: lopts.mongo_storage || gopts.mongo_storage,
             redis_storage: lopts.redis_storage || gopts.redis_storage,
             mongodb: lopts.mongoose || gopts.mongoose
-        },
-            requestHandler = getRequestHandler(hidden, defaults);
-
-        listen(app, app.logger, hidden);
+        };
+        listen(app, app.logger, false, hidden);
 
-        app.use(requestHandler);
+        //app.use(requestHandler);
 
         return cb(undefined, {
             secure: hidden.secure,

package.json

@@ -12,9 +12,8 @@
         "type":"git"
     },
     "dependencies":{
-        "socket.io": "1.3.6",
-        "socket.io-client": "1.3.6",
-        "socket.io-redis": "0.1.4",
+        "socket.io": "0.9.16",
+        "socket.io-client": "0.9.16",
         "handlebars": "3.0.3",
         "socket.io-mongo": "*",
         "site-assets": "git://github.com/ustyme/site-assets.git"

public/js/app-middle.js

@@ -17,7 +17,7 @@
             port = ":" + port;
         }
 
-        return protocol + location.hostname + port;
+        return window.location.protocol + location.hostname;
     }
 
     function convert(arg) {