Merge pull request 'Allow current-region takeover of empty draining locks' (#14) from feature/account-lock-session-end-fix into main

Reviewed-on: #14

.gitignore

@@ -39,3 +39,10 @@ yarn-error.log*
 .DS_Store
 .idea/
 .vscode/
+
+source-bestiary/
+source-drops/
+site/server-status.json
+site/server-status.json.tmp
+/scripts/
+/test/

ASSETS.md

@@ -1,14 +0,0 @@
-# PSO Peeps Site Assets
-
-## Included
-
-- `hero.jpg` — cropped from the supplied Pioneer 2 screenshot for the homepage hero area.
-
-## Still expected / placeholders
-
-- `logo.png` — PSO Peeps logo.
-- `icons/discord.png` — Discord icon.
-- `icons/mastodon.png` — Mastodon icon.
-- `icons/bluesky.png` — Bluesky icon.
-
-The HTML references these paths directly so the final assets can be dropped in without changing markup.

LICENSE

@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 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.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  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
+them 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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

backend/app.py

@@ -712,23 +712,32 @@ def newserv_account_lock_acquire():
                         "lock": lock_row_payload(row),
                     })
 
-                if row["holder_source"] != source:
-                    return jsonify({
-                        "ok": False,
-                        "message": f"$C6Account is already active\\non {row['holder_source']}.",
-                        "holder_source": row["holder_source"],
-                        "state": row["state"],
-                        "lock": lock_row_payload(row),
-                    })
-
                 sessions = row["sessions"] or {}
                 if isinstance(sessions, str):
                     sessions = json.loads(sessions)
