Commit 14f1b347 authored by nanahira's avatar nanahira

fix

parent 9cfe9747
Pipeline #6499 failed with stages
in 70 minutes and 51 seconds
...@@ -2207,13 +2207,11 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)-> ...@@ -2207,13 +2207,11 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
return return
when 4 when 4
if settings.modules.arena_mode.check_permit if settings.modules.arena_mode.check_permit
match_permit = null
try try
match_permit = await (axios.get settings.modules.arena_mode.check_permit, matchPermitRes = await axios.get settings.modules.arena_mode.check_permit,
responseType: 'json' responseType: 'json'
timeout: 3000 timeout: 3000
) match_permit = matchPermitRes.data
.data
catch e catch e
log.warn "match permit fail #{e.toString()}" log.warn "match permit fail #{e.toString()}"
if client.closed if client.closed
...@@ -2260,11 +2258,13 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)-> ...@@ -2260,11 +2258,13 @@ ygopro.ctos_follow 'JOIN_GAME', true, (buffer, info, client, server, datas)->
return create_room_with_action(decrypted_buffer, decrypted_buffer) return create_room_with_action(decrypted_buffer, decrypted_buffer)
try try
userData = await (axios.get "#{settings.modules.mycard.auth_base_url}/users/#{encodeURIComponent(client.name)}.json", userUrl = "#{settings.modules.mycard.auth_base_url}/users/#{encodeURIComponent(client.name)}.json"
console.log(userUrl)
userDataRes = await axios.get userUrl,
responseType: 'json' responseType: 'json'
timeout: 10000 timeout: 10000
) userData = userDataRes.data
.data console.log userData
catch e catch e
log.warn("READ USER FAIL", client.name, e.toString()) log.warn("READ USER FAIL", client.name, e.toString())
if !client.closed if !client.closed
......
...@@ -2726,7 +2726,7 @@ ...@@ -2726,7 +2726,7 @@
}); });
ygopro.ctos_follow('JOIN_GAME', true, async function(buffer, info, client, server, datas) { ygopro.ctos_follow('JOIN_GAME', true, async function(buffer, info, client, server, datas) {
var available_logs, check_buffer_indentity, create_room_with_action, decrypted_buffer, duelLog, e, exactBan, i, id, index, j, l, len, len1, len2, len3, m, n, pre_room, recover_match, ref, ref1, replay, replay_id, replays, room, secret, struct, userData; var available_logs, check_buffer_indentity, create_room_with_action, decrypted_buffer, duelLog, e, exactBan, i, id, index, j, l, len, len1, len2, len3, m, n, pre_room, recover_match, ref, ref1, replay, replay_id, replays, room, secret, struct, userData, userDataRes, userUrl;
//log.info info //log.info info
info.pass = info.pass.trim(); info.pass = info.pass.trim();
client.pass = info.pass; client.pass = info.pass;
...@@ -2831,7 +2831,7 @@ ...@@ -2831,7 +2831,7 @@
return (checksum & 0xFF) === 0; return (checksum & 0xFF) === 0;
}; };
create_room_with_action = async function(buffer, decrypted_buffer) { 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; var action, e, firstByte, len2, m, matchPermitRes, match_permit, name, opt0, opt1, opt2, opt3, options, player, ref, ref1, room, room_title, title;
if (client.closed) { if (client.closed) {
return; return;
} }
...@@ -2912,12 +2912,12 @@ ...@@ -2912,12 +2912,12 @@
break; break;
case 4: case 4:
if (settings.modules.arena_mode.check_permit) { if (settings.modules.arena_mode.check_permit) {
match_permit = null;
try { try {
match_permit = (await (axios.get(settings.modules.arena_mode.check_permit, { matchPermitRes = (await axios.get(settings.modules.arena_mode.check_permit, {
responseType: 'json', responseType: 'json',
timeout: 3000 timeout: 3000
})).data); }));
match_permit = matchPermitRes.data;
} catch (error1) { } catch (error1) {
e = error1; e = error1;
log.warn(`match permit fail ${e.toString()}`); log.warn(`match permit fail ${e.toString()}`);
...@@ -2983,10 +2983,14 @@ ...@@ -2983,10 +2983,14 @@
} }
} }
try { try {
userData = (await (axios.get(`${settings.modules.mycard.auth_base_url}/users/${encodeURIComponent(client.name)}.json`, { userUrl = `${settings.modules.mycard.auth_base_url}/users/${encodeURIComponent(client.name)}.json`;
console.log(userUrl);
userDataRes = (await axios.get(userUrl, {
responseType: 'json', responseType: 'json',
timeout: 10000 timeout: 10000
})).data); }));
userData = userDataRes.data;
console.log(userData);
} catch (error1) { } catch (error1) {
e = error1; e = error1;
log.warn("READ USER FAIL", client.name, e.toString()); log.warn("READ USER FAIL", client.name, e.toString());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment