From: konekoneko <jbh03215@hotmail.co.jp>
Date: Fri, 30 May 2014 16:09:28 +0000 (+0900)
Subject: グローバル変数の数を減らした
X-Git-Url: http://git.osdn.jp/view?p=webchat%2FWebChat.git;a=commitdiff_plain;h=0301dfbed680897cb05a6dc8ccf0cc5ad51c920e

グローバル変数の数を減らした
---

diff --git a/chat.js b/chat.js
index 4370bbe..dbdd35e 100644
--- a/chat.js
+++ b/chat.js
@@ -8,17 +8,6 @@ $log_directory = "log";	//ログファイルを置くフォルダー
 $log_file_name = "logfile%d.txt";	//ログファイル名(%dはそのままにしておくこと)
 $splited_log_file_name = "logfile%d_%s.txt"	//分割後のファイル名(%dと%sはそのままにしておくこと)
 
-var resource = require("./resources.js");
-var config = require("./configure.js");
-var security = require("./security.js");
-var lazy = require("lazy");
-var fs = require("fs");
-var async = require("async");
-var path = require("path");
-var util = require("util");
-var cookie = require("express/node_modules/cookie");
-var connectUtils = require("express/node_modules/connect/lib/utils");
-
 var clients = new Array();
 
 var sessionStore;