+
+                if row["holder_source"] != source:
+                    target_region_current = False
+                    if row["state"] == "draining" and not sessions and source_region:
+                        _all_current, sync = account_sync_current_on_all_regions(account_id)
+                        region_status = (sync.get("regions") or {}).get(source_region) or {}
+                        target_region_current = region_status.get("status") == "current"
+
+                    if not target_region_current:
+                        return jsonify({
+                            "ok": False,
+                            "message": f"$C6Account is already active\\non {row['holder_source']}.",
+                            "holder_source": row["holder_source"],
+                            "state": row["state"],
+                            "lock": lock_row_payload(row),
+                        })
+
                 sessions[session_nonce] = session_info
 
                 cur.execute("""
                     UPDATE account_session_locks
-                    SET state = 'active',
+                    SET holder_source = %s,
+                        state = 'active',
                         source_region = %s,
                         source_ship = %s,
                         account_store = %s,
@@ -739,6 +748,7 @@ def newserv_account_lock_acquire():
                     RETURNING account_id, holder_source, source_region, source_ship,
                               account_store, state, sessions, created_at, updated_at, expires_at
                 """, (
+                    source,
                     source_region,
                     source_ship,
                     account_store,
@@ -780,7 +790,7 @@ def newserv_account_lock_heartbeat():
                 SET updated_at = now(),
                     expires_at = %s
                 WHERE holder_source = %s
-                  AND state IN ('active', 'draining')
+                  AND state = 'active'
             """, (expires_at, source))
             refreshed = cur.rowcount
 
@@ -1939,3 +1949,117 @@ def hardcore_leaderboard_points_combined():
     return jsonify(rows[:100])
 
 # --- end Hardcore stats aggregator -------------------------------------------
+
+
+@app.get("/server-status")
+@app.get("/api/server-status")
+def public_server_status():
+    import json
+    import os
+    import urllib.parse
+    import urllib.request
+
+    prometheus_url = os.environ.get("PROMETHEUS_URL", "http://5.0.0.20:9090").rstrip("/")
+
+    def prom_value(query):
+        url = prometheus_url + "/api/v1/query?" + urllib.parse.urlencode({"query": query})
+        try:
+            with urllib.request.urlopen(url, timeout=2.5) as resp:
+                data = json.loads(resp.read().decode("utf-8"))
+        except Exception:
+            return 0
+
+        if data.get("status") != "success":
+            return 0
+
+        total = 0.0
+        for result in data.get("data", {}).get("result", []):
+            value = result.get("value", [None, "0"])[1]
+            try:
+                total += float(value)
+            except (TypeError, ValueError):
+                pass
+
+        return int(total)
+
+    def q(metric, labels):
+        label_text = ",".join(f'{k}="{v}"' for k, v in labels.items())
+        return f'sum({metric}{{{label_text}}}) or vector(0)'
+
+    def newserv(region, service, ship, version):
+        return prom_value(q("pso_newserv_clients_connected", {
+            "region": region,
+            "service": service,
+            "ship": ship,
+            "version": version,
+        }))
+
+    def adhoc(region, game):
+        return prom_value(q("psppeeps_adhoc_connected_clients_by_product", {
+            "region": region,
+            "service": f"{region}-psppeeps-adhoc",
+            "ship": "psp",
+            "game": game,
+        }))
+
+    us = {
+        "alis_v2": newserv("us", "us-newserv-live", "live", "v2"),
+        "alis_v3": newserv("us", "us-newserv-live", "live", "v3"),
+        "alis_bb": newserv("us", "us-newserv-live", "live", "v4"),
+        "abion_hcbb": newserv("us", "us-newserv-hardcore", "hardcore", "v4"),
+        "adhoc_psp1": adhoc("us", "psp1"),
+        "adhoc_psp2i": adhoc("us", "psp2i"),
+    }
+
+    eu = {
+        "palma_v2": newserv("eu", "eu-newserv-live", "live", "v2"),
+        "palma_v3": newserv("eu", "eu-newserv-live", "live", "v3"),
+        "palma_bb": newserv("eu", "eu-newserv-live", "live", "v4"),
+        "aiedo_hcbb": newserv("eu", "eu-newserv-hardcore", "hardcore", "v4"),
+        "adhoc_psp1": adhoc("eu", "psp1"),
+        "adhoc_psp2i": adhoc("eu", "psp2i"),
+    }
+
+    us_total = sum(us.values())
+    eu_total = sum(eu.values())
+
+    return jsonify({
+        "servers": [
+            {
+                "label": "US Server",
+                "players": us_total,
+                "ships": [
+                    {"label": "Alis", "rows": [
+                        {"label": "V2", "players": us["alis_v2"]},
+                        {"label": "V3", "players": us["alis_v3"]},
+                        {"label": "BB", "players": us["alis_bb"]},
+                    ]},
+                    {"label": "Abion", "rows": [
+                        {"label": "HC/BB", "players": us["abion_hcbb"]},
+                    ]},
+                    {"label": "AdHoc-US", "rows": [
+                        {"label": "PSP1", "players": us["adhoc_psp1"]},
+                        {"label": "PSP2i", "players": us["adhoc_psp2i"]},
+                    ]},
+                ],
+            },
+            {
+                "label": "EU Server",
+                "players": eu_total,
+                "ships": [
+                    {"label": "Palma", "rows": [
+                        {"label": "V2", "players": eu["palma_v2"]},
+                        {"label": "V3", "players": eu["palma_v3"]},
+                        {"label": "BB", "players": eu["palma_bb"]},
+                    ]},
+                    {"label": "Aiedo", "rows": [
+                        {"label": "HC/BB", "players": eu["aiedo_hcbb"]},
+                    ]},
+                    {"label": "AdHoc-EU", "rows": [
+                        {"label": "PSP1", "players": eu["adhoc_psp1"]},
+                        {"label": "PSP2i", "players": eu["adhoc_psp2i"]},
+                    ]},
+                ],
+            },
+        ],
+    })

backend/key_routes.py.before-final-gc-v3-neutral-20260611T011127Z

@@ -1,514 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = validate_secret(data.get("access_key"))
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key
-                        ) VALUES (%s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

backend/key_routes.py.before-gc-v3-accesskey-normalize-20260611T014008Z

@@ -1,530 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        gc_password TEXT,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-                cur.execute("""
-                    ALTER TABLE v2_v3_key_profiles
-                    ADD COLUMN IF NOT EXISTS gc_password TEXT
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-
-        if row["game_version"] == "gc_v3":
-            gc_password = row.get("gc_password")
-            if not gc_password:
-                raise RuntimeError("GC V3 key profile is missing its GC password")
-            password = phosg_string(gc_password)
-            return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}, "Password": {password}}}'
-
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key, gc_password
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = validate_secret(data.get("access_key"))
-            gc_password = validate_secret(data.get("password")) if game_version == "gc_v3" else None
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key,
-                            gc_password
-                        ) VALUES (%s, %s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                        gc_password,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

backend/key_routes.py.before-gc-v3-password-column-20260611T012517Z

@@ -1,514 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = validate_secret(data.get("access_key"))
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key
-                        ) VALUES (%s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

backend/key_routes.py.before-gc-v3-serial-message-fix-20260611T002117Z

@@ -1,514 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format, like 21-3364-4991")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = validate_secret(data.get("access_key"))
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key
-                        ) VALUES (%s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

backend/key_routes.py.before-gc-v3-smtp-fix-20260611T001916Z

@@ -1,514 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format, like 21-3364-4991")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = validate_secret(data.get("access_key"))
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key
-                        ) VALUES (%s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

backend/key_routes.py.before-insert-normalize-access-key-20260611T014503Z

@@ -1,530 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        gc_password TEXT,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-                cur.execute("""
-                    ALTER TABLE v2_v3_key_profiles
-                    ADD COLUMN IF NOT EXISTS gc_password TEXT
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format: NN-NNNN-NNNN.")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-
-        if row["game_version"] == "gc_v3":
-            gc_password = row.get("gc_password")
-            if not gc_password:
-                raise RuntimeError("GC V3 key profile is missing its GC password")
-            password = phosg_string(gc_password)
-            return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}, "Password": {password}}}'
-
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key, gc_password
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = normalize_access_key(data.get("access_key"), game_version)
-            gc_password = validate_secret(data.get("password")) if game_version == "gc_v3" else None
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key,
-                            gc_password
-                        ) VALUES (%s, %s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                        gc_password,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

backend/key_routes.py.before-neutral-gc-v3-copy-20260611T010909Z

@@ -1,514 +0,0 @@
-import json
-import re
-import os
-from pathlib import Path
-
-import psycopg
-
-
-SUPPORTED_KEY_VERSIONS = {
-    "dc_v2": {"label": "DC V2"},
-    "pc_v2": {"label": "PC V2"},
-    "gc_v3": {"label": "GC V3"},
-}
-
-
-def register_key_routes(
-    app,
-    *,
-    connect,
-    current_user,
-    jsonify,
-    request,
-    account_id_str,
-    bb_account_id,
-    canonical_license_path,
-    refresh_account_manifest,
-    enqueue_account_sync,
-    bb_sync_info,
-):
-    def ensure_key_profile_table():
-        with connect() as conn:
-            with conn.cursor() as cur:
-                cur.execute("""
-                    CREATE TABLE IF NOT EXISTS v2_v3_key_profiles (
-                        id BIGSERIAL PRIMARY KEY,
-                        user_id BIGINT NOT NULL REFERENCES site_users(id) ON DELETE CASCADE,
-                        account_id BIGINT NOT NULL,
-                        game_version TEXT NOT NULL,
-                        label TEXT NOT NULL DEFAULT '',
-                        serial_number_hex TEXT NOT NULL,
-                        access_key TEXT NOT NULL,
-                        created_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        updated_at TIMESTAMPTZ NOT NULL DEFAULT now(),
-                        UNIQUE (game_version, serial_number_hex)
-                    )
-                """)
-            conn.commit()
-
-    def site_account_id(username):
-        return bb_account_id(username)
-
-    def user_has_bb_account(conn, user_id):
-        with conn.cursor() as cur:
-            cur.execute(
-                "SELECT 1 FROM bb_accounts WHERE user_id = %s LIMIT 1",
-                (user_id,),
-            )
-            return cur.fetchone() is not None
-
-    def normalize_serial_hex(value, game_version):
-        raw = str(value or "").strip()
-
-        if not raw:
-            raise ValueError("serial number is required")
-
-        if game_version == "dc_v2":
-            v = raw.upper()
-            if v.startswith("0X"):
-                v = v[2:]
-            if not re.fullmatch(r"[0-9A-F]{1,8}", v):
-                raise ValueError("DC V2 serial must be hex, like 4E62F237")
-            return f"{int(v, 16):08X}"
-
-        if game_version == "pc_v2":
-            if not re.fullmatch(r"[0-9]{1,10}", raw):
-                raise ValueError("PC V2 serial must be digits only")
-            n = int(raw, 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("PC V2 serial is out of range")
-            return f"{n:08X}"
-
-        if game_version == "gc_v3":
-            if not re.fullmatch(r"[0-9]{2}-[0-9]{4}-[0-9]{4}", raw):
-                raise ValueError("GC V3 serial must use the dashed format, like 11-3273-6540")
-            n = int(raw.replace("-", ""), 10)
-            if not (0 <= n <= 0xFFFFFFFF):
-                raise ValueError("GC V3 serial is out of range")
-            return f"{n:08X}"
-
-        raise ValueError("unsupported game version")
-
-    def validate_secret(value):
-        v = str(value or "").strip()
-        if not v:
-            raise ValueError("key is required")
-        if len(v) > 64:
-            raise ValueError("key is too long")
-        if any(ord(ch) < 0x20 for ch in v):
-            raise ValueError("key contains invalid characters")
-        return v
-
-    def phosg_string(value):
-        return json.dumps(str(value))
-
-    def base_site_license_text(account_id, username):
-        aid_hex = f"0x{int(account_id):X}"
-        uname = phosg_string(username)
-        return (
-            "{\n"
-            "  \"BBTeamID\": 0x0,\n"
-            "  \"FormatVersion\": 0x1,\n"
-            f"  \"AccountID\": {aid_hex},\n"
-            f"  \"LastPlayerName\": {uname},\n"
-            "  \"DCNTELicenses\": [],\n"
-            "  \"BBLicenses\": [],\n"
-            "  \"BanEndTime\": 0x0,\n"
-            "  \"PCLicenses\": [],\n"
-            "  \"AutoReplyMessage\": \"\",\n"
-            "  \"GCLicenses\": [],\n"
-            "  \"AutoPatchesEnabled\": [\"PsoPeepsV2EXP_enabled\", \"RareDropNotifications\", \"UltimateMapFix\", \"RaresInQuests\", \"DisableIdleDisconnect\", \"ItemLossPrevention\"],\n"
-            "  \"XBLicenses\": [],\n"
-            "  \"Flags\": 0x0,\n"
-            "  \"Ep3TotalMesetaEarned\": 0x0,\n"
-            "  \"Ep3CurrentMeseta\": 0x0,\n"
-            "  \"DCLicenses\": [],\n"
-            "  \"UserFlags\": 0x0\n"
-            "}"
-        )
-
-    def find_array_span(text, array_name):
-        marker = f'"{array_name}":'
-        marker_pos = text.find(marker)
-        if marker_pos < 0:
-            return None
-
-        bracket_pos = text.find("[", marker_pos)
-        if bracket_pos < 0:
-            return None
-
-        depth = 0
-        in_string = False
-        escape = False
-
-        for i in range(bracket_pos, len(text)):
-            ch = text[i]
-
-            if in_string:
-                if escape:
-                    escape = False
-                elif ch == "\\":
-                    escape = True
-                elif ch == '"':
-                    in_string = False
-            else:
-                if ch == '"':
-                    in_string = True
-                elif ch == "[":
-                    depth += 1
-                elif ch == "]":
-                    depth -= 1
-                    if depth == 0:
-                        return bracket_pos, i + 1
-
-        return None
-
-    def replace_license_array(text, array_name, entries):
-        span = find_array_span(text, array_name)
-        if span is None:
-            raise RuntimeError(f"could not find {array_name} in license file")
-
-        start, end = span
-        rendered = "[]" if not entries else "[\n" + ",\n".join(f"    {e}" for e in entries) + "\n  ]"
-        return text[:start] + rendered + text[end:]
-
-    def render_v2_entry(row):
-        serial_hex = row["serial_number_hex"].upper()
-        secret = phosg_string(row["access_key"])
-        return f'{{"SerialNumber": 0x{serial_hex}, "AccessKey": {secret}}}'
-
-
-    def rewrite_v2_license_arrays(conn, user, account_id):
-        path = canonical_license_path(account_id)
-        path.parent.mkdir(parents=True, exist_ok=True)
-
-        text = path.read_text() if path.exists() else base_site_license_text(account_id, user["username"])
-
-        with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-            cur.execute("""
-                SELECT game_version, serial_number_hex, access_key
-                FROM v2_v3_key_profiles
-                WHERE user_id = %s
-                ORDER BY id
-            """, (user["id"],))
-            rows = list(cur.fetchall())
-
-        dc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "dc_v2"]
-        pc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "pc_v2"]
-        gc_entries = [render_v2_entry(r) for r in rows if r["game_version"] == "gc_v3"]
-
-        text = replace_license_array(text, "DCLicenses", dc_entries)
-        text = replace_license_array(text, "PCLicenses", pc_entries)
-        text = replace_license_array(text, "GCLicenses", gc_entries)
-
-        tmp = path.with_suffix(path.suffix + ".tmp")
-        tmp.write_text(text + "\n")
-        tmp.replace(path)
-
-        sync_root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-        flat_path = sync_root / "canonical-system" / "system" / "licenses" / path.name
-        flat_path.parent.mkdir(parents=True, exist_ok=True)
-        flat_tmp = flat_path.with_suffix(flat_path.suffix + ".tmp")
-        flat_tmp.write_text(text + "\n")
-        flat_tmp.replace(flat_path)
-
-        refresh_account_manifest(account_id)
-        enqueue_account_sync(account_id, "v2_key_profile_updated")
-        return path
-
-
-    @app.get("/keys")
-    def list_key_profiles():
-        user = current_user()
-        if not user:
-            return jsonify({"authenticated": False}), 401
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-        sync = bb_sync_info(account_id)
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex, created_at, updated_at
-                    FROM v2_v3_key_profiles
-                    WHERE user_id = %s
-                    ORDER BY id
-                """, (user["id"],))
-                rows = list(cur.fetchall())
-
-        return jsonify({
-            "authenticated": True,
-            "account_id": account_id_str(account_id),
-            "sync_status": sync["status"],
-            "regions": sync["regions"],
-            "keys": [{
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "game_version_label": SUPPORTED_KEY_VERSIONS.get(row["game_version"], {}).get("label", row["game_version"]),
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-                "created_at": row["created_at"].isoformat() if row["created_at"] else None,
-                "updated_at": row["updated_at"].isoformat() if row["updated_at"] else None,
-            } for row in rows],
-        })
-
-
-    def license_text_has_serial(text, serial_hex):
-        want_hex = (serial_hex or "").upper().lstrip("0") or "0"
-
-        for match in re.finditer(r'"SerialNumber"\s*:\s*0x([0-9A-Fa-f]+)', text):
-            got_hex = match.group(1).upper().lstrip("0") or "0"
-            if got_hex == want_hex:
-                return True
-
-        try:
-            want_dec = str(int(serial_hex, 16))
-        except ValueError:
-            want_dec = None
-
-        if want_dec is not None:
-            for match in re.finditer(r'"SerialNumber"\s*:\s*([0-9]+)', text):
-                if match.group(1) == want_dec:
-                    return True
-
-        return False
-
-
-    def find_existing_key_owner(serial_hex, current_account_id):
-        root = Path(os.environ.get("ACCOUNT_SYNC_ROOT", "/account-sync"))
-
-        current_ids = {
-            account_id_str(current_account_id),
-            str(int(current_account_id)),
-        }
-
-        def owner_for_license_path(license_path):
-            try:
-                rel = license_path.relative_to(root)
-                parts = rel.parts
-            except Exception:
-                return license_path.stem
-
-            # canonical/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # canonical/REGION/accounts/ACCOUNT/system/licenses/ACCOUNT.json
-            # inbox/REGION/SOURCE/ACCOUNT/system/licenses/ACCOUNT.json
-            for i in range(1, len(parts) - 2):
-                if parts[i:i + 2] == ("system", "licenses"):
-                    possible = parts[i - 1]
-                    if re.fullmatch(r"[0-9]{10}", possible):
-                        return possible
-
-            # canonical-system/system/licenses/ACCOUNT.json
-            return license_path.stem
-
-        search_paths = []
-        seen_paths = set()
-
-        for base in (
-            root / "canonical",
-            root / "canonical-system",
-            root / "inbox",
-        ):
-            if not base.is_dir():
-                continue
-
-            for license_path in sorted(base.rglob("system/licenses/*.json")):
-                if license_path in seen_paths:
-                    continue
-                seen_paths.add(license_path)
-                search_paths.append((license_path, owner_for_license_path(license_path)))
-
-        for license_path, owner_account_id in search_paths:
-            if owner_account_id in current_ids:
-                continue
-
-            try:
-                text = license_path.read_text(errors="ignore")
-            except OSError:
-                continue
-
-            if license_text_has_serial(text, serial_hex):
-                return {
-                    "account_id": owner_account_id,
-                    "path": str(license_path),
-                }
-
-        return None
-
-
-    @app.post("/keys/register")
-    def register_key_profile():
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            if not user_has_bb_account(conn, user["id"]):
-                return jsonify({
-                    "error": "Create your Blue Burst account before adding DC V2, PC V2, or GC V3 keys.",
-                    "bb_account_required": True,
-                }), 409
-
-        data = request.get_json(silent=True) or {}
-        game_version = str(data.get("game_version") or "").strip().lower()
-        label = str(data.get("label") or "").strip()[:80]
-
-        if game_version not in SUPPORTED_KEY_VERSIONS:
-            return jsonify({"error": "unsupported game version"}), 400
-
-        try:
-            serial_hex = normalize_serial_hex(data.get("serial_number"), game_version)
-            key_secret = validate_secret(data.get("access_key"))
-        except ValueError as e:
-            return jsonify({"error": str(e)}), 400
-
-        account_id = site_account_id(user["username"])
-
-        duplicate = find_existing_key_owner(serial_hex, account_id)
-        if duplicate:
-            return jsonify({
-                "error": "that key is already registered to another account"
-            }), 409
-
-        try:
-            with connect() as conn:
-                with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                    cur.execute("""
-                        INSERT INTO v2_v3_key_profiles (
-                            user_id,
-                            account_id,
-                            game_version,
-                            label,
-                            serial_number_hex,
-                            access_key
-                        ) VALUES (%s, %s, %s, %s, %s, %s)
-                        RETURNING id
-                    """, (
-                        user["id"],
-                        account_id,
-                        game_version,
-                        label,
-                        serial_hex,
-                        key_secret,
-                    ))
-                    row = cur.fetchone()
-
-                rewrite_v2_license_arrays(conn, user, account_id)
-                conn.commit()
-
-        except psycopg.errors.UniqueViolation:
-            return jsonify({"error": "that key is already registered to an account"}), 409
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": game_version,
-                "game_version_label": SUPPORTED_KEY_VERSIONS[game_version]["label"],
-                "label": label,
-                "serial_number_hex": serial_hex,
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-
-
-    @app.get("/keys/<int:key_id>/access-key")
-    def get_key_access_key(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before viewing game account keys.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, serial_number_hex, access_key
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-        if not row:
-            return jsonify({"error": "key profile not found"}), 404
-
-        return jsonify({
-            "ok": True,
-            "key": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "serial_number_hex": row["serial_number_hex"],
-                "access_key": row["access_key"],
-            },
-        })
-
-
-    @app.delete("/keys/<int:key_id>")
-    def delete_key_profile(key_id):
-        user = current_user()
-        if not user:
-            return jsonify({"error": "not authenticated"}), 401
-
-        if not user.get("email_verified_at"):
-            return jsonify({
-                "error": "Please verify your email before changing game account settings.",
-                "email_required": True,
-            }), 403
-
-        ensure_key_profile_table()
-        account_id = site_account_id(user["username"])
-
-        with connect() as conn:
-            with conn.cursor(row_factory=psycopg.rows.dict_row) as cur:
-                cur.execute("""
-                    SELECT id, game_version, label, serial_number_hex
-                    FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                    LIMIT 1
-                """, (key_id, user["id"]))
-                row = cur.fetchone()
-
-                if not row:
-                    return jsonify({"error": "key profile not found"}), 404
-
-                cur.execute("""
-                    DELETE FROM v2_v3_key_profiles
-                    WHERE id = %s AND user_id = %s
-                """, (key_id, user["id"]))
-
-            rewrite_v2_license_arrays(conn, user, account_id)
-            conn.commit()
-
-        sync = bb_sync_info(account_id)
-
-        return jsonify({
-            "ok": True,
-            "deleted": {
-                "id": row["id"],
-                "game_version": row["game_version"],
-                "label": row["label"],
-                "serial_number_hex": row["serial_number_hex"],
-            },
-            "sync_status": sync["status"],
-            "account_id": account_id_str(account_id),
-        })
-

scripts/generate-hardcore-leaderboard-json.sh

@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-
-cd /home/rbatty/.local/share/psopeeps_site
-
-out="site/generated/hardcore-leaderboard-points.json"
-mkdir -p "$(dirname "$out")"
-
-tmp="$(mktemp "${out}.tmp.XXXXXX")"
-trap 'rm -f "$tmp"' EXIT
-
-docker exec -i psopeeps-web-app python - <<'PY' > "$tmp"
-from app import _hc_combined_payload, _hc_points_row
-from datetime import datetime, timezone
-import json
-
-combined, errors = _hc_combined_payload()
-
-rows = []
-for source_row in combined:
-    points_row = _hc_points_row(source_row)
-
-    rows.append({
-        "PlayerName": (
-            points_row.get("PlayerName")
-            or points_row.get("CharacterName")
-            or source_row.get("character_name")
-            or ""
-        ),
-        "Points": int(points_row.get("Points") or points_row.get("TotalPoints") or 0),
-        "Class": (
-            points_row.get("Class")
-            or source_row.get("character_class")
-            or ""
-        ),
-        "SecID": (
-            points_row.get("SecID")
-            or source_row.get("section_id")
-            or ""
-        ),
-        "Kills": int(points_row.get("Kills") or points_row.get("TotalKills") or source_row.get("total_enemies_killed") or 0),
-        "PlayTimeSeconds": int(points_row.get("PlayTimeSeconds") or source_row.get("play_time_seconds") or 0),
-        "Alive": bool(points_row.get("Alive", True)),
-        "Level": int(points_row.get("Level") or source_row.get("level") or 0),
-        "TotalEXP": int(points_row.get("TotalEXP") or source_row.get("total_exp") or 0),
-    })
-
-rows.sort(key=lambda r: r["Points"], reverse=True)
-
-payload = {
-    "generated_at": datetime.now(timezone.utc).isoformat().replace("+00:00", "Z"),
-    "stale_after_seconds": 600,
-    "errors": errors,
-    "rows": rows[:100],
-}
-
-print(json.dumps(payload, separators=(",", ":")))
-PY
-
-python3 -m json.tool "$tmp" >/dev/null
-mv -f "$tmp" "$out"
-trap - EXIT

site/ASSETS.md

@@ -1,14 +0,0 @@
-# PSO Peeps Site Assets
-
-## Included
-
-- `hero.jpg` — cropped from the supplied Pioneer 2 screenshot for the homepage hero area.
-
-## Still expected / placeholders
-
-- `logo.png` — PSO Peeps logo.
-- `icons/discord.png` — Discord icon.
-- `icons/mastodon.png` — Mastodon icon.
-- `icons/bluesky.png` — Bluesky icon.
-
-The HTML references these paths directly so the final assets can be dropped in without changing markup.

site/account-ready.html

@@ -145,7 +145,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -154,6 +159,10 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
 </footer>
   </div>

site/account-unverified.html

@@ -92,7 +92,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -101,6 +106,10 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
 </footer>
   </div>

site/account.html

@@ -145,7 +145,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -154,6 +159,10 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
 </footer>
   </div>

site/bestiary-tables.js

@@ -0,0 +1,389 @@
+(() => {
+  "use strict";
+
+  const qs = (sel) => document.querySelector(sel);
+
+  const DIFFICULTY_ORDER = {
+    Normal: 0,
+    Hard: 1,
+    "Very Hard": 2,
+    Ultimate: 3,
+  };
+
+  const NUMERIC_COLUMNS = new Set([
+    "hp", "atp", "dfp", "mst", "ata", "evp", "lck", "esp", "exp",
+    "efr", "eic", "eth", "elt", "edk",
+  ]);
+
+  const BP_TIERS = {
+    0: { hp: 1.00, atp: 1.00, exp: 1.00 },
+    1: { hp: 1.10, atp: 1.01, exp: 1.10 },
+    2: { hp: 1.15, atp: 1.02, exp: 1.15 },
+    3: { hp: 1.20, atp: 1.03, exp: 1.20 },
+    4: { hp: 1.30, atp: 1.04, exp: 1.30 },
+    5: { hp: 1.40, atp: 1.05, exp: 1.40 },
+    6: { hp: 1.50, atp: 1.06, exp: 1.50 },
+    7: { hp: 1.75, atp: 1.07, exp: 1.75 },
+    8: { hp: 2.00, atp: 1.08, exp: 2.00 },
+    9: { hp: 2.50, atp: 1.09, exp: 2.50 },
+    10: { hp: 3.00, atp: 1.10, exp: 3.00 },
+    11: { hp: 4.00, atp: 1.10, exp: 3.00 },
+  };
+
+  const COLUMN_GROUPS = {
+    stats: [
+      ["enemy", "Enemy"],
+      ["mode", "Mode"],
+      ["episode", "Episode"],
+      ["difficulty", "Difficulty"],
+      ["hp", "HP"],
+      ["atp", "ATP"],
+      ["dfp", "DFP"],
+      ["ata", "ATA"],
+      ["evp", "EVP"],
+      ["lck", "LCK"],
+      ["exp", "EXP"],
+    ],
+    resists: [
+      ["enemy", "Enemy"],
+      ["mode", "Mode"],
+      ["episode", "Episode"],
+      ["difficulty", "Difficulty"],
+      ["efr", "EFR"],
+      ["eic", "EIC"],
+      ["eth", "ETH"],
+      ["elt", "ELT"],
+      ["edk", "EDK"],
+      ["esp", "ESP"],
+    ],
+    all: [
+      ["enemy", "Enemy"],
+      ["mode", "Mode"],
+      ["episode", "Episode"],
+      ["difficulty", "Difficulty"],
+      ["hp", "HP"],
+      ["atp", "ATP"],
+      ["dfp", "DFP"],
+      ["mst", "MST"],
+      ["ata", "ATA"],
+      ["evp", "EVP"],
+      ["lck", "LCK"],
+      ["esp", "ESP"],
+      ["exp", "EXP"],
+      ["efr", "EFR"],
+      ["eic", "EIC"],
+      ["eth", "ETH"],
+      ["elt", "ELT"],
+      ["edk", "EDK"],
+    ],
+  };
+
+  function currentColumns() {
+    const view = qs("#bestiary-view")?.value || "stats";
+    return COLUMN_GROUPS[view] || COLUMN_GROUPS.stats;
+  }
+
+  const state = {
+    rows: [],
+    index: null,
+    table: null,
+    page: 1,
+    pageSize: 100,
+    sort: {
+      key: "enemy",
+      dir: "asc",
+    },
+    filters: {
+      mode: "",
+      episode: "",
+      difficulty: "",
+      search: "",
+    },
+  };
+
+  function esc(value) {
+    return String(value ?? "")
+      .replaceAll("&", "&")
+      .replaceAll("<", "&lt;")
+      .replaceAll(">", "&gt;")
+      .replaceAll('"', "&quot;")
+      .replaceAll("'", "&#039;");
+  }
+
+  async function fetchJson(path) {
+    const res = await fetch(path, { cache: "no-store" });
+    if (!res.ok) throw new Error(`${path}: HTTP ${res.status}`);
+    return res.json();
+  }
+
+  function setStatus(message, kind = "") {
+    const box = qs("#bestiary-placeholder");
+    if (!box) return;
+    box.innerHTML = `<div class="drops-status ${kind ? `drops-status--${kind}` : ""}">${esc(message)}</div>`;
+  }
+
+  function uniqueSorted(rows, key) {
+    return [...new Set(rows.map((row) => row[key]).filter(Boolean))]
+      .sort((a, b) => String(a).localeCompare(String(b), undefined, { numeric: true }));
+  }
+
+  function fillSelect(select, values, allLabel) {
+    if (!select) return;
+    const previous = select.value;
+    select.innerHTML = `<option value="">${esc(allLabel)}</option>`;
+    for (const value of values) {
+      const opt = document.createElement("option");
+      opt.value = value;
+      opt.textContent = value;
+      select.appendChild(opt);
+    }
+    if ([...select.options].some((opt) => opt.value === previous)) {
+      select.value = previous;
+    }
+  }
+
+  function orderedDifficulties(rows) {
+    const present = new Set(rows.map((row) => row.difficulty).filter(Boolean));
+    return Object.keys(DIFFICULTY_ORDER).filter((value) => present.has(value));
+  }
+
+  function bpTier() {
+    const select = qs("#bestiary-tier");
+    const raw = String(select?.value || "");
+    const label = String(select?.selectedOptions?.[0]?.textContent || "");
+    const match = raw.match(/(\d+)$/) || label.match(/(\d+)/);
+    const tier = match ? Number(match[1]) : 0;
+    return BP_TIERS[tier] || BP_TIERS[0];
+  }
+
+  function xpBonusMultiplier() {
+    return Number(qs("#bestiary-xp-bonus")?.value || 1);
+  }
+
+  function displayValue(row, key) {
+    const value = row[key];
+
+    if (key === "exp" && row.difficulty !== "Ultimate") {
+      return Math.round(Number(value || 0) * xpBonusMultiplier());
+    }
+
+    if (row.difficulty !== "Ultimate") {
+      return value ?? "";
+    }
+
+    const tier = bpTier();
+
+    if (key === "hp") {
+      return Math.round(Number(value || 0) * tier.hp);
+    }
+
+    if (key === "atp") {
+      return Math.round(Number(value || 0) * tier.atp);
+    }
+
+    if (key === "exp" && tier.exp !== null) {
+      return Math.round(Number(value || 0) * tier.exp * xpBonusMultiplier());
+    }
+
+    return value ?? "";
+  }
+
+  function hasAnyBestiaryValue(row) {
+    const keys = ["hp", "atp", "dfp", "mst", "ata", "evp", "lck", "esp", "exp", "efr", "eic", "eth", "elt", "edk"];
+    return keys.some((key) => Number(row[key] || 0) !== 0);
+  }
+
+  function visibleRows() {
+    const search = state.filters.search.trim().toLowerCase();
+
+    return state.rows.filter((row) => {
+      if (!hasAnyBestiaryValue(row)) return false;
+      if (state.filters.mode && row.mode !== state.filters.mode) return false;
+      if (state.filters.episode && row.episode !== state.filters.episode) return false;
+      if (state.filters.difficulty && row.difficulty !== state.filters.difficulty) return false;
+
+      if (search) {
+        const haystack = [row.enemy, row.enemy_key, row.mode, row.episode, row.difficulty]
+          .join(" ")
+          .toLowerCase();
+        if (!haystack.includes(search)) return false;
+      }
+
+      return true;
+    });
+  }
+
+  function sortValue(row, key) {
+    if (key === "difficulty") return DIFFICULTY_ORDER[row.difficulty] ?? 999;
+    if (NUMERIC_COLUMNS.has(key)) return Number(displayValue(row, key) || 0);
+    return row[key] || "";
+  }
+
+  function sortedRows(rows) {
+    const { key, dir } = state.sort;
+    const factor = dir === "desc" ? -1 : 1;
+
+    return [...rows].sort((a, b) => {
+      const av = sortValue(a, key);
+      const bv = sortValue(b, key);
+
+      if (typeof av === "number" && typeof bv === "number") {
+        return (av - bv) * factor;
+      }
+
+      return String(av).localeCompare(String(bv), undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }) * factor;
+    });
+  }
+
+  function sortHeader(key, label) {
+    const active = state.sort.key === key;
+    const arrow = active ? (state.sort.dir === "asc" ? "▲" : "▼") : "";
+    const ariaSort = active ? (state.sort.dir === "asc" ? "ascending" : "descending") : "none";
+
+    return `<th aria-sort="${ariaSort}">
+      <button class="drops-sort-button ${active ? "is-active" : ""}" type="button" data-bestiary-sort="${esc(key)}">
+        <span>${esc(label)}</span>
+        <span class="drops-sort-arrow" aria-hidden="true">${arrow}</span>
+      </button>
+    </th>`;
+  }
+
+  function renderTable() {
+    const box = qs("#bestiary-placeholder");
+    if (!box) return;
+
+    const rows = sortedRows(visibleRows());
+    const totalPages = Math.max(1, Math.ceil(rows.length / state.pageSize));
+    state.page = Math.min(Math.max(1, state.page), totalPages);
+
+    const start = (state.page - 1) * state.pageSize;
+    const shown = rows.slice(start, start + state.pageSize);
+    const end = start + shown.length;
+
+    const columns = currentColumns();
+    if (!columns.some(([key]) => key === state.sort.key)) {
+      state.sort.key = "enemy";
+      state.sort.dir = "asc";
+    }
+
+    const body = shown.map((row) => `
+      <tr>
+        ${columns.map(([key]) => `<td data-label="${esc(key)}">${esc(displayValue(row, key))}</td>`).join("")}
+      </tr>
+    `).join("");
+
+    const rangeText = rows.length
+      ? ` Showing ${Number(start + 1).toLocaleString()}-${Number(end).toLocaleString()}.`
+      : "";
+
+    box.innerHTML = `
+      <div class="drops-summary">
+        <div>
+          <strong>BB Bestiary</strong>
+          <span>${rows.length.toLocaleString()} matching rows.${rangeText}</span>
+        </div>
+        <span>${state.rows.length.toLocaleString()} total rows</span>
+      </div>
+      <div class="drops-table-wrap">
+        <table class="drops-table bestiary-table">
+          <thead>
+            <tr>${columns.map(([key, label]) => sortHeader(key, label)).join("")}</tr>
+          </thead>
+          <tbody>${body || `<tr><td colspan="${columns.length}">No enemies match these filters.</td></tr>`}</tbody>
+        </table>
+      </div>
+      <div class="leaderboard-pager drops-pager">
+        <button type="button" data-bestiary-page="prev" ${state.page <= 1 ? "disabled" : ""}>Previous</button>
+        <span>Page ${state.page} of ${totalPages}</span>
+        <button type="button" data-bestiary-page="next" ${state.page >= totalPages ? "disabled" : ""}>Next</button>
+      </div>
+    `;
+  }
+
+  function populateFilters() {
+    fillSelect(qs("#bestiary-mode"), uniqueSorted(state.rows, "mode"), "All modes");
+    fillSelect(qs("#bestiary-episode"), uniqueSorted(state.rows, "episode"), "All episodes");
+    fillSelect(qs("#bestiary-difficulty"), orderedDifficulties(state.rows), "All difficulties");
+  }
+
+  async function loadBestiary() {
+    setStatus("Loading BB bestiary...");
+
+    state.index = await fetchJson("generated/bestiary/bb/index.json");
+    state.table = state.index.tables?.[0] || null;
+    state.rows = await fetchJson(`generated/bestiary/bb/${state.table.path}`);
+
+    populateFilters();
+    renderTable();
+  }
+
+  document.addEventListener("DOMContentLoaded", () => {
+    qs("#bestiary-mode")?.addEventListener("change", (event) => {
+      state.filters.mode = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-episode")?.addEventListener("change", (event) => {
+      state.filters.episode = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-difficulty")?.addEventListener("change", (event) => {
+      state.filters.difficulty = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-view")?.addEventListener("change", () => {
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-search")?.addEventListener("input", (event) => {
+      state.filters.search = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-tier")?.addEventListener("change", () => {
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#bestiary-xp-bonus")?.addEventListener("change", () => {
+      renderTable();
+    });
+
+    qs("#bestiary-placeholder")?.addEventListener("click", (event) => {
+      const pageButton = event.target.closest("[data-bestiary-page]");
+      if (pageButton) {
+        state.page += pageButton.dataset.bestiaryPage === "next" ? 1 : -1;
+        renderTable();
+        return;
+      }
+
+      const button = event.target.closest("[data-bestiary-sort]");
+      if (!button) return;
+
+      const key = button.dataset.bestiarySort;
+      if (state.sort.key === key) {
+        state.sort.dir = state.sort.dir === "asc" ? "desc" : "asc";
+      } else {
+        state.sort.key = key;
+        state.sort.dir = "asc";
+      }
+
+      state.page = 1;
+      renderTable();
+    });
+
+    loadBestiary().catch((err) => {
+      setStatus(err?.message || "Unable to load bestiary.", "error");
+    });
+  });
+})();

