Mirrors/cloudcmd
1
0
Fork 0
mirror of https://github.com/coderaiser/cloudcmd.git synced 2026-07-26 09:24:07 +00:00
Code Issues Projects Releases Wiki Activity

feature(tryRequire) add

Browse source
This commit is contained in:
coderaiser 2014-09-08 10:43:41 -04:00
parent 6976d2aa1a
commit 37b67c6f0c
9 changed files with 42 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

15
lib/server.js
View file

@ -31,6 +31,7 @@
join = require(DIR_SERVER + 'join'),
ponse = require(DIR_SERVER + 'ponse'),
express = require(DIR_SERVER + 'express'),
tryRequire = require(DIR_SERVER + 'tryRequire'),
emptyFunc = function(req, res, next) {
Util.exec(next);
@ -42,20 +43,10 @@
return emptyFunc;
};
Console = tryRequire('console-io') || emptyFunc;
function tryRequire(name) {
var module, error;
error = Util.exec.try(function() {
module = require(name);
});
Console = tryRequire('console-io', function(error) {
if (error)
Util.log(error.message);
return module;
}
}) || emptyFunc;
/**
* start server function

12
lib/server/express.js
View file

@ -7,6 +7,8 @@
Util = require(DIR_LIB + 'util'),
crypto = require('crypto'),
tryRequire = require('./tryRequire'),
express = tryRequire('express'),
httpAuth = tryRequire('http-auth'),
logger = tryRequire('morgan'),
@ -76,14 +78,4 @@
callback(equal);
});
}
function tryRequire(name) {
var module;
Util.exec.try(function() {
module = require(name);
});
return module;
}
})();

11
lib/server/flop.js
View file

@ -14,6 +14,7 @@
readify = require(DIR + 'readify'),
time = require(DIR + 'timem'),
pipe = require(DIR + 'pipe'),
tryRequire = require(DIR + 'tryRequire'),
ncp = tryRequire('ncp'),
rimraf = tryRequire('rimraf'),
@ -103,14 +104,4 @@
pipe.create(from, to, callback);
});
};
function tryRequire(name) {
var module;
Util.exec.try(function() {
module = require(name);
});
return module;
}
})();

16
lib/server/fstream.js
View file

@ -1,8 +1,10 @@
(function () {
'use strict';
var DIR = '../',
Util = require(DIR + 'util'),
var DIR = './',
tryRequire = require(DIR + 'tryRequire'),
fstream = tryRequire('fstream'),
tar = tryRequire('tar');
@ -23,14 +25,4 @@
return dirStream;
};
function tryRequire(name) {
var module;
Util.exec.try(function() {
module = require(name);
});
return module;
}
})();

11
lib/server/minify.js
View file

@ -1,7 +1,7 @@
(function() {
'use strict';
var Util = require('../util'),
var tryRequire = require('./tryRequire'),
minify = tryRequire('minify');
module.exports = function(name, params, callback) {
@ -19,13 +19,4 @@
next();
}
function tryRequire(name) {
var module;
Util.exec.try(function() {
module = require(name);
});
return module;
}
})();

17
lib/server/rest/markdown.js
View file

@ -9,11 +9,12 @@
Util = require(DIR_LIB + 'util'),
marked = tryRequire('marked'),
tryRequire = require(DIR + 'tryRequire'),
pipe = require(DIR + 'pipe'),
mellow = require(DIR + 'mellow'),
ponse = require(DIR + 'ponse');
ponse = require(DIR + 'ponse'),
marked = tryRequire('marked');
exports.operate = operate;
@ -64,14 +65,4 @@
});
}
function tryRequire(name) {
var module;
Util.exec.try(function() {
module = require(name);
});
return module;
}
})();

11
lib/server/socket.js
View file

@ -3,6 +3,8 @@
var DIR = '../',
Util = require(DIR + 'util'),
tryRequire = require('./tryRequire'),
io = tryRequire('socket.io'),
Socket,
@ -67,13 +69,4 @@
return Socket;
}
function tryRequire(name) {
var module;
Util.exec.try(function() {
module = require(name);
});
return module;
}
})();

19
lib/server/terminal.js
View file

@ -9,7 +9,12 @@
Util = require(DIR_LIB + 'util'),
CloudFunc = require(DIR_LIB + 'cloudfunc'),
pty = tryRequire('pty.js'),
tryRequire = require('./tryRequire.js'),
pty = tryRequire('pty.js', function(error) {
if (error)
Util.log(error.message);
}),
Clients = [],
CHANNEL = CloudFunc.CHANNEL_TERMINAL,
@ -17,18 +22,6 @@
ConNum = 0;
function tryRequire(name) {
var module,
error = Util.exec.try(function() {
module = require(name);
});
if (error)
Util.log(error.message);
return module;
}
module.exports = function(io) {
var makePty = function(clientSocket) {
onConnection(clientSocket, function(channel, data) {

19
lib/server/tryRequire.js Normal file
View file

@ -0,0 +1,19 @@
(function() {
'use strict';
var Util = require('../util');
module.exports = function(name, callback) {
var module,
isFunc = typeof callback === 'function',
error = Util.exec.try(function() {
module = require(name);
});
if (error && isFunc)
callback(error);
return module;
};
})();