Compare commits

...
64 Commits
Author SHA1 Message Date
dahyeon 8aff1be225 fix: align home page loading states 2026-06-09 19:13:34 -07:00
dahyeon bb336391ff docs: make readme demo loop 2026-06-09 06:28:15 -07:00
dahyeon 3f4ddead72 docs: update release readme media 2026-06-09 06:25:41 -07:00
dahyeon 168e0eca66 docs: refresh readme for release 77 2026-06-09 06:17:45 -07:00
dahyeon e7eaa4f67d fix(web): stack mobile tier badges 2026-06-09 04:51:37 -07:00
dahyeon ad9bf93b52 fix(web): increase light mode text contrast 2026-06-09 04:48:18 -07:00
dahyeon 774707de65 fix(web): enlarge desktop position text 2026-06-09 04:03:00 -07:00
dahyeon e28a2646bf fix(web): add slight tier badge spacing 2026-06-09 04:01:37 -07:00
dahyeon 2916333d71 fix(web): align tier queue columns 2026-06-09 03:59:53 -07:00
dahyeon d3d5f2b348 fix(web): prevent logout button overflow 2026-06-09 03:54:11 -07:00
dahyeon 4657cd453c fix(web): scale match participant icons with text 2026-06-09 03:38:13 -07:00
dahyeon 577ce45b64 fix(web): align header and match badges with brand styling 2026-06-09 03:37:11 -07:00
dahyeon ee3e5935d6 fix(web): stabilize recruiting mobile participant list 2026-06-09 03:17:49 -07:00
dahyeon 5ba68ea134 fix(web): improve compact UI readability 2026-06-09 03:12:00 -07:00
dahyeon 12869a7e9e fix(web): stabilize participant filter table 2026-06-08 23:10:39 -07:00
dahyeon d10e2ab011 fix(web): keep history table shell during loading 2026-06-08 22:48:16 -07:00
dahyeon 170e42098a fix(web): stabilize history table columns 2026-06-08 22:32:22 -07:00
dahyeon fe7a482969 fix(web): localize history pagination loading 2026-06-08 22:24:20 -07:00
dahyeon aa07ec0304 feat(api): add dakao schedule links 2026-06-08 21:44:28 -07:00
dahyeon cd5a82aa93 fix(web): refine mobile history cards 2026-06-08 05:39:22 -07:00
dahyeon 7a62e52d60 fix(web): improve mobile team layout 2026-06-08 05:24:14 -07:00
dahyeon 6fc58fec1d feat(web): add legal footer 2026-06-08 04:50:29 -07:00
dahyeon f586542dc3 fix(web): split home matches by schedule 2026-06-08 04:44:12 -07:00
dahyeon 6697cd8ea1 feat(api): add dakao primary account command 2026-06-08 03:29:55 -07:00
dahyeon c435e8a6a5 fix(web): stabilize match tier queue alignment 2026-06-08 02:32:11 -07:00
dahyeon 15ae680ec7 fix(web): bind dark utilities to theme toggle 2026-06-08 02:25:59 -07:00
dahyeon bdea0287a5 refactor(web): centralize rank badge display 2026-06-08 02:20:34 -07:00
dahyeon b56728f843 fix(web): align match team table columns 2026-06-08 02:07:56 -07:00
dahyeon 7f2b34fd4b fix(web): stabilize layout when scrollbar changes 2026-06-08 02:02:03 -07:00
dahyeon 146349beb8 fix(web): tone down login link 2026-06-08 01:49:20 -07:00
dahyeon 326e0c66b6 feat(web): add persistent theme toggle 2026-06-08 01:46:59 -07:00
dahyeon edfb960e97 fix(web): highlight shared current peak tier 2026-06-08 01:41:23 -07:00
dahyeon b2d438785b fix(web): pad compact tier chart domain 2026-06-08 01:34:09 -07:00
dahyeon b6dad78d02 fix(web): add adaptive compact tier guides 2026-06-08 01:28:10 -07:00
dahyeon 42d4854f9c fix(web): center compact tier chart labels 2026-06-08 01:15:55 -07:00
dahyeon e9081d77c9 fix(web): keep auction tier labels inside chart 2026-06-08 01:07:39 -07:00
dahyeon 181beb85e5 refactor(web): simplify auction tier chart 2026-06-08 01:02:52 -07:00
dahyeon ebca348723 feat: show tier history in auction spotlight 2026-06-08 00:34:04 -07:00
dahyeon de8bc87940 fix: unify riot refresh rate gating 2026-06-07 11:11:12 -07:00
dahyeon 25f3ccad57 fix: delete acknowledged riot job stream entries 2026-06-07 10:13:29 -07:00
dahyeon 55ab5b27dc chore: update Cloudflare Pages deploy branch handling 2026-06-07 09:54:10 -07:00
dahyeon 1c0af891fa feat: run Riot background refresh by default 2026-06-07 09:51:51 -07:00
dahyeon 528744ebf6 fix: accept Riot league entries without leagueId 2026-06-07 09:51:37 -07:00
dahyeon bd52160d91 fix(web): resolve recharts vite interop 2026-06-07 09:01:02 -07:00
dahyeon c3a3eb46dd feat(web): add tier history chart 2026-06-07 08:11:43 -07:00
dahyeon be5383a2e9 fix(riot): persist refreshed tier state 2026-06-07 07:59:11 -07:00
dahyeon ef693fcf4a feat(auction): cancel active auction 2026-06-07 07:44:59 -07:00
dahyeon 8a9dd37755 chore(release): bump build number to 68 2026-06-07 07:44:32 -07:00
dahyeon 5ad0f8a1c2 feat: add auction chat 2026-06-07 07:20:35 -07:00
dahyeon c4f19d256d fix: refresh riot tiers from history jobs 2026-06-07 07:16:31 -07:00
dahyeon ad84bf1f89 feat(web): show participant position counts 2026-06-07 07:07:48 -07:00
dahyeon b711c63dcd fix(api): keep zero-bid auction passes open 2026-06-07 07:01:01 -07:00
dahyeon 6a192276e8 feat(admin): manage match participants 2026-06-07 06:51:35 -07:00
dahyeon 994a9fcad0 feat(web): filter match participants 2026-06-07 06:28:11 -07:00
dahyeon 2dae3c7cae chore(web): add start scripts for modes 2026-06-07 06:27:51 -07:00
dahyeon a896342429 chore(web): limit upcoming match cards 2026-06-07 06:03:30 -07:00
dahyeon 7b636ee793 fix: preserve dakao result subjects on outbox retry 2026-06-07 05:57:44 -07:00
dahyeon e63fba0286 feat: include dakao send result subjects 2026-06-07 05:30:53 -07:00
dahyeon 245a096606 chore(web): hide api live indicator 2026-06-07 05:00:20 -07:00
dahyeon 6e0afe84cd chore(deploy): add build number release flow 2026-06-07 04:54:08 -07:00
dahyeon 6accb4b166 chore(api): allow pages dev cors origins 2026-06-07 01:26:07 -07:00
dahyeon f3d05004ce chore(env): update staging api origin 2026-06-07 01:24:21 -07:00
dahyeon eadae789c8 chore(env): rename test environment to staging 2026-06-07 01:01:13 -07:00
dahyeon d0d578b2b0 feat(dakao): add jetstream outbox delivery flow 2026-06-07 00:35:18 -07:00
104 changed files with 8845 additions and 1432 deletions

No files matched your search

