diff --git a/lib/server/config.js b/lib/server/config.js index d2013d83..c57f45e4 100644 --- a/lib/server/config.js +++ b/lib/server/config.js @@ -11,12 +11,12 @@ HOME = (HOME_UNIX || HOME_WIN) + '/', fs = require('fs'), + assert = require('assert'), password = require(DIR_SERVER + 'password'), Util = require(DIR_LIB + 'util'), CloudFunc = require(DIR_LIB + 'cloudfunc'), - check = require('checkup'), tryCatch = require('try-catch'), pipe = require('pipe-io'), ponse = require('ponse'), @@ -64,7 +64,7 @@ function save(callback) { var data = jonny.stringify(config, 0, 4); - check(arguments, ['callback']); + assert('callback'); if (data) fs.writeFile(ConfigHome, data, callback); @@ -73,7 +73,7 @@ } function socket(sock) { - check(arguments, ['socket']); + assert('socket'); sock.of('/config') .on('connection', function(socket) { diff --git a/lib/server/rest.js b/lib/server/rest.js index 31b6786c..34fc1a2c 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -14,6 +14,7 @@ DIR_JSON = DIR_LIB + '../json/', path = require('path'), + assert = require('assert'), root = require(DIR + 'root'), config = require(DIR + 'config'), binom = require(DIR + 'binom'), @@ -31,12 +32,19 @@ rendy = require('rendy'), copymitter = require('copymitter'), json = require('jonny'), - check = require('checkup'), Modules = require(DIR_JSON + 'modules'), isWin32 = process.platform === 'win32'; + + function check() { + var i, + n = arguments.length; + for (i = 0; i < n; i++) + assert(arguments[i]); + } + /** * rest interface * @@ -51,7 +59,7 @@ response : response }; - check(arguments, ['request', 'response', 'next']); + check(request, response, next); apiURL = CloudFunc.apiURL; name = ponse.getPathName(request); @@ -170,7 +178,7 @@ function onPUT(name, body, callback) { var cmd, files, data, from, to, msg; - check(arguments, ['name', 'body', 'callback']); + check(name, body, callback); if (name[0] === '/') cmd = name.replace('/', ''); @@ -326,7 +334,7 @@ }); }; - check(arguments, ['files', 'processFunc', 'callback']); + check(files, processFunc, callback); copy(); } diff --git a/package.json b/package.json index 2c808880..8e8630ea 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,6 @@ }, "subdomain": "cloudcmd", "dependencies": { - "checkup": "~1.0.3", "console-io": "~2.2.0", "copymitter": "~1.8.0", "dword": "~1.5.0",