Merge pull request 'docs: add file tree with explanations' (#16) from dev/dc09 into master

Reviewed-on: nm17/iotishnik-server#16
Reviewed-by: nm17 <nm17@riseup.net>

Cargo.toml

@@ -13,7 +13,7 @@ chrono = { version = "0.4.26", features = ["serde"] }
 clap = { version = "4.3.8", features = ["derive", "env"] }
 derive_more = "0.99.17"
 dotenvy = "0.15.7"
-fred = { version = "6.3.0", features = ["nom"] }
+fred = { version = "9.0.3", features = ["nom"] }
 heapless = { version = "0.7.16", features = ["ufmt-impl"] }
 hex = { version = "0.4.3", default-features = false, features = ["std", "alloc"] }
 hifitime = "3.8.2"
@@ -31,3 +31,4 @@ smallstr = { version = "0.3.0", features = ["std", "union"] }
 thiserror = "1.0.40"
 tokio = { version = "1.28.2", features = ["full"] }
 ufmt = { version = "0.2.0", features = ["std"] }
+futures-util = { version = "0.3.30", features = ["tokio-io"] }

LICENSE

@@ -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>.

docs/file_tree.md

@@ -0,0 +1,46 @@
+# nm17/iotishnik-server [Rust]
+Стандартная структура проекта на Rust с Cargo.
+Ниже описано содержимое `src/`.
+
+- `main.rs`: точка входа, запускает сервер
+  (см. [web_server](#web_server) и [ingest_socket_server](#ingest_socket_server))
+
+## ingest_protocol
+- `packet_types.rs`: структуры для хранения данных с датчиков,
+  вспомогательные функции интеграции с serde и записи в БД.
+- `parser.rs`: парсер пакетов в формате старого TCP/UDP API с #решётками#,
+  парсер MAC-ов.
+- `error.rs`: enum для ошибок в этом модуле.
+- `tests/`: тесты.
+
+## ingest_socket_server
+Сервер TCP/UDP API (work in progress).
+
+## web_server
+Сервер HTTP API на библиотеке Ntex.
+
+- `mod.rs`: предоставляет функцию запуска веб-сервера.
+- `app_error.rs`: enum для ошибок в этом модуле.
+
+### web_server/old_app_api
+HTTP API "Народного мониторинга" для приложений.
+
+- `handlers/`: обработчики запросов.
+- `types/`: структуры JSON-а запросов и ответов.
+
+### web_server/old_device_sensor_api
+HTTP API "Народного мониторинга" для загрузки данных с датчиков на сервер.
+
+- `mod.rs`: основной обработчик запросов.
+- `qs_parser.rs`: парсер аргументов GET-запроса /
+   тела POST-запроса в формате x-www-form-urlencoded.
+
+### web_server/utils
+- `mod.rs`: вспомогательные функции и макросы к веб-серверу.
+- `redis.rs`: утилиты для работы с Redis-совместимой БД.
+
+## utils
+Вспомогательные структуры данных и функции.
+
+- `mod.rs`: пока что только enum поддерживаемых единиц измерения, конвертация типов.
+- `hifitime_serde.rs`: интеграция hifitime::Epoch с serde для (де)сериализации.

docs/kv_db_arch.md

@@ -13,3 +13,5 @@
     - Поля
       - `exists`: bool
       - `unit`: str
+
+!!!! Убедитесь что в переменных ключей нет `_` !!!! 

src/ingest_protocol/error.rs

@@ -1,20 +1,19 @@
-
 use nom::error::VerboseError;
-use std::fmt::{Debug};
+use std::fmt::Debug;
 use std::num::ParseFloatError;
 use thiserror::Error as ThisError;
 
+#[allow(dead_code)]
 #[derive(Debug, ThisError)]
 pub enum Error<I: Debug> {
     #[error("Nom error: {0}")]
-    NomError(#[from] nom::Err<VerboseError<I>>),
+    Nom(#[from] nom::Err<VerboseError<I>>),
 
     #[error("Failed to parse a timestamp")]
     TimestampParseError(ParseFloatError),
 
     #[error("Unknown unit")]
     UnknownUnit(I),
-
     #[error("Failed to parse a number")]
-    DecimalParseError(#[from] rust_decimal::Error),
+    DecimalParsing(#[from] rust_decimal::Error),
 }

src/ingest_protocol/packet_types.rs

@@ -6,16 +6,20 @@
 // #[serde(rename = "...")]
 // #[serde(alias = "...")]
 
-use crate::utils::SupportedUnit;
 use crate::ingest_protocol::error::Error;
 use crate::ingest_protocol::parser::parse_mac_address;
+use crate::utils::{EpochUTC, SupportedUnit};
+use crate::web_server::app_error::AppError;
 
+use fred::clients::RedisClient;
+use fred::interfaces::{HashesInterface, KeysInterface};
 use hifitime::Epoch;
 use rust_decimal::Decimal;
 use serde::{Deserialize, Serialize};
 use serde_with::serde_as;
+use ufmt::uwrite;
 
-use std::collections::HashSet;
+use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
 
 /// Данные с одного датчика.
@@ -33,7 +37,7 @@ use std::hash::{Hash, Hasher};
 pub struct SensorValue {
     pub mac: String,
     pub value: Decimal,
-    pub time: Option<Epoch>,
+    pub time: Option<EpochUTC>,
     pub unit: Option<SupportedUnit>,
     pub name: Option<String>,
 }
@@ -59,7 +63,7 @@ serde_with::serde_conv!(
 );
 
 #[serde_as]
-#[derive(Debug, Clone, Default, PartialEq, Eq, Deserialize)]
+#[derive(Debug, Clone, Default, PartialEq, Eq, Serialize, Deserialize)]
 pub struct NMDeviceDataPacket {
     #[serde(alias = "ID")]
     #[serde_as(as = "MacAsArray")]
@@ -75,15 +79,92 @@ pub struct NMDeviceDataPacket {
     pub lon: Option<Decimal>,
     pub alt: Option<Decimal>,
 
+    /// Команды для управления устройством.
+    ///
+    /// Текст после декодировки.
+    ///
+    /// ## Отчёт совместимости
+    /// Функционал изначально narodmon-овский.
+    /// Про то, как кодировать при наличии символов `#;=` или поддержку UTF-8 не сказано.
+    /// Рассчитываю на то, что все значения нужно URL кодировать.
+    pub commands: Option<HashMap<String, String>>,
+
     // HTTP GET/POST url-encode specific parameters
     /// TODO: Желательное поведение в будущем:
     ///   - Если в values есть хотябы один times и этот time не None => Игнорируем этот time
     ///   - Если time нет у values => используем этот time (если он None, то соотв. считаем что информации о времени нет)
     /// TODO: В базе всё должно храниться как секунды по TAI спустя J1900 для возможности сортировки по времени позже.
-    pub time: Option<Epoch>,
+    pub time: Option<EpochUTC>,
+}
+
+impl NMDeviceDataPacket {
+    pub async fn save_to_db(&self, redis: &RedisClient) -> Result<(), AppError> {
+        let device_mac_enc = hex::encode(self.mac);
+
+        let mut key = String::new();
+
+        let now = Epoch::now().unwrap().into();
+        let mut device_time = self.time.unwrap_or(now);
+
+        // TODO: Добавить гистерезис
+        // Отчёт совместимости: отсутствует
+        if device_time > now {
+            device_time = now;
+        }
+
+        let device_tai_timestamp = device_time.0.to_duration_since_j1900().to_seconds();
+
+        uwrite!(&mut key, "devices_{}", device_mac_enc).unwrap();
+
+        let device_exists: Option<bool> = redis.hget(key.as_str(), "exists").await?;
+
+        if !device_exists.is_some_and(|v| v) {
+            return Err(AppError::DeviceNotFound(hex::encode(self.mac)));
+        }
+
+        // devices_{device_id}_{tai_timestamp}_{sensor_id}
+        for sensor in &self.values {
+            let mut key = String::new();
+            uwrite!(
+                &mut key,
+                "devices_{}_{}_{}",
+                device_mac_enc,
+                device_tai_timestamp.to_string(),
+                sensor.mac
+            )
+            .unwrap();
+
+            redis
+                .set(key.as_str(), sensor.value.to_string(), None, None, false)
+                .await?;
+        }
+
+        if let Some(commands) = &self.commands {
+            for (cmd_key, cmd_value) in commands {
+                let mut key = String::new();
+                uwrite!(&mut key, "devices_{}_cmds_{}", device_mac_enc, cmd_key).unwrap();
+
+                redis
+                    .set(key.as_str(), cmd_value, None, None, false)
+                    .await?;
+            }
+        }
+
+        Ok(())
+    }
 }
 
 #[derive(Debug, Clone, Default, PartialEq, Deserialize)]
 pub struct NMJsonPacket {
     pub devices: Vec<NMDeviceDataPacket>,
 }
+
+impl NMJsonPacket {
+    pub async fn save_to_db(&self, redis: &RedisClient) -> Result<(), AppError> {
+        for device in &self.devices {
+            device.save_to_db(redis).await?;
+        }
+
+        Ok(())
+    }
+}

src/ingest_protocol/parser.rs

@@ -6,7 +6,6 @@ use nom::character::complete::hex_digit1;
 use std::str::FromStr;
 
 use crate::ingest_protocol::error::Error;
-use crate::ingest_protocol::error::Error::TimestampParseError;
 use crate::ingest_protocol::{NMDeviceDataPacket, SensorValue};
 use nom::combinator::{map_parser, opt};
 use nom::error::context;
@@ -85,7 +84,7 @@ pub fn parse_packet_body<'a>(
 
             let sensor_time = match sensor_time {
                 Some(v) => Some(Epoch::from_unix_seconds(
-                    v.parse().map_err(TimestampParseError)?,
+                    v.parse().map_err(Error::TimestampParseError)?,
                 )),
                 None => None,
             };
@@ -94,7 +93,7 @@ pub fn parse_packet_body<'a>(
                 packet.values.insert(SensorValue {
                     mac: sensor_mac.into(),
                     value: Decimal::from_str(sensor_value)?,
-                    time: sensor_time, // TODO
+                    time: sensor_time.map(|v| v.into()), // TODO
                     unit: None,
                     name: sensor_name.map(|v| v.to_string()),
                 });

src/ingest_protocol/tests/mod.rs

@@ -1,11 +1,15 @@
-use crate::ingest_protocol::parser::{parse_mac_address, parse_packet};
+use crate::ingest_protocol::{
+    parser::{parse_mac_address, parse_packet},
+    SensorValue,
+};
+use hifitime::Epoch;
 
 #[test]
 fn test_asd() {
     let asd = r#"
 #A2-C6-47-01-DF-E1#Метео
 #OWNER#unknown
-#T1#13.44#Outdoor
+#T1#13.44#1000000#Outdoor
 #T2#27.74#Indoor
 #P1#691.02#Barometer
 #LAT#55.738178
@@ -14,14 +18,22 @@ fn test_asd() {
 ##
 "#
     .trim();
-    dbg!(parse_packet(asd));
+    let packet = parse_packet(asd).unwrap().1;
+    assert!(serde_json::to_string_pretty(&packet)
+        .unwrap()
+        .contains(r#""time": 1000000.0"#));
 }
 
 #[test]
 fn test_mac() {
-    //assert_eq!(parse_mac_address("12-34-AA-12-55-AA"), Ok(("", [18, 52, 170, 18, 85, 170])) );
+    assert_eq!(
+        parse_mac_address("12-34-AA-12-55-AA").unwrap(),
+        ("", [18, 52, 170, 18, 85, 170])
+    );
 
-    println!("{:?}", parse_mac_address("12-34-AA-12-55-AA"));
+    dbg!(Epoch::now().unwrap().to_unix_seconds());
+
+    //println!("{:?}", parse_mac_address("12-34-AA-12-55-AA"));
 }
 
 #[test]
@@ -35,3 +47,42 @@ fn test_packet() {
 
     println!("{:#?}", parse_packet(inp));
 }
+
+#[test]
+fn test_hex_parsing() {
+    let inp = r#"
+        {"mac": "T1", "value": "123", "time": "665B514B"}
+    "#
+    .trim();
+
+    let sensor_value: SensorValue = serde_json::from_str(inp).unwrap();
+    assert_eq!(
+        sensor_value.time.unwrap().0.to_unix_seconds(),
+        1717260619.0,
+        "hex text"
+    );
+
+    let inp = r#"
+        {"mac": "T1", "value": "123", "time": 1717260619}
+    "#
+    .trim();
+
+    let sensor_value: SensorValue = serde_json::from_str(inp).unwrap();
+    assert_eq!(
+        sensor_value.time.unwrap().0.to_unix_seconds(),
+        1717260619.0,
+        "integer test"
+    );
+
+    let inp = r#"
+        {"mac": "T1", "value": "123", "time": 1717260619.0}
+    "#
+    .trim();
+
+    let sensor_value: SensorValue = serde_json::from_str(inp).unwrap();
+    assert_eq!(
+        sensor_value.time.unwrap().0.to_unix_seconds(),
+        1717260619.0,
+        "float test"
+    );
+}

src/ingest_socket_server/mod.rs

@@ -0,0 +1,12 @@
+// let body = "OK";
+//
+// let mut stream = app_state.redis_client.scan("devices_{}", None, None);
+//
+// while let Some(cmd) = stream.next().await {
+//     let mut cmd = cmd?;
+//     let redis_cmd_keys = cmd.take_results().unwrap();
+//
+//     for redis_cmd_key in redis_cmd_keys {
+//         redis_cmd_key.as_str().unwrap().split("_"); // Продолжи
+//     }
+// }

src/main.rs

@@ -1,10 +1,10 @@
 #![doc = include_str!("../README.md")]
-
 #![feature(try_blocks)]
 extern crate core;
 
-mod utils;
 mod ingest_protocol;
+mod ingest_socket_server;
+mod utils;
 mod web_server;
 use crate::web_server::server_main;
 

src/utils/hifitime_serde.rs

@@ -0,0 +1,76 @@
+use hifitime::Epoch;
+use serde::{de, Deserialize, Deserializer, Serialize, Serializer};
+use std::fmt;
+use std::fmt::{Formatter, Write};
+
+#[derive(PartialOrd, PartialEq, Ord, Eq, Clone, Copy, Debug, Default)]
+#[repr(transparent)]
+pub struct EpochUTC(pub Epoch);
+
+impl From<Epoch> for EpochUTC {
+    #[inline]
+    fn from(value: Epoch) -> Self {
+        EpochUTC(value)
+    }
+}
+
+impl Serialize for EpochUTC {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: Serializer,
+    {
+        serializer.serialize_f64(self.0.to_unix_seconds())
+    }
+}
+
+impl<'de> Deserialize<'de> for EpochUTC {
+    fn deserialize<D>(deserializer: D) -> Result<EpochUTC, D::Error>
+    where
+        D: Deserializer<'de>,
+    {
+        struct EpochVisitor;
+
+        impl<'de> de::Visitor<'de> for EpochVisitor {
+            type Value = EpochUTC;
+
+            fn expecting(&self, formatter: &mut Formatter) -> fmt::Result {
+                formatter.write_str(
+                    "a (string, representing a timestamp in decimal or hexadecimal form) or a decimal",
+                )
+            }
+
+            fn visit_u64<E>(self, v: u64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Epoch::from_unix_seconds(v as f64).into())
+            }
+
+            fn visit_f64<E>(self, v: f64) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                Ok(Epoch::from_unix_seconds(v).into())
+            }
+
+            fn visit_str<E>(self, value: &str) -> Result<Self::Value, E>
+            where
+                E: de::Error,
+            {
+                if value.len() == 8 {
+                    let bytes = hex::decode(value).map_err(de::Error::custom)?;
+
+                    return Ok(Epoch::from_unix_seconds(u32::from_be_bytes(
+                        bytes.as_slice().try_into().unwrap(),
+                    ) as f64)
+                    .into());
+                }
+                Ok(
+                    Epoch::from_unix_seconds(value.parse().map_err(de::Error::custom)?).into(),
+                )
+            }
+        }
+
+        deserializer.deserialize_any(EpochVisitor)
+    }
+}

src/utils/mod.rs

@@ -1,16 +1,19 @@
 //! Глобальный модуль для вспомогательных типов и утилит.
 //!
 
+mod hifitime_serde;
 
 use phf::phf_map;
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
 use std::borrow::Cow;
 
+pub use hifitime_serde::EpochUTC;
 
 /// Поддерживаемые типы.
 ///
 /// TODO: Решить необходимо ли к данным прикреплять единицы измерения.
 /// TODO: Сейчас вообще сомнительно оставлять ли это или нет.
+#[allow(dead_code)]
 #[derive(Debug, Clone, Hash, PartialEq, Eq)]
 #[repr(u64)]
 pub enum SupportedUnit {
@@ -78,5 +81,5 @@ static STR_TO_UNITS: phf::Map<&'static str, SupportedUnit> = phf_map! {
     "V" => SupportedUnit::Volts,
     "W" => SupportedUnit::Watts,
     "s" => SupportedUnit::Seconds,
-    "KWh" => SupportedUnit::Seconds,
+    "KWh" => SupportedUnit::KWh,
 };

src/web_server/app_error.rs

@@ -13,6 +13,7 @@ use crate::web_server::old_device_sensor_api::qs_parser::QSParserError;
 use rust_decimal::Decimal;
 use serde_json::json;
 
+use super::old_device_sensor_api::qs_parser;
 
 /// Главный объект ошибки [std::error::Error] для всего Web API.
 ///
@@ -43,14 +44,17 @@ pub enum AppError {
         min: Option<Decimal>,
     },
 
+    #[display(fmt = "UTF8")]
+    Utf8Error(#[from] std::str::Utf8Error),
+
     #[display(fmt = "IDK")]
     UnknownBody {
         json_err: Option<serde_json::Error>,
-        query_error: Option<serde_qs::Error>,
+        query_error: Option<qs_parser::QSParserError>,
     },
 
     #[display(fmt = "IDK")]
-    DeviceNotFound(String)
+    DeviceNotFound(String),
 }
 
 impl web::error::WebResponseError for AppError {
@@ -62,9 +66,10 @@ impl web::error::WebResponseError for AppError {
             AppError::RequestTooLarge => StatusCode::PAYLOAD_TOO_LARGE,
             AppError::ServerRedisError(_) => StatusCode::INTERNAL_SERVER_ERROR,
             AppError::ApiKeyInvalid { .. } => StatusCode::BAD_REQUEST,
+            AppError::Utf8Error(_) => StatusCode::BAD_REQUEST,
             AppError::UnknownBody { .. } => StatusCode::BAD_REQUEST,
             AppError::QSError(..) => StatusCode::BAD_REQUEST,
-            AppError::DeviceNotFound(..) => StatusCode::BAD_REQUEST
+            AppError::DeviceNotFound(..) => StatusCode::BAD_REQUEST,
         }
     }
 
@@ -76,6 +81,7 @@ impl web::error::WebResponseError for AppError {
             AppError::RequestTooLarge => "Request is too large",
             AppError::ServerRedisError(_) => "Internal server error",
             AppError::ApiKeyInvalid { .. } => "API Key invalid",
+            AppError::Utf8Error(_) => "Invalid UTF8 sequence",
             AppError::UnknownBody { .. } => {
                 "Can't figure out where and in what encoding the main data is"
             }
@@ -118,16 +124,15 @@ impl web::error::WebResponseError for AppError {
             AppError::ApiKeyInvalid { reason } => {
                 insert_header!(headers, "X-Error-Description", *reason);
             }
-            AppError::QSError(err) => match err {
-                QSParserError::ParsingError(desc) => {
+            AppError::QSError(err) => {
+                if let QSParserError::Parsing(desc) = err {
                     insert_header!(
                         headers,
                         "X-Error-Description",
                         desc.escape_default().to_string()
                     );
                 }
-                _ => {}
-            },
+            }
             _ => {}
         };
 

src/web_server/mod.rs

@@ -5,11 +5,9 @@
 //!
 //! TODO: Начать работу над TCP/UDP и MQTT сервером
 
-use old_app_api::old_api_handler;
 use fred::bytes_utils::Str;
 use fred::prelude::*;
-
-
+use old_app_api::old_api_handler;
 
 pub mod app_error;
 pub mod old_app_api;
@@ -26,14 +24,8 @@ use crate::web_server::old_device_sensor_api::device_handler;
 use ntex::web;
 
 pub async fn server_main() {
-    let config = RedisConfig::default();
-    let perf = PerformanceConfig::default();
-    let policy = ReconnectPolicy::default();
-    let client = RedisClient::new(config, Some(perf), Some(policy));
-
-    // connect to the server, returning a handle to the task that drives the connection
-    let _ = client.connect();
-    client.wait_for_connect().await.unwrap();
+    let client = RedisClient::default();
+    client.init().await.unwrap();
 
     let asd: Str = client.ping().await.unwrap();
 

src/web_server/old_app_api/mod.rs

@@ -33,10 +33,7 @@ pub async fn old_api_handler(
     let mandatory_params: MandatoryParams<'_> = serde_json::from_slice(body_bytes)?; // TODO: Simd-JSON
 
     // Ignore clippy singlematch
-    match mandatory_params.cmd.as_ref() {
-        "version" => return version((), &app_state).await,
-        _ => {}
-    }
+    if mandatory_params.cmd.as_ref() == "version" { return version((), &app_state).await }
 
     is_api_key_valid(&app_state.redis_client, mandatory_params.api_key.as_ref()).await?;
 

src/web_server/old_device_sensor_api/mod.rs

@@ -2,21 +2,17 @@
 
 pub mod qs_parser;
 
-use crate::ingest_protocol::{NMDeviceDataPacket, NMJsonPacket};
+use crate::ingest_protocol::NMJsonPacket;
 use crate::web_server::app_error::AppError;
 
-
-use fred::types::RedisMap;
 use ntex::http::{HttpMessage, StatusCode};
-use ntex::util::{Bytes, HashMap};
-use ntex::{http, web};
-use fred::prelude::*;
-use hifitime::Epoch;
+use ntex::util::Bytes;
 use ntex::web::types::State;
+use ntex::{http, web};
+use qs_parser::QSParserError;
 use thiserror::Error;
-use ufmt::uwrite;
-use crate::web_server::NMAppState;
-use crate::web_server::old_device_sensor_api::qs_parser::QSParserError;
+
+use super::NMAppState;
 
 #[derive(Error, Debug)]
 pub enum Error {
@@ -28,7 +24,6 @@ pub enum Error {
     QSParserError(#[from] QSParserError),
 }
 
-
 /// Обработчик данных датчиков с устройств.
 ///
 /// Слушает /post и /get.
@@ -54,7 +49,8 @@ pub async fn device_handler<'a>(
                 Err(error) => json_error = Some(error),
             },
             "application/x-www-form-urlencoded" => {
-                match serde_qs::from_bytes::<NMDeviceDataPacket>(body.as_ref()) {
+                let body = std::str::from_utf8(body.as_ref())?;
+                match qs_parser::parse_nm_qs_format(body).await {
                     Ok(qs_body) => {
                         real_body = Some(NMJsonPacket {
                             devices: Vec::from([qs_body]),
@@ -66,7 +62,7 @@ pub async fn device_handler<'a>(
             _ => {}
         }
     } else if request.method() == http::Method::GET {
-        match serde_qs::from_str::<NMDeviceDataPacket>(request.query_string()) {
+        match qs_parser::parse_nm_qs_format(request.query_string()).await {
             Ok(qs_body) => {
                 real_body = Some(NMJsonPacket {
                     devices: Vec::from([qs_body]),
@@ -77,41 +73,7 @@ pub async fn device_handler<'a>(
     }
 
     if let Some(real_body) = real_body {
-        for device in real_body.devices {
-            let mut device_key_str = String::new();
-
-            let now = Epoch::now().unwrap();
-            let mut device_time = device.time
-                .unwrap_or(now);
-
-            // TODO: Добавить гистерезис
-            // Отчёт совместимости: отсутствует
-            if device_time > now {
-                device_time = now;
-            }
-
-            let device_tai_timestamp = device_time
-                .to_duration_since_j1900()
-                .to_seconds();
-
-            uwrite!(device_key_str, "devices_{}", hex::encode(device.mac));
-
-            let device_exists: bool = app_state.redis_client.hget(device_key_str.as_str(), "exists").await?;
-
-            if !device_exists {
-                return Err(AppError::DeviceNotFound(hex::encode(&device.mac)));
-            }
-
-            // devices_{device_id}_{tai_timestamp}_{sensor_id}
-            for sensor in device.values {
-                let mut device_report_key_str = String::new();
-                uwrite!(&mut device_report_key_str, "devices_{}_{}_{}", hex::encode(device.mac), device_tai_timestamp.to_string(), sensor.mac);
-
-                app_state.redis_client.set(
-                    device_key_str.as_str(), sensor.value.to_string(), None, None, false,
-                ).await?;
-            }
-        }
+        real_body.save_to_db(&app_state.redis_client).await?;
     } else {
         return Err(AppError::UnknownBody {
             json_err: json_error,
@@ -119,6 +81,5 @@ pub async fn device_handler<'a>(
         });
     }
 
-    Ok(web::HttpResponseBuilder::new(StatusCode::OK)
-        .finish())
+    Ok(web::HttpResponseBuilder::new(StatusCode::OK).finish())
 }

src/web_server/old_device_sensor_api/qs_parser.rs

@@ -1,28 +1,29 @@
+use crate::ingest_protocol::error::Error;
+use crate::ingest_protocol::parser::parse_mac_address;
+use crate::ingest_protocol::{NMDeviceDataPacket, SensorValue};
+use hifitime::Epoch;
+use ntex::util::HashMap;
+use rust_decimal::Decimal;
 use std::collections::HashSet;
 use std::num::ParseFloatError;
 use std::str::FromStr;
 use std::sync::Arc;
-use hifitime::Epoch;
-use ntex::util::HashMap;
-use rust_decimal::Decimal;
 use thiserror::Error;
-use crate::ingest_protocol::error::Error;
-use crate::ingest_protocol::{NMDeviceDataPacket, SensorValue};
-use crate::ingest_protocol::parser::parse_mac_address;
 
 /// В иделае было бы хорошо сделать всё как у [serde_json::Error], но это слишком большая морока
+#[allow(dead_code)]
 #[derive(Error, Clone, Debug)]
 pub enum QSParserError {
     #[error("asd")]
-    SerdeQSError(#[from] Arc<serde_qs::Error>),
+    SerdeQS(#[from] Arc<serde_qs::Error>),
     #[error("asd")]
-    ParsingError(String),
+    Parsing(String),
 
     #[error("asd")]
-    FloatParseError(#[from] ParseFloatError),
+    FloatParse(#[from] ParseFloatError),
 
     #[error("failed to parse into decimal")]
-    DecimalParseError(#[from] rust_decimal::Error),
+    DecimalParse(#[from] rust_decimal::Error),
 
     #[error("asd")]
     NoMAC,
@@ -30,13 +31,13 @@ pub enum QSParserError {
 
 impl From<Error<&str>> for QSParserError {
     fn from(value: Error<&str>) -> Self {
-        QSParserError::ParsingError(format!("{:?}", value))
+        QSParserError::Parsing(format!("{:?}", value))
     }
 }
 
 impl From<serde_qs::Error> for QSParserError {
     fn from(value: serde_qs::Error) -> Self {
-        QSParserError::SerdeQSError(Arc::new(value))
+        QSParserError::SerdeQS(Arc::new(value))
     }
 }
 
@@ -44,8 +45,10 @@ impl From<serde_qs::Error> for QSParserError {
 /// [SensorValue].
 ///
 /// Формат: `<SENSOR_MAC>=<SENSOR_VALUE>`.
-/// Других данных на подобии названия и времени нет.
-pub fn qs_rest_to_values(parsed: HashMap<String, String>) -> Result<HashSet<SensorValue>, QSParserError> {
+/// Других данных наподобие названия и времени нет.
+pub fn qs_rest_to_values(
+    parsed: HashMap<String, String>,
+) -> Result<HashSet<SensorValue>, QSParserError> {
     let mut hashset = HashSet::new();
 
     for (key, value) in parsed {
@@ -62,21 +65,23 @@ pub fn qs_rest_to_values(parsed: HashMap<String, String>) -> Result<HashSet<Sens
     Ok(hashset)
 }
 
-pub fn parse_decimal_if_exists(parsed: &mut HashMap<String, String>, key: &str) -> Result<Option<Decimal>, QSParserError> {
-    return if let Some(unwrapped_value) = parsed.remove(key) {
-        Ok(Some(
-            Decimal::from_str(unwrapped_value.as_str())?
-        ))
+pub fn parse_decimal_if_exists(
+    parsed: &mut HashMap<String, String>,
+    key: &str,
+) -> Result<Option<Decimal>, QSParserError> {
+    if let Some(unwrapped_value) = parsed.remove(key) {
+        Ok(Some(Decimal::from_str(unwrapped_value.as_str())?))
     } else {
         Ok(None)
     }
 }
 
-pub fn parse_epoch_if_exists(parsed: &mut HashMap<String, String>, key: &str) -> Result<Option<Epoch>, QSParserError> {
-    return if let Some(unwrapped_value) = parsed.remove(key) {
-        Ok(Some(
-            Epoch::from_unix_seconds(unwrapped_value.parse()?)
-        ))
+pub fn parse_epoch_if_exists(
+    parsed: &mut HashMap<String, String>,
+    key: &str,
+) -> Result<Option<Epoch>, QSParserError> {
+    if let Some(unwrapped_value) = parsed.remove(key) {
+        Ok(Some(Epoch::from_unix_seconds(unwrapped_value.parse()?)))
     } else {
         Ok(None)
     }
@@ -85,32 +90,25 @@ pub fn parse_epoch_if_exists(parsed: &mut HashMap<String, String>, key: &str) ->
 pub async fn parse_nm_qs_format(input: &str) -> Result<NMDeviceDataPacket, QSParserError> {
     let mut parsed: HashMap<String, String> = serde_qs::from_str(input)?;
 
-    let (_, _device_mac) = if let Some(id) = parsed.get("ID") {
+    let (_, device_mac) = if let Some(id) = parsed.get("ID") {
         parse_mac_address(id)?
     } else {
         return Err(QSParserError::NoMAC);
     };
 
-    for keys in parsed.keys() {
-        if keys.starts_with("") {
-
-        }
-    }
-
-    let lat = if let Some(lat) = parsed.remove("lat") {
-        Some(Decimal::from_str(lat.as_str())?)
-    } else {
-        None
-    };
+    parsed.remove("ID");
 
     let device_data = NMDeviceDataPacket {
-        mac: _device_mac,
+        mac: device_mac,
         name: parsed.remove("name").map(|v| v.to_owned()),
         owner: parsed.remove("owner").map(|v| v.to_owned()),
         lat: parse_decimal_if_exists(&mut parsed, "lat")?,
         lon: parse_decimal_if_exists(&mut parsed, "lon")?,
         alt: parse_decimal_if_exists(&mut parsed, "alt")?,
-        time: parse_epoch_if_exists(&mut parsed, "time")?,
+        time: parse_epoch_if_exists(&mut parsed, "time")?.map(|v| v.into()),
+        // TODO: Выяснить можно ли передавать команды по QS и можно ли их отличить от
+        //       маков и значений сенсоров.
+        commands: None,
 
         values: qs_rest_to_values(parsed)?,
     };

src/web_server/utils/redis.rs

@@ -5,6 +5,7 @@ use fred::prelude::*;
 use heapless::String as HeaplessString;
 use lazy_static::lazy_static;
 use regex::Regex;
+use serde::{Deserialize, Serialize};
 use ufmt::uwrite;
 
 lazy_static! {
@@ -13,6 +14,7 @@ lazy_static! {
 }
 
 /// Описание полей в KV DB у `apikey_{}`.
+#[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct ApiKeyDescription {
     /// ID владельца API ключа.
     apikey_owner: i64,