From 6578ef340056f1399c92e9d7922dc245ad196899 Mon Sep 17 00:00:00 2001 From: Mark W Date: Sat, 24 Feb 2018 16:01:37 -1000 Subject: [PATCH 1/4] clients talking to server and each other --- client.js | 14 ++++++++++++++ server.js | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+) create mode 100644 client.js create mode 100644 server.js diff --git a/client.js b/client.js new file mode 100644 index 0000000..e27b123 --- /dev/null +++ b/client.js @@ -0,0 +1,14 @@ +const net = require('net'); + +const server = net.createConnection(6969, '10.0.1.106', () => { + server.write("User connected to the server!"); + + server.on('data', function (data) { + console.log(data.toString()); + }); + + process.stdin.on('data', (key) => { + server.write(key); + }); + +}); \ No newline at end of file diff --git a/server.js b/server.js new file mode 100644 index 0000000..3adfbe7 --- /dev/null +++ b/server.js @@ -0,0 +1,56 @@ +const net = require('net'); +const PORT = 6969; +let people = []; +let person = ""; + +function ask(question, callback) { + var stdin = process.stdin, + stdout = process.stdout; + + stdin.resume(); + stdout.write(`${question}: `); + + stdin.once('data', function (data) { + data = data.toString().trim(); + + if (!data || data === '') { + stdout.write('Please enter some data bro... \n'); + ask(question, callback); + } else { + callback(data); + } + }); +} + +const server = net.createServer((client) => { + + client.user = "Anon" + people.length; + people.push(client); + console.log(`${client.user} connected to the server!`); + + client.write("You have connected to Mark's comp!"); + client.on('data', (data) => { + console.log(data.toString()); + + people.forEach((key, index) => { + + person = "Anon" + index; + if (client.user !== person) { + key.write(`${client.user}: ${data}`); + } + }); + }); + + client.on('error', (error) => { + console.log("this is the error " + error); + }); + + if (client.user === "Anon3") { + client.on('close'); + } + +}); + +server.listen(PORT, () => { + console.log(`Server started on port: ${PORT}`); +}); \ No newline at end of file From c465eac870f569bbeb3d97dc8c3f63a531f4f140 Mon Sep 17 00:00:00 2001 From: Mark W Date: Sat, 24 Feb 2018 16:29:01 -1000 Subject: [PATCH 2/4] deleted if else statement prohibiting certain amount of users --- server.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server.js b/server.js index 3adfbe7..3d73801 100644 --- a/server.js +++ b/server.js @@ -45,9 +45,9 @@ const server = net.createServer((client) => { console.log("this is the error " + error); }); - if (client.user === "Anon3") { - client.on('close'); - } + // if (client.user === "Anon3") { + // client.on('close'); + // } }); From a7591c94f608bc289ba5c5f0d1aaf321fd38dc95 Mon Sep 17 00:00:00 2001 From: Mark W Date: Sat, 24 Feb 2018 19:42:20 -1000 Subject: [PATCH 3/4] added message when user closes socket connection --- server.js | 28 +++------------------------- 1 file changed, 3 insertions(+), 25 deletions(-) diff --git a/server.js b/server.js index 3d73801..4646478 100644 --- a/server.js +++ b/server.js @@ -3,25 +3,6 @@ const PORT = 6969; let people = []; let person = ""; -function ask(question, callback) { - var stdin = process.stdin, - stdout = process.stdout; - - stdin.resume(); - stdout.write(`${question}: `); - - stdin.once('data', function (data) { - data = data.toString().trim(); - - if (!data || data === '') { - stdout.write('Please enter some data bro... \n'); - ask(question, callback); - } else { - callback(data); - } - }); -} - const server = net.createServer((client) => { client.user = "Anon" + people.length; @@ -41,14 +22,11 @@ const server = net.createServer((client) => { }); }); - client.on('error', (error) => { - console.log("this is the error " + error); + //this event occurs only after a user disconnects from the server + client.on('close', () => { + console.log(`${client.user} closed the socket`); }); - // if (client.user === "Anon3") { - // client.on('close'); - // } - }); server.listen(PORT, () => { From 0eabec1925c2be2e939c92cfce58d59dc1ccc336 Mon Sep 17 00:00:00 2001 From: Mark W Date: Wed, 14 Mar 2018 21:29:23 -1000 Subject: [PATCH 4/4] updating exercise tracker --- server.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/server.js b/server.js index 4646478..9b3753f 100644 --- a/server.js +++ b/server.js @@ -27,6 +27,8 @@ const server = net.createServer((client) => { console.log(`${client.user} closed the socket`); }); + + }); server.listen(PORT, () => {