replace console.log with winston logger

Fix cronjob syntax for data regeneration

.dockerignore

@@ -1,2 +1,2 @@
 .git
-node_modules
+**/node_modules

.drone.yml

@@ -3,12 +3,12 @@ type: docker
 name: build dev
 
 steps:
-  - name: build and push image
+  - name: build for staging
     image: plugins/docker
     settings:
       dockerfile: Dockerfile
-      registry: git.fsisp.de
+      registry: hub.fsisp.de
-      repo: git.fsisp.de/fionn/iassure-wx
+      repo: hub.fsisp.de/library/iassure-wx
       username:
         from_secret: reg_username
       password:
@@ -16,32 +16,27 @@ steps:
       tags:
         - dev
         - '${DRONE_COMMIT:0:8}'
-
+    when:
-trigger:
       branch:
         - dev
         - develop
+      event:
+        - push
 
----
+  - name: build for production
-kind: pipeline
-type: docker
-name: build master
-
-steps:
-  - name: build and push image
     image: plugins/docker
     settings:
       dockerfile: Dockerfile
-      registry: git.fsisp.de
+      registry: hub.fsisp.de
-      repo: git.fsisp.de/fionn/iassure-wx
+      repo: hub.fsisp.de/library/iassure-wx
       username:
         from_secret: reg_username
       password:
         from_secret: reg_password
       tags:
         - latest
+        - '${DRONE_TAG}'
         - '${DRONE_COMMIT:0:8}'
-
+    when:
-trigger:
+      event:
-  branch:
+        - tag
-    - main

.vscode/settings.json

@@ -1,6 +1,7 @@
 {
   "eslint.workingDirectories": [
     "backend",
-    "frontend"
+    "frontend",
+    "shared"
   ]
 }

Dockerfile

@@ -5,48 +5,45 @@ FROM node:16-alpine as base
 
 WORKDIR /opt
 
-COPY . .
+ENV NODE_ENV production
 
-WORKDIR /opt/backend
+RUN apk update && \
+    apk upgrade && \
+    npm i npm@latest -g && \
+    chown node:node -R /opt
     
-ARG NODE_ENV=production
+    # && \
-ENV NODE_ENV ${NODE_ENV}
+    # apk add --no-cache bash && \
+    # apk add --no-cache git && \
 
-RUN npm i npm@latest -g
+COPY --chown=node:node package*.json ./
 
-RUN chown node:node -R /opt
 USER node
 
 # ################################################################
-# ###                     development image                    ###
+# ###                        build image                       ###
-# ################################################################
-FROM base as development
-
-RUN npm install --quiet --unsafe-perm --no-progress --no-audit --include=dev
-
-CMD npm run dev
-
-# ################################################################
-# ###                    backend build image                   ###
 # ################################################################
 
-FROM base as backendbuild
+FROM base as build
 
-RUN npm install --quiet --unsafe-perm --no-progress --no-audit --include=dev
+ENV NODE_ENV development
 
-RUN npx tsc -p ./tsconfig.json
+COPY --chown=node:node . .
+
+RUN npm install && npm cache clean --force
+ENV PATH /opt/node_modules/.bin:$PATH
+
+RUN tsc -p ./tsconfig.node.json && \
+    resolve-tspaths --out "dist" && \
+    npm run spa-build
 
 # ################################################################
-# ###                   frontend build image                   ###
+# ###                      modules image                       ###
 # ################################################################
 
-FROM base as frontendbuild
+FROM base as modules
 
-WORKDIR /opt/frontend
+RUN npm install && npm cache clean --force
-
-RUN npm install --quiet --unsafe-perm --no-progress --no-audit --include=dev
-
-RUN npm run build
 
 # ################################################################
 # ###                     production image                     ###
@@ -54,9 +51,9 @@ RUN npm run build
 
 FROM base as production
 
-COPY --from=backendbuild --chown=node:node /opt/backend/dist/ /opt/backend/dist/
+COPY --from=build --chown=node:node /opt/dist ./dist
-COPY --from=frontendbuild --chown=node:node /opt/frontend/dist/ /opt/frontend/dist/
+COPY --from=modules --chown=node:node /opt/node_modules ./node_modules
 
-RUN npm install --quiet --unsafe-perm --no-progress --no-audit --omit=dev
+COPY --chown=node:node ./wx-config.* ./
 
-CMD node --es-module-specifier-resolution=node dist/app.js
+CMD node dist/backend/app.js

LICENSE

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

README.md