+1
View File
@@ -0,0 +1 @@
77
+480
View File
@@ -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!
+92 -41
View File
@@ -1,56 +1,89 @@
# LOLYMPUS
![LOLYMPUS match list](docs/screenshots/lolympus-match-list.png)
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
## 워크플로우
![LOLYMPUS match detail](docs/screenshots/lolympus-match-detail.png)
1. **내전 개설과 모집**
내전 일정, 진행 방식, 정원, 공지사항을 등록하고 참가 신청 현황을 확인합니다.
### Team progress
2. **참가자 정보 확인**
Riot 계정 기반으로 소환사명, 태그, 프로필 아이콘, 솔로랭크/자유랭크 티어, 선호 포지션을 보여줍니다.
![LOLYMPUS team progress](docs/screenshots/lolympus-team-progress.png)
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
View File
@@ -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.
+2 -2
View File
@@ -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",
+67
View File
@@ -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);
});
});
+101
View File
@@ -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
View File
@@ -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 = {
@@ -348,7 +531,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 +566,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 +640,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 () => {
+66 -48
View File
@@ -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,
@@ -26,6 +28,9 @@ import { TournamentResultService } from '../tournament-result/tournament-result.
const AUCTION_MAX_TEAM_SIZE = 5;
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 +59,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 +174,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 +234,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;
@@ -345,9 +383,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 +405,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 +633,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,
@@ -903,6 +920,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(),
@@ -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,
+15 -6
View File
@@ -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',
);
});
});
+39 -55
View File
@@ -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: '스타',
});
});
});
+109 -31
View File
@@ -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,
]);
}
}
+17 -8
View File
@@ -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.
@@ -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 {
@@ -508,6 +593,7 @@ export interface AuctionPlayerSnapshot {
profileIconId: number;
preferredPositions: PositionPreference[];
tiers: TierInfo[];
tierHistory: TierHistoryEntry[];
masteries: ChampionMasteryEntry[];
recentStatsSummary?: RiotRecentStatsSummary;
passCount: number;
@@ -533,6 +619,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 +644,7 @@ export interface Auction extends MongooseTimestamps {
initialPoints: number;
topTierThreshold: AuctionTopTierThreshold;
manualTopTierUserIds: mongoose.Types.ObjectId[];
chatMessages: AuctionChatMessage[];
startedAt?: Date;
completedAt?: Date;
}
@@ -844,6 +939,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: {
@@ -1341,6 +1532,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 +1581,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 +1638,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 +1731,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 +1775,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,
@@ -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;
@@ -173,6 +173,14 @@ export class UpdateMatchDto {
schedule?: MatchScheduleItemDto[];
}
export class UpdateParticipantDto {
@IsEnum(POSITIONS)
mainPosition!: Position;
@IsEnum(POSITIONS)
subPosition!: Position;
}
export class JoinMatchDto {
@IsArray()
@ArrayMinSize(1)
+70 -4
View File
@@ -27,6 +27,7 @@ import {
CreateMatchDto,
JoinMatchDto,
UpdateMatchDto,
UpdateParticipantDto,
} from './dto/create-match.dto';
import { MatchService } from './match.service';
@@ -71,16 +72,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 +149,49 @@ export class MatchController {
});
}
// 관리자 전용 — 참가자 주/부 포지션 변경.
@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 +222,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,135 @@ 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,
};
}
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('clears game schedule when a built match returns to recruiting', async () => {
const communityId = new mongoose.Types.ObjectId();
const match = {
+184 -9
View File
@@ -13,6 +13,7 @@ import {
MatchDocument,
MatchSeriesResult,
MatchStatus,
Position,
PositionPreference,
TierInfo,
} from '../global/database/schema';
@@ -22,6 +23,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,6 +42,23 @@ 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 {
@@ -54,6 +74,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 +120,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;
@@ -276,6 +333,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 +436,44 @@ export class MatchService {
};
}
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.`);
@@ -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,
+1 -1
View File
@@ -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;
+1 -1
View File
@@ -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
View File
@@ -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 -2
View File
@@ -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": {
+178 -66
View File
@@ -1,22 +1,24 @@
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 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 +26,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 +38,187 @@ 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/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>
+57 -2
View File
@@ -50,6 +50,11 @@ const DDRAGON_MANIFEST_STALE_MS = 24 * 60 * 60 * 1000;
interface MatchesQueryOptions {
status?: MatchStatus;
limit?: number;
page?: number;
offset?: number;
scheduledFrom?: string;
scheduledTo?: string;
sort?: 'asc' | 'desc';
}
export interface UserHistoryFilters {
@@ -74,6 +79,11 @@ function createMatchesPath(
const searchParams = new URLSearchParams();
if (options.status) searchParams.set('status', options.status);
if (options.limit) searchParams.set('limit', String(options.limit));
if (options.page) searchParams.set('page', String(options.page));
if (options.offset) searchParams.set('offset', String(options.offset));
if (options.scheduledFrom) searchParams.set('scheduledFrom', options.scheduledFrom);
if (options.scheduledTo) searchParams.set('scheduledTo', options.scheduledTo);
if (options.sort) searchParams.set('sort', options.sort);
const queryString = searchParams.toString();
return `/communities/${communityId}/matches${queryString ? `?${queryString}` : ''}`;
@@ -93,7 +103,17 @@ export function useMatches(
communityId = DEFAULT_COMMUNITY_ID,
) {
return useQuery({
queryKey: ['matches', communityId, options.status ?? null, options.limit ?? null],
queryKey: [
'matches',
communityId,
options.status ?? null,
options.limit ?? null,
options.page ?? null,
options.offset ?? null,
options.scheduledFrom ?? null,
options.scheduledTo ?? null,
options.sort ?? null,
],
queryFn: async () => {
const response = await apiFetch<MatchesResponse>(
createMatchesPath(communityId, options),
@@ -105,6 +125,31 @@ export function useMatches(
});
}
export function useMatchesPage(
options: MatchesQueryOptions,
communityId = DEFAULT_COMMUNITY_ID,
) {
return useQuery({
queryKey: [
'matches-page',
communityId,
options.status ?? null,
options.limit ?? null,
options.page ?? null,
options.offset ?? null,
options.scheduledFrom ?? null,
options.scheduledTo ?? null,
options.sort ?? null,
],
queryFn: () =>
apiFetch<MatchesResponse>(createMatchesPath(communityId, options), {
auth: 'none',
}),
enabled: Boolean(communityId),
placeholderData: (previousData) => previousData,
});
}
export function useMatch(matchId: string | undefined, communityId = DEFAULT_COMMUNITY_ID) {
return useQuery({
queryKey: ['match', communityId, matchId ?? null],
@@ -171,6 +216,15 @@ export function useUndoAuction(communityId = DEFAULT_COMMUNITY_ID) {
});
}
export function useResetAuction(communityId = DEFAULT_COMMUNITY_ID) {
return useMutation({
mutationFn: ({ matchId }: { matchId: string }) =>
apiFetch<void>(`/communities/${communityId}/matches/${matchId}/auction`, {
method: 'DELETE',
}),
});
}
export function useCreateMatch(communityId = DEFAULT_COMMUNITY_ID) {
return useMutation({
mutationFn: (body: MatchMutationRequest) =>
@@ -216,6 +270,7 @@ function createUserHistoryPath(
export function useUserHistoryProfile(
userId: string | undefined,
communityId = DEFAULT_COMMUNITY_ID,
enabled = true,
) {
return useQuery({
queryKey: ['user-history-profile', communityId, userId ?? null],
@@ -224,7 +279,7 @@ export function useUserHistoryProfile(
`/communities/${communityId}/users/${userId}/history-profile`,
{ auth: 'none' },
),
enabled: Boolean(communityId && userId),
enabled: enabled && Boolean(communityId && userId),
retry: false,
});
}
+5
View File
@@ -7,6 +7,7 @@ import type {
ApiPositionPreference,
ApiRiotLaneStats,
ApiRiotRecentStatsSummary,
ApiTierHistoryEntry,
ApiTierInfo,
MatchStatus,
Position,
@@ -91,6 +92,7 @@ export interface AuctionPlayerView extends ParticipantView {
level: number;
points: number;
}[];
tierHistory: ApiTierHistoryEntry[];
recentStats: {
overall: ApiRiotLaneStats;
byLane: Partial<Record<RiotLane, ApiRiotLaneStats>>;
@@ -236,6 +238,7 @@ function mapAuctionPlayerToView(
summonerName: player.gameName,
tag: player.tagLine,
tier: selectPrimaryTier(player.tiers),
tierHistory: player.tierHistory ?? [],
mainPosition,
subPosition,
profileIconId: player.profileIconId,
@@ -288,12 +291,14 @@ function mapAuctionTeamToView(
...participant,
passCount: 0,
masteries: [],
tierHistory: [],
recentStats: createEmptyRecentStatsView(),
}
: {
...createFallbackParticipant(member.userId),
passCount: 0,
masteries: [],
tierHistory: [],
recentStats: createEmptyRecentStatsView(),
});
+26 -1
View File
@@ -78,7 +78,7 @@ export interface ApiRiotAccount {
summonerLevel: number;
isPrimary: boolean;
tiers: ApiTierInfo[];
tierHistory: unknown[];
tierHistory: ApiTierHistoryEntry[];
matchIds: string[];
championMasteries: ApiChampionMasteryEntry[];
championRecords: Record<string, Record<string, unknown>>;
@@ -247,6 +247,7 @@ export interface ApiAuctionPlayerSnapshot {
profileIconId: number;
preferredPositions: ApiPositionPreference[];
tiers: ApiTierInfo[];
tierHistory: ApiTierHistoryEntry[];
masteries: ApiChampionMasteryEntry[];
recentStatsSummary?: ApiRiotRecentStatsSummary;
passCount: number;
@@ -272,6 +273,14 @@ export interface ApiAuctionBid {
timestamp: string;
}
export interface ApiAuctionChatMessage {
id: string;
userId?: string;
displayName: string;
message: string;
sentAt: string;
}
export interface ApiAuction {
_id: string;
matchId: string;
@@ -290,6 +299,7 @@ export interface ApiAuction {
initialPoints: number;
topTierThreshold: AuctionTopTierThreshold;
manualTopTierUserIds: string[];
chatMessages?: ApiAuctionChatMessage[];
startedAt?: string;
completedAt?: string;
createdAt: string;
@@ -330,6 +340,9 @@ export interface MeResponse {
export interface MatchesResponse {
matches: ApiMatch[];
total: number;
page: number;
limit: number;
}
export interface MatchMutationRequest {
@@ -451,11 +464,23 @@ export interface ApiUserHistoryProfile {
profileIconId: number;
summonerLevel: number;
tiers: ApiTierInfo[];
tierHistory: ApiTierHistoryEntry[];
season: ApiHistorySeason;
seasons: ApiHistorySeason[];
lastFetchedAt: string | null;
}
export interface ApiTierHistoryEntry {
queueType: string;
tier: string;
rank?: string;
leaguePoints?: number;
wins?: number;
losses?: number;
recordedAt: string;
season?: string;
}
export interface ApiChampionStatsRow {
championId: number;
games: number;
+63 -5
View File
@@ -2,7 +2,7 @@ import { useEffect, useRef, useState } from 'react';
import { io, type Socket } from 'socket.io-client';
import { API_BASE_URL, useAuthUserId } from '../config';
import { acquireAccessToken } from '../lib/auth/token-provider';
import type { ApiAuction, Position } from './types';
import type { ApiAuction, ApiAuctionChatMessage, Position } from './types';
type ConnectionStatus =
| 'idle'
@@ -17,18 +17,47 @@ interface BidPayload {
bidderUserId?: string;
}
interface ChatMessagePayload {
displayName?: string;
message: string;
}
interface ChatHistoryPayload {
messages?: ApiAuctionChatMessage[];
}
interface ResetPayload {
matchId?: string;
}
const MAX_CHAT_MESSAGES = 200;
function mergeChatMessages(
current: ApiAuctionChatMessage[],
incoming: ApiAuctionChatMessage[],
) {
const byId = new Map(current.map((message) => [message.id, message]));
for (const message of incoming) {
byId.set(message.id, message);
}
return [...byId.values()]
.sort((left, right) => Date.parse(left.sentAt) - Date.parse(right.sentAt))
.slice(-MAX_CHAT_MESSAGES);
}
export function useAuctionSocket(matchId: string | undefined) {
const authUserId = useAuthUserId();
const socketRef = useRef<Socket | null>(null);
const [auction, setAuction] = useState<ApiAuction | null>(null);
const [chatMessages, setChatMessages] = useState<ApiAuctionChatMessage[]>([]);
const [resetAt, setResetAt] = useState<number | null>(null);
const [connectionStatus, setConnectionStatus] =
useState<ConnectionStatus>('idle');
const [error, setError] = useState<string | null>(null);
useEffect(() => {
if (!matchId) {
setAuction(null);
setConnectionStatus('idle');
return;
}
@@ -65,9 +94,28 @@ export function useAuctionSocket(matchId: string | undefined) {
socket.on('state', (nextAuction: ApiAuction) => {
setAuction(nextAuction);
if (nextAuction.chatMessages) {
setChatMessages(mergeChatMessages([], nextAuction.chatMessages));
}
setError(null);
});
socket.on('chat-history', (payload: ChatHistoryPayload) => {
setChatMessages(mergeChatMessages([], payload.messages ?? []));
});
socket.on('chat-message', (message: ApiAuctionChatMessage) => {
setChatMessages((current) => mergeChatMessages(current, [message]));
});
socket.on('reset', (payload: ResetPayload) => {
if (payload.matchId && payload.matchId !== matchId) return;
setAuction(null);
setChatMessages([]);
setResetAt(Date.now());
setError('경매가 취소되었습니다.');
});
socket.on('error', (payload: { message?: string }) => {
setConnectionStatus('error');
setError(payload.message ?? '실시간 경매 연결 중 오류가 발생했습니다.');
@@ -101,9 +149,16 @@ export function useAuctionSocket(matchId: string | undefined) {
socket.emit(eventName, payload);
}
const visibleAuction = auction?.matchId === matchId ? auction : null;
const visibleConnectionStatus: ConnectionStatus = matchId
? connectionStatus
: 'idle';
return {
auction,
connectionStatus,
auction: visibleAuction,
chatMessages: visibleAuction ? chatMessages : [],
resetAt,
connectionStatus: visibleConnectionStatus,
error,
placeBid(payload: BidPayload) {
emit('bid', payload);
@@ -117,5 +172,8 @@ export function useAuctionSocket(matchId: string | undefined) {
next() {
emit('next', {});
},
sendChatMessage(payload: ChatMessagePayload) {
emit('chat-message', payload);
},
};
}
+3 -3
View File
@@ -22,10 +22,10 @@ export default function DevAuthSwitcher() {
return (
<div className="fixed right-4 bottom-4 z-50 w-72 border border-base-content/10 bg-base-100/95 backdrop-blur px-3 py-3 shadow-xl">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
Dev Auth
</div>
<div className="mt-2 text-[11px] text-base-content/45">
<div className="mt-2 text-xs text-base-content/45">
X-Auth-User-Id
</div>
<input
@@ -50,7 +50,7 @@ export default function DevAuthSwitcher() {
Clear
</button>
</div>
<div className="mt-2 text-[10px] text-base-content/35 break-all">
<div className="mt-2 text-xs text-base-content/35 break-all">
현재값: {authUserId ?? '없음'}
</div>
</div>
+122
View File
@@ -0,0 +1,122 @@
import type { ApiTierInfo } from "../api/types";
type RankBadgeSize = "sm" | "md";
type RankBadgeTooltipPlacement = "left" | "bottom";
const TIER_NAMES: Record<string, string> = {
IRON: "아이언",
BRONZE: "브론즈",
SILVER: "실버",
GOLD: "골드",
PLATINUM: "플래티넘",
EMERALD: "에메랄드",
DIAMOND: "다이아몬드",
MASTER: "마스터",
GRANDMASTER: "그랜드마스터",
CHALLENGER: "챌린저",
};
const SIZE_CLASSES: Record<RankBadgeSize, string> = {
sm: "h-[17px] min-w-[18px]",
md: "h-[18px] min-w-[20px]",
};
const TOOLTIP_CLASSES: Record<RankBadgeTooltipPlacement, string> = {
left: "tooltip-left",
bottom: "tooltip-bottom",
};
function normalizeRank(rank: string | undefined) {
switch (rank) {
case "I":
return "1";
case "II":
return "2";
case "III":
return "3";
case "IV":
return "4";
default:
return rank;
}
}
function rankBadgeClass(tier: ApiTierInfo | undefined) {
switch (tier?.tier) {
case "CHALLENGER":
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
case "GRANDMASTER":
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
case "MASTER":
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
case "DIAMOND":
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
case "EMERALD":
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
case "PLATINUM":
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
case "GOLD":
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
case "SILVER":
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
case "BRONZE":
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
case "IRON":
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
default:
return "border-base-content/30 bg-transparent text-base-content/50";
}
}
export function formatRankBadge(tier: ApiTierInfo | undefined) {
if (!tier) return "U";
const tierInitial =
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
const rank = normalizeRank(tier.rank);
return rank ? `${tierInitial}${rank}` : tierInitial;
}
export function formatRankDetail(tier: ApiTierInfo | undefined) {
if (!tier) return "랭크 정보 없음";
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
const rank = normalizeRank(tier.rank);
const label = rank ? `${tierName} ${rank}` : tierName;
return `${label} - ${tier.leaguePoints} LP`;
}
export function RankBadge({
tier,
size = "md",
tooltipPlacement = "bottom",
}: {
tier?: ApiTierInfo;
size?: RankBadgeSize;
tooltipPlacement?: RankBadgeTooltipPlacement;
}) {
const tooltip = formatRankDetail(tier);
return (
<span
className={`tooltip ${TOOLTIP_CLASSES[tooltipPlacement]}`}
data-tip={tooltip}
>
<span
className={`inline-flex ${SIZE_CLASSES[size]} shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-xs font-black leading-none ${rankBadgeClass(tier)}`}
aria-label={tooltip}
>
{formatRankBadge(tier)}
</span>
</span>
);
}
export function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
return (
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
<RankBadge tier={tier} />
<span className="hidden font-bold text-base-content/55 sm:inline">
{formatRankDetail(tier)}
</span>
</span>
);
}
@@ -0,0 +1,597 @@
import { useMemo, useState } from "react";
import {
CartesianGrid,
Line,
LineChart,
ReferenceDot,
ReferenceLine,
ResponsiveContainer,
Tooltip,
XAxis,
YAxis,
} from "recharts";
import type { ApiTierHistoryEntry } from "../api/types";
const TIER_NAMES: Record<string, string> = {
IRON: "아이언",
BRONZE: "브론즈",
SILVER: "실버",
GOLD: "골드",
PLATINUM: "플래티넘",
EMERALD: "에메랄드",
DIAMOND: "다이아몬드",
MASTER: "마스터",
GRANDMASTER: "그랜드마스터",
CHALLENGER: "챌린저",
};
// 낮은 티어 → 높은 티어. 인덱스가 사다리값의 기준이 된다.
const TIER_ORDER = [
"IRON",
"BRONZE",
"SILVER",
"GOLD",
"PLATINUM",
"EMERALD",
"DIAMOND",
"MASTER",
"GRANDMASTER",
"CHALLENGER",
];
const APEX_TIERS = new Set(["MASTER", "GRANDMASTER", "CHALLENGER"]);
// 한 티어 = 400, 한 디비전(랭크) = 100, LP는 그대로 더한다.
const TIER_SPAN = 400;
const RANK_SPAN = 100;
const RANK_INDEX: Record<string, number> = { IV: 0, III: 1, II: 2, I: 3 };
const RANK_BY_INDEX = ["IV", "III", "II", "I"];
const QUEUE_LABELS: Record<string, string> = {
RANKED_SOLO_5x5: "솔로랭크",
RANKED_FLEX_SR: "자유랭크",
};
const TIER_COMPACT_NAMES: Record<string, string> = {
IRON: "I",
BRONZE: "B",
SILVER: "S",
GOLD: "G",
PLATINUM: "P",
EMERALD: "E",
DIAMOND: "D",
MASTER: "M",
GRANDMASTER: "GM",
CHALLENGER: "C",
};
type PeriodKey = "30" | "90" | "all";
type SummaryVariant = "footer" | "inline";
type SummaryDirection = "up" | "down" | "flat";
const PERIOD_OPTIONS: { key: PeriodKey; label: string; days: number | null }[] =
[
{ key: "30", label: "최근 30일", days: 30 },
{ key: "90", label: "최근 90일", days: 90 },
{ key: "all", label: "전체", days: null },
];
function tierIndex(tier: string) {
const index = TIER_ORDER.indexOf(tier);
return index === -1 ? 0 : index;
}
// 티어/랭크/LP를 단일 연속 스칼라(사다리값)로 환산한다.
function ladderValue(entry: {
tier: string;
rank?: string;
leaguePoints?: number;
}) {
const base = tierIndex(entry.tier) * TIER_SPAN;
const lp = entry.leaguePoints ?? 0;
if (APEX_TIERS.has(entry.tier)) {
return base + lp;
}
const rankIdx = RANK_INDEX[entry.rank ?? "IV"] ?? 0;
return base + rankIdx * RANK_SPAN + lp;
}
function normalizeRank(rank: string | undefined) {
switch (rank) {
case "I":
return "1";
case "II":
return "2";
case "III":
return "3";
case "IV":
return "4";
default:
return rank ?? "";
}
}
function formatTierLabel(entry: {
tier: string;
rank?: string;
leaguePoints?: number;
}) {
const name = TIER_NAMES[entry.tier] ?? entry.tier;
if (APEX_TIERS.has(entry.tier)) {
return `${name} ${entry.leaguePoints ?? 0}LP`;
}
const rank = normalizeRank(entry.rank);
return `${name}${rank ? ` ${rank}` : ""} · ${entry.leaguePoints ?? 0}LP`;
}
function formatTierCompactLabel(entry: {
tier: string;
rank?: string;
leaguePoints?: number;
}) {
const tier = TIER_COMPACT_NAMES[entry.tier] ?? entry.tier;
const lp = entry.leaguePoints ?? 0;
if (APEX_TIERS.has(entry.tier)) {
return `${tier} ${lp}LP`;
}
const rank = normalizeRank(entry.rank);
return `${tier}${rank} ${lp}LP`;
}
function formatTierShort(tier: string) {
return TIER_NAMES[tier] ?? tier;
}
function formatPeriodChange(summary: {
first: ChartPoint;
last: ChartPoint;
direction: SummaryDirection;
}) {
const marker =
summary.direction === "up"
? "▲"
: summary.direction === "down"
? "▼"
: "·";
return `${formatTierShort(summary.first.tier)} ${marker} ${formatTierShort(summary.last.tier)}`;
}
function formatDate(ms: number) {
return new Intl.DateTimeFormat("ko-KR", {
month: "numeric",
day: "numeric",
}).format(new Date(ms));
}
type ChartPoint = {
ts: number;
value: number;
tier: string;
rank?: string;
leaguePoints?: number;
wins?: number;
losses?: number;
};
type YGuide = {
value: number;
label: string;
};
function isSamePoint(left: ChartPoint, right: ChartPoint) {
return left.ts === right.ts && left.value === right.value;
}
function nearestApexPoint(value: number, points: ChartPoint[]) {
const apexPoints = points.filter((point) => APEX_TIERS.has(point.tier));
if (apexPoints.length === 0) return null;
return apexPoints.reduce((best, point) =>
Math.abs(point.value - value) < Math.abs(best.value - value) ? point : best,
);
}
function compactEntryFromLadderValue(value: number, points: ChartPoint[]) {
const rounded = Math.max(0, Math.round(value));
const masterBase = tierIndex("MASTER") * TIER_SPAN;
if (rounded >= masterBase) {
const apexPoint = nearestApexPoint(rounded, points);
const apexTier = apexPoint?.tier ?? "MASTER";
const apexBase = tierIndex(apexTier) * TIER_SPAN;
if (rounded >= apexBase) {
return {
tier: apexTier,
leaguePoints: rounded - apexBase,
};
}
return {
tier: "MASTER",
leaguePoints: rounded - masterBase,
};
}
const tierIdx = Math.min(
TIER_ORDER.length - 1,
Math.floor(rounded / TIER_SPAN),
);
const tier = TIER_ORDER[tierIdx];
const withinTier = rounded - tierIdx * TIER_SPAN;
const rankIdx = Math.min(3, Math.floor(withinTier / RANK_SPAN));
return {
tier,
rank: RANK_BY_INDEX[rankIdx],
leaguePoints: withinTier - rankIdx * RANK_SPAN,
};
}
function buildAdaptiveYGuides(points: ChartPoint[]): YGuide[] {
if (points.length === 0) return [];
const min = Math.min(...points.map((point) => point.value));
const max = Math.max(...points.map((point) => point.value));
const paddedMin = min - 60;
const paddedMax = max + 60;
const steps = [50, 100, 200, 400, 800, 1200];
for (const step of steps) {
const start = Math.ceil(paddedMin / step) * step;
const end = Math.floor(paddedMax / step) * step;
const count = Math.floor((end - start) / step) + 1;
if (count >= 2 && count <= 4) {
return Array.from({ length: count }, (_, index) => {
const value = start + index * step;
return {
value,
label: formatTierCompactLabel(
compactEntryFromLadderValue(value, points),
),
};
});
}
}
const center = Math.round(((min + max) / 2) / 50) * 50;
return [center - 50, center + 50].map((value) => ({
value,
label: formatTierCompactLabel(compactEntryFromLadderValue(value, points)),
}));
}
function TierTooltip({
active,
payload,
}: {
active?: boolean;
payload?: Array<{ payload: ChartPoint }>;
}) {
if (!active || !payload?.length) return null;
const point = payload[0].payload;
const games =
point.wins !== undefined && point.losses !== undefined
? ` · ${point.wins}승 ${point.losses}패`
: "";
return (
<div className="border border-base-content/15 bg-base-100 px-3 py-2 text-xs shadow-lg">
<div className="font-bold text-base-content">{formatTierLabel(point)}</div>
<div className="mt-0.5 text-base-content/45">
{new Intl.DateTimeFormat("ko-KR", {
year: "numeric",
month: "long",
day: "numeric",
}).format(new Date(point.ts))}
{games}
</div>
</div>
);
}
export default function TierHistoryChart({
entries,
className = "border border-base-content/10 bg-base-100 mb-5 overflow-hidden",
summaryVariant = "footer",
height = 220,
showHeader = true,
}: {
entries: ApiTierHistoryEntry[];
className?: string;
summaryVariant?: SummaryVariant;
height?: number;
showHeader?: boolean;
}) {
// 데이터에 존재하는 큐 목록 (솔로 우선)
const availableQueues = useMemo(() => {
const queues = new Set(entries.map((entry) => entry.queueType));
return ["RANKED_SOLO_5x5", "RANKED_FLEX_SR"].filter((queue) =>
queues.has(queue),
);
}, [entries]);
const [queue, setQueue] = useState(
availableQueues[0] ?? "RANKED_SOLO_5x5",
);
const [period, setPeriod] = useState<PeriodKey>("all");
const activeQueue = availableQueues.includes(queue)
? queue
: (availableQueues[0] ?? "RANKED_SOLO_5x5");
const points = useMemo<ChartPoint[]>(() => {
const periodDays =
PERIOD_OPTIONS.find((option) => option.key === period)?.days ?? null;
const cutoff =
periodDays === null ? 0 : Date.now() - periodDays * 24 * 60 * 60 * 1000;
return entries
.filter((entry) => entry.queueType === activeQueue)
.map((entry) => ({
ts: new Date(entry.recordedAt).getTime(),
value: ladderValue(entry),
tier: entry.tier,
rank: entry.rank,
leaguePoints: entry.leaguePoints,
wins: entry.wins,
losses: entry.losses,
}))
.filter((point) => point.ts >= cutoff)
.sort((left, right) => left.ts - right.ts);
}, [entries, activeQueue, period]);
// 티어 경계(가로 점선) 후보 — 데이터 범위 안에 드는 티어 floor만.
const tierLines = useMemo(() => {
if (points.length === 0) return [];
const min = Math.min(...points.map((point) => point.value));
const max = Math.max(...points.map((point) => point.value));
return TIER_ORDER.map((tier, index) => ({
tier,
value: index * TIER_SPAN,
})).filter((line) => line.value >= min - TIER_SPAN && line.value <= max);
}, [points]);
const adaptiveYGuides = useMemo(() => {
return summaryVariant === "inline" ? buildAdaptiveYGuides(points) : [];
}, [points, summaryVariant]);
const summary = useMemo(() => {
if (points.length === 0) return null;
const first = points[0];
const last = points[points.length - 1];
const peak = points.reduce((best, point) =>
point.value > best.value ? point : best,
);
const direction: SummaryDirection =
last.value > first.value
? "up"
: last.value < first.value
? "down"
: "flat";
return { first, last, peak, direction };
}, [points]);
const xDomain = useMemo(() => {
if (summaryVariant !== "inline" || points.length < 2) {
return ["dataMin", "dataMax"] as const;
}
const min = points[0].ts;
const max = points[points.length - 1].ts;
const span = Math.max(1, max - min);
const padding = Math.max(span * 0.18, 24 * 60 * 60 * 1000);
return [min - padding, max + padding] as const;
}, [points, summaryVariant]);
const header = (
<div className="flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10 bg-base-200/40 px-4 py-2.5">
<h2 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
티어 변동
</h2>
<div className="flex items-center gap-1.5">
{availableQueues.length > 1 &&
availableQueues.map((option) => (
<button
key={option}
type="button"
onClick={() => setQueue(option)}
className={`h-7 px-2 text-xs font-semibold border transition-colors ${
activeQueue === option
? "border-primary/30 bg-primary/5 text-primary"
: "border-base-content/10 text-base-content/40 hover:text-base-content/70"
}`}
>
{QUEUE_LABELS[option] ?? option}
</button>
))}
<select
className="h-7 border border-base-content/10 bg-base-100 px-2 text-xs text-base-content focus:border-primary/30 focus:outline-none"
value={period}
onChange={(event) => setPeriod(event.target.value as PeriodKey)}
>
{PERIOD_OPTIONS.map((option) => (
<option key={option.key} value={option.key}>
{option.label}
</option>
))}
</select>
</div>
</div>
);
return (
<section className={className}>
{showHeader && header}
{points.length < 2 ? (
<div className="px-4 py-10 text-center text-xs text-base-content/35">
티어 변동 기록이 아직 부족해요.
<br />
정보를 갱신할수록 변화가 쌓여 그래프로 보여드릴게요.
</div>
) : (
<>
<div className="relative px-2 pt-4 pb-1">
<ResponsiveContainer width="100%" height={height}>
<LineChart
data={points}
margin={{
top: summaryVariant === "inline" ? 18 : 8,
right: summaryVariant === "inline" ? 20 : 16,
bottom: 4,
left: summaryVariant === "inline" ? 12 : 4,
}}
>
<CartesianGrid
strokeDasharray="3 3"
stroke="currentColor"
className="text-base-content/5"
vertical={false}
/>
{summaryVariant === "inline"
? adaptiveYGuides.map((guide) => (
<ReferenceLine
key={`${guide.value}-${guide.label}`}
y={guide.value}
stroke="currentColor"
className="text-base-content/12"
strokeDasharray="2 4"
label={{
value: guide.label,
position: "insideLeft",
fill: "currentColor",
fontSize: 10,
className: "text-base-content/35",
}}
/>
))
: tierLines.map((line) => (
<ReferenceLine
key={line.tier}
y={line.value}
stroke="currentColor"
className="text-base-content/15"
strokeDasharray="2 4"
label={{
value: formatTierShort(line.tier),
position: "insideLeft",
fill: "currentColor",
fontSize: 10,
className: "text-base-content/35",
}}
/>
))}
<XAxis
dataKey="ts"
type="number"
scale="time"
domain={xDomain}
tickFormatter={formatDate}
tick={{ fontSize: 10, fill: "currentColor" }}
className="text-base-content/40"
stroke="currentColor"
minTickGap={28}
/>
<YAxis
type="number"
domain={["dataMin - 60", "dataMax + 60"]}
hide
/>
<Tooltip
content={<TierTooltip />}
cursor={{
stroke: "currentColor",
strokeDasharray: "3 3",
className: "text-base-content/20",
}}
/>
{summaryVariant === "inline" && summary && (
<>
{!isSamePoint(summary.peak, summary.last) && (
<ReferenceDot
x={summary.peak.ts}
y={summary.peak.value}
r={3}
stroke="currentColor"
fill="currentColor"
className="text-amber-400"
label={{
value: formatTierCompactLabel(summary.peak),
position: "top",
fill: "currentColor",
fontSize: 10,
className: "text-amber-400",
}}
/>
)}
<ReferenceDot
x={summary.last.ts}
y={summary.last.value}
r={3}
stroke="currentColor"
fill="currentColor"
className={
isSamePoint(summary.peak, summary.last)
? "text-amber-400"
: "text-primary"
}
label={{
value: formatTierCompactLabel(summary.last),
position: "top",
fill: "currentColor",
fontSize: 10,
className: isSamePoint(summary.peak, summary.last)
? "text-amber-400"
: "text-primary",
}}
/>
</>
)}
<Line
type="monotone"
dataKey="value"
stroke="currentColor"
className="text-primary"
strokeWidth={2}
dot={{ r: 2.5, className: "text-primary", fill: "currentColor" }}
activeDot={{ r: 4 }}
isAnimationActive={false}
/>
</LineChart>
</ResponsiveContainer>
</div>
{summary && summaryVariant === "footer" && (
<div className="flex flex-wrap items-center gap-x-5 gap-y-1 border-t border-base-content/8 px-4 py-2.5 text-xs">
<span className="text-base-content/45">
현재{" "}
<span className="font-bold text-base-content/75">
{formatTierLabel(summary.last)}
</span>
</span>
<span className="text-base-content/45">
최고{" "}
<span className="font-bold text-amber-400">
{formatTierLabel(summary.peak)}
</span>
</span>
<span className="text-base-content/45">
기간 변동{" "}
<span
className={`font-bold ${
summary.direction === "up"
? "text-green-500"
: summary.direction === "down"
? "text-red-400"
: "text-base-content/55"
}`}
>
{formatPeriodChange(summary)}
</span>
</span>
</div>
)}
</>
)}
</section>
);
}
+46
View File
@@ -3,8 +3,12 @@ import { useSyncExternalStore } from 'react';
const AUTH_USER_ID_STORAGE_KEY = 'lolympus.authUserId';
const DEV_CAPTAIN_TEAM_INDEX_STORAGE_KEY = 'lolympus.devCaptainTeamIndex';
const LEGACY_DEV_CAPTAIN_SIDE_STORAGE_KEY = 'lolympus.devCaptainSide';
const THEME_STORAGE_KEY = 'lolympus.theme';
const AUTH_USER_CHANGED_EVENT = 'lolympus:auth-user-changed';
const CAPTAIN_SIDE_CHANGED_EVENT = 'lolympus:captain-side-changed';
const THEME_CHANGED_EVENT = 'lolympus:theme-changed';
export type AppTheme = 'light' | 'dark';
export const API_BASE_URL = (
import.meta.env.VITE_API_BASE_URL ?? 'http://localhost:3000'
@@ -80,6 +84,40 @@ export function setDevCaptainTeamIndex(teamIndex: number | null) {
dispatchWindowEvent(CAPTAIN_SIDE_CHANGED_EVENT);
}
function normalizeTheme(value: string | null | undefined): AppTheme {
return value === 'dark' ? 'dark' : 'light';
}
function applyTheme(theme: AppTheme) {
if (typeof document === 'undefined') return;
document.documentElement.dataset.theme = theme;
document.documentElement.style.colorScheme = theme;
}
export function getTheme(): AppTheme {
if (typeof window === 'undefined') return 'light';
try {
return normalizeTheme(window.localStorage.getItem(THEME_STORAGE_KEY));
} catch {
return 'light';
}
}
export function setTheme(theme: AppTheme) {
if (typeof window === 'undefined') return;
try {
window.localStorage.setItem(THEME_STORAGE_KEY, theme);
} catch {
// Keep applying the in-memory document theme even if persistence is blocked.
}
applyTheme(theme);
dispatchWindowEvent(THEME_CHANGED_EVENT);
}
export function initializeTheme() {
applyTheme(getTheme());
}
export function useAuthUserId(): string | null {
return useSyncExternalStore<string | null>(
(callback) => subscribeToWindowChanges(AUTH_USER_CHANGED_EVENT, callback),
@@ -95,3 +133,11 @@ export function useDevCaptainTeamIndex(): number | null {
() => null,
);
}
export function useTheme(): AppTheme {
return useSyncExternalStore<AppTheme>(
(callback) => subscribeToWindowChanges(THEME_CHANGED_EVENT, callback),
getTheme,
() => 'light',
);
}
+103 -3
View File
@@ -1,10 +1,15 @@
@import url("https://fonts.googleapis.com/css2?family=Asta+Sans:wght@300..800&family=Gamja+Flower&display=swap");
@import "tailwindcss";
@custom-variant dark (&:where([data-theme=dark], [data-theme=dark] *));
@plugin "daisyui" {
themes:
light --default,
dark --prefersdark;
dark;
}
html {
scrollbar-gutter: stable;
}
body {
@@ -24,8 +29,97 @@ body {
"Segoe UI Emoji",
"Segoe UI Symbol",
sans-serif;
font-size: 14px;
line-height: 1.5;
font-size: 15px;
line-height: 1.55;
}
/* ── 가독성 개선: 의미 기반 텍스트 대비 토큰 ──
폰트 크기는 표준 스케일 토큰(text-xs=12px / text-sm=14px …)을 사용한다.
새 코드에서는 text-content-subtle/muted/disabled를 우선 사용한다. */
:root,
[data-theme="light"] {
--lts-text-subtle-strength: 66%;
--lts-text-muted-strength: 72%;
--lts-text-disabled-strength: 50%;
--lts-content-subtle: color-mix(
in oklab,
var(--color-base-content) var(--lts-text-subtle-strength),
transparent
);
--lts-content-muted: color-mix(
in oklab,
var(--color-base-content) var(--lts-text-muted-strength),
transparent
);
--lts-content-disabled: color-mix(
in oklab,
var(--color-base-content) var(--lts-text-disabled-strength),
transparent
);
}
[data-theme="dark"] {
--lts-text-subtle-strength: 66%;
--lts-text-muted-strength: 76%;
--lts-text-disabled-strength: 52%;
}
@theme inline {
--color-content-subtle: var(--lts-content-subtle);
--color-content-muted: var(--lts-content-muted);
--color-content-disabled: var(--lts-content-disabled);
}
@layer utilities {
/* 기존 text-base-content/nn 알파 클래스 호환 shim.
hover/focus 상태 유틸이 specificity로 이길 수 있도록 !important를 쓰지 않는다. */
.text-base-content\/15,
.text-base-content\/20,
.text-base-content\/25,
.text-base-content\/30,
.text-base-content\/35 {
color: var(--lts-content-subtle);
}
.text-base-content\/40,
.text-base-content\/45,
.text-base-content\/50,
.text-base-content\/55 {
color: var(--lts-content-muted);
}
}
/* ════════════════════════════════════════════════════════════
🎛️ 튜닝 패널 (실험용) — 값만 바꾸면 dev에서 즉시 반영(HMR).
확정되면 element로 전환한 뒤 이 블록을 통째로 제거할 것.
색은 oklch(밝기% 채도 색상) 형식.
════════════════════════════════════════════════════════════ */
[data-theme="light"] {
/* ── 포인트 4색 (primary 주 액션 / secondary 강조 / accent 하이라이트 / info 정보·보조) ── */
/* 코랄레드 — primary 117곳 즉시 반영 */
--color-primary: oklch(0.708008 0.234375 24);
--color-primary-content: oklch(98% 0 0); /* 흰 글자 */
/* 바이올렛 — 버튼·뱃지·보더용 */
--color-secondary: oklch(0.481934 0.285938 285);
--color-secondary-content: oklch(98% 0 0); /* 흰 글자 */
/* 골드 — 배경·보더·아이콘만. 텍스트색(text-accent)으론 쓰지 말 것 */
--color-accent: oklch(0.853027 0.2 90);
--color-accent-content: oklch(22% 0.03 80); /* 어두운 글자 */
/* 시안 — 정보·링크·보조 강조. L70이라 흰배경 텍스트는 약함 → 배경/보더 위주 */
--color-info: oklch(70% 0.14523 200);
--color-info-content: oklch(24% 0.03 215); /* 어두운 글자 */
/* 텍스트 기본 진하기 (회색 알파의 기준색). 낮출수록 전체가 진해짐 */
--color-base-content: oklch(21% 0.006 285.885);
/* 표면 톤 */
--color-base-100: oklch(100% 0 0); /* 페이지/카드 배경 */
--color-base-200: oklch(98% 0 0); /* 살짝 들어간 표면 */
--color-base-300: oklch(95% 0 0); /* 구분선/보더 */
}
/* poro.gg style: 모든 모서리 각지게 */
@@ -44,3 +138,9 @@ body {
.btn {
border-radius: 0 !important;
}
/* daisyUI 버튼의 흰색 inset 하이라이트 제거 — 색 위에 흰색을 6% 얹어
채도를 깎던 주범(P3/쨍한 색일수록 도드라짐). drop shadow(입체감)는 유지. */
.btn {
box-shadow: var(--btn-shadow) !important;
}
+3
View File
@@ -4,6 +4,9 @@ import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import './index.css';
import App from './App.tsx';
import { MsalAppProvider } from './lib/auth/MsalAppProvider.tsx';
import { initializeTheme } from './config.ts';
initializeTheme();
const queryClient = new QueryClient({
defaultOptions: {
+386 -157
View File
@@ -1,13 +1,25 @@
import { useEffect, useMemo, useRef, useState } from 'react';
import {
lazy,
Suspense,
useEffect,
useMemo,
useRef,
useState,
type FormEvent,
type KeyboardEvent,
} from 'react';
import { useQueryClient } from '@tanstack/react-query';
import { Link, useLocation, useParams } from 'react-router';
import { AlertTriangle, SendHorizontal } from 'lucide-react';
import { Link, useLocation, useNavigate, useParams } from 'react-router';
import {
useAuction,
useAuctionHistory,
useDdragonManifest,
useMatch,
useMe,
useResetAuction,
useUndoAuction,
useUserHistoryProfile,
} from '../api/hooks';
import {
mapApiAuctionToAuctionState,
@@ -32,30 +44,21 @@ import {
teamIndexColorClasses,
teamIndexLabel,
} from '../lib/league';
import { RankBadge, ResponsiveTierLabel } from '../components/RankBadge';
import type {
ApiAuction,
ApiAuctionChatMessage,
ApiRiotLaneStats,
ApiTierInfo,
ApiUser,
Position,
} from '../api/types';
const TierHistoryChart = lazy(() => import('../components/TierHistoryChart'));
type CaptainRole = {
teamIndex: number;
};
const TIER_NAMES: Record<string, string> = {
IRON: '아이언',
BRONZE: '브론즈',
SILVER: '실버',
GOLD: '골드',
PLATINUM: '플래티넘',
EMERALD: '에메랄드',
DIAMOND: '다이아몬드',
MASTER: '마스터',
GRANDMASTER: '그랜드마스터',
CHALLENGER: '챌린저',
};
function formatPoints(value: number) {
return value.toLocaleString();
}
@@ -73,88 +76,29 @@ function relativeTime(dateLike: string) {
return `${Math.floor(hours / 24)}일 전`;
}
function normalizeRank(rank: string | undefined) {
switch (rank) {
case 'I':
return '1';
case 'II':
return '2';
case 'III':
return '3';
case 'IV':
return '4';
default:
return rank;
function formatChatTime(dateLike: string) {
return new Intl.DateTimeFormat('ko-KR', {
hour: '2-digit',
minute: '2-digit',
}).format(new Date(dateLike));
}
function resolveChatSenderLabel(
currentUser: ApiUser | null,
captainRole: CaptainRole | null,
) {
const primaryRiotAccount =
currentUser?.riotAccounts.find((entry) => entry.isPrimary) ??
currentUser?.riotAccounts[0];
if (primaryRiotAccount?.gameName) {
return primaryRiotAccount.tagLine
? `${primaryRiotAccount.gameName}#${primaryRiotAccount.tagLine}`
: primaryRiotAccount.gameName;
}
}
function formatRankBadge(tier: ApiTierInfo | undefined) {
if (!tier) return 'U';
const tierInitial =
tier.tier === 'GRANDMASTER' ? 'GM' : tier.tier.slice(0, 1);
const rank = normalizeRank(tier.rank);
return rank ? `${tierInitial}${rank}` : tierInitial;
}
function formatRankDetail(tier: ApiTierInfo | undefined) {
if (!tier) return '랭크 정보 없음';
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
const rank = normalizeRank(tier.rank);
const label = rank ? `${tierName} ${rank}` : tierName;
return `${label} - ${tier.leaguePoints} LP`;
}
function rankBadgeClass(tier: ApiTierInfo | undefined) {
switch (tier?.tier) {
case 'CHALLENGER':
return 'border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200';
case 'GRANDMASTER':
return 'border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200';
case 'MASTER':
return 'border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200';
case 'DIAMOND':
return 'border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200';
case 'EMERALD':
return 'border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200';
case 'PLATINUM':
return 'border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200';
case 'GOLD':
return 'border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200';
case 'SILVER':
return 'border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200';
case 'BRONZE':
return 'border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200';
case 'IRON':
return 'border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300';
default:
return 'border-base-content/30 bg-transparent text-base-content/50';
}
}
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
const tooltip = formatRankDetail(tier);
return (
<span className="tooltip tooltip-bottom" data-tip={tooltip}>
<span
className={`inline-flex h-[18px] min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
aria-label={tooltip}
>
{formatRankBadge(tier)}
</span>
</span>
);
}
function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
return (
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
<RankBadge tier={tier} />
<span className="hidden font-bold text-base-content/55 sm:inline">
{formatRankDetail(tier)}
</span>
</span>
);
if (currentUser?.kakaoTalkNickname) return currentUser.kakaoTalkNickname;
if (currentUser?.discordNickname) return currentUser.discordNickname;
if (captainRole) return `${teamIndexLabel(captainRole.teamIndex)} 팀장`;
return '관전자';
}
function isCurrentBidder(
@@ -192,7 +136,7 @@ const POSITION_TO_RIOT_LANE = {
function PosBadge({ pos }: { pos: Position }) {
return (
<span className="inline-flex items-center gap-1.5 text-[11px] font-medium px-1.5 py-0.5 border border-primary/20 text-primary bg-primary/5">
<span className="inline-flex items-center gap-1.5 text-xs font-medium px-1.5 py-0.5 border border-primary/20 text-primary bg-primary/5">
<img src={positionIcon[pos]} alt="" className="w-3.5 h-3.5 object-contain" />
<span>{positionLabel[pos]}</span>
</span>
@@ -238,10 +182,10 @@ function RecentSoloStats({
if (!primaryStats) {
return (
<div className="p-4">
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
<h4 className="text-xs font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
최근 솔로랭크
</h4>
<div className="rounded border border-dashed border-base-content/10 px-3 py-6 text-center text-[11px] text-base-content/25">
<div className="rounded border border-dashed border-base-content/10 px-3 py-6 text-center text-xs text-base-content/25">
최근 솔로랭크 기록이 없습니다
</div>
</div>
@@ -255,15 +199,15 @@ function RecentSoloStats({
<div className="p-4">
<div className="flex items-start justify-between gap-3 mb-3">
<div>
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
<h4 className="text-xs font-bold uppercase tracking-wider text-base-content/30">
최근 솔로랭크
</h4>
<div className="mt-1 flex items-center gap-2">
<span className="text-[12px] font-semibold text-base-content">
<span className="text-xs font-semibold text-base-content">
{positionLabel[player.mainPosition]}
</span>
{player.recentStats.primarySource === 'overall' ? (
<span className="text-[10px] text-base-content/35">
<span className="text-xs text-base-content/35">
전체 기준
</span>
) : null}
@@ -278,15 +222,15 @@ function RecentSoloStats({
<div className="space-y-2">
<div className="flex items-baseline justify-between">
<span className="text-[11px] text-base-content/40">전적</span>
<span className="text-[12px] text-base-content/60 tabular-nums">
<span className="text-xs text-base-content/40">전적</span>
<span className="text-xs text-base-content/60 tabular-nums">
<span className="text-blue-400">{primaryStats.wins}W</span>{' '}
<span className="text-red-400">{primaryStats.losses}L</span>
</span>
</div>
<div className="flex items-baseline justify-between">
<span className="text-[11px] text-base-content/40">KDA</span>
<span className="text-[12px] text-base-content/60 tabular-nums">
<span className="text-xs text-base-content/40">KDA</span>
<span className="text-xs text-base-content/60 tabular-nums">
{primaryStats.avgKills}/{primaryStats.avgDeaths}/{primaryStats.avgAssists}
<span
className={`ml-1 font-bold ${Number(primaryKdaRatio) >= 3 ? 'text-emerald-400' : 'text-base-content/50'}`}
@@ -296,8 +240,8 @@ function RecentSoloStats({
</span>
</div>
<div className="flex items-baseline justify-between">
<span className="text-[11px] text-base-content/40">분당 CS</span>
<span className="text-[12px] text-base-content/60 tabular-nums">
<span className="text-xs text-base-content/40">분당 CS</span>
<span className="text-xs text-base-content/60 tabular-nums">
{primaryStats.avgCsPerMin}
</span>
</div>
@@ -312,7 +256,7 @@ function RecentSoloStats({
return (
<div
key={position}
className={`flex items-center justify-between gap-3 text-[11px] ${isMainLane ? 'font-semibold text-base-content' : 'text-base-content/65'}`}
className={`flex items-center justify-between gap-3 text-xs ${isMainLane ? 'font-semibold text-base-content' : 'text-base-content/65'}`}
>
<span className={isMainLane ? 'text-base-content' : 'text-base-content/35'}>
{positionLabel[position]}
@@ -360,10 +304,10 @@ function TeamPanel({
<div className={`${tone.bg} px-3 py-2 border-b ${tone.border}`}>
<div className="flex items-center justify-between">
<div className="flex items-center gap-2">
<span className={`text-[11px] font-bold uppercase tracking-wide ${tone.text}`}>
<span className={`text-xs font-bold uppercase tracking-wide ${tone.text}`}>
{teamIndexLabel(team.teamIndex, team.name)}
</span>
<span className="text-[10px] text-base-content/30">
<span className="text-xs text-base-content/30">
팀장: {team.captainName}
</span>
</div>
@@ -371,7 +315,7 @@ function TeamPanel({
{formatPoints(team.points)}P
</span>
</div>
<div className="mt-1 flex items-center justify-between text-[10px]">
<div className="mt-1 flex items-center justify-between text-xs">
<span className="text-base-content/25">
팀장 포함 {teamSize}/{AUCTION_MAX_TEAM_SIZE}
</span>
@@ -381,7 +325,7 @@ function TeamPanel({
<div className="divide-y divide-base-content/5">
{team.members.length === 0 ? (
<div className="px-3 py-6 text-center text-[11px] text-base-content/20">
<div className="px-3 py-6 text-center text-xs text-base-content/20">
아직 멤버가 없습니다
</div>
) : (
@@ -405,15 +349,15 @@ function TeamPanel({
</div>
<RankBadge tier={member.tier} />
<div className="flex-1 min-w-0">
<span className="text-[12px] font-medium text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
<span className="text-xs font-medium text-base-content truncate block leading-tight group-hover:text-primary transition-colors">
{member.summonerName}
</span>
</div>
</Link>
<span className="shrink-0 text-[11px] font-semibold text-base-content/45">
<span className="shrink-0 text-xs font-semibold text-base-content/45">
{positionLabel[member.assignedPosition]}
</span>
<span className="text-[10px] text-amber-400/60 tabular-nums w-8 text-right">
<span className="text-xs text-amber-400/60 tabular-nums w-8 text-right">
{member.cost}
</span>
</div>
@@ -428,7 +372,7 @@ function TeamPanel({
className="px-3 py-1.5 h-[34px] flex items-center"
>
<div className="w-6 h-6 border border-dashed border-base-content/8 shrink-0" />
<span className="ml-2 text-[10px] text-base-content/10">—</span>
<span className="ml-2 text-xs text-base-content/10">—</span>
</div>
))}
</div>
@@ -445,7 +389,16 @@ function PlayerSpotlight({
}) {
const { data: ddragon } = useDdragonManifest();
const player = state.currentPlayer;
const historyProfileQuery = useUserHistoryProfile(
player?.userId,
DEFAULT_COMMUNITY_ID,
Boolean(player && player.tierHistory.length === 0),
);
if (!player) return null;
const tierHistory =
player.tierHistory.length > 0
? player.tierHistory
: (historyProfileQuery.data?.tierHistory ?? []);
return (
<div className="border border-base-content/10 bg-base-100">
@@ -471,16 +424,16 @@ function PlayerSpotlight({
>
{player.summonerName}
</Link>
<span className="text-[10px] text-base-content/25">
<span className="text-xs text-base-content/25">
#{player.tag}
</span>
</div>
<div className="mb-2 text-[11px]">
<div className="mb-2 text-xs">
<ResponsiveTierLabel tier={player.tier} />
</div>
<div className="flex items-center gap-1.5">
<PosBadge pos={player.mainPosition} />
<span className="inline-flex items-center gap-0.5 text-[11px] px-1.5 py-0.5 border border-base-content/8 text-base-content/35">
<span className="inline-flex items-center gap-0.5 text-xs px-1.5 py-0.5 border border-base-content/8 text-base-content/35">
<img
src={positionIcon[player.subPosition]}
alt=""
@@ -493,9 +446,25 @@ function PlayerSpotlight({
</div>
</div>
{tierHistory.length > 0 && (
<Suspense
fallback={
<div className="h-[180px] border-b border-base-content/8 bg-base-100" />
}
>
<TierHistoryChart
entries={tierHistory}
className="border-b border-base-content/8 bg-base-100 overflow-hidden"
summaryVariant="inline"
height={180}
showHeader={false}
/>
</Suspense>
)}
<div className="grid grid-cols-2 divide-x divide-base-content/5">
<div className="p-4">
<h4 className="text-[10px] font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
<h4 className="text-xs font-bold uppercase tracking-wider text-base-content/30 mb-2.5">
숙련도 높은 챔피언
</h4>
<div className="space-y-2">
@@ -518,10 +487,10 @@ function PlayerSpotlight({
) : null}
</div>
<div className="flex-1 min-w-0">
<div className="text-[12px] font-medium text-base-content truncate">
<div className="text-xs font-medium text-base-content truncate">
{displayName}
</div>
<div className="text-[10px] text-base-content/25">
<div className="text-xs text-base-content/25">
Lv.{mastery.level} · {(mastery.points / 1000).toFixed(0)}K
</div>
</div>
@@ -529,7 +498,7 @@ function PlayerSpotlight({
);
})
) : (
<div className="text-[11px] text-base-content/25">
<div className="text-xs text-base-content/25">
숙련도 데이터가 없습니다.
</div>
)}
@@ -542,13 +511,13 @@ function PlayerSpotlight({
{(state.phase === 'bidding' || state.phase === 'sold') && (
<div className="border-t border-base-content/8 px-4 py-3 bg-base-content/[0.02]">
<div className="flex items-center justify-between">
<span className="text-[11px] text-base-content/30 uppercase tracking-wider font-semibold">
<span className="text-xs text-base-content/30 uppercase tracking-wider font-semibold">
{state.phase === 'sold' ? '낙찰가' : '현재 입찰가'}
</span>
<div className="flex items-center gap-2">
{state.currentBidder && (
<span
className={`text-[10px] font-bold uppercase ${teamIndexColorClasses(state.currentBidder.teamIndex).text}`}
className={`text-xs font-bold uppercase ${teamIndexColorClasses(state.currentBidder.teamIndex).text}`}
>
{teamIndexLabel(state.currentBidder.teamIndex)}
</span>
@@ -615,7 +584,7 @@ function BidControls({
key={preset}
onClick={() => setBidAmount(Math.max(minBid, preset))}
disabled={isActiveTeamFull}
className={`text-[11px] px-2.5 py-1 border transition-colors ${
className={`text-xs px-2.5 py-1 border transition-colors ${
bidAmount === preset
? 'border-primary/40 bg-primary/10 text-primary'
: 'border-base-content/10 text-base-content/40 hover:border-base-content/20'
@@ -666,13 +635,13 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
return (
<div className="border border-base-content/10 bg-base-100 overflow-hidden">
<div className="px-3 py-1.5 border-b border-base-content/8 bg-base-200/40">
<span className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
<span className="text-xs font-bold uppercase tracking-wider text-base-content/30">
입찰 기록
</span>
</div>
<div className="max-h-28 overflow-y-auto p-2 space-y-0.5">
{bids.map((bid, index) => (
<div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-[11px]">
<div key={`${bid.teamIndex}-${bid.timestamp}-${index}`} className="flex items-center gap-2 text-xs">
<span
className={`font-bold uppercase ${teamIndexColorClasses(bid.teamIndex).text}`}
>
@@ -693,6 +662,7 @@ function BidLog({ bids }: { bids: AuctionStateView['bids'] }) {
export default function AuctionPage() {
const { id } = useParams();
const location = useLocation();
const navigate = useNavigate();
const queryClient = useQueryClient();
const meQuery = useMe();
const currentUser =
@@ -712,17 +682,42 @@ export default function AuctionPage() {
refetchInterval: 3000,
});
const undoMutation = useUndoAuction(DEFAULT_COMMUNITY_ID);
const resetAuctionMutation = useResetAuction(DEFAULT_COMMUNITY_ID);
const socket = useAuctionSocket(id);
const captainTeamIndex = useDevCaptainTeamIndex();
const [now, setNow] = useState(() => Date.now());
const [assignedPosition, setAssignedPosition] = useState<Position>('MID');
const [showCancelModal, setShowCancelModal] = useState(false);
const [cancelConfirmText, setCancelConfirmText] = useState('');
const cancelConfirmInputRef = useRef<HTMLInputElement>(null);
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
const canConfirmAuctionCancel = cancelConfirmText.trim() === '예';
async function invalidateAuctionData() {
if (!id) return;
await Promise.all([
queryClient.invalidateQueries({
queryKey: ['auction', DEFAULT_COMMUNITY_ID, id],
}),
queryClient.invalidateQueries({
queryKey: ['auction-history', DEFAULT_COMMUNITY_ID, id],
}),
queryClient.invalidateQueries({
queryKey: ['match', DEFAULT_COMMUNITY_ID, id],
}),
]);
}
useEffect(() => {
const timer = window.setInterval(() => setNow(Date.now()), 1000);
return () => window.clearInterval(timer);
}, []);
useEffect(() => {
if (!showCancelModal) return;
cancelConfirmInputRef.current?.focus();
}, [showCancelModal]);
const liveAuction = pickLatestAuction(socket.auction, auctionQuery.data);
const auctionState =
liveAuction && matchQuery.data
@@ -738,6 +733,7 @@ export default function AuctionPage() {
: {
teamIndex: captainTeamIndex,
};
const chatSenderLabel = resolveChatSenderLabel(currentUser, captainRole);
useEffect(() => {
if (auctionState?.currentPlayer) {
@@ -752,6 +748,13 @@ export default function AuctionPage() {
}
}, [availableTeamIndexes, captainTeamIndex]);
useEffect(() => {
if (!socket.resetAt || !id) return;
void invalidateAuctionData().finally(() => {
navigate(`/match/${id}`, { replace: true });
});
}, [id, navigate, socket.resetAt]);
if (!DEFAULT_COMMUNITY_ID) {
return (
<main className="max-w-5xl mx-auto px-4 py-20 text-center">
@@ -826,12 +829,27 @@ export default function AuctionPage() {
);
}
function handleResetAuction() {
if (!id || !canConfirmAuctionCancel) return;
resetAuctionMutation.mutate(
{ matchId: id },
{
onSuccess: async () => {
setShowCancelModal(false);
setCancelConfirmText('');
await invalidateAuctionData();
navigate(`/match/${id}`, { replace: true });
},
},
);
}
const undoPanel = canManageAuction ? (
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
되돌리기 (Undo)
</div>
<div className="max-h-48 overflow-y-auto space-y-1 text-[11px]">
<div className="max-h-48 overflow-y-auto space-y-1 text-xs">
{historyQuery.data?.length ? (
historyQuery.data.map((entry) => (
<button
@@ -845,7 +863,7 @@ export default function AuctionPage() {
#{entry.sequence}
</span>
<span className="text-base-content/45">{entry.actionLabel}</span>
<span className="text-[10px] text-base-content/25">
<span className="text-xs text-base-content/25">
{relativeTime(entry.takenAt)}
</span>
</button>
@@ -894,12 +912,18 @@ export default function AuctionPage() {
</div>
)}
{resetAuctionMutation.error instanceof Error && (
<div className="mb-4 border border-red-500/20 bg-red-500/10 px-4 py-3 text-sm text-red-500">
{resetAuctionMutation.error.message}
</div>
)}
<div className="mb-5 flex items-start justify-between flex-wrap gap-3">
<div>
<h1 className="text-xl font-bold text-base-content leading-tight">
경매 팀빌딩
</h1>
<p className="text-[11px] text-base-content/30 mt-0.5">
<p className="text-xs text-base-content/30 mt-0.5">
{Math.min(auctionState.currentPlayerIndex + 1, Math.max(auctionState.totalPlayers, 1))} /{' '}
{auctionState.totalPlayers} 선수
</p>
@@ -907,7 +931,7 @@ export default function AuctionPage() {
<div className="flex flex-col items-end gap-2">
<div className="flex items-center gap-2">
<span
className={`inline-flex items-center text-[11px] font-semibold px-2 py-1 border ${
className={`inline-flex items-center text-xs font-semibold px-2 py-1 border ${
auctionState.phase === 'bidding'
? 'border-green-500/20 bg-green-500/10 text-green-400'
: auctionState.phase === 'sold'
@@ -985,7 +1009,7 @@ export default function AuctionPage() {
</div>
<Link
to={`/match/${id}`}
className="btn btn-primary btn-sm mt-4 px-6 text-[11px]"
className="btn btn-primary btn-sm mt-4 px-6 text-xs"
>
결과 확인
</Link>
@@ -1021,7 +1045,7 @@ export default function AuctionPage() {
{canManageAuction && (
<div className="border border-base-content/10 bg-base-100 p-4 space-y-3">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
Auction Controls
</div>
{auctionState.phase === 'presenting' && (
@@ -1065,6 +1089,23 @@ export default function AuctionPage() {
다음 선수
</button>
)}
<div className="border-t border-base-content/10 pt-3">
<button
type="button"
className="btn btn-outline btn-error btn-sm inline-flex items-center gap-1.5 px-4 text-xs"
onClick={() => {
setCancelConfirmText('');
setShowCancelModal(true);
}}
disabled={resetAuctionMutation.isPending}
>
<AlertTriangle className="h-3.5 w-3.5" />
경매 진행 취소
</button>
<p className="mt-2 text-xs leading-relaxed text-base-content/35">
경매 데이터와 진행 기록을 삭제하고 내전을 모집 상태로 되돌립니다.
</p>
</div>
</div>
)}
{undoPanel}
@@ -1073,9 +1114,114 @@ export default function AuctionPage() {
</div>
<aside className="hidden xl:block">
<ChatPanel />
<ChatPanel
messages={socket.chatMessages}
connectionStatus={socket.connectionStatus}
senderLabel={chatSenderLabel}
onSend={(message) =>
socket.sendChatMessage({
displayName: chatSenderLabel,
message,
})
}
className="sticky top-4 h-[520px] max-h-[calc(100vh-2rem)]"
/>
</aside>
</div>
<div className="mt-4 xl:hidden">
<ChatPanel
messages={socket.chatMessages}
connectionStatus={socket.connectionStatus}
senderLabel={chatSenderLabel}
onSend={(message) =>
socket.sendChatMessage({
displayName: chatSenderLabel,
message,
})
}
className="h-[420px]"
/>
</div>
{showCancelModal && (
<div
className="fixed inset-0 z-50 flex items-center justify-center bg-black/55 px-4"
role="dialog"
aria-modal="true"
aria-labelledby="auction-cancel-title"
>
<div className="w-full max-w-md border border-red-500/25 bg-base-100 p-5 shadow-2xl">
<div className="flex items-start gap-3">
<span className="inline-flex h-9 w-9 shrink-0 items-center justify-center border border-red-500/25 bg-red-500/10 text-red-400">
<AlertTriangle className="h-4 w-4" />
</span>
<div className="min-w-0">
<h2
id="auction-cancel-title"
className="text-base font-bold text-base-content"
>
경매 진행 취소
</h2>
<p className="mt-2 text-sm leading-6 text-base-content/60">
정말 경매를 취소하고 모집 상태로 되돌리시겠습니까?
경매 데이터, 입찰 기록, 팀 배정 정보가 삭제됩니다.
</p>
</div>
</div>
<label
htmlFor="auction-cancel-confirm"
className="mt-5 block text-xs font-bold uppercase tracking-wider text-base-content/40"
>
계속하려면 예 입력
</label>
<input
id="auction-cancel-confirm"
ref={cancelConfirmInputRef}
value={cancelConfirmText}
onChange={(event) => setCancelConfirmText(event.target.value)}
onKeyDown={(event) => {
if (event.key === 'Escape') {
setShowCancelModal(false);
setCancelConfirmText('');
}
if (event.key === 'Enter' && canConfirmAuctionCancel) {
handleResetAuction();
}
}}
className="mt-2 h-10 w-full border border-base-content/15 bg-base-100 px-3 text-sm text-base-content outline-none transition-colors focus:border-red-400/60"
placeholder="예"
/>
<div className="mt-5 flex flex-wrap justify-end gap-2">
<button
type="button"
className="btn btn-ghost btn-sm px-4 text-xs"
onClick={() => {
setShowCancelModal(false);
setCancelConfirmText('');
}}
disabled={resetAuctionMutation.isPending}
>
닫기
</button>
<button
type="button"
className="btn btn-error btn-sm px-4 text-xs"
onClick={handleResetAuction}
disabled={
!canConfirmAuctionCancel || resetAuctionMutation.isPending
}
>
{resetAuctionMutation.isPending
? '취소 처리 중...'
: '경매 취소 진행'}
</button>
</div>
</div>
</div>
)}
</main>
);
}
@@ -1145,7 +1291,7 @@ function PoolPanel({ state }: { state: AuctionStateView }) {
<div className="flex-1 overflow-y-auto">
{activePool.length === 0 ? (
<div className="px-3 py-8 text-center text-[11px] text-base-content/30">
<div className="px-3 py-8 text-center text-xs text-base-content/30">
{tab === 'waiting'
? '대기 중인 유저가 없습니다'
: '유찰된 유저가 없습니다'}
@@ -1183,14 +1329,14 @@ function PoolTabButton({
role="tab"
type="button"
onClick={onClick}
className={`relative px-1 pt-3 pb-2.5 mr-5 text-[12px] font-semibold transition-colors ${
className={`relative px-1 pt-3 pb-2.5 mr-5 text-xs font-semibold transition-colors ${
active
? 'text-base-content'
: 'text-base-content/40 hover:text-base-content/70'
}`}
>
{label}
<span className="ml-1 text-[10px] tabular-nums text-base-content/30">
<span className="ml-1 text-xs tabular-nums text-base-content/30">
{count}
</span>
{active ? (
@@ -1217,12 +1363,12 @@ function PoolListItem({
className="w-7 h-7 shrink-0 rounded-sm border border-base-content/10 object-cover"
/>
<div className="min-w-0 flex-1 flex items-center gap-1.5">
<span className="truncate text-[12px] font-semibold text-base-content">
<span className="truncate text-xs font-semibold text-base-content">
{player.summonerName}
</span>
<RankBadge tier={player.tier} />
{showPassCount && player.passCount > 0 ? (
<span className="inline-flex items-center text-[10px] font-medium px-1.5 py-0.5 border border-amber-500/30 text-amber-500 bg-amber-500/5">
<span className="inline-flex items-center text-xs font-medium px-1.5 py-0.5 border border-amber-500/30 text-amber-500 bg-amber-500/5">
{player.passCount}회 유찰
</span>
) : null}
@@ -1231,37 +1377,120 @@ function PoolListItem({
);
}
function ChatPanel() {
function ChatPanel({
messages,
connectionStatus,
senderLabel,
onSend,
className = '',
}: {
messages: ApiAuctionChatMessage[];
connectionStatus: ReturnType<typeof useAuctionSocket>['connectionStatus'];
senderLabel: string;
onSend: (message: string) => void;
className?: string;
}) {
const [draft, setDraft] = useState('');
const messagesEndRef = useRef<HTMLDivElement | null>(null);
const trimmedDraft = draft.trim();
const isConnected = connectionStatus === 'connected';
const canSend = isConnected && trimmedDraft.length > 0;
useEffect(() => {
messagesEndRef.current?.scrollIntoView({ block: 'end' });
}, [messages.length]);
function handleSubmit(event: FormEvent<HTMLFormElement>) {
event.preventDefault();
if (!canSend) return;
onSend(trimmedDraft);
setDraft('');
}
function handleKeyDown(event: KeyboardEvent<HTMLTextAreaElement>) {
if (event.key !== 'Enter' || event.shiftKey) return;
event.preventDefault();
if (!canSend) return;
onSend(trimmedDraft);
setDraft('');
}
const statusLabel =
connectionStatus === 'connected'
? '실시간'
: connectionStatus === 'connecting'
? '연결 중'
: '오프라인';
return (
<div className="border border-base-content/10 bg-base-100 sticky top-4 h-[calc(100vh-2rem)] flex flex-col">
<div
className={`border border-base-content/10 bg-base-100 flex min-h-0 flex-col ${className}`}
>
<div className="border-b border-base-content/10 px-3 py-2.5 flex items-center justify-between">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/35">
<div className="text-xs font-bold uppercase tracking-wider text-base-content/35">
채팅
</div>
<span className="text-[10px] text-base-content/30">
곧 활성화됩니다
<span
className={`text-xs ${
isConnected ? 'text-green-500' : 'text-base-content/30'
}`}
>
{statusLabel}
</span>
</div>
<div className="flex-1 overflow-y-auto px-3 py-8 text-center text-[11px] text-base-content/25">
아직 메시지가 없습니다
<div className="flex-1 min-h-0 overflow-y-auto px-3 py-3">
{messages.length === 0 ? (
<div className="flex h-full items-center justify-center text-center text-xs text-base-content/25">
아직 메시지가 없습니다
</div>
) : (
<ol className="space-y-3">
{messages.map((message) => (
<li key={message.id} className="space-y-1">
<div className="flex items-center justify-between gap-2">
<span className="min-w-0 truncate text-xs font-bold text-base-content/70">
{message.displayName}
</span>
<time className="shrink-0 text-xs tabular-nums text-base-content/25">
{formatChatTime(message.sentAt)}
</time>
</div>
<p className="whitespace-pre-wrap break-words border border-base-content/8 bg-base-content/[0.03] px-2.5 py-2 text-xs leading-relaxed text-base-content/75">
{message.message}
</p>
</li>
))}
</ol>
)}
<div ref={messagesEndRef} />
</div>
<div className="border-t border-base-content/10 p-2 space-y-2">
<form onSubmit={handleSubmit} className="border-t border-base-content/10 p-2 space-y-2">
<div className="flex items-center justify-between gap-2 px-0.5 text-xs text-base-content/30">
<span className="truncate">{senderLabel}</span>
<span className="tabular-nums">{draft.length}/300</span>
</div>
<textarea
disabled
value={draft}
onChange={(event) => setDraft(event.target.value)}
onKeyDown={handleKeyDown}
disabled={!isConnected}
maxLength={300}
placeholder="메시지를 입력하세요"
className="w-full resize-none border border-base-content/10 bg-base-content/5 px-2 py-1.5 text-[12px] text-base-content/40 placeholder:text-base-content/25 focus:outline-none"
className="w-full resize-none border border-base-content/10 bg-base-content/5 px-2 py-1.5 text-xs text-base-content/80 placeholder:text-base-content/25 focus:border-primary/40 focus:outline-none disabled:cursor-not-allowed disabled:text-base-content/30"
rows={2}
aria-label="경매 채팅 메시지"
/>
<button
type="button"
disabled
className="btn btn-primary btn-sm w-full text-[11px] opacity-50"
type="submit"
disabled={!canSend}
className="btn btn-primary btn-sm w-full text-xs"
>
<SendHorizontal className="h-3.5 w-3.5" aria-hidden="true" />
전송
</button>
</div>
</form>
</div>
);
}
@@ -86,7 +86,7 @@ function MatchCard({
<article className="border border-base-content/10 bg-base-100 hover:border-primary/25 transition-colors">
<div className="p-4 grid lg:grid-cols-[1fr_auto_1fr] gap-4 items-center">
<div className="min-w-0">
<div className="text-[11px] text-base-content/35">
<div className="text-xs text-base-content/35">
{formatDateTime(match.scheduledAt)}
</div>
<h3 className="mt-1 text-base font-black text-base-content truncate group-hover:text-primary">
@@ -96,7 +96,7 @@ function MatchCard({
{match.games.map((game) => (
<span
key={game.gameNumber}
className="inline-flex items-center gap-1 border border-base-content/10 px-2 py-1 text-[10px] text-base-content/45"
className="inline-flex items-center gap-1 border border-base-content/10 px-2 py-1 text-xs text-base-content/45"
>
{game.gameNumber}경기
{game.winnerSide && game.winnerTeamIndex ? (
@@ -117,14 +117,14 @@ function MatchCard({
<div className="flex items-center justify-center gap-5">
<div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
<div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
<div className="text-xs font-bold uppercase tracking-wider">
{teamName(primarySeries.teamAIndex)}
</div>
</div>
<div className="text-base-content/15 text-xs font-black">VS</div>
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
<div className="text-xs font-bold uppercase tracking-wider">
{teamName(primarySeries.teamBIndex)}
</div>
</div>
@@ -138,7 +138,7 @@ function MatchCard({
key={team.teamIndex}
className={`border ${teamIndexColorClasses(team.teamIndex).border} p-2`}
>
<div className={`text-[10px] font-black uppercase tracking-wider ${teamIndexColorClasses(team.teamIndex).text}`}>
<div className={`text-xs font-black uppercase tracking-wider ${teamIndexColorClasses(team.teamIndex).text}`}>
{team.name}
</div>
<div className="mt-2 space-y-1">
@@ -152,7 +152,7 @@ function MatchCard({
loading="lazy"
/>
</span>
<span className="text-[11px] truncate text-base-content/65">
<span className="text-xs truncate text-base-content/65">
{member.summonerName}
</span>
</div>
@@ -178,13 +178,13 @@ function HighlightCard({
}) {
return (
<div className="border border-base-content/10 bg-base-100 p-4">
<div className="text-[10px] font-black uppercase tracking-wider text-base-content/30">
<div className="text-xs font-black uppercase tracking-wider text-base-content/30">
{title}
</div>
<div className="mt-2 text-xl font-black text-base-content tabular-nums">
{highlight ? `${highlight.metric}${suffix}` : '-'}
</div>
<div className="mt-1 text-[12px] text-base-content/45">
<div className="mt-1 text-xs text-base-content/45">
{highlight?.summonerName ?? '기록 없음'}
</div>
</div>
@@ -206,7 +206,7 @@ function LeaderboardTable({
<div className="overflow-x-auto">
<table className="w-full text-left min-w-[920px]">
<thead>
<tr className="border-b border-base-content/10 bg-base-200/50 text-[11px] uppercase tracking-wider text-base-content/35">
<tr className="border-b border-base-content/10 bg-base-200/50 text-xs uppercase tracking-wider text-base-content/35">
<th className="px-3 py-2.5">#</th>
<th className="px-3 py-2.5">소환사</th>
<th className="px-3 py-2.5 text-center">승률</th>
@@ -221,7 +221,7 @@ function LeaderboardTable({
<tbody>
{rows.map((row, index) => (
<tr key={row.userId} className="border-b border-base-content/5 last:border-b-0">
<td className="px-3 py-2.5 text-[11px] text-base-content/30">
<td className="px-3 py-2.5 text-xs text-base-content/30">
{index + 1}
</td>
<td className="px-3 py-2.5">
@@ -238,31 +238,31 @@ function LeaderboardTable({
loading="lazy"
/>
</span>
<span className="font-bold text-[13px] group-hover:text-primary">
<span className="font-bold text-sm group-hover:text-primary">
{row.summonerName}
</span>
</Link>
</td>
<td className={`px-3 py-2.5 text-center text-[13px] font-black ${ratioClass(row.winRate)}`}>
<td className={`px-3 py-2.5 text-center text-sm font-black ${ratioClass(row.winRate)}`}>
{row.winRate}%
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.games}
</td>
<td className="px-3 py-2.5 text-center text-[12px] font-bold tabular-nums">
<td className="px-3 py-2.5 text-center text-xs font-bold tabular-nums">
{row.kda}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.avgGoldPerMin}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.avgKillParticipation}%
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.avgCsPerMin}
</td>
<td className="px-3 py-2.5">
<div className="flex flex-wrap gap-2 text-[11px] text-base-content/55">
<div className="flex flex-wrap gap-2 text-xs text-base-content/55">
{row.topChampions.map((champion) => (
<ChampionChip
key={champion.championId}
@@ -326,7 +326,7 @@ export default function CommunityInternalStatsPage() {
<section className="mt-5 mb-6 border border-base-content/10 bg-base-100 p-5">
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-4">
<div>
<p className="text-[11px] font-black uppercase tracking-[0.24em] text-primary">
<p className="text-xs font-black uppercase tracking-[0.24em] text-primary">
Community Records
</p>
<h1 className="mt-2 text-3xl font-black text-base-content">
@@ -337,7 +337,7 @@ export default function CommunityInternalStatsPage() {
</p>
</div>
<div className="border border-base-content/10 px-4 py-3 text-sm text-base-content/55">
<div className="text-[10px] uppercase tracking-wider text-base-content/30">
<div className="text-xs uppercase tracking-wider text-base-content/30">
시즌
</div>
<div className="mt-1 font-bold">{season?.label ?? '현재 시즌'}</div>
@@ -356,7 +356,7 @@ export default function CommunityInternalStatsPage() {
<section className="mb-8">
<div className="flex items-center justify-between gap-3 mb-3">
<h2 className="text-sm font-black text-base-content">최근 내전</h2>
<div className="text-[11px] text-base-content/35">
<div className="text-xs text-base-content/35">
블루 승률 {insightsQuery.data?.sideWinRate.blue ?? 0}% · 레드 승률{' '}
{insightsQuery.data?.sideWinRate.red ?? 0}%
</div>
@@ -392,7 +392,7 @@ export default function CommunityInternalStatsPage() {
<section>
<div className="flex items-center justify-between gap-3 mb-3">
<h2 className="text-sm font-black text-base-content">선수 순위</h2>
<div className="text-[11px] text-base-content/35">
<div className="text-xs text-base-content/35">
포지션은 Riot Match의 라인 정보를 기준으로 합니다.
</div>
</div>
+609 -85
View File
@@ -1,8 +1,339 @@
import { useState } from 'react';
import { ChevronLeft, ChevronRight } from 'lucide-react';
import { Link } from 'react-router';
import { mapApiMatchToMatchDetail } from '../api/mappers';
import { useMatches, useMe } from '../api/hooks';
import { useMatches, useMatchesPage, useMe } from '../api/hooks';
import { DEFAULT_COMMUNITY_ID } from '../config';
const UPCOMING_GRID_MATCH_LIMIT = 3;
const UPCOMING_MATCH_LIST_LIMIT = UPCOMING_GRID_MATCH_LIMIT + 1;
const HISTORY_MATCH_PAGE_SIZE = 10;
const EMPTY_SCHEDULE_TEXT = '예정된 매치가 없습니다.';
const HISTORY_TABLE_ROW_CLASS =
'h-10 border-b border-base-content/5 last:border-b-0';
const SECTION_HEADING_CLASS =
'text-xs font-bold text-base-content/40 uppercase tracking-widest';
const ADMIN_LINK_CLASS =
'text-xs font-bold text-base-content/35 hover:text-primary';
const STATS_LINK_CLASS = 'text-xs font-bold text-primary hover:underline';
const STATUS_BADGE_CLASS =
'inline-flex items-center whitespace-nowrap text-xs font-semibold px-1.5 py-0.5 border';
const MAP_BADGE_CLASS =
'inline-flex items-center whitespace-nowrap text-xs px-1.5 py-0.5 border';
const NEXT_MATCH_TITLE_CLASS =
'text-xl sm:text-2xl font-bold text-base-content leading-tight';
const NEXT_MATCH_DESCRIPTION_CLASS =
'text-sm text-base-content/50 max-w-xl leading-relaxed';
const NEXT_MATCH_META_CLASS =
'flex items-center gap-3 text-xs text-base-content/40 flex-wrap';
const NEXT_MATCH_PARTICIPANT_BADGE_CLASS =
'inline-flex items-center whitespace-nowrap bg-accent text-accent-content px-1.5 py-0.5 font-semibold';
const DETAIL_BUTTON_CLASS = 'btn btn-secondary btn-sm px-6 text-xs font-semibold';
const UPCOMING_CARD_FRAME_CLASS = 'bg-base-100 h-full p-4 min-h-[135px]';
const UPCOMING_CARD_TITLE_CLASS =
'text-sm font-bold text-base-content truncate mr-2';
const UPCOMING_CARD_META_CLASS = 'space-y-1 text-xs text-base-content/40';
const HISTORY_MOBILE_DATE_CLASS = 'text-xs font-medium text-base-content/40';
const HISTORY_MOBILE_TITLE_CLASS =
'mt-1 text-sm font-semibold leading-snug text-base-content break-words';
const HISTORY_MOBILE_META_CLASS =
'flex flex-wrap items-center gap-x-1.5 gap-y-1 text-xs text-base-content/45';
function SkeletonText({
children,
className = '',
skeletonClassName,
}: {
children: string;
className?: string;
skeletonClassName: string;
}) {
return (
<span className={`relative block ${className}`}>
<span className="invisible">{children}</span>
<span
aria-hidden="true"
className={`absolute left-0 top-1/2 -translate-y-1/2 animate-pulse bg-base-content/10 ${skeletonClassName}`}
/>
</span>
);
}
function SkeletonBadge({
children,
className,
}: {
children: string;
className: string;
}) {
return (
<span className={`relative ${className}`}>
<span className="invisible">{children}</span>
<span
aria-hidden="true"
className="absolute inset-0 animate-pulse bg-base-content/10"
/>
</span>
);
}
function HistoryTableColGroup() {
return (
<colgroup>
<col className="w-[156px]" />
<col />
<col className="w-[88px]" />
<col className="w-[132px]" />
<col className="w-[72px]" />
<col className="w-[116px]" />
</colgroup>
);
}
function HistoryTableHeader() {
return (
<thead>
<tr className="bg-base-200/60 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/40">
<th className="py-2.5 px-4 font-semibold">날짜</th>
<th className="py-2.5 px-4 font-semibold">내전</th>
<th className="py-2.5 px-4 font-semibold">상태</th>
<th className="py-2.5 px-4 font-semibold">맵</th>
<th className="py-2.5 px-4 font-semibold">참가</th>
<th className="py-2.5 px-4 font-semibold">결과</th>
</tr>
</thead>
);
}
function HistoryRecordsSkeleton({
rows = HISTORY_MATCH_PAGE_SIZE,
}: {
rows?: number;
}) {
const historySkeletons = Array.from({ length: rows });
return (
<>
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
<table className="w-full table-fixed text-left">
<HistoryTableColGroup />
<HistoryTableHeader />
<tbody>
{historySkeletons.map((_, index) => (
<tr
key={index}
className={HISTORY_TABLE_ROW_CLASS}
>
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
<SkeletonText
skeletonClassName="h-[1em] w-20"
>
2026년 6월 8일 월
</SkeletonText>
</td>
<td className="py-2.5 px-4">
<SkeletonText
className="truncate text-sm font-medium"
skeletonClassName="h-[1em] w-36 max-w-full"
>
정기 내전
</SkeletonText>
</td>
<td className="py-2.5 px-4">
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent`}>
팀빌딩
</SkeletonBadge>
</td>
<td className="py-2.5 px-4">
<SkeletonBadge className={`${MAP_BADGE_CLASS} border-transparent`}>
소환사의 협곡
</SkeletonBadge>
</td>
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
<SkeletonText
skeletonClassName="h-[1em] w-8"
>
10명
</SkeletonText>
</td>
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
<SkeletonText
className="truncate"
skeletonClassName="h-[1em] w-14"
>
1팀 승리
</SkeletonText>
</td>
</tr>
))}
</tbody>
</table>
</div>
<div className="md:hidden border border-base-content/10">
{historySkeletons.map((_, index) => (
<div
key={index}
className="border-b border-base-content/5 last:border-b-0 p-3"
>
<div className="flex items-start justify-between gap-3">
<div className="min-w-0 flex-1">
<SkeletonText
className={HISTORY_MOBILE_DATE_CLASS}
skeletonClassName="h-[1em] w-28"
>
6/8 (월) 21:00
</SkeletonText>
<SkeletonText
className={HISTORY_MOBILE_TITLE_CLASS}
skeletonClassName="h-[1em] w-32 max-w-full"
>
정기 내전
</SkeletonText>
</div>
<div className="shrink-0">
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent`}>
팀빌딩
</SkeletonBadge>
</div>
</div>
<div className="mt-2">
<div className={HISTORY_MOBILE_META_CLASS}>
<SkeletonText skeletonClassName="h-[1em] w-20">
소환사의 협곡
</SkeletonText>
<span className="invisible text-base-content/20">·</span>
<SkeletonText skeletonClassName="h-[1em] w-8">
10명
</SkeletonText>
<span className="invisible text-base-content/20">·</span>
<SkeletonText skeletonClassName="h-[1em] w-14">
1팀 승리
</SkeletonText>
</div>
</div>
</div>
))}
</div>
</>
);
}
function HomePageSkeleton() {
const upcomingSkeletons = Array.from({ length: UPCOMING_GRID_MATCH_LIMIT });
return (
<main
className="max-w-5xl mx-auto px-4 sm:px-6"
aria-busy="true"
aria-live="polite"
>
<span className="sr-only">매치 목록을 불러오는 중...</span>
<section className="pt-8 pb-6">
<div className="flex items-center justify-between gap-3 mb-3">
<h2 className={SECTION_HEADING_CLASS}>
다음 내전
</h2>
<div className="flex items-center gap-3">
<Link
to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats`}
className={STATS_LINK_CLASS}
>
내전 전적 보기
</Link>
</div>
</div>
<div className="border border-base-content/10 bg-base-200/50">
<div className="p-5 sm:p-6 min-h-[150px]">
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
<div className="space-y-2.5 flex-1">
<div className="flex items-center gap-2.5 flex-wrap">
<SkeletonText
className={NEXT_MATCH_TITLE_CLASS}
skeletonClassName="h-[1em] w-52 sm:w-64 max-w-full"
>
롤림푸스 경매 테스트 매치
</SkeletonText>
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent`}>
모집중
</SkeletonBadge>
</div>
<div className={NEXT_MATCH_DESCRIPTION_CLASS}>
<SkeletonText skeletonClassName="h-[1em] w-full max-w-xl">
Socket.IO 경매 페이지 검증용으로 생성된 매치입니다.
</SkeletonText>
</div>
<div className={NEXT_MATCH_META_CLASS}>
<SkeletonText skeletonClassName="h-[1em] w-24">
6월 11일 21:00
</SkeletonText>
<span className="invisible text-base-content/15">|</span>
<SkeletonBadge className={NEXT_MATCH_PARTICIPANT_BADGE_CLASS}>
10/10명
</SkeletonBadge>
<span className="invisible text-base-content/15">|</span>
<SkeletonBadge className={`${MAP_BADGE_CLASS} border-transparent`}>
소환사의 협곡
</SkeletonBadge>
</div>
</div>
<div className="sm:shrink-0">
<SkeletonBadge className={DETAIL_BUTTON_CLASS}>
상세 보기
</SkeletonBadge>
</div>
</div>
</div>
</div>
</section>
<section className="pb-6">
<h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
예정된 내전
</h2>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10">
{upcomingSkeletons.map((_, index) => (
<div key={index} className={UPCOMING_CARD_FRAME_CLASS}>
<div className="flex items-center justify-between mb-2.5 gap-3">
<SkeletonText
className={UPCOMING_CARD_TITLE_CLASS}
skeletonClassName="h-[1em] w-28 max-w-full"
>
정기 내전
</SkeletonText>
<SkeletonBadge className={`${STATUS_BADGE_CLASS} border-transparent shrink-0`}>
모집중
</SkeletonBadge>
</div>
<div className={UPCOMING_CARD_META_CLASS}>
<SkeletonText skeletonClassName="h-[1em] w-24">
6월 11일 21:00
</SkeletonText>
<SkeletonText skeletonClassName="h-[1em] w-12">
10/10명
</SkeletonText>
</div>
<div className="mt-2.5">
<SkeletonBadge className={`${MAP_BADGE_CLASS} border-transparent`}>
소환사의 협곡
</SkeletonBadge>
</div>
</div>
))}
</div>
</section>
<section className="pb-12">
<h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
지난 내전 기록
</h2>
<HistoryRecordsSkeleton />
</section>
</main>
);
}
function StatusBadge({ status }: { status: string }) {
const styles: Record<string, string> = {
모집중: 'bg-green-500/15 text-green-500 border-green-500/20',
@@ -13,7 +344,7 @@ function StatusBadge({ status }: { status: string }) {
return (
<span
className={`inline-flex items-center text-[11px] font-semibold px-1.5 py-0.5 border ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
className={`${STATUS_BADGE_CLASS} ${styles[status] ?? 'bg-base-content/10 text-base-content/50 border-base-content/10'}`}
>
{status}
</span>
@@ -22,7 +353,7 @@ function StatusBadge({ status }: { status: string }) {
function MapBadge({ map }: { map: string }) {
return (
<span className="inline-flex items-center text-[11px] px-1.5 py-0.5 border border-base-content/10 text-base-content/50">
<span className={`${MAP_BADGE_CLASS} border-base-content/10 text-base-content/50`}>
{map}
</span>
);
@@ -43,10 +374,110 @@ function getStatusLabel(status: string) {
}
}
function formatCompactDateTime(dateLike: string) {
const date = new Date(dateLike);
if (Number.isNaN(date.getTime())) return '';
const weekday = new Intl.DateTimeFormat('ko-KR', {
weekday: 'short',
}).format(date);
const hours = String(date.getHours()).padStart(2, '0');
const minutes = String(date.getMinutes()).padStart(2, '0');
return `${date.getMonth() + 1}/${date.getDate()} (${weekday}) ${hours}:${minutes}`;
}
function HistoryMetaText({
map,
participants,
result,
}: {
map: string;
participants: number;
result?: string;
}) {
return (
<div className={HISTORY_MOBILE_META_CLASS}>
<span>{map}</span>
<span className="text-base-content/20">·</span>
<span>{participants}명</span>
{result && (
<>
<span className="text-base-content/20">·</span>
<span>{result}</span>
</>
)}
</div>
);
}
interface HistoryPaginationProps {
page: number;
pageCount: number;
total: number;
isFetching: boolean;
onPrevious: () => void;
onNext: () => void;
}
function HistoryPagination({
page,
pageCount,
total,
isFetching,
onPrevious,
onNext,
}: HistoryPaginationProps) {
const hasPrevious = page > 1;
const hasNext = page < pageCount;
return (
<div className="flex flex-wrap items-center gap-2 text-xs text-base-content/40">
<span className="font-medium whitespace-nowrap">
총 {total}개 · {page}/{pageCount}페이지
</span>
<div className="flex items-center gap-1">
<button
type="button"
className="btn btn-ghost btn-xs px-2"
disabled={!hasPrevious || isFetching}
onClick={onPrevious}
>
<ChevronLeft className="h-3.5 w-3.5" aria-hidden="true" />
이전
</button>
<button
type="button"
className="btn btn-ghost btn-xs px-2"
disabled={!hasNext || isFetching}
onClick={onNext}
>
다음
<ChevronRight className="h-3.5 w-3.5" aria-hidden="true" />
</button>
</div>
</div>
);
}
export default function HomePage() {
const upcomingMatchesQuery = useMatches({ limit: 20 }, DEFAULT_COMMUNITY_ID);
const finishedMatchesQuery = useMatches(
{ status: 'finished', limit: 10 },
const [timelineNow] = useState(() => new Date().toISOString());
const [historyPage, setHistoryPage] = useState(1);
const upcomingMatchesQuery = useMatches(
{
limit: UPCOMING_MATCH_LIST_LIMIT,
scheduledFrom: timelineNow,
sort: 'asc',
},
DEFAULT_COMMUNITY_ID,
);
const historyMatchesQuery = useMatchesPage(
{
limit: HISTORY_MATCH_PAGE_SIZE,
page: historyPage,
scheduledTo: timelineNow,
sort: 'desc',
},
DEFAULT_COMMUNITY_ID,
);
const meQuery = useMe();
@@ -61,15 +492,11 @@ export default function HomePage() {
);
}
if (upcomingMatchesQuery.isLoading || finishedMatchesQuery.isLoading) {
return (
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
<span className="text-sm text-base-content/40">매치 목록을 불러오는 중...</span>
</main>
);
if (upcomingMatchesQuery.isLoading) {
return <HomePageSkeleton />;
}
if (upcomingMatchesQuery.error || finishedMatchesQuery.error) {
if (upcomingMatchesQuery.error) {
return (
<main className="max-w-5xl mx-auto px-4 sm:px-6 py-20 text-center">
<span className="text-sm text-red-500">
@@ -81,10 +508,31 @@ export default function HomePage() {
const upcomingMatches =
upcomingMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
const finishedMatches =
finishedMatchesQuery.data?.map(mapApiMatchToMatchDetail) ?? [];
const historyMatches =
historyMatchesQuery.data?.matches.map((match) => ({
...mapApiMatchToMatchDetail(match),
compactDateTime: formatCompactDateTime(match.scheduledAt),
})) ?? [];
const historyTotal = historyMatchesQuery.data?.total ?? 0;
const historyLimit =
historyMatchesQuery.data?.limit ?? HISTORY_MATCH_PAGE_SIZE;
const historyPageCount = Math.max(
1,
Math.ceil(historyTotal / historyLimit),
);
const isHistoryPageLoading =
historyMatchesQuery.isLoading ||
(historyMatchesQuery.isFetching && historyMatchesQuery.isPlaceholderData);
const hasHistoryError =
Boolean(historyMatchesQuery.error) && !historyMatchesQuery.data;
const goToPreviousHistoryPage = () =>
setHistoryPage((page) => Math.max(1, page - 1));
const goToNextHistoryPage = () => setHistoryPage((page) => page + 1);
const nextMatch = upcomingMatches[0];
const upcomingCards = nextMatch ? upcomingMatches.slice(1) : upcomingMatches;
const upcomingCards = (nextMatch
? upcomingMatches.slice(1)
: upcomingMatches
).slice(0, UPCOMING_GRID_MATCH_LIMIT);
const currentUser =
meQuery.data?.memberships.find(
(membership) => membership.community?._id === DEFAULT_COMMUNITY_ID,
@@ -95,21 +543,21 @@ export default function HomePage() {
<main className="max-w-5xl mx-auto px-4 sm:px-6">
<section className="pt-8 pb-6">
<div className="flex items-center justify-between gap-3 mb-3">
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest">
<h2 className={SECTION_HEADING_CLASS}>
다음 내전
</h2>
<div className="flex items-center gap-3">
{canManage && (
<Link
to={`/admin/communities/${DEFAULT_COMMUNITY_ID}/matches`}
className="text-xs font-bold text-base-content/35 hover:text-primary"
className={ADMIN_LINK_CLASS}
>
내전 관리
</Link>
)}
<Link
to={`/communities/${DEFAULT_COMMUNITY_ID}/internal-stats`}
className="text-xs font-bold text-primary hover:underline"
className={STATS_LINK_CLASS}
>
내전 전적 보기
</Link>
@@ -119,22 +567,22 @@ export default function HomePage() {
{nextMatch ? (
<Link to={`/match/${nextMatch.id}`} className="block group">
<div className="border border-base-content/10 bg-base-200/50 hover:bg-base-200 transition-colors">
<div className="p-5 sm:p-6">
<div className="p-5 sm:p-6 min-h-[150px]">
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-4">
<div className="space-y-2.5">
<div className="flex items-center gap-2.5 flex-wrap">
<h3 className="text-xl sm:text-2xl font-bold text-base-content leading-tight">
<h3 className={NEXT_MATCH_TITLE_CLASS}>
{nextMatch.title}
</h3>
<StatusBadge status={getStatusLabel(nextMatch.status)} />
</div>
<p className="text-sm text-base-content/50 max-w-xl leading-relaxed">
<p className={NEXT_MATCH_DESCRIPTION_CLASS}>
{nextMatch.description}
</p>
<div className="flex items-center gap-3 text-xs text-base-content/40 flex-wrap">
<div className={NEXT_MATCH_META_CLASS}>
<span>{nextMatch.date} {nextMatch.time}</span>
<span className="text-base-content/15">|</span>
<span>
<span className={NEXT_MATCH_PARTICIPANT_BADGE_CLASS}>
{nextMatch.participants.length}/{nextMatch.maxParticipants}명
</span>
<span className="text-base-content/15">|</span>
@@ -142,7 +590,7 @@ export default function HomePage() {
</div>
</div>
<div className="sm:shrink-0">
<span className="btn btn-primary btn-sm px-6 text-xs font-semibold">
<span className={DETAIL_BUTTON_CLASS}>
상세 보기
</span>
</div>
@@ -151,28 +599,30 @@ export default function HomePage() {
</div>
</Link>
) : (
<div className="border border-base-content/10 bg-base-100 px-5 py-10 text-center text-sm text-base-content/40">
아직 등록된 내전이 없습니다.
<div className="border border-base-content/10 bg-base-200/50">
<div className="p-5 sm:p-6 min-h-[150px] flex items-center justify-center text-center text-sm text-base-content/40">
{EMPTY_SCHEDULE_TEXT}
</div>
</div>
)}
</section>
<section className="pb-6">
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
<h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
예정된 내전
</h2>
<div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-px bg-base-content/10 border border-base-content/10">
{upcomingCards.length > 0 ? (
upcomingCards.map((match) => (
<Link key={match.id} to={`/match/${match.id}`}>
<div className="bg-base-100 hover:bg-base-200/50 transition-colors cursor-pointer h-full p-4">
<div className={`${UPCOMING_CARD_FRAME_CLASS} hover:bg-base-200/50 transition-colors cursor-pointer`}>
<div className="flex items-center justify-between mb-2.5">
<h3 className="text-sm font-bold text-base-content truncate mr-2">
<h3 className={UPCOMING_CARD_TITLE_CLASS}>
{match.title}
</h3>
<StatusBadge status={getStatusLabel(match.status)} />
</div>
<div className="space-y-1 text-xs text-base-content/40">
<div className={UPCOMING_CARD_META_CLASS}>
<div>{match.date} {match.time}</div>
<div>
{match.participants.length}/{match.maxParticipants}명
@@ -185,70 +635,144 @@ export default function HomePage() {
</Link>
))
) : (
<div className="bg-base-100 px-4 py-6 text-sm text-base-content/35 col-span-full">
예정된 추가 매치가 없습니다.
<div className={`${UPCOMING_CARD_FRAME_CLASS} sm:col-span-2 lg:col-span-3 flex items-center justify-center text-center text-sm text-base-content/35`}>
{EMPTY_SCHEDULE_TEXT}
</div>
)}
</div>
</section>
<section className="pb-12">
<h2 className="text-xs font-bold text-base-content/40 uppercase tracking-widest mb-3">
<section
className="pb-12"
aria-busy={isHistoryPageLoading}
aria-live="polite"
>
<h2 className={`${SECTION_HEADING_CLASS} mb-3`}>
지난 내전 기록
</h2>
<div className="border border-base-content/10 overflow-x-auto">
<table className="w-full text-left">
<thead>
<tr className="bg-base-200/60 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/40">
<th className="py-2.5 px-4 font-semibold">날짜</th>
<th className="py-2.5 px-4 font-semibold">내전</th>
<th className="py-2.5 px-4 font-semibold">맵</th>
<th className="py-2.5 px-4 font-semibold">참가</th>
<th className="py-2.5 px-4 font-semibold">결과</th>
</tr>
</thead>
<tbody>
{finishedMatches.length > 0 ? (
finishedMatches.map((match) => (
<tr
key={match.id}
className="border-b border-base-content/5 last:border-b-0 hover:bg-base-content/[0.02] transition-colors"
>
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
{match.date}
</td>
<td className="py-2.5 px-4">
<Link
to={`/match/${match.id}`}
className="text-sm font-medium text-base-content hover:text-primary transition-colors"
{isHistoryPageLoading ? (
<HistoryRecordsSkeleton rows={HISTORY_MATCH_PAGE_SIZE} />
) : hasHistoryError ? (
<div className="border border-base-content/10 px-4 py-8 text-center text-sm text-red-500">
지난 내전 기록을 불러오지 못했습니다.
</div>
) : (
<>
{/* 데스크톱: 테이블 */}
<div className="hidden md:block border border-base-content/10 overflow-x-auto">
<table className="w-full table-fixed text-left">
<HistoryTableColGroup />
<HistoryTableHeader />
<tbody>
{historyMatches.length > 0 ? (
historyMatches.map((match) => (
<tr
key={match.id}
className={`${HISTORY_TABLE_ROW_CLASS} hover:bg-base-content/[0.02] transition-colors`}
>
{match.title}
</Link>
</td>
<td className="py-2.5 px-4">
<MapBadge map={match.map} />
</td>
<td className="py-2.5 px-4 text-xs text-base-content/50">
{match.participants.length}명
</td>
<td className="py-2.5 px-4 text-xs text-base-content/50">
{match.result?.winner ? `${match.result.winner} 승리` : '-'}
</td>
</tr>
))
<td className="py-2.5 px-4 text-xs text-base-content/40 whitespace-nowrap">
{match.date}
</td>
<td className="py-2.5 px-4">
<Link
to={`/match/${match.id}`}
className="block truncate text-sm font-medium text-base-content hover:text-primary transition-colors"
>
{match.title}
</Link>
</td>
<td className="py-2.5 px-4">
<StatusBadge status={getStatusLabel(match.status)} />
</td>
<td className="py-2.5 px-4">
<MapBadge map={match.map} />
</td>
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
{match.participants.length}명
</td>
<td className="py-2.5 px-4 text-xs text-base-content/50 whitespace-nowrap">
<span className="block truncate">
{match.result?.winner
? `${match.result.winner} 승리`
: '-'}
</span>
</td>
</tr>
))
) : (
<tr>
<td
colSpan={6}
className="py-6 px-4 text-sm text-base-content/35 text-center"
>
아직 내전 기록이 없습니다.
</td>
</tr>
)}
</tbody>
</table>
</div>
{/* 모바일: 카드 리스트 */}
<div className="md:hidden border border-base-content/10">
{historyMatches.length > 0 ? (
historyMatches.map((match) => {
const resultLabel = match.result?.winner
? `${match.result.winner} 승리`
: undefined;
return (
<Link
key={match.id}
to={`/match/${match.id}`}
className="block border-b border-base-content/5 last:border-b-0 p-3 hover:bg-base-content/[0.02] transition-colors"
>
<div className="flex items-start justify-between gap-3">
<div className="min-w-0 flex-1">
<div className={HISTORY_MOBILE_DATE_CLASS}>
{match.compactDateTime ||
`${match.date} ${match.time}`}
</div>
<div className={HISTORY_MOBILE_TITLE_CLASS}>
{match.title}
</div>
</div>
<div className="shrink-0">
<StatusBadge
status={getStatusLabel(match.status)}
/>
</div>
</div>
<div className="mt-2">
<HistoryMetaText
map={match.map}
participants={match.participants.length}
result={resultLabel}
/>
</div>
</Link>
);
})
) : (
<tr>
<td
colSpan={5}
className="py-6 px-4 text-sm text-base-content/35 text-center"
>
아직 종료된 내전 기록이 없습니다.
</td>
</tr>
<div className="py-6 px-4 text-sm text-base-content/35 text-center">
아직 내전 기록이 없습니다.
</div>
)}
</tbody>
</table>
</div>
</div>
</>
)}
{!hasHistoryError && historyTotal > 0 && (
<div className="mt-3 flex justify-end">
<HistoryPagination
page={historyPage}
pageCount={historyPageCount}
total={historyTotal}
isFetching={historyMatchesQuery.isFetching}
onPrevious={goToPreviousHistoryPage}
onNext={goToNextHistoryPage}
/>
</div>
)}
</section>
</main>
);
+92 -49
View File
@@ -1,24 +1,32 @@
import { Link, useLocation, useParams } from 'react-router';
import { useDdragonManifest, useInternalMatchDetail } from '../api/hooks';
import type { ApiInternalMatchDetailResponse, TeamSide } from '../api/types';
import { DEFAULT_COMMUNITY_ID } from '../config';
import { championDisplayName, championIconUrl, itemIconUrl } from '../lib/ddragon';
import { sideShortLabel, teamIndexColorClasses, teamIndexLabel } from '../lib/league';
import { LANE_LABELS } from '../lib/riot-history';
import { Link, useLocation, useParams } from "react-router";
import { useDdragonManifest, useInternalMatchDetail } from "../api/hooks";
import type { ApiInternalMatchDetailResponse, TeamSide } from "../api/types";
import { DEFAULT_COMMUNITY_ID } from "../config";
import {
championDisplayName,
championIconUrl,
itemIconUrl,
} from "../lib/ddragon";
import {
sideShortLabel,
teamIndexColorClasses,
teamIndexLabel,
} from "../lib/league";
import { LANE_LABELS } from "../lib/riot-history";
function formatDateTime(value: string | number) {
return new Intl.DateTimeFormat('ko-KR', {
month: 'long',
day: 'numeric',
hour: '2-digit',
minute: '2-digit',
return new Intl.DateTimeFormat("ko-KR", {
month: "long",
day: "numeric",
hour: "2-digit",
minute: "2-digit",
}).format(new Date(value));
}
function formatDuration(seconds: number) {
const minutes = Math.floor(seconds / 60);
const rest = seconds % 60;
return `${minutes}:${String(rest).padStart(2, '0')}`;
return `${minutes}:${String(rest).padStart(2, "0")}`;
}
function sideLabel(side: TeamSide) {
@@ -26,7 +34,9 @@ function sideLabel(side: TeamSide) {
}
function sideClass(side: TeamSide) {
return side === 'blue' ? 'text-blue-400 border-blue-500/20' : 'text-red-400 border-red-500/20';
return side === "blue"
? "text-blue-400 border-blue-500/20"
: "text-red-400 border-red-500/20";
}
function ChampionCell({
@@ -34,16 +44,18 @@ function ChampionCell({
manifest,
}: {
championId: number;
manifest: ReturnType<typeof useDdragonManifest>['data'];
manifest: ReturnType<typeof useDdragonManifest>["data"];
}) {
const icon = championIconUrl(manifest, championId);
const name = championDisplayName(manifest, championId) ?? String(championId);
return (
<div className="flex items-center gap-2 min-w-0">
<span className="w-8 h-8 bg-base-content/10 overflow-hidden shrink-0">
{icon ? <img src={icon} alt="" className="w-full h-full object-cover" /> : null}
{icon ? (
<img src={icon} alt="" className="w-full h-full object-cover" />
) : null}
</span>
<span className="font-bold text-[13px] truncate">{name}</span>
<span className="font-bold text-sm truncate">{name}</span>
</div>
);
}
@@ -55,7 +67,7 @@ function ItemStrip({
}: {
items: number[];
trinket: number;
manifest: ReturnType<typeof useDdragonManifest>['data'];
manifest: ReturnType<typeof useDdragonManifest>["data"];
}) {
return (
<div className="flex flex-wrap gap-1">
@@ -66,7 +78,9 @@ function ItemStrip({
key={`${itemId}-${index}`}
className="w-5 h-5 bg-base-content/10 border border-base-content/5 overflow-hidden"
>
{icon ? <img src={icon} alt="" className="w-full h-full object-cover" /> : null}
{icon ? (
<img src={icon} alt="" className="w-full h-full object-cover" />
) : null}
</span>
);
})}
@@ -78,8 +92,8 @@ function GamePanel({
game,
manifest,
}: {
game: ApiInternalMatchDetailResponse['games'][number];
manifest: ReturnType<typeof useDdragonManifest>['data'];
game: ApiInternalMatchDetailResponse["games"][number];
manifest: ReturnType<typeof useDdragonManifest>["data"];
}) {
const location = useLocation();
const historyBackTo = `${location.pathname}${location.search}${location.hash}`;
@@ -91,8 +105,9 @@ function GamePanel({
<h2 className="text-sm font-black text-base-content">
{game.gameNumber}경기
</h2>
<p className="mt-1 text-[11px] text-base-content/35">
{formatDateTime(game.gameCreation)} · {formatDuration(game.gameDuration)} ·{' '}
<p className="mt-1 text-xs text-base-content/35">
{formatDateTime(game.gameCreation)} ·{" "}
{formatDuration(game.gameDuration)} ·{" "}
<span className="font-mono">{game.riotMatchId}</span>
</p>
</div>
@@ -100,27 +115,33 @@ function GamePanel({
{game.teams.map((team) => (
<span
key={team.side}
className={`border px-2 py-1 text-[11px] font-black ${sideClass(team.side)} ${
team.win ? 'bg-base-content/5' : 'opacity-40'
className={`border px-2 py-1 text-xs font-black ${sideClass(team.side)} ${
team.win ? "bg-base-content/5" : "opacity-40"
}`}
>
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}){' '}
{team.win ? '승' : '패'}
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}){" "}
{team.win ? "승" : "패"}
</span>
))}
</div>
</div>
{game.teams.map((team) => (
<div key={team.side} className="border-b border-base-content/8 last:border-b-0">
<div className={`px-4 py-2 text-[11px] font-black uppercase tracking-wider ${sideClass(team.side)}`}>
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}) · 바론 {team.objectives.baron} · 드래곤{' '}
{team.objectives.dragon} · 타워 {team.objectives.tower}
<div
key={team.side}
className="border-b border-base-content/8 last:border-b-0"
>
<div
className={`px-4 py-2 text-xs font-black uppercase tracking-wider ${sideClass(team.side)}`}
>
{teamIndexLabel(team.teamIndex)} ({sideLabel(team.side)}) · 바론{" "}
{team.objectives.baron} · 드래곤 {team.objectives.dragon} · 타워{" "}
{team.objectives.tower}
</div>
<div className="overflow-x-auto">
<table className="w-full text-left min-w-[980px]">
<thead>
<tr className="bg-base-content/[0.02] text-[11px] text-base-content/35 uppercase tracking-wider">
<tr className="bg-base-content/[0.02] text-xs text-base-content/35 uppercase tracking-wider">
<th className="px-3 py-2">소환사</th>
<th className="px-3 py-2">챔피언</th>
<th className="px-3 py-2 text-center">포지션</th>
@@ -143,39 +164,44 @@ function GamePanel({
<Link
to={`/users/${participant.userId}/history?queueGroup=internal`}
state={{ backTo: historyBackTo }}
className="font-bold text-[13px] hover:text-primary"
className="font-bold text-sm hover:text-primary"
>
{participant.summonerName}
</Link>
) : (
<span className="font-bold text-[13px]">
<span className="font-bold text-sm">
{participant.summonerName}
</span>
)}
</td>
<td className="px-3 py-2">
<ChampionCell championId={participant.championId} manifest={manifest} />
<ChampionCell
championId={participant.championId}
manifest={manifest}
/>
</td>
<td className="px-3 py-2 text-center text-[12px]">
{LANE_LABELS[participant.teamPosition] ?? participant.teamPosition ?? '-'}
<td className="px-3 py-2 text-center text-xs">
{LANE_LABELS[participant.teamPosition] ??
participant.teamPosition ??
"-"}
</td>
<td className="px-3 py-2 text-center text-[13px] font-black tabular-nums">
<td className="px-3 py-2 text-center text-sm font-black tabular-nums">
{participant.kills}
<span className="text-base-content/25"> / </span>
<span className="text-red-400">{participant.deaths}</span>
<span className="text-base-content/25"> / </span>
{participant.assists}
</td>
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
<td className="px-3 py-2 text-center text-xs tabular-nums">
{participant.cs} ({participant.csPerMin}/m)
</td>
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
<td className="px-3 py-2 text-center text-xs tabular-nums">
{participant.gpm}
</td>
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
<td className="px-3 py-2 text-center text-xs tabular-nums">
{participant.killParticipation}%
</td>
<td className="px-3 py-2 text-center text-[12px] tabular-nums">
<td className="px-3 py-2 text-center text-xs tabular-nums">
{participant.damageShare}%
</td>
<td className="px-3 py-2">
@@ -248,21 +274,38 @@ export default function InternalMatchDetailPage() {
{detail.match.title}
</h1>
<p className="mt-2 text-sm text-base-content/45">
{formatDateTime(detail.match.scheduledAt)} · {detail.match.gameCount}전제
{formatDateTime(detail.match.scheduledAt)} ·{" "}
{detail.match.gameCount}전제
</p>
</div>
{primarySeries && (
<div className="flex items-center gap-6">
<div className={primarySeries.winnerTeamIndex === primarySeries.teamAIndex ? teamIndexColorClasses(primarySeries.teamAIndex).text : 'text-base-content/30'}>
<div className="text-4xl font-black tabular-nums">{primarySeries.teamAWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
<div
className={
primarySeries.winnerTeamIndex === primarySeries.teamAIndex
? teamIndexColorClasses(primarySeries.teamAIndex).text
: "text-base-content/30"
}
>
<div className="text-4xl font-black tabular-nums">
{primarySeries.teamAWins}
</div>
<div className="text-xs font-bold uppercase tracking-wider">
{teamName(primarySeries.teamAIndex)}
</div>
</div>
<div className="text-base-content/15 text-xs font-black">VS</div>
<div className={primarySeries.winnerTeamIndex === primarySeries.teamBIndex ? teamIndexColorClasses(primarySeries.teamBIndex).text : 'text-base-content/30'}>
<div className="text-4xl font-black tabular-nums">{primarySeries.teamBWins}</div>
<div className="text-[10px] font-bold uppercase tracking-wider">
<div
className={
primarySeries.winnerTeamIndex === primarySeries.teamBIndex
? teamIndexColorClasses(primarySeries.teamBIndex).text
: "text-base-content/30"
}
>
<div className="text-4xl font-black tabular-nums">
{primarySeries.teamBWins}
</div>
<div className="text-xs font-bold uppercase tracking-wider">
{teamName(primarySeries.teamBIndex)}
</div>
</div>
File diff suppressed because it is too large. Load diff
+25 -112
View File
@@ -6,7 +6,8 @@ import {
useMatch,
useUserHistoryProfile,
} from "../api/hooks";
import { formatKoreanDate, formatTierLabel } from "../api/mappers";
import { formatKoreanDate } from "../api/mappers";
import { RankBadge } from "../components/RankBadge";
import type {
ApiMatch,
ApiMatchGameResult,
@@ -45,94 +46,6 @@ function tierByQueue(tiers: ApiTierInfo[], queueType: string) {
return tiers.find((tier) => tier.queueType === queueType);
}
function normalizeRank(rank: string | undefined) {
switch (rank) {
case "I":
return "1";
case "II":
return "2";
case "III":
return "3";
case "IV":
return "4";
default:
return rank;
}
}
function formatRankTooltip(tier: ApiTierInfo | undefined) {
if (!tier) return "언랭크";
const highTier = ["MASTER", "GRANDMASTER", "CHALLENGER"].includes(tier.tier);
const normalizedTier = {
...tier,
rank: normalizeRank(tier.rank) ?? tier.rank,
};
const label = highTier
? formatTierLabel({ ...normalizedTier, leaguePoints: 0 })
: formatTierLabel(normalizedTier);
return `${label} - ${tier.leaguePoints}LP`;
}
function formatRankBadge(tier: ApiTierInfo | undefined) {
if (!tier) return "U";
const tierInitial =
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
const rank = normalizeRank(tier.rank);
return rank ? `${tierInitial}${rank}` : tierInitial;
}
function rankBadgeClass(tier: ApiTierInfo | undefined) {
switch (tier?.tier) {
case "CHALLENGER":
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
case "GRANDMASTER":
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
case "MASTER":
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
case "DIAMOND":
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
case "EMERALD":
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
case "PLATINUM":
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
case "GOLD":
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
case "SILVER":
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
case "BRONZE":
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
case "IRON":
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
default:
return "border-base-content/30 bg-transparent text-base-content/50";
}
}
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
const tooltip = formatRankTooltip(tier);
return (
<span className="tooltip tooltip-left" data-tip={tooltip}>
<span
className={`inline-flex h-[17px] min-w-[18px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
aria-label={tooltip}
>
{formatRankBadge(tier)}
</span>
</span>
);
}
function SummonerStatsSummary({
assignedPosition,
fallbackTier,
@@ -151,17 +64,17 @@ function SummonerStatsSummary({
return (
<div className="ml-auto flex min-w-[148px] shrink-0 flex-col items-end text-right leading-tight">
<div className="text-[11px] font-black text-primary">
<div className="text-xs font-black text-primary">
{assignedPosition ? positionLabel[assignedPosition] : "-"}
</div>
<div className="mt-1 flex items-center justify-end gap-2 text-[10px] font-black text-base-content/35">
<div className="mt-1 flex items-center justify-end gap-2 text-xs font-black text-base-content/35">
<span className="inline-flex items-center gap-1">
<span>SOLO</span>
<RankBadge tier={soloTier} />
<RankBadge tier={soloTier} size="sm" tooltipPlacement="left" />
</span>
<span className="inline-flex items-center gap-1">
<span>FLEX</span>
<RankBadge tier={flexTier} />
<RankBadge tier={flexTier} size="sm" tooltipPlacement="left" />
</span>
</div>
</div>
@@ -216,12 +129,12 @@ function ParticipantLine({
{name}
</span>
{isCaptain && (
<span className="shrink-0 border border-amber-500/20 bg-amber-500/10 px-1.5 py-0.5 text-[10px] font-bold text-amber-500">
<span className="shrink-0 border border-accent/20 bg-accent/10 px-1.5 py-0.5 text-xs font-bold text-amber-500">
팀장
</span>
)}
</div>
<div className="text-[11px] text-base-content/30">#{tag}</div>
<div className="text-xs text-base-content/30">#{tag}</div>
</div>
<SummonerStatsSummary
assignedPosition={assignedPosition}
@@ -305,7 +218,7 @@ function UpcomingGameCard({
<div className="flex items-center justify-between gap-2">
<div className="flex items-center gap-2">
<span
className={`border px-2 py-1 text-[11px] font-black ${
className={`border px-2 py-1 text-xs font-black ${
isNext
? "border-primary/25 bg-primary/10 text-primary"
: "border-base-content/10 bg-base-content/5 text-base-content/55"
@@ -313,14 +226,14 @@ function UpcomingGameCard({
>
{isNext ? "다음 경기" : `${slot.gameNumber}경기`}
</span>
<span className="text-[11px] font-semibold text-base-content/35">
<span className="text-xs font-semibold text-base-content/35">
{sideShortLabel(ourSide)}
</span>
</div>
{finished ? (
<div className="flex items-center gap-2">
<span
className={`border px-2 py-1 text-[11px] font-black ${resultBadgeClass(won)}`}
className={`border px-2 py-1 text-xs font-black ${resultBadgeClass(won)}`}
>
{won ? "승리" : "패배"}
</span>
@@ -361,12 +274,12 @@ function UpcomingGameCard({
{ourTeamName}
</div>
{ourCaptainName && (
<div className="mt-1 truncate text-[11px] text-base-content/35">
<div className="mt-1 truncate text-xs text-base-content/35">
팀장 {ourCaptainName}
</div>
)}
</div>
<div className="pt-0.5 text-[10px] font-black uppercase tracking-wider text-base-content/25">
<div className="pt-0.5 text-xs font-black uppercase tracking-wider text-base-content/25">
vs
</div>
<div className="min-w-0 text-right">
@@ -374,7 +287,7 @@ function UpcomingGameCard({
{opponentTeamName}
</div>
{opponentCaptainName && (
<div className="mt-1 truncate text-[11px] text-base-content/35">
<div className="mt-1 truncate text-xs text-base-content/35">
팀장 {opponentCaptainName}
</div>
)}
@@ -382,25 +295,25 @@ function UpcomingGameCard({
</div>
<div className="mt-4 border border-base-content/8 bg-base-content/[0.02] px-3 py-2">
<div className="text-[10px] font-black uppercase tracking-wider text-base-content/35">
<div className="text-xs font-black uppercase tracking-wider text-base-content/35">
토너먼트 코드
</div>
<div className="mt-1 flex items-center gap-2">
{slot.code ? (
<>
<code className="min-w-0 flex-1 truncate font-mono text-[12px] font-black text-primary">
<code className="min-w-0 flex-1 truncate font-mono text-xs font-black text-primary">
{slot.code}
</code>
<button
type="button"
className="border border-base-content/10 px-2 py-1 text-[10px] font-bold text-base-content/45 hover:text-primary"
className="border border-base-content/10 px-2 py-1 text-xs font-bold text-base-content/45 hover:text-primary"
onClick={handleCopy}
>
{copied ? "복사됨" : "복사"}
</button>
</>
) : (
<span className="text-[12px] font-semibold text-base-content/30">
<span className="text-xs font-semibold text-base-content/30">
발급 대기
</span>
)}
@@ -411,14 +324,14 @@ function UpcomingGameCard({
<div className="mt-3 border border-base-content/8 bg-base-content/[0.015]">
<div className="flex items-center justify-between gap-2 border-b border-base-content/8 px-3 py-2">
<div>
<div className="text-[11px] font-black text-base-content/55">
<div className="text-xs font-black text-base-content/55">
상대팀 멤버
</div>
<div className="mt-0.5 text-[10px] text-base-content/30">
<div className="mt-0.5 text-xs text-base-content/30">
라인 · 티어
</div>
</div>
<div className="truncate text-right text-[11px] font-bold text-base-content/45">
<div className="truncate text-right text-xs font-bold text-base-content/45">
{opponentTeamName}
</div>
</div>
@@ -442,7 +355,7 @@ function UpcomingGameCard({
)}
{finished && game?.riotMatchId && (
<div className="mt-2 truncate font-mono text-[10px] text-base-content/25">
<div className="mt-2 truncate font-mono text-xs text-base-content/25">
{game.riotMatchId}
</div>
)}
@@ -482,14 +395,14 @@ function TeamGameCardsSection({
return (
<section className="mb-4 border border-base-content/10 bg-base-100">
<div className="flex flex-col gap-1 border-b border-base-content/10 bg-base-200/40 px-4 py-3 sm:flex-row sm:items-center sm:justify-between">
<h2 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
<h2 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
{title}
</h2>
<div className="sm:text-right">
<div className="text-sm font-black text-base-content/70">
{formatted.date} {formatted.time}
</div>
<div className="mt-0.5 text-[11px] font-semibold text-base-content/35">
<div className="mt-0.5 text-xs font-semibold text-base-content/35">
{GAME_MODE_LABEL[match.gameMode]}
</div>
</div>
@@ -685,7 +598,7 @@ export default function MatchTeamProgressPage() {
<section className="border border-base-content/10 bg-base-100">
<div className="border-b border-base-content/10 bg-base-200/40 px-4 py-2">
<h2 className="text-[11px] font-bold uppercase tracking-wider text-base-content/40">
<h2 className="text-xs font-bold uppercase tracking-wider text-base-content/40">
팀 구성
</h2>
</div>
+60 -145
View File
@@ -1,4 +1,4 @@
import { useState } from "react";
import { lazy, Suspense, useState } from "react";
import { useQueryClient } from "@tanstack/react-query";
import { ChevronDown, ChevronUp } from "lucide-react";
import { Link, useLocation, useParams, useSearchParams } from "react-router";
@@ -16,7 +16,6 @@ import { useRiotRefreshSocket } from "../api/useRiotRefreshSocket";
import type {
ApiChampionStatsRow,
ApiEnqueueRefreshResult,
ApiTierInfo,
ApiRiotRefreshEvent,
ApiRecentMatchTeam,
ApiRecentMatchTeamParticipant,
@@ -43,6 +42,9 @@ import {
QUEUE_GROUP_TABS,
RANK_FILTER_TABS,
} from "../lib/riot-history";
import { ResponsiveTierLabel } from "../components/RankBadge";
// recharts가 무거워 메인 번들에서 분리한다 (전적 페이지에서만 로드).
const TierHistoryChart = lazy(() => import("../components/TierHistoryChart"));
type ChampionSortKey = "games" | "winRate" | "kda" | "avgCsPerMin";
@@ -57,19 +59,6 @@ const SORT_LABELS: Record<ChampionSortKey, string> = {
avgCsPerMin: "분당 CS",
};
const TIER_NAMES: Record<string, string> = {
IRON: "아이언",
BRONZE: "브론즈",
SILVER: "실버",
GOLD: "골드",
PLATINUM: "플래티넘",
EMERALD: "에메랄드",
DIAMOND: "다이아몬드",
MASTER: "마스터",
GRANDMASTER: "그랜드마스터",
CHALLENGER: "챌린저",
};
function resolveBackTo(state: unknown) {
if (!state || typeof state !== "object") return "/";
const backTo = (state as HistoryLocationState).backTo;
@@ -83,90 +72,6 @@ function resolveBackTo(state: unknown) {
return backTo;
}
function normalizeRank(rank: string | undefined) {
switch (rank) {
case "I":
return "1";
case "II":
return "2";
case "III":
return "3";
case "IV":
return "4";
default:
return rank;
}
}
function formatRankBadge(tier: ApiTierInfo | undefined) {
if (!tier) return "U";
const tierInitial =
tier.tier === "GRANDMASTER" ? "GM" : tier.tier.slice(0, 1);
const rank = normalizeRank(tier.rank);
return rank ? `${tierInitial}${rank}` : tierInitial;
}
function formatRankDetail(tier: ApiTierInfo | undefined) {
if (!tier) return "랭크 정보 없음";
const tierName = TIER_NAMES[tier.tier] ?? tier.tier;
const rank = normalizeRank(tier.rank);
const label = rank ? `${tierName} ${rank}` : tierName;
return `${label} - ${tier.leaguePoints} LP`;
}
function rankBadgeClass(tier: ApiTierInfo | undefined) {
switch (tier?.tier) {
case "CHALLENGER":
return "border-amber-500/60 bg-amber-100 text-amber-900 dark:border-amber-400/40 dark:bg-amber-400/20 dark:text-amber-200";
case "GRANDMASTER":
return "border-red-500/60 bg-red-100 text-red-800 dark:border-red-400/40 dark:bg-red-400/20 dark:text-red-200";
case "MASTER":
return "border-fuchsia-500/60 bg-fuchsia-100 text-fuchsia-800 dark:border-fuchsia-400/40 dark:bg-fuchsia-400/20 dark:text-fuchsia-200";
case "DIAMOND":
return "border-cyan-500/60 bg-cyan-100 text-cyan-800 dark:border-cyan-400/40 dark:bg-cyan-400/20 dark:text-cyan-200";
case "EMERALD":
return "border-emerald-500/60 bg-emerald-100 text-emerald-800 dark:border-emerald-400/40 dark:bg-emerald-400/20 dark:text-emerald-200";
case "PLATINUM":
return "border-teal-500/60 bg-teal-100 text-teal-800 dark:border-teal-400/40 dark:bg-teal-400/20 dark:text-teal-200";
case "GOLD":
return "border-amber-500/70 bg-amber-100 text-amber-900 dark:border-yellow-400/40 dark:bg-yellow-400/20 dark:text-yellow-200";
case "SILVER":
return "border-slate-400/60 bg-slate-100 text-slate-700 dark:border-slate-300/40 dark:bg-slate-300/15 dark:text-slate-200";
case "BRONZE":
return "border-orange-600/60 bg-orange-100 text-orange-800 dark:border-orange-500/40 dark:bg-orange-500/20 dark:text-orange-200";
case "IRON":
return "border-stone-500/60 bg-stone-100 text-stone-700 dark:border-stone-400/40 dark:bg-stone-400/15 dark:text-stone-300";
default:
return "border-base-content/30 bg-transparent text-base-content/50";
}
}
function RankBadge({ tier }: { tier?: ApiTierInfo }) {
const tooltip = formatRankDetail(tier);
return (
<span className="tooltip tooltip-bottom" data-tip={tooltip}>
<span
className={`inline-flex h-[18px] min-w-[20px] shrink-0 items-center justify-center whitespace-nowrap rounded-[3px] border px-1 text-[10px] font-black leading-none ${rankBadgeClass(tier)}`}
aria-label={tooltip}
>
{formatRankBadge(tier)}
</span>
</span>
);
}
function ResponsiveTierLabel({ tier }: { tier?: ApiTierInfo }) {
return (
<span className="inline-flex items-center gap-1.5 whitespace-nowrap">
<RankBadge tier={tier} />
<span className="hidden font-bold text-base-content/55 sm:inline">
{formatRankDetail(tier)}
</span>
</span>
);
}
function formatDuration(seconds: number) {
const minutes = Math.floor(seconds / 60);
const rest = seconds % 60;
@@ -238,7 +143,7 @@ function FilterButton({
<button
type="button"
onClick={onClick}
className={`px-3 py-2 text-[12px] font-semibold border-b-2 transition-colors ${
className={`px-3 py-2 text-xs font-semibold border-b-2 transition-colors ${
active
? "border-primary text-primary bg-primary/5"
: "border-transparent text-base-content/45 hover:text-base-content"
@@ -289,14 +194,14 @@ function SummaryCard({
}) {
return (
<div className="border border-base-content/8 bg-base-100 p-4">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
<div className="text-xs font-bold uppercase tracking-wider text-base-content/30">
{label}
</div>
<div className="mt-2 text-2xl font-black text-base-content tabular-nums">
{value}
</div>
{sub && (
<div className="mt-1 text-[11px] text-base-content/40">{sub}</div>
<div className="mt-1 text-xs text-base-content/40">{sub}</div>
)}
</div>
);
@@ -326,7 +231,7 @@ function ChampionStatsTable({
<div className="overflow-x-auto">
<table className="w-full text-left min-w-[860px]">
<thead>
<tr className="bg-base-200/50 border-b border-base-content/10 text-[11px] text-base-content/35 uppercase tracking-wider">
<tr className="bg-base-200/50 border-b border-base-content/10 text-xs text-base-content/35 uppercase tracking-wider">
<th className="px-3 py-2.5">챔피언</th>
<th className="px-3 py-2.5 text-center">승률</th>
<th className="px-3 py-2.5 text-center">게임</th>
@@ -357,48 +262,48 @@ function ChampionStatsTable({
championId={row.championId}
manifest={manifest}
/>
<span className="text-[13px] font-bold text-base-content">
<span className="text-sm font-bold text-base-content">
{displayName}
</span>
</div>
</td>
<td
className={`px-3 py-2.5 text-center text-[13px] font-bold ${ratioClass(row.winRate)}`}
className={`px-3 py-2.5 text-center text-sm font-bold ${ratioClass(row.winRate)}`}
>
{row.winRate}%
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.games}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums text-base-content/55">
<td className="px-3 py-2.5 text-center text-xs tabular-nums text-base-content/55">
<span className="text-blue-400">{row.wins}</span> /{" "}
<span className="text-red-400">{row.losses}</span>
</td>
<td
className={`px-3 py-2.5 text-center text-[13px] font-bold tabular-nums ${kdaClass(row.kda)}`}
className={`px-3 py-2.5 text-center text-sm font-bold tabular-nums ${kdaClass(row.kda)}`}
>
{row.kda}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.totalKills}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.totalDeaths}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.totalAssists}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums text-base-content/55">
<td className="px-3 py-2.5 text-center text-xs tabular-nums text-base-content/55">
{row.doubleKills}/{row.tripleKills}/{row.quadraKills}/
{row.pentaKills}
</td>
<td className="px-3 py-2.5 text-center text-[12px] tabular-nums">
<td className="px-3 py-2.5 text-center text-xs tabular-nums">
{row.avgCs} · {row.avgCsPerMin}/m
</td>
<td className="px-3 py-2.5 text-center">
<button
type="button"
className={`text-[11px] px-2 py-1 border ${
className={`text-xs px-2 py-1 border ${
selected
? "border-primary/40 bg-primary/10 text-primary"
: "border-base-content/10 text-base-content/40 hover:text-base-content"
@@ -469,7 +374,7 @@ function TeamMini({
manifest: DdragonManifest | null | undefined;
}) {
return (
<div className="grid sm:grid-cols-2 gap-2 text-[11px]">
<div className="grid sm:grid-cols-2 gap-2 text-xs">
{match.teams.map((team) => (
<div
key={`${match.matchId}-${team.side}`}
@@ -594,7 +499,7 @@ function DetailStatBar({
}) {
return (
<div>
<div className="flex items-center justify-between gap-2 text-[10px] text-base-content/45">
<div className="flex items-center justify-between gap-2 text-xs text-base-content/45">
<span>{label}</span>
<span className="font-bold text-base-content/70 tabular-nums">
{formatCompactNumber(value)}
@@ -619,15 +524,15 @@ function TeamHeader({ team }: { team: ApiRecentMatchTeam }) {
<div className="px-3 py-2 flex flex-wrap items-center justify-between gap-2 border-b border-base-content/10">
<div className="flex items-center gap-2">
<span
className={`text-[11px] font-black uppercase tracking-wider ${sideClass}`}
className={`text-xs font-black uppercase tracking-wider ${sideClass}`}
>
{sideLabel}
</span>
<span className={`text-[11px] font-black ${resultClass}`}>
<span className={`text-xs font-black ${resultClass}`}>
{team.win ? "승리" : "패배"}
</span>
</div>
<div className="flex items-center gap-3 text-[11px] text-base-content/45">
<div className="flex items-center gap-3 text-xs text-base-content/45">
<span>드래곤 {team.objectives?.dragon ?? 0}</span>
<span>바론 {team.objectives?.baron ?? 0}</span>
<span>타워 {team.objectives?.tower ?? 0}</span>
@@ -660,7 +565,7 @@ function ParticipantRow({
return (
<div
className={`grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 items-center border-b border-base-content/5 border-l-2 px-3 py-2 text-[11px] last:border-b-0 ${
className={`grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 items-center border-b border-base-content/5 border-l-2 px-3 py-2 text-xs last:border-b-0 ${
isOwner
? "border-l-primary bg-primary/[0.05]"
: "border-l-transparent hover:bg-base-content/[0.02]"
@@ -677,7 +582,7 @@ function ParticipantRow({
/>
) : null}
{participant.championLevel > 0 && (
<span className="absolute bottom-0 right-0 min-w-4 bg-base-300 px-1 text-center text-[9px] font-black leading-4 text-base-content">
<span className="absolute bottom-0 right-0 min-w-4 bg-base-300 px-1 text-center text-xs font-black leading-4 text-base-content">
{participant.championLevel}
</span>
)}
@@ -711,7 +616,7 @@ function ParticipantRow({
>
{participantName}
</div>
<div className="truncate text-[10px] text-base-content/35">
<div className="truncate text-xs text-base-content/35">
{participant.tagLine ? `#${participant.tagLine} · ` : ""}
{(LANE_LABELS[participant.teamPosition] ?? participant.teamPosition) ||
"포지션 없음"}
@@ -727,13 +632,13 @@ function ParticipantRow({
<span className="text-base-content/25"> / </span>
{participant.assists}
</div>
<div className={`mt-0.5 text-[10px] font-bold ${kdaClass(kda)}`}>
<div className={`mt-0.5 text-xs font-bold ${kdaClass(kda)}`}>
{participant.deaths === 0 ? "Perfect" : `${kda} KDA`}
</div>
</div>
<div className="space-y-2 tabular-nums">
<div className="flex items-center justify-between gap-2 text-[10px] text-base-content/45">
<div className="flex items-center justify-between gap-2 text-xs text-base-content/45">
<span>CS</span>
<span className="font-bold text-base-content/70">
{participant.totalCs} ({participant.csPerMin}/m)
@@ -762,7 +667,7 @@ function ParticipantRow({
fillClass="bg-base-content/35"
/>
</div>
<div className="text-[10px] text-base-content/40">
<div className="text-xs text-base-content/40">
시야 {participant.visionScore} · 와드 {participant.wardsPlaced}/
{participant.wardsKilled} · 제어 {participant.controlWardsBought}
</div>
@@ -801,7 +706,7 @@ function MatchDetailPanel({
if (participants.length === 0) {
return (
<div className="p-4 text-center text-[12px] text-base-content/35">
<div className="p-4 text-center text-xs text-base-content/35">
이 경기의 상세 팀 데이터가 아직 없습니다.
</div>
);
@@ -816,7 +721,7 @@ function MatchDetailPanel({
>
<TeamHeader team={team} />
<div className="overflow-x-auto">
<div className="grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 border-b border-base-content/10 bg-base-200/40 px-3 py-2 text-[10px] font-black uppercase tracking-wider text-base-content/35">
<div className="grid min-w-[920px] grid-cols-[260px_86px_132px_220px_164px] gap-3 border-b border-base-content/10 bg-base-200/40 px-3 py-2 text-xs font-black uppercase tracking-wider text-base-content/35">
<div>소환사</div>
<div className="text-center">KDA</div>
<div>CS · 골드</div>
@@ -861,16 +766,16 @@ function RecentMatchCard({
>
<div className="p-4 grid lg:grid-cols-[120px_1fr_120px_1.5fr_40px] gap-4 items-center">
<div className="text-center lg:text-left">
<div className={`text-[12px] font-black ${resultClass}`}>
<div className={`text-xs font-black ${resultClass}`}>
{match.remake ? "다시하기" : match.win ? "승리" : "패배"}
</div>
<div className="text-[11px] text-base-content/35 mt-1">
<div className="text-xs text-base-content/35 mt-1">
{match.queueLabel}
</div>
<div className="text-[11px] text-base-content/25">
<div className="text-xs text-base-content/25">
{formatDate(match.gameCreation)}
</div>
<div className="text-[11px] text-base-content/25">
<div className="text-xs text-base-content/25">
{formatDuration(match.gameDuration)}
</div>
</div>
@@ -885,7 +790,7 @@ function RecentMatchCard({
<div className="font-bold text-base-content truncate">
{championName}
</div>
<div className="text-[11px] text-base-content/35">
<div className="text-xs text-base-content/35">
Lv.{match.championLevel} ·{" "}
{(LANE_LABELS[match.teamPosition] ?? match.teamPosition) ||
"포지션 없음"}
@@ -909,17 +814,17 @@ function RecentMatchCard({
<span>{match.assists}</span>
</div>
<div
className={`text-[12px] font-bold tabular-nums ${kdaClass(match.kda)}`}
className={`text-xs font-bold tabular-nums ${kdaClass(match.kda)}`}
>
{match.deaths === 0 ? "Perfect" : `${match.kda} 평점`}
</div>
<div className="mt-1 text-[11px] text-base-content/35">
<div className="mt-1 text-xs text-base-content/35">
킬 관여 {match.killParticipation}%
</div>
</div>
<div className="grid sm:grid-cols-[100px_1fr] gap-4 items-center">
<div className="space-y-1 text-[11px] text-base-content/45">
<div className="space-y-1 text-xs text-base-content/45">
<div>
CS{" "}
<span className="font-bold text-base-content/70">
@@ -960,7 +865,7 @@ function RecentMatchCard({
aria-expanded={expanded}
aria-label={expanded ? "상세 전적 접기" : "상세 전적 펼치기"}
>
<span className="text-[11px] font-bold lg:hidden">
<span className="text-xs font-bold lg:hidden">
{expanded ? "상세 접기" : "상세 보기"}
</span>
{expanded ? (
@@ -1251,7 +1156,7 @@ export default function UserHistoryPage() {
<span>최근 저장: {formatLastFetched(profile.lastFetchedAt)}</span>
</div>
</div>
<div className="border border-dashed border-base-content/10 px-3 py-2 text-[11px] text-base-content/35 sm:text-right space-y-2">
<div className="border border-dashed border-base-content/10 px-3 py-2 text-xs text-base-content/35 sm:text-right space-y-2">
<div>
{isInternalQueue ? (
<>
@@ -1281,7 +1186,7 @@ export default function UserHistoryPage() {
: "정보 갱신"}
</button>
{!isInternalQueue && (
<div className="text-[10px] text-base-content/25">
<div className="text-xs text-base-content/25">
갱신 소켓: {refreshSocket.connectionStatus}
</div>
)}
@@ -1294,6 +1199,16 @@ export default function UserHistoryPage() {
)}
</section>
{profile.tierHistory.length > 0 && (
<Suspense
fallback={
<div className="mb-5 h-[180px] border border-base-content/10 bg-base-100" />
}
>
<TierHistoryChart entries={profile.tierHistory} />
</Suspense>
)}
<section className="border border-base-content/10 bg-base-100 mb-5">
<div className="flex flex-wrap border-b border-base-content/8">
{QUEUE_GROUP_TABS.map((tab) => (
@@ -1324,14 +1239,14 @@ export default function UserHistoryPage() {
))}
</div>
) : (
<div className="px-3 py-2 text-[11px] text-base-content/40">
<div className="px-3 py-2 text-xs text-base-content/40">
내전 탭은 토너먼트 코드 결과 수집 데이터를 기준으로 집계합니다.
</div>
)}
{selectedChampionName && (
<button
type="button"
className="text-[11px] px-2.5 py-1 border border-primary/30 text-primary bg-primary/5"
className="text-xs px-2.5 py-1 border border-primary/30 text-primary bg-primary/5"
onClick={() => updateSearch({ championId: null })}
>
{selectedChampionName} 필터 해제
@@ -1389,7 +1304,7 @@ export default function UserHistoryPage() {
sub="가장 최근 경기 기준"
/>
<div className="border border-base-content/8 bg-base-100 p-4">
<div className="text-[10px] font-bold uppercase tracking-wider text-base-content/30">
<div className="text-xs font-bold uppercase tracking-wider text-base-content/30">
자주 플레이한 챔피언
</div>
<div className="mt-3 flex items-center gap-3">
@@ -1406,13 +1321,13 @@ export default function UserHistoryPage() {
championId={champion.championId}
manifest={ddragon}
/>
<div className="mt-1 text-[10px] text-base-content/40 group-hover:text-primary">
<div className="mt-1 text-xs text-base-content/40 group-hover:text-primary">
{champion.winRate}%
</div>
</button>
))}
{(summary?.topChampions ?? []).length === 0 && (
<span className="text-[11px] text-base-content/25">
<span className="text-xs text-base-content/25">
기록 없음
</span>
)}
@@ -1425,7 +1340,7 @@ export default function UserHistoryPage() {
<div className="flex flex-col sm:flex-row sm:items-end sm:justify-between gap-3 mb-3">
<div>
<h2 className="text-sm font-bold text-base-content">챔피언 통계</h2>
<p className="mt-1 text-[11px] text-base-content/35">
<p className="mt-1 text-xs text-base-content/35">
저장된 데이터를 기준으로 집계합니다. 최신 데이터가 반영되지 않을
수 있습니다.
</p>
@@ -1465,7 +1380,7 @@ export default function UserHistoryPage() {
<section>
<div className="flex items-center justify-between gap-3 mb-3">
<h2 className="text-sm font-bold text-base-content">매치 히스토리</h2>
<span className="text-[11px] text-base-content/35">
<span className="text-xs text-base-content/35">
최근 저장: {formatLastFetched(historyLastFetchedAt)}
</span>
</div>
@@ -61,7 +61,7 @@ function JobCard({
<div className="border border-base-content/10 bg-base-100 p-4">
<div className="flex flex-col sm:flex-row sm:items-start sm:justify-between gap-3">
<div>
<div className="text-[11px] font-mono text-base-content/35">
<div className="text-xs font-mono text-base-content/35">
{job.jobId}
</div>
<div className="mt-1 flex flex-wrap items-center gap-2">
@@ -92,7 +92,7 @@ function JobCard({
style={{ width: `${progress(job)}%` }}
/>
</div>
<div className="mt-2 flex flex-wrap justify-between gap-2 text-[11px] text-base-content/35">
<div className="mt-2 flex flex-wrap justify-between gap-2 text-xs text-base-content/35">
<span>
{formatDate(job.windowStart)} ~ {formatDate(job.windowEnd)}
</span>
@@ -306,7 +306,7 @@ export default function LegacyImportPage() {
<section className="border border-base-content/10 bg-base-100 overflow-hidden mb-6">
<div className="px-4 py-3 border-b border-base-content/10">
<h2 className="text-sm font-bold">멤버별 윈도우</h2>
<p className="mt-1 text-[11px] text-base-content/35">
<p className="mt-1 text-xs text-base-content/35">
기본 시작일은 2024-05-01이며, 필요하면 멤버별 시작/종료 시간을 조정할 수 있습니다.
비활성 멤버는 종료일이 마지막 업데이트 시각으로 잡힙니다.
</p>
@@ -314,7 +314,7 @@ export default function LegacyImportPage() {
<div className="overflow-x-auto">
<table className="w-full min-w-[900px] text-left">
<thead>
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
<th className="px-3 py-2">멤버</th>
<th className="px-3 py-2">Riot ID</th>
<th className="px-3 py-2">상태</th>
@@ -161,7 +161,7 @@ export default function LegacyMatchesPage() {
<div className="overflow-x-auto">
<table className="w-full min-w-[900px] text-left">
<thead>
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
<th className="px-3 py-2 w-8">
<input
type="checkbox"
@@ -218,7 +218,7 @@ export default function LegacyMatchesPage() {
<td className="px-3 py-2 text-right">
<button
type="button"
className="text-[11px] px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
className="text-xs px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
disabled={deleteMutation.isPending}
onClick={() => {
if (!window.confirm('이 매치를 삭제할까요?')) return;
+7 -7
View File
@@ -37,7 +37,7 @@ const GAME_MODE_LABEL: Record<MatchGameMode, string> = {
function RequiredBadge() {
return (
<span className="ml-1 inline-flex items-center border border-primary/20 bg-primary/5 px-1.5 py-0.5 text-[10px] font-bold text-primary">
<span className="ml-1 inline-flex items-center border border-primary/20 bg-primary/5 px-1.5 py-0.5 text-xs font-bold text-primary">
필수
</span>
);
@@ -267,7 +267,7 @@ export default function MatchAdminPage() {
</label>
<label className="text-xs text-base-content/45 md:col-span-2">
설명
<span className="ml-1 text-[10px] text-base-content/25">선택</span>
<span className="ml-1 text-xs text-base-content/25">선택</span>
<textarea
value={form.description}
onChange={(event) => setForm((current) => ({ ...current, description: event.target.value }))}
@@ -319,7 +319,7 @@ export default function MatchAdminPage() {
<option key={value} value={value}>{label}</option>
))}
</select>
<span className="mt-1 block text-[10px] text-amber-500/80">
<span className="mt-1 block text-xs text-amber-500/80">
현재 경매/코드 연결은 페어 방식 기준으로 동작합니다.
</span>
</label>
@@ -377,7 +377,7 @@ export default function MatchAdminPage() {
<div className="overflow-x-auto">
<table className="w-full min-w-[900px] text-left">
<thead>
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
<th className="px-3 py-2">시간</th>
<th className="px-3 py-2">내전</th>
<th className="px-3 py-2">상태</th>
@@ -396,7 +396,7 @@ export default function MatchAdminPage() {
<Link to={`/match/${match._id}`} className="text-sm font-bold hover:text-primary">
{match.title}
</Link>
<div className="mt-0.5 text-[11px] text-base-content/30">
<div className="mt-0.5 text-xs text-base-content/30">
{match.description || '-'}
</div>
</td>
@@ -411,14 +411,14 @@ export default function MatchAdminPage() {
<div className="inline-flex gap-2">
<button
type="button"
className="text-[11px] px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
className="text-xs px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
onClick={() => openEdit(match)}
>
수정
</button>
<button
type="button"
className="text-[11px] px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
className="text-xs px-2 py-1 border border-red-500/20 text-red-400 hover:bg-red-500/10"
disabled={deleteMutation.isPending}
onClick={() => {
if (!window.confirm('이 내전을 삭제할까요?')) return;
@@ -200,7 +200,7 @@ export default function TournamentCodesPage() {
<section className="grid sm:grid-cols-5 gap-3 mb-6">
{STATES.map((state) => (
<div key={state} className="border border-base-content/10 bg-base-100 p-4">
<div className="text-[10px] uppercase tracking-wider text-base-content/30">
<div className="text-xs uppercase tracking-wider text-base-content/30">
{state}
</div>
<div className="mt-2 text-2xl font-black tabular-nums">
@@ -273,7 +273,7 @@ export default function TournamentCodesPage() {
<div className="overflow-x-auto">
<table className="w-full min-w-[900px] text-left">
<thead>
<tr className="bg-base-200/40 border-b border-base-content/10 text-[11px] uppercase tracking-wider text-base-content/35">
<tr className="bg-base-200/40 border-b border-base-content/10 text-xs uppercase tracking-wider text-base-content/35">
<th className="px-3 py-2">코드</th>
<th className="px-3 py-2">상태</th>
<th className="px-3 py-2">만료</th>
@@ -309,7 +309,7 @@ export default function TournamentCodesPage() {
{(code.state === 'released' || code.state === 'reserved') && (
<button
type="button"
className="text-[11px] px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
className="text-xs px-2 py-1 border border-base-content/10 text-base-content/50 hover:text-primary"
onClick={() =>
restoreMutation.mutate(code._id, {
onSuccess: invalidate,
@@ -322,7 +322,7 @@ export default function TournamentCodesPage() {
{code.state === 'available' && (
<button
type="button"
className="text-[11px] px-2 py-1 border border-red-500/20 text-red-400"
className="text-xs px-2 py-1 border border-red-500/20 text-red-400"
onClick={() =>
deleteMutation.mutate(code._id, {
onSuccess: invalidate,
+60 -1
View File
@@ -1,10 +1,69 @@
import { defineConfig } from "vite";
import react from "@vitejs/plugin-react";
import tailwindcss from "@tailwindcss/vite";
import { createRequire } from "node:module";
import fs from "node:fs";
import path from "node:path";
const ES_TOOLKIT_COMPAT_RE = /^es-toolkit\/compat\/[A-Za-z0-9_$]+$/;
const VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX = "\0es-toolkit-compat-esm:";
function esToolkitCompatEsm() {
return {
name: "es-toolkit-compat-esm",
enforce: "pre" as const,
resolveId(source: string, importer?: string) {
if (!importer || !ES_TOOLKIT_COMPAT_RE.test(source)) {
return null;
}
const requireFromImporter = createRequire(importer);
const wrapperPath = requireFromImporter.resolve(source);
const wrapperSource = fs.readFileSync(wrapperPath, "utf8");
const wrapperMatch = wrapperSource.match(
/require\(['"](\.\.\/dist\/compat\/[^'"]+)\.js['"]\)\.([A-Za-z0-9_$]+)/,
);
if (!wrapperMatch) {
return null;
}
const [, esmPathWithoutExtension, exportName] = wrapperMatch;
const esmPath = path.resolve(
path.dirname(wrapperPath),
`${esmPathWithoutExtension}.mjs`,
);
return `${VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX}${encodeURIComponent(
exportName,
)}:${encodeURIComponent(esmPath)}`;
},
load(id: string) {
if (!id.startsWith(VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX)) {
return null;
}
const [encodedExportName, encodedEsmPath] = id
.slice(VIRTUAL_ES_TOOLKIT_COMPAT_PREFIX.length)
.split(":");
const exportName = decodeURIComponent(encodedExportName);
const esmPath = decodeURIComponent(encodedEsmPath);
return `export { ${exportName} as default, ${exportName} } from ${JSON.stringify(
esmPath,
)};`;
},
};
}
// https://vite.dev/config/
export default defineConfig({
plugins: [react(), tailwindcss()],
plugins: [esToolkitCompatEsm(), react(), tailwindcss()],
optimizeDeps: {
rolldownOptions: {
plugins: [esToolkitCompatEsm()],
},
},
server: {
host: "0.0.0.0",
allowedHosts: ["126.dahyeon.us"],
Binary file not shown.

After

Width:  |  Height:  |  Size: 176 KiB

Binary file not shown.
Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 198 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 88 KiB

After

Width:  |  Height:  |  Size: 106 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 188 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 54 KiB

After

Width:  |  Height:  |  Size: 92 KiB

+6 -4
View File
@@ -5,20 +5,22 @@
"main": "index.js",
"scripts": {
"start:api:dev": "pnpm --filter api start:dev",
"start:api:test": "pnpm --filter api start:test",
"start:api:staging": "pnpm --filter api start:staging",
"start:api:prod": "pnpm --filter api start:prod",
"start:api": "pnpm --filter api start:prod",
"start:web:dev": "pnpm --filter web start:dev",
"start:web:staging": "pnpm --filter web start:staging",
"build:api": "pnpm --filter api build",
"dev:web": "pnpm --filter web dev",
"build:web:test": "pnpm --filter web build:test",
"build:web:staging": "pnpm --filter web build:staging",
"build:web:prod": "pnpm --filter web build:prod",
"deploy:web:test": "node scripts/deploy-cloudflare-pages.mjs test",
"deploy:web:staging": "node scripts/deploy-cloudflare-pages.mjs staging",
"deploy:web:prod": "node scripts/deploy-cloudflare-pages.mjs prod",
"test": "echo \"Error: no test specified\" && exit 1"
},
"keywords": [],
"author": "",
"license": "ISC",
"license": "LGPL-2.0",
"packageManager": "pnpm@10.4.1",
"dependencies": {
"@infisical/sdk": "^5.0.0"
+313
View File
@@ -159,6 +159,9 @@ importers:
react-router:
specifier: ^7.14.0
version: 7.14.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5)
recharts:
specifier: ^3.8.1
version: 3.8.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@18.3.1)(react@19.2.5)(redux@5.0.1)
socket.io-client:
specifier: ^4.8.3
version: 4.8.3
@@ -1437,6 +1440,17 @@ packages:
peerDependencies:
'@redis/client': ^5.12.1
'@reduxjs/toolkit@2.12.0':
resolution: {integrity: sha512-KiT+RzZbp6mQET+Mg+h2c97+9j1sNflUxQkIHI7Yuzf6Peu+OYpmkn6nbHWmLLWj+1ZODUJFwGZ7gx3L9R9EOw==}
peerDependencies:
react: ^16.9.0 || ^17.0.0 || ^18 || ^19
react-redux: ^7.2.1 || ^8.1.3 || ^9.0.0
peerDependenciesMeta:
react:
optional: true
react-redux:
optional: true
'@rolldown/binding-android-arm64@1.0.0-rc.15':
resolution: {integrity: sha512-YYe6aWruPZDtHNpwu7+qAHEMbQ/yRl6atqb/AhznLTnD3UY99Q1jE7ihLSahNWkF4EqRPVC4SiR4O0UkLK02tA==}
engines: {node: ^20.19.0 || >=22.12.0}
@@ -1722,6 +1736,12 @@ packages:
'@speed-highlight/core@1.2.15':
resolution: {integrity: sha512-BMq1K3DsElxDWawkX6eLg9+CKJrTVGCBAWVuHXVUV2u0s2711qiChLSId6ikYPfxhdYocLNt3wWwSvDiTvFabw==}
'@standard-schema/spec@1.1.0':
resolution: {integrity: sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==}
'@standard-schema/utils@0.3.0':
resolution: {integrity: sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==}
'@tailwindcss/node@4.2.2':
resolution: {integrity: sha512-pXS+wJ2gZpVXqFaUEjojq7jzMpTGf8rU6ipJz5ovJV6PUGmlJ+jvIwGrzdHdQ80Sg+wmQxUFuoW1UAAwHNEdFA==}
@@ -1866,6 +1886,33 @@ packages:
'@types/cors@2.8.19':
resolution: {integrity: sha512-mFNylyeyqN93lfe/9CSxOGREz8cpzAhH+E93xJ4xWQf62V8sQ/24reV2nyzUWM6H6Xji+GGHpkbLe7pVoUEskg==}
'@types/d3-array@3.2.2':
resolution: {integrity: sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==}
'@types/d3-color@3.1.3':
resolution: {integrity: sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==}
'@types/d3-ease@3.0.2':
resolution: {integrity: sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==}
'@types/d3-interpolate@3.0.4':
resolution: {integrity: sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==}
'@types/d3-path@3.1.1':
resolution: {integrity: sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==}
'@types/d3-scale@4.0.9':
resolution: {integrity: sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==}
'@types/d3-shape@3.1.8':
resolution: {integrity: sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==}
'@types/d3-time@3.0.4':
resolution: {integrity: sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==}
'@types/d3-timer@3.0.2':
resolution: {integrity: sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==}
'@types/eslint-scope@3.7.7':
resolution: {integrity: sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==}
@@ -1934,6 +1981,9 @@ packages:
'@types/supertest@7.2.0':
resolution: {integrity: sha512-uh2Lv57xvggst6lCqNdFAmDSvoMG7M/HDtX4iUCquxQ5EGPtaPM5PL5Hmi7LCvOG8db7YaCPNJEeoI8s/WzIQw==}
'@types/use-sync-external-store@0.0.6':
resolution: {integrity: sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==}
'@types/validator@13.15.10':
resolution: {integrity: sha512-T8L6i7wCuyoK8A/ZeLYt1+q0ty3Zb9+qbSSvrIVitzT3YjZqkTZ40IbRsPanlB4h1QB3JVL1SYCdR6ngtFYcuA==}
@@ -2473,6 +2523,10 @@ packages:
resolution: {integrity: sha512-JQHZ2QMW6l3aH/j6xCqQThY/9OH4D/9ls34cgkUBiEeocRTU04tHfKPBsUK1PqZCUQM7GiA0IIXJSuXHI64Kbg==}
engines: {node: '>=0.8'}
clsx@2.1.1:
resolution: {integrity: sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==}
engines: {node: '>=6'}
cluster-key-slot@1.1.2:
resolution: {integrity: sha512-RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==}
engines: {node: '>=0.10.0'}
@@ -2569,6 +2623,50 @@ packages:
csstype@3.2.3:
resolution: {integrity: sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==}
d3-array@3.2.4:
resolution: {integrity: sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==}
engines: {node: '>=12'}
d3-color@3.1.0:
resolution: {integrity: sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==}
engines: {node: '>=12'}
d3-ease@3.0.1:
resolution: {integrity: sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==}
engines: {node: '>=12'}
d3-format@3.1.2:
resolution: {integrity: sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==}
engines: {node: '>=12'}
d3-interpolate@3.0.1:
resolution: {integrity: sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==}
engines: {node: '>=12'}
d3-path@3.1.0:
resolution: {integrity: sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==}
engines: {node: '>=12'}
d3-scale@4.0.2:
resolution: {integrity: sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==}
engines: {node: '>=12'}
d3-shape@3.2.0:
resolution: {integrity: sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==}
engines: {node: '>=12'}
d3-time-format@4.1.0:
resolution: {integrity: sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==}
engines: {node: '>=12'}
d3-time@3.1.0:
resolution: {integrity: sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==}
engines: {node: '>=12'}
d3-timer@3.0.1:
resolution: {integrity: sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==}
engines: {node: '>=12'}
daisyui@5.5.19:
resolution: {integrity: sha512-pbFAkl1VCEh/MPCeclKL61I/MqRIFFhNU7yiXoDDRapXN4/qNCoMxeCCswyxEEhqL5eiTTfwHvucFtOE71C9sA==}
@@ -2581,6 +2679,9 @@ packages:
supports-color:
optional: true
decimal.js-light@2.5.1:
resolution: {integrity: sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==}
dedent@1.7.2:
resolution: {integrity: sha512-WzMx3mW98SN+zn3hgemf4OzdmyNhhhKz5Ay0pUfQiMQ3e1g+xmTJWp/pKdwKVXhdSkAEGIIzqeuWrL3mV/AXbA==}
peerDependencies:
@@ -2701,6 +2802,9 @@ packages:
resolution: {integrity: sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==}
engines: {node: '>= 0.4'}
es-toolkit@1.47.0:
resolution: {integrity: sha512-n1GuoD0WEQZMBk5tttoZSqwgyLx01oqa5XsBmCHwPyNe1S9jPBEmtR2pSgp2kJuWE3ciFZ6yRHmY4pM4C3OOkw==}
esbuild@0.27.3:
resolution: {integrity: sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==}
engines: {node: '>=18'}
@@ -2815,6 +2919,9 @@ packages:
resolution: {integrity: sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==}
engines: {node: '>= 0.6'}
eventemitter3@5.0.4:
resolution: {integrity: sha512-mlsTRyGaPBjPedk6Bvw+aqbsXDtoAyAzm5MO7JgU+yVRyMQ5O8bD4Kcci7BS85f93veegeCPkL8R4GLClnjLFw==}
events@3.3.0:
resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
engines: {node: '>=0.8.x'}
@@ -3069,6 +3176,12 @@ packages:
resolution: {integrity: sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==}
engines: {node: '>= 4'}
immer@10.2.0:
resolution: {integrity: sha512-d/+XTN3zfODyjr89gM3mPq1WNX2B8pYsu7eORitdwyA2sBubnTl3laYlBk4sXY5FUa5qTZGBDPJICVbvqzjlbw==}
immer@11.1.8:
resolution: {integrity: sha512-/tbkHMW7y10Lx6i1crLjD4/OhNkRG+Fo7byZHtah0547nIeXYcpIXaUh0IAQY6gO5459qpGGYapcEOHtFXkIuA==}
import-fresh@3.3.1:
resolution: {integrity: sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==}
engines: {node: '>=6'}
@@ -3089,6 +3202,10 @@ packages:
inherits@2.0.4:
resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
internmap@2.0.3:
resolution: {integrity: sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==}
engines: {node: '>=12'}
ipaddr.js@1.9.1:
resolution: {integrity: sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==}
engines: {node: '>= 0.10'}
@@ -3867,6 +3984,18 @@ packages:
react-is@18.3.1:
resolution: {integrity: sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==}
react-redux@9.3.0:
resolution: {integrity: sha512-KQopgqFo/p/fgmAs5qz6p5RWaNAzq40WAu7fJIXnQpYxFPbJYtsJPWvGeF2rOBaY/kEuV77AVsX8TsQzKm+A/g==}
peerDependencies:
'@types/react': ^18.2.25 || ^19
react: ^18.0 || ^19
redux: ^5.0.0
peerDependenciesMeta:
'@types/react':
optional: true
redux:
optional: true
react-router@7.14.0:
resolution: {integrity: sha512-m/xR9N4LQLmAS0ZhkY2nkPA1N7gQ5TUVa5n8TgANuDTARbn1gt+zLPXEm7W0XDTbrQ2AJSJKhoa6yx1D8BcpxQ==}
engines: {node: '>=20.0.0'}
@@ -3889,10 +4018,26 @@ packages:
resolution: {integrity: sha512-GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==}
engines: {node: '>= 14.18.0'}
recharts@3.8.1:
resolution: {integrity: sha512-mwzmO1s9sFL0TduUpwndxCUNoXsBw3u3E/0+A+cLcrSfQitSG62L32N69GhqUrrT5qKcAE3pCGVINC6pqkBBQg==}
engines: {node: '>=18'}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-dom: ^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
react-is: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
redis@5.12.1:
resolution: {integrity: sha512-LDsoVvb/CpoV9EN3FXvgvSHNJWuCIzl9MiO3ppOevuGLpSGJhwfQjpEwfFJcQvNSddHADDdZaWx0HnmMxRXG7g==}
engines: {node: '>= 18.19.0'}
redux-thunk@3.1.0:
resolution: {integrity: sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==}
peerDependencies:
redux: ^5.0.0
redux@5.0.1:
resolution: {integrity: sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==}
reflect-metadata@0.2.2:
resolution: {integrity: sha512-urBwgfrvVP/eAyXx4hluJivBKzuEbSQs9rKWCrCkbSxNv8mxPcUZKeuoF3Uy4mJl3Lwprp6yy5/39VWigZ4K6Q==}
@@ -3904,6 +4049,9 @@ packages:
resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
engines: {node: '>=0.10.0'}
reselect@5.1.1:
resolution: {integrity: sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==}
resolve-cwd@3.0.0:
resolution: {integrity: sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==}
engines: {node: '>=8'}
@@ -4187,6 +4335,9 @@ packages:
resolution: {integrity: sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==}
engines: {node: '>=8'}
tiny-invariant@1.3.3:
resolution: {integrity: sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==}
tinyglobby@0.2.16:
resolution: {integrity: sha512-pn99VhoACYR8nFHhxqix+uvsbXineAasWm5ojXoN8xEwK5Kd3/TrhNn1wByuD52UxWRLy8pu+kRMniEi6Eq9Zg==}
engines: {node: '>=12.0.0'}
@@ -4365,6 +4516,11 @@ packages:
uri-js@4.4.1:
resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==}
use-sync-external-store@1.6.0:
resolution: {integrity: sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==}
peerDependencies:
react: ^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0
util-deprecate@1.0.2:
resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
@@ -4383,6 +4539,9 @@ packages:
resolution: {integrity: sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==}
engines: {node: '>= 0.8'}
victory-vendor@37.3.6:
resolution: {integrity: sha512-SbPDPdDBYp+5MJHhBCAyI7wKM3d5ivekigc2Dk2s7pgbZ9wIgIBYGVw4zGHBml/qTFbexrofXW6Gu4noGxrOwQ==}
vite@8.0.8:
resolution: {integrity: sha512-dbU7/iLVa8KZALJyLOBOQ88nOXtNG8vxKuOT4I2mD+Ya70KPceF4IAmDsmU0h1Qsn5bPrvsY9HJstCRh3hG6Uw==}
engines: {node: ^20.19.0 || >=22.12.0}
@@ -6119,6 +6278,18 @@ snapshots:
dependencies:
'@redis/client': 5.12.1
'@reduxjs/toolkit@2.12.0(react-redux@9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1))(react@19.2.5)':
dependencies:
'@standard-schema/spec': 1.1.0
'@standard-schema/utils': 0.3.0
immer: 11.1.8
redux: 5.0.1
redux-thunk: 3.1.0(redux@5.0.1)
reselect: 5.1.1
optionalDependencies:
react: 19.2.5
react-redux: 9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1)
'@rolldown/binding-android-arm64@1.0.0-rc.15':
optional: true
@@ -6460,6 +6631,10 @@ snapshots:
'@speed-highlight/core@1.2.15': {}
'@standard-schema/spec@1.1.0': {}
'@standard-schema/utils@0.3.0': {}
'@tailwindcss/node@4.2.2':
dependencies:
'@jridgewell/remapping': 2.3.5
@@ -6593,6 +6768,30 @@ snapshots:
dependencies:
'@types/node': 24.12.2
'@types/d3-array@3.2.2': {}
'@types/d3-color@3.1.3': {}
'@types/d3-ease@3.0.2': {}
'@types/d3-interpolate@3.0.4':
dependencies:
'@types/d3-color': 3.1.3
'@types/d3-path@3.1.1': {}
'@types/d3-scale@4.0.9':
dependencies:
'@types/d3-time': 3.0.4
'@types/d3-shape@3.1.8':
dependencies:
'@types/d3-path': 3.1.1
'@types/d3-time@3.0.4': {}
'@types/d3-timer@3.0.2': {}
'@types/eslint-scope@3.7.7':
dependencies:
'@types/eslint': 9.6.1
@@ -6678,6 +6877,8 @@ snapshots:
'@types/methods': 1.1.4
'@types/superagent': 8.1.9
'@types/use-sync-external-store@0.0.6': {}
'@types/validator@13.15.10': {}
'@types/webidl-conversions@7.0.3': {}
@@ -7317,6 +7518,8 @@ snapshots:
clone@1.0.4: {}
clsx@2.1.1: {}
cluster-key-slot@1.1.2: {}
co@4.6.0: {}
@@ -7393,12 +7596,52 @@ snapshots:
csstype@3.2.3: {}
d3-array@3.2.4:
dependencies:
internmap: 2.0.3
d3-color@3.1.0: {}
d3-ease@3.0.1: {}
d3-format@3.1.2: {}
d3-interpolate@3.0.1:
dependencies:
d3-color: 3.1.0
d3-path@3.1.0: {}
d3-scale@4.0.2:
dependencies:
d3-array: 3.2.4
d3-format: 3.1.2
d3-interpolate: 3.0.1
d3-time: 3.1.0
d3-time-format: 4.1.0
d3-shape@3.2.0:
dependencies:
d3-path: 3.1.0
d3-time-format@4.1.0:
dependencies:
d3-time: 3.1.0
d3-time@3.1.0:
dependencies:
d3-array: 3.2.4
d3-timer@3.0.1: {}
daisyui@5.5.19: {}
debug@4.4.3:
dependencies:
ms: 2.1.3
decimal.js-light@2.5.1: {}
dedent@1.7.2: {}
deep-is@0.1.4: {}
@@ -7511,6 +7754,8 @@ snapshots:
has-tostringtag: 1.0.2
hasown: 2.0.2
es-toolkit@1.47.0: {}
esbuild@0.27.3:
optionalDependencies:
'@esbuild/aix-ppc64': 0.27.3
@@ -7658,6 +7903,8 @@ snapshots:
etag@1.8.1: {}
eventemitter3@5.0.4: {}
events@3.3.0: {}
execa@5.1.1:
@@ -7961,6 +8208,10 @@ snapshots:
ignore@7.0.5: {}
immer@10.2.0: {}
immer@11.1.8: {}
import-fresh@3.3.1:
dependencies:
parent-module: 1.0.1
@@ -7980,6 +8231,8 @@ snapshots:
inherits@2.0.4: {}
internmap@2.0.3: {}
ipaddr.js@1.9.1: {}
is-arrayish@0.2.1: {}
@@ -8831,6 +9084,15 @@ snapshots:
react-is@18.3.1: {}
react-redux@9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1):
dependencies:
'@types/use-sync-external-store': 0.0.6
react: 19.2.5
use-sync-external-store: 1.6.0(react@19.2.5)
optionalDependencies:
'@types/react': 19.2.14
redux: 5.0.1
react-router@7.14.0(react-dom@19.2.5(react@19.2.5))(react@19.2.5):
dependencies:
cookie: 1.1.1
@@ -8849,6 +9111,26 @@ snapshots:
readdirp@4.1.2: {}
recharts@3.8.1(@types/react@19.2.14)(react-dom@19.2.5(react@19.2.5))(react-is@18.3.1)(react@19.2.5)(redux@5.0.1):
dependencies:
'@reduxjs/toolkit': 2.12.0(react-redux@9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1))(react@19.2.5)
clsx: 2.1.1
decimal.js-light: 2.5.1
es-toolkit: 1.47.0
eventemitter3: 5.0.4
immer: 10.2.0
react: 19.2.5
react-dom: 19.2.5(react@19.2.5)
react-is: 18.3.1
react-redux: 9.3.0(@types/react@19.2.14)(react@19.2.5)(redux@5.0.1)
reselect: 5.1.1
tiny-invariant: 1.3.3
use-sync-external-store: 1.6.0(react@19.2.5)
victory-vendor: 37.3.6
transitivePeerDependencies:
- '@types/react'
- redux
redis@5.12.1:
dependencies:
'@redis/bloom': 5.12.1(@redis/client@5.12.1)
@@ -8860,12 +9142,20 @@ snapshots:
- '@node-rs/xxhash'
- '@opentelemetry/api'
redux-thunk@3.1.0(redux@5.0.1):
dependencies:
redux: 5.0.1
redux@5.0.1: {}
reflect-metadata@0.2.2: {}
require-directory@2.1.1: {}
require-from-string@2.0.2: {}
reselect@5.1.1: {}
resolve-cwd@3.0.0:
dependencies:
resolve-from: 5.0.0
@@ -9232,6 +9522,8 @@ snapshots:
glob: 7.2.3
minimatch: 3.1.5
tiny-invariant@1.3.3: {}
tinyglobby@0.2.16:
dependencies:
fdir: 6.5.0(picomatch@4.0.4)
@@ -9432,6 +9724,10 @@ snapshots:
dependencies:
punycode: 2.3.1
use-sync-external-store@1.6.0(react@19.2.5):
dependencies:
react: 19.2.5
util-deprecate@1.0.2: {}
v8-compile-cache-lib@3.0.1: {}
@@ -9446,6 +9742,23 @@ snapshots:
vary@1.1.2: {}
victory-vendor@37.3.6:
dependencies:
'@types/d3-array': 3.2.2
'@types/d3-ease': 3.0.2
'@types/d3-interpolate': 3.0.4
'@types/d3-scale': 4.0.9
'@types/d3-shape': 3.1.8
'@types/d3-time': 3.0.4
'@types/d3-timer': 3.0.2
d3-array: 3.2.4
d3-ease: 3.0.1
d3-interpolate: 3.0.1
d3-scale: 4.0.2
d3-shape: 3.2.0
d3-time: 3.1.0
d3-timer: 3.0.1
vite@8.0.8(@types/node@24.12.2)(esbuild@0.27.3)(jiti@2.6.1)(terser@5.46.1):
dependencies:
lightningcss: 1.32.0
+17 -10
View File
@@ -28,7 +28,7 @@ const { MongoClient, ObjectId } = require("mongodb");
const CONFIG = {
MONGODB_URI: process.env.MONGODB_URI ?? "mongodb://127.0.0.1:27017",
LOLYMPUS_DB_NAME: process.env.LOLYMPUS_DB_NAME ?? "lolympus-test",
LOLYMPUS_DB_NAME: process.env.LOLYMPUS_DB_NAME ?? "lolympus-staging",
COMMUNITY_ID: new ObjectId(
process.env.COMMUNITY_ID ?? "69ebe0adf627c11be2f020a1",
),
@@ -137,14 +137,18 @@ async function fetchRiotJson({ host, path, query }) {
});
if (response.status === 429) {
const retryAfterSeconds = Number(response.headers.get("retry-after") ?? 1);
const retryAfterSeconds = Number(
response.headers.get("retry-after") ?? 1,
);
await sleep(Math.max(1, retryAfterSeconds) * 1000);
continue;
}
if (response.status === 404) return null;
if (!response.ok) {
const body = await response.text().catch(() => "");
throw new Error(`Riot API failed ${response.status} ${url.pathname}: ${body}`);
throw new Error(
`Riot API failed ${response.status} ${url.pathname}: ${body}`,
);
}
return response.json();
}
@@ -190,13 +194,14 @@ async function fetchRecentMatchIdsByPuuid(puuid) {
async function fetchRiotData({ riotId }) {
const fallback = splitRiotId(riotId);
const account =
(await fetchAccountByRiotId(fallback)) ?? {
...fallback,
puuid: normalizeString(INPUT.puuid),
};
const account = (await fetchAccountByRiotId(fallback)) ?? {
...fallback,
puuid: normalizeString(INPUT.puuid),
};
if (!account?.puuid) {
throw new Error(`Riot account not found and PUUID was not provided: ${riotId}`);
throw new Error(
`Riot account not found and PUUID was not provided: ${riotId}`,
);
}
const [summoner, leagueEntries, championMasteries, matchIds] =
@@ -280,7 +285,9 @@ function buildRiotAccount(riotData, now) {
summonerLevel: riotData.summoner?.summonerLevel ?? 0,
isPrimary: true,
tiers: riotData.leagueEntries.map((entry) => toTierInfo(entry, now)),
tierHistory: riotData.leagueEntries.map((entry) => toTierHistory(entry, now)),
tierHistory: riotData.leagueEntries.map((entry) =>
toTierHistory(entry, now),
),
matchIds: riotData.matchIds,
matchIdsFetchedAt: riotData.matchIds.length > 0 ? now : undefined,
championMasteries: riotData.championMasteries
Loaded 100 of 104 files, more files were not shown because too many files have changed in this diff. Show more