feat(android): differentiate debug and release packages

.goreleaser.yml

@@ -0,0 +1,96 @@
+project_name: arcast
+before:
+  hooks:
+    - go mod tidy
+builds:
+  - id: arcast-player
+    binary: arcast-player
+    env:
+      - CGO_ENABLED=0
+    flags:
+      - -trimpath
+    ldflags:
+      - -s
+      - -w
+      - -X 'main.CommitRef={{ .Commit }}'
+      - -X 'main.Version={{ .Version }}'
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - arm64
+    main: ./cmd/desktop
+  - id: arcast-client
+    binary: arcast-client
+    env:
+      - CGO_ENABLED=0
+    flags:
+      - -trimpath
+    ldflags:
+      - -s
+      - -w
+      - -X 'main.CommitRef={{ .Commit }}'
+      - -X 'main.Version={{ .Version }}'
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - arm64
+    main: ./cmd/client
+archives:
+  - id: arcast-client
+    builds: ["arcast-client"]
+    name_template: '{{ .ProjectName }}-client_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
+    files:
+      - README.md
+      - LICENCE
+  - id: arcast-player
+    builds: ["arcast-player"]
+    name_template: '{{ .ProjectName }}-player_{{ .Version }}_{{ .Os }}_{{ .Arch }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}'
+    files:
+      - README.md
+      - LICENCE
+checksum:
+  name_template: "checksums.txt"
+snapshot:
+  name_template: "{{ .Version }}"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+nfpms:
+  - id: arcast-player
+    builds:
+      - "arcast-player"
+    package_name: arcast-player
+    homepage: https://forge.cadoles.com/arcad/arcast
+    maintainer: Cadoles <contact@cadoles.com>
+    description: |-
+      Web diffusion player
+    license: AGPL-3.0
+    formats:
+      - apk
+      - deb
+    dependencies:
+      - chromium | chromium-browser | google-chrome-stable
+    contents:
+      - src: misc/packaging/player.desktop
+        dst: /usr/share/applications/arcast-player.desktop
+        type: config
+      - src: misc/logo/icon.png
+        dst: /usr/share/pixmaps/arcast-player.png
+        type: config
+  - id: arcast-client
+    builds:
+      - "arcast-client"
+    package_name: arcast-client
+    homepage: https://forge.cadoles.com/arcad/arcast
+    maintainer: Cadoles <contact@cadoles.com>
+    description: |-
+      Arcast player command-line client
+    license: AGPL-3.0
+    formats:
+      - apk
+      - deb

.vscode/settings.json

@@ -1,5 +1,4 @@
 {
-    "java.project.sourcePaths": [
+  "java.project.sourcePaths": ["apps/main/src"],
-        "apps/main/src"
+  "java.configuration.updateBuildConfiguration": "automatic"
-    ]
 }

Jenkinsfile

