diff --git a/lib/client/Untitled b/lib/client/Untitled new file mode 100644 index 00000000..e69de29b diff --git a/lib/client/socket.js b/lib/client/socket.js index fb686008..7fd8de7d 100644 --- a/lib/client/socket.js +++ b/lib/client/socket.js @@ -1,17 +1,29 @@ /* module make possible connectoin thrue socket.io on a client */ -var CloudCommander, io; +var CloudCommander, io, socket; (function(){ "use strict"; var Util = CloudCommander.Util; - Util.jsload("http://localhost:31337/socket.io/lib/socket.io.js", function(){ - var socket = io.connect('http://localhost:31337/'); - socket.on('connect', function () { - socket.send('hi'); + Util.jsload("http://localhost:31337/socket.io/lib/socket.io.js", { + onload : function(){ + socket = io.connect(document.location.hostname); + + socket.on('connect', function () { + console.log('socket connected'); + }); + + socket.on('message', function (msg) { + console.log(msg); + }); + + socket.on('disconnect', function () { + console.log('socket disconected'); + }); + }, - socket.on('message', function (msg) { - console.log(msg); - }); - }); + onerror : function(){ + console.log('could not connect to socket.io\n'+ + 'npm i socket.io'); + } }); })(); \ No newline at end of file diff --git a/lib/server/socket.js b/lib/server/socket.js index 4f51342c..44064d59 100644 --- a/lib/server/socket.js +++ b/lib/server/socket.js @@ -1,13 +1,49 @@ /* module make possible connectoin thrue socket.io on a server */ -var CloudServer; +var io = require('socket.io'), + exec = require('child_process').exec, + Socket = {}; -var io = require('socket.io').listen(CloudServer.Server); +/** + * Function listen on servers port + * @pServer {Object} started server object + */ +exports.listen = function(pServer){ + io = io.listen(pServer); + + io.sockets.on('connection', function (socket) { + Socket = socket; + socket.send('hello from server!'); + + console.log('server connected'); + + socket.on('message', function(pCommand) { + console.log(pCommand); + + exec(pCommand, exec); + }); + + }); +}; -io.sockets.on('connection', function (socket) { -socket.on('message', function (data) { - console.log(data); -}); -socket.on('disconnect', function () { }); -}); \ No newline at end of file +/** + * function send result of command to client + * @param error + * @param stdout + * @param stderr + */ +function exec(error, stdout, stderr) { + if(stdout){ + console.log(stdout); + Socket.send(stdout); + } + if(stderr){ + console.log('stderr: ' + stderr); + Socket.send(stderr); + } + + if (error !== null) { + console.log('exec error: ' + error); + } +} \ No newline at end of file