Merge branch 'mc'

ygopro-server.coffee

@@ -2304,16 +2304,16 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
       return
     
     if settings.modules.mycard.enabled and settings.modules.mycard.ban_get and !client.is_local
-      try
-        banMCRequest = await axios.get settings.modules.mycard.ban_get, 
-          paramsSerializer: qs.stringify
-          params:
-            user: client.name
+      axios.get settings.modules.mycard.ban_get, 
+        paramsSerializer: qs.stringify
+        params:
+          user: client.name
+      .then (banMCRequest) ->
         if typeof(banMCRequest.data) == "object"
           client.ban_mc = banMCRequest.data
         else
           log.warn "ban get bad json", banMCRequest.data
-      catch e
+      .catch (e) ->
         log.warn 'ban get error', e.toString()
 
     check_buffer_indentity = (buf)->
@@ -2322,7 +2322,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
         checksum += buf.readUInt8(i)
       (checksum & 0xFF) == 0
 
-    create_room_with_action = (buffer, decrypted_buffer, match_permit)->
+    create_room_with_action = (buffer, decrypted_buffer)->
       if client.closed
         return
       firstByte = buffer.readUInt8(1)
@@ -2390,9 +2390,16 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
             ygopro.stoc_die(client, '${invalid_password_not_found}')
             return
         when 4
-          if match_permit and !match_permit.permit
-            ygopro.stoc_die(client, '${invalid_password_unauthorized}')
-            return
+          if settings.modules.arena_mode.check_permit
+            match_permit = null
+            try
+              match_permit = await axios.get settings.modules.arena_mode.check_permit,
+                responseType: 'json'
+            catch e
+              log.warn "match permit fail #{e.toString()}"
+            if match_permit and match_permit.permit == false
+              ygopro.stoc_die(client, '${invalid_password_unauthorized}')
+              return
           room = await ROOM_find_or_create_by_name('M#' + info.pass.slice(8))
           if room
             for player in room.get_playing_player() when player and player.name == client.name
@@ -2422,6 +2429,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
       return
 
     _async.auto({
+      ###
       match_permit: (done) ->
         if client.closed
           done()
@@ -2447,6 +2455,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
             done(null, null)
           return
         return
+      ###
       get_user: (done) ->
         if client.closed
           done()
@@ -2505,7 +2514,7 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
         return
 
 
-      create_room_with_action(data.get_user.original, data.get_user.decrypted, data.match_permit)
+      create_room_with_action(data.get_user.original, data.get_user.decrypted)
     )
 
 

ygopro-server.js

@@ -2965,7 +2965,7 @@
   });
 
   ygopro.ctos_follow('JOIN_GAME', true, async function(buffer, info, client, server, datas) {
-    var available_logs, banMCRequest, check_buffer_indentity, create_room_with_action, duelLog, e, exactBan, index, j, l, len, len1, pre_room, recover_match, replay, replay_id, replays, room, struct;
+    var available_logs, check_buffer_indentity, create_room_with_action, duelLog, exactBan, index, j, l, len, len1, pre_room, recover_match, replay, replay_id, replays, room, struct;
     //log.info info
     info.pass = info.pass.trim();
     client.pass = info.pass;
@@ -3046,22 +3046,20 @@
         return;
       }
       if (settings.modules.mycard.enabled && settings.modules.mycard.ban_get && !client.is_local) {
-        try {
-          banMCRequest = (await axios.get(settings.modules.mycard.ban_get, {
-            paramsSerializer: qs.stringify,
-            params: {
-              user: client.name
-            }
-          }));
+        axios.get(settings.modules.mycard.ban_get, {
+          paramsSerializer: qs.stringify,
+          params: {
+            user: client.name
+          }
+        }).then(function(banMCRequest) {
           if (typeof banMCRequest.data === "object") {
-            client.ban_mc = banMCRequest.data;
+            return client.ban_mc = banMCRequest.data;
           } else {
-            log.warn("ban get bad json", banMCRequest.data);
+            return log.warn("ban get bad json", banMCRequest.data);
           }
-        } catch (error1) {
-          e = error1;
-          log.warn('ban get error', e.toString());
-        }
+        }).catch(function(e) {
+          return log.warn('ban get error', e.toString());
+        });
       }
       check_buffer_indentity = function(buf) {
         var checksum, i, m, ref;
@@ -3071,8 +3069,8 @@
         }
         return (checksum & 0xFF) === 0;
       };
-      create_room_with_action = async function(buffer, decrypted_buffer, match_permit) {
-        var action, firstByte, len2, m, name, opt0, opt1, opt2, opt3, options, player, ref, ref1, room, room_title, title;
+      create_room_with_action = async function(buffer, decrypted_buffer) {
+        var action, e, firstByte, len2, m, match_permit, name, opt0, opt1, opt2, opt3, options, player, ref, ref1, room, room_title, title;
         if (client.closed) {
           return;
         }
@@ -3152,9 +3150,20 @@
             }
             break;
           case 4:
-            if (match_permit && !match_permit.permit) {
-              ygopro.stoc_die(client, '${invalid_password_unauthorized}');
-              return;
+            if (settings.modules.arena_mode.check_permit) {
+              match_permit = null;
+              try {
+                match_permit = (await axios.get(settings.modules.arena_mode.check_permit, {
+                  responseType: 'json'
+                }));
+              } catch (error1) {
+                e = error1;
+                log.warn(`match permit fail ${e.toString()}`);
+              }
+              if (match_permit && match_permit.permit === false) {
+                ygopro.stoc_die(client, '${invalid_password_unauthorized}');
+                return;
+              }
             }
             room = (await ROOM_find_or_create_by_name('M#' + info.pass.slice(8)));
             if (room) {
@@ -3196,36 +3205,33 @@
         }
       };
       _async.auto({
-        match_permit: function(done) {
-          if (client.closed) {
-            done();
-            return;
-          }
-          if (!settings.modules.arena_mode.check_permit) {
-            done(null, null);
-            return;
-          }
-          request({
+        /*
+        match_permit: (done) ->
+          if client.closed
+            done()
+            return
+          if(!settings.modules.arena_mode.check_permit)
+            done(null, null)
+            return
+          request
             url: settings.modules.arena_mode.check_permit,
             json: true,
-            qs: {
+            qs:
               username: client.name,
               password: info.pass,
               arena: settings.modules.arena_mode.mode
-            }
-          }, function(error, response, body) {
-            if (client.closed) {
-              done(null, null);
-              return;
-            }
-            if (!error && body) {
-              done(null, body);
-            } else {
-              log.warn("Match permit request error", error);
-              done(null, null);
-            }
-          });
-        },
+          , (error, response, body)->
+            if client.closed
+              done(null, null)
+              return
+            if !error and body
+              done(null, body)
+            else
+              log.warn("Match permit request error", error)
+              done(null, null)
+            return
+          return
+        */
         get_user: function(done) {
           var decrypted_buffer, i, id, len2, m, ref, secret;
           if (client.closed) {
@@ -3295,7 +3301,7 @@
           ygopro.stoc_die(client, err);
           return;
         }
-        return create_room_with_action(data.get_user.original, data.get_user.decrypted, data.match_permit);
+        return create_room_with_action(data.get_user.original, data.get_user.decrypted);
       });
     } else if (settings.modules.challonge.enabled) {
       if (info.version !== settings.version && settings.alternative_versions.includes(info.version)) {