@@ -15,7 +15,7 @@ standardMakePipeline([
 
     # Install utilities
     RUN apt-get update -y \
-    && apt-get install -y wget curl tar build-essential ca-certificates git openjdk-17-jdk unzip locales jq moreutils
+    && apt-get install -y wget git curl tar build-essential ca-certificates git openjdk-17-jdk unzip locales jq moreutils
 
     # Set locale
     RUN locale-gen en_US.UTF-8
@@ -51,7 +51,7 @@ standardMakePipeline([
         'extras;google;google_play_services'
     ''',
     'hooks': [
-        'pre-release': { 
+        'pre-build': { 
             sh '''
             make .mktools
             '''

LICENCE

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

Makefile

@@ -1,6 +1,8 @@
+export PATH := $(PATH):$(PWD)/tools/gomobile/bin:$(PWD)/tools/gobind/bin
+
 LINT_ARGS ?= --timeout 5m
-GORELEASER_VERSION ?= v1.13.1
+GORELEASER_VERSION ?= v1.25.1
-GORELEASER_ARGS ?= release --snapshot --rm-dist
+GORELEASER_ARGS ?= release --snapshot --clean
 GITCHLOG_ARGS ?=
 SHELL := /bin/bash
 JDK_PATH ?= /usr/lib/jvm/java-11-openjdk
@@ -18,6 +20,8 @@ ANDROID_KEYSTORE_KEY_VALIDITY ?= 365000
 
 ANDROID_BUILD_TOOLS_VERSION ?= 34.0.0
 
+VERSION_CODE ?= $(shell git rev-list HEAD --first-parent --count)
+
 APPS := main
 
 watch: tools/modd/bin/modd deps ## Watching updated files - live reload
@@ -48,10 +52,14 @@ build-client: deps ## Build executable
 		-o ./bin/client \
 		./cmd/client
 
-build-android: tools/gogio/bin/gogio deps ## Build executable
+.PHONY: android/app/libs/arcast.aar
+android/app/libs/arcast.aar: tools/gomobile/bin/gomobile tools/gobind/bin/gobind
+	mkdir -p android/app/libs
+	gomobile bind -v -javapkg com.cadoles.arcast -target android -o android/app/libs/arcast.aar ./pkg/android
+
+build-android: .mktools android/app/libs/arcast.aar deps ## Build executable
 	mkdir -p dist
-	CGO_ENABLED=1 GOOS=android CGO_CFLAGS="-I${JDK_PATH}/include -I${JDK_PATH}/include/linux -w" tools/gogio/bin/gogio -target android -buildmode archive -o android/app/libs/mobile.aar -x ./cmd/mobile
+	( cd android && VERSION_CODE=$(VERSION_CODE) VERSION_NAME=$(MKT_PROJECT_VERSION)-debug ./gradlew assembleDebug )
-	( cd android && ./gradlew assembleDebug )
 
 $(ANDROID_KEYSTORE_FILE):
 	keytool -genkey -noprompt \
@@ -62,10 +70,9 @@ $(ANDROID_KEYSTORE_FILE):
 		-validity $(ANDROID_KEYSTORE_KEY_VALIDITY) \
         -storepass "$(ANDROID_KEYSTORE_PASS)"
 
-release-android: $(ANDROID_KEYSTORE_FILE) tools/gogio/bin/gogio deps ## Build executable
+release-android: deps .mktools android/app/libs/arcast.aar $(ANDROID_KEYSTORE_FILE) ## Build executable
 	mkdir -p dist
-	CGO_ENABLED=1 GOOS=android CGO_CFLAGS="-I${JDK_PATH}/include -I${JDK_PATH}/include/linux -w" tools/gogio/bin/gogio -target android -buildmode archive -o android/app/libs/mobile.aar -x ./cmd/mobile
+	( cd android && VERSION_CODE=$(VERSION_CODE) VERSION_NAME=$(MKT_PROJECT_VERSION) ./gradlew assemble )
-	( cd android && ./gradlew assemble )
 	rm -f android/app/build/outputs/apk/release/app-release-unsigned-aligned.apk
 	"$(ANDROID_HOME)/build-tools/$(ANDROID_BUILD_TOOLS_VERSION)/zipalign" -p 4 android/app/build/outputs/apk/release/app-release-unsigned.apk android/app/build/outputs/apk/release/app-release-unsigned-aligned.apk
 	"$(ANDROID_HOME)/build-tools/$(ANDROID_BUILD_TOOLS_VERSION)/apksigner" \
@@ -101,27 +108,16 @@ tools/modd/bin/modd:
 	mkdir -p tools/modd/bin
 	GOBIN=$(PWD)/tools/modd/bin go install github.com/cortesi/modd/cmd/modd@latest
 
-tools/gogio/bin/gogio:
-	mkdir -p tools/gogio/bin
-	GOBIN=$(PWD)/tools/gogio/bin go install gioui.org/cmd/gogio@latest
-
-
 release: gitea-release
 
-gitea-release: .mktools build release-android
+gitea-release: .mktools build-apps goreleaser release-android
 	rm -rf .gitea-release
 	mkdir -p .gitea-release
 
-	cp ./bin/desktop_amd64 .gitea-release/arcad_player_linux_amd64
+	cp ./dist/*.apk .gitea-release/
-
+	cp ./dist/*.deb .gitea-release/
-	$(MAKE) GOARCH=arm build-desktop
+	cp ./dist/*.tar.gz .gitea-release/
-	cp ./bin/desktop_arm .gitea-release/arcad_player_linux_arm
+	cp ./android/app/build/outputs/apk/release/app-release.apk .gitea-release/arcast_player_$(MKT_PROJECT_VERSION)_android.apk
-
-	$(MAKE) GOARCH=arm64 build-desktop
-	cp ./bin/desktop_arm64 .gitea-release/arcad_player_linux_arm64
-
-	cp ./bin/client .gitea-release/arcad_client_linux_amd64
-	cp ./android/app/build/outputs/apk/release/app-release.apk .gitea-release/arcast_player.apk
 
 	MKT_GITEA_RELEASE_PROJECT="arcast" \
 		MKT_GITEA_RELEASE_ORG="arcad" \
@@ -135,6 +131,17 @@ gitea-release: .mktools build release-android
 		MKT_GITEA_RELEASE_ATTACHMENTS="$$(find .gitea-release/* -type f)" \
 		$(MAKE) mkt-gitea-release
 
+.PHONY: goreleaser
+goreleaser: .env .mktools
+	( set -o allexport && source .env && set +o allexport && curl -sfL https://goreleaser.com/static/run | VERSION=$(GORELEASER_VERSION) GORELEASER_CURRENT_TAG="$(MKT_PROJECT_VERSION)" GOPATH=$(shell go env GOPATH) bash /dev/stdin $(GORELEASER_ARGS) )
+
+tools/gomobile/bin/gomobile:
+	mkdir -p tools/gomobile/bin
+	GOBIN=$(PWD)/tools/gomobile/bin go install golang.org/x/mobile/cmd/gomobile@latest
+
+tools/gobind/bin/gobind:
+	mkdir -p tools/gobind/bin
+	GOBIN=$(PWD)/tools/gobind/bin go install golang.org/x/mobile/cmd/gobind@latest
 
 .PHONY: mktools
 mktools:

README.md

@@ -4,40 +4,25 @@
 
 # Arcast
 
-Serveur de diffusion de contenu (Web) pour afficheurs numériques (Linux et Android).
+Serveur et client de diffusion de contenu (Web) pour afficheurs numériques (Linux et Android).
 
 ## Téléchargement
 
-### Client en ligne de commande
+[Voir la dernière version](https://forge.cadoles.com/arcad/arcast/releases/latest)
 
-Le client en ligne de commande vous permet de contrôler votre flotte de serveurs Arcast à partir de votre shell.
+Voici la liste des artefacts publiés:
 
-[Démonstration d'utilisation du client](https://asciinema.org/a/627836)
+- Paquets Debian et dérivés: `*.deb` ;
+- Paquets Alpine Linux: `*_linux_<arch>.apk` ;
+- Paquets Android: `*_android.apk` ;
+- Archives pour les autres distributions GNU/Linux: `*_linux_<arch>.tar.gz`.
 
-#### Dernière version
+Les architectures `amd64` et `arm64` sont aujourd'hui supportées.
-
-- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_client_linux_amd64)
-
-### Application Android
-
-L'application `arcast_player` pour Android permet de transformer votre appareil Android en afficheur numérique.
-
-#### Dernière version
-
-- [`APK`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcast_player.apk)
-
-### Application de bureau
-
-L'application `arcast_player` pour Linux permet de transformer votre poste GNU/Linux en afficheur numérique.
-
-#### Pré-requis
-
-Avoir [Chromium](https://www.chromium.org/chromium-projects/) (ou `Google Chrome`) installé sur son poste GNU/Linux.
-
-#### Dernière version
-
-- Linux: [`amd64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_amd64), [`arm`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_arm), [`arm64`](https://forge.cadoles.com/arcad/arcast/releases/download/latest/arcad_player_linux_arm64)
 
 ## Documentation
 
 Voir le répertoire [`doc`](./doc)
+
+## Licence
+
+[AGPL-3.0](./LICENCE)

android/app/build.gradle

@@ -3,6 +3,9 @@ plugins {
     id 'org.jetbrains.kotlin.android'
 }
 
+def appVersionCode = Integer.valueOf(System.env.VERSION_CODE ?: 1)
+def appVersionName = System.env.VERSION_NAME ?: "0.0.0"
+
 android {
     namespace 'com.cadoles.arcast_player'
     compileSdk 34
@@ -11,8 +14,8 @@ android {
         applicationId "com.cadoles.arcast_player"
         minSdk 24
         targetSdk 34
-        versionCode 1
+        versionCode appVersionCode
-        versionName "1.0"
+        versionName appVersionName
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -25,6 +28,10 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            applicationIdSuffix = ".debug"
+            versionNameSuffix = "-debug"
+        }
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
@@ -47,7 +54,6 @@ android {
 }
 
 dependencies {
-
     implementation 'androidx.core:core-ktx:1.10.1'
     implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.6.1'
     implementation 'androidx.activity:activity-compose:1.7.0'
@@ -56,7 +62,7 @@ dependencies {
     implementation 'androidx.compose.ui:ui-graphics'
     implementation 'androidx.compose.ui:ui-tooling-preview'
     implementation 'androidx.compose.material3:material3'
-    implementation files('libs/sys_android.jar')
+    implementation("androidx.webkit:webkit:1.10.0")
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

android/app/libs/.gitignore

@@ -1 +1,2 @@
 /mobile.aar
+/arcast*

android/app/src/main/AndroidManifest.xml

@@ -8,8 +8,6 @@
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
@@ -35,12 +33,6 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name="org.gioui.GioActivity"
-            android:theme="@style/Theme.GioApp"
-            android:configChanges="orientation|keyboardHidden"
-            android:windowSoftInputMode="adjustResize"
-            android:keepScreenOn="true">
-        </activity>
     </application>
 
 </manifest>

android/app/src/main/java/com/example/arcast_player/ArcastBridge.kt

@@ -0,0 +1,31 @@
+package com.example.arcast_player
+
+import android.webkit.WebView
+import com.cadoles.arcast.android.Bridge
+
+class ArcastBridge(private val webview: WebView) : Bridge {
+    private var title: String = ""
+    private var url: String = ""
+
+    override fun getTitle(): String {
+        return title
+    }
+
+    override fun getURL(): String {
+        return url
+    }
+
+    override fun loadURL(url: String) {
+        webview.post(Runnable {
+            webview.loadUrl(url)
+        })
+    }
+
+    fun setURL(url: String) {
+        this.url = url
+    }
+
+    fun setTitle(title: String) {
+        this.title = title
+    }
+}

android/app/src/main/java/com/example/arcast_player/ArcastWebviewClient.kt

@@ -0,0 +1,18 @@
+package com.example.arcast_player
+
+import android.webkit.WebResourceRequest
+import android.webkit.WebView
+import android.webkit.WebViewClient
+
+class ArcastWebviewClient(private var bridge: ArcastBridge): WebViewClient() {
+
+    override fun shouldOverrideUrlLoading(view: WebView?, request: WebResourceRequest?): Boolean {
+        return false
+    }
+
+    override fun onPageFinished(view: WebView?, url: String?) {
+        super.onPageFinished(view, url)
+        bridge.title = view?.title.toString()
+        bridge.url = url.toString()
+    }
+}

android/app/src/main/java/com/example/arcast_player/MainActivity.kt

@@ -12,29 +12,26 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
 import com.cadoles.arcast_player.ui.theme.ArcastplayerTheme
-import org.gioui.GioActivity
 import android.view.WindowManager
+import android.webkit.WebView
+import com.cadoles.arcast.android.Android as Arcast
+import com.example.arcast_player.ArcastBridge
+import com.example.arcast_player.ArcastWebviewClient
 
 class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        startActivity(Intent(this, GioActivity::class.java))
+        val wv = WebView(applicationContext)
-        window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
+        val bridge: ArcastBridge = ArcastBridge(wv)
-    }
-}
 
-@Composable
+        wv.webViewClient = ArcastWebviewClient(bridge)
-fun Greeting(name: String, modifier: Modifier = Modifier) {
+        Arcast.setBridge(bridge)
-    Text(
-            text = "Hello $name!",
-            modifier = modifier
-    )
-}
 
-@Preview(showBackground = true)
+        val port = Arcast.startServer(filesDir.absolutePath)
-@Composable
+
-fun GreetingPreview() {
+        wv.settings.javaScriptEnabled = true
-    ArcastplayerTheme {
+        wv.loadUrl("http://127.0.0.1:${port}")
-        Greeting("Android")
+
+        setContentView(wv)
     }
 }

apps/main/src/pages/ScreenSharingPage/ScreenViewer.module.css

@@ -10,12 +10,13 @@
 }
 
 .video {
-    object-fit: cover;
-    width: 100%;
   height: auto;
-    position: absolute;
-    top: 0;
   left: 0;
-    bottom: 0;
+  object-fit: contain;
+  /* position: absolute; */
   right: 0;
+  top: 0;
+  width: 100%;
+  flex-grow: 1;
+  width: 100%;
 }

cmd/client/main.go

@@ -5,10 +5,13 @@ import (
 	"forge.cadoles.com/arcad/arcast/internal/command/client"
 )
 
+var Version = "dev"
+
 func main() {
 	command.Main(
 		"arcast",
-		"Arcast cli client",
+		"cli client",
+		Version,
 		client.Root().Subcommands...,
 	)
 }

cmd/desktop/main.go

@@ -5,10 +5,13 @@ import (
 	"forge.cadoles.com/arcad/arcast/internal/command/player"
 )
 
+var Version = "dev"
+
 func main() {
 	command.Main(
 		"arcast",
-		"Arcast desktop player",
+		"desktop player",
+		Version,
 		player.Root().Subcommands...,
 	)
 }

cmd/mobile/main.go

@@ -1,122 +0,0 @@
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"os"
-	"path/filepath"
-
-	"forge.cadoles.com/arcad/arcast"
-	"forge.cadoles.com/arcad/arcast/pkg/browser/gioui"
-	"forge.cadoles.com/arcad/arcast/pkg/config"
-	"forge.cadoles.com/arcad/arcast/pkg/server"
-	"gioui.org/app"
-	"gioui.org/io/system"
-	"gioui.org/layout"
-	"gioui.org/op"
-	"github.com/gioui-plugins/gio-plugins/plugin"
-	"github.com/gioui-plugins/gio-plugins/webviewer/webview"
-	"github.com/pkg/errors"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-const packageName = "com.cadoles.arcast_player"
-
-func main() {
-	ctx := context.Background()
-
-	webview.SetDebug(true)
-	window := app.NewWindow(
-		app.Fullscreen.Option(),
-	)
-
-	browser := gioui.NewBrowser(window)
-
-	go func() {
-		ops := new(op.Ops)
-		for {
-			evt := window.NextEvent()
-			plugin.Install(window, evt)
-
-			switch evt := evt.(type) {
-			case system.DestroyEvent:
-				os.Exit(0)
-				return
-			case system.FrameEvent:
-				gtx := layout.NewContext(ops, evt)
-				browser.Layout(gtx)
-				evt.Frame(gtx.Ops)
-			}
-		}
-	}()
-
-	go func() {
-
-		for {
-			ctx, cancel := context.WithCancel(ctx)
-			defer cancel()
-
-			conf := config.DefaultConfig()
-			configFiles := getConfigFiles(ctx)
-			for _, f := range configFiles {
-				logger.Info(ctx, "loading or creating configuration file", logger.F("filename", f))
-				if err := config.LoadOrCreate(ctx, f, conf, config.DefaultTransforms...); err != nil {
-					logger.Error(ctx, "could not load configuration file", logger.CapturedE(errors.WithStack(err)))
-					continue
-				}
-
-				break
-			}
-
-			cert, err := tls.X509KeyPair(conf.HTTPS.Cert, conf.HTTPS.Key)
-			if err != nil {
-				logger.Fatal(ctx, "could not parse x509 certificate", logger.CapturedE(errors.WithStack(err)))
-			}
-
-			server := server.New(
-				browser,
-				server.WithInstanceID(conf.InstanceID),
-				server.WithAppsEnabled(conf.Apps.Enabled),
-				server.WithDefaultApp(conf.Apps.DefaultApp),
-				server.WithApps(arcast.DefaultApps...),
-				server.WithTLSCertificate(&cert),
-				server.WithAddress(conf.HTTP.Address),
-				server.WithTLSAddress(conf.HTTPS.Address),
-				server.WithAllowedOrigins(conf.AllowedOrigins...),
-			)
-
-			if err := server.Start(); err != nil {
-				logger.Fatal(ctx, "could not start server", logger.CapturedE(errors.WithStack(err)))
-			}
-
-			defer func() {
-				if err := server.Stop(); err != nil {
-					logger.Error(ctx, "could not stop server", logger.CapturedE(errors.WithStack(err)))
-				}
-			}()
-
-			if err := server.Wait(); err != nil {
-				logger.Error(ctx, "could not wait for server", logger.CapturedE(errors.WithStack(err)))
-			}
-		}
-	}()
-
-	app.Main()
-}
-
-func getConfigFiles(ctx context.Context) []string {
-	configFiles := make([]string, 0)
-
-	sharedStorageConfigFile := filepath.Join("/storage/emulated/0/Android/data", packageName, "files/config.json")
-	configFiles = append(configFiles, sharedStorageConfigFile)
-
-	dataDir, err := app.DataDir()
-	if err != nil {
-		logger.Error(ctx, "could not retrieve app data dir", logger.CapturedE(errors.WithStack(err)))
-	} else {
-		appDataConfigFile := filepath.Join(dataDir, "config.json")
-		configFiles = append(configFiles, appDataConfigFile)
-	}
-
-	return configFiles
-}

doc/configuration.md

@@ -19,7 +19,10 @@ Voici un exemple commenté du fichier de configuration:
   "http": {
     // Couple <address>:<port> d'écoute
     // Par défaut ":" i.e. toutes les adresses avec port aléatoire
-    "address": ":"
+    "address": ":",
+    // Répertoire de personnalisation de la page d'accueil
+    // Voir section "Personnalisation" ci-dessous
+    "customDir": "${CONFIG_DIR}/custom"
   },
   // Configuration du serveur HTTPS
   "https": {
@@ -48,3 +51,9 @@ Voici un exemple commenté du fichier de configuration:
   }
 }
 ```
+
+## Personnalisation
+
+Il est possible de personnaliser la page d'accueil du player Arcast en créant des fichiers dans le répertoire définit par l'attribut de configuration `http.customDir`.
+
+Le contenu de ce répertoire doit répliquer l'arborescence embarquée par défaut (voir https://forge.cadoles.com/arcad/arcast/src/branch/develop/pkg/server/embed). Chaque fichier présent remplacera celui embarqué par défaut.

go.mod

@@ -3,9 +3,7 @@ module forge.cadoles.com/arcad/arcast
 go 1.21.4
 
 require (
-	gioui.org v0.4.1
+	github.com/dschmidt/go-layerfs v0.1.0
-	github.com/davecgh/go-spew v1.1.1
-	github.com/gioui-plugins/gio-plugins v0.0.0-20230625001848-8f18aae6c91c
 	github.com/go-chi/cors v1.2.1
 	github.com/gorilla/websocket v1.5.1
 	github.com/grandcat/zeroconf v1.0.1-0.20230119201135-e4f60f8407b1
@@ -13,22 +11,17 @@ require (
 	github.com/pkg/errors v0.9.1
 	github.com/wlynxg/anet v0.0.1
 	github.com/zserge/lorca v0.1.10
+	golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f
 )
 
 require (
 	cdr.dev/slog v1.6.1 // indirect
-	gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 // indirect
-	gioui.org/shader v1.0.8 // indirect
-	git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 // indirect
 	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
 	github.com/charmbracelet/lipgloss v0.7.1 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
 	github.com/go-playground/locales v0.14.0 // indirect
 	github.com/go-playground/universal-translator v0.18.0 // indirect
-	github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 // indirect
-	github.com/inkeliz/go_inkwasm v0.0.0-20220912074516-049d3472c98a // indirect
-	github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e // indirect
 	github.com/jedib0t/go-pretty/v6 v6.4.9 // indirect
 	github.com/leodido/go-urn v1.2.1 // indirect
 	github.com/lucasb-eyer/go-colorful v1.2.0 // indirect
@@ -43,12 +36,8 @@ require (
 	go.opentelemetry.io/otel v1.21.0 // indirect
 	go.opentelemetry.io/otel/trace v1.21.0 // indirect
 	golang.org/x/crypto v0.16.0 // indirect
-	golang.org/x/exp v0.0.0-20221012211006-4de253d81b95 // indirect
-	golang.org/x/exp/shiny v0.0.0-20220921164117-439092de6870 // indirect
-	golang.org/x/image v0.5.0 // indirect
 	golang.org/x/mod v0.14.0 // indirect
 	golang.org/x/term v0.15.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/tools v0.16.1 // indirect
 	golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect
 	gopkg.in/go-playground/validator.v9 v9.29.1 // indirect

go.sum

@@ -8,19 +8,9 @@ cloud.google.com/go/logging v1.7.0 h1:CJYxlNNNNAMkHp9em/YEXcfJg+rPDg7YfwoRpMU+t5
 cloud.google.com/go/logging v1.7.0/go.mod h1:3xjP2CjkM3ZkO73aj4ASA5wRPGGCRrPIAeNqVNkzY8M=
 cloud.google.com/go/longrunning v0.5.1 h1:Fr7TXftcqTudoyRJa113hyaqlGdiBQkp0Gq7tErFDWI=
 cloud.google.com/go/longrunning v0.5.1/go.mod h1:spvimkwdz6SPWKEt/XBij79E9fiTkHSQl/fRUUQJYJc=
-eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d h1:ARo7NCVvN2NdhLlJE9xAbKweuI9L6UgfTbYb0YwPacY=
-eliasnaur.com/font v0.0.0-20230308162249-dd43949cb42d/go.mod h1:OYVuxibdk9OSLX8vAqydtRPP87PyTFcT9uH3MlEGBQA=
-gioui.org v0.4.1 h1:sCTw5Fexg0xg9CxYmbrkKtHXcobf0JMbl5XpF2TC/zc=
-gioui.org v0.4.1/go.mod h1:2atiYR4upH71/6ehnh6XsUELa7JZOrOHHNMDxGBZF0Q=
-gioui.org/cpu v0.0.0-20210808092351-bfe733dd3334/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
-gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7 h1:tNJdnP5CgM39PRc+KWmBRRYX/zJ+rd5XaYxY5d5veqA=
-gioui.org/cpu v0.0.0-20220412190645-f1e9e8c3b1f7/go.mod h1:A8M0Cn5o+vY5LTMlnRoK3O5kG+rH0kWfJjeKd9QpBmQ=
-gioui.org/shader v1.0.8 h1:6ks0o/A+b0ne7RzEqRZK5f4Gboz2CfG+mVliciy6+qA=
-gioui.org/shader v1.0.8/go.mod h1:mWdiME581d/kV7/iEhLmUgUK5iZ09XR5XpduXzbePVM=
-git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0 h1:bGG/g4ypjrCJoSvFrP5hafr9PPB5aw8SjcOWWila7ZI=
-git.wow.st/gmp/jni v0.0.0-20210610011705-34026c7e22d0/go.mod h1:+axXBRUTIDlCeE73IKeD/os7LoEnTKdkp8/gQOFjqyo=
 github.com/Bornholm/lorca v0.0.0-20240121134933-d5e83569cb4c h1:xG9xSpEqZYOvd1Bvx/36i3RBTA17d7XnuvoMIG+/ry8=
 github.com/Bornholm/lorca v0.0.0-20240121134933-d5e83569cb4c/go.mod h1:TUOtEogaMwy0b+p9e4NxZC1jbPRUaNaEw5DnjQF//F8=
+github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
 github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
@@ -32,8 +22,8 @@ github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46t
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/gioui-plugins/gio-plugins v0.0.0-20230625001848-8f18aae6c91c h1:naFDaf0CvDEYZ3Zpxx20DY/cCvBQqKwsV7ZzBt3M/bU=
+github.com/dschmidt/go-layerfs v0.1.0 h1:jE6aHDfjNzS/31DS48th6EkmELwTa1Uf+aO4jRkBs3U=
-github.com/gioui-plugins/gio-plugins v0.0.0-20230625001848-8f18aae6c91c/go.mod h1:nBuRsi6udr2x6eorarLHtRkoRaWBICt+WzaE7zQXgYY=
+github.com/dschmidt/go-layerfs v0.1.0/go.mod h1:m62aff0hn23Q/tQBRiNSeLD7EUuimDvsuCvCpzBr3Gw=
 github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
 github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
 github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
@@ -46,10 +36,6 @@ github.com/go-playground/locales v0.14.0 h1:u50s323jtVGugKlcYeyzC0etD1HifMjqmJqb
 github.com/go-playground/locales v0.14.0/go.mod h1:sawfccIbzZTqEDETgFXqTho0QybSa7l++s0DH+LDiLs=
 github.com/go-playground/universal-translator v0.18.0 h1:82dyy6p4OuJq4/CByFNOn/jYrnRPArHwAcmLoJZxyho=
 github.com/go-playground/universal-translator v0.18.0/go.mod h1:UvRDBj+xPUEGrFYl+lu/H90nyDXpg0fqeB/AQUGNTVA=
-github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372 h1:FQivqchis6bE2/9uF70M2gmmLpe82esEm2QadL0TEJo=
-github.com/go-text/typesetting v0.0.0-20230803102845-24e03d8b5372/go.mod h1:evDBbvNR/KaVFZ2ZlDSOWWXIUKq0wCOEtzLxRM8SG3k=
-github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22 h1:LBQTFxP2MfsyEDqSKmUBZaDuDHN1vpqDyOZjcqS7MYI=
-github.com/go-text/typesetting-utils v0.0.0-20230616150549-2a7df14b6a22/go.mod h1:DDxDdQEnB70R8owOx3LVpEFvpMK9eeH1o2r0yZhFI9o=
 github.com/golang/protobuf v1.5.3 h1:KhyjKVUg7Usr/dYsdSqoFveMYd5ko72D+zANwlG1mmg=
 github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
@@ -58,12 +44,8 @@ github.com/gorilla/websocket v1.5.1 h1:gmztn0JnHVt9JZquRuzLw3g4wouNVzKL15iLr/zn/
 github.com/gorilla/websocket v1.5.1/go.mod h1:x3kM2JMyaluk02fnUJpQuwD2dCS5NDG2ZHL0uE0tcaY=
 github.com/grandcat/zeroconf v1.0.1-0.20230119201135-e4f60f8407b1 h1:cNb52t5fkWv8ZiicKWnc2eZnhsCCoH7WmRBMIbMp04Q=
 github.com/grandcat/zeroconf v1.0.1-0.20230119201135-e4f60f8407b1/go.mod h1:I6CSXU4zCGL08JOk9NbcT0ofAgnIkS/fVXbYzfSoDic=
-github.com/inkeliz/go_inkwasm v0.0.0-20220912074516-049d3472c98a h1:uZklbtdSPrDL/d1EUKd9s8a0Byla2TT01Wg/GZ4xj0w=
-github.com/inkeliz/go_inkwasm v0.0.0-20220912074516-049d3472c98a/go.mod h1:LPI3Qojj7OgTyc2R4RPB6BuMSgjoOXCObwnDzz1SOVk=
 github.com/jaevor/go-nanoid v1.3.0 h1:nD+iepesZS6pr3uOVf20vR9GdGgJW1HPaR46gtrxzkg=
 github.com/jaevor/go-nanoid v1.3.0/go.mod h1:SI+jFaPuddYkqkVQoNGHs81navCtH388TcrH0RqFKgY=
-github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e h1:Q3+PugElBCf4PFpxhErSzU3/PY5sFL5Z6rfv4AbGAck=
-github.com/jchv/go-winloader v0.0.0-20210711035445-715c2860da7e/go.mod h1:alcuEEnZsY1WQsagKhZDsoPCRoOijYqhZvPwLG0kzVs=
 github.com/jedib0t/go-pretty/v6 v6.4.9 h1:vZ6bjGg2eBSrJn365qlxGcaWu09Id+LHtrfDWlB2Usc=
 github.com/jedib0t/go-pretty/v6 v6.4.9/go.mod h1:Ndk3ase2CkQbXLLNf5QDHoYb6J9WtVfmHZu9n8rk2xs=
 github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w=
@@ -88,6 +70,8 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE
 github.com/pkg/profile v1.6.0/go.mod h1:qBsxPvzyUincmltOk6iyRVxHYg4adc0OFOv72ZdLa18=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/psanford/memfs v0.0.0-20210214183328-a001468d78ef h1:NKxTG6GVGbfMXc2mIk+KphcH6hagbVXhcFkbTgYleTI=
+github.com/psanford/memfs v0.0.0-20210214183328-a001468d78ef/go.mod h1:tcaRap0jS3eifrEEllL6ZMd9dg8IlDpi2S1oARrQ+NI=
 github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
 github.com/rivo/uniseg v0.4.4 h1:8TfxU8dW6PdqD27gjM8MVNuicgxIjxpm4K7x4jp8sis=
@@ -107,7 +91,6 @@ github.com/wlynxg/anet v0.0.1 h1:VbkEEgHxPSrRQSiyRd0pmrbcEQAEU2TTb8fb4DmSYoQ=
 github.com/wlynxg/anet v0.0.1/go.mod h1:eay5PRQr7fIVAMbTbchTnO9gG65Hg/uYGdc7mguHxoA=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673 h1:bAn7/zixMGCfxrRTfdpNzjtPYqr8smhKouy9mxVdGPU=
 github.com/xrash/smetrics v0.0.0-20201216005158-039620a65673/go.mod h1:N3UwUGtsrSj3ccvlPHLoLsHnpR27oXr4ZE984MbSER8=
-github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 gitlab.com/wpetit/goweb v0.0.0-20231215190137-4a8add1d3d07 h1:0V95X1cBpdj5zyOe6oGtn/BQHlRpV8WlL3eTs3jaxiA=
 gitlab.com/wpetit/goweb v0.0.0-20231215190137-4a8add1d3d07/go.mod h1:Nfr7aZPiSN6biFumhiHbh9k8A3rKQRzR+o0bVtv78UY=
 go.opentelemetry.io/otel v1.21.0 h1:hzLeKBZEL7Okw2mGzZ0cc4k/A7Fta0uoPgaJCr8fsFc=
@@ -119,60 +102,59 @@ go.opentelemetry.io/otel/sdk v1.16.0/go.mod h1:tMsIuKXuuIWPBAOrH+eHtvhTL+SntFtXF
 go.opentelemetry.io/otel/trace v1.21.0 h1:WD9i5gzvoUPuXIXH24ZNBudiarZDKuekPqi/E8fpfLc=
 go.opentelemetry.io/otel/trace v1.21.0/go.mod h1:LGbsEB0f9LGjN+OZaQQ26sohbOmiMR+BaslueVtS/qQ=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
-golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
+golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.16.0 h1:mMMrFzRSCF0GvB7Ne27XVtVAaXLrPmgPC7/v0tkwHaY=
 golang.org/x/crypto v0.16.0/go.mod h1:gCAAfMLgwOJRpTjQ2zCCt2OcSfYMTeZVSRtQlPC7Nq4=
-golang.org/x/exp v0.0.0-20221012211006-4de253d81b95 h1:sBdrWpxhGDdTAYNqbgBLAR+ULAPPhfgncLr1X0lyWtg=
+golang.org/x/exp v0.0.0-20190731235908-ec7cb31e5a56/go.mod h1:JhuoJpWY28nO4Vef9tZUw9qufEGTyX1+7lmHxV5q5G4=
-golang.org/x/exp v0.0.0-20221012211006-4de253d81b95/go.mod h1:cyybsKvd6eL0RnXn6p/Grxp8F5bW7iYuBgsNCOHpMYE=
+golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js=
-golang.org/x/exp/shiny v0.0.0-20220921164117-439092de6870 h1:GjCs9zNN8fojJskeK7QiiVecCaMk0dfGTyL6IUcmp0o=
+golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0=
-golang.org/x/exp/shiny v0.0.0-20220921164117-439092de6870/go.mod h1:VjAR7z0ngyATZTELrBSkxOOHhhlnVUxDye4mcjx5h/8=
+golang.org/x/mobile v0.0.0-20190312151609-d3739f865fa6/go.mod h1:z+o9i4GpDbdi3rU15maQ/Ox0txvL9dWGYEHz965HBQE=
-golang.org/x/image v0.5.0 h1:5JMiNunQeQw++mMOz48/ISeNu3Iweh/JaZU8ZLqHRrI=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f h1:kgfVkAEEQXXQ0qc6dH7n6y37NAYmTFmz0YRwrRjgxKw=
-golang.org/x/image v0.5.0/go.mod h1:FVC7BI/5Ym8R25iw5OLsgshdUBbT1h5jZTpA+mvAdZ4=
+golang.org/x/mobile v0.0.0-20201217150744-e6ae53a27f4f/go.mod h1:skQtrUTUwhdJvXM/2KKJzY8pDgNr9I/FOMqDVRPBUS4=
-golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
+golang.org/x/mod v0.1.0/go.mod h1:0QHyrYULN0/3qlju5TqG8bIK38QM8yzMo5ekMj3DlcY=
+golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
+golang.org/x/mod v0.1.1-0.20191209134235-331c550502dd/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.14.0 h1:dGoOF9QVLYng8IHTm7BAyWqCqSheQ5pYWGhzW00YJr0=
 golang.org/x/mod v0.14.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
 golang.org/x/net v0.0.0-20210423184538-5f58ad60dda6/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk=
-golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.19.0 h1:zTwKpTd2XuCqf8huc7Fo2iSy+4RHPd10s4KzeTnVr1c=
 golang.org/x/net v0.19.0/go.mod h1:CfAk/cbD4CthTvqiEl8NpboMuiuOYsAr/7NOjZJtv1U=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.5.0 h1:60k92dhOjHxJkrqnwsfl8KuaHbn/5dl0lUPUklKo3qE=
 golang.org/x/sync v0.5.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
-golang.org/x/sys v0.0.0-20200810151505-1b9f1253b3ed/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210426080607-c94f62235c83/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
-golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.15.0 h1:h48lPFYpsTvQJZF4EKyI4aLHaev3CxivZmv7yZig9pc=
 golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
-golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.15.0 h1:y/Oo/a/q3IXu26lQgl04j/gjuBDOBlx7X6Om1j2CPW4=
 golang.org/x/term v0.15.0/go.mod h1:BDl952bC7+uMoWR75FIrCDx79TPU9oHkTZ9yRbYOrX0=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
-golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
 golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ=
 golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
-golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
+golang.org/x/tools v0.0.0-20200117012304-6edc0a871e69/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
 golang.org/x/tools v0.16.1 h1:TLyB3WofjdOEepBHAU20JdNC1Zbg87elYofWYAY5oZA=
 golang.org/x/tools v0.16.1/go.mod h1:kYVVN6I1mBNoB1OX+noeBjbRk4IUEPa7JJ+TJMEooJ0=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 h1:+cNy6SZtPcJQH3LJVLOSmiC7MMxXNOb3PU/VUEz+EhU=
 golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028/go.mod h1:NDW/Ps6MPRej6fsCIbMTohpP40sJ/P/vI1MoTEGwX90=
 google.golang.org/genproto v0.0.0-20230726155614-23370e0ffb3e h1:xIXmWJ303kJCuogpj0bHq+dcjcZHU+XFyc1I0Yl9cRg=

internal/command/main.go

@@ -10,11 +10,12 @@ import (
 	"gitlab.com/wpetit/goweb/logger"
 )
 
-func Main(name string, usage string, commands ...*cli.Command) {
+func Main(name string, usage string, version string, commands ...*cli.Command) {
 	app := &cli.App{
 		Name:     name,
 		Usage:    usage,
 		Commands: commands,
+		Version:  version,
 		Before: func(ctx *cli.Context) error {
 			workdir := ctx.String("workdir")
 			// Switch to new working directory if defined

internal/command/player/run.go

@@ -68,6 +68,11 @@ func Run() *cli.Command {
 				EnvVars: []string{"ARCAST_DESKTOP_ALLOWED_ORIGINS"},
 				Value:   cli.NewStringSlice(),
 			},
+			&cli.StringFlag{
+				Name:    "custom-files-dir",
+				EnvVars: []string{"ARCAST_DESKTOP_CUSTOM_FILES_DIR"},
+				Value:   "",
+			},
 			&cli.BoolFlag{
 				Name:    "dummy-browser",
 				EnvVars: []string{"ARCAST_DESKTOP_DUMMY_BROWSER"},
@@ -114,21 +119,11 @@ func Run() *cli.Command {
 
 			conf := config.DefaultConfig()
 
-			logger.Info(ctx.Context, "loading or creating configuration file", logger.F("filename", configFile))
-			if err := config.LoadOrCreate(ctx.Context, configFile, conf, config.DefaultTransforms...); err != nil {
-				logger.Error(ctx.Context, "could not load configuration file", logger.CapturedE(errors.WithStack(err)))
-			}
-
 			instanceID := ctx.String("instance-id")
 			if instanceID != "" {
 				conf.InstanceID = instanceID
 			}
 
-			cert, err := tls.X509KeyPair(conf.HTTPS.Cert, conf.HTTPS.Key)
-			if err != nil {
-				return errors.Wrap(err, "could not parse tls cert/key pair")
-			}
-
 			if ctx.IsSet("apps") {
 				conf.Apps.Enabled = ctx.Bool("apps")
 			}
@@ -145,6 +140,20 @@ func Run() *cli.Command {
 				conf.AllowedOrigins = ctx.StringSlice("allowed-origins")
 			}
 
+			if ctx.IsSet("custom-dir") {
+				conf.HTTP.CustomDir = ctx.String("custom-dir")
+			}
+
+			logger.Info(ctx.Context, "loading or creating configuration file", logger.F("filename", configFile))
+			if err := config.LoadOrCreate(ctx.Context, configFile, conf, config.DefaultTransforms...); err != nil {
+				logger.Error(ctx.Context, "could not load configuration file", logger.CapturedE(errors.WithStack(err)))
+			}
+
+			cert, err := tls.X509KeyPair(conf.HTTPS.Cert, conf.HTTPS.Key)
+			if err != nil {
+				return errors.Wrap(err, "could not parse tls cert/key pair")
+			}
+
 			server := server.New(browser,
 				server.WithInstanceID(conf.InstanceID),
 				server.WithAppsEnabled(conf.Apps.Enabled),
@@ -154,6 +163,7 @@ func Run() *cli.Command {
 				server.WithTLSAddress(conf.HTTPS.Address),
 				server.WithTLSCertificate(&cert),
 				server.WithAllowedOrigins(conf.AllowedOrigins...),
+				server.WithUpperLayerDir(conf.HTTP.CustomDir),
 			)
 
 			if err := server.Start(); err != nil {

misc/packaging/player.desktop

@@ -0,0 +1,14 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Arcast Player
+GenericName=Web diffusion player
+Exec=arcast-player run --additional-chrome-arg incognito --additional-chrome-arg start-maximized
+Icon=arcast-player
+Terminal=false
+Categories=Network;Utility
+Actions=Kiosk
+
+[Desktop Action Kiosk]
+Name=Start in kiosk mode
+Exec=arcast-player run --additional-chrome-arg incognito --additional-chrome-arg kiosk

modd.conf

@@ -3,7 +3,7 @@
 }
 
 **/*.go
-pkg/server/templates/**.gotmpl
+pkg/server/embed/**
 modd.conf
 .env {
     prep: make build-client

pkg/android/binding.go

@@ -0,0 +1,86 @@
+package android
+
+import (
+	"context"
+	"crypto/tls"
+	"net"
+	"path/filepath"
+
+	"forge.cadoles.com/arcad/arcast"
+	"forge.cadoles.com/arcad/arcast/pkg/browser/proxy"
+	"forge.cadoles.com/arcad/arcast/pkg/config"
+	"forge.cadoles.com/arcad/arcast/pkg/server"
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/logger"
+)
+
+var (
+	browser = proxy.NewBrowser()
+)
+
+func SetBridge(bridge Bridge) {
+	browser.SetLoadURL(bridge.LoadURL)
+	browser.SetGetTitle(bridge.GetTitle)
+	browser.SetGetURL(bridge.GetURL)
+}
+
+func StartServer(dataDir string) string {
+	ctx := context.Background()
+
+	conf := config.DefaultConfig()
+	filename := filepath.Join(dataDir, "config.json")
+
+	logger.Info(ctx, "loading or creating configuration file", logger.F("filename", filename))
+	if err := config.LoadOrCreate(ctx, filename, conf, config.DefaultTransforms...); err != nil {
+		logger.Error(ctx, "could not load configuration file", logger.CapturedE(errors.WithStack(err)))
+	}
+
+	go func() {
+		for {
+			runServer(ctx, conf)
+		}
+	}()
+
+	_, port, err := net.SplitHostPort(conf.HTTP.Address)
+	if err != nil {
+		panic(errors.Wrap(err, "could not parse server listening address"))
+	}
+
+	return port
+}
+
+func runServer(ctx context.Context, conf *config.Config) {
+	ctx, cancel := context.WithCancel(ctx)
+	defer cancel()
+
+	cert, err := tls.X509KeyPair(conf.HTTPS.Cert, conf.HTTPS.Key)
+	if err != nil {
+		logger.Fatal(ctx, "could not parse x509 certificate", logger.CapturedE(errors.WithStack(err)))
+	}
+
+	server := server.New(
+		browser,
+		server.WithInstanceID(conf.InstanceID),
+		server.WithAppsEnabled(conf.Apps.Enabled),
+		server.WithDefaultApp(conf.Apps.DefaultApp),
+		server.WithApps(arcast.DefaultApps...),
+		server.WithTLSCertificate(&cert),
+		server.WithAddress(conf.HTTP.Address),
+		server.WithTLSAddress(conf.HTTPS.Address),
+		server.WithAllowedOrigins(conf.AllowedOrigins...),
+	)
+
+	if err := server.Start(); err != nil {
+		logger.Fatal(ctx, "could not start server", logger.CapturedE(errors.WithStack(err)))
+	}
+
+	defer func() {
+		if err := server.Stop(); err != nil {
+			logger.Error(ctx, "could not stop server", logger.CapturedE(errors.WithStack(err)))
+		}
+	}()
+
+	if err := server.Wait(); err != nil {
+		logger.Error(ctx, "could not wait for server", logger.CapturedE(errors.WithStack(err)))
+	}
+}

pkg/android/bridge.go

@@ -0,0 +1,11 @@
+package android
+
+import (
+	_ "golang.org/x/mobile/bind"
+)
+
+type Bridge interface {
+	LoadURL(url string)
+	GetTitle() string
+	GetURL() string
+}

pkg/browser/gioui/browser.go

@@ -1,129 +0,0 @@
-package gioui
-
-import (
-	"context"
-	"sync"
-
-	"forge.cadoles.com/arcad/arcast/pkg/browser"
-	"gioui.org/app"
-	"gioui.org/f32"
-	"gioui.org/layout"
-	"github.com/gioui-plugins/gio-plugins/webviewer"
-	"gitlab.com/wpetit/goweb/logger"
-)
-
-type Browser struct {
-	window *app.Window
-	tag    int
-
-	url     string
-	changed bool
-
-	status browser.Status
-	title  string
-
-	mutex sync.Mutex
-}
-
-func (b *Browser) Layout(gtx layout.Context) {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	events := gtx.Events(&b.tag)
-	for _, evt := range events {
-		switch ev := evt.(type) {
-		case webviewer.TitleEvent:
-			b.title = ev.Title
-		case webviewer.NavigationEvent:
-			b.url = ev.URL
-		}
-	}
-
-	ctx := context.Background()
-	logger.Debug(ctx, "drawing")
-
-	webviewer.WebViewOp{Tag: &b.tag}.Push(gtx.Ops)
-
-	webviewer.OffsetOp{
-		Point: f32.Point{
-			X: 0,
-			Y: 0,
-		},
-	}.Add(gtx.Ops)
-
-	webviewer.RectOp{
-		Size: f32.Point{
-			X: float32(gtx.Constraints.Max.X),
-			Y: float32(gtx.Constraints.Max.Y),
-		},
-	}.Add(gtx.Ops)
-
-	if b.changed {
-		logger.Debug(ctx, "url changed", logger.F("url", b.url))
-		webviewer.NavigateOp{URL: b.url}.Add(gtx.Ops)
-		b.changed = false
-	}
-}
-
-// Load implements browser.Browser.
-func (b *Browser) Load(url string) error {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	b.url = url
-	b.changed = true
-	b.status = browser.StatusCasting
-
-	b.window.Invalidate()
-
-	return nil
-}
-
-// Status implements browser.Browser.
-func (b *Browser) Status() (browser.Status, error) {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	return b.status, nil
-}
-
-// Title implements browser.Browser.
-func (b *Browser) Title() (string, error) {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	return b.title, nil
-}
-
-// URL implements browser.Browser.
-func (b *Browser) URL() (string, error) {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	return b.url, nil
-}
-
-// Reset implements browser.Browser.
-func (b *Browser) Reset(url string) error {
-	b.mutex.Lock()
-	defer b.mutex.Unlock()
-
-	b.url = url
-	b.changed = true
-	b.status = browser.StatusIdle
-
-	b.window.Invalidate()
-
-	return nil
-}
-
-func NewBrowser(window *app.Window) *Browser {
-	return &Browser{
-		window:  window,
-		url:     "",
-		changed: true,
-		status:  browser.StatusIdle,
-	}
-}
-
-var _ browser.Browser = &Browser{}

pkg/browser/proxy/browser.go

@@ -0,0 +1,110 @@
+package proxy
+
+import (
+	"sync"
+
+	"forge.cadoles.com/arcad/arcast/pkg/browser"
+	"github.com/pkg/errors"
+)
+
+var (
+	ErrNotInitialized = errors.New("not initialized")
+)
+
+type Browser struct {
+	loadURL  func(url string)
+	getURL   func() string
+	getTitle func() string
+
+	status browser.Status
+	mutex  sync.RWMutex
+}
+
+// Load implements browser.Browser.
+func (b *Browser) Load(url string) error {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	if b.loadURL == nil {
+		return errors.WithStack(ErrNotInitialized)
+	}
+
+	b.loadURL(url)
+	b.status = browser.StatusCasting
+
+	return nil
+}
+
+// Reset implements browser.Browser.
+func (b *Browser) Reset(url string) error {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	if b.loadURL == nil {
+		return errors.WithStack(ErrNotInitialized)
+	}
+
+	b.loadURL(url)
+	b.status = browser.StatusIdle
+
+	return nil
+}
+
+// Status implements browser.Browser.
+func (b *Browser) Status() (browser.Status, error) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
+
+	return b.status, nil
+}
+
+// Title implements browser.Browser.
+func (b *Browser) Title() (string, error) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
+
+	if b.getTitle == nil {
+		return "", errors.WithStack(ErrNotInitialized)
+	}
+
+	return b.getTitle(), nil
+}
+
+// URL implements browser.Browser.
+func (b *Browser) URL() (string, error) {
+	b.mutex.RLock()
+	defer b.mutex.RUnlock()
+
+	if b.getURL == nil {
+		return "", errors.WithStack(ErrNotInitialized)
+	}
+
+	return b.getURL(), nil
+}
+
+func (b *Browser) SetLoadURL(fn func(url string)) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	b.loadURL = fn
+}
+
+func (b *Browser) SetGetTitle(fn func() string) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	b.getTitle = fn
+}
+
+func (b *Browser) SetGetURL(fn func() string) {
+	b.mutex.Lock()
+	defer b.mutex.Unlock()
+
+	b.getURL = fn
+}
+
+func NewBrowser() *Browser {
+	return &Browser{}
+}
+
+var _ browser.Browser = &Browser{}

pkg/config/config.go

@@ -21,6 +21,7 @@ type Config struct {
 
 type HTTPConfig struct {
 	Address   string `json:"address"`
+	CustomDir string `json:"customDir"`
 }
 
 type HTTPSConfig struct {
@@ -40,7 +41,7 @@ type AppsConfig struct {
 	DefaultApp string `json:"defaultApp"`
 }
 
-type TransformFunc func(ctx context.Context, conf *Config) error
+type TransformFunc func(ctx context.Context, filename string, conf *Config) error
 
 func DefaultConfigFile(ctx context.Context) string {
 	configDir, err := os.UserConfigDir()
@@ -64,12 +65,12 @@ func LoadOrCreate(ctx context.Context, filename string, conf *Config, funcs ...T
 
 	if data != nil {
 		if err := json.Unmarshal(data, conf); err != nil {
-			return errors.WithStack(err)
+			logger.Error(ctx, "could not parse configuration file", logger.CapturedE(errors.WithStack(err)))
 		}
 	}
 
 	for _, fn := range funcs {
-		if err := fn(ctx, conf); err != nil {
+		if err := fn(ctx, filename, conf); err != nil {
 			return errors.WithStack(err)
 		}
 	}
@@ -100,6 +101,7 @@ func DefaultConfig() *Config {
 		AllowedOrigins: []string{},
 		HTTP: HTTPConfig{
 			Address:   ":45555",
+			CustomDir: "",
 		},
 		HTTPS: HTTPSConfig{
 			Address: ":45556",

pkg/config/custom_files.go

@@ -0,0 +1,28 @@
+package config
+
+import (
+	"context"
+	"os"
+	"path/filepath"
+
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/logger"
+)
+
+func CreateCustomDir(ctx context.Context, filename string, conf *Config) error {
+	if conf.HTTP.CustomDir != "" {
+		return nil
+	}
+
+	configDir := filepath.Dir(filename)
+	customFilesDir := filepath.Join(configDir, "custom")
+
+	if err := os.MkdirAll(customFilesDir, 0755); err != nil {
+		logger.Error(ctx, "could not create custom files directory", logger.CapturedE(errors.WithStack(err)))
+		return nil
+	}
+
+	conf.HTTP.CustomDir = customFilesDir
+
+	return nil
+}

pkg/config/default_transforms.go

@@ -3,4 +3,5 @@ package config
 var DefaultTransforms = []TransformFunc{
 	GenerateSelfSignedCert,
 	RenewExpiredSelfSignedCert,
+	CreateCustomDir,
 }

pkg/config/selfsigned.go

@@ -15,7 +15,7 @@ import (
 	"gitlab.com/wpetit/goweb/logger"
 )
 
-func GenerateSelfSignedCert(ctx context.Context, conf *Config) error {
+func GenerateSelfSignedCert(ctx context.Context, filename string, conf *Config) error {
 	if !conf.HTTPS.SelfSigned.Enabled {
 		return nil
 	}
@@ -42,13 +42,13 @@ func GenerateSelfSignedCert(ctx context.Context, conf *Config) error {
 	return nil
 }
 
-func RenewExpiredSelfSignedCert(ctx context.Context, conf *Config) error {
+func RenewExpiredSelfSignedCert(ctx context.Context, filename string, conf *Config) error {
 	if !conf.HTTPS.SelfSigned.Enabled {
 		return nil
 	}
 
 	if conf.HTTPS.Cert == nil || conf.HTTPS.Key == nil {
-		if err := GenerateSelfSignedCert(ctx, conf); err != nil {
+		if err := GenerateSelfSignedCert(ctx, filename, conf); err != nil {
 			return errors.WithStack(err)
 		}
 	}
@@ -62,7 +62,7 @@ func RenewExpiredSelfSignedCert(ctx context.Context, conf *Config) error {
 	if err != nil {
 		logger.Error(ctx, "could not parse x509 certificate, regenerating one", logger.CapturedE(errors.WithStack(err)))
 
-		if err := GenerateSelfSignedCert(ctx, conf); err != nil {
+		if err := GenerateSelfSignedCert(ctx, filename, conf); err != nil {
 			return errors.WithStack(err)
 		}
 	}
@@ -74,7 +74,7 @@ func RenewExpiredSelfSignedCert(ctx context.Context, conf *Config) error {
 
 	logger.Warn(ctx, "self-signed certificate has expired, regenerating one", logger.CapturedE(errors.WithStack(err)))
 
-	if err := GenerateSelfSignedCert(ctx, conf); err != nil {
+	if err := GenerateSelfSignedCert(ctx, filename, conf); err != nil {
 		return errors.WithStack(err)
 	}
 

pkg/server/embed/_partials/base.gohtml

@@ -0,0 +1,64 @@
+{{ define "base" }}
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <link rel="icon" type="image/x-icon" href="/logo.png" />
+    <title>Ready to cast !</title>
+    <link rel="stylesheet" href="style.css" />
+    {{ block "head" .
+    }}{{
+      end
+    }}
+  </head>
+  <body>
+    <div class="container">
+      <div class="panel">
+        <div id="icon"></div>
+        {{ block "message" . }}
+        <h2 id="title" class="text-centered">Ready to cast !</h2>
+        {{ end }}
+        {{ block "info" . }}
+        <p><b>Instance ID</b></p>
+        <p class="text-small text-centered">
+          <code>{{ .ID }}</code>
+        </p>
+        <p><b>Addresses</b></p>
+        <ul class="text-italic text-small text-centered">
+          {{ $port := .Port }}
+          {{
+            range.IPs
+          }}
+          <li>
+            <code>{{ . }}:{{ $port }}</code>
+          </li>
+          {{
+            end
+          }}
+        </ul>
+        {{ end }}
+        {{if .Apps }}
+        {{ block "apps" . }}
+        <p><b>Apps</b></p>
+        <ul class="text-italic text-small text-centered">
+          {{ $tlsPort := .TLSPort }}
+          {{
+            range.IPs
+          }}
+          <li>
+            <a href="https://{{ . }}:{{ $tlsPort }}/apps">
+              https://{{ . }}:{{ $tlsPort }}/apps
+            </a>
+          </li>
+          {{
+            end
+          }}
+        </ul>
+        {{ end }}
+        {{ end }}
+      </div>
+    </div>
+  </body>
+</html>
+{{ end }}

pkg/server/embed/_templates/index.gohtml

@@ -0,0 +1,3 @@
+{{ define "index" }}
+{{ template "base" . }}
+{{ end }}

pkg/server/embed/style.css

@@ -0,0 +1,121 @@
+html {
+  box-sizing: border-box;
+  font-size: 16px;
+  width: 100%;
+  height: 100%;
+}
+
+body {
+  font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", "Roboto", "Oxygen",
+    "Ubuntu", "Cantarell", "Fira Sans", "Droid Sans", "Helvetica Neue",
+    sans-serif;
+  width: 100%;
+  height: 100%;
+  background: rgb(76, 96, 188);
+  background: linear-gradient(
+    415deg,
+    rgba(4, 168, 243, 1),
+    rgb(76, 136, 188, 1),
+    rgba(76, 96, 188, 1),
+    rgb(115, 76, 188, 1),
+    rgb(87, 76, 188, 1)
+  );
+  background-size: 400% 400%;
+  animation: gradient 15s ease infinite;
+}
+
+@keyframes gradient {
+  0% {
+    background-position: 0% 50%;
+  }
+  50% {
+    background-position: 100% 50%;
+  }
+  100% {
+    background-position: 0% 50%;
+  }
+}
+
+*,
+*:before,
+*:after {
+  box-sizing: inherit;
+}
+
+ol,
+ul {
+  list-style: none;
+}
+
+body,
+h1,
+h2,
+h3,
+h4,
+h5,
+h6,
+p,
+ol,
+ul {
+  margin: 0;
+  padding: 0;
+  font-weight: normal;
+}
+
+.container {
+  width: 100%;
+  height: 100%;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+}
+
+.panel {
+  display: block;
+  background-color: #fff;
+  border-radius: 15px;
+  box-shadow: 10px 10px 10px #33333361;
+  position: relative;
+  padding: 50px 30px 30px 30px;
+  min-width: 50%;
+  color: #333;
+}
+
+#title {
+  margin: 10px 0px 20px 0px;
+}
+
+#icon {
+  width: 100px;
+  aspect-ratio: 1/1;
+  background-size: contain;
+  background-position: center center;
+  background-image: url("logo.png");
+  position: absolute;
+  left: 50%;
+  margin-left: -50px;
+  margin-top: -100px;
+  background-repeat: no-repeat;
+}
+
+.panel p,
+.panel ul {
+  margin-top: 10px;
+}
+
+.text-centered {
+  text-align: center;
+}
+
+.text-italic {
+  font-style: italic;
+}
+
+.text-small {
+  font-size: 0.8em;
+}
+
+.mt {
+  margin-top: 1em;
+  display: block;
+}

pkg/server/fs.go

@@ -0,0 +1,90 @@
+package server
+
+import (
+	"embed"
+	"html/template"
+	"io/fs"
+	"net/http"
+	"os"
+	"strings"
+
+	"forge.cadoles.com/arcad/arcast/pkg/network"
+	"github.com/dschmidt/go-layerfs"
+	"github.com/pkg/errors"
+	"gitlab.com/wpetit/goweb/logger"
+
+	_ "embed"
+)
+
+var (
+	//go:embed embed/**
+	embedFS embed.FS
+)
+
+func (s *Server) initLayeredFS() error {
+	layers := make([]fs.FS, 0)
+
+	if s.upperLayerDir != "" {
+		upperLayer := os.DirFS(s.upperLayerDir)
+		layers = append(layers, upperLayer)
+	}
+
+	baseLayer, err := fs.Sub(embedFS, "embed")
+	if err != nil {
+
+		return errors.WithStack(err)
+	}
+
+	layers = append(layers, baseLayer)
+
+	s.layeredFS = layerfs.New(layers...)
+
+	return nil
+}
+
+func (s *Server) handleStatic(w http.ResponseWriter, r *http.Request) {
+	path := r.URL.Path
+
+	if strings.HasPrefix(path, "/_templates") {
+		http.Error(w, http.StatusText(http.StatusNotFound), http.StatusNotFound)
+		return
+	}
+
+	http.ServeFileFS(w, r, s.layeredFS, path)
+}
+
+func (s *Server) handleIndex(w http.ResponseWriter, r *http.Request) {
+	type templateData struct {
+		IPs     []string
+		Port    int
+		TLSPort int
+		ID      string
+		Apps    bool
+	}
+
+	ips, err := network.GetLANIPv4Addrs()
+	if err != nil {
+		logger.Error(r.Context(), "could not retrieve lan ip addresses", logger.CapturedE(errors.WithStack(err)))
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		return
+	}
+
+	d := templateData{
+		ID:      s.instanceID,
+		IPs:     ips,
+		Port:    s.port,
+		TLSPort: s.tlsPort,
+		Apps:    s.appsEnabled,
+	}
+
+	templates, err := template.New("").ParseFS(s.layeredFS, "_partials/*.gohtml", "_templates/*.gohtml")
+	if err != nil {
+		logger.Error(r.Context(), "could not parse template", logger.CapturedE(errors.WithStack(err)))
+		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
+		return
+	}
+
+	if err := templates.ExecuteTemplate(w, "index", d); err != nil {
+		logger.Error(r.Context(), "could not render index page", logger.CapturedE(errors.WithStack(err)))
+	}
+}

pkg/server/http.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"crypto/tls"
 	"fmt"
-	"html/template"
 	"net"
 	"net/http"
 	"strconv"
@@ -14,25 +13,8 @@ import (
 	"github.com/go-chi/cors"
 	"github.com/pkg/errors"
 	"gitlab.com/wpetit/goweb/logger"
-
-	_ "embed"
 )
 
-var (
-	//go:embed templates/idle.html.gotmpl
-	rawIdleTemplate []byte
-	idleTemplate    *template.Template
-)
-
-func init() {
-	tmpl, err := template.New("").Parse(string(rawIdleTemplate))
-	if err != nil {
-		panic(errors.Wrap(err, "could not parse idle template"))
-	}
-
-	idleTemplate = tmpl
-}
-
 func (s *Server) startWebServers(ctx context.Context) error {
 	router := chi.NewRouter()
 
@@ -50,7 +32,6 @@ func (s *Server) startWebServers(ctx context.Context) error {
 		}))
 	}
 
-	router.Get("/", s.handleHome)
 	router.Get("/api/v1/info", s.handleInfo)
 	router.Post("/api/v1/cast", s.handleCast)
 	router.Delete("/api/v1/cast", s.handleReset)
@@ -63,6 +44,9 @@ func (s *Server) startWebServers(ctx context.Context) error {
 		router.Handle("/api/v1/broadcast/{channelID}", http.HandlerFunc(s.handleBroadcast))
 	}
 
+	router.Get("/", s.handleIndex)
+	router.Get("/*", s.handleStatic)
+
 	if err := s.startHTTPServer(ctx, router); err != nil {
 		return errors.WithStack(err)
 	}
@@ -193,32 +177,3 @@ func (s *Server) getAllowedOrigins() ([]string, error) {
 
 	return allowedOrigins, nil
 }
-
-func (s *Server) handleHome(w http.ResponseWriter, r *http.Request) {
-	type templateData struct {
-		IPs     []string
-		Port    int
-		TLSPort int
-		ID      string
-		Apps    bool
-	}
-
-	ips, err := network.GetLANIPv4Addrs()
-	if err != nil {
-		logger.Error(r.Context(), "could not retrieve lan ip addresses", logger.CapturedE(errors.WithStack(err)))
-		http.Error(w, http.StatusText(http.StatusInternalServerError), http.StatusInternalServerError)
-		return
-	}
-
-	d := templateData{
-		ID:      s.instanceID,
-		IPs:     ips,
-		Port:    s.port,
-		TLSPort: s.tlsPort,
-		Apps:    s.appsEnabled,
-	}
-
-	if err := idleTemplate.Execute(w, d); err != nil {
-		logger.Error(r.Context(), "could not render idle page", logger.CapturedE(errors.WithStack(err)))
-	}
-}

pkg/server/options.go

@@ -28,6 +28,7 @@ type Options struct {
 	DefaultApp             string
 	AllowedOrigins         []string
 	Apps                   []App
+	UpperLayerDir          string
 }
 
 type OptionFunc func(opts *Options)
@@ -42,6 +43,7 @@ func NewOptions(funcs ...OptionFunc) *Options {
 		DefaultApp:             "",
 		AllowedOrigins:         make([]string, 0),
 		Apps:                   make([]App, 0),
+		UpperLayerDir:          "",
 	}
 
 	for _, fn := range funcs {
@@ -105,6 +107,12 @@ func WithServiceDiscoveryEnabled(enabled bool) OptionFunc {
 	}
 }
 
+func WithUpperLayerDir(dir string) OptionFunc {
+	return func(opts *Options) {
+		opts.UpperLayerDir = dir
+	}
+}
+
 func NewRandomInstanceID() string {
 	return newRandomInstanceID()
 }

pkg/server/server.go

@@ -3,6 +3,7 @@ package server
 import (
 	"context"
 	"crypto/tls"
+	"io/fs"
 
 	"forge.cadoles.com/arcad/arcast/pkg/browser"
 	"github.com/gorilla/websocket"
@@ -32,10 +33,19 @@ type Server struct {
 	ctx      context.Context
 	cancel   context.CancelFunc
 	upgrader websocket.Upgrader
+
+	layeredFS     fs.FS
+	upperLayerDir string
 }
 
 func (s *Server) Start() error {
-	serverCtx, cancelServer := context.WithCancel(context.Background())
+	ctx := context.Background()
+
+	if err := s.initLayeredFS(); err != nil {
+		return errors.WithStack(err)
+	}
+
+	serverCtx, cancelServer := context.WithCancel(ctx)
 
 	s.cancel = cancelServer
 	s.ctx = serverCtx
@@ -92,6 +102,7 @@ func New(browser browser.Browser, funcs ...OptionFunc) *Server {
 		defaultApp:              opts.DefaultApp,
 		apps:                    opts.Apps,
 		serviceDiscoveryEnabled: opts.EnableServiceDiscovery,
+		upperLayerDir:           opts.UpperLayerDir,
 	}
 
 	server.upgrader = websocket.Upgrader{