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
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
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
MyCard
srvpro
Commits
6ddb626b
Commit
6ddb626b
authored
Apr 05, 2020
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
improves
parent
4ed935df
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
71 additions
and
56 deletions
+71
-56
ygopro-server.coffee
ygopro-server.coffee
+31
-26
ygopro-server.js
ygopro-server.js
+40
-30
No files found.
ygopro-server.coffee
View file @
6ddb626b
...
...
@@ -458,9 +458,10 @@ ban_user = global.ban_user = (name, callback) ->
settings
.
ban
.
banned_user
.
push
(
name
)
setting_save
(
settings
)
bad_ip
=
[]
_async
.
each
(
ROOM_all
.
filter
((
room
)
->
return
room
and
room
.
established
),
(
room
,
done
)
->
_async
.
each
(
ROOM_all
,
(
room
,
done
)
->
if
!
(
room
and
room
.
established
)
done
()
return
_async
.
each
([
"players"
,
"watchers"
],
(
player_type
,
_done
)
->
_async
.
each
(
room
[
player_type
].
filter
((
player
)
->
return
player
and
(
player
.
name
==
name
or
bad_ip
.
indexOf
(
player
.
ip
)
!=
-
1
)
...
...
@@ -496,12 +497,12 @@ ROOM_ban_player = global.ROOM_ban_player = (name, ip, reason, countadd = 1)->
return
ROOM_kick
=
(
name
,
callback
)
->
rooms
=
ROOM_all
.
filter
((
room
)
->
return
room
and
room
.
established
and
(
name
==
"all"
or
name
==
room
.
process_pid
.
toString
()
or
name
==
room
.
name
)
)
if
!
rooms
.
length
callback
(
null
,
false
)
_async
.
each
(
rooms
,
(
room
,
done
)
->
found
=
false
_async
.
each
(
ROOM_all
,
(
room
,
done
)
->
if
!
(
room
and
room
.
established
and
(
name
==
"all"
or
name
==
room
.
process_pid
.
toString
()
or
name
==
room
.
name
)
)
done
()
return
found
=
true
if
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
room
.
scores
[
room
.
dueling_players
[
0
].
name_vpass
]
=
0
room
.
scores
[
room
.
dueling_players
[
1
].
name_vpass
]
=
0
...
...
@@ -512,7 +513,7 @@ ROOM_kick = (name, callback)->
done
()
return
,
(
err
)
->
callback
(
null
,
true
)
callback
(
null
,
found
)
return
)
...
...
@@ -3451,9 +3452,10 @@ ygopro.stoc_follow 'REPLAY', true, (buffer, info, client, server, datas)->
if
settings
.
modules
.
random_duel
.
enabled
setInterval
()
->
_async
.
each
(
ROOM_all
.
filter
((
room
)
->
return
room
and
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
random_type
and
room
.
last_active_time
and
room
.
waiting_for_player
and
room
.
get_disconnected_count
()
==
0
and
(
!
settings
.
modules
.
side_timeout
or
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
)
),
(
room
,
done
)
->
_async
.
each
(
ROOM_all
,
(
room
,
done
)
->
if
!
(
room
and
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
random_type
and
room
.
last_active_time
and
room
.
waiting_for_player
and
room
.
get_disconnected_count
()
==
0
and
(
!
settings
.
modules
.
side_timeout
or
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
))
done
()
return
time_passed
=
Math
.
floor
((
moment
()
-
room
.
last_active_time
)
/
1000
)
#log.info time_passed
if
time_passed
>=
settings
.
modules
.
random_duel
.
hang_timeout
...
...
@@ -3475,9 +3477,10 @@ if settings.modules.random_duel.enabled
if
settings
.
modules
.
mycard
.
enabled
setInterval
()
->
_async
.
each
(
ROOM_all
.
filter
((
room
)
->
return
room
and
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
arena
and
room
.
last_active_time
and
room
.
waiting_for_player
and
room
.
get_disconnected_count
()
==
0
and
(
!
settings
.
modules
.
side_timeout
or
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
)
),
(
room
,
done
)
->
_async
.
each
(
ROOM_all
,
(
room
,
done
)
->
if
not
(
room
and
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
arena
and
room
.
last_active_time
and
room
.
waiting_for_player
and
room
.
get_disconnected_count
()
==
0
and
(
!
settings
.
modules
.
side_timeout
or
room
.
duel_stage
!=
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
))
done
()
return
time_passed
=
Math
.
floor
((
moment
()
-
room
.
last_active_time
)
/
1000
)
#log.info time_passed
if
time_passed
>=
settings
.
modules
.
random_duel
.
hang_timeout
...
...
@@ -3494,9 +3497,10 @@ if settings.modules.mycard.enabled
)
if
settings
.
modules
.
arena_mode
.
punish_quit_before_match
_async
.
each
(
ROOM_all
.
filter
((
room
)
->
return
room
and
room
.
arena
and
room
.
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
get_playing_player
().
length
<
2
),
(
room
,
done
)
->
_async
.
each
(
ROOM_all
,
(
room
,
done
)
->
if
not
(
room
and
room
.
arena
and
room
.
duel_stage
==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
and
room
.
get_playing_player
().
length
<
2
)
done
()
return
player
=
room
.
get_playing_player
()[
0
]
if
player
and
player
.
join_time
and
!
player
.
arena_quit_free
waited_time
=
moment
()
-
player
.
join_time
...
...
@@ -3822,14 +3826,15 @@ if settings.modules.http
response
.
writeHead
(
200
)
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"['密码错误', 0]"
))
return
rooms
=
ROOM_all
.
filter
((
room
)
->
return
room
and
(
u
.
query
.
death
==
"all"
or
u
.
query
.
death
==
room
.
process_pid
.
toString
()
or
u
.
query
.
death
==
room
.
name
)
)
death_room_found
=
false
_async
.
each
(
rooms
,
(
room
,
done
)
->
_async
.
each
(
ROOM_all
,
(
room
,
done
)
->
if
!
(
room
and
(
u
.
query
.
death
==
"all"
or
u
.
query
.
death
==
room
.
process_pid
.
toString
()
or
u
.
query
.
death
==
room
.
name
))
done
()
return
if
room
.
start_death
()
death_room_found
=
true
done
()
return
,
()
->
response
.
writeHead
(
200
)
if
death_room_found
...
...
@@ -3843,11 +3848,11 @@ if settings.modules.http
response
.
writeHead
(
200
)
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"['密码错误', 0]"
))
return
rooms
=
ROOM_all
.
filter
((
room
)
->
return
room
and
(
u
.
query
.
deathcancel
==
"all"
or
u
.
query
.
deathcancel
==
room
.
process_pid
.
toString
()
or
u
.
query
.
deathcancel
==
room
.
name
)
)
death_room_found
=
false
_async
.
each
(
rooms
,
(
room
,
done
)
->
if
!
(
room
and
(
u
.
query
.
deathcancel
==
"all"
or
u
.
query
.
deathcancel
==
room
.
process_pid
.
toString
()
or
u
.
query
.
deathcancel
==
room
.
name
))
done
()
return
if
room
.
cancel_death
()
death_room_found
=
true
done
()
...
...
ygopro-server.js
View file @
6ddb626b
...
...
@@ -539,9 +539,11 @@
settings
.
ban
.
banned_user
.
push
(
name
);
setting_save
(
settings
);
bad_ip
=
[];
_async
.
each
(
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
room
.
established
;
}),
function
(
room
,
done
)
{
_async
.
each
(
ROOM_all
,
function
(
room
,
done
)
{
if
(
!
(
room
&&
room
.
established
))
{
done
();
return
;
}
return
_async
.
each
([
"
players
"
,
"
watchers
"
],
function
(
player_type
,
_done
)
{
return
_async
.
each
(
room
[
player_type
].
filter
(
function
(
player
)
{
return
player
&&
(
player
.
name
===
name
||
bad_ip
.
indexOf
(
player
.
ip
)
!==
-
1
);
...
...
@@ -592,14 +594,14 @@
};
ROOM_kick
=
function
(
name
,
callback
)
{
var
rooms
;
rooms
=
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
room
.
established
&&
(
name
===
"
all
"
||
name
===
room
.
process_pid
.
toString
()
||
name
===
room
.
name
);
});
if
(
!
rooms
.
length
)
{
callback
(
null
,
false
)
;
var
found
;
found
=
false
;
return
_async
.
each
(
ROOM_all
,
function
(
room
,
done
)
{
if
(
!
(
room
&&
room
.
established
&&
(
name
===
"
all
"
||
name
===
room
.
process_pid
.
toString
()
||
name
===
room
.
name
)))
{
done
();
return
;
}
return
_async
.
each
(
rooms
,
function
(
room
,
done
)
{
found
=
true
;
if
(
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
)
{
room
.
scores
[
room
.
dueling_players
[
0
].
name_vpass
]
=
0
;
room
.
scores
[
room
.
dueling_players
[
1
].
name_vpass
]
=
0
;
...
...
@@ -610,7 +612,7 @@
room
[
"
delete
"
]();
done
();
},
function
(
err
)
{
callback
(
null
,
true
);
callback
(
null
,
found
);
});
};
...
...
@@ -4426,10 +4428,12 @@
if
(
settings
.
modules
.
random_duel
.
enabled
)
{
setInterval
(
function
()
{
_async
.
each
(
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
room
.
random_type
&&
room
.
last_active_time
&&
room
.
waiting_for_player
&&
room
.
get_disconnected_count
()
===
0
&&
(
!
settings
.
modules
.
side_timeout
||
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
);
}),
function
(
room
,
done
)
{
_async
.
each
(
ROOM_all
,
function
(
room
,
done
)
{
var
time_passed
;
if
(
!
(
room
&&
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
room
.
random_type
&&
room
.
last_active_time
&&
room
.
waiting_for_player
&&
room
.
get_disconnected_count
()
===
0
&&
(
!
settings
.
modules
.
side_timeout
||
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
)))
{
done
();
return
;
}
time_passed
=
Math
.
floor
((
moment
()
-
room
.
last_active_time
)
/
1000
);
if
(
time_passed
>=
settings
.
modules
.
random_duel
.
hang_timeout
)
{
room
.
last_active_time
=
moment
();
...
...
@@ -4449,10 +4453,12 @@
if
(
settings
.
modules
.
mycard
.
enabled
)
{
setInterval
(
function
()
{
_async
.
each
(
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
room
.
arena
&&
room
.
last_active_time
&&
room
.
waiting_for_player
&&
room
.
get_disconnected_count
()
===
0
&&
(
!
settings
.
modules
.
side_timeout
||
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
);
}),
function
(
room
,
done
)
{
_async
.
each
(
ROOM_all
,
function
(
room
,
done
)
{
var
time_passed
;
if
(
!
(
room
&&
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
room
.
arena
&&
room
.
last_active_time
&&
room
.
waiting_for_player
&&
room
.
get_disconnected_count
()
===
0
&&
(
!
settings
.
modules
.
side_timeout
||
room
.
duel_stage
!==
ygopro
.
constants
.
DUEL_STAGE
.
SIDING
)))
{
done
();
return
;
}
time_passed
=
Math
.
floor
((
moment
()
-
room
.
last_active_time
)
/
1000
);
if
(
time_passed
>=
settings
.
modules
.
random_duel
.
hang_timeout
)
{
room
.
last_active_time
=
moment
();
...
...
@@ -4466,10 +4472,12 @@
done
();
});
if
(
settings
.
modules
.
arena_mode
.
punish_quit_before_match
)
{
_async
.
each
(
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
room
.
arena
&&
room
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
room
.
get_playing_player
().
length
<
2
;
}),
function
(
room
,
done
)
{
_async
.
each
(
ROOM_all
,
function
(
room
,
done
)
{
var
player
,
waited_time
;
if
(
!
(
room
&&
room
.
arena
&&
room
.
duel_stage
===
ygopro
.
constants
.
DUEL_STAGE
.
BEGIN
&&
room
.
get_playing_player
().
length
<
2
))
{
done
();
return
;
}
player
=
room
.
get_playing_player
()[
0
];
if
(
player
&&
player
.
join_time
&&
!
player
.
arena_quit_free
)
{
waited_time
=
moment
()
-
player
.
join_time
;
...
...
@@ -4575,7 +4583,7 @@
return
callback
+
"
(
"
+
text
+
"
);
"
;
};
requestListener
=
function
(
request
,
response
)
{
var
archive_args
,
archive_name
,
archive_process
,
check
,
death_room_found
,
duellog
,
error
,
filename
,
getpath
,
len2
,
len3
,
m
,
n
,
parseQueryString
,
pass_validated
,
ref2
,
replay
,
room
,
rooms
,
rooms
json
,
u
;
var
archive_args
,
archive_name
,
archive_process
,
check
,
death_room_found
,
duellog
,
error
,
filename
,
getpath
,
len2
,
len3
,
m
,
n
,
parseQueryString
,
pass_validated
,
ref2
,
replay
,
room
,
roomsjson
,
u
;
parseQueryString
=
true
;
u
=
url
.
parse
(
request
.
url
,
parseQueryString
);
if
(
u
.
pathname
===
'
/api/getrooms
'
)
{
...
...
@@ -4867,15 +4875,16 @@
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"
['密码错误', 0]
"
));
return
;
}
rooms
=
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
(
u
.
query
.
death
===
"
all
"
||
u
.
query
.
death
===
room
.
process_pid
.
toString
()
||
u
.
query
.
death
===
room
.
name
);
});
death_room_found
=
false
;
_async
.
each
(
rooms
,
function
(
room
,
done
)
{
_async
.
each
(
ROOM_all
,
function
(
room
,
done
)
{
if
(
!
(
room
&&
(
u
.
query
.
death
===
"
all
"
||
u
.
query
.
death
===
room
.
process_pid
.
toString
()
||
u
.
query
.
death
===
room
.
name
)))
{
done
();
return
;
}
if
(
room
.
start_death
())
{
death_room_found
=
true
;
}
return
done
();
done
();
},
function
()
{
response
.
writeHead
(
200
);
if
(
death_room_found
)
{
...
...
@@ -4890,11 +4899,12 @@
response
.
end
(
addCallback
(
u
.
query
.
callback
,
"
['密码错误', 0]
"
));
return
;
}
rooms
=
ROOM_all
.
filter
(
function
(
room
)
{
return
room
&&
(
u
.
query
.
deathcancel
===
"
all
"
||
u
.
query
.
deathcancel
===
room
.
process_pid
.
toString
()
||
u
.
query
.
deathcancel
===
room
.
name
);
});
death_room_found
=
false
;
_async
.
each
(
rooms
,
function
(
room
,
done
)
{
if
(
!
(
room
&&
(
u
.
query
.
deathcancel
===
"
all
"
||
u
.
query
.
deathcancel
===
room
.
process_pid
.
toString
()
||
u
.
query
.
deathcancel
===
room
.
name
)))
{
done
();
return
;
}
if
(
room
.
cancel_death
())
{
death_room_found
=
true
;
}
...
...
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