Compare commits
No commits in common. "main" and "nix-flake" have entirely different histories.
|
@ -1,24 +0,0 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# [target.x86_64-unknown-linux-gnu]
|
|
||||||
# rustflags = ["-C", "link-arg=-fuse-ld=mold"]
|
|
||||||
|
|
||||||
[build]
|
|
||||||
rustflags = ["-C", "link-args=-rdynamic -fuse-ld=mold"]
|
|
23
.envrc
23
.envrc
|
@ -1,29 +1,6 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
use flake || use nix
|
use flake || use nix
|
||||||
watch_file flake.nix
|
watch_file flake.nix
|
||||||
|
|
||||||
PATH_add ./target/debug
|
|
||||||
PATH_add ./target/release
|
|
||||||
PATH_add ./scripts
|
|
||||||
|
|
||||||
if on_git_branch; then
|
if on_git_branch; then
|
||||||
echo && git status --short --branch &&
|
echo && git status --short --branch &&
|
||||||
echo && git fetch --verbose
|
echo && git fetch --verbose
|
||||||
|
|
|
@ -1,41 +1,10 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
userdata/
|
userdata/
|
||||||
trinitrix.log
|
trinitrix.log
|
||||||
plugin.txt
|
|
||||||
|
|
||||||
# build
|
# build
|
||||||
/target
|
/target
|
||||||
/result
|
/result
|
||||||
# generate by trixy for the c headers
|
|
||||||
/dist
|
|
||||||
|
|
||||||
# IDE stuff
|
# IDE stuff
|
||||||
.idea
|
.idea
|
||||||
.direnv
|
.direnv
|
||||||
|
|
||||||
# Pre Commit hooks
|
|
||||||
.pre-commit-config.yaml
|
|
||||||
|
|
||||||
# LS
|
|
||||||
## lua
|
|
||||||
.luarc.json
|
|
||||||
## c
|
|
||||||
.ccls-cache
|
|
||||||
|
|
201
.licensure.yml
201
.licensure.yml
|
@ -1,201 +0,0 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
---
|
|
||||||
# Regexes which if matched by a file path will always be excluded from
|
|
||||||
# getting a license header
|
|
||||||
excludes:
|
|
||||||
- .*lock
|
|
||||||
- \.git/.*
|
|
||||||
- LICENSE.spdx
|
|
||||||
- LICENSE
|
|
||||||
- COPYING
|
|
||||||
- COPYING.LESSER
|
|
||||||
- .*\.(rst|txt|pdf|png)
|
|
||||||
# Definition of the licenses used on this project and to what files
|
|
||||||
# they should apply.
|
|
||||||
#
|
|
||||||
# No default license configuration is provided. This section must be
|
|
||||||
# configured by the user.
|
|
||||||
licenses:
|
|
||||||
# Either a regex or the string "any" to determine to what files this
|
|
||||||
# license should apply. It is common for projects to have files
|
|
||||||
# under multiple licenses or with multiple copyright holders. This
|
|
||||||
# provides the ability to automatically license files correctly
|
|
||||||
# based on their file paths.
|
|
||||||
#
|
|
||||||
# If "any" is provided all files will match this license.
|
|
||||||
- files: any
|
|
||||||
#
|
|
||||||
# The license identifier, a list of common identifiers can be
|
|
||||||
# found at: https://spdx.org/licenses/ but existence of the ident
|
|
||||||
# in this list it is not enforced unless auto_template is set to
|
|
||||||
# true.
|
|
||||||
ident: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# A list of authors who hold copyright over these files
|
|
||||||
authors:
|
|
||||||
- name: "The Trinitrix Project"
|
|
||||||
email: "benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li"
|
|
||||||
|
|
||||||
# The template that will be rendered to generate the header before
|
|
||||||
# comment characters are applied. Available variables are:
|
|
||||||
# - [year]: substituted with the current year.
|
|
||||||
# - [name of author]: Substituted with name of the author and email
|
|
||||||
# if provided. If email is provided the output appears as Full
|
|
||||||
# Name <email@example.com>. If multiple authors are provided the
|
|
||||||
# list is concatenated together with commas.
|
|
||||||
template: |
|
|
||||||
Copyright (C) 2024 - [year]:
|
|
||||||
[name of author]
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
# If auto_template is true then template is ignored and the SPDX
|
|
||||||
# API will be queried with the ident value to automatically
|
|
||||||
# determine the license header template. auto_template works best
|
|
||||||
# with licenses that have a standardLicenseHeader field defined in
|
|
||||||
# their license info JSON, if it is not then we will use the full
|
|
||||||
# licenseText to generate the header which works fine for short
|
|
||||||
# licenses like MIT but can be quite lengthy for other licenses
|
|
||||||
# like BSD-4-Clause. The above default template is valid for most
|
|
||||||
# licenses and is recommended for MIT, and BSD licenses. Common
|
|
||||||
# licenses that work well with the auto_template feature are GPL
|
|
||||||
# variants, and the Apache 2.0 license.
|
|
||||||
#
|
|
||||||
# Important Note: this means the ident must be a valid SPDX identifier
|
|
||||||
# auto_template: true
|
|
||||||
|
|
||||||
# If true try to detect the text wrapping of the template, and unwrap it
|
|
||||||
unwrap_text: false
|
|
||||||
|
|
||||||
# Define type of comment characters to apply based on file extensions.
|
|
||||||
comments:
|
|
||||||
# The extensions (or singular extension) field defines which file
|
|
||||||
# extensions to apply the commenter to.
|
|
||||||
- extensions:
|
|
||||||
- js
|
|
||||||
- go
|
|
||||||
- pest
|
|
||||||
# The commenter field defines the kind of commenter to
|
|
||||||
# generate. There are two types of commenters: line and block.
|
|
||||||
#
|
|
||||||
# This demonstrates a line commenter configuration. A line
|
|
||||||
# commenter type will apply the comment_char to the beginning of
|
|
||||||
# each line in the license header. It will then apply a number of
|
|
||||||
# empty newlines to the end of the header equal to trailing_lines.
|
|
||||||
#
|
|
||||||
# If trailing_lines is omitted it is assumed to be 0.
|
|
||||||
commenter:
|
|
||||||
type: line
|
|
||||||
comment_char: "//"
|
|
||||||
trailing_lines: 1
|
|
||||||
|
|
||||||
- extensions:
|
|
||||||
- lua
|
|
||||||
# The commenter field defines the kind of commenter to
|
|
||||||
# generate. There are two types of commenters: line and block.
|
|
||||||
#
|
|
||||||
# This demonstrates a line commenter configuration. A line
|
|
||||||
# commenter type will apply the comment_char to the beginning of
|
|
||||||
# each line in the license header. It will then apply a number of
|
|
||||||
# empty newlines to the end of the header equal to trailing_lines.
|
|
||||||
#
|
|
||||||
# If trailing_lines is omitted it is assumed to be 0.
|
|
||||||
commenter:
|
|
||||||
type: line
|
|
||||||
comment_char: "--"
|
|
||||||
trailing_lines: 1
|
|
||||||
|
|
||||||
- extensions:
|
|
||||||
- rs
|
|
||||||
- tri
|
|
||||||
- css
|
|
||||||
- cpp
|
|
||||||
- c
|
|
||||||
- h
|
|
||||||
# This demonstrates a block commenter configuration. A block
|
|
||||||
# commenter type will add start_block_char as the first character
|
|
||||||
# in the license header and add end_block_char as the last character
|
|
||||||
# in the license header. If per_line_char is provided each line of
|
|
||||||
# the header between the block start and end characters will be
|
|
||||||
# line commented with the per_line_char
|
|
||||||
#
|
|
||||||
# trailing_lines works the same for both block and line commenter
|
|
||||||
# types
|
|
||||||
commenter:
|
|
||||||
type: block
|
|
||||||
start_block_char: "/*\n"
|
|
||||||
end_block_char: "*/\n"
|
|
||||||
per_line_char: "*"
|
|
||||||
trailing_lines: 1
|
|
||||||
|
|
||||||
- extension:
|
|
||||||
- html
|
|
||||||
- md
|
|
||||||
- svg
|
|
||||||
- drawio
|
|
||||||
commenter:
|
|
||||||
type: block
|
|
||||||
start_block_char: "<!--\n"
|
|
||||||
end_block_char: "-->\n"
|
|
||||||
trailing_lines: 1
|
|
||||||
|
|
||||||
- extensions:
|
|
||||||
- el
|
|
||||||
- lisp
|
|
||||||
commenter:
|
|
||||||
type: line
|
|
||||||
comment_char: ";;;"
|
|
||||||
trailing_lines: 1
|
|
||||||
|
|
||||||
- extensions:
|
|
||||||
- tex
|
|
||||||
- bib
|
|
||||||
commenter:
|
|
||||||
type: line
|
|
||||||
comment_char: "%"
|
|
||||||
trailing_lines: 1
|
|
||||||
|
|
||||||
# The extension string "any" is special and so will match any file
|
|
||||||
# extensions. Commenter configurations are always checked in the
|
|
||||||
# order they are defined, so if any is used it should be the last
|
|
||||||
# commenter configuration or else it will override all others.
|
|
||||||
#
|
|
||||||
# In this configuration if we can't match the file extension we fall
|
|
||||||
# back to the popular '#' line comment used in most scripting
|
|
||||||
# languages.
|
|
||||||
- extension: any
|
|
||||||
commenter:
|
|
||||||
type: line
|
|
||||||
comment_char: '#'
|
|
||||||
trailing_lines: 1
|
|
674
COPYING
674
COPYING
|
@ -1,674 +0,0 @@
|
||||||
GNU GENERAL PUBLIC LICENSE
|
|
||||||
Version 3, 29 June 2007
|
|
||||||
|
|
||||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
|
||||||
Everyone is permitted to copy and distribute verbatim copies
|
|
||||||
of this license document, but changing it is not allowed.
|
|
||||||
|
|
||||||
Preamble
|
|
||||||
|
|
||||||
The GNU General Public License is a free, copyleft license for
|
|
||||||
software and other kinds of works.
|
|
||||||
|
|
||||||
The licenses for most software and other practical works are designed
|
|
||||||
to take away your freedom to share and change the works. By contrast,
|
|
||||||
the GNU General Public License is intended to guarantee your freedom to
|
|
||||||
share and change all versions of a program--to make sure it remains free
|
|
||||||
software for all its users. We, the Free Software Foundation, use the
|
|
||||||
GNU General Public License for most of our software; it applies also to
|
|
||||||
any other work released this way by its authors. You can apply it to
|
|
||||||
your programs, too.
|
|
||||||
|
|
||||||
When we speak of free software, we are referring to freedom, not
|
|
||||||
price. Our General Public Licenses are designed to make sure that you
|
|
||||||
have the freedom to distribute copies of free software (and charge for
|
|
||||||
them if you wish), that you receive source code or can get it if you
|
|
||||||
want it, that you can change the software or use pieces of it in new
|
|
||||||
free programs, and that you know you can do these things.
|
|
||||||
|
|
||||||
To protect your rights, we need to prevent others from denying you
|
|
||||||
these rights or asking you to surrender the rights. Therefore, you have
|
|
||||||
certain responsibilities if you distribute copies of the software, or if
|
|
||||||
you modify it: responsibilities to respect the freedom of others.
|
|
||||||
|
|
||||||
For example, if you distribute copies of such a program, whether
|
|
||||||
gratis or for a fee, you must pass on to the recipients the same
|
|
||||||
freedoms that you received. You must make sure that they, too, receive
|
|
||||||
or can get the source code. And you must show them these terms so they
|
|
||||||
know their rights.
|
|
||||||
|
|
||||||
Developers that use the GNU GPL protect your rights with two steps:
|
|
||||||
(1) assert copyright on the software, and (2) offer you this License
|
|
||||||
giving you legal permission to copy, distribute and/or modify it.
|
|
||||||
|
|
||||||
For the developers' and authors' protection, the GPL clearly explains
|
|
||||||
that there is no warranty for this free software. For both users' and
|
|
||||||
authors' sake, the GPL requires that modified versions be marked as
|
|
||||||
changed, so that their problems will not be attributed erroneously to
|
|
||||||
authors of previous versions.
|
|
||||||
|
|
||||||
Some devices are designed to deny users access to install or run
|
|
||||||
modified versions of the software inside them, although the manufacturer
|
|
||||||
can do so. This is fundamentally incompatible with the aim of
|
|
||||||
protecting users' freedom to change the software. The systematic
|
|
||||||
pattern of such abuse occurs in the area of products for individuals to
|
|
||||||
use, which is precisely where it is most unacceptable. Therefore, we
|
|
||||||
have designed this version of the GPL to prohibit the practice for those
|
|
||||||
products. If such problems arise substantially in other domains, we
|
|
||||||
stand ready to extend this provision to those domains in future versions
|
|
||||||
of the GPL, as needed to protect the freedom of users.
|
|
||||||
|
|
||||||
Finally, every program is threatened constantly by software patents.
|
|
||||||
States should not allow patents to restrict development and use of
|
|
||||||
software on general-purpose computers, but in those that do, we wish to
|
|
||||||
avoid the special danger that patents applied to a free program could
|
|
||||||
make it effectively proprietary. To prevent this, the GPL assures that
|
|
||||||
patents cannot be used to render the program non-free.
|
|
||||||
|
|
||||||
The precise terms and conditions for copying, distribution and
|
|
||||||
modification follow.
|
|
||||||
|
|
||||||
TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
0. Definitions.
|
|
||||||
|
|
||||||
"This License" refers to version 3 of the GNU General Public License.
|
|
||||||
|
|
||||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
|
||||||
works, such as semiconductor masks.
|
|
||||||
|
|
||||||
"The Program" refers to any copyrightable work licensed under this
|
|
||||||
License. Each licensee is addressed as "you". "Licensees" and
|
|
||||||
"recipients" may be individuals or organizations.
|
|
||||||
|
|
||||||
To "modify" a work means to copy from or adapt all or part of the work
|
|
||||||
in a fashion requiring copyright permission, other than the making of an
|
|
||||||
exact copy. The resulting work is called a "modified version" of the
|
|
||||||
earlier work or a work "based on" the earlier work.
|
|
||||||
|
|
||||||
A "covered work" means either the unmodified Program or a work based
|
|
||||||
on the Program.
|
|
||||||
|
|
||||||
To "propagate" a work means to do anything with it that, without
|
|
||||||
permission, would make you directly or secondarily liable for
|
|
||||||
infringement under applicable copyright law, except executing it on a
|
|
||||||
computer or modifying a private copy. Propagation includes copying,
|
|
||||||
distribution (with or without modification), making available to the
|
|
||||||
public, and in some countries other activities as well.
|
|
||||||
|
|
||||||
To "convey" a work means any kind of propagation that enables other
|
|
||||||
parties to make or receive copies. Mere interaction with a user through
|
|
||||||
a computer network, with no transfer of a copy, is not conveying.
|
|
||||||
|
|
||||||
An interactive user interface displays "Appropriate Legal Notices"
|
|
||||||
to the extent that it includes a convenient and prominently visible
|
|
||||||
feature that (1) displays an appropriate copyright notice, and (2)
|
|
||||||
tells the user that there is no warranty for the work (except to the
|
|
||||||
extent that warranties are provided), that licensees may convey the
|
|
||||||
work under this License, and how to view a copy of this License. If
|
|
||||||
the interface presents a list of user commands or options, such as a
|
|
||||||
menu, a prominent item in the list meets this criterion.
|
|
||||||
|
|
||||||
1. Source Code.
|
|
||||||
|
|
||||||
The "source code" for a work means the preferred form of the work
|
|
||||||
for making modifications to it. "Object code" means any non-source
|
|
||||||
form of a work.
|
|
||||||
|
|
||||||
A "Standard Interface" means an interface that either is an official
|
|
||||||
standard defined by a recognized standards body, or, in the case of
|
|
||||||
interfaces specified for a particular programming language, one that
|
|
||||||
is widely used among developers working in that language.
|
|
||||||
|
|
||||||
The "System Libraries" of an executable work include anything, other
|
|
||||||
than the work as a whole, that (a) is included in the normal form of
|
|
||||||
packaging a Major Component, but which is not part of that Major
|
|
||||||
Component, and (b) serves only to enable use of the work with that
|
|
||||||
Major Component, or to implement a Standard Interface for which an
|
|
||||||
implementation is available to the public in source code form. A
|
|
||||||
"Major Component", in this context, means a major essential component
|
|
||||||
(kernel, window system, and so on) of the specific operating system
|
|
||||||
(if any) on which the executable work runs, or a compiler used to
|
|
||||||
produce the work, or an object code interpreter used to run it.
|
|
||||||
|
|
||||||
The "Corresponding Source" for a work in object code form means all
|
|
||||||
the source code needed to generate, install, and (for an executable
|
|
||||||
work) run the object code and to modify the work, including scripts to
|
|
||||||
control those activities. However, it does not include the work's
|
|
||||||
System Libraries, or general-purpose tools or generally available free
|
|
||||||
programs which are used unmodified in performing those activities but
|
|
||||||
which are not part of the work. For example, Corresponding Source
|
|
||||||
includes interface definition files associated with source files for
|
|
||||||
the work, and the source code for shared libraries and dynamically
|
|
||||||
linked subprograms that the work is specifically designed to require,
|
|
||||||
such as by intimate data communication or control flow between those
|
|
||||||
subprograms and other parts of the work.
|
|
||||||
|
|
||||||
The Corresponding Source need not include anything that users
|
|
||||||
can regenerate automatically from other parts of the Corresponding
|
|
||||||
Source.
|
|
||||||
|
|
||||||
The Corresponding Source for a work in source code form is that
|
|
||||||
same work.
|
|
||||||
|
|
||||||
2. Basic Permissions.
|
|
||||||
|
|
||||||
All rights granted under this License are granted for the term of
|
|
||||||
copyright on the Program, and are irrevocable provided the stated
|
|
||||||
conditions are met. This License explicitly affirms your unlimited
|
|
||||||
permission to run the unmodified Program. The output from running a
|
|
||||||
covered work is covered by this License only if the output, given its
|
|
||||||
content, constitutes a covered work. This License acknowledges your
|
|
||||||
rights of fair use or other equivalent, as provided by copyright law.
|
|
||||||
|
|
||||||
You may make, run and propagate covered works that you do not
|
|
||||||
convey, without conditions so long as your license otherwise remains
|
|
||||||
in force. You may convey covered works to others for the sole purpose
|
|
||||||
of having them make modifications exclusively for you, or provide you
|
|
||||||
with facilities for running those works, provided that you comply with
|
|
||||||
the terms of this License in conveying all material for which you do
|
|
||||||
not control copyright. Those thus making or running the covered works
|
|
||||||
for you must do so exclusively on your behalf, under your direction
|
|
||||||
and control, on terms that prohibit them from making any copies of
|
|
||||||
your copyrighted material outside their relationship with you.
|
|
||||||
|
|
||||||
Conveying under any other circumstances is permitted solely under
|
|
||||||
the conditions stated below. Sublicensing is not allowed; section 10
|
|
||||||
makes it unnecessary.
|
|
||||||
|
|
||||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
|
||||||
|
|
||||||
No covered work shall be deemed part of an effective technological
|
|
||||||
measure under any applicable law fulfilling obligations under article
|
|
||||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
|
||||||
similar laws prohibiting or restricting circumvention of such
|
|
||||||
measures.
|
|
||||||
|
|
||||||
When you convey a covered work, you waive any legal power to forbid
|
|
||||||
circumvention of technological measures to the extent such circumvention
|
|
||||||
is effected by exercising rights under this License with respect to
|
|
||||||
the covered work, and you disclaim any intention to limit operation or
|
|
||||||
modification of the work as a means of enforcing, against the work's
|
|
||||||
users, your or third parties' legal rights to forbid circumvention of
|
|
||||||
technological measures.
|
|
||||||
|
|
||||||
4. Conveying Verbatim Copies.
|
|
||||||
|
|
||||||
You may convey verbatim copies of the Program's source code as you
|
|
||||||
receive it, in any medium, provided that you conspicuously and
|
|
||||||
appropriately publish on each copy an appropriate copyright notice;
|
|
||||||
keep intact all notices stating that this License and any
|
|
||||||
non-permissive terms added in accord with section 7 apply to the code;
|
|
||||||
keep intact all notices of the absence of any warranty; and give all
|
|
||||||
recipients a copy of this License along with the Program.
|
|
||||||
|
|
||||||
You may charge any price or no price for each copy that you convey,
|
|
||||||
and you may offer support or warranty protection for a fee.
|
|
||||||
|
|
||||||
5. Conveying Modified Source Versions.
|
|
||||||
|
|
||||||
You may convey a work based on the Program, or the modifications to
|
|
||||||
produce it from the Program, in the form of source code under the
|
|
||||||
terms of section 4, provided that you also meet all of these conditions:
|
|
||||||
|
|
||||||
a) The work must carry prominent notices stating that you modified
|
|
||||||
it, and giving a relevant date.
|
|
||||||
|
|
||||||
b) The work must carry prominent notices stating that it is
|
|
||||||
released under this License and any conditions added under section
|
|
||||||
7. This requirement modifies the requirement in section 4 to
|
|
||||||
"keep intact all notices".
|
|
||||||
|
|
||||||
c) You must license the entire work, as a whole, under this
|
|
||||||
License to anyone who comes into possession of a copy. This
|
|
||||||
License will therefore apply, along with any applicable section 7
|
|
||||||
additional terms, to the whole of the work, and all its parts,
|
|
||||||
regardless of how they are packaged. This License gives no
|
|
||||||
permission to license the work in any other way, but it does not
|
|
||||||
invalidate such permission if you have separately received it.
|
|
||||||
|
|
||||||
d) If the work has interactive user interfaces, each must display
|
|
||||||
Appropriate Legal Notices; however, if the Program has interactive
|
|
||||||
interfaces that do not display Appropriate Legal Notices, your
|
|
||||||
work need not make them do so.
|
|
||||||
|
|
||||||
A compilation of a covered work with other separate and independent
|
|
||||||
works, which are not by their nature extensions of the covered work,
|
|
||||||
and which are not combined with it such as to form a larger program,
|
|
||||||
in or on a volume of a storage or distribution medium, is called an
|
|
||||||
"aggregate" if the compilation and its resulting copyright are not
|
|
||||||
used to limit the access or legal rights of the compilation's users
|
|
||||||
beyond what the individual works permit. Inclusion of a covered work
|
|
||||||
in an aggregate does not cause this License to apply to the other
|
|
||||||
parts of the aggregate.
|
|
||||||
|
|
||||||
6. Conveying Non-Source Forms.
|
|
||||||
|
|
||||||
You may convey a covered work in object code form under the terms
|
|
||||||
of sections 4 and 5, provided that you also convey the
|
|
||||||
machine-readable Corresponding Source under the terms of this License,
|
|
||||||
in one of these ways:
|
|
||||||
|
|
||||||
a) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by the
|
|
||||||
Corresponding Source fixed on a durable physical medium
|
|
||||||
customarily used for software interchange.
|
|
||||||
|
|
||||||
b) Convey the object code in, or embodied in, a physical product
|
|
||||||
(including a physical distribution medium), accompanied by a
|
|
||||||
written offer, valid for at least three years and valid for as
|
|
||||||
long as you offer spare parts or customer support for that product
|
|
||||||
model, to give anyone who possesses the object code either (1) a
|
|
||||||
copy of the Corresponding Source for all the software in the
|
|
||||||
product that is covered by this License, on a durable physical
|
|
||||||
medium customarily used for software interchange, for a price no
|
|
||||||
more than your reasonable cost of physically performing this
|
|
||||||
conveying of source, or (2) access to copy the
|
|
||||||
Corresponding Source from a network server at no charge.
|
|
||||||
|
|
||||||
c) Convey individual copies of the object code with a copy of the
|
|
||||||
written offer to provide the Corresponding Source. This
|
|
||||||
alternative is allowed only occasionally and noncommercially, and
|
|
||||||
only if you received the object code with such an offer, in accord
|
|
||||||
with subsection 6b.
|
|
||||||
|
|
||||||
d) Convey the object code by offering access from a designated
|
|
||||||
place (gratis or for a charge), and offer equivalent access to the
|
|
||||||
Corresponding Source in the same way through the same place at no
|
|
||||||
further charge. You need not require recipients to copy the
|
|
||||||
Corresponding Source along with the object code. If the place to
|
|
||||||
copy the object code is a network server, the Corresponding Source
|
|
||||||
may be on a different server (operated by you or a third party)
|
|
||||||
that supports equivalent copying facilities, provided you maintain
|
|
||||||
clear directions next to the object code saying where to find the
|
|
||||||
Corresponding Source. Regardless of what server hosts the
|
|
||||||
Corresponding Source, you remain obligated to ensure that it is
|
|
||||||
available for as long as needed to satisfy these requirements.
|
|
||||||
|
|
||||||
e) Convey the object code using peer-to-peer transmission, provided
|
|
||||||
you inform other peers where the object code and Corresponding
|
|
||||||
Source of the work are being offered to the general public at no
|
|
||||||
charge under subsection 6d.
|
|
||||||
|
|
||||||
A separable portion of the object code, whose source code is excluded
|
|
||||||
from the Corresponding Source as a System Library, need not be
|
|
||||||
included in conveying the object code work.
|
|
||||||
|
|
||||||
A "User Product" is either (1) a "consumer product", which means any
|
|
||||||
tangible personal property which is normally used for personal, family,
|
|
||||||
or household purposes, or (2) anything designed or sold for incorporation
|
|
||||||
into a dwelling. In determining whether a product is a consumer product,
|
|
||||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
|
||||||
product received by a particular user, "normally used" refers to a
|
|
||||||
typical or common use of that class of product, regardless of the status
|
|
||||||
of the particular user or of the way in which the particular user
|
|
||||||
actually uses, or expects or is expected to use, the product. A product
|
|
||||||
is a consumer product regardless of whether the product has substantial
|
|
||||||
commercial, industrial or non-consumer uses, unless such uses represent
|
|
||||||
the only significant mode of use of the product.
|
|
||||||
|
|
||||||
"Installation Information" for a User Product means any methods,
|
|
||||||
procedures, authorization keys, or other information required to install
|
|
||||||
and execute modified versions of a covered work in that User Product from
|
|
||||||
a modified version of its Corresponding Source. The information must
|
|
||||||
suffice to ensure that the continued functioning of the modified object
|
|
||||||
code is in no case prevented or interfered with solely because
|
|
||||||
modification has been made.
|
|
||||||
|
|
||||||
If you convey an object code work under this section in, or with, or
|
|
||||||
specifically for use in, a User Product, and the conveying occurs as
|
|
||||||
part of a transaction in which the right of possession and use of the
|
|
||||||
User Product is transferred to the recipient in perpetuity or for a
|
|
||||||
fixed term (regardless of how the transaction is characterized), the
|
|
||||||
Corresponding Source conveyed under this section must be accompanied
|
|
||||||
by the Installation Information. But this requirement does not apply
|
|
||||||
if neither you nor any third party retains the ability to install
|
|
||||||
modified object code on the User Product (for example, the work has
|
|
||||||
been installed in ROM).
|
|
||||||
|
|
||||||
The requirement to provide Installation Information does not include a
|
|
||||||
requirement to continue to provide support service, warranty, or updates
|
|
||||||
for a work that has been modified or installed by the recipient, or for
|
|
||||||
the User Product in which it has been modified or installed. Access to a
|
|
||||||
network may be denied when the modification itself materially and
|
|
||||||
adversely affects the operation of the network or violates the rules and
|
|
||||||
protocols for communication across the network.
|
|
||||||
|
|
||||||
Corresponding Source conveyed, and Installation Information provided,
|
|
||||||
in accord with this section must be in a format that is publicly
|
|
||||||
documented (and with an implementation available to the public in
|
|
||||||
source code form), and must require no special password or key for
|
|
||||||
unpacking, reading or copying.
|
|
||||||
|
|
||||||
7. Additional Terms.
|
|
||||||
|
|
||||||
"Additional permissions" are terms that supplement the terms of this
|
|
||||||
License by making exceptions from one or more of its conditions.
|
|
||||||
Additional permissions that are applicable to the entire Program shall
|
|
||||||
be treated as though they were included in this License, to the extent
|
|
||||||
that they are valid under applicable law. If additional permissions
|
|
||||||
apply only to part of the Program, that part may be used separately
|
|
||||||
under those permissions, but the entire Program remains governed by
|
|
||||||
this License without regard to the additional permissions.
|
|
||||||
|
|
||||||
When you convey a copy of a covered work, you may at your option
|
|
||||||
remove any additional permissions from that copy, or from any part of
|
|
||||||
it. (Additional permissions may be written to require their own
|
|
||||||
removal in certain cases when you modify the work.) You may place
|
|
||||||
additional permissions on material, added by you to a covered work,
|
|
||||||
for which you have or can give appropriate copyright permission.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, for material you
|
|
||||||
add to a covered work, you may (if authorized by the copyright holders of
|
|
||||||
that material) supplement the terms of this License with terms:
|
|
||||||
|
|
||||||
a) Disclaiming warranty or limiting liability differently from the
|
|
||||||
terms of sections 15 and 16 of this License; or
|
|
||||||
|
|
||||||
b) Requiring preservation of specified reasonable legal notices or
|
|
||||||
author attributions in that material or in the Appropriate Legal
|
|
||||||
Notices displayed by works containing it; or
|
|
||||||
|
|
||||||
c) Prohibiting misrepresentation of the origin of that material, or
|
|
||||||
requiring that modified versions of such material be marked in
|
|
||||||
reasonable ways as different from the original version; or
|
|
||||||
|
|
||||||
d) Limiting the use for publicity purposes of names of licensors or
|
|
||||||
authors of the material; or
|
|
||||||
|
|
||||||
e) Declining to grant rights under trademark law for use of some
|
|
||||||
trade names, trademarks, or service marks; or
|
|
||||||
|
|
||||||
f) Requiring indemnification of licensors and authors of that
|
|
||||||
material by anyone who conveys the material (or modified versions of
|
|
||||||
it) with contractual assumptions of liability to the recipient, for
|
|
||||||
any liability that these contractual assumptions directly impose on
|
|
||||||
those licensors and authors.
|
|
||||||
|
|
||||||
All other non-permissive additional terms are considered "further
|
|
||||||
restrictions" within the meaning of section 10. If the Program as you
|
|
||||||
received it, or any part of it, contains a notice stating that it is
|
|
||||||
governed by this License along with a term that is a further
|
|
||||||
restriction, you may remove that term. If a license document contains
|
|
||||||
a further restriction but permits relicensing or conveying under this
|
|
||||||
License, you may add to a covered work material governed by the terms
|
|
||||||
of that license document, provided that the further restriction does
|
|
||||||
not survive such relicensing or conveying.
|
|
||||||
|
|
||||||
If you add terms to a covered work in accord with this section, you
|
|
||||||
must place, in the relevant source files, a statement of the
|
|
||||||
additional terms that apply to those files, or a notice indicating
|
|
||||||
where to find the applicable terms.
|
|
||||||
|
|
||||||
Additional terms, permissive or non-permissive, may be stated in the
|
|
||||||
form of a separately written license, or stated as exceptions;
|
|
||||||
the above requirements apply either way.
|
|
||||||
|
|
||||||
8. Termination.
|
|
||||||
|
|
||||||
You may not propagate or modify a covered work except as expressly
|
|
||||||
provided under this License. Any attempt otherwise to propagate or
|
|
||||||
modify it is void, and will automatically terminate your rights under
|
|
||||||
this License (including any patent licenses granted under the third
|
|
||||||
paragraph of section 11).
|
|
||||||
|
|
||||||
However, if you cease all violation of this License, then your
|
|
||||||
license from a particular copyright holder is reinstated (a)
|
|
||||||
provisionally, unless and until the copyright holder explicitly and
|
|
||||||
finally terminates your license, and (b) permanently, if the copyright
|
|
||||||
holder fails to notify you of the violation by some reasonable means
|
|
||||||
prior to 60 days after the cessation.
|
|
||||||
|
|
||||||
Moreover, your license from a particular copyright holder is
|
|
||||||
reinstated permanently if the copyright holder notifies you of the
|
|
||||||
violation by some reasonable means, this is the first time you have
|
|
||||||
received notice of violation of this License (for any work) from that
|
|
||||||
copyright holder, and you cure the violation prior to 30 days after
|
|
||||||
your receipt of the notice.
|
|
||||||
|
|
||||||
Termination of your rights under this section does not terminate the
|
|
||||||
licenses of parties who have received copies or rights from you under
|
|
||||||
this License. If your rights have been terminated and not permanently
|
|
||||||
reinstated, you do not qualify to receive new licenses for the same
|
|
||||||
material under section 10.
|
|
||||||
|
|
||||||
9. Acceptance Not Required for Having Copies.
|
|
||||||
|
|
||||||
You are not required to accept this License in order to receive or
|
|
||||||
run a copy of the Program. Ancillary propagation of a covered work
|
|
||||||
occurring solely as a consequence of using peer-to-peer transmission
|
|
||||||
to receive a copy likewise does not require acceptance. However,
|
|
||||||
nothing other than this License grants you permission to propagate or
|
|
||||||
modify any covered work. These actions infringe copyright if you do
|
|
||||||
not accept this License. Therefore, by modifying or propagating a
|
|
||||||
covered work, you indicate your acceptance of this License to do so.
|
|
||||||
|
|
||||||
10. Automatic Licensing of Downstream Recipients.
|
|
||||||
|
|
||||||
Each time you convey a covered work, the recipient automatically
|
|
||||||
receives a license from the original licensors, to run, modify and
|
|
||||||
propagate that work, subject to this License. You are not responsible
|
|
||||||
for enforcing compliance by third parties with this License.
|
|
||||||
|
|
||||||
An "entity transaction" is a transaction transferring control of an
|
|
||||||
organization, or substantially all assets of one, or subdividing an
|
|
||||||
organization, or merging organizations. If propagation of a covered
|
|
||||||
work results from an entity transaction, each party to that
|
|
||||||
transaction who receives a copy of the work also receives whatever
|
|
||||||
licenses to the work the party's predecessor in interest had or could
|
|
||||||
give under the previous paragraph, plus a right to possession of the
|
|
||||||
Corresponding Source of the work from the predecessor in interest, if
|
|
||||||
the predecessor has it or can get it with reasonable efforts.
|
|
||||||
|
|
||||||
You may not impose any further restrictions on the exercise of the
|
|
||||||
rights granted or affirmed under this License. For example, you may
|
|
||||||
not impose a license fee, royalty, or other charge for exercise of
|
|
||||||
rights granted under this License, and you may not initiate litigation
|
|
||||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
|
||||||
any patent claim is infringed by making, using, selling, offering for
|
|
||||||
sale, or importing the Program or any portion of it.
|
|
||||||
|
|
||||||
11. Patents.
|
|
||||||
|
|
||||||
A "contributor" is a copyright holder who authorizes use under this
|
|
||||||
License of the Program or a work on which the Program is based. The
|
|
||||||
work thus licensed is called the contributor's "contributor version".
|
|
||||||
|
|
||||||
A contributor's "essential patent claims" are all patent claims
|
|
||||||
owned or controlled by the contributor, whether already acquired or
|
|
||||||
hereafter acquired, that would be infringed by some manner, permitted
|
|
||||||
by this License, of making, using, or selling its contributor version,
|
|
||||||
but do not include claims that would be infringed only as a
|
|
||||||
consequence of further modification of the contributor version. For
|
|
||||||
purposes of this definition, "control" includes the right to grant
|
|
||||||
patent sublicenses in a manner consistent with the requirements of
|
|
||||||
this License.
|
|
||||||
|
|
||||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
|
||||||
patent license under the contributor's essential patent claims, to
|
|
||||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
|
||||||
propagate the contents of its contributor version.
|
|
||||||
|
|
||||||
In the following three paragraphs, a "patent license" is any express
|
|
||||||
agreement or commitment, however denominated, not to enforce a patent
|
|
||||||
(such as an express permission to practice a patent or covenant not to
|
|
||||||
sue for patent infringement). To "grant" such a patent license to a
|
|
||||||
party means to make such an agreement or commitment not to enforce a
|
|
||||||
patent against the party.
|
|
||||||
|
|
||||||
If you convey a covered work, knowingly relying on a patent license,
|
|
||||||
and the Corresponding Source of the work is not available for anyone
|
|
||||||
to copy, free of charge and under the terms of this License, through a
|
|
||||||
publicly available network server or other readily accessible means,
|
|
||||||
then you must either (1) cause the Corresponding Source to be so
|
|
||||||
available, or (2) arrange to deprive yourself of the benefit of the
|
|
||||||
patent license for this particular work, or (3) arrange, in a manner
|
|
||||||
consistent with the requirements of this License, to extend the patent
|
|
||||||
license to downstream recipients. "Knowingly relying" means you have
|
|
||||||
actual knowledge that, but for the patent license, your conveying the
|
|
||||||
covered work in a country, or your recipient's use of the covered work
|
|
||||||
in a country, would infringe one or more identifiable patents in that
|
|
||||||
country that you have reason to believe are valid.
|
|
||||||
|
|
||||||
If, pursuant to or in connection with a single transaction or
|
|
||||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
|
||||||
covered work, and grant a patent license to some of the parties
|
|
||||||
receiving the covered work authorizing them to use, propagate, modify
|
|
||||||
or convey a specific copy of the covered work, then the patent license
|
|
||||||
you grant is automatically extended to all recipients of the covered
|
|
||||||
work and works based on it.
|
|
||||||
|
|
||||||
A patent license is "discriminatory" if it does not include within
|
|
||||||
the scope of its coverage, prohibits the exercise of, or is
|
|
||||||
conditioned on the non-exercise of one or more of the rights that are
|
|
||||||
specifically granted under this License. You may not convey a covered
|
|
||||||
work if you are a party to an arrangement with a third party that is
|
|
||||||
in the business of distributing software, under which you make payment
|
|
||||||
to the third party based on the extent of your activity of conveying
|
|
||||||
the work, and under which the third party grants, to any of the
|
|
||||||
parties who would receive the covered work from you, a discriminatory
|
|
||||||
patent license (a) in connection with copies of the covered work
|
|
||||||
conveyed by you (or copies made from those copies), or (b) primarily
|
|
||||||
for and in connection with specific products or compilations that
|
|
||||||
contain the covered work, unless you entered into that arrangement,
|
|
||||||
or that patent license was granted, prior to 28 March 2007.
|
|
||||||
|
|
||||||
Nothing in this License shall be construed as excluding or limiting
|
|
||||||
any implied license or other defenses to infringement that may
|
|
||||||
otherwise be available to you under applicable patent law.
|
|
||||||
|
|
||||||
12. No Surrender of Others' Freedom.
|
|
||||||
|
|
||||||
If conditions are imposed on you (whether by court order, agreement or
|
|
||||||
otherwise) that contradict the conditions of this License, they do not
|
|
||||||
excuse you from the conditions of this License. If you cannot convey a
|
|
||||||
covered work so as to satisfy simultaneously your obligations under this
|
|
||||||
License and any other pertinent obligations, then as a consequence you may
|
|
||||||
not convey it at all. For example, if you agree to terms that obligate you
|
|
||||||
to collect a royalty for further conveying from those to whom you convey
|
|
||||||
the Program, the only way you could satisfy both those terms and this
|
|
||||||
License would be to refrain entirely from conveying the Program.
|
|
||||||
|
|
||||||
13. Use with the GNU Affero General Public License.
|
|
||||||
|
|
||||||
Notwithstanding any other provision of this License, you have
|
|
||||||
permission to link or combine any covered work with a work licensed
|
|
||||||
under version 3 of the GNU Affero General Public License into a single
|
|
||||||
combined work, and to convey the resulting work. The terms of this
|
|
||||||
License will continue to apply to the part which is the covered work,
|
|
||||||
but the special requirements of the GNU Affero General Public License,
|
|
||||||
section 13, concerning interaction through a network will apply to the
|
|
||||||
combination as such.
|
|
||||||
|
|
||||||
14. Revised Versions of this License.
|
|
||||||
|
|
||||||
The Free Software Foundation may publish revised and/or new versions of
|
|
||||||
the GNU General Public License from time to time. Such new versions will
|
|
||||||
be similar in spirit to the present version, but may differ in detail to
|
|
||||||
address new problems or concerns.
|
|
||||||
|
|
||||||
Each version is given a distinguishing version number. If the
|
|
||||||
Program specifies that a certain numbered version of the GNU General
|
|
||||||
Public License "or any later version" applies to it, you have the
|
|
||||||
option of following the terms and conditions either of that numbered
|
|
||||||
version or of any later version published by the Free Software
|
|
||||||
Foundation. If the Program does not specify a version number of the
|
|
||||||
GNU General Public License, you may choose any version ever published
|
|
||||||
by the Free Software Foundation.
|
|
||||||
|
|
||||||
If the Program specifies that a proxy can decide which future
|
|
||||||
versions of the GNU General Public License can be used, that proxy's
|
|
||||||
public statement of acceptance of a version permanently authorizes you
|
|
||||||
to choose that version for the Program.
|
|
||||||
|
|
||||||
Later license versions may give you additional or different
|
|
||||||
permissions. However, no additional obligations are imposed on any
|
|
||||||
author or copyright holder as a result of your choosing to follow a
|
|
||||||
later version.
|
|
||||||
|
|
||||||
15. Disclaimer of Warranty.
|
|
||||||
|
|
||||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
|
||||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
|
||||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
|
||||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
|
||||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
|
||||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
|
||||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
|
||||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
|
||||||
|
|
||||||
16. Limitation of Liability.
|
|
||||||
|
|
||||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
|
||||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
|
||||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
|
||||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
|
||||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
|
||||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
|
||||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
|
||||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
|
||||||
SUCH DAMAGES.
|
|
||||||
|
|
||||||
17. Interpretation of Sections 15 and 16.
|
|
||||||
|
|
||||||
If the disclaimer of warranty and limitation of liability provided
|
|
||||||
above cannot be given local legal effect according to their terms,
|
|
||||||
reviewing courts shall apply local law that most closely approximates
|
|
||||||
an absolute waiver of all civil liability in connection with the
|
|
||||||
Program, unless a warranty or assumption of liability accompanies a
|
|
||||||
copy of the Program in return for a fee.
|
|
||||||
|
|
||||||
END OF TERMS AND CONDITIONS
|
|
||||||
|
|
||||||
How to Apply These Terms to Your New Programs
|
|
||||||
|
|
||||||
If you develop a new program, and you want it to be of the greatest
|
|
||||||
possible use to the public, the best way to achieve this is to make it
|
|
||||||
free software which everyone can redistribute and change under these terms.
|
|
||||||
|
|
||||||
To do so, attach the following notices to the program. It is safest
|
|
||||||
to attach them to the start of each source file to most effectively
|
|
||||||
state the exclusion of warranty; and each file should have at least
|
|
||||||
the "copyright" line and a pointer to where the full notice is found.
|
|
||||||
|
|
||||||
<one line to give the program's name and a brief idea of what it does.>
|
|
||||||
Copyright (C) <year> <name of author>
|
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation, either version 3 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
Also add information on how to contact you by electronic and paper mail.
|
|
||||||
|
|
||||||
If the program does terminal interaction, make it output a short
|
|
||||||
notice like this when it starts in an interactive mode:
|
|
||||||
|
|
||||||
<program> Copyright (C) <year> <name of author>
|
|
||||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
|
||||||
This is free software, and you are welcome to redistribute it
|
|
||||||
under certain conditions; type `show c' for details.
|
|
||||||
|
|
||||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
|
||||||
parts of the General Public License. Of course, your program's commands
|
|
||||||
might be different; for a GUI interface, you would use an "about box".
|
|
||||||
|
|
||||||
You should also get your employer (if you work as a programmer) or school,
|
|
||||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
|
||||||
For more information on this, and how to apply and follow the GNU GPL, see
|
|
||||||
<https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
The GNU General Public License does not permit incorporating your program
|
|
||||||
into proprietary programs. If your program is a subroutine library, you
|
|
||||||
may consider it more useful to permit linking proprietary applications with
|
|
||||||
the library. If this is what you want to do, use the GNU Lesser General
|
|
||||||
Public License instead of this License. But first, please read
|
|
||||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
|
File diff suppressed because it is too large
Load Diff
84
Cargo.toml
84
Cargo.toml
|
@ -1,83 +1,19 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
[package]
|
[package]
|
||||||
name = "trinitrix"
|
name = "trinitrix"
|
||||||
description = "A multi protocol chat client"
|
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
license = "GPL-3.0-or-later"
|
license = "MIT"
|
||||||
default-run = "trinitrix"
|
|
||||||
|
|
||||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
clap = { version = "4.5.4", features = ["derive"] }
|
tui = "0.19"
|
||||||
cli-log = "2.0"
|
tui-textarea = { version = "*" }
|
||||||
|
crossterm = "*"
|
||||||
|
matrix-sdk = "0.6"
|
||||||
anyhow = "1.0"
|
anyhow = "1.0"
|
||||||
tokio = { version = "1.37", features = [
|
tokio = { version = "1.0", features = ["macros", "rt-multi-thread"] }
|
||||||
"macros",
|
tokio-util = "0.7"
|
||||||
"rt-multi-thread",
|
serde = "1.0"
|
||||||
"fs",
|
cli-log = "2.0"
|
||||||
"time",
|
indexmap = "*"
|
||||||
"io-util"
|
|
||||||
] }
|
|
||||||
tokio-util = { version = "0.7.10" }
|
|
||||||
uuid = { version = "1.8.0", features = ["v4"] }
|
|
||||||
rand = "0.8.5"
|
|
||||||
serde = { version = "1.0.201", features = ["derive"] }
|
|
||||||
rmp-serde = "1.3.0"
|
|
||||||
strum = { version = "0.26.2", features = ["derive"] }
|
|
||||||
sqlx = { version = "0.7.4", features = ["sqlite"] }
|
|
||||||
|
|
||||||
# config
|
|
||||||
trinitry = { version = "0.1.0" }
|
|
||||||
keymaps = { version = "0.1.1", features = ["crossterm"] }
|
|
||||||
directories = "5.0.1"
|
|
||||||
|
|
||||||
# crypto
|
|
||||||
x25519-dalek = "2.0.1"
|
|
||||||
aes-gcm-siv = { version = "0.11.1", features = ["aes"] }
|
|
||||||
|
|
||||||
# c api
|
|
||||||
libloading = "0.8.3"
|
|
||||||
trixy = { version = "0.1.1" }
|
|
||||||
|
|
||||||
# lua stuff
|
|
||||||
mlua = { version = "0.9.7", features = ["lua54", "async", "send", "serialize"] }
|
|
||||||
once_cell = "1.19.0"
|
|
||||||
|
|
||||||
# tui feature specific parts
|
|
||||||
ratatui = "0.26.2"
|
|
||||||
tui-textarea = { version = "0.4", features = ["crossterm"] }
|
|
||||||
crossterm = { version = "0.25" }
|
|
||||||
|
|
||||||
# Trinitrx Backend API specific
|
|
||||||
interprocess = { version = "2.1.0", features = ["tokio"] }
|
|
||||||
triba-packet = { path = "../triba-packet" }
|
|
||||||
triba = { path = "../triba" }
|
|
||||||
|
|
||||||
[dev-dependencies]
|
|
||||||
pretty_assertions = "1.4.0"
|
|
||||||
|
|
||||||
[build-dependencies]
|
|
||||||
trixy = { version = "0.1.1" }
|
|
||||||
|
|
||||||
[profile.release]
|
|
||||||
lto = true
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
Copyright 2023 The Trinitrix Project <antifallobst@systemausfall.org>
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
|
this software and associated documentation files (the “Software”), to deal in
|
||||||
|
the Software without restriction, including without limitation the rights to use,
|
||||||
|
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
|
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
@ -1,7 +0,0 @@
|
||||||
SPDXVersion: SPDX-2.3
|
|
||||||
DataLicense: CC0-1.0
|
|
||||||
Creator: flake template init
|
|
||||||
PackageName: trinitrix
|
|
||||||
PackageOriginator: The Trinitrix Project
|
|
||||||
PackageHomePage: https://git.nerdcult.net/trinitrix/core
|
|
||||||
PackageLicenseDeclared: GPL-3.0-or-later
|
|
49
README.md
49
README.md
|
@ -1,38 +1,27 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Trinitrix
|
# Trinitrix
|
||||||
|
|
||||||
Trinitrix is a terminal UI client for the matrix chat protocol.
|
Trinitrix is a terminal UI client for the matrix chat protocol.
|
||||||
Docs can be found [here](https://git.nerdcult.net/antifallobst/trinitrix/src/branch/master/docs).
|
Docs can be found [here](https://git.nerdcult.net/antifallobst/trinitrix/src/branch/master/docs).
|
||||||
|
|
||||||
______________________________________________________________________
|
---
|
||||||
|
|
||||||
# License (GPL-3.0 or later)
|
# License (MIT)
|
||||||
|
Copyright 2023 The Trinitrix Project <antifallobst@systemausfall.org>
|
||||||
|
|
||||||
Copyright 2024 The Trinitrix Project \<antifallobst@systemausfall.org,
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
benedikt.peetz@b-peetz.de, sils@sils.li>
|
this software and associated documentation files (the “Software”), to deal in
|
||||||
|
the Software without restriction, including without limitation the rights to use,
|
||||||
|
copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the
|
||||||
|
Software, and to permit persons to whom the Software is furnished to do so,
|
||||||
|
subject to the following conditions:
|
||||||
|
|
||||||
This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
|
THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
|
||||||
|
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
|
||||||
You should have received a copy of the GNU General Public License along with this program. If not, see <https://www.gnu.org/licenses/>.
|
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
||||||
|
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
|
||||||
|
HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||||
|
WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||||
|
FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
|
||||||
|
OTHER DEALINGS IN THE SOFTWARE.
|
|
@ -1,24 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# License
|
|
||||||
|
|
||||||
The [square Trinitrix Logo](./square.svg) by Eric-Paul Ickhorn is marked with the CC0 1.0 Universal License.
|
|
|
@ -1,150 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
|
||||||
|
|
||||||
<svg
|
|
||||||
width="64mm"
|
|
||||||
height="64mm"
|
|
||||||
viewBox="0 0 64 64"
|
|
||||||
version="1.1"
|
|
||||||
id="svg190"
|
|
||||||
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
|
|
||||||
sodipodi:docname="trinitrix.svg"
|
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
|
||||||
xmlns="http://www.w3.org/2000/svg"
|
|
||||||
xmlns:svg="http://www.w3.org/2000/svg">
|
|
||||||
<sodipodi:namedview
|
|
||||||
id="namedview192"
|
|
||||||
pagecolor="#505050"
|
|
||||||
bordercolor="#eeeeee"
|
|
||||||
borderopacity="1"
|
|
||||||
inkscape:showpageshadow="0"
|
|
||||||
inkscape:pageopacity="0"
|
|
||||||
inkscape:pagecheckerboard="0"
|
|
||||||
inkscape:deskcolor="#505050"
|
|
||||||
inkscape:document-units="mm"
|
|
||||||
showgrid="true"
|
|
||||||
inkscape:zoom="2"
|
|
||||||
inkscape:cx="105.25"
|
|
||||||
inkscape:cy="75.25"
|
|
||||||
inkscape:window-width="1440"
|
|
||||||
inkscape:window-height="2488"
|
|
||||||
inkscape:window-x="2560"
|
|
||||||
inkscape:window-y="0"
|
|
||||||
inkscape:window-maximized="1"
|
|
||||||
inkscape:current-layer="layer1">
|
|
||||||
<inkscape:grid
|
|
||||||
type="xygrid"
|
|
||||||
id="grid201"
|
|
||||||
units="mm"
|
|
||||||
spacingx="0.49999999"
|
|
||||||
spacingy="0.49999999"
|
|
||||||
empspacing="8"
|
|
||||||
dotted="true" />
|
|
||||||
</sodipodi:namedview>
|
|
||||||
<defs
|
|
||||||
id="defs187" />
|
|
||||||
<g
|
|
||||||
inkscape:label="Layer 1"
|
|
||||||
inkscape:groupmode="layer"
|
|
||||||
id="layer1">
|
|
||||||
<path
|
|
||||||
style="display:inline;fill:#d5e5ff;stroke-width:0.264583"
|
|
||||||
d="m 21.999999,19.999999 c 0,0 1e-6,-13.9999991 0.500001,-15.4999991 0.447214,-1.3416413 18.552785,-1.3416407 18.999999,0 0.5,1.5 0.499998,15.4999991 0.499998,15.4999991 h -3.999999 l 1e-6,-12.4999992 h -12 V 19.999999 Z"
|
|
||||||
id="path427"
|
|
||||||
sodipodi:nodetypes="csscccccc" />
|
|
||||||
<path
|
|
||||||
style="display:inline;fill:#6f7c91;stroke-width:0.264583"
|
|
||||||
d="m 39.499999,20 h 8.5 c 0.5,-1e-6 1,0 1.5,0.5 0.5,0.5 0.5,1 0.5,1.5 v 35.999999 c 0,0.5 0,1 -0.5,1.5 -0.5,0.5 -1,0.5 -1.5,0.5 H 16 c -0.5,0 -1,0 -1.5,-0.5 -0.5,-0.5 -0.5,-1 -0.5,-1.5 C 14,58.499999 14,22 14,22 14,21.5 14,21 14.5,20.5 15,20 15.5,20 16,20"
|
|
||||||
id="path313"
|
|
||||||
sodipodi:nodetypes="ccscssscsccsc" />
|
|
||||||
<path
|
|
||||||
style="display:inline;fill:#1c1f24;stroke-width:0.264583"
|
|
||||||
d="M 17,57 V 23 h 29.999999 v 34 z"
|
|
||||||
id="path544"
|
|
||||||
sodipodi:nodetypes="ccccc" />
|
|
||||||
<path
|
|
||||||
style="display:inline;fill:#c87137;stroke-width:0.264583"
|
|
||||||
d="m 16.999998,28 v -5 h 10.500001 c 0,0 1.857347,-2.214233 -0.574489,-2.999999 L 25.999998,20 v -4.5 c 0,0 -2.595778,-1.319748 -3.250947,-0.664579 C 21.899156,15.685316 21.966695,18.569422 21.999998,20 l -5.999999,1e-6 c -0.500001,-1e-6 -1,0 -1.5,0.5 -0.5,0.5 -0.5,1 -0.5,1.5 0,0 0.0081,7.495418 0,8.021259 C 13.977029,31.521085 16.999998,28 16.999998,28 Z"
|
|
||||||
id="path798"
|
|
||||||
sodipodi:nodetypes="ccccccsccsssc" />
|
|
||||||
<circle
|
|
||||||
style="fill:#a05a2c;stroke-width:0.414214"
|
|
||||||
id="path1085"
|
|
||||||
cx="15.419278"
|
|
||||||
cy="21.217234"
|
|
||||||
r="0.78276724" />
|
|
||||||
<circle
|
|
||||||
style="fill:#a05a2c;stroke-width:0.529166"
|
|
||||||
id="path1087"
|
|
||||||
cx="16.999998"
|
|
||||||
cy="20.75"
|
|
||||||
r="0.49999952" />
|
|
||||||
<ellipse
|
|
||||||
style="fill:#a05a2c;stroke-width:0.341276"
|
|
||||||
id="path1089"
|
|
||||||
cx="15.322467"
|
|
||||||
cy="22.822466"
|
|
||||||
rx="0.32246634"
|
|
||||||
ry="0.32246637" />
|
|
||||||
<circle
|
|
||||||
style="fill:#a05a2c;stroke-width:0.229542"
|
|
||||||
id="path1091"
|
|
||||||
cx="18.433779"
|
|
||||||
cy="21.433781"
|
|
||||||
r="0.43378061" />
|
|
||||||
<circle
|
|
||||||
style="fill:#784421;stroke-width:0.526672"
|
|
||||||
id="path1181"
|
|
||||||
cx="16.601322"
|
|
||||||
cy="22.752354"
|
|
||||||
r="0.49764386" />
|
|
||||||
<circle
|
|
||||||
style="fill:#784421;stroke-width:0.264583"
|
|
||||||
id="path1185"
|
|
||||||
cx="15.84698"
|
|
||||||
cy="21.702047"
|
|
||||||
r="0.20204736" />
|
|
||||||
<circle
|
|
||||||
style="fill:#a05a2c;stroke-width:0.473495"
|
|
||||||
id="path1187"
|
|
||||||
cx="20.058605"
|
|
||||||
cy="20.960361"
|
|
||||||
r="0.6910435" />
|
|
||||||
<ellipse
|
|
||||||
style="fill:#66ff00;stroke-width:0.300663"
|
|
||||||
id="path1275"
|
|
||||||
cx="32"
|
|
||||||
cy="36"
|
|
||||||
rx="6.25"
|
|
||||||
ry="6.2499995" />
|
|
||||||
<rect
|
|
||||||
style="fill:#66ff00;stroke-width:0.280463"
|
|
||||||
id="rect1332"
|
|
||||||
width="5.0000005"
|
|
||||||
height="10.499998"
|
|
||||||
x="29.5"
|
|
||||||
y="40.75" />
|
|
||||||
</g>
|
|
||||||
</svg>
|
|
33
build.rs
33
build.rs
|
@ -1,33 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use trixy::macros::config::trixy::TrixyConfig;
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
println!("cargo:rerun-if-changed=./dist/*");
|
|
||||||
println!("cargo:rerun-if-changed=./src/app/command_interface/command_list/api.tri");
|
|
||||||
let file_tree = TrixyConfig::new("handle_cmd")
|
|
||||||
.trixy_path("./src/app/command_interface/command_list/api.tri")
|
|
||||||
.dist_dir_path("./dist")
|
|
||||||
.generate();
|
|
||||||
|
|
||||||
file_tree.materialize().unwrap();
|
|
||||||
}
|
|
44
cog.toml
44
cog.toml
|
@ -1,44 +0,0 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
tag_prefix = "v"
|
|
||||||
branch_whitelist = ["main"]
|
|
||||||
ignore_merge_commits = false
|
|
||||||
|
|
||||||
pre_bump_hooks = [
|
|
||||||
"nix flake check", # verify the project builds
|
|
||||||
"./scripts/renew_copyright_header.sh", # update the license header in each file
|
|
||||||
"cargo set-version {{version}}", # bump version in Cargo.toml
|
|
||||||
"nix fmt", # format
|
|
||||||
]
|
|
||||||
post_bump_hooks = [
|
|
||||||
"git push",
|
|
||||||
"cargo publish",
|
|
||||||
"git push origin v{{version}}", # push the new tag to origin
|
|
||||||
]
|
|
||||||
|
|
||||||
[bump_profiles]
|
|
||||||
|
|
||||||
[changelog]
|
|
||||||
path = "NEWS.md"
|
|
||||||
template = "remote"
|
|
||||||
remote = "git.nerdcult.net"
|
|
||||||
repository = "core"
|
|
||||||
owner = "trinitrix"
|
|
||||||
authors = [{ signature = "The Trinitrix Project", username = "trinitrix" }]
|
|
|
@ -1,141 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de,
|
|
||||||
* antifallobst@systemausfall.org, sils@sils.li> SPDX-License-Identifier:
|
|
||||||
* GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "../../dist/interface.h"
|
|
||||||
#include <assert.h>
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <stdlib.h>
|
|
||||||
#include <string.h>
|
|
||||||
|
|
||||||
#define println(args...) \
|
|
||||||
fprintf (log_file, "\33[32;1m(plugin):\33[0m \33[34;1m"); \
|
|
||||||
fprintf (log_file, args); \
|
|
||||||
fprintf (log_file, "\n\33[0m"); \
|
|
||||||
fflush (log_file);
|
|
||||||
|
|
||||||
#define eprintln(args...) \
|
|
||||||
fprintf (log_file, "\33[32;1m(plugin):\33[0m\33[31;1m "); \
|
|
||||||
fprintf (log_file, args); \
|
|
||||||
fprintf (log_file, "\n\33[0m"); \
|
|
||||||
fflush (log_file);
|
|
||||||
|
|
||||||
int is_first_log_file_open = 1;
|
|
||||||
FILE *
|
|
||||||
get_log_file ()
|
|
||||||
{
|
|
||||||
FILE *log_file;
|
|
||||||
|
|
||||||
if (is_first_log_file_open)
|
|
||||||
{
|
|
||||||
is_first_log_file_open = 0;
|
|
||||||
log_file = fopen ("plugin.txt", "w");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
log_file = fopen ("plugin.txt", "wa");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (log_file == NULL)
|
|
||||||
{
|
|
||||||
printf ("Error opening file!\n");
|
|
||||||
exit (1);
|
|
||||||
}
|
|
||||||
|
|
||||||
return log_file;
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
handle_error ()
|
|
||||||
{
|
|
||||||
FILE *log_file = get_log_file ();
|
|
||||||
eprintln ("GOT an error");
|
|
||||||
|
|
||||||
int error_length = last_error_length ();
|
|
||||||
char *error = malloc (error_length);
|
|
||||||
last_error_message (error, error_length);
|
|
||||||
eprintln ("Encountered error: %s", error);
|
|
||||||
free (error);
|
|
||||||
}
|
|
||||||
|
|
||||||
void
|
|
||||||
set_normal_mode ()
|
|
||||||
{
|
|
||||||
if (!trinitrix.api.ui.set_mode (Normal))
|
|
||||||
handle_error ();
|
|
||||||
}
|
|
||||||
void
|
|
||||||
set_command_mode ()
|
|
||||||
{
|
|
||||||
if (!trinitrix.api.ui.set_mode (Command))
|
|
||||||
handle_error ();
|
|
||||||
}
|
|
||||||
void
|
|
||||||
set_insert_mode ()
|
|
||||||
{
|
|
||||||
if (!trinitrix.api.ui.set_mode (Insert))
|
|
||||||
handle_error ();
|
|
||||||
}
|
|
||||||
void
|
|
||||||
print_hi ()
|
|
||||||
{
|
|
||||||
if (!trinitrix.api.raw.raise_error ("hi!"))
|
|
||||||
handle_error ();
|
|
||||||
}
|
|
||||||
void
|
|
||||||
print_warning ()
|
|
||||||
{
|
|
||||||
if (!trinitrix.api.raw.raise_error (
|
|
||||||
"To exit trinitrix use 'trinitrix.api.exit()' instead!"))
|
|
||||||
handle_error ();
|
|
||||||
}
|
|
||||||
|
|
||||||
int
|
|
||||||
plugin_main ()
|
|
||||||
{
|
|
||||||
FILE *log_file = get_log_file ();
|
|
||||||
|
|
||||||
println ("Hi, setting first keymap!");
|
|
||||||
if (!trinitrix.api.keymaps.add ("ci", "<ESC>", set_normal_mode))
|
|
||||||
handle_error ();
|
|
||||||
println ("Done setting that keymap");
|
|
||||||
|
|
||||||
if (!trinitrix.api.keymaps.add ("n", ":", set_command_mode))
|
|
||||||
handle_error ();
|
|
||||||
|
|
||||||
trinitrix.api.keymaps.add ("n", "i", set_insert_mode);
|
|
||||||
trinitrix.api.keymaps.add ("n", "<TAB>", trinitrix.api.ui.cycle_planes);
|
|
||||||
|
|
||||||
// a simple test to prove that key chords work
|
|
||||||
trinitrix.api.keymaps.add ("ni", "jj", print_hi);
|
|
||||||
|
|
||||||
trinitrix.api.keymaps.add ("n", "q", trinitrix.api.exit);
|
|
||||||
|
|
||||||
// Help people
|
|
||||||
trinitrix.api.keymaps.add ("n", "<C-c>", print_warning);
|
|
||||||
|
|
||||||
// workaround to avoid c de-allocating our nice strings
|
|
||||||
while (1)
|
|
||||||
{
|
|
||||||
};
|
|
||||||
|
|
||||||
return EXIT_SUCCESS;
|
|
||||||
}
|
|
|
@ -1,56 +0,0 @@
|
||||||
-- Copyright (C) 2024 - 2024:
|
|
||||||
-- The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
-- SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
--
|
|
||||||
-- This file is part of Trinitrix.
|
|
||||||
--
|
|
||||||
-- Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
-- it under the terms of the GNU General Public License as published
|
|
||||||
-- by the Free Software Foundation, either version 3 of the License,
|
|
||||||
-- or (at your option) any later version.
|
|
||||||
--
|
|
||||||
-- This program is distributed in the hope that it will be useful,
|
|
||||||
-- but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
-- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
-- General Public License for more details.
|
|
||||||
--
|
|
||||||
-- You should have received a copy of the GNU General Public License
|
|
||||||
-- along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
-- FIXME(@soispha): The code here has been deprecated, update it when trixy supports lua <2024-05-03>
|
|
||||||
|
|
||||||
-- create the required tables under `std`
|
|
||||||
trinitrix.std = { keymaps = {} }
|
|
||||||
|
|
||||||
--- Add a new keymap. This is just a convenience function which registers the function
|
|
||||||
--- and at the same time deals with the fact that the whole trinitrix api is async.
|
|
||||||
---@param mode string
|
|
||||||
---@param key string
|
|
||||||
---@param callback function
|
|
||||||
trinitrix.std.keymaps.add = function(mode, key, callback)
|
|
||||||
local callback_key = trinitrix.api.register_function(function()
|
|
||||||
local co = coroutine.create(callback)
|
|
||||||
while coroutine.status(co) ~= "dead" do
|
|
||||||
coroutine.resume(co)
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
trinitrix.api.keymaps.add(mode, key, callback_key)
|
|
||||||
end
|
|
||||||
|
|
||||||
trinitrix.std.keymaps.add("ci", "<ESC>", trinitrix.api.ui.set_mode_normal)
|
|
||||||
|
|
||||||
trinitrix.std.keymaps.add("n", ":", trinitrix.api.ui.command_line_show)
|
|
||||||
trinitrix.std.keymaps.add("n", "i", trinitrix.api.ui.set_mode_insert)
|
|
||||||
trinitrix.std.keymaps.add("n", "<TAB>", trinitrix.api.ui.cycle_planes)
|
|
||||||
|
|
||||||
-- a simple test to prove that key chords work
|
|
||||||
trinitrix.std.keymaps.add("ni", "jj", function()
|
|
||||||
print("hi")
|
|
||||||
end)
|
|
||||||
|
|
||||||
trinitrix.std.keymaps.add("n", "q", trinitrix.api.exit)
|
|
||||||
|
|
||||||
-- Help people
|
|
||||||
trinitrix.std.keymaps.add("n", "<C-c>", function()
|
|
||||||
print("To exit trinitrix use 'trinitrix.api.exit()' instead!")
|
|
||||||
end)
|
|
|
@ -1,30 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Command Line
|
|
||||||
|
|
||||||
Trinitrix has a command line, which you can use to control and navigate the app.
|
|
||||||
You can activate it with the `CommandLineShow` command, which is mapped to `<Ctrl>+c` by default.
|
|
||||||
|
|
||||||
## Syntax (LUA)
|
|
||||||
|
|
||||||
The command line uses [lua](https://www.lua.org/about.html) and provides a builtin function for every internal command.
|
|
||||||
The function names are the snake case variants of the command names.
|
|
|
@ -1,35 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Commands
|
|
||||||
|
|
||||||
Trinitrix relies heavily on the concept of commands.
|
|
||||||
There is a command for every interaction with the application.
|
|
||||||
By this, everything can use the same internal API, what makes the whole application extreme extensible and customizable.
|
|
||||||
|
|
||||||
## Available Commands
|
|
||||||
|
|
||||||
| Command | Description |
|
|
||||||
|-----------------|-------------------------------------------------------------------------------|
|
|
||||||
| Exit | Terminates the whole application. |
|
|
||||||
| CommandLineShow | Shows the command line. |
|
|
||||||
| CommandLineHide | Hides the command line. |
|
|
||||||
| RoomMessageSend | Sends the message, which is passed as argument, to the currently active room. |
|
|
|
@ -1,130 +1,29 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Commit message style
|
# Commit message style
|
||||||
|
|
||||||
*This specification is heavily inspired by the [AngularJS commit message format](https://github.com/angular/angular/blob/main/CONTRIBUTING.md#-commit-message-format).*
|
Commit messages have to align with the following style:
|
||||||
|
|
||||||
We have very precise rules over how our Git commit messages must be formatted.
|
`<type> (<space>): <change>`
|
||||||
This format leads to **easier to read commit history**.
|
|
||||||
|
|
||||||
Each commit message consists of a **header**, a **body** (optional), and a **footer** (optional).
|
Pull requests that don't align with this style probably won't be accepted.
|
||||||
|
|
||||||
```
|
## type
|
||||||
<header>
|
The type of change to be committed.
|
||||||
<BLANK LINE>
|
|
||||||
<body>
|
|
||||||
<BLANK LINE>
|
|
||||||
<footer>
|
|
||||||
```
|
|
||||||
|
|
||||||
The `header` is mandatory and must conform to the _Commit Message Header format_ (described below).
|
Possible values:
|
||||||
|
- __feature__ - When you added a new feature or functionality.
|
||||||
|
- __fix__ - When you fixed a bug or stuff like that.
|
||||||
|
- __docs__ - When you wrote documentation or changed the readme. The space field is optional here.
|
||||||
|
- __refactor__ - When you restructured the codebase / parts of it. The space field is optional here.
|
||||||
|
|
||||||
The `body` is mandatory for all commits that are not 100% self explainatory.
|
If your commit has multiple types, think about splitting it into multiple commits.
|
||||||
When the body is present it must be at least 20 characters long and must conform to the _Commit Message Body format_.
|
This helps others (and you) to understand changes in retrospect.
|
||||||
|
|
||||||
The `footer` is optional. The _Commit Message Footer format_ (described below) describes what the footer is used for and the structure it must have.
|
## space
|
||||||
|
The space that is affected by the commit.
|
||||||
|
|
||||||
## Commit Message Header
|
## change
|
||||||
|
What you've changed. / The actual commit message.
|
||||||
|
|
||||||
```
|
# Examples
|
||||||
<type>(<scope>): <short summary>
|
- `feature (AHCI): implemented port initialization`
|
||||||
│ │ │
|
- `fix (processes): changed process spawning to copy the null terminator at the end of the name`
|
||||||
│ │ └─⫸ Summary in present tense. Not capitalized. No period at the end.
|
|
||||||
│ │
|
|
||||||
│ └─⫸ Commit Scope: The name of the affected module.
|
|
||||||
│
|
|
||||||
└─⫸ Commit Type: Build|Docs|Feat|Fix|Perf|Refactor|Test|Merge
|
|
||||||
```
|
|
||||||
|
|
||||||
The `<type>` and `<summary>` fields are mandatory, the `(<scope>)` field is optional.
|
|
||||||
|
|
||||||
### type
|
|
||||||
|
|
||||||
Must be one of the following:
|
|
||||||
|
|
||||||
- **Build**: Changes that affect the build system or external dependencies (example scopes: gulp, broccoli, npm)
|
|
||||||
- **Docs**: Documentation only changes
|
|
||||||
- **Feat**: A new feature
|
|
||||||
- **Fix**: A bug fix
|
|
||||||
- **Perf**: A code change that improves performance
|
|
||||||
- **Refactor**: A code change that neither fixes a bug nor adds a feature
|
|
||||||
- **Test**: Adding missing tests or correcting existing tests
|
|
||||||
- **Merge**: A merging commit
|
|
||||||
|
|
||||||
### Scope
|
|
||||||
|
|
||||||
The scope should be the name of the module affected (as perceived by the person reading the changelog generated from commit messages).
|
|
||||||
|
|
||||||
Specify submodules if needed!
|
|
||||||
|
|
||||||
Example scopes:
|
|
||||||
|
|
||||||
- `app::events`
|
|
||||||
- `ui`
|
|
||||||
|
|
||||||
When a commit affects the whole tree, use `treewide`.
|
|
||||||
|
|
||||||
### Summary
|
|
||||||
|
|
||||||
Use the summary field to provide a succinct description of the change:
|
|
||||||
|
|
||||||
- use the imperative, present tense: "change" not "changed" nor "changes"
|
|
||||||
- don't capitalize the first letter
|
|
||||||
- no dot (.) at the end
|
|
||||||
|
|
||||||
## Commit Message Body
|
|
||||||
|
|
||||||
Just as in the summary, use the imperative, present tense: "fix" not "fixed" nor "fixes".
|
|
||||||
|
|
||||||
Explain the motivation for the change in the commit message body. This commit message should explain _why_ you are making the change.
|
|
||||||
You can include a comparison of the previous behavior with the new behavior in order to illustrate the impact of the change.
|
|
||||||
|
|
||||||
This is not needed, if the summary is 100% self-explainatory.
|
|
||||||
|
|
||||||
## Commit Message Footer
|
|
||||||
|
|
||||||
The footer can contain information about breaking changes and deprecations and is also the place to reference issues and other PRs that this commit closes or is related to.
|
|
||||||
For example:
|
|
||||||
|
|
||||||
```
|
|
||||||
BREAKING CHANGE: <breaking change summary>
|
|
||||||
<BLANK LINE>
|
|
||||||
<breaking change description + migration instructions>
|
|
||||||
<BLANK LINE>
|
|
||||||
<BLANK LINE>
|
|
||||||
Fixes #<issue number>
|
|
||||||
```
|
|
||||||
|
|
||||||
or
|
|
||||||
|
|
||||||
```
|
|
||||||
DEPRECATED: <what is deprecated>
|
|
||||||
<BLANK LINE>
|
|
||||||
<deprecation description + recommended update path>
|
|
||||||
<BLANK LINE>
|
|
||||||
<BLANK LINE>
|
|
||||||
Closes #<pr number>
|
|
||||||
```
|
|
||||||
|
|
||||||
Breaking Change section should start with the phrase "BREAKING CHANGE: " followed by a summary of the breaking change, a blank line, and a detailed description of the breaking change that also includes migration instructions.
|
|
||||||
|
|
||||||
Similarly, a Deprecation section should start with "DEPRECATED: " followed by a short description of what is deprecated, a blank line, and a detailed description of the deprecation that also mentions the recommended update path.
|
|
|
@ -1,25 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Config
|
|
||||||
|
|
||||||
To configure trinitrix, you can add a file named `config.lua` to the userdata path.
|
|
||||||
This file will be interpreted on startup with the same syntax as the Command Line.
|
|
|
@ -1,41 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
# Design Philosophy
|
|
||||||
|
|
||||||
## Customizability
|
|
||||||
|
|
||||||
Trinitrix aims to be highly customizable.
|
|
||||||
The command API provides a customizazion method, which can be used by an initial config script or live from the intern cli by the user.
|
|
||||||
The command API should cover at least 90% of the possible configuration settings.
|
|
||||||
|
|
||||||
## Cross Platform
|
|
||||||
|
|
||||||
Trinitrix is cross platform.
|
|
||||||
Even if the targeted users are nerdy linux users xD.
|
|
||||||
This can be easily achieved by using only cross platform libraries such as `crossterm` or `tui`.
|
|
||||||
|
|
||||||
## Future Proof / Extensible
|
|
||||||
|
|
||||||
Modules and Interfaces should be designed in a way, that they're not limited to only use case.
|
|
||||||
They should be open for every usecase, that makes sense.
|
|
||||||
A good example is the command API, which is a unified way to interact with the application.
|
|
||||||
It can used via lua, but use cases like fetching commands using http are theoretically possible too.
|
|
|
@ -1,61 +0,0 @@
|
||||||
# Trinitrix Backend API (TriBA)
|
|
||||||
|
|
||||||
**Disclaimer:** These docs are WIP and going to receive a lot of improvement.
|
|
||||||
|
|
||||||
## Basic concept
|
|
||||||
|
|
||||||
The core starts a CBS as its child process and gives it as first Arg a base64 encoded UUID.
|
|
||||||
The CBS then connects to the local fs (or namespaced) socket.
|
|
||||||
After performing a handshake, which includes exchange of encryption keys, all communication
|
|
||||||
between core and CBS is encrypted (AES256-GCM-SIV) and serialized using [MessagePack](https://msgpack.org)
|
|
||||||
|
|
||||||
## Packets
|
|
||||||
|
|
||||||
Post-Handshake communication is structured in packets, which have the following structure in their raw form:
|
|
||||||
|
|
||||||
| Size (bytes) | Type | Content |
|
|
||||||
|--------------|-------------------|--------------------------------------------------------------------|
|
|
||||||
| 4 | uint32 | The size of the payload. |
|
|
||||||
| - | encrypted payload | The AES-GCM-SIV encrypted MessagePack serialization of the packet. |
|
|
||||||
|
|
||||||
A decrypted and deserialized payload contains either a response or a request.
|
|
||||||
A request looks as follows:
|
|
||||||
|
|
||||||
| Size | Name | Type | Content |
|
|
||||||
|------|--------|--------|-------------------------------------------------------------------------------------------------------------------|
|
|
||||||
| 8 | `id` | uint64 | The ID of _this_ packet. |
|
|
||||||
| - | `body` | enum | The actual packet data. (this will be better documented, as soon, as I dive into the mPack serialization details) |
|
|
||||||
|
|
||||||
A response looks like this:
|
|
||||||
|
|
||||||
| Size | Name | Type | Content |
|
|
||||||
|------|--------|--------|-------------------------------------------------------|
|
|
||||||
| 8 | `id` | uint64 | The ID of _this_ packet. |
|
|
||||||
| 8 | `req` | uint64 | The ID of the request packet this response refers to. |
|
|
||||||
| - | `body` | enum | The actual packet data. |
|
|
||||||
|
|
||||||
**Every request packet, that is sent over the socket, has to get a linked response packet.**
|
|
||||||
|
|
||||||
### IDs
|
|
||||||
|
|
||||||
Packet IDs are expected to be an incremental counter.
|
|
||||||
There is no difference between requests and responses originating from the same socket side when it comes to IDs.
|
|
||||||
So both - requests and responses - should share the same counter.
|
|
||||||
|
|
||||||
## Handshake
|
|
||||||
|
|
||||||
The handshaking process after connecting to the socket looks as follows:
|
|
||||||
|
|
||||||
1. The CBS sends its ID as 16 raw bytes.
|
|
||||||
2. When the ID is not known to the core, it aborts the handshaking process by closing the connection.
|
|
||||||
3. The core sends its Public Key for this connection. Again just 32 raw bytes.
|
|
||||||
4. The CBS sends its Public Key for this connection.
|
|
||||||
5. The core sends a 12 byte nonce value.
|
|
||||||
6. __Connection Upgrade:__ From this point on, all communication is structured by packets.
|
|
||||||
The packet encryption key is calculated using x25519 Diffie-Hellman and the previously exchanged keys.
|
|
||||||
The nonce from step 5 will be used as nonce for all packets.
|
|
||||||
7. The CBS sends the `Request::HandshakeUpgradeConnection` packet.
|
|
||||||
8. The core responds with `Response::Success`.
|
|
||||||
9. (In here there is going to happen API version information exchange etc.)
|
|
||||||
10. The Core sends a `Request::HandshakeSuccess`
|
|
||||||
11. The CBS responds with `Response::Succcess`
|
|
|
@ -1,437 +1,236 @@
|
||||||
<!--
|
<mxfile host="app.diagrams.net" modified="2023-07-01T20:42:20.779Z" agent="Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/113.0" etag="9AqWz0qh-ewpSTInHByT" version="21.5.2" type="device">
|
||||||
Copyright (C) 2024 - 2024:
|
<diagram id="C5RBs43oDa-KdzZeNtuy" name="Page-1">
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
<mxGraphModel dx="1990" dy="1197" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<mxfile host="app.diagrams.net" modified="2023-08-04T10:25:32.584Z" agent="Mozilla/5.0 (X11; Linux x86_64; rv:109.0) Gecko/20100101 Firefox/115.0" etag="MddSPBE_GJy1ugcnxB6H" version="21.6.6" type="device">
|
|
||||||
<diagram name="Page-1" id="hWGGHW_Bsmf1wcgqsJl5">
|
|
||||||
<mxGraphModel dx="682" dy="366" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0">
|
|
||||||
<root>
|
<root>
|
||||||
<mxCell id="0" />
|
<mxCell id="WIyWlLk6GJQsqaUBKTNV-0" />
|
||||||
<mxCell id="1" parent="0" />
|
<mxCell id="WIyWlLk6GJQsqaUBKTNV-1" parent="WIyWlLk6GJQsqaUBKTNV-0" />
|
||||||
<mxCell id="sgZzQmQA5r4gPmcAVD2c-1" value="Main Process" style="swimlane;html=1;fillStyle=solid;rounded=0;fillColor=#b0e3e6;strokeColor=#0e8088;strokeWidth=4;" parent="1" vertex="1">
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--0" value="App - Struct" style="swimlane;fontStyle=2;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=0;strokeWidth=3;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
||||||
<mxGeometry x="40" y="80" width="770" height="700" as="geometry" />
|
<mxGeometry x="320" y="120" width="160" height="120" as="geometry">
|
||||||
</mxCell>
|
<mxRectangle x="230" y="140" width="160" height="26" as="alternateBounds" />
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-5" value="Accounts (example)" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="sgZzQmQA5r4gPmcAVD2c-1" vertex="1">
|
|
||||||
<mxGeometry x="90" y="480" width="140" height="150" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-6" value="Account 1 (Matrix)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="erJn0JmvOIQi-aqMdXCH-5" vertex="1">
|
|
||||||
<mxGeometry y="30" width="140" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-7" value="Account 2 (Matrix)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="erJn0JmvOIQi-aqMdXCH-5" vertex="1">
|
|
||||||
<mxGeometry y="60" width="140" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-8" value="Account 3 (Signal)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="erJn0JmvOIQi-aqMdXCH-5" vertex="1">
|
|
||||||
<mxGeometry y="90" width="140" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-10" value="Account 4 (Telegram)" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" parent="erJn0JmvOIQi-aqMdXCH-5" vertex="1">
|
|
||||||
<mxGeometry y="120" width="140" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-45" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;fillColor=#f8cecc;strokeColor=#b85450;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-35" target="bEImzGkf_4H7QTsFuULF-11" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="342" y="370" />
|
|
||||||
<mxPoint x="385" y="370" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-35" value="Event Stream" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;strokeColor=#432D57;fontColor=#ffffff;" parent="sgZzQmQA5r4gPmcAVD2c-1" vertex="1">
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--1" value="ui
" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" parent="zkfFHV4jXpPFQw0GAbJ--0" vertex="1">
|
||||||
<mxGeometry x="265" y="390" width="155" height="60" as="geometry" />
|
<mxGeometry y="30" width="160" height="26" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-34" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-39" edge="1">
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--2" value="accounts_manager
" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;shadow=0;html=0;" parent="zkfFHV4jXpPFQw0GAbJ--0" vertex="1">
|
||||||
<mxGeometry relative="1" as="geometry">
|
<mxGeometry y="56" width="160" height="26" as="geometry" />
|
||||||
<mxPoint x="440" y="570" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-35" value="Current Account" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="bEImzGkf_4H7QTsFuULF-34" vertex="1" connectable="0">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-35" value="status" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;shadow=0;html=0;" vertex="1" parent="zkfFHV4jXpPFQw0GAbJ--0">
|
||||||
<mxGeometry x="-0.1086" y="-2" relative="1" as="geometry">
|
<mxGeometry y="82" width="160" height="26" as="geometry" />
|
||||||
<mxPoint y="1" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-39" value="Chat&nbsp; Action Stream" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608a;strokeColor=#432D57;fontColor=#ffffff;" parent="sgZzQmQA5r4gPmcAVD2c-1" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-7" style="edgeStyle=orthogonalEdgeStyle;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="zkfFHV4jXpPFQw0GAbJ--6" target="EYjtFuS0Bnb1uTnDH7Uf-6">
|
||||||
<mxGeometry x="440" y="460" width="100" height="110" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-56" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-55" target="erJn0JmvOIQi-aqMdXCH-35" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
<mxGeometry relative="1" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-55" value="Key Input Sync <br>Thread" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=4;" parent="sgZzQmQA5r4gPmcAVD2c-1" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-78" value="<div>Call</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-7">
|
||||||
<mxGeometry x="40" y="390" width="120" height="60" as="geometry" />
|
<mxGeometry x="0.0638" y="-1" relative="1" as="geometry">
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-9" value="Main Loop<br>Thread" style="swimlane;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=4;startSize=40;" parent="sgZzQmQA5r4gPmcAVD2c-1" vertex="1">
|
|
||||||
<mxGeometry x="40" y="200" width="690" height="160" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="bEImzGkf_4H7QTsFuULF-9" source="bEImzGkf_4H7QTsFuULF-10" target="bEImzGkf_4H7QTsFuULF-11" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-10" value="Draw UI" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="bEImzGkf_4H7QTsFuULF-9" vertex="1">
|
|
||||||
<mxGeometry x="125" y="80" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="bEImzGkf_4H7QTsFuULF-9" source="bEImzGkf_4H7QTsFuULF-11" target="bEImzGkf_4H7QTsFuULF-12" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-11" value="Await Event" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="bEImzGkf_4H7QTsFuULF-9" vertex="1">
|
|
||||||
<mxGeometry x="285" y="80" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="bEImzGkf_4H7QTsFuULF-9" source="bEImzGkf_4H7QTsFuULF-12" target="bEImzGkf_4H7QTsFuULF-10" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="600" y="110" />
|
|
||||||
<mxPoint x="600" y="60" />
|
|
||||||
<mxPoint x="90" y="60" />
|
|
||||||
<mxPoint x="90" y="110" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-59" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#d5e8d4;strokeColor=#82b366;" parent="bEImzGkf_4H7QTsFuULF-9" source="bEImzGkf_4H7QTsFuULF-12" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="505" y="-40" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-12" value="Handle Event" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#e1d5e7;strokeColor=#9673a6;" parent="bEImzGkf_4H7QTsFuULF-9" vertex="1">
|
|
||||||
<mxGeometry x="445" y="80" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.096;entryY=1.001;entryDx=0;entryDy=0;entryPerimeter=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-6" target="erJn0JmvOIQi-aqMdXCH-35" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="280" y="520" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.366;entryY=0.993;entryDx=0;entryDy=0;entryPerimeter=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-7" target="erJn0JmvOIQi-aqMdXCH-35" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="322" y="550" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.612;entryY=1.017;entryDx=0;entryDy=0;entryPerimeter=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-8" target="erJn0JmvOIQi-aqMdXCH-35" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="360" y="580" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.873;entryY=1.033;entryDx=0;entryDy=0;entryPerimeter=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-10" target="erJn0JmvOIQi-aqMdXCH-35" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="400" y="610" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="sgZzQmQA5r4gPmcAVD2c-1" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="620" as="targetPoint" />
|
|
||||||
<mxPoint x="230" y="620" as="sourcePoint" />
|
|
||||||
<Array as="points" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-24" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="sgZzQmQA5r4gPmcAVD2c-1" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="590" as="targetPoint" />
|
|
||||||
<mxPoint x="230" y="590" as="sourcePoint" />
|
|
||||||
<Array as="points" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-23" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;startArrow=classic;startFill=1;endArrow=none;endFill=0;exitX=1.003;exitY=0.653;exitDx=0;exitDy=0;exitPerimeter=0;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="erJn0JmvOIQi-aqMdXCH-7" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="560" as="targetPoint" />
|
|
||||||
<mxPoint x="230" y="554.74" as="sourcePoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="265" y="560" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;startArrow=classic;startFill=1;endArrow=none;endFill=0;" parent="sgZzQmQA5r4gPmcAVD2c-1" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<mxPoint x="440" y="530" as="targetPoint" />
|
|
||||||
<mxPoint x="230" y="530" as="sourcePoint" />
|
|
||||||
<Array as="points" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-46" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;fillColor=#d5e8d4;strokeColor=#82b366;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="bEImzGkf_4H7QTsFuULF-12" target="erJn0JmvOIQi-aqMdXCH-35" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="520" y="420" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-48" value="Commands" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" parent="bEImzGkf_4H7QTsFuULF-46" vertex="1" connectable="0">
|
|
||||||
<mxGeometry x="0.5636" relative="1" as="geometry">
|
|
||||||
<mxPoint x="11" as="offset" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-49" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#d5e8d4;strokeColor=#82b366;exitX=0.625;exitY=1;exitDx=0;exitDy=0;exitPerimeter=0;" parent="sgZzQmQA5r4gPmcAVD2c-1" source="bEImzGkf_4H7QTsFuULF-12" target="erJn0JmvOIQi-aqMdXCH-39" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="560" y="360" />
|
|
||||||
<mxPoint x="545" y="360" />
|
|
||||||
<mxPoint x="545" y="440" />
|
|
||||||
<mxPoint x="490" y="440" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-1" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#76608A;strokeColor=#9673a6;" vertex="1" parent="sgZzQmQA5r4gPmcAVD2c-1">
|
|
||||||
<mxGeometry x="600" y="560" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#d5e8d4;strokeColor=#82b366;exitX=0.75;exitY=1;exitDx=0;exitDy=0;entryX=0.25;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="sgZzQmQA5r4gPmcAVD2c-1" source="bEImzGkf_4H7QTsFuULF-12" target="yyTpLhAHu4WPmghRuIGA-4">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="575" y="430" />
|
|
||||||
<mxPoint x="630" y="430" />
|
|
||||||
</Array>
|
|
||||||
<mxPoint x="650" y="350" as="sourcePoint" />
|
|
||||||
<mxPoint x="630" y="525" as="targetPoint" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.608;entryY=-0.073;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="sgZzQmQA5r4gPmcAVD2c-1" source="yyTpLhAHu4WPmghRuIGA-4" target="yyTpLhAHu4WPmghRuIGA-18">
|
|
||||||
<mxGeometry relative="1" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-4" value="Code executor" style="text;html=1;strokeColor=none;fillColor=none;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="sgZzQmQA5r4gPmcAVD2c-1">
|
|
||||||
<mxGeometry x="600" y="560" width="120" height="60" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-19" value="" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="sgZzQmQA5r4gPmcAVD2c-1">
|
|
||||||
<mxGeometry x="600" y="650" width="50" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-13" value="" style="endArrow=classic;html=1;rounded=0;exitX=0.67;exitY=-0.068;exitDx=0;exitDy=0;exitPerimeter=0;strokeColor=#82B366;entryX=1.002;entryY=0.17;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="sgZzQmQA5r4gPmcAVD2c-1" source="yyTpLhAHu4WPmghRuIGA-4" target="erJn0JmvOIQi-aqMdXCH-35">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
|
||||||
<mxPoint x="510" y="360" as="sourcePoint" />
|
|
||||||
<mxPoint x="430" y="400" as="targetPoint" />
|
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="680" y="400" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-15" value="<div>Commands</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="yyTpLhAHu4WPmghRuIGA-13">
|
|
||||||
<mxGeometry x="0.0387" y="3" relative="1" as="geometry">
|
|
||||||
<mxPoint as="offset" />
|
<mxPoint as="offset" />
|
||||||
</mxGeometry>
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-22" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0.25;exitY=0;exitDx=0;exitDy=0;entryX=0.098;entryY=1.035;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="sgZzQmQA5r4gPmcAVD2c-1" source="yyTpLhAHu4WPmghRuIGA-18" target="yyTpLhAHu4WPmghRuIGA-4">
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--6" value="Matrix Abstraction - Module" style="swimlane;fontStyle=0;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=0;strokeWidth=3;glass=0;swimlaneLine=1;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
||||||
|
<mxGeometry x="40" y="560" width="400" height="180" as="geometry">
|
||||||
|
<mxRectangle x="200" y="540" width="160" height="26" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-29" value="" style="group;strokeWidth=4;strokeColor=none;" vertex="1" connectable="0" parent="zkfFHV4jXpPFQw0GAbJ--6">
|
||||||
|
<mxGeometry y="26" width="400" height="154" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-20" value="" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=0;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;strokeColor=default;swimlaneLine=0;fillColor=none;container=0;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-29">
|
||||||
|
<mxGeometry width="200" height="38.5" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-21" value="Calls To Matrix SDK" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;container=0;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-20">
|
||||||
|
<mxGeometry width="200" height="38.5" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-24" value="Sync Thread" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;container=0;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-29">
|
||||||
|
<mxGeometry x="200" width="200" height="68.5" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-25" value="on_event" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;container=0;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-24">
|
||||||
|
<mxGeometry y="30" width="200" height="38.5" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-51" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="zkfFHV4jXpPFQw0GAbJ--13" target="EYjtFuS0Bnb1uTnDH7Uf-21">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="120" y="440" />
|
||||||
|
<mxPoint x="20" y="440" />
|
||||||
|
<mxPoint x="20" y="605" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-81" value="Call" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-51">
|
||||||
|
<mxGeometry x="-0.2437" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--13" value="Accounts Manager - Struct
" style="swimlane;fontStyle=0;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=0;strokeWidth=3;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
||||||
|
<mxGeometry x="40" y="220" width="160" height="130" as="geometry">
|
||||||
|
<mxRectangle x="340" y="380" width="170" height="26" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--14" value="add_account" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" parent="zkfFHV4jXpPFQw0GAbJ--13" vertex="1">
|
||||||
|
<mxGeometry y="26" width="160" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-41" value="remove_account" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" vertex="1" parent="zkfFHV4jXpPFQw0GAbJ--13">
|
||||||
|
<mxGeometry y="52" width="160" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-42" value="get_current_account_info" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" vertex="1" parent="zkfFHV4jXpPFQw0GAbJ--13">
|
||||||
|
<mxGeometry y="78" width="160" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-43" value="switch_account" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" vertex="1" parent="zkfFHV4jXpPFQw0GAbJ--13">
|
||||||
|
<mxGeometry y="104" width="160" height="26" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="zkfFHV4jXpPFQw0GAbJ--17" value="UI - Struct" style="swimlane;fontStyle=0;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=0;strokeWidth=3;" parent="WIyWlLk6GJQsqaUBKTNV-1" vertex="1">
|
||||||
|
<mxGeometry x="600" y="220" width="160" height="100" as="geometry">
|
||||||
|
<mxRectangle x="550" y="140" width="160" height="26" as="alternateBounds" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-8" value="<div>update</div>" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" vertex="1" parent="zkfFHV4jXpPFQw0GAbJ--17">
|
||||||
|
<mxGeometry y="26" width="160" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.25;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="zkfFHV4jXpPFQw0GAbJ--1" target="zkfFHV4jXpPFQw0GAbJ--17">
|
||||||
<mxGeometry relative="1" as="geometry" />
|
<mxGeometry relative="1" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-18" value="Lua" style="text;html=1;strokeColor=none;fillColor=#76608A;align=center;verticalAlign=middle;whiteSpace=wrap;rounded=0;" vertex="1" parent="sgZzQmQA5r4gPmcAVD2c-1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-86" value="<div>Child</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-1">
|
||||||
<mxGeometry x="600" y="650" width="50" height="30" as="geometry" />
|
<mxGeometry x="-0.4493" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="yyTpLhAHu4WPmghRuIGA-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="sgZzQmQA5r4gPmcAVD2c-1" source="yyTpLhAHu4WPmghRuIGA-19" target="yyTpLhAHu4WPmghRuIGA-18">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.75;entryY=0;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="zkfFHV4jXpPFQw0GAbJ--2" target="zkfFHV4jXpPFQw0GAbJ--13">
|
||||||
<mxGeometry relative="1" as="geometry" />
|
<mxGeometry relative="1" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-1" value="Trinitrix - Architecture - v2.0" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" parent="1" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-84" value="<div>Child</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-2">
|
||||||
<mxGeometry x="375" y="20" width="100" height="40" as="geometry" />
|
<mxGeometry x="-0.438" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-3" value="Protocol Servers" style="swimlane;whiteSpace=wrap;html=1;fillColor=#b0e3e6;strokeColor=#0e8088;" parent="1" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-5" value="Trinitrix - Codebase Structure - v1.0" style="text;strokeColor=none;fillColor=none;html=1;fontSize=24;fontStyle=1;verticalAlign=middle;align=center;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
<mxGeometry x="40" y="840" width="600" height="220" as="geometry" />
|
<mxGeometry x="364" y="20" width="100" height="40" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-9" value="Matrix Server<br>Process" style="swimlane;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=5;startSize=40;" parent="erJn0JmvOIQi-aqMdXCH-3" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-6" value="Matrix SDK - External Crate" style="swimlane;whiteSpace=wrap;html=1;strokeWidth=3;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
<mxGeometry x="40" y="60" width="100" height="140" as="geometry" />
|
<mxGeometry x="100" y="860" width="280" height="150" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-12" value="Matrix Server<br>Process" style="swimlane;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=4;startSize=40;" parent="erJn0JmvOIQi-aqMdXCH-3" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-37" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.13;entryY=0.002;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="EYjtFuS0Bnb1uTnDH7Uf-35" target="EYjtFuS0Bnb1uTnDH7Uf-45">
|
||||||
<mxGeometry x="180" y="60" width="100" height="140" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-14" value="Signal Server<br>Process" style="swimlane;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=4;startSize=40;" parent="erJn0JmvOIQi-aqMdXCH-3" vertex="1">
|
|
||||||
<mxGeometry x="320" y="60" width="100" height="140" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-15" value="Telegram Server<br>Process" style="swimlane;whiteSpace=wrap;html=1;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=4;startSize=40;" parent="erJn0JmvOIQi-aqMdXCH-3" vertex="1">
|
|
||||||
<mxGeometry x="460" y="60" width="100" height="140" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-16" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;fillColor=#008a00;strokeColor=#005700;" parent="1" source="erJn0JmvOIQi-aqMdXCH-6" target="erJn0JmvOIQi-aqMdXCH-9" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="400" y="320" as="targetPoint" />
|
||||||
<Array as="points">
|
<Array as="points">
|
||||||
<mxPoint x="50" y="605" />
|
<mxPoint x="300" y="215" />
|
||||||
<mxPoint x="50" y="830" />
|
<mxPoint x="300" y="320" />
|
||||||
<mxPoint x="130" y="830" />
|
|
||||||
</Array>
|
</Array>
|
||||||
</mxGeometry>
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;fillColor=#008a00;strokeColor=#005700;" parent="1" source="erJn0JmvOIQi-aqMdXCH-7" target="erJn0JmvOIQi-aqMdXCH-12" edge="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-85" value="Child" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-37">
|
||||||
<mxGeometry relative="1" as="geometry">
|
<mxGeometry x="0.0976" relative="1" as="geometry">
|
||||||
<Array as="points">
|
<mxPoint as="offset" />
|
||||||
<mxPoint x="70" y="635" />
|
|
||||||
<mxPoint x="70" y="810" />
|
|
||||||
<mxPoint x="270" y="810" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;startArrow=classic;startFill=1;fillColor=#008a00;strokeColor=#005700;" parent="1" source="erJn0JmvOIQi-aqMdXCH-8" target="erJn0JmvOIQi-aqMdXCH-14" edge="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-45" value="Status - Struct" style="swimlane;fontStyle=0;align=center;verticalAlign=top;childLayout=stackLayout;horizontal=1;startSize=26;horizontalStack=0;resizeParent=1;resizeLast=0;collapsible=1;marginBottom=0;rounded=0;shadow=0;strokeWidth=3;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
<mxGeometry relative="1" as="geometry">
|
<mxGeometry x="280" y="320" width="160" height="130" as="geometry">
|
||||||
<Array as="points">
|
<mxRectangle x="340" y="380" width="170" height="26" as="alternateBounds" />
|
||||||
<mxPoint x="90" y="665" />
|
|
||||||
<mxPoint x="90" y="790" />
|
|
||||||
<mxPoint x="410" y="790" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=0;entryDx=0;entryDy=0;startArrow=classic;startFill=1;fillColor=#008a00;strokeColor=#005700;" parent="1" source="erJn0JmvOIQi-aqMdXCH-10" target="erJn0JmvOIQi-aqMdXCH-15" edge="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-46" value="rooms" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-45">
|
||||||
<mxGeometry relative="1" as="geometry">
|
<mxGeometry y="26" width="160" height="26" as="geometry" />
|
||||||
<Array as="points">
|
|
||||||
<mxPoint x="110" y="695" />
|
|
||||||
<mxPoint x="110" y="770" />
|
|
||||||
<mxPoint x="550" y="770" />
|
|
||||||
</Array>
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-65" value="Color Legend" style="shape=table;startSize=30;container=1;collapsible=0;childLayout=tableLayout;fixedRows=1;rowLines=0;fontStyle=0;strokeColor=default;fontSize=16;strokeWidth=1;" parent="1" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-49" value="current_room" style="text;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rounded=0;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-45">
|
||||||
<mxGeometry x="660" y="792" width="180" height="290" as="geometry" />
|
<mxGeometry y="52" width="160" height="26" as="geometry" />
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-66" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-56" value="" style="endArrow=classic;html=1;rounded=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
<mxGeometry y="30" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-67" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;pointerEvents=1;fontSize=16;strokeWidth=1;fillColor=none;" parent="erJn0JmvOIQi-aqMdXCH-66" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-68" value="Thread / Process" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-66" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-69" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="60" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-70" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;fillColor=none;" parent="erJn0JmvOIQi-aqMdXCH-69" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-71" value="Write" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-69" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-72" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="90" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-73" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;perimeterSpacing=0;fillStyle=solid;strokeWidth=2;fillColor=none;" parent="erJn0JmvOIQi-aqMdXCH-72" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-74" value="Read" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-72" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-80" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="120" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-81" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;perimeterSpacing=0;fillStyle=solid;strokeWidth=2;fillColor=none;" parent="erJn0JmvOIQi-aqMdXCH-80" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-82" value="Execution Flow" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-80" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-1" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="150" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-2" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;perimeterSpacing=0;fillStyle=solid;strokeWidth=2;fillColor=none;" parent="bEImzGkf_4H7QTsFuULF-1" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-3" value="Struct / Vector" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="bEImzGkf_4H7QTsFuULF-1" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-5" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="180" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-6" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;perimeterSpacing=0;fillStyle=solid;strokeWidth=2;fillColor=none;" parent="bEImzGkf_4H7QTsFuULF-5" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-7" value="Logical Container" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="bEImzGkf_4H7QTsFuULF-5" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-37" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="210" width="180" height="50" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-38" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;perimeterSpacing=0;fillStyle=solid;strokeWidth=2;fillColor=none;" parent="bEImzGkf_4H7QTsFuULF-37" vertex="1">
|
|
||||||
<mxGeometry width="40" height="50" as="geometry">
|
|
||||||
<mxRectangle width="40" height="50" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-39" value="API<br>(Bidirectional IPC)" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="bEImzGkf_4H7QTsFuULF-37" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="50" as="geometry">
|
|
||||||
<mxRectangle width="140" height="50" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-41" value="" style="shape=tableRow;horizontal=0;startSize=0;swimlaneHead=0;swimlaneBody=0;top=0;left=0;bottom=0;right=0;collapsible=0;dropTarget=0;fillColor=none;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;strokeColor=inherit;fontSize=16;" parent="erJn0JmvOIQi-aqMdXCH-65" vertex="1">
|
|
||||||
<mxGeometry y="260" width="180" height="30" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-42" value="" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;top=0;left=0;bottom=0;right=0;overflow=hidden;fontSize=16;perimeterSpacing=0;fillStyle=solid;strokeWidth=2;fillColor=none;" parent="bEImzGkf_4H7QTsFuULF-41" vertex="1">
|
|
||||||
<mxGeometry width="40" height="30" as="geometry">
|
|
||||||
<mxRectangle width="40" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-43" value="Stream" style="shape=partialRectangle;html=1;whiteSpace=wrap;connectable=0;fillColor=none;top=0;left=0;bottom=0;right=0;align=left;spacingLeft=6;overflow=hidden;strokeColor=inherit;fontSize=16;" parent="bEImzGkf_4H7QTsFuULF-41" vertex="1">
|
|
||||||
<mxGeometry x="40" width="140" height="30" as="geometry">
|
|
||||||
<mxRectangle width="140" height="30" as="alternateBounds" />
|
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-77" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#f8cecc;strokeColor=#b85450;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="889" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-78" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d5e8d4;strokeColor=#82b366;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="858" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-79" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#ffe6cc;strokeColor=#d79b00;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="828" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="erJn0JmvOIQi-aqMdXCH-83" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#d0cee2;strokeColor=#56517e;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="919" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-4" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#dae8fc;strokeColor=#6c8ebf;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="949" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-8" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#b0e3e6;strokeColor=#0e8088;strokeWidth=2;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="978" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-28" value="" style="endArrow=none;html=1;rounded=0;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" edge="1">
|
|
||||||
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
<mxGeometry width="50" height="50" relative="1" as="geometry">
|
||||||
<mxPoint x="480" y="700" as="sourcePoint" />
|
<mxPoint x="280" y="860" as="sourcePoint" />
|
||||||
<mxPoint x="480" y="610" as="targetPoint" />
|
<mxPoint x="240" y="640" as="targetPoint" />
|
||||||
</mxGeometry>
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-40" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#7FE01F;strokeColor=#2D7600;strokeWidth=2;fontColor=#ffffff;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="1016" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-44" value="" style="whiteSpace=wrap;html=1;aspect=fixed;fillColor=#76608a;strokeColor=#432D57;strokeWidth=2;fontColor=#ffffff;" parent="1" vertex="1">
|
|
||||||
<mxGeometry x="669" y="1052" width="20" height="20" as="geometry" />
|
|
||||||
</mxCell>
|
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-58" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;fillColor=#f8cecc;strokeColor=#b85450;" parent="1" source="bEImzGkf_4H7QTsFuULF-50" target="bEImzGkf_4H7QTsFuULF-10" edge="1">
|
|
||||||
<mxGeometry relative="1" as="geometry">
|
|
||||||
<Array as="points">
|
<Array as="points">
|
||||||
<mxPoint x="265" y="280" />
|
<mxPoint x="280" y="710" />
|
||||||
<mxPoint x="265" y="280" />
|
<mxPoint x="280" y="680" />
|
||||||
|
<mxPoint x="210" y="680" />
|
||||||
|
<mxPoint x="210" y="640" />
|
||||||
</Array>
|
</Array>
|
||||||
</mxGeometry>
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
<mxCell id="bEImzGkf_4H7QTsFuULF-50" value="Status" style="swimlane;whiteSpace=wrap;html=1;fillColor=#dae8fc;strokeColor=#6c8ebf;" parent="1" vertex="1">
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-79" value="<div>Read</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-56">
|
||||||
<mxGeometry x="80" y="130" width="690" height="110" as="geometry" />
|
<mxGeometry x="-0.6652" y="-3" relative="1" as="geometry">
|
||||||
|
<mxPoint x="-3" y="-3" as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-90" value="Mainloop" style="swimlane;fontStyle=0;childLayout=stackLayout;horizontal=1;startSize=30;horizontalStack=0;resizeParent=1;resizeParentMax=0;resizeLast=0;collapsible=1;marginBottom=0;whiteSpace=wrap;html=1;strokeWidth=3;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
|
<mxGeometry x="590" y="585" width="140" height="120" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-91" value="Wait for KeyEvent" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-90">
|
||||||
|
<mxGeometry y="30" width="140" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-92" value="Handle Event" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-90">
|
||||||
|
<mxGeometry y="60" width="140" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-124" value="Repeat" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=middle;spacingLeft=4;spacingRight=4;overflow=hidden;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;rotatable=0;whiteSpace=wrap;html=1;" vertex="1" parent="EYjtFuS0Bnb1uTnDH7Uf-90">
|
||||||
|
<mxGeometry y="90" width="140" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-105" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="EYjtFuS0Bnb1uTnDH7Uf-100">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="440" y="410" as="targetPoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-106" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=-0.017;entryY=0.567;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="EYjtFuS0Bnb1uTnDH7Uf-100" target="EYjtFuS0Bnb1uTnDH7Uf-8">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="540" y="370" />
|
||||||
|
<mxPoint x="540" y="263" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-118" value="Text" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-106">
|
||||||
|
<mxGeometry x="-0.072" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-100" value="<div>R/W</div><div>Mutex<br></div>" style="html=1;whiteSpace=wrap;container=1;recursiveResize=0;collapsible=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
|
<mxGeometry x="464" y="350" width="50" height="80" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-104" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=1;entryY=0.75;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="EYjtFuS0Bnb1uTnDH7Uf-25" target="EYjtFuS0Bnb1uTnDH7Uf-100">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="540" y="630" />
|
||||||
|
<mxPoint x="540" y="410" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-117" value="<div>Write</div>" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-104">
|
||||||
|
<mxGeometry x="0.5275" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-110" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;exitX=0;exitY=0.75;exitDx=0;exitDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="464" y="370" as="targetPoint" />
|
||||||
|
<mxPoint x="440" y="370" as="sourcePoint" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-128" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="EYjtFuS0Bnb1uTnDH7Uf-120" target="EYjtFuS0Bnb1uTnDH7Uf-8">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-120" value="Mutex" style="html=1;whiteSpace=wrap;container=1;recursiveResize=0;collapsible=0;" vertex="1" parent="WIyWlLk6GJQsqaUBKTNV-1">
|
||||||
|
<mxGeometry x="750" y="375" width="60" height="30" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-122" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" source="EYjtFuS0Bnb1uTnDH7Uf-92" target="EYjtFuS0Bnb1uTnDH7Uf-120">
|
||||||
|
<mxGeometry relative="1" as="geometry" />
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-123" value="Call" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-122">
|
||||||
|
<mxGeometry x="-0.8689" relative="1" as="geometry">
|
||||||
|
<mxPoint x="5" as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-125" style="edgeStyle=orthogonalEdgeStyle;rounded=0;orthogonalLoop=1;jettySize=auto;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="WIyWlLk6GJQsqaUBKTNV-1" target="EYjtFuS0Bnb1uTnDH7Uf-120">
|
||||||
|
<mxGeometry relative="1" as="geometry">
|
||||||
|
<mxPoint x="440" y="650.24" as="sourcePoint" />
|
||||||
|
<mxPoint x="780" y="420" as="targetPoint" />
|
||||||
|
<Array as="points">
|
||||||
|
<mxPoint x="440" y="640" />
|
||||||
|
<mxPoint x="550" y="640" />
|
||||||
|
<mxPoint x="550" y="565" />
|
||||||
|
<mxPoint x="780" y="565" />
|
||||||
|
</Array>
|
||||||
|
</mxGeometry>
|
||||||
|
</mxCell>
|
||||||
|
<mxCell id="EYjtFuS0Bnb1uTnDH7Uf-126" value="Call" style="edgeLabel;html=1;align=center;verticalAlign=middle;resizable=0;points=[];" vertex="1" connectable="0" parent="EYjtFuS0Bnb1uTnDH7Uf-125">
|
||||||
|
<mxGeometry x="0.046" relative="1" as="geometry">
|
||||||
|
<mxPoint as="offset" />
|
||||||
|
</mxGeometry>
|
||||||
</mxCell>
|
</mxCell>
|
||||||
</root>
|
</root>
|
||||||
</mxGraphModel>
|
</mxGraphModel>
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 154 KiB |
File diff suppressed because one or more lines are too long
|
@ -1,62 +0,0 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
% TRINITRIX(1) trinitrix 0.1.0
|
|
||||||
% The Trinitrix Project
|
|
||||||
% May 2024
|
|
||||||
|
|
||||||
# NAME
|
|
||||||
|
|
||||||
trinitrix - A multi protocol chat client
|
|
||||||
|
|
||||||
# SYNOPSIS
|
|
||||||
|
|
||||||
**trinitrix** \[*--help*|*--version*\]
|
|
||||||
|
|
||||||
# DESCRIPTION
|
|
||||||
|
|
||||||
Trinitrix is a multi protocol client. That is implemented via cbs and plugins.
|
|
||||||
|
|
||||||
# OPTIONS
|
|
||||||
|
|
||||||
**--help**, **-h**
|
|
||||||
: Displays a help message and exit.
|
|
||||||
|
|
||||||
**--version**, **-v**
|
|
||||||
: Displays the software version and exit.
|
|
||||||
|
|
||||||
**--plugin-path \<SHARED_OBJECT>**, **-p \<SHARED_OBJECT>**
|
|
||||||
: The SHARED_OBJECT to load as a dynamic library. The `plugin_main` function will be
|
|
||||||
executed.
|
|
||||||
|
|
||||||
# EXAMPLES
|
|
||||||
|
|
||||||
**trinitrix repl**
|
|
||||||
: Start a repl with evaluation of trinitry commands.
|
|
||||||
|
|
||||||
# FILES
|
|
||||||
|
|
||||||
*plugin.so*
|
|
||||||
: Shared object file of a plugin, to be loaded with **--plugin-path**
|
|
||||||
|
|
||||||
# BUGS
|
|
||||||
|
|
||||||
Report bugs to <https://git.nerdcult.net/trinitrix/core/issues>.
|
|
131
flake.lock
131
flake.lock
|
@ -2,16 +2,25 @@
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"crane": {
|
"crane": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
|
"flake-compat": [
|
||||||
|
"flake-compat"
|
||||||
|
],
|
||||||
|
"flake-utils": [
|
||||||
|
"flake-utils"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"rust-overlay": [
|
||||||
|
"rust-overlay"
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714536327,
|
"lastModified": 1688772518,
|
||||||
"narHash": "sha256-zu4+LcygJwdyFHunTMeDFltBZ9+hoWvR/1A7IEy7ChA=",
|
"narHash": "sha256-ol7gZxwvgLnxNSZwFTDJJ49xVY5teaSvF7lzlo3YQfM=",
|
||||||
"owner": "ipetkov",
|
"owner": "ipetkov",
|
||||||
"repo": "crane",
|
"repo": "crane",
|
||||||
"rev": "3124551aebd8db15d4560716d4f903bd44c64e4a",
|
"rev": "8b08e96c9af8c6e3a2b69af5a7fa168750fcf88e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -23,11 +32,11 @@
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1696426674,
|
"lastModified": 1673956053,
|
||||||
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
|
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
|
||||||
"owner": "edolstra",
|
"owner": "edolstra",
|
||||||
"repo": "flake-compat",
|
"repo": "flake-compat",
|
||||||
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
|
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -38,16 +47,14 @@
|
||||||
},
|
},
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": [
|
"systems": "systems"
|
||||||
"systems"
|
|
||||||
]
|
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1710146030,
|
"lastModified": 1687709756,
|
||||||
"narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
|
"narHash": "sha256-Y5wKlQSkgEK2weWdOu4J3riRd+kV/VCgHsqLNTTWQ/0=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "flake-utils",
|
"repo": "flake-utils",
|
||||||
"rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
|
"rev": "dbabf0ca0c0c4bce6ea5eaf65af5cb694d2082c7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -56,65 +63,13 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"git-hooks": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": [
|
|
||||||
"flake-compat"
|
|
||||||
],
|
|
||||||
"flake-utils": [
|
|
||||||
"flake-utils"
|
|
||||||
],
|
|
||||||
"gitignore": [
|
|
||||||
"gitignore"
|
|
||||||
],
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"nixpkgs-stable": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714478972,
|
|
||||||
"narHash": "sha256-q//cgb52vv81uOuwz1LaXElp3XAe1TqrABXODAEF6Sk=",
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"rev": "2849da033884f54822af194400f8dff435ada242",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "cachix",
|
|
||||||
"repo": "git-hooks.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"gitignore": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1709087332,
|
|
||||||
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "hercules-ci",
|
|
||||||
"repo": "gitignore.nix",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714656196,
|
"lastModified": 1688829822,
|
||||||
"narHash": "sha256-kjQkA98lMcsom6Gbhw8SYzmwrSo+2nruiTcTZp5jK7o=",
|
"narHash": "sha256-hv56yK1fPHPt7SU2DboxBtdSbIuv9nym7Dss7Cn2jic=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "94035b482d181af0a0f8f77823a790b256b7c3cc",
|
"rev": "ed6afb10dfdfc97b6bcf0703f1bad8118e9e961b",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -129,12 +84,8 @@
|
||||||
"crane": "crane",
|
"crane": "crane",
|
||||||
"flake-compat": "flake-compat",
|
"flake-compat": "flake-compat",
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"git-hooks": "git-hooks",
|
|
||||||
"gitignore": "gitignore",
|
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"rust-overlay": "rust-overlay",
|
"rust-overlay": "rust-overlay"
|
||||||
"systems": "systems",
|
|
||||||
"treefmt-nix": "treefmt-nix"
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rust-overlay": {
|
"rust-overlay": {
|
||||||
|
@ -147,11 +98,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1714702555,
|
"lastModified": 1688870171,
|
||||||
"narHash": "sha256-/NoUbE5S5xpK1FU3nlHhQ/tL126+JcisXdzy3Ng4pDU=",
|
"narHash": "sha256-8tD8fheWPa7TaJoxzcU3iHkCrQQpOpdMN+HYqgZ1N5A=",
|
||||||
"owner": "oxalica",
|
"owner": "oxalica",
|
||||||
"repo": "rust-overlay",
|
"repo": "rust-overlay",
|
||||||
"rev": "7f0e3ef7b7fbed78e12e5100851175d28af4b7c6",
|
"rev": "5a932f10ac4bd59047d6e8b5780750ec76ea988a",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
@ -162,36 +113,16 @@
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1680978846,
|
"lastModified": 1681028828,
|
||||||
"narHash": "sha256-Gtqg8b/v49BFDpDetjclCYXm8mAnTrUzR0JnE2nv5aw=",
|
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "x86_64-linux",
|
"repo": "default",
|
||||||
"rev": "2ecfcac5e15790ba6ce360ceccddb15ad16d08a8",
|
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"owner": "nix-systems",
|
"owner": "nix-systems",
|
||||||
"repo": "x86_64-linux",
|
"repo": "default",
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"treefmt-nix": {
|
|
||||||
"inputs": {
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1714058656,
|
|
||||||
"narHash": "sha256-Qv4RBm4LKuO4fNOfx9wl40W2rBbv5u5m+whxRYUMiaA=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"rev": "c6aaf729f34a36c445618580a9f95a48f5e4e03f",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "treefmt-nix",
|
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
162
flake.nix
162
flake.nix
|
@ -1,50 +1,27 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
{
|
{
|
||||||
description = "A multi protocol chat client";
|
description = "A terminal UI client for the matrix chat protocol";
|
||||||
|
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
|
||||||
|
|
||||||
treefmt-nix = {
|
# inputs for following
|
||||||
url = "github:numtide/treefmt-nix";
|
flake-compat = {
|
||||||
inputs = {
|
url = "github:edolstra/flake-compat";
|
||||||
nixpkgs.follows = "nixpkgs";
|
flake = false;
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
crane = {
|
crane = {
|
||||||
url = "github:ipetkov/crane";
|
url = "github:ipetkov/crane";
|
||||||
inputs = {
|
inputs = {
|
||||||
nixpkgs.follows = "nixpkgs";
|
nixpkgs.follows = "nixpkgs";
|
||||||
};
|
|
||||||
};
|
|
||||||
git-hooks = {
|
|
||||||
url = "github:cachix/git-hooks.nix";
|
|
||||||
inputs = {
|
|
||||||
flake-compat.follows = "flake-compat";
|
flake-compat.follows = "flake-compat";
|
||||||
flake-utils.follows = "flake-utils";
|
flake-utils.follows = "flake-utils";
|
||||||
gitignore.follows = "gitignore";
|
rust-overlay.follows = "rust-overlay";
|
||||||
nixpkgs.follows = "nixpkgs";
|
|
||||||
nixpkgs-stable.follows = "nixpkgs";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
flake-utils = {
|
||||||
|
url = "github:numtide/flake-utils";
|
||||||
|
inputs = {};
|
||||||
|
};
|
||||||
rust-overlay = {
|
rust-overlay = {
|
||||||
url = "github:oxalica/rust-overlay";
|
url = "github:oxalica/rust-overlay";
|
||||||
inputs = {
|
inputs = {
|
||||||
|
@ -52,36 +29,13 @@
|
||||||
flake-utils.follows = "flake-utils";
|
flake-utils.follows = "flake-utils";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# inputs for following
|
|
||||||
gitignore = {
|
|
||||||
url = "github:hercules-ci/gitignore.nix";
|
|
||||||
inputs = {
|
|
||||||
nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
systems = {
|
|
||||||
url = "github:nix-systems/x86_64-linux"; # only evaluate for this system
|
|
||||||
};
|
|
||||||
flake-compat = {
|
|
||||||
url = "github:edolstra/flake-compat";
|
|
||||||
flake = false;
|
|
||||||
};
|
|
||||||
flake-utils = {
|
|
||||||
url = "github:numtide/flake-utils";
|
|
||||||
inputs = {
|
|
||||||
systems.follows = "systems";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
flake-utils,
|
|
||||||
git-hooks,
|
|
||||||
treefmt-nix,
|
|
||||||
crane,
|
crane,
|
||||||
|
flake-utils,
|
||||||
rust-overlay,
|
rust-overlay,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
|
@ -91,104 +45,42 @@
|
||||||
overlays = [(import rust-overlay)];
|
overlays = [(import rust-overlay)];
|
||||||
};
|
};
|
||||||
|
|
||||||
nightly = false;
|
#rust-nightly = pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default);
|
||||||
rust_minimal =
|
rust-stable = pkgs.rust-bin.stable.latest.default;
|
||||||
if nightly
|
|
||||||
then
|
craneLib = (crane.mkLib pkgs).overrideToolchain rust-stable;
|
||||||
(pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.minimal)).override {
|
|
||||||
extensions = ["rustc-codegen-cranelift-preview"];
|
|
||||||
}
|
|
||||||
else pkgs.rust-bin.stable.latest.minimal;
|
|
||||||
rust_default =
|
|
||||||
if nightly
|
|
||||||
then
|
|
||||||
(pkgs.rust-bin.selectLatestNightlyWith (toolchain: toolchain.default)).override {
|
|
||||||
extensions = ["rustc-codegen-cranelift-preview"];
|
|
||||||
}
|
|
||||||
else pkgs.rust-bin.stable.latest.default;
|
|
||||||
|
|
||||||
nativeBuildInputs = with pkgs; [
|
nativeBuildInputs = with pkgs; [
|
||||||
pkg-config
|
pkg-config
|
||||||
mold-wrapped
|
|
||||||
|
|
||||||
clang-tools
|
|
||||||
];
|
];
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
openssl
|
openssl
|
||||||
lua54Packages.lua
|
|
||||||
];
|
];
|
||||||
cargo_toml = craneLib.cleanCargoToml {cargoToml = ./Cargo.toml;};
|
|
||||||
pname = cargo_toml.package.name;
|
|
||||||
|
|
||||||
craneLib = (crane.mkLib pkgs).overrideToolchain rust_minimal;
|
|
||||||
craneBuild = craneLib.buildPackage {
|
craneBuild = craneLib.buildPackage {
|
||||||
inherit nativeBuildInputs buildInputs;
|
src = craneLib.cleanCargoSource ./.;
|
||||||
|
|
||||||
src = let
|
|
||||||
trixyFilter = path: _type: builtins.match ".*tri$" path != null;
|
|
||||||
markdownOrCargo = path: type:
|
|
||||||
(trixyFilter path type) || (craneLib.filterCargoSources path type);
|
|
||||||
in
|
|
||||||
pkgs.lib.cleanSourceWith {
|
|
||||||
src = craneLib.path ./.;
|
|
||||||
filter = markdownOrCargo;
|
|
||||||
};
|
|
||||||
|
|
||||||
doCheck = true;
|
doCheck = true;
|
||||||
|
inherit nativeBuildInputs buildInputs;
|
||||||
};
|
};
|
||||||
|
|
||||||
manual = pkgs.stdenv.mkDerivation {
|
|
||||||
name = "${pname}-manual";
|
|
||||||
inherit (cargo_toml.package) version;
|
|
||||||
|
|
||||||
src = ./docs;
|
|
||||||
nativeBuildInputs = with pkgs; [pandoc];
|
|
||||||
|
|
||||||
buildPhase = ''
|
|
||||||
mkdir --parents $out/docs;
|
|
||||||
|
|
||||||
pandoc "./${pname}.1.md" -s -t man > $out/docs/${pname}.1
|
|
||||||
'';
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
install -D $out/docs/${pname}.1 $out/share/man/man1/${pname};
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
treefmtEval = import ./treefmt.nix {inherit treefmt-nix pkgs;};
|
|
||||||
in {
|
in {
|
||||||
packages.default = pkgs.symlinkJoin {
|
packages.default = craneBuild;
|
||||||
inherit (cargo_toml.package) name;
|
|
||||||
|
|
||||||
paths = [manual craneBuild];
|
app.default = {
|
||||||
|
type = "app";
|
||||||
|
program = "${self.packages.${system}.default}/bin/trinitix";
|
||||||
};
|
};
|
||||||
|
|
||||||
checks = {
|
|
||||||
inherit craneBuild;
|
|
||||||
formatting = treefmtEval.config.build.check self;
|
|
||||||
pre-commit = git-hooks.lib.${system}.run {
|
|
||||||
src = ./.;
|
|
||||||
hooks.treefmt = {
|
|
||||||
enable = true;
|
|
||||||
package = treefmtEval.config.build.wrapper;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
formatter = treefmtEval.config.build.wrapper;
|
|
||||||
|
|
||||||
devShells.default = pkgs.mkShell {
|
devShells.default = pkgs.mkShell {
|
||||||
inherit (self.checks.${system}.pre-commit) shellHook;
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
cocogitto
|
nil
|
||||||
|
alejandra
|
||||||
|
statix
|
||||||
|
ltex-ls
|
||||||
|
|
||||||
yq
|
rust-stable
|
||||||
|
rust-analyzer
|
||||||
rust_default
|
|
||||||
cargo-edit
|
cargo-edit
|
||||||
|
|
||||||
valgrind
|
|
||||||
licensure
|
|
||||||
];
|
];
|
||||||
inherit nativeBuildInputs buildInputs;
|
inherit nativeBuildInputs buildInputs;
|
||||||
};
|
};
|
||||||
|
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
@ -1,24 +1,3 @@
|
||||||
<!--
|
|
||||||
Copyright (C) 2024 - 2024:
|
|
||||||
The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
|
|
||||||
This file is part of Trinitrix.
|
|
||||||
|
|
||||||
Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published
|
|
||||||
by the Free Software Foundation, either version 3 of the License,
|
|
||||||
or (at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
-->
|
|
||||||
|
|
||||||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||||
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
<!-- Created with Inkscape (http://www.inkscape.org/) -->
|
||||||
|
|
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 4.7 KiB |
55
makefile
55
makefile
|
@ -1,55 +0,0 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
BIN_NAME := ./target/plugin.so
|
|
||||||
|
|
||||||
BUILD_DIR := ./target/c_build/
|
|
||||||
|
|
||||||
# SRC := $(wildcard c/*.c)
|
|
||||||
SRC := ./config/c/plugin.c
|
|
||||||
OBJ := $(SRC:.c=.o)
|
|
||||||
DEP := $(OBJ:.o=.d)
|
|
||||||
|
|
||||||
LIBS :=
|
|
||||||
|
|
||||||
ALL_CFLAGS := -fPIC -O3 -MMD -Wall -Wextra -Wno-unused-parameter $(CFLAGS) $(CPPFLAGS)
|
|
||||||
ALL_LDFLAGS := $(addprefix -l,$(LIBS)) -L $(LD_LIBRARY_PATH) $(CFLAGS) $(LDFLAGS)
|
|
||||||
|
|
||||||
|
|
||||||
$(BIN_NAME): $(OBJ)
|
|
||||||
gcc $(addprefix $(BUILD_DIR),$(notdir $(OBJ))) -shared -o $(addprefix $(BUILD_DIR),$(notdir $(BIN_NAME))) $(ALL_CFLAGS) $(ALL_LDFLAGS)
|
|
||||||
|
|
||||||
$(OBJ): $(SRC)
|
|
||||||
mkdir --parents $(BUILD_DIR)
|
|
||||||
$(CC) -c $< -o $(addprefix $(BUILD_DIR),$(notdir $(OBJ))) $(ALL_CFLAGS)
|
|
||||||
|
|
||||||
.PHONY : clean options
|
|
||||||
options:
|
|
||||||
@echo "CC = $(CC)"
|
|
||||||
@echo "CFLAGS = $(ALL_CFLAGS)"
|
|
||||||
@echo "LDFLAGS = $(ALL_LDFLAGS)"
|
|
||||||
@echo "SRC = $(SRC)"
|
|
||||||
@echo "OBJ = $(OBJ)"
|
|
||||||
@echo "DEP = $(DEP)"
|
|
||||||
@echo ""
|
|
||||||
|
|
||||||
clean :
|
|
||||||
rm $(BIN_NAME) $(OBJ) $(DEP)
|
|
||||||
rm -r $(BUILD_DIR)
|
|
||||||
|
|
|
@ -1,110 +0,0 @@
|
||||||
#! /usr/bin/env sh
|
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
# NOTE: This is the line length of the .licensure.yml header template **plus** the extra
|
|
||||||
# line after the template comment.
|
|
||||||
TEMPLATE_LINE_LENGTH=19
|
|
||||||
LATEX_TEMPLATE_LINE_LENGTH=9
|
|
||||||
|
|
||||||
PROJECT_ROOT="$(git rev-parse --show-toplevel)"
|
|
||||||
|
|
||||||
remove() {
|
|
||||||
extension="$1"
|
|
||||||
file="$2"
|
|
||||||
|
|
||||||
# We need to differentiate, when removing the old copyright header, as some
|
|
||||||
# formatters do weird things to the file
|
|
||||||
case "$extension" in
|
|
||||||
# normal '#' comments (these are $TEMPLATE_LINE_LENGTH lines long)
|
|
||||||
"Makefile" | "makefile" | "toml" | "envrc" | "yml" | "gitignore" | "awk" | "lua")
|
|
||||||
sed --in-place "1,${TEMPLATE_LINE_LENGTH}d" "$file"
|
|
||||||
;;
|
|
||||||
# LaTeX files (or TeX files in general) have a different license, use the
|
|
||||||
# $LATEX_TEMPLATE_LINE_LENGTH variable.
|
|
||||||
"tex")
|
|
||||||
sed --in-place "1,${LATEX_TEMPLATE_LINE_LENGTH}d" "$file"
|
|
||||||
;;
|
|
||||||
# normal '/* ... */' like comments (these are $TEMPLATE_LINE_LENGTH + 2 lines long)
|
|
||||||
"c" | "h" | "md" | "rs" | "html" | "svg" | "drawio" | "tri")
|
|
||||||
length="$((TEMPLATE_LINE_LENGTH + 2))"
|
|
||||||
sed --in-place "1,${length}d;" "$file"
|
|
||||||
;;
|
|
||||||
# alejandra (the nix formatter) removes the blank line after the comment,
|
|
||||||
# thus only $TEMPLATE_LINE_LENGTH - 1 lines
|
|
||||||
"nix")
|
|
||||||
length="$((TEMPLATE_LINE_LENGTH - 1))"
|
|
||||||
sed --in-place "1,${length}d;" "$file"
|
|
||||||
;;
|
|
||||||
# Shell needs a shebang on the first line, only after the first line can we
|
|
||||||
# remove the $TEMPLATE_LINE_LENGTH lines
|
|
||||||
"sh")
|
|
||||||
sed --in-place "2,${TEMPLATE_LINE_LENGTH}d;" "$file"
|
|
||||||
licensure --in-place "$file"
|
|
||||||
|
|
||||||
TEMPLATE_LINE_LENGTH_NEW="$(($(yq --raw-output '.licenses | map(.template) | join("")' "$PROJECT_ROOT/.licensure.yml" | wc -l) + $(yq '.comments | last | .commenter.trailing_lines' "$PROJECT_ROOT/.licensure.yml")))"
|
|
||||||
|
|
||||||
# delete the current shebang
|
|
||||||
to="$((TEMPLATE_LINE_LENGTH_NEW + 1))"
|
|
||||||
sed --in-place "${TEMPLATE_LINE_LENGTH_NEW},${to}d;" "$file"
|
|
||||||
|
|
||||||
# add a new one
|
|
||||||
sed --in-place "1i#! /usr/bin/env sh" "$file"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "File '$file' with extension '$extension' is not know yet, please add it!"
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
list() {
|
|
||||||
echo "$extension -> $file"
|
|
||||||
}
|
|
||||||
|
|
||||||
if [ -f "$1" ]; then
|
|
||||||
file="$(realpath "$1")"
|
|
||||||
filename="$(basename -- "$file")"
|
|
||||||
extension="${filename##*.}"
|
|
||||||
filename="${filename%.*}"
|
|
||||||
|
|
||||||
if [ -n "$DRY_RUN" ]; then
|
|
||||||
list "$extension" "$file"
|
|
||||||
else
|
|
||||||
remove "$extension" "$file"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
fd --type file --hidden . | while read -r file; do
|
|
||||||
if grep --quiet 'SPDX-License-Identifier' "$file"; then
|
|
||||||
filename="$(basename -- "$file")"
|
|
||||||
extension="${filename##*.}"
|
|
||||||
filename="${filename%.*}"
|
|
||||||
|
|
||||||
if [ -n "$DRY_RUN" ]; then
|
|
||||||
list "$extension" "$file"
|
|
||||||
else
|
|
||||||
remove "$extension" "$file"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
||||||
if [ -z "$DRY_RUN" ]; then
|
|
||||||
licensure --in-place --project
|
|
||||||
nix fmt
|
|
||||||
fi
|
|
||||||
fi
|
|
|
@ -1,39 +0,0 @@
|
||||||
#! /usr/bin/env sh
|
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
cd "$(dirname "$0")" || {
|
|
||||||
echo "BUG: There is no parent dirname!"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
cd ..
|
|
||||||
|
|
||||||
make
|
|
||||||
cargo build
|
|
||||||
|
|
||||||
export TRINITRIX_LOG=info
|
|
||||||
|
|
||||||
valgrind --leak-check=full \
|
|
||||||
--show-leak-kinds=all \
|
|
||||||
--show-error-list=yes \
|
|
||||||
--track-origins=yes \
|
|
||||||
--log-file=./target/valgrind_out.txt \
|
|
||||||
./target/debug/trinitrix --plugin-path ./target/c_build/plugin.so
|
|
||||||
|
|
||||||
cat ./target/valgrind_out.txt
|
|
|
@ -0,0 +1,192 @@
|
||||||
|
use std::fs;
|
||||||
|
use matrix_sdk::{Client,
|
||||||
|
config::SyncSettings,
|
||||||
|
ruma::{user_id,
|
||||||
|
events::room::message::SyncRoomMessageEvent,
|
||||||
|
exports::serde_json},
|
||||||
|
Session};
|
||||||
|
use anyhow::{Error, Result};
|
||||||
|
use serde::{Deserialize, Serialize};
|
||||||
|
use cli_log::{error, warn, info};
|
||||||
|
|
||||||
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
||||||
|
pub struct Account {
|
||||||
|
homeserver: String,
|
||||||
|
id: u32,
|
||||||
|
name: String,
|
||||||
|
|
||||||
|
session: Session,
|
||||||
|
sync_token: Option<String>,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug, Serialize, Deserialize)]
|
||||||
|
struct AccountsData {
|
||||||
|
current_account: u32,
|
||||||
|
accounts: Vec<Account>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct AccountsManager {
|
||||||
|
current_account: u32,
|
||||||
|
num_accounts: u32,
|
||||||
|
accounts: Vec<Account>,
|
||||||
|
clients: Vec<Option<Client>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Account {
|
||||||
|
pub fn name (&self) -> &String {
|
||||||
|
&self.name
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn user_id(&self) -> String {
|
||||||
|
self.session.user_id.to_string()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AccountsManager {
|
||||||
|
pub fn new(config:Option<String>) -> Self {
|
||||||
|
return match config {
|
||||||
|
Some(s) => {
|
||||||
|
info!("Loading serialized AccountsManager");
|
||||||
|
let accounts_data:AccountsData = serde_json::from_str(&s).expect("failed to deserialize json");
|
||||||
|
let mut clients = Vec::new();
|
||||||
|
clients.resize(accounts_data.accounts.len(), None);
|
||||||
|
Self {
|
||||||
|
current_account: accounts_data.current_account,
|
||||||
|
num_accounts: accounts_data.accounts.len() as u32,
|
||||||
|
accounts: accounts_data.accounts,
|
||||||
|
clients,
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => {
|
||||||
|
info!("Creating empty AccountsManager");
|
||||||
|
Self {
|
||||||
|
current_account: 0,
|
||||||
|
num_accounts: 0,
|
||||||
|
accounts: Vec::new(),
|
||||||
|
clients: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn restore(&mut self) -> Result<()> {
|
||||||
|
self.login(self.current_account).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn add(&mut self, homeserver: &String, username: &String, password: &String) -> Result<u32> {
|
||||||
|
let id = self.num_accounts;
|
||||||
|
self.num_accounts += 1;
|
||||||
|
|
||||||
|
let client = Client::builder()
|
||||||
|
.homeserver_url(homeserver)
|
||||||
|
.sled_store(format!("userdata/{id}"), Some("supersecure"))?
|
||||||
|
.build()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
client.login_username(username, password)
|
||||||
|
.initial_device_display_name("Trinitrix")
|
||||||
|
.send()
|
||||||
|
.await?;
|
||||||
|
|
||||||
|
let session = client.session().expect("failed to get session");
|
||||||
|
|
||||||
|
let account = Account {
|
||||||
|
homeserver: homeserver.to_string(),
|
||||||
|
id,
|
||||||
|
name: client.account().get_display_name().await?.expect("failed to fetch display name"),
|
||||||
|
session: session.clone(),
|
||||||
|
sync_token: None
|
||||||
|
};
|
||||||
|
|
||||||
|
self.logout().await?;
|
||||||
|
self.current_account = id;
|
||||||
|
self.accounts.push(account);
|
||||||
|
self.clients.push(Some(client));
|
||||||
|
self.save()?;
|
||||||
|
|
||||||
|
info!("Logged in as '{}' device ID: {}", session.user_id.to_string(), session.device_id.to_string());
|
||||||
|
|
||||||
|
Ok(id)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn login(&mut self, account_id:u32) -> Result<()> {
|
||||||
|
self.logout().await?; // log out the current account
|
||||||
|
|
||||||
|
let account = if account_id >= self.num_accounts {
|
||||||
|
error!("Tried to log in with an invalid account ID {}", account_id);
|
||||||
|
return Err(Error::msg("Invalid account ID"));
|
||||||
|
} else {
|
||||||
|
self.get(account_id).expect("Account lookup failed")
|
||||||
|
};
|
||||||
|
|
||||||
|
if self.clients.get(account_id as usize).expect("client lookup failed").is_none() {
|
||||||
|
info!("No client cached for account: '{}' -> requesting a new one", &account.session.user_id);
|
||||||
|
let client = Client::builder()
|
||||||
|
.homeserver_url(&account.homeserver)
|
||||||
|
.sled_store(format!("userdata/{account_id}"), Some("supersecure")) ?
|
||||||
|
.build()
|
||||||
|
.await?;
|
||||||
|
client.restore_login(account.session.clone()).await?;
|
||||||
|
self.clients.insert(account_id as usize, Some(client));
|
||||||
|
} else {
|
||||||
|
info!("Using cached client for account: '{}'", &account.session.user_id);
|
||||||
|
};
|
||||||
|
|
||||||
|
info!("Restored account");
|
||||||
|
|
||||||
|
self.current_account = account_id;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn logout(&mut self) -> Result<()> {
|
||||||
|
// idk, do some matrix related stuff in here or something like that
|
||||||
|
if self.clients.get(self.current_account as usize).is_none() {
|
||||||
|
return Ok(());
|
||||||
|
}
|
||||||
|
let client = match self.clients.get(self.current_account as usize).unwrap() {
|
||||||
|
None => return Ok(()),
|
||||||
|
Some(c) => c,
|
||||||
|
};
|
||||||
|
|
||||||
|
info!("Logged out '{}' locally", client.session().unwrap().user_id);
|
||||||
|
client.logout().await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn save(&self) -> Result<()>{
|
||||||
|
let accounts_data = AccountsData {
|
||||||
|
current_account: self.current_account,
|
||||||
|
accounts: self.accounts.clone(),
|
||||||
|
};
|
||||||
|
|
||||||
|
let serialized = serde_json::to_string(&accounts_data)?;
|
||||||
|
fs::write("userdata/accounts.json", serialized)?;
|
||||||
|
|
||||||
|
info!("Saved serialized accounts config (userdata/accounts.json)");
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get(&self, id: u32) -> Option<&Account> {
|
||||||
|
self.accounts.get(id as usize)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn current(&self) -> Option<&Account> {
|
||||||
|
self.get(self.current_account)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn client(&self) -> Option<&Client> {
|
||||||
|
match self.clients.get(self.current_account as usize) {
|
||||||
|
None => None,
|
||||||
|
Some(oc) => match oc {
|
||||||
|
None => None,
|
||||||
|
Some(c) => Some(c),
|
||||||
|
},
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn num_accounts(&self) -> u32 { self.num_accounts }
|
||||||
|
}
|
|
@ -1,133 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
//// Prints to the output, with a newline.
|
|
||||||
// HACK(@soispha): The stdlib Lua `print()` function has stdout as output hardcoded,
|
|
||||||
// redirecting stdout seems too much like a hack thus we are just redefining the print function
|
|
||||||
// to output to a controlled output. <2023-09-09>
|
|
||||||
// This is implemented only for lua
|
|
||||||
/* fn print(CommandTransferValue); */
|
|
||||||
|
|
||||||
mod trinitrix {
|
|
||||||
/// Language specific functions, which mirror the `trinitrix.api` namespace.
|
|
||||||
/// That is, if you have to choose between a `std` and a `api` function choose the `std`
|
|
||||||
/// one as it will most likely be more high-level and easier to use (as it isn't abstracted
|
|
||||||
/// over multiple languages). Feel free to drop down to the lower level api, if you feel
|
|
||||||
/// like that more, it should be as stable and user-oriented as the `std` functions
|
|
||||||
mod stdi {}
|
|
||||||
|
|
||||||
/// General API to change stuff in Trinitrix
|
|
||||||
mod api {
|
|
||||||
/// Closes the application
|
|
||||||
fn exit();
|
|
||||||
|
|
||||||
//// Open the help pages at the first occurrence of
|
|
||||||
//// the input string if it is Some, otherwise open
|
|
||||||
//// the help pages at the start
|
|
||||||
// TODO(@soispha): To be implemented <2024-03-09>
|
|
||||||
// fn help(Option<String>);
|
|
||||||
|
|
||||||
/// Function that change the UI, or UI state
|
|
||||||
mod ui {
|
|
||||||
enum Mode {
|
|
||||||
/// Default mode (navigation mode)
|
|
||||||
Normal,
|
|
||||||
/// Allows you to insert things
|
|
||||||
Insert,
|
|
||||||
/// actives the command line
|
|
||||||
Command,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Change the active mode
|
|
||||||
fn set_mode(mode: Mode);
|
|
||||||
|
|
||||||
/// Go to the next plane
|
|
||||||
fn cycle_planes();
|
|
||||||
/// Go to the previous plane
|
|
||||||
fn cycle_planes_rev();
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Manipulate keymappings, the mode is specified as a String build up of all mode
|
|
||||||
/// the keymapping should be active in. The mapping works as follows:
|
|
||||||
/// n => normal Mode
|
|
||||||
/// c => command Mode
|
|
||||||
/// i => insert Mode
|
|
||||||
///
|
|
||||||
/// The key works in a similar matter, specifying the required keypresses to trigger the
|
|
||||||
/// callback. For example "aba" for require the user to press "a" then "b" then "a" again
|
|
||||||
/// to trigger the mapping. Special characters are encoded as follows:
|
|
||||||
/// "<C-a>ba" => "Ctrl+a" then "b" then "a"
|
|
||||||
/// "<S-a>" => "A" or "Shift+a"
|
|
||||||
/// "A" => "A"
|
|
||||||
/// "<M-a> " => "Alt+a" (<A-a>) or "Meta+a"(<M-a>) (most terminals can't really differentiate between these characters)
|
|
||||||
/// "a<C-b><C-a>" => "a" then "Ctrl+b" then "Ctrl+a" (also works for Shift, Alt and Super)
|
|
||||||
/// "<CSM-b>" => "Ctrl+Shift+Alt+b" (the ordering doesn't matter)
|
|
||||||
/// "a " => "a" then a literal space (" ")
|
|
||||||
/// "å🙂" => "å" then "🙂" (full Unicode support!)
|
|
||||||
/// "<ESC>" => escape key
|
|
||||||
/// "<F3>" => F3 key
|
|
||||||
/// "<BACKSPACE>" => backspace key (and so forth)
|
|
||||||
/// "<DASH>" => a literal "-"
|
|
||||||
/// "<ANGULAR_BRACKET_OPEN>" or "<ABO>" => a literal "<"
|
|
||||||
/// "<ANGULAR_BRACKET_CLOSE>" or "<ABC>" => a literal ">"
|
|
||||||
///
|
|
||||||
/// The callback MUST be registered first by calling
|
|
||||||
/// `trinitrix.api.register_function()` the returned value can than be used to
|
|
||||||
/// set the keymap.
|
|
||||||
mod keymaps {
|
|
||||||
/// Add a new keymapping
|
|
||||||
fn add(mode: String, key: String, callback: fn());
|
|
||||||
|
|
||||||
/// Remove a keymapping
|
|
||||||
///
|
|
||||||
/// Does nothing, if the keymapping doesn't exists yet
|
|
||||||
fn remove(mode: String, key: String);
|
|
||||||
|
|
||||||
/// List declared keymappings
|
|
||||||
fn get(mode: String);
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Functions only used internally within Trinitrix
|
|
||||||
mod raw {
|
|
||||||
/// Send an error to the default error output
|
|
||||||
fn raise_error(error_message: String);
|
|
||||||
|
|
||||||
/// Send output to the default output
|
|
||||||
/// This is mainly used to display the final
|
|
||||||
/// output of evaluated lua commands.
|
|
||||||
fn display_output(output_message: String);
|
|
||||||
|
|
||||||
/// Input a character without checking for possible keymaps
|
|
||||||
/// If the current state does not expect input, this character is ignored
|
|
||||||
/// The encoding is the same as in the `trinitrix.api.keymaps` commands
|
|
||||||
fn send_input_unprocessed(input: String);
|
|
||||||
|
|
||||||
/// This namespace is used to store some command specific data (like functions, as
|
|
||||||
/// ensuring memory locations stay allocated in garbage collected language is hard)
|
|
||||||
///
|
|
||||||
/// Treat it as an implementation detail
|
|
||||||
mod __private {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Trixy is sort of a subset of rust
|
|
||||||
// vim: syntax=rust
|
|
|
@ -1,79 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// Run the `api` bin to see the generated api
|
|
||||||
|
|
||||||
use std::{panic::catch_unwind, process, thread};
|
|
||||||
|
|
||||||
use cli_log::{debug, info};
|
|
||||||
|
|
||||||
use crate::app::{events::Event, COMMAND_TRANSMITTER};
|
|
||||||
|
|
||||||
include!(concat!(env!("OUT_DIR"), "/api.rs"));
|
|
||||||
|
|
||||||
pub fn handle_cmd(cmd: Commands) {
|
|
||||||
// Unwinding into the c code implicitly calling this function would be UB. Besides, rust would
|
|
||||||
// probably just abort the process, giving us a weird shutdown without an error message.
|
|
||||||
// Thus we catch the panic before the ffi boundary. This could also be moved to trixy.
|
|
||||||
let error = catch_unwind(|| {
|
|
||||||
let tx = COMMAND_TRANSMITTER
|
|
||||||
.get()
|
|
||||||
.expect("The cell should always be populated, at this point");
|
|
||||||
|
|
||||||
info!("Received command: {:#?}", cmd);
|
|
||||||
|
|
||||||
// NOTE: The extra future and tokio runtime here is necessary to have a sync api. Which is imho
|
|
||||||
// better than expecting c to work with a async one. <2024-05-04>
|
|
||||||
let future = async move {
|
|
||||||
debug!("Asyncly started to send cmd");
|
|
||||||
|
|
||||||
// FIXME: The None here is definitely wrong <2024-05-03>
|
|
||||||
tx.send(Event::CommandEvent(cmd, None))
|
|
||||||
.await
|
|
||||||
.expect("I hope that this does not fail");
|
|
||||||
|
|
||||||
debug!("Done with the async send");
|
|
||||||
};
|
|
||||||
|
|
||||||
debug!("Starting runtime");
|
|
||||||
let handle = thread::spawn(|| {
|
|
||||||
// run the task a separate thread to avoid tokio having problems with the currently
|
|
||||||
// running runtime.
|
|
||||||
|
|
||||||
// PERFORMANCE(@soispha): Stating a new thread for each command is very bad. <2024-05-04>
|
|
||||||
tokio::runtime::Builder::new_current_thread()
|
|
||||||
.enable_all()
|
|
||||||
.build()
|
|
||||||
.unwrap()
|
|
||||||
.block_on(future);
|
|
||||||
});
|
|
||||||
handle.join().expect("Shall never error");
|
|
||||||
debug!("Handled command");
|
|
||||||
});
|
|
||||||
|
|
||||||
if let Err(err) = error {
|
|
||||||
eprintln!("Catched a panic just before the c ffi: {:#?}", err);
|
|
||||||
|
|
||||||
// This will leave the terminal in a horrendous shape (as no destructors are run), but what
|
|
||||||
// can we do at this point beside that?
|
|
||||||
process::abort();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,165 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use cli_log::info;
|
|
||||||
use mlua::{ErrorContext, FromLua, IntoLua, LuaSerdeExt, Value};
|
|
||||||
|
|
||||||
use super::{support_types::Function, CommandTransferValue, Table};
|
|
||||||
|
|
||||||
impl<'lua> FromLua<'lua> for Function {
|
|
||||||
fn from_lua(value: Value<'lua>, lua: &'lua mlua::Lua) -> mlua::Result<Self> {
|
|
||||||
match value {
|
|
||||||
Value::Integer(function_id) => {
|
|
||||||
return Ok(Function::new(function_id.try_into().expect(
|
|
||||||
"We should never have i64::MAX functions
|
|
||||||
registered. The stack will
|
|
||||||
probably overflow, before this i64 overflows",
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
_ => unreachable!("The Function type can only take functions!"),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'lua> IntoLua<'lua> for CommandTransferValue {
|
|
||||||
fn into_lua(self, lua: &'lua mlua::Lua) -> mlua::Result<mlua::Value<'lua>> {
|
|
||||||
let converted_output = lua.to_value(&self)?;
|
|
||||||
return unwrap(converted_output, lua);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl<'lua> FromLua<'lua> for CommandTransferValue {
|
|
||||||
fn from_lua(value: Value<'lua>, lua: &'lua mlua::Lua) -> mlua::Result<Self> {
|
|
||||||
match value {
|
|
||||||
Value::Nil => Ok(Self::Nil),
|
|
||||||
Value::Boolean(bool) => Ok(Self::Boolean(bool)),
|
|
||||||
Value::Integer(int) => Ok(Self::Integer(int)),
|
|
||||||
Value::Number(num) => Ok(Self::Number(num)),
|
|
||||||
Value::String(string) => Ok(Self::String(
|
|
||||||
string
|
|
||||||
.to_str()
|
|
||||||
.context("Lua string seems to contain non UTF-8 chars")?
|
|
||||||
.to_owned(),
|
|
||||||
)),
|
|
||||||
Value::Table(table) => {
|
|
||||||
// FIXME(@soispha): This will fail, when the key is not a string, this should be
|
|
||||||
// accounted for <2023-09-09>
|
|
||||||
let mut rust_table: Table = HashMap::new();
|
|
||||||
for pair in table.pairs() {
|
|
||||||
let (key, value) = pair?;
|
|
||||||
rust_table.insert(key, value);
|
|
||||||
}
|
|
||||||
return Ok(Self::Table(rust_table));
|
|
||||||
}
|
|
||||||
|
|
||||||
Value::Function(_) => todo!(),
|
|
||||||
Value::Thread(_) => todo!(),
|
|
||||||
Value::UserData(_) => todo!(),
|
|
||||||
Value::Error(_) => todo!(),
|
|
||||||
Value::LightUserData(_) => todo!(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn unwrap<'lua>(
|
|
||||||
value_to_unwrap: Value<'lua>,
|
|
||||||
lua: &'lua mlua::Lua,
|
|
||||||
) -> mlua::Result<mlua::Value<'lua>> {
|
|
||||||
fn unwrap_first_level<'lua>(table: mlua::Table<'lua>) -> mlua::Result<Value<'lua>> {
|
|
||||||
let (_, value): (Value, Value) = table
|
|
||||||
.pairs()
|
|
||||||
.next()
|
|
||||||
.expect("Exactly one item should extist")?;
|
|
||||||
Ok(value)
|
|
||||||
}
|
|
||||||
// That converted value looks somewhat like this (e.g. a String):
|
|
||||||
// ```
|
|
||||||
// {
|
|
||||||
// ["String"] = "hi",
|
|
||||||
// }
|
|
||||||
// ```
|
|
||||||
// or like this (e.g. a table):
|
|
||||||
// ```
|
|
||||||
// {
|
|
||||||
// ["Table"] = {
|
|
||||||
// ["UserId"] = {
|
|
||||||
// ["Integer"] = 2,
|
|
||||||
// },
|
|
||||||
// ["UserName"] = {
|
|
||||||
// ["String"] = "James",
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// }
|
|
||||||
// ```
|
|
||||||
if let Value::Table(table) = value_to_unwrap {
|
|
||||||
let value = unwrap_first_level(table)?;
|
|
||||||
if let Value::Table(wrapped_table) = value {
|
|
||||||
info!("We've got a wtable! wtable: \n{:#?}", wrapped_table);
|
|
||||||
// we now have a wrapped table value for example like this:
|
|
||||||
// ```
|
|
||||||
// {
|
|
||||||
// ["UserId"] = {
|
|
||||||
// ["Integer"] = 2,
|
|
||||||
// },
|
|
||||||
// ["UserName"] = {
|
|
||||||
// ["String"] = "James",
|
|
||||||
// },
|
|
||||||
// ["Versions"] = {
|
|
||||||
// ["Table"] = {
|
|
||||||
// ["api"] = {
|
|
||||||
// ["Boolean"] = true,
|
|
||||||
// },
|
|
||||||
// ["interface"] = {
|
|
||||||
// ["Integer"] = 3,
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// }
|
|
||||||
// ```
|
|
||||||
let output_table: mlua::Table = lua
|
|
||||||
.load("{}")
|
|
||||||
.eval()
|
|
||||||
.expect("This is static, it should always work");
|
|
||||||
|
|
||||||
// FIXME(@soispha): This still fails for nested tables (i.e. the table above), as it
|
|
||||||
// unpacks too much. While unpacking the while loop should stop, when a key is not from
|
|
||||||
// the CommandTransferValue family (i.e. ["Integer", "Boolean", "String", "Table",
|
|
||||||
// etc.]) <2023-09-09>
|
|
||||||
for pair in wrapped_table.pairs::<Value, Value>() {
|
|
||||||
let (key, mut raw_value) = pair?;
|
|
||||||
while let Value::Table(raw_table) = raw_value {
|
|
||||||
raw_value = unwrap_first_level(raw_table)?;
|
|
||||||
}
|
|
||||||
output_table.set(key, raw_value)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
return Ok(output_table.into_lua(lua)?);
|
|
||||||
} else {
|
|
||||||
info!("We've got a normal output! output: {:#?}", value);
|
|
||||||
// we had a simple wrapped value, which is already unwrapped, thus it can be
|
|
||||||
// returned directly
|
|
||||||
return Ok(value);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
unreachable!("The returned table should always only contain one element");
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,86 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::{collections::HashMap, fmt::Display};
|
|
||||||
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use self::support_types::Function;
|
|
||||||
|
|
||||||
pub mod support_types;
|
|
||||||
pub mod type_conversions;
|
|
||||||
|
|
||||||
// language support
|
|
||||||
pub mod lua;
|
|
||||||
|
|
||||||
pub type Table = HashMap<String, CommandTransferValue>;
|
|
||||||
|
|
||||||
#[derive(Debug, Serialize, Deserialize, Clone)]
|
|
||||||
pub enum CommandTransferValue {
|
|
||||||
/// `nil` or `null` or `undefined`; anything which goes in that group of types.
|
|
||||||
Nil,
|
|
||||||
|
|
||||||
/// `true` or `false`.
|
|
||||||
Boolean(bool),
|
|
||||||
|
|
||||||
// A “light userdata” object, equivalent to a raw pointer.
|
|
||||||
// /* TODO */ LightUserData(LightUserData),
|
|
||||||
/// An integer number.
|
|
||||||
Integer(i64),
|
|
||||||
|
|
||||||
/// A floating point number.
|
|
||||||
Number(f64),
|
|
||||||
|
|
||||||
/// A string
|
|
||||||
String(String),
|
|
||||||
|
|
||||||
/// A table, dictionary or HashMap
|
|
||||||
Table(HashMap<String, CommandTransferValue>),
|
|
||||||
|
|
||||||
/// Reference to a function (or closure).
|
|
||||||
/// This 'Function' value is obtained by registering a function with 'register_function()'
|
|
||||||
Function(Function),
|
|
||||||
// Reference to a Lua thread (or coroutine).
|
|
||||||
// /* TODO */ Thread(Thread<'lua>),
|
|
||||||
|
|
||||||
// Reference to an userdata object that holds a custom type which implements `UserData`.
|
|
||||||
// Special builtin userdata types will be represented as other `Value` variants.
|
|
||||||
// /* TODO */ UserData(AnyUserData),
|
|
||||||
|
|
||||||
// `Error` is a special builtin userdata type. When received from Lua it is implicitly cloned.
|
|
||||||
// /* TODO */ Error(Error),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Display for CommandTransferValue {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
match self {
|
|
||||||
CommandTransferValue::Nil => f.write_str("Nil"),
|
|
||||||
CommandTransferValue::Boolean(bool) => f.write_str(&format!("{}", bool)),
|
|
||||||
CommandTransferValue::Integer(int) => f.write_str(&format!("{}", int)),
|
|
||||||
CommandTransferValue::Number(num) => f.write_str(&format!("{}", num)),
|
|
||||||
CommandTransferValue::String(str) => f.write_str(&format!("{}", str)),
|
|
||||||
// TODO(@Soispha): The following line should be a real display call, but how do you
|
|
||||||
// format a HashMap?
|
|
||||||
CommandTransferValue::Table(table) => f.write_str(&format!("{:#?}", table)),
|
|
||||||
CommandTransferValue::Function(function) => function.fmt(f),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,88 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::{
|
|
||||||
fmt::Display,
|
|
||||||
sync::atomic::{AtomicUsize, Ordering},
|
|
||||||
};
|
|
||||||
|
|
||||||
use cli_log::info;
|
|
||||||
use mlua::{ErrorContext, IntoLua, Lua, Table};
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, Debug, Deserialize, Serialize, PartialEq, Eq, PartialOrd, Ord, Hash)]
|
|
||||||
pub struct Function {
|
|
||||||
id: usize,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Function {
|
|
||||||
fn get_private<'lua>(lua: &'lua Lua) -> mlua::Result<Table<'lua>> {
|
|
||||||
let private: Table = lua
|
|
||||||
.globals()
|
|
||||||
// This is always initialized, as the namespaces are specified in the 'command_list' module
|
|
||||||
.get::<&str, mlua::Table>("trinitrix")
|
|
||||||
.context("Failed to access 'trinitrix'")?
|
|
||||||
.get::<&str, mlua::Table>("api")
|
|
||||||
.context("Failed to access 'api'")?
|
|
||||||
.get::<&str, mlua::Table>("raw")
|
|
||||||
.context("Failed to access 'raw'")?
|
|
||||||
.get::<&str, mlua::Table>("__private")
|
|
||||||
.context("Failed to access '__private'")?;
|
|
||||||
Ok(private)
|
|
||||||
}
|
|
||||||
pub fn new(function_id: usize) -> Self {
|
|
||||||
Function { id: function_id }
|
|
||||||
}
|
|
||||||
pub fn from_lua_function(function: mlua::Function, lua: &Lua) -> mlua::Result<Self> {
|
|
||||||
// TODO(@soispha): Does this expose a vulnerability, as the ids are predictable? <2023-10-14>
|
|
||||||
static COUNTER: AtomicUsize = AtomicUsize::new(0);
|
|
||||||
let id = COUNTER.fetch_add(1, Ordering::Relaxed);
|
|
||||||
|
|
||||||
let private = Self::get_private(lua)?;
|
|
||||||
info!("Registering function '{}'", id);
|
|
||||||
private.set(id, function)?;
|
|
||||||
|
|
||||||
Ok(Function::new(id))
|
|
||||||
}
|
|
||||||
pub fn call(&self, lua: &Lua) -> mlua::Result<()> {
|
|
||||||
let private = Self::get_private(lua)?;
|
|
||||||
|
|
||||||
info!("Calling function '{}'", &self.id);
|
|
||||||
|
|
||||||
let function: mlua::Function = private
|
|
||||||
.get(self.id)
|
|
||||||
.context("Failed to get function associated with callback!")?;
|
|
||||||
|
|
||||||
function.call(()).context("Failed to call function")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<'lua> IntoLua<'lua> for Function {
|
|
||||||
fn into_lua(self, lua: &'lua Lua) -> mlua::Result<mlua::Value<'lua>> {
|
|
||||||
Ok(self.id.into_lua(lua)?)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Display for Function {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
self.id.fmt(f)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,55 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::collections::HashMap;
|
|
||||||
|
|
||||||
use super::CommandTransferValue;
|
|
||||||
|
|
||||||
impl From<String> for CommandTransferValue {
|
|
||||||
fn from(s: String) -> Self {
|
|
||||||
Self::String(s.to_owned())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl From<f64> for CommandTransferValue {
|
|
||||||
fn from(s: f64) -> Self {
|
|
||||||
Self::Number(s.to_owned())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl From<i64> for CommandTransferValue {
|
|
||||||
fn from(s: i64) -> Self {
|
|
||||||
Self::Integer(s.to_owned())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl From<HashMap<String, CommandTransferValue>> for CommandTransferValue {
|
|
||||||
fn from(s: HashMap<String, CommandTransferValue>) -> Self {
|
|
||||||
Self::Table(s.to_owned())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl From<bool> for CommandTransferValue {
|
|
||||||
fn from(s: bool) -> Self {
|
|
||||||
Self::Boolean(s.to_owned())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
impl From<()> for CommandTransferValue {
|
|
||||||
fn from(_: ()) -> Self {
|
|
||||||
Self::Nil
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,216 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::thread;
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use cli_log::{debug, error, info};
|
|
||||||
use mlua::{ErrorContext, Lua, Value};
|
|
||||||
use once_cell::sync::OnceCell;
|
|
||||||
use tokio::{
|
|
||||||
runtime::Builder,
|
|
||||||
select,
|
|
||||||
sync::{mpsc, Mutex},
|
|
||||||
task::{self, LocalSet},
|
|
||||||
};
|
|
||||||
|
|
||||||
use crate::app::{
|
|
||||||
command_interface::{
|
|
||||||
add_lua_functions_to_globals,
|
|
||||||
Api::Raw,
|
|
||||||
Command,
|
|
||||||
Raw::{DisplayOutput, RaiseError},
|
|
||||||
Trinitrix::Api,
|
|
||||||
},
|
|
||||||
events::Event,
|
|
||||||
};
|
|
||||||
|
|
||||||
use super::command_transfer_value::support_types::Function;
|
|
||||||
|
|
||||||
static LUA: OnceCell<Mutex<mlua::Lua>> = OnceCell::new();
|
|
||||||
|
|
||||||
/// This structure contains the necessary state for running an embedded Lua runtime (i.e.
|
|
||||||
/// the tread, the Lua memory, etc.).
|
|
||||||
pub struct LuaCommandManager {
|
|
||||||
lua_command_tx: mpsc::Sender<String>,
|
|
||||||
lua_function_tx: mpsc::Sender<Function>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl LuaCommandManager {
|
|
||||||
pub async fn execute_code(&self, code: String) {
|
|
||||||
self.lua_command_tx
|
|
||||||
.send(code)
|
|
||||||
.await
|
|
||||||
.expect("The receiver should not be dropped at this time");
|
|
||||||
}
|
|
||||||
pub async fn execute_function(&self, function: Function) {
|
|
||||||
self.lua_function_tx
|
|
||||||
.send(function)
|
|
||||||
.await
|
|
||||||
.expect("The receiver should not be dropped");
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn new(event_call_tx: mpsc::Sender<Event>) -> Self {
|
|
||||||
info!("Spawning lua code execution thread...");
|
|
||||||
let (lua_command_tx, mut lua_command_rx) = mpsc::channel::<String>(256);
|
|
||||||
let (lua_function_tx, mut lua_function_rx) = mpsc::channel::<Function>(256);
|
|
||||||
thread::spawn(move || {
|
|
||||||
let rt = Builder::new_current_thread().enable_all().build().expect(
|
|
||||||
"Should always be able to build \
|
|
||||||
tokio runtime for lua command handling",
|
|
||||||
);
|
|
||||||
let local = LocalSet::new();
|
|
||||||
local.spawn_local(async move {
|
|
||||||
info!(
|
|
||||||
"Lua command handling initialized, \
|
|
||||||
waiting for commands.."
|
|
||||||
);
|
|
||||||
let mut done = false;
|
|
||||||
let moved_event_call_tx = event_call_tx.clone();
|
|
||||||
while !done {
|
|
||||||
select! {
|
|
||||||
command = lua_command_rx.recv() => {
|
|
||||||
if let Some(command) = command {
|
|
||||||
debug!("Received lua code (in LuaCommandHandler): {}", &command);
|
|
||||||
let local_event_call_tx = moved_event_call_tx.clone();
|
|
||||||
|
|
||||||
task::spawn_local(async move {
|
|
||||||
exec_lua(&command, local_event_call_tx).await.expect(
|
|
||||||
"This should return all relevent errors \
|
|
||||||
by other messages, \
|
|
||||||
this should never error",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
done = true;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
function_id = lua_function_rx.recv() => {
|
|
||||||
if let Some(function_id) = function_id {
|
|
||||||
debug!("Received lua function (in LuaCommandHandler): {}", &function_id);
|
|
||||||
let local_event_call_tx = moved_event_call_tx.clone();
|
|
||||||
|
|
||||||
task::spawn_local(async move {
|
|
||||||
let lua = initialize_lua(local_event_call_tx.clone()).await;
|
|
||||||
let out = function_id.call(&lua).map_err(|err| async move {
|
|
||||||
error!("Lua function `{}` returned error: `{}`", function_id, err);
|
|
||||||
local_event_call_tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Raw(RaiseError(err.to_string())))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await.expect(
|
|
||||||
"This should return all relevent errors \
|
|
||||||
by other messages, \
|
|
||||||
this should never error",
|
|
||||||
);
|
|
||||||
});
|
|
||||||
if let Err(err) = out {
|
|
||||||
err.await;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
done = true;
|
|
||||||
}
|
|
||||||
},
|
|
||||||
else => done = true,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
rt.block_on(local);
|
|
||||||
});
|
|
||||||
|
|
||||||
LuaCommandManager {
|
|
||||||
lua_command_tx,
|
|
||||||
lua_function_tx,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn initialize_lua<'a>(
|
|
||||||
event_call_tx: mpsc::Sender<Event>,
|
|
||||||
) -> matrix_sdk::locks::MutexGuard<'a, Lua> {
|
|
||||||
let lua = LUA
|
|
||||||
.get_or_init(|| {
|
|
||||||
let lua: Lua = add_lua_functions_to_globals(mlua::Lua::new(), event_call_tx);
|
|
||||||
{
|
|
||||||
let wrapped_register_function = lua
|
|
||||||
.create_function(
|
|
||||||
|lua: &Lua, function: mlua::Function| -> mlua::Result<Function> {
|
|
||||||
ErrorContext::context(
|
|
||||||
Function::from_lua_function(function, lua),
|
|
||||||
"Failed to register function",
|
|
||||||
)
|
|
||||||
},
|
|
||||||
)
|
|
||||||
.expect("This always works, as the function is static");
|
|
||||||
let trinitrix_api: mlua::Table = lua
|
|
||||||
.globals()
|
|
||||||
.get::<&str, mlua::Table>("trinitrix")
|
|
||||||
.expect("This was set in the add_lua_functions_to_globals function")
|
|
||||||
.get::<&str, mlua::Table>("api")
|
|
||||||
.expect("Same reason");
|
|
||||||
trinitrix_api
|
|
||||||
.set("register_function", wrapped_register_function)
|
|
||||||
.expect("This should work");
|
|
||||||
}
|
|
||||||
|
|
||||||
Mutex::new(lua)
|
|
||||||
})
|
|
||||||
.lock()
|
|
||||||
.await;
|
|
||||||
lua
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn exec_lua(lua_code: &str, event_call_tx: mpsc::Sender<Event>) -> Result<()> {
|
|
||||||
let lua = initialize_lua(event_call_tx.clone()).await;
|
|
||||||
|
|
||||||
info!("Recieved code to execute: `{}`, executing...", &lua_code);
|
|
||||||
let output = lua.load(lua_code).eval_async::<Value>().await;
|
|
||||||
match output {
|
|
||||||
Ok(out) => {
|
|
||||||
let to_string_fn: mlua::Function =
|
|
||||||
lua.globals().get("tostring").expect("This always exists");
|
|
||||||
let output: String = to_string_fn.call(out).expect("tostring should not error");
|
|
||||||
info!("Lua code `{}` evaluated to: `{}`", lua_code, &output);
|
|
||||||
|
|
||||||
if output != "nil" {
|
|
||||||
event_call_tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Raw(DisplayOutput(output)))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await
|
|
||||||
.context("Failed to send lua output command")?
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(err) => {
|
|
||||||
error!("Lua code `{}` returned error: `{}`", lua_code, err);
|
|
||||||
event_call_tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Raw(RaiseError(err.to_string())))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
Ok(())
|
|
||||||
}
|
|
|
@ -1,26 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pub mod command_list;
|
|
||||||
// pub mod command_transfer_value;
|
|
||||||
// pub mod lua_command_manager;
|
|
||||||
|
|
||||||
pub use command_list::*;
|
|
|
@ -1,66 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::path::{Path, PathBuf};
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use cli_log::{info, warn};
|
|
||||||
use tokio::{fs, sync::mpsc::Sender};
|
|
||||||
|
|
||||||
use crate::app::events::Event;
|
|
||||||
|
|
||||||
const LUA_CONFIG_FILE_NAME: &str = "init.lua";
|
|
||||||
|
|
||||||
pub async fn load(tx: Sender<Event>, path: PathBuf) -> Result<()> {
|
|
||||||
info!("Loaded config file at '{}'", path.display());
|
|
||||||
|
|
||||||
let lua_config_code = fs::read_to_string(&path).await?;
|
|
||||||
tx.send(Event::LuaCommand(lua_config_code)).await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn check_for_config_file(config_dir: &Path) -> Result<Option<PathBuf>> {
|
|
||||||
if config_dir
|
|
||||||
.try_exists()
|
|
||||||
.context("Failed to search for a config file")?
|
|
||||||
{
|
|
||||||
info!("Found config dir: `{}`", config_dir.display());
|
|
||||||
let config_file = config_dir.join(LUA_CONFIG_FILE_NAME);
|
|
||||||
|
|
||||||
info!("Searching for config file at '{}'", config_file.display());
|
|
||||||
if config_file.try_exists().with_context(|| {
|
|
||||||
format!(
|
|
||||||
"Failed to check, if the lua config file at '{}' exists.",
|
|
||||||
config_file.display()
|
|
||||||
)
|
|
||||||
})? {
|
|
||||||
info!("Found the config file at: '{}'", config_file.display());
|
|
||||||
Ok(Some(config_file))
|
|
||||||
} else {
|
|
||||||
warn!("No config file found!");
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
warn!("No config directory found at {}!", config_dir.display());
|
|
||||||
Ok(None)
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,23 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pub mod lua;
|
|
||||||
pub mod shared_objects;
|
|
|
@ -1,50 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::{
|
|
||||||
ffi::c_int,
|
|
||||||
path::PathBuf,
|
|
||||||
thread::{self},
|
|
||||||
};
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use cli_log::info;
|
|
||||||
use libloading::{Library, Symbol};
|
|
||||||
|
|
||||||
pub fn load(plugin: PathBuf) -> Result<()> {
|
|
||||||
info!("Loading a plugin from '{}'", plugin.display());
|
|
||||||
|
|
||||||
let _handle = thread::spawn(move || -> Result<()> {
|
|
||||||
unsafe {
|
|
||||||
let lib = Library::new(plugin).context("Failed to load plugin")?;
|
|
||||||
let func: Symbol<unsafe fn() -> c_int> = lib
|
|
||||||
.get(b"plugin_main")
|
|
||||||
.context("Plugin does not have a 'plugin_main' symbol")?;
|
|
||||||
|
|
||||||
info!("Starting plugin");
|
|
||||||
let out = func();
|
|
||||||
info!("Plugin finished with: {}", out);
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
});
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
|
@ -0,0 +1,302 @@
|
||||||
|
use crate::app::{App, status::{Status, State}};
|
||||||
|
use crate::ui;
|
||||||
|
use tokio::time::Duration;
|
||||||
|
use tokio::sync::{mpsc, broadcast};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
use anyhow::{Result, Error};
|
||||||
|
use matrix_sdk::{Client, room::{Room}, config::SyncSettings, ruma::events::room::{
|
||||||
|
member::StrippedRoomMemberEvent,
|
||||||
|
message::{MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent},
|
||||||
|
}, LoopCtrl};
|
||||||
|
use cli_log::{error, warn, info};
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub enum EventStatus {
|
||||||
|
Ok,
|
||||||
|
Finished,
|
||||||
|
Terminate,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Debug)]
|
||||||
|
pub struct Event {
|
||||||
|
input_event: Option<crossterm::event::Event>,
|
||||||
|
matrix_event: Option<matrix_sdk::deserialized_responses::SyncResponse>
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct EventBuilder {
|
||||||
|
event: Event,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for Event {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
input_event: None,
|
||||||
|
matrix_event: None,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Default for EventBuilder {
|
||||||
|
fn default() -> Self {
|
||||||
|
Self {
|
||||||
|
event: Event::default(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
impl EventBuilder {
|
||||||
|
fn input_event(&mut self, input_event: crossterm::event::Event) -> &Self {
|
||||||
|
self.event.input_event = Some(input_event);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn matrix_event(&mut self, matrix_event: matrix_sdk::deserialized_responses::SyncResponse) -> &Self {
|
||||||
|
self.event.matrix_event = Some(matrix_event);
|
||||||
|
self
|
||||||
|
}
|
||||||
|
|
||||||
|
fn build(&self) -> Event {
|
||||||
|
Event {
|
||||||
|
input_event: self.event.input_event.clone(),
|
||||||
|
matrix_event: self.event.matrix_event.clone(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Event {
|
||||||
|
pub async fn handle(&self, app: &mut App<'_>) -> Result<EventStatus> {
|
||||||
|
|
||||||
|
if self.matrix_event.is_some() {
|
||||||
|
return self.handle_matrix(app).await;
|
||||||
|
}
|
||||||
|
|
||||||
|
let status = match app.status.state() {
|
||||||
|
State::None => EventStatus::Ok,
|
||||||
|
State::Main => self.handle_main(app).await?,
|
||||||
|
State::Setup => self.handle_setup(app).await?,
|
||||||
|
};
|
||||||
|
|
||||||
|
Ok(status)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_matrix(&self, app: &mut App<'_>) -> Result<EventStatus> {
|
||||||
|
let sync = self.matrix_event.clone().unwrap();
|
||||||
|
for (m_room_id, m_room) in sync.rooms.join.iter() {
|
||||||
|
let room = match app.status.get_room_mut(m_room_id) {
|
||||||
|
Some(r) => r,
|
||||||
|
None => continue,
|
||||||
|
};
|
||||||
|
for m_event in m_room.timeline.events.clone() {
|
||||||
|
let event = m_event.event.deserialize().unwrap().into_full_event(m_room_id.clone());
|
||||||
|
room.timeline_add(event);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(EventStatus::Ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_main(&self, app: &mut App<'_>) -> Result<EventStatus> {
|
||||||
|
if self.input_event.is_some() {
|
||||||
|
match tui_textarea::Input::from(self.input_event.clone().unwrap()) {
|
||||||
|
tui_textarea::Input { key: tui_textarea::Key::Esc, .. } => return Ok(EventStatus::Terminate),
|
||||||
|
tui_textarea::Input {
|
||||||
|
key: tui_textarea::Key::Tab,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
app.ui.cycle_main_input_position();
|
||||||
|
}
|
||||||
|
input => {
|
||||||
|
match app.ui.input_position() {
|
||||||
|
ui::MainInputPosition::MessageCompose => {
|
||||||
|
match input {
|
||||||
|
tui_textarea::Input {key: tui_textarea::Key::Enter, alt: true, ..} => {
|
||||||
|
match app.status.room_mut() {
|
||||||
|
Some(room) => {
|
||||||
|
room.send(app.ui.message_compose.lines().join("\n")).await?;
|
||||||
|
app.ui.message_compose_clear();
|
||||||
|
},
|
||||||
|
None => ()
|
||||||
|
};
|
||||||
|
}
|
||||||
|
_ => { app.ui.message_compose.input(input); }
|
||||||
|
};
|
||||||
|
},
|
||||||
|
ui::MainInputPosition::Rooms => {
|
||||||
|
match input {
|
||||||
|
tui_textarea::Input {key: tui_textarea::Key::Up, ..} => {
|
||||||
|
let i = match app.ui.rooms_state.selected() {
|
||||||
|
Some(i) => {
|
||||||
|
if i > 0 { i - 1 }
|
||||||
|
else { i }
|
||||||
|
},
|
||||||
|
None => 0,
|
||||||
|
};
|
||||||
|
app.ui.rooms_state.select(Some(i));
|
||||||
|
app.status.set_room_by_index(i)?;
|
||||||
|
},
|
||||||
|
tui_textarea::Input {key: tui_textarea::Key::Down, ..} => {
|
||||||
|
let i = match app.ui.rooms_state.selected() {
|
||||||
|
Some(i) => {
|
||||||
|
if i < app.status.rooms().len() { i + 1 }
|
||||||
|
else { i }
|
||||||
|
},
|
||||||
|
None => 0,
|
||||||
|
};
|
||||||
|
app.ui.rooms_state.select(Some(i));
|
||||||
|
app.status.set_room_by_index(i)?;
|
||||||
|
},
|
||||||
|
_ => ()
|
||||||
|
};
|
||||||
|
},
|
||||||
|
ui::MainInputPosition::Messages => {
|
||||||
|
match input {
|
||||||
|
tui_textarea::Input {key: tui_textarea::Key::Up, ..} => {
|
||||||
|
match app.status.room_mut(){
|
||||||
|
Some(room) => {
|
||||||
|
let len = room.timeline().len();
|
||||||
|
let i = match room.view_scroll() {
|
||||||
|
Some(i) => i+1,
|
||||||
|
None => 0,
|
||||||
|
};
|
||||||
|
if i < len {
|
||||||
|
room.set_view_scroll(Some(i))
|
||||||
|
}
|
||||||
|
if i <= len - 5 {
|
||||||
|
room.poll_old_timeline().await?;
|
||||||
|
}
|
||||||
|
},
|
||||||
|
None => (),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
tui_textarea::Input {key: tui_textarea::Key::Down, ..} => {
|
||||||
|
match app.status.room_mut(){
|
||||||
|
Some(room) => {
|
||||||
|
match room.view_scroll() {
|
||||||
|
Some(i) => {
|
||||||
|
if i == 0 {
|
||||||
|
room.set_view_scroll(None);
|
||||||
|
} else {
|
||||||
|
room.set_view_scroll(Some(i - 1));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
None => (),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
None => (),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
_ => ()
|
||||||
|
};
|
||||||
|
},
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
Ok(EventStatus::Ok)
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn handle_setup(&self, app: &mut App<'_>) -> Result<EventStatus> {
|
||||||
|
let ui = match &mut app.ui.setup_ui {
|
||||||
|
Some(ui) => ui,
|
||||||
|
None => return Err(Error::msg("SetupUI instance not found"))
|
||||||
|
};
|
||||||
|
|
||||||
|
if self.input_event.is_some() {
|
||||||
|
match tui_textarea::Input::from(self.input_event.clone().unwrap()) {
|
||||||
|
tui_textarea::Input { key: tui_textarea::Key::Esc, .. } => return Ok(EventStatus::Terminate),
|
||||||
|
tui_textarea::Input {
|
||||||
|
key: tui_textarea::Key::Tab,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
ui.cycle_input_position();
|
||||||
|
},
|
||||||
|
tui_textarea::Input {
|
||||||
|
key: tui_textarea::Key::Enter,
|
||||||
|
..
|
||||||
|
} => {
|
||||||
|
match ui.input_position() {
|
||||||
|
ui::SetupInputPosition::Ok => {
|
||||||
|
let homeserver = ui.homeserver.lines()[0].clone();
|
||||||
|
let username = ui.username.lines()[0].clone();
|
||||||
|
let password = ui.password_data.lines()[0].clone();
|
||||||
|
let login = app.login(&homeserver, &username, &password).await;
|
||||||
|
if login.is_ok() {
|
||||||
|
return Ok(EventStatus::Finished);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => ui.cycle_input_position(),
|
||||||
|
};
|
||||||
|
},
|
||||||
|
input => {
|
||||||
|
match ui.input_position() {
|
||||||
|
ui::SetupInputPosition::Homeserver => { ui.homeserver.input(input); },
|
||||||
|
ui::SetupInputPosition::Username => { ui.username.input(input); },
|
||||||
|
ui::SetupInputPosition::Password => {
|
||||||
|
ui.password_data.input(input.clone());
|
||||||
|
match input.key {
|
||||||
|
tui_textarea::Key::Char(_) => {
|
||||||
|
ui.password.input(tui_textarea::Input { key: tui_textarea::Key::Char('*'), ctrl: false, alt: false });
|
||||||
|
},
|
||||||
|
_ => { ui.password.input(input); },
|
||||||
|
}
|
||||||
|
},
|
||||||
|
_ => (),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
Ok(EventStatus::Ok)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
async fn poll_input_events_stage_2(channel: mpsc::Sender<Event>) -> Result<()> {
|
||||||
|
loop {
|
||||||
|
if crossterm::event::poll(Duration::from_millis(100))? {
|
||||||
|
let event = EventBuilder::default()
|
||||||
|
.input_event(crossterm::event::read()?)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
channel.send(event).await?;
|
||||||
|
} else {
|
||||||
|
tokio::task::yield_now().await;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn poll_input_events(channel: mpsc::Sender<Event>, kill: CancellationToken) -> Result<()> {
|
||||||
|
tokio::select! {
|
||||||
|
output = poll_input_events_stage_2(channel) => output,
|
||||||
|
_ = kill.cancelled() => Err(Error::msg("received kill signal"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
async fn poll_matrix_events_stage_2(channel: mpsc::Sender<Event>, client: Client) -> Result<()> {
|
||||||
|
let sync_settings = SyncSettings::default();
|
||||||
|
// .token(sync_token)
|
||||||
|
// .timeout(Duration::from_secs(30));
|
||||||
|
|
||||||
|
let tx = &channel;
|
||||||
|
|
||||||
|
client.sync_with_callback(sync_settings, |response| async move {
|
||||||
|
let event = EventBuilder::default()
|
||||||
|
.matrix_event(response)
|
||||||
|
.build();
|
||||||
|
|
||||||
|
match tx.send(event).await {
|
||||||
|
Ok(_) => LoopCtrl::Continue,
|
||||||
|
Err(_) => LoopCtrl::Break,
|
||||||
|
}
|
||||||
|
}).await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn poll_matrix_events(channel: mpsc::Sender<Event>, kill: CancellationToken, client: Client) -> Result<()> {
|
||||||
|
tokio::select! {
|
||||||
|
output = poll_matrix_events_stage_2(channel, client) => output,
|
||||||
|
_ = kill.cancelled() => Err(Error::msg("received kill signal")),
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,299 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::{
|
|
||||||
command_interface::{
|
|
||||||
trinitrix::{
|
|
||||||
api::{keymaps::Keymaps, raw::Raw, ui::Ui, Api},
|
|
||||||
Trinitrix,
|
|
||||||
},
|
|
||||||
Commands,
|
|
||||||
},
|
|
||||||
events::EventStatus,
|
|
||||||
status::State,
|
|
||||||
App,
|
|
||||||
},
|
|
||||||
trinitrix::api::ui::Mode,
|
|
||||||
ui::ui_trait::TrinitrixUi,
|
|
||||||
};
|
|
||||||
use anyhow::Result;
|
|
||||||
use cli_log::{info, trace, warn};
|
|
||||||
use crossterm::event::Event;
|
|
||||||
use keymaps::{
|
|
||||||
key_repr::{Key, Keys},
|
|
||||||
trie::Node,
|
|
||||||
};
|
|
||||||
use trixy::oneshot;
|
|
||||||
|
|
||||||
pub async fn handle<U: TrinitrixUi>(
|
|
||||||
app: &mut App<U>,
|
|
||||||
command: &Commands,
|
|
||||||
|
|
||||||
// FIXME(@soispha): The `String` is temporary <2024-05-03>
|
|
||||||
output_callback: Option<oneshot::Sender<String>>,
|
|
||||||
) -> Result<EventStatus> {
|
|
||||||
// A command can both return _status output_ (what you would normally print to stderr)
|
|
||||||
// and _main output_ (the output which is normally printed to stdout).
|
|
||||||
// We simulate these by returning the main output to the Lua function, and printing the
|
|
||||||
// status output to a status UI field.
|
|
||||||
//
|
|
||||||
// Every function should return some status output to show the user, that something is
|
|
||||||
// happening, while only some functions return some value to the main output, as this
|
|
||||||
// is reserved for functions called only for their output (for example `greet()`).
|
|
||||||
macro_rules! send_status_output {
|
|
||||||
($str:expr) => {
|
|
||||||
app.status.add_status_message($str.to_owned())
|
|
||||||
};
|
|
||||||
($str:expr, $($args:ident),+) => {
|
|
||||||
app.status.add_status_message(format!($str, $($args),+))
|
|
||||||
};
|
|
||||||
}
|
|
||||||
macro_rules! send_error_output {
|
|
||||||
($str:expr) => {
|
|
||||||
app.status.add_error_message($str.to_owned())
|
|
||||||
};
|
|
||||||
($str:expr, $($args:ident),+) => {
|
|
||||||
app.status.add_error_message(format!($str, $($args),+))
|
|
||||||
};
|
|
||||||
}
|
|
||||||
// macro_rules! send_main_output {
|
|
||||||
// ($str:expr) => {
|
|
||||||
// if let Some(sender) = output_callback {
|
|
||||||
// sender
|
|
||||||
// .send(CommandTransferValue::from($str))
|
|
||||||
// .map_err(|e| Error::msg(format!("Failed to send command main output: `{}`", e)))?;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// ($str:expr, $($args:ident),+) => {
|
|
||||||
// if let Some(sender) = output_callback {
|
|
||||||
// sender
|
|
||||||
// .send(CommandTransferValue::from(format!($str, $($args),+)))
|
|
||||||
// .map_err(|e| Error::msg(format!("Failed to send command main output: `{}`", e)))?;
|
|
||||||
// }
|
|
||||||
// };
|
|
||||||
// }
|
|
||||||
|
|
||||||
trace!("Handling command: {:#?}", command);
|
|
||||||
|
|
||||||
Ok(match command {
|
|
||||||
Commands::Trinitrix(trinitrix) => match trinitrix {
|
|
||||||
Trinitrix::Stdi(_) => {
|
|
||||||
// No-op I guess
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Trinitrix::Api(api) => match api {
|
|
||||||
Api::exit => {
|
|
||||||
send_status_output!("Terminating the application..");
|
|
||||||
warn!("Terminating the application");
|
|
||||||
EventStatus::Terminate
|
|
||||||
}
|
|
||||||
Api::Ui(ui) => match ui {
|
|
||||||
Ui::set_mode { mode } => match mode {
|
|
||||||
Mode::Normal => {
|
|
||||||
app.status.set_state(State::Normal);
|
|
||||||
send_status_output!("Set input mode to Normal");
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Mode::Insert => {
|
|
||||||
app.status.set_state(State::Insert);
|
|
||||||
send_status_output!("Set input mode to Insert");
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Mode::Command => {
|
|
||||||
app.status.set_state(State::Command);
|
|
||||||
send_status_output!("Set input mode to CLI");
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Ui::cycle_planes => {
|
|
||||||
// TODO(@soispha): add this <2024-05-04>
|
|
||||||
// app.ui.cycle_main_input_position();
|
|
||||||
send_status_output!("Switched main input position");
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Ui::cycle_planes_rev => {
|
|
||||||
// TODO(@soispha): and this <2024-05-04>
|
|
||||||
// app.ui.cycle_main_input_position_rev();
|
|
||||||
send_status_output!("Switched main input position; reversed");
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
},
|
|
||||||
Api::Keymaps(keymaps) => match keymaps {
|
|
||||||
Keymaps::add {
|
|
||||||
mode,
|
|
||||||
key,
|
|
||||||
callback,
|
|
||||||
} => {
|
|
||||||
info!("Will add a keymapping for '{}' in mode '{}'", key, mode);
|
|
||||||
mode.as_str().chars().for_each(|char| {
|
|
||||||
info!("Setting keymaping ('{}') for mode '{}'", key, char);
|
|
||||||
let parsed_keys = key
|
|
||||||
.as_str()
|
|
||||||
.parse::<Keys>()
|
|
||||||
.map_err(|err| {
|
|
||||||
send_error_output!(err.to_string());
|
|
||||||
})
|
|
||||||
.expect("We dealt with the error");
|
|
||||||
|
|
||||||
match State::from_char(&char) {
|
|
||||||
Ok(state) => {
|
|
||||||
info!("Set for state '{}'", state);
|
|
||||||
let trie;
|
|
||||||
if let Some(collected_trie) = app.key_mappings.get_mut(&state) {
|
|
||||||
trie = collected_trie;
|
|
||||||
} else {
|
|
||||||
app.key_mappings.insert(state.clone(), Node::new());
|
|
||||||
trie = app
|
|
||||||
.key_mappings
|
|
||||||
.get_mut(&state)
|
|
||||||
.expect("Should be set");
|
|
||||||
}
|
|
||||||
trie.insert(&parsed_keys, callback.to_owned())
|
|
||||||
.map_err(|err| {
|
|
||||||
send_error_output!(format!("{:#?}", err));
|
|
||||||
})
|
|
||||||
.expect("We already dealt with the error")
|
|
||||||
}
|
|
||||||
Err(err) => send_error_output!(err.to_string()),
|
|
||||||
};
|
|
||||||
});
|
|
||||||
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
// FIXME(@soispha): It would be nice to have these functions, but well..
|
|
||||||
// someone needs to write them <2024-05-03>
|
|
||||||
Keymaps::remove { mode, key } => todo!(),
|
|
||||||
Keymaps::get { mode } => todo!(),
|
|
||||||
},
|
|
||||||
Api::Raw(raw) => match raw {
|
|
||||||
Raw::raise_error { error_message } => {
|
|
||||||
send_error_output!(error_message.to_string());
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Raw::display_output { output_message } => {
|
|
||||||
// TODO(@Soispha): This is only used to show the Lua command output to the user.
|
|
||||||
// Lua commands already receive the output. This should probably be communicated
|
|
||||||
// better, should it?
|
|
||||||
send_status_output!(output_message.to_string());
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Raw::send_input_unprocessed { input } => {
|
|
||||||
let key = Key::from_str(input.as_str())?;
|
|
||||||
|
|
||||||
match app.status.state() {
|
|
||||||
State::Insert | State::Command => {
|
|
||||||
app.ui.input(key);
|
|
||||||
}
|
|
||||||
State::Normal
|
|
||||||
| State::KeyInputPending {
|
|
||||||
old_state: _,
|
|
||||||
pending_keys: _,
|
|
||||||
} => {}
|
|
||||||
}
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
Raw::Private(private) => {
|
|
||||||
// no-op, this was used to store functions (not so sure, if we need it
|
|
||||||
// any longer)
|
|
||||||
EventStatus::Ok
|
|
||||||
}
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
// Command::Print(output) => {
|
|
||||||
// let output_str: String = output.to_string();
|
|
||||||
// send_status_output!(output_str);
|
|
||||||
// EventStatus::Ok
|
|
||||||
// }
|
|
||||||
//
|
|
||||||
// Command::Trinitrix(trinitrix) => match trinitrix {
|
|
||||||
// Trinitrix::Debug(debug) => match debug {
|
|
||||||
// Debug::Greet(msg) => {
|
|
||||||
// send_main_output!("Greeting, {}!", msg);
|
|
||||||
// EventStatus::Ok
|
|
||||||
// }
|
|
||||||
// Debug::GreetMultiple => {
|
|
||||||
// let mut table: Table = HashMap::new();
|
|
||||||
// table.insert("UserId".to_owned(), CommandTransferValue::Integer(2));
|
|
||||||
// table.insert(
|
|
||||||
// "UserName".to_owned(),
|
|
||||||
// CommandTransferValue::String("James".to_owned()),
|
|
||||||
// );
|
|
||||||
//
|
|
||||||
// let mut second_table: Table = HashMap::new();
|
|
||||||
// second_table.insert("interface".to_owned(), CommandTransferValue::Integer(3));
|
|
||||||
// second_table.insert("api".to_owned(), CommandTransferValue::Boolean(true));
|
|
||||||
// table.insert(
|
|
||||||
// "Versions".to_owned(),
|
|
||||||
// CommandTransferValue::Table(second_table),
|
|
||||||
// );
|
|
||||||
// send_main_output!(table);
|
|
||||||
// EventStatus::Ok
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// Trinitrix::Api(api) => match api {
|
|
||||||
// Api::RoomMessageSend(msg) => {
|
|
||||||
// }
|
|
||||||
// Api::Help(_) => todo!(),
|
|
||||||
// Api::Ui(ui) => match ui {
|
|
||||||
// Ui::CommandLineShow => {
|
|
||||||
// }
|
|
||||||
// Ui::CommandLineHide => {
|
|
||||||
// app.ui.cli_disable();
|
|
||||||
// send_status_output!("CLI offline");
|
|
||||||
// EventStatus::Ok
|
|
||||||
// }
|
|
||||||
// Ui::CyclePlanes => {
|
|
||||||
// }
|
|
||||||
// Ui::CyclePlanesRev => {
|
|
||||||
// }
|
|
||||||
// Ui::SetModeNormal => {
|
|
||||||
// }
|
|
||||||
// Ui::SetModeInsert => {
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
// Api::Keymaps(keymaps) => match keymaps {
|
|
||||||
// Keymaps::Add((mode, key, callback)) => {
|
|
||||||
// }
|
|
||||||
// // TODO(@soispha): Well.., we should probably add these functions: <2023-10-15>
|
|
||||||
// Keymaps::Remove((mode, key)) => todo!(),
|
|
||||||
// Keymaps::Get(mode) => todo!(),
|
|
||||||
// },
|
|
||||||
// Api::Raw(raw) => match raw {
|
|
||||||
// Raw::RaiseError(err) => {
|
|
||||||
// }
|
|
||||||
// Raw::DisplayOutput(output) => {
|
|
||||||
// }
|
|
||||||
// Raw::Private(_) => {
|
|
||||||
// }
|
|
||||||
// Raw::SendInputUnprocessed(char) =>
|
|
||||||
// },
|
|
||||||
// },
|
|
||||||
// Trinitrix::Std(_) => {
|
|
||||||
// // no-op, read the comment about it in the `command_list`
|
|
||||||
// EventStatus::Ok
|
|
||||||
// }
|
|
||||||
// },
|
|
||||||
})
|
|
||||||
}
|
|
|
@ -1,34 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// use anyhow::Result;
|
|
||||||
//
|
|
||||||
// use crate::app::{
|
|
||||||
// command_interface::command_transfer_value::support_types::Function, events::EventStatus, App,
|
|
||||||
// };
|
|
||||||
//
|
|
||||||
// // TODO(@soispha): We just assume for now that all functions originate in lua. This module will in
|
|
||||||
// // future versions house check for the language the function came from <2023-10-15>
|
|
||||||
// pub async fn handle(app: &mut App<'_>, function: Function) -> Result<EventStatus> {
|
|
||||||
// app.lua.execute_function(function).await;
|
|
||||||
//
|
|
||||||
// Ok(EventStatus::Ok)
|
|
||||||
// }
|
|
|
@ -1,157 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use anyhow::Result;
|
|
||||||
use cli_log::info;
|
|
||||||
use crossterm::event::Event as CrosstermEvent;
|
|
||||||
use keymaps::key_repr::{Key, Keys};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::{
|
|
||||||
command_interface::{
|
|
||||||
trinitrix::{
|
|
||||||
api::{raw::Raw, Api},
|
|
||||||
Trinitrix,
|
|
||||||
},
|
|
||||||
Commands,
|
|
||||||
},
|
|
||||||
events::{Event, EventStatus},
|
|
||||||
status::State,
|
|
||||||
App,
|
|
||||||
},
|
|
||||||
ui::ui_trait::TrinitrixUi,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub async fn handle<U: TrinitrixUi>(
|
|
||||||
app: &mut App<U>,
|
|
||||||
input_event: &CrosstermEvent,
|
|
||||||
) -> Result<EventStatus> {
|
|
||||||
async fn default<U: TrinitrixUi>(
|
|
||||||
converted_key: Key,
|
|
||||||
app: &mut App<U>,
|
|
||||||
old_state: &State,
|
|
||||||
) -> Result<()> {
|
|
||||||
info!(
|
|
||||||
"No keymaps exist for key ('{}'), passing it along..",
|
|
||||||
converted_key
|
|
||||||
);
|
|
||||||
if let State::KeyInputPending {
|
|
||||||
old_state: _,
|
|
||||||
pending_keys,
|
|
||||||
} = app.status.state().clone()
|
|
||||||
{
|
|
||||||
for key in pending_keys {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Commands::Trinitrix(Trinitrix::Api(Api::Raw(
|
|
||||||
Raw::send_input_unprocessed {
|
|
||||||
input: key.to_string_repr().into(),
|
|
||||||
},
|
|
||||||
))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
app.status.set_state(old_state.to_owned());
|
|
||||||
}
|
|
||||||
// Just let the input event slip through if no keymap matches
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Commands::Trinitrix(Trinitrix::Api(Api::Raw(Raw::send_input_unprocessed {
|
|
||||||
input: converted_key.to_string_repr().into(),
|
|
||||||
}))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
if let CrosstermEvent::Key(_) = input_event {
|
|
||||||
// r
|
|
||||||
// |
|
|
||||||
// a
|
|
||||||
// / \
|
|
||||||
// b a
|
|
||||||
// |
|
|
||||||
// c
|
|
||||||
//
|
|
||||||
//
|
|
||||||
//
|
|
||||||
// r->a->a: Some([a]) -> a.is_child() && a.is_terminal() ? call a : *key input pending*
|
|
||||||
// r->a->b: Some([b]) -> b.is_child() && b.is_terminal() ? *call b* : key input pending
|
|
||||||
// r->a->c: None -> continue
|
|
||||||
// r->a->a->c: Some([c]) -> c.is_child() && c.is_terminal() ? *call c* : key input pending
|
|
||||||
//
|
|
||||||
// r->a: Some([a, b]) -> key input pending
|
|
||||||
|
|
||||||
let converted_key: Key = input_event.try_into()?;
|
|
||||||
info!("Received input to handle: '{}'", converted_key);
|
|
||||||
let mut converted_keys: Keys = Keys::new(converted_key);
|
|
||||||
|
|
||||||
let mut old_state = app.status.state().clone();
|
|
||||||
if let State::KeyInputPending {
|
|
||||||
old_state: old,
|
|
||||||
pending_keys,
|
|
||||||
} = app.status.state().clone()
|
|
||||||
{
|
|
||||||
info!("Found KeyInputPending mode!");
|
|
||||||
old_state = *old;
|
|
||||||
converted_keys = pending_keys.join(converted_key);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(key_maps) = app.key_mappings.get(&old_state) {
|
|
||||||
if let Some((possible_key_maps, should_call)) = key_maps.get(&converted_keys) {
|
|
||||||
info!("possible key maps: {:#?}", possible_key_maps);
|
|
||||||
|
|
||||||
if possible_key_maps.len() == 1 {
|
|
||||||
let possible_key_map = possible_key_maps.get(0).expect("The len is 1");
|
|
||||||
|
|
||||||
if possible_key_map.is_child() && possible_key_map.is_terminal() && should_call
|
|
||||||
{
|
|
||||||
let function = possible_key_map
|
|
||||||
.value()
|
|
||||||
.expect("This node is terminal and a child, it should have a value");
|
|
||||||
|
|
||||||
function();
|
|
||||||
// app.tx.send(Event::Function(*function)).await?;
|
|
||||||
app.status.set_state(old_state.to_owned());
|
|
||||||
} else {
|
|
||||||
// The choice does not have a value attached to it (might be a waypoint)
|
|
||||||
app.status.set_state(State::KeyInputPending {
|
|
||||||
old_state: Box::new(old_state.to_owned()),
|
|
||||||
pending_keys: converted_keys,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
app.status.set_state(State::KeyInputPending {
|
|
||||||
old_state: Box::new(old_state.to_owned()),
|
|
||||||
pending_keys: converted_keys,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
default(converted_key, app, &old_state).await?
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
default(converted_key, app, &old_state).await?
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
|
@ -1,35 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// use anyhow::Result;
|
|
||||||
// use cli_log::trace;
|
|
||||||
//
|
|
||||||
// use crate::app::{events::EventStatus, App};
|
|
||||||
//
|
|
||||||
// // This function is here mainly to reserve this spot for further processing of the lua command.
|
|
||||||
// // TODO(@Soispha): Move the lua executor thread code from app to this module
|
|
||||||
// pub async fn handle(app: &mut App<'_>, command: String) -> Result<EventStatus> {
|
|
||||||
// trace!("Recieved ci command: `{command}`; executing..");
|
|
||||||
//
|
|
||||||
// app.lua.execute_code(command).await;
|
|
||||||
//
|
|
||||||
// Ok(EventStatus::Ok)
|
|
||||||
// }
|
|
|
@ -1,266 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use crossterm::event::{Event as CrosstermEvent, KeyCode, KeyEvent, KeyModifiers};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::{
|
|
||||||
command_interface::{
|
|
||||||
Api::{Exit, RoomMessageSend, Ui},
|
|
||||||
Command,
|
|
||||||
Trinitrix::Api,
|
|
||||||
Ui::{CommandLineShow, CyclePlanes, CyclePlanesRev, SetModeInsert, SetModeNormal},
|
|
||||||
},
|
|
||||||
events::event_types::{Event, EventStatus},
|
|
||||||
App,
|
|
||||||
},
|
|
||||||
ui::central,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub async fn handle_command(
|
|
||||||
app: &mut App<'_>,
|
|
||||||
input_event: &CrosstermEvent,
|
|
||||||
) -> Result<EventStatus> {
|
|
||||||
if let Some(cli) = &app.ui.cli {
|
|
||||||
match input_event {
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Esc, ..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Ui(SetModeNormal))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Enter,
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
let ci_event = cli
|
|
||||||
.lines()
|
|
||||||
.get(0)
|
|
||||||
.expect(
|
|
||||||
"One line always exists,
|
|
||||||
and others can't exists
|
|
||||||
because we collect on
|
|
||||||
enter",
|
|
||||||
)
|
|
||||||
.to_owned();
|
|
||||||
app.tx
|
|
||||||
.send(Event::LuaCommand(ci_event))
|
|
||||||
.await
|
|
||||||
.context("Failed to send lua command to internal event stream")?;
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
app.ui
|
|
||||||
.cli
|
|
||||||
.as_mut()
|
|
||||||
.expect("This is already checked")
|
|
||||||
.input(tui_textarea::Input::from(input_event.to_owned()));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
unreachable!("The cli should not be active while no cli is defined");
|
|
||||||
}
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
||||||
pub async fn handle_normal(app: &mut App<'_>, input_event: &CrosstermEvent) -> Result<EventStatus> {
|
|
||||||
match input_event {
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Char('q'),
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(Command::Trinitrix(Api(Exit)), None))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Tab, ..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Ui(CyclePlanes))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::BackTab,
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Ui(CyclePlanesRev))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Char(':'),
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Ui(CommandLineShow))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Char('i'),
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Ui(SetModeInsert))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
input => match app.ui.input_position() {
|
|
||||||
central::InputPosition::Rooms => {
|
|
||||||
match input {
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Up, ..
|
|
||||||
}) => {
|
|
||||||
let i = match app.ui.rooms_state.selected() {
|
|
||||||
Some(cur) => {
|
|
||||||
if cur > 0 {
|
|
||||||
cur - 1
|
|
||||||
} else {
|
|
||||||
cur
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => 0,
|
|
||||||
};
|
|
||||||
app.ui.rooms_state.select(Some(i));
|
|
||||||
app.status.set_room_by_index(i)?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Down,
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
let i = match app.ui.rooms_state.selected() {
|
|
||||||
Some(cur) => {
|
|
||||||
if cur < app.status.rooms().len() - 1 {
|
|
||||||
cur + 1
|
|
||||||
} else {
|
|
||||||
cur
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => 0,
|
|
||||||
};
|
|
||||||
app.ui.rooms_state.select(Some(i));
|
|
||||||
app.status.set_room_by_index(i)?;
|
|
||||||
}
|
|
||||||
_ => (),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
central::InputPosition::Messages => {
|
|
||||||
match input {
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Up, ..
|
|
||||||
}) => {
|
|
||||||
match app.status.room_mut() {
|
|
||||||
Some(room) => {
|
|
||||||
let len = room.timeline().len();
|
|
||||||
let i = match room.view_scroll() {
|
|
||||||
Some(i) => i + 1,
|
|
||||||
None => 0,
|
|
||||||
};
|
|
||||||
if i < len {
|
|
||||||
room.set_view_scroll(Some(i))
|
|
||||||
}
|
|
||||||
if i <= len - 5 {
|
|
||||||
room.poll_old_timeline().await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => (),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Down,
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
match app.status.room_mut() {
|
|
||||||
Some(room) => {
|
|
||||||
match room.view_scroll() {
|
|
||||||
Some(i) => {
|
|
||||||
if i == 0 {
|
|
||||||
room.set_view_scroll(None);
|
|
||||||
} else {
|
|
||||||
room.set_view_scroll(Some(i - 1));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
None => (),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
None => (),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
_ => (),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
_ => (),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn handle_insert(app: &mut App<'_>, event: &CrosstermEvent) -> Result<EventStatus> {
|
|
||||||
match event {
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Esc, ..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(Ui(SetModeNormal))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
CrosstermEvent::Key(KeyEvent {
|
|
||||||
code: KeyCode::Enter,
|
|
||||||
modifiers: KeyModifiers::ALT,
|
|
||||||
..
|
|
||||||
}) => {
|
|
||||||
app.tx
|
|
||||||
.send(Event::CommandEvent(
|
|
||||||
Command::Trinitrix(Api(RoomMessageSend(
|
|
||||||
app.ui.message_compose.lines().join("\n"),
|
|
||||||
))),
|
|
||||||
None,
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
app.ui.message_compose_clear();
|
|
||||||
}
|
|
||||||
_ => {
|
|
||||||
app.ui
|
|
||||||
.message_compose
|
|
||||||
.input(tui_textarea::Input::from(event.to_owned()));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
|
@ -1,28 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
// input events
|
|
||||||
pub mod input;
|
|
||||||
|
|
||||||
// ci
|
|
||||||
pub mod command;
|
|
||||||
pub mod lua_command;
|
|
||||||
// pub mod function;
|
|
|
@ -1,42 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use crate::app::events::Event;
|
|
||||||
use anyhow::{bail, Result};
|
|
||||||
use tokio::{sync::mpsc, time::Duration};
|
|
||||||
use tokio_util::sync::CancellationToken;
|
|
||||||
|
|
||||||
pub async fn poll(channel: mpsc::Sender<Event>, kill: CancellationToken) -> Result<()> {
|
|
||||||
async fn stage_2(channel: mpsc::Sender<Event>) -> Result<()> {
|
|
||||||
loop {
|
|
||||||
if crossterm::event::poll(Duration::from_millis(100))? {
|
|
||||||
let event = Event::InputEvent(crossterm::event::read()?);
|
|
||||||
channel.send(event).await?;
|
|
||||||
} else {
|
|
||||||
tokio::task::yield_now().await;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
tokio::select! {
|
|
||||||
output = stage_2(channel) => output,
|
|
||||||
_ = kill.cancelled() => bail!("received kill signal")
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,107 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
mod handlers;
|
|
||||||
pub mod listeners;
|
|
||||||
|
|
||||||
use anyhow::{Context, Error, Result};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::{command_interface::Commands, App},
|
|
||||||
ui::ui_trait::TrinitrixUi,
|
|
||||||
};
|
|
||||||
use cli_log::{trace, warn};
|
|
||||||
use crossterm::event::Event as CrosstermEvent;
|
|
||||||
use handlers::{command, input};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum ErrorEvent {
|
|
||||||
CBSCrash(Uuid, Error),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ErrorEvent {
|
|
||||||
pub async fn handle<U: TrinitrixUi>(self, app: &mut App<U>) -> Result<EventStatus> {
|
|
||||||
match self {
|
|
||||||
Self::CBSCrash(cbs, err) => {
|
|
||||||
// TODO: Kill CBS process
|
|
||||||
// TODO: Kill CBS connection threads
|
|
||||||
cli_log::error!("The CBS handler for {cbs} crashed: {err}");
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum Event {
|
|
||||||
InputEvent(CrosstermEvent),
|
|
||||||
CBSPacket(Uuid, triba_packet::Packet),
|
|
||||||
Error(ErrorEvent),
|
|
||||||
|
|
||||||
// FIXME(@soispha): The `String` here is just wrong <2024-05-03>
|
|
||||||
CommandEvent(Commands, Option<trixy::oneshot::Sender<String>>),
|
|
||||||
LuaCommand(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Event {
|
|
||||||
pub async fn handle<U: TrinitrixUi>(self, app: &mut App<U>) -> Result<EventStatus> {
|
|
||||||
trace!("Received event to handle: `{:#?}`", &self);
|
|
||||||
match self {
|
|
||||||
Event::CommandEvent(event, callback_tx) => command::handle(app, &event, callback_tx)
|
|
||||||
.await
|
|
||||||
.with_context(|| format!("Failed to handle command event: `{:#?}`", event)),
|
|
||||||
|
|
||||||
Event::CBSPacket(cbs, packet) => {
|
|
||||||
cli_log::info!("Received packet from cbs {cbs}: {packet:?}");
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
||||||
|
|
||||||
Event::Error(err) => err.handle(app).await,
|
|
||||||
|
|
||||||
Event::LuaCommand(lua_code) => {
|
|
||||||
warn!(
|
|
||||||
"Got lua code to execute, but no exectuter is available:\n{}",
|
|
||||||
lua_code
|
|
||||||
);
|
|
||||||
Ok(EventStatus::Ok)
|
|
||||||
}
|
|
||||||
// lua_command::handle(app, lua_code.to_owned())
|
|
||||||
// .await
|
|
||||||
// .with_context(|| format!("Failed to handle lua code: `{}`", lua_code)),
|
|
||||||
// Event::Function(function) => function::handle(app, function.to_owned())
|
|
||||||
// .await
|
|
||||||
// .with_context(|| format!("Failed to handle function: `{}`", function)),
|
|
||||||
Event::InputEvent(event) => match app.status.state() {
|
|
||||||
_ => input::handle(app, &event).await.with_context(|| {
|
|
||||||
format!("Failed to handle input (non-setup) event: `{:#?}`", event)
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum EventStatus {
|
|
||||||
Ok,
|
|
||||||
Finished,
|
|
||||||
Terminate,
|
|
||||||
}
|
|
249
src/app/mod.rs
249
src/app/mod.rs
|
@ -1,142 +1,175 @@
|
||||||
/*
|
pub mod event;
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pub mod command_interface;
|
|
||||||
pub mod config;
|
|
||||||
pub mod events;
|
|
||||||
pub mod status;
|
pub mod status;
|
||||||
pub mod storage;
|
|
||||||
|
|
||||||
use std::{collections::HashMap, path::PathBuf, sync::OnceLock};
|
use crate::accounts;
|
||||||
|
use crate::ui;
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
use std::path::Path;
|
||||||
use cli_log::{debug, warn};
|
use matrix_sdk::{Client,
|
||||||
use keymaps::trie::Node;
|
room::{Room},
|
||||||
use tokio::sync::mpsc::{self, Sender};
|
config::SyncSettings,
|
||||||
use tokio_util::sync::CancellationToken;
|
ruma::events::room::{
|
||||||
|
member::StrippedRoomMemberEvent,
|
||||||
// use self::command_interface::{
|
message::{MessageType, OriginalSyncRoomMessageEvent, RoomMessageEventContent},
|
||||||
// lua_command_manager::LuaCommandManager,
|
},
|
||||||
// };
|
event_handler::Ctx
|
||||||
|
|
||||||
use crate::app::storage::Storage;
|
|
||||||
use crate::{
|
|
||||||
app::{
|
|
||||||
events::{Event, EventStatus},
|
|
||||||
status::{State, Status},
|
|
||||||
},
|
|
||||||
cbs,
|
|
||||||
ui::ui_trait::TrinitrixUi,
|
|
||||||
};
|
};
|
||||||
|
use accounts::Account;
|
||||||
|
use accounts::AccountsManager;
|
||||||
|
use anyhow::{Result, Error};
|
||||||
|
use cli_log::{error, warn, info};
|
||||||
|
use tokio::{time::{sleep, Duration}, sync::{mpsc, broadcast}};
|
||||||
|
use tokio_util::sync::CancellationToken;
|
||||||
|
use status::{Status, State};
|
||||||
|
|
||||||
pub struct App<U: TrinitrixUi> {
|
|
||||||
ui: U,
|
pub struct App<'a> {
|
||||||
|
ui: ui::UI<'a>,
|
||||||
|
accounts_manager: accounts::AccountsManager,
|
||||||
status: Status,
|
status: Status,
|
||||||
|
|
||||||
cbs_manager: cbs::Manager,
|
channel_tx: mpsc::Sender<event::Event>,
|
||||||
|
channel_rx: mpsc::Receiver<event::Event>,
|
||||||
tx: mpsc::Sender<Event>,
|
|
||||||
rx: mpsc::Receiver<Event>,
|
|
||||||
|
|
||||||
input_listener_killer: CancellationToken,
|
input_listener_killer: CancellationToken,
|
||||||
|
matrix_listener_killer: CancellationToken,
|
||||||
// lua: LuaCommandManager,
|
|
||||||
storage: Storage,
|
|
||||||
|
|
||||||
key_mappings: HashMap<State, Node<extern "C" fn()>>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub static COMMAND_TRANSMITTER: OnceLock<Sender<Event>> = OnceLock::new();
|
impl Drop for App<'_> {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
|
||||||
impl<U: TrinitrixUi> App<U> {
|
}
|
||||||
pub async fn new(ui: U) -> Result<Self> {
|
}
|
||||||
let (tx, rx) = mpsc::channel(256);
|
|
||||||
|
|
||||||
COMMAND_TRANSMITTER
|
impl App<'_> {
|
||||||
.set(tx.clone())
|
pub fn new() -> Self {
|
||||||
.expect("The cell should always be empty at this point");
|
let path:&std::path::Path = Path::new("userdata/accounts.json");
|
||||||
|
let config = if path.exists() {
|
||||||
|
info!("Reading account config (userdata/accounts.json)");
|
||||||
|
Some(std::fs::read_to_string(path).expect("failed to read accounts config"))
|
||||||
|
} else {
|
||||||
|
None
|
||||||
|
};
|
||||||
|
|
||||||
let cbs_manager = cbs::Manager::new(tx.clone()).await;
|
let (channel_tx, channel_rx) = mpsc::channel(256);
|
||||||
cbs_manager.spawn_cbs().await?; // TODO: remove, this is just a dummy - antifallobst <2024-05-21>
|
|
||||||
|
|
||||||
Ok(Self {
|
Self {
|
||||||
ui,
|
ui: ui::UI::new(),
|
||||||
status: Status::new(),
|
accounts_manager: AccountsManager::new(config),
|
||||||
|
status: Status::new(None),
|
||||||
|
|
||||||
cbs_manager,
|
channel_tx,
|
||||||
|
channel_rx,
|
||||||
tx: tx.clone(),
|
|
||||||
rx,
|
|
||||||
input_listener_killer: CancellationToken::new(),
|
input_listener_killer: CancellationToken::new(),
|
||||||
|
matrix_listener_killer: CancellationToken::new(),
|
||||||
// lua: LuaCommandManager::new(tx),
|
}
|
||||||
|
|
||||||
// TODO: We probably want to populate the strings below a bit more <2023-09-09>
|
|
||||||
storage: Storage::new().await?,
|
|
||||||
key_mappings: HashMap::new(),
|
|
||||||
})
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn run(
|
pub async fn run(&mut self) -> Result<()> {
|
||||||
&mut self,
|
|
||||||
cli_lua_config_file: Option<PathBuf>,
|
|
||||||
plugin_path: Option<PathBuf>,
|
|
||||||
) -> Result<()> {
|
|
||||||
// Spawn input event listener
|
// Spawn input event listener
|
||||||
tokio::task::spawn(events::listeners::poll(
|
tokio::task::spawn(event::poll_input_events(self.channel_tx.clone(), self.input_listener_killer.clone()));
|
||||||
self.tx.clone(),
|
|
||||||
self.input_listener_killer.clone(),
|
|
||||||
));
|
|
||||||
|
|
||||||
if let Some(config_file) = cli_lua_config_file {
|
if self.account().is_err() {
|
||||||
config::lua::load(self.tx.clone(), config_file).await?;
|
info!("No saved sessions found -> jumping into setup");
|
||||||
warn!("Loading cli config file, will ignore the default locations");
|
self.setup().await?;
|
||||||
} else {
|
} else {
|
||||||
let config_file =
|
self.accounts_manager.restore().await?;
|
||||||
config::lua::check_for_config_file(self.storage.project_dirs().config_dir())
|
self.init_account().await?;
|
||||||
.await
|
|
||||||
.context("Failed to check for the config file")?;
|
|
||||||
|
|
||||||
if let Some(config) = config_file {
|
|
||||||
config::lua::load(self.tx.clone(), config).await?;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if let Some(plugin) = plugin_path {
|
|
||||||
config::shared_objects::load(plugin.clone())
|
|
||||||
.with_context(|| format!("Failed to load a pluging at '{}'", plugin.display()))?;
|
|
||||||
}
|
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
self.status.set_state(State::Main);
|
||||||
self.ui.update(&self.status).await?;
|
self.ui.update(&self.status).await?;
|
||||||
|
|
||||||
let event = self.rx.recv().await.context("Failed to get next event")?;
|
let event: event::Event = match self.channel_rx.recv().await {
|
||||||
|
Some(e) => e,
|
||||||
|
None => return Err(Error::msg("Event channel has no senders"))
|
||||||
|
};
|
||||||
|
|
||||||
match event.handle(self).await? {
|
match event.handle(self).await? {
|
||||||
EventStatus::Ok => (),
|
event::EventStatus::Ok => (),
|
||||||
EventStatus::Terminate => break,
|
event::EventStatus::Terminate => break,
|
||||||
_ => todo!(),
|
_ => (),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
self.input_listener_killer.cancel();
|
self.input_listener_killer.cancel();
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
async fn setup(&mut self) -> Result<()> {
|
||||||
|
self.ui.setup_ui = Some(ui::SetupUI::new());
|
||||||
|
|
||||||
|
loop {
|
||||||
|
self.status.set_state(State::Setup);
|
||||||
|
self.ui.update_setup().await?;
|
||||||
|
|
||||||
|
let event: event::Event = match self.channel_rx.recv().await {
|
||||||
|
Some(e) => e,
|
||||||
|
None => return Err(Error::msg("Event channel has no senders"))
|
||||||
|
};
|
||||||
|
|
||||||
|
match event.handle(self).await? {
|
||||||
|
event::EventStatus::Ok => (),
|
||||||
|
event::EventStatus::Finished => return Ok(()),
|
||||||
|
event::EventStatus::Terminate => return Err(Error::msg("Terminated by user")),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn init_account(&mut self) -> Result<()> {
|
||||||
|
let client = match self.client() {
|
||||||
|
Some(c) => c,
|
||||||
|
None => return Err(Error::msg("failed to get current client"))
|
||||||
|
}.clone();
|
||||||
|
|
||||||
|
self.matrix_listener_killer.cancel();
|
||||||
|
self.matrix_listener_killer = CancellationToken::new();
|
||||||
|
|
||||||
|
// Spawn Matrix Event Listener
|
||||||
|
tokio::task::spawn(event::poll_matrix_events(self.channel_tx.clone(), self.matrix_listener_killer.clone(), client.clone()));
|
||||||
|
|
||||||
|
// Reset Status
|
||||||
|
self.status = Status::new(Some(client));
|
||||||
|
|
||||||
|
let account = self.account()?;
|
||||||
|
let name = account.name().clone();
|
||||||
|
let user_id = account.user_id().clone();
|
||||||
|
self.status.set_account_name(name);
|
||||||
|
self.status.set_account_user_id(user_id);
|
||||||
|
|
||||||
|
|
||||||
|
for (_, room) in self.status.rooms_mut() {
|
||||||
|
room.update_name().await?;
|
||||||
|
for _ in 0..3 { room.poll_old_timeline().await?; }
|
||||||
|
}
|
||||||
|
|
||||||
|
info!("Initializing client for the current account");
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn switch_account(&mut self, account_id: u32) -> Result<()> {
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn login(&mut self, homeserver: &String, username: &String, password: &String) -> Result<()> {
|
||||||
|
self.accounts_manager.add(homeserver, username, password).await?;
|
||||||
|
self.init_account().await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn account(&self) -> Result<&Account> {
|
||||||
|
let account = self.accounts_manager.current();
|
||||||
|
match account {
|
||||||
|
None => Err(Error::msg("failed to resolve current account")),
|
||||||
|
Some(a) => Ok(a)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn client(&self) -> Option<&Client> {
|
||||||
|
self.accounts_manager.client()
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,128 +1,198 @@
|
||||||
/*
|
use std::any::Any;
|
||||||
* Copyright (C) 2024 - 2024:
|
use indexmap::IndexMap;
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
use matrix_sdk::{Client,
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
ruma::{events::{AnyTimelineEvent,
|
||||||
*
|
room::message::RoomMessageEventContent,
|
||||||
* This file is part of Trinitrix.
|
StateEventType},
|
||||||
*
|
RoomId,
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
TransactionId},
|
||||||
* it under the terms of the GNU General Public License as published
|
room::MessagesOptions};
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
use anyhow::{Result, Error};
|
||||||
* or (at your option) any later version.
|
use cli_log::{error, warn, info};
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use core::fmt;
|
|
||||||
|
|
||||||
use anyhow::{bail, Result};
|
|
||||||
use keymaps::key_repr::Keys;
|
|
||||||
|
|
||||||
#[derive(PartialEq, Eq, PartialOrd, Ord, Hash, Clone, Debug, Default)]
|
|
||||||
pub enum State {
|
pub enum State {
|
||||||
#[default]
|
None,
|
||||||
Normal,
|
Main,
|
||||||
Insert,
|
Setup,
|
||||||
Command,
|
|
||||||
/// Only used internally to signal, that we are waiting on further keyinputs, if multiple
|
|
||||||
/// keymappings have the same prefix
|
|
||||||
KeyInputPending {
|
|
||||||
old_state: Box<State>,
|
|
||||||
pending_keys: Keys,
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl State {
|
pub struct Room {
|
||||||
pub fn from_char(c: &char) -> Result<Self> {
|
matrix_room: matrix_sdk::room::Joined,
|
||||||
Ok(match c {
|
name: String,
|
||||||
'n' => State::Normal,
|
encrypted: bool,
|
||||||
'i' => State::Insert,
|
timeline: Vec<AnyTimelineEvent>,
|
||||||
'c' => State::Command,
|
timeline_end: Option<String>,
|
||||||
_ => bail!(
|
view_scroll: Option<usize>,
|
||||||
"The letter '{}' is either not connected to a state or not yet implemented",
|
|
||||||
c
|
|
||||||
),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct StatusMessage {
|
|
||||||
content: String,
|
|
||||||
is_error: bool,
|
|
||||||
}
|
|
||||||
impl StatusMessage {
|
|
||||||
pub fn content(&self) -> String {
|
|
||||||
self.content.clone()
|
|
||||||
}
|
|
||||||
pub fn is_error(&self) -> bool {
|
|
||||||
self.is_error
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub struct Status {
|
pub struct Status {
|
||||||
state: State,
|
state: State,
|
||||||
|
account_name: String,
|
||||||
|
account_user_id: String,
|
||||||
|
|
||||||
status_messages: Vec<StatusMessage>,
|
client: Option<Client>,
|
||||||
|
rooms: IndexMap<String, Room>,
|
||||||
|
current_room_id: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for State {
|
impl Room {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
pub fn new (matrix_room: matrix_sdk::room::Joined) -> Self {
|
||||||
match self {
|
Self {
|
||||||
Self::Normal => write!(f, "Normal"),
|
matrix_room,
|
||||||
Self::Insert => write!(f, "Insert"),
|
name: "".to_string(),
|
||||||
Self::Command => write!(f, "Command"),
|
encrypted: false,
|
||||||
Self::KeyInputPending {
|
timeline: Vec::new(),
|
||||||
old_state: _,
|
timeline_end: None,
|
||||||
pending_keys: keys,
|
view_scroll: None,
|
||||||
} => write!(f, "Key Input Pending: {}", keys),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn poll_old_timeline(&mut self) -> Result<()> {
|
||||||
|
if let Some(AnyTimelineEvent::State(event)) = &self.timeline.get(0) {
|
||||||
|
if event.event_type() == StateEventType::RoomCreate {
|
||||||
|
return Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut messages_options = MessagesOptions::backward();
|
||||||
|
messages_options = match &self.timeline_end {
|
||||||
|
Some(end) => messages_options.from(end.as_str()),
|
||||||
|
None => messages_options
|
||||||
|
};
|
||||||
|
let events = self.matrix_room.messages(messages_options).await?;
|
||||||
|
self.timeline_end = events.end;
|
||||||
|
|
||||||
|
for event in events.chunk.iter() {
|
||||||
|
self.timeline.insert(0, match event.event.deserialize() {
|
||||||
|
Ok(ev) => ev,
|
||||||
|
Err(err) => {
|
||||||
|
warn!("Failed to deserialize timeline event - {err}");
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn name(&self) -> &String {
|
||||||
|
&self.name
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_name(&mut self) -> Result<()> {
|
||||||
|
self.name = self.matrix_room.display_name().await?.to_string();
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn timeline_add(&mut self, event: AnyTimelineEvent) {
|
||||||
|
self.timeline.push(event);
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn timeline(&self) -> &Vec<AnyTimelineEvent> { &self.timeline }
|
||||||
|
|
||||||
|
pub async fn send(&mut self, message: String) -> Result<()> {
|
||||||
|
let content = RoomMessageEventContent::text_plain(message);
|
||||||
|
let id = TransactionId::new();
|
||||||
|
self.matrix_room.send(content, Some(&id)).await?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn view_scroll(&self) -> Option<usize> {
|
||||||
|
self.view_scroll
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_view_scroll(&mut self, scroll: Option<usize>) {
|
||||||
|
self.view_scroll = scroll;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn encrypted(&self) -> bool {
|
||||||
|
self.matrix_room.is_encrypted()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Status {
|
impl Status {
|
||||||
pub fn new() -> Self {
|
pub fn new(client: Option<Client>) -> Self {
|
||||||
|
let mut rooms = IndexMap::new();
|
||||||
|
if let Some(c) = &client {
|
||||||
|
for r in c.joined_rooms() {
|
||||||
|
rooms.insert(
|
||||||
|
r.room_id().to_string(),
|
||||||
|
Room::new(r.clone()));
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
state: State::default(),
|
state: State::None,
|
||||||
status_messages: vec![StatusMessage {
|
account_name: "".to_string(),
|
||||||
content: "Initialized!".to_owned(),
|
account_user_id: "".to_string(),
|
||||||
is_error: false,
|
client,
|
||||||
}],
|
rooms,
|
||||||
|
current_room_id: "".to_string(),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn add_status_message(&mut self, msg: String) {
|
pub fn account_name(&self) -> &String {
|
||||||
// TODO(@Soispha): This could allocate a lot of ram, when we don't
|
&self.account_name
|
||||||
// add a limit to the messages.
|
|
||||||
// This needs to be proven.
|
|
||||||
self.status_messages.push(StatusMessage {
|
|
||||||
content: msg,
|
|
||||||
is_error: false,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
pub fn add_error_message(&mut self, msg: String) {
|
|
||||||
// TODO(@Soispha): This could allocate a lot of ram, when we don't
|
|
||||||
// add a limit to the messages.
|
|
||||||
// This needs to be proven.
|
|
||||||
self.status_messages.push(StatusMessage {
|
|
||||||
content: msg,
|
|
||||||
is_error: true,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
pub fn status_messages(&self) -> &Vec<StatusMessage> {
|
|
||||||
&self.status_messages
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn set_account_name(&mut self, name: String) {
|
||||||
|
self.account_name = name;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn account_user_id(&self) -> &String {
|
||||||
|
&self.account_user_id
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_account_user_id(&mut self, user_id: String) {
|
||||||
|
self.account_user_id = user_id;
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn room(&self) -> Option<&Room> {
|
||||||
|
self.rooms.get(self.current_room_id.as_str())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn room_mut(&mut self) -> Option<&mut Room> {
|
||||||
|
self.rooms.get_mut(self.current_room_id.as_str())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn rooms(&self) -> &IndexMap<String, Room> {
|
||||||
|
&self.rooms
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn rooms_mut(&mut self) -> &mut IndexMap<String, Room> {
|
||||||
|
&mut self.rooms
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_room(&mut self, room_id: &RoomId) -> Result<()> {
|
||||||
|
if self.rooms.contains_key(room_id.as_str()) {
|
||||||
|
self.current_room_id = room_id.to_string();
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::msg(format!("failed to set room -> invalid room id {}", room_id.to_string())))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn set_room_by_index(&mut self, room_index: usize) -> Result<()> {
|
||||||
|
if let Some((room_id, _)) = self.rooms.get_index(room_index) {
|
||||||
|
self.current_room_id = room_id.clone();
|
||||||
|
Ok(())
|
||||||
|
} else {
|
||||||
|
Err(Error::msg(format!("failed to set room -> invalid room index {}", room_index)))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_room(&self, room_id: &RoomId) -> Option<&Room> {
|
||||||
|
self.rooms.get(room_id.as_str())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn get_room_mut(&mut self, room_id: &RoomId) -> Option<&mut Room> {
|
||||||
|
self.rooms.get_mut(room_id.as_str())
|
||||||
|
}
|
||||||
|
|
||||||
pub fn state(&self) -> &State {
|
pub fn state(&self) -> &State {
|
||||||
&self.state
|
&self.state
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn set_state(&mut self, state: State) {
|
pub fn set_state(&mut self, state: State) {
|
||||||
self.state = state;
|
self.state = state;
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,82 +0,0 @@
|
||||||
use anyhow::Result;
|
|
||||||
use sqlx::{FromRow, SqlitePool};
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::convert::TryInto;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
#[derive(Debug, FromRow)]
|
|
||||||
pub struct RawAccount {
|
|
||||||
id: Vec<u8>,
|
|
||||||
cbs: Vec<u8>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Account {
|
|
||||||
id: Uuid,
|
|
||||||
cbs: Uuid,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Account> for RawAccount {
|
|
||||||
fn from(value: Account) -> Self {
|
|
||||||
Self {
|
|
||||||
id: value.id.into_bytes().to_vec(),
|
|
||||||
cbs: value.cbs.into_bytes().to_vec(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<RawAccount> for Account {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
fn try_from(value: RawAccount) -> std::result::Result<Self, Self::Error> {
|
|
||||||
Ok(Self {
|
|
||||||
id: Uuid::from_slice(value.id.as_slice())?,
|
|
||||||
cbs: Uuid::from_slice(value.cbs.as_slice())?,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Accounts {
|
|
||||||
pool: SqlitePool,
|
|
||||||
accounts: HashMap<Uuid, Account>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Accounts {
|
|
||||||
pub async fn new(pool: SqlitePool) -> Result<Self> {
|
|
||||||
sqlx::query(
|
|
||||||
r#"CREATE TABLE IF NOT EXIST Accounts (
|
|
||||||
id BINARY(16) PRIMARY KEY,
|
|
||||||
cbs BINARY(16)
|
|
||||||
);"#,
|
|
||||||
)
|
|
||||||
.execute(&pool)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let raw_accounts: Vec<RawAccount> = sqlx::query_as(r#"SELECT * FROM Accounts;"#)
|
|
||||||
.fetch_all(&pool)
|
|
||||||
.await?;
|
|
||||||
let mut accounts = HashMap::new();
|
|
||||||
for account in raw_accounts {
|
|
||||||
let account: Account = account.try_into()?;
|
|
||||||
accounts.insert(account.id, account);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self { pool, accounts })
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn add(&mut self, id: Uuid, cbs: Uuid) -> Result<()> {
|
|
||||||
let account = Account { id, cbs };
|
|
||||||
|
|
||||||
self.accounts.insert(id, account.clone());
|
|
||||||
|
|
||||||
let raw: RawAccount = account.into();
|
|
||||||
|
|
||||||
sqlx::query(r#"INSERT INTO Accounts VALUES ?, ?;"#)
|
|
||||||
.bind(raw.id)
|
|
||||||
.bind(raw.cbs)
|
|
||||||
.execute(&self.pool)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,76 +0,0 @@
|
||||||
use anyhow::Result;
|
|
||||||
use sqlx::{FromRow, SqlitePool};
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use std::convert::TryInto;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
#[derive(Debug, FromRow)]
|
|
||||||
pub struct RawBackend {
|
|
||||||
id: Vec<u8>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct Backend {
|
|
||||||
id: Uuid,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Backend> for RawBackend {
|
|
||||||
fn from(value: Backend) -> Self {
|
|
||||||
Self {
|
|
||||||
id: value.id.into_bytes().to_vec(),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TryFrom<RawBackend> for Backend {
|
|
||||||
type Error = anyhow::Error;
|
|
||||||
fn try_from(value: RawBackend) -> std::result::Result<Self, Self::Error> {
|
|
||||||
Ok(Self {
|
|
||||||
id: Uuid::from_slice(value.id.as_slice())?,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct Backends {
|
|
||||||
pool: SqlitePool,
|
|
||||||
backends: HashMap<Uuid, Backend>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Backends {
|
|
||||||
pub async fn new(pool: SqlitePool) -> Result<Self> {
|
|
||||||
sqlx::query(
|
|
||||||
r#"CREATE TABLE IF NOT EXIST Backends (
|
|
||||||
id BINARY(16) PRIMARY KEY
|
|
||||||
);"#,
|
|
||||||
)
|
|
||||||
.execute(&pool)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let raw_backends: Vec<RawBackend> = sqlx::query_as(r#"SELECT * FROM Backends;"#)
|
|
||||||
.fetch_all(&pool)
|
|
||||||
.await?;
|
|
||||||
let mut backends = HashMap::new();
|
|
||||||
for backend in raw_backends {
|
|
||||||
let backend: Backend = backend.try_into()?;
|
|
||||||
backends.insert(backend.id, backend);
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self { pool, backends })
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn add(&mut self, id: Uuid) -> Result<()> {
|
|
||||||
let backend = Backend { id };
|
|
||||||
|
|
||||||
self.backends.insert(id, backend.clone());
|
|
||||||
|
|
||||||
let raw: RawBackend = backend.into();
|
|
||||||
|
|
||||||
sqlx::query(r#"INSERT INTO Backends VALUES ?;"#)
|
|
||||||
.bind(raw.id)
|
|
||||||
.execute(&self.pool)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,54 +0,0 @@
|
||||||
mod accounts;
|
|
||||||
mod backends;
|
|
||||||
|
|
||||||
pub use accounts::{Account, Accounts};
|
|
||||||
pub use backends::{Backend, Backends};
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use directories::ProjectDirs;
|
|
||||||
use sqlx::SqlitePool;
|
|
||||||
|
|
||||||
const DATABASE_NAME: &str = "storage.sqlite";
|
|
||||||
const PROJECT_DIRS: (&str, &str, &str) = ("", "", "trinitrix");
|
|
||||||
|
|
||||||
pub struct Storage {
|
|
||||||
project_dirs: ProjectDirs,
|
|
||||||
accounts: Accounts,
|
|
||||||
backends: Backends,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Storage {
|
|
||||||
pub async fn new() -> Result<Self> {
|
|
||||||
let project_dirs = ProjectDirs::from("", "", "trinitrix").context(
|
|
||||||
"Failed to allocate project directory paths, please ensure your $HOME is set correctly",
|
|
||||||
)?;
|
|
||||||
|
|
||||||
let pool = SqlitePool::connect(&format!(
|
|
||||||
"sqlite:{}/{}",
|
|
||||||
project_dirs.data_dir().to_string_lossy(),
|
|
||||||
DATABASE_NAME
|
|
||||||
))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let accounts = Accounts::new(pool.clone()).await?;
|
|
||||||
let backends = Backends::new(pool).await?;
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
project_dirs,
|
|
||||||
accounts,
|
|
||||||
backends,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn project_dirs(&self) -> &ProjectDirs {
|
|
||||||
&self.project_dirs
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn accounts(&self) -> &Accounts {
|
|
||||||
&self.accounts
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn backends(&self) -> &Backends {
|
|
||||||
&self.backends
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,25 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
fn main() {
|
|
||||||
let output = include_str!(concat!(env!("OUT_DIR"), "/api.rs"));
|
|
||||||
println!("{}", output);
|
|
||||||
}
|
|
|
@ -1,206 +0,0 @@
|
||||||
use crate::app::events::{ErrorEvent as AppErrorEvent, Event as AppEvent};
|
|
||||||
|
|
||||||
use aes_gcm_siv::{Aes256GcmSiv, Nonce};
|
|
||||||
use anyhow::{anyhow, Context, Result};
|
|
||||||
use interprocess::local_socket::tokio::{RecvHalf, SendHalf};
|
|
||||||
use tokio::sync::mpsc;
|
|
||||||
use tokio_util::sync::CancellationToken;
|
|
||||||
use triba_packet::{IdPool, Packet, Request, Response};
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
enum Event {
|
|
||||||
ToCBSReq(Request),
|
|
||||||
ToCBSResp(Response, u64),
|
|
||||||
FromCBS(Packet),
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Connection {
|
|
||||||
tx: mpsc::UnboundedSender<Event>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Connection {
|
|
||||||
pub async fn send_request(&self, body: Request) -> Result<()> {
|
|
||||||
self.tx.send(Event::ToCBSReq(body))?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn send_response(&self, body: Response, receiver: u64) -> Result<()> {
|
|
||||||
self.tx.send(Event::ToCBSResp(body, receiver))?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct UnstableConnection {
|
|
||||||
kill_token: CancellationToken,
|
|
||||||
id: Uuid,
|
|
||||||
main_tx: mpsc::Sender<AppEvent>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl UnstableConnection {
|
|
||||||
pub fn new(kill_token: CancellationToken, id: Uuid, main_tx: mpsc::Sender<AppEvent>) -> Self {
|
|
||||||
Self {
|
|
||||||
kill_token,
|
|
||||||
id,
|
|
||||||
main_tx,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn stabilize(
|
|
||||||
&self,
|
|
||||||
cipher: Aes256GcmSiv,
|
|
||||||
nonce: Nonce,
|
|
||||||
mut sock_rx: RecvHalf,
|
|
||||||
mut sock_tx: SendHalf,
|
|
||||||
) -> Result<Connection> {
|
|
||||||
let (tx, mut rx) = mpsc::unbounded_channel();
|
|
||||||
|
|
||||||
let mut id_pool = IdPool::new();
|
|
||||||
|
|
||||||
let packet = Packet::recv(&mut sock_rx, &cipher, &nonce).await?;
|
|
||||||
match packet {
|
|
||||||
Packet::Request { id, body } => {
|
|
||||||
match body {
|
|
||||||
Request::HandshakeUpgradeConnection => {
|
|
||||||
Packet::response(id_pool.acquire(), id, Response::Success)
|
|
||||||
.send(&mut sock_tx, &cipher, &nonce)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
cli_log::info!(
|
|
||||||
"CBS {id}: upgraded connection to encrypted messagepack",
|
|
||||||
id = self.id
|
|
||||||
);
|
|
||||||
}
|
|
||||||
req => return Err(anyhow!(
|
|
||||||
"expected cbs to send: Request::HandshakeUpgradeConnection, but got: Request::{req}"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
body => {
|
|
||||||
return Err(anyhow!(
|
|
||||||
"expected cbs to send: Request::HandshakeUpgradeConnection, but got: {body}"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Packet::request(id_pool.acquire(), Request::HandshakeSuccess)
|
|
||||||
.send(&mut sock_tx, &cipher, &nonce)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
match Packet::recv(&mut sock_rx, &cipher, &nonce).await? {
|
|
||||||
Packet::Response { body, .. } => match body {
|
|
||||||
Response::Success => {}
|
|
||||||
req => {
|
|
||||||
return Err(anyhow!(
|
|
||||||
"expected cbs to send: Response::Success, but got: Request::{req}"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
},
|
|
||||||
body => {
|
|
||||||
return Err(anyhow!(
|
|
||||||
"expected cbs to send: Request::Success, but got: {body}"
|
|
||||||
))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Poll packets from socket
|
|
||||||
{
|
|
||||||
let cipher = cipher.clone();
|
|
||||||
let nonce = nonce.clone();
|
|
||||||
let tx = tx.clone();
|
|
||||||
|
|
||||||
let id = self.id.clone();
|
|
||||||
let main_tx = self.main_tx.clone();
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
|
||||||
match poll_from_socket(&mut sock_rx, &cipher, &nonce, tx).await {
|
|
||||||
Err(e) => main_tx
|
|
||||||
.send(AppEvent::Error(AppErrorEvent::CBSCrash(id, e)))
|
|
||||||
.await
|
|
||||||
.expect("Failed to propagate error back to main queue."),
|
|
||||||
Ok(_) => (),
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle and route all packets
|
|
||||||
{
|
|
||||||
let cipher = cipher.clone();
|
|
||||||
let nonce = nonce.clone();
|
|
||||||
let kill_token = self.kill_token.clone();
|
|
||||||
let main_tx = self.main_tx.clone();
|
|
||||||
let id = self.id.clone();
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
|
||||||
match route_packets(
|
|
||||||
rx,
|
|
||||||
kill_token,
|
|
||||||
id_pool,
|
|
||||||
&mut sock_tx,
|
|
||||||
&cipher,
|
|
||||||
&nonce,
|
|
||||||
main_tx.clone(),
|
|
||||||
id,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
Err(e) => main_tx
|
|
||||||
.send(AppEvent::Error(AppErrorEvent::CBSCrash(id, e)))
|
|
||||||
.await
|
|
||||||
.expect("Failed to propagate error back to main queue."),
|
|
||||||
Ok(_) => (),
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Connection { tx })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn poll_from_socket(
|
|
||||||
rx: &mut RecvHalf,
|
|
||||||
cipher: &Aes256GcmSiv,
|
|
||||||
nonce: &Nonce,
|
|
||||||
tx: mpsc::UnboundedSender<Event>,
|
|
||||||
) -> Result<()> {
|
|
||||||
loop {
|
|
||||||
let packet = Packet::recv(rx, cipher, nonce).await?;
|
|
||||||
tx.send(Event::FromCBS(packet))?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn route_packets(
|
|
||||||
mut rx: mpsc::UnboundedReceiver<Event>,
|
|
||||||
kill_token: CancellationToken,
|
|
||||||
mut id_pool: IdPool,
|
|
||||||
sock_tx: &mut SendHalf,
|
|
||||||
cipher: &Aes256GcmSiv,
|
|
||||||
nonce: &Nonce,
|
|
||||||
main_tx: mpsc::Sender<AppEvent>,
|
|
||||||
id: Uuid,
|
|
||||||
) -> Result<()> {
|
|
||||||
loop {
|
|
||||||
let event = tokio::select! {
|
|
||||||
event = rx.recv() => event.context("The cbs event queue was closed unexpectedly.")?,
|
|
||||||
_ = kill_token.cancelled() => break,
|
|
||||||
};
|
|
||||||
|
|
||||||
match event {
|
|
||||||
Event::ToCBSReq(req) => {
|
|
||||||
Packet::request(id_pool.acquire(), req)
|
|
||||||
.send(sock_tx, cipher, nonce)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
Event::ToCBSResp(resp, req) => {
|
|
||||||
Packet::response(id_pool.acquire(), req, resp)
|
|
||||||
.send(sock_tx, cipher, nonce)
|
|
||||||
.await?;
|
|
||||||
}
|
|
||||||
Event::FromCBS(packet) => {
|
|
||||||
main_tx
|
|
||||||
.send(AppEvent::CBSPacket(id.clone(), packet))
|
|
||||||
.await?
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
|
@ -1,10 +0,0 @@
|
||||||
use interprocess::local_socket::Name;
|
|
||||||
use uuid::Uuid;
|
|
||||||
|
|
||||||
pub async fn cbs(sock_name: Name<'_>, id: Uuid) {
|
|
||||||
let (session, rx) = triba::Session::new(id, sock_name).await.unwrap();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
tokio::task::yield_now().await;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,195 +0,0 @@
|
||||||
use super::{Connection, UnstableConnection};
|
|
||||||
use crate::app::events::Event as AppEvent;
|
|
||||||
|
|
||||||
use aes_gcm_siv::{Aes256GcmSiv, KeyInit, Nonce};
|
|
||||||
use anyhow::{anyhow, Result};
|
|
||||||
use interprocess::local_socket::{
|
|
||||||
self,
|
|
||||||
tokio::{prelude::*, Stream},
|
|
||||||
GenericFilePath, GenericNamespaced, ListenerOptions,
|
|
||||||
};
|
|
||||||
use rand::{
|
|
||||||
distributions::Alphanumeric,
|
|
||||||
{thread_rng, Rng},
|
|
||||||
};
|
|
||||||
use std::collections::HashMap;
|
|
||||||
use tokio::{
|
|
||||||
io::{AsyncReadExt, AsyncWriteExt, BufReader},
|
|
||||||
sync::{mpsc, oneshot},
|
|
||||||
};
|
|
||||||
use tokio_util::sync::CancellationToken;
|
|
||||||
use triba_packet::{Request, Response};
|
|
||||||
use uuid::Uuid;
|
|
||||||
use x25519_dalek::{EphemeralSecret, PublicKey};
|
|
||||||
|
|
||||||
enum Event {
|
|
||||||
IncomingConnection(Stream),
|
|
||||||
SpawnCBS(oneshot::Sender<Result<Uuid>>),
|
|
||||||
SendRequest(Uuid, Request),
|
|
||||||
SendResponse(Uuid, Response, u64),
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn poll_socket(
|
|
||||||
sock_name: local_socket::Name<'_>,
|
|
||||||
tx: mpsc::UnboundedSender<Event>,
|
|
||||||
) -> Result<()> {
|
|
||||||
let listener = ListenerOptions::new()
|
|
||||||
.name(sock_name)
|
|
||||||
.create_tokio()
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
let stream = listener.accept().await?;
|
|
||||||
tx.send(Event::IncomingConnection(stream)).unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn handle_incoming(
|
|
||||||
stream: Stream,
|
|
||||||
connections: &mut HashMap<Uuid, (UnstableConnection, oneshot::Sender<Result<Uuid>>)>,
|
|
||||||
) -> Result<(Uuid, Connection)> {
|
|
||||||
let (raw_rx, mut tx) = stream.split();
|
|
||||||
let mut rx = BufReader::new(&raw_rx);
|
|
||||||
|
|
||||||
let id = {
|
|
||||||
let mut buffer = [0u8; 16];
|
|
||||||
rx.read(&mut buffer).await?;
|
|
||||||
Uuid::from_bytes(buffer)
|
|
||||||
};
|
|
||||||
|
|
||||||
cli_log::info!("Received CBS connection with id: {id}");
|
|
||||||
|
|
||||||
let conn = match connections.get(&id) {
|
|
||||||
Some((conn, _)) => conn,
|
|
||||||
None => {
|
|
||||||
return Err(anyhow!("The CBS id {id} is unknown."));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
let dh_own_secret = EphemeralSecret::random_from_rng(thread_rng());
|
|
||||||
let dh_own_public = PublicKey::from(&dh_own_secret);
|
|
||||||
|
|
||||||
tx.write(dh_own_public.as_bytes()).await?;
|
|
||||||
|
|
||||||
let dh_cbs_public = {
|
|
||||||
let mut buffer = [0u8; 32];
|
|
||||||
rx.read(&mut buffer).await?;
|
|
||||||
PublicKey::from(buffer)
|
|
||||||
};
|
|
||||||
|
|
||||||
let shared_secret = dh_own_secret.diffie_hellman(&dh_cbs_public);
|
|
||||||
|
|
||||||
let nonce = Nonce::from(rand::random::<[u8; 12]>());
|
|
||||||
tx.write(nonce.as_slice()).await?;
|
|
||||||
|
|
||||||
let cipher = Aes256GcmSiv::new(shared_secret.as_bytes().into());
|
|
||||||
|
|
||||||
let conn = conn.stabilize(cipher, nonce, raw_rx, tx).await?;
|
|
||||||
|
|
||||||
Ok((id, conn))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Manager {
|
|
||||||
tx: mpsc::UnboundedSender<Event>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Manager {
|
|
||||||
pub async fn new(main_tx: mpsc::Sender<AppEvent>) -> Self {
|
|
||||||
let (tx, mut rx) = mpsc::unbounded_channel();
|
|
||||||
|
|
||||||
let sock_name = {
|
|
||||||
let suffix = thread_rng()
|
|
||||||
.sample_iter(&Alphanumeric)
|
|
||||||
.take(30)
|
|
||||||
.map(char::from)
|
|
||||||
.collect::<String>();
|
|
||||||
|
|
||||||
if GenericNamespaced::is_supported() {
|
|
||||||
format!("example_{suffix}.sock")
|
|
||||||
.to_ns_name::<GenericNamespaced>()
|
|
||||||
.unwrap()
|
|
||||||
} else {
|
|
||||||
format!("/tmp/example_{suffix}.sock")
|
|
||||||
.to_fs_name::<GenericFilePath>()
|
|
||||||
.unwrap()
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
// Start socket connection listener
|
|
||||||
tokio::spawn(poll_socket(sock_name.clone(), tx.clone()));
|
|
||||||
|
|
||||||
tokio::spawn(async move {
|
|
||||||
let mut unstable_connections: HashMap<
|
|
||||||
Uuid,
|
|
||||||
(UnstableConnection, oneshot::Sender<Result<Uuid>>),
|
|
||||||
> = HashMap::new();
|
|
||||||
let mut connections: HashMap<Uuid, Connection> = HashMap::new();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
match rx.recv().await.unwrap() {
|
|
||||||
Event::IncomingConnection(stream) => {
|
|
||||||
match handle_incoming(stream, &mut unstable_connections).await {
|
|
||||||
Ok((id, conn)) => {
|
|
||||||
let (_, tx) = unstable_connections.remove(&id).unwrap();
|
|
||||||
connections.insert(id, conn);
|
|
||||||
|
|
||||||
tx.send(Ok(id)).unwrap();
|
|
||||||
cli_log::info!("CBS {id}: Connection stabilized.")
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
cli_log::error!("Handshake failed: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Event::SpawnCBS(tx) => {
|
|
||||||
let id = Uuid::new_v4();
|
|
||||||
unstable_connections.insert(
|
|
||||||
id,
|
|
||||||
(
|
|
||||||
UnstableConnection::new(
|
|
||||||
CancellationToken::new(),
|
|
||||||
id,
|
|
||||||
main_tx.clone(),
|
|
||||||
),
|
|
||||||
tx,
|
|
||||||
),
|
|
||||||
);
|
|
||||||
|
|
||||||
cli_log::info!("Spawned CBS with ID: {id}");
|
|
||||||
|
|
||||||
// Start dummy cbs
|
|
||||||
let sock_name = sock_name.clone();
|
|
||||||
tokio::spawn(super::dummy::cbs(sock_name.clone(), id));
|
|
||||||
}
|
|
||||||
Event::SendRequest(id, body) => {
|
|
||||||
let conn = connections.get(&id).unwrap();
|
|
||||||
conn.send_request(body).await.unwrap();
|
|
||||||
}
|
|
||||||
Event::SendResponse(id, body, req) => {
|
|
||||||
let conn = connections.get(&id).unwrap();
|
|
||||||
conn.send_response(body, req).await.unwrap();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
Self { tx }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn spawn_cbs(&self) -> Result<Uuid> {
|
|
||||||
let (tx, rx) = oneshot::channel();
|
|
||||||
|
|
||||||
self.tx.send(Event::SpawnCBS(tx))?;
|
|
||||||
rx.await?
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn send_request(&self, cbs: Uuid, body: Request) -> Result<()> {
|
|
||||||
self.tx.send(Event::SendRequest(cbs, body))?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn send_response(&self, cbs: Uuid, body: Response, receiver: u64) -> Result<()> {
|
|
||||||
self.tx.send(Event::SendResponse(cbs, body, receiver))?;
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,9 +0,0 @@
|
||||||
pub mod connection;
|
|
||||||
mod dummy;
|
|
||||||
pub mod manager;
|
|
||||||
|
|
||||||
// TODO: This whole module uses hell a lot of unwraps,
|
|
||||||
// which need to be replaced by proper error handling. - antifallobst 2024-05-14
|
|
||||||
|
|
||||||
pub use connection::{Connection, UnstableConnection};
|
|
||||||
pub use manager::Manager;
|
|
48
src/cli.rs
48
src/cli.rs
|
@ -1,48 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::path::PathBuf;
|
|
||||||
|
|
||||||
use clap::{Parser, Subcommand};
|
|
||||||
|
|
||||||
/// A multi protocol chat client
|
|
||||||
#[derive(Parser, Debug)]
|
|
||||||
#[command(author, version, about, long_about = None, arg_required_else_help(true))]
|
|
||||||
pub struct Args {
|
|
||||||
#[command(subcommand)]
|
|
||||||
/// The subcommand to execute, default is help
|
|
||||||
pub subcommand: Command,
|
|
||||||
|
|
||||||
// #[arg(long, short)]
|
|
||||||
// /// Path to the Lua config file, executed instead of the normal one
|
|
||||||
// pub lua_config_file: Option<PathBuf>,
|
|
||||||
#[arg(long, short)]
|
|
||||||
/// Path to a plugin to load. It must be a shared-object (.so)
|
|
||||||
pub plugin_path: Option<PathBuf>,
|
|
||||||
}
|
|
||||||
#[derive(Subcommand, Debug)]
|
|
||||||
pub enum Command {
|
|
||||||
/// Starts a TUI client
|
|
||||||
Tui {},
|
|
||||||
|
|
||||||
/// Starts a repl to the trinitry cli interpreter
|
|
||||||
Repl {},
|
|
||||||
}
|
|
54
src/main.rs
54
src/main.rs
|
@ -1,59 +1,15 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
mod app;
|
|
||||||
mod cbs;
|
|
||||||
mod cli;
|
|
||||||
mod ui;
|
mod ui;
|
||||||
|
mod accounts;
|
||||||
|
mod app;
|
||||||
|
|
||||||
use anyhow::Context;
|
use cli_log::{error, warn, info};
|
||||||
use clap::Parser;
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
cli::{Args, Command},
|
|
||||||
ui::{repl::Repl, tui::Tui},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() -> anyhow::Result<()> {
|
async fn main() -> anyhow::Result<()> {
|
||||||
cli_log::init_cli_log!();
|
cli_log::init_cli_log!();
|
||||||
|
|
||||||
let args = Args::parse();
|
let mut app = app::App::new();
|
||||||
match args.subcommand {
|
app.run().await?;
|
||||||
Command::Tui {} => {
|
|
||||||
let mut app = app::App::new(Tui::new().context("Failed to setup tui")?).await?;
|
|
||||||
|
|
||||||
// NOTE(@soispha): The `None` here is temporary <2024-05-08>
|
|
||||||
app.run(None, args.plugin_path).await?;
|
|
||||||
}
|
|
||||||
Command::Repl {} => {
|
|
||||||
let mut app = app::App::new(Repl::new().context("Failed to setup repl")?).await?;
|
|
||||||
|
|
||||||
// NOTE(@soispha): The `None` here is temporary <2024-05-03>
|
|
||||||
app.run(None, args.plugin_path).await?;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
// FIXME(@soispha): Re-exports for trixy, this should be configurable <2024-05-03>
|
|
||||||
pub use crate::app::command_interface::*;
|
|
||||||
|
|
461
src/ui/mod.rs
461
src/ui/mod.rs
|
@ -1,24 +1,439 @@
|
||||||
/*
|
use crate::app::status::Status;
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pub mod repl;
|
use std::cmp;
|
||||||
pub mod tui;
|
use crossterm::{
|
||||||
pub mod ui_trait;
|
event::{self, DisableMouseCapture, EnableMouseCapture, Event, read},
|
||||||
|
execute,
|
||||||
|
terminal::{disable_raw_mode, enable_raw_mode, EnterAlternateScreen, LeaveAlternateScreen},
|
||||||
|
style::{style},
|
||||||
|
};
|
||||||
|
use anyhow::{Error, Result};
|
||||||
|
use std::io::Stdout;
|
||||||
|
use std::io;
|
||||||
|
use tui::{backend::CrosstermBackend, layout::{Constraint, Direction, Layout}, widgets::{Block, Borders, Widget}, Terminal, Frame};
|
||||||
|
use tui::layout::{Alignment, Corner};
|
||||||
|
use tui::style::{Color, Modifier, Style};
|
||||||
|
use tui::text::{Spans, Span, Text};
|
||||||
|
use tui::widgets::{List, ListItem, ListState, Paragraph, Wrap};
|
||||||
|
use tui_textarea::{Input, Key, TextArea};
|
||||||
|
use cli_log::{error, warn, info};
|
||||||
|
use matrix_sdk::{room::MessagesOptions, ruma::events::{AnyTimelineEvent, AnyMessageLikeEvent}};
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
pub enum SetupInputPosition {
|
||||||
|
Homeserver,
|
||||||
|
Username,
|
||||||
|
Password,
|
||||||
|
Ok
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(Clone, Copy)]
|
||||||
|
pub enum MainInputPosition {
|
||||||
|
Status,
|
||||||
|
Rooms,
|
||||||
|
Messages,
|
||||||
|
MessageCompose,
|
||||||
|
RoomInfo
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct SetupUI<'a> {
|
||||||
|
input_position: SetupInputPosition,
|
||||||
|
|
||||||
|
pub homeserver: TextArea<'a>,
|
||||||
|
pub username: TextArea<'a>,
|
||||||
|
pub password: TextArea<'a>,
|
||||||
|
pub password_data: TextArea<'a>,
|
||||||
|
}
|
||||||
|
|
||||||
|
pub struct UI<'a> {
|
||||||
|
terminal: Terminal<CrosstermBackend<Stdout>>,
|
||||||
|
input_position: MainInputPosition,
|
||||||
|
pub rooms_state: ListState,
|
||||||
|
pub message_compose: TextArea<'a>,
|
||||||
|
|
||||||
|
pub setup_ui: Option<SetupUI<'a>>,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
fn terminal_prepare() -> Result<Stdout> {
|
||||||
|
enable_raw_mode()?;
|
||||||
|
let mut stdout = io::stdout();
|
||||||
|
execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
|
||||||
|
info!("Prepared terminal");
|
||||||
|
Ok(stdout)
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn textarea_activate(textarea: &mut TextArea) {
|
||||||
|
textarea.set_cursor_line_style(Style::default().add_modifier(Modifier::UNDERLINED));
|
||||||
|
textarea.set_cursor_style(Style::default().add_modifier(Modifier::REVERSED));
|
||||||
|
let b = textarea
|
||||||
|
.block()
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or_else(|| Block::default().borders(Borders::ALL));
|
||||||
|
textarea.set_block(b.style(Style::default()));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn textarea_inactivate(textarea: &mut TextArea) {
|
||||||
|
textarea.set_cursor_line_style(Style::default());
|
||||||
|
textarea.set_cursor_style(Style::default());
|
||||||
|
let b = textarea
|
||||||
|
.block()
|
||||||
|
.cloned()
|
||||||
|
.unwrap_or_else(|| Block::default().borders(Borders::ALL));
|
||||||
|
textarea.set_block(
|
||||||
|
b.style(Style::default().fg(Color::DarkGray))
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Drop for UI<'_> {
|
||||||
|
fn drop(&mut self) {
|
||||||
|
info!("Destructing UI");
|
||||||
|
disable_raw_mode().expect("While destructing UI -> Failed to disable raw mode");
|
||||||
|
execute!(
|
||||||
|
self.terminal.backend_mut(),
|
||||||
|
LeaveAlternateScreen,
|
||||||
|
DisableMouseCapture
|
||||||
|
).expect("While destructing UI -> Failed execute backend commands (LeaveAlternateScreen and DisableMouseCapture)");
|
||||||
|
self.terminal.show_cursor().expect("While destructing UI -> Failed to re-enable cursor");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl SetupUI<'_> {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
let mut homeserver = TextArea::new(vec!["https://matrix.org".to_string()]);
|
||||||
|
let mut username = TextArea::default();
|
||||||
|
let mut password = TextArea::default();
|
||||||
|
let mut password_data = TextArea::default();
|
||||||
|
|
||||||
|
homeserver.set_block(
|
||||||
|
Block::default()
|
||||||
|
.title("Homeserver")
|
||||||
|
.borders(Borders::ALL));
|
||||||
|
username.set_block(
|
||||||
|
Block::default()
|
||||||
|
.title("Username")
|
||||||
|
.borders(Borders::ALL));
|
||||||
|
password.set_block(
|
||||||
|
Block::default()
|
||||||
|
.title("Password")
|
||||||
|
.borders(Borders::ALL));
|
||||||
|
|
||||||
|
textarea_activate(&mut homeserver);
|
||||||
|
textarea_inactivate(&mut username);
|
||||||
|
textarea_inactivate(&mut password);
|
||||||
|
|
||||||
|
Self {
|
||||||
|
input_position: SetupInputPosition::Homeserver,
|
||||||
|
homeserver,
|
||||||
|
username,
|
||||||
|
password,
|
||||||
|
password_data,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn cycle_input_position(&mut self) {
|
||||||
|
self.input_position = match self.input_position {
|
||||||
|
SetupInputPosition::Homeserver => {
|
||||||
|
textarea_inactivate(&mut self.homeserver);
|
||||||
|
textarea_activate(&mut self.username);
|
||||||
|
textarea_inactivate(&mut self.password);
|
||||||
|
SetupInputPosition::Username
|
||||||
|
},
|
||||||
|
SetupInputPosition::Username => {
|
||||||
|
textarea_inactivate(&mut self.homeserver);
|
||||||
|
textarea_inactivate(&mut self.username);
|
||||||
|
textarea_activate(&mut self.password);
|
||||||
|
SetupInputPosition::Password
|
||||||
|
},
|
||||||
|
SetupInputPosition::Password => {
|
||||||
|
textarea_inactivate(&mut self.homeserver);
|
||||||
|
textarea_inactivate(&mut self.username);
|
||||||
|
textarea_inactivate(&mut self.password);
|
||||||
|
SetupInputPosition::Ok
|
||||||
|
},
|
||||||
|
SetupInputPosition::Ok => {
|
||||||
|
textarea_activate(&mut self.homeserver);
|
||||||
|
textarea_inactivate(&mut self.username);
|
||||||
|
textarea_inactivate(&mut self.password);
|
||||||
|
SetupInputPosition::Homeserver
|
||||||
|
},
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn input_position(&self) -> &SetupInputPosition { &self.input_position }
|
||||||
|
|
||||||
|
pub async fn update(&'_ mut self, terminal: &mut Terminal<CrosstermBackend<Stdout>>) -> Result<()> {
|
||||||
|
let mut strings: Vec<String> = Vec::new();
|
||||||
|
strings.resize(3, "".to_string());
|
||||||
|
|
||||||
|
let content_ok = match self.input_position {
|
||||||
|
SetupInputPosition:: Ok => Span::styled("OK", Style::default().add_modifier(Modifier::UNDERLINED)),
|
||||||
|
_ => Span::styled("OK", Style::default().fg(Color::DarkGray)),
|
||||||
|
};
|
||||||
|
|
||||||
|
let block = Block::default()
|
||||||
|
.title("Login")
|
||||||
|
.borders(Borders::ALL);
|
||||||
|
|
||||||
|
let mut ok = Paragraph::new(content_ok)
|
||||||
|
.alignment(Alignment::Center);
|
||||||
|
|
||||||
|
|
||||||
|
// define a 32 * 6 chunk in the middle of the screen
|
||||||
|
let mut chunk = terminal.size()?;
|
||||||
|
chunk.x = (chunk.width / 2) - 16;
|
||||||
|
chunk.y = (chunk.height / 2) - 5;
|
||||||
|
chunk.height = 12;
|
||||||
|
chunk.width = 32;
|
||||||
|
|
||||||
|
let mut split_chunk = chunk.clone();
|
||||||
|
split_chunk.x += 1;
|
||||||
|
split_chunk.y += 1;
|
||||||
|
split_chunk.height -= 1;
|
||||||
|
split_chunk.width -= 2;
|
||||||
|
|
||||||
|
let chunks = Layout::default()
|
||||||
|
.direction(Direction::Vertical)
|
||||||
|
.constraints([
|
||||||
|
Constraint::Length(3), // 0. Homserver:
|
||||||
|
Constraint::Length(3), // 1. Username:
|
||||||
|
Constraint::Length(3), // 2. Password:
|
||||||
|
Constraint::Length(1) // 3. OK
|
||||||
|
].as_ref())
|
||||||
|
.split(split_chunk);
|
||||||
|
|
||||||
|
terminal.draw(|frame| {
|
||||||
|
frame.render_widget(block.clone(), chunk);
|
||||||
|
frame.render_widget(self.homeserver.widget(), chunks[0]);
|
||||||
|
frame.render_widget(self.username.widget(), chunks[1]);
|
||||||
|
frame.render_widget(self.password.widget(), chunks[2]);
|
||||||
|
frame.render_widget(ok.clone(), chunks[3]);
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl UI<'_> {
|
||||||
|
pub fn new() -> Self {
|
||||||
|
let stdout = terminal_prepare().expect("failed to prepare terminal");
|
||||||
|
let backend = CrosstermBackend::new(stdout);
|
||||||
|
let mut terminal = Terminal::new(backend).expect("failed to initialize terminal");
|
||||||
|
|
||||||
|
terminal.clear().expect("failed to clear screen");
|
||||||
|
|
||||||
|
let mut message_compose = TextArea::default();
|
||||||
|
message_compose.set_block(
|
||||||
|
Block::default()
|
||||||
|
.title("Message Compose (send: <Alt>+<Enter>)")
|
||||||
|
.borders(Borders::ALL));
|
||||||
|
|
||||||
|
info!("Initialized UI");
|
||||||
|
|
||||||
|
Self {
|
||||||
|
terminal,
|
||||||
|
input_position: MainInputPosition::Rooms,
|
||||||
|
rooms_state: ListState::default(),
|
||||||
|
message_compose,
|
||||||
|
setup_ui: None
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn cycle_main_input_position(&mut self) {
|
||||||
|
self.input_position = match self.input_position {
|
||||||
|
MainInputPosition::Status => MainInputPosition::Rooms,
|
||||||
|
MainInputPosition::Rooms => MainInputPosition::Messages,
|
||||||
|
MainInputPosition::Messages => MainInputPosition::MessageCompose,
|
||||||
|
MainInputPosition::MessageCompose => MainInputPosition::RoomInfo,
|
||||||
|
MainInputPosition::RoomInfo => MainInputPosition::Status,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn input_position(&self) -> &MainInputPosition { &self.input_position }
|
||||||
|
|
||||||
|
pub fn message_compose_clear(&mut self) {
|
||||||
|
self.message_compose = TextArea::default();
|
||||||
|
self.message_compose.set_block(
|
||||||
|
Block::default()
|
||||||
|
.title("Message Compose (send: <Alt>+<Enter>)")
|
||||||
|
.borders(Borders::ALL));
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update(&mut self, status: &Status) -> Result<()> {
|
||||||
|
let chunk = self.terminal.size()?;
|
||||||
|
|
||||||
|
let main_chunks = Layout::default()
|
||||||
|
.direction(Direction::Horizontal)
|
||||||
|
.constraints([Constraint::Length(32), Constraint::Min(16), Constraint::Length(32)].as_ref())
|
||||||
|
.split(chunk);
|
||||||
|
|
||||||
|
let left_chunks = Layout::default()
|
||||||
|
.direction(Direction::Vertical)
|
||||||
|
.constraints([Constraint::Length(5), Constraint::Min(4)].as_ref())
|
||||||
|
.split(main_chunks[0]);
|
||||||
|
|
||||||
|
let middle_chunks = Layout::default()
|
||||||
|
.direction(Direction::Vertical)
|
||||||
|
.constraints([Constraint::Min(4), Constraint::Length(cmp::min(2 + self.message_compose.lines().len() as u16, 8))].as_ref())
|
||||||
|
.split(main_chunks[1]);
|
||||||
|
|
||||||
|
let right_chunks = Layout::default()
|
||||||
|
.direction(Direction::Vertical)
|
||||||
|
.constraints([Constraint::Min(4)].as_ref())
|
||||||
|
.split(main_chunks[2]);
|
||||||
|
|
||||||
|
let mut status_content = Text::styled(status.account_name(), Style::default().add_modifier(Modifier::BOLD));
|
||||||
|
status_content.extend(Text::styled(status.account_user_id(), Style::default()));
|
||||||
|
status_content.extend(Text::styled("settings", Style::default().fg(Color::LightMagenta).add_modifier(Modifier::ITALIC | Modifier::UNDERLINED)));
|
||||||
|
|
||||||
|
let rooms_content = status.rooms()
|
||||||
|
.iter()
|
||||||
|
.map(|(_, room)| {
|
||||||
|
ListItem::new(Span::styled(room.name(), Style::default()))
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>();
|
||||||
|
|
||||||
|
let messages_content = match status.room() {
|
||||||
|
Some(r) => {
|
||||||
|
r.timeline()
|
||||||
|
.iter()
|
||||||
|
.rev()
|
||||||
|
.map(|event| {
|
||||||
|
match event {
|
||||||
|
|
||||||
|
// Message Like Events
|
||||||
|
AnyTimelineEvent::MessageLike(message_like_event) => {
|
||||||
|
let (content, color) = match &message_like_event {
|
||||||
|
AnyMessageLikeEvent::RoomMessage(room_message_event) => {
|
||||||
|
let message_content = &room_message_event
|
||||||
|
.as_original()
|
||||||
|
.unwrap()
|
||||||
|
.content
|
||||||
|
.body();
|
||||||
|
|
||||||
|
(message_content.to_string(), Color::White)
|
||||||
|
},
|
||||||
|
_ => ("~~~ not supported message like event ~~~".to_string(), Color::Red)
|
||||||
|
};
|
||||||
|
let mut text = Text::styled(message_like_event.sender().to_string(),
|
||||||
|
Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD));
|
||||||
|
text.extend(Text::styled(content.to_string(),
|
||||||
|
Style::default().fg(color)));
|
||||||
|
ListItem::new(text)
|
||||||
|
},
|
||||||
|
|
||||||
|
// State Events
|
||||||
|
AnyTimelineEvent::State(state) => {
|
||||||
|
ListItem::new(vec![Spans::from(vec![
|
||||||
|
Span::styled(state.sender().to_string(), Style::default().fg(Color::DarkGray)),
|
||||||
|
Span::styled(": ", Style::default().fg(Color::DarkGray)),
|
||||||
|
Span::styled(state.event_type().to_string(), Style::default().fg(Color::DarkGray))
|
||||||
|
])])
|
||||||
|
}
|
||||||
|
}
|
||||||
|
})
|
||||||
|
.collect::<Vec<_>>()
|
||||||
|
},
|
||||||
|
None => {
|
||||||
|
vec![ListItem::new(Text::styled("No room selected!", Style::default().fg(Color::Red)))]
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
let mut messages_state = ListState::default();
|
||||||
|
let mut room_info_content = Text::default();
|
||||||
|
|
||||||
|
if let Some(room) = status.room() {
|
||||||
|
messages_state.select(room.view_scroll());
|
||||||
|
|
||||||
|
room_info_content.extend(Text::styled(room.name(), Style::default().fg(Color::Cyan)));
|
||||||
|
if room.encrypted() {
|
||||||
|
room_info_content.extend(Text::styled("Encrypted", Style::default().fg(Color::Green)));
|
||||||
|
} else {
|
||||||
|
room_info_content.extend(Text::styled("Not Encrypted!", Style::default().fg(Color::Red)));
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
room_info_content.extend(Text::styled("No room selected!", Style::default().fg(Color::Red)));
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
// calculate to widgets colors, based of which widget is currently selected
|
||||||
|
let colors = match self.input_position {
|
||||||
|
MainInputPosition::Status => {
|
||||||
|
textarea_inactivate(&mut self.message_compose);
|
||||||
|
vec![Color::White, Color::DarkGray, Color::DarkGray, Color::DarkGray, Color::DarkGray]
|
||||||
|
},
|
||||||
|
MainInputPosition::Rooms => {
|
||||||
|
textarea_inactivate(&mut self.message_compose);
|
||||||
|
vec![Color::DarkGray, Color::White, Color::DarkGray, Color::DarkGray, Color::DarkGray]
|
||||||
|
},
|
||||||
|
MainInputPosition::Messages => {
|
||||||
|
textarea_inactivate(&mut self.message_compose);
|
||||||
|
vec![Color::DarkGray, Color::DarkGray, Color::White, Color::DarkGray, Color::DarkGray]
|
||||||
|
},
|
||||||
|
MainInputPosition::MessageCompose => {
|
||||||
|
textarea_activate(&mut self.message_compose);
|
||||||
|
vec![Color::DarkGray, Color::DarkGray, Color::DarkGray, Color::DarkGray, Color::DarkGray]
|
||||||
|
},
|
||||||
|
MainInputPosition::RoomInfo => {
|
||||||
|
textarea_inactivate(&mut self.message_compose);
|
||||||
|
vec![Color::DarkGray, Color::DarkGray, Color::DarkGray, Color::DarkGray, Color::White]
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
|
// initiate the widgets
|
||||||
|
let status_panel = Paragraph::new(status_content)
|
||||||
|
.block(Block::default()
|
||||||
|
.title("Status")
|
||||||
|
.borders(Borders::ALL)
|
||||||
|
.style(Style::default().fg(colors[MainInputPosition::Status as usize])))
|
||||||
|
.alignment(Alignment::Left);
|
||||||
|
|
||||||
|
let rooms_panel = List::new(rooms_content)
|
||||||
|
.block(Block::default()
|
||||||
|
.title("Rooms (navigate: arrow keys)")
|
||||||
|
.borders(Borders::ALL)
|
||||||
|
.style(Style::default().fg(colors[MainInputPosition::Rooms as usize])))
|
||||||
|
.style(Style::default().fg(Color::DarkGray))
|
||||||
|
.highlight_style(Style::default().fg(Color::Cyan).add_modifier(Modifier::BOLD))
|
||||||
|
.highlight_symbol(">");
|
||||||
|
|
||||||
|
let messages_panel = List::new(messages_content)
|
||||||
|
.block(Block::default()
|
||||||
|
.title("Messages")
|
||||||
|
.borders(Borders::ALL)
|
||||||
|
.style(Style::default().fg(colors[MainInputPosition::Messages as usize])))
|
||||||
|
.start_corner(Corner::BottomLeft)
|
||||||
|
.highlight_symbol(">")
|
||||||
|
.highlight_style(Style::default().fg(Color::LightMagenta).add_modifier(Modifier::BOLD));
|
||||||
|
|
||||||
|
let room_info_panel = Paragraph::new(room_info_content)
|
||||||
|
.block(Block::default()
|
||||||
|
.title("Room Info")
|
||||||
|
.borders(Borders::ALL)
|
||||||
|
.style(Style::default().fg(colors[MainInputPosition::RoomInfo as usize])))
|
||||||
|
.alignment(Alignment::Center);
|
||||||
|
|
||||||
|
|
||||||
|
// render the widgets
|
||||||
|
self.terminal.draw(|frame| {
|
||||||
|
frame.render_widget(status_panel, left_chunks[0]);
|
||||||
|
frame.render_stateful_widget(rooms_panel, left_chunks[1], &mut self.rooms_state);
|
||||||
|
frame.render_stateful_widget(messages_panel, middle_chunks[0], & mut messages_state);
|
||||||
|
frame.render_widget(self.message_compose.widget(), middle_chunks[1]);
|
||||||
|
frame.render_widget(room_info_panel, right_chunks[0]);
|
||||||
|
})?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub async fn update_setup(&mut self) -> Result<()> {
|
||||||
|
let ui = match &mut self.setup_ui {
|
||||||
|
Some(c) => c,
|
||||||
|
None => return Err(Error::msg("SetupUI instance not found")),
|
||||||
|
};
|
||||||
|
|
||||||
|
ui.update(&mut self.terminal).await?;
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -1,153 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::io::{self, Stdout, Write};
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use cli_log::{debug, info};
|
|
||||||
use crossterm::{
|
|
||||||
execute,
|
|
||||||
terminal::{disable_raw_mode, enable_raw_mode, EnableLineWrap},
|
|
||||||
};
|
|
||||||
use keymaps::key_repr::{Key, KeyValue};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::status::{State, Status},
|
|
||||||
ui::ui_trait::TrinitrixUi,
|
|
||||||
};
|
|
||||||
|
|
||||||
pub struct Repl {
|
|
||||||
current_written_buffer: String,
|
|
||||||
current_input: String,
|
|
||||||
enter_new_line: bool,
|
|
||||||
stdout: Stdout,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Repl {
|
|
||||||
pub fn new() -> Result<Self> {
|
|
||||||
enable_raw_mode().context("Failed to enable raw mode")?;
|
|
||||||
let mut stdout = io::stdout();
|
|
||||||
|
|
||||||
write!(
|
|
||||||
stdout,
|
|
||||||
"Welcome to the Trinitrix repl! You can now enter trinitry commands."
|
|
||||||
)?;
|
|
||||||
write!(stdout, "\n\r{}", Self::prompt(&Status::new()))?;
|
|
||||||
stdout.flush()?;
|
|
||||||
|
|
||||||
Ok(Repl {
|
|
||||||
current_written_buffer: String::new(),
|
|
||||||
current_input: String::new(),
|
|
||||||
enter_new_line: false,
|
|
||||||
stdout,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
pub fn prompt(status: &Status) -> String {
|
|
||||||
format!("{}> ", status.state())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for Repl {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
disable_raw_mode().expect("Must work in drop");
|
|
||||||
execute!(io::stdout(), EnableLineWrap).expect("Must also work");
|
|
||||||
|
|
||||||
writeln!(self.stdout, "\n\rBye!").expect("Must also work");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl TrinitrixUi for Repl {
|
|
||||||
async fn update(&mut self, status: &Status) -> Result<()> {
|
|
||||||
if self.enter_new_line {
|
|
||||||
info!("Got '{}' from user in repl.", self.current_written_buffer);
|
|
||||||
|
|
||||||
if status.state() == &State::Command {
|
|
||||||
write!(
|
|
||||||
self.stdout,
|
|
||||||
"\n\rEvaluating: '{}' ..",
|
|
||||||
self.current_written_buffer
|
|
||||||
)?;
|
|
||||||
} else {
|
|
||||||
write!(
|
|
||||||
self.stdout,
|
|
||||||
"\n\rCan't insert anything in the repl besides in command mode!",
|
|
||||||
)?;
|
|
||||||
}
|
|
||||||
|
|
||||||
self.enter_new_line = false;
|
|
||||||
self.current_written_buffer.clear();
|
|
||||||
|
|
||||||
write!(self.stdout, "\n\r{}", Self::prompt(status))?;
|
|
||||||
} else {
|
|
||||||
write!(
|
|
||||||
self.stdout,
|
|
||||||
"\r{}{}{}",
|
|
||||||
Self::prompt(status),
|
|
||||||
self.current_written_buffer,
|
|
||||||
self.current_input
|
|
||||||
)?;
|
|
||||||
|
|
||||||
self.current_written_buffer += self.current_input.as_str();
|
|
||||||
self.current_input.clear();
|
|
||||||
}
|
|
||||||
self.stdout.flush()?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn input(&mut self, input: Key) {
|
|
||||||
debug!("Input received at repl: {}", input);
|
|
||||||
|
|
||||||
if let Some(value) = input.value() {
|
|
||||||
match value {
|
|
||||||
KeyValue::Backspace => {
|
|
||||||
self.current_written_buffer.pop();
|
|
||||||
}
|
|
||||||
KeyValue::Enter => self.enter_new_line = true,
|
|
||||||
KeyValue::Left => todo!(),
|
|
||||||
KeyValue::Right => todo!(),
|
|
||||||
KeyValue::Up => todo!(),
|
|
||||||
KeyValue::Down => todo!(),
|
|
||||||
KeyValue::Home => todo!(),
|
|
||||||
KeyValue::End => todo!(),
|
|
||||||
KeyValue::PageUp => todo!(),
|
|
||||||
KeyValue::PageDown => todo!(),
|
|
||||||
KeyValue::Tab => todo!(),
|
|
||||||
KeyValue::BackTab => todo!(),
|
|
||||||
KeyValue::Delete => todo!(),
|
|
||||||
KeyValue::Insert => todo!(),
|
|
||||||
KeyValue::F(_) => todo!(),
|
|
||||||
KeyValue::Char(ch) => self.current_input.push(*ch),
|
|
||||||
KeyValue::Null => todo!(),
|
|
||||||
KeyValue::Esc => todo!(),
|
|
||||||
KeyValue::CapsLock => todo!(),
|
|
||||||
KeyValue::ScrollLock => todo!(),
|
|
||||||
KeyValue::NumLock => todo!(),
|
|
||||||
KeyValue::PrintScreen => todo!(),
|
|
||||||
KeyValue::Pause => todo!(),
|
|
||||||
KeyValue::Menu => todo!(),
|
|
||||||
KeyValue::KeypadBegin => todo!(),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
info!("User wrote: '{}'", input.to_string_repr());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,290 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pub mod trinitrixui;
|
|
||||||
pub mod utils;
|
|
||||||
|
|
||||||
use std::io::Stdout;
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use cli_log::{info, warn};
|
|
||||||
use crossterm::{
|
|
||||||
event::DisableMouseCapture,
|
|
||||||
execute,
|
|
||||||
terminal::{disable_raw_mode, LeaveAlternateScreen},
|
|
||||||
};
|
|
||||||
use ratatui::{
|
|
||||||
backend::CrosstermBackend,
|
|
||||||
style::Color,
|
|
||||||
widgets::{Block, Borders, ListState},
|
|
||||||
Terminal,
|
|
||||||
};
|
|
||||||
use tui_textarea::TextArea;
|
|
||||||
|
|
||||||
use crate::ui::{
|
|
||||||
tui::utils::{terminal_prepare, textarea_activate, textarea_inactivate},
|
|
||||||
ui_trait::TrinitrixUi,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Clone, Copy, PartialEq)]
|
|
||||||
pub enum InputPosition {
|
|
||||||
Status,
|
|
||||||
Rooms,
|
|
||||||
Messages,
|
|
||||||
MessageCompose,
|
|
||||||
CommandMonitor,
|
|
||||||
RoomInfo,
|
|
||||||
CLI,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl InputPosition {
|
|
||||||
// calculate to widgets colors, based of which widget is currently selected
|
|
||||||
pub fn colors(
|
|
||||||
&self,
|
|
||||||
mut cli: &mut Option<TextArea<'_>>,
|
|
||||||
mut message_compose: &mut TextArea<'_>,
|
|
||||||
) -> Vec<Color> {
|
|
||||||
match self {
|
|
||||||
InputPosition::Status => {
|
|
||||||
textarea_inactivate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_inactivate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::White,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
InputPosition::Rooms => {
|
|
||||||
textarea_inactivate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_inactivate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::White,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
InputPosition::Messages => {
|
|
||||||
textarea_inactivate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_inactivate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::White,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
InputPosition::MessageCompose => {
|
|
||||||
textarea_activate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_inactivate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
InputPosition::RoomInfo => {
|
|
||||||
textarea_inactivate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_inactivate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::White,
|
|
||||||
Color::DarkGray,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
InputPosition::CLI => {
|
|
||||||
textarea_inactivate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_activate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
InputPosition::CommandMonitor => {
|
|
||||||
textarea_inactivate(&mut message_compose);
|
|
||||||
if let Some(cli) = &mut cli {
|
|
||||||
textarea_inactivate(cli);
|
|
||||||
}
|
|
||||||
vec![
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::DarkGray,
|
|
||||||
Color::White,
|
|
||||||
]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Tui<'a> {
|
|
||||||
terminal: Terminal<CrosstermBackend<Stdout>>,
|
|
||||||
input_position: InputPosition,
|
|
||||||
pub rooms_state: ListState,
|
|
||||||
pub message_compose: TextArea<'a>,
|
|
||||||
pub cli: Option<TextArea<'a>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Drop for Tui<'_> {
|
|
||||||
fn drop(&mut self) {
|
|
||||||
info!("Destructing UI");
|
|
||||||
disable_raw_mode().expect("While destructing UI -> Failed to disable raw mode");
|
|
||||||
execute!(
|
|
||||||
self.terminal.backend_mut(),
|
|
||||||
LeaveAlternateScreen,
|
|
||||||
DisableMouseCapture
|
|
||||||
).expect("While destructing UI -> Failed execute backend commands (LeaveAlternateScreen and DisableMouseCapture)");
|
|
||||||
self.terminal
|
|
||||||
.show_cursor()
|
|
||||||
.expect("While destructing UI -> Failed to re-enable cursor");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Tui<'_> {
|
|
||||||
pub fn new() -> Result<Self> {
|
|
||||||
let stdout = terminal_prepare().context("Falied to prepare terminal")?;
|
|
||||||
let backend = CrosstermBackend::new(stdout);
|
|
||||||
let mut terminal = Terminal::new(backend)?;
|
|
||||||
|
|
||||||
terminal.clear()?;
|
|
||||||
|
|
||||||
let mut message_compose = TextArea::default();
|
|
||||||
message_compose.set_block(
|
|
||||||
Block::default()
|
|
||||||
.title("Message Compose (send: <Alt>+<Enter>)")
|
|
||||||
.borders(Borders::ALL),
|
|
||||||
);
|
|
||||||
|
|
||||||
info!("Initialized UI");
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
terminal,
|
|
||||||
input_position: InputPosition::Rooms,
|
|
||||||
rooms_state: ListState::default(),
|
|
||||||
message_compose,
|
|
||||||
cli: None,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn cycle_main_input_position(&mut self) {
|
|
||||||
self.input_position = match self.input_position {
|
|
||||||
InputPosition::Status => InputPosition::Rooms,
|
|
||||||
InputPosition::Rooms => InputPosition::Messages,
|
|
||||||
InputPosition::Messages => InputPosition::MessageCompose,
|
|
||||||
InputPosition::MessageCompose => InputPosition::CommandMonitor,
|
|
||||||
InputPosition::CommandMonitor => InputPosition::RoomInfo,
|
|
||||||
InputPosition::RoomInfo => match self.cli {
|
|
||||||
Some(_) => InputPosition::CLI,
|
|
||||||
None => InputPosition::Status,
|
|
||||||
},
|
|
||||||
InputPosition::CLI => InputPosition::Status,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn cycle_main_input_position_rev(&mut self) {
|
|
||||||
self.input_position = match self.input_position {
|
|
||||||
InputPosition::Status => match self.cli {
|
|
||||||
Some(_) => InputPosition::CLI,
|
|
||||||
None => InputPosition::RoomInfo,
|
|
||||||
},
|
|
||||||
InputPosition::Rooms => InputPosition::Status,
|
|
||||||
InputPosition::Messages => InputPosition::Rooms,
|
|
||||||
InputPosition::MessageCompose => InputPosition::Messages,
|
|
||||||
InputPosition::RoomInfo => InputPosition::CommandMonitor,
|
|
||||||
InputPosition::CommandMonitor => InputPosition::MessageCompose,
|
|
||||||
InputPosition::CLI => InputPosition::RoomInfo,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn set_input_position(&mut self, position: InputPosition) {
|
|
||||||
self.input_position = position;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn input_position(&self) -> &InputPosition {
|
|
||||||
&self.input_position
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn message_compose_clear(&mut self) {
|
|
||||||
self.message_compose = TextArea::default();
|
|
||||||
self.message_compose.set_block(
|
|
||||||
Block::default()
|
|
||||||
.title("Message Compose (send: <Alt>+<Enter>)")
|
|
||||||
.borders(Borders::ALL),
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn set_command_output(&mut self, output: &str) {
|
|
||||||
info!("Setting output to: `{}`", output);
|
|
||||||
if let Some(_) = self.cli {
|
|
||||||
let cli = Some(TextArea::from([output]));
|
|
||||||
self.cli = cli;
|
|
||||||
} else {
|
|
||||||
warn!("Failed to set output");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn cli_enable(&mut self) {
|
|
||||||
self.input_position = InputPosition::CLI;
|
|
||||||
if self.cli.is_some() {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
let mut cli = TextArea::default();
|
|
||||||
cli.set_block(Block::default().borders(Borders::ALL));
|
|
||||||
self.cli = Some(cli);
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn cli_disable(&mut self) {
|
|
||||||
if self.input_position == InputPosition::CLI {
|
|
||||||
self.cycle_main_input_position();
|
|
||||||
}
|
|
||||||
self.cli = None;
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,154 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::cmp;
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
app::status::Status,
|
|
||||||
ui::{
|
|
||||||
tui::{trinitrixui::widgets::command_monitor, Tui},
|
|
||||||
ui_trait::TrinitrixUi,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
use anyhow::Result;
|
|
||||||
use cli_log::{debug, info};
|
|
||||||
use keymaps::key_repr::{Key, KeyValue};
|
|
||||||
use ratatui::{
|
|
||||||
layout::{Constraint, Direction, Layout},
|
|
||||||
style::{Color, Style},
|
|
||||||
widgets::{Block, Borders, Paragraph},
|
|
||||||
};
|
|
||||||
|
|
||||||
pub mod widgets;
|
|
||||||
|
|
||||||
impl<'r> TrinitrixUi for Tui<'r> {
|
|
||||||
async fn update(&mut self, status: &Status) -> Result<()> {
|
|
||||||
let chunks = Layout::default()
|
|
||||||
.direction(Direction::Vertical)
|
|
||||||
.constraints([Constraint::Min(10), Constraint::Length(3)].as_ref())
|
|
||||||
.split(self.terminal.size()?);
|
|
||||||
|
|
||||||
let bottom_chunks = Layout::default()
|
|
||||||
.direction(Direction::Horizontal)
|
|
||||||
.constraints(
|
|
||||||
[
|
|
||||||
Constraint::Length((status.state().to_string().len() + 2) as u16),
|
|
||||||
Constraint::Min(16),
|
|
||||||
]
|
|
||||||
.as_ref(),
|
|
||||||
)
|
|
||||||
.split(chunks[1]);
|
|
||||||
|
|
||||||
let main_chunks = Layout::default()
|
|
||||||
.direction(Direction::Horizontal)
|
|
||||||
.constraints(
|
|
||||||
[
|
|
||||||
Constraint::Length(32),
|
|
||||||
Constraint::Min(16),
|
|
||||||
Constraint::Length(32),
|
|
||||||
]
|
|
||||||
.as_ref(),
|
|
||||||
)
|
|
||||||
.split(chunks[0]);
|
|
||||||
|
|
||||||
let _left_chunks = Layout::default()
|
|
||||||
.direction(Direction::Vertical)
|
|
||||||
.constraints([Constraint::Length(5), Constraint::Min(4)].as_ref())
|
|
||||||
.split(main_chunks[0]);
|
|
||||||
|
|
||||||
let middle_chunks = Layout::default()
|
|
||||||
.direction(Direction::Vertical)
|
|
||||||
.constraints(
|
|
||||||
[
|
|
||||||
Constraint::Min(4),
|
|
||||||
Constraint::Length(cmp::min(2 + self.message_compose.lines().len() as u16, 8)),
|
|
||||||
]
|
|
||||||
.as_ref(),
|
|
||||||
)
|
|
||||||
.split(main_chunks[1]);
|
|
||||||
|
|
||||||
let right_chunks = Layout::default()
|
|
||||||
.direction(Direction::Vertical)
|
|
||||||
.constraints([Constraint::Length(5), Constraint::Min(4)].as_ref())
|
|
||||||
.split(main_chunks[2]);
|
|
||||||
|
|
||||||
let colors = self
|
|
||||||
.input_position
|
|
||||||
.colors(&mut self.cli, &mut self.message_compose);
|
|
||||||
|
|
||||||
// initiate the widgets
|
|
||||||
let mode_indicator = Paragraph::new(status.state().to_string())
|
|
||||||
.block(
|
|
||||||
Block::default()
|
|
||||||
.borders(Borders::ALL)
|
|
||||||
.style(Style::default().fg(Color::DarkGray)),
|
|
||||||
)
|
|
||||||
.style(Style::default().fg(Color::LightYellow));
|
|
||||||
let command_monitor = command_monitor::init(status.status_messages(), &colors);
|
|
||||||
|
|
||||||
// render the widgets
|
|
||||||
self.terminal.draw(|frame| {
|
|
||||||
frame.render_widget(self.message_compose.widget(), middle_chunks[1]);
|
|
||||||
frame.render_widget(mode_indicator, bottom_chunks[0]);
|
|
||||||
match &self.cli {
|
|
||||||
Some(cli) => frame.render_widget(cli.widget(), bottom_chunks[1]),
|
|
||||||
None => (),
|
|
||||||
};
|
|
||||||
frame.render_widget(command_monitor, right_chunks[1]);
|
|
||||||
})?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
fn input(&mut self, input: Key) {
|
|
||||||
debug!("Input received in tui: {}", input);
|
|
||||||
if let Some(value) = input.value() {
|
|
||||||
match value {
|
|
||||||
KeyValue::Backspace => todo!(),
|
|
||||||
KeyValue::Enter => todo!(),
|
|
||||||
KeyValue::Left => todo!(),
|
|
||||||
KeyValue::Right => todo!(),
|
|
||||||
KeyValue::Up => todo!(),
|
|
||||||
KeyValue::Down => todo!(),
|
|
||||||
KeyValue::Home => todo!(),
|
|
||||||
KeyValue::End => todo!(),
|
|
||||||
KeyValue::PageUp => todo!(),
|
|
||||||
KeyValue::PageDown => todo!(),
|
|
||||||
KeyValue::Tab => todo!(),
|
|
||||||
KeyValue::BackTab => todo!(),
|
|
||||||
KeyValue::Delete => todo!(),
|
|
||||||
KeyValue::Insert => todo!(),
|
|
||||||
KeyValue::F(_) => todo!(),
|
|
||||||
KeyValue::Char(_) => todo!(),
|
|
||||||
KeyValue::Null => todo!(),
|
|
||||||
KeyValue::Esc => todo!(),
|
|
||||||
KeyValue::CapsLock => todo!(),
|
|
||||||
KeyValue::ScrollLock => todo!(),
|
|
||||||
KeyValue::NumLock => todo!(),
|
|
||||||
KeyValue::PrintScreen => todo!(),
|
|
||||||
KeyValue::Pause => todo!(),
|
|
||||||
KeyValue::Menu => todo!(),
|
|
||||||
KeyValue::KeypadBegin => todo!(),
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
info!("User wrote: '{}'", input.to_string_repr());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,55 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use ratatui::{
|
|
||||||
layout::Alignment,
|
|
||||||
style::{Color, Style},
|
|
||||||
text::Text,
|
|
||||||
widgets::{Block, Borders, Paragraph},
|
|
||||||
};
|
|
||||||
|
|
||||||
use crate::{app::status::StatusMessage, ui::tui::InputPosition};
|
|
||||||
|
|
||||||
pub fn init<'a>(status_events: &Vec<StatusMessage>, colors: &Vec<Color>) -> Paragraph<'a> {
|
|
||||||
let mut command_monitor = Text::default();
|
|
||||||
|
|
||||||
status_events.iter().for_each(|event| {
|
|
||||||
// TODO(@Soispha): The added text (`event.content()`) doesn't wrap nicely,
|
|
||||||
// it would be nice if it did.
|
|
||||||
command_monitor.extend(Text::styled(
|
|
||||||
event.content(),
|
|
||||||
Style::default().fg(if event.is_error() {
|
|
||||||
Color::Red
|
|
||||||
} else {
|
|
||||||
Color::Cyan
|
|
||||||
}),
|
|
||||||
));
|
|
||||||
});
|
|
||||||
|
|
||||||
Paragraph::new(command_monitor)
|
|
||||||
.block(
|
|
||||||
Block::default()
|
|
||||||
.title("Command Montior")
|
|
||||||
.borders(Borders::ALL)
|
|
||||||
.style(Style::default().fg(colors[InputPosition::CommandMonitor as usize])),
|
|
||||||
)
|
|
||||||
.alignment(Alignment::Center)
|
|
||||||
}
|
|
|
@ -1,22 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
pub mod command_monitor;
|
|
|
@ -1,63 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use std::{io, io::Stdout};
|
|
||||||
|
|
||||||
use anyhow::{Context, Result};
|
|
||||||
use cli_log::info;
|
|
||||||
use crossterm::{
|
|
||||||
event::EnableMouseCapture,
|
|
||||||
execute,
|
|
||||||
terminal::{enable_raw_mode, EnterAlternateScreen},
|
|
||||||
};
|
|
||||||
use ratatui::{
|
|
||||||
style::{Color, Modifier, Style},
|
|
||||||
widgets::{Block, Borders},
|
|
||||||
};
|
|
||||||
use tui_textarea::TextArea;
|
|
||||||
|
|
||||||
pub(super) fn terminal_prepare() -> Result<Stdout> {
|
|
||||||
enable_raw_mode().context("Failed to enable raw mode")?;
|
|
||||||
let mut stdout = io::stdout();
|
|
||||||
execute!(stdout, EnterAlternateScreen, EnableMouseCapture)?;
|
|
||||||
info!("Prepared terminal");
|
|
||||||
Ok(stdout)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn textarea_activate(textarea: &mut TextArea) {
|
|
||||||
textarea.set_cursor_line_style(Style::default().add_modifier(Modifier::UNDERLINED));
|
|
||||||
textarea.set_cursor_style(Style::default().add_modifier(Modifier::REVERSED));
|
|
||||||
let b = textarea
|
|
||||||
.block()
|
|
||||||
.cloned()
|
|
||||||
.unwrap_or_else(|| Block::default().borders(Borders::ALL));
|
|
||||||
textarea.set_block(b.style(Style::default()));
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn textarea_inactivate(textarea: &mut TextArea) {
|
|
||||||
textarea.set_cursor_line_style(Style::default());
|
|
||||||
textarea.set_cursor_style(Style::default());
|
|
||||||
let b = textarea
|
|
||||||
.block()
|
|
||||||
.cloned()
|
|
||||||
.unwrap_or_else(|| Block::default().borders(Borders::ALL));
|
|
||||||
textarea.set_block(b.style(Style::default().fg(Color::DarkGray)));
|
|
||||||
}
|
|
|
@ -1,30 +0,0 @@
|
||||||
/*
|
|
||||||
* Copyright (C) 2024 - 2024:
|
|
||||||
* The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
* SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
*
|
|
||||||
* This file is part of Trinitrix.
|
|
||||||
*
|
|
||||||
* Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
* it under the terms of the GNU General Public License as published
|
|
||||||
* by the Free Software Foundation, either version 3 of the License,
|
|
||||||
* or (at your option) any later version.
|
|
||||||
*
|
|
||||||
* This program is distributed in the hope that it will be useful,
|
|
||||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
* General Public License for more details.
|
|
||||||
*
|
|
||||||
* You should have received a copy of the GNU General Public License
|
|
||||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
use anyhow::Result;
|
|
||||||
use keymaps::key_repr::Key;
|
|
||||||
|
|
||||||
use crate::app::status::Status;
|
|
||||||
|
|
||||||
pub trait TrinitrixUi {
|
|
||||||
async fn update(&mut self, status: &Status) -> Result<()>;
|
|
||||||
fn input(&mut self, input: Key);
|
|
||||||
}
|
|
91
treefmt.nix
91
treefmt.nix
|
@ -1,91 +0,0 @@
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
{
|
|
||||||
treefmt-nix,
|
|
||||||
pkgs,
|
|
||||||
}:
|
|
||||||
treefmt-nix.lib.evalModule pkgs (
|
|
||||||
{pkgs, ...}: {
|
|
||||||
# Used to find the project root
|
|
||||||
projectRootFile = "flake.nix";
|
|
||||||
|
|
||||||
programs = {
|
|
||||||
alejandra.enable = true;
|
|
||||||
rustfmt.enable = true;
|
|
||||||
clang-format.enable = true;
|
|
||||||
mdformat.enable = true;
|
|
||||||
shfmt = {
|
|
||||||
enable = true;
|
|
||||||
indent_size = 4;
|
|
||||||
};
|
|
||||||
shellcheck.enable = true;
|
|
||||||
prettier = {
|
|
||||||
settings = {
|
|
||||||
arrowParens = "always";
|
|
||||||
bracketSameLine = false;
|
|
||||||
bracketSpacing = true;
|
|
||||||
editorconfig = true;
|
|
||||||
embeddedLanguageFormatting = "auto";
|
|
||||||
endOfLine = "lf";
|
|
||||||
# experimentalTernaries = false;
|
|
||||||
htmlWhitespaceSensitivity = "css";
|
|
||||||
insertPragma = false;
|
|
||||||
jsxSingleQuote = true;
|
|
||||||
printWidth = 80;
|
|
||||||
proseWrap = "always";
|
|
||||||
quoteProps = "consistent";
|
|
||||||
requirePragma = false;
|
|
||||||
semi = true;
|
|
||||||
singleAttributePerLine = true;
|
|
||||||
singleQuote = true;
|
|
||||||
trailingComma = "all";
|
|
||||||
useTabs = false;
|
|
||||||
vueIndentScriptAndStyle = false;
|
|
||||||
|
|
||||||
tabWidth = 4;
|
|
||||||
overrides = {
|
|
||||||
files = ["*.js"];
|
|
||||||
options.tabwidth = 2;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
stylua.enable = true;
|
|
||||||
ruff = {
|
|
||||||
enable = true;
|
|
||||||
format = true;
|
|
||||||
};
|
|
||||||
taplo.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
settings = {
|
|
||||||
global.excludes = [
|
|
||||||
"CHANGELOG.md"
|
|
||||||
"NEWS.md"
|
|
||||||
];
|
|
||||||
formatter = {
|
|
||||||
clang-format = {
|
|
||||||
options = ["--style" "GNU"];
|
|
||||||
};
|
|
||||||
shfmt = {
|
|
||||||
includes = ["*.bash"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
)
|
|
23
update.sh
23
update.sh
|
@ -1,23 +0,0 @@
|
||||||
#! /usr/bin/env sh
|
|
||||||
# Copyright (C) 2024 - 2024:
|
|
||||||
# The Trinitrix Project <benedikt.peetz@b-peetz.de, antifallobst@systemausfall.org, sils@sils.li>
|
|
||||||
# SPDX-License-Identifier: GPL-3.0-or-later
|
|
||||||
#
|
|
||||||
# This file is part of Trinitrix.
|
|
||||||
#
|
|
||||||
# Trinitrix is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU General Public License as published
|
|
||||||
# by the Free Software Foundation, either version 3 of the License,
|
|
||||||
# or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
||||||
# General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU General Public License
|
|
||||||
# along with this program. If not, see <https://www.gnu.org/licenses/>.
|
|
||||||
|
|
||||||
cargo update && cargo upgrade
|
|
||||||
|
|
||||||
# vim: ft=sh
|
|
Reference in New Issue