Compare commits
17
Commits
cb01e1bcf0
..
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2fee340259 | ||
|
|
9964fbf044 | ||
|
|
5f0e8c11b4 | ||
|
|
655fb89a7f | ||
|
|
632d990c85 | ||
|
|
3dcd4173c2 | ||
|
|
dbed39ee3a | ||
|
|
5732e26380 | ||
|
|
c500c3fadf | ||
|
|
8c8f98623e | ||
|
|
3617793136 | ||
|
|
479a98c40f | ||
|
|
c479862c0e | ||
|
|
b4f9c911fe | ||
|
|
7280c5dd07 | ||
|
|
a603566235 | ||
|
|
42e2fbcdb5 |
No files matched your search
@@ -0,0 +1,24 @@
|
|||||||
|
.git/
|
||||||
|
.gitea/
|
||||||
|
.gitignore
|
||||||
|
|
||||||
|
.venv/
|
||||||
|
__pycache__/
|
||||||
|
.pytest_cache/
|
||||||
|
.mypy_cache/
|
||||||
|
.ruff_cache/
|
||||||
|
.uv/
|
||||||
|
|
||||||
|
*.py[cod]
|
||||||
|
*.pyo
|
||||||
|
*.log
|
||||||
|
|
||||||
|
.env
|
||||||
|
.env.*
|
||||||
|
.secrets.toml
|
||||||
|
|
||||||
|
db.sqlite3
|
||||||
|
|
||||||
|
Dockerfile
|
||||||
|
docker-compose*.yml
|
||||||
|
README.md
|
||||||
@@ -0,0 +1,674 @@
|
|||||||
|
GNU GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 29 June 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 General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
the GNU General Public License is 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. We, the Free Software Foundation, use the
|
||||||
|
GNU General Public License for most of our software; it applies also to
|
||||||
|
any other work released this way by its authors. You can apply it to
|
||||||
|
your programs, too.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
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.
|
||||||
|
|
||||||
|
To protect your rights, we need to prevent others from denying you
|
||||||
|
these rights or asking you to surrender the rights. Therefore, you have
|
||||||
|
certain responsibilities if you distribute copies of the software, or if
|
||||||
|
you modify it: responsibilities to respect the freedom of others.
|
||||||
|
|
||||||
|
For example, if you distribute copies of such a program, whether
|
||||||
|
gratis or for a fee, you must pass on to the recipients the same
|
||||||
|
freedoms that you received. You must make sure that they, too, receive
|
||||||
|
or can get the source code. And you must show them these terms so they
|
||||||
|
know their rights.
|
||||||
|
|
||||||
|
Developers that use the GNU GPL protect your rights with two steps:
|
||||||
|
(1) assert copyright on the software, and (2) offer you this License
|
||||||
|
giving you legal permission to copy, distribute and/or modify it.
|
||||||
|
|
||||||
|
For the developers' and authors' protection, the GPL clearly explains
|
||||||
|
that there is no warranty for this free software. For both users' and
|
||||||
|
authors' sake, the GPL requires that modified versions be marked as
|
||||||
|
changed, so that their problems will not be attributed erroneously to
|
||||||
|
authors of previous versions.
|
||||||
|
|
||||||
|
Some devices are designed to deny users access to install or run
|
||||||
|
modified versions of the software inside them, although the manufacturer
|
||||||
|
can do so. This is fundamentally incompatible with the aim of
|
||||||
|
protecting users' freedom to change the software. The systematic
|
||||||
|
pattern of such abuse occurs in the area of products for individuals to
|
||||||
|
use, which is precisely where it is most unacceptable. Therefore, we
|
||||||
|
have designed this version of the GPL to prohibit the practice for those
|
||||||
|
products. If such problems arise substantially in other domains, we
|
||||||
|
stand ready to extend this provision to those domains in future versions
|
||||||
|
of the GPL, as needed to protect the freedom of users.
|
||||||
|
|
||||||
|
Finally, every program is threatened constantly by software patents.
|
||||||
|
States should not allow patents to restrict development and use of
|
||||||
|
software on general-purpose computers, but in those that do, we wish to
|
||||||
|
avoid the special danger that patents applied to a free program could
|
||||||
|
make it effectively proprietary. To prevent this, the GPL assures that
|
||||||
|
patents cannot be used to render the program non-free.
|
||||||
|
|
||||||
|
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 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. Use with the GNU Affero General Public License.
|
||||||
|
|
||||||
|
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 Affero 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 special requirements of the GNU Affero General Public License,
|
||||||
|
section 13, concerning interaction through a network will apply to the
|
||||||
|
combination as such.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU 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 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 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 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 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 General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU 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 the program does terminal interaction, make it output a short
|
||||||
|
notice like this when it starts in an interactive mode:
|
||||||
|
|
||||||
|
<program> Copyright (C) <year> <name of author>
|
||||||
|
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||||
|
This is free software, and you are welcome to redistribute it
|
||||||
|
under certain conditions; type `show c' for details.
|
||||||
|
|
||||||
|
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||||
|
parts of the General Public License. Of course, your program's commands
|
||||||
|
might be different; for a GUI interface, you would use an "about box".
|
||||||
|
|
||||||
|
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 GPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
The GNU General Public License does not permit incorporating your program
|
||||||
|
into proprietary programs. If your program is a subroutine library, you
|
||||||
|
may consider it more useful to permit linking proprietary applications with
|
||||||
|
the library. If this is what you want to do, use the GNU Lesser General
|
||||||
|
Public License instead of this License. But first, please read
|
||||||
|
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||||
+2
-3
@@ -4,9 +4,8 @@ from sqlalchemy import engine_from_config
|
|||||||
from sqlalchemy import pool
|
from sqlalchemy import pool
|
||||||
|
|
||||||
from alembic import context
|
from alembic import context
|
||||||
from sqlmodel import SQLModel
|
|
||||||
|
|
||||||
from loon.web.db import database_url
|
from loon.web.db import Base, database_url
|
||||||
|
|
||||||
import loon.web
|
import loon.web
|
||||||
|
|
||||||
@@ -23,7 +22,7 @@ if config.config_file_name is not None:
|
|||||||
# for 'autogenerate' support
|
# for 'autogenerate' support
|
||||||
# from myapp import mymodel
|
# from myapp import mymodel
|
||||||
# target_metadata = mymodel.Base.metadata
|
# target_metadata = mymodel.Base.metadata
|
||||||
target_metadata = SQLModel.metadata
|
target_metadata = Base.metadata
|
||||||
|
|
||||||
config.set_main_option("sqlalchemy.url", database_url())
|
config.set_main_option("sqlalchemy.url", database_url())
|
||||||
|
|
||||||
|
|||||||
@@ -10,8 +10,6 @@ from typing import Sequence, Union
|
|||||||
from alembic import op
|
from alembic import op
|
||||||
import sqlalchemy as sa
|
import sqlalchemy as sa
|
||||||
${imports if imports else ""}
|
${imports if imports else ""}
|
||||||
import sqlmodel
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
# revision identifiers, used by Alembic.
|
||||||
revision: str = ${repr(up_revision)}
|
revision: str = ${repr(up_revision)}
|
||||||
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
|
down_revision: Union[str, Sequence[str], None] = ${repr(down_revision)}
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
"""Users
|
|
||||||
|
|
||||||
Revision ID: 2df7e2c6af43
|
|
||||||
Revises:
|
|
||||||
Create Date: 2026-08-17 12:42:05.103510
|
|
||||||
|
|
||||||
"""
|
|
||||||
from typing import Sequence, Union
|
|
||||||
|
|
||||||
from alembic import op
|
|
||||||
import sqlalchemy as sa
|
|
||||||
|
|
||||||
import sqlmodel
|
|
||||||
|
|
||||||
# revision identifiers, used by Alembic.
|
|
||||||
revision: str = '2df7e2c6af43'
|
|
||||||
down_revision: Union[str, Sequence[str], None] = None
|
|
||||||
branch_labels: Union[str, Sequence[str], None] = None
|
|
||||||
depends_on: Union[str, Sequence[str], None] = None
|
|
||||||
|
|
||||||
|
|
||||||
def upgrade() -> None:
|
|
||||||
"""Upgrade schema."""
|
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
|
||||||
op.create_table('user',
|
|
||||||
sa.Column('id', sa.Integer(), nullable=False),
|
|
||||||
sa.Column('uuid', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
|
||||||
sa.Column('internal_username', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
|
||||||
sa.Column('password', sqlmodel.sql.sqltypes.AutoString(), nullable=False),
|
|
||||||
sa.Column('admin', sa.Boolean(), nullable=False),
|
|
||||||
sa.PrimaryKeyConstraint('id'),
|
|
||||||
sa.UniqueConstraint('internal_username'),
|
|
||||||
sa.UniqueConstraint('uuid')
|
|
||||||
)
|
|
||||||
# ### end Alembic commands ###
|
|
||||||
|
|
||||||
|
|
||||||
def downgrade() -> None:
|
|
||||||
"""Downgrade schema."""
|
|
||||||
# ### commands auto generated by Alembic - please adjust! ###
|
|
||||||
op.drop_table('user')
|
|
||||||
# ### end Alembic commands ###
|
|
||||||
@@ -0,0 +1,65 @@
|
|||||||
|
"""init
|
||||||
|
|
||||||
|
Revision ID: 7efb7d0c39ae
|
||||||
|
Revises:
|
||||||
|
Create Date: 2026-09-04 23:50:22.513272
|
||||||
|
|
||||||
|
"""
|
||||||
|
from typing import Sequence, Union
|
||||||
|
|
||||||
|
from alembic import op
|
||||||
|
import sqlalchemy as sa
|
||||||
|
|
||||||
|
# revision identifiers, used by Alembic.
|
||||||
|
revision: str = '7efb7d0c39ae'
|
||||||
|
down_revision: Union[str, Sequence[str], None] = None
|
||||||
|
branch_labels: Union[str, Sequence[str], None] = None
|
||||||
|
depends_on: Union[str, Sequence[str], None] = None
|
||||||
|
|
||||||
|
|
||||||
|
def upgrade() -> None:
|
||||||
|
"""Upgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.create_table('logtype',
|
||||||
|
sa.Column('id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('code', sa.String(), nullable=False),
|
||||||
|
sa.PrimaryKeyConstraint('id'),
|
||||||
|
sa.UniqueConstraint('code')
|
||||||
|
)
|
||||||
|
op.create_table('minecraftuser',
|
||||||
|
sa.Column('id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('uuid', sa.String(), nullable=False),
|
||||||
|
sa.Column('username', sa.String(), nullable=False),
|
||||||
|
sa.PrimaryKeyConstraint('id'),
|
||||||
|
sa.UniqueConstraint('uuid')
|
||||||
|
)
|
||||||
|
op.create_table('logentry',
|
||||||
|
sa.Column('id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('log_type_id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('created_at', sa.DateTime(timezone=True), nullable=False),
|
||||||
|
sa.Column('message', sa.String(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['log_type_id'], ['logtype.id'], ),
|
||||||
|
sa.PrimaryKeyConstraint('id')
|
||||||
|
)
|
||||||
|
op.create_table('user',
|
||||||
|
sa.Column('id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('minecraft_user_id', sa.Integer(), nullable=False),
|
||||||
|
sa.Column('internal_username', sa.String(), nullable=False),
|
||||||
|
sa.Column('password', sa.String(), nullable=False),
|
||||||
|
sa.Column('admin', sa.Boolean(), nullable=False),
|
||||||
|
sa.ForeignKeyConstraint(['minecraft_user_id'], ['minecraftuser.id'], ),
|
||||||
|
sa.PrimaryKeyConstraint('id'),
|
||||||
|
sa.UniqueConstraint('internal_username'),
|
||||||
|
sa.UniqueConstraint('minecraft_user_id')
|
||||||
|
)
|
||||||
|
# ### end Alembic commands ###
|
||||||
|
|
||||||
|
|
||||||
|
def downgrade() -> None:
|
||||||
|
"""Downgrade schema."""
|
||||||
|
# ### commands auto generated by Alembic - please adjust! ###
|
||||||
|
op.drop_table('user')
|
||||||
|
op.drop_table('logentry')
|
||||||
|
op.drop_table('minecraftuser')
|
||||||
|
op.drop_table('logtype')
|
||||||
|
# ### end Alembic commands ###
|
||||||
@@ -1,41 +1,53 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
from sqlmodel import Session, select
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from loon.web.db import engine
|
from loon.web.db import engine
|
||||||
from loon.web.users.models import User
|
from loon.web.logs.service import write_log, player_tag
|
||||||
from loon.web.utils.password import hash_password
|
from loon.web.logs.types import LogTypeEnum
|
||||||
|
from loon.web.users.models import MinecraftUser, User
|
||||||
|
|
||||||
|
|
||||||
async def change_password_handler(client, userdata, msg, data):
|
async def change_password_handler(client, userdata, msg, data):
|
||||||
if msg.topic != "loon/register/change_password":
|
prefix = "loon/auth/register/"
|
||||||
|
|
||||||
|
if not msg.topic.startswith(prefix):
|
||||||
|
return
|
||||||
|
|
||||||
|
rest = msg.topic[len(prefix):]
|
||||||
|
uuid, _, subtopic = rest.partition("/")
|
||||||
|
|
||||||
|
if not uuid or subtopic != "change_password":
|
||||||
return
|
return
|
||||||
|
|
||||||
uuid = data["uuid"]
|
|
||||||
password = data["password"]
|
password = data["password"]
|
||||||
|
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
statement = select(User).where(User.uuid == uuid)
|
statement = select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
|
||||||
user = session.exec(statement).first()
|
user = session.execute(statement).scalars().first()
|
||||||
|
|
||||||
if user is None:
|
if user is None:
|
||||||
client.publish(f"loon/register/{uuid}/response",
|
client.publish(f"loon/auth/change_password/{uuid}/response",
|
||||||
json.dumps({"success": False, "error": "The user is not registered!"}))
|
json.dumps({"success": False, "error": "The user is not registered!"}))
|
||||||
return
|
return
|
||||||
|
|
||||||
user = session.exec(
|
user = session.execute(
|
||||||
select(User).where(User.uuid == uuid)
|
select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
|
||||||
).first()
|
).scalars().first()
|
||||||
user.password = hash_password(password)
|
user.password = password
|
||||||
|
internal_username = user.internal_username
|
||||||
|
|
||||||
try:
|
try:
|
||||||
session.commit()
|
session.commit()
|
||||||
except IntegrityError:
|
except IntegrityError:
|
||||||
session.rollback()
|
session.rollback()
|
||||||
client.publish(f"loon/register/{uuid}/response",
|
client.publish(f"loon/auth/change_password/{uuid}/response",
|
||||||
json.dumps({"success": False, "error": "The user is not registered!"}))
|
json.dumps({"success": False, "error": "The user is not registered!"}))
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
client.publish(f"loon/register/{uuid}/response", json.dumps({"success": True, "error": None}))
|
await write_log(LogTypeEnum.PLAYER_PASSWORD_CHANGED, f"Player {player_tag(uuid, internal_username)} changed their password.")
|
||||||
|
|
||||||
|
client.publish(f"loon/auth/change_password/{uuid}/response", json.dumps({"success": True, "error": None}))
|
||||||
@@ -1,10 +1,14 @@
|
|||||||
import json
|
import json
|
||||||
import random
|
import random
|
||||||
|
|
||||||
|
from loon.web.logs.service import write_log, player_tag
|
||||||
|
from loon.web.logs.types import LogTypeEnum
|
||||||
from loon.web.users.state import user_threads
|
from loon.web.users.state import user_threads
|
||||||
|
|
||||||
PLAYER_EVENT_SUFFIXES = ("died", "joined", "left", "kicked")
|
PLAYER_EVENT_SUFFIXES = ("died", "joined", "left", "kicked")
|
||||||
|
|
||||||
|
BAN_KICK_REASON = "Banned by admin"
|
||||||
|
|
||||||
DEATH_BY_DAMAGE = {
|
DEATH_BY_DAMAGE = {
|
||||||
"fall": (
|
"fall": (
|
||||||
"{username} fell from a high place",
|
"{username} fell from a high place",
|
||||||
@@ -78,7 +82,8 @@ async def marquee_handler(client, userdata, msg, data):
|
|||||||
if not isinstance(player, dict):
|
if not isinstance(player, dict):
|
||||||
return
|
return
|
||||||
username = player.get("username")
|
username = player.get("username")
|
||||||
if not username:
|
uuid = player.get("uuid")
|
||||||
|
if not username or not uuid:
|
||||||
return
|
return
|
||||||
|
|
||||||
if subtopic == "died":
|
if subtopic == "died":
|
||||||
@@ -88,20 +93,43 @@ async def marquee_handler(client, userdata, msg, data):
|
|||||||
if killer:
|
if killer:
|
||||||
templates = DEATH_BY_KILLER.get(damage_type, DEATH_BY_KILLER_DEFAULT)
|
templates = DEATH_BY_KILLER.get(damage_type, DEATH_BY_KILLER_DEFAULT)
|
||||||
message = get_random(templates, username=username, killer=killer)
|
message = get_random(templates, username=username, killer=killer)
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_DEAD, f"Player {player_tag(uuid, username)} was killed by {killer}.")
|
||||||
elif damage_type in DEATH_BY_DAMAGE:
|
elif damage_type in DEATH_BY_DAMAGE:
|
||||||
message = get_random(DEATH_BY_DAMAGE[damage_type], username=username)
|
message = get_random(DEATH_BY_DAMAGE[damage_type], username=username)
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_DEAD, f"Player {player_tag(uuid, username)} died of {damage_type}.")
|
||||||
elif damage_type:
|
elif damage_type:
|
||||||
message = f"{username} died of {damage_type}"
|
message = f"{username} died of {damage_type}"
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_DEAD, f"Player {player_tag(uuid, username)} died of {damage_type}.")
|
||||||
else:
|
else:
|
||||||
message = f"{username} died"
|
message = f"{username} died"
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_DEAD, f"Player {player_tag(uuid, username)} died.")
|
||||||
elif subtopic == "joined":
|
elif subtopic == "joined":
|
||||||
message = f"{username} joined the game"
|
message = f"{username} joined the game"
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_JOINED, f"Player {player_tag(uuid, username)} joined the game.")
|
||||||
elif subtopic == "kicked":
|
elif subtopic == "kicked":
|
||||||
reason = data.get("reason")
|
reason = data.get("reason")
|
||||||
message = f"{username} was kicked: {reason}" if reason else f"{username} was kicked"
|
|
||||||
|
if reason == BAN_KICK_REASON:
|
||||||
|
message = f"{username} was banned"
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_BANNED, f"Player {player_tag(uuid, username)} was banned.")
|
||||||
|
else:
|
||||||
|
message = f"{username} was kicked: {reason}" if reason else f"{username} was kicked"
|
||||||
|
|
||||||
|
await write_log(
|
||||||
|
LogTypeEnum.PLAYER_KICKED,
|
||||||
|
f"Player {player_tag(uuid, username)} was kicked: {reason}." if reason else f"Player {player_tag(uuid, username)} was kicked.",
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
message = f"{username} left the game"
|
message = f"{username} left the game"
|
||||||
|
|
||||||
|
await write_log(LogTypeEnum.PLAYER_LEFT, f"Player {player_tag(uuid, username)} left the game.")
|
||||||
|
|
||||||
envelope = json.dumps({"topic": "server/marquee", "payload": {"message": message}})
|
envelope = json.dumps({"topic": "server/marquee", "payload": {"message": message}})
|
||||||
|
|
||||||
for queue in list(user_threads.values()):
|
for queue in list(user_threads.values()):
|
||||||
|
|||||||
@@ -0,0 +1,12 @@
|
|||||||
|
from loon.web.users.service import sync_minecraft_users
|
||||||
|
|
||||||
|
|
||||||
|
async def player_joined_handler(client, userdata, msg, data):
|
||||||
|
if msg.topic != "loon/playerlist/joined":
|
||||||
|
return
|
||||||
|
|
||||||
|
player = data.get("player")
|
||||||
|
if not player:
|
||||||
|
return
|
||||||
|
|
||||||
|
await sync_minecraft_users([{"uuid": player["uuid"], "username": player["username"]}])
|
||||||
@@ -0,0 +1,8 @@
|
|||||||
|
from loon.web.users.service import sync_minecraft_users
|
||||||
|
|
||||||
|
|
||||||
|
async def players_sync_handler(client, userdata, msg, data):
|
||||||
|
if msg.topic != "loon/playerlist/sync":
|
||||||
|
return
|
||||||
|
|
||||||
|
await sync_minecraft_users(data.get("players", []))
|
||||||
@@ -1,47 +1,65 @@
|
|||||||
import json
|
import json
|
||||||
|
|
||||||
from sqlalchemy.exc import IntegrityError
|
from sqlalchemy.exc import IntegrityError
|
||||||
from sqlmodel import Session, select
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from loon.web.db import engine
|
from loon.web.db import engine
|
||||||
from loon.web.users.models import User
|
from loon.web.logs.service import write_log, player_tag
|
||||||
from loon.web.utils.password import hash_password
|
from loon.web.logs.types import LogTypeEnum
|
||||||
|
from loon.web.users.models import MinecraftUser, User
|
||||||
|
|
||||||
|
|
||||||
async def register_request_handler(client, userdata, msg, data):
|
async def register_request_handler(client, userdata, msg, data):
|
||||||
if msg.topic != "loon/register/request":
|
prefix = "loon/auth/register/"
|
||||||
|
|
||||||
|
if not msg.topic.startswith(prefix):
|
||||||
|
return
|
||||||
|
|
||||||
|
rest = msg.topic[len(prefix):]
|
||||||
|
uuid, _, subtopic = rest.partition("/")
|
||||||
|
|
||||||
|
if not uuid or subtopic != "request":
|
||||||
return
|
return
|
||||||
|
|
||||||
uuid = data["uuid"]
|
|
||||||
password = data["password"]
|
password = data["password"]
|
||||||
internal_username = data["internalUsername"]
|
internal_username = data["internalUsername"]
|
||||||
|
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
statement = select(User).where(User.uuid == uuid)
|
minecraft_user = session.execute(select(MinecraftUser).where(MinecraftUser.uuid == uuid)).scalars().first()
|
||||||
user = session.exec(statement).first()
|
|
||||||
|
if minecraft_user is None:
|
||||||
|
client.publish(f"loon/auth/register/{uuid}/response",
|
||||||
|
json.dumps({"success": False, "error": "Player not recognized yet, please rejoin the server and try again."}))
|
||||||
|
return
|
||||||
|
|
||||||
|
statement = select(User).where(User.minecraft_user_id == minecraft_user.id)
|
||||||
|
user = session.execute(statement).scalars().first()
|
||||||
|
|
||||||
if user is not None:
|
if user is not None:
|
||||||
client.publish(f"loon/register/{uuid}/response",
|
client.publish(f"loon/auth/register/{uuid}/response",
|
||||||
json.dumps({"success": False, "error": "The user is already registered!"}))
|
json.dumps({"success": False, "error": "The user is already registered!"}))
|
||||||
return
|
return
|
||||||
|
|
||||||
statement = select(User).where(User.internal_username == internal_username)
|
statement = select(User).where(User.internal_username == internal_username)
|
||||||
user = session.exec(statement).first()
|
user = session.execute(statement).scalars().first()
|
||||||
|
|
||||||
if user is not None:
|
if user is not None:
|
||||||
client.publish(f"loon/register/{uuid}/response",
|
client.publish(f"loon/auth/register/{uuid}/response",
|
||||||
json.dumps({"success": False, "error": f"The {internal_username} is taken!"}))
|
json.dumps({"success": False, "error": f"The {internal_username} is taken!"}))
|
||||||
return
|
return
|
||||||
|
|
||||||
user = User(uuid=uuid, password=hash_password(password), internal_username=internal_username, admin=False)
|
user = User(minecraft_user_id=minecraft_user.id, password=password, internal_username=internal_username, admin=False)
|
||||||
session.add(user)
|
session.add(user)
|
||||||
try:
|
try:
|
||||||
session.commit()
|
session.commit()
|
||||||
except IntegrityError:
|
except IntegrityError:
|
||||||
session.rollback()
|
session.rollback()
|
||||||
client.publish(f"loon/register/{uuid}/response",
|
client.publish(f"loon/auth/register/{uuid}/response",
|
||||||
json.dumps({"success": False, "error": "The user is already registered!"}))
|
json.dumps({"success": False, "error": "The user is already registered!"}))
|
||||||
|
|
||||||
return
|
return
|
||||||
|
|
||||||
client.publish(f"loon/register/{uuid}/response", json.dumps({"success": True, "error": None}))
|
await write_log(LogTypeEnum.PLAYER_REGISTERED, f"Player {player_tag(uuid, internal_username)} registered.")
|
||||||
|
|
||||||
|
client.publish(f"loon/auth/register/{uuid}/response", json.dumps({"success": True, "error": None}))
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import json
|
||||||
|
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from loon.web.db import engine
|
||||||
|
from loon.web.users.models import MinecraftUser, User
|
||||||
|
|
||||||
|
|
||||||
|
async def show_username_handler(client, userdata, msg, data):
|
||||||
|
prefix = "loon/auth/show_username/"
|
||||||
|
|
||||||
|
if not msg.topic.startswith(prefix):
|
||||||
|
return
|
||||||
|
|
||||||
|
rest = msg.topic[len(prefix):]
|
||||||
|
uuid, _, subtopic = rest.partition("/")
|
||||||
|
|
||||||
|
if not uuid or subtopic:
|
||||||
|
return
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
user = session.execute(
|
||||||
|
select(User).join(MinecraftUser).where(MinecraftUser.uuid == uuid)
|
||||||
|
).scalars().first()
|
||||||
|
|
||||||
|
if user is None:
|
||||||
|
client.publish(f"loon/auth/show_username/{uuid}/response",
|
||||||
|
json.dumps({"success": False, "error": "The user is not registered!"}))
|
||||||
|
return
|
||||||
|
|
||||||
|
internal_username = user.internal_username
|
||||||
|
|
||||||
|
client.publish(f"loon/auth/show_username/{uuid}/response",
|
||||||
|
json.dumps({"success": True, "error": None, "internalUsername": internal_username}))
|
||||||
@@ -22,7 +22,7 @@ async def world_handler(client, userdata, msg, data):
|
|||||||
|
|
||||||
if settings.redis.enabled:
|
if settings.redis.enabled:
|
||||||
try:
|
try:
|
||||||
set_chunk_cache(x, z, data)
|
await set_chunk_cache(x, z, data)
|
||||||
except redis.RedisError:
|
except redis.RedisError:
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|||||||
@@ -9,13 +9,16 @@ from loon import logger
|
|||||||
from loon.mqtt.handlers.change_password_request import change_password_handler
|
from loon.mqtt.handlers.change_password_request import change_password_handler
|
||||||
from loon.mqtt.handlers.marquee import marquee_handler
|
from loon.mqtt.handlers.marquee import marquee_handler
|
||||||
from loon.mqtt.handlers.player import player_handler
|
from loon.mqtt.handlers.player import player_handler
|
||||||
|
from loon.mqtt.handlers.player_joined import player_joined_handler
|
||||||
|
from loon.mqtt.handlers.players_sync import players_sync_handler
|
||||||
from loon.mqtt.handlers.register_request import register_request_handler
|
from loon.mqtt.handlers.register_request import register_request_handler
|
||||||
from loon.mqtt.handlers.server import server_handler
|
from loon.mqtt.handlers.server import server_handler
|
||||||
|
from loon.mqtt.handlers.show_username_request import show_username_handler
|
||||||
from loon.mqtt.handlers.world import world_handler
|
from loon.mqtt.handlers.world import world_handler
|
||||||
|
|
||||||
|
|
||||||
class MQTTManager:
|
class MQTTManager:
|
||||||
BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler]
|
BASE_HANDLERS = [player_handler, register_request_handler, world_handler, server_handler, marquee_handler, change_password_handler, show_username_handler, players_sync_handler, player_joined_handler]
|
||||||
|
|
||||||
def __init__(self, inject_handlers = None):
|
def __init__(self, inject_handlers = None):
|
||||||
if inject_handlers is None:
|
if inject_handlers is None:
|
||||||
@@ -52,6 +55,8 @@ class MQTTManager:
|
|||||||
logger.info(f"MQTT connected (rc={reason_code})")
|
logger.info(f"MQTT connected (rc={reason_code})")
|
||||||
client.subscribe("loon/#")
|
client.subscribe("loon/#")
|
||||||
|
|
||||||
|
client.publish("loon/playerlist/sync/request")
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def on_disconnect(client, userdata, reason_code):
|
def on_disconnect(client, userdata, reason_code):
|
||||||
logger.warning(f"MQTT disconnected (rc={reason_code}). Reconnecting...")
|
logger.warning(f"MQTT disconnected (rc={reason_code}). Reconnecting...")
|
||||||
@@ -59,7 +64,8 @@ class MQTTManager:
|
|||||||
def on_topic(self, client, userdata, msg):
|
def on_topic(self, client, userdata, msg):
|
||||||
async def handle_message():
|
async def handle_message():
|
||||||
try:
|
try:
|
||||||
data = json.loads(msg.payload.decode())
|
raw = msg.payload.decode()
|
||||||
|
data = json.loads(raw) if raw.strip() else {}
|
||||||
except json.decoder.JSONDecodeError:
|
except json.decoder.JSONDecodeError:
|
||||||
return
|
return
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import redis
|
import redis.asyncio as redis
|
||||||
from redis.backoff import ExponentialBackoff
|
from redis.backoff import ExponentialBackoff
|
||||||
from redis.exceptions import ConnectionError, TimeoutError
|
from redis.exceptions import ConnectionError, TimeoutError
|
||||||
from redis.retry import Retry
|
from redis.retry import Retry
|
||||||
|
|||||||
+13
-6
@@ -4,16 +4,23 @@ from config import settings
|
|||||||
from loon.redis import r
|
from loon.redis import r
|
||||||
|
|
||||||
|
|
||||||
def set_chunk_cache(x: int, z: int, chunk_payload):
|
async def set_chunk_cache(x: int, z: int, chunk_payload):
|
||||||
r.setex(f'{x}:{z}', settings.redis.expire_time, str(json.dumps(chunk_payload)))
|
await r.setex(f'{x}:{z}', settings.redis.expire_time, str(json.dumps(chunk_payload)))
|
||||||
|
|
||||||
def get_chunk_cache(x: int, z: int):
|
async def get_chunk_cache(x: int, z: int):
|
||||||
chunk = r.get(f'{x}:{z}')
|
chunk = await r.get(f'{x}:{z}')
|
||||||
|
|
||||||
if chunk:
|
if chunk:
|
||||||
return json.loads(chunk)
|
return json.loads(chunk)
|
||||||
|
|
||||||
return None
|
return None
|
||||||
|
|
||||||
def reset_chunk_cache(x: int, z: int):
|
async def get_chunks_cache(coords):
|
||||||
return r.delete(f'{x}:{z}')
|
if not coords:
|
||||||
|
return {}
|
||||||
|
|
||||||
|
vals = await r.mget([f'{x}:{z}' for x, z in coords])
|
||||||
|
return {c: json.loads(v) for c, v in zip(coords, vals) if v}
|
||||||
|
|
||||||
|
async def reset_chunk_cache(x: int, z: int):
|
||||||
|
return await r.delete(f'{x}:{z}')
|
||||||
@@ -19,8 +19,15 @@ async def lifespan(app: FastAPI):
|
|||||||
limiter = Limiter(key_func=lambda request: request.client.host)
|
limiter = Limiter(key_func=lambda request: request.client.host)
|
||||||
|
|
||||||
docs_url = "/docs" if settings.web.show_docs else None
|
docs_url = "/docs" if settings.web.show_docs else None
|
||||||
|
redoc_url = "/redoc" if settings.web.show_docs else None
|
||||||
|
openapi_url = "/openapi.json" if settings.web.show_docs else None
|
||||||
|
|
||||||
app = FastAPI(lifespan=lifespan, docs_url=docs_url)
|
app = FastAPI(
|
||||||
|
lifespan=lifespan,
|
||||||
|
docs_url=docs_url,
|
||||||
|
redoc_url=redoc_url,
|
||||||
|
openapi_url=openapi_url,
|
||||||
|
)
|
||||||
|
|
||||||
app.state.limiter = limiter
|
app.state.limiter = limiter
|
||||||
app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
|
app.add_exception_handler(RateLimitExceeded, _rate_limit_exceeded_handler)
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
from sqlmodel import Session, select
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from loon.web.db import engine
|
from loon.web.db import engine
|
||||||
from loon.web.users.models import User
|
from loon.web.users.models import User
|
||||||
@@ -6,9 +7,9 @@ from loon.web.users.models import User
|
|||||||
|
|
||||||
def choose_admin(username: str) -> None:
|
def choose_admin(username: str) -> None:
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
user = session.exec(
|
user = session.execute(
|
||||||
select(User).where(User.internal_username == username)
|
select(User).where(User.internal_username == username)
|
||||||
).first()
|
).scalars().first()
|
||||||
|
|
||||||
if user is None:
|
if user is None:
|
||||||
print(f"No user named {username!r}.")
|
print(f"No user named {username!r}.")
|
||||||
|
|||||||
@@ -1,7 +1,85 @@
|
|||||||
from fastapi import APIRouter
|
from fastapi import APIRouter, HTTPException
|
||||||
|
from sqlalchemy.orm import selectinload, Session
|
||||||
|
from sqlalchemy import select
|
||||||
from starlette.requests import Request
|
from starlette.requests import Request
|
||||||
|
|
||||||
from loon.web.auth.middleware import admin
|
from loon.web.auth.middleware import admin
|
||||||
|
from loon.web.db import engine
|
||||||
|
from loon.web.logs.models import LogEntry
|
||||||
|
from loon.web.logs.schema import LogEntryResponse
|
||||||
|
from loon.web.users.models import MinecraftUser, User
|
||||||
|
from loon.web.users.schema import MinecraftUserPublic, UserPublic
|
||||||
|
|
||||||
router = APIRouter(prefix="/admin", tags=["admin"])
|
router = APIRouter(prefix="/admin", tags=["admin"])
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/logs", response_model=list[LogEntryResponse])
|
||||||
|
@admin
|
||||||
|
async def list_logs(request: Request):
|
||||||
|
with Session(engine) as session:
|
||||||
|
statement = (
|
||||||
|
select(LogEntry)
|
||||||
|
.options(selectinload(LogEntry.log_type))
|
||||||
|
.order_by(LogEntry.created_at)
|
||||||
|
)
|
||||||
|
entries = session.execute(statement).scalars().all()
|
||||||
|
return [
|
||||||
|
LogEntryResponse(
|
||||||
|
id=entry.id,
|
||||||
|
log_type=entry.log_type.code,
|
||||||
|
created_at=entry.created_at,
|
||||||
|
message=entry.message,
|
||||||
|
)
|
||||||
|
for entry in entries
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/mc-users", response_model=list[MinecraftUserPublic])
|
||||||
|
@admin
|
||||||
|
async def list_mc_users(request: Request):
|
||||||
|
with Session(engine) as session:
|
||||||
|
statement = select(MinecraftUser).order_by(MinecraftUser.username)
|
||||||
|
return session.execute(statement).scalars().all()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/users", response_model=list[UserPublic])
|
||||||
|
@admin
|
||||||
|
async def list_users(request: Request):
|
||||||
|
with Session(engine) as session:
|
||||||
|
statement = (
|
||||||
|
select(User)
|
||||||
|
.options(selectinload(User.minecraft_user))
|
||||||
|
.order_by(User.internal_username)
|
||||||
|
)
|
||||||
|
return session.execute(statement).scalars().all()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/users/{internal_username}", response_model=UserPublic)
|
||||||
|
@admin
|
||||||
|
async def get_user(request: Request, internal_username: str):
|
||||||
|
with Session(engine) as session:
|
||||||
|
statement = (
|
||||||
|
select(User)
|
||||||
|
.where(User.internal_username == internal_username)
|
||||||
|
.options(selectinload(User.minecraft_user))
|
||||||
|
)
|
||||||
|
user = session.execute(statement).scalars().first()
|
||||||
|
if user is None:
|
||||||
|
raise HTTPException(status_code=404)
|
||||||
|
return user
|
||||||
|
|
||||||
|
|
||||||
|
@router.get("/users/by-uuid/{uuid}", response_model=UserPublic)
|
||||||
|
@admin
|
||||||
|
async def get_user_by_uuid(request: Request, uuid: str):
|
||||||
|
with Session(engine) as session:
|
||||||
|
statement = (
|
||||||
|
select(User)
|
||||||
|
.join(MinecraftUser)
|
||||||
|
.where(MinecraftUser.uuid == uuid)
|
||||||
|
.options(selectinload(User.minecraft_user))
|
||||||
|
)
|
||||||
|
user = session.execute(statement).scalars().first()
|
||||||
|
if user is None:
|
||||||
|
raise HTTPException(status_code=404)
|
||||||
|
return user
|
||||||
@@ -8,7 +8,8 @@ from starlette.authentication import (
|
|||||||
)
|
)
|
||||||
from starlette.requests import HTTPConnection
|
from starlette.requests import HTTPConnection
|
||||||
from starlette.responses import JSONResponse, Response
|
from starlette.responses import JSONResponse, Response
|
||||||
from sqlmodel import Session, select
|
from sqlalchemy.orm import selectinload, Session
|
||||||
|
from sqlalchemy import select
|
||||||
|
|
||||||
from loon.web.db import engine
|
from loon.web.db import engine
|
||||||
from loon.web.users.models import User
|
from loon.web.users.models import User
|
||||||
@@ -34,9 +35,9 @@ class JWTAuthBackend(AuthenticationBackend):
|
|||||||
if scheme.lower() == "bearer" and credentials:
|
if scheme.lower() == "bearer" and credentials:
|
||||||
return credentials
|
return credentials
|
||||||
|
|
||||||
# Browser WebSocket APIs cannot set Authorization headers.
|
if conn.scope["type"] == "websocket":
|
||||||
token = conn.query_params.get("token")
|
return conn.query_params.get("token") or None
|
||||||
return token or None
|
return None
|
||||||
|
|
||||||
async def authenticate(
|
async def authenticate(
|
||||||
self, conn: HTTPConnection
|
self, conn: HTTPConnection
|
||||||
@@ -54,8 +55,17 @@ class JWTAuthBackend(AuthenticationBackend):
|
|||||||
if not isinstance(user_id, int):
|
if not isinstance(user_id, int):
|
||||||
raise AuthenticationError("Invalid or expired token")
|
raise AuthenticationError("Invalid or expired token")
|
||||||
|
|
||||||
|
typ = payload.get("typ")
|
||||||
|
if conn.scope["type"] == "websocket":
|
||||||
|
if typ != "ws":
|
||||||
|
raise AuthenticationError("Invalid or expired token")
|
||||||
|
elif typ != "web":
|
||||||
|
raise AuthenticationError("Invalid or expired token")
|
||||||
|
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
user = session.exec(select(User).where(User.id == user_id)).first()
|
user = session.execute(
|
||||||
|
select(User).where(User.id == user_id).options(selectinload(User.minecraft_user))
|
||||||
|
).scalars().first()
|
||||||
|
|
||||||
if user is None:
|
if user is None:
|
||||||
raise AuthenticationError("User not found")
|
raise AuthenticationError("User not found")
|
||||||
|
|||||||
+18
-5
@@ -1,11 +1,13 @@
|
|||||||
from fastapi import APIRouter, HTTPException, Request, status
|
from fastapi import APIRouter, HTTPException, Request, status
|
||||||
from sqlmodel import Session, select
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
from loon.web import limiter
|
from loon.web import limiter
|
||||||
|
from loon.web.auth.middleware import authenticated
|
||||||
from loon.web.auth.schema import JWTResponse, JWTRequest
|
from loon.web.auth.schema import JWTResponse, JWTRequest
|
||||||
from loon.web.db import engine
|
from loon.web.db import engine
|
||||||
from loon.web.users.models import User
|
from loon.web.users.models import User
|
||||||
from loon.web.utils.jwt import generate_token
|
from loon.web.utils.jwt import generate_token, generate_ws_token
|
||||||
from loon.web.utils.password import verify_password
|
from loon.web.utils.password import verify_password
|
||||||
|
|
||||||
router = APIRouter(prefix="/auth", tags=["auth"])
|
router = APIRouter(prefix="/auth", tags=["auth"])
|
||||||
@@ -16,13 +18,24 @@ router = APIRouter(prefix="/auth", tags=["auth"])
|
|||||||
async def get_jwt(request: Request, body: JWTRequest) -> JWTResponse:
|
async def get_jwt(request: Request, body: JWTRequest) -> JWTResponse:
|
||||||
with Session(engine) as session:
|
with Session(engine) as session:
|
||||||
statement = select(User).where(User.internal_username == body.username)
|
statement = select(User).where(User.internal_username == body.username)
|
||||||
user = session.exec(statement).first()
|
user = session.execute(statement).scalars().first()
|
||||||
|
|
||||||
if user is None or not verify_password(body.password, user.password):
|
if user is None or user.id is None or not verify_password(body.password, user.password):
|
||||||
raise HTTPException(
|
raise HTTPException(
|
||||||
status_code=status.HTTP_401_UNAUTHORIZED,
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
detail="Invalid username or password",
|
detail="Invalid username or password",
|
||||||
)
|
)
|
||||||
|
|
||||||
assert user.id is not None
|
|
||||||
return JWTResponse(access_token=generate_token(user.id))
|
return JWTResponse(access_token=generate_token(user.id))
|
||||||
|
|
||||||
|
|
||||||
|
@router.post("/ws-token", response_model=JWTResponse)
|
||||||
|
@authenticated
|
||||||
|
async def get_ws_token(request: Request) -> JWTResponse:
|
||||||
|
user_id = request.user.user.id
|
||||||
|
if user_id is None:
|
||||||
|
raise HTTPException(
|
||||||
|
status_code=status.HTTP_401_UNAUTHORIZED,
|
||||||
|
detail="Invalid or expired token",
|
||||||
|
)
|
||||||
|
return JWTResponse(access_token=generate_ws_token(user_id))
|
||||||
@@ -1,9 +1,9 @@
|
|||||||
from pydantic import BaseModel
|
from pydantic import BaseModel, Field
|
||||||
|
|
||||||
|
|
||||||
class JWTRequest(BaseModel):
|
class JWTRequest(BaseModel):
|
||||||
username: str
|
username: str
|
||||||
password: str
|
password: str = Field(max_length=256)
|
||||||
|
|
||||||
|
|
||||||
class JWTResponse(BaseModel):
|
class JWTResponse(BaseModel):
|
||||||
|
|||||||
@@ -1,8 +1,13 @@
|
|||||||
from sqlmodel import SQLModel, create_engine
|
from sqlalchemy import create_engine
|
||||||
|
from sqlalchemy.orm import DeclarativeBase
|
||||||
|
|
||||||
from config import settings
|
from config import settings
|
||||||
|
|
||||||
|
|
||||||
|
class Base(DeclarativeBase):
|
||||||
|
pass
|
||||||
|
|
||||||
|
|
||||||
def database_url(url: str | None = None) -> str:
|
def database_url(url: str | None = None) -> str:
|
||||||
url = url or settings.database.url
|
url = url or settings.database.url
|
||||||
for src, dst in (
|
for src, dst in (
|
||||||
|
|||||||
Whitespace-only changes.
@@ -0,0 +1,24 @@
|
|||||||
|
from datetime import datetime, timezone
|
||||||
|
|
||||||
|
from sqlalchemy import DateTime, ForeignKey
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
|
from loon.web.db import Base
|
||||||
|
|
||||||
|
|
||||||
|
class LogType(Base):
|
||||||
|
__tablename__ = "logtype"
|
||||||
|
|
||||||
|
id: Mapped[int] = mapped_column(primary_key=True)
|
||||||
|
code: Mapped[str] = mapped_column(unique=True)
|
||||||
|
entries: Mapped[list["LogEntry"]] = relationship(back_populates="log_type")
|
||||||
|
|
||||||
|
|
||||||
|
class LogEntry(Base):
|
||||||
|
__tablename__ = "logentry"
|
||||||
|
|
||||||
|
id: Mapped[int] = mapped_column(primary_key=True)
|
||||||
|
log_type_id: Mapped[int] = mapped_column(ForeignKey("logtype.id"))
|
||||||
|
log_type: Mapped[LogType] = relationship(back_populates="entries")
|
||||||
|
created_at: Mapped[datetime] = mapped_column(DateTime(timezone=True), default=lambda: datetime.now(timezone.utc))
|
||||||
|
message: Mapped[str]
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
from datetime import datetime
|
||||||
|
|
||||||
|
from pydantic import BaseModel
|
||||||
|
|
||||||
|
|
||||||
|
class LogEntryResponse(BaseModel):
|
||||||
|
id: int
|
||||||
|
log_type: str
|
||||||
|
created_at: datetime
|
||||||
|
message: str
|
||||||
@@ -0,0 +1,32 @@
|
|||||||
|
import asyncio
|
||||||
|
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from loon.web.db import engine
|
||||||
|
from loon.web.logs.models import LogType, LogEntry
|
||||||
|
from loon.web.logs.types import LogTypeEnum
|
||||||
|
|
||||||
|
|
||||||
|
def player_tag(uuid: str, username: str) -> str:
|
||||||
|
return f"[player:{uuid}]{username}[/player]"
|
||||||
|
|
||||||
|
|
||||||
|
def _write_log(log_type: LogTypeEnum, message: str) -> None:
|
||||||
|
with Session(engine) as session:
|
||||||
|
statement = select(LogType).where(LogType.code == log_type.value)
|
||||||
|
log_type_object = session.execute(statement).scalars().first()
|
||||||
|
|
||||||
|
if not log_type_object:
|
||||||
|
log_type_object = LogType(code=log_type.value)
|
||||||
|
session.add(log_type_object)
|
||||||
|
session.commit()
|
||||||
|
session.refresh(log_type_object)
|
||||||
|
|
||||||
|
log_entry = LogEntry(log_type_id=log_type_object.id, message=message)
|
||||||
|
session.add(log_entry)
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
|
||||||
|
async def write_log(log_type: LogTypeEnum, message: str) -> None:
|
||||||
|
await asyncio.to_thread(_write_log, log_type, message)
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
from enum import Enum
|
||||||
|
|
||||||
|
|
||||||
|
class LogTypeEnum(Enum):
|
||||||
|
PLAYER_DEAD = "player_dead"
|
||||||
|
PLAYER_JOINED = "player_joined"
|
||||||
|
PLAYER_LEFT = "player_left"
|
||||||
|
PLAYER_KICKED = "player_kicked"
|
||||||
|
PLAYER_BANNED = "player_banned"
|
||||||
|
PLAYER_REGISTERED = "player_registered"
|
||||||
|
PLAYER_PASSWORD_CHANGED = "player_password_changed"
|
||||||
@@ -1,9 +1,30 @@
|
|||||||
from sqlmodel import SQLModel, Field
|
from sqlalchemy import ForeignKey
|
||||||
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
||||||
|
|
||||||
|
from loon.web.db import Base
|
||||||
|
|
||||||
|
|
||||||
class User(SQLModel, table=True):
|
class MinecraftUser(Base):
|
||||||
id: int = Field(default=None, primary_key=True)
|
__tablename__ = "minecraftuser"
|
||||||
uuid: str = Field(unique=True)
|
|
||||||
internal_username: str = Field(unique=True)
|
id: Mapped[int] = mapped_column(primary_key=True)
|
||||||
password: str
|
uuid: Mapped[str] = mapped_column(unique=True)
|
||||||
admin: bool = Field(default=False)
|
username: Mapped[str]
|
||||||
|
user: Mapped["User"] = relationship(back_populates="minecraft_user")
|
||||||
|
|
||||||
|
|
||||||
|
class User(Base):
|
||||||
|
__tablename__ = "user"
|
||||||
|
|
||||||
|
id: Mapped[int] = mapped_column(primary_key=True)
|
||||||
|
|
||||||
|
minecraft_user_id: Mapped[int] = mapped_column(ForeignKey("minecraftuser.id"), unique=True)
|
||||||
|
minecraft_user: Mapped[MinecraftUser] = relationship(back_populates="user")
|
||||||
|
|
||||||
|
internal_username: Mapped[str] = mapped_column(unique=True)
|
||||||
|
password: Mapped[str]
|
||||||
|
admin: Mapped[bool] = mapped_column(default=False)
|
||||||
|
|
||||||
|
@property
|
||||||
|
def uuid(self) -> str:
|
||||||
|
return self.minecraft_user.uuid
|
||||||
@@ -1,20 +1,19 @@
|
|||||||
import asyncio
|
|
||||||
import threading
|
|
||||||
|
|
||||||
from fastapi import APIRouter, Request
|
from fastapi import APIRouter, Request
|
||||||
from starlette.websockets import WebSocket, WebSocketDisconnect
|
from starlette.websockets import WebSocket, WebSocketDisconnect
|
||||||
|
|
||||||
from loon.web import get_mqtt_manager
|
from loon.web import get_mqtt_manager
|
||||||
from loon.web.auth.middleware import authenticated
|
from loon.web.auth.middleware import authenticated
|
||||||
from loon.web.users.state import user_threads, user_world_requests
|
from loon.web.users.models import User
|
||||||
|
from loon.web.users.schema import UserPublic
|
||||||
|
from loon.web.users.state import subscribe_player, get_user_messages, unsubscribe_player
|
||||||
|
|
||||||
router = APIRouter(prefix="/users", tags=["users"])
|
router = APIRouter(prefix="/users", tags=["users"])
|
||||||
|
|
||||||
|
|
||||||
@router.get("/me")
|
@router.get("/me", response_model=UserPublic)
|
||||||
@authenticated
|
@authenticated
|
||||||
async def me(request: Request):
|
async def me(request: Request) -> User:
|
||||||
return request.user.user.model_dump(exclude={"password", "id"})
|
return request.user.user
|
||||||
|
|
||||||
@router.post("/inventory/request")
|
@router.post("/inventory/request")
|
||||||
@authenticated
|
@authenticated
|
||||||
@@ -47,16 +46,12 @@ async def websocket_endpoint(websocket: WebSocket):
|
|||||||
await websocket.accept()
|
await websocket.accept()
|
||||||
user = websocket.user.user
|
user = websocket.user.user
|
||||||
|
|
||||||
queue = asyncio.Queue()
|
subscribe_player(user)
|
||||||
user_threads[user.uuid] = queue
|
|
||||||
user_world_requests[user.uuid] = set()
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
while True:
|
async for message in get_user_messages(user):
|
||||||
message = await queue.get()
|
|
||||||
await websocket.send_text(message)
|
await websocket.send_text(message)
|
||||||
except WebSocketDisconnect:
|
except WebSocketDisconnect:
|
||||||
pass
|
pass
|
||||||
finally:
|
finally:
|
||||||
user_threads.pop(user.uuid, None)
|
unsubscribe_player(user)
|
||||||
user_world_requests.pop(user.uuid, None)
|
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
from pydantic import BaseModel, ConfigDict
|
||||||
|
|
||||||
|
|
||||||
|
class MinecraftUserPublic(BaseModel):
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
uuid: str
|
||||||
|
username: str
|
||||||
|
|
||||||
|
|
||||||
|
class UserPublic(BaseModel):
|
||||||
|
model_config = ConfigDict(from_attributes=True)
|
||||||
|
|
||||||
|
internal_username: str
|
||||||
|
admin: bool
|
||||||
|
minecraft_user: MinecraftUserPublic
|
||||||
@@ -0,0 +1,44 @@
|
|||||||
|
import asyncio
|
||||||
|
|
||||||
|
from sqlalchemy import select
|
||||||
|
from sqlalchemy.orm import Session
|
||||||
|
|
||||||
|
from loon.web.db import engine
|
||||||
|
from loon.web.users.models import MinecraftUser
|
||||||
|
|
||||||
|
|
||||||
|
def _sync_minecraft_users(players: list[dict]) -> list[MinecraftUser]:
|
||||||
|
players_by_uuid = {player["uuid"]: player["username"] for player in players}
|
||||||
|
|
||||||
|
with Session(engine) as session:
|
||||||
|
existing = session.execute(
|
||||||
|
select(MinecraftUser).where(MinecraftUser.uuid.in_(players_by_uuid))
|
||||||
|
).scalars().all()
|
||||||
|
existing_by_uuid = {minecraft_user.uuid: minecraft_user for minecraft_user in existing}
|
||||||
|
|
||||||
|
new_users = []
|
||||||
|
for uuid, username in players_by_uuid.items():
|
||||||
|
minecraft_user = existing_by_uuid.get(uuid)
|
||||||
|
|
||||||
|
if minecraft_user is None:
|
||||||
|
minecraft_user = MinecraftUser(uuid=uuid, username=username)
|
||||||
|
new_users.append(minecraft_user)
|
||||||
|
session.add(minecraft_user)
|
||||||
|
elif minecraft_user.username != username:
|
||||||
|
minecraft_user.username = username
|
||||||
|
session.add(minecraft_user)
|
||||||
|
|
||||||
|
session.commit()
|
||||||
|
|
||||||
|
minecraft_users = [*existing, *new_users]
|
||||||
|
for minecraft_user in minecraft_users:
|
||||||
|
session.refresh(minecraft_user)
|
||||||
|
|
||||||
|
return minecraft_users
|
||||||
|
|
||||||
|
|
||||||
|
async def sync_minecraft_users(players: list[dict]) -> list[MinecraftUser]:
|
||||||
|
if not players:
|
||||||
|
return []
|
||||||
|
|
||||||
|
return await asyncio.to_thread(_sync_minecraft_users, players)
|
||||||
@@ -1,2 +1,38 @@
|
|||||||
|
import asyncio
|
||||||
|
|
||||||
|
from loon.web.users.models import User
|
||||||
|
|
||||||
user_threads = {}
|
user_threads = {}
|
||||||
user_world_requests = {}
|
user_world_requests = {}
|
||||||
|
|
||||||
|
|
||||||
|
async def send_to_player(user: User, msg):
|
||||||
|
queue = user_threads.get(user.uuid)
|
||||||
|
if queue is not None:
|
||||||
|
await queue.put(msg)
|
||||||
|
|
||||||
|
|
||||||
|
def get_player_thread(user: User):
|
||||||
|
return user_threads.get(user.uuid)
|
||||||
|
|
||||||
|
|
||||||
|
async def get_user_messages(user: User):
|
||||||
|
queue = user_threads.get(user.uuid)
|
||||||
|
if queue is None:
|
||||||
|
return
|
||||||
|
|
||||||
|
while True:
|
||||||
|
yield await queue.get()
|
||||||
|
|
||||||
|
|
||||||
|
def subscribe_player(user: User):
|
||||||
|
queue = asyncio.Queue()
|
||||||
|
user_threads[user.uuid] = queue
|
||||||
|
user_world_requests[user.uuid] = set()
|
||||||
|
|
||||||
|
return user_threads[user.uuid]
|
||||||
|
|
||||||
|
|
||||||
|
def unsubscribe_player(user: User):
|
||||||
|
user_threads.pop(user.uuid, None)
|
||||||
|
user_world_requests.pop(user.uuid, None)
|
||||||
+14
-3
@@ -1,4 +1,5 @@
|
|||||||
import time
|
import time
|
||||||
|
from typing import Literal
|
||||||
|
|
||||||
import jwt
|
import jwt
|
||||||
|
|
||||||
@@ -8,13 +9,23 @@ JWT_SECRET = settings.jwt.secret
|
|||||||
JWT_ALGORITHM = "HS256"
|
JWT_ALGORITHM = "HS256"
|
||||||
|
|
||||||
|
|
||||||
def generate_token(user_id: int) -> str:
|
def _encode_jwt(user_id: int, ttl: int, typ: Literal["ws", "web"]) -> str:
|
||||||
payload = {
|
payload = {
|
||||||
"user_id": user_id,
|
"user_id": user_id,
|
||||||
"exp": int(time.time()) + 60 * 60 * 24,
|
"exp": int(time.time()) + ttl,
|
||||||
|
"typ": typ,
|
||||||
}
|
}
|
||||||
return jwt.encode(payload, JWT_SECRET, algorithm=JWT_ALGORITHM)
|
return jwt.encode(payload, JWT_SECRET, algorithm=JWT_ALGORITHM)
|
||||||
|
|
||||||
|
|
||||||
|
def generate_token(user_id: int) -> str:
|
||||||
|
return _encode_jwt(user_id, settings.jwt.access_ttl, "web")
|
||||||
|
|
||||||
|
|
||||||
|
def generate_ws_token(user_id: int) -> str:
|
||||||
|
return _encode_jwt(user_id, settings.jwt.ws_ttl, "ws")
|
||||||
|
|
||||||
|
|
||||||
def decode_token(token: str) -> dict:
|
def decode_token(token: str) -> dict:
|
||||||
payload = jwt.decode(token, JWT_SECRET)
|
payload = jwt.decode(token, JWT_SECRET, algorithms=[JWT_ALGORITHM])
|
||||||
return payload
|
return payload
|
||||||
@@ -2,14 +2,6 @@ from argon2 import PasswordHasher
|
|||||||
from argon2.exceptions import InvalidHashError, VerifyMismatchError
|
from argon2.exceptions import InvalidHashError, VerifyMismatchError
|
||||||
|
|
||||||
|
|
||||||
def hash_password(password: str) -> str:
|
|
||||||
ph = PasswordHasher()
|
|
||||||
|
|
||||||
hashed = ph.hash(password)
|
|
||||||
|
|
||||||
return str(hashed)
|
|
||||||
|
|
||||||
|
|
||||||
def verify_password(password: str, hashed_password: str) -> bool:
|
def verify_password(password: str, hashed_password: str) -> bool:
|
||||||
ph = PasswordHasher()
|
ph = PasswordHasher()
|
||||||
|
|
||||||
|
|||||||
+24
-18
@@ -5,7 +5,7 @@ from fastapi import APIRouter, Request, HTTPException
|
|||||||
from starlette import status
|
from starlette import status
|
||||||
|
|
||||||
from config import settings
|
from config import settings
|
||||||
from loon.redis.chunk import get_chunk_cache, reset_chunk_cache
|
from loon.redis.chunk import get_chunks_cache, reset_chunk_cache
|
||||||
from loon.web import get_mqtt_manager
|
from loon.web import get_mqtt_manager
|
||||||
from loon.web.auth.middleware import authenticated
|
from loon.web.auth.middleware import authenticated
|
||||||
from loon.web.users.state import user_threads, user_world_requests
|
from loon.web.users.state import user_threads, user_world_requests
|
||||||
@@ -45,29 +45,35 @@ async def request_world(
|
|||||||
misses = []
|
misses = []
|
||||||
thread = user_threads.get(uuid)
|
thread = user_threads.get(uuid)
|
||||||
|
|
||||||
try:
|
all_coords = [
|
||||||
for x in range(x_start, x_end + 1):
|
(x, z)
|
||||||
for z in range(z_start, z_end + 1):
|
for x in range(x_start, x_end + 1)
|
||||||
cached_chunk = get_chunk_cache(x, z)
|
for z in range(z_start, z_end + 1)
|
||||||
|
]
|
||||||
|
|
||||||
if cached_chunk is not None:
|
try:
|
||||||
if thread:
|
hits = await get_chunks_cache(all_coords)
|
||||||
await thread.put(
|
except redis.exceptions.RedisError:
|
||||||
json.dumps({"topic": f"world/chunk/{x}/{z}", "payload": cached_chunk})
|
|
||||||
)
|
|
||||||
else:
|
|
||||||
if wanted is not None:
|
|
||||||
wanted.add((x, z))
|
|
||||||
misses.append((x, z))
|
|
||||||
except redis.RedisError:
|
|
||||||
if wanted is not None:
|
if wanted is not None:
|
||||||
for x in range(x_start, x_end + 1):
|
wanted.update(all_coords)
|
||||||
for z in range(z_start, z_end + 1):
|
|
||||||
wanted.add((x, z))
|
|
||||||
|
|
||||||
get_mqtt_manager().publish(f"loon/world/chunks/{x_start}:{x_end}/{z_start}:{z_end}/request")
|
get_mqtt_manager().publish(f"loon/world/chunks/{x_start}:{x_end}/{z_start}:{z_end}/request")
|
||||||
return 200
|
return 200
|
||||||
|
|
||||||
|
for coord in all_coords:
|
||||||
|
cached_chunk = hits.get(coord)
|
||||||
|
|
||||||
|
if cached_chunk is not None:
|
||||||
|
if thread:
|
||||||
|
x, z = coord
|
||||||
|
await thread.put(
|
||||||
|
json.dumps({"topic": f"world/chunk/{x}/{z}", "payload": cached_chunk})
|
||||||
|
)
|
||||||
|
else:
|
||||||
|
if wanted is not None:
|
||||||
|
wanted.add(coord)
|
||||||
|
misses.append(coord)
|
||||||
|
|
||||||
for xa, xb, za, zb in miss_row_rects(misses):
|
for xa, xb, za, zb in miss_row_rects(misses):
|
||||||
get_mqtt_manager().publish(f"loon/world/chunks/{xa}:{xb}/{za}:{zb}/request")
|
get_mqtt_manager().publish(f"loon/world/chunks/{xa}:{xb}/{za}:{zb}/request")
|
||||||
|
|
||||||
|
|||||||
@@ -55,7 +55,6 @@ dependencies = [
|
|||||||
"shellingham==1.5.4",
|
"shellingham==1.5.4",
|
||||||
"slowapi>=0.1.10",
|
"slowapi>=0.1.10",
|
||||||
"sqlalchemy==2.0.51",
|
"sqlalchemy==2.0.51",
|
||||||
"sqlmodel==0.0.39",
|
|
||||||
"starlette==1.3.1",
|
"starlette==1.3.1",
|
||||||
"typer==0.27.0",
|
"typer==0.27.0",
|
||||||
"typing-extensions==4.16.0",
|
"typing-extensions==4.16.0",
|
||||||
|
|||||||
@@ -24,3 +24,5 @@ log_data = false
|
|||||||
|
|
||||||
[jwt]
|
[jwt]
|
||||||
secret = 'secret'
|
secret = 'secret'
|
||||||
|
access_ttl = 86400 # 24h
|
||||||
|
ws_ttl = 45
|
||||||
@@ -516,7 +516,6 @@ dependencies = [
|
|||||||
{ name = "shellingham" },
|
{ name = "shellingham" },
|
||||||
{ name = "slowapi" },
|
{ name = "slowapi" },
|
||||||
{ name = "sqlalchemy" },
|
{ name = "sqlalchemy" },
|
||||||
{ name = "sqlmodel" },
|
|
||||||
{ name = "starlette" },
|
{ name = "starlette" },
|
||||||
{ name = "typer" },
|
{ name = "typer" },
|
||||||
{ name = "typing-extensions" },
|
{ name = "typing-extensions" },
|
||||||
@@ -580,7 +579,6 @@ requires-dist = [
|
|||||||
{ name = "shellingham", specifier = "==1.5.4" },
|
{ name = "shellingham", specifier = "==1.5.4" },
|
||||||
{ name = "slowapi", specifier = ">=0.1.10" },
|
{ name = "slowapi", specifier = ">=0.1.10" },
|
||||||
{ name = "sqlalchemy", specifier = "==2.0.51" },
|
{ name = "sqlalchemy", specifier = "==2.0.51" },
|
||||||
{ name = "sqlmodel", specifier = "==0.0.39" },
|
|
||||||
{ name = "starlette", specifier = "==1.3.1" },
|
{ name = "starlette", specifier = "==1.3.1" },
|
||||||
{ name = "typer", specifier = "==0.27.0" },
|
{ name = "typer", specifier = "==0.27.0" },
|
||||||
{ name = "typing-extensions", specifier = "==4.16.0" },
|
{ name = "typing-extensions", specifier = "==4.16.0" },
|
||||||
@@ -1022,20 +1020,6 @@ wheels = [
|
|||||||
{ url = "https://files.pythonhosted.org/packages/e2/22/dbf013a12ec759e54a34a119e9e217435b3f71b2dd5c61a7ade0a25dae87/sqlalchemy-2.0.51-py3-none-any.whl", hash = "sha256:bb024d8b621d0be75f4f44ecc7c950450026e76d66dc8f791bb5331d7fed59d5", size = 1944334, upload-time = "2026-06-15T16:09:22.418Z" },
|
{ url = "https://files.pythonhosted.org/packages/e2/22/dbf013a12ec759e54a34a119e9e217435b3f71b2dd5c61a7ade0a25dae87/sqlalchemy-2.0.51-py3-none-any.whl", hash = "sha256:bb024d8b621d0be75f4f44ecc7c950450026e76d66dc8f791bb5331d7fed59d5", size = 1944334, upload-time = "2026-06-15T16:09:22.418Z" },
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "sqlmodel"
|
|
||||||
version = "0.0.39"
|
|
||||||
source = { registry = "https://pypi.org/simple" }
|
|
||||||
dependencies = [
|
|
||||||
{ name = "pydantic" },
|
|
||||||
{ name = "sqlalchemy" },
|
|
||||||
{ name = "typing-extensions" },
|
|
||||||
]
|
|
||||||
sdist = { url = "https://files.pythonhosted.org/packages/68/ee/22a0559283c3cf6048678e787ed5d4959dcd00dedd8ba4567eeae684eeb1/sqlmodel-0.0.39.tar.gz", hash = "sha256:23d8e50a8d8ee936032ed79c55023a5d618dd6bc3c510bbf4909d1a7a605a570", size = 91057, upload-time = "2026-06-25T13:01:38.475Z" }
|
|
||||||
wheels = [
|
|
||||||
{ url = "https://files.pythonhosted.org/packages/cf/7d/b9813a582d4eb310be35e1fc7dfaae71207d7b62e9e53be314ebd251b53b/sqlmodel-0.0.39-py3-none-any.whl", hash = "sha256:90ebe92ce5cc11d7fff8dc7cb594790a102333c8fe7c14865254f6fc5c939795", size = 29680, upload-time = "2026-06-25T13:01:37.494Z" },
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "starlette"
|
name = "starlette"
|
||||||
version = "1.3.1"
|
version = "1.3.1"
|
||||||
|
|||||||
Reference in new issue
Block a user