Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
S
srvpro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
srvpro
Commits
77e2addb
Commit
77e2addb
authored
Apr 04, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use async for mycard match
parent
a14632fc
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
160 additions
and
123 deletions
+160
-123
ygopro-server.coffee
ygopro-server.coffee
+71
-54
ygopro-server.js
ygopro-server.js
+89
-69
No files found.
ygopro-server.coffee
View file @
77e2addb
...
...
@@ -1925,7 +1925,7 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
checksum
+=
buf
.
readUInt8
(
i
)
(
checksum
&
0xFF
)
==
0
buffer_handle_callback
=
(
buffer
,
decrypted_buffer
,
match_permit
)
->
create_room_with_action
=
(
buffer
,
decrypted_buffer
,
match_permit
)
->
if
client
.
closed
return
action
=
buffer
.
readUInt8
(
1
)
>>
4
...
...
@@ -2044,67 +2044,84 @@ ygopro.ctos_follow 'JOIN_GAME', false, (buffer, info, client, server, datas)->
room
.
connect
(
client
)
return
match_permit_callback
=
(
buffer
,
match_permit
)
->
if
client
.
closed
_async
.
auto
({
match_permit
:
(
done
)
->
if
(
!
settings
.
modules
.
arena_mode
.
check_permit
)
done
(
null
,
null
)
return
request
url
:
settings
.
modules
.
arena_mode
.
check_permit
,
json
:
true
,
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
,
boddy
)
else
log
.
warn
(
"Match permit request error"
,
error
)
match_permit_callback
(
null
,
null
)
return
return
if
id
=
users_cache
[
client
.
name
]
secret
=
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
return
buffer_handle_callback
(
decrypted_buffer
,
decrypted_buffer
,
match_permit
)
#TODO: query database directly, like preload.
request
baseUrl
:
settings
.
modules
.
mycard
.
auth_base_url
,
url
:
'/users/'
+
encodeURIComponent
(
client
.
name
)
+
'.json'
,
qs
:
api_key
:
settings
.
modules
.
mycard
.
auth_key
,
api_username
:
client
.
name
,
skip_track_visit
:
true
json
:
true
,
(
error
,
response
,
body
)
->
if
!
error
and
body
and
body
.
user
users_cache
[
client
.
name
]
=
body
.
user
.
id
secret
=
body
.
user
.
id
%
65535
+
1
get_user
:
(
done
)
->
if
client
.
closed
return
if
id
=
users_cache
[
client
.
name
]
secret
=
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
buffer
=
decrypted_buffer
else
log
.
warn
(
"READ USER FAIL"
,
error
,
body
)
ygopro
.
stoc_die
(
client
,
"${create_room_failed}"
)
return
done
(
null
,
{
original
:
decrypted_buffer
,
decrypted
:
decrypted_buffer
})
#TODO: query database directly, like preload.
request
baseUrl
:
settings
.
modules
.
mycard
.
auth_base_url
,
url
:
'/users/'
+
encodeURIComponent
(
client
.
name
)
+
'.json'
,
qs
:
api_key
:
settings
.
modules
.
mycard
.
auth_key
,
api_username
:
client
.
name
,
skip_track_visit
:
true
json
:
true
,
(
error
,
response
,
body
)
->
if
!
error
and
body
and
body
.
user
users_cache
[
client
.
name
]
=
body
.
user
.
id
secret
=
body
.
user
.
id
%
65535
+
1
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
)
for
i
in
[
0
,
2
,
4
]
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
)
if
check_buffer_indentity
(
decrypted_buffer
)
buffer
=
decrypted_buffer
else
log
.
warn
(
"READ USER FAIL"
,
error
,
body
)
done
(
"${create_room_failed}"
)
return
# buffer != decrypted_buffer ==> auth failed
# buffer != decrypted_buffer ==> auth failed
if
!
check_buffer_indentity
(
buffer
)
ygopro
.
stoc_die
(
client
,
'${invalid_password_checksum}'
)
return
return
buffer_handle_callback
(
buffer
,
decrypted_buffer
,
match_permit
)
return
if
settings
.
modules
.
arena_mode
.
check_permit
request
url
:
settings
.
modules
.
arena_mode
.
check_permit
,
json
:
true
,
qs
:
username
:
client
.
name
,
password
:
info
.
pass
,
arena
:
settings
.
modules
.
arena_mode
.
mode
,
(
error
,
response
,
body
)
->
if
client
.
closed
return
if
!
error
and
body
match_permit_callback
(
buffer
,
body
)
else
log
.
warn
(
"Match permit request error"
,
error
)
match_permit_callback
(
buffer
,
null
)
if
!
check_buffer_indentity
(
buffer
)
done
(
'${invalid_password_checksum}'
)
return
done
(
null
,
{
original
:
buffer
,
decrypted
:
decrypted_buffer
})
return
else
match_permit_callback
(
buffer
,
null
)
},
(
err
,
data
)
->
if
(
client
.
closed
)
return
if
(
err
)
ygopro
.
stoc_die
(
client
,
err
)
return
create_room_with_action
(
data
.
get_user
.
original
,
data
.
get_user
.
decrypted
,
match_permit
)
)
else
if
settings
.
modules
.
challonge
.
enabled
...
...
ygopro-server.js
View file @
77e2addb
...
...
@@ -2354,7 +2354,7 @@
});
ygopro
.
ctos_follow
(
'
JOIN_GAME
'
,
false
,
function
(
buffer
,
info
,
client
,
server
,
datas
)
{
var
buffer_handle_callback
,
check_buffer_indentity
,
len2
,
len3
,
m
,
match_permit_callback
,
n
,
name
,
pre_room
,
ref2
,
ref3
,
replay_id
,
room
;
var
check_buffer_indentity
,
create_room_with_action
,
len2
,
len3
,
m
,
n
,
name
,
pre_room
,
ref2
,
ref3
,
replay_id
,
room
;
info
.
pass
=
info
.
pass
.
trim
();
client
.
pass
=
info
.
pass
;
if
(
CLIENT_is_able_to_reconnect
(
client
)
||
CLIENT_is_able_to_kick_reconnect
(
client
))
{
...
...
@@ -2435,7 +2435,7 @@
}
return
(
checksum
&
0xFF
)
===
0
;
};
buffer_handle_callback
=
function
(
buffer
,
decrypted_buffer
,
match_permit
)
{
create_room_with_action
=
function
(
buffer
,
decrypted_buffer
,
match_permit
)
{
var
action
,
len2
,
len3
,
m
,
n
,
name
,
opt1
,
opt2
,
opt3
,
options
,
player
,
ref2
,
ref3
,
room
,
room_title
,
title
;
if
(
client
.
closed
)
{
return
;
...
...
@@ -2577,81 +2577,101 @@
room
.
connect
(
client
);
}
};
match_permit_callback
=
function
(
buffer
,
match_permit
)
{
var
decrypted_buffer
,
i
,
id
,
len2
,
m
,
ref2
,
secret
;
if
(
client
.
closed
)
{
return
;
}
if
(
id
=
users_cache
[
client
.
name
])
{
secret
=
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref2
=
[
0
,
2
,
4
];
for
(
m
=
0
,
len2
=
ref2
.
length
;
m
<
len2
;
m
++
)
{
i
=
ref2
[
m
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
_async
.
auto
({
match_permit
:
function
(
done
)
{
if
(
!
settings
.
modules
.
arena_mode
.
check_permit
)
{
done
(
null
,
null
);
return
;
}
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
return
buffer_handle_callback
(
decrypted_buffer
,
decrypted_buffer
,
match_permit
);
request
({
url
:
settings
.
modules
.
arena_mode
.
check_permit
,
json
:
true
,
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
,
boddy
);
}
else
{
log
.
warn
(
"
Match permit request error
"
,
error
);
match_permit_callback
(
null
,
null
);
}
});
},
get_user
:
function
(
done
)
{
var
decrypted_buffer
,
i
,
id
,
len2
,
m
,
ref2
,
secret
;
if
(
client
.
closed
)
{
return
;
}
}
request
({
baseUrl
:
settings
.
modules
.
mycard
.
auth_base_url
,
url
:
'
/users/
'
+
encodeURIComponent
(
client
.
name
)
+
'
.json
'
,
qs
:
{
api_key
:
settings
.
modules
.
mycard
.
auth_key
,
api_username
:
client
.
name
,
skip_track_visit
:
true
},
json
:
true
},
function
(
error
,
response
,
body
)
{
var
len3
,
n
,
ref3
;
if
(
!
error
&&
body
&&
body
.
user
)
{
users_cache
[
client
.
name
]
=
body
.
user
.
id
;
secret
=
body
.
user
.
id
%
65535
+
1
;
if
(
id
=
users_cache
[
client
.
name
])
{
secret
=
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref
3
=
[
0
,
2
,
4
];
for
(
n
=
0
,
len3
=
ref3
.
length
;
n
<
len3
;
n
++
)
{
i
=
ref
3
[
n
];
ref
2
=
[
0
,
2
,
4
];
for
(
m
=
0
,
len2
=
ref2
.
length
;
m
<
len2
;
m
++
)
{
i
=
ref
2
[
m
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
}
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
buffer
=
decrypted_buffer
;
done
(
null
,
{
original
:
decrypted_buffer
,
decrypted
:
decrypted_buffer
});
}
}
else
{
log
.
warn
(
"
READ USER FAIL
"
,
error
,
body
);
ygopro
.
stoc_die
(
client
,
"
${create_room_failed}
"
);
return
;
}
if
(
!
check_buffer_indentity
(
buffer
))
{
ygopro
.
stoc_die
(
client
,
'
${invalid_password_checksum}
'
);
return
;
}
return
buffer_handle_callback
(
buffer
,
decrypted_buffer
,
match_permit
);
});
};
if
(
settings
.
modules
.
arena_mode
.
check_permit
)
{
request
({
url
:
settings
.
modules
.
arena_mode
.
check_permit
,
json
:
true
,
qs
:
{
username
:
client
.
name
,
password
:
info
.
pass
,
arena
:
settings
.
modules
.
arena_mode
.
mode
}
},
function
(
error
,
response
,
body
)
{
if
(
client
.
closed
)
{
return
;
}
if
(
!
error
&&
body
)
{
match_permit_callback
(
buffer
,
body
);
}
else
{
log
.
warn
(
"
Match permit request error
"
,
error
);
match_permit_callback
(
buffer
,
null
);
}
});
}
else
{
match_permit_callback
(
buffer
,
null
);
}
request
({
baseUrl
:
settings
.
modules
.
mycard
.
auth_base_url
,
url
:
'
/users/
'
+
encodeURIComponent
(
client
.
name
)
+
'
.json
'
,
qs
:
{
api_key
:
settings
.
modules
.
mycard
.
auth_key
,
api_username
:
client
.
name
,
skip_track_visit
:
true
},
json
:
true
},
function
(
error
,
response
,
body
)
{
var
len3
,
n
,
ref3
;
if
(
!
error
&&
body
&&
body
.
user
)
{
users_cache
[
client
.
name
]
=
body
.
user
.
id
;
secret
=
body
.
user
.
id
%
65535
+
1
;
decrypted_buffer
=
Buffer
.
allocUnsafe
(
6
);
ref3
=
[
0
,
2
,
4
];
for
(
n
=
0
,
len3
=
ref3
.
length
;
n
<
len3
;
n
++
)
{
i
=
ref3
[
n
];
decrypted_buffer
.
writeUInt16LE
(
buffer
.
readUInt16LE
(
i
)
^
secret
,
i
);
}
if
(
check_buffer_indentity
(
decrypted_buffer
))
{
buffer
=
decrypted_buffer
;
}
}
else
{
log
.
warn
(
"
READ USER FAIL
"
,
error
,
body
);
done
(
"
${create_room_failed}
"
);
return
;
}
if
(
!
check_buffer_indentity
(
buffer
))
{
done
(
'
${invalid_password_checksum}
'
);
return
;
}
return
done
(
null
,
{
original
:
buffer
,
decrypted
:
decrypted_buffer
});
});
}
},
function
(
err
,
data
)
{
if
(
client
.
closed
)
{
return
;
}
if
(
err
)
{
ygopro
.
stoc_die
(
client
,
err
);
return
;
}
return
create_room_with_action
(
data
.
get_user
.
original
,
data
.
get_user
.
decrypted
,
match_permit
);
});
}
else
if
(
settings
.
modules
.
challonge
.
enabled
)
{
pre_room
=
ROOM_find_by_name
(
info
.
pass
);
if
(
pre_room
&&
pre_room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
settings
.
modules
.
cloud_replay
.
enable_halfway_watch
&&
!
pre_room
.
hostinfo
.
no_watch
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment