jody/notes.kaplon.us
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Get separate socket.io rooms for each user; adjust file paths by user; no more broadcast shouting, keep socket messages in user-rooms.

Browse Source
This commit is contained in:
jkaplon 2017-04-21 16:54:43 -04:00
parent 4cdbbe1dbf
commit 45b0829ba2
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
server.js
View File

@ -6,7 +6,6 @@ app.use(bodyParser.urlencoded({ extended: true })); // Also need url encoding
var winston = require('winston'); var winston = require('winston');
winston.add(winston.transports.File, { filename: './logs/notes.kaplon.us.log', maxsize: 5000000 }); // 5MB winston.add(winston.transports.File, { filename: './logs/notes.kaplon.us.log', maxsize: 5000000 }); // 5MB
var fileSystem = require('fs'); var fileSystem = require('fs');
var notePath = __dirname + '/note-data/allNotes.txt';
var favicon = require('serve-favicon'); var favicon = require('serve-favicon');
app.use(favicon(__dirname + '/assets/favicon.ico')); // Put this before setting static dir. app.use(favicon(__dirname + '/assets/favicon.ico')); // Put this before setting static dir.
app.use(express.static(__dirname + '/assets')); app.use(express.static(__dirname + '/assets'));
@ -109,11 +108,19 @@ io.on('connection', function(socket){
socket.emit('redirect', '/login'); socket.emit('redirect', '/login');
socket.disconnect(); socket.disconnect();
} }
// next line works until container restarted...need to validate session existence? // next line no worky...but might get by with only user-#.
// or is the problem with a nodemon restart???
winston.info('user id, '+ socket.handshake.session.passport.user);
// not sure if next line works yet...
//winston.info('user name, '+ socket.handshake.session.passport.user.username); //winston.info('user name, '+ socket.handshake.session.passport.user.username);
var userNum = socket.handshake.session.passport.user;
winston.info('user id, '+ userNum);
socket.join(userNum);
var notePath, noteDir
if (userNum === 1) {
notePath = __dirname + '/note-data/allNotes.txt';
noteDir = __dirname + '/note-data/';
} else {
notePath = __dirname + '/note-data/' + userNum + '/allNotes.txt';
noteDir = __dirname + '/note-data/' + userNum + '/';
}
fileSystem.readFile(notePath, {encoding: 'utf-8'}, function(err,data){ fileSystem.readFile(notePath, {encoding: 'utf-8'}, function(err,data){
if (!err){ if (!err){
winston.info('file read on connection'); winston.info('file read on connection');
@ -132,7 +139,7 @@ io.on('connection', function(socket){
if (err) { winston.error(err); } if (err) { winston.error(err); }
var exec = require('child_process').exec; var exec = require('child_process').exec;
var cmd = ` var cmd = `
cd note-data && \ cd ${noteDir} && \
git checkout -b ${now} && \ git checkout -b ${now} && \
git commit -am "Notes modified via websocket, ${now}" && \ git commit -am "Notes modified via websocket, ${now}" && \
git checkout master && \ git checkout master && \
@ -142,19 +149,19 @@ io.on('connection', function(socket){
exec(cmd, function(error, stdout, stderr) { exec(cmd, function(error, stdout, stderr) {
if (error) { winston.error(error); } if (error) { winston.error(error); }
if (!stdout.includes('CONFLICT')) { // Case-sensitivity seems brittle here. Better to check return code rather than stdout? Can child_process be called w/signature to include return code? if (!stdout.includes('CONFLICT')) { // Case-sensitivity seems brittle here. Better to check return code rather than stdout? Can child_process be called w/signature to include return code?
var cmd2 = `cd note-data && git branch -d ${now}` var cmd2 = `cd ${noteDir} && git branch -d ${now}`
exec(cmd2, function(error, stdout, stderr) { exec(cmd2, function(error, stdout, stderr) {
if (error) { winston.error(error); } if (error) { winston.error(error); }
winston.info('temp branch deleted; new content written to allNotes.txt'); winston.info('temp branch deleted; new content written to allNotes.txt');
// Send new content to all other clients EXCEPT the orig sender. // Send new content to all other clients EXCEPT the orig sender.
socket.broadcast.emit('download allNotes',msg); socket.in(userNum).emit('download allNotes',msg);
winston.info('sent content update to other clients'); winston.info('sent content update to other clients');
}); });
} else { } else {
// Auto-merge failed, keep the new branch. // Auto-merge failed, keep the new branch.
// Send a conflict warning message to socket.io clients (prompt for IAP ;-). // Send a conflict warning message to socket.io clients (prompt for IAP ;-).
socket.emit('conflict', `Auto-merge failed, manually merge ${now} branch to rescue recent edit.`); socket.in(userNum).emit('conflict', `Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
socket.emit('download allNotes',data); // Send pre-conflict content back down to client. socket.in(userNum).emit('download allNotes',data); // Send pre-conflict content back down to client.
winston.info(`Auto-merge failed, manually merge ${now} branch to rescue recent edit.`); winston.info(`Auto-merge failed, manually merge ${now} branch to rescue recent edit.`);
// MVP for now, can deal w/merge conflicts with git on the server if the cotent needs to be saved. // MVP for now, can deal w/merge conflicts with git on the server if the cotent needs to be saved.
} }