From 316f15db48ce13d71757da9cb5511609f142d153 Mon Sep 17 00:00:00 2001
From: frtk <frederic.villeneuve.seguier@gmail.com>
Date: Fri, 12 Feb 2016 20:05:23 +0100
Subject: [PATCH] v0.0.7

---
 client/index.html       | 28 ----------------------------
 nodePong.js             | 22 ++++++++--------------
 server/server_config.js | 16 +++++++---------
 server/server_core.js   | 34 +++++++++++++++++-----------------
 version.md              | 10 +++++++++-
 5 files changed, 41 insertions(+), 69 deletions(-)

diff --git a/client/index.html b/client/index.html
index 3ceffd1..fdc7065 100644
--- a/client/index.html
+++ b/client/index.html
@@ -21,34 +21,6 @@
 
 </html>
 
-<!--
-<script type="text/javascript">
-  //console.log(io);
-  var socket = {};
-  if (typeof io !== 'object') {
-      console.log('Client: io object is unknown');
-  }
-  if ((typeof self.socket.socket === 'undefined')) {
-     console.log('[#SocketClient] attempting server connection...');
-     socket = io.connect();  // socket connection                                                                
-     console.log('[#SocketClient] attempting server connection...');
-     //socket.socket.connect();
-  }
-  socket.emit('data', 'yo');
-</script>
--->
-
-<!--
-<script type="text/javascript">
-  console.log(io);
-//  NPGClient.io = io;
-//  NPGClient.SocketClient.setIO(io);
-  NPGClient.SocketClient.connect();
-  NPGClient.SocketClient.socket.emit('data','yo');
-</script>
--->
-
-
 <script type="text/javascript">
 $(document).ready(function() {
   NPGClient.SocketIO.startConnectLoop();;
diff --git a/nodePong.js b/nodePong.js
index c2a96e8..61a5d5b 100644
--- a/nodePong.js
+++ b/nodePong.js
@@ -13,39 +13,33 @@ var express = require('express');
 var http = require('http');
 //--- server app libs & params
 //var servP = require('./server/server_config.js');  
-var nPong = require('./server/server_core.js');
+var npg = require('./server/server_core.js');
 //--- nodePong config
-var config = require('./server/server_config.js');
-
+var cfg = require('./server/server_config.js');
 
 
 //
-nPong.Server.setVersion(config.VERSION);
-nPong.Server.log("$ ##### nodePong - v" + nPong.Server.version);
+npg.NPGServer.init(cfg.Config);
 
 
 /*
  * starting HTTP and socket.io services
  */
 //--- HTTP server
-nPong.Server.log("$ # starting http service on port " + config.HTTP.port);
+npg.NPGServer.log("$ # starting http service on port " + npg.NPGServer.port);
 var app = express();
 var httpserv = http.createServer(app);
-httpserv.listen(config.HTTP.port);
+httpserv.listen(npg.NPGServer.port);
 //--- allow access to static files from "/client" directory
 app.use(express.static(__dirname + '/client/'));
 
 //--- socket.io
-nPong.Server.log('$ # registering socket.io service on port ' + config.HTTP.port);  
+npg.NPGServer.log('$ # registering socket.io service on port ' + npg.NPGServer.port);  
 var io = require('socket.io').listen(httpserv, { log: true } );
 //-- setup server socket handling features
-nPong.Server.socketHandling(io);
-
+npg.NPGServer.socketHandling(io);
 //
-nPong.Server.log('$ #####');
-
-
-
+npg.NPGServer.log('$ #####');
 
 
 
diff --git a/server/server_config.js b/server/server_config.js
index 7fbb05c..b587ee9 100644
--- a/server/server_config.js
+++ b/server/server_config.js
@@ -3,13 +3,12 @@
  * @author frtk
  */
 
-var VERSION = '0.0.5';
-
-/**
- * HTTP Service
- */
-var HTTP = {
-  port: 8042,
+var Config = {
+  VERSION : '0.0.6',
+  HTTP: {
+    host: '127.0.0.1',
+    port: 8042
+  },
 }
 
 
@@ -20,6 +19,5 @@ var HTTP = {
  *
  */
 if (typeof exports !== "undefined") {
-  exports.HTTP = HTTP;
-  exports.VERSION = VERSION;
+  exports.Config = Config;
 }
diff --git a/server/server_core.js b/server/server_core.js
index 80d0fdd..45d8e54 100644
--- a/server/server_core.js
+++ b/server/server_core.js
@@ -10,13 +10,16 @@
  * nodePong Server Object
  *
  */
-var Server = {
+var NPGServer = {
   
   /*
    * Data 
    */
-  // version
+  // app
   version: '',
+  host: '',
+  port: 0,
+
   // Users and Games
   users: [],
   games: [],
@@ -26,9 +29,12 @@ var Server = {
    *
    */
   //--- init()
-  init: function() {
+  init: function(o) {
     var self = this;
-
+    self.version = o.VERSION || '';  
+    self.host = o.HTTP.host || ''; 
+    self.port = o.HTTP.port || 8042;  
+    self.log('$ ##### nodePong - v'+self.version);  
   },
 
 
@@ -37,10 +43,6 @@ var Server = {
     this.version = s;
   },
 
-  //--- setIO(io)  
-  setIO: function(io) { 
-      
-  },
 
   /*
    * Server Messages
@@ -90,16 +92,14 @@ var Server = {
   socketHandling: function(io) {
     var self = this;
     io.sockets.on('connection', function (socket) {
-	
-	//
-	self.log('$ User connected : id=' + socket.id);
+      //
+      self.log('$ User connected : id=' + socket.id);
 
-	// 'disconnect'
-	socket.on('disconnect', function () {                                                                                  
-            self.log('$ User disconnected : id=' + socket.id);                                                         
-            connected = false;                                                                                                 
-	}); 
+      // 'disconnect'
+      socket.on('disconnect', function () {                                                                                 self.log('$ User disconnected : id=' + socket.id);                                                         
+      });
 
+      //  
     });
   },
 
@@ -135,7 +135,7 @@ var Game = function() {
  *
  */
 if (typeof exports !== "undefined") {
-  exports.Server = Server;
+  exports.NPGServer = NPGServer;
   exports.User = User;
   exports.Game = Game;
 }
diff --git a/version.md b/version.md
index 606bf9a..d34dc17 100644
--- a/version.md
+++ b/version.md
@@ -1,7 +1,15 @@
 
+### **v0.0.7:**
+--- focus on server object
+- Renamed server object in server_core.js (Server -> NPGServer)
+- Removed setIO(io) function in NPGServer object
+- added init() function to NPGClient 
+- Changed server_config.js structure
+- updated nodePong.js 
+
 
 ### **v0.0.6:**
-- focus on socket.io client & server)
+--- focus on socket.io client & server)
 - Renamed SocketClient.js to SocketIO.js (files and objects)
 - Added SocketIO object (NGPClient lib in /client/js/)
 - Implemented socket.io client connection (with loop) => working