Working through the errors thrown by buildbug

Moving Routes, ExpressRoute, and SocketRoute to bugjs bugroutes project

[airbug/airbug#89] Airbug. Airbug MVP Part I: Chat Basics

buildbug.js

@@ -42,6 +42,7 @@ buildProperties({
             main: "./lib/AirBugServer.js",
             dependencies: {
                 bugpack: "https://s3.amazonaws.com/airbug/bugpack-0.0.5.tgz",
+                connect: "2.x",
                 express: "3.0.x",
                 mu2express: "0.0.x",
                 "mongodb": ">=1.2.11",
@@ -55,10 +56,11 @@ buildProperties({
         sourcePaths: [
             "./projects/airbugserver/js/src",
             '../bugjs/projects/annotate/js/src',
-            '../bugjs/projects/bugboil/js/src',
             '../bugjs/projects/bugflow/js/src',
             '../bugjs/projects/bugfs/js/src',
+            '../bugjs/projects/bugioc/js/src',
             '../bugjs/projects/bugjs/js/src',
+            '../bugjs/projects/bugroutes/js/src',
             '../bugjs/projects/bugtrace/js/src',
             '../bugunit/projects/bugunit/js/src'
            // "../bugjs/projects/clientjs/js/src"
@@ -68,7 +70,8 @@ buildProperties({
             "../bugunit/projects/bugunit/js/scripts"
         ],
         testPaths: [
-            "../bugjs/projects/bugjs/js/test"
+            "../bugjs/projects/bugjs/js/test",
+            '../bugjs/projects/bugroutes/js/test'
         ],
 
         //TODO BRN: These static paths are temporary until we get the client js server working.
@@ -150,7 +153,6 @@ buildProperties({
         sourcePaths: [
             '../bugjs/projects/annotate/js/src',
             '../bugjs/projects/bugjs/js/src',
-            '../bugjs/projects/bugboil/js/src',
             '../bugjs/projects/bugflow/js/src',
             '../bugjs/projects/bugfs/js/src',
             '../bugjs/projects/bugtrace/js/src',
@@ -247,7 +249,7 @@ buildTarget('local').buildFlow(
                         packageVersion: buildProject.getProperty("server.packageJson.version")
                     }
                 }),
-                /*targetTask('startNodeModuleTests', {
+                targetTask('startNodeModuleTests', {
                     init: function(task, buildProject, properties) {
                         var packedNodePackage = nodejs.findPackedNodePackage(
                             buildProject.getProperty("server.packageJson.name"),
@@ -257,7 +259,7 @@ buildTarget('local').buildFlow(
                             modulePath: packedNodePackage.getFilePath()
                         });
                     }
-                }),*/
+                }),
                 targetTask("s3EnsureBucket", {
                     properties: {
                         bucket: buildProject.getProperty("local-bucket")

projects/airbugserver/js/src/AirBugApplication.js

@@ -71,4 +71,4 @@ var AirBugApplication = Class.extend(Obj, {
 // Exports
 //-------------------------------------------------------------------------------
 
-bugpack.export('airbug.AirBugApplication', AirBugApplication);
+bugpack.export('airbugserver.AirBugApplication', AirBugApplication);

projects/airbugserver/js/src/AirBugConfiguration.js

@@ -86,6 +86,20 @@ var AirBugConfiguration = Class.extend(Obj, {
          * @type {AirBugServer}
          */
         this._airBugServer = null;
+
+        /**
+         * @private
+         * @type {{
+         *      port: number,
+         *      mongoDbIp: string
+         * }}
+         */
+        this._config = null;
+
+        /**
+         * @type {string}
+         */
+        this._configFilePath = null;
     },
 
 
@@ -100,11 +114,6 @@ var AirBugConfiguration = Class.extend(Obj, {
         this._airBugServer.start();
     },
 
-
-    //-------------------------------------------------------------------------------
-    // Configuration Methods
-    //-------------------------------------------------------------------------------
-
     /**
      * @return {AirBugServer}
      */
@@ -120,6 +129,12 @@ var AirBugConfiguration = Class.extend(Obj, {
         return new ChatMessagesApi();
     },
 
+    config: function(){
+        this._configFilePath = path.resolve(__dirname, '../config.json');
+        this._config = this.loadConfig(this.configFilePath);
+        return this._config;
+    },
+
     /**
      * @return {ConversationsApi}
      */
@@ -131,7 +146,7 @@ var AirBugConfiguration = Class.extend(Obj, {
      * @return {ExpressServer}
      */
     expressApp: function() {
-        return new ExpressApp();
+        return new ExpressApp().initialize();
     },
 
     /**
@@ -148,6 +163,9 @@ var AirBugConfiguration = Class.extend(Obj, {
         return new ExpressServer();
     },
 
+    /**
+     * @return {Mongoose}
+     */
     mongoose: function(){
         return mongoose;
     },
@@ -189,6 +207,40 @@ var AirBugConfiguration = Class.extend(Obj, {
      */
     usersApi: function(){
         return new UsersApi();
+    },
+
+    //-------------------------------------------------------------------------------
+    // Private Methods
+    //-------------------------------------------------------------------------------
+
+    /*
+     * @private
+     * @param {?string=} configPath
+     * @return {{
+     *      port: number,
+     *      mongoDbIp: string
+     * }}
+     **/
+    loadConfig: function(configPath){
+        var config;
+        var defaults = {
+            port: 8000,
+            mongoDbIp: "localhost"
+        };
+
+        if (BugFs.existsSync(configPath)) {
+            try {
+                config = JSON.parse(BugFs.readFileSync(configPath, 'utf8'));
+            } catch(error) {
+                    console.log(configPath, "could not be parsed. Invalid JSON.");
+                    console.log(AirBugServer, "config set to defaults.");
+                    return defaults;
+            } finally {
+                return config;
+            }
+        } else {
+            return defaults;
+        }
     }
 });
 
@@ -212,6 +264,7 @@ annotate(AirBugServerConfiguration).with(
         //-------------------------------------------------------------------------------
         module("airBugServer")
             .properties([
+                property("config").ref("config"),
                 property("expressServer").ref("expressServer"),
                 property("mongoose").ref("mongoose"),
                 property("socketManager").ref("socketManager")
@@ -220,20 +273,21 @@ annotate(AirBugServerConfiguration).with(
         //-------------------------------------------------------------------------------
         // Express
         //-------------------------------------------------------------------------------
-        module("expressApp"),
-        module("expressRoutes"),
-        module("expressServer")
+        module("expressApp")
             .properties([
+                property("config").ref("config"),
+                property("expressRoutes").re("expressRoutes"),
                 property("sessionStore").ref("sessionStore")
             ]),
+        module("expressRoutes"),
+        module("expressServer"),
 
         //-------------------------------------------------------------------------------
         // Sockets
         //-------------------------------------------------------------------------------
         module("socketManager")
             .properties([
                 property("server").ref("expressServer"),
-                // property("socketIoManager").ref("socketIoManager"),
                 property("socketsMap").ref("socketsMap")
             ]),
         module("socketsMap"),

projects/airbugserver/js/src/AirBugServer.js

@@ -34,7 +34,6 @@ var path        = require('path');
 //-------------------------------------------------------------------------------
 
 var BugFs           = bugpack.require('bugfs.BugFs');
-// var Map             = bugpack.require('Map');
 var ExpressServer   = bugpack.require('airbugserver.ExpressServer');
 var SocketManager   = bugpack.require('airbugserver.SocketManager');
 
@@ -59,50 +58,64 @@ var AirBugServer = Class.extend(Obj, {
         // Variables
         //-------------------------------------------------------------------------------
 
+        /*
+         * @type {{
+         *      port: number,
+         *      mongoDbIp: string
+         * }}
+         **/
+        this.config         = null;
+
         /*
          * @type {ExpressServer}
          **/
-        this.expressServer = null;
+        this.expressServer  = null;
 
         /*
-         * @type {mongoose}
+         * @type {Mongoose}
          **/
-        this.mongoose = null;
+        this.mongoose       = null;
 
         /*
          * @type {SocketManager}
          **/
-        this.socketManager = null;
+        this.socketManager  = null;
 
     }
 
     //-------------------------------------------------------------------------------
     // Public Methods
     //-------------------------------------------------------------------------------
 
+    /*
+     **/
     start: function() {
 
+        var configPath      = path.resolve(__dirname, '../config.json');
+        var config          = this.loadConfig(configPath);
         var expressServer   = this.expressServer.start();
         var mongoose        = this.mongoose;
         var socketManager   = this.socketManager.initialize(expressServer);
         var cookieParser    = expressServer.getCookieParser();
         var sessionStore    = expressServer.getSessionStore();
         var sessionKey      = expressServer.getSessionKey();
-
-        socketManager.enablesockets(cookieParser, sessionStore, sessionKey);
-
-        var configPath = path.resolve(__dirname, '../config.json');
-        var config = {
-            port: 8000,
-            mongoDbIp: "localhost"
-        };
 
-        if (BugFs.existsSync(configPath)) {
-            config = JSON.parse(BugFs.readFileSync(configPath, 'utf8'));
-        }
+        //-------------------------------------------------------------------------------
+        // Connect to MongoDB
+        //-------------------------------------------------------------------------------
 
         mongoose.connect('mongodb://' + config.mongoDbIp + '/airbug');
 
+        //-------------------------------------------------------------------------------
+        // Enable Sockets
+        //-------------------------------------------------------------------------------
+
+        socketManager.enablesockets(cookieParser, sessionStore, sessionKey);
+
+        //-------------------------------------------------------------------------------
+        // 
+        //-------------------------------------------------------------------------------
+
         //var clientJSServer = new ClientJSServer(app);
 
 
@@ -128,11 +141,16 @@ var AirBugServer = Class.extend(Obj, {
         });*/
 
     }
+
+    //-------------------------------------------------------------------------------
+    // Private Methods
+    //-------------------------------------------------------------------------------
+
 });
 
 
 //-------------------------------------------------------------------------------
 // Exports
 //-------------------------------------------------------------------------------
 
-bugpack.export('airbug.AirBugServer', AirBugServer);
+bugpack.export('airbugserver.AirBugServer', AirBugServer);