Remove config dep and include socket.io-client in bundle

package.json

@@ -7,6 +7,7 @@
   "scripts": {
     "build": "webpack --config webpack.config.js",
     "start": "npm run build && node server",
+    "dev": "npm run build && NODE_ENV=development node server",
     "deploy": "git push heroku master"
   },
   "dependencies": {
@@ -15,10 +16,10 @@
     "angular-ui-bootstrap": "^0.13.4",
     "angular-ui-router": "^0.2.18",
     "bootstrap": "^3.1.1",
-    "config": "^1.21.0",
     "express": "^4.14.0",
     "morgan": "^1.7.0",
     "path": "^0.12.7",
+    "socket.io-client": "^1.4.8",
     "underscore": "^1.8.3"
   },
   "devDependencies": {

server/config.js

@@ -0,0 +1,17 @@
+const productionConfig = {
+  apiBase: 'http://api.storypalette.net/v1/',
+  socketBase: 'http://api.storypalette.net/',
+  environment: 'production',
+  port: 8881,
+};
+
+const developmentConfig = {
+  apiBase: 'http://localhost:8880/v1/',
+  socketBase: 'http://localhost:8880/',
+  environment: 'local',
+  port: 8881,
+}
+
+const config = (process.env.NODE_ENV === 'development') ? developmentConfig : productionConfig;
+
+module.exports = config;

server/env.js

@@ -2,8 +2,9 @@
 // by injecting a javascript object `window.env`
 module.exports = function(config) {
   var info = {
-    apiBase: config.api.baseUrl, 
-    //environment: config.server.environment
+    apiBase: config.apiBase, 
+    socketBase: config.socketBase, 
+    environment: config.environment
   };
 
   return function(req, res) {

server/index.html

@@ -5,8 +5,6 @@
     <title>Storypalette Touch Performer</title>
     <meta charset="utf-8">
 
-    <!-- socket.io client js is served by storypalette-server -->
-    <script src="http://api.storypalette.net:8890/socket.io/socket.io.js"></script>
 
     <!-- server config info is served by storypalette-server -->
     <script src="/env.js"></script>

server/index.js

@@ -1,7 +1,7 @@
 // Storypalette Player server
 // Serves the interface files for the native app.
 
-var config = require('config');
+var config = require('./config');
 var path = require('path');
 var express = require('express');
 //var favicon = require('serve-favicon');
@@ -26,9 +26,10 @@ app.get('/*', function(req, res) {
 });
 
 // Start server.
-var port = process.env.PORT || 8890;
+var port = process.env.PORT || config.port;
+const mode = process.env.NODE_ENV || 'production';
 
 app.listen(port, function() {
-  console.log('storypalette-player available at port', port);
+  console.log(`storypalette-player in ${mode} mode at port ${port}`);
 });
 module.exports = app;

src/app.js

@@ -50,6 +50,7 @@ angular.module('sp.player', [
         }
       },
       socket: function(user, connection, utils, auth) {
+        console.log('user', user);
         var ns = utils.getSocketNamespace(user);
         var room = user.roomId;
         var token = auth.getToken(); 

src/common/spConnection/connection.js

@@ -1,4 +1,5 @@
 import btFordSocketIo from 'angular-socket-io';
+import io from 'socket.io-client';
 
 angular.module('spConnection', [
   'btford.socket-io'

src/common/spUtils/utils.js

@@ -6,7 +6,8 @@ angular.module('spUtils', [])
 
     // Socket utils. 
     getSocketNamespace: function(user) {
-      return 'http://api.storypalette.net:8890/' + user.organisation._id;
+      // TODO: hacky
+      return `${window.env.socketBase}${user.organisation._id}`;
     },
 
     // Returns an array of available rooms for a (non-player user)