From 8ba6a916adac9a3cd721c0adc251e366ed5c8d0e Mon Sep 17 00:00:00 2001 From: Keith Irwin Date: Wed, 15 Mar 2017 06:30:03 -0400 Subject: [PATCH] Prepare for release 0.5.0 --- README.md | 9 +++++++-- config/sockets.js | 25 +++++++++++++++---------- package.json | 9 ++------- views/map.html | 16 ++++++++++------ 4 files changed, 34 insertions(+), 25 deletions(-) diff --git a/README.md b/README.md index ad464ca..27027f5 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Tracman -###### v 0.4.5 +###### v 0.5.0 node.js application to display a map with user's location. @@ -14,13 +14,18 @@ $ git clone https://github.com/Tracman-org/Server.git && (cd Server && exec npm $ npm start ``` +## Contributing + +Tracman will be updated according to [this branching model](http://nvie.com/posts/a-successful-git-branching-model). + ## Changelog -#### v0.4.5 +#### v0.5.0 * Updated libraries * Fixed recognition of attached clients [#34](https://github.com/Tracman-org/Server/issues/21) * Moved socket.io code to own file. +* Many minor fixes #### v0.4.3 diff --git a/config/sockets.js b/config/sockets.js index bd4c52b..dd3562b 100644 --- a/config/sockets.js +++ b/config/sockets.js @@ -5,7 +5,7 @@ const User = require('./models/user.js'); // Check for tracking clients function checkForUsers(io, user) { - console.log(`Checking for clients receiving updates for ${user}`); + //console.log(`Checking for clients receiving updates for ${user}`); // Checks if any sockets are getting updates for this user //TODO: Use Object.values() after upgrading to node v7 @@ -14,10 +14,10 @@ function checkForUsers(io, user) { }).some( function(socket){ return socket.gets==user; })) { - console.log(`Activating updates for ${user}.`); + //console.log(`Activating updates for ${user}.`); io.to(user).emit('activate','true'); } else { - console.log(`Deactivating updates for ${user}.`); + //console.log(`Deactivating updates for ${user}.`); io.to(user).emit('activate', 'false'); } } @@ -28,13 +28,18 @@ module.exports = { init: function(io){ io.on('connection', function(socket) { - console.log(`${socket.id} connected.`); + //console.log(`${socket.id} connected.`); + + // Log + //socket.on('log', function(text){ + //console.log(`LOG: ${text}`); + //}); // This socket can set location (app) socket.on('can-set', function(userId){ - console.log(`${socket.id} can set updates for ${userId}.`); + //console.log(`${socket.id} can set updates for ${userId}.`); socket.join(userId, function(){ - console.log(`${socket.id} joined ${userId}`); + //console.log(`${socket.id} joined ${userId}`); }); checkForUsers( io, userId ); }); @@ -42,9 +47,9 @@ module.exports = { // This socket can receive location (map) socket.on('can-get', function(userId){ socket.gets = userId; - console.log(`${socket.id} can get updates for ${userId}.`); + //console.log(`${socket.id} can get updates for ${userId}.`); socket.join(userId, function(){ - console.log(`${socket.id} joined ${userId}`); + //console.log(`${socket.id} joined ${userId}`); socket.to(userId).emit('activate', 'true'); }); }); @@ -92,11 +97,11 @@ module.exports = { // Shutdown (check for remaining clients) socket.on('disconnect', function(reason){ - console.log(`${socket.id} disconnected because of a ${reason}.`); + //console.log(`${socket.id} disconnected because of a ${reason}.`); // Check if client was receiving updates if (socket.gets){ - console.log(`${socket.id} left ${socket.gets}`); + //console.log(`${socket.id} left ${socket.gets}`); checkForUsers( io, socket.gets ); } diff --git a/package.json b/package.json index f814d01..4d8398c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tracman", - "version": "0.4.5", + "version": "0.5.0", "description": "Tracks user's GPS location", "main": "server.js", "dependencies": { @@ -37,12 +37,7 @@ "test": "mocha test.js", "start": "node server.js", "dev": "nodemon server.js", - "deploy": "ssh -t khp 'rsync -aP --delete --exclude-from /srv/tracman/.gitignore --exclude .git kptow:/srv/c9/tracman/ /srv/tracman && sudo systemctl reload-or-restart tracman'", - "drydeploy": "rsync --dry-run -vaP --delete --exclude-from /srv/c9/tracman/.gitignore --exclude .git /srv/c9/tracman/ khp:/srv/tracman", - "revert": "ssh -t khp 'rsync -aP --delete --exclude-from /srv/tracman/.gitignore --exclude .git /srv/tracman/ kptow:/srv/c9/tracman'", - "dryrevert": "rsync --dry-run -vaP --delete --exclude-from /srv/c9/tracman/.gitignore --exclude .git khp:/srv/tracman/ /srv/c9/tracman", - "log": "ssh -t khp 'journalctl -u tracman'", - "restart": "ssh -t khp 'sudo systemctl reload-or-restart tracman'" + "update": "sudo n stable && sudo npm update --save && sudo npm prune" }, "repository": { "type": "git", diff --git a/views/map.html b/views/map.html index 79ceb97..7a395a6 100644 --- a/views/map.html +++ b/views/map.html @@ -106,22 +106,22 @@ // Can get location socket.emit('can-get', mapuserid ); - console.log(`Receiving updates for ${mapuserid}.`); + //console.log(`Receiving updates for ${mapuserid}.`); // Can set location too if (mapuserid==userid){ socket.emit('can-set', userid ); - console.log(`Sending updates for ${userid}.`); + //console.log(`Sending updates for ${userid}.`); } } // Connect to socket.io socket.on('connect', function(){ - console.log(`Connected... `); + //console.log(`Connected... `); onConnect(socket,userid,mapuserid); }).on('reconnect', function(){ - console.log(`Reconnected... `); + //console.log(`Reconnected... `); onConnect(socket,userid,mapuserid); }).on('error', function (err){ console.error(`Unable to connect because of: ${err.message}`); @@ -246,6 +246,8 @@ // Get location socket.on('get', function(loc) { + //console.log(`Received location: ${loc.lat}, ${loc.lon}`); + loc = parseLoc(loc); if (disp!='1' || !settings.showStreetview) { $('.tim').text('location updated '+loc.time); @@ -285,8 +287,10 @@ if (err) { alert("Unable to set location."); io.emit('log',err.message); - console.log(err.message); } - else { console.log('Got position',pos); } + console.error(err.message); } + else { + //console.log('Set position',pos); + } }, { enableHighAccuracy:true }); } }