From 487fa135ccf0973c1fa029f97ab2acda88359cb7 Mon Sep 17 00:00:00 2001 From: coderaiser Date: Wed, 20 Aug 2014 04:37:33 -0400 Subject: [PATCH] feature(main) rm pipe --- lib/server/auth.js | 4 +++- lib/server/main.js | 3 +-- lib/server/rest.js | 2 +- lib/server/rest/markdown.js | 15 ++++++++------- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/lib/server/auth.js b/lib/server/auth.js index 987a5ca7..4678ff89 100644 --- a/lib/server/auth.js +++ b/lib/server/auth.js @@ -16,9 +16,11 @@ var main = global.cloudcmd.main, + DIR = './', + https = main.https, qs = main.querystring, - pipe = main.pipe, + pipe = require(DIR + 'pipe'), Modules = main.modules, Util = main.util, diff --git a/lib/server/main.js b/lib/server/main.js index c73dd44c..ea7167bb 100644 --- a/lib/server/main.js +++ b/lib/server/main.js @@ -11,7 +11,7 @@ SLASH, ISWIN32, ext, - path, fs, zlib, url, pipe, CloudFunc, diffPatch, querystring, + path, fs, zlib, url, CloudFunc, diffPatch, querystring, Config = { server : true, @@ -74,7 +74,6 @@ /* Additional Modules */ exports.cloudfunc = CloudFunc = librequire('cloudfunc'), - exports.pipe = pipe = srvrequire('pipe'), exports.socket = srvrequire('socket'), exports.auth = srvrequire('auth').auth, diffPatch = librequire('diff/diff-match-patch').diff_match_patch, diff --git a/lib/server/rest.js b/lib/server/rest.js index 459b1b08..44473744 100644 --- a/lib/server/rest.js +++ b/lib/server/rest.js @@ -18,7 +18,6 @@ path = main.path, crypto = require('crypto'), Util = main.util, - pipe = main.pipe, CloudFunc = main.cloudfunc, onFSGet = main.srvrequire('rest/fs/get').onGet, @@ -35,6 +34,7 @@ mellow = require(DIR + 'mellow'), format = require(DIR + 'format'), ponse = require(DIR + 'ponse'), + pipe = require(DIR + 'pipe'), isWin32 = process.platform === 'win32'; diff --git a/lib/server/rest/markdown.js b/lib/server/rest/markdown.js index 63363b94..2f0b6163 100644 --- a/lib/server/rest/markdown.js +++ b/lib/server/rest/markdown.js @@ -3,15 +3,16 @@ var main = global.cloudcmd.main, marked = main.require('marked'), - Util = main.util, - DIR = main.DIR, - DIR_SERVER = DIR + 'lib/server/', + + DIR = './', fs = require('fs'), - pipe = main.pipe, - mellow = require(DIR_SERVER + 'mellow'), - ponse = require(DIR_SERVER + 'ponse'); - + + pipe = require(DIR + 'pipe'), + mellow = require(DIR + 'mellow'), + ponse = require(DIR + 'ponse'), + Util = require(DIR + 'util'); + exports.operate = operate; function operate(name, request, callback) {