Browse Source

v0.0.7

master
frtk 5 years ago
parent
commit
316f15db48
5 changed files with 41 additions and 69 deletions
  1. +0
    -28
      client/index.html
  2. +8
    -14
      nodePong.js
  3. +7
    -9
      server/server_config.js
  4. +17
    -17
      server/server_core.js
  5. +9
    -1
      version.md

+ 0
- 28
client/index.html View File

@ -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();;


+ 8
- 14
nodePong.js View File

@ -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('$ #####');


+ 7
- 9
server/server_config.js View File

@ -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;
}

+ 17
- 17
server/server_core.js View File

@ -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;
}

+ 9
- 1
version.md View File

@ -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


Loading…
Cancel
Save