Fix voucher compensation logic

.dockerignore

@@ -1,10 +0,0 @@
-/.github/
-
-Dockerfile*
-docker-compose*.yml
-
-/.data/
-/secret.key
-
-/rogueserver*
-!/rogueserver.go

.github/workflows/ci.yml

@@ -1,52 +0,0 @@
-name: Build
-
-on:
-  push:
-  pull_request:
-
-jobs:
-  build:
-    name: Build (${{ matrix.os_name }})
-    env:
-      GO_VERSION: 1.22
-      GOOS: ${{ matrix.os_name }}
-      GOARCH: ${{ matrix.arch }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        include:
-          - os: ubuntu-latest
-            os_name: linux
-            arch: amd64
-          - os: windows-latest
-            os_name: windows
-            arch: amd64
-# TODO macos needs universal binary!
-#          - os: macos-latest
-#            os_name: macos
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Go ${{ env.GO_VERSION }}
-        uses: actions/setup-go@v5
-        with:
-          go-version: ${{ env.GO_VERSION }}
-      - name: Install dependencies
-        run: go mod download
-      - name: Lint Codebase
-        continue-on-error: true
-        uses: golangci/golangci-lint-action@v6
-        with:
-          version: latest
-          args: --config .golangci.yml
-      - name: Test
-        run: go test -v
-      - name: Build
-        run: go build -v
-      - name: Upload artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: rogueserver-${{ matrix.os_name }}-${{ matrix.arch }}-${{ github.sha }}
-          path: |
-            rogueserver*
-            !rogueserver.go

.github/workflows/ghcr.yml

@@ -1,38 +0,0 @@
-name: Publish to GHCR
-
-on:
-  push:
-
-jobs:
-  build:
-    name: Build and publish to GHCR
-    if: github.repository == 'pagefaultgames/rogueserver'
-    env:
-      GO_VERSION: 1.22
-    runs-on: ubuntu-latest
-    steps:
-      - name: Setup Docker BuildX
-        uses: docker/setup-buildx-action@v3
-      - name: Log into container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ github.token }}
-      - name: Extract Docker metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}
-      - name: Build Docker image
-        uses: docker/build-push-action@v5
-        with:
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-          build-args: |
-            GO_VERSION=${{ env.GO_VERSION }}
-            VERSION=${{ github.ref_name }}-SNAPSHOT
-            COMMIT_SHA=${{ env.GITHUB_SHA_SHORT }}

.gitignore

@@ -1,16 +1,4 @@
 
-# no extension on linux, .exe on windows
+pokerogue-server.exe
-rogueserver*
+userdata/*
-!/rogueserver/*
-/userdata/*
 secret.key
-
-# local testing
-/.data/
-
-# Jetbrains IDEs
-/.idea/
-*.iml
-*.ipr
-*.iws
-.vscode/launch.json

.golangci.yml

@@ -1,8 +0,0 @@
-run:
-  timeout: 10m
-severity:
-  default-severity: error
-  rules:
-    - linters:
-        - unused
-      severity: info

Dockerfile

@@ -1,29 +0,0 @@
-ARG GO_VERSION=1.22
-
-FROM golang:${GO_VERSION} AS builder
-
-WORKDIR /src
-
-COPY ./go.mod /src/
-COPY ./go.sum /src/
-
-RUN go mod download && go mod verify
-
-COPY . /src/
-
-RUN CGO_ENABLED=0 \
-    go build -o rogueserver
-
-RUN chmod +x /src/rogueserver
-
-# ---------------------------------------------
-
-FROM scratch
-
-WORKDIR /app
-
-COPY --from=builder /src/rogueserver .
-
-EXPOSE 8001
-
-ENTRYPOINT ["./rogueserver"]

LICENSE

@@ -1,661 +0,0 @@
-                    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/>.

README.md

@@ -1,83 +1 @@
-# rogueserver
+# pokerogue-server
-
-# Hosting in Docker
-It is advised that you host this in a docker container as it will be much easier to manage. 
-There is a sample docker-compose file for setting up a docker container to setup this server.
-
-# Self Hosting outside of Docker:
-## Required Tools:
-- Golang
-- Node: **18.3.0**
-- npm: [how to install](https://docs.npmjs.com/downloading-and-installing-node-js-and-npm)
-
-## Installation:
-The docker compose file should automatically implement a container with mariadb with an empty database and the default user and password combo of pokerogue:pokerogue
-
-### src/utils.ts:224-225 (in pokerogue)
-Replace both URLs (one on each line) with the local API server address from rogueserver.go (0.0.0.0:8001) (or whatever port you picked)
-
-# If you are on Windows
-
-Now that all of the files are configured: start up powershell as administrator:
-```
-cd C:\api\server\location\
-go build .
-.\rogueserver.exe --debug --dbuser yourusername --dbpass yourpassword 
-```
-The other available flags are located in rogueserver.go:34-43.
-
-Then in another run this the first time then run `npm run start` from the rogueserver location from then on:
-```
-powershell -ep bypass
-cd C:\server\location\
-npm install
-npm run start
-```
-You will need to allow the port youre running the API (8001) on and port 8000 to accept inbound connections through the [Windows Advanced Firewall](https://www.youtube.com/watch?v=9llH5_CON-Y).
-
-# If you are on Linux
-In whatever shell you prefer, run the following:
-```
-cd /api/server/location/
-go build .
-./rogueserver --debug --dbuser yourusername --dbpass yourpassword &
-
-cd /server/location/
-npm run start
-```
-
-If you have a firewall running such as ufw on your linux machine, make sure to allow inbound connections on the ports youre running the API and the pokerogue server (8000,8001).
-An example to allow incoming connections using UFW:
-```
-sudo ufw allow 8000,8001/tcp
-```
-
-This should allow you to reach the game from other computers on the same network. 
-
-## Tying to a Domain
-
-If you want to tie it to a domain like I did and make it publicly accessible, there is some extra work to be done.
-
-I setup caddy and would recommend using it as a reverse proxy. 
-[caddy installation](https://caddyserver.com/docs/install)
-once its installed setup a config file for caddy:
-
-```
-pokerogue.exampledomain.com {
-	reverse_proxy localhost:8000
-}
-pokeapi.exampledomain.com {
-	reverse_proxy localhost:8001
-} 
-```
-Preferably set up caddy as a service from [here.](https://caddyserver.com/docs/running)
-
-Once this is good to go, take your API url (https://pokeapi.exampledomain.com) and paste it on 
-### src/utils.ts:224-225 
-in place of the previous 0.0.0.0:8001 address
-
-Make sure that both 8000 and 8001 are portforwarded on your router.
-
-Test that the server's game and game authentication works from other machines both in and outside of the network. Once this is complete, enjoy!
-
-

api/account-helper.go

@@ -0,0 +1,53 @@
+package api
+
+import (
+	"encoding/base64"
+	"fmt"
+	"net/http"
+
+	"github.com/Flashfyre/pokerogue-server/db"
+)
+
+func getUsernameFromRequest(r *http.Request) (string, error) {
+	if r.Header.Get("Authorization") == "" {
+		return "", fmt.Errorf("missing token")
+	}
+
+	token, err := base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
+	if err != nil {
+		return "", fmt.Errorf("failed to decode token: %s", err)
+	}
+
+	if len(token) != 32 {
+		return "", fmt.Errorf("invalid token length: got %d, expected 32", len(token))
+	}
+
+	username, err := db.FetchUsernameFromToken(token)
+	if err != nil {
+		return "", fmt.Errorf("failed to validate token: %s", err)
+	}
+
+	return username, nil
+}
+
+func getUUIDFromRequest(r *http.Request) ([]byte, error) {
+	if r.Header.Get("Authorization") == "" {
+		return nil, fmt.Errorf("missing token")
+	}
+
+	token, err := base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
+	if err != nil {
+		return nil, fmt.Errorf("failed to decode token: %s", err)
+	}
+
+	if len(token) != 32 {
+		return nil, fmt.Errorf("invalid token length: got %d, expected 32", len(token))
+	}
+
+	uuid, err := db.FetchUUIDFromToken(token)
+	if err != nil {
+		return nil, fmt.Errorf("failed to validate token: %s", err)
+	}
+
+	return uuid, nil
+}

api/account.go

@@ -0,0 +1,146 @@
+package api
+
+import (
+	"bytes"
+	"crypto/rand"
+	"database/sql"
+	"encoding/base64"
+	"fmt"
+	"os"
+	"regexp"
+	"strconv"
+	"time"
+
+	"github.com/Flashfyre/pokerogue-server/db"
+	"golang.org/x/crypto/argon2"
+)
+
+const (
+	UUIDSize      = 16
+	ArgonTime     = 1
+	ArgonMemory   = 256 * 1024
+	ArgonThreads  = 4
+	ArgonKeySize  = 32
+	ArgonSaltSize = 16
+)
+
+var isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString
+
+type AccountInfoResponse struct {
+	Username        string `json:"username"`
+	LastSessionSlot int    `json:"lastSessionSlot"`
+}
+
+// /account/info - get account info
+func handleAccountInfo(username string, uuid []byte) (AccountInfoResponse, error) {
+	var latestSave time.Time
+	latestSaveID := -1
+	for id := range sessionSlotCount {
+		fileName := "session"
+		if id != 0 {
+			fileName += strconv.Itoa(id)
+		}
+
+		stat, err := os.Stat(fmt.Sprintf("userdata/%x/%s.pzs", uuid, fileName))
+		if err != nil {
+			continue
+		}
+
+		if stat.ModTime().After(latestSave) {
+			latestSave = stat.ModTime()
+			latestSaveID = id
+		}
+	}
+
+	return AccountInfoResponse{Username: username, LastSessionSlot: latestSaveID}, nil
+}
+
+type AccountRegisterRequest GenericAuthRequest
+
+// /account/register - register account
+func handleAccountRegister(username, password string) error {
+	if !isValidUsername(username) {
+		return fmt.Errorf("invalid username")
+	}
+
+	if len(password) < 6 {
+		return fmt.Errorf("invalid password")
+	}
+
+	uuid := make([]byte, UUIDSize)
+	_, err := rand.Read(uuid)
+	if err != nil {
+		return fmt.Errorf("failed to generate uuid: %s", err)
+	}
+
+	salt := make([]byte, ArgonSaltSize)
+	_, err = rand.Read(salt)
+	if err != nil {
+		return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err))
+	}
+
+	err = db.AddAccountRecord(uuid, username, argon2.IDKey([]byte(password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize), salt)
+	if err != nil {
+		return fmt.Errorf("failed to add account record: %s", err)
+	}
+
+	return nil
+}
+
+type AccountLoginRequest GenericAuthRequest
+type AccountLoginResponse GenericAuthResponse
+
+// /account/login - log into account
+func handleAccountLogin(username, password string) (AccountLoginResponse, error) {
+	if !isValidUsername(username) {
+		return AccountLoginResponse{}, fmt.Errorf("invalid username")
+	}
+
+	if len(password) < 6 {
+		return AccountLoginResponse{}, fmt.Errorf("invalid password")
+	}
+
+	key, salt, err := db.FetchAccountKeySaltFromUsername(username)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return AccountLoginResponse{}, fmt.Errorf("account doesn't exist")
+		}
+
+		return AccountLoginResponse{}, err
+	}
+
+	if !bytes.Equal(key, argon2.IDKey([]byte(password), salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize)) {
+		return AccountLoginResponse{}, fmt.Errorf("password doesn't match")
+	}
+
+	token := make([]byte, 32)
+	_, err = rand.Read(token)
+	if err != nil {
+		return AccountLoginResponse{}, fmt.Errorf("failed to generate token: %s", err)
+	}
+
+	err = db.AddAccountSession(username, token)
+	if err != nil {
+		return AccountLoginResponse{}, fmt.Errorf("failed to add account session")
+	}
+
+	return AccountLoginResponse{Token: base64.StdEncoding.EncodeToString(token)}, nil
+}
+
+// /account/logout - log out of account
+func handleAccountLogout(token []byte) error {
+	if len(token) != 32 {
+		return fmt.Errorf("invalid token")
+	}
+
+	err := db.RemoveSessionFromToken(token)
+	if err != nil {
+		if err == sql.ErrNoRows {
+			return fmt.Errorf("token not found")
+		}
+
+		return fmt.Errorf("failed to remove account session")
+	}
+
+	return nil
+}

api/account/changepw.go

@@ -1,44 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package account
-
-import (
-	"crypto/rand"
-	"fmt"
-
-	"github.com/pagefaultgames/rogueserver/db"
-)
-
-func ChangePW(uuid []byte, password string) error {
-	if len(password) < 6 {
-		return fmt.Errorf("invalid password")
-	}
-
-	salt := make([]byte, ArgonSaltSize)
-	_, err := rand.Read(salt)
-	if err != nil {
-		return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err))
-	}
-
-	err = db.UpdateAccountPassword(uuid, deriveArgon2IDKey([]byte(password), salt), salt)
-	if err != nil {
-		return fmt.Errorf("failed to add account record: %s", err)
-	}
-
-	return nil
-}

api/account/common.go

@@ -1,54 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package account
-
-import (
-	"regexp"
-	"runtime"
-
-	"golang.org/x/crypto/argon2"
-)
-
-type GenericAuthResponse struct {
-	Token string `json:"token"`
-}
-
-const (
-	ArgonTime     = 1
-	ArgonMemory   = 256 * 1024
-	ArgonThreads  = 4
-	ArgonKeySize  = 32
-	ArgonSaltSize = 16
-
-	UUIDSize  = 16
-	TokenSize = 32
-)
-
-var (
-	ArgonMaxInstances = runtime.NumCPU()
-
-	isValidUsername = regexp.MustCompile(`^\w{1,16}$`).MatchString
-	semaphore       = make(chan bool, ArgonMaxInstances)
-)
-
-func deriveArgon2IDKey(password, salt []byte) []byte {
-	semaphore <- true
-	defer func() { <-semaphore }()
-
-	return argon2.IDKey(password, salt, ArgonTime, ArgonMemory, ArgonThreads, ArgonKeySize)
-}

api/account/info.go

@@ -1,52 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package account
-
-import (
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-type InfoResponse struct {
-	Username        string `json:"username"`
-	LastSessionSlot int    `json:"lastSessionSlot"`
-}
-
-// /account/info - get account info
-func Info(username string, uuid []byte) (InfoResponse, error) {
-	response := InfoResponse{Username: username, LastSessionSlot: -1}
-
-	highest := -1
-	for i := 0; i < defs.SessionSlotCount; i++ {
-		data, err := db.ReadSessionSaveData(uuid, i)
-		if err != nil {
-			continue
-		}
-
-		if data.Timestamp > highest {
-			highest = data.Timestamp
-			response.LastSessionSlot = i
-		}
-	}
-
-	if response.LastSessionSlot < 0 || response.LastSessionSlot >= defs.SessionSlotCount {
-		response.LastSessionSlot = -1
-	}
-
-	return response, nil
-}

api/account/login.go

@@ -1,71 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package account
-
-import (
-	"bytes"
-	"crypto/rand"
-	"database/sql"
-	"encoding/base64"
-	"fmt"
-
-	"github.com/pagefaultgames/rogueserver/db"
-)
-
-type LoginResponse GenericAuthResponse
-
-// /account/login - log into account
-func Login(username, password string) (LoginResponse, error) {
-	var response LoginResponse
-
-	if !isValidUsername(username) {
-		return response, fmt.Errorf("invalid username")
-	}
-
-	if len(password) < 6 {
-		return response, fmt.Errorf("invalid password")
-	}
-
-	key, salt, err := db.FetchAccountKeySaltFromUsername(username)
-	if err != nil {
-		if err == sql.ErrNoRows {
-			return response, fmt.Errorf("account doesn't exist")
-		}
-
-		return response, err
-	}
-
-	if !bytes.Equal(key, deriveArgon2IDKey([]byte(password), salt)) {
-		return response, fmt.Errorf("password doesn't match")
-	}
-
-	token := make([]byte, TokenSize)
-	_, err = rand.Read(token)
-	if err != nil {
-		return response, fmt.Errorf("failed to generate token: %s", err)
-	}
-
-	err = db.AddAccountSession(username, token)
-	if err != nil {
-		return response, fmt.Errorf("failed to add account session")
-	}
-
-	response.Token = base64.StdEncoding.EncodeToString(token)
-
-	return response, nil
-}

api/account/logout.go

@@ -1,40 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package account
-
-import (
-	"database/sql"
-	"errors"
-	"fmt"
-
-	"github.com/pagefaultgames/rogueserver/db"
-)
-
-// /account/logout - log out of account
-func Logout(token []byte) error {
-	err := db.RemoveSessionFromToken(token)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			return fmt.Errorf("token not found")
-		}
-
-		return fmt.Errorf("failed to remove account session")
-	}
-
-	return nil
-}

api/account/register.go

@@ -1,54 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package account
-
-import (
-	"crypto/rand"
-	"fmt"
-	"github.com/pagefaultgames/rogueserver/db"
-)
-
-// /account/register - register account
-func Register(username, password string) error {
-	if !isValidUsername(username) {
-		return fmt.Errorf("invalid username")
-	}
-
-	if len(password) < 6 {
-		return fmt.Errorf("invalid password")
-	}
-
-	uuid := make([]byte, UUIDSize)
-	_, err := rand.Read(uuid)
-	if err != nil {
-		return fmt.Errorf("failed to generate uuid: %s", err)
-	}
-
-	salt := make([]byte, ArgonSaltSize)
-	_, err = rand.Read(salt)
-	if err != nil {
-		return fmt.Errorf(fmt.Sprintf("failed to generate salt: %s", err))
-	}
-
-	err = db.AddAccountRecord(uuid, username, deriveArgon2IDKey([]byte(password), salt), salt)
-	if err != nil {
-		return fmt.Errorf("failed to add account record: %s", err)
-	}
-
-	return nil
-}

api/common.go

@@ -1,118 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package api
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"github.com/pagefaultgames/rogueserver/api/account"
-	"github.com/pagefaultgames/rogueserver/api/daily"
-	"github.com/pagefaultgames/rogueserver/db"
-	"log"
-	"net/http"
-)
-
-func Init(mux *http.ServeMux) error {
-	if err := scheduleStatRefresh(); err != nil {
-		return err
-	}
-	if err := daily.Init(); err != nil {
-		return err
-	}
-
-	// account
-	mux.HandleFunc("GET /account/info", handleAccountInfo)
-	mux.HandleFunc("POST /account/register", handleAccountRegister)
-	mux.HandleFunc("POST /account/login", handleAccountLogin)
-	mux.HandleFunc("POST /account/changepw", handleAccountChangePW)
-	mux.HandleFunc("GET /account/logout", handleAccountLogout)
-
-	// game
-	mux.HandleFunc("GET /game/titlestats", handleGameTitleStats)
-	mux.HandleFunc("GET /game/classicsessioncount", handleGameClassicSessionCount)
-
-	// savedata
-	mux.HandleFunc("GET /savedata/get", legacyHandleGetSaveData)
-	mux.HandleFunc("POST /savedata/update", legacyHandleSaveData)
-	mux.HandleFunc("GET /savedata/delete", legacyHandleSaveData) // TODO use deleteSystemSave
-	mux.HandleFunc("POST /savedata/clear", legacyHandleSaveData) // TODO use clearSessionData
-	mux.HandleFunc("GET /savedata/newclear", legacyHandleNewClear)
-
-	// new session
-	mux.HandleFunc("POST /savedata/updateall", handleUpdateAll)
-	mux.HandleFunc("POST /savedata/system/verify", handleSystemVerify)
-	mux.HandleFunc("GET /savedata/system", handleGetSystemData)
-	mux.HandleFunc("GET /savedata/session", handleGetSessionData)
-
-	// daily
-	mux.HandleFunc("GET /daily/seed", handleDailySeed)
-	mux.HandleFunc("GET /daily/rankings", handleDailyRankings)
-	mux.HandleFunc("GET /daily/rankingpagecount", handleDailyRankingPageCount)
-	return nil
-}
-
-func tokenFromRequest(r *http.Request) ([]byte, error) {
-	if r.Header.Get("Authorization") == "" {
-		return nil, fmt.Errorf("missing token")
-	}
-
-	token, err := base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
-	if err != nil {
-		return nil, fmt.Errorf("failed to decode token: %s", err)
-	}
-
-	if len(token) != account.TokenSize {
-		return nil, fmt.Errorf("invalid token length: got %d, expected %d", len(token), account.TokenSize)
-	}
-
-	return token, nil
-}
-
-func uuidFromRequest(r *http.Request) ([]byte, error) {
-	_, uuid, err := tokenAndUuidFromRequest(r)
-	return uuid, err
-}
-
-func tokenAndUuidFromRequest(r *http.Request) ([]byte, []byte, error) {
-	token, err := tokenFromRequest(r)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	uuid, err := db.FetchUUIDFromToken(token)
-	if err != nil {
-		return nil, nil, fmt.Errorf("failed to validate token: %s", err)
-	}
-
-	return token, uuid, nil
-}
-
-func httpError(w http.ResponseWriter, r *http.Request, err error, code int) {
-	log.Printf("%s: %s\n", r.URL.Path, err)
-	http.Error(w, err.Error(), code)
-}
-
-func jsonResponse(w http.ResponseWriter, r *http.Request, data any) {
-	w.Header().Set("Content-Type", "application/json")
-	err := json.NewEncoder(w).Encode(data)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to encode response json: %s", err), http.StatusInternalServerError)
-		return
-	}
-}

api/daily.go

@@ -0,0 +1,105 @@
+package api
+
+import (
+	"crypto/md5"
+	"crypto/rand"
+	"encoding/base64"
+	"encoding/binary"
+	"fmt"
+	"log"
+	"os"
+	"time"
+
+	"github.com/Flashfyre/pokerogue-server/db"
+	"github.com/Flashfyre/pokerogue-server/defs"
+	"github.com/go-co-op/gocron"
+)
+
+const secondsPerDay = 60 * 60 * 24
+
+var (
+	dailyRunScheduler = gocron.NewScheduler(time.UTC)
+	dailyRunSecret    []byte
+	dailyRunSeed      string
+)
+
+func ScheduleDailyRunRefresh() {
+	dailyRunScheduler.Every(1).Day().At("00:00").Do(func() error {
+		err := InitDailyRun()
+		if err != nil {
+			log.Fatal(err)
+		}
+
+		return nil
+	}())
+	dailyRunScheduler.StartAsync()
+}
+
+func InitDailyRun() error {
+	secret, err := os.ReadFile("secret.key")
+	if err != nil {
+		if !os.IsNotExist(err) {
+			return fmt.Errorf("failed to read daily seed secret: %s", err)
+		}
+
+		newSecret := make([]byte, 32)
+		_, err := rand.Read(newSecret)
+		if err != nil {
+			return fmt.Errorf("failed to generate daily seed secret: %s", err)
+		}
+
+		err = os.WriteFile("secret.key", newSecret, 0400)
+		if err != nil {
+			return fmt.Errorf("failed to write daily seed secret: %s", err)
+		}
+
+		secret = newSecret
+	}
+
+	dailyRunSecret = secret
+
+	dailyRunSeed = base64.StdEncoding.EncodeToString(deriveDailyRunSeed(time.Now().UTC()))
+
+	err = db.TryAddDailyRun(dailyRunSeed)
+	if err != nil {
+		log.Print(err)
+	}
+
+	log.Printf("Daily Run Seed: %s", dailyRunSeed)
+
+	return nil
+}
+
+func deriveDailyRunSeed(seedTime time.Time) []byte {
+	day := make([]byte, 8)
+	binary.BigEndian.PutUint64(day, uint64(seedTime.Unix()/secondsPerDay))
+
+	hashedSeed := md5.Sum(append(day, dailyRunSecret...))
+
+	return hashedSeed[:]
+}
+
+// /daily/rankings - fetch daily rankings
+func handleRankings(uuid []byte, category, page int) ([]defs.DailyRanking, error) {
+	err := db.UpdateAccountLastActivity(uuid)
+	if err != nil {
+		log.Print("failed to update account last activity")
+	}
+
+	rankings, err := db.FetchRankings(category, page)
+	if err != nil {
+		log.Print("failed to retrieve rankings")
+	}
+
+	return rankings, nil
+}
+
+// /daily/rankingpagecount - fetch daily ranking page count
+func handleRankingPageCount(category int) (int, error) {
+	pageCount, err := db.FetchRankingPageCount(category)
+	if err != nil {
+		log.Print("failed to retrieve ranking page count")
+	}
+
+	return pageCount, nil
+}

api/daily/common.go

@@ -1,105 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package daily
-
-import (
-	"crypto/md5"
-	"crypto/rand"
-	"encoding/base64"
-	"encoding/binary"
-	"fmt"
-	"log"
-	"os"
-	"time"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/robfig/cron/v3"
-)
-
-const secondsPerDay = 60 * 60 * 24
-
-var (
-	scheduler = cron.New(cron.WithLocation(time.UTC))
-	secret    []byte
-)
-
-func Init() error {
-	var err error
-
-	secret, err = os.ReadFile("secret.key")
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return fmt.Errorf("failed to read daily seed secret: %s", err)
-		}
-
-		newSecret := make([]byte, 32)
-		_, err := rand.Read(newSecret)
-		if err != nil {
-			return fmt.Errorf("failed to generate daily seed secret: %s", err)
-		}
-
-		err = os.WriteFile("secret.key", newSecret, 0400)
-		if err != nil {
-			return fmt.Errorf("failed to write daily seed secret: %s", err)
-		}
-
-		secret = newSecret
-	}
-
-	seed, err := recordNewDaily()
-	if err != nil {
-		log.Print(err)
-	}
-
-	log.Printf("Daily Run Seed: %s", seed)
-
-	_, err = scheduler.AddFunc("@daily", func() {
-		time.Sleep(time.Second)
-
-		seed, err = recordNewDaily()
-		if err != nil {
-			log.Printf("error while recording new daily: %s", err)
-		} else {
-			log.Printf("Daily Run Seed: %s", seed)
-		}
-	})
-	if err != nil {
-		return err
-	}
-
-	scheduler.Start()
-
-	return nil
-}
-
-func Seed() string {
-	return base64.StdEncoding.EncodeToString(deriveSeed(time.Now().UTC()))
-}
-
-func deriveSeed(seedTime time.Time) []byte {
-	day := make([]byte, 8)
-	binary.BigEndian.PutUint64(day, uint64(seedTime.Unix()/secondsPerDay))
-
-	hashedSeed := md5.Sum(append(day, secret...))
-
-	return hashedSeed[:]
-}
-
-func recordNewDaily() (string, error) {
-	return db.TryAddDailyRun(Seed())
-}

api/daily/rankings.go

@@ -1,35 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package daily
-
-import (
-	"log"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-// /daily/rankings - fetch daily rankings
-func Rankings(category, page int) ([]defs.DailyRanking, error) {
-	rankings, err := db.FetchRankings(category, page)
-	if err != nil {
-		log.Print("failed to retrieve rankings")
-	}
-
-	return rankings, nil
-}

api/daily/rankingspagecount.go

@@ -1,34 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package daily
-
-import (
-	"log"
-
-	"github.com/pagefaultgames/rogueserver/db"
-)
-
-// /daily/rankingpagecount - fetch daily ranking page count
-func RankingPageCount(category int) (int, error) {
-	pageCount, err := db.FetchRankingPageCount(category)
-	if err != nil {
-		log.Print("failed to retrieve ranking page count")
-	}
-
-	return pageCount, nil
-}

api/endpoints.go

@@ -1,827 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package api
-
-import (
-	"database/sql"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"net/http"
-	"strconv"
-
-	"github.com/pagefaultgames/rogueserver/api/account"
-	"github.com/pagefaultgames/rogueserver/api/daily"
-	"github.com/pagefaultgames/rogueserver/api/savedata"
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-/*
-	The caller of endpoint handler functions are responsible for extracting the necessary data from the request.
-	Handler functions are responsible for checking the validity of this data and returning a result or error.
-	Handlers should not return serialized JSON, instead return the struct itself.
-*/
-
-// account
-
-func handleAccountInfo(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	username, err := db.FetchUsernameFromUUID(uuid)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	response, err := account.Info(username, uuid)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, response)
-}
-
-func handleAccountRegister(w http.ResponseWriter, r *http.Request) {
-	err := r.ParseForm()
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to parse request form: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	err = account.Register(r.Form.Get("username"), r.Form.Get("password"))
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-}
-
-func handleAccountLogin(w http.ResponseWriter, r *http.Request) {
-	err := r.ParseForm()
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to parse request form: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	response, err := account.Login(r.Form.Get("username"), r.Form.Get("password"))
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, response)
-}
-
-func handleAccountChangePW(w http.ResponseWriter, r *http.Request) {
-	err := r.ParseForm()
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to parse request form: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	err = account.ChangePW(uuid, r.Form.Get("password"))
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-}
-
-func handleAccountLogout(w http.ResponseWriter, r *http.Request) {
-	token, err := tokenFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	err = account.Logout(token)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-}
-
-// game
-func handleGameTitleStats(w http.ResponseWriter, r *http.Request) {
-	stats := defs.TitleStats{
-		PlayerCount: playerCount,
-		BattleCount: battleCount,
-	}
-
-	jsonResponse(w, r, stats)
-}
-
-func handleGameClassicSessionCount(w http.ResponseWriter, r *http.Request) {
-	_, _ = w.Write([]byte(strconv.Itoa(classicSessionCount)))
-}
-
-func handleGetSessionData(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	var slot int
-	if r.URL.Query().Has("slot") {
-		slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var clientSessionId string
-	if r.URL.Query().Has("clientSessionId") {
-		clientSessionId = r.URL.Query().Get("clientSessionId")
-	} else {
-		httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest)
-	}
-
-	err = db.UpdateActiveSession(uuid, clientSessionId)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	var save any
-	save, err = savedata.Get(uuid, 1, slot)
-	if errors.Is(err, sql.ErrNoRows) {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, save)
-}
-
-const legacyClientSessionId = "LEGACY_CLIENT"
-
-func legacyHandleGetSaveData(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	datatype := -1
-	if r.URL.Query().Has("datatype") {
-		datatype, err = strconv.Atoi(r.URL.Query().Get("datatype"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var slot int
-	if r.URL.Query().Has("slot") {
-		slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var save any
-	if datatype == 0 {
-		err = db.UpdateActiveSession(uuid, legacyClientSessionId) // we dont have a client id
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
-			return
-		}
-	}
-
-	save, err = savedata.Get(uuid, datatype, slot)
-	if errors.Is(err, sql.ErrNoRows) {
-		http.Error(w, err.Error(), http.StatusNotFound)
-		return
-	}
-
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, save)
-}
-
-// FIXME UNFINISHED!!!
-func clearSessionData(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	var slot int
-	if r.URL.Query().Has("slot") {
-		slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var save any
-	var session defs.SessionSaveData
-	err = json.NewDecoder(r.Body).Decode(&session)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	save = session
-
-	var active bool
-	active, err = db.IsActiveSession(uuid, legacyClientSessionId) //TODO unfinished, read token from query
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	var trainerId, secretId int
-	if r.URL.Query().Has("trainerId") && r.URL.Query().Has("secretId") {
-		trainerId, err = strconv.Atoi(r.URL.Query().Get("trainerId"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-
-		secretId, err = strconv.Atoi(r.URL.Query().Get("secretId"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	storedTrainerId, storedSecretId, err := db.FetchTrainerIds(uuid)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	if storedTrainerId > 0 || storedSecretId > 0 {
-		if trainerId != storedTrainerId || secretId != storedSecretId {
-			httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest)
-			return
-		}
-	} else {
-		err = db.UpdateTrainerIds(trainerId, secretId, uuid)
-		if err != nil {
-			httpError(w, r, fmt.Errorf("unable to update trainer ID: %s", err), http.StatusInternalServerError)
-			return
-		}
-	}
-
-	if !active {
-		save = savedata.ClearResponse{Error: "session out of date: not active"}
-	}
-
-	var seed string
-	seed, err = db.GetDailyRunSeed()
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	response, err := savedata.Clear(uuid, slot, seed, save.(defs.SessionSaveData))
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, response)
-}
-
-// FIXME UNFINISHED!!!
-func deleteSystemSave(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	datatype := 0
-	if r.URL.Query().Has("datatype") {
-		datatype, err = strconv.Atoi(r.URL.Query().Get("datatype"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var slot int
-	if r.URL.Query().Has("slot") {
-		slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var active bool
-	active, err = db.IsActiveSession(uuid, legacyClientSessionId) //TODO unfinished, read token from query
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusInternalServerError)
-		return
-	}
-
-	if !active {
-		httpError(w, r, fmt.Errorf("session out of date: not active"), http.StatusBadRequest)
-		return
-	}
-
-	var trainerId, secretId int
-
-	if r.URL.Query().Has("trainerId") && r.URL.Query().Has("secretId") {
-		trainerId, err = strconv.Atoi(r.URL.Query().Get("trainerId"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-
-		secretId, err = strconv.Atoi(r.URL.Query().Get("secretId"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	storedTrainerId, storedSecretId, err := db.FetchTrainerIds(uuid)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	if storedTrainerId > 0 || storedSecretId > 0 {
-		if trainerId != storedTrainerId || secretId != storedSecretId {
-			httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest)
-			return
-		}
-	} else {
-		if err := db.UpdateTrainerIds(trainerId, secretId, uuid); err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-	}
-
-	err = savedata.Delete(uuid, datatype, slot)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	w.WriteHeader(http.StatusOK)
-}
-
-func legacyHandleSaveData(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	datatype := -1
-	if r.URL.Query().Has("datatype") {
-		datatype, err = strconv.Atoi(r.URL.Query().Get("datatype"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var slot int
-	if r.URL.Query().Has("slot") {
-		slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	var clientSessionId string
-	if r.URL.Query().Has("clientSessionId") {
-		clientSessionId = r.URL.Query().Get("clientSessionId")
-	}
-	if clientSessionId == "" {
-		clientSessionId = legacyClientSessionId
-	}
-
-	var save any
-	// /savedata/get and /savedata/delete specify datatype, but don't expect data in body
-	if r.URL.Path != "/savedata/get" && r.URL.Path != "/savedata/delete" {
-		if datatype == 0 {
-			var system defs.SystemSaveData
-			err = json.NewDecoder(r.Body).Decode(&system)
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
-				return
-			}
-
-			save = system
-			// /savedata/clear doesn't specify datatype, it is assumed to be 1 (session)
-		} else if datatype == 1 || r.URL.Path == "/savedata/clear" {
-			var session defs.SessionSaveData
-			err = json.NewDecoder(r.Body).Decode(&session)
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
-				return
-			}
-
-			save = session
-		}
-	}
-
-	var active bool
-	if r.URL.Path == "/savedata/get" {
-		if datatype == 0 {
-			err = db.UpdateActiveSession(uuid, clientSessionId)
-			if err != nil {
-				httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
-				return
-			}
-		}
-	} else {
-		active, err = db.IsActiveSession(uuid, clientSessionId)
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
-			return
-		}
-
-		// TODO: make this not suck
-		if !active && r.URL.Path != "/savedata/clear" {
-			httpError(w, r, fmt.Errorf("session out of date: not active"), http.StatusBadRequest)
-			return
-		}
-
-		var trainerId, secretId int
-
-		if r.URL.Path != "/savedata/update" || datatype == 1 {
-			if r.URL.Query().Has("trainerId") && r.URL.Query().Has("secretId") {
-				trainerId, err = strconv.Atoi(r.URL.Query().Get("trainerId"))
-				if err != nil {
-					httpError(w, r, err, http.StatusBadRequest)
-					return
-				}
-
-				secretId, err = strconv.Atoi(r.URL.Query().Get("secretId"))
-				if err != nil {
-					httpError(w, r, err, http.StatusBadRequest)
-					return
-				}
-			}
-		} else {
-			trainerId = save.(defs.SystemSaveData).TrainerId
-			secretId = save.(defs.SystemSaveData).SecretId
-		}
-
-		storedTrainerId, storedSecretId, err := db.FetchTrainerIds(uuid)
-		if err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-
-		if storedTrainerId > 0 || storedSecretId > 0 {
-			if trainerId != storedTrainerId || secretId != storedSecretId {
-				httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest)
-				return
-			}
-		} else {
-			if err := db.UpdateTrainerIds(trainerId, secretId, uuid); err != nil {
-				httpError(w, r, err, http.StatusInternalServerError)
-				return
-			}
-		}
-	}
-
-	switch r.URL.Path {
-	case "/savedata/get":
-		save, err = savedata.Get(uuid, datatype, slot)
-		if err == sql.ErrNoRows {
-			http.Error(w, err.Error(), http.StatusNotFound)
-			return
-		}
-	case "/savedata/update":
-		err = savedata.Update(uuid, slot, save)
-	case "/savedata/delete":
-		err = savedata.Delete(uuid, datatype, slot)
-	case "/savedata/clear":
-		if !active {
-			// TODO: make this not suck
-			save = savedata.ClearResponse{Error: "session out of date: not active"}
-			break
-		}
-
-		var seed string
-		seed, err = db.GetDailyRunSeed()
-		if err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-
-		// doesn't return a save, but it works
-		save, err = savedata.Clear(uuid, slot, seed, save.(defs.SessionSaveData))
-	}
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	if save == nil || r.URL.Path == "/savedata/update" {
-		w.WriteHeader(http.StatusOK)
-		return
-	}
-
-	jsonResponse(w, r, save)
-}
-
-type CombinedSaveData struct {
-	System          defs.SystemSaveData  `json:"system"`
-	Session         defs.SessionSaveData `json:"session"`
-	SessionSlotId   int                  `json:"sessionSlotId"`
-	ClientSessionId string               `json:"clientSessionId"`
-}
-
-// TODO wrap this in a transaction
-func handleUpdateAll(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	var data CombinedSaveData
-	err = json.NewDecoder(r.Body).Decode(&data)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
-		return
-	}
-	if data.ClientSessionId == "" {
-		data.ClientSessionId = legacyClientSessionId
-	}
-
-	var active bool
-	active, err = db.IsActiveSession(uuid, data.ClientSessionId)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	if !active {
-		httpError(w, r, fmt.Errorf("session out of date: not active"), http.StatusBadRequest)
-		return
-	}
-
-	trainerId := data.System.TrainerId
-	secretId := data.System.SecretId
-
-	storedTrainerId, storedSecretId, err := db.FetchTrainerIds(uuid)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	if storedTrainerId > 0 || storedSecretId > 0 {
-		if trainerId != storedTrainerId || secretId != storedSecretId {
-			httpError(w, r, fmt.Errorf("session out of date: stored trainer or secret ID does not match"), http.StatusBadRequest)
-			return
-		}
-	} else {
-		if err = db.UpdateTrainerIds(trainerId, secretId, uuid); err != nil {
-			httpError(w, r, err, http.StatusInternalServerError)
-			return
-		}
-	}
-
-	err = savedata.Update(uuid, data.SessionSlotId, data.Session)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-	err = savedata.Update(uuid, 0, data.System)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-	w.WriteHeader(http.StatusOK)
-}
-
-type SystemVerifyResponse struct {
-	Valid      bool                 `json:"valid"`
-	SystemData *defs.SystemSaveData `json:"systemData"`
-}
-
-type SystemVerifyRequest struct {
-	ClientSessionId string `json:"clientSessionId"`
-}
-
-func handleSystemVerify(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	var input SystemVerifyRequest
-	err = json.NewDecoder(r.Body).Decode(&input)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	var active bool
-	active, err = db.IsActiveSession(uuid, input.ClientSessionId)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to check active session: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	response := SystemVerifyResponse{
-		Valid: active,
-	}
-
-	// not valid, send server state
-	if !active {
-		err = db.UpdateActiveSession(uuid, input.ClientSessionId)
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
-			return
-		}
-
-		var storedSaveData defs.SystemSaveData
-		storedSaveData, err = db.ReadSystemSaveData(uuid)
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to read session save data: %s", err), http.StatusInternalServerError)
-			return
-		}
-
-		response.SystemData = &storedSaveData
-	}
-
-	err = db.UpdateAccountLastActivity(uuid)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to update account last activity: %s", err), http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, response)
-}
-
-func handleGetSystemData(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	var clientSessionId string
-	if r.URL.Query().Has("clientSessionId") {
-		clientSessionId = r.URL.Query().Get("clientSessionId")
-	} else {
-		httpError(w, r, fmt.Errorf("missing clientSessionId"), http.StatusBadRequest)
-	}
-
-	err = db.UpdateActiveSession(uuid, clientSessionId)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to update active session: %s", err), http.StatusBadRequest)
-		return
-	}
-
-	var save any //TODO this is always system save data
-	save, err = savedata.Get(uuid, 0, 0)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			http.Error(w, err.Error(), http.StatusNotFound)
-		} else {
-			httpError(w, r, err, http.StatusInternalServerError)
-		}
-
-		return
-	}
-	//TODO apply vouchers
-
-	jsonResponse(w, r, save)
-}
-
-func legacyHandleNewClear(w http.ResponseWriter, r *http.Request) {
-	uuid, err := uuidFromRequest(r)
-	if err != nil {
-		httpError(w, r, err, http.StatusBadRequest)
-		return
-	}
-
-	var slot int
-	if r.URL.Query().Has("slot") {
-		slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
-		if err != nil {
-			httpError(w, r, err, http.StatusBadRequest)
-			return
-		}
-	}
-
-	newClear, err := savedata.NewClear(uuid, slot)
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to read new clear: %s", err), http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, newClear)
-}
-
-// daily
-func handleDailySeed(w http.ResponseWriter, r *http.Request) {
-	seed, err := db.GetDailyRunSeed()
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	_, err = w.Write([]byte(seed))
-	if err != nil {
-		httpError(w, r, fmt.Errorf("failed to write seed: %s", err), http.StatusInternalServerError)
-	}
-}
-
-func handleDailyRankings(w http.ResponseWriter, r *http.Request) {
-	var err error
-
-	var category int
-	if r.URL.Query().Has("category") {
-		category, err = strconv.Atoi(r.URL.Query().Get("category"))
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to convert category: %s", err), http.StatusBadRequest)
-			return
-		}
-	}
-
-	page := 1
-	if r.URL.Query().Has("page") {
-		page, err = strconv.Atoi(r.URL.Query().Get("page"))
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to convert page: %s", err), http.StatusBadRequest)
-			return
-		}
-	}
-
-	rankings, err := daily.Rankings(category, page)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-		return
-	}
-
-	jsonResponse(w, r, rankings)
-}
-
-func handleDailyRankingPageCount(w http.ResponseWriter, r *http.Request) {
-	var category int
-	if r.URL.Query().Has("category") {
-		var err error
-		category, err = strconv.Atoi(r.URL.Query().Get("category"))
-		if err != nil {
-			httpError(w, r, fmt.Errorf("failed to convert category: %s", err), http.StatusBadRequest)
-			return
-		}
-	}
-
-	count, err := daily.RankingPageCount(category)
-	if err != nil {
-		httpError(w, r, err, http.StatusInternalServerError)
-	}
-
-	_, _ = w.Write([]byte(strconv.Itoa(count)))
-}

api/error.go

@@ -0,0 +1,11 @@
+package api
+
+import (
+	"log"
+	"net/http"
+)
+
+func httpError(w http.ResponseWriter, r *http.Request, err error, code int) {
+	log.Printf("%s: %s\n", r.URL.Path, err)
+	http.Error(w, err.Error(), code)
+}

api/game.go

@@ -0,0 +1,39 @@
+package api
+
+import (
+	"log"
+	"time"
+
+	"github.com/Flashfyre/pokerogue-server/db"
+	"github.com/go-co-op/gocron"
+)
+
+var (
+	statScheduler       = gocron.NewScheduler(time.UTC)
+	playerCount         int
+	battleCount         int
+	classicSessionCount int
+)
+
+func ScheduleStatRefresh() {
+	statScheduler.Every(10).Second().Do(updateStats)
+	statScheduler.StartAsync()
+}
+
+func updateStats() {
+	var err error
+	playerCount, err = db.FetchPlayerCount()
+	if err != nil {
+		log.Print(err)
+	}
+
+	battleCount, err = db.FetchBattleCount()
+	if err != nil {
+		log.Print(err)
+	}
+
+	classicSessionCount, err = db.FetchClassicSessionCount()
+	if err != nil {
+		log.Print(err)
+	}
+}

api/generic.go

@@ -0,0 +1,285 @@
+package api
+
+import (
+	"encoding/base64"
+	"encoding/gob"
+	"encoding/json"
+	"fmt"
+	"net/http"
+	"strconv"
+
+	"github.com/Flashfyre/pokerogue-server/defs"
+)
+
+type Server struct {
+	Debug bool
+}
+
+/*
+	The caller of endpoint handler functions are responsible for extracting the necessary data from the request.
+	Handler functions are responsible for checking the validity of this data and returning a result or error.
+	Handlers should not return serialized JSON, instead return the struct itself.
+*/
+
+func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	gob.Register([]interface{}{})
+	gob.Register(map[string]interface{}{})
+
+	if s.Debug {
+		w.Header().Set("Access-Control-Allow-Headers", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "*")
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+
+		if r.Method == "OPTIONS" {
+			w.WriteHeader(http.StatusOK)
+			return
+		}
+	}
+
+	switch r.URL.Path {
+	// /account
+	case "/account/info":
+		username, err := getUsernameFromRequest(r)
+		if err != nil {
+			httpError(w, r, err, http.StatusBadRequest)
+			return
+		}
+
+		uuid, err := getUUIDFromRequest(r) // lazy
+		if err != nil {
+			httpError(w, r, err, http.StatusBadRequest)
+			return
+		}
+
+		info, err := handleAccountInfo(username, uuid)
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+			return
+		}
+
+		response, err := json.Marshal(info)
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to marshal response json: %s", err), http.StatusInternalServerError)
+			return
+		}
+
+		w.Write(response)
+	case "/account/register":
+		var request AccountRegisterRequest
+		err := json.NewDecoder(r.Body).Decode(&request)
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
+			return
+		}
+
+		err = handleAccountRegister(request.Username, request.Password)
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+	case "/account/login":
+		var request AccountLoginRequest
+		err := json.NewDecoder(r.Body).Decode(&request)
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
+			return
+		}
+
+		token, err := handleAccountLogin(request.Username, request.Password)
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+			return
+		}
+
+		response, err := json.Marshal(token)
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to marshal response json: %s", err), http.StatusInternalServerError)
+			return
+		}
+
+		w.Write(response)
+	case "/account/logout":
+		token, err := base64.StdEncoding.DecodeString(r.Header.Get("Authorization"))
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to decode token: %s", err), http.StatusBadRequest)
+			return
+		}
+
+		err = handleAccountLogout(token)
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+			return
+		}
+
+		w.WriteHeader(http.StatusOK)
+
+		// /game
+	case "/game/playercount":
+		w.Write([]byte(strconv.Itoa(playerCount)))
+	case "/game/titlestats":
+		response, err := json.Marshal(&defs.TitleStats{
+			PlayerCount: playerCount,
+			BattleCount: battleCount,
+		})
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to marshal response json: %s", err), http.StatusInternalServerError)
+			return
+		}
+
+		w.Write(response)
+	case "/game/classicsessioncount":
+		w.Write([]byte(strconv.Itoa(classicSessionCount)))
+
+		// /savedata
+	case "/savedata/get", "/savedata/update", "/savedata/delete", "/savedata/clear":
+		uuid, err := getUUIDFromRequest(r)
+		if err != nil {
+			httpError(w, r, err, http.StatusBadRequest)
+			return
+		}
+
+		datatype := -1
+		if r.URL.Query().Has("datatype") {
+			datatype, err = strconv.Atoi(r.URL.Query().Get("datatype"))
+			if err != nil {
+				httpError(w, r, err, http.StatusBadRequest)
+				return
+			}
+		}
+
+		var slot int
+		if r.URL.Query().Has("slot") {
+			slot, err = strconv.Atoi(r.URL.Query().Get("slot"))
+			if err != nil {
+				httpError(w, r, err, http.StatusBadRequest)
+				return
+			}
+		}
+
+		var save any
+		// /savedata/get and /savedata/delete specify datatype, but don't expect data in body
+		if r.URL.Path != "/savedata/get" && r.URL.Path != "/savedata/delete" {
+			if datatype == 0 {
+				var system defs.SystemSaveData
+				err = json.NewDecoder(r.Body).Decode(&system)
+				if err != nil {
+					httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
+					return
+				}
+
+				save = system
+				// /savedata/clear doesn't specify datatype, it is assumed to be 1 (session)
+			} else if datatype == 1 || r.URL.Path == "/savedata/clear" {
+				var session defs.SessionSaveData
+				err = json.NewDecoder(r.Body).Decode(&session)
+				if err != nil {
+					httpError(w, r, fmt.Errorf("failed to decode request body: %s", err), http.StatusBadRequest)
+					return
+				}
+
+				save = session
+			}
+		}
+
+		switch r.URL.Path {
+		case "/savedata/get":
+			save, err = handleSavedataGet(uuid, datatype, slot)
+		case "/savedata/update":
+			err = handleSavedataUpdate(uuid, slot, save)
+		case "/savedata/delete":
+			err = handleSavedataDelete(uuid, datatype, slot)
+		case "/savedata/clear":
+			// doesn't return a save, but it works
+			save, err = handleSavedataClear(uuid, slot, save.(defs.SessionSaveData))
+		}
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+			return
+		}
+
+		if save == nil || r.URL.Path == "/savedata/update" {
+			w.WriteHeader(http.StatusOK)
+			return
+		}
+
+		response, err := json.Marshal(save)
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to marshal response json: %s", err), http.StatusInternalServerError)
+			return
+		}
+
+		w.Write(response)
+
+		// /daily
+	case "/daily/seed":
+		w.Write([]byte(dailyRunSeed))
+	case "/daily/rankings":
+		uuid, err := getUUIDFromRequest(r)
+		if err != nil {
+			httpError(w, r, err, http.StatusBadRequest)
+			return
+		}
+
+		var category int
+		if r.URL.Query().Has("category") {
+			category, err = strconv.Atoi(r.URL.Query().Get("category"))
+			if err != nil {
+				httpError(w, r, fmt.Errorf("failed to convert category: %s", err), http.StatusBadRequest)
+				return
+			}
+		}
+
+		page := 1
+		if r.URL.Query().Has("page") {
+			page, err = strconv.Atoi(r.URL.Query().Get("page"))
+			if err != nil {
+				httpError(w, r, fmt.Errorf("failed to convert page: %s", err), http.StatusBadRequest)
+				return
+			}
+		}
+
+		rankings, err := handleRankings(uuid, category, page)
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+			return
+		}
+
+		response, err := json.Marshal(rankings)
+		if err != nil {
+			httpError(w, r, fmt.Errorf("failed to marshal response json: %s", err), http.StatusInternalServerError)
+			return
+		}
+
+		w.Write(response)
+	case "/daily/rankingpagecount":
+		var category int
+		if r.URL.Query().Has("category") {
+			var err error
+			category, err = strconv.Atoi(r.URL.Query().Get("category"))
+			if err != nil {
+				httpError(w, r, fmt.Errorf("failed to convert category: %s", err), http.StatusBadRequest)
+				return
+			}
+		}
+
+		count, err := handleRankingPageCount(category)
+		if err != nil {
+			httpError(w, r, err, http.StatusInternalServerError)
+		}
+
+		w.Write([]byte(strconv.Itoa(count)))
+	}
+}
+
+// auth
+
+type GenericAuthRequest struct {
+	Username string `json:"username"`
+	Password string `json:"password"`
+}
+
+type GenericAuthResponse struct {
+	Token string `json:"token"`
+}

api/savedata-helper.go

@@ -0,0 +1,85 @@
+package api
+
+import (
+	"bytes"
+	"encoding/gob"
+	"encoding/hex"
+	"fmt"
+	"os"
+	"strconv"
+
+	"github.com/Flashfyre/pokerogue-server/defs"
+	"github.com/klauspost/compress/zstd"
+)
+
+func readSystemSaveData(uuid []byte) (defs.SystemSaveData, error) {
+	var system defs.SystemSaveData
+
+	save, err := os.ReadFile("userdata/" + hex.EncodeToString(uuid) + "/system.pzs")
+	if err != nil {
+		return system, fmt.Errorf("failed to read save file: %s", err)
+	}
+
+	zstdReader, err := zstd.NewReader(nil)
+	if err != nil {
+		return system, fmt.Errorf("failed to create zstd reader: %s", err)
+	}
+
+	decompressed, err := zstdReader.DecodeAll(save, nil)
+	if err != nil {
+		return system, fmt.Errorf("failed to decompress save file: %s", err)
+	}
+
+	gobDecoderBuf := bytes.NewBuffer(decompressed)
+
+	err = gob.NewDecoder(gobDecoderBuf).Decode(&system)
+	if err != nil {
+		return system, fmt.Errorf("failed to deserialize save: %s", err)
+	}
+
+	return system, nil
+}
+
+func readSessionSaveData(uuid []byte, slotID int) (defs.SessionSaveData, error) {
+	var session defs.SessionSaveData
+
+	fileName := "session"
+	if slotID != 0 {
+		fileName += strconv.Itoa(slotID)
+	}
+
+	save, err := os.ReadFile(fmt.Sprintf("userdata/%s/%s.pzs", hex.EncodeToString(uuid), fileName))
+	if err != nil {
+		return session, fmt.Errorf("failed to read save file: %s", err)
+	}
+
+	zstdReader, err := zstd.NewReader(nil)
+	if err != nil {
+		return session, fmt.Errorf("failed to create zstd reader: %s", err)
+	}
+
+	decompressed, err := zstdReader.DecodeAll(save, nil)
+	if err != nil {
+		return session, fmt.Errorf("failed to decompress save file: %s", err)
+	}
+
+	gobDecoderBuf := bytes.NewBuffer(decompressed)
+
+	err = gob.NewDecoder(gobDecoderBuf).Decode(&session)
+	if err != nil {
+		return session, fmt.Errorf("failed to deserialize save: %s", err)
+	}
+
+	return session, nil
+}
+
+func validateSessionCompleted(session defs.SessionSaveData) bool {
+	switch session.GameMode {
+	case 0:
+		return session.BattleType == 2 && session.WaveIndex == 200
+	case 3:
+		return session.BattleType == 2 && session.WaveIndex == 50
+	}
+
+	return false
+}

api/savedata.go

@@ -0,0 +1,221 @@
+package api
+
+import (
+	"bytes"
+	"encoding/gob"
+	"encoding/hex"
+	"fmt"
+	"log"
+	"os"
+	"strconv"
+
+	"github.com/Flashfyre/pokerogue-server/db"
+	"github.com/Flashfyre/pokerogue-server/defs"
+	"github.com/klauspost/compress/zstd"
+)
+
+const sessionSlotCount = 3
+
+// /savedata/get - get save data
+func handleSavedataGet(uuid []byte, datatype, slot int) (any, error) {
+	switch datatype {
+	case 0: // System
+		system, err := readSystemSaveData(uuid)
+		if err != nil {
+			return nil, err
+		}
+
+		compensations, err := db.FetchAndClaimAccountCompensations(uuid)
+		if err != nil {
+			return nil, fmt.Errorf("failed to fetch compensations: %s", err)
+		}
+
+		for k, v := range compensations {
+			typeKey := strconv.Itoa(k)
+			system.VoucherCounts[typeKey] += v
+		}
+
+		return system, nil
+	case 1: // Session
+		if slot < 0 || slot >= sessionSlotCount {
+			return nil, fmt.Errorf("slot id %d out of range", slot)
+		}
+
+		session, err := readSessionSaveData(uuid, slot)
+		if err != nil {
+			return nil, err
+		}
+
+		return session, nil
+	default:
+		return nil, fmt.Errorf("invalid data type")
+	}
+}
+
+// /savedata/update - update save data
+func handleSavedataUpdate(uuid []byte, slot int, save any) error {
+	err := db.UpdateAccountLastActivity(uuid)
+	if err != nil {
+		log.Print("failed to update account last activity")
+	}
+
+	hexUUID := hex.EncodeToString(uuid)
+
+	switch save := save.(type) {
+	case defs.SystemSaveData: // System
+		if save.TrainerId == 0 && save.SecretId == 0 {
+			return fmt.Errorf("invalid system data")
+		}
+
+		err = db.UpdateAccountStats(uuid, save.GameStats)
+		if err != nil {
+			return fmt.Errorf("failed to update account stats: %s", err)
+		}
+
+		var gobBuffer bytes.Buffer
+		err = gob.NewEncoder(&gobBuffer).Encode(save)
+		if err != nil {
+			return fmt.Errorf("failed to serialize save: %s", err)
+		}
+
+		zstdWriter, err := zstd.NewWriter(nil)
+		if err != nil {
+			return fmt.Errorf("failed to create zstd writer, %s", err)
+		}
+
+		compressed := zstdWriter.EncodeAll(gobBuffer.Bytes(), nil)
+
+		err = os.MkdirAll("userdata/"+hexUUID, 0755)
+		if err != nil && !os.IsExist(err) {
+			return fmt.Errorf("failed to create userdata folder: %s", err)
+		}
+
+		err = os.WriteFile("userdata/"+hexUUID+"/system.pzs", compressed, 0644)
+		if err != nil {
+			return fmt.Errorf("failed to write save file: %s", err)
+		}
+
+		db.DeleteClaimedAccountCompensations(uuid)
+	case defs.SessionSaveData: // Session
+		if slot < 0 || slot >= sessionSlotCount {
+			return fmt.Errorf("slot id %d out of range", slot)
+		}
+
+		fileName := "session"
+		if slot != 0 {
+			fileName += strconv.Itoa(slot)
+		}
+
+		var gobBuffer bytes.Buffer
+		err = gob.NewEncoder(&gobBuffer).Encode(save)
+		if err != nil {
+			return fmt.Errorf("failed to serialize save: %s", err)
+		}
+
+		zstdWriter, err := zstd.NewWriter(nil)
+		if err != nil {
+			return fmt.Errorf("failed to create zstd writer, %s", err)
+		}
+
+		compressed := zstdWriter.EncodeAll(gobBuffer.Bytes(), nil)
+
+		err = os.MkdirAll("userdata/"+hexUUID, 0755)
+		if err != nil && !os.IsExist(err) {
+			return fmt.Errorf(fmt.Sprintf("failed to create userdata folder: %s", err))
+		}
+
+		err = os.WriteFile(fmt.Sprintf("userdata/%s/%s.pzs", hexUUID, fileName), compressed, 0644)
+		if err != nil {
+			return fmt.Errorf("failed to write save file: %s", err)
+		}
+	default:
+		return fmt.Errorf("invalid data type")
+	}
+
+	return nil
+}
+
+// /savedata/delete - delete save data
+func handleSavedataDelete(uuid []byte, datatype, slot int) error {
+	err := db.UpdateAccountLastActivity(uuid)
+	if err != nil {
+		log.Print("failed to update account last activity")
+	}
+
+	hexUUID := hex.EncodeToString(uuid)
+
+	switch datatype {
+	case 0: // System
+		err := os.Remove("userdata/" + hexUUID + "/system.pzs")
+		if err != nil && !os.IsNotExist(err) {
+			return fmt.Errorf("failed to delete save file: %s", err)
+		}
+	case 1: // Session
+		if slot < 0 || slot >= sessionSlotCount {
+			return fmt.Errorf("slot id %d out of range", slot)
+		}
+
+		fileName := "session"
+		if slot != 0 {
+			fileName += strconv.Itoa(slot)
+		}
+
+		err = os.Remove(fmt.Sprintf("userdata/%s/%s.pzs", hexUUID, fileName))
+		if err != nil && !os.IsNotExist(err) {
+			return fmt.Errorf("failed to delete save file: %s", err)
+		}
+	default:
+		return fmt.Errorf("invalid data type")
+	}
+
+	return nil
+}
+
+type SavedataClearResponse struct {
+	Success bool `json:"success"`
+}
+
+// /savedata/clear - mark session save data as cleared and delete
+func handleSavedataClear(uuid []byte, slot int, save defs.SessionSaveData) (SavedataClearResponse, error) {
+	err := db.UpdateAccountLastActivity(uuid)
+	if err != nil {
+		log.Print("failed to update account last activity")
+	}
+
+	if slot < 0 || slot >= sessionSlotCount {
+		return SavedataClearResponse{}, fmt.Errorf("slot id %d out of range", slot)
+	}
+
+	sessionCompleted := validateSessionCompleted(save)
+	newCompletion := false
+
+	if save.GameMode == 3 && save.Seed == dailyRunSeed {
+		waveCompleted := save.WaveIndex
+		if !sessionCompleted {
+			waveCompleted--
+		}
+		err = db.AddOrUpdateAccountDailyRun(uuid, save.Score, waveCompleted)
+		if err != nil {
+			log.Printf("failed to add or update daily run record: %s", err)
+		}
+	}
+
+	if sessionCompleted {
+		newCompletion, err = db.TryAddSeedCompletion(uuid, save.Seed, int(save.GameMode))
+		if err != nil {
+			log.Printf("failed to mark seed as completed: %s", err)
+		}
+	}
+
+	fileName := "session"
+	if slot != 0 {
+		fileName += strconv.Itoa(slot)
+	}
+
+	err = os.Remove(fmt.Sprintf("userdata/%s/%s.pzs", hex.EncodeToString(uuid), fileName))
+	if err != nil && !os.IsNotExist(err) {
+		return SavedataClearResponse{}, fmt.Errorf("failed to delete save file: %s", err)
+	}
+
+	return SavedataClearResponse{Success: newCompletion}, nil
+}

api/savedata/clear.go

@@ -1,72 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package savedata
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-type ClearResponse struct {
-	Success bool   `json:"success"`
-	Error   string `json:"error"`
-}
-
-// /savedata/clear - mark session save data as cleared and delete
-func Clear(uuid []byte, slot int, seed string, save defs.SessionSaveData) (ClearResponse, error) {
-	var response ClearResponse
-	err := db.UpdateAccountLastActivity(uuid)
-	if err != nil {
-		log.Print("failed to update account last activity")
-	}
-
-	if slot < 0 || slot >= defs.SessionSlotCount {
-		return response, fmt.Errorf("slot id %d out of range", slot)
-	}
-
-	sessionCompleted := validateSessionCompleted(save)
-
-	if save.GameMode == 3 && save.Seed == seed {
-		waveCompleted := save.WaveIndex
-		if !sessionCompleted {
-			waveCompleted--
-		}
-
-		err = db.AddOrUpdateAccountDailyRun(uuid, save.Score, waveCompleted)
-		if err != nil {
-			log.Printf("failed to add or update daily run record: %s", err)
-		}
-	}
-
-	if sessionCompleted {
-		response.Success, err = db.TryAddSeedCompletion(uuid, save.Seed, int(save.GameMode))
-		if err != nil {
-			log.Printf("failed to mark seed as completed: %s", err)
-		}
-	}
-
-	err = db.DeleteSessionSaveData(uuid, slot)
-	if err != nil {
-		log.Printf("failed to delete session save data: %s", err)
-	}
-
-	return response, nil
-}

api/savedata/common.go

@@ -1,33 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package savedata
-
-import (
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-func validateSessionCompleted(session defs.SessionSaveData) bool {
-	switch session.GameMode {
-	case 0:
-		return session.BattleType == 2 && session.WaveIndex == 200
-	case 3:
-		return session.BattleType == 2 && session.WaveIndex == 50
-	}
-
-	return false
-}

api/savedata/delete.go

@@ -1,46 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package savedata
-
-import (
-	"fmt"
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-	"log"
-)
-
-// /savedata/delete - delete save data
-func Delete(uuid []byte, datatype, slot int) error {
-	err := db.UpdateAccountLastActivity(uuid)
-	if err != nil {
-		log.Print("failed to update account last activity")
-	}
-
-	switch datatype {
-	case 0: // System
-		return db.DeleteSystemSaveData(uuid)
-	case 1: // Session
-		if slot < 0 || slot >= defs.SessionSlotCount {
-			return fmt.Errorf("slot id %d out of range", slot)
-		}
-
-		return db.DeleteSessionSaveData(uuid, slot)
-	default:
-		return fmt.Errorf("invalid data type")
-	}
-}

api/savedata/get.go

@@ -1,86 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package savedata
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-// /savedata/get - get save data
-func Get(uuid []byte, datatype, slot int) (any, error) {
-	switch datatype {
-	case 0: // System
-		if slot != 0 {
-			return nil, fmt.Errorf("invalid slot id for system data")
-		}
-
-		system, err := db.ReadSystemSaveData(uuid)
-		if err != nil {
-			return nil, err
-		}
-
-		// TODO this should be a transaction
-		compensations, err := db.FetchAndClaimAccountCompensations(uuid)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch compensations: %s", err)
-		}
-
-		needsUpdate := false
-		for compensationType, amount := range compensations {
-			system.VoucherCounts[strconv.Itoa(compensationType)] += amount
-			if amount > 0 {
-				needsUpdate = true
-			}
-		}
-
-		if needsUpdate {
-			err = db.StoreSystemSaveData(uuid, system)
-			if err != nil {
-				return nil, fmt.Errorf("failed to update system save data: %s", err)
-			}
-			err = db.DeleteClaimedAccountCompensations(uuid)
-			if err != nil {
-				return nil, fmt.Errorf("failed to delete claimed compensations: %s", err)
-			}
-
-			err = db.UpdateAccountStats(uuid, system.GameStats, system.VoucherCounts)
-			if err != nil {
-				return nil, fmt.Errorf("failed to update account stats: %s", err)
-			}
-		}
-
-		return system, nil
-	case 1: // Session
-		if slot < 0 || slot >= defs.SessionSlotCount {
-			return nil, fmt.Errorf("slot id %d out of range", slot)
-		}
-
-		session, err := db.ReadSessionSaveData(uuid, slot)
-		if err != nil {
-			return nil, err
-		}
-
-		return session, nil
-	default:
-		return nil, fmt.Errorf("invalid data type")
-	}
-}