site/bestiary.html

@@ -8,7 +8,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="style.css">
+  <link rel="stylesheet" href="style.css?v=bestiary-table-viewer-20260613-3">
   <script src="app.js?v=saves-synced-20260609-2" defer></script>
 </head>
 <body>
@@ -33,21 +33,46 @@
         <form class="placeholder-form">
           <label for="bestiary-version">Version</label>
           <select id="bestiary-version">
-            <option>V2</option>
-            <option>V3</option>
-            <option>V4</option>
+            <option value="bb">BB</option>
           </select>
 
-          <label for="bestiary-episode" data-bestiary-episode-wrap hidden>Episode</label>
-          <select id="bestiary-episode" data-bestiary-episode-wrap hidden>
-            <option>Episode 1</option>
-            <option>Episode 2</option>
-            <option>Episode 4</option>
+          <label for="bestiary-mode">Mode</label>
+          <select id="bestiary-mode">
+            <option value="">All modes</option>
           </select>
 
+          <label for="bestiary-episode">Episode</label>
+          <select id="bestiary-episode">
+            <option value="">All episodes</option>
+          </select>
+
+          <label for="bestiary-difficulty">Difficulty</label>
+          <select id="bestiary-difficulty">
+            <option value="">All difficulties</option>
+          </select>
+
+          <label for="bestiary-xp-bonus">XP Bonus</label>
+          <select id="bestiary-xp-bonus">
+            <option value="1">No modifier</option>
+            <option value="5">5x</option>
+            <option value="10">10x</option>
+          </select>
+          <p class="drops-field-note">Applies EXP multiplier only.</p>
+
+          <label for="bestiary-view">View</label>
+          <select id="bestiary-view">
+            <option value="stats">Stats</option>
+            <option value="resists">Resists</option>
+            <option value="all">All</option>
+          </select>
+
+          <label for="bestiary-search">Search</label>
+          <input id="bestiary-search" type="search" placeholder="Enemy name...">
+
           <label for="bestiary-tier" data-bestiary-tier-wrap>BP Tier</label>
           <select id="bestiary-tier" data-bestiary-tier-wrap>
-            <option>BP+1</option><option>BP+2</option><option>BP+3</option>
+            
+            <option value="0">No modifier</option><option>BP+1</option><option>BP+2</option><option>BP+3</option>
             <option>BP+4</option><option>BP+5</option><option>BP+6</option>
             <option>BP+7</option><option>BP+8</option><option>BP+9</option>
             <option>BP+10</option><option>BP+11</option>
@@ -77,7 +102,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -86,9 +116,13 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
 </footer>
   </div>
-  <script src="placeholder-pages.js?v=basic-pages-fixed-1" defer></script>
+  <script src="bestiary-tables.js?v=hide-zero-bestiary-rows-1" defer></script>
 </body>
 </html>

site/drop-tables.js

@@ -0,0 +1,498 @@
+(() => {
+  "use strict";
+
+  const qs = (sel) => document.querySelector(sel);
+
+  const state = {
+    index: null,
+    rows: [],
+    table: null,
+    filters: {
+      mode: "",
+      episode: "",
+      difficulty: "",
+      section: "",
+      search: "",
+    },
+    sort: {
+      key: "source",
+      dir: "asc",
+    },
+    page: 1,
+    pageSize: 100,
+  };
+
+  const RARE_MODIFIER_VERSIONS = new Set(["v2", "bb"]);
+
+  function esc(value) {
+    return String(value ?? "")
+      .replaceAll("&", "&")
+      .replaceAll("<", "&lt;")
+      .replaceAll(">", "&gt;")
+      .replaceAll('"', "&quot;")
+      .replaceAll("'", "&#039;");
+  }
+
+  function labelValue(value) {
+    return String(value || "")
+      .replace(/^Episode(\d+)$/, "Episode $1")
+      .replace(/^VeryHard$/, "Very Hard")
+      .replaceAll("_", " ");
+  }
+
+  function setStatus(message, kind = "") {
+    const box = qs("#drops-placeholder");
+    if (!box) return;
+    box.innerHTML = `<div class="drops-status ${kind ? `drops-status--${kind}` : ""}">${esc(message)}</div>`;
+  }
+
+  function currentVersion() {
+    return qs("#drops-version")?.value || "v1";
+  }
+
+  function rareModifierEnabled() {
+    const selectedMode = qs("#drops-mode")?.value || "peeps";
+    return selectedMode === "peeps" && RARE_MODIFIER_VERSIONS.has(currentVersion());
+  }
+
+  function currentRareModifier() {
+    const select = qs("#drops-rare-modifier");
+    const pct = rareModifierEnabled() ? Number(select?.value || 0) : 0;
+    const label = select?.selectedOptions?.[0]?.textContent || "No modifier";
+    return { pct, label, multiplier: 1 + (pct / 100) };
+  }
+
+  function modifierMultiplierLabel(modifier) {
+    return `x${modifier.multiplier.toFixed(3).replace(/0+$/, "").replace(/\.$/, "")}`;
+  }
+
+  function updateRareModifierControls() {
+    const wrap = qs("#drops-rare-modifier-wrap");
+    const v2Note = qs("#drops-v2-note");
+    const select = qs("#drops-rare-modifier");
+    const enabled = rareModifierEnabled();
+
+    if (wrap) wrap.hidden = !enabled;
+    if (v2Note) v2Note.hidden = currentVersion() !== "v2";
+
+    if (!enabled && select) {
+      select.value = "0";
+    }
+  }
+
+  function formatOddsDenominator(value) {
+    if (!Number.isFinite(value) || value <= 0) return "—";
+
+    if (value >= 1000) {
+      return Math.round(value).toLocaleString();
+    }
+
+    if (value >= 100) {
+      return value.toFixed(1).replace(/\.0$/, "");
+    }
+
+    return value.toFixed(2).replace(/0+$/, "").replace(/\.$/, "");
+  }
+
+  function adjustedRate(rate) {
+    const text = String(rate || "");
+    const match = text.match(/^(\d+)\/(\d+)$/);
+    if (!match) return text || "—";
+
+    const num = Number(match[1]);
+    const den = Number(match[2]);
+    const modifier = currentRareModifier();
+
+    if (!rareModifierEnabled() || modifier.pct <= 0) {
+      return text;
+    }
+
+    const baseProbability = num / den;
+    const adjustedProbability = Math.min(1, baseProbability * modifier.multiplier);
+
+    if (adjustedProbability >= 1) {
+      return "1/1";
+    }
+
+    return `1/${formatOddsDenominator(1 / adjustedProbability)}`;
+  }
+
+  function rateCellHtml(rate) {
+    const base = String(rate || "—");
+    const adjusted = adjustedRate(base);
+    const modifier = currentRareModifier();
+
+    if (!rareModifierEnabled() || modifier.pct <= 0 || adjusted === base) {
+      return esc(base);
+    }
+
+    return esc(adjusted);
+  }
+
+  async function fetchJson(path) {
+    const res = await fetch(path, { cache: "no-store" });
+    if (!res.ok) throw new Error(`${path}: HTTP ${res.status}`);
+    return res.json();
+  }
+
+  function uniqueSorted(rows, key) {
+    return [...new Set(rows.map((row) => row[key]).filter(Boolean))]
+      .sort((a, b) => String(a).localeCompare(String(b)));
+  }
+
+  function fillSelect(select, values, allLabel) {
+    if (!select) return;
+    const previous = select.value;
+    select.innerHTML = `<option value="">${esc(allLabel)}</option>`;
+    for (const value of values) {
+      const opt = document.createElement("option");
+      opt.value = value;
+      opt.textContent = labelValue(value);
+      select.appendChild(opt);
+    }
+    if ([...select.options].some((opt) => opt.value === previous)) {
+      select.value = previous;
+    }
+  }
+
+  function populateVersions(index) {
+    const select = qs("#drops-version");
+    if (!select) return;
+
+    const previous = select.value || "v1";
+    select.innerHTML = "";
+
+    for (const table of index.tables || []) {
+      const opt = document.createElement("option");
+      opt.value = table.version;
+      opt.textContent = table.label;
+      select.appendChild(opt);
+    }
+
+    if ([...select.options].some((opt) => opt.value === previous)) {
+      select.value = previous;
+    }
+  }
+
+  function orderedDifficultyValues(rows) {
+    const order = ["Normal", "Hard", "VeryHard", "Ultimate"];
+    const present = new Set(rows.map((row) => row.difficulty).filter(Boolean));
+    const ordered = order.filter((value) => present.has(value));
+    const extras = [...present]
+      .filter((value) => !order.includes(value))
+      .sort((a, b) => String(a).localeCompare(String(b)));
+    return [...ordered, ...extras];
+  }
+
+  function populateFilters(rows) {
+    fillSelect(qs("#drops-rare-mode"), uniqueSorted(rows, "mode"), "All modes");
+    fillSelect(qs("#drops-episode"), uniqueSorted(rows, "episode"), "All episodes");
+    fillSelect(qs("#drops-difficulty"), orderedDifficultyValues(rows), "All difficulties");
+    fillSelect(qs("#drops-section"), uniqueSorted(rows, "section_id"), "All Section IDs");
+  }
+
+  const SORT_COLUMNS = [
+    ["mode", "Mode"],
+    ["episode", "Episode"],
+    ["difficulty", "Difficulty"],
+    ["section_id", "SECID"],
+    ["source", "Source"],
+    ["item", "Item"],
+    ["item_code", "Code"],
+    ["rate", "Rate"],
+  ];
+
+  const DIFFICULTY_SORT_ORDER = {
+    Normal: 0,
+    Hard: 1,
+    VeryHard: 2,
+    Ultimate: 3,
+  };
+
+  function rateSortValue(rate) {
+    const text = String(rate || "").replaceAll(",", "");
+    const match = text.match(/^(\d+(?:\.\d+)?)\/(\d+(?:\.\d+)?)$/);
+    if (!match) return Number.NEGATIVE_INFINITY;
+
+    const num = Number(match[1]);
+    const den = Number(match[2]);
+
+    if (!Number.isFinite(num) || !Number.isFinite(den) || den <= 0) {
+      return Number.NEGATIVE_INFINITY;
+    }
+
+    // Sort by actual probability, same as percentage conversion.
+    // 5/8 => 0.625, 1/8192 => 0.000122...
+    return num / den;
+  }
+
+  function sortValue(row, key) {
+    if (key === "difficulty") {
+      return DIFFICULTY_SORT_ORDER[row.difficulty] ?? 999;
+    }
+
+    if (key === "rate") {
+      return rateSortValue(adjustedRate(row.rate));
+    }
+
+    if (key === "item") {
+      return row.item || row.item_code || "";
+    }
+
+    return row[key] || "";
+  }
+
+  function sortedRows(rows) {
+    const { key, dir } = state.sort;
+    const factor = dir === "desc" ? -1 : 1;
+
+    return [...rows].sort((a, b) => {
+      const av = sortValue(a, key);
+      const bv = sortValue(b, key);
+
+      if (typeof av === "number" && typeof bv === "number") {
+        return (av - bv) * factor;
+      }
+
+      return String(av).localeCompare(String(bv), undefined, {
+        numeric: true,
+        sensitivity: "base",
+      }) * factor;
+    });
+  }
+
+  function sortHeader(key, label) {
+    const active = state.sort.key === key;
+    const arrow = active ? (state.sort.dir === "asc" ? "▲" : "▼") : "";
+    const ariaSort = active ? (state.sort.dir === "asc" ? "ascending" : "descending") : "none";
+
+    return `<th aria-sort="${ariaSort}">
+      <button class="drops-sort-button ${active ? "is-active" : ""}" type="button" data-drops-sort="${esc(key)}">
+        <span>${esc(label)}</span>
+        <span class="drops-sort-arrow" aria-hidden="true">${arrow}</span>
+      </button>
+    </th>`;
+  }
+
+  function visibleRows() {
+    const search = state.filters.search.trim().toLowerCase();
+
+    return state.rows.filter((row) => {
+      if (state.filters.mode && row.mode !== state.filters.mode) return false;
+      if (state.filters.episode && row.episode !== state.filters.episode) return false;
+      if (state.filters.difficulty && row.difficulty !== state.filters.difficulty) return false;
+      if (state.filters.section && row.section_id !== state.filters.section) return false;
+
+      if (search) {
+        const haystack = [
+          row.mode,
+          row.episode,
+          row.difficulty,
+          row.section_id,
+          row.source,
+          row.item,
+          row.item_code,
+          row.rate,
+        ].join(" ").toLowerCase();
+
+        if (!haystack.includes(search)) return false;
+      }
+
+      return true;
+    });
+  }
+
+  function renderTable() {
+    const box = qs("#drops-placeholder");
+    if (!box) return;
+
+    const rows = sortedRows(visibleRows());
+    const tableLabel = state.table?.label || "BB";
+    const groupLabel = state.table?.groupLabel || "Peeps";
+    const totalPages = Math.max(1, Math.ceil(rows.length / state.pageSize));
+    state.page = Math.min(Math.max(1, state.page), totalPages);
+
+    const start = (state.page - 1) * state.pageSize;
+    const shown = rows.slice(start, start + state.pageSize);
+    const end = start + shown.length;
+
+    const body = shown.map((row) => {
+      const item = row.item || row.item_code || "—";
+      const itemCode = row.item_code || "—";
+
+      return `
+        <tr>
+          <td data-label="Mode">${esc(labelValue(row.mode))}</td>
+          <td data-label="Episode">${esc(labelValue(row.episode))}</td>
+          <td data-label="Difficulty">${esc(labelValue(row.difficulty))}</td>
+          <td data-label="Section ID">${esc(row.section_id || "—")}</td>
+          <td data-label="Source">${esc(labelValue(row.source || "—"))}</td>
+          <td data-label="Item">${esc(item)}</td>
+          <td data-label="Item Code">${esc(itemCode)}</td>
+          <td data-label="Rate">${rateCellHtml(row.rate || "—")}</td>
+        </tr>
+      `;
+    }).join("");
+
+    const rangeText = rows.length
+      ? ` Showing ${Number(start + 1).toLocaleString()}-${Number(end).toLocaleString()}.`
+      : "";
+    const modifier = currentRareModifier();
+    const modifierNote = rareModifierEnabled() && modifier.pct > 0
+      ? `<span>Rate modifier: ${esc(modifier.label)} / ${esc(modifierMultiplierLabel(modifier))}</span>`
+      : "";
+
+    box.innerHTML = `
+      <div class="drops-summary">
+        <div>
+          <strong>${esc(groupLabel)} ${esc(tableLabel)} drop table</strong>
+          <span>${rows.length.toLocaleString()} matching rows.${rangeText}</span>
+          ${modifierNote}
+        </div>
+        <span>${state.rows.length.toLocaleString()} total rows</span>
+      </div>
+      <div class="drops-table-wrap">
+        <table class="drops-table">
+          <thead>
+            <tr>
+              ${SORT_COLUMNS.map(([key, label]) => sortHeader(key, label)).join("")}
+            </tr>
+          </thead>
+          <tbody>${body || `<tr><td colspan="8">No drops match these filters.</td></tr>`}</tbody>
+        </table>
+      </div>
+      <div class="leaderboard-pager drops-pager">
+        <button type="button" data-drops-page="prev" ${state.page <= 1 ? "disabled" : ""}>Previous</button>
+        <span>Page ${state.page} of ${totalPages}</span>
+        <button type="button" data-drops-page="next" ${state.page >= totalPages ? "disabled" : ""}>Next</button>
+      </div>
+    `;
+  }
+
+  async function loadDropGroup() {
+    const selectedMode = qs("#drops-mode")?.value || "peeps";
+    const groupPath = selectedMode === "hardcore" ? "hardcore" : "peeps";
+    const groupLabel = selectedMode === "hardcore" ? "Hardcore" : "Peeps";
+
+    setStatus(`Loading ${groupLabel} drop tables...`);
+
+    state.index = await fetchJson(`generated/drops/${groupPath}/index.json`);
+
+    if (selectedMode === "peeps") {
+      populateVersions(state.index);
+    }
+
+    const version = selectedMode === "hardcore" ? "bb" : currentVersion();
+    const table = (state.index.tables || []).find((entry) => entry.version === version);
+
+    if (!table) {
+      setStatus(`No ${groupLabel} drop table is configured.`, "error");
+      return;
+    }
+
+    state.table = { ...table, groupLabel };
+    state.rows = await fetchJson(`generated/drops/${groupPath}/${table.path}`);
+
+    state.filters.mode = "";
+    state.filters.episode = "";
+    state.filters.difficulty = "";
+    state.filters.section = "";
+    state.filters.search = "";
+    state.page = 1;
+
+    if (qs("#drops-search")) qs("#drops-search").value = "";
+
+    populateFilters(state.rows);
+    updateRareModifierControls();
+
+    if (qs("#drops-rare-mode")) qs("#drops-rare-mode").value = "";
+    if (qs("#drops-episode")) qs("#drops-episode").value = "";
+    if (qs("#drops-difficulty")) qs("#drops-difficulty").value = "";
+    if (qs("#drops-section")) qs("#drops-section").value = "";
+
+    renderTable();
+  }
+
+  async function updateMode() {
+    const mode = qs("#drops-mode")?.value || "peeps";
+    const versionSelect = qs("#drops-version");
+    const versionLabel = document.querySelector('label[for="drops-version"]');
+    const v2Note = qs("#drops-v2-note");
+    const hardcoreNote = qs("#drops-hardcore-note");
+
+    if (versionSelect) versionSelect.hidden = mode === "hardcore";
+    if (versionLabel) versionLabel.hidden = mode === "hardcore";
+    if (v2Note) v2Note.hidden = true;
+    if (hardcoreNote) hardcoreNote.hidden = mode !== "hardcore";
+
+    try {
+      await loadDropGroup();
+    } catch (err) {
+      setStatus(err?.message || "Unable to load drop table.", "error");
+    }
+  }
+
+  document.addEventListener("DOMContentLoaded", () => {
+    qs("#drops-mode")?.addEventListener("change", updateMode);
+    qs("#drops-version")?.addEventListener("change", loadDropGroup);
+    qs("#drops-rare-modifier")?.addEventListener("change", () => {
+      state.page = 1;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#drops-rare-mode")?.addEventListener("change", (event) => {
+      state.filters.mode = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#drops-episode")?.addEventListener("change", (event) => {
+      state.filters.episode = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#drops-difficulty")?.addEventListener("change", (event) => {
+      state.filters.difficulty = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#drops-section")?.addEventListener("change", (event) => {
+      state.filters.section = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#drops-search")?.addEventListener("input", (event) => {
+      state.filters.search = event.target.value;
+      state.page = 1;
+      renderTable();
+    });
+
+    qs("#drops-placeholder")?.addEventListener("click", (event) => {
+      const pageButton = event.target.closest("[data-drops-page]");
+      if (pageButton) {
+        state.page += pageButton.dataset.dropsPage === "next" ? 1 : -1;
+        renderTable();
+        return;
+      }
+
+      const button = event.target.closest("[data-drops-sort]");
+      if (!button) return;
+
+      const key = button.dataset.dropsSort;
+      if (state.sort.key === key) {
+        state.sort.dir = state.sort.dir === "asc" ? "desc" : "asc";
+      } else {
+        state.sort.key = key;
+        state.sort.dir = "asc";
+      }
+
+      renderTable();
+    });
+
+    updateMode();
+  });
+})();

