add timeout, disable skip_empty_side

ygopro-server.coffee

@@ -40,6 +40,8 @@ else
 net.createServer (client) ->
   server = new net.Socket()
   client.server = server
+  
+  client.setTimeout(300000) # 5分钟
 
   #释放处理
   client.on 'close', (had_error) ->
@@ -56,6 +58,9 @@ net.createServer (client) ->
       client.room.disconnect(client, error) if client.room
     server.end()
 
+  client.on 'timeout', ()->
+    server.end()
+
   server.on 'close', (had_error) ->
     #log.info "server closed", client.name, had_error
     server.closed = true unless server.closed
@@ -399,15 +404,17 @@ ygopro.ctos_follow 'UPDATE_DECK', false, (buffer, info, client, server)->
   client.main = main
   client.side = side
 
+###
 if settings.modules.skip_empty_side
   ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
-    if not _.any(client.deck, (card_usage)->card_usage.side)
+    if client.side
       ygopro.ctos_send server, 'UPDATE_DECK', {
         mainc: client.main.length,
         sidec: 0,
         deckbuf: client.main
       }
       ygopro.stoc_send_chat client, '等待更换副卡组中...'
+###
 
 #http
 if settings.modules.http

ygopro-server.js

@@ -54,6 +54,7 @@
     var ctos_buffer, ctos_message_length, ctos_proto, server, stoc_buffer, stoc_message_length, stoc_proto;
     server = new net.Socket();
     client.server = server;
+    client.setTimeout(300000);
     client.on('close', function(had_error) {
       if (!client.closed) {
         client.closed = true;
@@ -72,6 +73,9 @@
       }
       return server.end();
     });
+    client.on('timeout', function() {
+      return server.end();
+    });
     server.on('close', function(had_error) {
       if (!server.closed) {
         server.closed = true;
@@ -477,20 +481,18 @@
     return client.side = side;
   });
 
-  if (settings.modules.skip_empty_side) {
-    ygopro.stoc_follow('CHANGE_SIDE', false, function(buffer, info, client, server) {
-      if (!_.any(client.deck, function(card_usage) {
-        return card_usage.side;
-      })) {
-        ygopro.ctos_send(server, 'UPDATE_DECK', {
+
+  /*
+  if settings.modules.skip_empty_side
+    ygopro.stoc_follow 'CHANGE_SIDE', false, (buffer, info, client, server)->
+      if client.side
+        ygopro.ctos_send server, 'UPDATE_DECK', {
           mainc: client.main.length,
           sidec: 0,
           deckbuf: client.main
-        });
-        return ygopro.stoc_send_chat(client, '等待更换副卡组中...');
-      }
-    });
-  }
+        }
+        ygopro.stoc_send_chat client, '等待更换副卡组中...'
+   */
 
   if (settings.modules.http) {
     http_server = http.createServer(function(request, response) {