Merge branch 'mc'

ygopro-server.coffee

@@ -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)->
+    create_room_with_action = (buffer, decrypted_buffer, match_permit)->
       if client.closed
         return
       firstByte = buffer.readUInt8(1)
@@ -2390,16 +2390,9 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
             ygopro.stoc_die(client, '${invalid_password_not_found}')
             return
         when 4
-          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
+          if match_permit and !match_permit.permit
+            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
@@ -2429,7 +2422,6 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
       return
 
     _async.auto({
-      ###
       match_permit: (done) ->
         if client.closed
           done()
@@ -2455,7 +2447,6 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
             done(null, null)
           return
         return
-      ###
       get_user: (done) ->
         if client.closed
           done()
@@ -2514,7 +2505,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)
+      create_room_with_action(data.get_user.original, data.get_user.decrypted, data.match_permit)
     )
 
 

ygopro-server.js

@@ -3069,8 +3069,8 @@
         }
         return (checksum & 0xFF) === 0;
       };
-      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;
+      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;
         if (client.closed) {
           return;
         }
@@ -3150,20 +3150,9 @@
             }
             break;
           case 4:
-            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;
-              }
+            if (match_permit && !match_permit.permit) {
+              ygopro.stoc_die(client, '${invalid_password_unauthorized}');
+              return;
             }
             room = (await ROOM_find_or_create_by_name('M#' + info.pass.slice(8)));
             if (room) {
@@ -3205,33 +3194,36 @@
         }
       };
       _async.auto({
-        /*
-        match_permit: (done) ->
-          if client.closed
-            done()
-            return
-          if(!settings.modules.arena_mode.check_permit)
-            done(null, null)
-            return
-          request
+        match_permit: function(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
-          , (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
-        */
+            }
+          }, 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);
+            }
+          });
+        },
         get_user: function(done) {
           var decrypted_buffer, i, id, len2, m, ref, secret;
           if (client.closed) {
@@ -3301,7 +3293,7 @@
           ygopro.stoc_die(client, err);
           return;
         }
-        return create_room_with_action(data.get_user.original, data.get_user.decrypted);
+        return create_room_with_action(data.get_user.original, data.get_user.decrypted, data.match_permit);
       });
     } else if (settings.modules.challonge.enabled) {
       if (info.version !== settings.version && settings.alternative_versions.includes(info.version)) {