site/drops.html

@@ -8,7 +8,7 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="style.css">
+  <link rel="stylesheet" href="style.css?v=drops-peeps-table-viewer-20260613-3">
   <script src="app.js?v=saves-synced-20260609-2" defer></script>
 </head>
 <body>
@@ -37,25 +37,64 @@
             <option value="hardcore">Hardcore</option>
           </select>
 
-          <label for="drops-version" data-drops-version-wrap>Version</label>
-          <select id="drops-version" data-drops-version-wrap>
-            <option>V1</option>
-            <option>V2</option>
-            <option>V3</option>
-            <option>V4</option>
-          </select>
+          <div id="drops-peeps-controls">
+            <label for="drops-version">Version</label>
+            <select id="drops-version">
+              <option value="v1">V1</option>
+              <option value="v2">V2</option>
+              <option value="v3">V3</option>
+              <option value="bb">BB</option>
+            </select>
+            <p class="drops-field-note" id="drops-v2-note" hidden>V2 drop tables apply to PSO PC only.</p>
+            <p class="drops-field-note" id="drops-hardcore-note" hidden>Hardcore uses the BB/V4 drop table.</p>
 
-          <label for="drops-episode" data-drops-episode-wrap hidden>Episode</label>
-          <select id="drops-episode" data-drops-episode-wrap hidden>
-            <option>Episode 1</option>
-            <option>Episode 2</option>
-            <option>Episode 4</option>
-          </select>
+            <div id="drops-rare-modifier-wrap" hidden>
+              <label for="drops-rare-modifier">Rare bonus modifier</label>
+              <select id="drops-rare-modifier">
+                <option value="0">No modifier</option>
+                <option value="0.1">Brutal Peeps +1 (+0.1%)</option>
+                <option value="0.2">Brutal Peeps +2 (+0.2%)</option>
+                <option value="0.5">Brutal Peeps +3 (+0.5%)</option>
+                <option value="0.6">Brutal Peeps +4 (+0.6%)</option>
+                <option value="0.8">Brutal Peeps +5 (+0.8%)</option>
+                <option value="0.9">Brutal Peeps +6 (+0.9%)</option>
+                <option value="1.0">Brutal Peeps +7 (+1.0%)</option>
+                <option value="2.0">Brutal Peeps +8 (+2.0%)</option>
+                <option value="3.0">Brutal Peeps +9 (+3.0%)</option>
+                <option value="4.0">Brutal Peeps +10 (+4.0%)</option>
+                <option value="5.0">Brutal Peeps +11 (+5.0%)</option>
+              </select>
+              <p class="drops-field-note">Applies to the Rate column for V2 PC and BB/V4.</p>
+            </div>
+
+            <label for="drops-rare-mode">Mode</label>
+            <select id="drops-rare-mode">
+              <option value="">All modes</option>
+            </select>
+
+            <label for="drops-episode">Episode</label>
+            <select id="drops-episode">
+              <option value="">All episodes</option>
+            </select>
+
+            <label for="drops-difficulty">Difficulty</label>
+            <select id="drops-difficulty">
+              <option value="">All difficulties</option>
+            </select>
+
+            <label for="drops-section">Section ID</label>
+            <select id="drops-section">
+              <option value="">All Section IDs</option>
+            </select>
+
+            <label for="drops-search">Search</label>
+            <input id="drops-search" type="search" placeholder="Enemy, box, item, code...">
+          </div>
         </form>
       </section>
 
       <section class="card placeholder-results-card">
