Compare commits
84
Commits
33abda997f
...
release/81
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
737702d78c | ||
|
|
98c2323ff2 | ||
|
|
d2fe4604dd | ||
|
|
b0dc857463 | ||
|
|
bac29ac933 | ||
|
|
65bc214fb2 | ||
|
|
0434a5db66 | ||
|
|
747adfcb11 | ||
|
|
7b5604873e | ||
|
|
c6da2013bd | ||
|
|
b9881fcb6f | ||
|
|
303886ed53 | ||
|
|
1272c81fa9 | ||
|
|
ade5735dc2 | ||
|
|
7399968fe8 | ||
|
|
658592973e | ||
|
|
24983aeb09 | ||
|
|
8aff1be225 | ||
|
|
bb336391ff | ||
|
|
3f4ddead72 | ||
|
|
168e0eca66 | ||
|
|
e7eaa4f67d | ||
|
|
ad9bf93b52 | ||
|
|
774707de65 | ||
|
|
e28a2646bf | ||
|
|
2916333d71 | ||
|
|
d3d5f2b348 | ||
|
|
4657cd453c | ||
|
|
577ce45b64 | ||
|
|
ee3e5935d6 | ||
|
|
5ba68ea134 | ||
|
|
12869a7e9e | ||
|
|
d10e2ab011 | ||
|
|
170e42098a | ||
|
|
fe7a482969 | ||
|
|
aa07ec0304 | ||
|
|
cd5a82aa93 | ||
|
|
7a62e52d60 | ||
|
|
6fc58fec1d | ||
|
|
f586542dc3 | ||
|
|
6697cd8ea1 | ||
|
|
c435e8a6a5 | ||
|
|
15ae680ec7 | ||
|
|
bdea0287a5 | ||
|
|
b56728f843 | ||
|
|
7f2b34fd4b | ||
|
|
146349beb8 | ||
|
|
326e0c66b6 | ||
|
|
edfb960e97 | ||
|
|
b2d438785b | ||
|
|
b6dad78d02 | ||
|
|
42d4854f9c | ||
|
|
e9081d77c9 | ||
|
|
181beb85e5 | ||
|
|
ebca348723 | ||
|
|
de8bc87940 | ||
|
|
25f3ccad57 | ||
|
|
55ab5b27dc | ||
|
|
1c0af891fa | ||
|
|
528744ebf6 | ||
|
|
bd52160d91 | ||
|
|
c3a3eb46dd | ||
|
|
be5383a2e9 | ||
|
|
ef693fcf4a | ||
|
|
8a9dd37755 | ||
|
|
5ad0f8a1c2 | ||
|
|
c4f19d256d | ||
|
|
ad84bf1f89 | ||
|
|
b711c63dcd | ||
|
|
6a192276e8 | ||
|
|
994a9fcad0 | ||
|
|
2dae3c7cae | ||
|
|
a896342429 | ||
|
|
7b636ee793 | ||
|
|
e63fba0286 | ||
|
|
245a096606 | ||
|
|
6e0afe84cd | ||
|
|
6accb4b166 | ||
|
|
f3d05004ce | ||
|
|
eadae789c8 | ||
|
|
d0d578b2b0 | ||
|
|
4ab3c3a135 | ||
|
|
251eb6deb9 | ||
|
|
b7886589cb |
No files matched your search
@@ -0,0 +1 @@
|
||||
77
|
||||
+1
-1
@@ -35,7 +35,7 @@ FROM gcr.io/distroless/nodejs24-debian13:nonroot AS runtime
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
ENV NODE_ENV=prod
|
||||
# ENV NODE_ENV=prod
|
||||
|
||||
COPY --from=prod-deps --chown=nonroot:nonroot /app/package.json ./package.json
|
||||
COPY --from=prod-deps --chown=nonroot:nonroot /app/node_modules ./node_modules
|
||||
|
||||
@@ -0,0 +1,480 @@
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
Version 2, June 1991
|
||||
|
||||
Copyright (C) 1991 Free Software Foundation, Inc.
|
||||
<https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
[This is the first released version of the library GPL. It is
|
||||
numbered 2 because it goes with version 2 of the ordinary GPL.]
|
||||
|
||||
Preamble
|
||||
|
||||
The licenses for most software are designed to take away your
|
||||
freedom to share and change it. By contrast, the GNU General Public
|
||||
Licenses are intended to guarantee your freedom to share and change
|
||||
free software--to make sure the software is free for all its users.
|
||||
|
||||
This license, the Library General Public License, applies to some
|
||||
specially designated Free Software Foundation software, and to any
|
||||
other libraries whose authors decide to use it. You can use it for
|
||||
your libraries, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
this service if you wish), that you receive source code or can get it
|
||||
if you want it, that you can change the software or use pieces of it
|
||||
in new free programs; and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to make restrictions that forbid
|
||||
anyone to deny you these rights or to ask you to surrender the rights.
|
||||
These restrictions translate to certain responsibilities for you if
|
||||
you distribute copies of the library, or if you modify it.
|
||||
|
||||
For example, if you distribute copies of the library, whether gratis
|
||||
or for a fee, you must give the recipients all the rights that we gave
|
||||
you. You must make sure that they, too, receive or can get the source
|
||||
code. If you link a program with the library, you must provide
|
||||
complete object files to the recipients so that they can relink them
|
||||
with the library, after making changes to the library and recompiling
|
||||
it. And you must show them these terms so they know their rights.
|
||||
|
||||
Our method of protecting your rights has two steps: (1) copyright
|
||||
the library, and (2) offer you this license which gives you legal
|
||||
permission to copy, distribute and/or modify the library.
|
||||
|
||||
Also, for each distributor's protection, we want to make certain
|
||||
that everyone understands that there is no warranty for this free
|
||||
library. If the library is modified by someone else and passed on, we
|
||||
want its recipients to know that what they have is not the original
|
||||
version, so that any problems introduced by others will not reflect on
|
||||
the original authors' reputations.
|
||||
|
||||
Finally, any free program is threatened constantly by software
|
||||
patents. We wish to avoid the danger that companies distributing free
|
||||
software will individually obtain patent licenses, thus in effect
|
||||
transforming the program into proprietary software. To prevent this,
|
||||
we have made it clear that any patent must be licensed for everyone's
|
||||
free use or not licensed at all.
|
||||
|
||||
Most GNU software, including some libraries, is covered by the ordinary
|
||||
GNU General Public License, which was designed for utility programs. This
|
||||
license, the GNU Library General Public License, applies to certain
|
||||
designated libraries. This license is quite different from the ordinary
|
||||
one; be sure to read it in full, and don't assume that anything in it is
|
||||
the same as in the ordinary license.
|
||||
|
||||
The reason we have a separate public license for some libraries is that
|
||||
they blur the distinction we usually make between modifying or adding to a
|
||||
program and simply using it. Linking a program with a library, without
|
||||
changing the library, is in some sense simply using the library, and is
|
||||
analogous to running a utility program or application program. However, in
|
||||
a textual and legal sense, the linked executable is a combined work, a
|
||||
derivative of the original library, and the ordinary General Public License
|
||||
treats it as such.
|
||||
|
||||
Because of this blurred distinction, using the ordinary General
|
||||
Public License for libraries did not effectively promote software
|
||||
sharing, because most developers did not use the libraries. We
|
||||
concluded that weaker conditions might promote sharing better.
|
||||
|
||||
However, unrestricted linking of non-free programs would deprive the
|
||||
users of those programs of all benefit from the free status of the
|
||||
libraries themselves. This Library General Public License is intended to
|
||||
permit developers of non-free programs to use free libraries, while
|
||||
preserving your freedom as a user of such programs to change the free
|
||||
libraries that are incorporated in them. (We have not seen how to achieve
|
||||
this as regards changes in header files, but we have achieved it as regards
|
||||
changes in the actual functions of the Library.) The hope is that this
|
||||
will lead to faster development of free libraries.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow. Pay close attention to the difference between a
|
||||
"work based on the library" and a "work that uses the library". The
|
||||
former contains code derived from the library, while the latter only
|
||||
works together with the library.
|
||||
|
||||
Note that it is possible for a library to be covered by the ordinary
|
||||
General Public License rather than by this special one.
|
||||
|
||||
GNU LIBRARY GENERAL PUBLIC LICENSE
|
||||
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
|
||||
|
||||
0. This License Agreement applies to any software library which
|
||||
contains a notice placed by the copyright holder or other authorized
|
||||
party saying it may be distributed under the terms of this Library
|
||||
General Public License (also called "this License"). Each licensee is
|
||||
addressed as "you".
|
||||
|
||||
A "library" means a collection of software functions and/or data
|
||||
prepared so as to be conveniently linked with application programs
|
||||
(which use some of those functions and data) to form executables.
|
||||
|
||||
The "Library", below, refers to any such software library or work
|
||||
which has been distributed under these terms. A "work based on the
|
||||
Library" means either the Library or any derivative work under
|
||||
copyright law: that is to say, a work containing the Library or a
|
||||
portion of it, either verbatim or with modifications and/or translated
|
||||
straightforwardly into another language. (Hereinafter, translation is
|
||||
included without limitation in the term "modification".)
|
||||
|
||||
"Source code" for a work means the preferred form of the work for
|
||||
making modifications to it. For a library, complete source code means
|
||||
all the source code for all modules it contains, plus any associated
|
||||
interface definition files, plus the scripts used to control compilation
|
||||
and installation of the library.
|
||||
|
||||
Activities other than copying, distribution and modification are not
|
||||
covered by this License; they are outside its scope. The act of
|
||||
running a program using the Library is not restricted, and output from
|
||||
such a program is covered only if its contents constitute a work based
|
||||
on the Library (independent of the use of the Library in a tool for
|
||||
writing it). Whether that is true depends on what the Library does
|
||||
and what the program that uses the Library does.
|
||||
|
||||
1. You may copy and distribute verbatim copies of the Library's
|
||||
complete source code as you receive it, in any medium, provided that
|
||||
you conspicuously and appropriately publish on each copy an
|
||||
appropriate copyright notice and disclaimer of warranty; keep intact
|
||||
all the notices that refer to this License and to the absence of any
|
||||
warranty; and distribute a copy of this License along with the
|
||||
Library.
|
||||
|
||||
You may charge a fee for the physical act of transferring a copy,
|
||||
and you may at your option offer warranty protection in exchange for a
|
||||
fee.
|
||||
|
||||
2. You may modify your copy or copies of the Library or any portion
|
||||
of it, thus forming a work based on the Library, and copy and
|
||||
distribute such modifications or work under the terms of Section 1
|
||||
above, provided that you also meet all of these conditions:
|
||||
|
||||
a) The modified work must itself be a software library.
|
||||
|
||||
b) You must cause the files modified to carry prominent notices
|
||||
stating that you changed the files and the date of any change.
|
||||
|
||||
c) You must cause the whole of the work to be licensed at no
|
||||
charge to all third parties under the terms of this License.
|
||||
|
||||
d) If a facility in the modified Library refers to a function or a
|
||||
table of data to be supplied by an application program that uses
|
||||
the facility, other than as an argument passed when the facility
|
||||
is invoked, then you must make a good faith effort to ensure that,
|
||||
in the event an application does not supply such function or
|
||||
table, the facility still operates, and performs whatever part of
|
||||
its purpose remains meaningful.
|
||||
|
||||
(For example, a function in a library to compute square roots has
|
||||
a purpose that is entirely well-defined independent of the
|
||||
application. Therefore, Subsection 2d requires that any
|
||||
application-supplied function or table used by this function must
|
||||
be optional: if the application does not supply it, the square
|
||||
root function must still compute square roots.)
|
||||
|
||||
These requirements apply to the modified work as a whole. If
|
||||
identifiable sections of that work are not derived from the Library,
|
||||
and can be reasonably considered independent and separate works in
|
||||
themselves, then this License, and its terms, do not apply to those
|
||||
sections when you distribute them as separate works. But when you
|
||||
distribute the same sections as part of a whole which is a work based
|
||||
on the Library, the distribution of the whole must be on the terms of
|
||||
this License, whose permissions for other licensees extend to the
|
||||
entire whole, and thus to each and every part regardless of who wrote
|
||||
it.
|
||||
|
||||
Thus, it is not the intent of this section to claim rights or contest
|
||||
your rights to work written entirely by you; rather, the intent is to
|
||||
exercise the right to control the distribution of derivative or
|
||||
collective works based on the Library.
|
||||
|
||||
In addition, mere aggregation of another work not based on the Library
|
||||
with the Library (or with a work based on the Library) on a volume of
|
||||
a storage or distribution medium does not bring the other work under
|
||||
the scope of this License.
|
||||
|
||||
3. You may opt to apply the terms of the ordinary GNU General Public
|
||||
License instead of this License to a given copy of the Library. To do
|
||||
this, you must alter all the notices that refer to this License, so
|
||||
that they refer to the ordinary GNU General Public License, version 2,
|
||||
instead of to this License. (If a newer version than version 2 of the
|
||||
ordinary GNU General Public License has appeared, then you can specify
|
||||
that version instead if you wish.) Do not make any other change in
|
||||
these notices.
|
||||
|
||||
Once this change is made in a given copy, it is irreversible for
|
||||
that copy, so the ordinary GNU General Public License applies to all
|
||||
subsequent copies and derivative works made from that copy.
|
||||
|
||||
This option is useful when you wish to copy part of the code of
|
||||
the Library into a program that is not a library.
|
||||
|
||||
4. You may copy and distribute the Library (or a portion or
|
||||
derivative of it, under Section 2) in object code or executable form
|
||||
under the terms of Sections 1 and 2 above provided that you accompany
|
||||
it with the complete corresponding machine-readable source code, which
|
||||
must be distributed under the terms of Sections 1 and 2 above on a
|
||||
medium customarily used for software interchange.
|
||||
|
||||
If distribution of object code is made by offering access to copy
|
||||
from a designated place, then offering equivalent access to copy the
|
||||
source code from the same place satisfies the requirement to
|
||||
distribute the source code, even though third parties are not
|
||||
compelled to copy the source along with the object code.
|
||||
|
||||
5. A program that contains no derivative of any portion of the
|
||||
Library, but is designed to work with the Library by being compiled or
|
||||
linked with it, is called a "work that uses the Library". Such a
|
||||
work, in isolation, is not a derivative work of the Library, and
|
||||
therefore falls outside the scope of this License.
|
||||
|
||||
However, linking a "work that uses the Library" with the Library
|
||||
creates an executable that is a derivative of the Library (because it
|
||||
contains portions of the Library), rather than a "work that uses the
|
||||
library". The executable is therefore covered by this License.
|
||||
Section 6 states terms for distribution of such executables.
|
||||
|
||||
When a "work that uses the Library" uses material from a header file
|
||||
that is part of the Library, the object code for the work may be a
|
||||
derivative work of the Library even though the source code is not.
|
||||
Whether this is true is especially significant if the work can be
|
||||
linked without the Library, or if the work is itself a library. The
|
||||
threshold for this to be true is not precisely defined by law.
|
||||
|
||||
If such an object file uses only numerical parameters, data
|
||||
structure layouts and accessors, and small macros and small inline
|
||||
functions (ten lines or less in length), then the use of the object
|
||||
file is unrestricted, regardless of whether it is legally a derivative
|
||||
work. (Executables containing this object code plus portions of the
|
||||
Library will still fall under Section 6.)
|
||||
|
||||
Otherwise, if the work is a derivative of the Library, you may
|
||||
distribute the object code for the work under the terms of Section 6.
|
||||
Any executables containing that work also fall under Section 6,
|
||||
whether or not they are linked directly with the Library itself.
|
||||
|
||||
6. As an exception to the Sections above, you may also compile or
|
||||
link a "work that uses the Library" with the Library to produce a
|
||||
work containing portions of the Library, and distribute that work
|
||||
under terms of your choice, provided that the terms permit
|
||||
modification of the work for the customer's own use and reverse
|
||||
engineering for debugging such modifications.
|
||||
|
||||
You must give prominent notice with each copy of the work that the
|
||||
Library is used in it and that the Library and its use are covered by
|
||||
this License. You must supply a copy of this License. If the work
|
||||
during execution displays copyright notices, you must include the
|
||||
copyright notice for the Library among them, as well as a reference
|
||||
directing the user to the copy of this License. Also, you must do one
|
||||
of these things:
|
||||
|
||||
a) Accompany the work with the complete corresponding
|
||||
machine-readable source code for the Library including whatever
|
||||
changes were used in the work (which must be distributed under
|
||||
Sections 1 and 2 above); and, if the work is an executable linked
|
||||
with the Library, with the complete machine-readable "work that
|
||||
uses the Library", as object code and/or source code, so that the
|
||||
user can modify the Library and then relink to produce a modified
|
||||
executable containing the modified Library. (It is understood
|
||||
that the user who changes the contents of definitions files in the
|
||||
Library will not necessarily be able to recompile the application
|
||||
to use the modified definitions.)
|
||||
|
||||
b) Accompany the work with a written offer, valid for at
|
||||
least three years, to give the same user the materials
|
||||
specified in Subsection 6a, above, for a charge no more
|
||||
than the cost of performing this distribution.
|
||||
|
||||
c) If distribution of the work is made by offering access to copy
|
||||
from a designated place, offer equivalent access to copy the above
|
||||
specified materials from the same place.
|
||||
|
||||
d) Verify that the user has already received a copy of these
|
||||
materials or that you have already sent this user a copy.
|
||||
|
||||
For an executable, the required form of the "work that uses the
|
||||
Library" must include any data and utility programs needed for
|
||||
reproducing the executable from it. However, as a special exception,
|
||||
the source code distributed need not include anything that is normally
|
||||
distributed (in either source or binary form) with the major
|
||||
components (compiler, kernel, and so on) of the operating system on
|
||||
which the executable runs, unless that component itself accompanies
|
||||
the executable.
|
||||
|
||||
It may happen that this requirement contradicts the license
|
||||
restrictions of other proprietary libraries that do not normally
|
||||
accompany the operating system. Such a contradiction means you cannot
|
||||
use both them and the Library together in an executable that you
|
||||
distribute.
|
||||
|
||||
7. You may place library facilities that are a work based on the
|
||||
Library side-by-side in a single library together with other library
|
||||
facilities not covered by this License, and distribute such a combined
|
||||
library, provided that the separate distribution of the work based on
|
||||
the Library and of the other library facilities is otherwise
|
||||
permitted, and provided that you do these two things:
|
||||
|
||||
a) Accompany the combined library with a copy of the same work
|
||||
based on the Library, uncombined with any other library
|
||||
facilities. This must be distributed under the terms of the
|
||||
Sections above.
|
||||
|
||||
b) Give prominent notice with the combined library of the fact
|
||||
that part of it is a work based on the Library, and explaining
|
||||
where to find the accompanying uncombined form of the same work.
|
||||
|
||||
8. You may not copy, modify, sublicense, link with, or distribute
|
||||
the Library except as expressly provided under this License. Any
|
||||
attempt otherwise to copy, modify, sublicense, link with, or
|
||||
distribute the Library is void, and will automatically terminate your
|
||||
rights under this License. However, parties who have received copies,
|
||||
or rights, from you under this License will not have their licenses
|
||||
terminated so long as such parties remain in full compliance.
|
||||
|
||||
9. You are not required to accept this License, since you have not
|
||||
signed it. However, nothing else grants you permission to modify or
|
||||
distribute the Library or its derivative works. These actions are
|
||||
prohibited by law if you do not accept this License. Therefore, by
|
||||
modifying or distributing the Library (or any work based on the
|
||||
Library), you indicate your acceptance of this License to do so, and
|
||||
all its terms and conditions for copying, distributing or modifying
|
||||
the Library or works based on it.
|
||||
|
||||
10. Each time you redistribute the Library (or any work based on the
|
||||
Library), the recipient automatically receives a license from the
|
||||
original licensor to copy, distribute, link with or modify the Library
|
||||
subject to these terms and conditions. You may not impose any further
|
||||
restrictions on the recipients' exercise of the rights granted herein.
|
||||
You are not responsible for enforcing compliance by third parties to
|
||||
this License.
|
||||
|
||||
11. If, as a consequence of a court judgment or allegation of patent
|
||||
infringement or for any other reason (not limited to patent issues),
|
||||
conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot
|
||||
distribute so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you
|
||||
may not distribute the Library at all. For example, if a patent
|
||||
license would not permit royalty-free redistribution of the Library by
|
||||
all those who receive copies directly or indirectly through you, then
|
||||
the only way you could satisfy both it and this License would be to
|
||||
refrain entirely from distribution of the Library.
|
||||
|
||||
If any portion of this section is held invalid or unenforceable under any
|
||||
particular circumstance, the balance of the section is intended to apply,
|
||||
and the section as a whole is intended to apply in other circumstances.
|
||||
|
||||
It is not the purpose of this section to induce you to infringe any
|
||||
patents or other property right claims or to contest validity of any
|
||||
such claims; this section has the sole purpose of protecting the
|
||||
integrity of the free software distribution system which is
|
||||
implemented by public license practices. Many people have made
|
||||
generous contributions to the wide range of software distributed
|
||||
through that system in reliance on consistent application of that
|
||||
system; it is up to the author/donor to decide if he or she is willing
|
||||
to distribute software through any other system and a licensee cannot
|
||||
impose that choice.
|
||||
|
||||
This section is intended to make thoroughly clear what is believed to
|
||||
be a consequence of the rest of this License.
|
||||
|
||||
12. If the distribution and/or use of the Library is restricted in
|
||||
certain countries either by patents or by copyrighted interfaces, the
|
||||
original copyright holder who places the Library under this License may add
|
||||
an explicit geographical distribution limitation excluding those countries,
|
||||
so that distribution is permitted only in or among countries not thus
|
||||
excluded. In such case, this License incorporates the limitation as if
|
||||
written in the body of this License.
|
||||
|
||||
13. The Free Software Foundation may publish revised and/or new
|
||||
versions of the Library General Public License from time to time.
|
||||
Such new versions will be similar in spirit to the present version,
|
||||
but may differ in detail to address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the Library
|
||||
specifies a version number of this License which applies to it and
|
||||
"any later version", you have the option of following the terms and
|
||||
conditions either of that version or of any later version published by
|
||||
the Free Software Foundation. If the Library does not specify a
|
||||
license version number, you may choose any version ever published by
|
||||
the Free Software Foundation.
|
||||
|
||||
14. If you wish to incorporate parts of the Library into other free
|
||||
programs whose distribution conditions are incompatible with these,
|
||||
write to the author to ask for permission. For software which is
|
||||
copyrighted by the Free Software Foundation, write to the Free
|
||||
Software Foundation; we sometimes make exceptions for this. Our
|
||||
decision will be guided by the two goals of preserving the free status
|
||||
of all derivatives of our free software and of promoting the sharing
|
||||
and reuse of software generally.
|
||||
|
||||
NO WARRANTY
|
||||
|
||||
15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
|
||||
WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
|
||||
EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
|
||||
OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
|
||||
KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
|
||||
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
|
||||
LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
|
||||
THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
|
||||
WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
|
||||
AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
|
||||
FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
|
||||
CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
|
||||
LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
|
||||
RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
|
||||
FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
|
||||
SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
|
||||
DAMAGES.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Libraries
|
||||
|
||||
If you develop a new library, and you want it to be of the greatest
|
||||
possible use to the public, we recommend making it free software that
|
||||
everyone can redistribute and change. You can do so by permitting
|
||||
redistribution under these terms (or, alternatively, under the terms of the
|
||||
ordinary General Public License).
|
||||
|
||||
To apply these terms, attach the following notices to the library. It is
|
||||
safest to attach them to the start of each source file to most effectively
|
||||
convey the exclusion of warranty; and each file should have at least the
|
||||
"copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the library's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This library is free software; you can redistribute it and/or
|
||||
modify it under the terms of the GNU Library General Public
|
||||
License as published by the Free Software Foundation; either
|
||||
version 2 of the License, or (at your option) any later version.
|
||||
|
||||
This library is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||
Library General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU Library General Public
|
||||
License along with this library; if not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
You should also get your employer (if you work as a programmer) or your
|
||||
school, if any, to sign a "copyright disclaimer" for the library, if
|
||||
necessary. Here is a sample; alter the names:
|
||||
|
||||
Yoyodyne, Inc., hereby disclaims all copyright interest in the
|
||||
library `Frob' (a library for tweaking knobs) written by James Random Hacker.
|
||||
|
||||
<signature of Moe Ghoul>, 1 April 1990
|
||||
Moe Ghoul, President of Vice
|
||||
|
||||
That's all there is to it!
|
||||
@@ -1,56 +1,89 @@
|
||||
# LOLYMPUS
|
||||
|
||||

|
||||
LOLYMPUS는 리그 오브 레전드 커뮤니티의 여러 이벤트 중 내전(사용자 설정 게임)을 운영할 때 필요한 일정 관리, 참여자 모집, 팀 빌딩, 토너먼트 코드 배정, 경기 진행, 실시간 라이브 방송(추후 지원 예정), 결과 수집, 전적 확인을 한곳에서 처리하기 위한 웹 애플리케이션입니다.
|
||||
|
||||
## Overview
|
||||
<p align="center">
|
||||
<video
|
||||
src="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/77/docs/screenshots/lolympus-demo.mp4"
|
||||
poster="docs/screenshots/lolympus-auction.png"
|
||||
width="960"
|
||||
autoplay="autoplay"
|
||||
muted="muted"
|
||||
loop="loop"
|
||||
playsinline="playsinline"
|
||||
controls
|
||||
>
|
||||
<a href="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/77/docs/screenshots/lolympus-demo.mp4">3초 간격 데모 영상 보기</a>
|
||||
</video>
|
||||
</p>
|
||||
|
||||
LOLYMPUS는 리그 오브 레전드 내전을 운영할 때 필요한 것들을 한곳에 모아둔 웹 애플리케이션입니다.
|
||||
<p align="center">
|
||||
<a href="https://git.dahyeon.us/dahyeon/lolympus-tournament-support/raw/branch/release/77/docs/screenshots/lolympus-demo.mp4">3초 간격 데모 영상 보기</a>
|
||||
</p>
|
||||
|
||||
참가자 모집, 팀 편성, 경매, 토너먼트 코드 배정, 경기 결과 수집, 전적 확인처럼 운영자가 매번 손으로 챙기던 일을 줄이는 데 초점을 맞췄습니다. 처음부터 큰 서비스로 만들었다기보다는, 실제 커뮤니티 내전을 굴리면서 불편했던 부분을 하나씩 붙여가며 만든 프로젝트입니다.
|
||||
## 배포 주소
|
||||
|
||||
## Purpose
|
||||
| Environment | Version | URL |
|
||||
| ----------- | ------- | -------------------------------------- |
|
||||
| Production | v77 | <https://lolympus.dahyeon.us/> |
|
||||
| Staging | v77 | <https://890c50be.lolympus.pages.dev/> |
|
||||
|
||||
내전은 사람만 모이면 끝나는 일이 아니었습니다. 참가자 티어를 확인하고, 포지션을 맞추고, 팀장을 정하고, 경기마다 토너먼트 코드를 나눠주고, 끝난 뒤 결과까지 정리해야 했습니다.
|
||||
## 개요
|
||||
|
||||
이 프로젝트는 그 흐름을 최대한 덜 번거롭게 만들기 위해 시작했습니다. 운영자는 전체 진행 상황을 보고, 참가자는 본인이 속한 팀과 다음 경기를 빠르게 확인할 수 있도록 구성했습니다.
|
||||
내전 운영은 사람을 모으는 것에서 끝나지 않습니다. 참가자의 티어와 포지션을 확인하고, 팀장을 정하고, 팀을 나누고, 경기마다 토너먼트 코드를 전달하고, 끝난 뒤 결과와 전적까지 정리해야 합니다.
|
||||
|
||||
## Screens
|
||||
LOLYMPUS는 이 반복 작업을 줄이는 데 초점을 맞췄습니다. 운영자는 전체 진행 상황을 한눈에 보고, 참가자는 카카오톡 연동을 통해 쉽게 일정 확인/참가 신청하고 본인이 속한 팀과 다음 경기 정보를 빠르게 확인할 수 있습니다.
|
||||
|
||||
### Match detail
|
||||
## 워크플로우
|
||||
|
||||

|
||||
1. **내전 개설과 모집**
|
||||
내전 일정, 진행 방식, 정원, 공지사항을 등록하고 참가 신청 현황을 확인합니다.
|
||||
|
||||
### Team progress
|
||||
2. **참가자 정보 확인**
|
||||
Riot 계정 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다.
|
||||
|
||||

|
||||
3. **팀 빌딩과 경매**
|
||||
팀장을 기준으로 팀을 구성하거나, 경매 방식으로 참가자를 배정합니다. 현재 입찰가, 팀별 포인트, 낙찰 기록을 함께 관리합니다.
|
||||
|
||||
## Functionalities
|
||||
4. **팀별 진행 페이지**
|
||||
각 팀은 예정 경기, 상대 팀, 라인업, 토너먼트 코드를 한 화면에서 확인하고 복사할 수 있습니다.
|
||||
|
||||
**1. 내전 관리**
|
||||
내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인을 할 수 있습니다.
|
||||
5. **결과 수집과 통계**
|
||||
Riot Match-V5 데이터를 이용해 경기 결과를 수집하고, 소환사별 전적과 커뮤니티 리더보드를 제공합니다.
|
||||
|
||||
**2. 참가자 정보 관리**
|
||||
Riot 계정 정보를 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다.
|
||||
## 스크린샷
|
||||
|
||||
**3. 팀 빌딩**
|
||||
팀장을 정하고 포지션을 맞춰 팀을 구성합니다. 여러 팀이 참여하는 내전도 처리할 수 있습니다.
|
||||
상단의 경매 화면은 LOLYMPUS가 단순 참가자 목록을 넘어서 실제 팀빌딩 운영까지 다루는 대표 화면입니다. 3초 간격 데모 영상은 README 렌더러가 video 태그를 지원하면 자동/반복 재생되고, 세부 화면은 아래 PNG 원본을 기준으로 볼 수 있습니다.
|
||||
|
||||
**4. 경매 진행**
|
||||
팀장 경매 방식으로 참가자를 뽑을 수 있고, 현재 입찰가와 낙찰 기록을 관리합니다.
|
||||
| 경매 팀빌딩 |
|
||||
| ----------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| <a href="docs/screenshots/lolympus-demo.mp4"><img src="docs/screenshots/lolympus-auction.png" alt="LOLYMPUS 경매 팀빌딩" width="840"></a> |
|
||||
|
||||
**5. 토너먼트 코드 관리**
|
||||
업로드한 토너먼트 코드를 경기별로 배정하고, 팀별 진행 페이지에서 바로 복사할 수 있게 했습니다.
|
||||
| 내전 목록 | 모집 상세 |
|
||||
| ----------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------- |
|
||||
| <img src="docs/screenshots/lolympus-match-list.png" alt="LOLYMPUS 내전 목록" width="420"> | <img src="docs/screenshots/lolympus-match-recruiting.png" alt="LOLYMPUS 모집 상세" width="420"> |
|
||||
|
||||
**6. 팀별 진행 페이지**
|
||||
각 팀이 자기 경기 일정, 상대 팀, 토너먼트 코드, 종료된 경기 결과를 한 화면에서 확인할 수 있습니다.
|
||||
| 단판 경기 결과 | 개인 전적 |
|
||||
| ------------------------------------------------------------------------------------------------------ | --------------------------------------------------------------------------------------------- |
|
||||
| <img src="docs/screenshots/lolympus-match-result(pair).png" alt="LOLYMPUS 단판 경기 결과" width="420"> | <img src="docs/screenshots/lolympus-player-stats.png" alt="LOLYMPUS 소환사 전적" width="420"> |
|
||||
|
||||
**7. 전적 수집과 통계**
|
||||
Riot Match-V5 데이터를 이용해 내전 결과를 수집하고, 개인 전적과 커뮤니티 리더보드를 보여줍니다.
|
||||
| 경기 상세 |
|
||||
| ------------------------------------------------------------------------------------------- |
|
||||
| <img src="docs/screenshots/lolympus-match-detail.png" alt="LOLYMPUS 경기 상세" width="840"> |
|
||||
|
||||
**8. 커뮤니티 명령 연동**
|
||||
Dakao/NATS 기반 명령을 받아 참가 신청이나 운영 흐름과 연결할 수 있도록 구성했습니다.
|
||||
## 기능
|
||||
|
||||
## Used technologies
|
||||
- 내전 생성, 수정, 모집 상태 변경, 참가자 목록 확인
|
||||
- 카카오톡 명령어를 통한 일정 조회, 내전 참가, 취소, 계정 등록 등 기능 제공
|
||||
- Riot 계정 기반 참가자 프로필, 티어, 포지션 확인
|
||||
- 팀장 지정, 포지션 기반 팀 구성, 다팀 내전 지원
|
||||
- 팀장 경매 방식의 참가자 낙찰과 입찰 기록 관리
|
||||
- 경기별 토너먼트 코드 배정과 팀별 복사 UI
|
||||
- 팀별 경기 일정, 상대 팀, 라인업, 결과 확인
|
||||
- Riot Match-V5 기반 결과 수집, 개인 전적, 리더보드 제공
|
||||
- Dakao/NATS 기반 커뮤니티 명령 연동
|
||||
|
||||
## 기술 스택
|
||||
|
||||
- React
|
||||
- Vite
|
||||
@@ -62,31 +95,49 @@ Dakao/NATS 기반 명령을 받아 참가 신청이나 운영 흐름과 연결
|
||||
- NATS
|
||||
- Riot API
|
||||
- pnpm workspace
|
||||
- Kubernetes
|
||||
- ArgoCD
|
||||
|
||||
## Project structure
|
||||
## 디렉터리 구조
|
||||
|
||||
```text
|
||||
apps/
|
||||
api/ NestJS API server
|
||||
web/ React + Vite client
|
||||
scripts/ deployment and maintenance scripts
|
||||
docs/
|
||||
screenshots/ README and project screenshots
|
||||
scripts/ deployment and maintenance scripts
|
||||
```
|
||||
|
||||
## How to run
|
||||
## 사전 요구사항
|
||||
|
||||
- Node.js 24 이상
|
||||
- pnpm 10.4.1 (`packageManager` 기준, `corepack enable`로 활성화 권장)
|
||||
- MongoDB 7.0, Redis 5.0 이상, NATS 실행 환경
|
||||
|
||||
## 실행 방법
|
||||
|
||||
```bash
|
||||
pnpm install
|
||||
pnpm start:api:dev
|
||||
pnpm dev:web
|
||||
pnpm start:web:dev
|
||||
```
|
||||
|
||||
웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 같이 확인합니다.
|
||||
웹 앱은 기본적으로 `apps/web/.env.development` 값을 사용합니다. API 환경값은 `apps/project.env`와 실행 환경의 시크릿 설정을 함께 확인합니다.
|
||||
|
||||
## Checks
|
||||
카카오톡 기반 명령어 기능은 Dakao(커스텀 카카오톡 게이트웨이) 연동이 필요합니다. Dakao가 실행 중이 아니거나 NATS를 통해 API 서버와 연결되어 있지 않으면 일정 조회, 내전 참가, 참가 취소, 계정 등록 같은 카카오톡 명령어는 사용할 수 없습니다.
|
||||
|
||||
```bash
|
||||
pnpm --filter api test
|
||||
pnpm --filter web build:test
|
||||
```
|
||||
## 커맨드
|
||||
|
||||
현재 정리된 기준으로 API 테스트와 웹 테스트 빌드를 통과합니다.
|
||||
| Command | Description |
|
||||
| --------------------------------- | -------------------------------- |
|
||||
| `pnpm start:web:dev` | 웹 앱 개발 서버 실행 |
|
||||
| `pnpm start:api:dev` | API 서버 dev 환경 실행 |
|
||||
| `pnpm --filter api test` | API 테스트 실행 |
|
||||
| `pnpm --filter web build:staging` | 웹 staging 빌드 검증 |
|
||||
| `pnpm deploy:web:staging` | Cloudflare Pages staging 배포 |
|
||||
| `pnpm deploy:web:prod` | Cloudflare Pages production 배포 |
|
||||
|
||||
## 라이선스
|
||||
|
||||
This project is licensed under the GNU Library General Public License v2.0. See [LICENSE](LICENSE) for details.
|
||||
+2
-2
@@ -27,8 +27,8 @@
|
||||
|
||||
## Riot Background Refresh
|
||||
|
||||
Set `RIOT_BG_REFRESH_ENABLED=true` to refresh stale Riot accounts automatically
|
||||
between KST 03:00 and 10:00. The scheduler picks active users whose
|
||||
Stale Riot accounts refresh automatically between KST 03:00 and 10:00.
|
||||
The scheduler picks active users whose
|
||||
`lastRefreshRequestedAt` is older than 6 hours, oldest first, and uses a
|
||||
background-only Riot token bucket capped at roughly 40% of the app rate limit.
|
||||
|
||||
|
||||
@@ -11,10 +11,10 @@
|
||||
"seed:dev": "ts-node src/seed.ts",
|
||||
"seed:dakao-participant": "ts-node src/seed-dakao-participant.ts",
|
||||
"start:dev": "node -e \"process.env.NODE_ENV='dev'; require('./dist/main.js')\"",
|
||||
"start:test": "node -e \"process.env.NODE_ENV='test'; require('./dist/main.js')\"",
|
||||
"start:staging": "node -e \"process.env.NODE_ENV='staging'; require('./dist/main.js')\"",
|
||||
"start:prod": "node -e \"process.env.NODE_ENV='prod'; require('./dist/main.js')\"",
|
||||
"pm2:dev": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:dev",
|
||||
"pm2:test": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:test",
|
||||
"pm2:staging": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:staging",
|
||||
"pm2:prod": "pm2 start npm --name lolympus-tournament-support --update-env -- run start:prod",
|
||||
"start:debug": "nest start --debug --watch",
|
||||
"lint": "eslint \"{src,apps,libs,test}/**/*.ts\" --fix",
|
||||
|
||||
@@ -0,0 +1,67 @@
|
||||
import {
|
||||
createCorsOrigin,
|
||||
isAllowedCorsOrigin,
|
||||
resolveWebOrigins,
|
||||
} from './cors-origin';
|
||||
|
||||
describe('CORS origin resolution', () => {
|
||||
it('allows Cloudflare Pages preview origins in dev and staging', () => {
|
||||
const origin = 'https://807e0ea6.lolympus.pages.dev';
|
||||
|
||||
expect(isAllowedCorsOrigin(origin, 'dev')).toBe(true);
|
||||
expect(isAllowedCorsOrigin(origin, 'staging')).toBe(true);
|
||||
});
|
||||
|
||||
it('does not allow Cloudflare Pages preview origins in prod', () => {
|
||||
expect(
|
||||
isAllowedCorsOrigin('https://807e0ea6.lolympus.pages.dev', 'prod'),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it('rejects similar but unsafe Pages origins', () => {
|
||||
expect(
|
||||
isAllowedCorsOrigin('http://807e0ea6.lolympus.pages.dev', 'staging'),
|
||||
).toBe(false);
|
||||
expect(isAllowedCorsOrigin('https://lolympus.pages.dev', 'staging')).toBe(
|
||||
false,
|
||||
);
|
||||
expect(
|
||||
isAllowedCorsOrigin('https://a.b.lolympus.pages.dev', 'staging'),
|
||||
).toBe(false);
|
||||
expect(
|
||||
isAllowedCorsOrigin(
|
||||
'https://807e0ea6.lolympus.pages.dev.evil.com',
|
||||
'staging',
|
||||
),
|
||||
).toBe(false);
|
||||
});
|
||||
|
||||
it('keeps configured web origins allowed', () => {
|
||||
expect(
|
||||
isAllowedCorsOrigin('https://example.com', 'prod', [
|
||||
'https://example.com',
|
||||
]),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it('falls back to default web origins when WEB_ORIGIN is empty', () => {
|
||||
expect(resolveWebOrigins('')).toContain('http://localhost:5173');
|
||||
});
|
||||
|
||||
it('creates a Nest CORS callback from the same rules', (done) => {
|
||||
const corsOrigin = createCorsOrigin('staging');
|
||||
|
||||
expect(corsOrigin).not.toBe(true);
|
||||
if (corsOrigin === true) return;
|
||||
|
||||
corsOrigin('https://807e0ea6.lolympus.pages.dev', (error, allow) => {
|
||||
expect(error).toBeNull();
|
||||
expect(allow).toBe(true);
|
||||
done();
|
||||
});
|
||||
});
|
||||
|
||||
it('keeps dev CORS permissive for local development', () => {
|
||||
expect(createCorsOrigin('dev')).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,101 @@
|
||||
import type { CustomOrigin } from '@nestjs/common/interfaces/external/cors-options.interface';
|
||||
|
||||
const DEFAULT_WEB_ORIGINS = [
|
||||
'http://localhost:5173',
|
||||
'http://126.dahyeon.us:5173',
|
||||
'https://lolympus.dahyeon.us',
|
||||
];
|
||||
|
||||
const PAGES_DEV_ORIGIN_HOST_PATTERN =
|
||||
/^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?\.lolympus\.pages\.dev$/i;
|
||||
|
||||
const PAGES_DEV_CORS_ENVIRONMENTS = new Set(['dev', 'staging']);
|
||||
|
||||
function parseOrigin(origin: string, allowPath: boolean): URL | null {
|
||||
const trimmedOrigin = origin.trim();
|
||||
if (trimmedOrigin.length === 0) return null;
|
||||
|
||||
try {
|
||||
const url = new URL(trimmedOrigin);
|
||||
if (
|
||||
!allowPath &&
|
||||
(url.pathname !== '/' || url.search !== '' || url.hash !== '')
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return url;
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function normalizeOrigin(origin: string, allowPath = false): string | null {
|
||||
const url = parseOrigin(origin, allowPath);
|
||||
if (!url) return null;
|
||||
|
||||
return `${url.protocol}//${url.host}`;
|
||||
}
|
||||
|
||||
export function resolveWebOrigins(
|
||||
webOrigin = process.env.WEB_ORIGIN,
|
||||
): string[] {
|
||||
const configuredOrigins = webOrigin
|
||||
?.split(',')
|
||||
.map((origin) => normalizeOrigin(origin, true))
|
||||
.filter((origin): origin is string => origin !== null);
|
||||
|
||||
if (configuredOrigins && configuredOrigins.length > 0) {
|
||||
return configuredOrigins;
|
||||
}
|
||||
|
||||
return [...DEFAULT_WEB_ORIGINS];
|
||||
}
|
||||
|
||||
export function isLolympusPagesDevOrigin(origin: string): boolean {
|
||||
const url = parseOrigin(origin, false);
|
||||
if (!url) return false;
|
||||
|
||||
return (
|
||||
url.protocol === 'https:' &&
|
||||
url.port === '' &&
|
||||
PAGES_DEV_ORIGIN_HOST_PATTERN.test(url.hostname)
|
||||
);
|
||||
}
|
||||
|
||||
export function isAllowedCorsOrigin(
|
||||
requestOrigin: string | undefined,
|
||||
nodeEnv = process.env.NODE_ENV,
|
||||
webOrigins = resolveWebOrigins(),
|
||||
): boolean {
|
||||
if (!requestOrigin) return false;
|
||||
|
||||
const normalizedRequestOrigin = normalizeOrigin(requestOrigin);
|
||||
if (!normalizedRequestOrigin) return false;
|
||||
|
||||
const normalizedWebOrigins = webOrigins
|
||||
.map((origin) => normalizeOrigin(origin, true))
|
||||
.filter((origin): origin is string => origin !== null);
|
||||
|
||||
if (normalizedWebOrigins.includes(normalizedRequestOrigin)) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return (
|
||||
PAGES_DEV_CORS_ENVIRONMENTS.has(nodeEnv ?? '') &&
|
||||
isLolympusPagesDevOrigin(requestOrigin)
|
||||
);
|
||||
}
|
||||
|
||||
export function createCorsOrigin(
|
||||
nodeEnv = process.env.NODE_ENV,
|
||||
webOrigin = process.env.WEB_ORIGIN,
|
||||
): true | CustomOrigin {
|
||||
if (nodeEnv === 'dev') return true;
|
||||
|
||||
const webOrigins = resolveWebOrigins(webOrigin);
|
||||
|
||||
return (requestOrigin, callback) => {
|
||||
callback(null, isAllowedCorsOrigin(requestOrigin, nodeEnv, webOrigins));
|
||||
};
|
||||
}
|
||||
+5
-10
@@ -1,23 +1,18 @@
|
||||
import { ValidationPipe } from '@nestjs/common';
|
||||
import { NestFactory } from '@nestjs/core';
|
||||
import { AppModule } from './app.module';
|
||||
import { createCorsOrigin } from './cors-origin';
|
||||
|
||||
async function bootstrap() {
|
||||
const app = await NestFactory.create(AppModule, {
|
||||
rawBody: true,
|
||||
});
|
||||
|
||||
const isDev = process.env.NODE_ENV === 'dev';
|
||||
const webOrigins = process.env.WEB_ORIGIN?.split(',').map((origin) =>
|
||||
origin.trim(),
|
||||
) ?? [
|
||||
'http://localhost:5173',
|
||||
'http://126.dahyeon.us:5173',
|
||||
'https://lolympus.dahyeon.us',
|
||||
];
|
||||
const nodeEnv = process.env.NODE_ENV;
|
||||
const isDev = nodeEnv === 'dev';
|
||||
|
||||
app.enableCors({
|
||||
origin: isDev ? true : webOrigins,
|
||||
origin: createCorsOrigin(nodeEnv),
|
||||
credentials: true,
|
||||
allowedHeaders: ['Authorization', 'Content-Type', 'X-Auth-User-Id'],
|
||||
});
|
||||
@@ -31,4 +26,4 @@ async function bootstrap() {
|
||||
);
|
||||
await app.listen(isDev ? 3000 : 10712);
|
||||
}
|
||||
bootstrap();
|
||||
void bootstrap();
|
||||
@@ -164,6 +164,7 @@ export class AuctionController {
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
await this.auctionService.reset({ matchId, communityId });
|
||||
this.auctionGateway.broadcastReset(matchId.toString());
|
||||
}
|
||||
|
||||
private resolveBidder(
|
||||
|
||||
@@ -16,6 +16,7 @@ import { IdentityService } from '../auth/identity.service';
|
||||
import { JwtService } from '../auth/jwt.service';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import type {
|
||||
AuctionChatMessage,
|
||||
AuctionDocument,
|
||||
IdentityDocument,
|
||||
Position,
|
||||
@@ -37,6 +38,11 @@ interface SoldPayload {
|
||||
assignedPosition?: Position;
|
||||
}
|
||||
|
||||
interface ChatMessagePayload {
|
||||
message?: string;
|
||||
displayName?: string;
|
||||
}
|
||||
|
||||
@WebSocketGateway({
|
||||
namespace: '/auction',
|
||||
cors: {
|
||||
@@ -100,6 +106,7 @@ export class AuctionGateway
|
||||
const auction = await this.auctionService.getByMatchId(
|
||||
new mongoose.Types.ObjectId(payload.matchId),
|
||||
);
|
||||
this.emitChatHistory(socket, auction);
|
||||
this.broadcastState(payload.matchId, auction);
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
@@ -182,6 +189,34 @@ export class AuctionGateway
|
||||
}
|
||||
}
|
||||
|
||||
@SubscribeMessage('chat-message')
|
||||
public async handleChatMessage(
|
||||
@ConnectedSocket() socket: Socket,
|
||||
@MessageBody() payload: ChatMessagePayload,
|
||||
) {
|
||||
const matchId = this.requireJoinedMatchId(socket);
|
||||
if (!matchId) return;
|
||||
|
||||
if (typeof payload?.message !== 'string') {
|
||||
this.emitError(socket, 'Chat message is required.');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
const { message } = await this.auctionService.appendChatMessage({
|
||||
matchId: new mongoose.Types.ObjectId(matchId),
|
||||
userId: this.resolveSocketUserId(socket),
|
||||
displayName: this.resolveChatDisplayName(socket, payload.displayName),
|
||||
message: payload.message,
|
||||
});
|
||||
this.server
|
||||
.to(matchId)
|
||||
.emit('chat-message', this.serializeChatMessage(message));
|
||||
} catch (error) {
|
||||
this.emitKnownError(socket, error);
|
||||
}
|
||||
}
|
||||
|
||||
private requireJoinedMatchId(socket: Socket): string | null {
|
||||
const matchId = this.getSocketMatchId(socket);
|
||||
if (!matchId) {
|
||||
@@ -219,6 +254,36 @@ export class AuctionGateway
|
||||
return Array.isArray(header) ? header[0] : header;
|
||||
}
|
||||
|
||||
private resolveSocketUserId(
|
||||
socket: Socket,
|
||||
): mongoose.Types.ObjectId | undefined {
|
||||
return (socket.data.user as UserDocument | undefined)?._id;
|
||||
}
|
||||
|
||||
private resolveChatDisplayName(
|
||||
socket: Socket,
|
||||
fallbackDisplayName?: string,
|
||||
): string {
|
||||
const user = socket.data.user as UserDocument | undefined;
|
||||
const primaryRiotAccount =
|
||||
user?.riotAccounts.find((entry) => entry.isPrimary) ??
|
||||
user?.riotAccounts[0];
|
||||
if (primaryRiotAccount?.gameName) {
|
||||
return primaryRiotAccount.tagLine
|
||||
? `${primaryRiotAccount.gameName}#${primaryRiotAccount.tagLine}`
|
||||
: primaryRiotAccount.gameName;
|
||||
}
|
||||
|
||||
if (user?.kakaoTalkNickname) return user.kakaoTalkNickname;
|
||||
if (user?.discordNickname) return user.discordNickname;
|
||||
|
||||
const identity = socket.data.identity as IdentityDocument | undefined;
|
||||
if (identity?.displayName) return identity.displayName;
|
||||
if (identity?.email) return identity.email;
|
||||
|
||||
return fallbackDisplayName ?? '관전자';
|
||||
}
|
||||
|
||||
private async authenticateSocket(socket: Socket): Promise<void> {
|
||||
const fallback = await this.authService.resolveDevUserById(
|
||||
this.readHandshakeUserId(socket),
|
||||
@@ -299,6 +364,19 @@ export class AuctionGateway
|
||||
this.syncRoomTimer(matchId, auction);
|
||||
}
|
||||
|
||||
public broadcastReset(matchId: string) {
|
||||
this.clearRoomTimer(matchId);
|
||||
this.server.to(matchId).emit('reset', { matchId });
|
||||
}
|
||||
|
||||
private emitChatHistory(socket: Socket, auction: AuctionDocument) {
|
||||
socket.emit('chat-history', {
|
||||
messages: (auction.chatMessages ?? []).map((message) =>
|
||||
this.serializeChatMessage(message),
|
||||
),
|
||||
});
|
||||
}
|
||||
|
||||
private syncRoomTimer(matchId: string, auction: AuctionDocument) {
|
||||
this.clearRoomTimer(matchId);
|
||||
if (!auction.currentDeadline) return;
|
||||
@@ -382,4 +460,8 @@ export class AuctionGateway
|
||||
private serializeAuction(auction: AuctionDocument) {
|
||||
return JSON.parse(JSON.stringify(auction));
|
||||
}
|
||||
|
||||
private serializeChatMessage(message: AuctionChatMessage) {
|
||||
return JSON.parse(JSON.stringify(message));
|
||||
}
|
||||
}
|
||||
@@ -159,6 +159,76 @@ describe('AuctionService', () => {
|
||||
expect(tournamentResultService.scheduleInitialPoll).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('appends a chat message and keeps only the latest 200 messages', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const userId = new mongoose.Types.ObjectId();
|
||||
const oldMessages = Array.from({ length: 200 }, (_, index) => ({
|
||||
id: `old-${index}`,
|
||||
displayName: 'Old',
|
||||
message: `old message ${index}`,
|
||||
sentAt: new Date(index),
|
||||
}));
|
||||
const auction = {
|
||||
matchId,
|
||||
chatMessages: oldMessages,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
const appended = await service.appendChatMessage({
|
||||
matchId,
|
||||
userId,
|
||||
displayName: ' Captain One ',
|
||||
message: ' 좋은 픽입니다 ',
|
||||
});
|
||||
|
||||
expect(appended.message).toMatchObject({
|
||||
userId,
|
||||
displayName: 'Captain One',
|
||||
message: '좋은 픽입니다',
|
||||
});
|
||||
expect(appended.message.id).toHaveLength(36);
|
||||
expect(appended.message.sentAt).toBeInstanceOf(Date);
|
||||
expect(auction.chatMessages).toHaveLength(200);
|
||||
expect(auction.chatMessages[0].id).toBe('old-1');
|
||||
expect(auction.chatMessages.at(-1)).toBe(appended.message);
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('rejects blank and overly long chat messages', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
matchId,
|
||||
chatMessages: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.appendChatMessage({
|
||||
matchId,
|
||||
displayName: 'Spectator',
|
||||
message: ' ',
|
||||
}),
|
||||
).rejects.toThrow('Chat message is required.');
|
||||
await expect(
|
||||
service.appendChatMessage({
|
||||
matchId,
|
||||
displayName: 'Spectator',
|
||||
message: 'a'.repeat(301),
|
||||
}),
|
||||
).rejects.toThrow('Chat message must be 300 characters or less.');
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('randomizes the non-captain player order when starting an auction', async () => {
|
||||
const randomSpy = jest.spyOn(Math, 'random').mockReturnValue(0);
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
@@ -252,6 +322,119 @@ describe('AuctionService', () => {
|
||||
expect(randomSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('includes tier history in auction player snapshots when starting an auction', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userIds = Array.from(
|
||||
{ length: 10 },
|
||||
() => new mongoose.Types.ObjectId(),
|
||||
);
|
||||
const participants = userIds.map((userId, index) => ({
|
||||
userId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
joinedAt: new Date(index),
|
||||
excluded: false,
|
||||
}));
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
participants,
|
||||
status: 'recruiting',
|
||||
teamBuiltAt: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const tierHistory = [
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
leaguePoints: 42,
|
||||
wins: 30,
|
||||
losses: 24,
|
||||
recordedAt: new Date('2026-05-01T00:00:00.000Z'),
|
||||
},
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
leaguePoints: 15,
|
||||
wins: 34,
|
||||
losses: 27,
|
||||
recordedAt: new Date('2026-05-08T00:00:00.000Z'),
|
||||
},
|
||||
];
|
||||
const users = userIds.slice(2).map((userId, index) => ({
|
||||
_id: userId,
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: `puuid-${index}`,
|
||||
gameName: `Player${index}`,
|
||||
tagLine: 'KR1',
|
||||
profileIconId: index,
|
||||
tiers: [],
|
||||
tierHistory: index === 0 ? tierHistory : [],
|
||||
championMasteries: [],
|
||||
recentStatsSummary: undefined,
|
||||
lastRefreshRequestedAt: new Date(),
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
}));
|
||||
const auctionCreate = jest.fn().mockImplementation(async (payload) => ({
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
toObject: jest.fn().mockReturnValue({ matchId, ...payload }),
|
||||
}));
|
||||
const { service } = createService({
|
||||
match: {
|
||||
findById: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
user: {
|
||||
find: jest.fn().mockResolvedValue(users),
|
||||
},
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(null),
|
||||
create: auctionCreate,
|
||||
},
|
||||
community: {
|
||||
findById: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue({
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
},
|
||||
});
|
||||
|
||||
await service.start({
|
||||
matchId,
|
||||
communityId,
|
||||
captains: [
|
||||
{ teamIndex: 1, userId: userIds[0] },
|
||||
{ teamIndex: 2, userId: userIds[1] },
|
||||
],
|
||||
initialPoints: 1000,
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 5,
|
||||
topTierThreshold: 'NONE',
|
||||
manualTopTierUserIds: [],
|
||||
});
|
||||
|
||||
const firstPlayerSnapshot = auctionCreate.mock.calls[0][0].order.find(
|
||||
(player: { userId: mongoose.Types.ObjectId }) =>
|
||||
player.userId.equals(userIds[2]),
|
||||
);
|
||||
|
||||
expect(firstPlayerSnapshot).toMatchObject({
|
||||
userId: userIds[2],
|
||||
tierHistory,
|
||||
});
|
||||
});
|
||||
|
||||
it('rejects bids when the team already has 5 members including captain', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
@@ -276,6 +459,91 @@ describe('AuctionService', () => {
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('rejects bids that do not reserve minimum points for remaining team slots', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'bidding',
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
captainUserId: new mongoose.Types.ObjectId(),
|
||||
points: 1000,
|
||||
members: [],
|
||||
},
|
||||
],
|
||||
currentBid: 100,
|
||||
currentDeadline: new Date(),
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 5,
|
||||
bids: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.placeBid({
|
||||
matchId,
|
||||
teamIndex: 1,
|
||||
amount: 980,
|
||||
}),
|
||||
).rejects.toThrow('Bid must reserve minimum points for remaining slots.');
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('allows bids up to the maximum after reserving minimum points', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const captainUserId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'bidding',
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
captainUserId,
|
||||
points: 1000,
|
||||
members: [],
|
||||
},
|
||||
],
|
||||
currentBid: 100,
|
||||
currentDeadline: new Date(),
|
||||
maxTimerSeconds: 30,
|
||||
bidExtensionSeconds: 5,
|
||||
bids: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await service.placeBid({
|
||||
matchId,
|
||||
teamIndex: 1,
|
||||
amount: 970,
|
||||
});
|
||||
|
||||
expect(auction.currentBid).toBe(970);
|
||||
expect(auction.currentBidderTeamIndex).toBe(1);
|
||||
expect(auction.bids).toEqual([
|
||||
expect.objectContaining({
|
||||
teamIndex: 1,
|
||||
amount: 970,
|
||||
bidderUserId: captainUserId,
|
||||
}),
|
||||
]);
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('extends a short bid deadline using the configured bid extension seconds', async () => {
|
||||
const now = new Date('2026-05-02T00:00:00.000Z');
|
||||
jest.useFakeTimers().setSystemTime(now);
|
||||
@@ -348,7 +616,7 @@ describe('AuctionService', () => {
|
||||
expect(auction.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('marks a zero-bid player as passed and queues them for round two', async () => {
|
||||
it('marks a zero-bid player as passed and queues them for another round', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const playerId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
@@ -383,25 +651,63 @@ describe('AuctionService', () => {
|
||||
expect(auction.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('force-assigns second-pass players to the open team with most points', async () => {
|
||||
it('queues zero-bid passes after the first auction round', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const playerId = new mongoose.Types.ObjectId();
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'bidding',
|
||||
currentBid: 0,
|
||||
currentIndex: 0,
|
||||
auctionRound: 2,
|
||||
order: [
|
||||
{
|
||||
userId: playerId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
passCount: 1,
|
||||
},
|
||||
],
|
||||
passedQueue: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
});
|
||||
|
||||
await service.markPassed(matchId);
|
||||
|
||||
expect(auction.phase).toBe('passed');
|
||||
expect(auction.order[0].passCount).toBe(2);
|
||||
expect(auction.passedQueue).toHaveLength(1);
|
||||
expect(auction.passedQueue[0]).toMatchObject({
|
||||
userId: playerId.toString(),
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
passCount: 2,
|
||||
});
|
||||
});
|
||||
|
||||
it('requeues second-pass players instead of force-assigning them', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const captainOneId = new mongoose.Types.ObjectId();
|
||||
const captainTwoId = new mongoose.Types.ObjectId();
|
||||
const passedPlayerId = new mongoose.Types.ObjectId();
|
||||
const passedPlayer = {
|
||||
userId: passedPlayerId,
|
||||
preferredPositions: [{ position: 'SUP', priority: 1 }],
|
||||
passCount: 2,
|
||||
};
|
||||
const auction = {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
matchId,
|
||||
phase: 'passed',
|
||||
currentIndex: 0,
|
||||
auctionRound: 2,
|
||||
order: [
|
||||
{
|
||||
userId: passedPlayerId,
|
||||
preferredPositions: [{ position: 'SUP', priority: 1 }],
|
||||
passCount: 2,
|
||||
},
|
||||
],
|
||||
passedQueue: [],
|
||||
order: [passedPlayer],
|
||||
passedQueue: [passedPlayer],
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
@@ -419,46 +725,28 @@ describe('AuctionService', () => {
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
toObject: jest.fn().mockReturnValue({ _id: 'auction', matchId }),
|
||||
};
|
||||
const match = {
|
||||
participants: [
|
||||
{
|
||||
userId: captainOneId,
|
||||
preferredPositions: [{ position: 'TOP', priority: 1 }],
|
||||
},
|
||||
{
|
||||
userId: captainTwoId,
|
||||
preferredPositions: [{ position: 'JGL', priority: 1 }],
|
||||
},
|
||||
{
|
||||
userId: passedPlayerId,
|
||||
preferredPositions: [{ position: 'SUP', priority: 1 }],
|
||||
},
|
||||
],
|
||||
status: 'team-built',
|
||||
teams: [],
|
||||
teamBuiltAt: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService({
|
||||
auction: {
|
||||
findOne: jest.fn().mockResolvedValue(auction),
|
||||
},
|
||||
match: {
|
||||
findById: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
});
|
||||
|
||||
await service.next(matchId);
|
||||
|
||||
expect(auction.phase).toBe('complete');
|
||||
expect(auction.teams[1].members).toEqual([
|
||||
{
|
||||
userId: passedPlayerId,
|
||||
assignedPosition: 'SUP',
|
||||
cost: 1,
|
||||
},
|
||||
]);
|
||||
expect(auction.teams[1].points).toBe(49);
|
||||
expect(auction.phase).toBe('presenting');
|
||||
expect(auction.auctionRound).toBe(3);
|
||||
expect(auction.currentIndex).toBe(1);
|
||||
expect(auction.order).toHaveLength(2);
|
||||
expect(auction.order[1]).toMatchObject({
|
||||
userId: passedPlayerId.toString(),
|
||||
preferredPositions: [{ position: 'SUP', priority: 1 }],
|
||||
passCount: 2,
|
||||
});
|
||||
expect(auction.passedQueue).toEqual([]);
|
||||
expect(auction.teams[0].members).toEqual([]);
|
||||
expect(auction.teams[1].members).toEqual([]);
|
||||
expect(auction.teams[0].points).toBe(10);
|
||||
expect(auction.teams[1].points).toBe(50);
|
||||
});
|
||||
|
||||
it('syncs completed auction teams into the match document', async () => {
|
||||
|
||||
@@ -5,10 +5,12 @@ import {
|
||||
Logger,
|
||||
NotFoundException,
|
||||
} from '@nestjs/common';
|
||||
import { randomUUID } from 'crypto';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import {
|
||||
AuctionActionType,
|
||||
AuctionChatMessage,
|
||||
AuctionDocument,
|
||||
AuctionPlayerSnapshot,
|
||||
AuctionTeam,
|
||||
@@ -24,8 +26,12 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
|
||||
import { TournamentResultService } from '../tournament-result/tournament-result.service';
|
||||
|
||||
const AUCTION_MAX_TEAM_SIZE = 5;
|
||||
const AUCTION_MIN_BID_POINTS = 10;
|
||||
const AUCTION_BACKGROUND_ENRICHMENT_CONCURRENCY = 1;
|
||||
const AUCTION_ENRICHMENT_COOLDOWN_MS = 3 * 60 * 60 * 1000;
|
||||
const AUCTION_CHAT_MAX_MESSAGES = 200;
|
||||
const AUCTION_CHAT_MAX_MESSAGE_LENGTH = 300;
|
||||
const AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH = 24;
|
||||
|
||||
interface StartAuctionParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
@@ -54,6 +60,13 @@ interface MarkSoldParams {
|
||||
assignedPosition?: Position;
|
||||
}
|
||||
|
||||
interface AppendChatMessageParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
userId?: mongoose.Types.ObjectId;
|
||||
displayName?: string;
|
||||
message: string;
|
||||
}
|
||||
|
||||
export interface AuctionHistoryView {
|
||||
sequence: number;
|
||||
action: AuctionActionType;
|
||||
@@ -162,6 +175,7 @@ export class AuctionService {
|
||||
profileIconId: primary.profileIconId,
|
||||
preferredPositions: participant.preferredPositions,
|
||||
tiers: primary.tiers,
|
||||
tierHistory: primary.tierHistory ?? [],
|
||||
masteries: primary.championMasteries,
|
||||
recentStatsSummary: primary.recentStatsSummary,
|
||||
passCount: 0,
|
||||
@@ -221,6 +235,31 @@ export class AuctionService {
|
||||
return auction;
|
||||
}
|
||||
|
||||
public async appendChatMessage(params: AppendChatMessageParams): Promise<{
|
||||
auction: AuctionDocument;
|
||||
message: AuctionChatMessage;
|
||||
}> {
|
||||
const auction = await this.getByMatchId(params.matchId);
|
||||
const messageText = this.normalizeChatMessage(params.message);
|
||||
const message: AuctionChatMessage = {
|
||||
id: randomUUID(),
|
||||
userId: params.userId,
|
||||
displayName: this.normalizeChatDisplayName(params.displayName),
|
||||
message: messageText,
|
||||
sentAt: new Date(),
|
||||
};
|
||||
|
||||
auction.chatMessages ??= [];
|
||||
auction.chatMessages.push(message);
|
||||
const overflow = auction.chatMessages.length - AUCTION_CHAT_MAX_MESSAGES;
|
||||
if (overflow > 0) {
|
||||
auction.chatMessages.splice(0, overflow);
|
||||
}
|
||||
|
||||
await auction.save();
|
||||
return { auction, message };
|
||||
}
|
||||
|
||||
public async listHistory(params: {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
@@ -280,6 +319,11 @@ export class AuctionService {
|
||||
throw new BadRequestException('Bid exceeds team points.');
|
||||
}
|
||||
this.assertTeamHasSlot(team);
|
||||
if (params.amount > this.calculateMaxBidForTeam(team)) {
|
||||
throw new BadRequestException(
|
||||
'Bid must reserve minimum points for remaining slots.',
|
||||
);
|
||||
}
|
||||
// 임시 운영용: 클라이언트에서 선택한 팀장 모드를 신뢰하고 실제 로그인 사용자 검증은 건너뛴다.
|
||||
|
||||
await this.recordSnapshot(auction, 'bid', params.bidderUserId);
|
||||
@@ -345,9 +389,8 @@ export class AuctionService {
|
||||
|
||||
await this.recordSnapshot(auction, 'passed');
|
||||
current.passCount = (current.passCount ?? 0) + 1;
|
||||
if ((auction.auctionRound ?? 1) === 1) {
|
||||
auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current));
|
||||
}
|
||||
auction.passedQueue ??= [];
|
||||
auction.passedQueue.push(this.cloneAuctionPlayerSnapshot(current));
|
||||
auction.phase = 'passed';
|
||||
auction.currentDeadline = undefined;
|
||||
await auction.save();
|
||||
@@ -368,29 +411,22 @@ export class AuctionService {
|
||||
const nextIndex = auction.currentIndex + 1;
|
||||
const completesAuction =
|
||||
nextIndex >= auction.order.length &&
|
||||
!(
|
||||
(auction.auctionRound ?? 1) === 1 &&
|
||||
(auction.passedQueue?.length ?? 0) > 0
|
||||
);
|
||||
(auction.passedQueue?.length ?? 0) === 0;
|
||||
await this.recordSnapshot(auction, completesAuction ? 'complete' : 'next');
|
||||
if (nextIndex >= auction.order.length) {
|
||||
if (
|
||||
(auction.auctionRound ?? 1) === 1 &&
|
||||
(auction.passedQueue?.length ?? 0) > 0
|
||||
) {
|
||||
if ((auction.passedQueue?.length ?? 0) > 0) {
|
||||
auction.order.push(
|
||||
...auction.passedQueue.map((player) =>
|
||||
this.cloneAuctionPlayerSnapshot(player),
|
||||
),
|
||||
);
|
||||
auction.passedQueue = [];
|
||||
auction.auctionRound = 2;
|
||||
auction.auctionRound = (auction.auctionRound ?? 1) + 1;
|
||||
auction.currentIndex = nextIndex;
|
||||
auction.phase = 'presenting';
|
||||
auction.currentBid = 0;
|
||||
auction.currentBidderTeamIndex = undefined;
|
||||
} else {
|
||||
this.forceAssignRemainingPasses(auction);
|
||||
auction.phase = 'complete';
|
||||
auction.completedAt = new Date();
|
||||
}
|
||||
@@ -603,47 +639,34 @@ export class AuctionService {
|
||||
return shuffled;
|
||||
}
|
||||
|
||||
private forceAssignRemainingPasses(auction: AuctionDocument): void {
|
||||
const forcedPlayers = auction.order.filter(
|
||||
(player) =>
|
||||
(player.passCount ?? 0) >= 2 &&
|
||||
!this.isAuctionPlayerAssigned(auction, player.userId),
|
||||
);
|
||||
|
||||
for (const player of forcedPlayers) {
|
||||
const targetTeam = [...auction.teams]
|
||||
.filter(
|
||||
(team) => this.countTeamMembersIncludingCaptain(team) < AUCTION_MAX_TEAM_SIZE,
|
||||
)
|
||||
.sort((left, right) => right.points - left.points)[0];
|
||||
if (!targetTeam) return;
|
||||
|
||||
const preferredPrimary = player.preferredPositions[0]?.position;
|
||||
targetTeam.members.push({
|
||||
userId: player.userId,
|
||||
assignedPosition: preferredPrimary ?? 'MID',
|
||||
cost: 1,
|
||||
});
|
||||
targetTeam.points = Math.max(0, targetTeam.points - 1);
|
||||
}
|
||||
}
|
||||
|
||||
private isAuctionPlayerAssigned(
|
||||
auction: AuctionDocument,
|
||||
userId: mongoose.Types.ObjectId,
|
||||
): boolean {
|
||||
const userIdText = userId.toString();
|
||||
return auction.teams.some((team) =>
|
||||
team.members.some((member) => member.userId.toString() === userIdText),
|
||||
);
|
||||
}
|
||||
|
||||
private cloneAuctionPlayerSnapshot(
|
||||
player: AuctionPlayerSnapshot,
|
||||
): AuctionPlayerSnapshot {
|
||||
return JSON.parse(JSON.stringify(player)) as AuctionPlayerSnapshot;
|
||||
}
|
||||
|
||||
private normalizeChatMessage(message: string): string {
|
||||
const normalized = message.trim();
|
||||
if (!normalized) {
|
||||
throw new BadRequestException('Chat message is required.');
|
||||
}
|
||||
if (Array.from(normalized).length > AUCTION_CHAT_MAX_MESSAGE_LENGTH) {
|
||||
throw new BadRequestException(
|
||||
`Chat message must be ${AUCTION_CHAT_MAX_MESSAGE_LENGTH} characters or less.`,
|
||||
);
|
||||
}
|
||||
return normalized;
|
||||
}
|
||||
|
||||
private normalizeChatDisplayName(displayName: string | undefined): string {
|
||||
const normalized = displayName?.trim() || '관전자';
|
||||
const chars = Array.from(normalized);
|
||||
if (chars.length <= AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH) {
|
||||
return normalized;
|
||||
}
|
||||
return chars.slice(0, AUCTION_CHAT_MAX_DISPLAY_NAME_LENGTH).join('');
|
||||
}
|
||||
|
||||
private async recordSnapshot(
|
||||
auction: AuctionDocument,
|
||||
action: AuctionActionType,
|
||||
@@ -792,6 +815,16 @@ export class AuctionService {
|
||||
}
|
||||
}
|
||||
|
||||
private calculateMaxBidForTeam(team: AuctionTeam): number {
|
||||
const remainingSlotsAfterCurrentBid = Math.max(
|
||||
0,
|
||||
AUCTION_MAX_TEAM_SIZE - this.countTeamMembersIncludingCaptain(team) - 1,
|
||||
);
|
||||
const reservedPoints =
|
||||
remainingSlotsAfterCurrentBid * AUCTION_MIN_BID_POINTS;
|
||||
return Math.max(0, team.points - reservedPoints);
|
||||
}
|
||||
|
||||
private countTeamMembersIncludingCaptain(team: AuctionTeam): number {
|
||||
const userIds = new Set<string>([team.captainUserId.toString()]);
|
||||
for (const member of team.members) {
|
||||
@@ -903,6 +936,7 @@ export class AuctionService {
|
||||
'order.$.tagLine': account.tagLine,
|
||||
'order.$.profileIconId': account.profileIconId,
|
||||
'order.$.tiers': account.tiers,
|
||||
'order.$.tierHistory': account.tierHistory ?? [],
|
||||
'order.$.masteries': account.championMasteries,
|
||||
'order.$.recentStatsSummary': account.recentStatsSummary,
|
||||
updatedAt: new Date(),
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { RiotModule } from '../riot/riot.module';
|
||||
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
||||
import { CommunityStatsController } from './community-stats.controller';
|
||||
import { CommunityStatsService } from './community-stats.service';
|
||||
@@ -7,6 +8,7 @@ import { MatchStatsRepository } from './match-stats.repository';
|
||||
import { MatchStatsService } from './match-stats.service';
|
||||
|
||||
@Module({
|
||||
imports: [RiotModule],
|
||||
controllers: [CommunityStatsController],
|
||||
providers: [
|
||||
CommunityStatsService,
|
||||
|
||||
@@ -0,0 +1,194 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { CommunityStatsCacheService } from './community-stats-cache.service';
|
||||
import { CommunityStatsService } from './community-stats.service';
|
||||
import type {
|
||||
InternalMatchCardView,
|
||||
InternalMatchDetailResponse,
|
||||
} from './community-stats.types';
|
||||
import { MatchStatsRepository } from './match-stats.repository';
|
||||
import { MatchStatsService } from './match-stats.service';
|
||||
import type { InternalGameDetail, InternalRecord } from './match-stats.types';
|
||||
|
||||
function objectives() {
|
||||
return {
|
||||
tower: 1,
|
||||
dragon: 0,
|
||||
inhibitor: 0,
|
||||
baron: 0,
|
||||
riftHerald: 0,
|
||||
voidGrub: 0,
|
||||
elderDragon: 0,
|
||||
};
|
||||
}
|
||||
|
||||
function record(matchId: mongoose.Types.ObjectId): InternalRecord {
|
||||
return {
|
||||
matchId: matchId.toString(),
|
||||
title: '내전',
|
||||
scheduledAt: new Date('2026-06-18T12:00:00.000Z'),
|
||||
gameNumber: 1,
|
||||
riotMatchId: 'KR_1',
|
||||
gameCreation: 1_000,
|
||||
gameDuration: 1_800,
|
||||
userId: new mongoose.Types.ObjectId().toString(),
|
||||
summonerName: 'Player',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 1,
|
||||
teamIndex: 1,
|
||||
side: 'blue',
|
||||
championId: 266,
|
||||
championLevel: 15,
|
||||
teamPosition: 'TOP',
|
||||
kills: 5,
|
||||
deaths: 1,
|
||||
assists: 7,
|
||||
win: true,
|
||||
cs: 200,
|
||||
csPerMin: 6.7,
|
||||
gold: 12_000,
|
||||
gpm: 400,
|
||||
damageDealtToChampions: 18_000,
|
||||
damageTaken: 20_000,
|
||||
damageShare: 30,
|
||||
killParticipation: 60,
|
||||
visionScore: 18,
|
||||
controlWardsBought: 1,
|
||||
wardsPlaced: 8,
|
||||
wardsKilled: 2,
|
||||
firstBloodKill: false,
|
||||
firstBloodAssist: false,
|
||||
items: [1054, 3071, 0, 0, 0, 0],
|
||||
trinket: 3340,
|
||||
summonerSpells: [4, 12],
|
||||
perks: {
|
||||
primaryStyle: 8000,
|
||||
subStyle: 8400,
|
||||
keystone: 8010,
|
||||
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||
styles: [
|
||||
{ styleId: 8000, perkIds: [8010, 9111, 9105, 8299] },
|
||||
{ styleId: 8400, perkIds: [8444, 8451] },
|
||||
],
|
||||
statPerks: { defense: 5001, flex: 5008, offense: 5005 },
|
||||
},
|
||||
itemBuild: [{ timestamp: 10, itemId: 1054, type: 'purchased' }],
|
||||
skillBuild: [{ timestamp: 11, skillSlot: 1, level: 1 }],
|
||||
rating: 8.5,
|
||||
};
|
||||
}
|
||||
|
||||
describe('CommunityStatsService', () => {
|
||||
it('ignores stale detail cache entries missing timeline build fields', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const match: InternalMatchCardView = {
|
||||
matchId: matchId.toString(),
|
||||
title: '내전',
|
||||
scheduledAt: '2026-06-18T12:00:00.000Z',
|
||||
status: 'finished',
|
||||
gameCount: 1,
|
||||
games: [],
|
||||
teams: [],
|
||||
seriesResults: [],
|
||||
};
|
||||
const participant = record(matchId);
|
||||
const gameDetail: InternalGameDetail = {
|
||||
gameNumber: 1,
|
||||
riotMatchId: 'KR_1',
|
||||
gameCreation: 1_000,
|
||||
gameDuration: 1_800,
|
||||
winnerSide: 'blue',
|
||||
timelineLoaded: true,
|
||||
timeline: [
|
||||
{
|
||||
timestamp: 0,
|
||||
blue: { gold: 500, xp: 0 },
|
||||
red: { gold: 500, xp: 0 },
|
||||
goldDiff: 0,
|
||||
xpDiff: 0,
|
||||
},
|
||||
],
|
||||
objectiveEvents: [],
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
side: 'blue',
|
||||
win: true,
|
||||
objectives: objectives(),
|
||||
bans: [],
|
||||
participants: [participant],
|
||||
},
|
||||
],
|
||||
};
|
||||
const staleCache = {
|
||||
match,
|
||||
games: [
|
||||
{
|
||||
gameNumber: 1,
|
||||
riotMatchId: 'KR_1',
|
||||
gameCreation: 1_000,
|
||||
gameDuration: 1_800,
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
side: 'blue',
|
||||
win: true,
|
||||
objectives: { tower: 1, dragon: 0, baron: 0 },
|
||||
participants: [
|
||||
{
|
||||
summonerName: 'Player',
|
||||
perks: {
|
||||
primaryStyle: 8000,
|
||||
subStyle: 8400,
|
||||
keystone: 8010,
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
],
|
||||
} as unknown as InternalMatchDetailResponse;
|
||||
const cacheService = {
|
||||
get: jest.fn().mockResolvedValue(staleCache),
|
||||
setDetail: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<CommunityStatsCacheService>;
|
||||
const matchStatsService = {
|
||||
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<MatchStatsService>;
|
||||
const service = new CommunityStatsService(
|
||||
{} as ConnectionService,
|
||||
cacheService,
|
||||
{} as MatchStatsRepository,
|
||||
matchStatsService,
|
||||
);
|
||||
(service as unknown as { buildBaseDataset: jest.Mock }).buildBaseDataset =
|
||||
jest.fn().mockResolvedValue({
|
||||
season: {
|
||||
id: 'all',
|
||||
label: '전체',
|
||||
startTime: null,
|
||||
endTime: null,
|
||||
},
|
||||
matches: [match],
|
||||
records: [participant],
|
||||
detailsByMatchId: new Map([[matchId.toString(), [gameDetail]]]),
|
||||
});
|
||||
|
||||
const response = await service.getMatchDetail({ communityId, matchId });
|
||||
|
||||
expect(response.games[0].timeline).toHaveLength(1);
|
||||
expect(response.games[0].teams[0].participants[0].itemBuild).toHaveLength(
|
||||
1,
|
||||
);
|
||||
expect(response.games[0].teams[0].participants[0].perks).toMatchObject({
|
||||
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||
});
|
||||
expect(matchStatsService.buildAndUpsert).not.toHaveBeenCalled();
|
||||
expect(cacheService.setDetail).toHaveBeenCalledWith(
|
||||
expect.stringContaining(':r3:'),
|
||||
response,
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -36,6 +36,7 @@ const DEFAULT_LIST_LIMIT = 20;
|
||||
const MAX_LIST_LIMIT = 50;
|
||||
const MAX_MATCH_SCAN = 300;
|
||||
const MIN_HIGHLIGHT_GAMES = 5;
|
||||
const MATCH_DETAIL_RESPONSE_CACHE_VERSION = 3;
|
||||
|
||||
interface CommunityStatsContext {
|
||||
community: CommunityDocument;
|
||||
@@ -205,10 +206,10 @@ export class CommunityStatsService {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
}): Promise<InternalMatchDetailResponse> {
|
||||
const key = `riot:communitystats:matchDetail:${params.communityId.toString()}:${params.matchId.toString()}`;
|
||||
const key = `riot:communitystats:matchDetail:v${MATCH_STATS_BUILDER_VERSION}:r${MATCH_DETAIL_RESPONSE_CACHE_VERSION}:${params.communityId.toString()}:${params.matchId.toString()}`;
|
||||
const cached =
|
||||
await this.cacheService.get<InternalMatchDetailResponse>(key);
|
||||
if (cached) return cached;
|
||||
if (cached && isCompleteMatchDetailResponse(cached)) return cached;
|
||||
|
||||
const dataset = await this.buildBaseDataset(params.communityId, {
|
||||
seasonId: 'all',
|
||||
@@ -217,26 +218,42 @@ export class CommunityStatsService {
|
||||
(item) => item.matchId === params.matchId.toString(),
|
||||
);
|
||||
if (!match) throw new NotFoundException('Internal match not found.');
|
||||
let gameDetails = dataset.detailsByMatchId.get(match.matchId) ?? [];
|
||||
if (gameDetails.some((game) => game.timelineLoaded !== true)) {
|
||||
await this.matchStatsService.buildAndUpsert(params.matchId, {
|
||||
includeTimeline: true,
|
||||
});
|
||||
const refreshedDataset = await this.buildBaseDataset(params.communityId, {
|
||||
seasonId: 'all',
|
||||
});
|
||||
gameDetails = refreshedDataset.detailsByMatchId.get(match.matchId) ?? [];
|
||||
}
|
||||
const response: InternalMatchDetailResponse = {
|
||||
match,
|
||||
games: (dataset.detailsByMatchId.get(match.matchId) ?? []).map(
|
||||
games: gameDetails.map(
|
||||
(game) => ({
|
||||
gameNumber: game.gameNumber,
|
||||
riotMatchId: game.riotMatchId,
|
||||
gameCreation: game.gameCreation,
|
||||
gameDuration: game.gameDuration,
|
||||
gameVersion: game.gameVersion,
|
||||
timeline: game.timeline ?? [],
|
||||
objectiveEvents: game.objectiveEvents ?? [],
|
||||
teams: game.teams.map((team) => ({
|
||||
teamIndex: team.teamIndex,
|
||||
side: team.side,
|
||||
win: team.win,
|
||||
objectives: team.objectives,
|
||||
bans: team.bans ?? [],
|
||||
participants: team.participants.map((record) => ({
|
||||
userId: record.userId,
|
||||
summonerName: record.summonerName,
|
||||
tagLine: record.tagLine,
|
||||
teamIndex: record.teamIndex,
|
||||
side: record.side,
|
||||
teamPosition: record.teamPosition,
|
||||
championId: record.championId,
|
||||
championLevel: record.championLevel,
|
||||
kills: record.kills,
|
||||
deaths: record.deaths,
|
||||
assists: record.assists,
|
||||
@@ -245,13 +262,21 @@ export class CommunityStatsService {
|
||||
gold: record.gold,
|
||||
gpm: record.gpm,
|
||||
damageDealtToChampions: record.damageDealtToChampions,
|
||||
damageTaken: record.damageTaken,
|
||||
damageShare: record.damageShare,
|
||||
killParticipation: record.killParticipation,
|
||||
visionScore: record.visionScore,
|
||||
wardsPlaced: record.wardsPlaced,
|
||||
wardsKilled: record.wardsKilled,
|
||||
controlWardsBought: record.controlWardsBought,
|
||||
firstBloodKill: record.firstBloodKill ?? false,
|
||||
firstBloodAssist: record.firstBloodAssist ?? false,
|
||||
items: record.items,
|
||||
trinket: record.trinket,
|
||||
summonerSpells: record.summonerSpells,
|
||||
perks: record.perks,
|
||||
itemBuild: record.itemBuild ?? [],
|
||||
skillBuild: record.skillBuild ?? [],
|
||||
win: record.win,
|
||||
})),
|
||||
})),
|
||||
@@ -990,3 +1015,23 @@ export class CommunityStatsService {
|
||||
return Math.round(value * 10) / 10;
|
||||
}
|
||||
}
|
||||
|
||||
function isCompleteMatchDetailResponse(
|
||||
response: InternalMatchDetailResponse,
|
||||
): boolean {
|
||||
return response.games.every(
|
||||
(game) =>
|
||||
Array.isArray(game.timeline) &&
|
||||
Array.isArray(game.objectiveEvents) &&
|
||||
game.teams.every(
|
||||
(team) =>
|
||||
Array.isArray(team.bans) &&
|
||||
team.participants.every(
|
||||
(participant) =>
|
||||
typeof participant.tagLine === 'string' &&
|
||||
Array.isArray(participant.itemBuild) &&
|
||||
Array.isArray(participant.skillBuild),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -1,4 +1,10 @@
|
||||
import type { RiotLane, TeamSide } from '../global/database/schema';
|
||||
import type {
|
||||
MatchStatsItemBuildEvent,
|
||||
MatchStatsRunePerks,
|
||||
MatchStatsSkillBuildEvent,
|
||||
RiotLane,
|
||||
TeamSide,
|
||||
} from '../global/database/schema';
|
||||
import type { RecentMatchView, HistorySeasonDto } from '../match-history/match-history.types';
|
||||
|
||||
export interface CommunityStatsFilters {
|
||||
@@ -108,18 +114,43 @@ export interface InternalMatchDetailResponse {
|
||||
riotMatchId: string;
|
||||
gameCreation: number;
|
||||
gameDuration: number;
|
||||
gameVersion?: string;
|
||||
timeline: Array<{
|
||||
timestamp: number;
|
||||
blue: { gold: number; xp: number };
|
||||
red: { gold: number; xp: number };
|
||||
goldDiff: number;
|
||||
xpDiff: number;
|
||||
}>;
|
||||
objectiveEvents: Array<{
|
||||
timestamp: number;
|
||||
side: TeamSide;
|
||||
type: 'dragon' | 'elderDragon' | 'baron' | 'riftHerald' | 'voidGrub';
|
||||
monsterSubType?: string;
|
||||
}>;
|
||||
teams: Array<{
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
win: boolean;
|
||||
objectives: { baron: number; dragon: number; tower: number };
|
||||
objectives: {
|
||||
tower: number;
|
||||
dragon: number;
|
||||
inhibitor: number;
|
||||
baron: number;
|
||||
riftHerald: number;
|
||||
voidGrub: number;
|
||||
elderDragon: number;
|
||||
};
|
||||
bans: Array<{ championId: number; pickTurn: number }>;
|
||||
participants: Array<{
|
||||
userId: string | null;
|
||||
summonerName: string;
|
||||
tagLine: string;
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
teamPosition: string;
|
||||
championId: number;
|
||||
championLevel: number;
|
||||
kills: number;
|
||||
deaths: number;
|
||||
assists: number;
|
||||
@@ -128,13 +159,21 @@ export interface InternalMatchDetailResponse {
|
||||
gold: number;
|
||||
gpm: number;
|
||||
damageDealtToChampions: number;
|
||||
damageTaken: number;
|
||||
damageShare: number;
|
||||
killParticipation: number;
|
||||
visionScore: number;
|
||||
wardsPlaced: number;
|
||||
wardsKilled: number;
|
||||
controlWardsBought: number;
|
||||
firstBloodKill: boolean;
|
||||
firstBloodAssist: boolean;
|
||||
items: number[];
|
||||
trinket: number;
|
||||
summonerSpells: [number, number];
|
||||
perks: { primaryStyle?: number; subStyle?: number; keystone?: number };
|
||||
perks: MatchStatsRunePerks;
|
||||
itemBuild: MatchStatsItemBuildEvent[];
|
||||
skillBuild: MatchStatsSkillBuildEvent[];
|
||||
win: boolean;
|
||||
}>;
|
||||
}>;
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
import mongoose from 'mongoose';
|
||||
import type { MatchDocument } from '../global/database/schema';
|
||||
import type { RiotMatchDto, RiotMatchTimelineDto } from '../riot/riot.types';
|
||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||
|
||||
function makeMatch(): MatchDocument {
|
||||
@@ -95,4 +96,301 @@ describe('MatchStatsFragmentBuilder', () => {
|
||||
});
|
||||
expect(fragment.gameDetails[0].teams[0].participants).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('builds rich set detail from raw Riot match data', () => {
|
||||
const builder = new MatchStatsFragmentBuilder();
|
||||
const match = makeMatch();
|
||||
const raw = {
|
||||
metadata: {
|
||||
dataVersion: '2',
|
||||
matchId: 'KR_1',
|
||||
participants: ['puuid-1'],
|
||||
},
|
||||
info: {
|
||||
gameCreation: 1_000,
|
||||
gameDuration: 1_800,
|
||||
gameId: 1,
|
||||
gameMode: 'CLASSIC',
|
||||
gameName: 'teambuilder-match-1',
|
||||
gameStartTimestamp: 1_000,
|
||||
gameType: 'CUSTOM_GAME',
|
||||
gameVersion: '16.11.1.1234',
|
||||
mapId: 11,
|
||||
participants: [
|
||||
{
|
||||
assists: 7,
|
||||
champExperience: 15_000,
|
||||
champLevel: 15,
|
||||
championId: 266,
|
||||
championName: 'Aatrox',
|
||||
deaths: 1,
|
||||
firstBloodAssist: false,
|
||||
firstBloodKill: true,
|
||||
goldEarned: 12_345,
|
||||
goldSpent: 11_000,
|
||||
individualPosition: 'TOP',
|
||||
item0: 1054,
|
||||
item1: 3071,
|
||||
item2: 0,
|
||||
item3: 0,
|
||||
item4: 0,
|
||||
item5: 0,
|
||||
item6: 3340,
|
||||
kills: 5,
|
||||
neutralMinionsKilled: 8,
|
||||
participantId: 1,
|
||||
perks: {
|
||||
statPerks: { defense: 5001, flex: 5008, offense: 5005 },
|
||||
styles: [
|
||||
{
|
||||
description: 'primaryStyle',
|
||||
style: 8000,
|
||||
selections: [
|
||||
{ perk: 8010, var1: 0, var2: 0, var3: 0 },
|
||||
{ perk: 9111, var1: 0, var2: 0, var3: 0 },
|
||||
{ perk: 9105, var1: 0, var2: 0, var3: 0 },
|
||||
{ perk: 8299, var1: 0, var2: 0, var3: 0 },
|
||||
],
|
||||
},
|
||||
{
|
||||
description: 'subStyle',
|
||||
style: 8400,
|
||||
selections: [
|
||||
{ perk: 8444, var1: 0, var2: 0, var3: 0 },
|
||||
{ perk: 8451, var1: 0, var2: 0, var3: 0 },
|
||||
],
|
||||
},
|
||||
],
|
||||
},
|
||||
puuid: 'puuid-1',
|
||||
riotIdGameName: 'Player',
|
||||
riotIdTagLine: 'KR1',
|
||||
summoner1Id: 4,
|
||||
summoner2Id: 12,
|
||||
summonerId: 'summoner-1',
|
||||
summonerLevel: 100,
|
||||
summonerName: 'Player',
|
||||
teamId: 100,
|
||||
teamPosition: 'TOP',
|
||||
timePlayed: 1_800,
|
||||
totalDamageDealtToChampions: 18_765,
|
||||
totalDamageTaken: 24_321,
|
||||
totalMinionsKilled: 220,
|
||||
visionScore: 18,
|
||||
visionWardsBoughtInGame: 2,
|
||||
wardsKilled: 3,
|
||||
wardsPlaced: 11,
|
||||
win: true,
|
||||
},
|
||||
],
|
||||
platformId: 'KR',
|
||||
queueId: 0,
|
||||
teams: [
|
||||
{
|
||||
bans: [
|
||||
{ championId: 14, pickTurn: 1 },
|
||||
{ championId: 43, pickTurn: 2 },
|
||||
],
|
||||
objectives: {
|
||||
baron: { first: true, kills: 1 },
|
||||
champion: { first: true, kills: 5 },
|
||||
dragon: { first: true, kills: 2 },
|
||||
horde: { first: false, kills: 3 },
|
||||
inhibitor: { first: false, kills: 0 },
|
||||
riftHerald: { first: false, kills: 0 },
|
||||
tower: { first: true, kills: 7 },
|
||||
},
|
||||
teamId: 100,
|
||||
win: true,
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
const timeline = {
|
||||
metadata: {
|
||||
dataVersion: '2',
|
||||
matchId: 'KR_1',
|
||||
participants: ['puuid-1'],
|
||||
},
|
||||
info: {
|
||||
frameInterval: 60_000,
|
||||
frames: [
|
||||
{
|
||||
timestamp: 0,
|
||||
participantFrames: {
|
||||
'1': { participantId: 1, totalGold: 500, xp: 0 },
|
||||
},
|
||||
},
|
||||
{
|
||||
timestamp: 60_000,
|
||||
events: [
|
||||
{
|
||||
type: 'ITEM_PURCHASED',
|
||||
timestamp: 10_000,
|
||||
participantId: 1,
|
||||
itemId: 1054,
|
||||
},
|
||||
{
|
||||
type: 'SKILL_LEVEL_UP',
|
||||
timestamp: 11_000,
|
||||
participantId: 1,
|
||||
skillSlot: 1,
|
||||
levelUpType: 'NORMAL',
|
||||
},
|
||||
{
|
||||
type: 'ITEM_DESTROYED',
|
||||
timestamp: 12_000,
|
||||
participantId: 1,
|
||||
itemId: 2003,
|
||||
},
|
||||
{
|
||||
type: 'ITEM_UNDO',
|
||||
timestamp: 13_000,
|
||||
participantId: 1,
|
||||
beforeId: 1054,
|
||||
afterId: 3071,
|
||||
},
|
||||
{
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
timestamp: 20_000,
|
||||
killerTeamId: 100,
|
||||
monsterType: 'DRAGON',
|
||||
monsterSubType: 'FIRE_DRAGON',
|
||||
},
|
||||
{
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
timestamp: 30_000,
|
||||
killerTeamId: 100,
|
||||
monsterType: 'DRAGON',
|
||||
monsterSubType: 'ELDER_DRAGON',
|
||||
},
|
||||
{
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
timestamp: 40_000,
|
||||
killerId: 1,
|
||||
monsterType: 'HORDE',
|
||||
},
|
||||
{
|
||||
type: 'SKILL_LEVEL_UP',
|
||||
timestamp: 45_000,
|
||||
participantId: 1,
|
||||
skillSlot: 3,
|
||||
levelUpType: 'NORMAL',
|
||||
},
|
||||
{
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
timestamp: 50_000,
|
||||
killerTeamId: 100,
|
||||
monsterType: 'BARON_NASHOR',
|
||||
},
|
||||
{
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
timestamp: 55_000,
|
||||
killerTeamId: 100,
|
||||
monsterType: 'RIFTHERALD',
|
||||
},
|
||||
],
|
||||
participantFrames: {
|
||||
'1': { participantId: 1, totalGold: 1_150, xp: 550 },
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
|
||||
const fragment = builder.buildFragment({
|
||||
match,
|
||||
rawByRiotMatchId: new Map([['KR_1', raw as RiotMatchDto]]),
|
||||
timelineByRiotMatchId: new Map([
|
||||
['KR_1', timeline as RiotMatchTimelineDto],
|
||||
]),
|
||||
});
|
||||
|
||||
expect(fragment.gameDetails[0]).toMatchObject({
|
||||
gameVersion: '16.11.1.1234',
|
||||
objectiveEvents: [
|
||||
{
|
||||
timestamp: 20,
|
||||
side: 'blue',
|
||||
type: 'dragon',
|
||||
monsterSubType: 'FIRE_DRAGON',
|
||||
},
|
||||
{
|
||||
timestamp: 30,
|
||||
side: 'blue',
|
||||
type: 'elderDragon',
|
||||
monsterSubType: 'ELDER_DRAGON',
|
||||
},
|
||||
{ timestamp: 40, side: 'blue', type: 'voidGrub' },
|
||||
{ timestamp: 50, side: 'blue', type: 'baron' },
|
||||
{ timestamp: 55, side: 'blue', type: 'riftHerald' },
|
||||
],
|
||||
timeline: [
|
||||
{
|
||||
timestamp: 0,
|
||||
blue: { gold: 500, xp: 0 },
|
||||
red: { gold: 0, xp: 0 },
|
||||
goldDiff: 500,
|
||||
xpDiff: 0,
|
||||
},
|
||||
{
|
||||
timestamp: 60,
|
||||
blue: { gold: 1_150, xp: 550 },
|
||||
red: { gold: 0, xp: 0 },
|
||||
goldDiff: 1_150,
|
||||
xpDiff: 550,
|
||||
},
|
||||
],
|
||||
});
|
||||
expect(fragment.gameDetails[0].teams[0].bans).toEqual([
|
||||
{ championId: 14, pickTurn: 1 },
|
||||
{ championId: 43, pickTurn: 2 },
|
||||
]);
|
||||
expect(fragment.gameDetails[0].teams[0].objectives).toMatchObject({
|
||||
baron: 1,
|
||||
dragon: 1,
|
||||
elderDragon: 1,
|
||||
inhibitor: 0,
|
||||
riftHerald: 1,
|
||||
tower: 7,
|
||||
voidGrub: 1,
|
||||
});
|
||||
expect(fragment.records[0]).toMatchObject({
|
||||
championLevel: 15,
|
||||
cs: 228,
|
||||
damageDealtToChampions: 18_765,
|
||||
damageTaken: 24_321,
|
||||
firstBloodKill: true,
|
||||
firstBloodAssist: false,
|
||||
controlWardsBought: 2,
|
||||
wardsKilled: 3,
|
||||
wardsPlaced: 11,
|
||||
perks: {
|
||||
primaryStyle: 8000,
|
||||
subStyle: 8400,
|
||||
keystone: 8010,
|
||||
selectedPerkIds: [8010, 9111, 9105, 8299, 8444, 8451],
|
||||
styles: [
|
||||
{ styleId: 8000, perkIds: [8010, 9111, 9105, 8299] },
|
||||
{ styleId: 8400, perkIds: [8444, 8451] },
|
||||
],
|
||||
statPerks: { defense: 5001, flex: 5008, offense: 5005 },
|
||||
},
|
||||
itemBuild: [
|
||||
{ timestamp: 10, itemId: 1054, type: 'purchased' },
|
||||
{ timestamp: 12, itemId: 2003, type: 'destroyed' },
|
||||
{
|
||||
timestamp: 13,
|
||||
itemId: 3071,
|
||||
type: 'undo',
|
||||
beforeId: 1054,
|
||||
afterId: 3071,
|
||||
},
|
||||
],
|
||||
skillBuild: [
|
||||
{ timestamp: 11, skillSlot: 1, level: 1, levelUpType: 'NORMAL' },
|
||||
{ timestamp: 45, skillSlot: 3, level: 2, levelUpType: 'NORMAL' },
|
||||
],
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -3,9 +3,18 @@ import mongoose from 'mongoose';
|
||||
import type {
|
||||
MatchDocument,
|
||||
MatchGameResultParticipant,
|
||||
MatchStatsItemBuildEvent,
|
||||
MatchStatsObjectiveEvent,
|
||||
MatchStatsObjectiveSummary,
|
||||
MatchStatsSkillBuildEvent,
|
||||
MatchStatsTimelinePoint,
|
||||
TeamSide,
|
||||
} from '../global/database/schema';
|
||||
import type { RiotMatchDto, RiotMatchParticipantDto } from '../riot/riot.types';
|
||||
import type {
|
||||
RiotMatchDto,
|
||||
RiotMatchParticipantDto,
|
||||
RiotMatchTimelineDto,
|
||||
} from '../riot/riot.types';
|
||||
import type { InternalMatchCardView } from './community-stats.types';
|
||||
import type {
|
||||
InternalGameDetail,
|
||||
@@ -13,11 +22,18 @@ import type {
|
||||
MatchStatsFragment,
|
||||
} from './match-stats.types';
|
||||
|
||||
interface ParticipantBuildEvents {
|
||||
items: MatchStatsItemBuildEvent[];
|
||||
skills: MatchStatsSkillBuildEvent[];
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class MatchStatsFragmentBuilder {
|
||||
public buildFragment(params: {
|
||||
match: MatchDocument;
|
||||
rawByRiotMatchId: Map<string, RiotMatchDto>;
|
||||
timelineByRiotMatchId?: Map<string, RiotMatchTimelineDto>;
|
||||
timelineLoadAttempted?: boolean;
|
||||
}): MatchStatsFragment {
|
||||
const games = [...(params.match.result?.games ?? [])].sort(
|
||||
(left, right) => left.gameNumber - right.gameNumber,
|
||||
@@ -25,8 +41,15 @@ export class MatchStatsFragmentBuilder {
|
||||
const matchCard = this.toMatchCard(params.match, games);
|
||||
const gameDetails = games.map((game) => {
|
||||
const raw = params.rawByRiotMatchId.get(game.riotMatchId);
|
||||
const timeline = params.timelineByRiotMatchId?.get(game.riotMatchId);
|
||||
return raw
|
||||
? this.toGameDetail(params.match, game, raw)
|
||||
? this.toGameDetail(
|
||||
params.match,
|
||||
game,
|
||||
raw,
|
||||
timeline,
|
||||
params.timelineLoadAttempted === true,
|
||||
)
|
||||
: this.toFallbackGameDetail(params.match, game);
|
||||
});
|
||||
const records = gameDetails.flatMap((detail) =>
|
||||
@@ -106,6 +129,8 @@ export class MatchStatsFragmentBuilder {
|
||||
match: MatchDocument,
|
||||
game: NonNullable<MatchDocument['result']>['games'][number],
|
||||
raw: RiotMatchDto,
|
||||
timeline?: RiotMatchTimelineDto,
|
||||
timelineLoadAttempted = false,
|
||||
): InternalGameDetail {
|
||||
const puuidByUserId = new Map(
|
||||
match.participants
|
||||
@@ -129,13 +154,29 @@ export class MatchStatsFragmentBuilder {
|
||||
rawTeamIdBySide.set(participant.side, rawParticipant.teamId);
|
||||
}
|
||||
}
|
||||
const sideByParticipantId = this.toSideByParticipantId(
|
||||
raw,
|
||||
rawTeamIdBySide,
|
||||
);
|
||||
const objectiveEvents = this.toObjectiveEvents(
|
||||
timeline,
|
||||
rawTeamIdBySide,
|
||||
sideByParticipantId,
|
||||
);
|
||||
const timelineObjectives = this.toTimelineObjectives(objectiveEvents);
|
||||
const buildEventsByParticipantId =
|
||||
this.toBuildEventsByParticipantId(timeline);
|
||||
|
||||
return {
|
||||
gameNumber: game.gameNumber,
|
||||
riotMatchId: game.riotMatchId,
|
||||
gameCreation: game.gameCreation,
|
||||
gameDuration: game.gameDuration,
|
||||
gameVersion: raw.info.gameVersion,
|
||||
winnerSide: game.winnerSide,
|
||||
timeline: this.toTimeline(raw, rawTeamIdBySide, timeline),
|
||||
timelineLoaded: timelineLoadAttempted || Boolean(timeline),
|
||||
objectiveEvents,
|
||||
teams: (['blue', 'red'] as TeamSide[]).map((side) => {
|
||||
const teamIndex =
|
||||
side === 'blue' ? game.blueTeamIndex : game.redTeamIndex;
|
||||
@@ -158,25 +199,35 @@ export class MatchStatsFragmentBuilder {
|
||||
teamIndex,
|
||||
side,
|
||||
win: game.winnerSide === side,
|
||||
objectives: {
|
||||
baron: rawTeam?.objectives?.baron?.kills ?? 0,
|
||||
dragon: rawTeam?.objectives?.dragon?.kills ?? 0,
|
||||
tower: rawTeam?.objectives?.tower?.kills ?? 0,
|
||||
},
|
||||
objectives: this.toObjectiveSummary(
|
||||
rawTeam,
|
||||
timelineObjectives.get(side),
|
||||
Boolean(timeline),
|
||||
),
|
||||
bans: (rawTeam?.bans ?? []).map((ban) => ({
|
||||
championId: ban.championId,
|
||||
pickTurn: ban.pickTurn,
|
||||
})),
|
||||
participants: game.participants
|
||||
.filter((participant) => participant.side === side)
|
||||
.map((participant) =>
|
||||
this.toRecord({
|
||||
.map((participant) => {
|
||||
const rawParticipant = rawByPuuid.get(
|
||||
puuidByUserId.get(participant.userId.toString()) ?? '',
|
||||
);
|
||||
return this.toRecord({
|
||||
match,
|
||||
game,
|
||||
participant,
|
||||
rawParticipant: rawByPuuid.get(
|
||||
puuidByUserId.get(participant.userId.toString()) ?? '',
|
||||
),
|
||||
rawParticipant,
|
||||
buildEvents: rawParticipant
|
||||
? buildEventsByParticipantId.get(
|
||||
rawParticipant.participantId,
|
||||
)
|
||||
: undefined,
|
||||
teamKills,
|
||||
teamDamage,
|
||||
}),
|
||||
),
|
||||
});
|
||||
}),
|
||||
};
|
||||
}),
|
||||
};
|
||||
@@ -192,11 +243,15 @@ export class MatchStatsFragmentBuilder {
|
||||
gameCreation: game.gameCreation,
|
||||
gameDuration: game.gameDuration,
|
||||
winnerSide: game.winnerSide,
|
||||
timeline: [],
|
||||
timelineLoaded: false,
|
||||
objectiveEvents: [],
|
||||
teams: (['blue', 'red'] as TeamSide[]).map((side) => ({
|
||||
teamIndex: side === 'blue' ? game.blueTeamIndex : game.redTeamIndex,
|
||||
side,
|
||||
win: game.winnerSide === side,
|
||||
objectives: { baron: 0, dragon: 0, tower: 0 },
|
||||
objectives: emptyObjectives(),
|
||||
bans: [],
|
||||
participants: game.participants
|
||||
.filter((participant) => participant.side === side)
|
||||
.map((participant) =>
|
||||
@@ -217,11 +272,19 @@ export class MatchStatsFragmentBuilder {
|
||||
game: NonNullable<MatchDocument['result']>['games'][number];
|
||||
participant: MatchGameResultParticipant;
|
||||
rawParticipant?: RiotMatchParticipantDto;
|
||||
buildEvents?: ParticipantBuildEvents;
|
||||
teamKills: number;
|
||||
teamDamage: number;
|
||||
}): InternalRecord {
|
||||
const { match, game, participant, rawParticipant, teamKills, teamDamage } =
|
||||
params;
|
||||
const {
|
||||
match,
|
||||
game,
|
||||
participant,
|
||||
rawParticipant,
|
||||
buildEvents,
|
||||
teamKills,
|
||||
teamDamage,
|
||||
} = params;
|
||||
const snapshot = match.participants.find((item) =>
|
||||
item.userId.equals(participant.userId),
|
||||
);
|
||||
@@ -262,6 +325,7 @@ export class MatchStatsFragmentBuilder {
|
||||
rawParticipant?.riotIdGameName ??
|
||||
rawParticipant?.summonerName ??
|
||||
'Unknown',
|
||||
tagLine: snapshot?.tagLine ?? rawParticipant?.riotIdTagLine ?? '',
|
||||
profileIconId: snapshot?.profileIconId ?? 0,
|
||||
teamIndex: participant.teamIndex,
|
||||
side: participant.side,
|
||||
@@ -290,6 +354,8 @@ export class MatchStatsFragmentBuilder {
|
||||
),
|
||||
wardsPlaced: rawParticipant?.wardsPlaced ?? 0,
|
||||
wardsKilled: rawParticipant?.wardsKilled ?? 0,
|
||||
firstBloodKill: booleanField(rawParticipant, 'firstBloodKill'),
|
||||
firstBloodAssist: booleanField(rawParticipant, 'firstBloodAssist'),
|
||||
items: [
|
||||
rawParticipant?.item0 ?? 0,
|
||||
rawParticipant?.item1 ?? 0,
|
||||
@@ -304,6 +370,8 @@ export class MatchStatsFragmentBuilder {
|
||||
rawParticipant?.summoner2Id ?? 0,
|
||||
],
|
||||
perks: rawParticipant ? this.resolvePerks(rawParticipant) : {},
|
||||
itemBuild: buildEvents?.items ?? [],
|
||||
skillBuild: buildEvents?.skills ?? [],
|
||||
rating,
|
||||
};
|
||||
}
|
||||
@@ -319,6 +387,250 @@ export class MatchStatsFragmentBuilder {
|
||||
primaryStyle: primary?.style,
|
||||
subStyle: sub?.style,
|
||||
keystone: primary?.selections[0]?.perk,
|
||||
selectedPerkIds: participant.perks.styles.flatMap((style) =>
|
||||
style.selections.map((selection) => selection.perk),
|
||||
),
|
||||
styles: participant.perks.styles.map((style) => ({
|
||||
styleId: style.style,
|
||||
perkIds: style.selections.map((selection) => selection.perk),
|
||||
})),
|
||||
statPerks: {
|
||||
offense: participant.perks.statPerks.offense,
|
||||
flex: participant.perks.statPerks.flex,
|
||||
defense: participant.perks.statPerks.defense,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
private toBuildEventsByParticipantId(
|
||||
timeline?: RiotMatchTimelineDto,
|
||||
): Map<number, ParticipantBuildEvents> {
|
||||
const buildEventsByParticipantId = new Map<number, ParticipantBuildEvents>();
|
||||
if (!timeline?.info.frames.length) return buildEventsByParticipantId;
|
||||
|
||||
const getEvents = (participantId: number): ParticipantBuildEvents => {
|
||||
const current = buildEventsByParticipantId.get(participantId);
|
||||
if (current) return current;
|
||||
const created: ParticipantBuildEvents = { items: [], skills: [] };
|
||||
buildEventsByParticipantId.set(participantId, created);
|
||||
return created;
|
||||
};
|
||||
|
||||
for (const frame of timeline.info.frames) {
|
||||
for (const event of frame.events ?? []) {
|
||||
const participantId = event.participantId;
|
||||
if (!participantId) continue;
|
||||
const timestamp = Math.max(0, Math.round(event.timestamp / 1000));
|
||||
|
||||
if (event.type === 'SKILL_LEVEL_UP' && isSkillSlot(event.skillSlot)) {
|
||||
const skills = getEvents(participantId).skills;
|
||||
skills.push({
|
||||
timestamp,
|
||||
skillSlot: event.skillSlot,
|
||||
level: skills.length + 1,
|
||||
levelUpType: event.levelUpType,
|
||||
});
|
||||
continue;
|
||||
}
|
||||
|
||||
const itemType = toItemBuildType(event.type);
|
||||
if (!itemType) continue;
|
||||
const itemId = event.itemId ?? event.afterId ?? event.beforeId ?? 0;
|
||||
if (itemId <= 0) continue;
|
||||
getEvents(participantId).items.push({
|
||||
timestamp,
|
||||
itemId,
|
||||
type: itemType,
|
||||
beforeId: event.beforeId,
|
||||
afterId: event.afterId,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
||||
for (const events of buildEventsByParticipantId.values()) {
|
||||
events.items.sort((left, right) => left.timestamp - right.timestamp);
|
||||
events.skills.sort((left, right) => left.timestamp - right.timestamp);
|
||||
}
|
||||
|
||||
return buildEventsByParticipantId;
|
||||
}
|
||||
|
||||
private toTimeline(
|
||||
raw: RiotMatchDto,
|
||||
rawTeamIdBySide: Map<TeamSide, number>,
|
||||
timeline?: RiotMatchTimelineDto,
|
||||
): MatchStatsTimelinePoint[] {
|
||||
if (!timeline?.info.frames.length) return [];
|
||||
|
||||
const sideByParticipantId = this.toSideByParticipantId(
|
||||
raw,
|
||||
rawTeamIdBySide,
|
||||
);
|
||||
|
||||
const points = timeline.info.frames.map((frame) => {
|
||||
const point: MatchStatsTimelinePoint = {
|
||||
timestamp: Math.max(0, Math.round(frame.timestamp / 1000)),
|
||||
blue: { gold: 0, xp: 0 },
|
||||
red: { gold: 0, xp: 0 },
|
||||
goldDiff: 0,
|
||||
xpDiff: 0,
|
||||
};
|
||||
|
||||
for (const participantFrame of Object.values(frame.participantFrames)) {
|
||||
const side = sideByParticipantId.get(participantFrame.participantId);
|
||||
if (!side) continue;
|
||||
point[side].gold += participantFrame.totalGold;
|
||||
point[side].xp += participantFrame.xp;
|
||||
}
|
||||
point.goldDiff = point.blue.gold - point.red.gold;
|
||||
point.xpDiff = point.blue.xp - point.red.xp;
|
||||
return point;
|
||||
});
|
||||
|
||||
return points.filter(
|
||||
(point, index) =>
|
||||
index === 0 || point.timestamp !== points[index - 1].timestamp,
|
||||
);
|
||||
}
|
||||
|
||||
private toSideByParticipantId(
|
||||
raw: RiotMatchDto,
|
||||
rawTeamIdBySide: Map<TeamSide, number>,
|
||||
): Map<number, TeamSide> {
|
||||
const blueTeamId = rawTeamIdBySide.get('blue') ?? 100;
|
||||
const redTeamId = rawTeamIdBySide.get('red') ?? 200;
|
||||
const sideByParticipantId = new Map<number, TeamSide>();
|
||||
for (const participant of raw.info.participants) {
|
||||
if (participant.teamId === blueTeamId) {
|
||||
sideByParticipantId.set(participant.participantId, 'blue');
|
||||
}
|
||||
if (participant.teamId === redTeamId) {
|
||||
sideByParticipantId.set(participant.participantId, 'red');
|
||||
}
|
||||
}
|
||||
return sideByParticipantId;
|
||||
}
|
||||
|
||||
private toObjectiveEvents(
|
||||
timeline: RiotMatchTimelineDto | undefined,
|
||||
rawTeamIdBySide: Map<TeamSide, number>,
|
||||
sideByParticipantId: Map<number, TeamSide>,
|
||||
): MatchStatsObjectiveEvent[] {
|
||||
if (!timeline?.info.frames.length) return [];
|
||||
|
||||
const sideByTeamId = new Map<number, TeamSide>();
|
||||
for (const [side, teamId] of rawTeamIdBySide.entries()) {
|
||||
sideByTeamId.set(teamId, side);
|
||||
}
|
||||
|
||||
const objectiveEvents: MatchStatsObjectiveEvent[] = [];
|
||||
for (const frame of timeline.info.frames) {
|
||||
for (const event of frame.events ?? []) {
|
||||
if (event.type !== 'ELITE_MONSTER_KILL') continue;
|
||||
const side =
|
||||
(typeof event.killerTeamId === 'number'
|
||||
? sideByTeamId.get(event.killerTeamId)
|
||||
: undefined) ??
|
||||
(typeof event.killerId === 'number'
|
||||
? sideByParticipantId.get(event.killerId)
|
||||
: undefined);
|
||||
if (!side) continue;
|
||||
const timestamp = Math.max(0, Math.round(event.timestamp / 1000));
|
||||
switch (event.monsterType) {
|
||||
case 'BARON_NASHOR':
|
||||
objectiveEvents.push({ timestamp, side, type: 'baron' });
|
||||
break;
|
||||
case 'RIFTHERALD':
|
||||
objectiveEvents.push({ timestamp, side, type: 'riftHerald' });
|
||||
break;
|
||||
case 'HORDE':
|
||||
objectiveEvents.push({ timestamp, side, type: 'voidGrub' });
|
||||
break;
|
||||
case 'DRAGON':
|
||||
if (event.monsterSubType === 'ELDER_DRAGON') {
|
||||
objectiveEvents.push({
|
||||
timestamp,
|
||||
side,
|
||||
type: 'elderDragon',
|
||||
monsterSubType: event.monsterSubType,
|
||||
});
|
||||
} else {
|
||||
objectiveEvents.push({
|
||||
timestamp,
|
||||
side,
|
||||
type: 'dragon',
|
||||
monsterSubType: event.monsterSubType,
|
||||
});
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return objectiveEvents.sort((left, right) => left.timestamp - right.timestamp);
|
||||
}
|
||||
|
||||
private toTimelineObjectives(
|
||||
objectiveEvents: MatchStatsObjectiveEvent[],
|
||||
): Map<TeamSide, MatchStatsObjectiveSummary> {
|
||||
const objectives = new Map<TeamSide, MatchStatsObjectiveSummary>([
|
||||
['blue', emptyObjectives()],
|
||||
['red', emptyObjectives()],
|
||||
]);
|
||||
|
||||
for (const event of objectiveEvents) {
|
||||
const current = objectives.get(event.side) ?? emptyObjectives();
|
||||
switch (event.type) {
|
||||
case 'baron':
|
||||
current.baron += 1;
|
||||
break;
|
||||
case 'riftHerald':
|
||||
current.riftHerald += 1;
|
||||
break;
|
||||
case 'voidGrub':
|
||||
current.voidGrub += 1;
|
||||
break;
|
||||
case 'dragon':
|
||||
current.dragon += 1;
|
||||
break;
|
||||
case 'elderDragon':
|
||||
current.elderDragon += 1;
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
objectives.set(event.side, current);
|
||||
}
|
||||
|
||||
return objectives;
|
||||
}
|
||||
|
||||
private toObjectiveSummary(
|
||||
rawTeam:
|
||||
| RiotMatchDto['info']['teams'][number]
|
||||
| undefined,
|
||||
timelineObjectives: MatchStatsObjectiveSummary | undefined,
|
||||
hasTimeline: boolean,
|
||||
): MatchStatsObjectiveSummary {
|
||||
const rawObjectives = rawTeam?.objectives;
|
||||
return {
|
||||
tower: rawObjectives?.tower?.kills ?? 0,
|
||||
dragon: hasTimeline
|
||||
? (timelineObjectives?.dragon ?? 0)
|
||||
: (rawObjectives?.dragon?.kills ?? 0),
|
||||
inhibitor: rawObjectives?.inhibitor?.kills ?? 0,
|
||||
baron: hasTimeline
|
||||
? (timelineObjectives?.baron ?? 0)
|
||||
: (rawObjectives?.baron?.kills ?? 0),
|
||||
riftHerald: hasTimeline
|
||||
? (timelineObjectives?.riftHerald ?? 0)
|
||||
: (rawObjectives?.riftHerald?.kills ?? 0),
|
||||
voidGrub: hasTimeline
|
||||
? (timelineObjectives?.voidGrub ?? 0)
|
||||
: (rawObjectives?.horde?.kills ?? 0),
|
||||
elderDragon: timelineObjectives?.elderDragon ?? 0,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -354,6 +666,27 @@ function average(value: number, total: number): number {
|
||||
return total > 0 ? round(value / total) : 0;
|
||||
}
|
||||
|
||||
function isSkillSlot(value: number | undefined): value is 1 | 2 | 3 | 4 {
|
||||
return value === 1 || value === 2 || value === 3 || value === 4;
|
||||
}
|
||||
|
||||
function toItemBuildType(
|
||||
value: string,
|
||||
): MatchStatsItemBuildEvent['type'] | null {
|
||||
switch (value) {
|
||||
case 'ITEM_PURCHASED':
|
||||
return 'purchased';
|
||||
case 'ITEM_SOLD':
|
||||
return 'sold';
|
||||
case 'ITEM_DESTROYED':
|
||||
return 'destroyed';
|
||||
case 'ITEM_UNDO':
|
||||
return 'undo';
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
function round(value: number): number {
|
||||
return Math.round(value * 10) / 10;
|
||||
}
|
||||
@@ -365,3 +698,22 @@ function numberField(
|
||||
const value = participant?.[key];
|
||||
return typeof value === 'number' && Number.isFinite(value) ? value : 0;
|
||||
}
|
||||
|
||||
function booleanField(
|
||||
participant: RiotMatchParticipantDto | undefined,
|
||||
key: string,
|
||||
): boolean {
|
||||
return participant?.[key] === true;
|
||||
}
|
||||
|
||||
function emptyObjectives(): MatchStatsObjectiveSummary {
|
||||
return {
|
||||
tower: 0,
|
||||
dragon: 0,
|
||||
inhibitor: 0,
|
||||
baron: 0,
|
||||
riftHerald: 0,
|
||||
voidGrub: 0,
|
||||
elderDragon: 0,
|
||||
};
|
||||
}
|
||||
@@ -29,6 +29,7 @@ describe('MatchStatsService', () => {
|
||||
connectionService,
|
||||
repository,
|
||||
{} as MatchStatsFragmentBuilder,
|
||||
{ getMatchTimeline: jest.fn() } as never,
|
||||
);
|
||||
|
||||
await service.buildAndUpsert(matchId);
|
||||
@@ -53,7 +54,20 @@ describe('MatchStatsService', () => {
|
||||
});
|
||||
const riotFind = jest.fn().mockReturnValue({
|
||||
lean: () => ({
|
||||
exec: jest.fn().mockResolvedValue([{ matchId: 'KR_1', raw: {} }]),
|
||||
exec: jest.fn().mockResolvedValue([
|
||||
{
|
||||
matchId: 'KR_1',
|
||||
raw: {},
|
||||
timeline: {
|
||||
metadata: {
|
||||
dataVersion: '2',
|
||||
matchId: 'KR_1',
|
||||
participants: [],
|
||||
},
|
||||
info: { frameInterval: 60_000, frames: [] },
|
||||
},
|
||||
},
|
||||
]),
|
||||
}),
|
||||
});
|
||||
const connectionService = {
|
||||
@@ -82,6 +96,7 @@ describe('MatchStatsService', () => {
|
||||
connectionService,
|
||||
repository,
|
||||
builder,
|
||||
{ getMatchTimeline: jest.fn() } as never,
|
||||
);
|
||||
|
||||
await service.buildAndUpsert(matchId);
|
||||
@@ -89,6 +104,8 @@ describe('MatchStatsService', () => {
|
||||
expect(builder.buildFragment).toHaveBeenCalledWith({
|
||||
match,
|
||||
rawByRiotMatchId: expect.any(Map),
|
||||
timelineByRiotMatchId: expect.any(Map),
|
||||
timelineLoadAttempted: false,
|
||||
});
|
||||
expect(repository.upsert).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
@@ -97,7 +114,7 @@ describe('MatchStatsService', () => {
|
||||
scheduledAt,
|
||||
gameCreationMin: 1_000,
|
||||
gameCreationMax: 2_000,
|
||||
builderVersion: 1,
|
||||
builderVersion: 9,
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
@@ -1,21 +1,33 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import type { MatchDocument } from '../global/database/schema';
|
||||
import type { RiotMatchDto } from '../riot/riot.types';
|
||||
import { RiotMatchService } from '../riot/riot-match.service';
|
||||
import {
|
||||
RIOT_REGIONAL_ROUTES,
|
||||
type RiotMatchDto,
|
||||
type RiotMatchTimelineDto,
|
||||
type RiotRegionalRoute,
|
||||
} from '../riot/riot.types';
|
||||
import { MatchStatsFragmentBuilder } from './match-stats-fragment.builder';
|
||||
import { MatchStatsRepository } from './match-stats.repository';
|
||||
import { MATCH_STATS_BUILDER_VERSION } from './match-stats.types';
|
||||
|
||||
@Injectable()
|
||||
export class MatchStatsService {
|
||||
private readonly logger = new Logger(MatchStatsService.name);
|
||||
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly repository: MatchStatsRepository,
|
||||
private readonly builder: MatchStatsFragmentBuilder,
|
||||
private readonly riotMatchService: RiotMatchService,
|
||||
) {}
|
||||
|
||||
public async buildAndUpsert(matchId: mongoose.Types.ObjectId): Promise<void> {
|
||||
public async buildAndUpsert(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
options: { includeTimeline?: boolean } = {},
|
||||
): Promise<void> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const RiotMatchModel = await this.connectionService.getModel('riotMatch');
|
||||
const match = await MatchModel.findById(matchId).exec();
|
||||
@@ -41,7 +53,51 @@ export class MatchStatsService {
|
||||
const rawByRiotMatchId = new Map(
|
||||
riotDocs.map((doc) => [doc.matchId, doc.raw as unknown as RiotMatchDto]),
|
||||
);
|
||||
const fragment = this.builder.buildFragment({ match, rawByRiotMatchId });
|
||||
const timelineByRiotMatchId = new Map<string, RiotMatchTimelineDto>();
|
||||
for (const doc of riotDocs) {
|
||||
if (isRiotMatchTimelineDto(doc.timeline)) {
|
||||
timelineByRiotMatchId.set(doc.matchId, doc.timeline);
|
||||
}
|
||||
}
|
||||
if (
|
||||
options.includeTimeline &&
|
||||
riotDocs.length > 0 &&
|
||||
timelineByRiotMatchId.size < riotDocs.length
|
||||
) {
|
||||
const region = await this.resolveRiotRegion(match.communityId);
|
||||
for (const doc of riotDocs) {
|
||||
if (timelineByRiotMatchId.has(doc.matchId)) continue;
|
||||
try {
|
||||
const timeline = await this.riotMatchService.getMatchTimeline(
|
||||
doc.matchId,
|
||||
{ region },
|
||||
);
|
||||
await RiotMatchModel.updateOne(
|
||||
{ matchId: doc.matchId },
|
||||
{
|
||||
$set: {
|
||||
timeline: timeline as unknown as Record<string, unknown>,
|
||||
timelineFetchedAt: new Date(),
|
||||
},
|
||||
},
|
||||
).exec();
|
||||
timelineByRiotMatchId.set(doc.matchId, timeline);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Failed to fetch match timeline for ${doc.matchId}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const fragment = this.builder.buildFragment({
|
||||
match,
|
||||
rawByRiotMatchId,
|
||||
timelineByRiotMatchId,
|
||||
timelineLoadAttempted: options.includeTimeline === true,
|
||||
});
|
||||
|
||||
await this.repository.upsert({
|
||||
matchId: match._id,
|
||||
@@ -101,4 +157,29 @@ export class MatchStatsService {
|
||||
Boolean(match.result?.games?.length)
|
||||
);
|
||||
}
|
||||
|
||||
private async resolveRiotRegion(
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): Promise<RiotRegionalRoute> {
|
||||
const CommunityModel = await this.connectionService.getModel('community');
|
||||
const community = await CommunityModel.findById(communityId)
|
||||
.select({ riotRegion: 1 })
|
||||
.lean()
|
||||
.exec();
|
||||
const region = community?.riotRegion;
|
||||
return RIOT_REGIONAL_ROUTES.includes(region as RiotRegionalRoute)
|
||||
? (region as RiotRegionalRoute)
|
||||
: 'asia';
|
||||
}
|
||||
}
|
||||
|
||||
function isRiotMatchTimelineDto(
|
||||
value: unknown,
|
||||
): value is RiotMatchTimelineDto {
|
||||
if (!isRecord(value) || !isRecord(value.info)) return false;
|
||||
return Array.isArray(value.info.frames);
|
||||
}
|
||||
|
||||
function isRecord(value: unknown): value is Record<string, unknown> {
|
||||
return typeof value === 'object' && value !== null;
|
||||
}
|
||||
@@ -4,7 +4,7 @@ import type {
|
||||
} from '../global/database/schema';
|
||||
import type { InternalMatchCardView } from './community-stats.types';
|
||||
|
||||
export const MATCH_STATS_BUILDER_VERSION = 1;
|
||||
export const MATCH_STATS_BUILDER_VERSION = 9;
|
||||
|
||||
export type InternalRecord = MatchStatsRecord;
|
||||
export type InternalGameDetail = MatchStatsGameDetail;
|
||||
|
||||
@@ -0,0 +1,123 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
|
||||
const DEFAULT_LEASE_MS = 5 * 60 * 1000;
|
||||
|
||||
export type DakaoInboxClaimResult =
|
||||
| { status: 'claimed' }
|
||||
| { status: 'duplicate' }
|
||||
| { status: 'inflight' };
|
||||
|
||||
@Injectable()
|
||||
export class DakaoInboxService {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async claim(params: {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
leaseMs?: number;
|
||||
}): Promise<DakaoInboxClaimResult> {
|
||||
const Model = await this.connectionService.getModel('dakaoInboundMessage');
|
||||
const now = new Date();
|
||||
const processingExpiresAt = new Date(
|
||||
now.getTime() + (params.leaseMs ?? DEFAULT_LEASE_MS),
|
||||
);
|
||||
|
||||
try {
|
||||
await Model.create({
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
state: 'processing',
|
||||
attempts: 1,
|
||||
processingExpiresAt,
|
||||
});
|
||||
return { status: 'claimed' };
|
||||
} catch (err) {
|
||||
if ((err as { code?: number })?.code !== 11000) throw err;
|
||||
}
|
||||
|
||||
const existing = await Model.findOne({
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
})
|
||||
.lean()
|
||||
.exec();
|
||||
if (!existing) return { status: 'inflight' };
|
||||
if (existing.state === 'processed') return { status: 'duplicate' };
|
||||
if (
|
||||
existing.state === 'processing' &&
|
||||
existing.processingExpiresAt &&
|
||||
existing.processingExpiresAt > now
|
||||
) {
|
||||
return { status: 'inflight' };
|
||||
}
|
||||
|
||||
const updated = await Model.updateOne(
|
||||
{
|
||||
_id: existing._id,
|
||||
$or: [
|
||||
{ state: 'failed' },
|
||||
{ state: 'processing', processingExpiresAt: { $lte: now } },
|
||||
],
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'processing',
|
||||
processingExpiresAt,
|
||||
},
|
||||
$inc: { attempts: 1 },
|
||||
},
|
||||
).exec();
|
||||
return updated.modifiedCount > 0
|
||||
? { status: 'claimed' }
|
||||
: { status: 'inflight' };
|
||||
}
|
||||
|
||||
public async markProcessed(params: {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
}): Promise<void> {
|
||||
const Model = await this.connectionService.getModel('dakaoInboundMessage');
|
||||
await Model.updateOne(
|
||||
{
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'processed',
|
||||
processedAt: new Date(),
|
||||
},
|
||||
$unset: { processingExpiresAt: '', lastError: '' },
|
||||
},
|
||||
).exec();
|
||||
}
|
||||
|
||||
public async markFailed(params: {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
error: unknown;
|
||||
}): Promise<void> {
|
||||
const Model = await this.connectionService.getModel('dakaoInboundMessage');
|
||||
await Model.updateOne(
|
||||
{
|
||||
consumer: params.consumer,
|
||||
projectId: params.projectId,
|
||||
chatLogLogId: params.chatLogLogId,
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'failed',
|
||||
lastError: (params.error as Error)?.message ?? String(params.error),
|
||||
},
|
||||
$unset: { processingExpiresAt: '' },
|
||||
},
|
||||
).exec();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,64 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoJetStreamResourceService {
|
||||
private ensurePromise: Promise<void> | null = null;
|
||||
|
||||
constructor(private readonly natsService: NatsService) {}
|
||||
|
||||
public async ensure(): Promise<void> {
|
||||
this.ensurePromise ??= this.ensureInternal();
|
||||
await this.ensurePromise;
|
||||
}
|
||||
|
||||
private async ensureInternal(): Promise<void> {
|
||||
const names = resolveDakaoNatsNames();
|
||||
await this.natsService.ensureJetStreamStream({
|
||||
name: names.streams.botCommand,
|
||||
subjects: [names.subjects.botCommandSubmitted],
|
||||
retention: 'workqueue',
|
||||
replicas: 1,
|
||||
});
|
||||
await this.natsService.ensureJetStreamConsumer({
|
||||
stream: names.streams.botCommand,
|
||||
durable: names.consumers.botCommand,
|
||||
filterSubject: names.subjects.botCommandSubmitted,
|
||||
description: 'LolyMpus Dakao bot command handler',
|
||||
replicas: 1,
|
||||
});
|
||||
|
||||
await this.natsService.ensureJetStreamStream({
|
||||
name: names.streams.sendRequest,
|
||||
subjects: [names.subjects.chatSendMessage],
|
||||
retention: 'workqueue',
|
||||
replicas: 1,
|
||||
});
|
||||
await this.natsService.ensureJetStreamConsumer({
|
||||
stream: names.streams.sendRequest,
|
||||
durable: names.consumers.sendRequest,
|
||||
filterSubject: names.subjects.chatSendMessage,
|
||||
description: 'Dakao send-message worker',
|
||||
replicas: 1,
|
||||
});
|
||||
|
||||
await this.natsService.ensureJetStreamStream({
|
||||
name: names.streams.sendResult,
|
||||
subjects: [
|
||||
names.subjects.chatSendMessageSucceeded,
|
||||
names.subjects.chatSendMessageFailed,
|
||||
],
|
||||
retention: 'limits',
|
||||
maxAgeDays: 30,
|
||||
replicas: 1,
|
||||
});
|
||||
await this.natsService.ensureJetStreamConsumer({
|
||||
stream: names.streams.sendResult,
|
||||
durable: names.consumers.sendResult,
|
||||
filterSubject: `${names.env}.lolympus.dakao.chat.send-message.*.v1`,
|
||||
description: 'LolyMpus Dakao send-message result handler',
|
||||
replicas: 1,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import {
|
||||
Injectable,
|
||||
Logger,
|
||||
OnModuleDestroy,
|
||||
OnModuleInit,
|
||||
} from '@nestjs/common';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
|
||||
const SWEEP_INTERVAL_MS = 60 * 1000;
|
||||
const STALE_OUTBOX_MS = 5 * 60 * 1000;
|
||||
|
||||
@Injectable()
|
||||
export class DakaoOutboxSweeperService
|
||||
implements OnModuleInit, OnModuleDestroy
|
||||
{
|
||||
private readonly logger = new Logger(DakaoOutboxSweeperService.name);
|
||||
private timer: NodeJS.Timeout | undefined;
|
||||
|
||||
constructor(private readonly outboxService: DakaoOutboxService) {}
|
||||
|
||||
onModuleInit() {
|
||||
this.timer = setInterval(() => {
|
||||
void this.sweep();
|
||||
}, SWEEP_INTERVAL_MS);
|
||||
this.timer.unref();
|
||||
}
|
||||
|
||||
onModuleDestroy() {
|
||||
if (this.timer) clearInterval(this.timer);
|
||||
}
|
||||
|
||||
private async sweep(): Promise<void> {
|
||||
try {
|
||||
const swept = await this.outboxService.sweepStale({
|
||||
staleMs: STALE_OUTBOX_MS,
|
||||
limit: 20,
|
||||
});
|
||||
if (swept > 0) {
|
||||
this.logger.warn(`Re-published ${swept} stale Dakao outbox messages.`);
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.error(
|
||||
`Dakao outbox sweep failed: ${(err as Error)?.stack ?? err}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,116 @@
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
import { DakaoResultSubjects } from './dakao.types';
|
||||
|
||||
function execResult<T>(value: T) {
|
||||
return { exec: jest.fn().mockResolvedValue(value) };
|
||||
}
|
||||
|
||||
function makeService(outboxModel: Record<string, unknown>) {
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue(outboxModel),
|
||||
} as unknown as ConnectionService;
|
||||
const natsService = {
|
||||
publishJetStream: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as NatsService;
|
||||
|
||||
return {
|
||||
service: new DakaoOutboxService(connectionService, natsService),
|
||||
connectionService,
|
||||
natsService,
|
||||
};
|
||||
}
|
||||
|
||||
describe('DakaoOutboxService', () => {
|
||||
it('persists result subjects when enqueuing send-message commands', async () => {
|
||||
const outboxModel = {
|
||||
findOneAndUpdate: jest.fn().mockReturnValue(execResult({})),
|
||||
updateOne: jest.fn().mockReturnValue(execResult({})),
|
||||
};
|
||||
const { service, natsService } = makeService(outboxModel);
|
||||
const resultSubjects: DakaoResultSubjects = {
|
||||
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
};
|
||||
|
||||
await service.enqueueAndPublish({
|
||||
subject: 'staging.dakao.chat.send-message.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
envelope: {
|
||||
schema: 'dakao.command.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
type: 'chat.send-message',
|
||||
eventSource: 'lolympus',
|
||||
correlationId: 'chat-log-1',
|
||||
resultSubjects,
|
||||
payload: {
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [{ kind: 'text', text: 'done' }],
|
||||
},
|
||||
},
|
||||
});
|
||||
|
||||
expect(outboxModel.findOneAndUpdate).toHaveBeenCalledWith(
|
||||
{ eventId: 'lolympus:chat.send-message:chat-log-1' },
|
||||
expect.objectContaining({
|
||||
$setOnInsert: expect.objectContaining({ resultSubjects }),
|
||||
}),
|
||||
expect.any(Object),
|
||||
);
|
||||
expect(natsService.publishJetStream).toHaveBeenCalledWith(
|
||||
'staging.dakao.chat.send-message.v1',
|
||||
expect.objectContaining({ resultSubjects }),
|
||||
{ messageId: 'lolympus:chat.send-message:chat-log-1' },
|
||||
);
|
||||
});
|
||||
|
||||
it('restores send-message result subjects when sweeping legacy stale rows', async () => {
|
||||
const previousNodeEnv = process.env.NODE_ENV;
|
||||
process.env.NODE_ENV = 'staging';
|
||||
|
||||
try {
|
||||
const exec = jest.fn().mockResolvedValue([
|
||||
{
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
type: 'chat.send-message',
|
||||
eventSource: 'lolympus',
|
||||
subject: 'staging.dakao.chat.send-message.v1',
|
||||
correlationId: 'chat-log-1',
|
||||
payload: {
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [{ kind: 'text', text: 'done' }],
|
||||
},
|
||||
},
|
||||
]);
|
||||
const lean = jest.fn().mockReturnValue({ exec });
|
||||
const limit = jest.fn().mockReturnValue({ lean });
|
||||
const sort = jest.fn().mockReturnValue({ limit });
|
||||
const outboxModel = {
|
||||
find: jest.fn().mockReturnValue({ sort }),
|
||||
};
|
||||
const { service } = makeService(outboxModel);
|
||||
const enqueue = jest
|
||||
.spyOn(service, 'enqueueAndPublish')
|
||||
.mockResolvedValue(undefined);
|
||||
|
||||
await expect(service.sweepStale({ staleMs: 1, limit: 1 })).resolves.toBe(
|
||||
1,
|
||||
);
|
||||
|
||||
expect(enqueue).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
envelope: expect.objectContaining({
|
||||
resultSubjects: {
|
||||
succeeded:
|
||||
'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
}),
|
||||
}),
|
||||
);
|
||||
} finally {
|
||||
process.env.NODE_ENV = previousNodeEnv;
|
||||
}
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,191 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import {
|
||||
DakaoCommandEnvelope,
|
||||
DakaoResultEnvelope,
|
||||
DakaoResultSubjects,
|
||||
} from './dakao.types';
|
||||
|
||||
const CHAT_SEND_MESSAGE_TYPE = 'chat.send-message';
|
||||
const TERMINAL_STATES = ['sent', 'failed'] as const;
|
||||
|
||||
@Injectable()
|
||||
export class DakaoOutboxService {
|
||||
private readonly logger = new Logger(DakaoOutboxService.name);
|
||||
private readonly chatSendMessageResultSubjects = {
|
||||
succeeded: resolveDakaoNatsNames().subjects.chatSendMessageSucceeded,
|
||||
failed: resolveDakaoNatsNames().subjects.chatSendMessageFailed,
|
||||
};
|
||||
|
||||
constructor(
|
||||
private readonly connectionService: ConnectionService,
|
||||
private readonly natsService: NatsService,
|
||||
) {}
|
||||
|
||||
public async enqueueAndPublish<TPayload>(params: {
|
||||
subject: string;
|
||||
eventId: string;
|
||||
envelope: DakaoCommandEnvelope<TPayload>;
|
||||
}): Promise<void> {
|
||||
const OutboxModel =
|
||||
await this.connectionService.getModel('dakaoOutboxMessage');
|
||||
await OutboxModel.findOneAndUpdate(
|
||||
{ eventId: params.eventId },
|
||||
{
|
||||
$setOnInsert: {
|
||||
eventId: params.eventId,
|
||||
eventSource: params.envelope.eventSource,
|
||||
type: params.envelope.type,
|
||||
subject: params.subject,
|
||||
correlationId: params.envelope.correlationId,
|
||||
resultSubjects: params.envelope.resultSubjects,
|
||||
payload: params.envelope.payload as Record<string, unknown>,
|
||||
state: 'pending',
|
||||
publishAttempts: 0,
|
||||
compensationState: 'none',
|
||||
},
|
||||
},
|
||||
{ upsert: true, returnDocument: 'after', setDefaultsOnInsert: true },
|
||||
).exec();
|
||||
|
||||
try {
|
||||
await this.natsService.publishJetStream(params.subject, params.envelope, {
|
||||
messageId: params.eventId,
|
||||
});
|
||||
await OutboxModel.updateOne(
|
||||
{
|
||||
eventId: params.eventId,
|
||||
state: { $nin: TERMINAL_STATES },
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'published',
|
||||
publishedAt: new Date(),
|
||||
},
|
||||
$inc: { publishAttempts: 1 },
|
||||
$unset: { lastPublishError: '' },
|
||||
},
|
||||
).exec();
|
||||
} catch (err) {
|
||||
await OutboxModel.updateOne(
|
||||
{
|
||||
eventId: params.eventId,
|
||||
state: { $nin: TERMINAL_STATES },
|
||||
},
|
||||
{
|
||||
$inc: { publishAttempts: 1 },
|
||||
$set: {
|
||||
lastPublishError: (err as Error)?.message ?? String(err),
|
||||
},
|
||||
},
|
||||
).exec();
|
||||
this.logger.error(
|
||||
`Failed to publish Dakao outbox eventId=${params.eventId}: ${
|
||||
(err as Error)?.stack ?? err
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
public async applySendResult(params: {
|
||||
subject: string;
|
||||
envelope: DakaoResultEnvelope;
|
||||
}): Promise<{ duplicate: boolean; terminalState?: 'sent' | 'failed' }> {
|
||||
const ResultModel = await this.connectionService.getModel(
|
||||
'dakaoSendResultEvent',
|
||||
);
|
||||
const OutboxModel =
|
||||
await this.connectionService.getModel('dakaoOutboxMessage');
|
||||
|
||||
try {
|
||||
await ResultModel.create({
|
||||
eventId: params.envelope.eventId,
|
||||
requestEventId: params.envelope.requestEventId,
|
||||
eventSource: params.envelope.eventSource,
|
||||
requestEventSource: params.envelope.requestEventSource,
|
||||
type: params.envelope.type,
|
||||
subject: params.subject,
|
||||
status: params.envelope.status,
|
||||
correlationId: params.envelope.correlationId,
|
||||
handledAt: new Date(params.envelope.handledAt),
|
||||
providerMessageId: params.envelope.providerMessageId,
|
||||
error: params.envelope.error,
|
||||
raw: params.envelope as unknown as Record<string, unknown>,
|
||||
});
|
||||
} catch (err) {
|
||||
if ((err as { code?: number })?.code === 11000) {
|
||||
return { duplicate: true };
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
|
||||
const terminalState =
|
||||
params.envelope.status === 'succeeded' ? 'sent' : 'failed';
|
||||
await OutboxModel.updateOne(
|
||||
{
|
||||
eventId: params.envelope.requestEventId,
|
||||
state: { $nin: TERMINAL_STATES },
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: terminalState,
|
||||
terminalAt: new Date(),
|
||||
resultEventId: params.envelope.eventId,
|
||||
terminalError: params.envelope.error,
|
||||
compensationState:
|
||||
params.envelope.status === 'failed' ? 'pending' : 'none',
|
||||
compensationReason: params.envelope.error?.code,
|
||||
},
|
||||
},
|
||||
).exec();
|
||||
|
||||
return { duplicate: false, terminalState };
|
||||
}
|
||||
|
||||
public async sweepStale(params?: {
|
||||
staleMs?: number;
|
||||
limit?: number;
|
||||
}): Promise<number> {
|
||||
const OutboxModel =
|
||||
await this.connectionService.getModel('dakaoOutboxMessage');
|
||||
const staleBefore = new Date(
|
||||
Date.now() - (params?.staleMs ?? 5 * 60 * 1000),
|
||||
);
|
||||
const rows = await OutboxModel.find({
|
||||
state: { $in: ['pending', 'published'] },
|
||||
updatedAt: { $lte: staleBefore },
|
||||
})
|
||||
.sort({ updatedAt: 1 })
|
||||
.limit(params?.limit ?? 20)
|
||||
.lean()
|
||||
.exec();
|
||||
|
||||
for (const row of rows) {
|
||||
await this.enqueueAndPublish({
|
||||
subject: row.subject,
|
||||
eventId: row.eventId,
|
||||
envelope: {
|
||||
schema: 'dakao.command.v1',
|
||||
eventId: row.eventId,
|
||||
type: row.type,
|
||||
eventSource: row.eventSource,
|
||||
correlationId: row.correlationId,
|
||||
resultSubjects:
|
||||
row.resultSubjects ?? this.resolveDefaultResultSubjects(row.type),
|
||||
payload: row.payload,
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
return rows.length;
|
||||
}
|
||||
|
||||
private resolveDefaultResultSubjects(
|
||||
type: string,
|
||||
): DakaoResultSubjects | undefined {
|
||||
if (type !== CHAT_SEND_MESSAGE_TYPE) return undefined;
|
||||
return this.chatSendMessageResultSubjects;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,81 @@
|
||||
import { Injectable, Logger, OnModuleInit } from '@nestjs/common';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
import { DakaoResultEnvelope } from './dakao.types';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoSendResultSubscriber implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoSendResultSubscriber.name);
|
||||
|
||||
constructor(
|
||||
private readonly natsService: NatsService,
|
||||
private readonly resources: DakaoJetStreamResourceService,
|
||||
private readonly outboxService: DakaoOutboxService,
|
||||
) {}
|
||||
|
||||
async onModuleInit() {
|
||||
await this.resources.ensure();
|
||||
const names = resolveDakaoNatsNames();
|
||||
void this.natsService.consumeJetStream<DakaoResultEnvelope>(
|
||||
{
|
||||
stream: names.streams.sendResult,
|
||||
durable: names.consumers.sendResult,
|
||||
},
|
||||
(event, msg) => this.handleResult(event, msg.subject),
|
||||
);
|
||||
this.logger.log(
|
||||
`Dakao send-result subscriber ready on stream="${names.streams.sendResult}" durable="${names.consumers.sendResult}"`,
|
||||
);
|
||||
}
|
||||
|
||||
private async handleResult(
|
||||
event: DakaoResultEnvelope,
|
||||
subject: string,
|
||||
): Promise<void> {
|
||||
if (!this.validate(event)) {
|
||||
this.logger.warn(`Ignoring invalid Dakao send-result on ${subject}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const result = await this.outboxService.applySendResult({
|
||||
subject,
|
||||
envelope: event,
|
||||
});
|
||||
if (result.duplicate) {
|
||||
this.logger.log(
|
||||
`Duplicate Dakao result ignored eventId=${event.eventId}`,
|
||||
);
|
||||
return;
|
||||
}
|
||||
this.logger.log(
|
||||
`Dakao result applied eventId=${event.eventId} requestEventId=${event.requestEventId} state=${result.terminalState ?? '-'}`,
|
||||
);
|
||||
}
|
||||
|
||||
private validate(event: unknown): event is DakaoResultEnvelope {
|
||||
if (!event || typeof event !== 'object') return false;
|
||||
const e = event as Partial<DakaoResultEnvelope>;
|
||||
if (e.schema !== 'dakao.result.v1') return false;
|
||||
if (typeof e.eventId !== 'string' || e.eventId.length === 0) return false;
|
||||
if (typeof e.requestEventId !== 'string' || e.requestEventId.length === 0) {
|
||||
return false;
|
||||
}
|
||||
if (typeof e.eventSource !== 'string' || e.eventSource.length === 0)
|
||||
return false;
|
||||
if (
|
||||
typeof e.requestEventSource !== 'string' ||
|
||||
e.requestEventSource.length === 0
|
||||
) {
|
||||
return false;
|
||||
}
|
||||
if (e.status !== 'succeeded' && e.status !== 'failed') return false;
|
||||
if (
|
||||
typeof e.handledAt !== 'string' ||
|
||||
Number.isNaN(Date.parse(e.handledAt))
|
||||
)
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,148 @@
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||
|
||||
describe('DakaoUrlShortenerService', () => {
|
||||
const originalEnv = process.env;
|
||||
const originalFetch = global.fetch;
|
||||
|
||||
beforeEach(() => {
|
||||
process.env = { ...originalEnv };
|
||||
});
|
||||
|
||||
afterEach(() => {
|
||||
process.env = originalEnv;
|
||||
global.fetch = originalFetch;
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
function makeService(token = 'shortener-token') {
|
||||
const secretService = {
|
||||
get: jest.fn().mockResolvedValue(token),
|
||||
} as unknown as jest.Mocked<SecretService>;
|
||||
|
||||
return {
|
||||
service: new DakaoUrlShortenerService(secretService),
|
||||
secretService,
|
||||
};
|
||||
}
|
||||
|
||||
it('posts a production match detail URL with a deterministic slug', async () => {
|
||||
process.env.NODE_ENV = 'prod';
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
status: 201,
|
||||
json: jest
|
||||
.fn()
|
||||
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtpAB12' }),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
const shortUrl = await service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'ab12',
|
||||
});
|
||||
|
||||
expect(shortUrl).toBe('https://go.dahyeon.us/lmtpAB12');
|
||||
expect(global.fetch).toHaveBeenCalledWith(
|
||||
'https://go.dahyeon.us/api/shorten',
|
||||
expect.objectContaining({
|
||||
method: 'POST',
|
||||
headers: expect.objectContaining({
|
||||
Accept: 'application/json',
|
||||
Authorization: 'Bearer shortener-token',
|
||||
'Content-Type': 'application/json',
|
||||
}),
|
||||
}),
|
||||
);
|
||||
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||
expect(JSON.parse(init.body as string)).toEqual({
|
||||
slug: 'lmtpAB12',
|
||||
url: 'https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||
redirectStatus: 302,
|
||||
expiresAt: null,
|
||||
});
|
||||
});
|
||||
|
||||
it('uses staging slug prefix and configured target base URL outside production', async () => {
|
||||
process.env.NODE_ENV = 'staging';
|
||||
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||
'https://staging.lolympus.pages.dev/';
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
status: 201,
|
||||
json: jest
|
||||
.fn()
|
||||
.mockResolvedValue({ shortUrl: 'https://go.dahyeon.us/lmtsCD34' }),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
await service.shortenMatchLink({
|
||||
matchId: '444444444444444444444444',
|
||||
shortCode: 'cd34',
|
||||
});
|
||||
|
||||
const init = (global.fetch as jest.Mock).mock.calls[0][1] as RequestInit;
|
||||
expect(JSON.parse(init.body as string)).toEqual(
|
||||
expect.objectContaining({
|
||||
slug: 'lmtsCD34',
|
||||
url: 'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('builds the direct match detail URL for fallback output', () => {
|
||||
process.env.URL_SHORTENER_TARGET_BASE_URL =
|
||||
'https://staging.lolympus.pages.dev/';
|
||||
const { service } = makeService();
|
||||
|
||||
expect(service.buildMatchDetailUrl('444444444444444444444444')).toBe(
|
||||
'https://staging.lolympus.pages.dev/match/444444444444444444444444',
|
||||
);
|
||||
});
|
||||
|
||||
it('skips shortener calls when the bearer token is missing', async () => {
|
||||
global.fetch = jest.fn();
|
||||
const { service } = makeService('');
|
||||
|
||||
await expect(
|
||||
service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
}),
|
||||
).resolves.toBeUndefined();
|
||||
expect(global.fetch).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('returns the deterministic short URL when the slug already exists', async () => {
|
||||
process.env.NODE_ENV = 'prod';
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: false,
|
||||
status: 409,
|
||||
text: jest.fn().mockResolvedValue('Conflict'),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
await expect(
|
||||
service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
}),
|
||||
).resolves.toBe('https://go.dahyeon.us/lmtpAB12');
|
||||
});
|
||||
|
||||
it('returns undefined when the shortener rejects the request', async () => {
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: false,
|
||||
status: 500,
|
||||
text: jest.fn().mockResolvedValue('server error'),
|
||||
} as unknown as Response);
|
||||
const { service } = makeService();
|
||||
|
||||
await expect(
|
||||
service.shortenMatchLink({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
}),
|
||||
).resolves.toBeUndefined();
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,180 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
|
||||
const DEFAULT_SHORTENER_API_URL = 'https://go.dahyeon.us/api/shorten';
|
||||
const DEFAULT_SHORTENER_BASE_URL = 'https://go.dahyeon.us';
|
||||
const DEFAULT_TARGET_BASE_URL = 'https://lolympus.dahyeon.us';
|
||||
const DEFAULT_TIMEOUT_MS = 1500;
|
||||
|
||||
interface ShortenMatchLinkParams {
|
||||
matchId: string;
|
||||
shortCode: string | undefined;
|
||||
}
|
||||
|
||||
interface ShortenerResponseBody {
|
||||
shortUrl?: unknown;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class DakaoUrlShortenerService {
|
||||
private readonly logger = new Logger(DakaoUrlShortenerService.name);
|
||||
|
||||
constructor(private readonly secretService: SecretService) {}
|
||||
|
||||
public async shortenMatchLink(
|
||||
params: ShortenMatchLinkParams,
|
||||
): Promise<string | undefined> {
|
||||
const shortCode = params.shortCode?.trim().toUpperCase();
|
||||
if (!shortCode) return undefined;
|
||||
|
||||
const token = await this.resolveToken();
|
||||
if (!token) return undefined;
|
||||
|
||||
const slug = `${this.resolveSlugPrefix()}${shortCode}`;
|
||||
const requestBody = {
|
||||
slug,
|
||||
url: this.buildMatchDetailUrl(params.matchId),
|
||||
redirectStatus: 302,
|
||||
expiresAt: null,
|
||||
};
|
||||
|
||||
const controller = new AbortController();
|
||||
const timeout = setTimeout(
|
||||
() => controller.abort(),
|
||||
this.resolveTimeoutMs(),
|
||||
);
|
||||
|
||||
try {
|
||||
const response = await fetch(this.resolveApiUrl(), {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
Accept: 'application/json',
|
||||
Authorization: `Bearer ${token}`,
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify(requestBody),
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
if (response.status === 409) {
|
||||
return this.buildShortUrl(slug);
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
await this.logFailedResponse(response, slug);
|
||||
return undefined;
|
||||
}
|
||||
|
||||
const payload = await this.parseResponseBody(response);
|
||||
const shortUrl = payload?.shortUrl;
|
||||
return typeof shortUrl === 'string' && shortUrl.trim()
|
||||
? shortUrl.trim()
|
||||
: this.buildShortUrl(slug);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`URL shortener request failed for slug="${slug}": ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
return undefined;
|
||||
} finally {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
}
|
||||
|
||||
private async resolveToken(): Promise<string | undefined> {
|
||||
try {
|
||||
const token = await this.secretService.get<string>(
|
||||
'URL_SHORTENER_TOKEN',
|
||||
'',
|
||||
);
|
||||
return token.trim() || undefined;
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`URL shortener token unavailable: ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private resolveSlugPrefix(): 'lmtp' | 'lmts' {
|
||||
const nodeEnv = process.env.NODE_ENV?.trim().toLowerCase();
|
||||
return nodeEnv === 'prod' || nodeEnv === 'production' ? 'lmtp' : 'lmts';
|
||||
}
|
||||
|
||||
public buildMatchDetailUrl(matchId: string): string {
|
||||
return `${this.resolveTargetBaseUrl()}/match/${encodeURIComponent(matchId)}`;
|
||||
}
|
||||
|
||||
private buildShortUrl(slug: string): string {
|
||||
return `${this.resolveShortenerBaseUrl()}/${encodeURIComponent(slug)}`;
|
||||
}
|
||||
|
||||
private resolveApiUrl(): string {
|
||||
return (
|
||||
process.env.URL_SHORTENER_API_URL?.trim() || DEFAULT_SHORTENER_API_URL
|
||||
);
|
||||
}
|
||||
|
||||
private resolveShortenerBaseUrl(): string {
|
||||
return (
|
||||
this.normalizeBaseUrl(process.env.URL_SHORTENER_BASE_URL) ??
|
||||
this.normalizeOrigin(this.resolveApiUrl()) ??
|
||||
DEFAULT_SHORTENER_BASE_URL
|
||||
);
|
||||
}
|
||||
|
||||
private resolveTargetBaseUrl(): string {
|
||||
return (
|
||||
this.normalizeBaseUrl(process.env.URL_SHORTENER_TARGET_BASE_URL) ??
|
||||
this.normalizeBaseUrl(process.env.WEB_ORIGIN) ??
|
||||
DEFAULT_TARGET_BASE_URL
|
||||
);
|
||||
}
|
||||
|
||||
private resolveTimeoutMs(): number {
|
||||
const configured = Number(process.env.URL_SHORTENER_TIMEOUT_MS);
|
||||
return Number.isFinite(configured) && configured > 0
|
||||
? configured
|
||||
: DEFAULT_TIMEOUT_MS;
|
||||
}
|
||||
|
||||
private normalizeBaseUrl(value: string | undefined): string | undefined {
|
||||
const raw = value?.split(',')[0]?.trim();
|
||||
if (!raw) return undefined;
|
||||
|
||||
try {
|
||||
const url = new URL(raw);
|
||||
const pathname = url.pathname.replace(/\/+$/u, '');
|
||||
return `${url.origin}${pathname}`;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private normalizeOrigin(value: string): string | undefined {
|
||||
try {
|
||||
return new URL(value).origin;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private async parseResponseBody(
|
||||
response: Response,
|
||||
): Promise<ShortenerResponseBody | undefined> {
|
||||
try {
|
||||
return (await response.json()) as ShortenerResponseBody;
|
||||
} catch {
|
||||
return undefined;
|
||||
}
|
||||
}
|
||||
|
||||
private async logFailedResponse(
|
||||
response: Response,
|
||||
slug: string,
|
||||
): Promise<void> {
|
||||
const body = await response.text().catch(() => '');
|
||||
this.logger.warn(
|
||||
`URL shortener returned ${response.status} for slug="${slug}"${body ? `: ${body.slice(0, 200)}` : ''}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -14,7 +14,7 @@ function makeQuery<T>(value: T) {
|
||||
}
|
||||
|
||||
function makeService(params: {
|
||||
user: Partial<UserDocument>;
|
||||
user: Partial<UserDocument> | null;
|
||||
community?: Record<string, unknown> | null;
|
||||
riotAccountService?: Partial<RiotAccountService>;
|
||||
enrichmentService?: Partial<RiotAccountEnrichmentService>;
|
||||
@@ -22,6 +22,7 @@ function makeService(params: {
|
||||
const findOneAndUpdate = jest
|
||||
.fn()
|
||||
.mockReturnValue(makeQuery(params.user as UserDocument));
|
||||
const findOne = jest.fn().mockReturnValue(makeQuery(params.user));
|
||||
const findById = jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue(makeQuery(params.community ?? {})),
|
||||
@@ -29,7 +30,7 @@ function makeService(params: {
|
||||
});
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'user') return { findOneAndUpdate };
|
||||
if (name === 'user') return { findOneAndUpdate, findOne };
|
||||
if (name === 'community') return { findById };
|
||||
throw new Error(`Unexpected model: ${name}`);
|
||||
}),
|
||||
@@ -51,6 +52,7 @@ function makeService(params: {
|
||||
),
|
||||
connectionService,
|
||||
findOneAndUpdate,
|
||||
findOne,
|
||||
findById,
|
||||
riotAccountService,
|
||||
enrichmentService,
|
||||
@@ -168,4 +170,78 @@ describe('DakaoUserService', () => {
|
||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||
expect(save).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('changes the primary Riot account for the Dakao user', async () => {
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
const oldPrimary = {
|
||||
puuid: 'puuid-1',
|
||||
gameName: '기존소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
} as RiotAccount;
|
||||
const nextPrimary = {
|
||||
puuid: 'puuid-2',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: false,
|
||||
} as RiotAccount;
|
||||
const { service, findOne } = makeService({
|
||||
user: {
|
||||
_id: objectId('222222222222222222222222'),
|
||||
kakaoTalkNickname: '이전닉',
|
||||
riotAccounts: [oldPrimary, nextPrimary],
|
||||
save,
|
||||
} as Partial<UserDocument>,
|
||||
});
|
||||
|
||||
const result = await service.changePrimaryRiotAccount({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
|
||||
expect(findOne).toHaveBeenCalledWith({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
});
|
||||
expect(oldPrimary.isPrimary).toBe(false);
|
||||
expect(nextPrimary.isPrimary).toBe(true);
|
||||
expect(result.riotAccount).toBe(nextPrimary);
|
||||
expect(result.user.kakaoTalkNickname).toBe('프리리');
|
||||
expect(save).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('rejects primary account changes for unregistered Riot accounts', async () => {
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
const { service } = makeService({
|
||||
user: {
|
||||
_id: objectId('222222222222222222222222'),
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: '기존소환사',
|
||||
tagLine: 'KR1',
|
||||
isPrimary: true,
|
||||
},
|
||||
],
|
||||
save,
|
||||
} as Partial<UserDocument>,
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.changePrimaryRiotAccount({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
}),
|
||||
).rejects.toMatchObject({
|
||||
code: 'riot_account_not_found',
|
||||
detail: '프리리#KR1',
|
||||
});
|
||||
expect(save).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -230,6 +230,43 @@ export class DakaoUserService {
|
||||
return user;
|
||||
}
|
||||
|
||||
public async changePrimaryRiotAccount(
|
||||
context: ResolveContext,
|
||||
): Promise<ResolveResult> {
|
||||
const requestedGameName = normalizeRiotIdPart(context.gameName);
|
||||
const requestedTagLine = normalizeRiotIdPart(context.tagLine);
|
||||
const detail = `${requestedGameName}#${requestedTagLine}`;
|
||||
|
||||
const user = await this.findUserByKakaoTalkId({
|
||||
communityId: context.communityId,
|
||||
kakaoTalkId: context.kakaoTalkId,
|
||||
});
|
||||
if (!user) {
|
||||
throw new DakaoUserError('riot_account_not_found', detail);
|
||||
}
|
||||
|
||||
const target = user.riotAccounts.find(
|
||||
(account) =>
|
||||
normalizeRiotIdPart(account.gameName).toLowerCase() ===
|
||||
requestedGameName.toLowerCase() &&
|
||||
normalizeRiotIdPart(account.tagLine).toLowerCase() ===
|
||||
requestedTagLine.toLowerCase(),
|
||||
);
|
||||
if (!target) {
|
||||
throw new DakaoUserError('riot_account_not_found', detail);
|
||||
}
|
||||
|
||||
if (context.kakaoTalkNickname.trim()) {
|
||||
user.kakaoTalkNickname = context.kakaoTalkNickname;
|
||||
}
|
||||
for (const account of user.riotAccounts) {
|
||||
account.isPrimary = account.puuid === target.puuid;
|
||||
}
|
||||
await user.save();
|
||||
|
||||
return { user, riotAccount: target };
|
||||
}
|
||||
|
||||
private toPositionPreferences(positions: Position[]): PositionPreference[] {
|
||||
return positions.map((position, index) => ({
|
||||
position,
|
||||
|
||||
@@ -1,19 +1,22 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { MatchModule } from '../match/match.module';
|
||||
import { RiotModule } from '../riot/riot.module';
|
||||
import {
|
||||
DAKAO_OPTIONS,
|
||||
createDefaultDakaoOptions,
|
||||
} from './dakao.options';
|
||||
import { DAKAO_OPTIONS, createDefaultDakaoOptions } from './dakao.options';
|
||||
import { DakaoPublisher } from './dakao.publisher';
|
||||
import { DakaoSubscriber } from './dakao.subscriber';
|
||||
import { DakaoInboxService } from './dakao-inbox.service';
|
||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||
import { DakaoOutboxSweeperService } from './dakao-outbox-sweeper.service';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
import { DakaoUserService } from './dakao-user.service';
|
||||
import { IdempotencyCache } from './idempotency.cache';
|
||||
import { DakaoSendResultSubscriber } from './dakao-send-result.subscriber';
|
||||
import { DakaoUrlShortenerService } from './dakao-url-shortener.service';
|
||||
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
||||
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||
import { MatchListHandler } from './handlers/match-list.handler';
|
||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||
|
||||
@Module({
|
||||
imports: [RiotModule, MatchModule],
|
||||
@@ -22,15 +25,21 @@ import { PreferredPositionRegisterHandler } from './handlers/preferred-position-
|
||||
provide: DAKAO_OPTIONS,
|
||||
useFactory: createDefaultDakaoOptions,
|
||||
},
|
||||
DakaoOutboxService,
|
||||
DakaoOutboxSweeperService,
|
||||
DakaoInboxService,
|
||||
DakaoJetStreamResourceService,
|
||||
DakaoPublisher,
|
||||
DakaoSubscriber,
|
||||
DakaoSendResultSubscriber,
|
||||
DakaoUserService,
|
||||
IdempotencyCache,
|
||||
DakaoUrlShortenerService,
|
||||
AccountRegisterHandler,
|
||||
MatchListHandler,
|
||||
MatchJoinHandler,
|
||||
MatchCancelHandler,
|
||||
PreferredPositionRegisterHandler,
|
||||
PrimaryAccountChangeHandler,
|
||||
],
|
||||
exports: [DakaoPublisher],
|
||||
})
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
|
||||
describe('resolveDakaoNatsNames', () => {
|
||||
it('resolves staging subjects and JetStream resources from NODE_ENV=staging', () => {
|
||||
expect(resolveDakaoNatsNames('staging')).toEqual({
|
||||
env: 'staging',
|
||||
shortEnv: 'STG',
|
||||
subjects: {
|
||||
botCommandSubmitted: 'staging.lolympus.dakao.bot-command.submitted.v1',
|
||||
chatSendMessage: 'staging.dakao.chat.send-message.v1',
|
||||
chatSendMessageSucceeded:
|
||||
'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
chatSendMessageFailed:
|
||||
'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
streams: {
|
||||
botCommand: 'STG_DAKAO_TO_LOLYMPUS_BOTCMD',
|
||||
sendRequest: 'STG_DAKAO_SENDREQ',
|
||||
sendResult: 'STG_DAKAO_TO_LOLYMPUS_SENDRES',
|
||||
},
|
||||
consumers: {
|
||||
botCommand: 'STG_LOLYMPUS_BOTCMD',
|
||||
sendRequest: 'STG_DAKAO_SENDREQ_WORKER',
|
||||
sendResult: 'STG_LOLYMPUS_SENDRES',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it('keeps JetStream resource names within the 32 character safety target', () => {
|
||||
const names = resolveDakaoNatsNames('prod');
|
||||
const resources = [
|
||||
...Object.values(names.streams),
|
||||
...Object.values(names.consumers),
|
||||
];
|
||||
|
||||
expect(resources.every((name) => name.length <= 32)).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,68 @@
|
||||
export type DakaoRuntimeEnv = 'dev' | 'staging' | 'prod';
|
||||
export type DakaoShortEnv = 'DEV' | 'STG' | 'PROD';
|
||||
|
||||
export interface DakaoNatsNames {
|
||||
env: DakaoRuntimeEnv;
|
||||
shortEnv: DakaoShortEnv;
|
||||
subjects: {
|
||||
botCommandSubmitted: string;
|
||||
chatSendMessage: string;
|
||||
chatSendMessageSucceeded: string;
|
||||
chatSendMessageFailed: string;
|
||||
};
|
||||
streams: {
|
||||
botCommand: string;
|
||||
sendRequest: string;
|
||||
sendResult: string;
|
||||
};
|
||||
consumers: {
|
||||
botCommand: string;
|
||||
sendRequest: string;
|
||||
sendResult: string;
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveDakaoNatsNames(
|
||||
nodeEnv = process.env.NODE_ENV,
|
||||
): DakaoNatsNames {
|
||||
const env = resolveRuntimeEnv(nodeEnv);
|
||||
const shortEnv = toShortEnv(env);
|
||||
|
||||
return {
|
||||
env,
|
||||
shortEnv,
|
||||
subjects: {
|
||||
botCommandSubmitted: `${env}.lolympus.dakao.bot-command.submitted.v1`,
|
||||
chatSendMessage: `${env}.dakao.chat.send-message.v1`,
|
||||
chatSendMessageSucceeded: `${env}.lolympus.dakao.chat.send-message.succeeded.v1`,
|
||||
chatSendMessageFailed: `${env}.lolympus.dakao.chat.send-message.failed.v1`,
|
||||
},
|
||||
streams: {
|
||||
botCommand: `${shortEnv}_DAKAO_TO_LOLYMPUS_BOTCMD`,
|
||||
sendRequest: `${shortEnv}_DAKAO_SENDREQ`,
|
||||
sendResult: `${shortEnv}_DAKAO_TO_LOLYMPUS_SENDRES`,
|
||||
},
|
||||
consumers: {
|
||||
botCommand: `${shortEnv}_LOLYMPUS_BOTCMD`,
|
||||
sendRequest: `${shortEnv}_DAKAO_SENDREQ_WORKER`,
|
||||
sendResult: `${shortEnv}_LOLYMPUS_SENDRES`,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
function resolveRuntimeEnv(nodeEnv?: string): DakaoRuntimeEnv {
|
||||
if (nodeEnv === 'prod' || nodeEnv === 'production') return 'prod';
|
||||
if (nodeEnv === 'staging') return 'staging';
|
||||
return 'dev';
|
||||
}
|
||||
|
||||
function toShortEnv(env: DakaoRuntimeEnv): DakaoShortEnv {
|
||||
switch (env) {
|
||||
case 'prod':
|
||||
return 'PROD';
|
||||
case 'staging':
|
||||
return 'STG';
|
||||
case 'dev':
|
||||
return 'DEV';
|
||||
}
|
||||
}
|
||||
@@ -1,32 +1,38 @@
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import { DakaoCommandEnvelope, DakaoSendMessagePayload } from './dakao.types';
|
||||
import { DakaoPublisher } from './dakao.publisher';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
|
||||
function makePublisher() {
|
||||
const natsService = {
|
||||
publish: jest.fn().mockResolvedValue(undefined),
|
||||
subscribe: jest.fn(),
|
||||
} as unknown as NatsService;
|
||||
const outboxService = {
|
||||
enqueueAndPublish: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as DakaoOutboxService;
|
||||
const secretService = {} as SecretService;
|
||||
const publisher = new DakaoPublisher(natsService, secretService, {
|
||||
instanceId: 'test',
|
||||
});
|
||||
const previousNodeEnv = process.env.NODE_ENV;
|
||||
process.env.NODE_ENV = 'staging';
|
||||
|
||||
return { publisher, natsService };
|
||||
try {
|
||||
const publisher = new DakaoPublisher(secretService, outboxService, {
|
||||
instanceId: 'staging-instance',
|
||||
});
|
||||
|
||||
return { publisher, outboxService };
|
||||
} finally {
|
||||
process.env.NODE_ENV = previousNodeEnv;
|
||||
}
|
||||
}
|
||||
|
||||
function getPublishedPayload(natsService: NatsService): DakaoSendMessagePayload {
|
||||
const publish = natsService.publish as jest.Mock;
|
||||
const envelope = publish.mock.calls[0][1] as DakaoCommandEnvelope<
|
||||
DakaoSendMessagePayload
|
||||
>;
|
||||
return envelope.payload;
|
||||
function getPublishedEnvelope(
|
||||
outboxService: DakaoOutboxService,
|
||||
): DakaoCommandEnvelope<DakaoSendMessagePayload> {
|
||||
const enqueue = outboxService.enqueueAndPublish as jest.Mock;
|
||||
return enqueue.mock.calls[0][0]
|
||||
.envelope as DakaoCommandEnvelope<DakaoSendMessagePayload>;
|
||||
}
|
||||
|
||||
describe('DakaoPublisher', () => {
|
||||
it('keeps valid mention segments intact', async () => {
|
||||
const { publisher, natsService } = makePublisher();
|
||||
const { publisher, outboxService } = makePublisher();
|
||||
|
||||
await publisher.sendMessage({
|
||||
chatroomId: '18474390111480678',
|
||||
@@ -40,7 +46,7 @@ describe('DakaoPublisher', () => {
|
||||
],
|
||||
});
|
||||
|
||||
expect(getPublishedPayload(natsService).segments).toEqual([
|
||||
expect(getPublishedEnvelope(outboxService).payload.segments).toEqual([
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: '6215844374579825921',
|
||||
@@ -51,7 +57,7 @@ describe('DakaoPublisher', () => {
|
||||
});
|
||||
|
||||
it('downgrades invalid mention segments to text before publishing', async () => {
|
||||
const { publisher, natsService } = makePublisher();
|
||||
const { publisher, outboxService } = makePublisher();
|
||||
|
||||
await publisher.sendMessage({
|
||||
chatroomId: '18474390111480678',
|
||||
@@ -65,9 +71,39 @@ describe('DakaoPublisher', () => {
|
||||
],
|
||||
});
|
||||
|
||||
expect(getPublishedPayload(natsService).segments).toEqual([
|
||||
expect(getPublishedEnvelope(outboxService).payload.segments).toEqual([
|
||||
{ kind: 'text', text: '@소쿠리' },
|
||||
{ kind: 'text', text: ' 신청 완료' },
|
||||
]);
|
||||
});
|
||||
|
||||
it('uses deterministic event ids and the shared Dakao send subject', async () => {
|
||||
const { publisher, outboxService } = makePublisher();
|
||||
|
||||
await publisher.sendMessage({
|
||||
chatroomId: '18474390111480678',
|
||||
segments: [{ kind: 'text', text: '신청 완료' }],
|
||||
correlationId: 'chat-log-1',
|
||||
});
|
||||
|
||||
const enqueue = outboxService.enqueueAndPublish as jest.Mock;
|
||||
expect(enqueue.mock.calls[0][0]).toMatchObject({
|
||||
subject: 'staging.dakao.chat.send-message.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
});
|
||||
expect(getPublishedEnvelope(outboxService)).toMatchObject({
|
||||
schema: 'dakao.command.v1',
|
||||
eventId: 'lolympus:chat.send-message:chat-log-1',
|
||||
eventSource: 'lolympus',
|
||||
type: 'chat.send-message',
|
||||
correlationId: 'chat-log-1',
|
||||
resultSubjects: {
|
||||
succeeded: 'staging.lolympus.dakao.chat.send-message.succeeded.v1',
|
||||
failed: 'staging.lolympus.dakao.chat.send-message.failed.v1',
|
||||
},
|
||||
});
|
||||
expect(getPublishedEnvelope(outboxService)).not.toHaveProperty(
|
||||
'replySubject',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -1,86 +1,86 @@
|
||||
import {
|
||||
Inject,
|
||||
Injectable,
|
||||
Logger,
|
||||
OnModuleDestroy,
|
||||
OnModuleInit,
|
||||
} from '@nestjs/common';
|
||||
import { Inject, Injectable, Logger, OnModuleInit } from '@nestjs/common';
|
||||
import { randomUUID } from 'crypto';
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { NatsService } from '../global/nats/nats.service';
|
||||
import {
|
||||
DakaoCommandEnvelope,
|
||||
DakaoResultEnvelope,
|
||||
DakaoResultSubjects,
|
||||
DakaoSegment,
|
||||
DakaoSendMessagePayload,
|
||||
} from './dakao.types';
|
||||
import type { DakaoOptions } from './dakao.options';
|
||||
import { DAKAO_OPTIONS } from './dakao.options';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import { DakaoOutboxService } from './dakao-outbox.service';
|
||||
|
||||
const SEND_MESSAGE_SUBJECT_DEFAULT = 'dakao.command.chat.send-message.v1';
|
||||
const COMMAND_SOURCE_DEFAULT = 'lolympus-tournament-support';
|
||||
const EVENT_SOURCE_DEFAULT = 'lolympus';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoPublisher implements OnModuleInit, OnModuleDestroy {
|
||||
export class DakaoPublisher implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoPublisher.name);
|
||||
private replySubject = '';
|
||||
private sendMessageSubject = SEND_MESSAGE_SUBJECT_DEFAULT;
|
||||
private source = COMMAND_SOURCE_DEFAULT;
|
||||
private readonly names = resolveDakaoNatsNames();
|
||||
private sendMessageSubject = this.names.subjects.chatSendMessage;
|
||||
private resultSubjects: DakaoResultSubjects = {
|
||||
succeeded: this.names.subjects.chatSendMessageSucceeded,
|
||||
failed: this.names.subjects.chatSendMessageFailed,
|
||||
};
|
||||
private eventSource = EVENT_SOURCE_DEFAULT;
|
||||
|
||||
constructor(
|
||||
private readonly natsService: NatsService,
|
||||
private readonly secretService: SecretService,
|
||||
private readonly outboxService: DakaoOutboxService,
|
||||
@Inject(DAKAO_OPTIONS) private readonly options: DakaoOptions,
|
||||
) {}
|
||||
|
||||
async onModuleInit() {
|
||||
const replyOverride = await this.secretService
|
||||
.get<string>('DAKAO_REPLY_SUBJECT_PREFIX')
|
||||
.catch(() => undefined);
|
||||
const sendOverride = await this.secretService
|
||||
.get<string>('DAKAO_NATS_COMMAND_CHAT_SEND_MESSAGE_SUBJECT')
|
||||
.get<string>('DAKAO_CHAT_SEND_MESSAGE_SUBJECT')
|
||||
.catch(() => undefined);
|
||||
const sourceOverride = await this.secretService
|
||||
.get<string>('DAKAO_COMMAND_SOURCE')
|
||||
.get<string>('DAKAO_EVENT_SOURCE')
|
||||
.catch(() => undefined);
|
||||
|
||||
const replyPrefix = replyOverride || `dakao.result.${COMMAND_SOURCE_DEFAULT}`;
|
||||
this.replySubject = `${replyPrefix}.${this.options.instanceId}`;
|
||||
this.sendMessageSubject = sendOverride || SEND_MESSAGE_SUBJECT_DEFAULT;
|
||||
this.source = sourceOverride || COMMAND_SOURCE_DEFAULT;
|
||||
this.sendMessageSubject =
|
||||
sendOverride || resolveDakaoNatsNames().subjects.chatSendMessage;
|
||||
this.resultSubjects = {
|
||||
succeeded: this.names.subjects.chatSendMessageSucceeded,
|
||||
failed: this.names.subjects.chatSendMessageFailed,
|
||||
};
|
||||
this.eventSource = sourceOverride || EVENT_SOURCE_DEFAULT;
|
||||
|
||||
this.natsService.subscribe<DakaoResultEnvelope>(
|
||||
this.replySubject,
|
||||
(data) => this.handleReply(data),
|
||||
);
|
||||
this.logger.log(
|
||||
`Dakao reply subscriber ready on subject="${this.replySubject}"`,
|
||||
`Dakao send-message publisher ready on subject="${this.sendMessageSubject}" source="${this.eventSource}" instanceId="${this.options.instanceId}"`,
|
||||
);
|
||||
}
|
||||
|
||||
async onModuleDestroy() {
|
||||
// NatsService 가 subscription 정리한다.
|
||||
}
|
||||
|
||||
public async sendMessage(params: {
|
||||
chatroomId: string;
|
||||
segments: DakaoSegment[];
|
||||
correlationId?: string;
|
||||
eventId?: string;
|
||||
}): Promise<void> {
|
||||
const eventId =
|
||||
params.eventId ??
|
||||
(params.correlationId
|
||||
? `${this.eventSource}:chat.send-message:${params.correlationId}`
|
||||
: `${this.eventSource}:chat.send-message:${randomUUID()}`);
|
||||
const payload: DakaoSendMessagePayload = {
|
||||
chatroomId: params.chatroomId,
|
||||
segments: this.normalizeSegments(params.segments),
|
||||
};
|
||||
const envelope: DakaoCommandEnvelope<DakaoSendMessagePayload> = {
|
||||
schema: 'dakao.command.v1',
|
||||
id: randomUUID(),
|
||||
eventId,
|
||||
type: 'chat.send-message',
|
||||
source: this.source,
|
||||
eventSource: this.eventSource,
|
||||
correlationId: params.correlationId,
|
||||
replySubject: this.replySubject,
|
||||
resultSubjects: this.resultSubjects,
|
||||
payload,
|
||||
};
|
||||
await this.natsService.publish(this.sendMessageSubject, envelope);
|
||||
await this.outboxService.enqueueAndPublish({
|
||||
subject: this.sendMessageSubject,
|
||||
eventId,
|
||||
envelope,
|
||||
});
|
||||
}
|
||||
|
||||
private normalizeSegments(segments: DakaoSegment[]): DakaoSegment[] {
|
||||
@@ -111,11 +111,7 @@ export class DakaoPublisher implements OnModuleInit, OnModuleDestroy {
|
||||
|
||||
const id = segment.id.trim();
|
||||
const altText = segment.altText.trim();
|
||||
if (
|
||||
id.length > 0 &&
|
||||
altText.length > 0 &&
|
||||
!/[()@]/.test(altText)
|
||||
) {
|
||||
if (id.length > 0 && altText.length > 0 && !/[()@]/.test(altText)) {
|
||||
normalized.push({ kind: 'emoticon', id, altText });
|
||||
continue;
|
||||
}
|
||||
@@ -139,16 +135,4 @@ export class DakaoPublisher implements OnModuleInit, OnModuleDestroy {
|
||||
const label = displayText || userId || '사용자';
|
||||
return label.startsWith('@') ? label : `@${label}`;
|
||||
}
|
||||
|
||||
private handleReply(reply: DakaoResultEnvelope): void {
|
||||
if (reply.status === 'succeeded') {
|
||||
this.logger.log(
|
||||
`Dakao reply succeeded id=${reply.id} type=${reply.type} correlationId=${reply.correlationId ?? '-'}`,
|
||||
);
|
||||
return;
|
||||
}
|
||||
this.logger.warn(
|
||||
`Dakao reply failed id=${reply.id} type=${reply.type} code=${reply.error?.code ?? '-'} retryable=${reply.error?.retryable ?? false} message=${reply.error?.message ?? '-'}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,107 @@
|
||||
import { DakaoSubscriber } from './dakao.subscriber';
|
||||
import { DakaoInboundEvent, DakaoSegment } from './dakao.types';
|
||||
import { CommandParseError } from './parsers/command.parser';
|
||||
|
||||
function makeSubscriber(): DakaoSubscriber {
|
||||
return new DakaoSubscriber(
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
{} as never,
|
||||
);
|
||||
}
|
||||
|
||||
const event = {
|
||||
projectId: '111111111111111111111111',
|
||||
chatroomId: 'chatroom-1',
|
||||
nickname: '프리리',
|
||||
userId: '12345',
|
||||
origin: {
|
||||
chatId: 'chat-1',
|
||||
logId: 'log-1',
|
||||
chatLog: {
|
||||
logId: 'log-1',
|
||||
chatId: 'chat-1',
|
||||
authorId: '12345',
|
||||
type: 1,
|
||||
sendAt: 0,
|
||||
message: '!내전',
|
||||
},
|
||||
},
|
||||
} satisfies DakaoInboundEvent;
|
||||
|
||||
describe('DakaoSubscriber', () => {
|
||||
it('renders usage help with star emoticon command lines', () => {
|
||||
const subscriber = makeSubscriber() as unknown as {
|
||||
parseErrorReply: (
|
||||
event: DakaoInboundEvent,
|
||||
senderNickname: string,
|
||||
err: CommandParseError,
|
||||
) => DakaoSegment[];
|
||||
};
|
||||
|
||||
const segments = subscriber.parseErrorReply(
|
||||
event,
|
||||
'프리리',
|
||||
new CommandParseError('usage'),
|
||||
);
|
||||
|
||||
expect(segments).toEqual([
|
||||
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||
{ kind: 'text', text: ' 사용법\n' },
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{ kind: 'text', text: ' !내전 일정\n' },
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{
|
||||
kind: 'text',
|
||||
text: ' !내전 신청 코드 소환사이름#태그 포지션1,포지션2\n',
|
||||
},
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{ kind: 'text', text: ' !내전 계정등록 소환사이름#태그\n' },
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{
|
||||
kind: 'text',
|
||||
text: ' !내전 선호포지션등록 포지션1,포지션2\n',
|
||||
},
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' },
|
||||
{
|
||||
kind: 'text',
|
||||
text: ' !내전 대표계정변경 소환사이름#태그',
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it('keeps the unknown command header before star emoticon usage lines', () => {
|
||||
const subscriber = makeSubscriber() as unknown as {
|
||||
parseErrorReply: (
|
||||
event: DakaoInboundEvent,
|
||||
senderNickname: string,
|
||||
err: CommandParseError,
|
||||
) => DakaoSegment[];
|
||||
};
|
||||
|
||||
const segments = subscriber.parseErrorReply(
|
||||
event,
|
||||
'프리리',
|
||||
new CommandParseError('unknown_command', '폭파'),
|
||||
);
|
||||
|
||||
expect(segments.slice(0, 2)).toEqual([
|
||||
{ kind: 'mention', userId: '12345', displayText: '프리리' },
|
||||
{ kind: 'text', text: ' 알 수 없는 명령어입니다.\n' },
|
||||
]);
|
||||
expect(segments).toContainEqual({
|
||||
kind: 'emoticon',
|
||||
id: '1200281_035',
|
||||
altText: '스타',
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -6,50 +6,59 @@ import { CommandParseError, parseCommand } from './parsers/command.parser';
|
||||
import { DakaoInboundEvent, DakaoLong, DakaoSegment } from './dakao.types';
|
||||
import { DakaoPublisher } from './dakao.publisher';
|
||||
import { DakaoUserError, DakaoUserService } from './dakao-user.service';
|
||||
import { IdempotencyCache } from './idempotency.cache';
|
||||
import { AccountRegisterHandler } from './handlers/account-register.handler';
|
||||
import { MatchCancelHandler } from './handlers/match-cancel.handler';
|
||||
import { MatchJoinHandler } from './handlers/match-join.handler';
|
||||
import { MatchListHandler } from './handlers/match-list.handler';
|
||||
import { PreferredPositionRegisterHandler } from './handlers/preferred-position-register.handler';
|
||||
|
||||
const INBOUND_SUBJECT_DEFAULT = 'lolympus-tournament-support.kakaotalk.command';
|
||||
import { PrimaryAccountChangeHandler } from './handlers/primary-account-change.handler';
|
||||
import { resolveDakaoNatsNames } from './dakao.nats-names';
|
||||
import { DakaoInboxService } from './dakao-inbox.service';
|
||||
import { DakaoJetStreamResourceService } from './dakao-jetstream-resource.service';
|
||||
|
||||
@Injectable()
|
||||
export class DakaoSubscriber implements OnModuleInit {
|
||||
private readonly logger = new Logger(DakaoSubscriber.name);
|
||||
private inboundSubject = INBOUND_SUBJECT_DEFAULT;
|
||||
private readonly natsNames = resolveDakaoNatsNames();
|
||||
private botUserId: string | undefined;
|
||||
private readonly usageCommands = [
|
||||
'!내전 일정',
|
||||
'!내전 신청 코드 소환사이름#태그 포지션1,포지션2',
|
||||
'!내전 계정등록 소환사이름#태그',
|
||||
'!내전 선호포지션등록 포지션1,포지션2',
|
||||
'!내전 대표계정변경 소환사이름#태그',
|
||||
];
|
||||
|
||||
constructor(
|
||||
private readonly natsService: NatsService,
|
||||
private readonly secretService: SecretService,
|
||||
private readonly dakaoUserService: DakaoUserService,
|
||||
private readonly publisher: DakaoPublisher,
|
||||
private readonly idempotency: IdempotencyCache,
|
||||
private readonly inbox: DakaoInboxService,
|
||||
private readonly resources: DakaoJetStreamResourceService,
|
||||
private readonly accountRegisterHandler: AccountRegisterHandler,
|
||||
private readonly matchListHandler: MatchListHandler,
|
||||
private readonly matchJoinHandler: MatchJoinHandler,
|
||||
private readonly matchCancelHandler: MatchCancelHandler,
|
||||
private readonly preferredPositionRegisterHandler: PreferredPositionRegisterHandler,
|
||||
private readonly primaryAccountChangeHandler: PrimaryAccountChangeHandler,
|
||||
) {}
|
||||
|
||||
async onModuleInit() {
|
||||
const subjectOverride = await this.secretService
|
||||
.get<string>('DAKAO_INBOUND_SUBJECT')
|
||||
.catch(() => undefined);
|
||||
this.inboundSubject = subjectOverride || INBOUND_SUBJECT_DEFAULT;
|
||||
|
||||
this.botUserId = await this.secretService
|
||||
.get<string>('DAKAO_BOT_USER_ID')
|
||||
.catch(() => undefined);
|
||||
|
||||
this.natsService.subscribe<DakaoInboundEvent>(
|
||||
this.inboundSubject,
|
||||
await this.resources.ensure();
|
||||
void this.natsService.consumeJetStream<DakaoInboundEvent>(
|
||||
{
|
||||
stream: this.natsNames.streams.botCommand,
|
||||
durable: this.natsNames.consumers.botCommand,
|
||||
},
|
||||
(event) => this.handleEvent(event),
|
||||
);
|
||||
this.logger.log(
|
||||
`Dakao inbound subscriber ready on subject="${this.inboundSubject}"`,
|
||||
`Dakao inbound subscriber ready on stream="${this.natsNames.streams.botCommand}" durable="${this.natsNames.consumers.botCommand}"`,
|
||||
);
|
||||
}
|
||||
|
||||
@@ -60,35 +69,52 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
return;
|
||||
}
|
||||
|
||||
const logIdKey = this.deriveLogIdKey(event);
|
||||
if (logIdKey && this.idempotency.has(logIdKey)) {
|
||||
return;
|
||||
const chatLogLogId = this.serializeDakaoLong(event.origin.chatLog.logId);
|
||||
let claimed = false;
|
||||
if (chatLogLogId) {
|
||||
const claim = await this.inbox.claim({
|
||||
consumer: this.natsNames.consumers.botCommand,
|
||||
projectId: event.projectId,
|
||||
chatLogLogId,
|
||||
});
|
||||
if (claim.status === 'duplicate') return;
|
||||
if (claim.status === 'inflight') {
|
||||
throw new Error(
|
||||
`Dakao event is already being processed projectId=${event.projectId} logId=${chatLogLogId}`,
|
||||
);
|
||||
}
|
||||
claimed = true;
|
||||
}
|
||||
if (logIdKey) this.idempotency.remember(logIdKey);
|
||||
|
||||
let communityId: mongoose.Types.ObjectId;
|
||||
try {
|
||||
communityId = await this.dakaoUserService.resolveCommunityIdByDakaoProjectId(
|
||||
event.projectId,
|
||||
);
|
||||
communityId =
|
||||
await this.dakaoUserService.resolveCommunityIdByDakaoProjectId(
|
||||
event.projectId,
|
||||
);
|
||||
} catch (err) {
|
||||
if (err instanceof DakaoUserError) {
|
||||
if (err.code === 'invalid_project_id') {
|
||||
this.logger.warn(`Invalid dakao projectId format: ${event.projectId}`);
|
||||
this.logger.warn(
|
||||
`Invalid dakao projectId format: ${event.projectId}`,
|
||||
);
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
if (err.code === 'community_not_found') {
|
||||
// 우리 쪽이 모르는 projectId. 메시지를 보내봤자 컨텍스트가 없으므로 로그만.
|
||||
this.logger.warn(`Unknown dakao projectId: ${event.projectId}`);
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
}
|
||||
if (claimed) await this.markFailed(event, chatLogLogId, err);
|
||||
throw err;
|
||||
}
|
||||
|
||||
let segments: DakaoSegment[];
|
||||
const senderNickname = this.resolveSenderNickname(event);
|
||||
const correlationId = this.serializeDakaoLong(event.origin.chatLog.logId);
|
||||
const correlationId = chatLogLogId;
|
||||
try {
|
||||
const command = parseCommand(event.origin.chatLog.message);
|
||||
|
||||
@@ -109,6 +135,15 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
tagLine: command.tagLine,
|
||||
});
|
||||
break;
|
||||
case 'primary-account-change':
|
||||
segments = await this.primaryAccountChangeHandler.handle({
|
||||
communityId,
|
||||
senderUserId: event.userId,
|
||||
senderNickname,
|
||||
gameName: command.gameName,
|
||||
tagLine: command.tagLine,
|
||||
});
|
||||
break;
|
||||
case 'match-join':
|
||||
segments = await this.matchJoinHandler.handle({
|
||||
communityId,
|
||||
@@ -141,27 +176,35 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
segments,
|
||||
correlationId,
|
||||
});
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
} catch (err) {
|
||||
if (err instanceof CommandParseError) {
|
||||
// not_a_command 는 명령이 아닌 일반 메시지 → 무시.
|
||||
if (err.code === 'not_a_command') return;
|
||||
if (err.code === 'not_a_command') {
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
await this.publisher.sendMessage({
|
||||
chatroomId: event.chatroomId,
|
||||
segments: this.parseErrorReply(event, senderNickname, err),
|
||||
correlationId,
|
||||
});
|
||||
if (claimed) await this.markProcessed(event, chatLogLogId);
|
||||
return;
|
||||
}
|
||||
this.logger.error(
|
||||
`Unhandled dakao event error: ${(err as Error)?.stack ?? err}`,
|
||||
);
|
||||
if (claimed) await this.markFailed(event, chatLogLogId, err);
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private validate(event: unknown): event is DakaoInboundEvent {
|
||||
if (!event || typeof event !== 'object') return false;
|
||||
const e = event as Partial<DakaoInboundEvent>;
|
||||
if (typeof e.projectId !== 'string' || e.projectId.length === 0) return false;
|
||||
if (typeof e.projectId !== 'string' || e.projectId.length === 0)
|
||||
return false;
|
||||
if (typeof e.chatroomId !== 'string' || e.chatroomId.length === 0)
|
||||
return false;
|
||||
if (typeof e.nickname !== 'string') return false;
|
||||
@@ -174,11 +217,6 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
return true;
|
||||
}
|
||||
|
||||
private deriveLogIdKey(event: DakaoInboundEvent): string | null {
|
||||
const serialized = this.serializeDakaoLong(event.origin.chatLog.logId);
|
||||
return serialized ? `${event.projectId}:${serialized}` : null;
|
||||
}
|
||||
|
||||
private serializeDakaoLong(value: DakaoLong | string | undefined): string {
|
||||
if (typeof value === 'string') return value;
|
||||
if (!value || typeof value !== 'object') return '';
|
||||
@@ -197,6 +235,30 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
return fallback ?? '';
|
||||
}
|
||||
|
||||
private async markProcessed(
|
||||
event: DakaoInboundEvent,
|
||||
chatLogLogId: string,
|
||||
): Promise<void> {
|
||||
await this.inbox.markProcessed({
|
||||
consumer: this.natsNames.consumers.botCommand,
|
||||
projectId: event.projectId,
|
||||
chatLogLogId,
|
||||
});
|
||||
}
|
||||
|
||||
private async markFailed(
|
||||
event: DakaoInboundEvent,
|
||||
chatLogLogId: string,
|
||||
error: unknown,
|
||||
): Promise<void> {
|
||||
await this.inbox.markFailed({
|
||||
consumer: this.natsNames.consumers.botCommand,
|
||||
projectId: event.projectId,
|
||||
chatLogLogId,
|
||||
error,
|
||||
});
|
||||
}
|
||||
|
||||
private parseErrorReply(
|
||||
event: DakaoInboundEvent,
|
||||
senderNickname: string,
|
||||
@@ -212,9 +274,9 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
const text = ((): string => {
|
||||
switch (err.code) {
|
||||
case 'unknown_command':
|
||||
return ` 알 수 없는 명령어입니다. 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
||||
return ` 알 수 없는 명령어입니다.\n`;
|
||||
case 'usage':
|
||||
return ` 사용법: !내전 일정, !내전 계정등록 <게임명>#<태그>, !내전 선호포지션등록 미드,정글, !내전 신청 [코드] [게임명#태그] [포지션1,포지션2], !내전 취소 <코드>`;
|
||||
return ` 내전 명령어 사용법\n`;
|
||||
case 'invalid_match_id':
|
||||
return ` 매치 ID 형식이 올바르지 않습니다 (${err.detail ?? ''}).`;
|
||||
case 'invalid_riot_id':
|
||||
@@ -225,6 +287,22 @@ export class DakaoSubscriber implements OnModuleInit {
|
||||
return ` 명령을 처리할 수 없습니다.`;
|
||||
}
|
||||
})();
|
||||
if (err.code === 'unknown_command' || err.code === 'usage') {
|
||||
return [...head, { kind: 'text', text }, ...this.usageCommandSegments()];
|
||||
}
|
||||
return [...head, { kind: 'text', text }];
|
||||
}
|
||||
|
||||
private usageCommandSegments(): DakaoSegment[] {
|
||||
return this.usageCommands.flatMap((command, index) => [
|
||||
{ kind: 'emoticon', id: '1200281_035', altText: '스타' } as const,
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
index === this.usageCommands.length - 1
|
||||
? ` ${command}`
|
||||
: ` ${command} \n`,
|
||||
} as const,
|
||||
]);
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
// dakao NATS contracts
|
||||
// inbound: dakao 가 lolympus-tournament-support.kakaotalk.command 로 발행하는 이벤트
|
||||
// outbound: 우리가 dakao.command.chat.send-message.v1 로 발행하는 명령
|
||||
// reply: dakao 가 우리 envelope 의 replySubject 로 publish 하는 결과
|
||||
// inbound: dakao 가 {env}.lolympus.dakao.bot-command.submitted.v1 로 발행하는 이벤트
|
||||
// outbound: 우리가 {env}.dakao.chat.send-message.v1 로 발행하는 명령
|
||||
// result: dakao 가 {env}.lolympus.dakao.chat.send-message.{succeeded|failed}.v1 로 발행하는 결과 이벤트
|
||||
|
||||
// ===== Inbound =====
|
||||
export interface DakaoLong {
|
||||
@@ -75,24 +75,33 @@ export interface DakaoSendMessagePayload {
|
||||
silence?: boolean;
|
||||
}
|
||||
|
||||
export interface DakaoResultSubjects {
|
||||
succeeded: string;
|
||||
failed: string;
|
||||
}
|
||||
|
||||
export interface DakaoCommandEnvelope<TPayload> {
|
||||
schema: 'dakao.command.v1';
|
||||
id: string;
|
||||
eventId: string;
|
||||
type: string;
|
||||
source: string;
|
||||
eventSource: string;
|
||||
correlationId?: string;
|
||||
replySubject?: string;
|
||||
resultSubjects?: DakaoResultSubjects;
|
||||
payload: TPayload;
|
||||
}
|
||||
|
||||
// ===== Reply =====
|
||||
// ===== Result =====
|
||||
export interface DakaoResultEnvelope {
|
||||
schema: 'dakao.result.v1';
|
||||
id: string;
|
||||
eventId: string;
|
||||
requestEventId: string;
|
||||
type: string;
|
||||
eventSource: string;
|
||||
requestEventSource: string;
|
||||
status: 'succeeded' | 'failed';
|
||||
handledAt: string;
|
||||
correlationId?: string;
|
||||
providerMessageId?: string;
|
||||
result?: Record<string, unknown>;
|
||||
error?: {
|
||||
code: string;
|
||||
|
||||
@@ -1,11 +1,28 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||
import { MatchListHandler } from './match-list.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(params: {
|
||||
matchService: Partial<MatchService>;
|
||||
urlShortener?: Partial<DakaoUrlShortenerService>;
|
||||
}): MatchListHandler {
|
||||
return new MatchListHandler(
|
||||
params.matchService as MatchService,
|
||||
{
|
||||
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||
buildMatchDetailUrl: jest.fn(
|
||||
(matchId: string) => `https://lolympus.dahyeon.us/match/${matchId}`,
|
||||
),
|
||||
...params.urlShortener,
|
||||
} as unknown as DakaoUrlShortenerService,
|
||||
);
|
||||
}
|
||||
|
||||
describe('MatchListHandler', () => {
|
||||
it('prints short codes and compact KST dates', async () => {
|
||||
it('prints short codes, compact KST dates, and short links', async () => {
|
||||
const match = {
|
||||
_id: objectId('333333333333333333333333'),
|
||||
title: '토요 내전',
|
||||
@@ -17,8 +34,13 @@ describe('MatchListHandler', () => {
|
||||
const matchService = {
|
||||
list: jest.fn().mockResolvedValue([match]),
|
||||
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||
} as unknown as MatchService;
|
||||
const handler = new MatchListHandler(matchService);
|
||||
};
|
||||
const urlShortener = {
|
||||
shortenMatchLink: jest
|
||||
.fn()
|
||||
.mockResolvedValue('https://go.dahyeon.us/lmtpAB12'),
|
||||
};
|
||||
const handler = makeHandler({ matchService, urlShortener });
|
||||
|
||||
const segments = await handler.handle({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
@@ -27,6 +49,10 @@ describe('MatchListHandler', () => {
|
||||
});
|
||||
|
||||
expect(matchService.ensureShortCode).toHaveBeenCalledWith(match);
|
||||
expect(urlShortener.shortenMatchLink).toHaveBeenCalledWith({
|
||||
matchId: '333333333333333333333333',
|
||||
shortCode: 'AB12',
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('토요 내전 (2/10) 5/2 19:30'),
|
||||
@@ -35,6 +61,10 @@ describe('MatchListHandler', () => {
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('코드: AB12'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('링크: https://go.dahyeon.us/lmtpAB12'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('2026-05-02'),
|
||||
@@ -43,5 +73,50 @@ describe('MatchListHandler', () => {
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('ID:'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('계정등록:'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.not.stringContaining('신청:'),
|
||||
});
|
||||
});
|
||||
|
||||
it('falls back to a direct match detail link when short link creation is skipped', async () => {
|
||||
const match = {
|
||||
_id: objectId('333333333333333333333333'),
|
||||
title: '토요 내전',
|
||||
shortCode: 'AB12',
|
||||
participants: [],
|
||||
maxParticipants: 10,
|
||||
scheduledAt: new Date('2026-05-02T10:30:00.000Z'),
|
||||
};
|
||||
const handler = makeHandler({
|
||||
matchService: {
|
||||
list: jest.fn().mockResolvedValue([match]),
|
||||
ensureShortCode: jest.fn().mockResolvedValue(match),
|
||||
},
|
||||
urlShortener: {
|
||||
shortenMatchLink: jest.fn().mockResolvedValue(undefined),
|
||||
},
|
||||
});
|
||||
|
||||
const segments = await handler.handle({
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
});
|
||||
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('코드: AB12'),
|
||||
});
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining(
|
||||
'링크: https://lolympus.dahyeon.us/match/333333333333333333333333',
|
||||
),
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -1,11 +1,18 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { MatchDocument } from '../../global/database/schema';
|
||||
import { MatchService } from '../../match/match.service';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUrlShortenerService } from '../dakao-url-shortener.service';
|
||||
|
||||
@Injectable()
|
||||
export class MatchListHandler {
|
||||
constructor(private readonly matchService: MatchService) {}
|
||||
private readonly logger = new Logger(MatchListHandler.name);
|
||||
|
||||
constructor(
|
||||
private readonly matchService: MatchService,
|
||||
private readonly urlShortener: DakaoUrlShortenerService,
|
||||
) {}
|
||||
|
||||
public async handle(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
@@ -33,12 +40,16 @@ export class MatchListHandler {
|
||||
matches.map((match) => this.matchService.ensureShortCode(match)),
|
||||
);
|
||||
|
||||
const lines = matchesWithCodes.map((m, i) => {
|
||||
const filled = m.participants.length;
|
||||
const cap = m.maxParticipants;
|
||||
const time = formatScheduledAt(m.scheduledAt);
|
||||
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}`;
|
||||
});
|
||||
const lines = await Promise.all(
|
||||
matchesWithCodes.map(async (m, i) => {
|
||||
const filled = m.participants.length;
|
||||
const cap = m.maxParticipants;
|
||||
const time = formatScheduledAt(m.scheduledAt);
|
||||
const shortUrl = await this.createShortUrl(m);
|
||||
const linkLine = shortUrl ? `\n 링크: ${shortUrl}` : '';
|
||||
return `\n${i + 1}. ${m.title} (${filled}/${cap}) ${time}\n 코드: ${m.shortCode}${linkLine}`;
|
||||
}),
|
||||
);
|
||||
|
||||
return [
|
||||
{
|
||||
@@ -48,10 +59,29 @@ export class MatchListHandler {
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}\n계정등록: !내전 계정등록 <닉네임>#<태그>\n선호포지션등록: !내전 선호포지션등록 미드,정글\n신청: !내전 신청 <코드> [닉네임#태그] [포지션1,포지션2]\n취소: !내전 취소 <코드>\n계정/선호포지션을 등록해두면 !내전 신청 <코드> 로 신청할 수 있습니다.`,
|
||||
text: ` 모집 중인 내전 ${matches.length}건${lines.join('')}`,
|
||||
},
|
||||
];
|
||||
}
|
||||
|
||||
private async createShortUrl(
|
||||
match: MatchDocument,
|
||||
): Promise<string | undefined> {
|
||||
try {
|
||||
const shortUrl = await this.urlShortener.shortenMatchLink({
|
||||
matchId: String(match._id),
|
||||
shortCode: match.shortCode,
|
||||
});
|
||||
return (
|
||||
shortUrl ?? this.urlShortener.buildMatchDetailUrl(String(match._id))
|
||||
);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Failed to create dakao match short URL for match="${String(match._id)}": ${error instanceof Error ? error.message : String(error)}`,
|
||||
);
|
||||
return this.urlShortener.buildMatchDetailUrl(String(match._id));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function formatScheduledAt(date: Date): string {
|
||||
|
||||
@@ -0,0 +1,73 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
import { PrimaryAccountChangeHandler } from './primary-account-change.handler';
|
||||
|
||||
const objectId = (hex: string) => new mongoose.Types.ObjectId(hex);
|
||||
|
||||
function makeHandler(dakaoUserService?: Partial<DakaoUserService>) {
|
||||
return new PrimaryAccountChangeHandler({
|
||||
changePrimaryRiotAccount: jest.fn(),
|
||||
...dakaoUserService,
|
||||
} as unknown as DakaoUserService);
|
||||
}
|
||||
|
||||
const baseParams = {
|
||||
communityId: objectId('111111111111111111111111'),
|
||||
senderUserId: 'kakao-user-1',
|
||||
senderNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
};
|
||||
|
||||
describe('PrimaryAccountChangeHandler', () => {
|
||||
it('changes the primary Riot account through DakaoUserService', async () => {
|
||||
const changePrimaryRiotAccount = jest.fn().mockResolvedValue({
|
||||
user: { _id: objectId('222222222222222222222222') },
|
||||
riotAccount: { gameName: '프리리', tagLine: 'KR1' },
|
||||
});
|
||||
const handler = makeHandler({
|
||||
changePrimaryRiotAccount,
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(changePrimaryRiotAccount).toHaveBeenCalledWith({
|
||||
communityId: baseParams.communityId,
|
||||
kakaoTalkId: 'kakao-user-1',
|
||||
kakaoTalkNickname: '프리리',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('대표 계정 변경 완료'),
|
||||
}),
|
||||
]);
|
||||
expect(segments[1]).toMatchObject({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('대표 계정: 프리리#KR1'),
|
||||
});
|
||||
});
|
||||
|
||||
it('asks users to register the Riot account first when not found', async () => {
|
||||
const handler = makeHandler({
|
||||
changePrimaryRiotAccount: jest
|
||||
.fn()
|
||||
.mockRejectedValue(
|
||||
new DakaoUserError('riot_account_not_found', '프리리#KR1'),
|
||||
),
|
||||
});
|
||||
|
||||
const segments = await handler.handle(baseParams);
|
||||
|
||||
expect(segments).toEqual([
|
||||
expect.objectContaining({ kind: 'mention', userId: 'kakao-user-1' }),
|
||||
expect.objectContaining({
|
||||
kind: 'text',
|
||||
text: expect.stringContaining('먼저 !내전 계정등록'),
|
||||
}),
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,81 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { DakaoSegment } from '../dakao.types';
|
||||
import { DakaoUserError, DakaoUserService } from '../dakao-user.service';
|
||||
|
||||
interface PrimaryAccountChangeHandlerParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
senderUserId: string;
|
||||
senderNickname: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class PrimaryAccountChangeHandler {
|
||||
constructor(private readonly dakaoUserService: DakaoUserService) {}
|
||||
|
||||
public async handle(
|
||||
params: PrimaryAccountChangeHandlerParams,
|
||||
): Promise<DakaoSegment[]> {
|
||||
try {
|
||||
const resolved = await this.dakaoUserService.changePrimaryRiotAccount({
|
||||
communityId: params.communityId,
|
||||
kakaoTalkId: params.senderUserId,
|
||||
kakaoTalkNickname: params.senderNickname,
|
||||
gameName: params.gameName,
|
||||
tagLine: params.tagLine,
|
||||
});
|
||||
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{
|
||||
kind: 'text',
|
||||
text:
|
||||
` 대표 계정 변경 완료` +
|
||||
`\n대표 계정: ${resolved.riotAccount.gameName}#${resolved.riotAccount.tagLine}`,
|
||||
},
|
||||
];
|
||||
} catch (err) {
|
||||
if (err instanceof DakaoUserError) {
|
||||
return this.errorReply(params, this.translateUserError(err));
|
||||
}
|
||||
throw err;
|
||||
}
|
||||
}
|
||||
|
||||
private errorReply(
|
||||
params: PrimaryAccountChangeHandlerParams,
|
||||
message: string,
|
||||
): DakaoSegment[] {
|
||||
return [
|
||||
{
|
||||
kind: 'mention',
|
||||
userId: params.senderUserId,
|
||||
displayText: params.senderNickname,
|
||||
},
|
||||
{ kind: 'text', text: ` ${message}` },
|
||||
];
|
||||
}
|
||||
|
||||
private translateUserError(err: DakaoUserError): string {
|
||||
switch (err.code) {
|
||||
case 'invalid_project_id':
|
||||
return '커뮤니티 식별자가 올바르지 않습니다.';
|
||||
case 'community_not_found':
|
||||
return '연결된 커뮤니티를 찾을 수 없습니다.';
|
||||
case 'riot_account_not_found':
|
||||
return `등록된 라이엇 계정을 찾을 수 없습니다 (${err.detail ?? ''}). 먼저 !내전 계정등록 <닉네임>#<태그> 로 계정을 등록해주세요.`;
|
||||
case 'riot_account_already_registered':
|
||||
return `이미 등록된 라이엇 계정이 있습니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_conflict':
|
||||
return `이미 다른 사용자가 등록한 라이엇 계정입니다 (${err.detail ?? ''}).`;
|
||||
case 'riot_account_lookup_failed':
|
||||
return '라이엇 계정 조회 중 오류가 발생했습니다. 잠시 후 다시 시도해주세요.';
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -121,6 +121,25 @@ describe('parseCommand', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('parses primary account change command', () => {
|
||||
expect(parseCommand('!내전 대표계정변경 프리리#KR1')).toEqual({
|
||||
kind: 'primary-account-change',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('normalizes primary account change riot id', () => {
|
||||
const decomposedGameName = '프리리'.normalize('NFD');
|
||||
expect(
|
||||
parseCommand(`!내전 대표계정변경 ${decomposedGameName}\u200B#KR1\uFEFF`),
|
||||
).toEqual({
|
||||
kind: 'primary-account-change',
|
||||
gameName: '프리리',
|
||||
tagLine: 'KR1',
|
||||
});
|
||||
});
|
||||
|
||||
it('normalizes account register riot id', () => {
|
||||
const decomposedGameName = '프리리'.normalize('NFD');
|
||||
expect(
|
||||
@@ -136,6 +155,10 @@ describe('parseCommand', () => {
|
||||
expect(() => parseCommand('안녕하세요')).toThrow(/not_a_command/);
|
||||
});
|
||||
|
||||
it('throws usage for bare command prefix', () => {
|
||||
expect(() => parseCommand('!내전')).toThrow(/usage/);
|
||||
});
|
||||
|
||||
it('throws unknown_command for unrecognized subcommands', () => {
|
||||
expect(() => parseCommand('!내전 폭파')).toThrow(/unknown_command/);
|
||||
});
|
||||
|
||||
@@ -12,6 +12,11 @@ export type DakaoCommand =
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
| {
|
||||
kind: 'primary-account-change';
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
}
|
||||
| {
|
||||
kind: 'match-join';
|
||||
matchAndRiotId: string;
|
||||
@@ -70,6 +75,8 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
||||
return parseCancelArgs(args);
|
||||
case '계정등록':
|
||||
return parseAccountRegisterArgs(args);
|
||||
case '대표계정변경':
|
||||
return parsePrimaryAccountChangeArgs(args);
|
||||
case '선호포지션등록':
|
||||
case '포지션등록':
|
||||
return parsePreferredPositionRegisterArgs(args);
|
||||
@@ -79,6 +86,24 @@ export function parseCommand(rawMessage: string): DakaoCommand {
|
||||
}
|
||||
|
||||
function parseAccountRegisterArgs(args: string): DakaoCommand {
|
||||
const riotId = parseRiotIdArgs(args);
|
||||
return {
|
||||
kind: 'account-register',
|
||||
gameName: riotId.gameName,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
|
||||
function parsePrimaryAccountChangeArgs(args: string): DakaoCommand {
|
||||
const riotId = parseRiotIdArgs(args);
|
||||
return {
|
||||
kind: 'primary-account-change',
|
||||
gameName: riotId.gameName,
|
||||
tagLine: riotId.tagLine,
|
||||
};
|
||||
}
|
||||
|
||||
function parseRiotIdArgs(args: string): { gameName: string; tagLine: string } {
|
||||
if (args.length === 0) {
|
||||
throw new CommandParseError('usage');
|
||||
}
|
||||
@@ -94,11 +119,7 @@ function parseAccountRegisterArgs(args: string): DakaoCommand {
|
||||
throw new CommandParseError('invalid_riot_id', args);
|
||||
}
|
||||
|
||||
return {
|
||||
kind: 'account-register',
|
||||
gameName,
|
||||
tagLine,
|
||||
};
|
||||
return { gameName, tagLine };
|
||||
}
|
||||
|
||||
function parseCancelArgs(args: string): DakaoCommand {
|
||||
|
||||
@@ -7,7 +7,7 @@ describe('resolveMongoDbName', () => {
|
||||
|
||||
it('uses isolated databases for non-production environments', () => {
|
||||
expect(resolveMongoDbName('dev')).toBe('lolympus-dev');
|
||||
expect(resolveMongoDbName('test')).toBe('lolympus-test');
|
||||
expect(resolveMongoDbName('staging')).toBe('lolympus-staging');
|
||||
expect(resolveMongoDbName('')).toBe('lolympus-dev');
|
||||
expect(resolveMongoDbName('local')).toBe('lolympus-dev');
|
||||
});
|
||||
|
||||
@@ -5,7 +5,7 @@ import { tournamentModelDefinitions, TournamentModelTypes } from './schema';
|
||||
|
||||
export function resolveMongoDbName(nodeEnv = process.env.NODE_ENV): string {
|
||||
if (nodeEnv === 'prod') return 'lolympus';
|
||||
if (nodeEnv === 'test') return 'lolympus-test';
|
||||
if (nodeEnv === 'staging') return 'lolympus-staging';
|
||||
return 'lolympus-dev';
|
||||
}
|
||||
|
||||
|
||||
@@ -121,7 +121,7 @@ function parseArgs(argv: string[]): CliOptions {
|
||||
}
|
||||
if (arg === '--env') {
|
||||
const value = argv[index + 1];
|
||||
if (!value) throw new Error('--env requires dev, test, or prod.');
|
||||
if (!value) throw new Error('--env requires dev, staging, or prod.');
|
||||
nodeEnv = value;
|
||||
index += 1;
|
||||
continue;
|
||||
@@ -164,8 +164,8 @@ function parseArgs(argv: string[]): CliOptions {
|
||||
throw new Error(`Unknown argument: ${arg}`);
|
||||
}
|
||||
|
||||
if (!['dev', 'test', 'prod'].includes(nodeEnv)) {
|
||||
throw new Error('--env must be dev, test, or prod.');
|
||||
if (!['dev', 'staging', 'prod'].includes(nodeEnv)) {
|
||||
throw new Error('--env must be dev, staging, or prod.');
|
||||
}
|
||||
if (communityId && !mongoose.isValidObjectId(communityId)) {
|
||||
throw new Error('--community-id must be a valid ObjectId.');
|
||||
@@ -198,7 +198,7 @@ function printHelp() {
|
||||
Options:
|
||||
--community-id <id> Community ObjectId. Defaults to env or first community.
|
||||
--dry-run Print the payload summary without writing.
|
||||
--env <env> dev | test | prod. Default: NODE_ENV or dev.
|
||||
--env <env> dev | staging | prod. Default: NODE_ENV or dev.
|
||||
--replace Delete previous temp matches created by this script first.
|
||||
--scheduled-at <iso> Scheduled date. Default: yesterday.
|
||||
--title <title> Match title. Default: timestamped temp title.
|
||||
|
||||
+680
@@ -0,0 +1,680 @@
|
||||
import 'reflect-metadata';
|
||||
import { Module } from '@nestjs/common';
|
||||
import { ConfigModule } from '@nestjs/config';
|
||||
import { NestFactory } from '@nestjs/core';
|
||||
import mongoose from 'mongoose';
|
||||
import { readFile } from 'node:fs/promises';
|
||||
import { resolve } from 'node:path';
|
||||
import {
|
||||
ConnectionService,
|
||||
resolveMongoDbName,
|
||||
} from '../connection.service';
|
||||
import type {
|
||||
MatchDocument,
|
||||
MatchGameAssignment,
|
||||
MatchGameResult,
|
||||
MatchSeriesResult,
|
||||
TournamentCodeDocument,
|
||||
} from '../schema';
|
||||
import { SecretModule } from '../../secret/secret.module';
|
||||
import { MatchStatsFragmentBuilder } from '../../../community-stats/match-stats-fragment.builder';
|
||||
import { MatchStatsRepository } from '../../../community-stats/match-stats.repository';
|
||||
import { MatchStatsService } from '../../../community-stats/match-stats.service';
|
||||
|
||||
interface CliOptions {
|
||||
dryRun: boolean;
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
maxRounds: number;
|
||||
nodeEnv: string;
|
||||
}
|
||||
|
||||
interface ResultGamePlan {
|
||||
oldGameNumber: number;
|
||||
newGameNumber: number;
|
||||
roundNumber: number;
|
||||
teamAIndex: number;
|
||||
teamBIndex: number;
|
||||
game: MatchGameResult;
|
||||
}
|
||||
|
||||
interface RepairPlan {
|
||||
schedule: MatchGameAssignment[];
|
||||
gamePlans: ResultGamePlan[];
|
||||
seriesResults: MatchSeriesResult[];
|
||||
winnerTeamIndex?: number;
|
||||
usedCodeByOldGameNumber: Map<number, TournamentCodeDocument>;
|
||||
releasedCodes: TournamentCodeDocument[];
|
||||
}
|
||||
|
||||
@Module({
|
||||
imports: [
|
||||
ConfigModule.forRoot({
|
||||
isGlobal: true,
|
||||
envFilePath: [
|
||||
resolve(__dirname, '../../../../../../project.env'),
|
||||
resolve(process.cwd(), '../project.env'),
|
||||
resolve(process.cwd(), 'apps/project.env'),
|
||||
resolve(process.cwd(), 'project.env'),
|
||||
],
|
||||
}),
|
||||
SecretModule,
|
||||
],
|
||||
providers: [
|
||||
ConnectionService,
|
||||
MatchStatsFragmentBuilder,
|
||||
MatchStatsRepository,
|
||||
MatchStatsService,
|
||||
],
|
||||
})
|
||||
class RepairModule {}
|
||||
|
||||
async function loadMachineEnvFile() {
|
||||
const homeDir = process.env.HOME ?? process.env.USERPROFILE;
|
||||
if (!homeDir) return;
|
||||
|
||||
const machineEnvFile = resolve(homeDir, 'source/global-env-vars.txt');
|
||||
|
||||
try {
|
||||
const file = await readFile(machineEnvFile, 'utf8');
|
||||
for (const rawLine of file.split(/\r?\n/)) {
|
||||
const line = rawLine.trim();
|
||||
if (!line || line.startsWith('#')) continue;
|
||||
|
||||
const matched = line.match(/^([A-Za-z_][A-Za-z0-9_]*)\s*=\s*(.*)$/);
|
||||
if (!matched) continue;
|
||||
|
||||
const [, key, rawValue] = matched;
|
||||
process.env[key] = rawValue.replace(/^["']|["']$/g, '');
|
||||
}
|
||||
} catch {
|
||||
// 로컬 machine env 파일이 없으면 그냥 지나간다.
|
||||
}
|
||||
}
|
||||
|
||||
function parseArgs(argv: string[]): CliOptions {
|
||||
let dryRun = true;
|
||||
let matchId: mongoose.Types.ObjectId | undefined;
|
||||
let maxRounds = 3;
|
||||
let nodeEnv = process.env.NODE_ENV ?? 'dev';
|
||||
|
||||
for (let index = 0; index < argv.length; index += 1) {
|
||||
const arg = argv[index];
|
||||
if (arg === '--apply') {
|
||||
dryRun = false;
|
||||
continue;
|
||||
}
|
||||
if (arg === '--dry-run') {
|
||||
dryRun = true;
|
||||
continue;
|
||||
}
|
||||
if (arg === '--match-id') {
|
||||
const value = argv[index + 1];
|
||||
if (!value || !mongoose.isValidObjectId(value)) {
|
||||
throw new Error('--match-id requires a valid ObjectId.');
|
||||
}
|
||||
matchId = new mongoose.Types.ObjectId(value);
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--match-id=')) {
|
||||
const value = arg.slice('--match-id='.length);
|
||||
if (!mongoose.isValidObjectId(value)) {
|
||||
throw new Error('--match-id requires a valid ObjectId.');
|
||||
}
|
||||
matchId = new mongoose.Types.ObjectId(value);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--max-rounds') {
|
||||
maxRounds = parsePositiveInteger(argv[index + 1], '--max-rounds');
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--max-rounds=')) {
|
||||
maxRounds = parsePositiveInteger(
|
||||
arg.slice('--max-rounds='.length),
|
||||
'--max-rounds',
|
||||
);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--env') {
|
||||
const value = argv[index + 1];
|
||||
if (!value) throw new Error('--env requires dev, staging, or prod.');
|
||||
nodeEnv = value;
|
||||
index += 1;
|
||||
continue;
|
||||
}
|
||||
if (arg.startsWith('--env=')) {
|
||||
nodeEnv = arg.slice('--env='.length);
|
||||
continue;
|
||||
}
|
||||
if (arg === '--help' || arg === '-h') {
|
||||
printHelp();
|
||||
process.exit(0);
|
||||
}
|
||||
throw new Error(`Unknown argument: ${arg}`);
|
||||
}
|
||||
|
||||
if (!matchId) throw new Error('--match-id is required.');
|
||||
if (!['dev', 'staging', 'prod'].includes(nodeEnv)) {
|
||||
throw new Error('--env must be dev, staging, or prod.');
|
||||
}
|
||||
|
||||
return { dryRun, matchId, maxRounds, nodeEnv };
|
||||
}
|
||||
|
||||
function parsePositiveInteger(value: string | undefined, label: string) {
|
||||
const parsed = Number(value);
|
||||
if (!Number.isInteger(parsed) || parsed < 1) {
|
||||
throw new Error(`${label} requires a positive integer.`);
|
||||
}
|
||||
return parsed;
|
||||
}
|
||||
|
||||
function printHelp() {
|
||||
console.log(`Usage:
|
||||
pnpm --filter api exec ts-node src/modules/global/database/migrations/repair-limited-round-robin-finished-match.ts --match-id <id> --max-rounds 3 --dry-run
|
||||
pnpm --filter api exec ts-node src/modules/global/database/migrations/repair-limited-round-robin-finished-match.ts --match-id <id> --max-rounds 3 --env prod --apply
|
||||
|
||||
Options:
|
||||
--match-id <id> Match ObjectId to repair.
|
||||
--max-rounds <n> Number of round-robin rounds to keep. Default: 3.
|
||||
--dry-run Print the repair plan without writing. Default.
|
||||
--apply Apply match, tournament code, and stats updates.
|
||||
--env <env> dev | staging | prod. Default: NODE_ENV or dev.
|
||||
`);
|
||||
}
|
||||
|
||||
async function main() {
|
||||
const options = parseArgs(process.argv.slice(2));
|
||||
process.env.NODE_ENV = options.nodeEnv;
|
||||
await loadMachineEnvFile();
|
||||
|
||||
const app = await NestFactory.createApplicationContext(RepairModule, {
|
||||
logger: ['log', 'warn', 'error'],
|
||||
});
|
||||
|
||||
try {
|
||||
const connectionService = app.get(ConnectionService);
|
||||
const matchStatsService = app.get(MatchStatsService);
|
||||
const MatchModel = await connectionService.getModel('match');
|
||||
const TournamentCodeModel =
|
||||
await connectionService.getModel('tournamentCode');
|
||||
const match = await MatchModel.findById(options.matchId).exec();
|
||||
if (!match) {
|
||||
throw new Error(`Match not found: ${options.matchId.toString()}`);
|
||||
}
|
||||
|
||||
const codes = await TournamentCodeModel.find({
|
||||
_id: { $in: match.tournamentCodeIds ?? [] },
|
||||
})
|
||||
.sort({ gameNumber: 1, reservedAt: 1, _id: 1 })
|
||||
.exec();
|
||||
const plan = buildRepairPlan(match, codes, options.maxRounds);
|
||||
|
||||
printPlan(options, match, codes, plan);
|
||||
|
||||
if (options.dryRun) {
|
||||
console.log('No writes were made. Re-run with --apply to update MongoDB.');
|
||||
return;
|
||||
}
|
||||
|
||||
const now = new Date();
|
||||
const session = await (await connectionService.getConnection()).startSession();
|
||||
try {
|
||||
await session.withTransaction(async () => {
|
||||
await applyTournamentCodeUpdates(plan, now, session);
|
||||
await MatchModel.updateOne(
|
||||
{ _id: match._id },
|
||||
{
|
||||
$set: {
|
||||
status: 'finished',
|
||||
roundRobinMaxRounds: options.maxRounds,
|
||||
gameSchedule: plan.schedule,
|
||||
tournamentCodeIds: [
|
||||
...plan.usedCodeByOldGameNumber.values(),
|
||||
].map((code) => code._id),
|
||||
resultPollState: {
|
||||
startedAt: match.resultPollState?.startedAt ?? now,
|
||||
lastPolledAt: now,
|
||||
lastPollOutcome: 'matched',
|
||||
matchedCount: plan.gamePlans.length,
|
||||
expandedToAllPuuids: true,
|
||||
state: 'complete',
|
||||
},
|
||||
result: {
|
||||
winnerTeamIndex: plan.winnerTeamIndex,
|
||||
mvpUserId: match.result?.mvpUserId,
|
||||
riotMatchIds: plan.gamePlans.map(
|
||||
(gamePlan) => gamePlan.game.riotMatchId,
|
||||
),
|
||||
games: plan.gamePlans.map((gamePlan) => ({
|
||||
...toPlainGame(gamePlan.game),
|
||||
gameNumber: gamePlan.newGameNumber,
|
||||
})),
|
||||
seriesResults: plan.seriesResults,
|
||||
},
|
||||
},
|
||||
},
|
||||
{ session },
|
||||
).exec();
|
||||
});
|
||||
} finally {
|
||||
await session.endSession();
|
||||
}
|
||||
|
||||
await matchStatsService.buildAndUpsert(match._id);
|
||||
console.log('Repair applied and match stats rebuilt.');
|
||||
} finally {
|
||||
await app.close();
|
||||
await mongoose.disconnect();
|
||||
}
|
||||
}
|
||||
|
||||
function buildRepairPlan(
|
||||
match: MatchDocument,
|
||||
codes: TournamentCodeDocument[],
|
||||
maxRounds: number,
|
||||
): RepairPlan {
|
||||
if (match.gameMode !== 'round-robin') {
|
||||
throw new Error(`Expected round-robin match, got ${match.gameMode}.`);
|
||||
}
|
||||
|
||||
const games = [...(match.result?.games ?? [])]
|
||||
.map(toPlainGame)
|
||||
.sort((left, right) => left.gameNumber - right.gameNumber);
|
||||
if (games.length === 0) {
|
||||
throw new Error('Match has no result games to preserve.');
|
||||
}
|
||||
|
||||
const teamIndexes = [...new Set(match.teams.map((team) => team.teamIndex))]
|
||||
.filter((teamIndex) => Number.isInteger(teamIndex) && teamIndex > 0)
|
||||
.sort((left, right) => left - right);
|
||||
if (teamIndexes.length < 2) {
|
||||
throw new Error('Match needs at least two teams.');
|
||||
}
|
||||
if (teamIndexes.length % 2 !== 0) {
|
||||
throw new Error('This repair script currently expects an even team count.');
|
||||
}
|
||||
|
||||
const gamesPerRound = teamIndexes.length / 2;
|
||||
const requiredGames = gamesPerRound * maxRounds;
|
||||
if (games.length !== requiredGames) {
|
||||
throw new Error(
|
||||
`Expected ${requiredGames} result games for ${maxRounds} rounds and ${teamIndexes.length} teams, got ${games.length}.`,
|
||||
);
|
||||
}
|
||||
|
||||
validateResultGames(games, teamIndexes);
|
||||
const rounds = partitionIntoRounds(games, teamIndexes, maxRounds);
|
||||
const gamePlans = rounds.flatMap((roundGames, roundIndex) =>
|
||||
sortRoundGames(roundGames).map((game, gameIndex) => ({
|
||||
oldGameNumber: game.gameNumber,
|
||||
newGameNumber: roundIndex * gamesPerRound + gameIndex + 1,
|
||||
roundNumber: roundIndex + 1,
|
||||
teamAIndex: Math.min(game.blueTeamIndex, game.redTeamIndex),
|
||||
teamBIndex: Math.max(game.blueTeamIndex, game.redTeamIndex),
|
||||
game,
|
||||
})),
|
||||
);
|
||||
|
||||
const schedule = gamePlans.map(
|
||||
({ newGameNumber, roundNumber, teamAIndex, teamBIndex }) => ({
|
||||
gameNumber: newGameNumber,
|
||||
roundNumber,
|
||||
teamAIndex,
|
||||
teamBIndex,
|
||||
}),
|
||||
);
|
||||
|
||||
const usedOldGameNumbers = new Set(
|
||||
gamePlans.map((gamePlan) => gamePlan.oldGameNumber),
|
||||
);
|
||||
const usedCodeByOldGameNumber = resolveUsedCodesByOldGameNumber(
|
||||
codes,
|
||||
gamePlans,
|
||||
);
|
||||
const releasedCodes = codes.filter(
|
||||
(code) => !usedOldGameNumbers.has(code.gameNumber ?? 0),
|
||||
);
|
||||
const unsafeReleased = releasedCodes.filter((code) => code.state === 'used');
|
||||
if (unsafeReleased.length > 0) {
|
||||
throw new Error(
|
||||
`Refusing to release used tournament codes without matching result games: ${unsafeReleased
|
||||
.map((code) => formatCode(code))
|
||||
.join(', ')}`,
|
||||
);
|
||||
}
|
||||
|
||||
const updatedGames = gamePlans.map((gamePlan) => ({
|
||||
...toPlainGame(gamePlan.game),
|
||||
gameNumber: gamePlan.newGameNumber,
|
||||
}));
|
||||
const seriesResults = buildSeriesResults(updatedGames);
|
||||
|
||||
return {
|
||||
schedule,
|
||||
gamePlans,
|
||||
seriesResults,
|
||||
winnerTeamIndex: resolveMatchWinnerTeamIndex(seriesResults),
|
||||
usedCodeByOldGameNumber,
|
||||
releasedCodes,
|
||||
};
|
||||
}
|
||||
|
||||
function validateResultGames(games: MatchGameResult[], teamIndexes: number[]) {
|
||||
const validTeamIndexes = new Set(teamIndexes);
|
||||
const pairKeys = new Set<string>();
|
||||
const gameNumbers = new Set<number>();
|
||||
|
||||
for (const game of games) {
|
||||
if (gameNumbers.has(game.gameNumber)) {
|
||||
throw new Error(`Duplicate result gameNumber: ${game.gameNumber}.`);
|
||||
}
|
||||
gameNumbers.add(game.gameNumber);
|
||||
|
||||
if (!validTeamIndexes.has(game.blueTeamIndex)) {
|
||||
throw new Error(`Invalid blueTeamIndex ${game.blueTeamIndex}.`);
|
||||
}
|
||||
if (!validTeamIndexes.has(game.redTeamIndex)) {
|
||||
throw new Error(`Invalid redTeamIndex ${game.redTeamIndex}.`);
|
||||
}
|
||||
if (game.blueTeamIndex === game.redTeamIndex) {
|
||||
throw new Error(`Game ${game.gameNumber} has the same team twice.`);
|
||||
}
|
||||
|
||||
const key = pairKey(game);
|
||||
if (pairKeys.has(key)) {
|
||||
throw new Error(`Duplicate team pair in results: ${key}.`);
|
||||
}
|
||||
pairKeys.add(key);
|
||||
}
|
||||
}
|
||||
|
||||
function partitionIntoRounds(
|
||||
games: MatchGameResult[],
|
||||
teamIndexes: number[],
|
||||
maxRounds: number,
|
||||
): MatchGameResult[][] {
|
||||
const targetPerRound = teamIndexes.length / 2;
|
||||
const unused = new Set(games.map((game) => game.gameNumber));
|
||||
const byGameNumber = new Map(games.map((game) => [game.gameNumber, game]));
|
||||
const rounds: MatchGameResult[][] = [];
|
||||
|
||||
function fillRound(roundIndex: number): boolean {
|
||||
if (roundIndex === maxRounds) return unused.size === 0;
|
||||
|
||||
const candidates = enumerateRoundCandidates(
|
||||
[...unused]
|
||||
.map((gameNumber) => byGameNumber.get(gameNumber))
|
||||
.filter((game): game is MatchGameResult => Boolean(game)),
|
||||
teamIndexes,
|
||||
targetPerRound,
|
||||
);
|
||||
|
||||
for (const candidate of candidates) {
|
||||
for (const game of candidate) unused.delete(game.gameNumber);
|
||||
rounds[roundIndex] = candidate;
|
||||
if (fillRound(roundIndex + 1)) return true;
|
||||
for (const game of candidate) unused.add(game.gameNumber);
|
||||
}
|
||||
|
||||
rounds.length = roundIndex;
|
||||
return false;
|
||||
}
|
||||
|
||||
if (!fillRound(0)) {
|
||||
throw new Error('Could not partition result games into simultaneous rounds.');
|
||||
}
|
||||
|
||||
return rounds;
|
||||
}
|
||||
|
||||
function enumerateRoundCandidates(
|
||||
availableGames: MatchGameResult[],
|
||||
teamIndexes: number[],
|
||||
targetPerRound: number,
|
||||
): MatchGameResult[][] {
|
||||
const candidates: MatchGameResult[][] = [];
|
||||
|
||||
function visit(usedTeams: Set<number>, chosen: MatchGameResult[]) {
|
||||
if (chosen.length === targetPerRound) {
|
||||
candidates.push([...chosen]);
|
||||
return;
|
||||
}
|
||||
|
||||
const nextTeam = teamIndexes.find((teamIndex) => !usedTeams.has(teamIndex));
|
||||
if (!nextTeam) return;
|
||||
|
||||
const nextGames = availableGames
|
||||
.filter((game) => {
|
||||
if (!includesTeam(game, nextTeam)) return false;
|
||||
return (
|
||||
!usedTeams.has(game.blueTeamIndex) &&
|
||||
!usedTeams.has(game.redTeamIndex)
|
||||
);
|
||||
})
|
||||
.sort((left, right) => left.gameNumber - right.gameNumber);
|
||||
|
||||
for (const game of nextGames) {
|
||||
chosen.push(game);
|
||||
usedTeams.add(game.blueTeamIndex);
|
||||
usedTeams.add(game.redTeamIndex);
|
||||
visit(usedTeams, chosen);
|
||||
usedTeams.delete(game.blueTeamIndex);
|
||||
usedTeams.delete(game.redTeamIndex);
|
||||
chosen.pop();
|
||||
}
|
||||
}
|
||||
|
||||
visit(new Set<number>(), []);
|
||||
return candidates;
|
||||
}
|
||||
|
||||
function sortRoundGames(games: MatchGameResult[]) {
|
||||
return [...games].sort(
|
||||
(left, right) =>
|
||||
Math.min(left.blueTeamIndex, left.redTeamIndex) -
|
||||
Math.min(right.blueTeamIndex, right.redTeamIndex) ||
|
||||
Math.max(left.blueTeamIndex, left.redTeamIndex) -
|
||||
Math.max(right.blueTeamIndex, right.redTeamIndex),
|
||||
);
|
||||
}
|
||||
|
||||
function resolveUsedCodesByOldGameNumber(
|
||||
codes: TournamentCodeDocument[],
|
||||
gamePlans: ResultGamePlan[],
|
||||
): Map<number, TournamentCodeDocument> {
|
||||
const byGameNumber = new Map<number, TournamentCodeDocument[]>();
|
||||
for (const code of codes) {
|
||||
if (!code.gameNumber) continue;
|
||||
const existing = byGameNumber.get(code.gameNumber) ?? [];
|
||||
existing.push(code);
|
||||
byGameNumber.set(code.gameNumber, existing);
|
||||
}
|
||||
|
||||
const result = new Map<number, TournamentCodeDocument>();
|
||||
for (const gamePlan of gamePlans) {
|
||||
const candidates = byGameNumber.get(gamePlan.oldGameNumber) ?? [];
|
||||
if (candidates.length !== 1) {
|
||||
throw new Error(
|
||||
`Expected exactly one tournament code for old game ${gamePlan.oldGameNumber}, got ${candidates.length}.`,
|
||||
);
|
||||
}
|
||||
const [code] = candidates;
|
||||
if (code.riotMatchId && code.riotMatchId !== gamePlan.game.riotMatchId) {
|
||||
throw new Error(
|
||||
`Tournament code ${formatCode(code)} has riotMatchId ${code.riotMatchId}, expected ${gamePlan.game.riotMatchId}.`,
|
||||
);
|
||||
}
|
||||
result.set(gamePlan.oldGameNumber, code);
|
||||
}
|
||||
|
||||
return result;
|
||||
}
|
||||
|
||||
async function applyTournamentCodeUpdates(
|
||||
plan: RepairPlan,
|
||||
now: Date,
|
||||
session: mongoose.ClientSession,
|
||||
) {
|
||||
const usedOperations = plan.gamePlans.map((gamePlan) => {
|
||||
const code = plan.usedCodeByOldGameNumber.get(gamePlan.oldGameNumber);
|
||||
if (!code) {
|
||||
throw new Error(`Missing tournament code for ${gamePlan.oldGameNumber}.`);
|
||||
}
|
||||
return code.updateOne(
|
||||
{
|
||||
$set: {
|
||||
state: 'used',
|
||||
gameNumber: gamePlan.newGameNumber,
|
||||
riotMatchId: gamePlan.game.riotMatchId,
|
||||
usedAt: resolveGameEndedAt(gamePlan.game),
|
||||
},
|
||||
$unset: {
|
||||
releasedAt: '',
|
||||
},
|
||||
},
|
||||
{ session },
|
||||
);
|
||||
});
|
||||
|
||||
const releasedOperations = plan.releasedCodes.map((code) =>
|
||||
code.updateOne(
|
||||
{
|
||||
$set: {
|
||||
state: 'released',
|
||||
releasedAt: now,
|
||||
},
|
||||
$unset: {
|
||||
matchId: '',
|
||||
gameNumber: '',
|
||||
reservedAt: '',
|
||||
usedAt: '',
|
||||
riotMatchId: '',
|
||||
},
|
||||
},
|
||||
{ session },
|
||||
),
|
||||
);
|
||||
|
||||
await Promise.all([...usedOperations, ...releasedOperations]);
|
||||
}
|
||||
|
||||
function buildSeriesResults(games: MatchGameResult[]): MatchSeriesResult[] {
|
||||
const bySeries = new Map<string, MatchSeriesResult>();
|
||||
for (const game of games) {
|
||||
const teamAIndex = Math.min(game.blueTeamIndex, game.redTeamIndex);
|
||||
const teamBIndex = Math.max(game.blueTeamIndex, game.redTeamIndex);
|
||||
const key = `${teamAIndex}:${teamBIndex}`;
|
||||
const current =
|
||||
bySeries.get(key) ??
|
||||
({
|
||||
teamAIndex,
|
||||
teamBIndex,
|
||||
teamAWins: 0,
|
||||
teamBWins: 0,
|
||||
} satisfies MatchSeriesResult);
|
||||
if (game.winnerTeamIndex === teamAIndex) current.teamAWins += 1;
|
||||
if (game.winnerTeamIndex === teamBIndex) current.teamBWins += 1;
|
||||
current.winnerTeamIndex =
|
||||
current.teamAWins > current.teamBWins
|
||||
? teamAIndex
|
||||
: current.teamBWins > current.teamAWins
|
||||
? teamBIndex
|
||||
: undefined;
|
||||
bySeries.set(key, current);
|
||||
}
|
||||
return [...bySeries.values()].sort(
|
||||
(left, right) =>
|
||||
left.teamAIndex - right.teamAIndex ||
|
||||
left.teamBIndex - right.teamBIndex,
|
||||
);
|
||||
}
|
||||
|
||||
function resolveMatchWinnerTeamIndex(seriesResults: MatchSeriesResult[]) {
|
||||
const winsByTeam = new Map<number, number>();
|
||||
for (const series of seriesResults) {
|
||||
if (!series.winnerTeamIndex) continue;
|
||||
winsByTeam.set(
|
||||
series.winnerTeamIndex,
|
||||
(winsByTeam.get(series.winnerTeamIndex) ?? 0) + 1,
|
||||
);
|
||||
}
|
||||
|
||||
const sorted = [...winsByTeam.entries()].sort(
|
||||
(left, right) => right[1] - left[1],
|
||||
);
|
||||
if (sorted.length === 0) return undefined;
|
||||
if (sorted.length > 1 && sorted[0][1] === sorted[1][1]) return undefined;
|
||||
return sorted[0][0];
|
||||
}
|
||||
|
||||
function printPlan(
|
||||
options: CliOptions,
|
||||
match: MatchDocument,
|
||||
codes: TournamentCodeDocument[],
|
||||
plan: RepairPlan,
|
||||
) {
|
||||
console.log(
|
||||
`[limited round-robin repair] mode=${options.dryRun ? 'dry-run' : 'apply'} env=${options.nodeEnv} db=${resolveMongoDbName(options.nodeEnv)}`,
|
||||
);
|
||||
console.log(
|
||||
`[limited round-robin repair] match=${match._id.toString()} title="${match.title}"`,
|
||||
);
|
||||
console.log(
|
||||
`[limited round-robin repair] status ${match.status} -> finished, maxRounds=${options.maxRounds}`,
|
||||
);
|
||||
console.log(
|
||||
`[limited round-robin repair] resultGames=${plan.gamePlans.length} codes kept=${plan.usedCodeByOldGameNumber.size} codes released=${plan.releasedCodes.length} previousCodeIds=${codes.length}`,
|
||||
);
|
||||
console.log(
|
||||
`[limited round-robin repair] winnerTeamIndex=${plan.winnerTeamIndex ?? '(tie)'}`,
|
||||
);
|
||||
|
||||
for (const gamePlan of plan.gamePlans) {
|
||||
console.log(
|
||||
` R${gamePlan.roundNumber} G${gamePlan.newGameNumber}: ${gamePlan.teamAIndex}팀 vs ${gamePlan.teamBIndex}팀 (old G${gamePlan.oldGameNumber}, riot=${gamePlan.game.riotMatchId})`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function toPlainGame(game: MatchGameResult): MatchGameResult {
|
||||
const maybeSubdocument = game as unknown as {
|
||||
toObject?: () => MatchGameResult;
|
||||
};
|
||||
const objectValue =
|
||||
typeof maybeSubdocument.toObject === 'function'
|
||||
? maybeSubdocument.toObject()
|
||||
: game;
|
||||
return {
|
||||
...objectValue,
|
||||
participants: [...(objectValue.participants ?? [])],
|
||||
};
|
||||
}
|
||||
|
||||
function includesTeam(game: MatchGameResult, teamIndex: number) {
|
||||
return game.blueTeamIndex === teamIndex || game.redTeamIndex === teamIndex;
|
||||
}
|
||||
|
||||
function pairKey(game: MatchGameResult) {
|
||||
const teamAIndex = Math.min(game.blueTeamIndex, game.redTeamIndex);
|
||||
const teamBIndex = Math.max(game.blueTeamIndex, game.redTeamIndex);
|
||||
return `${teamAIndex}:${teamBIndex}`;
|
||||
}
|
||||
|
||||
function resolveGameEndedAt(game: MatchGameResult) {
|
||||
return new Date(game.gameCreation + game.gameDuration * 1000);
|
||||
}
|
||||
|
||||
function formatCode(code: TournamentCodeDocument) {
|
||||
return `${code._id.toString()}(gameNumber=${code.gameNumber ?? 'none'}, state=${code.state})`;
|
||||
}
|
||||
|
||||
void main()
|
||||
.then(() => {
|
||||
process.exit(0);
|
||||
})
|
||||
.catch((error: unknown) => {
|
||||
console.error(error instanceof Error ? error.message : error);
|
||||
process.exit(1);
|
||||
});
|
||||
@@ -71,7 +71,7 @@ function parseArgs(argv: string[]): CliOptions {
|
||||
}
|
||||
if (arg === '--env') {
|
||||
const value = argv[index + 1];
|
||||
if (!value) throw new Error('--env requires dev, test, or prod.');
|
||||
if (!value) throw new Error('--env requires dev, staging, or prod.');
|
||||
nodeEnv = value;
|
||||
index += 1;
|
||||
continue;
|
||||
@@ -104,8 +104,8 @@ function parseArgs(argv: string[]): CliOptions {
|
||||
throw new Error(`Unknown argument: ${arg}`);
|
||||
}
|
||||
|
||||
if (!['dev', 'test', 'prod'].includes(nodeEnv)) {
|
||||
throw new Error('--env must be dev, test, or prod.');
|
||||
if (!['dev', 'staging', 'prod'].includes(nodeEnv)) {
|
||||
throw new Error('--env must be dev, staging, or prod.');
|
||||
}
|
||||
|
||||
return { dryRun, limit, nodeEnv };
|
||||
@@ -119,7 +119,7 @@ function printHelp() {
|
||||
Options:
|
||||
--dry-run Print affected counts without writing. Default.
|
||||
--apply Apply updates to MongoDB.
|
||||
--env <env> dev | test | prod. Default: NODE_ENV or dev.
|
||||
--env <env> dev | staging | prod. Default: NODE_ENV or dev.
|
||||
--limit <n> Only scan first n documents per collection.
|
||||
`);
|
||||
}
|
||||
@@ -130,7 +130,9 @@ async function main() {
|
||||
await loadMachineEnvFile();
|
||||
|
||||
const app = await NestFactory.createApplicationContext(MigrationModule, {
|
||||
logger: options.dryRun ? ['log', 'warn', 'error'] : ['log', 'warn', 'error'],
|
||||
logger: options.dryRun
|
||||
? ['log', 'warn', 'error']
|
||||
: ['log', 'warn', 'error'],
|
||||
});
|
||||
|
||||
try {
|
||||
@@ -145,14 +147,19 @@ async function main() {
|
||||
`[team-index migration] mode=${options.dryRun ? 'dry-run' : 'apply'} env=${options.nodeEnv} db=${dbName}`,
|
||||
);
|
||||
|
||||
const stats = await migrateTeamIndex(connection.db as Parameters<typeof migrateTeamIndex>[0], {
|
||||
dryRun: options.dryRun,
|
||||
limit: options.limit,
|
||||
});
|
||||
const stats = await migrateTeamIndex(
|
||||
connection.db as Parameters<typeof migrateTeamIndex>[0],
|
||||
{
|
||||
dryRun: options.dryRun,
|
||||
limit: options.limit,
|
||||
},
|
||||
);
|
||||
|
||||
console.table(stats);
|
||||
if (options.dryRun) {
|
||||
console.log('No writes were made. Re-run with --apply to update documents.');
|
||||
console.log(
|
||||
'No writes were made. Re-run with --apply to update documents.',
|
||||
);
|
||||
} else {
|
||||
console.log('Migration applied.');
|
||||
}
|
||||
|
||||
@@ -91,6 +91,39 @@ export const LEGACY_IMPORT_JOB_STATES: LegacyImportJobState[] = [
|
||||
'cancelled',
|
||||
];
|
||||
|
||||
export type DakaoInboundMessageState = 'processing' | 'processed' | 'failed';
|
||||
export const DAKAO_INBOUND_MESSAGE_STATES: DakaoInboundMessageState[] = [
|
||||
'processing',
|
||||
'processed',
|
||||
'failed',
|
||||
];
|
||||
|
||||
export type DakaoOutboxMessageState =
|
||||
| 'pending'
|
||||
| 'published'
|
||||
| 'sent'
|
||||
| 'failed';
|
||||
export const DAKAO_OUTBOX_MESSAGE_STATES: DakaoOutboxMessageState[] = [
|
||||
'pending',
|
||||
'published',
|
||||
'sent',
|
||||
'failed',
|
||||
];
|
||||
|
||||
export type DakaoOutboxCompensationState =
|
||||
| 'none'
|
||||
| 'pending'
|
||||
| 'completed'
|
||||
| 'failed';
|
||||
export const DAKAO_OUTBOX_COMPENSATION_STATES: DakaoOutboxCompensationState[] =
|
||||
['none', 'pending', 'completed', 'failed'];
|
||||
|
||||
export type DakaoSendResultStatus = 'succeeded' | 'failed';
|
||||
export const DAKAO_SEND_RESULT_STATUSES: DakaoSendResultStatus[] = [
|
||||
'succeeded',
|
||||
'failed',
|
||||
];
|
||||
|
||||
export interface PositionPreference {
|
||||
position: Position;
|
||||
priority: number; // 1 = 최우선, 숫자가 작을수록 높은 우선순위
|
||||
@@ -300,9 +333,61 @@ export interface CommunitySeason {
|
||||
endedAt?: Date;
|
||||
}
|
||||
|
||||
export interface DakaoInboundMessage extends MongooseTimestamps {
|
||||
consumer: string;
|
||||
projectId: string;
|
||||
chatLogLogId: string;
|
||||
state: DakaoInboundMessageState;
|
||||
attempts: number;
|
||||
processingExpiresAt?: Date;
|
||||
processedAt?: Date;
|
||||
lastError?: string;
|
||||
}
|
||||
|
||||
export interface DakaoOutboxMessage extends MongooseTimestamps {
|
||||
eventId: string;
|
||||
eventSource: string;
|
||||
type: string;
|
||||
subject: string;
|
||||
correlationId?: string;
|
||||
resultSubjects?: {
|
||||
succeeded: string;
|
||||
failed: string;
|
||||
};
|
||||
payload: Record<string, unknown>;
|
||||
state: DakaoOutboxMessageState;
|
||||
publishAttempts: number;
|
||||
publishedAt?: Date;
|
||||
terminalAt?: Date;
|
||||
resultEventId?: string;
|
||||
lastPublishError?: string;
|
||||
terminalError?: Record<string, unknown>;
|
||||
compensationState: DakaoOutboxCompensationState;
|
||||
compensationReason?: string;
|
||||
}
|
||||
|
||||
export interface DakaoSendResultEvent extends MongooseTimestamps {
|
||||
eventId: string;
|
||||
requestEventId: string;
|
||||
eventSource: string;
|
||||
requestEventSource: string;
|
||||
type: string;
|
||||
subject: string;
|
||||
status: DakaoSendResultStatus;
|
||||
correlationId?: string;
|
||||
handledAt: Date;
|
||||
providerMessageId?: string;
|
||||
error?: Record<string, unknown>;
|
||||
raw: Record<string, unknown>;
|
||||
}
|
||||
|
||||
export type CommunityDocument = HydratedDocument<Community>;
|
||||
export type IdentityDocument = HydratedDocument<Identity>;
|
||||
export type UserDocument = HydratedDocument<User>;
|
||||
export type DakaoInboundMessageDocument = HydratedDocument<DakaoInboundMessage>;
|
||||
export type DakaoOutboxMessageDocument = HydratedDocument<DakaoOutboxMessage>;
|
||||
export type DakaoSendResultEventDocument =
|
||||
HydratedDocument<DakaoSendResultEvent>;
|
||||
|
||||
// ===== RiotMatch (Riot 원본 매치 아카이브) =====
|
||||
export interface RiotMatch extends MongooseTimestamps {
|
||||
@@ -313,6 +398,8 @@ export interface RiotMatch extends MongooseTimestamps {
|
||||
queueId?: number;
|
||||
participantPuuids: string[];
|
||||
raw: Record<string, unknown>; // Riot API Match-V5 원본 응답 전체
|
||||
timeline?: Record<string, unknown>; // Riot API Match-V5 timeline 원본 응답 전체
|
||||
timelineFetchedAt?: Date;
|
||||
fetchedAt: Date;
|
||||
}
|
||||
|
||||
@@ -402,6 +489,7 @@ export interface MatchSeriesResult {
|
||||
|
||||
export interface MatchGameAssignment {
|
||||
gameNumber: number;
|
||||
roundNumber?: number;
|
||||
teamAIndex: number;
|
||||
teamBIndex: number;
|
||||
}
|
||||
@@ -439,6 +527,7 @@ export interface Match extends MongooseTimestamps {
|
||||
maxParticipants: number;
|
||||
gameCount: number;
|
||||
gameMode: MatchGameMode;
|
||||
roundRobinMaxRounds?: number;
|
||||
tournamentCodeIds: mongoose.Types.ObjectId[];
|
||||
gameSchedule: MatchGameAssignment[];
|
||||
teamBuiltAt?: Date;
|
||||
@@ -508,6 +597,7 @@ export interface AuctionPlayerSnapshot {
|
||||
profileIconId: number;
|
||||
preferredPositions: PositionPreference[];
|
||||
tiers: TierInfo[];
|
||||
tierHistory: TierHistoryEntry[];
|
||||
masteries: ChampionMasteryEntry[];
|
||||
recentStatsSummary?: RiotRecentStatsSummary;
|
||||
passCount: number;
|
||||
@@ -533,6 +623,14 @@ export interface AuctionBid {
|
||||
timestamp: Date;
|
||||
}
|
||||
|
||||
export interface AuctionChatMessage {
|
||||
id: string;
|
||||
userId?: mongoose.Types.ObjectId;
|
||||
displayName: string;
|
||||
message: string;
|
||||
sentAt: Date;
|
||||
}
|
||||
|
||||
export interface Auction extends MongooseTimestamps {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
phase: AuctionPhase;
|
||||
@@ -550,6 +648,7 @@ export interface Auction extends MongooseTimestamps {
|
||||
initialPoints: number;
|
||||
topTierThreshold: AuctionTopTierThreshold;
|
||||
manualTopTierUserIds: mongoose.Types.ObjectId[];
|
||||
chatMessages: AuctionChatMessage[];
|
||||
startedAt?: Date;
|
||||
completedAt?: Date;
|
||||
}
|
||||
@@ -569,6 +668,39 @@ export interface AuctionHistoryEntry extends MongooseTimestamps {
|
||||
export type AuctionHistoryEntryDocument = HydratedDocument<AuctionHistoryEntry>;
|
||||
|
||||
// ===== MatchStats (precomputed internal stats fragment) =====
|
||||
export interface MatchStatsRuneStyleSelection {
|
||||
styleId: number;
|
||||
perkIds: number[];
|
||||
}
|
||||
|
||||
export interface MatchStatsRunePerks {
|
||||
primaryStyle?: number;
|
||||
subStyle?: number;
|
||||
keystone?: number;
|
||||
selectedPerkIds?: number[];
|
||||
styles?: MatchStatsRuneStyleSelection[];
|
||||
statPerks?: {
|
||||
offense?: number;
|
||||
flex?: number;
|
||||
defense?: number;
|
||||
};
|
||||
}
|
||||
|
||||
export interface MatchStatsItemBuildEvent {
|
||||
timestamp: number;
|
||||
itemId: number;
|
||||
type: 'purchased' | 'sold' | 'destroyed' | 'undo';
|
||||
beforeId?: number;
|
||||
afterId?: number;
|
||||
}
|
||||
|
||||
export interface MatchStatsSkillBuildEvent {
|
||||
timestamp: number;
|
||||
skillSlot: 1 | 2 | 3 | 4;
|
||||
level: number;
|
||||
levelUpType?: string;
|
||||
}
|
||||
|
||||
export interface MatchStatsRecord {
|
||||
matchId: string;
|
||||
title: string;
|
||||
@@ -579,6 +711,7 @@ export interface MatchStatsRecord {
|
||||
gameDuration: number;
|
||||
userId: string;
|
||||
summonerName: string;
|
||||
tagLine: string;
|
||||
profileIconId: number;
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
@@ -601,10 +734,14 @@ export interface MatchStatsRecord {
|
||||
controlWardsBought: number;
|
||||
wardsPlaced: number;
|
||||
wardsKilled: number;
|
||||
firstBloodKill: boolean;
|
||||
firstBloodAssist: boolean;
|
||||
items: number[];
|
||||
trinket: number;
|
||||
summonerSpells: [number, number];
|
||||
perks: { primaryStyle?: number; subStyle?: number; keystone?: number };
|
||||
perks: MatchStatsRunePerks;
|
||||
itemBuild: MatchStatsItemBuildEvent[];
|
||||
skillBuild: MatchStatsSkillBuildEvent[];
|
||||
rating: number;
|
||||
}
|
||||
|
||||
@@ -613,16 +750,46 @@ export interface MatchStatsGameDetail {
|
||||
riotMatchId: string;
|
||||
gameCreation: number;
|
||||
gameDuration: number;
|
||||
gameVersion?: string;
|
||||
winnerSide: TeamSide;
|
||||
timeline: MatchStatsTimelinePoint[];
|
||||
timelineLoaded?: boolean;
|
||||
objectiveEvents: MatchStatsObjectiveEvent[];
|
||||
teams: Array<{
|
||||
teamIndex: number;
|
||||
side: TeamSide;
|
||||
win: boolean;
|
||||
objectives: { baron: number; dragon: number; tower: number };
|
||||
objectives: MatchStatsObjectiveSummary;
|
||||
bans: Array<{ championId: number; pickTurn: number }>;
|
||||
participants: MatchStatsRecord[];
|
||||
}>;
|
||||
}
|
||||
|
||||
export interface MatchStatsObjectiveSummary {
|
||||
tower: number;
|
||||
dragon: number;
|
||||
inhibitor: number;
|
||||
baron: number;
|
||||
riftHerald: number;
|
||||
voidGrub: number;
|
||||
elderDragon: number;
|
||||
}
|
||||
|
||||
export interface MatchStatsObjectiveEvent {
|
||||
timestamp: number;
|
||||
side: TeamSide;
|
||||
type: 'dragon' | 'elderDragon' | 'baron' | 'riftHerald' | 'voidGrub';
|
||||
monsterSubType?: string;
|
||||
}
|
||||
|
||||
export interface MatchStatsTimelinePoint {
|
||||
timestamp: number;
|
||||
blue: { gold: number; xp: number };
|
||||
red: { gold: number; xp: number };
|
||||
goldDiff: number;
|
||||
xpDiff: number;
|
||||
}
|
||||
|
||||
export interface MatchStats extends MongooseTimestamps {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
@@ -844,6 +1011,102 @@ CommunitySchema.index({ name: 1 }, { unique: true });
|
||||
CommunitySchema.index({ ownerUserId: 1 });
|
||||
CommunitySchema.index({ dakaoProjectId: 1 }, { unique: true, sparse: true });
|
||||
|
||||
export const DakaoInboundMessageSchema = new Schema<DakaoInboundMessage>(
|
||||
{
|
||||
consumer: { type: String, required: true },
|
||||
projectId: { type: String, required: true },
|
||||
chatLogLogId: { type: String, required: true },
|
||||
state: {
|
||||
type: String,
|
||||
enum: DAKAO_INBOUND_MESSAGE_STATES,
|
||||
required: true,
|
||||
default: 'processing',
|
||||
},
|
||||
attempts: { type: Number, required: true, default: 1 },
|
||||
processingExpiresAt: { type: Date },
|
||||
processedAt: { type: Date },
|
||||
lastError: { type: String },
|
||||
},
|
||||
{
|
||||
timestamps: true,
|
||||
collection: 'dakao_inbound_message',
|
||||
},
|
||||
);
|
||||
|
||||
DakaoInboundMessageSchema.index(
|
||||
{ consumer: 1, projectId: 1, chatLogLogId: 1 },
|
||||
{ unique: true },
|
||||
);
|
||||
DakaoInboundMessageSchema.index({ state: 1, processingExpiresAt: 1 });
|
||||
|
||||
export const DakaoOutboxMessageSchema = new Schema<DakaoOutboxMessage>(
|
||||
{
|
||||
eventId: { type: String, required: true, unique: true },
|
||||
eventSource: { type: String, required: true },
|
||||
type: { type: String, required: true },
|
||||
subject: { type: String, required: true },
|
||||
correlationId: { type: String },
|
||||
resultSubjects: {
|
||||
succeeded: { type: String },
|
||||
failed: { type: String },
|
||||
},
|
||||
payload: { type: Schema.Types.Mixed, required: true },
|
||||
state: {
|
||||
type: String,
|
||||
enum: DAKAO_OUTBOX_MESSAGE_STATES,
|
||||
required: true,
|
||||
default: 'pending',
|
||||
},
|
||||
publishAttempts: { type: Number, required: true, default: 0 },
|
||||
publishedAt: { type: Date },
|
||||
terminalAt: { type: Date },
|
||||
resultEventId: { type: String },
|
||||
lastPublishError: { type: String },
|
||||
terminalError: { type: Schema.Types.Mixed },
|
||||
compensationState: {
|
||||
type: String,
|
||||
enum: DAKAO_OUTBOX_COMPENSATION_STATES,
|
||||
required: true,
|
||||
default: 'none',
|
||||
},
|
||||
compensationReason: { type: String },
|
||||
},
|
||||
{
|
||||
timestamps: true,
|
||||
collection: 'dakao_outbox_message',
|
||||
},
|
||||
);
|
||||
|
||||
DakaoOutboxMessageSchema.index({ state: 1, updatedAt: 1 });
|
||||
DakaoOutboxMessageSchema.index({ correlationId: 1 }, { sparse: true });
|
||||
|
||||
export const DakaoSendResultEventSchema = new Schema<DakaoSendResultEvent>(
|
||||
{
|
||||
eventId: { type: String, required: true, unique: true },
|
||||
requestEventId: { type: String, required: true },
|
||||
eventSource: { type: String, required: true },
|
||||
requestEventSource: { type: String, required: true },
|
||||
type: { type: String, required: true },
|
||||
subject: { type: String, required: true },
|
||||
status: {
|
||||
type: String,
|
||||
enum: DAKAO_SEND_RESULT_STATUSES,
|
||||
required: true,
|
||||
},
|
||||
correlationId: { type: String },
|
||||
handledAt: { type: Date, required: true },
|
||||
providerMessageId: { type: String },
|
||||
error: { type: Schema.Types.Mixed },
|
||||
raw: { type: Schema.Types.Mixed, required: true },
|
||||
},
|
||||
{
|
||||
timestamps: true,
|
||||
collection: 'dakao_send_result_event',
|
||||
},
|
||||
);
|
||||
|
||||
DakaoSendResultEventSchema.index({ requestEventId: 1, status: 1 });
|
||||
|
||||
export const UserSchema = new Schema<User>(
|
||||
{
|
||||
communityId: {
|
||||
@@ -942,6 +1205,8 @@ export const RiotMatchSchema = new Schema<RiotMatch>(
|
||||
queueId: { type: Number },
|
||||
participantPuuids: { type: [String], required: true, default: [] },
|
||||
raw: { type: Schema.Types.Mixed, required: true, default: () => ({}) },
|
||||
timeline: { type: Schema.Types.Mixed },
|
||||
timelineFetchedAt: { type: Date },
|
||||
fetchedAt: { type: Date, required: true, default: Date.now },
|
||||
},
|
||||
{
|
||||
@@ -960,7 +1225,6 @@ export const TournamentCodeSchema = new Schema<TournamentCode>(
|
||||
type: String,
|
||||
required: true,
|
||||
trim: true,
|
||||
uppercase: true,
|
||||
},
|
||||
region: { type: String, required: true, default: 'kr' },
|
||||
mapType: {
|
||||
@@ -1093,6 +1357,7 @@ const MatchSeriesResultSubSchema = new Schema<MatchSeriesResult>(
|
||||
const MatchGameAssignmentSubSchema = new Schema<MatchGameAssignment>(
|
||||
{
|
||||
gameNumber: { type: Number, required: true, min: 1 },
|
||||
roundNumber: { type: Number, required: false, min: 1 },
|
||||
teamAIndex: { type: Number, required: true, min: 1 },
|
||||
teamBIndex: { type: Number, required: true, min: 1 },
|
||||
},
|
||||
@@ -1198,6 +1463,7 @@ export const MatchSchema = new Schema<Match>(
|
||||
required: true,
|
||||
default: 'pair',
|
||||
},
|
||||
roundRobinMaxRounds: { type: Number, required: false, min: 1 },
|
||||
tournamentCodeIds: {
|
||||
type: [{ type: Schema.Types.ObjectId, ref: 'tournamentCode' }],
|
||||
required: true,
|
||||
@@ -1341,6 +1607,11 @@ const AuctionPlayerSnapshotSubSchema = new Schema<AuctionPlayerSnapshot>(
|
||||
default: [],
|
||||
},
|
||||
tiers: { type: [TierInfoSubSchema], required: true, default: [] },
|
||||
tierHistory: {
|
||||
type: [TierHistoryEntrySubSchema],
|
||||
required: true,
|
||||
default: [],
|
||||
},
|
||||
masteries: {
|
||||
type: [ChampionMasteryEntrySubSchema],
|
||||
required: true,
|
||||
@@ -1385,6 +1656,17 @@ const AuctionBidSubSchema = new Schema<AuctionBid>(
|
||||
{ _id: false },
|
||||
);
|
||||
|
||||
const AuctionChatMessageSubSchema = new Schema<AuctionChatMessage>(
|
||||
{
|
||||
id: { type: String, required: true },
|
||||
userId: { type: Schema.Types.ObjectId, ref: 'user', required: false },
|
||||
displayName: { type: String, required: true },
|
||||
message: { type: String, required: true },
|
||||
sentAt: { type: Date, required: true, default: Date.now },
|
||||
},
|
||||
{ _id: false },
|
||||
);
|
||||
|
||||
export const AuctionSchema = new Schema<Auction>(
|
||||
{
|
||||
matchId: {
|
||||
@@ -1431,6 +1713,11 @@ export const AuctionSchema = new Schema<Auction>(
|
||||
required: true,
|
||||
default: [],
|
||||
},
|
||||
chatMessages: {
|
||||
type: [AuctionChatMessageSubSchema],
|
||||
required: true,
|
||||
default: [],
|
||||
},
|
||||
startedAt: { type: Date, required: false },
|
||||
completedAt: { type: Date, required: false },
|
||||
},
|
||||
@@ -1519,6 +1806,21 @@ MatchStatsSchema.index({ communityId: 1, championIds: 1 });
|
||||
export const tournamentModelDefinitions: ModelDefinition[] = [
|
||||
{ name: 'identity', schema: IdentitySchema, schemaName: 'identity' },
|
||||
{ name: 'community', schema: CommunitySchema, schemaName: 'community' },
|
||||
{
|
||||
name: 'dakaoInboundMessage',
|
||||
schema: DakaoInboundMessageSchema,
|
||||
schemaName: 'dakaoInboundMessage',
|
||||
},
|
||||
{
|
||||
name: 'dakaoOutboxMessage',
|
||||
schema: DakaoOutboxMessageSchema,
|
||||
schemaName: 'dakaoOutboxMessage',
|
||||
},
|
||||
{
|
||||
name: 'dakaoSendResultEvent',
|
||||
schema: DakaoSendResultEventSchema,
|
||||
schemaName: 'dakaoSendResultEvent',
|
||||
},
|
||||
{ name: 'user', schema: UserSchema, schemaName: 'user' },
|
||||
{ name: 'riotMatch', schema: RiotMatchSchema, schemaName: 'riotMatch' },
|
||||
{
|
||||
@@ -1548,6 +1850,9 @@ export const tournamentModelDefinitions: ModelDefinition[] = [
|
||||
export interface TournamentModelTypes {
|
||||
identity: Identity;
|
||||
community: Community;
|
||||
dakaoInboundMessage: DakaoInboundMessage;
|
||||
dakaoOutboxMessage: DakaoOutboxMessage;
|
||||
dakaoSendResultEvent: DakaoSendResultEvent;
|
||||
user: User;
|
||||
riotMatch: RiotMatch;
|
||||
tournamentCode: TournamentCode;
|
||||
|
||||
@@ -1,9 +1,4 @@
|
||||
import {
|
||||
Inject,
|
||||
Injectable,
|
||||
Logger,
|
||||
OnModuleDestroy,
|
||||
} from '@nestjs/common';
|
||||
import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
|
||||
import type { createClient } from 'redis';
|
||||
import { GARNET_CLIENT } from './garnet.constants';
|
||||
|
||||
@@ -203,6 +198,13 @@ export class GarnetService implements OnModuleDestroy {
|
||||
return this.client.xAck(key, group, ids);
|
||||
}
|
||||
|
||||
public async deleteStreamEntries(
|
||||
key: string,
|
||||
ids: string | string[],
|
||||
): Promise<number> {
|
||||
return this.client.xDel(key, ids);
|
||||
}
|
||||
|
||||
public async streamLength(key: string): Promise<number> {
|
||||
return this.client.xLen(key);
|
||||
}
|
||||
|
||||
@@ -1,11 +1,21 @@
|
||||
import { Inject, Injectable, Logger, OnModuleDestroy } from '@nestjs/common';
|
||||
import {
|
||||
Inject,
|
||||
Injectable,
|
||||
Logger,
|
||||
OnModuleDestroy,
|
||||
} from '@nestjs/common';
|
||||
import { StringCodec } from 'nats';
|
||||
import type { Msg, NatsConnection, Subscription } from 'nats';
|
||||
AckPolicy,
|
||||
DeliverPolicy,
|
||||
nanos,
|
||||
ReplayPolicy,
|
||||
RetentionPolicy,
|
||||
StorageType,
|
||||
StringCodec,
|
||||
} from 'nats';
|
||||
import type {
|
||||
ConsumerMessages,
|
||||
JsMsg,
|
||||
Msg,
|
||||
NatsConnection,
|
||||
PubAck,
|
||||
Subscription,
|
||||
} from 'nats';
|
||||
import { NATS_CLIENT } from './nats.constants';
|
||||
|
||||
export type NatsMessageHandler<T = unknown> = (
|
||||
@@ -13,17 +23,62 @@ export type NatsMessageHandler<T = unknown> = (
|
||||
msg: Msg,
|
||||
) => Promise<void> | void;
|
||||
|
||||
export type JetStreamRetention = 'workqueue' | 'limits';
|
||||
|
||||
export type JetStreamMessageHandler<T = unknown> = (
|
||||
data: T,
|
||||
msg: JsMsg,
|
||||
) => Promise<void> | void;
|
||||
|
||||
export interface JetStreamStreamOptions {
|
||||
name: string;
|
||||
subjects: string[];
|
||||
retention: JetStreamRetention;
|
||||
maxAgeDays?: number;
|
||||
replicas?: number;
|
||||
}
|
||||
|
||||
export interface JetStreamConsumerOptions {
|
||||
stream: string;
|
||||
durable: string;
|
||||
filterSubject: string;
|
||||
description?: string;
|
||||
ackWaitMs?: number;
|
||||
backoffMs?: number[];
|
||||
maxDeliver?: number;
|
||||
maxAckPending?: number;
|
||||
replicas?: number;
|
||||
}
|
||||
|
||||
export interface JetStreamConsumeOptions {
|
||||
stream: string;
|
||||
durable: string;
|
||||
maxMessages?: number;
|
||||
expiresMs?: number;
|
||||
nakDelayMs?: number;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class NatsService implements OnModuleDestroy {
|
||||
private readonly logger = new Logger(NatsService.name);
|
||||
private readonly stringCodec = StringCodec();
|
||||
private readonly subscriptions = new Set<Subscription>();
|
||||
private readonly jetStreamConsumers = new Set<ConsumerMessages>();
|
||||
|
||||
constructor(
|
||||
@Inject(NATS_CLIENT) private readonly natsClient: NatsConnection,
|
||||
) {}
|
||||
|
||||
async onModuleDestroy() {
|
||||
for (const consumer of this.jetStreamConsumers) {
|
||||
try {
|
||||
await consumer.close();
|
||||
} catch {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
this.jetStreamConsumers.clear();
|
||||
|
||||
for (const sub of this.subscriptions) {
|
||||
try {
|
||||
sub.unsubscribe();
|
||||
@@ -68,6 +123,108 @@ export class NatsService implements OnModuleDestroy {
|
||||
return sub;
|
||||
}
|
||||
|
||||
public async publishJetStream<T = unknown>(
|
||||
subject: string,
|
||||
data: T,
|
||||
options?: { messageId?: string; timeoutMs?: number },
|
||||
): Promise<PubAck> {
|
||||
const ack = await this.natsClient
|
||||
.jetstream()
|
||||
.publish(subject, this.stringCodec.encode(JSON.stringify(data)), {
|
||||
msgID: options?.messageId,
|
||||
timeout: options?.timeoutMs ?? 5000,
|
||||
});
|
||||
return ack;
|
||||
}
|
||||
|
||||
public async ensureJetStreamStream(
|
||||
options: JetStreamStreamOptions,
|
||||
): Promise<void> {
|
||||
const manager = await this.natsClient.jetstreamManager();
|
||||
const config = {
|
||||
name: options.name,
|
||||
subjects: options.subjects,
|
||||
retention: this.toRetentionPolicy(options.retention),
|
||||
storage: StorageType.File,
|
||||
num_replicas: options.replicas ?? 1,
|
||||
max_age: options.maxAgeDays
|
||||
? nanos(options.maxAgeDays * 24 * 60 * 60 * 1000)
|
||||
: 0,
|
||||
};
|
||||
|
||||
try {
|
||||
await manager.streams.info(options.name);
|
||||
await manager.streams.update(options.name, {
|
||||
subjects: config.subjects,
|
||||
max_age: config.max_age,
|
||||
num_replicas: config.num_replicas,
|
||||
});
|
||||
return;
|
||||
} catch {
|
||||
await manager.streams.add(config);
|
||||
}
|
||||
}
|
||||
|
||||
public async ensureJetStreamConsumer(
|
||||
options: JetStreamConsumerOptions,
|
||||
): Promise<void> {
|
||||
const manager = await this.natsClient.jetstreamManager();
|
||||
const config = {
|
||||
durable_name: options.durable,
|
||||
name: options.durable,
|
||||
description: options.description,
|
||||
filter_subject: options.filterSubject,
|
||||
deliver_policy: DeliverPolicy.All,
|
||||
ack_policy: AckPolicy.Explicit,
|
||||
replay_policy: ReplayPolicy.Instant,
|
||||
ack_wait: nanos(options.ackWaitMs ?? 30000),
|
||||
backoff: (options.backoffMs ?? [5000, 30000, 120000, 600000]).map(
|
||||
(entry) => nanos(entry),
|
||||
),
|
||||
max_deliver: options.maxDeliver ?? 10,
|
||||
max_ack_pending: options.maxAckPending ?? 50,
|
||||
num_replicas: options.replicas ?? 1,
|
||||
};
|
||||
|
||||
try {
|
||||
await manager.consumers.info(options.stream, options.durable);
|
||||
await manager.consumers.update(options.stream, options.durable, config);
|
||||
return;
|
||||
} catch {
|
||||
await manager.consumers.add(options.stream, config);
|
||||
}
|
||||
}
|
||||
|
||||
public async consumeJetStream<T = unknown>(
|
||||
options: JetStreamConsumeOptions,
|
||||
handler: JetStreamMessageHandler<T>,
|
||||
): Promise<void> {
|
||||
try {
|
||||
const consumer = await this.natsClient
|
||||
.jetstream()
|
||||
.consumers.get(options.stream, options.durable);
|
||||
const messages = await consumer.consume({
|
||||
max_messages: options.maxMessages ?? 10,
|
||||
expires: options.expiresMs ?? 30000,
|
||||
});
|
||||
this.jetStreamConsumers.add(messages);
|
||||
|
||||
try {
|
||||
for await (const msg of messages) {
|
||||
await this.dispatchJetStream(msg, handler, options);
|
||||
}
|
||||
} finally {
|
||||
this.jetStreamConsumers.delete(messages);
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.error(
|
||||
`JetStream consumer stream="${options.stream}" durable="${options.durable}" terminated: ${
|
||||
(err as Error)?.stack ?? err
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private async consumeSubscription<T>(
|
||||
sub: Subscription,
|
||||
handler: NatsMessageHandler<T>,
|
||||
@@ -114,4 +271,46 @@ export class NatsService implements OnModuleDestroy {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private async dispatchJetStream<T>(
|
||||
msg: JsMsg,
|
||||
handler: JetStreamMessageHandler<T>,
|
||||
options: JetStreamConsumeOptions,
|
||||
): Promise<void> {
|
||||
let data: T;
|
||||
try {
|
||||
data = JSON.parse(msg.string()) as T;
|
||||
} catch (err) {
|
||||
this.logger.warn(
|
||||
`Terminating undecodable JetStream message subject="${msg.subject}" stream="${options.stream}": ${
|
||||
(err as Error)?.message ?? err
|
||||
}`,
|
||||
);
|
||||
msg.term('invalid_json');
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await handler(data, msg);
|
||||
const acked = await msg.ackAck({ timeout: 5000 });
|
||||
if (!acked) {
|
||||
this.logger.warn(
|
||||
`JetStream ack was not confirmed subject="${msg.subject}" stream="${options.stream}" seq=${msg.seq}`,
|
||||
);
|
||||
}
|
||||
} catch (err) {
|
||||
this.logger.error(
|
||||
`JetStream handler error subject="${msg.subject}" stream="${options.stream}" seq=${msg.seq}: ${
|
||||
(err as Error)?.stack ?? err
|
||||
}`,
|
||||
);
|
||||
msg.nak(options.nakDelayMs ?? 5000);
|
||||
}
|
||||
}
|
||||
|
||||
private toRetentionPolicy(retention: JetStreamRetention): RetentionPolicy {
|
||||
return retention === 'workqueue'
|
||||
? RetentionPolicy.Workqueue
|
||||
: RetentionPolicy.Limits;
|
||||
}
|
||||
}
|
||||
@@ -84,7 +84,7 @@ export class SecretService {
|
||||
environment:
|
||||
process.env.NODE_ENV === 'prod'
|
||||
? 'prod'
|
||||
: process.env.NODE_ENV === 'test'
|
||||
: process.env.NODE_ENV === 'staging'
|
||||
? 'staging'
|
||||
: 'dev',
|
||||
projectId: bootstrapConfig.projectId,
|
||||
|
||||
@@ -99,6 +99,18 @@ export class MatchHistoryService {
|
||||
losses: tier.losses,
|
||||
fetchedAt: tier.fetchedAt.toISOString(),
|
||||
})),
|
||||
tierHistory: [...context.account.tierHistory]
|
||||
.sort((left, right) => left.recordedAt.getTime() - right.recordedAt.getTime())
|
||||
.map((entry) => ({
|
||||
queueType: entry.queueType,
|
||||
tier: entry.tier,
|
||||
rank: entry.rank,
|
||||
leaguePoints: entry.leaguePoints,
|
||||
wins: entry.wins,
|
||||
losses: entry.losses,
|
||||
recordedAt: entry.recordedAt.toISOString(),
|
||||
season: entry.season,
|
||||
})),
|
||||
season: context.season,
|
||||
seasons: this.resolveSeasons(context.community),
|
||||
lastFetchedAt: lastFetchedAt?.toISOString() ?? null,
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import type { RiotLane } from '../global/database/schema';
|
||||
import type { MatchStatsRunePerks, RiotLane } from '../global/database/schema';
|
||||
import type {
|
||||
RiotQueueGroup,
|
||||
RiotRankFilter,
|
||||
@@ -27,6 +27,16 @@ export interface UserHistoryProfileResponse {
|
||||
losses: number;
|
||||
fetchedAt: string;
|
||||
}>;
|
||||
tierHistory: Array<{
|
||||
queueType: string;
|
||||
tier: string;
|
||||
rank?: string;
|
||||
leaguePoints?: number;
|
||||
wins?: number;
|
||||
losses?: number;
|
||||
recordedAt: string;
|
||||
season?: string;
|
||||
}>;
|
||||
season: HistorySeasonDto;
|
||||
seasons: HistorySeasonDto[];
|
||||
lastFetchedAt: string | null;
|
||||
@@ -111,7 +121,7 @@ export interface RecentMatchTeamParticipantView {
|
||||
items: number[];
|
||||
trinket: number;
|
||||
summonerSpells: [number, number];
|
||||
perks: { primaryStyle?: number; subStyle?: number; keystone?: number };
|
||||
perks: MatchStatsRunePerks;
|
||||
totalCs: number;
|
||||
csPerMin: number;
|
||||
goldEarned: number;
|
||||
@@ -152,7 +162,7 @@ export interface RecentMatchView {
|
||||
items: number[];
|
||||
trinket: number;
|
||||
summonerSpells: [number, number];
|
||||
perks: { primaryStyle?: number; subStyle?: number; keystone?: number };
|
||||
perks: MatchStatsRunePerks;
|
||||
teams: Array<{
|
||||
side: 100 | 200;
|
||||
win: boolean;
|
||||
|
||||
@@ -101,6 +101,11 @@ export class CreateMatchDto {
|
||||
@IsEnum(MATCH_GAME_MODES)
|
||||
gameMode?: MatchGameMode;
|
||||
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
roundRobinMaxRounds?: number;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@IsString({ each: true })
|
||||
@@ -156,6 +161,11 @@ export class UpdateMatchDto {
|
||||
@IsEnum(MATCH_GAME_MODES)
|
||||
gameMode?: MatchGameMode;
|
||||
|
||||
@IsOptional()
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
roundRobinMaxRounds?: number;
|
||||
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@IsString({ each: true })
|
||||
@@ -173,6 +183,14 @@ export class UpdateMatchDto {
|
||||
schedule?: MatchScheduleItemDto[];
|
||||
}
|
||||
|
||||
export class UpdateParticipantDto {
|
||||
@IsEnum(POSITIONS)
|
||||
mainPosition!: Position;
|
||||
|
||||
@IsEnum(POSITIONS)
|
||||
subPosition!: Position;
|
||||
}
|
||||
|
||||
export class JoinMatchDto {
|
||||
@IsArray()
|
||||
@ArrayMinSize(1)
|
||||
@@ -185,3 +203,17 @@ export class JoinMatchDto {
|
||||
@IsString()
|
||||
userId?: string;
|
||||
}
|
||||
|
||||
export class AddParticipantDto {
|
||||
@IsOptional()
|
||||
@IsArray()
|
||||
@ArrayMinSize(1)
|
||||
@ArrayMaxSize(5)
|
||||
@ValidateNested({ each: true })
|
||||
@Type(() => PositionPreferenceDto)
|
||||
preferredPositions?: PositionPreferenceDto[];
|
||||
|
||||
@IsOptional()
|
||||
@IsString()
|
||||
riotPuuid?: string;
|
||||
}
|
||||
@@ -24,9 +24,11 @@ import type {
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
import {
|
||||
AddParticipantDto,
|
||||
CreateMatchDto,
|
||||
JoinMatchDto,
|
||||
UpdateMatchDto,
|
||||
UpdateParticipantDto,
|
||||
} from './dto/create-match.dto';
|
||||
import { MatchService } from './match.service';
|
||||
|
||||
@@ -55,6 +57,7 @@ export class MatchController {
|
||||
maxParticipants: body.maxParticipants ?? 10,
|
||||
gameCount: body.gameCount,
|
||||
gameMode: body.gameMode ?? 'pair',
|
||||
roundRobinMaxRounds: body.roundRobinMaxRounds,
|
||||
prizes: body.prizes ?? [],
|
||||
notices: body.notices ?? [],
|
||||
schedule: body.schedule ?? [],
|
||||
@@ -71,16 +74,27 @@ export class MatchController {
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Query('status') status?: MatchStatus,
|
||||
@Query('limit') limit?: string,
|
||||
@Query('page') page?: string,
|
||||
@Query('offset') offset?: string,
|
||||
@Query('scheduledFrom') scheduledFrom?: string,
|
||||
@Query('scheduledTo') scheduledTo?: string,
|
||||
@Query('sort') sort?: 'asc' | 'desc',
|
||||
) {
|
||||
const matches = await this.matchService.list({
|
||||
const result = await this.matchService.listPage({
|
||||
communityId,
|
||||
status,
|
||||
limit: limit ? Number(limit) : undefined,
|
||||
limit: this.toOptionalNumber(limit),
|
||||
page: this.toOptionalNumber(page),
|
||||
offset: this.toOptionalNumber(offset),
|
||||
scheduledFrom: this.toOptionalDate(scheduledFrom),
|
||||
scheduledTo: this.toOptionalDate(scheduledTo),
|
||||
sort,
|
||||
});
|
||||
if (!currentUser) return { matches };
|
||||
if (!currentUser) return result;
|
||||
const myId = currentUser._id;
|
||||
return {
|
||||
matches: matches.map((m) => this.annotateJoined(m, myId)),
|
||||
...result,
|
||||
matches: result.matches.map((m) => this.annotateJoined(m, myId)),
|
||||
};
|
||||
}
|
||||
|
||||
@@ -137,6 +151,71 @@ export class MatchController {
|
||||
});
|
||||
}
|
||||
|
||||
// 관리자 전용 — 커뮤니티 유저를 모집중 매치에 직접 추가한다.
|
||||
@Post(':matchId/participants/:userId')
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async addParticipant(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId,
|
||||
@Body() body: AddParticipantDto | undefined,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
const match = await this.matchService.join({
|
||||
matchId,
|
||||
userId,
|
||||
preferredPositions: body?.preferredPositions,
|
||||
riotPuuid: body?.riotPuuid,
|
||||
});
|
||||
return this.matchService.serialize(match);
|
||||
}
|
||||
|
||||
// 관리자 전용 — 참가자 주/부 포지션 변경.
|
||||
@Patch(':matchId/participants/:userId')
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
public async updateParticipant(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId,
|
||||
@Body() body: UpdateParticipantDto,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
const match = await this.matchService.updateParticipantPositions({
|
||||
matchId,
|
||||
communityId,
|
||||
targetUserId: userId,
|
||||
mainPosition: body.mainPosition,
|
||||
subPosition: body.subPosition,
|
||||
});
|
||||
return this.matchService.serialize(match);
|
||||
}
|
||||
|
||||
// 관리자 전용 — 참가자 강제 제외.
|
||||
@Delete(':matchId/participants/:userId')
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
@HttpCode(HttpStatus.NO_CONTENT)
|
||||
public async removeParticipant(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Param('userId', ParseObjectIdPipe) userId: mongoose.Types.ObjectId,
|
||||
) {
|
||||
this.assertSameCommunity(currentUser, communityId);
|
||||
await this.matchService.removeParticipant({
|
||||
matchId,
|
||||
communityId,
|
||||
targetUserId: userId,
|
||||
});
|
||||
}
|
||||
|
||||
private resolveJoinerUserId(
|
||||
currentUser: UserDocument | undefined,
|
||||
bodyUserId?: string,
|
||||
@@ -167,4 +246,15 @@ export class MatchController {
|
||||
throw new BadRequestException('Different community.');
|
||||
}
|
||||
}
|
||||
|
||||
private toOptionalNumber(value?: string): number | undefined {
|
||||
const numberValue = Number(value);
|
||||
return Number.isFinite(numberValue) ? numberValue : undefined;
|
||||
}
|
||||
|
||||
private toOptionalDate(value?: string): Date | undefined {
|
||||
if (!value) return undefined;
|
||||
const date = new Date(value);
|
||||
return Number.isNaN(date.getTime()) ? undefined : date;
|
||||
}
|
||||
}
|
||||
@@ -36,6 +36,224 @@ describe('MatchService', () => {
|
||||
};
|
||||
}
|
||||
|
||||
function createServiceWithListModel() {
|
||||
const exec = jest.fn().mockResolvedValue([{ title: 'second page' }]);
|
||||
const limit = jest.fn().mockReturnValue({ exec });
|
||||
const skip = jest.fn().mockReturnValue({ limit });
|
||||
const sort = jest.fn().mockReturnValue({ skip });
|
||||
const find = jest.fn().mockReturnValue({ sort });
|
||||
const countExec = jest.fn().mockResolvedValue(12);
|
||||
const countDocuments = jest.fn().mockReturnValue({ exec: countExec });
|
||||
const MatchModel = {
|
||||
find,
|
||||
countDocuments,
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'match') return MatchModel;
|
||||
return {};
|
||||
}),
|
||||
};
|
||||
const tournamentCodeService = {
|
||||
buildSlots: jest.fn().mockResolvedValue([]),
|
||||
releaseFromMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const communityStatsService = {
|
||||
invalidateCommunity: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const matchStatsService = {
|
||||
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||
removeByMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
return {
|
||||
service: new MatchService(
|
||||
connectionService as never,
|
||||
tournamentCodeService as never,
|
||||
communityStatsService as never,
|
||||
matchStatsService as never,
|
||||
),
|
||||
MatchModel,
|
||||
sort,
|
||||
skip,
|
||||
limit,
|
||||
};
|
||||
}
|
||||
|
||||
function createServiceWithJoinModels(params: {
|
||||
user: Record<string, unknown> | null;
|
||||
match: Record<string, unknown> | null;
|
||||
}) {
|
||||
const UserModel = {
|
||||
findById: jest.fn().mockResolvedValue(params.user),
|
||||
};
|
||||
const MatchModel = {
|
||||
findById: jest.fn().mockResolvedValue(params.match),
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'user') return UserModel;
|
||||
if (name === 'match') return MatchModel;
|
||||
return {};
|
||||
}),
|
||||
};
|
||||
const tournamentCodeService = {
|
||||
buildSlots: jest.fn().mockResolvedValue([]),
|
||||
releaseFromMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const communityStatsService = {
|
||||
invalidateCommunity: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const matchStatsService = {
|
||||
buildAndUpsert: jest.fn().mockResolvedValue(undefined),
|
||||
removeByMatch: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
|
||||
return {
|
||||
service: new MatchService(
|
||||
connectionService as never,
|
||||
tournamentCodeService as never,
|
||||
communityStatsService as never,
|
||||
matchStatsService as never,
|
||||
),
|
||||
UserModel,
|
||||
MatchModel,
|
||||
};
|
||||
}
|
||||
|
||||
it('returns a paginated match list with total count', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const { service, MatchModel, sort, skip, limit } =
|
||||
createServiceWithListModel();
|
||||
|
||||
const page = await service.listPage({
|
||||
communityId,
|
||||
page: 2,
|
||||
limit: 5,
|
||||
});
|
||||
|
||||
expect(MatchModel.find).toHaveBeenCalledWith({ communityId });
|
||||
expect(MatchModel.countDocuments).toHaveBeenCalledWith({ communityId });
|
||||
expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 });
|
||||
expect(skip).toHaveBeenCalledWith(5);
|
||||
expect(limit).toHaveBeenCalledWith(5);
|
||||
expect(page).toEqual({
|
||||
matches: [{ title: 'second page' }],
|
||||
total: 12,
|
||||
page: 2,
|
||||
limit: 5,
|
||||
});
|
||||
});
|
||||
|
||||
it('applies offset before page-based pagination', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const { service, skip } = createServiceWithListModel();
|
||||
|
||||
const page = await service.listPage({
|
||||
communityId,
|
||||
offset: 4,
|
||||
page: 2,
|
||||
limit: 5,
|
||||
});
|
||||
|
||||
expect(skip).toHaveBeenCalledWith(9);
|
||||
expect(page.total).toBe(8);
|
||||
});
|
||||
|
||||
it('filters future matches and sorts oldest first for upcoming sections', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const scheduledFrom = new Date('2026-06-08T12:00:00.000Z');
|
||||
const { service, MatchModel, sort } = createServiceWithListModel();
|
||||
|
||||
await service.listPage({
|
||||
communityId,
|
||||
scheduledFrom,
|
||||
sort: 'asc',
|
||||
limit: 4,
|
||||
});
|
||||
|
||||
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $gte: scheduledFrom },
|
||||
});
|
||||
expect(MatchModel.countDocuments).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $gte: scheduledFrom },
|
||||
});
|
||||
expect(sort).toHaveBeenCalledWith({ scheduledAt: 1 });
|
||||
});
|
||||
|
||||
it('filters past matches and keeps newest first for history sections', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const scheduledTo = new Date('2026-06-08T12:00:00.000Z');
|
||||
const { service, MatchModel, sort } = createServiceWithListModel();
|
||||
|
||||
await service.listPage({
|
||||
communityId,
|
||||
scheduledTo,
|
||||
sort: 'desc',
|
||||
limit: 10,
|
||||
});
|
||||
|
||||
expect(MatchModel.find).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $lt: scheduledTo },
|
||||
});
|
||||
expect(MatchModel.countDocuments).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
scheduledAt: { $lt: scheduledTo },
|
||||
});
|
||||
expect(sort).toHaveBeenCalledWith({ scheduledAt: -1 });
|
||||
});
|
||||
|
||||
it('uses saved user preferences when joining without explicit positions', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userId = new mongoose.Types.ObjectId();
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const user = {
|
||||
_id: userId,
|
||||
communityId,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'Dahyeon',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 7,
|
||||
isPrimary: true,
|
||||
tiers: [],
|
||||
},
|
||||
],
|
||||
};
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
status: 'recruiting',
|
||||
maxParticipants: 10,
|
||||
participants: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createServiceWithJoinModels({ user, match });
|
||||
|
||||
await service.join({
|
||||
matchId,
|
||||
userId,
|
||||
});
|
||||
|
||||
expect(match.participants).toEqual([
|
||||
expect.objectContaining({
|
||||
userId,
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'Dahyeon',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 7,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
excluded: false,
|
||||
}),
|
||||
]);
|
||||
expect(match.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('clears game schedule when a built match returns to recruiting', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const match = {
|
||||
@@ -74,6 +292,29 @@ describe('MatchService', () => {
|
||||
expect(matchStatsService.removeByMatch).toHaveBeenCalledWith(match._id);
|
||||
});
|
||||
|
||||
it('rejects round-robin max round changes after recruiting', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const match = {
|
||||
communityId,
|
||||
status: 'team-built',
|
||||
tournamentCodeIds: [],
|
||||
set: jest.fn(),
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const { service } = createService(match);
|
||||
|
||||
await expect(
|
||||
service.update({
|
||||
matchId: new mongoose.Types.ObjectId(),
|
||||
communityId,
|
||||
patch: { roundRobinMaxRounds: 3 },
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
'maxParticipants, gameMode, and roundRobinMaxRounds can only be changed while recruiting.',
|
||||
);
|
||||
expect(match.set).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('releases reserved codes when returning a built match to recruiting', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const codeId = new mongoose.Types.ObjectId();
|
||||
|
||||
@@ -13,6 +13,8 @@ import {
|
||||
MatchDocument,
|
||||
MatchSeriesResult,
|
||||
MatchStatus,
|
||||
POSITIONS,
|
||||
Position,
|
||||
PositionPreference,
|
||||
TierInfo,
|
||||
} from '../global/database/schema';
|
||||
@@ -22,6 +24,8 @@ import { TournamentCodeService } from '../tournament-code/tournament-code.servic
|
||||
const MATCH_SHORT_CODE_ALPHABET = 'ABCDEFGHJKLMNPQRSTUVWXYZ23456789';
|
||||
const MATCH_SHORT_CODE_LENGTH = 4;
|
||||
const MATCH_SHORT_CODE_GENERATION_ATTEMPTS = 20;
|
||||
const DEFAULT_MATCH_LIST_LIMIT = 50;
|
||||
const MAX_MATCH_LIST_LIMIT = 200;
|
||||
|
||||
interface CreateMatchParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
@@ -39,12 +43,29 @@ interface ListMatchesQuery {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
limit?: number;
|
||||
scheduledFrom?: Date;
|
||||
scheduledTo?: Date;
|
||||
sort?: 'asc' | 'desc';
|
||||
}
|
||||
|
||||
interface ListMatchesPageQuery extends ListMatchesQuery {
|
||||
page?: number;
|
||||
offset?: number;
|
||||
}
|
||||
|
||||
interface MatchListFilter {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
scheduledAt?: {
|
||||
$gte?: Date;
|
||||
$lt?: Date;
|
||||
};
|
||||
}
|
||||
|
||||
interface JoinMatchParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
userId: mongoose.Types.ObjectId;
|
||||
preferredPositions: PositionPreference[];
|
||||
preferredPositions?: PositionPreference[];
|
||||
// 특정 RiotAccount(puuid)로 참가하고 싶을 때 지정. 없으면 primary 사용.
|
||||
riotPuuid?: string;
|
||||
}
|
||||
@@ -54,6 +75,20 @@ interface CancelMatchJoinParams {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
}
|
||||
|
||||
interface RemoveParticipantParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
targetUserId: mongoose.Types.ObjectId;
|
||||
}
|
||||
|
||||
interface UpdateParticipantPositionsParams {
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
targetUserId: mongoose.Types.ObjectId;
|
||||
mainPosition: Position;
|
||||
subPosition: Position;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class MatchService {
|
||||
constructor(
|
||||
@@ -86,19 +121,42 @@ export class MatchService {
|
||||
|
||||
public async list(query: ListMatchesQuery): Promise<MatchDocument[]> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const filter: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
status?: MatchStatus;
|
||||
} = {
|
||||
communityId: query.communityId,
|
||||
};
|
||||
if (query.status) filter.status = query.status;
|
||||
const filter = this.buildListFilter(query);
|
||||
return MatchModel.find(filter)
|
||||
.sort({ scheduledAt: -1 })
|
||||
.limit(Math.min(query.limit ?? 50, 200))
|
||||
.sort(this.buildListSort(query.sort))
|
||||
.limit(this.normalizeListLimit(query.limit))
|
||||
.exec();
|
||||
}
|
||||
|
||||
public async listPage(query: ListMatchesPageQuery): Promise<{
|
||||
matches: MatchDocument[];
|
||||
total: number;
|
||||
page: number;
|
||||
limit: number;
|
||||
}> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const filter = this.buildListFilter(query);
|
||||
const page = this.normalizeListPage(query.page);
|
||||
const limit = this.normalizeListLimit(query.limit);
|
||||
const offset = this.normalizeListOffset(query.offset);
|
||||
const skip = offset + (page - 1) * limit;
|
||||
const [matches, rawTotal] = await Promise.all([
|
||||
MatchModel.find(filter)
|
||||
.sort(this.buildListSort(query.sort))
|
||||
.skip(skip)
|
||||
.limit(limit)
|
||||
.exec(),
|
||||
MatchModel.countDocuments(filter).exec(),
|
||||
]);
|
||||
|
||||
return {
|
||||
matches,
|
||||
total: Math.max(rawTotal - offset, 0),
|
||||
page,
|
||||
limit,
|
||||
};
|
||||
}
|
||||
|
||||
public async ensureShortCode(match: MatchDocument): Promise<MatchDocument> {
|
||||
if (match.shortCode) return match;
|
||||
|
||||
@@ -156,10 +214,12 @@ export class MatchService {
|
||||
const previousStatus = match.status;
|
||||
if (
|
||||
previousStatus !== 'recruiting' &&
|
||||
('maxParticipants' in params.patch || 'gameMode' in params.patch)
|
||||
('maxParticipants' in params.patch ||
|
||||
'gameMode' in params.patch ||
|
||||
'roundRobinMaxRounds' in params.patch)
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'maxParticipants and gameMode can only be changed while recruiting.',
|
||||
'maxParticipants, gameMode, and roundRobinMaxRounds can only be changed while recruiting.',
|
||||
);
|
||||
}
|
||||
match.set(params.patch);
|
||||
@@ -236,7 +296,10 @@ export class MatchService {
|
||||
tagLine: selectedRiot?.tagLine,
|
||||
profileIconId: selectedRiot?.profileIconId,
|
||||
tier: selectedTier,
|
||||
preferredPositions: params.preferredPositions,
|
||||
preferredPositions: this.resolveJoinPreferredPositions(
|
||||
params.preferredPositions,
|
||||
user.preferredPositions,
|
||||
),
|
||||
joinedAt: new Date(),
|
||||
excluded: false,
|
||||
});
|
||||
@@ -276,6 +339,86 @@ export class MatchService {
|
||||
return match;
|
||||
}
|
||||
|
||||
// 관리자 전용 — 특정 참가자를 강제로 제외한다.
|
||||
public async removeParticipant(
|
||||
params: RemoveParticipantParams,
|
||||
): Promise<MatchDocument> {
|
||||
const match = await this.loadRecruitingMatch(
|
||||
params.matchId,
|
||||
params.communityId,
|
||||
);
|
||||
const participantIndex = match.participants.findIndex((participant) =>
|
||||
participant.userId.equals(params.targetUserId),
|
||||
);
|
||||
if (participantIndex === -1) {
|
||||
throw new NotFoundException('Participant not found.');
|
||||
}
|
||||
match.participants.splice(participantIndex, 1);
|
||||
await match.save();
|
||||
return match;
|
||||
}
|
||||
|
||||
// 관리자 전용 — 참가자의 주/부 포지션(선호 우선순위 1·2)을 교체한다.
|
||||
public async updateParticipantPositions(
|
||||
params: UpdateParticipantPositionsParams,
|
||||
): Promise<MatchDocument> {
|
||||
const match = await this.loadRecruitingMatch(
|
||||
params.matchId,
|
||||
params.communityId,
|
||||
);
|
||||
const participant = match.participants.find((entry) =>
|
||||
entry.userId.equals(params.targetUserId),
|
||||
);
|
||||
if (!participant) {
|
||||
throw new NotFoundException('Participant not found.');
|
||||
}
|
||||
participant.preferredPositions = this.reorderPreferredPositions(
|
||||
params.mainPosition,
|
||||
params.subPosition,
|
||||
participant.preferredPositions,
|
||||
);
|
||||
match.markModified('participants');
|
||||
await match.save();
|
||||
return match;
|
||||
}
|
||||
|
||||
private async loadRecruitingMatch(
|
||||
matchId: mongoose.Types.ObjectId,
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
): Promise<MatchDocument> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const match = await MatchModel.findById(matchId);
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
if (!match.communityId.equals(communityId)) {
|
||||
throw new BadRequestException('Different community.');
|
||||
}
|
||||
if (match.status !== 'recruiting') {
|
||||
throw new BadRequestException('Match is not recruiting.');
|
||||
}
|
||||
return match;
|
||||
}
|
||||
|
||||
// 주/부 포지션을 priority 1·2로 올리고 기존 나머지 선호는 뒤로 보존한다.
|
||||
private reorderPreferredPositions(
|
||||
mainPosition: Position,
|
||||
subPosition: Position,
|
||||
current: PositionPreference[],
|
||||
): PositionPreference[] {
|
||||
const ordered: Position[] = [mainPosition];
|
||||
if (subPosition !== mainPosition) ordered.push(subPosition);
|
||||
for (const preference of [...current].sort(
|
||||
(left, right) => left.priority - right.priority,
|
||||
)) {
|
||||
if (!ordered.includes(preference.position)) {
|
||||
ordered.push(preference.position);
|
||||
}
|
||||
}
|
||||
return ordered.map((position, index) => ({
|
||||
position,
|
||||
priority: index + 1,
|
||||
}));
|
||||
}
|
||||
|
||||
private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined {
|
||||
const tier =
|
||||
tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0];
|
||||
@@ -299,6 +442,66 @@ export class MatchService {
|
||||
};
|
||||
}
|
||||
|
||||
private resolveJoinPreferredPositions(
|
||||
requested: PositionPreference[] | undefined,
|
||||
saved: PositionPreference[] | undefined,
|
||||
): PositionPreference[] {
|
||||
const source = requested?.length
|
||||
? requested
|
||||
: saved?.length
|
||||
? saved
|
||||
: POSITIONS.map((position, index) => ({
|
||||
position,
|
||||
priority: index + 1,
|
||||
}));
|
||||
|
||||
return [...source]
|
||||
.sort((left, right) => left.priority - right.priority)
|
||||
.slice(0, 5)
|
||||
.map((preference, index) => ({
|
||||
position: preference.position,
|
||||
priority: index + 1,
|
||||
}));
|
||||
}
|
||||
|
||||
private buildListFilter(query: ListMatchesQuery): MatchListFilter {
|
||||
const filter: MatchListFilter = {
|
||||
communityId: query.communityId,
|
||||
};
|
||||
if (query.status) filter.status = query.status;
|
||||
if (query.scheduledFrom || query.scheduledTo) {
|
||||
filter.scheduledAt = {};
|
||||
if (query.scheduledFrom) filter.scheduledAt.$gte = query.scheduledFrom;
|
||||
if (query.scheduledTo) filter.scheduledAt.$lt = query.scheduledTo;
|
||||
}
|
||||
return filter;
|
||||
}
|
||||
|
||||
private buildListSort(sort?: 'asc' | 'desc'): { scheduledAt: 1 | -1 } {
|
||||
return { scheduledAt: sort === 'asc' ? 1 : -1 };
|
||||
}
|
||||
|
||||
private normalizeListLimit(limit?: number): number {
|
||||
if (!Number.isFinite(limit) || !limit || limit < 1) {
|
||||
return DEFAULT_MATCH_LIST_LIMIT;
|
||||
}
|
||||
return Math.min(Math.floor(limit), MAX_MATCH_LIST_LIMIT);
|
||||
}
|
||||
|
||||
private normalizeListPage(page?: number): number {
|
||||
if (!Number.isFinite(page) || !page || page < 1) {
|
||||
return 1;
|
||||
}
|
||||
return Math.floor(page);
|
||||
}
|
||||
|
||||
private normalizeListOffset(offset?: number): number {
|
||||
if (!Number.isFinite(offset) || !offset || offset < 1) {
|
||||
return 0;
|
||||
}
|
||||
return Math.floor(offset);
|
||||
}
|
||||
|
||||
private async generateUniqueShortCode(
|
||||
MatchModel: mongoose.Model<Match>,
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import mongoose from 'mongoose';
|
||||
import { GarnetService } from '../global/garnet/garnet.service';
|
||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||
@@ -30,7 +29,7 @@ function candidate(puuid: string): StaleAccountCandidate {
|
||||
};
|
||||
}
|
||||
|
||||
function makeScheduler(enabled = true) {
|
||||
function makeScheduler() {
|
||||
const rawClient = {
|
||||
sendCommand: jest.fn().mockResolvedValue(1),
|
||||
};
|
||||
@@ -42,7 +41,7 @@ function makeScheduler(enabled = true) {
|
||||
raw: jest.fn().mockReturnValue(rawClient),
|
||||
} as unknown as jest.Mocked<GarnetService> & { raw: jest.Mock };
|
||||
const rateLimiter = {
|
||||
acquireBackground: jest.fn().mockResolvedValue(undefined),
|
||||
isRefreshWindowOpen: jest.fn().mockResolvedValue(true),
|
||||
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||
const enrichmentService = {
|
||||
markRefreshRequested: jest.fn().mockResolvedValue(undefined),
|
||||
@@ -51,16 +50,11 @@ function makeScheduler(enabled = true) {
|
||||
const staleAccountRepository = {
|
||||
findStaleAccounts: jest.fn().mockResolvedValue([]),
|
||||
} as unknown as jest.Mocked<StaleAccountRepository>;
|
||||
const config = {
|
||||
get: jest.fn().mockReturnValue(enabled ? 'true' : 'false'),
|
||||
} as unknown as ConfigService;
|
||||
|
||||
const scheduler = new BackgroundRefreshScheduler(
|
||||
garnet,
|
||||
rateLimiter,
|
||||
enrichmentService,
|
||||
staleAccountRepository,
|
||||
config,
|
||||
) as SchedulerInternals;
|
||||
|
||||
return {
|
||||
@@ -79,19 +73,40 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
it('does not schedule ticks when disabled', () => {
|
||||
it('schedules ticks without requiring RIOT_BG_REFRESH_ENABLED', () => {
|
||||
jest.useFakeTimers();
|
||||
const setIntervalSpy = jest.spyOn(global, 'setInterval');
|
||||
const { scheduler } = makeScheduler(false);
|
||||
const { scheduler } = makeScheduler();
|
||||
|
||||
scheduler.onModuleInit();
|
||||
|
||||
expect(setIntervalSpy).not.toHaveBeenCalled();
|
||||
expect(setIntervalSpy).toHaveBeenCalledTimes(2);
|
||||
scheduler.onModuleDestroy();
|
||||
});
|
||||
|
||||
it('does not query stale accounts outside the KST window', async () => {
|
||||
it('uses the dawn refresh gate ratio inside the KST background window', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const { scheduler, rateLimiter } = makeScheduler();
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.8);
|
||||
});
|
||||
|
||||
it('uses the opportunistic refresh gate ratio outside the KST background window', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T17:59:59.000Z'));
|
||||
const { scheduler, staleAccountRepository } = makeScheduler();
|
||||
const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler();
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
expect(rateLimiter.isRefreshWindowOpen).toHaveBeenCalledWith(0.5);
|
||||
expect(staleAccountRepository.findStaleAccounts).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('does not query stale accounts when the refresh gate is closed', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const { scheduler, rateLimiter, staleAccountRepository } = makeScheduler();
|
||||
rateLimiter.isRefreshWindowOpen.mockResolvedValue(false);
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
@@ -108,21 +123,15 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
expect(staleAccountRepository.findStaleAccounts).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('marks and enriches each stale candidate with background rate tokens', async () => {
|
||||
it('marks and enriches each stale candidate without background precharge', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const {
|
||||
scheduler,
|
||||
rateLimiter,
|
||||
enrichmentService,
|
||||
staleAccountRepository,
|
||||
} = makeScheduler();
|
||||
const { scheduler, enrichmentService, staleAccountRepository } =
|
||||
makeScheduler();
|
||||
const candidates = [candidate('puuid-1'), candidate('puuid-2')];
|
||||
staleAccountRepository.findStaleAccounts.mockResolvedValue(candidates);
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
expect(rateLimiter.acquireBackground).toHaveBeenCalledTimes(2);
|
||||
expect(rateLimiter.acquireBackground).toHaveBeenCalledWith(8);
|
||||
expect(enrichmentService.markRefreshRequested).toHaveBeenCalledTimes(2);
|
||||
expect(enrichmentService.markRefreshRequested).toHaveBeenNthCalledWith(
|
||||
1,
|
||||
@@ -136,6 +145,28 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('stops the candidate loop when the refresh gate closes mid-tick', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const {
|
||||
scheduler,
|
||||
rateLimiter,
|
||||
enrichmentService,
|
||||
staleAccountRepository,
|
||||
} = makeScheduler();
|
||||
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
||||
candidate('puuid-1'),
|
||||
candidate('puuid-2'),
|
||||
]);
|
||||
rateLimiter.isRefreshWindowOpen
|
||||
.mockResolvedValueOnce(true)
|
||||
.mockResolvedValueOnce(true)
|
||||
.mockResolvedValueOnce(false);
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
expect(enrichmentService.enrichRiotAccount).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('continues after a candidate throws and records a failure counter', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const { scheduler, rawClient, enrichmentService, staleAccountRepository } =
|
||||
@@ -162,13 +193,8 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
|
||||
it('skips candidates already in failure backoff', async () => {
|
||||
jest.useFakeTimers().setSystemTime(new Date('2026-05-02T18:00:00.000Z'));
|
||||
const {
|
||||
scheduler,
|
||||
garnet,
|
||||
rateLimiter,
|
||||
enrichmentService,
|
||||
staleAccountRepository,
|
||||
} = makeScheduler();
|
||||
const { scheduler, garnet, enrichmentService, staleAccountRepository } =
|
||||
makeScheduler();
|
||||
staleAccountRepository.findStaleAccounts.mockResolvedValue([
|
||||
candidate('skip-me'),
|
||||
]);
|
||||
@@ -179,7 +205,6 @@ describe('BackgroundRefreshScheduler', () => {
|
||||
|
||||
await scheduler.tick();
|
||||
|
||||
expect(rateLimiter.acquireBackground).not.toHaveBeenCalled();
|
||||
expect(enrichmentService.markRefreshRequested).not.toHaveBeenCalled();
|
||||
expect(enrichmentService.enrichRiotAccount).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
@@ -4,7 +4,6 @@ import {
|
||||
OnModuleDestroy,
|
||||
OnModuleInit,
|
||||
} from '@nestjs/common';
|
||||
import { ConfigService } from '@nestjs/config';
|
||||
import {
|
||||
type EnrichResult,
|
||||
RiotAccountEnrichmentService,
|
||||
@@ -20,11 +19,17 @@ const LEADER_TTL_SECONDS = 90;
|
||||
const LEADER_RENEW_INTERVAL_MS = 30_000;
|
||||
const STALE_THRESHOLD_MS = 6 * 60 * 60 * 1000;
|
||||
const PER_TICK_CANDIDATE_LIMIT = 20;
|
||||
const ENRICH_COST_TOKENS = 8;
|
||||
const DAWN_USAGE_RATIO = 0.8;
|
||||
const OPPORTUNISTIC_USAGE_RATIO = 0.5;
|
||||
const FAILURE_BACKOFF_KEY_PREFIX = 'riot:bg:fail';
|
||||
const FAILURE_BACKOFF_THRESHOLD = 3;
|
||||
const FAILURE_BACKOFF_TTL_SECONDS = 24 * 60 * 60;
|
||||
|
||||
interface RefreshGatePolicy {
|
||||
mode: 'dawn' | 'opportunistic';
|
||||
usageRatio: number;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class BackgroundRefreshScheduler
|
||||
implements OnModuleInit, OnModuleDestroy
|
||||
@@ -34,26 +39,15 @@ export class BackgroundRefreshScheduler
|
||||
private leaderRenewTimer?: NodeJS.Timeout;
|
||||
private tickInProgress = false;
|
||||
private readonly consumer = `${process.pid}:${Math.random().toString(36).slice(2)}`;
|
||||
private readonly enabled: boolean;
|
||||
|
||||
constructor(
|
||||
private readonly garnet: GarnetService,
|
||||
private readonly rateLimiter: RiotRateLimiterService,
|
||||
private readonly enrichmentService: RiotAccountEnrichmentService,
|
||||
private readonly staleAccountRepository: StaleAccountRepository,
|
||||
config: ConfigService,
|
||||
) {
|
||||
this.enabled = config.get<string>('RIOT_BG_REFRESH_ENABLED') === 'true';
|
||||
}
|
||||
) {}
|
||||
|
||||
public onModuleInit(): void {
|
||||
if (!this.enabled) {
|
||||
this.logger.log(
|
||||
'Background Riot refresh is disabled (RIOT_BG_REFRESH_ENABLED).',
|
||||
);
|
||||
return;
|
||||
}
|
||||
|
||||
this.tickTimer = setInterval(() => void this.safeTick(), TICK_INTERVAL_MS);
|
||||
this.leaderRenewTimer = setInterval(
|
||||
() => void this.renewLeaderIfHeld(),
|
||||
@@ -87,7 +81,11 @@ export class BackgroundRefreshScheduler
|
||||
}
|
||||
|
||||
private async tick(): Promise<void> {
|
||||
if (!isInKstBackgroundWindow()) return;
|
||||
const initialGate = this.currentRefreshGatePolicy();
|
||||
if (!(await this.rateLimiter.isRefreshWindowOpen(initialGate.usageRatio))) {
|
||||
return;
|
||||
}
|
||||
|
||||
const isLeader = await this.tryBecomeLeader();
|
||||
if (!isLeader) return;
|
||||
|
||||
@@ -101,15 +99,20 @@ export class BackgroundRefreshScheduler
|
||||
let processed = 0;
|
||||
let failed = 0;
|
||||
let skipped = 0;
|
||||
let currentGate = initialGate;
|
||||
|
||||
for (const candidate of candidates) {
|
||||
if (!isInKstBackgroundWindow()) break;
|
||||
currentGate = this.currentRefreshGatePolicy();
|
||||
if (
|
||||
!(await this.rateLimiter.isRefreshWindowOpen(currentGate.usageRatio))
|
||||
) {
|
||||
break;
|
||||
}
|
||||
if (await this.isInFailureBackoff(candidate.puuid)) {
|
||||
skipped += 1;
|
||||
continue;
|
||||
}
|
||||
|
||||
await this.rateLimiter.acquireBackground(ENRICH_COST_TOKENS);
|
||||
await this.enrichmentService.markRefreshRequested(
|
||||
candidate.userId,
|
||||
candidate.puuid,
|
||||
@@ -142,10 +145,18 @@ export class BackgroundRefreshScheduler
|
||||
}
|
||||
|
||||
this.logger.debug(
|
||||
`Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length}`,
|
||||
`Background refresh tick: processed=${processed} failed=${failed} skipped=${skipped} candidates=${candidates.length} mode=${currentGate.mode} ratio=${currentGate.usageRatio}`,
|
||||
);
|
||||
}
|
||||
|
||||
private currentRefreshGatePolicy(): RefreshGatePolicy {
|
||||
const isDawn = isInKstBackgroundWindow();
|
||||
return {
|
||||
mode: isDawn ? 'dawn' : 'opportunistic',
|
||||
usageRatio: isDawn ? DAWN_USAGE_RATIO : OPPORTUNISTIC_USAGE_RATIO,
|
||||
};
|
||||
}
|
||||
|
||||
private async tryBecomeLeader(): Promise<boolean> {
|
||||
const current = await this.garnet.getString(LEADER_KEY);
|
||||
if (current === this.consumer) {
|
||||
|
||||
@@ -0,0 +1,154 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import { GarnetService } from '../global/garnet/garnet.service';
|
||||
import { LegacyImportService } from '../legacy-import/legacy-import.service';
|
||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||
import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service';
|
||||
import { TournamentResultService } from '../tournament-result/tournament-result.service';
|
||||
import { RIOT_JOB_GROUP, RiotRefreshSubJob } from './riot-job-queue.types';
|
||||
import { RiotJobQueueService } from './riot-job-queue.service';
|
||||
import { RiotJobWorkerService } from './riot-job-worker.service';
|
||||
import { RiotRefreshGateway } from './riot-refresh.gateway';
|
||||
|
||||
function execResult<T>(value: T) {
|
||||
return { exec: jest.fn().mockResolvedValue(value) };
|
||||
}
|
||||
|
||||
function makeWorker() {
|
||||
const garnetService = {
|
||||
acknowledgeStream: jest.fn().mockResolvedValue(undefined),
|
||||
deleteStreamEntries: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<GarnetService>;
|
||||
const jobQueueService = {
|
||||
markProcessing: jest.fn().mockResolvedValue(undefined),
|
||||
markCompleted: jest.fn().mockResolvedValue({
|
||||
parentJobId: 'parent-1',
|
||||
jobId: 'job-1',
|
||||
queueGroup: 'summoners-rift',
|
||||
puuid: 'puuid-1',
|
||||
state: 'completed',
|
||||
}),
|
||||
markFailed: jest.fn(),
|
||||
} as unknown as jest.Mocked<RiotJobQueueService>;
|
||||
const recentMatchesService = {
|
||||
ensureFreshForQueue: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<RiotRecentMatchesService>;
|
||||
const userModel = {
|
||||
updateOne: jest.fn().mockReturnValue(execResult({ modifiedCount: 1 })),
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue(userModel),
|
||||
} as unknown as jest.Mocked<ConnectionService>;
|
||||
const refreshGateway = {
|
||||
broadcastRefreshEvent: jest.fn(),
|
||||
} as unknown as jest.Mocked<RiotRefreshGateway>;
|
||||
const tournamentResultService = {
|
||||
processPollJob: jest.fn(),
|
||||
} as unknown as jest.Mocked<TournamentResultService>;
|
||||
const legacyImportService = {
|
||||
processMemberJob: jest.fn(),
|
||||
} as unknown as jest.Mocked<LegacyImportService>;
|
||||
const enrichmentService = {
|
||||
refreshLeagueEntries: jest.fn().mockResolvedValue('updated'),
|
||||
} as unknown as jest.Mocked<RiotAccountEnrichmentService>;
|
||||
|
||||
const worker = new RiotJobWorkerService(
|
||||
garnetService,
|
||||
jobQueueService,
|
||||
recentMatchesService,
|
||||
connectionService,
|
||||
refreshGateway,
|
||||
tournamentResultService,
|
||||
legacyImportService,
|
||||
enrichmentService,
|
||||
);
|
||||
|
||||
return {
|
||||
worker,
|
||||
garnetService,
|
||||
jobQueueService,
|
||||
recentMatchesService,
|
||||
connectionService,
|
||||
refreshGateway,
|
||||
enrichmentService,
|
||||
};
|
||||
}
|
||||
|
||||
describe('RiotJobWorkerService', () => {
|
||||
it('acknowledges and deletes invalid stream entries', async () => {
|
||||
const { worker, garnetService } = makeWorker();
|
||||
|
||||
await (
|
||||
worker as unknown as {
|
||||
processEntry: (
|
||||
stream: string,
|
||||
entry: { id: string; message: Record<string, string> },
|
||||
) => Promise<void>;
|
||||
}
|
||||
).processEntry('riot:queue:high', {
|
||||
id: 'bad-1',
|
||||
message: { job: 'not-json' },
|
||||
});
|
||||
|
||||
expect(garnetService.acknowledgeStream).toHaveBeenCalledWith(
|
||||
'riot:queue:high',
|
||||
RIOT_JOB_GROUP,
|
||||
'bad-1',
|
||||
);
|
||||
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||
'riot:queue:high',
|
||||
'bad-1',
|
||||
);
|
||||
});
|
||||
|
||||
it('refreshes league entries while processing user history refresh jobs', async () => {
|
||||
const { worker, enrichmentService, recentMatchesService, garnetService } =
|
||||
makeWorker();
|
||||
const userId = new mongoose.Types.ObjectId().toString();
|
||||
const job: RiotRefreshSubJob = {
|
||||
jobId: 'job-1',
|
||||
parentJobId: 'parent-1',
|
||||
userId,
|
||||
puuid: 'puuid-1',
|
||||
region: 'asia',
|
||||
platform: 'kr',
|
||||
queueGroup: 'summoners-rift',
|
||||
queueIds: [420, 430],
|
||||
requestedAt: Date.now(),
|
||||
priority: 'high',
|
||||
};
|
||||
|
||||
await (
|
||||
worker as unknown as {
|
||||
processEntry: (
|
||||
stream: string,
|
||||
entry: { id: string; message: Record<string, string> },
|
||||
) => Promise<void>;
|
||||
}
|
||||
).processEntry('riot:queue:high', {
|
||||
id: '1-0',
|
||||
message: { job: JSON.stringify(job) },
|
||||
});
|
||||
|
||||
expect(recentMatchesService.ensureFreshForQueue).toHaveBeenCalledTimes(2);
|
||||
expect(enrichmentService.refreshLeagueEntries).toHaveBeenCalledWith({
|
||||
userId: expect.any(mongoose.Types.ObjectId),
|
||||
puuid: 'puuid-1',
|
||||
platform: 'kr',
|
||||
});
|
||||
expect(garnetService.acknowledgeStream).toHaveBeenCalledWith(
|
||||
'riot:queue:high',
|
||||
RIOT_JOB_GROUP,
|
||||
'1-0',
|
||||
);
|
||||
expect(garnetService.deleteStreamEntries).toHaveBeenCalledWith(
|
||||
'riot:queue:high',
|
||||
'1-0',
|
||||
);
|
||||
expect(
|
||||
garnetService.acknowledgeStream.mock.invocationCallOrder[0],
|
||||
).toBeLessThan(
|
||||
garnetService.deleteStreamEntries.mock.invocationCallOrder[0],
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -9,7 +9,10 @@ import { ConnectionService } from '../global/database/connection.service';
|
||||
import { GarnetService, StreamEntry } from '../global/garnet/garnet.service';
|
||||
import { LegacyImportService } from '../legacy-import/legacy-import.service';
|
||||
import type { LegacyImportMemberJob } from '../legacy-import/legacy-import.types';
|
||||
import { RiotAccountEnrichmentService } from '../riot/riot-account-enrichment.service';
|
||||
import { RiotRecentMatchesService } from '../riot/riot-recent-matches.service';
|
||||
import { TournamentResultService } from '../tournament-result/tournament-result.service';
|
||||
import type { PollTournamentResultJob } from '../tournament-result/tournament-result.types';
|
||||
import {
|
||||
RIOT_JOB_GROUP,
|
||||
RIOT_JOB_HIGH_STREAM,
|
||||
@@ -19,8 +22,6 @@ import {
|
||||
} from './riot-job-queue.types';
|
||||
import { RiotJobQueueService } from './riot-job-queue.service';
|
||||
import { RiotRefreshGateway } from './riot-refresh.gateway';
|
||||
import { TournamentResultService } from '../tournament-result/tournament-result.service';
|
||||
import type { PollTournamentResultJob } from '../tournament-result/tournament-result.types';
|
||||
|
||||
const LEADER_KEY = 'riot:worker:leader';
|
||||
const LEADER_TTL_SECONDS = 60;
|
||||
@@ -39,6 +40,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
private readonly refreshGateway: RiotRefreshGateway,
|
||||
private readonly tournamentResultService: TournamentResultService,
|
||||
private readonly legacyImportService: LegacyImportService,
|
||||
private readonly enrichmentService: RiotAccountEnrichmentService,
|
||||
) {}
|
||||
|
||||
public async onModuleInit() {
|
||||
@@ -77,10 +79,13 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
}
|
||||
}
|
||||
|
||||
private async processEntry(stream: string, entry: StreamEntry): Promise<void> {
|
||||
private async processEntry(
|
||||
stream: string,
|
||||
entry: StreamEntry,
|
||||
): Promise<void> {
|
||||
const job = this.parseJob(entry);
|
||||
if (!job) {
|
||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
||||
await this.acknowledgeAndDelete(stream, entry.id);
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -102,6 +107,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
queueId,
|
||||
});
|
||||
}
|
||||
await this.refreshLeagueEntries(job);
|
||||
await this.markUserFetchedAt(job);
|
||||
const event = await this.jobQueueService.markCompleted(job);
|
||||
this.refreshGateway.broadcastRefreshEvent(event);
|
||||
@@ -131,7 +137,50 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
}`,
|
||||
);
|
||||
} finally {
|
||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, entry.id);
|
||||
await this.acknowledgeAndDelete(stream, entry.id);
|
||||
}
|
||||
}
|
||||
|
||||
private async acknowledgeAndDelete(
|
||||
stream: string,
|
||||
id: string,
|
||||
): Promise<void> {
|
||||
await this.garnetService.acknowledgeStream(stream, RIOT_JOB_GROUP, id);
|
||||
await this.deleteAcknowledgedEntry(stream, id);
|
||||
}
|
||||
|
||||
private async deleteAcknowledgedEntry(
|
||||
stream: string,
|
||||
id: string,
|
||||
): Promise<void> {
|
||||
try {
|
||||
await this.garnetService.deleteStreamEntries(stream, id);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Failed to delete acknowledged Riot job stream entry ${stream} ${id}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private async refreshLeagueEntries(job: RiotRefreshSubJob): Promise<void> {
|
||||
try {
|
||||
const result = await this.enrichmentService.refreshLeagueEntries({
|
||||
userId: new mongoose.Types.ObjectId(job.userId),
|
||||
puuid: job.puuid,
|
||||
platform: job.platform,
|
||||
});
|
||||
if (result !== 'failed') return;
|
||||
this.logger.warn(
|
||||
`Riot league refresh failed ${job.jobId}: puuid=${job.puuid}`,
|
||||
);
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Riot league refresh failed ${job.jobId}: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -169,9 +218,7 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
return job.kind === 'poll-tournament-result';
|
||||
}
|
||||
|
||||
private isLegacyImportJob(
|
||||
job: RiotJobPayload,
|
||||
): job is LegacyImportMemberJob {
|
||||
private isLegacyImportJob(job: RiotJobPayload): job is LegacyImportMemberJob {
|
||||
return job.kind === 'legacy-import-member';
|
||||
}
|
||||
|
||||
@@ -196,7 +243,8 @@ export class RiotJobWorkerService implements OnModuleInit, OnModuleDestroy {
|
||||
try {
|
||||
await this.garnetService.createConsumerGroup(stream, RIOT_JOB_GROUP);
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : String(error);
|
||||
const message =
|
||||
error instanceof Error ? error.message : String(error);
|
||||
if (!message.includes('BUSYGROUP')) throw error;
|
||||
}
|
||||
}),
|
||||
|
||||
@@ -70,9 +70,11 @@ function makeAccount(overrides: Partial<FakeAccount> = {}): FakeAccount {
|
||||
|
||||
function makeUser(account: FakeAccount) {
|
||||
const _id = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const save = jest.fn().mockResolvedValue(undefined);
|
||||
return {
|
||||
_id,
|
||||
communityId,
|
||||
riotAccounts: [account],
|
||||
save,
|
||||
};
|
||||
@@ -86,6 +88,7 @@ function makeService(overrides?: {
|
||||
mastery?: Partial<RiotChampionMasteryService>;
|
||||
recentMatches?: Partial<RiotRecentMatchesService>;
|
||||
recentStats?: Partial<RiotRecentStatsService>;
|
||||
match?: any;
|
||||
}) {
|
||||
const user = overrides?.user;
|
||||
const userFindById = jest.fn().mockReturnValue({
|
||||
@@ -98,10 +101,15 @@ function makeService(overrides?: {
|
||||
Promise.resolve({
|
||||
riotPlatform: 'kr',
|
||||
riotRegion: 'asia',
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
});
|
||||
const matchUpdateManyExec = jest.fn().mockResolvedValue({ modifiedCount: 0 });
|
||||
const matchModel = {
|
||||
updateMany: jest.fn().mockReturnValue({ exec: matchUpdateManyExec }),
|
||||
...overrides?.match,
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (modelName: string) => {
|
||||
if (modelName === 'user') {
|
||||
@@ -110,6 +118,9 @@ function makeService(overrides?: {
|
||||
if (modelName === 'community') {
|
||||
return { findById: communityFindById };
|
||||
}
|
||||
if (modelName === 'match') {
|
||||
return matchModel;
|
||||
}
|
||||
throw new Error(`Unexpected model: ${modelName}`);
|
||||
}),
|
||||
} as unknown as ConnectionService;
|
||||
@@ -160,6 +171,8 @@ function makeService(overrides?: {
|
||||
masteryService,
|
||||
recentMatchesService,
|
||||
recentStatsService,
|
||||
matchModel,
|
||||
matchUpdateManyExec,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -370,6 +383,273 @@ describe('RiotAccountEnrichmentService', () => {
|
||||
expect(user.save).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('refreshes league entries without refreshing recent matches', async () => {
|
||||
const recent = new Date(Date.now() - 60_000);
|
||||
const account = makeAccount({
|
||||
revisionDate: Date.now() - 60_000,
|
||||
tiers: [
|
||||
{
|
||||
leagueId: 'L1',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 1,
|
||||
wins: 1,
|
||||
losses: 1,
|
||||
fetchedAt: recent,
|
||||
},
|
||||
],
|
||||
recentStatsFetchedAt: recent,
|
||||
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||
});
|
||||
const user = makeUser(account);
|
||||
const { service, leagueService, recentMatchesService } = makeService({
|
||||
user,
|
||||
league: {
|
||||
getEntriesByPuuid: jest.fn().mockResolvedValue([
|
||||
{
|
||||
leagueId: 'L2',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 20,
|
||||
wins: 10,
|
||||
losses: 8,
|
||||
},
|
||||
]),
|
||||
} as Partial<RiotLeagueService>,
|
||||
});
|
||||
|
||||
const result = await service.refreshLeagueEntries({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
platform: 'kr',
|
||||
});
|
||||
|
||||
expect(result).toBe('updated');
|
||||
expect(leagueService.getEntriesByPuuid).toHaveBeenCalledWith('puuid-1', {
|
||||
platform: 'kr',
|
||||
});
|
||||
expect(recentMatchesService.syncRecentMatches).not.toHaveBeenCalled();
|
||||
expect(account.tiers).toHaveLength(1);
|
||||
expect(account.tiers[0]).toMatchObject({
|
||||
leagueId: 'L2',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
leaguePoints: 20,
|
||||
});
|
||||
expect(account.tierHistory.at(-1)).toMatchObject({
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
leaguePoints: 20,
|
||||
});
|
||||
expect(user.save).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
|
||||
it('appends tier history when LP changes without tier or rank changes', async () => {
|
||||
const recent = new Date(Date.now() - 60_000);
|
||||
const account = makeAccount({
|
||||
revisionDate: Date.now() - 60_000,
|
||||
tiers: [
|
||||
{
|
||||
leagueId: 'L1',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 10,
|
||||
wins: 20,
|
||||
losses: 12,
|
||||
fetchedAt: recent,
|
||||
},
|
||||
],
|
||||
tierHistory: [
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
leaguePoints: 10,
|
||||
wins: 20,
|
||||
losses: 12,
|
||||
recordedAt: recent,
|
||||
},
|
||||
],
|
||||
recentStatsFetchedAt: recent,
|
||||
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||
});
|
||||
const user = makeUser(account);
|
||||
const { service } = makeService({
|
||||
user,
|
||||
league: {
|
||||
getEntriesByPuuid: jest.fn().mockResolvedValue([
|
||||
{
|
||||
leagueId: 'L1',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 44,
|
||||
wins: 21,
|
||||
losses: 12,
|
||||
},
|
||||
]),
|
||||
} as Partial<RiotLeagueService>,
|
||||
});
|
||||
|
||||
await service.refreshLeagueEntries({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
platform: 'kr',
|
||||
});
|
||||
|
||||
expect(account.tierHistory).toHaveLength(2);
|
||||
expect(account.tierHistory.at(-1)).toMatchObject({
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
leaguePoints: 44,
|
||||
wins: 21,
|
||||
losses: 12,
|
||||
});
|
||||
});
|
||||
|
||||
it('syncs refreshed league tier into active match participant snapshots', async () => {
|
||||
const recent = new Date(Date.now() - 60_000);
|
||||
const account = makeAccount({
|
||||
revisionDate: Date.now() - 60_000,
|
||||
tiers: [
|
||||
{
|
||||
leagueId: 'L1',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 1,
|
||||
wins: 1,
|
||||
losses: 1,
|
||||
fetchedAt: recent,
|
||||
},
|
||||
],
|
||||
recentStatsFetchedAt: recent,
|
||||
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||
});
|
||||
const user = makeUser(account);
|
||||
const { service, matchModel } = makeService({
|
||||
user,
|
||||
league: {
|
||||
getEntriesByPuuid: jest.fn().mockResolvedValue([
|
||||
{
|
||||
leagueId: 'L2',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 20,
|
||||
wins: 10,
|
||||
losses: 8,
|
||||
},
|
||||
]),
|
||||
} as Partial<RiotLeagueService>,
|
||||
});
|
||||
|
||||
await service.refreshLeagueEntries({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
platform: 'kr',
|
||||
});
|
||||
|
||||
expect(matchModel.updateMany).toHaveBeenCalledWith(
|
||||
{
|
||||
status: { $in: ['recruiting', 'team-built', 'in-progress'] },
|
||||
participants: {
|
||||
$elemMatch: {
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
'participants.$[participant].tier': expect.objectContaining({
|
||||
leagueId: 'L2',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'PLATINUM',
|
||||
rank: 'IV',
|
||||
leaguePoints: 20,
|
||||
}),
|
||||
},
|
||||
},
|
||||
{
|
||||
arrayFilters: [
|
||||
{
|
||||
'participant.userId': user._id,
|
||||
'participant.puuid': 'puuid-1',
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
it('clears active match participant tier when refreshed league entries are empty', async () => {
|
||||
const recent = new Date(Date.now() - 60_000);
|
||||
const account = makeAccount({
|
||||
revisionDate: Date.now() - 60_000,
|
||||
tiers: [
|
||||
{
|
||||
leagueId: 'L1',
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'GOLD',
|
||||
rank: 'II',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 1,
|
||||
wins: 1,
|
||||
losses: 1,
|
||||
fetchedAt: recent,
|
||||
},
|
||||
],
|
||||
recentStatsFetchedAt: recent,
|
||||
recentStatsSummary: createEmptyRiotRecentStatsSummary(),
|
||||
});
|
||||
const user = makeUser(account);
|
||||
const { service, matchModel } = makeService({
|
||||
user,
|
||||
league: {
|
||||
getEntriesByPuuid: jest.fn().mockResolvedValue([]),
|
||||
} as Partial<RiotLeagueService>,
|
||||
});
|
||||
|
||||
await service.refreshLeagueEntries({
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
platform: 'kr',
|
||||
});
|
||||
|
||||
expect(matchModel.updateMany).toHaveBeenCalledWith(
|
||||
{
|
||||
status: { $in: ['recruiting', 'team-built', 'in-progress'] },
|
||||
participants: {
|
||||
$elemMatch: {
|
||||
userId: user._id,
|
||||
puuid: 'puuid-1',
|
||||
},
|
||||
},
|
||||
},
|
||||
{ $unset: { 'participants.$[participant].tier': '' } },
|
||||
{
|
||||
arrayFilters: [
|
||||
{
|
||||
'participant.userId': user._id,
|
||||
'participant.puuid': 'puuid-1',
|
||||
},
|
||||
],
|
||||
},
|
||||
);
|
||||
});
|
||||
|
||||
it('records failed for individual failing fetches but updates the rest', async () => {
|
||||
const account = makeAccount();
|
||||
const user = makeUser(account);
|
||||
|
||||
@@ -3,6 +3,7 @@ import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import {
|
||||
ChampionMasteryEntry,
|
||||
MatchStatus,
|
||||
RiotAccount,
|
||||
TierInfo,
|
||||
} from '../global/database/schema';
|
||||
@@ -33,6 +34,11 @@ const DEFAULT_SUMMONER_TTL_MS = 24 * 60 * 60 * 1000; // 24h
|
||||
const DEFAULT_LEAGUE_TTL_MS = 60 * 60 * 1000; // 1h
|
||||
const DEFAULT_MASTERY_TTL_MS = 6 * 60 * 60 * 1000; // 6h
|
||||
const DEFAULT_RECENT_MATCHES_TTL_MS = 6 * 60 * 60 * 1000; // 6h
|
||||
const ACTIVE_MATCH_STATUSES: MatchStatus[] = [
|
||||
'recruiting',
|
||||
'team-built',
|
||||
'in-progress',
|
||||
];
|
||||
|
||||
export interface EnrichOptions {
|
||||
platform?: RiotPlatformRoute;
|
||||
@@ -52,6 +58,8 @@ export interface EnrichResult {
|
||||
account: RiotAccount | null;
|
||||
}
|
||||
|
||||
export type RefreshLeagueEntriesResult = 'updated' | 'failed';
|
||||
|
||||
@Injectable()
|
||||
export class RiotAccountEnrichmentService {
|
||||
private readonly logger = new Logger(RiotAccountEnrichmentService.name);
|
||||
@@ -95,6 +103,34 @@ export class RiotAccountEnrichmentService {
|
||||
return promise;
|
||||
}
|
||||
|
||||
public async refreshLeagueEntries(params: {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
platform?: RiotPlatformRoute;
|
||||
}): Promise<RefreshLeagueEntriesResult> {
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const user = await UserModel.findById(params.userId).exec();
|
||||
if (!user) return 'failed';
|
||||
|
||||
const account = user.riotAccounts.find((a) => a.puuid === params.puuid);
|
||||
if (!account) return 'failed';
|
||||
|
||||
const outcome = await this.fetchLeagueSafe(
|
||||
params.puuid,
|
||||
params.platform ?? DEFAULT_PLATFORM,
|
||||
);
|
||||
if (outcome.status !== 'updated' || !outcome.dto) return 'failed';
|
||||
|
||||
this.applyLeagueEntries(account, outcome.dto);
|
||||
await user.save();
|
||||
await this.syncActiveMatchParticipantTier(
|
||||
user._id,
|
||||
params.puuid,
|
||||
account.tiers,
|
||||
);
|
||||
return 'updated';
|
||||
}
|
||||
|
||||
private async doEnrichRiotAccount(params: {
|
||||
userId: mongoose.Types.ObjectId;
|
||||
puuid: string;
|
||||
@@ -218,6 +254,13 @@ export class RiotAccountEnrichmentService {
|
||||
) {
|
||||
await user.save();
|
||||
}
|
||||
if (leagueOutcome.status === 'updated') {
|
||||
await this.syncActiveMatchParticipantTier(
|
||||
user._id,
|
||||
params.puuid,
|
||||
account.tiers,
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
summoner: summonerOutcome.status,
|
||||
@@ -400,7 +443,10 @@ export class RiotAccountEnrichmentService {
|
||||
const changed =
|
||||
!last ||
|
||||
last.tier !== entry.tier ||
|
||||
(last.rank ?? '') !== (entry.rank ?? '');
|
||||
(last.rank ?? '') !== (entry.rank ?? '') ||
|
||||
last.leaguePoints !== entry.leaguePoints ||
|
||||
last.wins !== entry.wins ||
|
||||
last.losses !== entry.losses;
|
||||
if (!changed) continue;
|
||||
|
||||
account.tierHistory.push({
|
||||
@@ -438,6 +484,62 @@ export class RiotAccountEnrichmentService {
|
||||
account.matchIdsFetchedAt = fetchedAt;
|
||||
}
|
||||
|
||||
private async syncActiveMatchParticipantTier(
|
||||
userId: mongoose.Types.ObjectId,
|
||||
puuid: string,
|
||||
tiers: TierInfo[],
|
||||
): Promise<void> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const tier = this.selectParticipantTier(tiers);
|
||||
const update = tier
|
||||
? { $set: { 'participants.$[participant].tier': tier } }
|
||||
: { $unset: { 'participants.$[participant].tier': '' } };
|
||||
|
||||
await MatchModel.updateMany(
|
||||
{
|
||||
status: { $in: ACTIVE_MATCH_STATUSES },
|
||||
participants: {
|
||||
$elemMatch: {
|
||||
userId,
|
||||
puuid,
|
||||
},
|
||||
},
|
||||
},
|
||||
update,
|
||||
{
|
||||
arrayFilters: [
|
||||
{
|
||||
'participant.userId': userId,
|
||||
'participant.puuid': puuid,
|
||||
},
|
||||
],
|
||||
},
|
||||
).exec();
|
||||
}
|
||||
|
||||
private selectParticipantTier(tiers: TierInfo[]): TierInfo | undefined {
|
||||
const tier =
|
||||
tiers.find((entry) => entry.queueType === 'RANKED_SOLO_5x5') ?? tiers[0];
|
||||
if (!tier) return undefined;
|
||||
|
||||
return {
|
||||
leagueId: tier.leagueId,
|
||||
queueType: tier.queueType,
|
||||
tier: tier.tier,
|
||||
rank: tier.rank,
|
||||
puuid: tier.puuid,
|
||||
leaguePoints: tier.leaguePoints,
|
||||
wins: tier.wins,
|
||||
losses: tier.losses,
|
||||
veteran: tier.veteran,
|
||||
inactive: tier.inactive,
|
||||
freshBlood: tier.freshBlood,
|
||||
hotStreak: tier.hotStreak,
|
||||
miniSeries: tier.miniSeries,
|
||||
fetchedAt: tier.fetchedAt,
|
||||
};
|
||||
}
|
||||
|
||||
private tiersOldestAt(tiers: TierInfo[]): number {
|
||||
if (tiers.length === 0) return 0;
|
||||
let oldest = Infinity;
|
||||
|
||||
@@ -0,0 +1,47 @@
|
||||
import { RiotClientService } from './riot.client.service';
|
||||
import { RiotLeagueService } from './riot-league.service';
|
||||
import type { RiotLeagueEntryDto, RiotResponseParser } from './riot.types';
|
||||
|
||||
describe('RiotLeagueService', () => {
|
||||
it('accepts Riot league entries without optional leagueId', async () => {
|
||||
const client = {
|
||||
get: jest.fn(
|
||||
async <T>(
|
||||
_path: string,
|
||||
_options: unknown,
|
||||
parser?: RiotResponseParser<T>,
|
||||
) =>
|
||||
parser
|
||||
? parser([
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'EMERALD',
|
||||
rank: 'I',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 75,
|
||||
wins: 160,
|
||||
losses: 148,
|
||||
},
|
||||
])
|
||||
: ([] as T),
|
||||
),
|
||||
} as unknown as RiotClientService;
|
||||
const service = new RiotLeagueService(client);
|
||||
|
||||
const result = await service.getEntriesByPuuid('puuid-1', {
|
||||
platform: 'kr',
|
||||
});
|
||||
|
||||
expect(result).toEqual<RiotLeagueEntryDto[]>([
|
||||
{
|
||||
queueType: 'RANKED_SOLO_5x5',
|
||||
tier: 'EMERALD',
|
||||
rank: 'I',
|
||||
puuid: 'puuid-1',
|
||||
leaguePoints: 75,
|
||||
wins: 160,
|
||||
losses: 148,
|
||||
},
|
||||
]);
|
||||
});
|
||||
});
|
||||
@@ -36,7 +36,10 @@ function parseEntry(value: unknown, index: number): RiotLeagueEntryDto {
|
||||
throw new TypeError(`leagueEntries[${index}] must be an object.`);
|
||||
}
|
||||
return {
|
||||
leagueId: requireString(value.leagueId, `leagueEntries[${index}].leagueId`),
|
||||
leagueId: optionalString(
|
||||
value.leagueId,
|
||||
`leagueEntries[${index}].leagueId`,
|
||||
),
|
||||
queueType: requireString(
|
||||
value.queueType,
|
||||
`leagueEntries[${index}].queueType`,
|
||||
@@ -71,6 +74,11 @@ function requireString(value: unknown, path: string): string {
|
||||
return value;
|
||||
}
|
||||
|
||||
function optionalString(value: unknown, path: string): string | undefined {
|
||||
if (value === undefined || value === null) return undefined;
|
||||
return requireString(value, path);
|
||||
}
|
||||
|
||||
function requireNumber(value: unknown, path: string): number {
|
||||
if (typeof value !== 'number' || !Number.isFinite(value)) {
|
||||
throw new TypeError(`${path} must be a finite number.`);
|
||||
|
||||
@@ -106,4 +106,112 @@ describe('RiotMatchService', () => {
|
||||
expect(match.info.participants[0].teamPosition).toBe('');
|
||||
expect(match.info.participants[0].individualPosition).toBe('');
|
||||
});
|
||||
|
||||
it('fetches and parses match timeline frames', async () => {
|
||||
const payload = {
|
||||
metadata: {
|
||||
dataVersion: '2',
|
||||
matchId: 'KR_8188913502',
|
||||
participants: ['puuid-1'],
|
||||
},
|
||||
info: {
|
||||
frameInterval: 60_000,
|
||||
gameId: 8188913502,
|
||||
participants: [{ participantId: 1, puuid: 'puuid-1' }],
|
||||
frames: [
|
||||
{
|
||||
timestamp: 60_000,
|
||||
events: [
|
||||
{
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
timestamp: 30_000,
|
||||
killerTeamId: 100,
|
||||
monsterType: 'DRAGON',
|
||||
monsterSubType: 'ELDER_DRAGON',
|
||||
},
|
||||
{
|
||||
type: 'ITEM_PURCHASED',
|
||||
timestamp: 40_000,
|
||||
participantId: 1,
|
||||
itemId: 1054,
|
||||
},
|
||||
{
|
||||
type: 'ITEM_UNDO',
|
||||
timestamp: 45_000,
|
||||
participantId: 1,
|
||||
beforeId: 1054,
|
||||
afterId: 3071,
|
||||
},
|
||||
{
|
||||
type: 'SKILL_LEVEL_UP',
|
||||
timestamp: 50_000,
|
||||
participantId: 1,
|
||||
skillSlot: 3,
|
||||
levelUpType: 'NORMAL',
|
||||
},
|
||||
],
|
||||
participantFrames: {
|
||||
'1': {
|
||||
currentGold: 650,
|
||||
jungleMinionsKilled: 0,
|
||||
level: 2,
|
||||
minionsKilled: 6,
|
||||
participantId: 1,
|
||||
totalGold: 1_150,
|
||||
xp: 550,
|
||||
},
|
||||
},
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
const riotClientService = {
|
||||
get: jest.fn(
|
||||
async <T>(
|
||||
_path: string,
|
||||
_options: unknown,
|
||||
parser?: RiotResponseParser<T>,
|
||||
) => (parser ? parser(payload) : (payload as T)),
|
||||
),
|
||||
} as unknown as RiotClientService;
|
||||
const service = new RiotMatchService(riotClientService);
|
||||
|
||||
const timeline = await service.getMatchTimeline('KR_8188913502', {
|
||||
region: 'asia',
|
||||
});
|
||||
|
||||
expect(riotClientService.get).toHaveBeenCalledWith(
|
||||
'/lol/match/v5/matches/KR_8188913502/timeline',
|
||||
expect.objectContaining({ region: 'asia' }),
|
||||
expect.any(Function),
|
||||
);
|
||||
expect(timeline.info.frames[0].participantFrames['1']).toMatchObject({
|
||||
participantId: 1,
|
||||
totalGold: 1_150,
|
||||
xp: 550,
|
||||
});
|
||||
expect(timeline.info.frames[0].events[0]).toMatchObject({
|
||||
type: 'ELITE_MONSTER_KILL',
|
||||
killerTeamId: 100,
|
||||
monsterType: 'DRAGON',
|
||||
monsterSubType: 'ELDER_DRAGON',
|
||||
});
|
||||
expect(timeline.info.frames[0].events[1]).toMatchObject({
|
||||
type: 'ITEM_PURCHASED',
|
||||
participantId: 1,
|
||||
itemId: 1054,
|
||||
});
|
||||
expect(timeline.info.frames[0].events[2]).toMatchObject({
|
||||
type: 'ITEM_UNDO',
|
||||
participantId: 1,
|
||||
beforeId: 1054,
|
||||
afterId: 3071,
|
||||
});
|
||||
expect(timeline.info.frames[0].events[3]).toMatchObject({
|
||||
type: 'SKILL_LEVEL_UP',
|
||||
participantId: 1,
|
||||
skillSlot: 3,
|
||||
levelUpType: 'NORMAL',
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -15,6 +15,12 @@ import {
|
||||
RiotMatchPerkStyleSelectionDto,
|
||||
RiotMatchStatPerksDto,
|
||||
RiotMatchTeamDto,
|
||||
RiotMatchTimelineDto,
|
||||
RiotMatchTimelineEventDto,
|
||||
RiotMatchTimelineFrameDto,
|
||||
RiotMatchTimelineInfoDto,
|
||||
RiotMatchTimelineParticipantDto,
|
||||
RiotMatchTimelineParticipantFrameDto,
|
||||
RiotMatchType,
|
||||
} from './riot.types';
|
||||
|
||||
@@ -66,6 +72,20 @@ export class RiotMatchService {
|
||||
parseMatchResponse,
|
||||
);
|
||||
}
|
||||
|
||||
public async getMatchTimeline(
|
||||
matchId: string,
|
||||
options: RiotMatchLookupOptions = {},
|
||||
): Promise<RiotMatchTimelineDto> {
|
||||
return this.riotClientService.get<RiotMatchTimelineDto>(
|
||||
`/lol/match/v5/matches/${encodeURIComponent(matchId)}/timeline`,
|
||||
{
|
||||
region: options.region,
|
||||
signal: options.signal,
|
||||
},
|
||||
parseMatchTimelineResponse,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function validateMatchIdsLookupOptions(
|
||||
@@ -115,6 +135,48 @@ function parseMatchResponse(value: unknown): RiotMatchDto {
|
||||
};
|
||||
}
|
||||
|
||||
function parseMatchTimelineResponse(value: unknown): RiotMatchTimelineDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError('Riot match timeline response must be an object.');
|
||||
}
|
||||
|
||||
return {
|
||||
metadata: parseMatchMetadata(value.metadata),
|
||||
info: parseMatchTimelineInfo(value.info),
|
||||
};
|
||||
}
|
||||
|
||||
function parseMatchTimelineInfo(value: unknown): RiotMatchTimelineInfoDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError('Riot match timeline info must be an object.');
|
||||
}
|
||||
|
||||
const frames = value.frames;
|
||||
if (!Array.isArray(frames)) {
|
||||
throw new TypeError('Riot match timeline info.frames must be an array.');
|
||||
}
|
||||
|
||||
const participants = value.participants;
|
||||
if (participants !== undefined && !Array.isArray(participants)) {
|
||||
throw new TypeError(
|
||||
'Riot match timeline info.participants must be an array when present.',
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
...value,
|
||||
frameInterval: requireNumber(
|
||||
value.frameInterval,
|
||||
'timeline.info.frameInterval',
|
||||
),
|
||||
frames: frames.map((frame, index) => parseTimelineFrame(frame, index)),
|
||||
gameId: optionalNumber(value.gameId, 'timeline.info.gameId'),
|
||||
participants: participants?.map((participant, index) =>
|
||||
parseTimelineParticipant(participant, index),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
function parseMatchMetadata(value: unknown): RiotMatchMetadataDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError('Riot match metadata must be an object.');
|
||||
@@ -211,6 +273,195 @@ function parseMatchInfo(value: unknown): RiotMatchInfoDto {
|
||||
};
|
||||
}
|
||||
|
||||
function parseTimelineParticipant(
|
||||
value: unknown,
|
||||
index: number,
|
||||
): RiotMatchTimelineParticipantDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError(`timeline.info.participants[${index}] must be an object.`);
|
||||
}
|
||||
|
||||
return {
|
||||
...value,
|
||||
participantId: requireNumber(
|
||||
value.participantId,
|
||||
`timeline.info.participants[${index}].participantId`,
|
||||
),
|
||||
puuid: requireString(value.puuid, `timeline.info.participants[${index}].puuid`),
|
||||
};
|
||||
}
|
||||
|
||||
function parseTimelineFrame(
|
||||
value: unknown,
|
||||
index: number,
|
||||
): RiotMatchTimelineFrameDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError(`timeline.info.frames[${index}] must be an object.`);
|
||||
}
|
||||
|
||||
const participantFrames = value.participantFrames;
|
||||
if (!isRecord(participantFrames)) {
|
||||
throw new TypeError(
|
||||
`timeline.info.frames[${index}].participantFrames must be an object.`,
|
||||
);
|
||||
}
|
||||
const events = value.events;
|
||||
if (events !== undefined && !Array.isArray(events)) {
|
||||
throw new TypeError(
|
||||
`timeline.info.frames[${index}].events must be an array when present.`,
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
...value,
|
||||
events: (events ?? []).map((event, eventIndex) =>
|
||||
parseTimelineEvent(event, index, eventIndex),
|
||||
),
|
||||
timestamp: requireNumber(
|
||||
value.timestamp,
|
||||
`timeline.info.frames[${index}].timestamp`,
|
||||
),
|
||||
participantFrames: Object.fromEntries(
|
||||
Object.entries(participantFrames).map(([key, participantFrame]) => [
|
||||
key,
|
||||
parseTimelineParticipantFrame(participantFrame, index, key),
|
||||
]),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
function parseTimelineEvent(
|
||||
value: unknown,
|
||||
frameIndex: number,
|
||||
eventIndex: number,
|
||||
): RiotMatchTimelineEventDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError(
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}] must be an object.`,
|
||||
);
|
||||
}
|
||||
|
||||
const assistingParticipantIds = value.assistingParticipantIds;
|
||||
if (
|
||||
assistingParticipantIds !== undefined &&
|
||||
(!Array.isArray(assistingParticipantIds) ||
|
||||
!assistingParticipantIds.every(isFiniteNumber))
|
||||
) {
|
||||
throw new TypeError(
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].assistingParticipantIds must be an array of numbers when present.`,
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
...value,
|
||||
afterId: optionalNumber(
|
||||
value.afterId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].afterId`,
|
||||
),
|
||||
assistingParticipantIds,
|
||||
beforeId: optionalNumber(
|
||||
value.beforeId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].beforeId`,
|
||||
),
|
||||
buildingType: optionalString(
|
||||
value.buildingType,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].buildingType`,
|
||||
),
|
||||
itemId: optionalNumber(
|
||||
value.itemId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].itemId`,
|
||||
),
|
||||
killerId: optionalNumber(
|
||||
value.killerId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].killerId`,
|
||||
),
|
||||
killerTeamId: optionalNumber(
|
||||
value.killerTeamId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].killerTeamId`,
|
||||
),
|
||||
levelUpType: optionalString(
|
||||
value.levelUpType,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].levelUpType`,
|
||||
),
|
||||
monsterSubType: optionalString(
|
||||
value.monsterSubType,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].monsterSubType`,
|
||||
),
|
||||
monsterType: optionalString(
|
||||
value.monsterType,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].monsterType`,
|
||||
),
|
||||
participantId: optionalNumber(
|
||||
value.participantId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].participantId`,
|
||||
),
|
||||
skillSlot: optionalNumber(
|
||||
value.skillSlot,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].skillSlot`,
|
||||
),
|
||||
teamId: optionalNumber(
|
||||
value.teamId,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].teamId`,
|
||||
),
|
||||
timestamp: requireNumber(
|
||||
value.timestamp,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].timestamp`,
|
||||
),
|
||||
towerType: optionalString(
|
||||
value.towerType,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].towerType`,
|
||||
),
|
||||
type: requireString(
|
||||
value.type,
|
||||
`timeline.info.frames[${frameIndex}].events[${eventIndex}].type`,
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
function parseTimelineParticipantFrame(
|
||||
value: unknown,
|
||||
frameIndex: number,
|
||||
key: string,
|
||||
): RiotMatchTimelineParticipantFrameDto {
|
||||
if (!isRecord(value)) {
|
||||
throw new TypeError(
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key} must be an object.`,
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
...value,
|
||||
currentGold: optionalNumber(
|
||||
value.currentGold,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.currentGold`,
|
||||
),
|
||||
jungleMinionsKilled: optionalNumber(
|
||||
value.jungleMinionsKilled,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.jungleMinionsKilled`,
|
||||
),
|
||||
level: optionalNumber(
|
||||
value.level,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.level`,
|
||||
),
|
||||
minionsKilled: optionalNumber(
|
||||
value.minionsKilled,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.minionsKilled`,
|
||||
),
|
||||
participantId: requireNumber(
|
||||
value.participantId,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.participantId`,
|
||||
),
|
||||
totalGold: requireNumber(
|
||||
value.totalGold,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.totalGold`,
|
||||
),
|
||||
xp: requireNumber(
|
||||
value.xp,
|
||||
`timeline.info.frames[${frameIndex}].participantFrames.${key}.xp`,
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
function parseParticipant(
|
||||
value: unknown,
|
||||
index: number,
|
||||
@@ -504,12 +755,22 @@ function parseObjectives(
|
||||
baron: parseObjective(value.baron, teamIndex, 'baron'),
|
||||
champion: parseObjective(value.champion, teamIndex, 'champion'),
|
||||
dragon: parseObjective(value.dragon, teamIndex, 'dragon'),
|
||||
horde: optionalObjective(value.horde, teamIndex, 'horde'),
|
||||
inhibitor: parseObjective(value.inhibitor, teamIndex, 'inhibitor'),
|
||||
riftHerald: parseObjective(value.riftHerald, teamIndex, 'riftHerald'),
|
||||
tower: parseObjective(value.tower, teamIndex, 'tower'),
|
||||
};
|
||||
}
|
||||
|
||||
function optionalObjective(
|
||||
value: unknown,
|
||||
teamIndex: number,
|
||||
key: keyof RiotMatchObjectivesDto,
|
||||
): RiotMatchObjectiveDto | undefined {
|
||||
if (value === undefined || value === null) return undefined;
|
||||
return parseObjective(value, teamIndex, key);
|
||||
}
|
||||
|
||||
function parseObjective(
|
||||
value: unknown,
|
||||
teamIndex: number,
|
||||
|
||||
@@ -3,63 +3,156 @@ import { RiotRateLimiterService } from './riot-rate-limiter.service';
|
||||
|
||||
function makeService(sendCommand = jest.fn().mockResolvedValue(0)) {
|
||||
const garnet = {
|
||||
getString: jest.fn().mockResolvedValue(null),
|
||||
raw: jest.fn().mockReturnValue({ sendCommand }),
|
||||
} as unknown as GarnetService;
|
||||
setString: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<GarnetService>;
|
||||
return {
|
||||
service: new RiotRateLimiterService(garnet),
|
||||
garnet,
|
||||
sendCommand,
|
||||
};
|
||||
}
|
||||
|
||||
describe('RiotRateLimiterService background limiter', () => {
|
||||
function observedState(params: {
|
||||
count120: number;
|
||||
limit120?: number;
|
||||
observedAt: number;
|
||||
windowStartAt: number;
|
||||
}) {
|
||||
return JSON.stringify({
|
||||
count120: params.count120,
|
||||
limit120: params.limit120 ?? 100,
|
||||
observedAt: params.observedAt,
|
||||
windowStartAt: params.windowStartAt,
|
||||
});
|
||||
}
|
||||
|
||||
describe('RiotRateLimiterService', () => {
|
||||
afterEach(() => {
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
it('uses the background key namespace and passes cost to the Lua script', async () => {
|
||||
it('uses global app rate keys and passes cost to the Lua script', async () => {
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_000);
|
||||
const { service, sendCommand } = makeService();
|
||||
|
||||
await service.acquireBackground(8);
|
||||
await service.acquire('asia', 3);
|
||||
|
||||
expect(sendCommand).toHaveBeenCalledTimes(1);
|
||||
const command = sendCommand.mock.calls[0][0] as string[];
|
||||
expect(command[0]).toBe('EVAL');
|
||||
expect(command[2]).toBe('2');
|
||||
expect(command[3]).toBe('riot:bg:rl:1000');
|
||||
expect(command[4]).toBe('riot:bg:rl:120000');
|
||||
expect(command[3]).toBe('riot:rl:app:1000');
|
||||
expect(command[4]).toBe('riot:rl:app:120000');
|
||||
expect(command[5]).toBe('1000');
|
||||
expect(command[7]).toBe('8');
|
||||
expect(command[7]).toBe('3');
|
||||
});
|
||||
|
||||
it('reads cleaned background usage for both windows', async () => {
|
||||
jest.spyOn(Date, 'now').mockReturnValue(200_000);
|
||||
const sendCommand = jest
|
||||
.fn()
|
||||
.mockImplementation(async (command: string[]) => {
|
||||
if (command[0] === 'ZREMRANGEBYSCORE') return 0;
|
||||
if (command[1] === 'riot:bg:rl:1000') return 3;
|
||||
if (command[1] === 'riot:bg:rl:120000') return 24;
|
||||
return 0;
|
||||
});
|
||||
const { service } = makeService(sendCommand);
|
||||
it('records the 120 second app rate observation from Riot headers', async () => {
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_000_000);
|
||||
const { service, garnet } = makeService();
|
||||
|
||||
await expect(service.getBackgroundUsage()).resolves.toEqual({
|
||||
used1s: 3,
|
||||
used2m: 24,
|
||||
await service.recordAppRateLimitObservation('47:120,3:1', '100:120,20:1');
|
||||
|
||||
expect(garnet.setString).toHaveBeenCalledTimes(1);
|
||||
const [key, raw, ttl] = garnet.setString.mock.calls[0];
|
||||
expect(key).toBe('riot:app:rl:observed');
|
||||
expect(ttl).toBe(300);
|
||||
expect(JSON.parse(raw)).toEqual({
|
||||
count120: 47,
|
||||
limit120: 100,
|
||||
observedAt: 1_000_000,
|
||||
windowStartAt: 1_000_000,
|
||||
});
|
||||
});
|
||||
|
||||
it('resets the inferred window when Riot count decreases or observation is stale', async () => {
|
||||
const { service, garnet } = makeService();
|
||||
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_060_000);
|
||||
garnet.getString.mockResolvedValueOnce(
|
||||
observedState({
|
||||
count120: 80,
|
||||
observedAt: 1_050_000,
|
||||
windowStartAt: 1_000_000,
|
||||
}),
|
||||
);
|
||||
|
||||
await service.recordAppRateLimitObservation('2:120', null);
|
||||
|
||||
expect(JSON.parse(garnet.setString.mock.calls[0][1])).toMatchObject({
|
||||
count120: 2,
|
||||
windowStartAt: 1_060_000,
|
||||
});
|
||||
|
||||
expect(sendCommand).toHaveBeenCalledWith([
|
||||
'ZREMRANGEBYSCORE',
|
||||
'riot:bg:rl:1000',
|
||||
'-inf',
|
||||
'199000',
|
||||
]);
|
||||
expect(sendCommand).toHaveBeenCalledWith([
|
||||
'ZREMRANGEBYSCORE',
|
||||
'riot:bg:rl:120000',
|
||||
'-inf',
|
||||
'80000',
|
||||
]);
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_240_000);
|
||||
garnet.getString.mockResolvedValueOnce(
|
||||
observedState({
|
||||
count120: 20,
|
||||
observedAt: 1_120_000,
|
||||
windowStartAt: 1_000_000,
|
||||
}),
|
||||
);
|
||||
|
||||
await service.recordAppRateLimitObservation('25:120', null);
|
||||
|
||||
expect(JSON.parse(garnet.setString.mock.calls[1][1])).toMatchObject({
|
||||
count120: 25,
|
||||
windowStartAt: 1_240_000,
|
||||
});
|
||||
});
|
||||
|
||||
it('opens the refresh gate when there is no active observation', async () => {
|
||||
const { service, garnet } = makeService();
|
||||
|
||||
await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true);
|
||||
|
||||
garnet.getString.mockResolvedValueOnce(
|
||||
observedState({
|
||||
count120: 90,
|
||||
observedAt: 1_000_000,
|
||||
windowStartAt: 900_000,
|
||||
}),
|
||||
);
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_120_000);
|
||||
|
||||
await expect(service.isRefreshWindowOpen(0.5)).resolves.toBe(true);
|
||||
});
|
||||
|
||||
it.each([
|
||||
{ ratio: 0.5, count120: 49, expected: true },
|
||||
{ ratio: 0.5, count120: 50, expected: false },
|
||||
{ ratio: 0.8, count120: 79, expected: true },
|
||||
{ ratio: 0.8, count120: 80, expected: false },
|
||||
])(
|
||||
'checks tail headroom for refresh gate ratio=$ratio count=$count120',
|
||||
async ({ ratio, count120, expected }) => {
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_070_000);
|
||||
const { service, garnet } = makeService();
|
||||
garnet.getString.mockResolvedValue(
|
||||
observedState({
|
||||
count120,
|
||||
observedAt: 1_069_000,
|
||||
windowStartAt: 1_000_000,
|
||||
}),
|
||||
);
|
||||
|
||||
await expect(service.isRefreshWindowOpen(ratio)).resolves.toBe(expected);
|
||||
},
|
||||
);
|
||||
|
||||
it('keeps the refresh gate closed before the 120 second window tail', async () => {
|
||||
jest.spyOn(Date, 'now').mockReturnValue(1_050_000);
|
||||
const { service, garnet } = makeService();
|
||||
garnet.getString.mockResolvedValue(
|
||||
observedState({
|
||||
count120: 10,
|
||||
observedAt: 1_049_000,
|
||||
windowStartAt: 1_000_000,
|
||||
}),
|
||||
);
|
||||
|
||||
await expect(service.isRefreshWindowOpen(0.8)).resolves.toBe(false);
|
||||
});
|
||||
});
|
||||
@@ -7,11 +7,19 @@ const APP_LIMITS = [
|
||||
{ windowMs: 120_000, max: 90 },
|
||||
] as const;
|
||||
|
||||
const BACKGROUND_LIMITS = [
|
||||
{ windowMs: 1_000, max: 6 },
|
||||
{ windowMs: 120_000, max: 36 },
|
||||
] as const;
|
||||
const BACKGROUND_KEY_PREFIX = 'riot:bg:rl';
|
||||
const APP_KEY_PREFIX = 'riot:rl:app';
|
||||
const APP_WINDOW_MS = 120_000;
|
||||
const TAIL_MS = 60_000;
|
||||
const APP_OBSERVED_KEY = 'riot:app:rl:observed';
|
||||
const APP_OBSERVED_TTL_SECONDS = 300;
|
||||
const DEFAULT_APP_LIMIT_120 = 100;
|
||||
|
||||
interface AppRateObservation {
|
||||
count120: number;
|
||||
limit120: number;
|
||||
observedAt: number;
|
||||
windowStartAt: number;
|
||||
}
|
||||
|
||||
const ACQUIRE_SCRIPT = `
|
||||
local now = tonumber(ARGV[1])
|
||||
@@ -81,85 +89,78 @@ export class RiotRateLimiterService {
|
||||
|
||||
public async acquire(
|
||||
route: RiotRegionalRoute | RiotPlatformRoute,
|
||||
cost = 1,
|
||||
): Promise<void> {
|
||||
for (;;) {
|
||||
const now = Date.now();
|
||||
const waitMs = await this.checkAndAdd(route, now, 1);
|
||||
if (waitMs <= 0) return;
|
||||
|
||||
if (waitMs >= 100) {
|
||||
this.logger.warn(
|
||||
`Riot API throttle waiting ${waitMs}ms for route=${route}.`,
|
||||
);
|
||||
}
|
||||
await sleep(waitMs);
|
||||
}
|
||||
}
|
||||
|
||||
public async acquireBackground(cost = 1): Promise<void> {
|
||||
const normalizedCost = normalizeCost(cost);
|
||||
for (;;) {
|
||||
const now = Date.now();
|
||||
const waitMs = await this.checkAndAddBackground(now, normalizedCost);
|
||||
const waitMs = await this.checkAndAdd(now, normalizedCost);
|
||||
if (waitMs <= 0) return;
|
||||
|
||||
if (waitMs >= 100) {
|
||||
this.logger.warn(
|
||||
`Background Riot throttle waiting ${waitMs}ms (cost=${normalizedCost}).`,
|
||||
`Riot API throttle waiting ${waitMs}ms for route=${route} cost=${normalizedCost}.`,
|
||||
);
|
||||
}
|
||||
await sleep(waitMs);
|
||||
}
|
||||
}
|
||||
|
||||
public async getBackgroundUsage(): Promise<{
|
||||
used1s: number;
|
||||
used2m: number;
|
||||
}> {
|
||||
const client = this.garnet.raw();
|
||||
const now = Date.now();
|
||||
const usages = await Promise.all(
|
||||
BACKGROUND_LIMITS.map(async (limit) => {
|
||||
const key = `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`;
|
||||
await client.sendCommand([
|
||||
'ZREMRANGEBYSCORE',
|
||||
key,
|
||||
'-inf',
|
||||
String(now - limit.windowMs),
|
||||
]);
|
||||
const response = await client.sendCommand(['ZCARD', key]);
|
||||
const count = Number(response ?? 0);
|
||||
return Number.isFinite(count) && count > 0 ? count : 0;
|
||||
}),
|
||||
);
|
||||
public async recordAppRateLimitObservation(
|
||||
countHeader: string | null,
|
||||
limitHeader?: string | null,
|
||||
): Promise<void> {
|
||||
const count120 = parseRateLimitHeader(countHeader, 120);
|
||||
if (count120 === null) return;
|
||||
|
||||
return {
|
||||
used1s: usages[0] ?? 0,
|
||||
used2m: usages[1] ?? 0,
|
||||
const limit120 =
|
||||
parseRateLimitHeader(limitHeader ?? null, 120) ?? DEFAULT_APP_LIMIT_120;
|
||||
const now = Date.now();
|
||||
const previous = await this.getAppRateObservation();
|
||||
const windowStartAt =
|
||||
!previous ||
|
||||
now - previous.observedAt >= APP_WINDOW_MS ||
|
||||
count120 < previous.count120
|
||||
? now
|
||||
: previous.windowStartAt;
|
||||
|
||||
const observation: AppRateObservation = {
|
||||
count120,
|
||||
limit120,
|
||||
observedAt: now,
|
||||
windowStartAt,
|
||||
};
|
||||
|
||||
// Concurrent responses can race here. This observation is advisory, so
|
||||
// last-writer-wins is acceptable and self-corrects on the next Riot header.
|
||||
await this.garnet.setString(
|
||||
APP_OBSERVED_KEY,
|
||||
JSON.stringify(observation),
|
||||
APP_OBSERVED_TTL_SECONDS,
|
||||
);
|
||||
}
|
||||
|
||||
private async checkAndAdd(
|
||||
route: RiotRegionalRoute | RiotPlatformRoute,
|
||||
now: number,
|
||||
cost: number,
|
||||
): Promise<number> {
|
||||
public async isRefreshWindowOpen(
|
||||
usageRatio: number,
|
||||
now = Date.now(),
|
||||
): Promise<boolean> {
|
||||
const observation = await this.getAppRateObservation();
|
||||
if (!observation) return true;
|
||||
if (now - observation.observedAt >= APP_WINDOW_MS) return true;
|
||||
|
||||
const ratio = Number.isFinite(usageRatio) ? usageRatio : 0;
|
||||
const headroomOk = observation.count120 < observation.limit120 * ratio;
|
||||
const inTail = now >= observation.windowStartAt + APP_WINDOW_MS - TAIL_MS;
|
||||
return headroomOk && inTail;
|
||||
}
|
||||
|
||||
private async checkAndAdd(now: number, cost: number): Promise<number> {
|
||||
const keys = APP_LIMITS.map(
|
||||
(limit) => `riot:rl:${route}:${limit.windowMs}`,
|
||||
(limit) => `${APP_KEY_PREFIX}:${limit.windowMs}`,
|
||||
);
|
||||
return this.checkAndAddWithLimits(keys, APP_LIMITS, now, cost);
|
||||
}
|
||||
|
||||
private async checkAndAddBackground(
|
||||
now: number,
|
||||
cost: number,
|
||||
): Promise<number> {
|
||||
const keys = BACKGROUND_LIMITS.map(
|
||||
(limit) => `${BACKGROUND_KEY_PREFIX}:${limit.windowMs}`,
|
||||
);
|
||||
return this.checkAndAddWithLimits(keys, BACKGROUND_LIMITS, now, cost);
|
||||
}
|
||||
|
||||
private async checkAndAddWithLimits(
|
||||
keys: string[],
|
||||
limits: ReadonlyArray<{ windowMs: number; max: number }>,
|
||||
@@ -187,6 +188,32 @@ export class RiotRateLimiterService {
|
||||
if (!Number.isFinite(waitMs) || waitMs < 0) return 0;
|
||||
return waitMs;
|
||||
}
|
||||
|
||||
private async getAppRateObservation(): Promise<AppRateObservation | null> {
|
||||
const raw = await this.garnet.getString(APP_OBSERVED_KEY);
|
||||
if (!raw) return null;
|
||||
|
||||
try {
|
||||
const parsed = JSON.parse(raw) as Partial<AppRateObservation>;
|
||||
if (
|
||||
typeof parsed.count120 !== 'number' ||
|
||||
typeof parsed.limit120 !== 'number' ||
|
||||
typeof parsed.observedAt !== 'number' ||
|
||||
typeof parsed.windowStartAt !== 'number'
|
||||
) {
|
||||
return null;
|
||||
}
|
||||
|
||||
return {
|
||||
count120: parsed.count120,
|
||||
limit120: parsed.limit120,
|
||||
observedAt: parsed.observedAt,
|
||||
windowStartAt: parsed.windowStartAt,
|
||||
};
|
||||
} catch {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function normalizeCost(cost: number): number {
|
||||
@@ -194,6 +221,24 @@ function normalizeCost(cost: number): number {
|
||||
return Math.max(1, Math.floor(cost));
|
||||
}
|
||||
|
||||
function parseRateLimitHeader(
|
||||
header: string | null,
|
||||
windowSeconds: number,
|
||||
): number | null {
|
||||
if (!header) return null;
|
||||
|
||||
for (const rawEntry of header.split(',')) {
|
||||
const [rawCount, rawWindow] = rawEntry.trim().split(':');
|
||||
const count = Number(rawCount);
|
||||
const window = Number(rawWindow);
|
||||
if (window === windowSeconds && Number.isFinite(count) && count >= 0) {
|
||||
return count;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function sleep(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
@@ -0,0 +1,43 @@
|
||||
import { SecretService } from '../global/secret/secret.service';
|
||||
import { RiotClientService } from './riot.client.service';
|
||||
import { RiotRateLimiterService } from './riot-rate-limiter.service';
|
||||
|
||||
describe('RiotClientService', () => {
|
||||
const originalFetch = global.fetch;
|
||||
|
||||
afterEach(() => {
|
||||
global.fetch = originalFetch;
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
it('records Riot app rate limit headers after a response', async () => {
|
||||
const secretService = {
|
||||
get: jest.fn().mockResolvedValue('riot-key'),
|
||||
} as unknown as jest.Mocked<SecretService>;
|
||||
const rateLimiter = {
|
||||
acquire: jest.fn().mockResolvedValue(undefined),
|
||||
recordAppRateLimitObservation: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as jest.Mocked<RiotRateLimiterService>;
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
headers: {
|
||||
get: jest.fn((name: string) => {
|
||||
if (name === 'X-App-Rate-Limit-Count') return '47:120,3:1';
|
||||
if (name === 'X-App-Rate-Limit') return '100:120,20:1';
|
||||
return null;
|
||||
}),
|
||||
},
|
||||
json: jest.fn().mockResolvedValue({ ok: true }),
|
||||
ok: true,
|
||||
status: 200,
|
||||
} as unknown as Response);
|
||||
const service = new RiotClientService(secretService, rateLimiter);
|
||||
|
||||
await service.get('/lol/status/v4/platform-data', { platform: 'kr' });
|
||||
|
||||
expect(rateLimiter.acquire).toHaveBeenCalledWith('kr');
|
||||
expect(rateLimiter.recordAppRateLimitObservation).toHaveBeenCalledWith(
|
||||
'47:120,3:1',
|
||||
'100:120,20:1',
|
||||
);
|
||||
});
|
||||
});
|
||||
@@ -140,16 +140,18 @@ export class RiotClientService {
|
||||
});
|
||||
|
||||
const appRateLimitCount = response.headers.get('X-App-Rate-Limit-Count');
|
||||
const appRateLimit = response.headers.get('X-App-Rate-Limit');
|
||||
void this.rateLimiter.recordAppRateLimitObservation(
|
||||
appRateLimitCount,
|
||||
appRateLimit,
|
||||
);
|
||||
if (appRateLimitCount && Math.random() < 0.05) {
|
||||
this.logger.debug(`Riot rate usage ${routeKey}: ${appRateLimitCount}`);
|
||||
}
|
||||
|
||||
if (!response.ok) {
|
||||
const error = await this.createApiError(response, url);
|
||||
if (
|
||||
error.status === 429 &&
|
||||
attempt === 0
|
||||
) {
|
||||
if (error.status === 429 && attempt === 0) {
|
||||
await sleep((error.retryAfterSeconds ?? 1) * 1000);
|
||||
return this.fetchWithRetry(
|
||||
url,
|
||||
|
||||
@@ -89,7 +89,7 @@ export interface RiotSummonerDto {
|
||||
|
||||
// League-V4 entries by-puuid 응답
|
||||
export interface RiotLeagueEntryDto {
|
||||
leagueId: string;
|
||||
leagueId?: string;
|
||||
queueType: string;
|
||||
tier: string;
|
||||
rank: string;
|
||||
@@ -134,6 +134,11 @@ export interface RiotMatchDto {
|
||||
info: RiotMatchInfoDto;
|
||||
}
|
||||
|
||||
export interface RiotMatchTimelineDto {
|
||||
metadata: RiotMatchMetadataDto;
|
||||
info: RiotMatchTimelineInfoDto;
|
||||
}
|
||||
|
||||
export interface RiotMatchMetadataDto {
|
||||
dataVersion: string;
|
||||
matchId: string;
|
||||
@@ -240,6 +245,7 @@ export interface RiotMatchObjectivesDto {
|
||||
baron: RiotMatchObjectiveDto;
|
||||
champion: RiotMatchObjectiveDto;
|
||||
dragon: RiotMatchObjectiveDto;
|
||||
horde?: RiotMatchObjectiveDto;
|
||||
inhibitor: RiotMatchObjectiveDto;
|
||||
riftHerald: RiotMatchObjectiveDto;
|
||||
tower: RiotMatchObjectiveDto;
|
||||
@@ -249,3 +255,51 @@ export interface RiotMatchObjectiveDto {
|
||||
first: boolean;
|
||||
kills: number;
|
||||
}
|
||||
|
||||
export interface RiotMatchTimelineInfoDto extends Record<string, unknown> {
|
||||
frameInterval: number;
|
||||
frames: RiotMatchTimelineFrameDto[];
|
||||
gameId?: number;
|
||||
participants?: RiotMatchTimelineParticipantDto[];
|
||||
}
|
||||
|
||||
export interface RiotMatchTimelineParticipantDto extends Record<string, unknown> {
|
||||
participantId: number;
|
||||
puuid: string;
|
||||
}
|
||||
|
||||
export interface RiotMatchTimelineFrameDto extends Record<string, unknown> {
|
||||
timestamp: number;
|
||||
events: RiotMatchTimelineEventDto[];
|
||||
participantFrames: Record<string, RiotMatchTimelineParticipantFrameDto>;
|
||||
}
|
||||
|
||||
export interface RiotMatchTimelineEventDto extends Record<string, unknown> {
|
||||
type: string;
|
||||
timestamp: number;
|
||||
afterId?: number;
|
||||
assistingParticipantIds?: number[];
|
||||
beforeId?: number;
|
||||
buildingType?: string;
|
||||
itemId?: number;
|
||||
killerId?: number;
|
||||
killerTeamId?: number;
|
||||
levelUpType?: string;
|
||||
monsterSubType?: string;
|
||||
monsterType?: string;
|
||||
participantId?: number;
|
||||
skillSlot?: number;
|
||||
teamId?: number;
|
||||
towerType?: string;
|
||||
}
|
||||
|
||||
export interface RiotMatchTimelineParticipantFrameDto
|
||||
extends Record<string, unknown> {
|
||||
participantId: number;
|
||||
totalGold: number;
|
||||
xp: number;
|
||||
currentGold?: number;
|
||||
jungleMinionsKilled?: number;
|
||||
level?: number;
|
||||
minionsKilled?: number;
|
||||
}
|
||||
@@ -1,5 +1,6 @@
|
||||
import {
|
||||
resolveRoundRobinTeamCount,
|
||||
roundRobinGameSchedule,
|
||||
roundRobinPairCount,
|
||||
roundRobinPairs,
|
||||
shuffleInPlace,
|
||||
@@ -25,6 +26,30 @@ describe('round-robin util', () => {
|
||||
expect(roundRobinPairCount(6)).toBe(15);
|
||||
});
|
||||
|
||||
it('builds round-robin games grouped into simultaneously playable rounds', () => {
|
||||
const schedule = roundRobinGameSchedule(6, { gamesPerPair: 1 });
|
||||
|
||||
expect(schedule).toHaveLength(15);
|
||||
for (const roundNumber of [1, 2, 3, 4, 5]) {
|
||||
const round = schedule.filter((game) => game.roundNumber === roundNumber);
|
||||
expect(round).toHaveLength(3);
|
||||
expect(new Set(round.flatMap((game) => [game.teamAIndex, game.teamBIndex])))
|
||||
.toHaveProperty('size', 6);
|
||||
}
|
||||
});
|
||||
|
||||
it('limits round-robin games by max rounds', () => {
|
||||
const schedule = roundRobinGameSchedule(8, {
|
||||
gamesPerPair: 1,
|
||||
maxRounds: 3,
|
||||
});
|
||||
|
||||
expect(schedule).toHaveLength(12);
|
||||
expect(new Set(schedule.map((game) => game.roundNumber))).toEqual(
|
||||
new Set([1, 2, 3]),
|
||||
);
|
||||
});
|
||||
|
||||
it('resolves team count from teams first, then active participants', () => {
|
||||
expect(
|
||||
resolveRoundRobinTeamCount({
|
||||
|
||||
@@ -3,11 +3,23 @@ export interface RoundRobinPair {
|
||||
teamBIndex: number;
|
||||
}
|
||||
|
||||
export interface RoundRobinGameAssignment extends RoundRobinPair {
|
||||
gameNumber: number;
|
||||
roundNumber: number;
|
||||
}
|
||||
|
||||
export interface RoundRobinTeamCountInput {
|
||||
teams?: Array<{ teamIndex: number }>;
|
||||
participants: Array<{ excluded?: boolean }>;
|
||||
}
|
||||
|
||||
export interface RoundRobinGameScheduleOptions {
|
||||
gamesPerPair?: number;
|
||||
maxRounds?: number;
|
||||
rng?: () => number;
|
||||
shuffleTeams?: boolean;
|
||||
}
|
||||
|
||||
export function roundRobinPairs(teamCount: number): RoundRobinPair[] {
|
||||
const pairs: RoundRobinPair[] = [];
|
||||
for (let teamAIndex = 1; teamAIndex <= teamCount; teamAIndex += 1) {
|
||||
@@ -27,6 +39,70 @@ export function roundRobinPairCount(teamCount: number): number {
|
||||
return (teamCount * (teamCount - 1)) / 2;
|
||||
}
|
||||
|
||||
export function roundRobinRoundCount(teamCount: number): number {
|
||||
if (teamCount < 2) return 0;
|
||||
return teamCount % 2 === 0 ? teamCount - 1 : teamCount;
|
||||
}
|
||||
|
||||
export function roundRobinGameSchedule(
|
||||
teamCount: number,
|
||||
options: RoundRobinGameScheduleOptions = {},
|
||||
): RoundRobinGameAssignment[] {
|
||||
if (teamCount < 2) return [];
|
||||
|
||||
const rawGamesPerPair = options.gamesPerPair ?? 1;
|
||||
const gamesPerPair = Number.isFinite(rawGamesPerPair)
|
||||
? Math.max(1, Math.floor(rawGamesPerPair))
|
||||
: 1;
|
||||
const fullRoundCount = roundRobinRoundCount(teamCount);
|
||||
const requestedRoundCount =
|
||||
typeof options.maxRounds === 'number' && Number.isFinite(options.maxRounds)
|
||||
? Math.floor(options.maxRounds)
|
||||
: fullRoundCount;
|
||||
const roundLimit = Math.max(
|
||||
0,
|
||||
Math.min(fullRoundCount, requestedRoundCount),
|
||||
);
|
||||
if (roundLimit === 0) return [];
|
||||
|
||||
const bye = 0;
|
||||
const teams = Array.from({ length: teamCount }, (_, index) => index + 1);
|
||||
if (options.shuffleTeams) shuffleInPlace(teams, options.rng);
|
||||
if (teams.length % 2 === 1) teams.push(bye);
|
||||
|
||||
const rotating = [...teams];
|
||||
const schedule: RoundRobinGameAssignment[] = [];
|
||||
let gameNumber = 1;
|
||||
|
||||
for (let roundIndex = 0; roundIndex < roundLimit; roundIndex += 1) {
|
||||
const roundNumber = roundIndex + 1;
|
||||
for (let index = 0; index < rotating.length / 2; index += 1) {
|
||||
const left = rotating[index];
|
||||
const right = rotating[rotating.length - 1 - index];
|
||||
if (left === bye || right === bye) continue;
|
||||
|
||||
const teamAIndex = Math.min(left, right);
|
||||
const teamBIndex = Math.max(left, right);
|
||||
for (let gameIndex = 0; gameIndex < gamesPerPair; gameIndex += 1) {
|
||||
schedule.push({
|
||||
gameNumber,
|
||||
roundNumber,
|
||||
teamAIndex,
|
||||
teamBIndex,
|
||||
});
|
||||
gameNumber += 1;
|
||||
}
|
||||
}
|
||||
|
||||
const fixed = rotating[0];
|
||||
const tail = rotating.slice(1);
|
||||
tail.unshift(tail.pop() as number);
|
||||
rotating.splice(0, rotating.length, fixed, ...tail);
|
||||
}
|
||||
|
||||
return schedule;
|
||||
}
|
||||
|
||||
export function resolveRoundRobinTeamCount(
|
||||
match: RoundRobinTeamCountInput,
|
||||
): number {
|
||||
|
||||
@@ -0,0 +1,111 @@
|
||||
import {
|
||||
SYSTEM_TOURNAMENT_CODE_UPLOADED_BY,
|
||||
TournamentCodeAutoProvisionService,
|
||||
} from './tournament-code-auto-provision.service';
|
||||
import { TournamentCodeService } from './tournament-code.service';
|
||||
import { TournamentCodeVendorService } from './tournament-code-vendor.service';
|
||||
|
||||
describe('TournamentCodeAutoProvisionService', () => {
|
||||
function createFixture(params?: {
|
||||
availableCounts?: number[];
|
||||
vendorCodes?: string[];
|
||||
}) {
|
||||
const availableCounts = [...(params?.availableCounts ?? [30])];
|
||||
const vendorCodes = [...(params?.vendorCodes ?? [])];
|
||||
const tournamentCodeService = {
|
||||
countUsableAvailable: jest.fn().mockImplementation(async () => {
|
||||
return availableCounts.shift() ?? 30;
|
||||
}),
|
||||
bulkUpload: jest.fn().mockResolvedValue({
|
||||
inserted: 1,
|
||||
duplicates: [],
|
||||
invalid: [],
|
||||
}),
|
||||
} as unknown as jest.Mocked<TournamentCodeService>;
|
||||
const vendorService = {
|
||||
fetchTournamentCode: jest.fn().mockImplementation(async () => {
|
||||
const code = vendorCodes.shift();
|
||||
if (!code) throw new Error('No vendor code');
|
||||
return code;
|
||||
}),
|
||||
} as unknown as jest.Mocked<TournamentCodeVendorService>;
|
||||
const service = new TournamentCodeAutoProvisionService(
|
||||
tournamentCodeService,
|
||||
vendorService,
|
||||
);
|
||||
jest
|
||||
.spyOn(
|
||||
service as unknown as { sleepBeforeVendorRequest(): Promise<void> },
|
||||
'sleepBeforeVendorRequest',
|
||||
)
|
||||
.mockResolvedValue(undefined);
|
||||
|
||||
return { service, tournamentCodeService, vendorService };
|
||||
}
|
||||
|
||||
it('does nothing when the usable pool already meets the target', async () => {
|
||||
const { service, tournamentCodeService, vendorService } = createFixture({
|
||||
availableCounts: [30],
|
||||
});
|
||||
|
||||
await expect(service.ensurePool()).resolves.toMatchObject({
|
||||
target: 30,
|
||||
before: 30,
|
||||
after: 30,
|
||||
requested: 0,
|
||||
inserted: 0,
|
||||
});
|
||||
expect(vendorService.fetchTournamentCode).not.toHaveBeenCalled();
|
||||
expect(tournamentCodeService.bulkUpload).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('requests vendor codes until the pool reaches 30', async () => {
|
||||
const { service, tournamentCodeService, vendorService } = createFixture({
|
||||
availableCounts: [28, 29, 30],
|
||||
vendorCodes: ['KR05090-aBc', 'KR05090-dEf'],
|
||||
});
|
||||
|
||||
const result = await service.ensurePool();
|
||||
|
||||
expect(result).toMatchObject({
|
||||
target: 30,
|
||||
before: 28,
|
||||
after: 30,
|
||||
requested: 2,
|
||||
inserted: 2,
|
||||
});
|
||||
expect(vendorService.fetchTournamentCode).toHaveBeenCalledTimes(2);
|
||||
expect(
|
||||
(
|
||||
service as unknown as {
|
||||
sleepBeforeVendorRequest: jest.Mock;
|
||||
}
|
||||
).sleepBeforeVendorRequest,
|
||||
).toHaveBeenCalledTimes(2);
|
||||
expect(tournamentCodeService.bulkUpload).toHaveBeenCalledWith({
|
||||
uploadedBy: SYSTEM_TOURNAMENT_CODE_UPLOADED_BY,
|
||||
codes: [
|
||||
expect.objectContaining({
|
||||
code: 'KR05090-aBc',
|
||||
source: 'deeplol-vendor',
|
||||
spectatorType: 'ALL',
|
||||
}),
|
||||
],
|
||||
});
|
||||
});
|
||||
|
||||
it('shares an in-flight refill instead of starting overlapping vendor loops', async () => {
|
||||
const { service, vendorService } = createFixture({
|
||||
availableCounts: [29, 30],
|
||||
vendorCodes: ['KR05090-aBc'],
|
||||
});
|
||||
|
||||
const [left, right] = await Promise.all([
|
||||
service.ensurePool(),
|
||||
service.ensurePool(),
|
||||
]);
|
||||
|
||||
expect(left).toBe(right);
|
||||
expect(vendorService.fetchTournamentCode).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,128 @@
|
||||
import { Injectable, Logger } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { TOURNAMENT_CODE_EXPIRY_MARGIN_MS } from './tournament-code.constants';
|
||||
import { TournamentCodeService } from './tournament-code.service';
|
||||
import {
|
||||
resolveVendorRequestDelayMs,
|
||||
TournamentCodeVendorService,
|
||||
} from './tournament-code-vendor.service';
|
||||
|
||||
const DEFAULT_POOL_TARGET = 30;
|
||||
const DEFAULT_VENDOR_CODE_EXPIRES_IN_MS = 14 * 24 * 60 * 60 * 1000;
|
||||
const MAX_REFILL_ATTEMPTS_MULTIPLIER = 2;
|
||||
|
||||
export const SYSTEM_TOURNAMENT_CODE_UPLOADED_BY = new mongoose.Types.ObjectId(
|
||||
'000000000000000000000000',
|
||||
);
|
||||
|
||||
export interface TournamentCodeAutoProvisionResult {
|
||||
target: number;
|
||||
before: number;
|
||||
after: number;
|
||||
requested: number;
|
||||
inserted: number;
|
||||
duplicates: number;
|
||||
invalid: number;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class TournamentCodeAutoProvisionService {
|
||||
private readonly logger = new Logger(TournamentCodeAutoProvisionService.name);
|
||||
private inFlight?: Promise<TournamentCodeAutoProvisionResult>;
|
||||
|
||||
constructor(
|
||||
private readonly tournamentCodeService: TournamentCodeService,
|
||||
private readonly vendorService: TournamentCodeVendorService,
|
||||
) {}
|
||||
|
||||
public async ensurePool(): Promise<TournamentCodeAutoProvisionResult> {
|
||||
if (this.inFlight) return this.inFlight;
|
||||
|
||||
this.inFlight = this.refillPool().finally(() => {
|
||||
this.inFlight = undefined;
|
||||
});
|
||||
return this.inFlight;
|
||||
}
|
||||
|
||||
public async sleepBeforeVendorRequest(): Promise<void> {
|
||||
await sleep(resolveVendorRequestDelayMs());
|
||||
}
|
||||
|
||||
private async refillPool(): Promise<TournamentCodeAutoProvisionResult> {
|
||||
const target = resolvePoolTarget();
|
||||
const before = await this.tournamentCodeService.countUsableAvailable();
|
||||
let after = before;
|
||||
let requested = 0;
|
||||
let inserted = 0;
|
||||
let duplicates = 0;
|
||||
let invalid = 0;
|
||||
|
||||
const maxAttempts = Math.max(
|
||||
1,
|
||||
(target - before) * MAX_REFILL_ATTEMPTS_MULTIPLIER,
|
||||
);
|
||||
|
||||
while (after < target && requested < maxAttempts) {
|
||||
await this.sleepBeforeVendorRequest();
|
||||
const code = await this.vendorService.fetchTournamentCode();
|
||||
requested += 1;
|
||||
|
||||
const uploadResult = await this.tournamentCodeService.bulkUpload({
|
||||
uploadedBy: SYSTEM_TOURNAMENT_CODE_UPLOADED_BY,
|
||||
codes: [
|
||||
{
|
||||
code,
|
||||
expiresAt: resolveVendorCodeExpiresAt().toISOString(),
|
||||
spectatorType: 'ALL',
|
||||
source: 'deeplol-vendor',
|
||||
notes: 'auto-provisioned from Deeplol vendor',
|
||||
},
|
||||
],
|
||||
});
|
||||
inserted += uploadResult.inserted;
|
||||
duplicates += uploadResult.duplicates.length;
|
||||
invalid += uploadResult.invalid.length;
|
||||
after = await this.tournamentCodeService.countUsableAvailable();
|
||||
}
|
||||
|
||||
if (inserted > 0 || before < target) {
|
||||
this.logger.log(
|
||||
`Tournament code pool refill: before=${before} after=${after} target=${target} requested=${requested} inserted=${inserted} duplicates=${duplicates} invalid=${invalid}`,
|
||||
);
|
||||
}
|
||||
|
||||
return {
|
||||
target,
|
||||
before,
|
||||
after,
|
||||
requested,
|
||||
inserted,
|
||||
duplicates,
|
||||
invalid,
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
function resolvePoolTarget(): number {
|
||||
const configured = Number(process.env.TOURNAMENT_CODE_POOL_TARGET);
|
||||
return Number.isInteger(configured) && configured > 0
|
||||
? configured
|
||||
: DEFAULT_POOL_TARGET;
|
||||
}
|
||||
|
||||
function resolveVendorCodeExpiresAt(): Date {
|
||||
const configuredHours = Number(
|
||||
process.env.TOURNAMENT_CODE_VENDOR_EXPIRES_IN_HOURS,
|
||||
);
|
||||
const expiresInMs =
|
||||
Number.isFinite(configuredHours) && configuredHours > 0
|
||||
? configuredHours * 60 * 60 * 1000
|
||||
: DEFAULT_VENDOR_CODE_EXPIRES_IN_MS;
|
||||
return new Date(
|
||||
Date.now() + Math.max(expiresInMs, TOURNAMENT_CODE_EXPIRY_MARGIN_MS),
|
||||
);
|
||||
}
|
||||
|
||||
function sleep(ms: number): Promise<void> {
|
||||
return new Promise((resolve) => setTimeout(resolve, ms));
|
||||
}
|
||||
@@ -0,0 +1,47 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED } from '../auth/allow-public-access.decorator';
|
||||
import { TournamentCodeReplacementController } from './tournament-code-replacement.controller';
|
||||
import type { TournamentCodeService } from './tournament-code.service';
|
||||
|
||||
describe('TournamentCodeReplacementController', () => {
|
||||
function createFixture() {
|
||||
const service = {
|
||||
replaceForMatchGame: jest.fn().mockResolvedValue({
|
||||
gameNumber: 1,
|
||||
code: 'NEW-CODE',
|
||||
}),
|
||||
} as unknown as jest.Mocked<
|
||||
Pick<TournamentCodeService, 'replaceForMatchGame'>
|
||||
>;
|
||||
const controller = new TournamentCodeReplacementController(
|
||||
service as unknown as TournamentCodeService,
|
||||
);
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
|
||||
return { controller, service, communityId, matchId };
|
||||
}
|
||||
|
||||
it('allows public replacement requests', async () => {
|
||||
const { controller, service, communityId, matchId } = createFixture();
|
||||
|
||||
await expect(
|
||||
controller.replaceForMatchGame(communityId, matchId, 1),
|
||||
).resolves.toEqual(expect.objectContaining({ code: 'NEW-CODE' }));
|
||||
|
||||
expect(service.replaceForMatchGame).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
matchId,
|
||||
gameNumber: 1,
|
||||
});
|
||||
});
|
||||
|
||||
it('marks the replacement endpoint as public access', () => {
|
||||
expect(
|
||||
Reflect.getMetadata(
|
||||
METADATA_KEY_IS_PUBLIC_ACCESS_ALLOWED,
|
||||
TournamentCodeReplacementController.prototype.replaceForMatchGame,
|
||||
),
|
||||
).toBe(true);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,30 @@
|
||||
import {
|
||||
Controller,
|
||||
Param,
|
||||
ParseIntPipe,
|
||||
Post,
|
||||
} from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { AllowPublicAccess } from '../auth/allow-public-access.decorator';
|
||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||
import { TournamentCodeService } from './tournament-code.service';
|
||||
|
||||
@Controller('communities/:communityId/tournament-codes')
|
||||
export class TournamentCodeReplacementController {
|
||||
constructor(private readonly tournamentCodeService: TournamentCodeService) {}
|
||||
|
||||
@Post('matches/:matchId/games/:gameNumber/replace')
|
||||
@AllowPublicAccess()
|
||||
public async replaceForMatchGame(
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Param('matchId', ParseObjectIdPipe) matchId: mongoose.Types.ObjectId,
|
||||
@Param('gameNumber', ParseIntPipe) gameNumber: number,
|
||||
) {
|
||||
return this.tournamentCodeService.replaceForMatchGame({
|
||||
communityId,
|
||||
matchId,
|
||||
gameNumber,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,95 @@
|
||||
import {
|
||||
buildDeeplolTournamentCodeRequest,
|
||||
resolveVendorRequestDelayMs,
|
||||
TournamentCodeVendorService,
|
||||
} from './tournament-code-vendor.service';
|
||||
|
||||
describe('TournamentCodeVendorService', () => {
|
||||
const originalFetch = global.fetch;
|
||||
|
||||
afterEach(() => {
|
||||
global.fetch = originalFetch;
|
||||
jest.restoreAllMocks();
|
||||
});
|
||||
|
||||
it('builds the Deeplol request URL and browser-like headers', () => {
|
||||
const request = buildDeeplolTournamentCodeRequest();
|
||||
|
||||
expect(request.url.toString()).toBe(
|
||||
'https://b2c-api.deeplol.gg/tournament/tournament_code?server_id=212&server_name=%EB%A1%A4%EB%A6%BC%ED%91%B8%EC%8A%A4&server_comment=LPS_%EB%82%B4%EC%A0%84&spectator_type=ALL&pick_type=TOURNAMENT_DRAFT&map_name=SUMMONERS_RIFT&platform_id=KR',
|
||||
);
|
||||
expect(request.headers).toMatchObject({
|
||||
accept: '*/*',
|
||||
'accept-encoding': 'gzip, deflate, br, zstd',
|
||||
'accept-language': 'ko,en;q=0.9,en-US;q=0.8',
|
||||
'cache-control': 'no-cache',
|
||||
host: 'b2c-api.deeplol.gg',
|
||||
origin: 'https://clash.deeplol.gg',
|
||||
pragma: 'no-cache',
|
||||
priority: 'u=1, i',
|
||||
referer: 'https://clash.deeplol.gg/',
|
||||
'sec-ch-ua':
|
||||
'"Microsoft Edge";v="149", "Chromium";v="149", "Not)A;Brand";v="24"',
|
||||
'sec-ch-ua-mobile': '?0',
|
||||
'sec-ch-ua-platform': '"Windows"',
|
||||
'sec-fetch-dest': 'empty',
|
||||
'sec-fetch-mode': 'cors',
|
||||
'sec-fetch-site': 'same-site',
|
||||
'user-agent':
|
||||
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36 Edg/149.0.0.0',
|
||||
});
|
||||
expect(Object.keys(request.headers)).not.toContain(':authority');
|
||||
});
|
||||
|
||||
it('fetches the first tournament code from the vendor response', async () => {
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
status: 200,
|
||||
json: jest.fn().mockResolvedValue({
|
||||
tournament_code_list: [
|
||||
'KR05090-85d64e26-0a7d-438b-9ada-11784e46add3',
|
||||
],
|
||||
}),
|
||||
});
|
||||
const service = new TournamentCodeVendorService();
|
||||
|
||||
await expect(service.fetchTournamentCode()).resolves.toBe(
|
||||
'KR05090-85d64e26-0a7d-438b-9ada-11784e46add3',
|
||||
);
|
||||
expect(global.fetch).toHaveBeenCalledWith(
|
||||
expect.stringContaining(
|
||||
'https://b2c-api.deeplol.gg/tournament/tournament_code?',
|
||||
),
|
||||
expect.objectContaining({
|
||||
method: 'GET',
|
||||
headers: expect.objectContaining({
|
||||
origin: 'https://clash.deeplol.gg',
|
||||
referer: 'https://clash.deeplol.gg/',
|
||||
}),
|
||||
signal: expect.any(AbortSignal),
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it('rejects malformed vendor responses', async () => {
|
||||
global.fetch = jest.fn().mockResolvedValue({
|
||||
ok: true,
|
||||
status: 200,
|
||||
json: jest.fn().mockResolvedValue({
|
||||
tournament_code_list: [null],
|
||||
}),
|
||||
});
|
||||
const service = new TournamentCodeVendorService();
|
||||
|
||||
await expect(service.fetchTournamentCode()).rejects.toThrow(
|
||||
'Vendor tournament code response is malformed.',
|
||||
);
|
||||
});
|
||||
|
||||
it('generates mostly near-5-second delays with occasional extra delay', () => {
|
||||
expect(resolveVendorRequestDelayMs(() => 0.1)).toBe(5_050);
|
||||
expect(resolveVendorRequestDelayMs(() => 0.84)).toBe(5_420);
|
||||
expect(resolveVendorRequestDelayMs(() => 0.9)).toBe(8_700);
|
||||
expect(resolveVendorRequestDelayMs(() => 0)).toBeGreaterThanOrEqual(5_000);
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,152 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
|
||||
const DEFAULT_VENDOR_URL =
|
||||
'https://b2c-api.deeplol.gg/tournament/tournament_code';
|
||||
const DEFAULT_FETCH_TIMEOUT_MS = 10_000;
|
||||
const MIN_REQUEST_DELAY_MS = 5_000;
|
||||
|
||||
const DEFAULT_QUERY_PARAMS = {
|
||||
server_id: '212',
|
||||
server_name: '롤림푸스',
|
||||
server_comment: 'LPS_내전',
|
||||
spectator_type: 'ALL',
|
||||
pick_type: 'TOURNAMENT_DRAFT',
|
||||
map_name: 'SUMMONERS_RIFT',
|
||||
platform_id: 'KR',
|
||||
} as const;
|
||||
|
||||
const BROWSER_LIKE_HEADERS = {
|
||||
accept: '*/*',
|
||||
'accept-encoding': 'gzip, deflate, br, zstd',
|
||||
'accept-language': 'ko,en;q=0.9,en-US;q=0.8',
|
||||
'cache-control': 'no-cache',
|
||||
host: 'b2c-api.deeplol.gg',
|
||||
origin: 'https://clash.deeplol.gg',
|
||||
pragma: 'no-cache',
|
||||
priority: 'u=1, i',
|
||||
referer: 'https://clash.deeplol.gg/',
|
||||
'sec-ch-ua':
|
||||
'"Microsoft Edge";v="149", "Chromium";v="149", "Not)A;Brand";v="24"',
|
||||
'sec-ch-ua-mobile': '?0',
|
||||
'sec-ch-ua-platform': '"Windows"',
|
||||
'sec-fetch-dest': 'empty',
|
||||
'sec-fetch-mode': 'cors',
|
||||
'sec-fetch-site': 'same-site',
|
||||
'user-agent':
|
||||
'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/149.0.0.0 Safari/537.36 Edg/149.0.0.0',
|
||||
} as const;
|
||||
|
||||
interface DeeplolTournamentCodeResponse {
|
||||
tournament_code_list?: unknown;
|
||||
}
|
||||
|
||||
export interface DeeplolTournamentCodeRequest {
|
||||
url: URL;
|
||||
headers: Record<string, string>;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class TournamentCodeVendorService {
|
||||
public async fetchTournamentCode(): Promise<string> {
|
||||
const request = buildDeeplolTournamentCodeRequest();
|
||||
const controller = new AbortController();
|
||||
const timeout = setTimeout(() => {
|
||||
controller.abort();
|
||||
}, resolveFetchTimeoutMs());
|
||||
|
||||
try {
|
||||
const response = await fetch(request.url.toString(), {
|
||||
method: 'GET',
|
||||
headers: request.headers,
|
||||
signal: controller.signal,
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(
|
||||
`Vendor tournament code request failed (${response.status}).`,
|
||||
);
|
||||
}
|
||||
|
||||
const payload = (await response.json()) as DeeplolTournamentCodeResponse;
|
||||
return parseVendorTournamentCode(payload);
|
||||
} finally {
|
||||
clearTimeout(timeout);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export function buildDeeplolTournamentCodeRequest(
|
||||
env: NodeJS.ProcessEnv = process.env,
|
||||
): DeeplolTournamentCodeRequest {
|
||||
const url = new URL(
|
||||
env.TOURNAMENT_CODE_VENDOR_URL?.trim() || DEFAULT_VENDOR_URL,
|
||||
);
|
||||
const params = {
|
||||
server_id:
|
||||
env.TOURNAMENT_CODE_VENDOR_SERVER_ID ?? DEFAULT_QUERY_PARAMS.server_id,
|
||||
server_name:
|
||||
env.TOURNAMENT_CODE_VENDOR_SERVER_NAME ??
|
||||
DEFAULT_QUERY_PARAMS.server_name,
|
||||
server_comment:
|
||||
env.TOURNAMENT_CODE_VENDOR_SERVER_COMMENT ??
|
||||
DEFAULT_QUERY_PARAMS.server_comment,
|
||||
spectator_type:
|
||||
env.TOURNAMENT_CODE_VENDOR_SPECTATOR_TYPE ??
|
||||
DEFAULT_QUERY_PARAMS.spectator_type,
|
||||
pick_type:
|
||||
env.TOURNAMENT_CODE_VENDOR_PICK_TYPE ?? DEFAULT_QUERY_PARAMS.pick_type,
|
||||
map_name:
|
||||
env.TOURNAMENT_CODE_VENDOR_MAP_NAME ?? DEFAULT_QUERY_PARAMS.map_name,
|
||||
platform_id:
|
||||
env.TOURNAMENT_CODE_VENDOR_PLATFORM_ID ??
|
||||
DEFAULT_QUERY_PARAMS.platform_id,
|
||||
};
|
||||
|
||||
for (const [key, value] of Object.entries(params)) {
|
||||
url.searchParams.set(key, value);
|
||||
}
|
||||
|
||||
return {
|
||||
url,
|
||||
headers: {
|
||||
...BROWSER_LIKE_HEADERS,
|
||||
host: url.host,
|
||||
},
|
||||
};
|
||||
}
|
||||
|
||||
export function resolveVendorRequestDelayMs(
|
||||
random: () => number = Math.random,
|
||||
): number {
|
||||
const roll = clampRandom(random());
|
||||
if (roll < 0.85) {
|
||||
return MIN_REQUEST_DELAY_MS + Math.round(roll * 500);
|
||||
}
|
||||
return MIN_REQUEST_DELAY_MS + 100 + Math.round(roll * 4_000);
|
||||
}
|
||||
|
||||
function parseVendorTournamentCode(
|
||||
payload: DeeplolTournamentCodeResponse,
|
||||
): string {
|
||||
const codes = payload.tournament_code_list;
|
||||
if (
|
||||
!Array.isArray(codes) ||
|
||||
typeof codes[0] !== 'string' ||
|
||||
!codes[0].trim()
|
||||
) {
|
||||
throw new Error('Vendor tournament code response is malformed.');
|
||||
}
|
||||
return codes[0].trim();
|
||||
}
|
||||
|
||||
function resolveFetchTimeoutMs(): number {
|
||||
const configured = Number(process.env.TOURNAMENT_CODE_VENDOR_TIMEOUT_MS);
|
||||
return Number.isFinite(configured) && configured > 0
|
||||
? configured
|
||||
: DEFAULT_FETCH_TIMEOUT_MS;
|
||||
}
|
||||
|
||||
function clampRandom(value: number): number {
|
||||
if (!Number.isFinite(value)) return 0;
|
||||
return Math.min(1, Math.max(0, value));
|
||||
}
|
||||
@@ -1,11 +1,19 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { TournamentCodeController } from './tournament-code.controller';
|
||||
import { TournamentCodeAutoProvisionService } from './tournament-code-auto-provision.service';
|
||||
import { TournamentCodeReplacementController } from './tournament-code-replacement.controller';
|
||||
import { TournamentCodeScheduler } from './tournament-code.scheduler';
|
||||
import { TournamentCodeService } from './tournament-code.service';
|
||||
import { TournamentCodeVendorService } from './tournament-code-vendor.service';
|
||||
|
||||
@Module({
|
||||
controllers: [TournamentCodeController],
|
||||
providers: [TournamentCodeService, TournamentCodeScheduler],
|
||||
controllers: [TournamentCodeController, TournamentCodeReplacementController],
|
||||
providers: [
|
||||
TournamentCodeService,
|
||||
TournamentCodeVendorService,
|
||||
TournamentCodeAutoProvisionService,
|
||||
TournamentCodeScheduler,
|
||||
],
|
||||
exports: [TournamentCodeService],
|
||||
})
|
||||
export class TournamentCodeModule {}
|
||||
@@ -1,4 +1,5 @@
|
||||
import { Injectable, Logger, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
|
||||
import { TournamentCodeAutoProvisionService } from './tournament-code-auto-provision.service';
|
||||
import { TournamentCodeService } from './tournament-code.service';
|
||||
|
||||
@Injectable()
|
||||
@@ -6,8 +7,12 @@ export class TournamentCodeScheduler implements OnModuleInit, OnModuleDestroy {
|
||||
private readonly logger = new Logger(TournamentCodeScheduler.name);
|
||||
private attachTimer?: NodeJS.Timeout;
|
||||
private expireTimer?: NodeJS.Timeout;
|
||||
private refillTimer?: NodeJS.Timeout;
|
||||
|
||||
constructor(private readonly tournamentCodeService: TournamentCodeService) {}
|
||||
constructor(
|
||||
private readonly tournamentCodeService: TournamentCodeService,
|
||||
private readonly autoProvisionService: TournamentCodeAutoProvisionService,
|
||||
) {}
|
||||
|
||||
public onModuleInit() {
|
||||
this.attachTimer = setInterval(() => {
|
||||
@@ -16,16 +21,26 @@ export class TournamentCodeScheduler implements OnModuleInit, OnModuleDestroy {
|
||||
this.expireTimer = setInterval(() => {
|
||||
void this.markExpired();
|
||||
}, 60 * 60 * 1000);
|
||||
if (isAutoProvisionEnabled()) {
|
||||
this.refillTimer = setInterval(() => {
|
||||
void this.ensureVendorPool();
|
||||
}, 5 * 60 * 1000);
|
||||
}
|
||||
this.attachTimer.unref?.();
|
||||
this.expireTimer.unref?.();
|
||||
this.refillTimer?.unref?.();
|
||||
|
||||
void this.attachPending();
|
||||
void this.markExpired();
|
||||
if (isAutoProvisionEnabled()) {
|
||||
void this.ensureVendorPool();
|
||||
}
|
||||
}
|
||||
|
||||
public onModuleDestroy() {
|
||||
if (this.attachTimer) clearInterval(this.attachTimer);
|
||||
if (this.expireTimer) clearInterval(this.expireTimer);
|
||||
if (this.refillTimer) clearInterval(this.refillTimer);
|
||||
}
|
||||
|
||||
private async attachPending() {
|
||||
@@ -54,4 +69,23 @@ export class TournamentCodeScheduler implements OnModuleInit, OnModuleDestroy {
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
private async ensureVendorPool() {
|
||||
try {
|
||||
await this.autoProvisionService.ensurePool();
|
||||
} catch (error) {
|
||||
this.logger.warn(
|
||||
`Failed to auto-provision tournament codes: ${
|
||||
error instanceof Error ? error.message : error
|
||||
}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
function isAutoProvisionEnabled(): boolean {
|
||||
const raw = process.env.TOURNAMENT_CODE_AUTO_PROVISION_ENABLED
|
||||
?.trim()
|
||||
.toLowerCase();
|
||||
return raw !== 'false' && raw !== '0' && raw !== 'off';
|
||||
}
|
||||
@@ -1,4 +1,8 @@
|
||||
import type { MatchDocument } from '../global/database/schema';
|
||||
import {
|
||||
TournamentCodeSchema,
|
||||
type MatchDocument,
|
||||
} from '../global/database/schema';
|
||||
import mongoose from 'mongoose';
|
||||
import { TournamentCodeService } from './tournament-code.service';
|
||||
|
||||
type TournamentCodeServiceInternals = TournamentCodeService & {
|
||||
@@ -8,6 +12,12 @@ type TournamentCodeServiceInternals = TournamentCodeService & {
|
||||
gameNumber: number,
|
||||
): { teamAIndex: number; teamBIndex: number };
|
||||
ensureGameSchedule(match: MatchDocument): void;
|
||||
replaceForMatchGame(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
gameNumber: number;
|
||||
}): Promise<unknown>;
|
||||
attachPendingMatches(communityId?: mongoose.Types.ObjectId): Promise<number>;
|
||||
};
|
||||
|
||||
function createService() {
|
||||
@@ -19,10 +29,12 @@ function createService() {
|
||||
interface MatchOverrides {
|
||||
gameCount?: number;
|
||||
gameMode?: 'pair' | 'bracket' | 'round-robin';
|
||||
roundRobinMaxRounds?: number;
|
||||
participants?: Array<{ excluded?: boolean }>;
|
||||
teams?: Array<{ teamIndex: number }>;
|
||||
gameSchedule?: Array<{
|
||||
gameNumber: number;
|
||||
roundNumber?: number;
|
||||
teamAIndex: number;
|
||||
teamBIndex: number;
|
||||
}>;
|
||||
@@ -30,11 +42,15 @@ interface MatchOverrides {
|
||||
|
||||
function createMatch(overrides: MatchOverrides): MatchDocument {
|
||||
return {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
status: 'in-progress',
|
||||
gameCount: 1,
|
||||
gameMode: 'pair',
|
||||
participants: [],
|
||||
teams: [],
|
||||
tournamentCodeIds: [],
|
||||
gameSchedule: [],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
...overrides,
|
||||
} as unknown as MatchDocument;
|
||||
}
|
||||
@@ -102,15 +118,32 @@ describe('TournamentCodeService round-robin scheduling', () => {
|
||||
).toBe(15);
|
||||
});
|
||||
|
||||
it('calculates limited round-robin slots from max rounds', () => {
|
||||
const service = createService();
|
||||
|
||||
expect(
|
||||
service.resolveRequiredSlots(
|
||||
createMatch({
|
||||
gameMode: 'round-robin',
|
||||
gameCount: 1,
|
||||
roundRobinMaxRounds: 3,
|
||||
teams: Array.from({ length: 8 }, (_, index) => ({
|
||||
teamIndex: index + 1,
|
||||
})),
|
||||
}),
|
||||
),
|
||||
).toBe(12);
|
||||
});
|
||||
|
||||
it('uses persisted round-robin game schedule for game refs', () => {
|
||||
const service = createService();
|
||||
const match = createMatch({
|
||||
gameMode: 'round-robin',
|
||||
gameCount: 2,
|
||||
gameSchedule: [
|
||||
{ gameNumber: 1, teamAIndex: 2, teamBIndex: 5 },
|
||||
{ gameNumber: 2, teamAIndex: 2, teamBIndex: 5 },
|
||||
{ gameNumber: 3, teamAIndex: 1, teamBIndex: 4 },
|
||||
{ gameNumber: 1, roundNumber: 1, teamAIndex: 2, teamBIndex: 5 },
|
||||
{ gameNumber: 2, roundNumber: 1, teamAIndex: 2, teamBIndex: 5 },
|
||||
{ gameNumber: 3, roundNumber: 2, teamAIndex: 1, teamBIndex: 4 },
|
||||
],
|
||||
});
|
||||
|
||||
@@ -124,7 +157,7 @@ describe('TournamentCodeService round-robin scheduling', () => {
|
||||
});
|
||||
});
|
||||
|
||||
it('falls back to lexicographic round-robin pairs before schedule is persisted', () => {
|
||||
it('falls back to round-based pairs before schedule is persisted', () => {
|
||||
const service = createService();
|
||||
const match = createMatch({
|
||||
gameMode: 'round-robin',
|
||||
@@ -137,10 +170,10 @@ describe('TournamentCodeService round-robin scheduling', () => {
|
||||
|
||||
expect(service.resolveSeriesRefForGameNumber(match, 1)).toEqual({
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
teamBIndex: 4,
|
||||
});
|
||||
expect(service.resolveSeriesRefForGameNumber(match, 2)).toEqual({
|
||||
teamAIndex: 1,
|
||||
teamAIndex: 2,
|
||||
teamBIndex: 3,
|
||||
});
|
||||
});
|
||||
@@ -173,6 +206,105 @@ describe('TournamentCodeService round-robin scheduling', () => {
|
||||
expect(pair.gameSchedule).toEqual([]);
|
||||
});
|
||||
|
||||
it('creates a limited round-robin schedule grouped by playable rounds', () => {
|
||||
const service = createService();
|
||||
const roundRobin = createMatch({
|
||||
gameMode: 'round-robin',
|
||||
gameCount: 1,
|
||||
roundRobinMaxRounds: 3,
|
||||
teams: Array.from({ length: 8 }, (_, index) => ({
|
||||
teamIndex: index + 1,
|
||||
})),
|
||||
gameSchedule: [],
|
||||
});
|
||||
|
||||
service.ensureGameSchedule(roundRobin);
|
||||
|
||||
expect(roundRobin.gameSchedule).toHaveLength(12);
|
||||
for (const roundNumber of [1, 2, 3]) {
|
||||
const round = roundRobin.gameSchedule.filter(
|
||||
(game) => game.roundNumber === roundNumber,
|
||||
);
|
||||
expect(round).toHaveLength(4);
|
||||
expect(new Set(round.flatMap((game) => [game.teamAIndex, game.teamBIndex])).size)
|
||||
.toBe(8);
|
||||
}
|
||||
});
|
||||
|
||||
it('leaves legacy round-robin schedules without round numbers unchanged', () => {
|
||||
const service = createService();
|
||||
const roundRobin = createMatch({
|
||||
gameMode: 'round-robin',
|
||||
gameCount: 1,
|
||||
teams: Array.from({ length: 6 }, (_, index) => ({
|
||||
teamIndex: index + 1,
|
||||
})),
|
||||
gameSchedule: [
|
||||
{ gameNumber: 1, teamAIndex: 2, teamBIndex: 5 },
|
||||
{ gameNumber: 2, teamAIndex: 1, teamBIndex: 2 },
|
||||
{ gameNumber: 3, teamAIndex: 4, teamBIndex: 5 },
|
||||
{ gameNumber: 4, teamAIndex: 1, teamBIndex: 6 },
|
||||
{ gameNumber: 5, teamAIndex: 5, teamBIndex: 6 },
|
||||
{ gameNumber: 6, teamAIndex: 4, teamBIndex: 6 },
|
||||
],
|
||||
});
|
||||
|
||||
const persisted = [...roundRobin.gameSchedule];
|
||||
service.ensureGameSchedule(roundRobin);
|
||||
|
||||
expect(roundRobin.gameSchedule).toEqual(persisted);
|
||||
});
|
||||
|
||||
it('does not expose round numbers for legacy round-robin slots', async () => {
|
||||
const codeFindExec = jest.fn().mockResolvedValue([]);
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue({
|
||||
find: jest.fn().mockReturnValue({ exec: codeFindExec }),
|
||||
}),
|
||||
};
|
||||
const service = new TournamentCodeService(
|
||||
connectionService as never,
|
||||
) as unknown as TournamentCodeServiceInternals;
|
||||
|
||||
const slots = await service.buildSlots(
|
||||
createMatch({
|
||||
gameMode: 'round-robin',
|
||||
gameCount: 1,
|
||||
teams: Array.from({ length: 6 }, (_, index) => ({
|
||||
teamIndex: index + 1,
|
||||
})),
|
||||
gameSchedule: [
|
||||
{ gameNumber: 1, teamAIndex: 2, teamBIndex: 5 },
|
||||
{ gameNumber: 2, teamAIndex: 1, teamBIndex: 2 },
|
||||
{ gameNumber: 3, teamAIndex: 4, teamBIndex: 5 },
|
||||
{ gameNumber: 4, teamAIndex: 1, teamBIndex: 6 },
|
||||
{ gameNumber: 5, teamAIndex: 5, teamBIndex: 6 },
|
||||
{ gameNumber: 6, teamAIndex: 4, teamBIndex: 6 },
|
||||
{ gameNumber: 7, teamAIndex: 2, teamBIndex: 6 },
|
||||
{ gameNumber: 8, teamAIndex: 3, teamBIndex: 5 },
|
||||
{ gameNumber: 9, teamAIndex: 2, teamBIndex: 3 },
|
||||
{ gameNumber: 10, teamAIndex: 1, teamBIndex: 4 },
|
||||
{ gameNumber: 11, teamAIndex: 3, teamBIndex: 6 },
|
||||
{ gameNumber: 12, teamAIndex: 1, teamBIndex: 3 },
|
||||
{ gameNumber: 13, teamAIndex: 3, teamBIndex: 4 },
|
||||
{ gameNumber: 14, teamAIndex: 1, teamBIndex: 5 },
|
||||
{ gameNumber: 15, teamAIndex: 2, teamBIndex: 4 },
|
||||
],
|
||||
}),
|
||||
);
|
||||
|
||||
expect(slots).toHaveLength(15);
|
||||
expect(slots[0]).toEqual(
|
||||
expect.objectContaining({
|
||||
gameNumber: 1,
|
||||
roundNumber: undefined,
|
||||
teamAIndex: 2,
|
||||
teamBIndex: 5,
|
||||
}),
|
||||
);
|
||||
expect(slots.every((slot) => slot.roundNumber === undefined)).toBe(true);
|
||||
});
|
||||
|
||||
it('does not expose fallback round-robin slots before the schedule is persisted', async () => {
|
||||
const service = createService();
|
||||
const slots = await service.buildSlots(
|
||||
@@ -189,3 +321,282 @@ describe('TournamentCodeService round-robin scheduling', () => {
|
||||
expect(slots).toEqual([]);
|
||||
});
|
||||
});
|
||||
|
||||
describe('TournamentCodeService bulk upload', () => {
|
||||
it('preserves tournament code casing at the schema layer', async () => {
|
||||
const connection = mongoose.createConnection();
|
||||
try {
|
||||
const TournamentCodeModel = connection.model(
|
||||
'TournamentCodeCasingSpec',
|
||||
TournamentCodeSchema,
|
||||
);
|
||||
|
||||
const code = new TournamentCodeModel({
|
||||
code: ' AbC-12345 ',
|
||||
expiresAt: new Date(Date.now() + 60 * 60 * 1000),
|
||||
uploadedBy: new mongoose.Types.ObjectId(),
|
||||
});
|
||||
|
||||
expect(code.code).toBe('AbC-12345');
|
||||
} finally {
|
||||
await connection.close();
|
||||
}
|
||||
});
|
||||
|
||||
it('stores tournament codes with the exact casing from input', async () => {
|
||||
const insertMany = jest.fn().mockResolvedValue(undefined);
|
||||
const TournamentCodeModel = {
|
||||
find: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue([]),
|
||||
}),
|
||||
}),
|
||||
}),
|
||||
insertMany,
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue(TournamentCodeModel),
|
||||
};
|
||||
const service = new TournamentCodeService(
|
||||
connectionService as never,
|
||||
) as unknown as TournamentCodeServiceInternals;
|
||||
service.attachPendingMatches = jest.fn().mockResolvedValue(0);
|
||||
|
||||
await service.bulkUpload({
|
||||
communityId: new mongoose.Types.ObjectId(),
|
||||
uploadedBy: new mongoose.Types.ObjectId(),
|
||||
codes: [
|
||||
{
|
||||
code: ' AbC-12345 ',
|
||||
expiresAt: new Date(Date.now() + 60 * 60 * 1000).toISOString(),
|
||||
},
|
||||
],
|
||||
});
|
||||
|
||||
expect(insertMany).toHaveBeenCalledWith(
|
||||
[
|
||||
expect.objectContaining({
|
||||
code: 'AbC-12345',
|
||||
}),
|
||||
],
|
||||
{ ordered: false },
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe('TournamentCodeService pool stats', () => {
|
||||
it('counts only available codes that are usable beyond the expiry margin', async () => {
|
||||
const countDocuments = jest.fn().mockReturnValue({
|
||||
exec: jest.fn().mockResolvedValue(12),
|
||||
});
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockResolvedValue({ countDocuments }),
|
||||
};
|
||||
const service = new TournamentCodeService(connectionService as never);
|
||||
|
||||
await expect(service.countUsableAvailable()).resolves.toBe(12);
|
||||
expect(countDocuments).toHaveBeenCalledWith({
|
||||
state: 'available',
|
||||
expiresAt: {
|
||||
$gt: expect.any(Date),
|
||||
},
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe('TournamentCodeService code replacement', () => {
|
||||
function queryResult<T>(value: T) {
|
||||
return { exec: jest.fn().mockResolvedValue(value) };
|
||||
}
|
||||
|
||||
function createCode(overrides: Record<string, unknown>) {
|
||||
return {
|
||||
_id: new mongoose.Types.ObjectId(),
|
||||
code: 'CODE',
|
||||
state: 'reserved',
|
||||
expiresAt: new Date(Date.now() + 60 * 60 * 1000),
|
||||
matchId: new mongoose.Types.ObjectId(),
|
||||
gameNumber: 1,
|
||||
reservedAt: new Date(),
|
||||
releasedAt: undefined,
|
||||
riotMatchId: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
function createReplacementFixture(params?: {
|
||||
currentCode?: Record<string, unknown> | null;
|
||||
replacementCode?: Record<string, unknown> | null;
|
||||
match?: MatchDocument;
|
||||
}) {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const oldCodeId = new mongoose.Types.ObjectId();
|
||||
const newCodeId = new mongoose.Types.ObjectId();
|
||||
const match =
|
||||
params?.match ??
|
||||
createMatch({
|
||||
_id: matchId,
|
||||
communityId,
|
||||
status: 'in-progress',
|
||||
gameCount: 1,
|
||||
participants: Array.from({ length: 10 }, () => ({})),
|
||||
teams: [{ teamIndex: 1 }, { teamIndex: 2 }],
|
||||
tournamentCodeIds: [oldCodeId],
|
||||
} as unknown as MatchOverrides);
|
||||
const currentCode =
|
||||
params?.currentCode === null
|
||||
? null
|
||||
: createCode({
|
||||
_id: oldCodeId,
|
||||
code: 'OLD-CODE',
|
||||
matchId,
|
||||
gameNumber: 1,
|
||||
...(params?.currentCode ?? {}),
|
||||
});
|
||||
const replacementCode =
|
||||
params?.replacementCode === null
|
||||
? null
|
||||
: createCode({
|
||||
_id: newCodeId,
|
||||
code: 'NEW-CODE',
|
||||
matchId,
|
||||
gameNumber: 1,
|
||||
...(params?.replacementCode ?? {}),
|
||||
});
|
||||
|
||||
const MatchModel = {
|
||||
findOne: jest.fn().mockReturnValue(queryResult(match)),
|
||||
};
|
||||
const TournamentCodeModel = {
|
||||
findOne: jest.fn().mockReturnValue(queryResult(currentCode)),
|
||||
findOneAndUpdate: jest.fn().mockReturnValue(queryResult(replacementCode)),
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation((modelName: string) => {
|
||||
if (modelName === 'match') return Promise.resolve(MatchModel);
|
||||
if (modelName === 'tournamentCode') {
|
||||
return Promise.resolve(TournamentCodeModel);
|
||||
}
|
||||
throw new Error(`Unexpected model: ${modelName}`);
|
||||
}),
|
||||
};
|
||||
const service = new TournamentCodeService(
|
||||
connectionService as never,
|
||||
) as unknown as TournamentCodeServiceInternals;
|
||||
|
||||
return {
|
||||
match,
|
||||
communityId,
|
||||
matchId,
|
||||
currentCode,
|
||||
replacementCode,
|
||||
MatchModel,
|
||||
TournamentCodeModel,
|
||||
service,
|
||||
};
|
||||
}
|
||||
|
||||
it('replaces a reserved code on the same game slot', async () => {
|
||||
const {
|
||||
match,
|
||||
communityId,
|
||||
matchId,
|
||||
currentCode,
|
||||
replacementCode,
|
||||
MatchModel,
|
||||
TournamentCodeModel,
|
||||
service,
|
||||
} = createReplacementFixture();
|
||||
|
||||
const slot = await service.replaceForMatchGame({
|
||||
communityId,
|
||||
matchId,
|
||||
gameNumber: 1,
|
||||
});
|
||||
|
||||
expect(slot).toEqual(
|
||||
expect.objectContaining({
|
||||
gameNumber: 1,
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
code: 'NEW-CODE',
|
||||
state: 'reserved',
|
||||
}),
|
||||
);
|
||||
expect(MatchModel.findOne).toHaveBeenCalledWith({
|
||||
_id: matchId,
|
||||
communityId,
|
||||
});
|
||||
expect(TournamentCodeModel.findOneAndUpdate).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
state: 'available',
|
||||
region: 'kr',
|
||||
mapType: 'SUMMONERS_RIFT',
|
||||
teamSize: 5,
|
||||
}),
|
||||
expect.objectContaining({
|
||||
$set: expect.objectContaining({
|
||||
state: 'reserved',
|
||||
matchId,
|
||||
gameNumber: 1,
|
||||
}),
|
||||
}),
|
||||
expect.objectContaining({ returnDocument: 'after' }),
|
||||
);
|
||||
expect(currentCode?.state).toBe('released');
|
||||
expect(currentCode?.matchId).toBeUndefined();
|
||||
expect(currentCode?.gameNumber).toBeUndefined();
|
||||
expect(currentCode?.save).toHaveBeenCalled();
|
||||
expect(match.tournamentCodeIds.map((id) => id.toString())).toEqual([
|
||||
replacementCode?._id.toString(),
|
||||
]);
|
||||
expect(match.save).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('rejects replacement after the game result is collected', async () => {
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const fixture = createReplacementFixture({
|
||||
match: createMatch({
|
||||
_id: matchId,
|
||||
communityId,
|
||||
status: 'in-progress',
|
||||
gameCount: 1,
|
||||
participants: Array.from({ length: 10 }, () => ({})),
|
||||
teams: [{ teamIndex: 1 }, { teamIndex: 2 }],
|
||||
tournamentCodeIds: [new mongoose.Types.ObjectId()],
|
||||
result: {
|
||||
riotMatchIds: ['KR_1'],
|
||||
games: [{ gameNumber: 1 }],
|
||||
seriesResults: [],
|
||||
},
|
||||
} as unknown as MatchOverrides),
|
||||
});
|
||||
|
||||
await expect(
|
||||
fixture.service.replaceForMatchGame({
|
||||
communityId,
|
||||
matchId,
|
||||
gameNumber: 1,
|
||||
}),
|
||||
).rejects.toThrow('already has a collected result');
|
||||
expect(fixture.TournamentCodeModel.findOne).not.toHaveBeenCalled();
|
||||
expect(fixture.TournamentCodeModel.findOneAndUpdate).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('leaves the current code untouched when no replacement code is available', async () => {
|
||||
const { match, communityId, matchId, currentCode, service } =
|
||||
createReplacementFixture({
|
||||
replacementCode: null,
|
||||
});
|
||||
|
||||
await expect(
|
||||
service.replaceForMatchGame({ communityId, matchId, gameNumber: 1 }),
|
||||
).rejects.toThrow('No available tournament code');
|
||||
expect(currentCode?.save).not.toHaveBeenCalled();
|
||||
expect(match.save).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
@@ -25,10 +25,8 @@ import type {
|
||||
TournamentCodeUploadItem,
|
||||
} from './tournament-code.types';
|
||||
import {
|
||||
roundRobinGameSchedule,
|
||||
resolveRoundRobinTeamCount,
|
||||
roundRobinPairCount,
|
||||
roundRobinPairs,
|
||||
shuffleInPlace,
|
||||
} from './round-robin.util';
|
||||
|
||||
const DEFAULT_REGION = 'kr';
|
||||
@@ -39,7 +37,7 @@ export class TournamentCodeService {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async bulkUpload(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
communityId?: mongoose.Types.ObjectId;
|
||||
uploadedBy: mongoose.Types.ObjectId;
|
||||
codes: TournamentCodeUploadItem[];
|
||||
}): Promise<BulkUploadTournamentCodesResponse> {
|
||||
@@ -123,6 +121,17 @@ export class TournamentCodeService {
|
||||
};
|
||||
}
|
||||
|
||||
public async countUsableAvailable(): Promise<number> {
|
||||
const TournamentCodeModel =
|
||||
await this.connectionService.getModel('tournamentCode');
|
||||
return TournamentCodeModel.countDocuments({
|
||||
state: 'available',
|
||||
expiresAt: {
|
||||
$gt: new Date(Date.now() + TOURNAMENT_CODE_EXPIRY_MARGIN_MS),
|
||||
},
|
||||
}).exec();
|
||||
}
|
||||
|
||||
public async list(params: {
|
||||
state?: TournamentCodeState;
|
||||
limit?: number;
|
||||
@@ -275,6 +284,111 @@ export class TournamentCodeService {
|
||||
return match;
|
||||
}
|
||||
|
||||
public async replaceForMatchGame(params: {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
matchId: mongoose.Types.ObjectId;
|
||||
gameNumber: number;
|
||||
}): Promise<TournamentCodeSlotView> {
|
||||
const MatchModel = await this.connectionService.getModel('match');
|
||||
const TournamentCodeModel =
|
||||
await this.connectionService.getModel('tournamentCode');
|
||||
const match = await MatchModel.findOne({
|
||||
_id: params.matchId,
|
||||
communityId: params.communityId,
|
||||
}).exec();
|
||||
if (!match) throw new NotFoundException('Match not found.');
|
||||
if (match.status !== 'team-built' && match.status !== 'in-progress') {
|
||||
throw new BadRequestException(
|
||||
'Tournament codes can only be replaced while the match is ready or in progress.',
|
||||
);
|
||||
}
|
||||
|
||||
match.gameCount = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT;
|
||||
match.tournamentCodeIds = match.tournamentCodeIds ?? [];
|
||||
this.ensureGameSchedule(match);
|
||||
|
||||
const requiredSlots = this.resolveRequiredSlots(match);
|
||||
if (
|
||||
!Number.isInteger(params.gameNumber) ||
|
||||
params.gameNumber < 1 ||
|
||||
params.gameNumber > requiredSlots
|
||||
) {
|
||||
throw new BadRequestException('Invalid tournament code game number.');
|
||||
}
|
||||
if (
|
||||
(match.result?.games ?? []).some(
|
||||
(game) => game.gameNumber === params.gameNumber,
|
||||
)
|
||||
) {
|
||||
throw new BadRequestException(
|
||||
'This game already has a collected result and cannot be replaced.',
|
||||
);
|
||||
}
|
||||
|
||||
const currentCode = await TournamentCodeModel.findOne({
|
||||
_id: { $in: match.tournamentCodeIds },
|
||||
matchId: match._id,
|
||||
gameNumber: params.gameNumber,
|
||||
}).exec();
|
||||
if (!currentCode) {
|
||||
throw new NotFoundException('Assigned tournament code not found.');
|
||||
}
|
||||
if (currentCode.state === 'used' || currentCode.riotMatchId) {
|
||||
throw new BadRequestException('Used tournament codes cannot be replaced.');
|
||||
}
|
||||
|
||||
const expiresAfter = new Date(Date.now() + TOURNAMENT_CODE_EXPIRY_MARGIN_MS);
|
||||
const replacement = await TournamentCodeModel.findOneAndUpdate(
|
||||
{
|
||||
state: 'available',
|
||||
region: DEFAULT_REGION,
|
||||
mapType: 'SUMMONERS_RIFT',
|
||||
teamSize: 5,
|
||||
expiresAt: { $gt: expiresAfter },
|
||||
},
|
||||
{
|
||||
$set: {
|
||||
state: 'reserved',
|
||||
matchId: match._id,
|
||||
gameNumber: params.gameNumber,
|
||||
reservedAt: new Date(),
|
||||
},
|
||||
$unset: { releasedAt: 1 },
|
||||
},
|
||||
{ sort: { expiresAt: 1 }, returnDocument: 'after' },
|
||||
).exec();
|
||||
if (!replacement) {
|
||||
throw new BadRequestException('No available tournament code to replace with.');
|
||||
}
|
||||
|
||||
currentCode.state = 'released';
|
||||
currentCode.matchId = undefined;
|
||||
currentCode.gameNumber = undefined;
|
||||
currentCode.reservedAt = undefined;
|
||||
currentCode.releasedAt = new Date();
|
||||
currentCode.riotMatchId = undefined;
|
||||
match.tournamentCodeIds = this.replaceTournamentCodeId(
|
||||
match.tournamentCodeIds,
|
||||
currentCode._id,
|
||||
replacement._id,
|
||||
);
|
||||
await currentCode.save();
|
||||
await match.save();
|
||||
|
||||
return {
|
||||
gameNumber: params.gameNumber,
|
||||
roundNumber: this.resolveRoundNumberForGameNumber(
|
||||
match,
|
||||
params.gameNumber,
|
||||
),
|
||||
...this.resolveSeriesRefForGameNumber(match, params.gameNumber),
|
||||
code: replacement.code,
|
||||
expiresAt: replacement.expiresAt.toISOString(),
|
||||
state: replacement.state,
|
||||
riotMatchId: replacement.riotMatchId ?? null,
|
||||
};
|
||||
}
|
||||
|
||||
public async releaseFromMatch(
|
||||
matchOrId: MatchDocument | mongoose.Types.ObjectId,
|
||||
): Promise<void> {
|
||||
@@ -368,6 +482,7 @@ export class TournamentCodeService {
|
||||
const seriesRef = this.resolveSeriesRefForGameNumber(match, gameNumber);
|
||||
return {
|
||||
gameNumber,
|
||||
roundNumber: this.resolveRoundNumberForGameNumber(match, gameNumber),
|
||||
...seriesRef,
|
||||
code: null,
|
||||
expiresAt: null,
|
||||
@@ -377,6 +492,7 @@ export class TournamentCodeService {
|
||||
}
|
||||
return {
|
||||
gameNumber,
|
||||
roundNumber: this.resolveRoundNumberForGameNumber(match, gameNumber),
|
||||
...this.resolveSeriesRefForGameNumber(match, gameNumber),
|
||||
code: code.code,
|
||||
expiresAt: code.expiresAt.toISOString(),
|
||||
@@ -387,7 +503,22 @@ export class TournamentCodeService {
|
||||
}
|
||||
|
||||
private normalizeCode(code: string | undefined): string {
|
||||
return (code ?? '').trim().toUpperCase();
|
||||
return (code ?? '').trim();
|
||||
}
|
||||
|
||||
private replaceTournamentCodeId(
|
||||
currentIds: mongoose.Types.ObjectId[],
|
||||
oldId: mongoose.Types.ObjectId,
|
||||
newId: mongoose.Types.ObjectId,
|
||||
): mongoose.Types.ObjectId[] {
|
||||
let replaced = false;
|
||||
const next = currentIds.map((id) => {
|
||||
if (id.toString() !== oldId.toString()) return id;
|
||||
replaced = true;
|
||||
return newId;
|
||||
});
|
||||
if (!replaced) next.push(newId);
|
||||
return next;
|
||||
}
|
||||
|
||||
private resolveRequiredSlots(match: MatchDocument): number {
|
||||
@@ -395,8 +526,10 @@ export class TournamentCodeService {
|
||||
const gameMode = match.gameMode ?? 'pair';
|
||||
|
||||
if (gameMode === 'round-robin') {
|
||||
const teamCount = resolveRoundRobinTeamCount(match);
|
||||
return roundRobinPairCount(teamCount) * gameCount;
|
||||
if ((match.gameSchedule?.length ?? 0) > 0) {
|
||||
return match.gameSchedule.length;
|
||||
}
|
||||
return this.buildRoundRobinGameSchedule(match).length;
|
||||
}
|
||||
|
||||
const teamCount = (match.teams ?? []).length;
|
||||
@@ -426,13 +559,18 @@ export class TournamentCodeService {
|
||||
};
|
||||
}
|
||||
|
||||
const teamCount = resolveRoundRobinTeamCount(match);
|
||||
const perSeries = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT;
|
||||
const pairIndex = Math.max(0, Math.ceil(gameNumber / perSeries) - 1);
|
||||
return roundRobinPairs(teamCount)[pairIndex] ?? {
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
};
|
||||
const fallback = this.buildRoundRobinGameSchedule(match).find(
|
||||
(entry) => entry.gameNumber === gameNumber,
|
||||
);
|
||||
return fallback
|
||||
? {
|
||||
teamAIndex: fallback.teamAIndex,
|
||||
teamBIndex: fallback.teamBIndex,
|
||||
}
|
||||
: {
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
};
|
||||
}
|
||||
|
||||
const perSeries = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT;
|
||||
@@ -450,21 +588,33 @@ export class TournamentCodeService {
|
||||
const teamCount = resolveRoundRobinTeamCount(match);
|
||||
if (teamCount < 2) return;
|
||||
|
||||
const gameCount = match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT;
|
||||
const pairs = shuffleInPlace([...roundRobinPairs(teamCount)]);
|
||||
const schedule: MatchGameAssignment[] = [];
|
||||
match.gameSchedule = this.buildRoundRobinGameSchedule(match);
|
||||
}
|
||||
|
||||
for (let pairIndex = 0; pairIndex < pairs.length; pairIndex += 1) {
|
||||
const pair = pairs[pairIndex];
|
||||
for (let gameIndex = 0; gameIndex < gameCount; gameIndex += 1) {
|
||||
schedule.push({
|
||||
gameNumber: pairIndex * gameCount + gameIndex + 1,
|
||||
teamAIndex: pair.teamAIndex,
|
||||
teamBIndex: pair.teamBIndex,
|
||||
});
|
||||
}
|
||||
}
|
||||
private resolveRoundNumberForGameNumber(
|
||||
match: MatchDocument,
|
||||
gameNumber: number,
|
||||
): number | undefined {
|
||||
if ((match.gameMode ?? 'pair') !== 'round-robin') return undefined;
|
||||
|
||||
match.gameSchedule = schedule;
|
||||
const persisted = match.gameSchedule?.find(
|
||||
(entry) => entry.gameNumber === gameNumber,
|
||||
);
|
||||
if (persisted) return persisted.roundNumber;
|
||||
|
||||
return this.buildRoundRobinGameSchedule(match).find(
|
||||
(entry) => entry.gameNumber === gameNumber,
|
||||
)?.roundNumber;
|
||||
}
|
||||
|
||||
private buildRoundRobinGameSchedule(
|
||||
match: MatchDocument,
|
||||
shuffleTeams = false,
|
||||
): MatchGameAssignment[] {
|
||||
return roundRobinGameSchedule(resolveRoundRobinTeamCount(match), {
|
||||
gamesPerPair: match.gameCount || DEFAULT_TOURNAMENT_GAME_COUNT,
|
||||
maxRounds: match.roundRobinMaxRounds,
|
||||
shuffleTeams,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -24,6 +24,7 @@ export interface BulkUploadTournamentCodesResponse {
|
||||
|
||||
export interface TournamentCodeSlotView {
|
||||
gameNumber: number;
|
||||
roundNumber?: number;
|
||||
teamAIndex: number;
|
||||
teamBIndex: number;
|
||||
code: string | null;
|
||||
|
||||
@@ -24,10 +24,12 @@ function createService() {
|
||||
interface MatchOverrides {
|
||||
gameCount?: number;
|
||||
gameMode?: 'pair' | 'bracket' | 'round-robin';
|
||||
roundRobinMaxRounds?: number;
|
||||
participants?: Array<{ excluded?: boolean }>;
|
||||
teams?: Array<{ teamIndex: number }>;
|
||||
gameSchedule?: Array<{
|
||||
gameNumber: number;
|
||||
roundNumber?: number;
|
||||
teamAIndex: number;
|
||||
teamBIndex: number;
|
||||
}>;
|
||||
@@ -58,6 +60,20 @@ describe('TournamentResultService round-robin scheduling', () => {
|
||||
expect(service.resolveRequiredGameSlots(match)).toBe(15);
|
||||
});
|
||||
|
||||
it('calculates limited round-robin slots for polling', () => {
|
||||
const service = createService();
|
||||
const match = createMatch({
|
||||
gameMode: 'round-robin',
|
||||
gameCount: 1,
|
||||
roundRobinMaxRounds: 3,
|
||||
teams: Array.from({ length: 8 }, (_, index) => ({
|
||||
teamIndex: index + 1,
|
||||
})),
|
||||
});
|
||||
|
||||
expect(service.resolveRequiredGameSlots(match)).toBe(12);
|
||||
});
|
||||
|
||||
it('uses persisted round-robin schedule when mapping a game number', () => {
|
||||
const service = createService();
|
||||
const match = createMatch({
|
||||
@@ -85,6 +101,180 @@ describe('TournamentResultService round-robin scheduling', () => {
|
||||
});
|
||||
});
|
||||
|
||||
describe('TournamentResultService tournament code polling', () => {
|
||||
function queryResult<T>(value: T) {
|
||||
return { exec: jest.fn().mockResolvedValue(value) };
|
||||
}
|
||||
|
||||
function sortedQueryResult<T>(value: T) {
|
||||
return {
|
||||
sort: jest.fn().mockReturnValue(queryResult(value)),
|
||||
};
|
||||
}
|
||||
|
||||
function createPollFixture(params: {
|
||||
storedCode: string;
|
||||
riotTournamentCode: string;
|
||||
}) {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const matchId = new mongoose.Types.ObjectId();
|
||||
const codeId = new mongoose.Types.ObjectId();
|
||||
const users = Array.from({ length: 10 }, (_, index) => ({
|
||||
userId: new mongoose.Types.ObjectId(),
|
||||
puuid: `poll-puuid-${index + 1}`,
|
||||
}));
|
||||
const match = {
|
||||
_id: matchId,
|
||||
communityId,
|
||||
status: 'team-built',
|
||||
teamBuiltAt: new Date('2026-05-03T10:00:00.000Z'),
|
||||
gameCount: 1,
|
||||
gameMode: 'pair',
|
||||
tournamentCodeIds: [codeId],
|
||||
gameSchedule: [],
|
||||
resultPollState: {
|
||||
startedAt: new Date(),
|
||||
matchedCount: 0,
|
||||
expandedToAllPuuids: true,
|
||||
state: 'polling',
|
||||
},
|
||||
participants: users.map((user) => ({
|
||||
userId: user.userId,
|
||||
puuid: user.puuid,
|
||||
excluded: false,
|
||||
})),
|
||||
teams: [
|
||||
{
|
||||
teamIndex: 1,
|
||||
members: users.slice(0, 5).map((user) => ({ userId: user.userId })),
|
||||
},
|
||||
{
|
||||
teamIndex: 2,
|
||||
members: users.slice(5).map((user) => ({ userId: user.userId })),
|
||||
},
|
||||
],
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
} as unknown as MatchDocument & {
|
||||
save: jest.Mock;
|
||||
result?: MatchDocument['result'];
|
||||
};
|
||||
const code = {
|
||||
_id: codeId,
|
||||
code: params.storedCode,
|
||||
state: 'reserved',
|
||||
gameNumber: 1,
|
||||
riotMatchId: undefined,
|
||||
save: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const detail = {
|
||||
metadata: {
|
||||
matchId: 'KR_9876543210',
|
||||
participants: users.map((user) => user.puuid),
|
||||
},
|
||||
info: {
|
||||
tournamentCode: params.riotTournamentCode,
|
||||
gameCreation: Date.parse('2026-05-03T10:30:00.000Z'),
|
||||
gameEndTimestamp: Date.parse('2026-05-03T11:00:00.000Z'),
|
||||
gameDuration: 1800,
|
||||
participants: users.map((user, index) => ({
|
||||
puuid: user.puuid,
|
||||
teamId: index < 5 ? 100 : 200,
|
||||
championId: 1,
|
||||
kills: 1,
|
||||
deaths: 1,
|
||||
assists: 1,
|
||||
win: index < 5,
|
||||
})),
|
||||
teams: [
|
||||
{ teamId: 100, win: true },
|
||||
{ teamId: 200, win: false },
|
||||
],
|
||||
},
|
||||
} as unknown as RiotMatchDto;
|
||||
const TournamentCodeModel = {
|
||||
find: jest
|
||||
.fn()
|
||||
.mockReturnValueOnce(sortedQueryResult([code]))
|
||||
.mockReturnValueOnce(sortedQueryResult([code])),
|
||||
exists: jest.fn().mockResolvedValue(null),
|
||||
};
|
||||
const RiotMatchModel = {
|
||||
findOne: jest.fn().mockReturnValue(queryResult(null)),
|
||||
updateOne: jest.fn().mockReturnValue(queryResult(undefined)),
|
||||
};
|
||||
const CommunityModel = {
|
||||
findById: jest.fn().mockReturnValue({
|
||||
select: jest.fn().mockReturnValue({
|
||||
lean: jest.fn().mockReturnValue(queryResult({ riotRegion: 'asia' })),
|
||||
}),
|
||||
}),
|
||||
};
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'match') {
|
||||
return { findById: jest.fn().mockResolvedValue(match) };
|
||||
}
|
||||
if (name === 'tournamentCode') return TournamentCodeModel;
|
||||
if (name === 'community') return CommunityModel;
|
||||
if (name === 'riotMatch') return RiotMatchModel;
|
||||
throw new Error(`Unexpected model: ${name}`);
|
||||
}),
|
||||
};
|
||||
const riotMatchService = {
|
||||
getMatchIdsByPuuid: jest.fn().mockResolvedValue(['KR_9876543210']),
|
||||
getMatch: jest.fn().mockResolvedValue(detail),
|
||||
};
|
||||
const riotJobQueueService = {
|
||||
enqueueTournamentResultPoll: jest.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
const service = new TournamentResultService(
|
||||
connectionService as never,
|
||||
riotMatchService as never,
|
||||
riotJobQueueService as never,
|
||||
{ invalidateCommunity: jest.fn().mockResolvedValue(undefined) } as never,
|
||||
{ buildAndUpsert: jest.fn().mockResolvedValue(undefined) } as never,
|
||||
);
|
||||
|
||||
return { service, match, code };
|
||||
}
|
||||
|
||||
it('matches Riot tournament codes using exact casing', async () => {
|
||||
const { service, match, code } = createPollFixture({
|
||||
storedCode: 'AbC-12345',
|
||||
riotTournamentCode: 'AbC-12345',
|
||||
});
|
||||
|
||||
await service.processPollJob({
|
||||
matchId: match._id.toString(),
|
||||
attempt: 1,
|
||||
expandedToAllPuuids: true,
|
||||
});
|
||||
|
||||
expect(code.state).toBe('used');
|
||||
expect(code.riotMatchId).toBe('KR_9876543210');
|
||||
expect(code.save).toHaveBeenCalled();
|
||||
expect(match.result?.games).toHaveLength(1);
|
||||
});
|
||||
|
||||
it('does not match tournament codes when casing differs', async () => {
|
||||
const { service, match, code } = createPollFixture({
|
||||
storedCode: 'ABC-12345',
|
||||
riotTournamentCode: 'abc-12345',
|
||||
});
|
||||
|
||||
await service.processPollJob({
|
||||
matchId: match._id.toString(),
|
||||
attempt: 1,
|
||||
expandedToAllPuuids: true,
|
||||
});
|
||||
|
||||
expect(code.state).toBe('reserved');
|
||||
expect(code.riotMatchId).toBeUndefined();
|
||||
expect(code.save).not.toHaveBeenCalled();
|
||||
expect(match.result?.games).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe('TournamentResultService manual result collection', () => {
|
||||
function createManualFixture() {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
|
||||
@@ -19,9 +19,8 @@ import type { RiotJobPriority } from '../riot-job-queue/riot-job-queue.types';
|
||||
import { RiotMatchService } from '../riot/riot-match.service';
|
||||
import type { RiotMatchDto, RiotRegionalRoute } from '../riot/riot.types';
|
||||
import {
|
||||
roundRobinGameSchedule,
|
||||
resolveRoundRobinTeamCount,
|
||||
roundRobinPairCount,
|
||||
roundRobinPairs,
|
||||
} from '../tournament-code/round-robin.util';
|
||||
import {
|
||||
collectCaptainUserIds,
|
||||
@@ -263,7 +262,7 @@ export class TournamentResultService {
|
||||
);
|
||||
continue;
|
||||
}
|
||||
const tournamentCode = detail.info.tournamentCode?.trim().toUpperCase();
|
||||
const tournamentCode = detail.info.tournamentCode?.trim();
|
||||
if (!tournamentCode) continue;
|
||||
|
||||
const code = unmatchedByCode.get(tournamentCode);
|
||||
@@ -785,14 +784,18 @@ export class TournamentResultService {
|
||||
};
|
||||
}
|
||||
|
||||
const perSeries = match.gameCount || 1;
|
||||
const pairIndex = Math.max(0, Math.ceil(gameNumber / perSeries) - 1);
|
||||
return (
|
||||
roundRobinPairs(resolveRoundRobinTeamCount(match))[pairIndex] ?? {
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
}
|
||||
const fallback = this.buildRoundRobinGameSchedule(match).find(
|
||||
(entry) => entry.gameNumber === gameNumber,
|
||||
);
|
||||
return fallback
|
||||
? {
|
||||
teamAIndex: fallback.teamAIndex,
|
||||
teamBIndex: fallback.teamBIndex,
|
||||
}
|
||||
: {
|
||||
teamAIndex: 1,
|
||||
teamBIndex: 2,
|
||||
};
|
||||
}
|
||||
|
||||
const perSeries = match.gameCount || 1;
|
||||
@@ -806,8 +809,10 @@ export class TournamentResultService {
|
||||
private resolveRequiredGameSlots(match: MatchDocument): number {
|
||||
const gameMode = match.gameMode ?? 'pair';
|
||||
if (gameMode === 'round-robin') {
|
||||
const teamCount = resolveRoundRobinTeamCount(match);
|
||||
return roundRobinPairCount(teamCount) * (match.gameCount || 1);
|
||||
if ((match.gameSchedule?.length ?? 0) > 0) {
|
||||
return match.gameSchedule.length;
|
||||
}
|
||||
return this.buildRoundRobinGameSchedule(match).length;
|
||||
}
|
||||
|
||||
const activeParticipantCount = match.participants.filter(
|
||||
@@ -819,6 +824,13 @@ export class TournamentResultService {
|
||||
return seriesCount * (match.gameCount || 1);
|
||||
}
|
||||
|
||||
private buildRoundRobinGameSchedule(match: MatchDocument) {
|
||||
return roundRobinGameSchedule(resolveRoundRobinTeamCount(match), {
|
||||
gamesPerPair: match.gameCount || 1,
|
||||
maxRounds: match.roundRobinMaxRounds,
|
||||
});
|
||||
}
|
||||
|
||||
private resolveMatchWinnerTeamIndex(
|
||||
seriesResults: NonNullable<MatchDocument['result']>['seriesResults'],
|
||||
): number | undefined {
|
||||
|
||||
@@ -0,0 +1,61 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
Controller,
|
||||
Get,
|
||||
Param,
|
||||
Query,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import { Type } from 'class-transformer';
|
||||
import {
|
||||
IsInt,
|
||||
IsOptional,
|
||||
IsString,
|
||||
Max,
|
||||
MaxLength,
|
||||
Min,
|
||||
} from 'class-validator';
|
||||
import mongoose from 'mongoose';
|
||||
import { CurrentUser } from '../auth/current-user.decorator';
|
||||
import { Roles } from '../auth/roles.decorator';
|
||||
import { RolesGuard } from '../auth/roles.guard';
|
||||
import { ParseObjectIdPipe } from '../common/parse-object-id.pipe';
|
||||
import type { UserDocument } from '../global/database/schema';
|
||||
import { UserSearchService } from './user-search.service';
|
||||
|
||||
class SearchCommunityUsersQueryDto {
|
||||
@IsString()
|
||||
@MaxLength(80)
|
||||
query!: string;
|
||||
|
||||
@IsOptional()
|
||||
@Type(() => Number)
|
||||
@IsInt()
|
||||
@Min(1)
|
||||
@Max(20)
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
@Controller('communities/:communityId/users')
|
||||
@Roles('admin', 'owner')
|
||||
@UseGuards(RolesGuard)
|
||||
export class CommunityUserController {
|
||||
constructor(private readonly userSearchService: UserSearchService) {}
|
||||
|
||||
@Get('search')
|
||||
public async searchUsers(
|
||||
@CurrentUser() currentUser: UserDocument,
|
||||
@Param('communityId', ParseObjectIdPipe)
|
||||
communityId: mongoose.Types.ObjectId,
|
||||
@Query() query: SearchCommunityUsersQueryDto,
|
||||
) {
|
||||
if (!currentUser.communityId.equals(communityId)) {
|
||||
throw new BadRequestException('Different community.');
|
||||
}
|
||||
return this.userSearchService.search({
|
||||
communityId,
|
||||
query: query.query,
|
||||
limit: query.limit,
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,143 @@
|
||||
import mongoose from 'mongoose';
|
||||
import { UserSearchService } from './user-search.service';
|
||||
|
||||
describe('UserSearchService', () => {
|
||||
function createService(users: Record<string, unknown>[] = []) {
|
||||
const exec = jest.fn().mockResolvedValue(users);
|
||||
const limit = jest.fn().mockReturnValue({ exec });
|
||||
const find = jest.fn().mockReturnValue({ limit });
|
||||
const UserModel = { find };
|
||||
const connectionService = {
|
||||
getModel: jest.fn().mockImplementation(async (name: string) => {
|
||||
if (name === 'user') return UserModel;
|
||||
return {};
|
||||
}),
|
||||
};
|
||||
|
||||
return {
|
||||
service: new UserSearchService(connectionService as never),
|
||||
UserModel,
|
||||
limit,
|
||||
};
|
||||
}
|
||||
|
||||
it('returns no results for short queries', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const { service, UserModel } = createService();
|
||||
|
||||
const results = await service.search({ communityId, query: 'a' });
|
||||
|
||||
expect(results).toEqual([]);
|
||||
expect(UserModel.find).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it('searches by kakao nickname and Riot ID parts', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const { service, UserModel, limit } = createService();
|
||||
|
||||
await service.search({ communityId, query: 'Hide on bush#KR1', limit: 50 });
|
||||
|
||||
expect(UserModel.find).toHaveBeenCalledWith({
|
||||
communityId,
|
||||
$or: expect.arrayContaining([
|
||||
{ kakaoTalkNickname: expect.any(RegExp) },
|
||||
{
|
||||
riotAccounts: {
|
||||
$elemMatch: {
|
||||
gameName: expect.any(RegExp),
|
||||
tagLine: expect.any(RegExp),
|
||||
},
|
||||
},
|
||||
},
|
||||
]),
|
||||
});
|
||||
expect(limit).toHaveBeenCalledWith(20);
|
||||
});
|
||||
|
||||
it('serializes limited candidate fields', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userId = new mongoose.Types.ObjectId();
|
||||
const { service } = createService([
|
||||
{
|
||||
_id: userId,
|
||||
kakaoTalkNickname: '다혜',
|
||||
isActivated: true,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'Dahyeon',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 7,
|
||||
isPrimary: true,
|
||||
tiers: [{ queueType: 'RANKED_SOLO_5x5', tier: 'GOLD' }],
|
||||
matchIds: ['private-extra-field'],
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
|
||||
const results = await service.search({ communityId, query: '다혜' });
|
||||
|
||||
expect(results).toEqual([
|
||||
{
|
||||
userId: userId.toString(),
|
||||
kakaoTalkNickname: '다혜',
|
||||
isActivated: true,
|
||||
preferredPositions: [{ position: 'MID', priority: 1 }],
|
||||
matchedRiotPuuid: undefined,
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'puuid-1',
|
||||
gameName: 'Dahyeon',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 7,
|
||||
isPrimary: true,
|
||||
tiers: [{ queueType: 'RANKED_SOLO_5x5', tier: 'GOLD' }],
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
});
|
||||
|
||||
it('returns the matching secondary Riot account as a selection hint', async () => {
|
||||
const communityId = new mongoose.Types.ObjectId();
|
||||
const userId = new mongoose.Types.ObjectId();
|
||||
const { service } = createService([
|
||||
{
|
||||
_id: userId,
|
||||
kakaoTalkNickname: '다혜',
|
||||
isActivated: true,
|
||||
preferredPositions: [],
|
||||
riotAccounts: [
|
||||
{
|
||||
puuid: 'main-puuid',
|
||||
gameName: 'MainDahyeon',
|
||||
tagLine: 'KR1',
|
||||
profileIconId: 7,
|
||||
isPrimary: true,
|
||||
tiers: [],
|
||||
},
|
||||
{
|
||||
puuid: 'smurf-puuid',
|
||||
gameName: 'PracticeDahyeon',
|
||||
tagLine: 'KR2',
|
||||
profileIconId: 8,
|
||||
isPrimary: false,
|
||||
tiers: [],
|
||||
},
|
||||
],
|
||||
},
|
||||
]);
|
||||
|
||||
const results = await service.search({
|
||||
communityId,
|
||||
query: 'Practice#KR2',
|
||||
});
|
||||
|
||||
expect(results[0]).toMatchObject({
|
||||
userId: userId.toString(),
|
||||
matchedRiotPuuid: 'smurf-puuid',
|
||||
});
|
||||
});
|
||||
});
|
||||
@@ -0,0 +1,164 @@
|
||||
import { Injectable } from '@nestjs/common';
|
||||
import mongoose from 'mongoose';
|
||||
import { ConnectionService } from '../global/database/connection.service';
|
||||
import type {
|
||||
PositionPreference,
|
||||
RiotAccount,
|
||||
TierInfo,
|
||||
UserDocument,
|
||||
} from '../global/database/schema';
|
||||
|
||||
const DEFAULT_SEARCH_LIMIT = 10;
|
||||
const MAX_SEARCH_LIMIT = 20;
|
||||
const MIN_QUERY_LENGTH = 2;
|
||||
|
||||
export interface UserSearchRiotAccountResult {
|
||||
puuid: string;
|
||||
gameName: string;
|
||||
tagLine: string;
|
||||
profileIconId: number;
|
||||
isPrimary: boolean;
|
||||
tiers: TierInfo[];
|
||||
}
|
||||
|
||||
export interface UserSearchResult {
|
||||
userId: string;
|
||||
kakaoTalkNickname?: string;
|
||||
isActivated: boolean;
|
||||
preferredPositions: PositionPreference[];
|
||||
matchedRiotPuuid?: string;
|
||||
riotAccounts: UserSearchRiotAccountResult[];
|
||||
}
|
||||
|
||||
export interface SearchCommunityUsersParams {
|
||||
communityId: mongoose.Types.ObjectId;
|
||||
query: string;
|
||||
limit?: number;
|
||||
}
|
||||
|
||||
@Injectable()
|
||||
export class UserSearchService {
|
||||
constructor(private readonly connectionService: ConnectionService) {}
|
||||
|
||||
public async search(
|
||||
params: SearchCommunityUsersParams,
|
||||
): Promise<UserSearchResult[]> {
|
||||
const query = params.query.trim();
|
||||
if (query.length < MIN_QUERY_LENGTH) return [];
|
||||
|
||||
const UserModel = await this.connectionService.getModel('user');
|
||||
const users = await UserModel.find(
|
||||
this.buildFilter(params.communityId, query),
|
||||
)
|
||||
.limit(this.resolveLimit(params.limit))
|
||||
.exec();
|
||||
|
||||
return users.map((user) => this.serializeUser(user, query));
|
||||
}
|
||||
|
||||
private buildFilter(communityId: mongoose.Types.ObjectId, query: string) {
|
||||
const [gameName, tagLine] = this.splitRiotId(query);
|
||||
const generalRegex = this.toContainsRegex(query);
|
||||
const filters: Record<string, unknown>[] = [
|
||||
{ kakaoTalkNickname: generalRegex },
|
||||
{ 'riotAccounts.gameName': generalRegex },
|
||||
{ 'riotAccounts.tagLine': generalRegex },
|
||||
];
|
||||
|
||||
if (gameName && tagLine) {
|
||||
filters.push({
|
||||
riotAccounts: {
|
||||
$elemMatch: {
|
||||
gameName: this.toContainsRegex(gameName),
|
||||
tagLine: this.toContainsRegex(tagLine),
|
||||
},
|
||||
},
|
||||
});
|
||||
}
|
||||
|
||||
return { communityId, $or: filters };
|
||||
}
|
||||
|
||||
private splitRiotId(query: string): [string | null, string | null] {
|
||||
const hashIndex = query.lastIndexOf('#');
|
||||
if (hashIndex <= 0 || hashIndex === query.length - 1) {
|
||||
return [null, null];
|
||||
}
|
||||
return [
|
||||
query.slice(0, hashIndex).trim(),
|
||||
query.slice(hashIndex + 1).trim(),
|
||||
];
|
||||
}
|
||||
|
||||
private toContainsRegex(value: string): RegExp {
|
||||
return new RegExp(escapeRegex(value.trim()), 'i');
|
||||
}
|
||||
|
||||
private resolveLimit(limit: number | undefined): number {
|
||||
if (typeof limit !== 'number' || !Number.isFinite(limit)) {
|
||||
return DEFAULT_SEARCH_LIMIT;
|
||||
}
|
||||
return Math.min(MAX_SEARCH_LIMIT, Math.max(1, Math.trunc(limit)));
|
||||
}
|
||||
|
||||
private serializeUser(user: UserDocument, query: string): UserSearchResult {
|
||||
return {
|
||||
userId: user._id.toString(),
|
||||
kakaoTalkNickname: user.kakaoTalkNickname,
|
||||
isActivated: user.isActivated,
|
||||
preferredPositions: user.preferredPositions ?? [],
|
||||
matchedRiotPuuid: this.findMatchingRiotAccount(
|
||||
user.riotAccounts ?? [],
|
||||
query,
|
||||
)?.puuid,
|
||||
riotAccounts: (user.riotAccounts ?? []).map((account) =>
|
||||
this.serializeRiotAccount(account),
|
||||
),
|
||||
};
|
||||
}
|
||||
|
||||
private serializeRiotAccount(
|
||||
account: RiotAccount,
|
||||
): UserSearchRiotAccountResult {
|
||||
return {
|
||||
puuid: account.puuid,
|
||||
gameName: account.gameName,
|
||||
tagLine: account.tagLine,
|
||||
profileIconId: account.profileIconId,
|
||||
isPrimary: account.isPrimary,
|
||||
tiers: account.tiers ?? [],
|
||||
};
|
||||
}
|
||||
|
||||
private findMatchingRiotAccount(
|
||||
accounts: RiotAccount[],
|
||||
query: string,
|
||||
): RiotAccount | undefined {
|
||||
const [gameName, tagLine] = this.splitRiotId(query);
|
||||
if (gameName && tagLine) {
|
||||
return accounts.find(
|
||||
(account) =>
|
||||
includesNormalized(account.gameName, gameName) &&
|
||||
includesNormalized(account.tagLine, tagLine),
|
||||
);
|
||||
}
|
||||
|
||||
return accounts.find(
|
||||
(account) =>
|
||||
includesNormalized(account.gameName, query) ||
|
||||
includesNormalized(account.tagLine, query),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function escapeRegex(value: string): string {
|
||||
return value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
|
||||
}
|
||||
|
||||
function includesNormalized(value: string | undefined, query: string): boolean {
|
||||
return normalizeForSearch(value).includes(normalizeForSearch(query));
|
||||
}
|
||||
|
||||
function normalizeForSearch(value: string | undefined): string {
|
||||
return (value ?? '').trim().toLowerCase();
|
||||
}
|
||||
@@ -1,9 +1,12 @@
|
||||
import { Module } from '@nestjs/common';
|
||||
import { RiotModule } from '../riot/riot.module';
|
||||
import { CommunityUserController } from './community-user.controller';
|
||||
import { UserController } from './user.controller';
|
||||
import { UserSearchService } from './user-search.service';
|
||||
|
||||
@Module({
|
||||
imports: [RiotModule],
|
||||
controllers: [UserController],
|
||||
controllers: [UserController, CommunityUserController],
|
||||
providers: [UserSearchService],
|
||||
})
|
||||
export class UserModule {}
|
||||
@@ -1,4 +1,4 @@
|
||||
VITE_API_BASE_URL=http://localhost:3000
|
||||
VITE_API_BASE_URL=http://126.dahyeon.us:3000
|
||||
VITE_DEFAULT_COMMUNITY_ID=69ebe0adf627c11be2f020a1
|
||||
VITE_MSAL_CLIENT_ID=15fb5a20-47e0-44fa-9a41-b50ca9d0e7e3
|
||||
VITE_MSAL_AUTHORITY=https://login.microsoftonline.com/5ef88004-e953-4b04-93db-64bbf49c6863
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
VITE_API_BASE_URL=https://lolympus-test-api.dahyeon.us
|
||||
VITE_API_BASE_URL=https://lolympus-api-staging.dahyeon.us
|
||||
VITE_DEFAULT_COMMUNITY_ID=69ebe0adf627c11be2f020a1
|
||||
VITE_MSAL_CLIENT_ID=15fb5a20-47e0-44fa-9a41-b50ca9d0e7e3
|
||||
VITE_MSAL_AUTHORITY=https://login.microsoftonline.com/5ef88004-e953-4b04-93db-64bbf49c6863
|
||||
+16
-1
@@ -1,5 +1,5 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<html lang="ko" data-theme="light">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<link rel="icon" type="image/svg+xml" href="/favicon.svg" />
|
||||
@@ -7,6 +7,21 @@
|
||||
<title>롤림푸스 - 내전 관리</title>
|
||||
</head>
|
||||
<body>
|
||||
<script>
|
||||
(() => {
|
||||
let theme = "light";
|
||||
try {
|
||||
theme =
|
||||
window.localStorage.getItem("lolympus.theme") === "dark"
|
||||
? "dark"
|
||||
: "light";
|
||||
} catch {
|
||||
theme = "light";
|
||||
}
|
||||
document.documentElement.dataset.theme = theme;
|
||||
document.documentElement.style.colorScheme = theme;
|
||||
})();
|
||||
</script>
|
||||
<div id="root"></div>
|
||||
<script type="module" src="/src/main.tsx"></script>
|
||||
</body>
|
||||
|
||||
@@ -5,10 +5,12 @@
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
"dev": "vite",
|
||||
"start:dev": "vite --mode development",
|
||||
"start:staging": "vite --mode staging",
|
||||
"build": "tsc -b && vite build",
|
||||
"build:test": "tsc -b && vite build --mode test",
|
||||
"build:staging": "tsc -b && vite build --mode staging",
|
||||
"build:prod": "tsc -b && vite build --mode production",
|
||||
"deploy:test": "node ../../scripts/deploy-cloudflare-pages.mjs test",
|
||||
"deploy:staging": "node ../../scripts/deploy-cloudflare-pages.mjs staging",
|
||||
"deploy:prod": "node ../../scripts/deploy-cloudflare-pages.mjs prod",
|
||||
"pages:login": "wrangler login",
|
||||
"pages:whoami": "wrangler whoami",
|
||||
@@ -23,6 +25,7 @@
|
||||
"react": "^19.2.4",
|
||||
"react-dom": "^19.2.4",
|
||||
"react-router": "^7.14.0",
|
||||
"recharts": "^3.8.1",
|
||||
"socket.io-client": "^4.8.3"
|
||||
},
|
||||
"devDependencies": {
|
||||
|
||||
+183
-66
@@ -1,22 +1,25 @@
|
||||
import { BrowserRouter, Link, Route, Routes } from 'react-router';
|
||||
import { useMsal } from '@azure/msal-react';
|
||||
import DevAuthSwitcher from './components/DevAuthSwitcher';
|
||||
import { DEFAULT_COMMUNITY_ID } from './config';
|
||||
import { useCommunity } from './api/hooks';
|
||||
import { isMsalConfigured } from './lib/auth/msal.config';
|
||||
import AuthCallbackPage from './pages/AuthCallback';
|
||||
import HomePage from './pages/HomePage';
|
||||
import LoginPage from './pages/Login';
|
||||
import MatchDetailPage from './pages/MatchDetailPage';
|
||||
import MatchTeamProgressPage from './pages/MatchTeamProgressPage';
|
||||
import AuctionPage from './pages/AuctionPage';
|
||||
import UserHistoryPage from './pages/UserHistoryPage';
|
||||
import CommunityInternalStatsPage from './pages/CommunityInternalStatsPage';
|
||||
import InternalMatchDetailPage from './pages/InternalMatchDetailPage';
|
||||
import LegacyImportPage from './pages/admin/LegacyImportPage';
|
||||
import LegacyMatchesPage from './pages/admin/LegacyMatchesPage';
|
||||
import MatchAdminPage from './pages/admin/MatchAdminPage';
|
||||
import TournamentCodesPage from './pages/admin/TournamentCodesPage';
|
||||
import { BrowserRouter, Link, Route, Routes } from "react-router";
|
||||
import type { ReactNode } from "react";
|
||||
import { useMsal } from "@azure/msal-react";
|
||||
import { Moon, Sun } from "lucide-react";
|
||||
import DevAuthSwitcher from "./components/DevAuthSwitcher";
|
||||
import { DEFAULT_COMMUNITY_ID, setTheme, useTheme } from "./config";
|
||||
import { useCommunity } from "./api/hooks";
|
||||
import { isMsalConfigured } from "./lib/auth/msal.config";
|
||||
import AuthCallbackPage from "./pages/AuthCallback";
|
||||
import HomePage from "./pages/HomePage";
|
||||
import LoginPage from "./pages/Login";
|
||||
import MatchDetailPage from "./pages/MatchDetailPage";
|
||||
import MatchGameDetailPage from "./pages/MatchGameDetailPage";
|
||||
import MatchTeamProgressPage from "./pages/MatchTeamProgressPage";
|
||||
import AuctionPage from "./pages/AuctionPage";
|
||||
import UserHistoryPage from "./pages/UserHistoryPage";
|
||||
import CommunityInternalStatsPage from "./pages/CommunityInternalStatsPage";
|
||||
import InternalMatchDetailPage from "./pages/InternalMatchDetailPage";
|
||||
import LegacyImportPage from "./pages/admin/LegacyImportPage";
|
||||
import LegacyMatchesPage from "./pages/admin/LegacyMatchesPage";
|
||||
import MatchAdminPage from "./pages/admin/MatchAdminPage";
|
||||
import TournamentCodesPage from "./pages/admin/TournamentCodesPage";
|
||||
|
||||
function MsalHeaderActions() {
|
||||
const { accounts, instance } = useMsal();
|
||||
@@ -24,7 +27,10 @@ function MsalHeaderActions() {
|
||||
|
||||
if (!account) {
|
||||
return (
|
||||
<Link className="btn btn-primary btn-xs px-3" to="/login">
|
||||
<Link
|
||||
className="btn btn-ghost btn-sm px-2 text-base-content/60 hover:text-base-content"
|
||||
to="/login"
|
||||
>
|
||||
로그인
|
||||
</Link>
|
||||
);
|
||||
@@ -33,80 +39,191 @@ function MsalHeaderActions() {
|
||||
return (
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-ghost btn-xs px-3"
|
||||
className="btn btn-ghost btn-sm px-3 max-w-[45vw] sm:max-w-none"
|
||||
onClick={() => void instance.logoutRedirect()}
|
||||
>
|
||||
{account.name ?? account.username} 로그아웃
|
||||
<span className="truncate">{account.name ?? account.username}</span>
|
||||
<span className="hidden shrink-0 sm:inline">로그아웃</span>
|
||||
</button>
|
||||
);
|
||||
}
|
||||
|
||||
function ThemeToggle() {
|
||||
const theme = useTheme();
|
||||
const nextTheme = theme === "light" ? "dark" : "light";
|
||||
const label = nextTheme === "dark" ? "다크 테마로 전환" : "라이트 테마로 전환";
|
||||
const Icon = nextTheme === "dark" ? Moon : Sun;
|
||||
|
||||
return (
|
||||
<span className="tooltip tooltip-bottom" data-tip={label}>
|
||||
<button
|
||||
type="button"
|
||||
className="btn btn-ghost btn-sm btn-square text-base-content/60 hover:text-base-content"
|
||||
aria-label={label}
|
||||
onClick={() => setTheme(nextTheme)}
|
||||
>
|
||||
<Icon className="size-4" aria-hidden="true" />
|
||||
</button>
|
||||
</span>
|
||||
);
|
||||
}
|
||||
|
||||
function AppFooter() {
|
||||
return (
|
||||
<footer className="border-t border-base-content/10 bg-base-100">
|
||||
<div className="max-w-5xl mx-auto px-4 sm:px-6 py-8 text-xs text-base-content/35">
|
||||
<nav className="flex items-center gap-4 mb-4 font-semibold text-base-content/45">
|
||||
<Link to="/terms" className="hover:text-base-content">
|
||||
서비스 이용약관
|
||||
</Link>
|
||||
<Link to="/privacy" className="hover:text-base-content">
|
||||
개인정보처리방침
|
||||
</Link>
|
||||
</nav>
|
||||
<p className="leading-relaxed max-w-4xl">
|
||||
© 2026 LOLYMPUS. LOLYMPUS is not endorsed by Riot Games and
|
||||
does not reflect the views or opinions of Riot Games or anyone
|
||||
officially involved in producing or managing League of Legends.
|
||||
League of Legends and Riot Games are trademarks or registered
|
||||
trademarks of Riot Games, Inc. League of Legends © Riot Games, Inc.
|
||||
</p>
|
||||
</div>
|
||||
</footer>
|
||||
);
|
||||
}
|
||||
|
||||
function LegalPage({
|
||||
title,
|
||||
children,
|
||||
}: {
|
||||
title: string;
|
||||
children: ReactNode;
|
||||
}) {
|
||||
return (
|
||||
<main className="max-w-3xl mx-auto px-4 sm:px-6 py-12">
|
||||
<Link
|
||||
to="/"
|
||||
className="inline-flex text-xs text-base-content/40 hover:text-base-content mb-5"
|
||||
>
|
||||
← 홈으로
|
||||
</Link>
|
||||
<h1 className="text-2xl font-black text-base-content">{title}</h1>
|
||||
<div className="mt-6 space-y-4 text-sm leading-7 text-base-content/60">
|
||||
{children}
|
||||
</div>
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
function App() {
|
||||
const communityQuery = useCommunity(DEFAULT_COMMUNITY_ID);
|
||||
const communityLabel = communityQuery.data?.name ?? 'LOLYMPUS';
|
||||
const communityLabel = communityQuery.data?.name ?? "LOLYMPUS";
|
||||
|
||||
return (
|
||||
<BrowserRouter>
|
||||
<div className="min-h-screen bg-base-100">
|
||||
<div className="min-h-screen bg-base-100 flex flex-col">
|
||||
<nav className="bg-base-100 border-b border-base-content/10 sticky top-0 z-50">
|
||||
<div className="max-w-5xl mx-auto px-4 sm:px-6 flex items-center justify-between h-11">
|
||||
<div className="max-w-5xl mx-auto px-4 sm:px-6 flex items-center justify-between h-12">
|
||||
<Link
|
||||
className="text-sm font-bold tracking-tight text-base-content"
|
||||
className="text-base font-bold tracking-tight text-base-content"
|
||||
to="/"
|
||||
>
|
||||
{communityLabel}
|
||||
</Link>
|
||||
<div className="flex items-center gap-3">
|
||||
{DEFAULT_COMMUNITY_ID ? (
|
||||
<span className="text-[10px] uppercase tracking-wider text-base-content/25">
|
||||
{/* {DEFAULT_COMMUNITY_ID ? (
|
||||
<span className="text-xs uppercase tracking-wider text-base-content/25">
|
||||
API Live
|
||||
</span>
|
||||
) : (
|
||||
<span className="text-[10px] uppercase tracking-wider text-amber-500/70">
|
||||
<span className="text-xs uppercase tracking-wider text-amber-500/70">
|
||||
Set `VITE_DEFAULT_COMMUNITY_ID`
|
||||
</span>
|
||||
)}
|
||||
)} */}
|
||||
<ThemeToggle />
|
||||
{isMsalConfigured && <MsalHeaderActions />}
|
||||
</div>
|
||||
</div>
|
||||
</nav>
|
||||
|
||||
<Routes>
|
||||
<Route path="/" element={<HomePage />} />
|
||||
<Route path="/login" element={<LoginPage />} />
|
||||
<Route path="/auth/callback" element={<AuthCallbackPage />} />
|
||||
<Route path="/match/:id" element={<MatchDetailPage />} />
|
||||
<Route
|
||||
path="/match/:id/team/:teamIndex"
|
||||
element={<MatchTeamProgressPage />}
|
||||
/>
|
||||
<Route path="/match/:id/auction" element={<AuctionPage />} />
|
||||
<Route path="/users/:userId/history" element={<UserHistoryPage />} />
|
||||
<Route
|
||||
path="/communities/:cid/internal-stats"
|
||||
element={<CommunityInternalStatsPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/communities/:cid/internal-stats/match/:matchId"
|
||||
element={<InternalMatchDetailPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/matches"
|
||||
element={<MatchAdminPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/tournament-codes"
|
||||
element={<TournamentCodesPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/legacy-import"
|
||||
element={<LegacyImportPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/legacy-matches"
|
||||
element={<LegacyMatchesPage />}
|
||||
/>
|
||||
</Routes>
|
||||
<div className="flex-1">
|
||||
<Routes>
|
||||
<Route path="/" element={<HomePage />} />
|
||||
<Route path="/login" element={<LoginPage />} />
|
||||
<Route path="/auth/callback" element={<AuthCallbackPage />} />
|
||||
<Route path="/match/:id" element={<MatchDetailPage />} />
|
||||
<Route
|
||||
path="/match/:id/game/:gameNumber"
|
||||
element={<MatchGameDetailPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/match/:id/team/:teamIndex"
|
||||
element={<MatchTeamProgressPage />}
|
||||
/>
|
||||
<Route path="/match/:id/auction" element={<AuctionPage />} />
|
||||
<Route path="/users/:userId/history" element={<UserHistoryPage />} />
|
||||
<Route
|
||||
path="/communities/:cid/internal-stats"
|
||||
element={<CommunityInternalStatsPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/communities/:cid/internal-stats/match/:matchId"
|
||||
element={<InternalMatchDetailPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/matches"
|
||||
element={<MatchAdminPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/tournament-codes"
|
||||
element={<TournamentCodesPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/legacy-import"
|
||||
element={<LegacyImportPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/admin/communities/:cid/legacy-matches"
|
||||
element={<LegacyMatchesPage />}
|
||||
/>
|
||||
<Route
|
||||
path="/terms"
|
||||
element={
|
||||
<LegalPage title="서비스 이용약관">
|
||||
<p>
|
||||
This service is provided for community tournament support,
|
||||
including match scheduling, participation management, team
|
||||
organization, and related statistics.
|
||||
</p>
|
||||
<p>
|
||||
By using this service, users agree not to interfere with
|
||||
service operation, misuse community data, or submit content
|
||||
that violates applicable laws or community rules.
|
||||
</p>
|
||||
</LegalPage>
|
||||
}
|
||||
/>
|
||||
<Route
|
||||
path="/privacy"
|
||||
element={
|
||||
<LegalPage title="개인정보처리방침">
|
||||
<p>
|
||||
This service processes account, profile, match
|
||||
participation, team, and authentication data only as needed
|
||||
to operate community tournament features.
|
||||
</p>
|
||||
<p>
|
||||
Users may request access, correction, or deletion of their
|
||||
personal data through the service administrator, subject to
|
||||
records that must be retained for service integrity or legal
|
||||
obligations.
|
||||
</p>
|
||||
</LegalPage>
|
||||
}
|
||||
/>
|
||||
</Routes>
|
||||
</div>
|
||||
<AppFooter />
|
||||
<DevAuthSwitcher />
|
||||
</div>
|
||||
</BrowserRouter>
|
||||
|
||||
Loaded 100 of 140 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user