diff --git a/cloudcmd.js b/cloudcmd.js
index 1582ee01..a93202b2 100644
--- a/cloudcmd.js
+++ b/cloudcmd.js
@@ -1,22 +1,22 @@
"use strict";
-var main = require('./lib/server/main.js');
+var main = require('./lib/server/main.js'),
-var DIR = main.Dir,
- LIBDIR = DIR + 'lib/',
- SRVDIR = LIBDIR + 'server/',
+ DIR = main.DIR,
+ LIBDIR = main.LIBDIR,
+ SRVDIR = main.SRVDIR,
srvfunc = main.srvfunc,
path = main.path,
- fs = main.path,
- Server = main.server,
+ fs = main.path,
CloudFunc = main.cloudfunc,
Util = main.util,
update = main.update,
- srv = main.srv,
- Config = main.config;
-
+ Server = srvfunc.require(DIR + 'server'),
+ srv = Server.CloudServer,
+ Config = main.config,
+ WIN32 = srvfunc.isWin32;
readConfig();
Server.start(Config, indexProcessing, appCacheProcessing);
@@ -32,7 +32,7 @@ function indexProcessing(pIndex, pList){
*/
if(srv.Minify._allowed.css){
var lReplace_s = '' : '"/css/reset.css">');
+ (WIN32 ? '/css/reset.css>' : '"/css/reset.css">');
pIndex = Util.removeStr(pIndex, lReplace_s);
pIndex = pIndex.replace('/css/style.css', srv.Minify.MinFolder + 'all.min.css');
@@ -46,7 +46,7 @@ function indexProcessing(pIndex, pList){
'' + CloudFunc.setTitle() + '');
if(!srv.Config.appcache)
- pIndex = srvfunc.isWin32 ?
+ pIndex = WIN32 ?
Util.removeStr(pIndex, ' manifest=/cloudcmd.appcache') :
Util.removeStr(pIndex, ' manifest="/cloudcmd.appcache"');
diff --git a/lib/server/main.js b/lib/server/main.js
index 2a64f3f6..7081a7be 100644
--- a/lib/server/main.js
+++ b/lib/server/main.js
@@ -1,21 +1,23 @@
var DIR,
LIBDIR,
SRVDIR,
- srvfunc,
- server;
+ srvfunc;
exports.DIR = DIR = process.cwd() + '/',
exports.LIBDIR = LIBDIR = DIR + 'lib/',
exports.SRVDIR = SRVDIR = LIBDIR + 'server/',
+exports.srvfunc = srvfunc = require(SRVDIR + 'srvfunc'),
-exports.srvfunc = srvfunc = require(SRVDIR + 'srvfunc');
+exports.path = require('path'),
+exports.fs = require('fs'),
+exports.querystring = require('querystring'),
+exports.child_process = require('child_process'),
+exports.zlib = srvfunc.require('zlib'),
+exports.cloudfunc = srvfunc.require(LIBDIR + 'cloudfunc'),
+exports.util = srvfunc.require(LIBDIR + 'util'),
+exports.update = srvfunc.require(SRVDIR + 'update'),
+exports.appcache = srvfunc.require(SRVDIR + 'appcache'),
+exports.socket = srvfunc.require(SRVDIR + 'socket'),
+exports.object = srvfunc.require(SRVDIR + 'object'),
-exports.path = require('path');
-exports.fs = require('fs');
-exports.server = server = srvfunc.require(DIR + 'server');
-exports.cloudfunc = srvfunc.require(LIBDIR + 'cloudfunc');
-exports.util = srvfunc.require(LIBDIR + 'util');
-exports.update = srvfunc.require(SRVDIR + 'update');
-
-exports.srv = server.CloudServer;
-exports.config = srvfunc.require(DIR + 'config');
+exports.config = srvfunc.require(DIR + 'config');
\ No newline at end of file
diff --git a/lib/server/object.js b/lib/server/object.js
index 7f80b632..a304577d 100644
--- a/lib/server/object.js
+++ b/lib/server/object.js
@@ -5,10 +5,10 @@
* - Minify
*/
-var DIR = process.cwd() + '/',
- SRVDIR = DIR + 'lib/server/',
-
- srvfunc = require(SRVDIR + 'srvfunc');
+var DIR = process.cwd() + '/',
+ main = require(DIR + 'lib/server/main.js'),
+ SRVDIR = main.SRVDIR,
+ srvfunc = main.srvfunc;
/*
* Обьект для работы с кэшем
diff --git a/lib/server/socket.js b/lib/server/socket.js
index b5bee888..c8ef8d69 100644
--- a/lib/server/socket.js
+++ b/lib/server/socket.js
@@ -1,17 +1,18 @@
/* module make possible connectoin thrue socket.io on a server */
var DIR = process.cwd() + '/',
- SRVDIR = DIR + 'lib/server/',
+ main = require(DIR + 'lib/server/main.js'),
+ SRVDIR = main.SRVDIR,
- srvfunc = require(SRVDIR + 'srvfunc'),
+ srvfunc = main.srvfunc,
io = srvfunc.require('socket.io'),
- exec = require('child_process').exec,
- update = srvfunc.require(SRVDIR + 'update'),
+ exec = main.child_process.exec,
+ update = main.update,
ClientFuncs = [],
OnMessageFuncs = [],
- Win32_b = process.platform === 'win32';
+ Win32_b = srvfunc.isWin32;
/**
* function listen on servers port
diff --git a/server.js b/server.js
index b7e01ed0..d817627d 100644
--- a/server.js
+++ b/server.js
@@ -92,58 +92,59 @@ var CloudServer = {
},
DirPath = '/',
-
+
DIR = process.cwd() + '/',
- LIBDIR = DIR + 'lib/',
- SRVDIR = LIBDIR + 'server/',
+ main = require(DIR + 'lib/server/main.js'),
+
+ DIR = main.DIR,
+ LIBDIR = main.LIBDIR,
+ SRVDIR = main.LIBDIR,
/* модуль для работы с путями*/
- Path = require('path'),
- Fs = require('fs'), /* модуль для работы с файловой системой*/
- Querystring = require('querystring'),
+ Path = main.path,
+ Fs = main.fs, /* модуль для работы с файловой системой*/
+ Querystring = main.querystring,
- srvfunc = require(SRVDIR + 'srvfunc'),
+ srvfunc = main.srvfunc,
/* node v0.4 not contains zlib */
- Zlib = srvfunc.require('zlib'); /* модуль для сжатия данных gzip-ом*/
+ Zlib = main.zlib; /* модуль для сжатия данных gzip-ом*/
if(!Zlib)
console.log('to use gzip-commpression' +
'you should use newer node version\n');
/* добавляем модуль с функциями */
-var CloudFunc = srvfunc.require(LIBDIR + 'cloudfunc'),
- Util = srvfunc.require(LIBDIR + 'util');
+var CloudFunc = main.cloudfunc,
+ Util = main.util;
-CloudServer.AppCache = srvfunc.require(SRVDIR + 'appcache');
-CloudServer.Socket = srvfunc.require(SRVDIR + 'socket');
-
-CloudServer.Obj = srvfunc.require(SRVDIR + 'object');
+CloudServer.AppCache = main.appcache;
+CloudServer.Socket = main.socket;
-if(CloudServer.Obj){
- CloudServer.Cache = CloudServer.Obj.Cache;
- CloudServer.Minify = CloudServer.Obj.Minify;
+if(main.object){
+ CloudServer.Cache = main.object.Cache;
+ CloudServer.Minify = main.object.Minify;
}
else
console.log('could not found one of Cloud Commander SS files');
/* базовая инициализация */
-CloudServer.init = (function(pAppCachProcessing){
+CloudServer.init = (function(pAppCachProcessing){
/* Переменная в которой храниться кэш*/
- this.Cache.setAllowed(CloudServer.Config.cache.allowed);
+ this.Cache.setAllowed(this.Config.cache.allowed);
/* Change default parameters of
* js/css/html minification
*/
- this.Minify.setAllowed(CloudServer.Config.minification);
+ this.Minify.setAllowed(this.Config.minification);
/* Если нужно минимизируем скрипты */
this.Minify._allowed = this.Minify.doit();
- var lAppCache = CloudServer.AppCache;
+ var lAppCache = this.AppCache;
/* создаём файл app cache */
- if( CloudServer.Config.appcache &&
+ if( this.Config.appcache &&
lAppCache &&
- CloudServer.Config.server )
+ this.Config.server )
Util.exec( pAppCachProcessing );
});