@@ -32,6 +21,7 @@ module.exports = function(app,server,express,session){
 	app.get("/chat/admin", admin_proc);
 	app.post("/chat/admin",admin_postproc);
 
+	var config = require("./configure.js");
 	var io = require("socket.io").listen(server);
 	io.configure("production", function(){
 		io.set("transports", config.transports);
@@ -50,6 +40,7 @@ module.exports = function(app,server,express,session){
 };
 
 function chat_proc(req, res){
+	var security = require("./security.js");
 	var info = new security.SessionInfomation(false);
 	req.session.items = info;
 
@@ -60,6 +51,7 @@ function chat_proc(req, res){
 }
 
 function auth_proc(user, pass) {
+	var config = require("./configure.js");
 	return user === config.username && pass === config.password;
 }
 
@@ -90,9 +82,11 @@ function admin_postproc(req,res){
 
 function admin_proc(req,res)
 {
+	var security = require("./security.js");
 	var info = new security.SessionInfomation(true);
 	req.session.items = info;
 	var iplist = ipbanlist.GetText();
+	var fs = require("fs");
 
 	fs.readdir($log_directory,function(err,list){
 		res.setHeader("X-FRAME-OPTIONS","DENY");
@@ -114,9 +108,10 @@ function removeLog(files,callback)
 			callback();
 		return;
 	}
-
+	var async = require("async");
 	async.map(files,
 	function(item,callback){
+		var fs = require("fs");
 		fs.unlink($log_directory + "/" + item,callback);
 	},
 	function(err,results){
@@ -128,6 +123,7 @@ function removeLog(files,callback)
 //RoomInfomationCollecionクラス
 function RoomInfomationCollection()
 {
+	var config = require("./configure.js");
 	var MySQLPool = new require("./mysql_pool.js");
 	var pool = new MySQLPool({
 				host     : config.db_host,
@@ -167,11 +163,13 @@ function RoomInfomationCollection()
 	}
 	this.Update = function(data,callfunc){
 		Clear();
+		var async = require("async");
 		async.waterfall([
 			function(next){
 				pool.query("TRUNCATE TABLE rooms",null,next);
 			},
 			function(result,next){
+				var util = require("util");
 				console.log(util.inspect(data));
 				var items = new Array();
 				var config = data.config;
@@ -201,6 +199,7 @@ function RoomInfomationCollection()
 	}
 	function GetRoomList(callback){
 		Clear();
+		var async = require("async");
 		async.waterfall([
 			function(next){
 				pool.query("SELECT * FROM rooms",null,next);
@@ -217,6 +216,7 @@ function RoomInfomationCollection()
 	}
 	function Clear(){
 		collection = {};
+		var config = require("./configure.js");
 		for(var i = 0; i < config.max_room_number; i++)
 			Add(i,null,null);
 	};
@@ -345,6 +345,7 @@ function RoomInfomation(pass,hiddenlogflag)
 //IPBANクラス
 function IpBanCollecion()
 {
+	var config = require("./configure.js");
 	var MySQLPool = new require("./mysql_pool.js");
 	var pool = new MySQLPool({
 				host     : config.db_host,
@@ -373,6 +374,7 @@ function IpBanCollecion()
 	}
 	this.Update = function(text,callfunc){
 		collection = {};
+		var async = require("async");
 		async.waterfall([
 			function(next){
 				pool.query("TRUNCATE TABLE ipbanlist",null,next);
@@ -398,6 +400,7 @@ function IpBanCollecion()
 	}
 	function GetIpBanList(callfunc)
 	{
+		var async = require("async");
 		async.waterfall([
 			function(next){
 				pool.query("SELECT * FROM ipbanlist",null,next);
@@ -419,6 +422,7 @@ createLogDirectory();
 
 function createLogDirectory()
 {
+	var fs = require("fs");
 	fs.exists($log_directory,function(exists){
 		if(exists == false)
 			fs.mkdirSync($log_directory);
@@ -465,7 +469,9 @@ function ParseConnect(socket)
 
 function ParseAuthorization(handshakeData, callback)
 {
+	var connectUtils = require("express/node_modules/connect/lib/utils");
 	if(handshakeData.headers.cookie) {
+		var cookie = require("express/node_modules/cookie");
 		var signedCookie = cookie.parse(handshakeData.headers.cookie);
 		var sessionID = connectUtils.parseSignedCookies(signedCookie, $secret)["connect.sid"];
 		sessionStore.get(sessionID, function (err, session) {
@@ -507,6 +513,7 @@ function ParseSetPassword(socket,msg)
 		name:$system_name,
 		message:null,
 	};
+	var resource = require("./resources.js");
 	if($rooms.Get(rno).IsVolatile() == false && $rooms.Get(rno).SetPassword(msg.owner,msg.password))
 		newMeg.message = resource.password_setted_message;
 	else
@@ -520,6 +527,7 @@ function ParseJoin(socket,msg)
 
 	if(ipbanlist.IsBlockedToWrite(ip))
 	{
+		var resource = require("./resources.js");
 		socket.emit("error",resource.block_message);
 		return;
 	}
@@ -532,6 +540,7 @@ function ParseJoin(socket,msg)
 	socket.json.emit("send romcount",romcount);
 	socket.json.broadcast.emit("send romcount",romcount);
 
+	var util = require("util");
 	if($rooms.Get(rno).IsVolatile() == false)
 	{
 		if($rooms.Get(rno).IsTimeout() ||
@@ -546,6 +555,7 @@ function ParseJoin(socket,msg)
 		}
 		else
 		{
+			var resource = require("./resources.js");
 			socket.emit("error",resource.unmatch_password);
 			return;
 		}
@@ -562,6 +572,7 @@ function ParseQuit(socket,msg)
 {
 	var ip = GetClientIPAdress(socket);
 
+	var resource = require("./resources.js");
 	if(ipbanlist.IsBlockedToWrite(ip))
 	{
 		socket.emit("error",resource.block_message);
@@ -595,6 +606,7 @@ function ParseQuit(socket,msg)
 			$rooms.Get(rno).RemoveAuth(msg.name);
 	}
 
+	var util = require("util");
 	newMeg.message = util.format("/quitedby %s",msg.name);
 	ParseSendMsg(socket,newMeg);
 }
@@ -607,6 +619,7 @@ function ParseSendMsg(socket,msg)
 
 	if(ip in ipbanlist)
 	{
+		var resource = require("./resources.js");
 		socket.emit("error",resource.block_message);
 		return;
 	}
@@ -632,6 +645,7 @@ function ParseSendMsg(socket,msg)
 
 	socket.json.broadcast.emit("req msg", repacked_msg);
 
+	var util = require("util");
 	var path = $log_directory + "/" + util.format($log_file_name,rno);
 	var log = new ChatLog(path);
 	log.Save(repacked_msg,ip,rno);
@@ -655,6 +669,7 @@ function ParseGetPastLog(socket,file)
 		return;
 	var path = $log_directory + "/" + file;
 	var log = new ChatLog(path);
+	var config = require("./configure.js");
 	log.ToArray(config.showip,function(array){
 		socket.json.emit("req pastlog",array);
 	});
@@ -664,11 +679,13 @@ function ChatLog(path)
 {
 	this.ToArray = function(hasIp,callback)
 	{
+		var fs = require("fs");
 		var state = fs.stat(path,function(err,state){
 			if(err)
 				return;
 			var array = new Array();
 			var stream = fs.createReadStream(path);
+			var lazy = require("lazy");
 			new lazy(stream)
 				.lines
 				.forEach(function(line){
@@ -703,6 +720,8 @@ function ChatLog(path)
 
 	function SplitLog(rno,callback)
 	{
+		var util = require("util");
+		var fs = require("fs");
 		var state = fs.stat(path,function(err,state){
 			if(err && typeof(callback) == "function")
 			{
@@ -726,6 +745,8 @@ function ChatLog(path)
 
 	function WritePastLog(path,text)
 	{
+		var fs = require("fs");
+		var async = require("async");
 		async.waterfall([
 			function(callback){
 				fs.open(path,"a",callback);