diff --git a/lib/server/config.js b/lib/server/config.js index f4c29ead..c45bc302 100644 --- a/lib/server/config.js +++ b/lib/server/config.js @@ -15,7 +15,7 @@ Util = require(DIR_LIB + 'util'), CloudFunc = require(DIR_LIB + 'cloudfunc'), - check = Util.check, + check = require('checkup'), tryRequire = require('tryrequire'), diff --git a/lib/server/rest.js b/lib/server/rest.js index 5937181a..f0e5e4b0 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -30,6 +30,7 @@ rendy = require('rendy'), copymitter = require('copymitter'), tryCatch = require('try-catch'), + check = require('checkup'), Modules = require(DIR_JSON + 'modules'), @@ -69,7 +70,7 @@ response : response }; - Util.check(arguments, ['request', 'response', 'next']); + check(arguments, ['request', 'response', 'next']); apiURL = CloudFunc.apiURL; name = ponse.getPathName(request); @@ -188,7 +189,7 @@ function onPUT(name, body, callback) { var cmd, files, data, from, to, error, msg; - Util.check(arguments, ['name', 'body', 'callback']); + check(arguments, ['name', 'body', 'callback']); if (name[0] === '/') cmd = name.replace('/', ''); @@ -359,7 +360,7 @@ }); }; - Util.check(arguments, ['files', 'processFunc', 'callback']); + check(arguments, ['files', 'processFunc', 'callback']); copy(); } @@ -382,7 +383,7 @@ function formatMsg(msgParam, dataParam, status) { var msg, data, - isObj = Util.type.object(dataParam); + isObj = typeof dataParam === 'object'; if (isObj) data = json.stringify(dataParam); diff --git a/lib/server/route.js b/lib/server/route.js index a1b43e20..9f78ba5e 100644 --- a/lib/server/route.js +++ b/lib/server/route.js @@ -17,10 +17,10 @@ minify = require('minify'), format = require('format-io'), + check = require('checkup'), config = require(DIR_SERVER + 'config'), - Util = require(DIR_LIB + 'util'), CloudFunc = require(DIR_LIB + 'cloudfunc'), PATH_INDEX = DIR_FS + 'index.html', @@ -94,7 +94,7 @@ lenthPath = TMPL_PATH.length, isRead = lengthTmpl === lenthPath; - Util.check(arguments, ['callback']); + check(arguments, ['callback']); if (isRead) { callback(); @@ -128,7 +128,7 @@ function route(request, response, callback) { var name, p, isAuth, isFS, path; - Util.check(arguments, ['req', 'res', 'callback']); + check(arguments, ['req', 'res', 'callback']); name = ponse.getPathName(request); isAuth = RegExp('^(/auth|/auth/github)$').test(name); diff --git a/package.json b/package.json index 4987d9ae..e0c1a25e 100644 --- a/package.json +++ b/package.json @@ -27,6 +27,7 @@ "subdomain": "cloudcmd", "dependencies": { "ashify": "~1.0.0", + "checkup": "~1.0.3", "console-io": "~2.2.0", "copymitter": "~1.5.0", "dword": "~1.3.2",