Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-01-23 10:45:47 +00:00
Code Issues Projects Releases Wiki Activity

minor changes

Browse source
This commit is contained in:
coderaiser 2012-09-24 10:48:14 -04:00
parent a15664c0ab
commit f910ed7ed6
4 changed files with 55 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -110,7 +110,7 @@ Additional modules
---------------
**Cloud Commander's Server Side** not using additional modules for main functionality.
But for minification and optimization tricks optional can be
assingned (and installed) module: [Minify] (https://github.com/coderaiser/minify "Minify")
assingned (and installed) modules: [Minify] (https://github.com/coderaiser/minify "Minify")
and [socket.io] (https://github.com/LearnBoost/socket.io "Socket.IO").
Install addtitional modules:

33
lib/client/socket.js
View file

@ -16,17 +16,21 @@ var CloudCommander, io;
cloudcmd.Socket = socket;
socket.on('connect', function () {
outToTerminal('socket connected');
outToTerminal({stdout: 'socket connected'});
JqueryTerminal.Term.resume();
});
socket.on('message', function (msg) {
outToTerminal(msg);
var lMsg = JSON.parse(msg);
outToTerminal(lMsg);
});
socket.on('disconnect', function () {
outToTerminal('socket disconected');
outToTerminal({stderr: 'socket disconected'});
JqueryTerminal.Term.pause();
});
},
@ -42,14 +46,31 @@ var CloudCommander, io;
lResult = true;
if(lTerm){
var lStdout,
lStderr;
if(Messages.length){
/* show oll msg from buffer */
for(var i=0; i < Messages.length; i++)
lTerm.echo(Messages[i]);
for(var i=0; i < Messages.length; i++){
lStdout = Messages[i].stdout;
lStderr = Messages[i].stderr;
if(lStdout)
lTerm.echo(lStdout);
if(lStderr)
lTerm.error(lStderr);
}
Messages = [];
}
lResult = lTerm.echo(pMsg);
lStdout = pMsg.stdout;
lStderr = pMsg.stderr;
if(lStdout)
lResult = lTerm.echo(lStdout);
if(lStderr)
lResult = lTerm.error(pMsg.lStderr);
}
else{
/* if term not accesable

29
lib/cloudfunc.js
View file

@ -482,19 +482,16 @@ CloudFunc.buildFromJSON = function(pJSON, pKeyBinded)
* Если мы на стороне сервера -
* прописываем экспортируемые функции
*/
try{
if(exports){
/* экспортируемые функции */
exports.checkExtension = CloudFunc.checkExtension;
exports.buildFromJSON = CloudFunc.buildFromJSON;
exports.setTitle = CloudFunc.setTitle;
exports.getUserUIDsAndNames = CloudFunc.getUserUIDsAndNames;
/* константы*/
exports.Name = CloudFunc.NAME;
exports.NOJS = CloudFunc.NOJS;
exports.FS = CloudFunc.FS;
}
}catch(err){
/* если мы на клиенте */
}
var exports;
if(exports){
/* экспортируемые функции */
exports.checkExtension = CloudFunc.checkExtension;
exports.buildFromJSON = CloudFunc.buildFromJSON;
exports.setTitle = CloudFunc.setTitle;
exports.getUserUIDsAndNames = CloudFunc.getUserUIDsAndNames;
/* константы*/
exports.Name = CloudFunc.NAME;
exports.NOJS = CloudFunc.NOJS;
exports.FS = CloudFunc.FS;
}

26
lib/server/socket.js
View file

@ -14,7 +14,7 @@ exports.listen = function(pServer){
io.sockets.on('connection', function (socket) {
Socket = socket;
socket.send('hello from server!');
socket.send('{stdout:"client connected"}');
console.log('server connected');
@ -38,17 +38,19 @@ exports.listen = function(pServer){
* @param stdout
* @param stderr
*/
function getExec(error, stdout, stderr) {
if(stdout){
console.log(stdout);
Socket.send(stdout);
function getExec(pError, pStdout, pStderr) {
if (pError !== null) {
console.log('exec error: ' + pError);
}
if(stderr){
console.log('stderr: ' + stderr);
Socket.send(stderr);
else{
var lExec = {
stdout : pStdout,
stderr : pStderr
};
var lExec_str = JSON.stringify(lExec);
Socket.send(lExec_str);
console.log(lExec);
}
if (error !== null) {
console.log('exec error: ' + error);
}
}