-        <div class="blank-data-box" id="drops-placeholder">Drop table placeholder</div>
+        <div class="blank-data-box drops-box" id="drops-placeholder">Drop table placeholder</div>
       </section>
     </main>
 
@@ -76,7 +115,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -85,9 +129,13 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
 </footer>
   </div>
-  <script src="placeholder-pages.js?v=basic-pages-fixed-1" defer></script>
+  <script src="drop-tables.js?v=drops-peeps-table-viewer-20260613-12" defer></script>
 </body>
 </html>

site/generated/bestiary/bb/index.json

@@ -0,0 +1,12 @@
+{
+  "label": "BB",
+  "mode": "bestiary",
+  "tables": [
+    {
+      "label": "BB",
+      "path": "bb.json",
+      "rows": 3216,
+      "version": "bb"
+    }
+  ]
+}

site/generated/drops/hardcore/index.json

@@ -0,0 +1,12 @@
+{
+  "label": "Hardcore",
+  "mode": "hardcore",
+  "tables": [
+    {
+      "label": "BB",
+      "path": "bb.json",
+      "rows": 7200,
+      "version": "bb"
+    }
+  ]
+}

site/generated/drops/peeps/index.json

@@ -0,0 +1,30 @@
+{
+  "label": "Peeps",
+  "mode": "peeps",
+  "tables": [
+    {
+      "label": "V1",
+      "path": "v1.json",
+      "rows": 5328,
+      "version": "v1"
+    },
+    {
+      "label": "V2",
+      "path": "v2.json",
+      "rows": 7872,
+      "version": "v2"
+    },
+    {
+      "label": "V3",
+      "path": "v3.json",
+      "rows": 5636,
+      "version": "v3"
+    },
+    {
+      "label": "BB",
+      "path": "bb.json",
+      "rows": 7200,
+      "version": "bb"
+    }
+  ]
+}

site/home-leaderboard.js

@@ -65,7 +65,7 @@
       return;
     }
 
-    const top = rows.slice(0, 5);
+    const top = rows.slice(0, 10);
 
     if (!top.length) {
       list.innerHTML = `<li><span class="rank">1.</span><span>—</span></li>`;

site/index.html

@@ -8,8 +8,9 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700;800&display=swap" rel="stylesheet">
-  <link rel="stylesheet" href="style.css?v=home-hardcore-preline-20260610-1">
+  <link rel="stylesheet" href="style.css?v=home-status-two-boxes-2">
   <script src="app.js?v=account-status-label-20260609" defer></script>
+  <script src="server-status.js?v=home-status-prometheus-2" defer></script>
 </head>
 <body>
   <div class="site-shell">
@@ -52,30 +53,48 @@
 
         <h1 id="server-status-heading" class="section-title">Server Status</h1>
 
-        <div class="status-list" role="list" aria-label="Current server player counts">
-          <div class="status-row status-parent" role="listitem"><span>US Server</span><span></span></div>
+        <div class="status-list status-list--regions" role="list" aria-label="Current server player counts" data-server-status="loading">
+          <div class="status-region" role="group" aria-label="US Server player counts">
+            <div class="status-region-header">
+              <span>US Server</span><span>Loading…</span>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Alis</div>
+              <div class="status-row"><span>V2</span><span>—</span></div>
+              <div class="status-row"><span>V3</span><span>—</span></div>
+              <div class="status-row"><span>BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Abion</div>
+              <div class="status-row"><span>HC/BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">AdHoc-US</div>
+              <div class="status-row"><span>PSP1</span><span>—</span></div>
+              <div class="status-row"><span>PSP2i</span><span>—</span></div>
+            </div>
+          </div>
 
-          <div class="status-row status-parent" role="listitem"><span>Alis</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V2</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V3</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>BB</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>Abion</span><span></span></div>
-          <div class="status-row status-child" role="listitem"><span>HC</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>EU Server</span><span></span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>Palma</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V2</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>V3</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>BB</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>Aiedo</span><span></span></div>
-          <div class="status-row status-child" role="listitem"><span>HC</span><span>0 Players</span></div>
-
-          <div class="status-row status-parent" role="listitem"><span>PSP Ship</span><span></span></div>
-          <div class="status-row status-child" role="listitem"><span>PSP1</span><span>0 Players</span></div>
-          <div class="status-row status-child" role="listitem"><span>PSP2i</span><span>0 Players</span></div>
+          <div class="status-region" role="group" aria-label="EU Server player counts">
+            <div class="status-region-header">
+              <span>EU Server</span><span>Loading…</span>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Palma</div>
+              <div class="status-row"><span>V2</span><span>—</span></div>
+              <div class="status-row"><span>V3</span><span>—</span></div>
+              <div class="status-row"><span>BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">Aiedo</div>
+              <div class="status-row"><span>HC/BB</span><span>—</span></div>
+            </div>
+            <div class="status-ship">
+              <div class="status-ship-name">AdHoc-EU</div>
+              <div class="status-row"><span>PSP1</span><span>—</span></div>
+              <div class="status-row"><span>PSP2i</span><span>—</span></div>
+            </div>
+          </div>
         </div>
       </section>
 
@@ -90,22 +109,11 @@
 
         <section class="card leaderboard-card" aria-labelledby="hardcore-heading">
           <h2 id="hardcore-heading" class="section-title">Hardcore Leaderboard</h2>
-          <ol class="leaderboard-list leaderboard-list--home-hardcore" id="home-hardcore-leaderboard-body" aria-label="Top five hardcore players">
+          <ol class="leaderboard-list leaderboard-list--home-hardcore" id="home-hardcore-leaderboard-body" aria-label="Top ten hardcore players">
             <li><span class="rank">1.</span><span>Loading...</span></li>
           </ol>
           <a class="small-link home-leaderboard-more" href="leaderboards.html">more</a>
         </section>
-
-        <section class="card leaderboard-card" aria-labelledby="crank-heading">
-          <h2 id="crank-heading" class="section-title">C Rank Points</h2>
-          <ol class="leaderboard-list" aria-label="Top five C Rank point totals">
-            <li><span class="rank">1.</span><span>—</span></li>
-            <li><span class="rank">2.</span><span>—</span></li>
-            <li><span class="rank">3.</span><span>—</span></li>
-            <li><span class="rank">4.</span><span>—</span></li>
-            <li><span class="rank">5.</span><span>—</span></li>
-          </ol>
-        </section>
       </aside>
     </main>
 
@@ -126,7 +134,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -135,10 +148,14 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
     </footer>
   </div>
   <script src="hero-cycle.js?v=force-cycle-3" defer></script>
-  <script src="home-leaderboard.js?v=home-hardcore-preline-20260610-1" defer></script>
+  <script src="home-leaderboard.js?v=home-hardcore-top10-1" defer></script>
 </body>
 </html>

site/leaderboards.html

@@ -71,7 +71,12 @@
       </div>
       <div class="footer-legal" aria-label="Site license and software credits">
         <p>
-          All content on this website is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site" target="_blank" rel="noopener noreferrer">psopeeps.online</a>
+          is licensed under
+          <a href="https://git.circlewithadot.net/incentive/psopeeps_site/src/branch/main/LICENSE" target="_blank" rel="noopener noreferrer">AGPL 3.0</a>.
+        </p>
+        <p>
+          All written content on this website is licensed under
           <a href="https://creativecommons.org/licenses/by-nc-sa/4.0/" target="_blank" rel="noopener noreferrer">CC BY-NC-SA 4.0</a>.
         </p>
         <p>
@@ -80,6 +85,10 @@
           from fuzziqersoftware.
           <a href="https://github.com/fuzziqersoftware/newserv/blob/master/LICENSE" target="_blank" rel="noopener noreferrer">LICENSE</a>
         </p>
+        <p>
+          PSO Peeps is hosted and maintained by
+          <a href="https://circlewithadot.net" target="_blank" rel="noopener noreferrer">CIRCLE WITH A DOT</a>.
+        </p>
       </div>
 </footer>
   </div>

site/server-status.js

@@ -0,0 +1,54 @@
+(() => {
+  const list = document.querySelector(".status-list");
+  if (!list) return;
+
+  const esc = (value) => String(value ?? "").replace(/[&<>"']/g, (ch) => ({
+    "&": "&amp;",
+    "<": "&lt;",
+    ">": "&gt;",
+    "\"": "&quot;",
+    "'": "&#39;",
+  }[ch]));
+
+  const players = (value) => {
+    const n = Number(value || 0);
+    return `${n.toLocaleString()} ${n === 1 ? "Player" : "Players"}`;
+  };
+
+  const render = (data) => {
+    const servers = Array.isArray(data?.servers) ? data.servers : [];
+    if (!servers.length) return;
+
+    list.classList.add("status-list--regions");
+    list.innerHTML = servers.map((server) => `
+      <div class="status-region" role="group" aria-label="${esc(server.label)} player counts">
+        <div class="status-row status-parent status-server" role="listitem">
+          <span>${esc(server.label)}</span><span>${players(server.players)}</span>
+        </div>
+        ${(server.ships || []).map((ship) => `
+          <div class="status-row status-parent status-ship" role="listitem">
+            <span>${esc(ship.label)}</span><span></span>
+          </div>
+          ${(ship.rows || []).map((row) => `
+            <div class="status-row status-child" role="listitem">
+              <span>${esc(row.label)}</span><span>${players(row.players)}</span>
+            </div>
+          `).join("")}
+        `).join("")}
+      </div>
+    `).join("");
+  };
+
+  const loadStatus = (url) => fetch(url, { cache: "no-store" })
+    .then((res) => {
+      if (!res.ok) {
+        throw new Error(`status ${res.status}`);
+      }
+      return res.json();
+    });
+
+  loadStatus(`/server-status.json?ts=${Date.now()}`)
+    .catch(() => loadStatus("/api/server-status"))
+    .then((data) => data && render(data))
+    .catch(() => {});
+})();