@@ -6,7 +6,7 @@ This service is designed to gather weather data to be used by [IASsure](https://
 
 ## Installation/Deployment
 
-IASsure-WX can be installed using docker. The image is available at `git.fsisp.de/fionn/iassure`.
+IASsure-WX can be installed using docker. The image is available at `hub.fsisp.de/library/iassure-wx`.
 
 Tags:
   - `latest` - The newest recommended build, built from `main`
@@ -16,3 +16,19 @@ Tags:
 ## Configuration
 
 IASsure-WX can be configured using the `wx-config.json`-file. For now it contains test data but will include production data for at least the Langen FIR. It necessary, another file can be mounted on top of it (`/opt/wx-config.json`). You may also choose to make the necessary changes to the file in this repository. The file is documented in the schema definition file (`wx-config.schema.json`).
+
+## Environment Variables
+
+Some options can be defined using environment variables:
+
+```bash 
+# defines the port, the application will listen on
+PORT=3000
+# defines the base path used for the api
+BASE_PATH=/api
+# defines ips that are allowed as proxy ips
+# See http://expressjs.com/en/guide/behind-proxies.html
+TRUST_PROXY=
+# set to true to disable /api-Endpoint. will also disable frontend.
+DISABLE_DEFAULT_API_ENDPOINT=
+```

backend/.eslintrc.json

@@ -1,31 +0,0 @@
-{
-  "env": {
-    "es2021": true,
-    "node": true
-  },
-  "extends": [
-    "airbnb-typescript/base",
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint",
-    "import",
-    "promise"
-  ],
-  "overrides": [],
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module",
-    "project": "./tsconfig.json"
-  },
-  "rules": {
-    "eol-last": [
-      "error",
-      "always"
-    ]
-  }
-}

backend/package.json

@@ -1,37 +0,0 @@
-{
-  "name": "app",
-  "version": "1.0.0",
-  "description": "",
-  "main": "index.js",
-  "type": "module",
-  "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
-    "predev": "npm install && rimraf dist/*",
-    "start": "node --inspect=0.0.0.0:9229 --es-module-specifier-resolution=node dist/app.js",
-    "dev": "tsc-watch --onSuccess \"npm run start\" --onFailure \"echo WHOOPS! Server compilation failed\""
-  },
-  "keywords": [],
-  "author": "Fionn Sperath",
-  "license": "ISC",
-  "dependencies": {
-    "axios": "^1.3.4",
-    "express": "^4.18.1",
-    "morgan": "^1.10.0",
-    "node-schedule": "^2.1.1"
-  },
-  "devDependencies": {
-    "@types/express": "^4.17.13",
-    "@types/morgan": "^1.9.4",
-    "@types/node": "^18.7.6",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
-    "eslint": "^8.23.1",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.5",
-    "eslint-plugin-promise": "^6.0.1",
-    "rimraf": "^3.0.2",
-    "tsc-watch": "^5.0.3",
-    "typescript": "^4.7.4"
-  }
-}

backend/src/app.ts

@@ -1,35 +0,0 @@
-import express, { NextFunction, Request, Response } from 'express';
-import nodesched from 'node-schedule';
-import morgan from 'morgan';
-import router from './router';
-import wxService from './services/wx.service';
-
-const { PORT = 3000 } = process.env;
-
-const app = express();
-
-app.set('trust proxy', true);
-app.use(morgan('combined'));
-
-app.use('/api', router.router);
-
-const frontendRoot = '/opt/frontend/dist';
-app.use(express.static(frontendRoot));
-app.use((req, res) => res.sendFile(`${frontendRoot}/index.html`));
-
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-app.use((err, req: Request, res: Response, next: NextFunction) => {
-  console.log('err', err);
-  
-  // 500
-  res.status(500).json({ msg: 'an error occurred' });
-});
-
-nodesched.scheduleJob('regenerate data', '*/30 * * * * *', wxService.wrappedGenerateData)
-wxService.wrappedGenerateData();
-
-app.listen(PORT, () => {
-  console.log(
-    `application is listening on port ${PORT}`,
-  );
-});

docker-compose.yml

@@ -5,9 +5,10 @@ services:
     build:
       context: .
       dockerfile: ./Dockerfile
-      target: development
+      target: build
       args:
         - NODE_ENV=development
+    command: npm run dev
     ports:
       - '3030:3000/tcp'
       - '9229:9229/tcp'

frontend/.eslintrc.json

@@ -1,32 +0,0 @@
-{
-  "env": {
-    "es2021": true,
-    "node": true
-  },
-  "extends": [
-    "airbnb-typescript/base",
-    "eslint:recommended",
-    "plugin:@typescript-eslint/eslint-recommended",
-    "plugin:@typescript-eslint/recommended"
-  ],
-  "root": true,
-  "parser": "@typescript-eslint/parser",
-  "plugins": [
-    "@typescript-eslint",
-    "import",
-    "promise"
-  ],
-  "overrides": [],
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module",
-    "project": "./tsconfig.json"
-  },
-  "rules": {
-    "import/extensions": "off",
-    "eol-last": [
-      "error",
-      "always"
-    ]
-  }
-}

frontend/.gitignore

@@ -1,24 +0,0 @@
-# Logs
-logs
-*.log
-npm-debug.log*
-yarn-debug.log*
-yarn-error.log*
-pnpm-debug.log*
-lerna-debug.log*
-
-node_modules
-dist
-dist-ssr
-*.local
-
-# Editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-.DS_Store
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

frontend/package.json