api/savedata/newclear.go

@@ -1,44 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package savedata
-
-import (
-	"fmt"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-// /savedata/newclear - return whether a session is a new clear for its seed
-func NewClear(uuid []byte, slot int) (bool, error) {
-	if slot < 0 || slot >= defs.SessionSlotCount {
-		return false, fmt.Errorf("slot id %d out of range", slot)
-	}
-
-	session, err := db.ReadSessionSaveData(uuid, slot)
-	if err != nil {
-		return false, err
-	}
-
-	completed, err := db.ReadSeedCompleted(uuid, session.Seed)
-	if err != nil {
-		return false, fmt.Errorf("failed to read seed completed: %s", err)
-	}
-
-	return !completed, nil
-}

api/savedata/update.go

@@ -1,66 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package savedata
-
-import (
-	"fmt"
-	"log"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-// /savedata/update - update save data
-func Update(uuid []byte, slot int, save any) error {
-	err := db.UpdateAccountLastActivity(uuid)
-	if err != nil {
-		log.Print("failed to update account last activity")
-	}
-
-	switch save := save.(type) {
-	case defs.SystemSaveData: // System
-		if save.TrainerId == 0 && save.SecretId == 0 {
-			return fmt.Errorf("invalid system data")
-		}
-
-		if save.GameVersion != "1.0.4" {
-			return fmt.Errorf("client version out of date")
-		}
-
-		err = db.UpdateAccountStats(uuid, save.GameStats, save.VoucherCounts)
-		if err != nil {
-			return fmt.Errorf("failed to update account stats: %s", err)
-		}
-
-		err = db.DeleteClaimedAccountCompensations(uuid)
-		if err != nil {
-			return fmt.Errorf("failed to delete claimed compensations: %s", err)
-		}
-
-		return db.StoreSystemSaveData(uuid, save)
-
-	case defs.SessionSaveData: // Session
-		if slot < 0 || slot >= defs.SessionSlotCount {
-			return fmt.Errorf("slot id %d out of range", slot)
-		}
-		return db.StoreSessionSaveData(uuid, save, slot)
-
-	default:
-		return fmt.Errorf("invalid data type")
-	}
-}

api/stats.go

@@ -1,68 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package api
-
-import (
-	"log"
-	"time"
-
-	"github.com/pagefaultgames/rogueserver/db"
-	"github.com/robfig/cron/v3"
-)
-
-var (
-	scheduler           = cron.New(cron.WithLocation(time.UTC))
-	playerCount         int
-	battleCount         int
-	classicSessionCount int
-)
-
-func scheduleStatRefresh() error {
-	_, err := scheduler.AddFunc("@every 30s", func() {
-		err := updateStats()
-		if err != nil {
-			log.Printf("failed to update stats: %s", err)
-		}
-	})
-	if err != nil {
-		return err
-	}
-
-	scheduler.Start()
-	return nil
-}
-
-func updateStats() error {
-	var err error
-	playerCount, err = db.FetchPlayerCount()
-	if err != nil {
-		return err
-	}
-
-	battleCount, err = db.FetchBattleCount()
-	if err != nil {
-		return err
-	}
-
-	classicSessionCount, err = db.FetchClassicSessionCount()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

db/account.go

@@ -1,30 +1,12 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package db
 
 import (
 	"database/sql"
-	"errors"
 	"fmt"
 	"slices"
 
+	"github.com/Flashfyre/pokerogue-server/defs"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/pagefaultgames/rogueserver/defs"
 )
 
 func AddAccountRecord(uuid []byte, username string, key, salt []byte) error {
@@ -50,15 +32,6 @@ func AddAccountSession(username string, token []byte) error {
 	return nil
 }
 
-func UpdateAccountPassword(uuid, key, salt []byte) error {
-	_, err := handle.Exec("UPDATE accounts SET (hash, salt) VALUES (?, ?) WHERE uuid = ?", key, salt, uuid)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func UpdateAccountLastActivity(uuid []byte) error {
 	_, err := handle.Exec("UPDATE accounts SET lastActivity = UTC_TIMESTAMP() WHERE uuid = ?", uuid)
 	if err != nil {
@@ -68,8 +41,8 @@ func UpdateAccountLastActivity(uuid []byte) error {
 	return nil
 }
 
-func UpdateAccountStats(uuid []byte, stats defs.GameStats, voucherCounts map[string]int) error {
+func UpdateAccountStats(uuid []byte, stats defs.GameStats) error {
-	var columns = []string{"playTime", "battles", "classicSessionsPlayed", "sessionsWon", "highestEndlessWave", "highestLevel", "pokemonSeen", "pokemonDefeated", "pokemonCaught", "pokemonHatched", "eggsPulled", "regularVouchers", "plusVouchers", "premiumVouchers", "goldenVouchers"}
+	var columns = []string{"playTime", "battles", "classicSessionsPlayed", "sessionsWon", "highestEndlessWave", "highestLevel", "pokemonSeen", "pokemonDefeated", "pokemonCaught", "pokemonHatched", "eggsPulled"}
 
 	var statCols []string
 	var statValues []interface{}
@@ -91,24 +64,6 @@ func UpdateAccountStats(uuid []byte, stats defs.GameStats, voucherCounts map[str
 		}
 	}
 
-	for k, v := range voucherCounts {
-		var column string
-		switch k {
-		case "0":
-			column = "regularVouchers"
-		case "1":
-			column = "plusVouchers"
-		case "2":
-			column = "premiumVouchers"
-		case "3":
-			column = "goldenVouchers"
-		default:
-			continue
-		}
-		statCols = append(statCols, column)
-		statValues = append(statValues, v)
-	}
-
 	var statArgs []interface{}
 	statArgs = append(statArgs, uuid)
 	for range 2 {
@@ -182,6 +137,16 @@ func DeleteClaimedAccountCompensations(uuid []byte) error {
 	return nil
 }
 
+func FetchUsernameFromToken(token []byte) (string, error) {
+	var username string
+	err := handle.QueryRow("SELECT a.username FROM accounts a JOIN sessions s ON s.uuid = a.uuid WHERE s.token = ? AND s.expire > UTC_TIMESTAMP()", token).Scan(&username)
+	if err != nil {
+		return "", err
+	}
+
+	return username, nil
+}
+
 func FetchAccountKeySaltFromUsername(username string) ([]byte, []byte, error) {
 	var key, salt []byte
 	err := handle.QueryRow("SELECT hash, salt FROM accounts WHERE username = ?", username).Scan(&key, &salt)
@@ -192,54 +157,14 @@ func FetchAccountKeySaltFromUsername(username string) ([]byte, []byte, error) {
 	return key, salt, nil
 }
 
-func FetchTrainerIds(uuid []byte) (trainerId, secretId int, err error) {
-	err = handle.QueryRow("SELECT trainerId, secretId FROM accounts WHERE uuid = ?", uuid).Scan(&trainerId, &secretId)
-	if err != nil {
-		return 0, 0, err
-	}
-
-	return trainerId, secretId, nil
-}
-
-func UpdateTrainerIds(trainerId, secretId int, uuid []byte) error {
-	_, err := handle.Exec("UPDATE accounts SET trainerId = ?, secretId = ? WHERE uuid = ?", trainerId, secretId, uuid)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func IsActiveSession(uuid []byte, clientSessionId string) (bool, error) {
-	var storedId string
-	err := handle.QueryRow("SELECT clientSessionId FROM activeClientSessions WHERE uuid = ?", uuid).Scan(&storedId)
-	if err != nil {
-		if errors.Is(err, sql.ErrNoRows) {
-			err = UpdateActiveSession(uuid, clientSessionId)
-			if err != nil {
-				return false, err
-			}
-			return true, nil
-		}
-		return false, err
-	}
-
-	return storedId == "" || storedId == clientSessionId, nil
-}
-
-func UpdateActiveSession(uuid []byte, clientSessionId string) error {
-	_, err := handle.Exec("REPLACE INTO activeClientSessions VALUES (?, ?)", uuid, clientSessionId)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
 func FetchUUIDFromToken(token []byte) ([]byte, error) {
 	var uuid []byte
-	err := handle.QueryRow("SELECT uuid FROM sessions WHERE token = ?", token).Scan(&uuid)
+	err := handle.QueryRow("SELECT uuid FROM sessions WHERE token = ? AND expire > UTC_TIMESTAMP()", token).Scan(&uuid)
 	if err != nil {
+		if err == sql.ErrNoRows {
+			return nil, err
+		}
+
 		return nil, err
 	}
 
@@ -254,13 +179,3 @@ func RemoveSessionFromToken(token []byte) error {
 
 	return nil
 }
-
-func FetchUsernameFromUUID(uuid []byte) (string, error) {
-	var username string
-	err := handle.QueryRow("SELECT username FROM accounts WHERE uuid = ?", uuid).Scan(&username)
-	if err != nil {
-		return "", err
-	}
-
-	return username, nil
-}

db/daily.go

@@ -1,47 +1,18 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package db
 
 import (
 	"math"
 
-	"github.com/pagefaultgames/rogueserver/defs"
+	"github.com/Flashfyre/pokerogue-server/defs"
 )
 
-func TryAddDailyRun(seed string) (string, error) {
+func TryAddDailyRun(seed string) error {
-	var actualSeed string
+	_, err := handle.Exec("INSERT INTO dailyRuns (seed, date) VALUES (?, UTC_DATE()) ON DUPLICATE KEY UPDATE date = date", seed)
-	err := handle.QueryRow("INSERT INTO dailyRuns (seed, date) VALUES (?, UTC_DATE()) ON DUPLICATE KEY UPDATE date = date RETURNING seed", seed).Scan(&actualSeed)
 	if err != nil {
-		return "", err
+		return err
 	}
 
-	return actualSeed, nil
+	return nil
-}
-
-func GetDailyRunSeed() (string, error) {
-	var seed string
-	err := handle.QueryRow("SELECT seed FROM dailyRuns WHERE date = UTC_DATE()").Scan(&seed)
-	if err != nil {
-		return "", err
-	}
-
-	return seed, nil
-
 }
 
 func AddOrUpdateAccountDailyRun(uuid []byte, score int, wave int) error {

db/db.go

@@ -1,29 +1,8 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package db
 
 import (
 	"database/sql"
-	"encoding/hex"
 	"fmt"
-	"log"
-	"os"
-	"time"
 
 	_ "github.com/go-sql-driver/mysql"
 )
@@ -31,158 +10,12 @@ import (
 var handle *sql.DB
 
 func Init(username, password, protocol, address, database string) error {
-	var err error
+	db, err := sql.Open("mysql", username+":"+password+"@"+protocol+"("+address+")/"+database)
-
-	handle, err = sql.Open("mysql", username+":"+password+"@"+protocol+"("+address+")/"+database)
 	if err != nil {
 		return fmt.Errorf("failed to open database connection: %s", err)
 	}
 
-	conns := 1024
+	handle = db
-	if protocol != "unix" {
-		conns = 256
-	}
-
-	handle.SetMaxOpenConns(conns)
-	handle.SetMaxIdleConns(conns / 4)
-
-	handle.SetConnMaxIdleTime(time.Second * 10)
-
-	tx, err := handle.Begin()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	err = setupDb(tx)
-	if err != nil {
-		_ = tx.Rollback()
-		log.Fatal(err)
-	}
-
-	err = tx.Commit()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// TODO temp code
-	_, err = os.Stat("userdata")
-	if err != nil {
-		if !os.IsNotExist(err) { // not found, do not migrate
-			log.Fatalf("failed to stat userdata directory: %s", err)
-		}
-
-		return nil
-	}
-
-	entries, err := os.ReadDir("userdata")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	for _, entry := range entries {
-		if !entry.IsDir() {
-			continue
-		}
-
-		uuidString := entry.Name()
-		uuid, err := hex.DecodeString(uuidString)
-		if err != nil {
-			log.Printf("failed to decode uuid: %s", err)
-			continue
-		}
-
-		var count int
-		err = handle.QueryRow("SELECT COUNT(*) FROM systemSaveData WHERE uuid = ?", uuid).Scan(&count)
-		if err != nil || count != 0 {
-			continue
-		}
-
-		// store new system data
-		systemData, err := LegacyReadSystemSaveData(uuid)
-		if err != nil {
-			log.Printf("failed to read system save data for %v: %s", uuidString, err)
-			continue
-		}
-
-		err = StoreSystemSaveData(uuid, systemData)
-		if err != nil {
-			log.Fatalf("failed to store system save data for %v: %s\n", uuidString, err)
-		}
-
-		// delete old system data
-		err = os.Remove("userdata/" + uuidString + "/system.pzs")
-		if err != nil {
-			log.Fatalf("failed to remove legacy system save data for %v: %s", uuidString, err)
-		}
-
-		for i := 0; i < 5; i++ {
-			sessionData, err := LegacyReadSessionSaveData(uuid, i)
-			if err != nil {
-				log.Printf("failed to read session save data %v for %v: %s", i, uuidString, err)
-				continue
-			}
-
-			// store new session data
-			err = StoreSessionSaveData(uuid, sessionData, i)
-			if err != nil {
-				log.Fatalf("failed to store session save data for %v: %s\n", uuidString, err)
-			}
-
-			// delete old session data
-			filename := "session"
-			if i != 0 {
-				filename += fmt.Sprintf("%d", i)
-			}
-			err = os.Remove(fmt.Sprintf("userdata/%s/%s.pzs", uuidString, filename))
-			if err != nil {
-				log.Fatalf("failed to remove legacy session save data %v for %v: %s", i, uuidString, err)
-			}
-		}
-	}
 
 	return nil
 }
-
-func setupDb(tx *sql.Tx) error {
-	queries := []string{
-		// MIGRATION 000
-
-		`CREATE TABLE IF NOT EXISTS accounts (uuid BINARY(16) NOT NULL PRIMARY KEY, username VARCHAR(16) UNIQUE NOT NULL, hash BINARY(32) NOT NULL, salt BINARY(16) NOT NULL, registered TIMESTAMP NOT NULL, lastLoggedIn TIMESTAMP DEFAULT NULL, lastActivity TIMESTAMP DEFAULT NULL, banned TINYINT(1) NOT NULL DEFAULT 0, trainerId SMALLINT(5) UNSIGNED DEFAULT 0, secretId SMALLINT(5) UNSIGNED DEFAULT 0)`,
-		`CREATE INDEX IF NOT EXISTS accountsByActivity ON accounts (lastActivity)`,
-
-		`CREATE TABLE IF NOT EXISTS sessions (token BINARY(32) NOT NULL PRIMARY KEY, uuid BINARY(16) NOT NULL, active TINYINT(1) NOT NULL DEFAULT 0, expire TIMESTAMP DEFAULT NULL, CONSTRAINT sessions_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-		`CREATE INDEX IF NOT EXISTS sessionsByUuid ON sessions (uuid)`,
-
-		`CREATE TABLE IF NOT EXISTS accountStats (uuid BINARY(16) NOT NULL PRIMARY KEY, playTime INT(11) NOT NULL DEFAULT 0, battles INT(11) NOT NULL DEFAULT 0, classicSessionsPlayed INT(11) NOT NULL DEFAULT 0, sessionsWon INT(11) NOT NULL DEFAULT 0, highestEndlessWave INT(11) NOT NULL DEFAULT 0, highestLevel INT(11) NOT NULL DEFAULT 0, pokemonSeen INT(11) NOT NULL DEFAULT 0, pokemonDefeated INT(11) NOT NULL DEFAULT 0, pokemonCaught INT(11) NOT NULL DEFAULT 0, pokemonHatched INT(11) NOT NULL DEFAULT 0, eggsPulled INT(11) NOT NULL DEFAULT 0, regularVouchers INT(11) NOT NULL DEFAULT 0, plusVouchers INT(11) NOT NULL DEFAULT 0, premiumVouchers INT(11) NOT NULL DEFAULT 0, goldenVouchers INT(11) NOT NULL DEFAULT 0, CONSTRAINT accountStats_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-
-		`CREATE TABLE IF NOT EXISTS accountCompensations (id INT(11) NOT NULL AUTO_INCREMENT PRIMARY KEY, uuid BINARY(16) NOT NULL, voucherType INT(11) NOT NULL, count INT(11) NOT NULL DEFAULT 1, claimed BIT(1) NOT NULL DEFAULT b'0', CONSTRAINT accountCompensations_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-		`CREATE INDEX IF NOT EXISTS accountCompensationsByUuid ON accountCompensations (uuid)`,
-
-		`CREATE TABLE IF NOT EXISTS dailyRuns (date DATE NOT NULL PRIMARY KEY, seed CHAR(24) CHARACTER SET ascii COLLATE ascii_bin NOT NULL)`,
-		`CREATE INDEX IF NOT EXISTS dailyRunsByDateAndSeed ON dailyRuns (date, seed)`,
-
-		`CREATE TABLE IF NOT EXISTS dailyRunCompletions (uuid BINARY(16) NOT NULL, seed CHAR(24) CHARACTER SET ascii COLLATE ascii_bin NOT NULL, mode INT(11) NOT NULL DEFAULT 0, score INT(11) NOT NULL DEFAULT 0, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (uuid, seed), CONSTRAINT dailyRunCompletions_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-		`CREATE INDEX IF NOT EXISTS dailyRunCompletionsByUuidAndSeed ON dailyRunCompletions (uuid, seed)`,
-
-		`CREATE TABLE IF NOT EXISTS accountDailyRuns (uuid BINARY(16) NOT NULL, date DATE NOT NULL, score INT(11) NOT NULL DEFAULT 0, wave INT(11) NOT NULL DEFAULT 0, timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, PRIMARY KEY (uuid, date), CONSTRAINT accountDailyRuns_ibfk_1 FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE, CONSTRAINT accountDailyRuns_ibfk_2 FOREIGN KEY (date) REFERENCES dailyRuns (date) ON DELETE NO ACTION ON UPDATE NO ACTION)`,
-		`CREATE INDEX IF NOT EXISTS accountDailyRunsByDate ON accountDailyRuns (date)`,
-
-		`CREATE TABLE IF NOT EXISTS systemSaveData (uuid BINARY(16) PRIMARY KEY, data LONGBLOB, timestamp TIMESTAMP, FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-
-		`CREATE TABLE IF NOT EXISTS sessionSaveData (uuid BINARY(16), slot TINYINT, data LONGBLOB, timestamp TIMESTAMP, PRIMARY KEY (uuid, slot), FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-
-		// ----------------------------------
-		// MIGRATION 001
-
-		`ALTER TABLE sessions DROP COLUMN IF EXISTS active`,
-		`CREATE TABLE IF NOT EXISTS activeClientSessions (uuid BINARY(16) NOT NULL PRIMARY KEY, clientSessionId VARCHAR(32) NOT NULL, FOREIGN KEY (uuid) REFERENCES accounts (uuid) ON DELETE CASCADE ON UPDATE CASCADE)`,
-	}
-
-	for _, q := range queries {
-		_, err := tx.Exec(q)
-		if err != nil {
-			return fmt.Errorf("failed to execute query: %w, query: %s", err, q)
-		}
-	}
-	return nil
-}

db/game.go

@@ -1,20 +1,3 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package db
 
 func FetchPlayerCount() (int, error) {
@@ -29,7 +12,7 @@ func FetchPlayerCount() (int, error) {
 
 func FetchBattleCount() (int, error) {
 	var battleCount int
-	err := handle.QueryRow("SELECT COALESCE(SUM(s.battles), 0) FROM accountStats s JOIN accounts a ON a.uuid = s.uuid WHERE a.banned = 0").Scan(&battleCount)
+	err := handle.QueryRow("SELECT SUM(battles) FROM accountStats").Scan(&battleCount)
 	if err != nil {
 		return 0, err
 	}
@@ -39,7 +22,7 @@ func FetchBattleCount() (int, error) {
 
 func FetchClassicSessionCount() (int, error) {
 	var classicSessionCount int
-	err := handle.QueryRow("SELECT COALESCE(SUM(s.classicSessionsPlayed), 0) FROM accountStats s JOIN accounts a ON a.uuid = s.uuid WHERE a.banned = 0").Scan(&classicSessionCount)
+	err := handle.QueryRow("SELECT SUM(classicSessionsPlayed) FROM accountStats").Scan(&classicSessionCount)
 	if err != nil {
 		return 0, err
 	}

db/legacy.go

@@ -1,84 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package db
-
-import (
-	"encoding/gob"
-	"encoding/hex"
-	"fmt"
-	"os"
-	"strconv"
-
-	"github.com/klauspost/compress/zstd"
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
-func LegacyReadSystemSaveData(uuid []byte) (defs.SystemSaveData, error) {
-	var system defs.SystemSaveData
-
-	file, err := os.Open("userdata/" + hex.EncodeToString(uuid) + "/system.pzs")
-	if err != nil {
-		return system, fmt.Errorf("failed to open save file for reading: %s", err)
-	}
-
-	defer file.Close()
-
-	zstdDecoder, err := zstd.NewReader(file)
-	if err != nil {
-		return system, fmt.Errorf("failed to create zstd decoder: %s", err)
-	}
-
-	defer zstdDecoder.Close()
-
-	err = gob.NewDecoder(zstdDecoder).Decode(&system)
-	if err != nil {
-		return system, fmt.Errorf("failed to deserialize save: %s", err)
-	}
-
-	return system, nil
-}
-
-func LegacyReadSessionSaveData(uuid []byte, slotID int) (defs.SessionSaveData, error) {
-	var session defs.SessionSaveData
-
-	fileName := "session"
-	if slotID != 0 {
-		fileName += strconv.Itoa(slotID)
-	}
-
-	file, err := os.Open(fmt.Sprintf("userdata/%s/%s.pzs", hex.EncodeToString(uuid), fileName))
-	if err != nil {
-		return session, fmt.Errorf("failed to open save file for reading: %s", err)
-	}
-
-	defer file.Close()
-
-	zstdDecoder, err := zstd.NewReader(file)
-	if err != nil {
-		return session, fmt.Errorf("failed to create zstd decoder: %s", err)
-	}
-
-	defer zstdDecoder.Close()
-
-	err = gob.NewDecoder(zstdDecoder).Decode(&session)
-	if err != nil {
-		return session, fmt.Errorf("failed to deserialize save: %s", err)
-	}
-
-	return session, nil
-}

db/savedata.go

@@ -1,144 +1,24 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package db
 
-import (
-	"bytes"
-	"encoding/gob"
-
-	"github.com/pagefaultgames/rogueserver/defs"
-)
-
 func TryAddSeedCompletion(uuid []byte, seed string, mode int) (bool, error) {
+	if len(seed) < 24 {
+		for range 24 - len(seed) {
+			seed += "0"
+		}
+	}
+
 	var count int
-	err := handle.QueryRow("SELECT COUNT(*) FROM dailyRunCompletions WHERE uuid = ? AND seed = ?", uuid, seed).Scan(&count)
+	err := handle.QueryRow("SELECT COUNT(*) FROM seedCompletions WHERE uuid = ? AND seed = ?", uuid, seed).Scan(&count)
 	if err != nil {
 		return false, err
 	} else if count > 0 {
 		return false, nil
 	}
 
-	_, err = handle.Exec("INSERT INTO dailyRunCompletions (uuid, seed, mode, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP())", uuid, seed, mode)
+	_, err = handle.Exec("INSERT INTO seedCompletions (uuid, seed, mode, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP())", uuid, seed, mode)
 	if err != nil {
 		return false, err
 	}
 
 	return true, nil
 }
-
-func ReadSeedCompleted(uuid []byte, seed string) (bool, error) {
-	var count int
-	err := handle.QueryRow("SELECT COUNT(*) FROM dailyRunCompletions WHERE uuid = ? AND seed = ?", uuid, seed).Scan(&count)
-	if err != nil {
-		return false, err
-	}
-
-	return count > 0, nil
-}
-
-func ReadSystemSaveData(uuid []byte) (defs.SystemSaveData, error) {
-	var system defs.SystemSaveData
-
-	var data []byte
-	err := handle.QueryRow("SELECT data FROM systemSaveData WHERE uuid = ?", uuid).Scan(&data)
-	if err != nil {
-		return system, err
-	}
-
-	err = gob.NewDecoder(bytes.NewReader(data)).Decode(&system)
-	if err != nil {
-		return system, err
-	}
-
-	return system, nil
-}
-
-func StoreSystemSaveData(uuid []byte, data defs.SystemSaveData) error {
-	var buf bytes.Buffer
-	err := gob.NewEncoder(&buf).Encode(data)
-	if err != nil {
-		return err
-	}
-
-	_, err = handle.Exec("INSERT INTO systemSaveData (uuid, data, timestamp) VALUES (?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = ?, timestamp = UTC_TIMESTAMP()", uuid, buf.Bytes(), buf.Bytes())
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func DeleteSystemSaveData(uuid []byte) error {
-	_, err := handle.Exec("DELETE FROM systemSaveData WHERE uuid = ?", uuid)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func ReadSessionSaveData(uuid []byte, slot int) (defs.SessionSaveData, error) {
-	var session defs.SessionSaveData
-
-	var data []byte
-	err := handle.QueryRow("SELECT data FROM sessionSaveData WHERE uuid = ? AND slot = ?", uuid, slot).Scan(&data)
-	if err != nil {
-		return session, err
-	}
-
-	err = gob.NewDecoder(bytes.NewReader(data)).Decode(&session)
-	if err != nil {
-		return session, err
-	}
-
-	return session, nil
-}
-
-func GetLatestSessionSaveDataSlot(uuid []byte) (int, error) {
-	var slot int
-	err := handle.QueryRow("SELECT slot FROM sessionSaveData WHERE uuid = ? ORDER BY timestamp DESC, slot ASC LIMIT 1", uuid).Scan(&slot)
-	if err != nil {
-		return -1, err
-	}
-
-	return slot, nil
-}
-
-func StoreSessionSaveData(uuid []byte, data defs.SessionSaveData, slot int) error {
-	var buf bytes.Buffer
-	err := gob.NewEncoder(&buf).Encode(data)
-	if err != nil {
-		return err
-	}
-
-	_, err = handle.Exec("INSERT INTO sessionSaveData (uuid, slot, data, timestamp) VALUES (?, ?, ?, UTC_TIMESTAMP()) ON DUPLICATE KEY UPDATE data = ?, timestamp = UTC_TIMESTAMP()", uuid, slot, buf.Bytes(), buf.Bytes())
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func DeleteSessionSaveData(uuid []byte, slot int) error {
-	_, err := handle.Exec("DELETE FROM sessionSaveData WHERE uuid = ? AND slot = ?", uuid, slot)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}

defs/daily.go

@@ -1,20 +1,3 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package defs
 
 type DailyRanking struct {

defs/game.go

@@ -1,20 +1,3 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package defs
 
 type TitleStats struct {

defs/savedata.go

@@ -1,32 +1,12 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
 package defs
 
-const SessionSlotCount = 5
-
 type SystemSaveData struct {
 	TrainerId          int                `json:"trainerId"`
 	SecretId           int                `json:"secretId"`
 	Gender             int                `json:"gender"`
 	DexData            DexData            `json:"dexData"`
-	StarterData        StarterData        `json:"starterData"`
+	StarterMoveData    StarterMoveData    `json:"starterMoveData"`
-	StarterMoveData    StarterMoveData    `json:"starterMoveData"`    // Legacy
+	StarterEggMoveData StarterEggMoveData `json:"starterEggMoveData"`
-	StarterEggMoveData StarterEggMoveData `json:"starterEggMoveData"` // Legacy
 	GameStats          GameStats          `json:"gameStats"`
 	Unlocks            Unlocks            `json:"unlocks"`
 	AchvUnlocks        AchvUnlocks        `json:"achvUnlocks"`
@@ -49,19 +29,6 @@ type DexEntry struct {
 	Ivs          []int       `json:"ivs"`
 }
 
-type StarterData map[int]StarterEntry
-
-type StarterEntry struct {
-	Moveset         interface{} `json:"moveset"`
-	EggMoves        int         `json:"eggMoves"`
-	CandyCount      int         `json:"candyCount"`
-	Friendship      int         `json:"friendship"`
-	AbilityAttr     int         `json:"abilityAttr"`
-	PassiveAttr     int         `json:"passiveAttr"`
-	ValueReduction  int         `json:"valueReduction"`
-	ClassicWinCount int         `json:"classicWinCount"`
-}
-
 type StarterMoveData map[int]interface{}
 
 type StarterEggMoveData map[int]int
@@ -97,9 +64,6 @@ type SessionSaveData struct {
 	PokeballCounts PokeballCounts           `json:"pokeballCounts"`
 	Money          int                      `json:"money"`
 	Score          int                      `json:"score"`
-	VictoryCount   int                      `json:"victoryCount"`
-	FaintCount     int                      `json:"faintCount"`
-	ReviveCount    int                      `json:"reviveCount"`
 	WaveIndex      int                      `json:"waveIndex"`
 	BattleType     BattleType               `json:"battleType"`
 	Trainer        TrainerData              `json:"trainer"`

docker-compose.Development.yml

@@ -1,14 +0,0 @@
-services:
-  db:
-    image: mariadb:11
-    container_name: pokerogue-db-local
-    restart: on-failure
-    environment:
-      MYSQL_ROOT_PASSWORD: admin
-      MYSQL_DATABASE: pokeroguedb
-      MYSQL_USER: pokerogue
-      MYSQL_PASSWORD: pokerogue
-    ports:
-      - "3306:3306"
-    volumes:
-      - ./.data/db:/var/lib/mysql

docker-compose.Example.yml

@@ -1,54 +0,0 @@
-services:
-  server:
-    command: --debug --dbaddr db --dbuser pokerogue --dbpass pokerogue --dbname pokeroguedb
-    image: ghcr.io/pagefaultgames/rogueserver:master
-    restart: unless-stopped
-    depends_on:
-      db:
-        condition: service_healthy
-    networks:
-      - internal
-    ports:
-      - "8001:8001"
-
-  db:
-    image: mariadb:11
-    restart: unless-stopped
-    healthcheck:
-      test: [ "CMD", "healthcheck.sh", "--su-mysql", "--connect", "--innodb_initialized" ]
-      start_period: 10s
-      start_interval: 10s
-      interval: 1m
-      timeout: 5s
-      retries: 3
-    environment:
-      MYSQL_ROOT_PASSWORD: admin
-      MYSQL_DATABASE: pokeroguedb
-      MYSQL_USER: pokerogue
-      MYSQL_PASSWORD: pokerogue
-    volumes:
-      - database:/var/lib/mysql
-    networks:
-      - internal
-
-  # Watchtower is a service that will automatically update your running containers
-  # when a new image is available. This is useful for keeping your server up-to-date.
-  # see https://containrrr.dev/watchtower/ for more information.
-  watchtower:
-    image: containrrr/watchtower
-    container_name: watchtower
-    restart: always
-    security_opt:
-      - no-new-privileges:true
-    environment:
-      WATCHTOWER_CLEANUP: true
-      WATCHTOWER_SCHEDULE: "@midnight"
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-
-volumes:
-  database:
-
-networks:
-  internal:

go.mod

@@ -1,12 +1,17 @@
-module github.com/pagefaultgames/rogueserver
+module github.com/Flashfyre/pokerogue-server
 
 go 1.22
 
 require (
+	github.com/go-co-op/gocron v1.37.0
 	github.com/go-sql-driver/mysql v1.7.1
 	github.com/klauspost/compress v1.17.4
-	github.com/robfig/cron/v3 v3.0.1
 	golang.org/x/crypto v0.16.0
 )
 
-require golang.org/x/sys v0.15.0 // indirect
+require (
+	github.com/google/uuid v1.4.0 // indirect
+	github.com/robfig/cron/v3 v3.0.1 // indirect
+	go.uber.org/atomic v1.9.0 // indirect
+	golang.org/x/sys v0.15.0 // indirect
+)

go.sum

@@ -1,10 +1,46 @@
+github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
+github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
 github.com/go-sql-driver/mysql v1.7.1 h1:lUIinVbN1DY0xBg0eMOzmmtGoHwWBbvnWubQUrtU8EI=
 github.com/go-sql-driver/mysql v1.7.1/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
+github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/klauspost/compress v1.17.4 h1:Ej5ixsIri7BrIjBkRZLTo6ghwrEtHFk7ijlczPW4fZ4=
 github.com/klauspost/compress v1.17.4/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
+github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
+github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
 github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
+github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
+github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
+github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
+go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
+gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
+gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

pokerogue-server.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"flag"
+	"log"
+	"net"
+	"net/http"
+	"os"
+
+	"github.com/Flashfyre/pokerogue-server/api"
+	"github.com/Flashfyre/pokerogue-server/db"
+)
+
+func main() {
+	debug := flag.Bool("debug", false, "debug mode")
+
+	proto := flag.String("proto", "tcp", "protocol for api to use (tcp, unix)")
+	addr := flag.String("addr", "0.0.0.0", "network address for api to listen on")
+
+	dbuser := flag.String("dbuser", "pokerogue", "database username")
+	dbpass := flag.String("dbpass", "", "database password")
+	dbproto := flag.String("dbproto", "tcp", "protocol for database connection")
+	dbaddr := flag.String("dbaddr", "localhost", "database address")
+	dbname := flag.String("dbname", "pokeroguedb", "database name")
+
+	flag.Parse()
+
+	err := db.Init(*dbuser, *dbpass, *dbproto, *dbaddr, *dbname)
+	if err != nil {
+		log.Fatalf("failed to initialize database: %s", err)
+	}
+
+	if *proto == "unix" {
+		os.Remove(*addr)
+	}
+
+	listener, err := net.Listen(*proto, *addr)
+	if err != nil {
+		log.Fatalf("failed to create net listener: %s", err)
+	}
+
+	if *proto == "unix" {
+		os.Chmod(*addr, 0777)
+	}
+
+	api.ScheduleStatRefresh()
+	api.ScheduleDailyRunRefresh()
+	api.InitDailyRun()
+
+	err = http.Serve(listener, &api.Server{Debug: *debug})
+	if err != nil {
+		log.Fatalf("failed to create http server or server errored: %s", err)
+	}
+}

rogueserver.go

@@ -1,136 +0,0 @@
-/*
-	Copyright (C) 2024  Pagefault Games
-
-	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 <http://www.gnu.org/licenses/>.
-*/
-
-package main
-
-import (
-	"encoding/gob"
-	"flag"
-	"log"
-	"net"
-	"net/http"
-	"os"
-
-	"github.com/pagefaultgames/rogueserver/api"
-	"github.com/pagefaultgames/rogueserver/db"
-)
-
-func main() {
-	// flag stuff
-	debug := flag.Bool("debug", false, "use debug mode")
-
-	proto := flag.String("proto", "tcp", "protocol for api to use (tcp, unix)")
-	addr := flag.String("addr", "0.0.0.0:8001", "network address for api to listen on")
-	tlscert := flag.String("tlscert", "", "tls certificate path")
-	tlskey := flag.String("tlskey", "", "tls key path")
-
-	dbuser := flag.String("dbuser", "pokerogue", "database username")
-	dbpass := flag.String("dbpass", "pokerogue", "database password")
-	dbproto := flag.String("dbproto", "tcp", "protocol for database connection")
-	dbaddr := flag.String("dbaddr", "localhost", "database address")
-	dbname := flag.String("dbname", "pokeroguedb", "database name")
-
-	flag.Parse()
-
-	// register gob types
-	gob.Register([]interface{}{})
-	gob.Register(map[string]interface{}{})
-
-	// get database connection
-	err := db.Init(*dbuser, *dbpass, *dbproto, *dbaddr, *dbname)
-	if err != nil {
-		log.Fatalf("failed to initialize database: %s", err)
-	}
-
-	// create listener
-	listener, err := createListener(*proto, *addr)
-	if err != nil {
-		log.Fatalf("failed to create net listener: %s", err)
-	}
-
-	mux := http.NewServeMux()
-
-	// init api
-	if err := api.Init(mux); err != nil {
-		log.Fatal(err)
-	}
-
-	// start web server
-	handler := prodHandler(mux)
-	if *debug {
-		handler = debugHandler(mux)
-	}
-
-	if *tlscert == "" {
-		err = http.Serve(listener, handler)
-	} else {
-		err = http.ServeTLS(listener, handler, *tlscert, *tlskey)
-	}
-	if err != nil {
-		log.Fatalf("failed to create http server or server errored: %s", err)
-	}
-}
-
-func createListener(proto, addr string) (net.Listener, error) {
-	if proto == "unix" {
-		os.Remove(addr)
-	}
-
-	listener, err := net.Listen(proto, addr)
-	if err != nil {
-		return nil, err
-	}
-
-	if proto == "unix" {
-		if err := os.Chmod(addr, 0777); err != nil {
-			listener.Close()
-			return nil, err
-		}
-	}
-
-	return listener, nil
-}
-
-func prodHandler(router *http.ServeMux) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Headers", "Authorization, Content-Type")
-		w.Header().Set("Access-Control-Allow-Methods", "OPTIONS, GET, POST")
-		w.Header().Set("Access-Control-Allow-Origin", "https://pokerogue.net")
-
-		if r.Method == "OPTIONS" {
-			w.WriteHeader(http.StatusOK)
-			return
-		}
-
-		router.ServeHTTP(w, r)
-	})
-}
-
-func debugHandler(router *http.ServeMux) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Headers", "*")
-		w.Header().Set("Access-Control-Allow-Methods", "*")
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-
-		if r.Method == "OPTIONS" {
-			w.WriteHeader(http.StatusOK)
-			return
-		}
-
-		router.ServeHTTP(w, r)
-	})
-}