site/style.css

@@ -1842,900 +1842,76 @@ button.inline-link,
   padding: 2rem;
 }
 
-.key-sync-status {
-  display: inline-flex;
-  align-items: center;
-  gap: 0.45rem;
-  margin-right: 1.1rem;
-  white-space: nowrap;
-}
-
-.key-sync-dot {
-  width: 0.65rem;
-  height: 0.65rem;
-  border-radius: 999px;
-  display: inline-block;
-  flex: 0 0 auto;
-  vertical-align: middle;
-}
-
-.key-sync-dot.is-synced {
-  background: #38d66b;
-  box-shadow: 0 0 0 2px rgba(56, 214, 107, 0.15);
-}
-
-.key-sync-dot.is-syncing {
-  background: #e05252;
-  box-shadow: 0 0 0 2px rgba(224, 82, 82, 0.16);
-}
-
-.key-sync-status {
-  display: inline-flex;
-  align-items: center;
-  gap: 0.45rem;
-  margin-right: 1.1rem;
-  white-space: nowrap;
-}
-
-.key-sync-dot {
-  width: 0.65rem;
-  height: 0.65rem;
-  border-radius: 999px;
-  display: inline-block;
-  flex: 0 0 auto;
-  vertical-align: middle;
-}
-
-.key-sync-dot.is-synced {
-  background: #38d66b;
-  box-shadow: 0 0 0 2px rgba(56, 214, 107, 0.15);
-}
-
-.key-sync-dot.is-syncing {
-  background: #e05252;
-  box-shadow: 0 0 0 2px rgba(224, 82, 82, 0.16);
-}
-
-.key-sync-status {
-  display: inline-flex;
-  align-items: center;
-  gap: 0.45rem;
-  margin-right: 1.1rem;
-  white-space: nowrap;
-}
-
-.key-sync-dot {
-  width: 0.65rem;
-  height: 0.65rem;
-  border-radius: 999px;
-  display: inline-block;
-  flex: 0 0 auto;
-  vertical-align: middle;
-}
-
-.key-sync-dot.is-synced {
-  background: #38d66b;
-  box-shadow: 0 0 0 2px rgba(56, 214, 107, 0.15);
-}
-
-.key-sync-dot.is-syncing {
-  background: #e05252;
-  box-shadow: 0 0 0 2px rgba(224, 82, 82, 0.16);
-}
-
-#key-sync-summary.key-sync-summary .key-sync-status {
-  display: inline-flex !important;
-  align-items: center !important;
-  gap: 0.45rem !important;
-  margin-right: 1.1rem !important;
-  white-space: nowrap !important;
-}
-
-#key-sync-summary.key-sync-summary .key-sync-dot {
-  display: inline-block !important;
-  width: 0.65rem !important;
-  height: 0.65rem !important;
-  min-width: 0.65rem !important;
-  min-height: 0.65rem !important;
-  border-radius: 999px !important;
-  background-color: #e05252 !important;
-  box-shadow: 0 0 0 2px rgba(224, 82, 82, 0.16) !important;
-  opacity: 1 !important;
-  visibility: visible !important;
-}
-
-#key-sync-summary.key-sync-summary .key-sync-dot.is-synced {
-  background-color: #38d66b !important;
-  box-shadow: 0 0 0 2px rgba(56, 214, 107, 0.15) !important;
-}
-
-#key-sync-summary .key-sync-dot {
-  display: inline-block !important;
-  width: auto !important;
-  height: auto !important;
-  min-width: 0 !important;
-  min-height: 0 !important;
-  background: transparent !important;
-  box-shadow: none !important;
-  font-size: 0.95rem !important;
-  line-height: 1 !important;
-  color: #e05252 !important;
-}
-
-#key-sync-summary .key-sync-dot.is-synced {
-  color: #38d66b !important;
-}
-
-/* homepage server status touch-up */
-.server-status-card .site-intro {
-  margin: 0 0 1.35rem;
-  color: var(--text);
-  line-height: 1.65;
-}
-
-.status-list {
-  margin-top: 1.25rem;
-}
-
-.status-server {
-  margin-top: 1.2rem;
-  color: var(--text);
-  font-family: var(--mono);
-  font-weight: 900;
-}
-
-.status-server:first-child {
-  margin-top: 0;
-}
-
-.status-label {
-  margin: 0.25rem 0 0.4rem;
-  color: var(--muted);
-  font-family: var(--mono);
-  font-size: 0.76rem;
-  letter-spacing: 0.08em;
-  text-transform: uppercase;
-}
-
-.status-ship {
-  padding-top: 0.25rem;
-  font-family: var(--mono);
-  font-weight: 900;
-}
-
-.status-ship--solo {
-  justify-content: flex-start;
-}
-
-.status-child {
-  padding-left: 1.15rem;
-  color: var(--muted);
-}
-
-
-/* Hardcore leaderboard table */
-.leaderboard-box {
-  align-items: stretch;
-  justify-content: flex-start;
-  min-height: 260px;
-  text-align: left;
-}
-
-#leaderboard-page-size-wrap {
-  display: grid;
-  gap: 0.45rem;
-}
-
-.leaderboard-status {
-  display: grid;
-  min-height: 220px;
-  place-items: center;
-  color: var(--muted);
-  font-weight: 700;
-  text-align: center;
-}
-
-.leaderboard-status--error {
-  color: #ff9a9a;
-}
-
-.leaderboard-table-wrap {
-  width: 100%;
-  overflow-x: auto;
-}
-
-.leaderboard-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 0.92rem;
-}
-
-.leaderboard-table th,
-.leaderboard-table td {
-  border-bottom: 1px solid var(--line);
-  padding: 0.8rem 0.65rem;
-  text-align: left;
-  white-space: nowrap;
-}
-
-.leaderboard-table th {
-  color: var(--muted);
-  font-size: 0.72rem;
-  letter-spacing: 0.12em;
-  text-transform: uppercase;
-}
-
-.leaderboard-sort {
-  appearance: none;
-  border: 0;
-  background: transparent;
-  color: inherit;
-  cursor: pointer;
-  font: inherit;
-  letter-spacing: inherit;
-  padding: 0;
-  text-transform: inherit;
-}
-
-.leaderboard-sort:hover,
-.leaderboard-sort:focus {
-  color: var(--text);
-}
-
-.leaderboard-table td:nth-child(1),
-.leaderboard-table td:nth-child(3),
-.leaderboard-table td:nth-child(4),
-.leaderboard-table td:nth-child(7),
-.leaderboard-table td:nth-child(8) {
-  font-variant-numeric: tabular-nums;
-}
-
-.leaderboard-pager {
-  align-items: center;
-  color: var(--muted);
-  display: flex;
-  font-size: 0.85rem;
-  font-weight: 700;
-  gap: 1rem;
-  justify-content: center;
-  margin-top: 1rem;
-}
-
-.leaderboard-pager button {
-  border: 1px solid var(--line);
-  border-radius: 0.45rem;
-  background: rgba(255, 255, 255, 0.03);
-  color: var(--text);
-  cursor: pointer;
-  font: inherit;
-  font-size: 0.75rem;
-  font-weight: 800;
-  letter-spacing: 0.12em;
-  padding: 0.6rem 0.85rem;
-  text-transform: uppercase;
-}
-
-.leaderboard-pager button:disabled {
-  cursor: not-allowed;
-  opacity: 0.35;
-}
-
-@media (max-width: 720px) {
-  .leaderboard-table {
-    min-width: 720px;
-  }
-}
-
-
-/* Keep wide leaderboard table contained on small screens */
-.placeholder-results-card,
-.leaderboard-box {
+/* Bestiary: keep the results card at page width and scroll the table horizontally when it's too wide (e.g. the "All" view). Touches width/scroll only — no colors, fonts, spacing, or layout of the table. */
+.placeholder-results-card {
   min-width: 0;
   max-width: 100%;
   overflow: hidden;
+  contain: inline-size;
 }
 
-.leaderboard-table-wrap {
-  min-width: 0;
+#bestiary-placeholder .drops-table-wrap {
+  width: 100%;
   max-width: 100%;
+  min-width: 0;
   overflow-x: auto;
   overflow-y: hidden;
   -webkit-overflow-scrolling: touch;
+}\n\n
+/* Home right column: stretch Hardcore leaderboard after C Rank removal */
+.right-stack {
+  display: flex;
+  flex-direction: column;
 }
 
-.leaderboard-table {
-  min-width: 820px;
+.right-stack .leaderboard-card {
+  flex: 1;
+}
+\n
+
+
+/* Home layout: stretch right column to match server status card */
+.home-grid {
+  align-items: stretch;
 }
 
-.leaderboard-table th,
-.leaderboard-table td {
-  box-sizing: border-box;
+.right-stack {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
 }
 
-.leaderboard-table td:nth-child(1),
-.leaderboard-table td:nth-child(3),
-.leaderboard-table td:nth-child(4),
-.leaderboard-table td:nth-child(7),
-.leaderboard-table td:nth-child(8) {
-  font-variant-numeric: tabular-nums;
+.right-stack .leaderboard-card {
+  flex: 1 1 auto;
+}
+
+
+/* Home server status: split US/EU into two inner boxes */
+.server-card .status-list.status-list--regions {
+  display: grid;
+  grid-template-columns: repeat(2, minmax(0, 1fr));
+  gap: 1rem;
+  background: transparent;
+  border: 0;
+  padding: 0;
+}
+
+.server-card .status-region {
+  display: grid;
+  gap: 0.35rem;
+  padding: 1rem;
+  border: 1px solid rgba(255, 255, 255, 0.08);
+  border-radius: 0.45rem;
+  background: rgba(0, 0, 0, 0.35);
+}
+
+.server-card .status-region .status-row {
+  grid-template-columns: minmax(0, 1fr) max-content;
 }
 
 @media (max-width: 720px) {
-  .leaderboard-box {
-    display: block;
-    padding: 1rem;
-  }
-
-  .leaderboard-table {
-    width: 820px;
-    min-width: 820px;
-  }
-
-  .leaderboard-pager {
-    min-width: 0;
-    max-width: 100%;
+  .server-card .status-list.status-list--regions {
+    grid-template-columns: 1fr;
   }
 }
 
-
-/* Mobile containment for wide leaderboard tables */
-html,
-body {
-  max-width: 100%;
-  overflow-x: hidden;
-}
-
-.site-shell,
-.placeholder-layout,
-.placeholder-control-card,
-.placeholder-results-card,
-.blank-data-box,
-.leaderboard-box {
-  box-sizing: border-box;
-  max-width: 100%;
-  min-width: 0;
-}
-
-.leaderboard-box {
-  overflow: hidden;
-}
-
-.leaderboard-table-wrap {
-  display: block;
-  box-sizing: border-box;
-  width: 100%;
-  max-width: 100%;
-  min-width: 0;
-  overflow-x: auto;
-  overflow-y: hidden;
-  -webkit-overflow-scrolling: touch;
-}
-
-.leaderboard-table {
-  width: max-content;
-  min-width: 820px;
-  max-width: none;
-}
-
-@media (max-width: 720px) {
-  .site-shell {
-    width: 100%;
-    max-width: 100%;
-  }
-
-  .placeholder-results-card {
-    overflow: hidden;
-  }
-
-  .leaderboard-box {
-    display: block;
-    width: 100%;
-    padding: 1rem;
-  }
-
-  .leaderboard-table-wrap {
-    width: 100%;
-  }
-
-  .leaderboard-table {
-    width: max-content;
-    min-width: 820px;
-  }
-}
-
-/* Hard clamp mobile leaderboard overflow */
-@media (max-width: 720px) {
-  html,
-  body {
-    width: 100%;
-    max-width: 100%;
-    overflow-x: hidden;
-  }
-
-  .site-shell,
-  .hero,
-  .nav-bar,
-  .placeholder-layout,
-  .card,
-  .placeholder-control-card,
-  .placeholder-results-card,
-  .footer-bar {
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    min-width: 0;
-    overflow-x: hidden;
-  }
-
-  .blank-data-box.leaderboard-box {
-    box-sizing: border-box;
-    display: block;
-    width: 100%;
-    max-width: 100%;
-    min-width: 0;
-    overflow: hidden;
-    padding: 1rem;
-  }
-
-  .leaderboard-table-wrap {
-    box-sizing: border-box;
-    display: block;
-    width: 100%;
-    max-width: 100%;
-    min-width: 0;
-    overflow-x: auto;
-    overflow-y: hidden;
-    -webkit-overflow-scrolling: touch;
-    overscroll-behavior-x: contain;
-  }
-
-  .leaderboard-table {
-    display: table;
-    width: 820px;
-    min-width: 820px;
-    max-width: none;
-  }
-
-  .leaderboard-pager {
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    min-width: 0;
-  }
-}
-
-/* Final mobile leaderboard containment: keep page width fixed, scroll table only */
-@media (max-width: 720px) {
-  html,
-  body {
-    width: 100%;
-    max-width: 100vw;
-    overflow-x: hidden;
-  }
-
-  .site-shell {
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100vw;
-    min-width: 0;
-    overflow-x: hidden;
-  }
-
-  .placeholder-layout,
-  .placeholder-control-card,
-  .placeholder-results-card {
-    box-sizing: border-box;
-    width: calc(100vw - 1rem) !important;
-    max-width: calc(100vw - 1rem) !important;
-    min-width: 0 !important;
-    overflow: hidden !important;
-  }
-
-  .placeholder-results-card,
-  .blank-data-box.leaderboard-box {
-    contain: inline-size;
-  }
-
-  .blank-data-box.leaderboard-box {
-    box-sizing: border-box;
-    display: block;
-    width: 100% !important;
-    max-width: 100% !important;
-    min-width: 0 !important;
-    overflow: hidden !important;
-  }
-
-  .leaderboard-table-wrap {
-    box-sizing: border-box;
-    display: block;
-    inline-size: 100% !important;
-    max-inline-size: 100% !important;
-    min-inline-size: 0 !important;
-    overflow-x: auto !important;
-    overflow-y: hidden !important;
-    -webkit-overflow-scrolling: touch;
-    overscroll-behavior-x: contain;
-  }
-
-  .leaderboard-table {
-    inline-size: max-content !important;
-    width: max-content !important;
-    min-width: 820px !important;
-    max-width: none !important;
-  }
-
-  .leaderboard-pager {
-    box-sizing: border-box;
-    width: 100%;
-    max-width: 100%;
-    min-width: 0;
-  }
-}
-
-
-/* Disable failed mobile card experiment */
-.leaderboard-mobile-wrap {
-  display: none !important;
-}
-
-/* Home page Hardcore leaderboard */
-.home-leaderboard-wrap {
-  width: 100%;
-  overflow-x: auto;
-}
-
-.home-leaderboard-table {
-  width: 100%;
-  border-collapse: collapse;
-  font-size: 0.9rem;
-}
-
-.home-leaderboard-table th,
-.home-leaderboard-table td {
-  border-bottom: 1px solid var(--line);
-  padding: 0.65rem 0.45rem;
-  text-align: left;
-  white-space: nowrap;
-}
-
-.home-leaderboard-table th {
-  color: var(--muted);
-  font-size: 0.68rem;
-  font-weight: 900;
-  letter-spacing: 0.12em;
-  text-transform: uppercase;
-}
-
-.home-leaderboard-table td:nth-child(2) {
-  font-variant-numeric: tabular-nums;
-  text-align: right;
-}
-
-.home-leaderboard-table th:nth-child(2) {
-  text-align: right;
-}
-
-.home-leaderboard-more {
-  display: inline-block;
-  margin-top: 0.85rem;
-}
-
-/* Home Hardcore compact leaderboard list */
-.home-leaderboard-wrap {
-  width: 100%;
-}
-
-.home-leaderboard-list {
-  display: grid;
-  gap: 0;
-  width: 100%;
-}
-
-.home-leaderboard-row {
-  align-items: center;
-  border-bottom: 1px solid var(--line);
-  display: grid;
-  gap: 0.65rem;
-  grid-template-columns: 2rem minmax(0, 1fr) auto auto;
-  min-width: 0;
-  padding: 0.55rem 0;
-}
-
-.home-leaderboard-row:last-child {
-  border-bottom: 0;
-}
-
-.home-leaderboard-row--head {
-  color: var(--muted);
-  font-size: 0.68rem;
-  font-weight: 900;
-  letter-spacing: 0.12em;
-  padding-top: 0;
-  text-transform: uppercase;
-}
-
-.home-leaderboard-rank {
-  color: var(--muted);
-  font-variant-numeric: tabular-nums;
-}
-
-.home-leaderboard-name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.home-leaderboard-points {
-  font-variant-numeric: tabular-nums;
-  text-align: right;
-}
-
-.home-leaderboard-status {
-  color: var(--muted);
-}
-
-.home-leaderboard-status--alive {
-  color: #9fd6a3;
-}
-
-.home-leaderboard-status--dead {
-  color: #f09a9a;
-}
-
-.home-leaderboard-empty {
-  color: var(--muted);
-  padding: 0.65rem 0;
-}
-
-.home-leaderboard-more {
-  display: inline-block;
-  margin-top: 0.8rem;
-}
-
-/* Home Hardcore entries inside standard leaderboard-list */
-.leaderboard-list--home-hardcore .home-hardcore-entry {
-  display: grid;
-  gap: 0.75rem;
-  grid-template-columns: minmax(0, 1fr) auto auto;
-  min-width: 0;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-name {
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-points {
-  font-variant-numeric: tabular-nums;
-  text-align: right;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-status {
-  color: var(--muted);
-}
-
-.home-leaderboard-more {
-  display: inline-block;
-  margin-top: 0.8rem;
-}
-
-
-/* Align Home Hardcore leaderboard columns like an invisible table */
-.leaderboard-list--home-hardcore .home-hardcore-entry {
-  display: grid;
-  grid-template-columns: minmax(0, 1fr) 5.25rem 4.25rem;
-  gap: 0.75rem;
-  align-items: baseline;
-  min-width: 0;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-points {
-  font-variant-numeric: tabular-nums;
-  text-align: right;
-  white-space: nowrap;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-status {
-  color: var(--muted);
-  text-align: left;
-  white-space: nowrap;
-}
-
-/* Home Hardcore leaderboard: invisible table columns */
-.leaderboard-list.leaderboard-list--home-hardcore li.home-hardcore-row {
-  display: grid;
-  grid-template-columns: 2rem minmax(0, 1fr) 5.5rem 4.25rem;
-  gap: 0.75rem;
-  align-items: baseline;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-points {
-  font-variant-numeric: tabular-nums;
-  text-align: right;
-  white-space: nowrap;
-}
-
-.leaderboard-list--home-hardcore .home-hardcore-status {
-  color: var(--muted);
-  text-align: left;
-  white-space: nowrap;
-}
-
-/* Home Hardcore invisible table matching C Rank list */
-.home-hardcore-table {
-  border-collapse: collapse;
-  font-family: "SFMono-Regular", Consolas, "Liberation Mono", monospace;
-  font-size: 0.95rem;
-  font-variant-numeric: tabular-nums;
-  width: 100%;
-}
-
-.home-hardcore-table td {
-  border-bottom: 1px solid rgba(255, 255, 255, 0.045);
-  color: var(--text-soft);
-  padding: 0.25rem 0;
-  vertical-align: baseline;
-  white-space: nowrap;
-}
-
-.home-hardcore-table tr:last-child td {
-  border-bottom: 0;
-}
-
-.home-hardcore-table .rank {
-  color: var(--muted);
-  width: 2rem;
-}
-
-.home-hardcore-table .home-hardcore-name {
-  max-width: 8rem;
-  overflow: hidden;
-  padding-right: 0.75rem;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.home-hardcore-table .home-hardcore-points {
-  padding-right: 0.75rem;
-  text-align: right;
-  width: 5.5rem;
-}
-
-.home-hardcore-table .home-hardcore-status {
-  color: var(--muted);
-  text-align: left;
-  width: 4rem;
-}
-
-/* Home Hardcore leaderboard: visually match C Rank list */
-.home-hardcore-table {
-  border-collapse: collapse;
-  border-spacing: 0;
-  font-family: "SFMono-Regular", Consolas, "Liberation Mono", monospace;
-  font-size: 0.95rem;
-  font-variant-numeric: tabular-nums;
-  line-height: 1.45;
-  margin: 0;
-  width: 100%;
-}
-
-.home-hardcore-table td {
-  border-bottom: 1px solid rgba(255, 255, 255, 0.045);
-  color: var(--text-soft);
-  padding: 0.25rem 0;
-  vertical-align: baseline;
-  white-space: nowrap;
-}
-
-.home-hardcore-table tr:last-child td {
-  border-bottom: 0;
-}
-
-.home-hardcore-table .rank {
-  color: var(--muted);
-  padding-right: 0.75rem;
-  width: 2rem;
-}
-
-.home-hardcore-table .home-hardcore-name {
-  max-width: 8rem;
-  overflow: hidden;
-  padding-right: 1.25rem;
-  text-overflow: ellipsis;
-  white-space: nowrap;
-}
-
-.home-hardcore-table .home-hardcore-points {
-  padding-left: 1rem;
-  padding-right: 1.25rem;
-  text-align: right;
-  width: 5.75rem;
-}
-
-.home-hardcore-table .home-hardcore-status {
-  color: var(--muted);
-  padding-left: 0.75rem;
-  text-align: left;
-  width: 4rem;
-}
-
-.home-leaderboard-more {
-  display: inline-block;
-  margin-top: 0.8rem;
-}
-
-/* Home Hardcore leaderboard: aligned grid rows */
-.home-hardcore-table {
-  display: block;
-  font-family: "SFMono-Regular", Consolas, "Liberation Mono", monospace;
-  font-size: 0.95rem;
-  font-variant-numeric: tabular-nums;
-  line-height: 1.45;
-  width: 100%;
-}
-
-.home-hardcore-table tbody {
-  display: grid;
-  gap: 0;
-  width: 100%;
-}
-
-.home-hardcore-table tr {
-  align-items: baseline;
-  border-bottom: 1px solid rgba(255, 255, 255, 0.045);
-  display: grid;
-  gap: 0.9rem;
-  grid-template-columns: 2rem minmax(0, 1fr) 6.25rem 4.25rem;
-  padding: 0.25rem 0;
-}
-
-.home-hardcore-table tr:last-child {
-  border-bottom: 0;
-}
-
-.home-hardcore-table td {
-  border-bottom: 0 !important;
-  color: var(--text-soft);
-  display: block;
-  padding: 0 !important;
-  white-space: nowrap;
-}
-
-.home-hardcore-table .rank {
-  color: var(--muted);
-}
-
-.home-hardcore-table .home-hardcore-name {
-  min-width: 0;
-  overflow: hidden;
-  text-overflow: ellipsis;
-}
-
-.home-hardcore-table .home-hardcore-points {
-  text-align: right;
-}
-
-.home-hardcore-table .home-hardcore-status {
-  color: var(--muted);
-  text-align: left;
-}
-
-/* Home Hardcore padded line inside standard leaderboard-list */
-.leaderboard-list--home-hardcore .home-hardcore-line {
-  white-space: pre;
-}