@@ -1,30 +0,0 @@
-{
-  "name": "frontend",
-  "private": true,
-  "version": "0.0.0",
-  "type": "module",
-  "scripts": {
-    "dev": "vite",
-    "build": "tsc && vite build",
-    "preview": "vite preview"
-  },
-  "dependencies": {
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0"
-  },
-  "devDependencies": {
-    "@types/react": "^18.0.26",
-    "@types/react-dom": "^18.0.9",
-    "@typescript-eslint/eslint-plugin": "^5.38.1",
-    "@typescript-eslint/parser": "^5.38.1",
-    "@vitejs/plugin-react": "^3.0.0",
-    "eslint": "^8.23.1",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-n": "^15.2.5",
-    "eslint-plugin-promise": "^6.0.1",
-    "eslint-plugin-react": "^7.31.11",
-    "typescript": "^4.9.4",
-    "vite": "^4.0.0"
-  }
-}

frontend/src/App.css

@@ -1,41 +0,0 @@
-#root {
-  max-width: 1280px;
-  margin: 0 auto;
-  padding: 2rem;
-  text-align: center;
-}
-
-.logo {
-  height: 6em;
-  padding: 1.5em;
-  will-change: filter;
-}
-.logo:hover {
-  filter: drop-shadow(0 0 2em #646cffaa);
-}
-.logo.react:hover {
-  filter: drop-shadow(0 0 2em #61dafbaa);
-}
-
-@keyframes logo-spin {
-  from {
-    transform: rotate(0deg);
-  }
-  to {
-    transform: rotate(360deg);
-  }
-}
-
-@media (prefers-reduced-motion: no-preference) {
-  a:nth-of-type(2) .logo {
-    animation: logo-spin infinite 20s linear;
-  }
-}
-
-.card {
-  padding: 2em;
-}
-
-.read-the-docs {
-  color: #888;
-}

frontend/src/App.tsx

@@ -1,34 +0,0 @@
-import { useState } from 'react';
-import reactLogo from './assets/react.svg';
-import './App.css';
-
-function App() {
-  const [count, setCount] = useState(0);
-
-  return (
-    <div className="App">
-      <div>
-        <a href="https://vitejs.dev" target="_blank">
-          <img src="/vite.svg" className="logo" alt="Vite logo" />
-        </a>
-        <a href="https://reactjs.org" target="_blank">
-          <img src={reactLogo} className="logo react" alt="React logo" />
-        </a>
-      </div>
-      <h1>Vite + React</h1>
-      <div className="card">
-        <button onClick={() => setCount(count + 1)}>
-          count is {count}
-        </button>
-        <p>
-          Edit <code>src/App.tsx</code> and save to test HMR
-        </p>
-      </div>
-      <p className="read-the-docs">
-        Click on the Vite and React logos to learn more
-      </p>
-    </div>
-  );
-}
-
-export default App;

frontend/src/index.css

@@ -1,70 +0,0 @@
-:root {
-  font-family: Inter, Avenir, Helvetica, Arial, sans-serif;
-  font-size: 16px;
-  line-height: 24px;
-  font-weight: 400;
-
-  color-scheme: light dark;
-  color: rgba(255, 255, 255, 0.87);
-  background-color: #242424;
-
-  font-synthesis: none;
-  text-rendering: optimizeLegibility;
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-  -webkit-text-size-adjust: 100%;
-}
-
-a {
-  font-weight: 500;
-  color: #646cff;
-  text-decoration: inherit;
-}
-a:hover {
-  color: #535bf2;
-}
-
-body {
-  margin: 0;
-  display: flex;
-  place-items: center;
-  min-width: 320px;
-  min-height: 100vh;
-}
-
-h1 {
-  font-size: 3.2em;
-  line-height: 1.1;
-}
-
-button {
-  border-radius: 8px;
-  border: 1px solid transparent;
-  padding: 0.6em 1.2em;
-  font-size: 1em;
-  font-weight: 500;
-  font-family: inherit;
-  background-color: #1a1a1a;
-  cursor: pointer;
-  transition: border-color 0.25s;
-}
-button:hover {
-  border-color: #646cff;
-}
-button:focus,
-button:focus-visible {
-  outline: 4px auto -webkit-focus-ring-color;
-}
-
-@media (prefers-color-scheme: light) {
-  :root {
-    color: #213547;
-    background-color: #ffffff;
-  }
-  a:hover {
-    color: #747bff;
-  }
-  button {
-    background-color: #f9f9f9;
-  }
-}

frontend/tsconfig.json

@@ -1,21 +0,0 @@
-{
-  "compilerOptions": {
-    "target": "ESNext",
-    "useDefineForClassFields": true,
-    "lib": ["DOM", "DOM.Iterable", "ESNext"],
-    "allowJs": false,
-    "skipLibCheck": true,
-    "esModuleInterop": false,
-    "allowSyntheticDefaultImports": true,
-    "strict": true,
-    "forceConsistentCasingInFileNames": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "resolveJsonModule": true,
-    "isolatedModules": true,
-    "noEmit": true,
-    "jsx": "react-jsx"
-  },
-  "include": ["src"],
-  "references": [{ "path": "./tsconfig.node.json" }]
-}

frontend/tsconfig.node.json

@@ -1,9 +0,0 @@
-{
-  "compilerOptions": {
-    "composite": true,
-    "module": "ESNext",
-    "moduleResolution": "Node",
-    "allowSyntheticDefaultImports": true
-  },
-  "include": ["vite.config.ts"]
-}

frontend/vite.config.ts

@@ -1,7 +0,0 @@
-import { defineConfig } from 'vite'
-import react from '@vitejs/plugin-react'
-
-// https://vitejs.dev/config/
-export default defineConfig({
-  plugins: [react()],
-})

package.json

@@ -0,0 +1,107 @@
+{
+  "name": "iassure-wx",
+  "version": "1.3.2",
+  "description": "",
+  "main": "index.js",
+  "type": "module",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "paths": "resolve-tspaths --out \"dist\"",
+    "start": "resolve-tspaths --out \"dist\" && node --inspect=0.0.0.0:9229 dist/backend/app.js",
+    "dev": "tsc-watch -p ./tsconfig.node.json --onSuccess \"npm run start\" --onFailure \"echo WHOOPS! Server compilation failed\"",
+    "spa-dev": "vite --config=src/frontend/vite.config.ts",
+    "spa-build": "tsc -p ./tsconfig.web.json && vite --config=src/frontend/vite.config.ts build",
+    "spa-preview": "vite --config=src/frontend/vite.config.ts"
+  },
+  "keywords": [],
+  "author": "Fionn Sperath",
+  "license": "AGPL-3.0-only",
+  "dependencies": {
+    "axios": "^1.3.4",
+    "express": "^4.18.1",
+    "morgan": "^1.10.0",
+    "node-schedule": "^2.1.1",
+    "winston": "^3.10.0"
+  },
+  "devDependencies": {
+    "@types/express": "^4.17.13",
+    "@types/leaflet": "^1.9.3",
+    "@types/morgan": "^1.9.4",
+    "@types/node": "^18.16.3",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "@typescript-eslint/eslint-plugin": "^5.38.1",
+    "@typescript-eslint/parser": "^5.38.1",
+    "@vitejs/plugin-react": "^3.0.0",
+    "bootstrap": "^5.2.3",
+    "eslint": "^8.23.1",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-n": "^15.2.5",
+    "eslint-plugin-promise": "^6.0.1",
+    "eslint-plugin-react": "^7.31.11",
+    "leaflet": "^1.9.3",
+    "react": "^18.2.0",
+    "react-bootstrap": "^2.7.4",
+    "react-dom": "^18.2.0",
+    "react-leaflet": "^4.2.1",
+    "react-router": "^6.11.1",
+    "resolve-tspaths": "^0.8.8",
+    "rimraf": "^3.0.2",
+    "tsc-watch": "^5.0.3",
+    "typescript": "^4.9.4",
+    "vite": "^4.0.0"
+  },
+  "eslintConfig": {
+    "env": {
+      "es2021": true,
+      "node": true
+    },
+    "extends": [
+      "airbnb-typescript/base",
+      "eslint:recommended",
+      "plugin:@typescript-eslint/eslint-recommended",
+      "plugin:@typescript-eslint/recommended"
+    ],
+    "root": true,
+    "parser": "@typescript-eslint/parser",
+    "plugins": [
+      "@typescript-eslint",
+      "import",
+      "promise"
+    ],
+    "overrides": [],
+    "parserOptions": {
+      "ecmaVersion": "latest",
+      "sourceType": "module",
+      "project": [
+        "./tsconfig.node.json",
+        "./tsconfig.web.json"
+      ]
+    },
+    "rules": {
+      "no-console": "warn",
+      "import/extensions": "off",
+      "eol-last": [
+        "error",
+        "always"
+      ],
+      "import/no-extraneous-dependencies": [
+        "error",
+        {
+          "devDependencies": true
+        }
+      ],
+      "import/order": [
+        "error",
+        {
+          "newlines-between": "always",
+          "alphabetize": {
+            "order": "asc"
+          }
+        }
+      ],
+      "@typescript-eslint/ban-ts-comment": "off"
+    }
+  }
+}

src/backend/app.ts

@@ -0,0 +1,57 @@
+import express, { NextFunction, Request, Response } from 'express';
+import morgan from 'morgan';
+import nodesched from 'node-schedule';
+
+import appConfig from './config';
+import logger from './logger';
+import router from './router';
+import wxService from './services/wx.service';
+
+const app = express();
+
+const config = appConfig();
+
+app.set('trust proxy', config.trustProxy);
+app.use(morgan('combined'));
+
+if (config.apiBasePath) {
+  app.use(config.apiBasePath, router.router);
+}
+
+if (!config.disableDefaultApiEndpoint) {
+  app.use('/api', router.router);
+
+  const frontendRoot = '/opt/dist/frontend';
+  app.use(express.static(frontendRoot));
+  app.use((req, res) => res.sendFile(`${frontendRoot}/index.html`));
+}
+
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+app.use((err, req: Request, res: Response, next: NextFunction) => {
+  logger.error('%o', err);
+  
+  // 500
+  res.status(500).json({ msg: 'an error occurred' });
+});
+
+nodesched.scheduleJob('regenerate data', '*/30 * * * *', wxService.wrappedGenerateData);
+wxService.wrappedGenerateData();
+
+const server = app.listen(config.port, () => {
+  logger.info('application is listening on port %s', config.port);
+});
+
+function processShutdown(signal: string) {
+  logger.warn('%s signal received. Shutting down.', signal);
+  server.close((err) => {
+    if (err) {
+      logger.error('Failed to shut down server gracefully: %o', err);
+      process.exit(1);
+    }
+
+    logger.info('Server closed');
+    process.exit(0);
+  });
+}
+
+['SIGTERM', 'SIGINT'].map(signal => process.on(signal, processShutdown.bind(undefined, signal)));

src/backend/config.ts

@@ -0,0 +1,28 @@
+export default function appConfig() {
+  const {
+    PORT,
+    BASE_PATH,
+    TRUST_PROXY,
+    DISABLE_DEFAULT_API_ENDPOINT,
+  } = process.env;
+
+  let trustProxy: string | boolean = false;
+
+  if (TRUST_PROXY == '*') {
+    trustProxy = true;
+  }
+
+  return {
+    port: Number(PORT ?? 3000),
+
+    apiBasePath: BASE_PATH ?? '',
+    trustProxy,
+
+    disableDefaultApiEndpoint: DISABLE_DEFAULT_API_ENDPOINT == 'true',
+
+    logging: {
+      levelConsole: process.env.LOG_LEVEL_CONSOLE || 'http',
+      levelFile: process.env.LOG_LEVEL_FILE || 'info',
+    },
+  };
+}

src/backend/controllers/region.controller.ts

@@ -1,4 +1,5 @@
 import express from 'express';
+
 import regionsService from '../services/regions.service';
 
 export async function getRegions(req: express.Request, res: express.Response, next: express.NextFunction) {

src/backend/controllers/wx.controller.ts

@@ -1,9 +1,11 @@
 import express from 'express';
+
 import wxService from '../services/wx.service';
 
 export async function getRegionWx(req: express.Request, res: express.Response, next: express.NextFunction) {
   try {
     const { region } = req.params;
+    
     res.json(wxService.getWx(region));
   } catch (e) {
     next(e);

src/backend/logger.ts

@@ -0,0 +1,42 @@
+import winston from 'winston';
+
+import getConfig from './config';
+
+const { logging } = getConfig();
+
+const transports = [
+  new winston.transports.File({
+    filename: 'app.log',
+    level: logging.levelFile,
+  }),
+  new winston.transports.Console({
+    level: logging.levelConsole,
+    format: winston.format.colorize({ all: true }),
+  }),
+];
+
+const logger = winston.createLogger({
+  exitOnError: false,
+  format: winston.format.combine(
+    winston.format.timestamp({ format: 'YYYY-MM-DD HH:mm:ss' }),
+    winston.format.splat(),
+    winston.format.printf(info => `${info.timestamp} ${info.level}: ${info.message}`),
+  ),
+  transports,
+});
+
+winston.addColors({
+  error: 'brightRed',
+  warn: 'yellow',
+  info: 'green',
+  http: 'magenta',
+  verbose: 'brightBlue',
+  debug: 'brightCyan',
+  silly: 'gray',
+});
+
+process.on('warning', e => logger.warn('%o', e));
+process.on('uncaughtException', e => logger.error('%o', e));
+process.on('unhandledRejection', e => logger.error('%o', e));
+
+export default logger;

src/backend/services/config.service.ts

@@ -0,0 +1,13 @@
+import fs from 'fs';
+
+import { WxConfig } from '@/shared/types/config.types';
+
+export function getConfig(): WxConfig {
+  const data = JSON.parse(fs.readFileSync('/opt/wx-config.json').toString());
+
+  return data;
+}
+
+export default {
+  getConfig,
+};

src/backend/services/regions.service.ts

@@ -1,6 +1,8 @@
-import configService, { WxConfig, WxRegion } from "./config.service";
+import configService from './config.service';
 
-export function getRegions(): WxConfig["regions"] {
+import { WxConfig, WxRegion } from '@/shared/types/config.types';
+
+export function getRegions(): WxConfig['regions'] {
   return configService.getConfig().regions;
 }
 

src/backend/services/wx.service.ts

@@ -1,6 +1,11 @@
-import axios from "axios";
+import axios from 'axios';
-import { WxFix } from "./config.service";
+
-import regionsService from "./regions.service";
+import logger from '../logger';
+
+import regionsService from './regions.service';
+
+import { WxFix } from '@/shared/types/config.types';
+import { WxFixData, WxData } from '@/shared/types/wx.types';
 
 const cachedData: { [key: string]: WxData } = {};
 
@@ -12,7 +17,10 @@ const qnhLevelMapping = {
   500: 180,
   600: 140,
   700: 100,
-  850: 50
+  800: 64,
+  850: 50,
+  900: 30,
+  925: 25,
 };
 
 const necessaryDatapoints = [
@@ -33,34 +41,6 @@ for (const qnh of Object.keys(qnhLevelMapping)) {
   }
 }
 
-interface WxLevelData {
-  "T(K)": string;
-  windspeed: string;
-  windhdg: string;
-};
-
-export interface WxFixData {
-  coords: {
-    lat: string;
-    long: string;
-  };
-
-  levels: {
-    [key: string]: WxLevelData;
-  }
-}
-
-export interface WxData {
-  info: {
-    date: string;
-    datestring: string;
-    legal: string;
-  };
-  data: {
-    [key: string]: WxFixData;
-  }
-}
-
 export async function getDataAtFix(fix: WxFix, index: number): Promise<WxFixData> {
   const response = await axios.get(`https://api.open-meteo.com/v1/forecast?latitude=${fix.lat}&longitude=${fix.lon}&windspeed_unit=kn&forecast_days=1&hourly=${requestedData.join(',')}`);
   const hourlyData = response.data.hourly;
@@ -68,15 +48,15 @@ export async function getDataAtFix(fix: WxFix, index: number): Promise<WxFixData
   const data: WxFixData = {
     coords: {
       lat: String(fix.lat),
-      long: String(fix.lon)
+      long: String(fix.lon),
     },
-    levels: {}
+    levels: {},
-  }
+  };
 
-  data.levels["0"] = {
+  data.levels['0'] = {
-    "T(K)": String(Number(hourlyData?.[`temperature_2m`]?.[index]) + 273.15),
+    'T(K)': String(Number(hourlyData?.temperature_2m?.[index]) + 273.15),
-    "windspeed": String(hourlyData?.[`windspeed_10m`]?.[index]),
+    'windspeed': String(hourlyData?.windspeed_10m?.[index]),
-    "windhdg": String(hourlyData?.[`winddirection_10m`]?.[index]),
+    'windhdg': String(hourlyData?.winddirection_10m?.[index]),
   };
 
   for (const [qnh, fl] of Object.entries(qnhLevelMapping)) {
@@ -85,10 +65,10 @@ export async function getDataAtFix(fix: WxFix, index: number): Promise<WxFixData
     const speed = hourlyData?.[`windspeed_${qnh}hPa`]?.[index]; 
 
     data.levels[String(fl)] = {
-      "T(K)": String(temp),
+      'T(K)': String(temp),
-      "windspeed": String(speed),
+      'windspeed': String(speed),
-      "windhdg": String(dir),
+      'windhdg': String(dir),
-    }
+    };
   }
 
   return data;
@@ -104,10 +84,10 @@ export async function generateData() {
       info: {
         date: now.toISOString(),
         datestring: `${now.getUTCDate()}${now.getUTCHours()}`,
-        legal: "Weather data by Open-Meteo.com (https://open-meteo.com)"
+        legal: 'Weather data by Open-Meteo.com (https://open-meteo.com)',
       },
-      data: {}
+      data: {},
-    }
+    };
 
     for (const fix of region.fixes) {
       regionData.data[fix.name] = await getDataAtFix(fix, now.getUTCHours());
@@ -120,7 +100,7 @@ export async function generateData() {
 }
 
 export function wrappedGenerateData() {
-  generateData().catch((...params) => console.error(...params));
+  generateData().catch((...params) => logger.error('%o', params));
 }
 
 export function getWx(region: string): WxData | null {
@@ -133,4 +113,4 @@ export default {
   getWx,
   generateData,
   wrappedGenerateData,
-}
+};

src/frontend/index.html

@@ -4,7 +4,7 @@
     <meta charset="UTF-8" />
     <link rel="icon" type="image/svg+xml" href="/vite.svg" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Vite + React + TS</title>
+    <title>IASsure-WX</title>
   </head>
   <body>
     <div id="root"></div>

src/frontend/src/App.tsx

@@ -0,0 +1,165 @@
+import 'leaflet/dist/leaflet.css';
+import 'bootstrap/dist/css/bootstrap.css';
+
+import { DivIcon } from 'leaflet';
+import { useEffect, useState } from 'react';
+import { Button, Modal, Table } from 'react-bootstrap';
+import { MapContainer, TileLayer, LayersControl, LayerGroup, Popup, Marker } from 'react-leaflet';
+
+import wxService from './services/wx.service';
+
+import { WxRegion } from '@/shared/types/config.types';
+import { WxData } from '@/shared/types/wx.types';
+
+
+function App() {
+  const [showModal, setShowModal] = useState(false);
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  const [loading, setLoading] = useState(false);
+  
+  const [regions, setRegions] = useState<WxRegion[]>([]);
+  const [selectedRegion, setSelectedRegion] = useState<string>('');
+  const [wxData, setWxData] = useState<WxData | null>(null);
+
+  function getSetShowModal(val: boolean) {
+    return () => setShowModal(val);
+  }
+
+  useEffect(() => {
+    if (selectedRegion) {
+      return;
+    }
+    
+    setLoading(true);
+
+    wxService.getRegions()
+      .then(regionsResponse => {
+        setRegions(regionsResponse);
+        setShowModal(true);
+        setLoading(false);
+      });
+  }, []);
+
+  useEffect(() => {
+    setLoading(true);
+
+    wxService.getWxData(selectedRegion).then(wxResponse => {
+      setWxData(wxResponse);
+      setShowModal(false);
+      setLoading(false);
+      console.log(wxResponse);
+    });
+  }, [selectedRegion]);
+
+  return (
+    <>
+      <Modal
+        show={showModal}
+        backdrop="static"
+        keyboard={false}
+      >
+        <Modal.Header>
+          <Modal.Title>Regions</Modal.Title>
+        </Modal.Header>
+        <Modal.Body>
+          <Table striped>
+            <thead>
+              <tr>
+                <th>#</th>
+                <th>Region</th>
+                <th>Fixes</th>
+                <th></th>
+              </tr>
+            </thead>
+            <tbody>
+              {regions.length ? regions.map((region, idx) => <>
+                <tr key={idx}>
+                  <td>{idx + 1}</td>
+                  <td>{region.identifier}</td>
+                  <td>{region.fixes.length} Fixes</td>
+                  <td>
+                    <Button
+                      variant={selectedRegion == region.identifier ? 'success' : 'primary'}
+                      type='button'
+                      onClick={() => setSelectedRegion(region.identifier)}
+                    >
+                      Select
+                    </Button>
+                  </td>
+                </tr>
+              </>) : (<>
+                <tr>
+                  <td className='p-2 text-center' colSpan={4}>- no regions defined -</td>
+                </tr>
+              </>)}
+            </tbody>
+          </Table>
+        </Modal.Body>
+      </Modal>
+
+      <div className='position-absolute bottom-0 p-2' style={{ zIndex: 999 }}>
+        <Button variant='outline-secondary' type='button' onClick={getSetShowModal(true)}>↗ {selectedRegion && `(Selected: ${selectedRegion})`}</Button>
+      </div>
+
+      <MapContainer style={{ height: '100vh', width: '100vw' }} center={[50.033306, 8.570456]} zoom={7} scrollWheelZoom={true}>
+        <TileLayer
+          url='https://{s}.basemaps.cartocdn.com/dark_nolabels/{z}/{x}/{y}.png'
+          attribution={[
+            '<a href="http://www.openstreetmap.org/copyright" target="_blank">OpenStreetMap</a>',
+            '<a href="https://carto.com/attributions" target="_blank">CARTO</a>',
+            'Weather data by Open-Meteo.com (<a href="https://open-meteo.com" target="_blank">open-meteo.com</a>)',
+            '<a href="https://github.com/dotFionn/iassure-wx" target="_blank">IASsure-WX</a>: <a href="https://fsperath.de" target="_blank">Fionn Sperath</a> and <a href="https://github.com/dotFionn/iassure-wx/graphs/contributors" target="_blank">contributors</a>',
+          ].map(str => `&copy; ${str}`).join(' | ')}
+          subdomains={'abc'}
+          maxZoom={20}
+          minZoom={0}
+        />
+
+        <LayersControl position='topright'>
+          <LayersControl.Overlay checked name='Enable labels'>
+            <TileLayer
+              url='https://{s}.basemaps.cartocdn.com/dark_only_labels/{z}/{x}/{y}.png'
+              subdomains={'abc'}
+              maxZoom={20}
+              minZoom={0}
+            />
+          </LayersControl.Overlay>
+          <LayersControl.Overlay checked name="Points">
+            <LayerGroup>
+              {Object.entries(wxData?.data || {}).map(([fix, data]) => (
+                <>
+                <Marker
+                  position={[Number(data.coords.lat), Number(data.coords.long)]}
+                  key={fix}
+                  title={fix}
+                  icon={new DivIcon({ html: `⨀&nbsp;<span class="fw-bold">${fix}</span>`, className: 'bg-none text-warning' })}
+                >
+                  <Popup>
+                      <Table>
+                        <thead>
+                          <tr><th colSpan={3} className='text-center'>{fix}</th></tr>
+                          <tr><th>Lvl</th><th>Temp/K</th><th>Wind</th></tr>
+                        </thead>
+                        <tbody>
+                          {Object.entries(data.levels).map(([lvl, lvlData], lvlIdx) => (
+                            <tr key={lvlIdx}>
+                              <td>{lvl}</td>
+                              <td>{Math.round(Number(lvlData['T(K)']))}</td>
+                              <td>{lvlData.windhdg}° / {lvlData.windspeed}kts</td>
+                            </tr>
+                          ))}
+                        </tbody>
+                      </Table>
+                    </Popup>
+                </Marker>
+                </>
+              ))}
+            </LayerGroup>
+          </LayersControl.Overlay>
+        </LayersControl>
+      </MapContainer>
+    </>
+  );
+}
+
+export default App;

src/frontend/src/index.css

@@ -0,0 +1,6 @@
+body {
+  margin: 0;
+  height: 100vh;
+  width: 100vw;
+  overflow: hidden;
+}

src/frontend/src/main.tsx

@@ -1,5 +1,6 @@
 import React from 'react';
 import ReactDOM from 'react-dom/client';
+
 import App from './App';
 import './index.css';
 

src/frontend/src/services/wx.service.ts

@@ -0,0 +1,19 @@
+import axios from 'axios';
+
+import { WxRegion } from '@/shared/types/config.types';
+import { WxData } from '@/shared/types/wx.types';
+
+async function getRegions(): Promise<WxRegion[]> {
+  const response = await axios.get<WxRegion[]>('/api/regions');
+  return response.data;
+}
+
+async function getWxData(region: string): Promise<WxData> {
+  const response = await axios.get<WxData>(`/api/regions/${region}/wx`);
+  return response.data;
+}
+
+export default {
+  getRegions,
+  getWxData,
+};

src/frontend/vite.config.ts

@@ -0,0 +1,32 @@
+import { resolve } from 'path';
+
+import react from '@vitejs/plugin-react';
+import { defineConfig } from 'vite';
+
+// https://vitejs.dev/config/
+export default defineConfig({
+  plugins: [react()],
+  root: resolve(__dirname),
+  build: {
+    lib: {
+      entry: resolve(__dirname, 'index.html'),
+      formats: ['es'],
+    },
+    minify: true,
+    outDir: resolve(__dirname, '..', '..', 'dist', 'frontend'),
+    emptyOutDir: true,
+  },
+  server: {
+    proxy: {
+      '/api': {
+        target: 'http://localhost:3030',
+        changeOrigin: true,
+        // secure: false,
+        // ws: true,
+      },
+    },
+  },
+  define: {
+    'process.env': `(${JSON.stringify(process.env)})`,
+  },
+});

src/shared/types/config.types.ts

@@ -1,5 +1,3 @@
-import fs from 'fs';
-
 export interface WxConfig {
   regions: WxRegion[];
 }
@@ -14,13 +12,3 @@ export interface WxFix {
   lat: number;
   lon: number;
 }
-
-export function getConfig(): WxConfig {
-  const data = JSON.parse(fs.readFileSync('/opt/wx-config.json').toString());
-
-  return data;
-}
-
-export default {
-  getConfig,
-}

src/shared/types/wx.types.ts

@@ -0,0 +1,27 @@
+export interface WxLevelData {
+  'T(K)': string;
+  windspeed: string;
+  windhdg: string;
+}
+
+export interface WxFixData {
+  coords: {
+    lat: string;
+    long: string;
+  };
+
+  levels: {
+    [key: string]: WxLevelData;
+  }
+}
+
+export interface WxData {
+  info: {
+    date: string;
+    datestring: string;
+    legal: string;
+  };
+  data: {
+    [key: string]: WxFixData;
+  }
+}

tsconfig.json

@@ -1,11 +1,13 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
+    "rootDir": "src",
     "outDir": "dist",
     "module": "ES2022",
     "target": "ES2022",
     "lib": [
-      "ES2022"
+      "ES2022",
+      "DOM"
     ],
     "sourceMap": true,
     "strictNullChecks": true,
@@ -15,8 +17,16 @@
     "forceConsistentCasingInFileNames": true,
     "esModuleInterop": true,
     "moduleResolution": "Node",
+    "paths": {
+      "@/*": ["./src/*"],
+    }
   },
   "watchOptions": {
     "watchFile": "fixedpollinginterval"
-  }
+  },
+  "files": [],
+  "references": [
+    { "path": "./tsconfig.node.json" },
+    { "path": "./tsconfig.web.json" }
+  ]
 }

tsconfig.node.json

@@ -0,0 +1,11 @@
+{
+  "extends": "./tsconfig.json",
+  "include": [
+    "src/backend/**/*",
+    "src/shared/**/*",
+    "src/frontend/vite.config.ts"
+  ],
+  "compilerOptions": {
+    "composite": false
+  }
+}

tsconfig.web.json

@@ -0,0 +1,23 @@
+{
+  "extends": "./tsconfig.json",
+  "include": [
+    "src/frontend/**/*",
+    "src/shared/**/*"
+  ],
+  "exclude": [
+    "src/frontend/vite.config.ts"
+  ],
+  "compilerOptions": {
+    "useDefineForClassFields": true,
+    "lib": ["DOM", "DOM.Iterable", "ESNext"],
+    "jsx": "react-jsx",
+    "composite": false,
+    "noEmit": true,
+    "allowJs": false,
+    "skipLibCheck": true,
+    "strict": true,
+    "moduleResolution": "Node",
+    "resolveJsonModule": true,
+    "isolatedModules": true
+  }
+}