mirror of
https://github.com/nailuj05/framemate.git
synced 2026-10-07 10:00:32 +02:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
816aff8902 | ||
|
|
cd029b0050 | ||
|
|
724acd4ac6 | ||
|
|
69ac066bad | ||
|
|
58836dfadc | ||
|
|
fb78f43862 | ||
|
|
8e02b62ca9 | ||
|
|
1e01b830b4 | ||
|
|
675a50fdb1 | ||
|
|
a0fd89809b | ||
|
|
607da0f88d | ||
|
|
9c04f99a25 | ||
|
|
7034b8f88b | ||
|
|
4b2d141c4c | ||
|
|
7a83161228 | ||
|
|
66f6acced2 | ||
|
|
90ccfad498 | ||
|
|
1cb434f03d | ||
|
|
f985f109c7 | ||
|
|
b572465513 | ||
|
|
5f05387985 | ||
|
|
0fe4d9e502 | ||
|
|
cb99789500 | ||
|
|
017e11e9a5 | ||
|
|
2abea1ea42 | ||
|
|
40b71404dc | ||
|
|
22ad3744bf | ||
|
|
a8052f075f | ||
|
|
1e859f1102 | ||
|
|
71f8a5ba03 | ||
|
|
76223e3229 | ||
|
|
8b5db9ba87 | ||
|
|
373cb6001a | ||
|
|
23836330ae |
No files matched your search
@@ -0,0 +1,24 @@
|
||||
---
|
||||
name: Bug report
|
||||
about: Create a report to help me improve the app
|
||||
title: ''
|
||||
labels: ''
|
||||
assignees: ''
|
||||
|
||||
---
|
||||
|
||||
**Describe the bug**
|
||||
A clear and concise description of what the bug is.
|
||||
|
||||
**To Reproduce**
|
||||
Steps to reproduce the behavior:
|
||||
1. Go to '...'
|
||||
2. Click on '....'
|
||||
3. Scroll down to '....'
|
||||
4. See error
|
||||
|
||||
**Expected behavior**
|
||||
A clear and concise description of what you expected to happen.
|
||||
|
||||
**Screenshots**
|
||||
If applicable, add screenshots to help explain your problem.
|
||||
@@ -1,10 +1,8 @@
|
||||
# Builds the agent Flatpak bundle and the Android APK and uploads both as workflow artifacts.
|
||||
# A pushed `v*` tag additionally publishes them as a GitHub release.
|
||||
# Runs on pushed `v*` tags: builds the agent Flatpak bundle and the Android APK, uploads both
|
||||
name: Build
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [main]
|
||||
tags: ["v*"]
|
||||
workflow_dispatch:
|
||||
|
||||
|
||||
@@ -0,0 +1,91 @@
|
||||
# Contributing to FrameMate
|
||||
|
||||
Patches, bug reports and testing on other SteamOS versions are all welcome.
|
||||
FrameMate leans on undocumented Steam internals, so reports of "this broke
|
||||
after an update" are useful even without a fix attached.
|
||||
|
||||
## Sign your commits (DCO)
|
||||
|
||||
FrameMate uses the [Developer Certificate of Origin](DCO), same as the Linux kernel.
|
||||
There is no CLA to sign and no copyright assignment: you keep the copyright on your work.
|
||||
|
||||
Every commit must carry a `Signed-off-by` line matching the author:
|
||||
|
||||
```sh
|
||||
git commit -s -m "Fix controller battery after sleep"
|
||||
```
|
||||
|
||||
That appends:
|
||||
|
||||
```
|
||||
Signed-off-by: Your Name <your.email@example.com>
|
||||
```
|
||||
|
||||
Forgot it? `git commit --amend -s` for the last commit, or
|
||||
`git rebase --signoff main` for a branch. Please use a name you're comfortable having in the public git history, sign-offs are permanent.
|
||||
|
||||
By signing off you certify the four points in [`DCO`](DCO), and that your
|
||||
contribution is offered under:
|
||||
|
||||
- the **GNU GPL v3.0 or later** ([`LICENSE`](LICENSE)); **and**
|
||||
- the additional terms in [`LICENSE-EXCEPTION.md`](LICENSE-EXCEPTION.md) —
|
||||
notably the GPL §7 app store distribution permission.
|
||||
|
||||
That second point is key, it allows future app store releases without needing to get approval from every past contributor.
|
||||
|
||||
## Project layout
|
||||
|
||||
| Path | |
|
||||
|---|---|
|
||||
| `crates/agent` | The agent that runs on the Frame. Static `aarch64-unknown-linux-musl` binary, shipped as a Flatpak |
|
||||
| `app` | The phone app: SvelteKit frontend |
|
||||
| `app/src-tauri` | The app's Rust shell |
|
||||
| `scripts` | `flatpak.sh` (build/install the agent), `deploy.sh` (dev loop on the Frame), `release.sh` (tag a release) |
|
||||
|
||||
Following should be preserved:
|
||||
|
||||
- **The agent stays small and dependency-light.** It's ~5 MB and idles at
|
||||
practically zero CPU on a battery-powered headset. New dependencies in
|
||||
`crates/agent` need to earn their place.
|
||||
- **The agent stays free of heavyweight media stacks.** Encoding talks to the
|
||||
V4L2 encoder through raw ioctls (`crates/agent/src/{v4l2,encoder}.rs`)
|
||||
because GStreamer's `v4l2h264enc` fails caps negotiation with this driver and isn't in the Flatpak runtime.
|
||||
|
||||
## Development
|
||||
|
||||
Setup and build commands are in [Building from
|
||||
source](README.md#building-from-source). The quick loop:
|
||||
|
||||
```sh
|
||||
scripts/deploy.sh # build + run the current agent on the Frame (| logs | stop)
|
||||
cd app && bun run tauri dev # desktop window for UI work
|
||||
```
|
||||
|
||||
`scripts/*.sh` reach the Frame as `steamos@frame.local`; override with
|
||||
`FRAME_HOST`.
|
||||
|
||||
## Before you open a PR
|
||||
|
||||
CI only builds release artifacts on pushed `v*` tags, which needs push access to this repository, so it never sees a pull request. Nothing will catch mistakes for you, so please run these yourself:
|
||||
|
||||
```sh
|
||||
cargo test # agent unit tests (host target, not musl)
|
||||
cargo fmt --all # default rustfmt, no custom config
|
||||
cargo clippy --all-targets
|
||||
cd app && bun run check # svelte-check + TypeScript
|
||||
```
|
||||
|
||||
Also:
|
||||
|
||||
- **Don't bump version numbers manually.** `scripts/release.sh` sets them everywhere at
|
||||
once, and the release job verifies the tag matches `Cargo.toml` and
|
||||
`tauri.conf.json`.
|
||||
- Keep commits focused, and match the surrounding comment style
|
||||
- Document *why* a hardware or Steam quirk is handled a certain way
|
||||
- If a change depends on a particular SteamOS or Steam client version, say so in the PR.
|
||||
|
||||
## Reporting bugs
|
||||
|
||||
Use the [bug report template](.github/ISSUE_TEMPLATE/bug_report.md) and include
|
||||
your SteamOS version (Settings -> System), the agent version, and relevant agent
|
||||
logs from `scripts/deploy.sh logs`.
|
||||
Generated
+2
-1
@@ -327,7 +327,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "framemate-agent"
|
||||
version = "0.1.0"
|
||||
version = "0.1.5"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"axum",
|
||||
@@ -335,6 +335,7 @@ dependencies = [
|
||||
"libc",
|
||||
"serde",
|
||||
"serde_json",
|
||||
"socket2",
|
||||
"tokio",
|
||||
"tokio-tungstenite 0.30.0",
|
||||
"tracing",
|
||||
|
||||
+2
-1
@@ -5,8 +5,9 @@ resolver = "3"
|
||||
members = ["crates/agent"]
|
||||
|
||||
[workspace.package]
|
||||
version = "0.1.0"
|
||||
version = "0.1.5"
|
||||
edition = "2024"
|
||||
license = "GPL-3.0-or-later"
|
||||
|
||||
[profile.release]
|
||||
strip = true
|
||||
|
||||
@@ -0,0 +1,34 @@
|
||||
Developer Certificate of Origin
|
||||
Version 1.1
|
||||
|
||||
Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
|
||||
|
||||
Everyone is permitted to copy and distribute verbatim copies of this
|
||||
license document, but changing it is not allowed.
|
||||
|
||||
|
||||
Developer's Certificate of Origin 1.1
|
||||
|
||||
By making a contribution to this project, I certify that:
|
||||
|
||||
(a) The contribution was created in whole or in part by me and I
|
||||
have the right to submit it under the open source license
|
||||
indicated in the file; or
|
||||
|
||||
(b) The contribution is based upon previous work that, to the best
|
||||
of my knowledge, is covered under an appropriate open source
|
||||
license and I have the right under that license to submit that
|
||||
work with modifications, whether created in whole or in part
|
||||
by me, under the same open source license (unless I am
|
||||
permitted to submit under a different license), as indicated
|
||||
in the file; or
|
||||
|
||||
(c) The contribution was provided directly to me by some other
|
||||
person who certified (a), (b) or (c) and I have not modified
|
||||
it.
|
||||
|
||||
(d) I understand and agree that this project and the contribution
|
||||
are public and that a record of the contribution (including all
|
||||
personal information I submit with it, including my sign-off) is
|
||||
maintained indefinitely and may be redistributed consistent with
|
||||
this project or the open source license(s) involved.
|
||||
@@ -0,0 +1,674 @@
|
||||
GNU GENERAL PUBLIC LICENSE
|
||||
Version 3, 29 June 2007
|
||||
|
||||
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||
Everyone is permitted to copy and distribute verbatim copies
|
||||
of this license document, but changing it is not allowed.
|
||||
|
||||
Preamble
|
||||
|
||||
The GNU General Public License is a free, copyleft license for
|
||||
software and other kinds of works.
|
||||
|
||||
The licenses for most software and other practical works are designed
|
||||
to take away your freedom to share and change the works. By contrast,
|
||||
the GNU General Public License is intended to guarantee your freedom to
|
||||
share and change all versions of a program--to make sure it remains free
|
||||
software for all its users. We, the Free Software Foundation, use the
|
||||
GNU General Public License for most of our software; it applies also to
|
||||
any other work released this way by its authors. You can apply it to
|
||||
your programs, too.
|
||||
|
||||
When we speak of free software, we are referring to freedom, not
|
||||
price. Our General Public Licenses are designed to make sure that you
|
||||
have the freedom to distribute copies of free software (and charge for
|
||||
them if you wish), that you receive source code or can get it if you
|
||||
want it, that you can change the software or use pieces of it in new
|
||||
free programs, and that you know you can do these things.
|
||||
|
||||
To protect your rights, we need to prevent others from denying you
|
||||
these rights or asking you to surrender the rights. Therefore, you have
|
||||
certain responsibilities if you distribute copies of the software, or if
|
||||
you modify it: responsibilities to respect the freedom of others.
|
||||
|
||||
For example, if you distribute copies of such a program, whether
|
||||
gratis or for a fee, you must pass on to the recipients the same
|
||||
freedoms that you received. You must make sure that they, too, receive
|
||||
or can get the source code. And you must show them these terms so they
|
||||
know their rights.
|
||||
|
||||
Developers that use the GNU GPL protect your rights with two steps:
|
||||
(1) assert copyright on the software, and (2) offer you this License
|
||||
giving you legal permission to copy, distribute and/or modify it.
|
||||
|
||||
For the developers' and authors' protection, the GPL clearly explains
|
||||
that there is no warranty for this free software. For both users' and
|
||||
authors' sake, the GPL requires that modified versions be marked as
|
||||
changed, so that their problems will not be attributed erroneously to
|
||||
authors of previous versions.
|
||||
|
||||
Some devices are designed to deny users access to install or run
|
||||
modified versions of the software inside them, although the manufacturer
|
||||
can do so. This is fundamentally incompatible with the aim of
|
||||
protecting users' freedom to change the software. The systematic
|
||||
pattern of such abuse occurs in the area of products for individuals to
|
||||
use, which is precisely where it is most unacceptable. Therefore, we
|
||||
have designed this version of the GPL to prohibit the practice for those
|
||||
products. If such problems arise substantially in other domains, we
|
||||
stand ready to extend this provision to those domains in future versions
|
||||
of the GPL, as needed to protect the freedom of users.
|
||||
|
||||
Finally, every program is threatened constantly by software patents.
|
||||
States should not allow patents to restrict development and use of
|
||||
software on general-purpose computers, but in those that do, we wish to
|
||||
avoid the special danger that patents applied to a free program could
|
||||
make it effectively proprietary. To prevent this, the GPL assures that
|
||||
patents cannot be used to render the program non-free.
|
||||
|
||||
The precise terms and conditions for copying, distribution and
|
||||
modification follow.
|
||||
|
||||
TERMS AND CONDITIONS
|
||||
|
||||
0. Definitions.
|
||||
|
||||
"This License" refers to version 3 of the GNU General Public License.
|
||||
|
||||
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||
works, such as semiconductor masks.
|
||||
|
||||
"The Program" refers to any copyrightable work licensed under this
|
||||
License. Each licensee is addressed as "you". "Licensees" and
|
||||
"recipients" may be individuals or organizations.
|
||||
|
||||
To "modify" a work means to copy from or adapt all or part of the work
|
||||
in a fashion requiring copyright permission, other than the making of an
|
||||
exact copy. The resulting work is called a "modified version" of the
|
||||
earlier work or a work "based on" the earlier work.
|
||||
|
||||
A "covered work" means either the unmodified Program or a work based
|
||||
on the Program.
|
||||
|
||||
To "propagate" a work means to do anything with it that, without
|
||||
permission, would make you directly or secondarily liable for
|
||||
infringement under applicable copyright law, except executing it on a
|
||||
computer or modifying a private copy. Propagation includes copying,
|
||||
distribution (with or without modification), making available to the
|
||||
public, and in some countries other activities as well.
|
||||
|
||||
To "convey" a work means any kind of propagation that enables other
|
||||
parties to make or receive copies. Mere interaction with a user through
|
||||
a computer network, with no transfer of a copy, is not conveying.
|
||||
|
||||
An interactive user interface displays "Appropriate Legal Notices"
|
||||
to the extent that it includes a convenient and prominently visible
|
||||
feature that (1) displays an appropriate copyright notice, and (2)
|
||||
tells the user that there is no warranty for the work (except to the
|
||||
extent that warranties are provided), that licensees may convey the
|
||||
work under this License, and how to view a copy of this License. If
|
||||
the interface presents a list of user commands or options, such as a
|
||||
menu, a prominent item in the list meets this criterion.
|
||||
|
||||
1. Source Code.
|
||||
|
||||
The "source code" for a work means the preferred form of the work
|
||||
for making modifications to it. "Object code" means any non-source
|
||||
form of a work.
|
||||
|
||||
A "Standard Interface" means an interface that either is an official
|
||||
standard defined by a recognized standards body, or, in the case of
|
||||
interfaces specified for a particular programming language, one that
|
||||
is widely used among developers working in that language.
|
||||
|
||||
The "System Libraries" of an executable work include anything, other
|
||||
than the work as a whole, that (a) is included in the normal form of
|
||||
packaging a Major Component, but which is not part of that Major
|
||||
Component, and (b) serves only to enable use of the work with that
|
||||
Major Component, or to implement a Standard Interface for which an
|
||||
implementation is available to the public in source code form. A
|
||||
"Major Component", in this context, means a major essential component
|
||||
(kernel, window system, and so on) of the specific operating system
|
||||
(if any) on which the executable work runs, or a compiler used to
|
||||
produce the work, or an object code interpreter used to run it.
|
||||
|
||||
The "Corresponding Source" for a work in object code form means all
|
||||
the source code needed to generate, install, and (for an executable
|
||||
work) run the object code and to modify the work, including scripts to
|
||||
control those activities. However, it does not include the work's
|
||||
System Libraries, or general-purpose tools or generally available free
|
||||
programs which are used unmodified in performing those activities but
|
||||
which are not part of the work. For example, Corresponding Source
|
||||
includes interface definition files associated with source files for
|
||||
the work, and the source code for shared libraries and dynamically
|
||||
linked subprograms that the work is specifically designed to require,
|
||||
such as by intimate data communication or control flow between those
|
||||
subprograms and other parts of the work.
|
||||
|
||||
The Corresponding Source need not include anything that users
|
||||
can regenerate automatically from other parts of the Corresponding
|
||||
Source.
|
||||
|
||||
The Corresponding Source for a work in source code form is that
|
||||
same work.
|
||||
|
||||
2. Basic Permissions.
|
||||
|
||||
All rights granted under this License are granted for the term of
|
||||
copyright on the Program, and are irrevocable provided the stated
|
||||
conditions are met. This License explicitly affirms your unlimited
|
||||
permission to run the unmodified Program. The output from running a
|
||||
covered work is covered by this License only if the output, given its
|
||||
content, constitutes a covered work. This License acknowledges your
|
||||
rights of fair use or other equivalent, as provided by copyright law.
|
||||
|
||||
You may make, run and propagate covered works that you do not
|
||||
convey, without conditions so long as your license otherwise remains
|
||||
in force. You may convey covered works to others for the sole purpose
|
||||
of having them make modifications exclusively for you, or provide you
|
||||
with facilities for running those works, provided that you comply with
|
||||
the terms of this License in conveying all material for which you do
|
||||
not control copyright. Those thus making or running the covered works
|
||||
for you must do so exclusively on your behalf, under your direction
|
||||
and control, on terms that prohibit them from making any copies of
|
||||
your copyrighted material outside their relationship with you.
|
||||
|
||||
Conveying under any other circumstances is permitted solely under
|
||||
the conditions stated below. Sublicensing is not allowed; section 10
|
||||
makes it unnecessary.
|
||||
|
||||
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||
|
||||
No covered work shall be deemed part of an effective technological
|
||||
measure under any applicable law fulfilling obligations under article
|
||||
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||
similar laws prohibiting or restricting circumvention of such
|
||||
measures.
|
||||
|
||||
When you convey a covered work, you waive any legal power to forbid
|
||||
circumvention of technological measures to the extent such circumvention
|
||||
is effected by exercising rights under this License with respect to
|
||||
the covered work, and you disclaim any intention to limit operation or
|
||||
modification of the work as a means of enforcing, against the work's
|
||||
users, your or third parties' legal rights to forbid circumvention of
|
||||
technological measures.
|
||||
|
||||
4. Conveying Verbatim Copies.
|
||||
|
||||
You may convey verbatim copies of the Program's source code as you
|
||||
receive it, in any medium, provided that you conspicuously and
|
||||
appropriately publish on each copy an appropriate copyright notice;
|
||||
keep intact all notices stating that this License and any
|
||||
non-permissive terms added in accord with section 7 apply to the code;
|
||||
keep intact all notices of the absence of any warranty; and give all
|
||||
recipients a copy of this License along with the Program.
|
||||
|
||||
You may charge any price or no price for each copy that you convey,
|
||||
and you may offer support or warranty protection for a fee.
|
||||
|
||||
5. Conveying Modified Source Versions.
|
||||
|
||||
You may convey a work based on the Program, or the modifications to
|
||||
produce it from the Program, in the form of source code under the
|
||||
terms of section 4, provided that you also meet all of these conditions:
|
||||
|
||||
a) The work must carry prominent notices stating that you modified
|
||||
it, and giving a relevant date.
|
||||
|
||||
b) The work must carry prominent notices stating that it is
|
||||
released under this License and any conditions added under section
|
||||
7. This requirement modifies the requirement in section 4 to
|
||||
"keep intact all notices".
|
||||
|
||||
c) You must license the entire work, as a whole, under this
|
||||
License to anyone who comes into possession of a copy. This
|
||||
License will therefore apply, along with any applicable section 7
|
||||
additional terms, to the whole of the work, and all its parts,
|
||||
regardless of how they are packaged. This License gives no
|
||||
permission to license the work in any other way, but it does not
|
||||
invalidate such permission if you have separately received it.
|
||||
|
||||
d) If the work has interactive user interfaces, each must display
|
||||
Appropriate Legal Notices; however, if the Program has interactive
|
||||
interfaces that do not display Appropriate Legal Notices, your
|
||||
work need not make them do so.
|
||||
|
||||
A compilation of a covered work with other separate and independent
|
||||
works, which are not by their nature extensions of the covered work,
|
||||
and which are not combined with it such as to form a larger program,
|
||||
in or on a volume of a storage or distribution medium, is called an
|
||||
"aggregate" if the compilation and its resulting copyright are not
|
||||
used to limit the access or legal rights of the compilation's users
|
||||
beyond what the individual works permit. Inclusion of a covered work
|
||||
in an aggregate does not cause this License to apply to the other
|
||||
parts of the aggregate.
|
||||
|
||||
6. Conveying Non-Source Forms.
|
||||
|
||||
You may convey a covered work in object code form under the terms
|
||||
of sections 4 and 5, provided that you also convey the
|
||||
machine-readable Corresponding Source under the terms of this License,
|
||||
in one of these ways:
|
||||
|
||||
a) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by the
|
||||
Corresponding Source fixed on a durable physical medium
|
||||
customarily used for software interchange.
|
||||
|
||||
b) Convey the object code in, or embodied in, a physical product
|
||||
(including a physical distribution medium), accompanied by a
|
||||
written offer, valid for at least three years and valid for as
|
||||
long as you offer spare parts or customer support for that product
|
||||
model, to give anyone who possesses the object code either (1) a
|
||||
copy of the Corresponding Source for all the software in the
|
||||
product that is covered by this License, on a durable physical
|
||||
medium customarily used for software interchange, for a price no
|
||||
more than your reasonable cost of physically performing this
|
||||
conveying of source, or (2) access to copy the
|
||||
Corresponding Source from a network server at no charge.
|
||||
|
||||
c) Convey individual copies of the object code with a copy of the
|
||||
written offer to provide the Corresponding Source. This
|
||||
alternative is allowed only occasionally and noncommercially, and
|
||||
only if you received the object code with such an offer, in accord
|
||||
with subsection 6b.
|
||||
|
||||
d) Convey the object code by offering access from a designated
|
||||
place (gratis or for a charge), and offer equivalent access to the
|
||||
Corresponding Source in the same way through the same place at no
|
||||
further charge. You need not require recipients to copy the
|
||||
Corresponding Source along with the object code. If the place to
|
||||
copy the object code is a network server, the Corresponding Source
|
||||
may be on a different server (operated by you or a third party)
|
||||
that supports equivalent copying facilities, provided you maintain
|
||||
clear directions next to the object code saying where to find the
|
||||
Corresponding Source. Regardless of what server hosts the
|
||||
Corresponding Source, you remain obligated to ensure that it is
|
||||
available for as long as needed to satisfy these requirements.
|
||||
|
||||
e) Convey the object code using peer-to-peer transmission, provided
|
||||
you inform other peers where the object code and Corresponding
|
||||
Source of the work are being offered to the general public at no
|
||||
charge under subsection 6d.
|
||||
|
||||
A separable portion of the object code, whose source code is excluded
|
||||
from the Corresponding Source as a System Library, need not be
|
||||
included in conveying the object code work.
|
||||
|
||||
A "User Product" is either (1) a "consumer product", which means any
|
||||
tangible personal property which is normally used for personal, family,
|
||||
or household purposes, or (2) anything designed or sold for incorporation
|
||||
into a dwelling. In determining whether a product is a consumer product,
|
||||
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||
product received by a particular user, "normally used" refers to a
|
||||
typical or common use of that class of product, regardless of the status
|
||||
of the particular user or of the way in which the particular user
|
||||
actually uses, or expects or is expected to use, the product. A product
|
||||
is a consumer product regardless of whether the product has substantial
|
||||
commercial, industrial or non-consumer uses, unless such uses represent
|
||||
the only significant mode of use of the product.
|
||||
|
||||
"Installation Information" for a User Product means any methods,
|
||||
procedures, authorization keys, or other information required to install
|
||||
and execute modified versions of a covered work in that User Product from
|
||||
a modified version of its Corresponding Source. The information must
|
||||
suffice to ensure that the continued functioning of the modified object
|
||||
code is in no case prevented or interfered with solely because
|
||||
modification has been made.
|
||||
|
||||
If you convey an object code work under this section in, or with, or
|
||||
specifically for use in, a User Product, and the conveying occurs as
|
||||
part of a transaction in which the right of possession and use of the
|
||||
User Product is transferred to the recipient in perpetuity or for a
|
||||
fixed term (regardless of how the transaction is characterized), the
|
||||
Corresponding Source conveyed under this section must be accompanied
|
||||
by the Installation Information. But this requirement does not apply
|
||||
if neither you nor any third party retains the ability to install
|
||||
modified object code on the User Product (for example, the work has
|
||||
been installed in ROM).
|
||||
|
||||
The requirement to provide Installation Information does not include a
|
||||
requirement to continue to provide support service, warranty, or updates
|
||||
for a work that has been modified or installed by the recipient, or for
|
||||
the User Product in which it has been modified or installed. Access to a
|
||||
network may be denied when the modification itself materially and
|
||||
adversely affects the operation of the network or violates the rules and
|
||||
protocols for communication across the network.
|
||||
|
||||
Corresponding Source conveyed, and Installation Information provided,
|
||||
in accord with this section must be in a format that is publicly
|
||||
documented (and with an implementation available to the public in
|
||||
source code form), and must require no special password or key for
|
||||
unpacking, reading or copying.
|
||||
|
||||
7. Additional Terms.
|
||||
|
||||
"Additional permissions" are terms that supplement the terms of this
|
||||
License by making exceptions from one or more of its conditions.
|
||||
Additional permissions that are applicable to the entire Program shall
|
||||
be treated as though they were included in this License, to the extent
|
||||
that they are valid under applicable law. If additional permissions
|
||||
apply only to part of the Program, that part may be used separately
|
||||
under those permissions, but the entire Program remains governed by
|
||||
this License without regard to the additional permissions.
|
||||
|
||||
When you convey a copy of a covered work, you may at your option
|
||||
remove any additional permissions from that copy, or from any part of
|
||||
it. (Additional permissions may be written to require their own
|
||||
removal in certain cases when you modify the work.) You may place
|
||||
additional permissions on material, added by you to a covered work,
|
||||
for which you have or can give appropriate copyright permission.
|
||||
|
||||
Notwithstanding any other provision of this License, for material you
|
||||
add to a covered work, you may (if authorized by the copyright holders of
|
||||
that material) supplement the terms of this License with terms:
|
||||
|
||||
a) Disclaiming warranty or limiting liability differently from the
|
||||
terms of sections 15 and 16 of this License; or
|
||||
|
||||
b) Requiring preservation of specified reasonable legal notices or
|
||||
author attributions in that material or in the Appropriate Legal
|
||||
Notices displayed by works containing it; or
|
||||
|
||||
c) Prohibiting misrepresentation of the origin of that material, or
|
||||
requiring that modified versions of such material be marked in
|
||||
reasonable ways as different from the original version; or
|
||||
|
||||
d) Limiting the use for publicity purposes of names of licensors or
|
||||
authors of the material; or
|
||||
|
||||
e) Declining to grant rights under trademark law for use of some
|
||||
trade names, trademarks, or service marks; or
|
||||
|
||||
f) Requiring indemnification of licensors and authors of that
|
||||
material by anyone who conveys the material (or modified versions of
|
||||
it) with contractual assumptions of liability to the recipient, for
|
||||
any liability that these contractual assumptions directly impose on
|
||||
those licensors and authors.
|
||||
|
||||
All other non-permissive additional terms are considered "further
|
||||
restrictions" within the meaning of section 10. If the Program as you
|
||||
received it, or any part of it, contains a notice stating that it is
|
||||
governed by this License along with a term that is a further
|
||||
restriction, you may remove that term. If a license document contains
|
||||
a further restriction but permits relicensing or conveying under this
|
||||
License, you may add to a covered work material governed by the terms
|
||||
of that license document, provided that the further restriction does
|
||||
not survive such relicensing or conveying.
|
||||
|
||||
If you add terms to a covered work in accord with this section, you
|
||||
must place, in the relevant source files, a statement of the
|
||||
additional terms that apply to those files, or a notice indicating
|
||||
where to find the applicable terms.
|
||||
|
||||
Additional terms, permissive or non-permissive, may be stated in the
|
||||
form of a separately written license, or stated as exceptions;
|
||||
the above requirements apply either way.
|
||||
|
||||
8. Termination.
|
||||
|
||||
You may not propagate or modify a covered work except as expressly
|
||||
provided under this License. Any attempt otherwise to propagate or
|
||||
modify it is void, and will automatically terminate your rights under
|
||||
this License (including any patent licenses granted under the third
|
||||
paragraph of section 11).
|
||||
|
||||
However, if you cease all violation of this License, then your
|
||||
license from a particular copyright holder is reinstated (a)
|
||||
provisionally, unless and until the copyright holder explicitly and
|
||||
finally terminates your license, and (b) permanently, if the copyright
|
||||
holder fails to notify you of the violation by some reasonable means
|
||||
prior to 60 days after the cessation.
|
||||
|
||||
Moreover, your license from a particular copyright holder is
|
||||
reinstated permanently if the copyright holder notifies you of the
|
||||
violation by some reasonable means, this is the first time you have
|
||||
received notice of violation of this License (for any work) from that
|
||||
copyright holder, and you cure the violation prior to 30 days after
|
||||
your receipt of the notice.
|
||||
|
||||
Termination of your rights under this section does not terminate the
|
||||
licenses of parties who have received copies or rights from you under
|
||||
this License. If your rights have been terminated and not permanently
|
||||
reinstated, you do not qualify to receive new licenses for the same
|
||||
material under section 10.
|
||||
|
||||
9. Acceptance Not Required for Having Copies.
|
||||
|
||||
You are not required to accept this License in order to receive or
|
||||
run a copy of the Program. Ancillary propagation of a covered work
|
||||
occurring solely as a consequence of using peer-to-peer transmission
|
||||
to receive a copy likewise does not require acceptance. However,
|
||||
nothing other than this License grants you permission to propagate or
|
||||
modify any covered work. These actions infringe copyright if you do
|
||||
not accept this License. Therefore, by modifying or propagating a
|
||||
covered work, you indicate your acceptance of this License to do so.
|
||||
|
||||
10. Automatic Licensing of Downstream Recipients.
|
||||
|
||||
Each time you convey a covered work, the recipient automatically
|
||||
receives a license from the original licensors, to run, modify and
|
||||
propagate that work, subject to this License. You are not responsible
|
||||
for enforcing compliance by third parties with this License.
|
||||
|
||||
An "entity transaction" is a transaction transferring control of an
|
||||
organization, or substantially all assets of one, or subdividing an
|
||||
organization, or merging organizations. If propagation of a covered
|
||||
work results from an entity transaction, each party to that
|
||||
transaction who receives a copy of the work also receives whatever
|
||||
licenses to the work the party's predecessor in interest had or could
|
||||
give under the previous paragraph, plus a right to possession of the
|
||||
Corresponding Source of the work from the predecessor in interest, if
|
||||
the predecessor has it or can get it with reasonable efforts.
|
||||
|
||||
You may not impose any further restrictions on the exercise of the
|
||||
rights granted or affirmed under this License. For example, you may
|
||||
not impose a license fee, royalty, or other charge for exercise of
|
||||
rights granted under this License, and you may not initiate litigation
|
||||
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||
any patent claim is infringed by making, using, selling, offering for
|
||||
sale, or importing the Program or any portion of it.
|
||||
|
||||
11. Patents.
|
||||
|
||||
A "contributor" is a copyright holder who authorizes use under this
|
||||
License of the Program or a work on which the Program is based. The
|
||||
work thus licensed is called the contributor's "contributor version".
|
||||
|
||||
A contributor's "essential patent claims" are all patent claims
|
||||
owned or controlled by the contributor, whether already acquired or
|
||||
hereafter acquired, that would be infringed by some manner, permitted
|
||||
by this License, of making, using, or selling its contributor version,
|
||||
but do not include claims that would be infringed only as a
|
||||
consequence of further modification of the contributor version. For
|
||||
purposes of this definition, "control" includes the right to grant
|
||||
patent sublicenses in a manner consistent with the requirements of
|
||||
this License.
|
||||
|
||||
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||
patent license under the contributor's essential patent claims, to
|
||||
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||
propagate the contents of its contributor version.
|
||||
|
||||
In the following three paragraphs, a "patent license" is any express
|
||||
agreement or commitment, however denominated, not to enforce a patent
|
||||
(such as an express permission to practice a patent or covenant not to
|
||||
sue for patent infringement). To "grant" such a patent license to a
|
||||
party means to make such an agreement or commitment not to enforce a
|
||||
patent against the party.
|
||||
|
||||
If you convey a covered work, knowingly relying on a patent license,
|
||||
and the Corresponding Source of the work is not available for anyone
|
||||
to copy, free of charge and under the terms of this License, through a
|
||||
publicly available network server or other readily accessible means,
|
||||
then you must either (1) cause the Corresponding Source to be so
|
||||
available, or (2) arrange to deprive yourself of the benefit of the
|
||||
patent license for this particular work, or (3) arrange, in a manner
|
||||
consistent with the requirements of this License, to extend the patent
|
||||
license to downstream recipients. "Knowingly relying" means you have
|
||||
actual knowledge that, but for the patent license, your conveying the
|
||||
covered work in a country, or your recipient's use of the covered work
|
||||
in a country, would infringe one or more identifiable patents in that
|
||||
country that you have reason to believe are valid.
|
||||
|
||||
If, pursuant to or in connection with a single transaction or
|
||||
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||
covered work, and grant a patent license to some of the parties
|
||||
receiving the covered work authorizing them to use, propagate, modify
|
||||
or convey a specific copy of the covered work, then the patent license
|
||||
you grant is automatically extended to all recipients of the covered
|
||||
work and works based on it.
|
||||
|
||||
A patent license is "discriminatory" if it does not include within
|
||||
the scope of its coverage, prohibits the exercise of, or is
|
||||
conditioned on the non-exercise of one or more of the rights that are
|
||||
specifically granted under this License. You may not convey a covered
|
||||
work if you are a party to an arrangement with a third party that is
|
||||
in the business of distributing software, under which you make payment
|
||||
to the third party based on the extent of your activity of conveying
|
||||
the work, and under which the third party grants, to any of the
|
||||
parties who would receive the covered work from you, a discriminatory
|
||||
patent license (a) in connection with copies of the covered work
|
||||
conveyed by you (or copies made from those copies), or (b) primarily
|
||||
for and in connection with specific products or compilations that
|
||||
contain the covered work, unless you entered into that arrangement,
|
||||
or that patent license was granted, prior to 28 March 2007.
|
||||
|
||||
Nothing in this License shall be construed as excluding or limiting
|
||||
any implied license or other defenses to infringement that may
|
||||
otherwise be available to you under applicable patent law.
|
||||
|
||||
12. No Surrender of Others' Freedom.
|
||||
|
||||
If conditions are imposed on you (whether by court order, agreement or
|
||||
otherwise) that contradict the conditions of this License, they do not
|
||||
excuse you from the conditions of this License. If you cannot convey a
|
||||
covered work so as to satisfy simultaneously your obligations under this
|
||||
License and any other pertinent obligations, then as a consequence you may
|
||||
not convey it at all. For example, if you agree to terms that obligate you
|
||||
to collect a royalty for further conveying from those to whom you convey
|
||||
the Program, the only way you could satisfy both those terms and this
|
||||
License would be to refrain entirely from conveying the Program.
|
||||
|
||||
13. Use with the GNU Affero General Public License.
|
||||
|
||||
Notwithstanding any other provision of this License, you have
|
||||
permission to link or combine any covered work with a work licensed
|
||||
under version 3 of the GNU Affero General Public License into a single
|
||||
combined work, and to convey the resulting work. The terms of this
|
||||
License will continue to apply to the part which is the covered work,
|
||||
but the special requirements of the GNU Affero General Public License,
|
||||
section 13, concerning interaction through a network will apply to the
|
||||
combination as such.
|
||||
|
||||
14. Revised Versions of this License.
|
||||
|
||||
The Free Software Foundation may publish revised and/or new versions of
|
||||
the GNU General Public License from time to time. Such new versions will
|
||||
be similar in spirit to the present version, but may differ in detail to
|
||||
address new problems or concerns.
|
||||
|
||||
Each version is given a distinguishing version number. If the
|
||||
Program specifies that a certain numbered version of the GNU General
|
||||
Public License "or any later version" applies to it, you have the
|
||||
option of following the terms and conditions either of that numbered
|
||||
version or of any later version published by the Free Software
|
||||
Foundation. If the Program does not specify a version number of the
|
||||
GNU General Public License, you may choose any version ever published
|
||||
by the Free Software Foundation.
|
||||
|
||||
If the Program specifies that a proxy can decide which future
|
||||
versions of the GNU General Public License can be used, that proxy's
|
||||
public statement of acceptance of a version permanently authorizes you
|
||||
to choose that version for the Program.
|
||||
|
||||
Later license versions may give you additional or different
|
||||
permissions. However, no additional obligations are imposed on any
|
||||
author or copyright holder as a result of your choosing to follow a
|
||||
later version.
|
||||
|
||||
15. Disclaimer of Warranty.
|
||||
|
||||
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||
|
||||
16. Limitation of Liability.
|
||||
|
||||
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||
SUCH DAMAGES.
|
||||
|
||||
17. Interpretation of Sections 15 and 16.
|
||||
|
||||
If the disclaimer of warranty and limitation of liability provided
|
||||
above cannot be given local legal effect according to their terms,
|
||||
reviewing courts shall apply local law that most closely approximates
|
||||
an absolute waiver of all civil liability in connection with the
|
||||
Program, unless a warranty or assumption of liability accompanies a
|
||||
copy of the Program in return for a fee.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
How to Apply These Terms to Your New Programs
|
||||
|
||||
If you develop a new program, and you want it to be of the greatest
|
||||
possible use to the public, the best way to achieve this is to make it
|
||||
free software which everyone can redistribute and change under these terms.
|
||||
|
||||
To do so, attach the following notices to the program. It is safest
|
||||
to attach them to the start of each source file to most effectively
|
||||
state the exclusion of warranty; and each file should have at least
|
||||
the "copyright" line and a pointer to where the full notice is found.
|
||||
|
||||
<one line to give the program's name and a brief idea of what it does.>
|
||||
Copyright (C) <year> <name of author>
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
the Free Software Foundation, either version 3 of the License, or
|
||||
(at your option) any later version.
|
||||
|
||||
This program is distributed in the hope that it will be useful,
|
||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
GNU General Public License for more details.
|
||||
|
||||
You should have received a copy of the GNU General Public License
|
||||
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
|
||||
Also add information on how to contact you by electronic and paper mail.
|
||||
|
||||
If the program does terminal interaction, make it output a short
|
||||
notice like this when it starts in an interactive mode:
|
||||
|
||||
<program> Copyright (C) <year> <name of author>
|
||||
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
|
||||
This is free software, and you are welcome to redistribute it
|
||||
under certain conditions; type `show c' for details.
|
||||
|
||||
The hypothetical commands `show w' and `show c' should show the appropriate
|
||||
parts of the General Public License. Of course, your program's commands
|
||||
might be different; for a GUI interface, you would use an "about box".
|
||||
|
||||
You should also get your employer (if you work as a programmer) or school,
|
||||
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||
For more information on this, and how to apply and follow the GNU GPL, see
|
||||
<https://www.gnu.org/licenses/>.
|
||||
|
||||
The GNU General Public License does not permit incorporating your program
|
||||
into proprietary programs. If your program is a subroutine library, you
|
||||
may consider it more useful to permit linking proprietary applications with
|
||||
the library. If this is what you want to do, use the GNU Lesser General
|
||||
Public License instead of this License. But first, please read
|
||||
<https://www.gnu.org/licenses/why-not-lgpl.html>.
|
||||
@@ -0,0 +1,56 @@
|
||||
# Additional terms
|
||||
|
||||
FrameMate is licensed under the GNU General Public License, version 3 or (at
|
||||
your option) any later version — see [`LICENSE`](LICENSE). The following terms
|
||||
accompany that license. Nothing here takes away any permission the GPL grants
|
||||
you.
|
||||
|
||||
## 1. Additional permission for app store distribution (GPL-3.0 section 7)
|
||||
|
||||
As an additional permission under section 7 of the GNU General Public License
|
||||
version 3, the copyright holder grants permission to distribute FrameMate, and
|
||||
works based on it, through application distribution platforms ("app stores")
|
||||
whose terms of service require the distributor to accept or impose terms that
|
||||
section 6 of the License would otherwise forbid — including digital rights
|
||||
management, device or installation limits, and restrictions on further
|
||||
redistribution imposed by the platform operator.
|
||||
|
||||
This permission covers the act of distribution through such a platform only.
|
||||
It does **not**:
|
||||
|
||||
- relieve the distributor of the obligation to convey the Corresponding Source
|
||||
of the distributed version, under the terms of the License, to every
|
||||
recipient; or
|
||||
- permit distribution of FrameMate, or works based on it, under terms other
|
||||
than the License outside of such a platform.
|
||||
|
||||
If you distribute through such a platform, state in the listing or in the
|
||||
application itself where the Corresponding Source can be obtained free of
|
||||
charge.
|
||||
|
||||
## 2. Reserved names and artwork (GPL-3.0 section 7(e))
|
||||
|
||||
The following are **not** licensed under the GPL, and no trademark rights are
|
||||
granted for them:
|
||||
|
||||
- the name **FrameMate**;
|
||||
- the FrameMate logo — `assets/framemate-black.{png,svg}` and
|
||||
`assets/framemate-white.{png,svg}`;
|
||||
- the application identifiers `dev.framemate.Agent` and `dev.framemate.app`.
|
||||
|
||||
You may fork and redistribute the source and binaries under the GPL, and you
|
||||
may truthfully state that your work is derived from FrameMate. You may not name
|
||||
your fork FrameMate, ship it under the logo or those application identifiers,
|
||||
or otherwise present it in a way that suggests it is the original or is
|
||||
endorsed by its author. A fork intended for redistribution should replace the
|
||||
logo files and choose its own application identifier.
|
||||
|
||||
## 3. Third-party material
|
||||
|
||||
- Icons are from Material Symbols by Google, licensed Apache-2.0. See
|
||||
[`app/src/lib/icons/LICENSES.md`](app/src/lib/icons/LICENSES.md). Apache-2.0
|
||||
is compatible with GPL-3.0; the icons remain under their own license.
|
||||
- Game artwork shown in the app is loaded at runtime from Steam's public CDN
|
||||
and is not part of this project.
|
||||
- Steam, SteamOS and Steam Frame are trademarks of Valve Corporation.
|
||||
FrameMate is not affiliated with or endorsed by Valve.
|
||||
@@ -1,6 +1,6 @@
|
||||
<p align="center">
|
||||
<picture>
|
||||
<source media="(prefers-color-scheme: dark)" srcset="assets/framemate-black.png">
|
||||
<source media="(prefers-color-scheme: dark)" srcset="assets/framemate-white.png">
|
||||
<img src="assets/framemate-white.png" alt="FrameMate logo" width="128">
|
||||
</picture>
|
||||
</p>
|
||||
@@ -8,7 +8,7 @@
|
||||
<h1 align="center">FrameMate</h1>
|
||||
|
||||
<p align="center">
|
||||
A companion app for the <b>Steam Frame</b>: mirror the headset to your phone, keep an eye on battery, controllers, downloads and what's playing.
|
||||
A companion app for the <b>Steam Frame</b>: mirror the headset to your phone, keep an eye on battery, controllers, downloads and what's playing. <a href="https://youtu.be/Tva1_8JajW4">Demo Video</a>
|
||||
</p>
|
||||
|
||||
## At a glance
|
||||
@@ -54,27 +54,33 @@ You need a Steam Frame and an Android phone on the same network.
|
||||
|
||||
### 1. Agent on the Steam Frame
|
||||
|
||||
The agent ships as a Flatpak. Open a terminal on the Frame (Desktop Mode → Konsole, or via SSH)
|
||||
and run:
|
||||
The agent ships as a Flatpak. Open a terminal on the Frame via SSH (recommended), or Desktop
|
||||
Mode → Konsole ([see here](TROUBLESHOOTING.md#installing-from-desktop-mode)), and run:
|
||||
|
||||
```sh
|
||||
curl -LO https://github.com/nailuj05/framemate/releases/latest/download/framemate-agent.flatpak
|
||||
flatpak install --user -y framemate-agent.flatpak
|
||||
flatpak run dev.framemate.Agent install-service
|
||||
flatpak run dev.framemate.Agent token
|
||||
flatpak run --user dev.framemate.Agent install-service
|
||||
rm framemate-agent.flatpak
|
||||
```
|
||||
|
||||
- `flatpak install` pulls the Freedesktop runtime from Flathub if it isn't installed yet
|
||||
(about 270 MB, once).
|
||||
- `install-service` registers a user service, so the agent starts with every boot – in
|
||||
Game Mode too – and restarts it right away.
|
||||
- `token` prints the access token (e.g. `MCK55-EGGCG`) you'll enter in the app.
|
||||
Game Mode too – and restarts it right away. It then runs a self check and prints the
|
||||
address and access token (e.g. `MCK55-EGGCG`) you'll enter in the app.
|
||||
In Desktop Mode it can't start the agent right away (the nested desktop has no access to the
|
||||
user's systemd); the agent then starts with the next restart, and the command prints how to
|
||||
start it immediately.
|
||||
- `flatpak run --user dev.framemate.Agent check` repeats the self check (useful when the app can't
|
||||
connect); `flatpak run --user dev.framemate.Agent token` prints just the token, and
|
||||
`flatpak run --user dev.framemate.Agent rotate-token` replaces it with a new one.
|
||||
|
||||
To **update**, download the new `framemate-agent.flatpak` and run the first three commands
|
||||
To **update**, download the new `framemate-agent.flatpak` and run the same commands
|
||||
again. To **remove** it:
|
||||
|
||||
```sh
|
||||
flatpak run dev.framemate.Agent uninstall-service
|
||||
flatpak run --user dev.framemate.Agent uninstall-service
|
||||
flatpak uninstall --user dev.framemate.Agent
|
||||
```
|
||||
|
||||
@@ -84,6 +90,10 @@ flatpak uninstall --user dev.framemate.Agent
|
||||
2. Open it and allow your browser/file manager to install apps when Android asks.
|
||||
3. In the app's **Settings** tab, enter the Frame's address (`frame.local`, or its IP) and the
|
||||
token, then tap **Save & connect**.
|
||||
|
||||
### Troubleshooting
|
||||
|
||||
If you encounter any issues please check out [TROUBLESHOOTING](TROUBLESHOOTING.md).
|
||||
|
||||
### Web dashboard (Debug)
|
||||
|
||||
@@ -95,7 +105,10 @@ page in any browser, and `http://frame.local:7380/stream?token=<your token>` mir
|
||||
- **Unofficial.** FrameMate relies on undocumented Steam internals. A Steam or SteamOS update can
|
||||
break parts of it until the agent is updated. Tested on SteamOS 0.4.3 (beta branch).
|
||||
- **Local network only.** The agent listens on port 7380 and talks plain HTTP/WebSocket, protected
|
||||
by the token. Don't expose that port to the internet.
|
||||
by the token. Don't expose that port to the internet. The connection isn't encrypted, so others
|
||||
on the same network could read the token and what's sent, including Mirroring. Use FrameMate on
|
||||
networks you trust, like your home Wi-Fi, not on public or shared ones. The agent also rejects
|
||||
connections from public addresses outside your network (relevant for IPv6, where the Frame is globally addressable)
|
||||
- **Developer Mode.** FrameMate doesn't depend on it. Note that while it is on, SteamOS's devkit
|
||||
service exposes Steam's debugging interface to your whole network (port 8081); FrameMate never
|
||||
uses that port.
|
||||
@@ -141,18 +154,45 @@ Authenticate with `?token=<token>` or `Authorization: Bearer <token>`.
|
||||
In theory this app should be able to be build for iOS aswell, I do not have the devices or infrastructure to build and test an iOS version.
|
||||
If you do and you want to contribute, please let me know!
|
||||
|
||||
|
||||
## Contributing
|
||||
|
||||
Patches and bug reports are welcome — see [`CONTRIBUTING.md`](CONTRIBUTING.md).
|
||||
Commits need a `Signed-off-by` line (`git commit -s`); there's no CLA.
|
||||
|
||||
## License
|
||||
|
||||
FrameMate is free software under the **GNU General Public License v3.0 or
|
||||
later** ([`LICENSE`](LICENSE)). You may use, study, share and modify it. If you
|
||||
distribute it — modified or not, free or for money — you must pass on the same
|
||||
freedoms and make the complete source available under the same license. Closed
|
||||
forks are not permitted.
|
||||
|
||||
Two additional terms apply, in [`LICENSE-EXCEPTION.md`](LICENSE-EXCEPTION.md):
|
||||
an app store distribution permission under GPL-3.0 §7, and a reservation of the
|
||||
FrameMate name, logo and application identifiers (forks must use their own).
|
||||
|
||||
## Future
|
||||
|
||||
- [ ] iOS Support
|
||||
- [ ] TLS Support (self signed + pinning + QR pairing)
|
||||
- [ ] PWA for the mobile client
|
||||
- [ ] Feed on the App notifying you of newly frame verified games (in your library)
|
||||
- [ ] Control Downloads (pause, resume, reorder)
|
||||
- [ ] View and Transfer Screenshots
|
||||
- [ ] Mobile Notifications in VR
|
||||
- [ ] Turn off controller, headset, etc.
|
||||
|
||||
## AI usage
|
||||
|
||||
This project used AI for reversing the Steam API (for use in the agent), the frontend of the mobile app, the shell scripts and the Actions used for building the releases.
|
||||
AI was also used for exploring how the Video Stream for Mirroring could be accessed and encoded.
|
||||
|
||||
## Credits
|
||||
|
||||
- Icons: [Material Symbols](https://github.com/google/material-design-icons) (Apache-2.0); see
|
||||
[`app/src/lib/icons/LICENSES.md`](app/src/lib/icons/LICENSES.md).
|
||||
- Steam Frame Controller Icons: [Kenney Input Prompts](https://kenney.nl/assets/input-prompts) (CC0)
|
||||
- Game artwork is loaded from Steam's public CDN.
|
||||
- FrameMate Icon made by me
|
||||
|
||||
|
||||
@@ -0,0 +1,60 @@
|
||||
# Troubleshooting
|
||||
|
||||
If you ran into any issues installing or using FrameMate, check out this file for possible fixes. If the issue persists please open an issue here on GitHub.
|
||||
|
||||
The more information you can give me the better, this page will also describe how to access more info for troubleshooting.
|
||||
|
||||
## Common issues
|
||||
|
||||
Before going any further, please ensure that you are on an up to date version of SteamOS.
|
||||
Also make sure you followed the installation guide fully.
|
||||
|
||||
Run `flatpak run --user dev.framemate.Agent check` on the frame (ssh / console in desktop mode) for a detailed report of what might be the issue.
|
||||
|
||||
## Connection issues
|
||||
|
||||
Make sure of the following:
|
||||
|
||||
- Both the frame and the phone running the app need to be in the same (local) network.
|
||||
- There is no firewall or router settings blocking communication between app and frame.
|
||||
- Port 7380 needs to be open on the frame, this is the case by default, if you installed or configured a firewall you'll need to open that port.
|
||||
- Check whether you can reach the (debug) web interface, you can access it by visiting http://frame.local:7380/healthz or http://<frame-ip>:7380/healthz in your browser.
|
||||
- mDNS used for resolving frame.local might be unreliable in some cases, use the plain ip from the frame instead
|
||||
- Android 17 (SDK 37) blocks local network access by default for apps that target it. FrameMate declares `ACCESS_LOCAL_NETWORK`, if it still won't connect grant the permission under Settings > Apps > FrameMate > Permissions > Local network (it is part of the Nearby devices group, you may have to open that submenu). If you deny it, the connection will fail silently with a timeout.
|
||||
|
||||
Note: Some guest or mesh wifi networks may isolate devices by default, make sure that isn't the issue before proceeding.
|
||||
|
||||
### "FrameMate only accepts connections from the local network"
|
||||
|
||||
The agent rejects devices it doesn't consider part of your local network. That can hit unusual
|
||||
setups: a phone on a VPN, a guest or mesh Wi-Fi with its own subnet, or a router handing out
|
||||
IPv6 addresses from several prefixes. The agent's log names the rejected address
|
||||
(`journalctl --user -n 50 _COMM=framemate-agent`). To turn the check off, add
|
||||
`Environment=FRAMEMATE_ALLOW_REMOTE=1` under `[Service]` in
|
||||
`~/.config/systemd/user/framemate-agent.service`, then run
|
||||
`systemctl --user daemon-reload && systemctl --user restart framemate-agent`. Please also open
|
||||
an issue with your setup, so the check can be improved.
|
||||
|
||||
## Installation issues
|
||||
|
||||
If you encounter an error during installation please send me the logs and the commands you ran in a github issue.
|
||||
Should the app say "Wrong token", get it with `flatpak run --user dev.framemate.Agent token`. Note that reinstalling keeps the token.
|
||||
You may generate a new token with `flatpak run --user dev.framemate.Agent rotate-token` and enter the it in the app.
|
||||
|
||||
### Installing from Desktop Mode
|
||||
|
||||
If `install-service` says "systemd isn't reachable from this terminal": Desktop Mode on the Frame is a nested desktop without access to your user's systemd, so
|
||||
`install-service` can't start the agent from there. The agent is still installed and starts with
|
||||
the next restart of the Frame. To start it right away, run the command it prints:
|
||||
|
||||
```sh
|
||||
env XDG_RUNTIME_DIR=/run/user/$(id -u) DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus \
|
||||
flatpak run --user dev.framemate.Agent install-service
|
||||
```
|
||||
|
||||
Installing over SSH doesn't have this problem.
|
||||
|
||||
## Other issues
|
||||
|
||||
You encountered a different issue or think you found a bug, please let me know!
|
||||
Include steps to reproduce, the output of the agents `check` command and the logs (`journalctl --user -n 200 _COMM=framemate-agent`).
|
||||
+2
-2
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "framemate-app",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.5",
|
||||
"description": "",
|
||||
"type": "module",
|
||||
"scripts": {
|
||||
@@ -12,7 +12,7 @@
|
||||
"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
|
||||
"tauri": "tauri"
|
||||
},
|
||||
"license": "MIT",
|
||||
"license": "GPL-3.0-or-later",
|
||||
"devDependencies": {
|
||||
"@sveltejs/adapter-static": "^3.0.10",
|
||||
"@sveltejs/kit": "^2.65.1",
|
||||
|
||||
Generated
+1
-1
@@ -823,7 +823,7 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "framemate-app"
|
||||
version = "0.1.0"
|
||||
version = "0.1.5"
|
||||
dependencies = [
|
||||
"tauri",
|
||||
"tauri-build",
|
||||
|
||||
@@ -4,7 +4,8 @@
|
||||
[package]
|
||||
name = "framemate-app"
|
||||
description = "FrameMate companion app"
|
||||
version = "0.1.0"
|
||||
version = "0.1.5"
|
||||
license = "GPL-3.0-or-later"
|
||||
edition = "2024"
|
||||
|
||||
[lib]
|
||||
|
||||
@@ -66,8 +66,8 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
||||
targetCompatibility = JavaVersion.VERSION_1_8
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
buildFeatures {
|
||||
buildConfig = true
|
||||
@@ -76,7 +76,7 @@ android {
|
||||
|
||||
kotlin {
|
||||
compilerOptions {
|
||||
jvmTarget = JvmTarget.JVM_1_8
|
||||
jvmTarget = JvmTarget.JVM_17
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+2
-2
@@ -11,8 +11,8 @@
|
||||
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
|
||||
# public *;
|
||||
#}
|
||||
# FullscreenBridge, called from JS as `window.FrameMateAndroid` (see MainActivity.kt).
|
||||
-keepclassmembers class dev.framemate.app.MainActivity$FullscreenBridge {
|
||||
# NativeBridge, called from JS as `window.FrameMateAndroid` (see MainActivity.kt).
|
||||
-keepclassmembers class dev.framemate.app.MainActivity$NativeBridge {
|
||||
@android.webkit.JavascriptInterface <methods>;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.INTERNET" />
|
||||
|
||||
<!-- AndroidTV support -->
|
||||
<uses-feature android:name="android.software.leanback" android:required="false" />
|
||||
<!-- Android 17 (target SDK 37) blocks local network access by default, the
|
||||
app only talks to the Frame on the LAN, so this is required to connect.
|
||||
On Android 16 (SDK 36) this permission is an opt-in flag and has no
|
||||
effect, on older releases it is unknown and ignored. -->
|
||||
<uses-permission android:name="android.permission.ACCESS_LOCAL_NETWORK" />
|
||||
|
||||
<application
|
||||
android:icon="@mipmap/ic_launcher"
|
||||
@@ -20,8 +22,6 @@
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
<!-- AndroidTV support -->
|
||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
|
||||
|
||||
@@ -1,7 +1,12 @@
|
||||
package dev.framemate.app
|
||||
|
||||
import android.content.Intent
|
||||
import android.content.pm.ActivityInfo
|
||||
import android.content.pm.PackageManager
|
||||
import android.net.Uri
|
||||
import android.os.Build
|
||||
import android.os.Bundle
|
||||
import android.provider.Settings
|
||||
import android.webkit.JavascriptInterface
|
||||
import android.webkit.WebView
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
@@ -9,23 +14,30 @@ import androidx.core.view.WindowCompat
|
||||
import androidx.core.view.WindowInsetsCompat
|
||||
import androidx.core.view.WindowInsetsControllerCompat
|
||||
|
||||
// Android 17 (target SDK 37) blocks LAN traffic, WebView included, until this runtime
|
||||
// permission ("Nearby devices") is granted. Declared in AndroidManifest.xml.
|
||||
private const val LOCAL_NETWORK = "android.permission.ACCESS_LOCAL_NETWORK"
|
||||
private const val ANDROID_17 = 37
|
||||
|
||||
class MainActivity : TauriActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
enableEdgeToEdge()
|
||||
super.onCreate(savedInstanceState)
|
||||
// The WebView's reconnect loop picks the connection up once it's granted.
|
||||
if (!localNetworkAllowed()) requestPermissions(arrayOf(LOCAL_NETWORK), 1)
|
||||
}
|
||||
|
||||
private fun localNetworkAllowed() =
|
||||
Build.VERSION.SDK_INT < ANDROID_17 || checkSelfPermission(LOCAL_NETWORK) == PackageManager.PERMISSION_GRANTED
|
||||
|
||||
override fun onWebViewCreate(webView: WebView) {
|
||||
super.onWebViewCreate(webView)
|
||||
webView.addJavascriptInterface(FullscreenBridge(), "FrameMateAndroid")
|
||||
webView.addJavascriptInterface(NativeBridge(), "FrameMateAndroid")
|
||||
}
|
||||
|
||||
/**
|
||||
* The app is portrait-only (see AndroidManifest). The headset view calls
|
||||
* `FrameMateAndroid.setFullscreen(true)` to go landscape without system bars.
|
||||
* WebViews can't do this themselves: the Screen Orientation API is browser-only.
|
||||
*/
|
||||
inner class FullscreenBridge {
|
||||
/** `window.FrameMateAndroid`: things the WebView can't do itself. */
|
||||
inner class NativeBridge {
|
||||
/** Landscape without system bars for the headset view; WebViews can't lock orientation. */
|
||||
@JavascriptInterface
|
||||
fun setFullscreen(enabled: Boolean) = runOnUiThread {
|
||||
requestedOrientation =
|
||||
@@ -39,5 +51,23 @@ class MainActivity : TauriActivity() {
|
||||
bars.show(WindowInsetsCompat.Type.systemBars())
|
||||
}
|
||||
}
|
||||
|
||||
/** System browser instead of navigating the WebView away. */
|
||||
@JavascriptInterface
|
||||
fun openUrl(url: String) = runOnUiThread {
|
||||
val uri = Uri.parse(url)
|
||||
if (uri.scheme == "https" || uri.scheme == "http") {
|
||||
startActivity(Intent(Intent.ACTION_VIEW, uri))
|
||||
}
|
||||
}
|
||||
|
||||
@JavascriptInterface
|
||||
fun localNetworkAllowed() = this@MainActivity.localNetworkAllowed()
|
||||
|
||||
/** After two denials Android stops prompting; only the app's settings page is left. */
|
||||
@JavascriptInterface
|
||||
fun openAppSettings() = runOnUiThread {
|
||||
startActivity(Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS, Uri.fromParts("package", packageName, null)))
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,7 +1,7 @@
|
||||
{
|
||||
"$schema": "https://schema.tauri.app/config/2",
|
||||
"productName": "FrameMate",
|
||||
"version": "0.1.0",
|
||||
"version": "0.1.5",
|
||||
"identifier": "dev.framemate.app",
|
||||
"build": {
|
||||
"beforeDevCommand": "bun run dev",
|
||||
|
||||
Vendored
+7
-2
@@ -1,4 +1,3 @@
|
||||
// See https://svelte.dev/docs/kit/types#app.d.ts
|
||||
declare global {
|
||||
namespace App {
|
||||
interface PageState {
|
||||
@@ -9,7 +8,13 @@ declare global {
|
||||
|
||||
interface Window {
|
||||
/** Native bridge from MainActivity.kt (Android only). */
|
||||
FrameMateAndroid?: { setFullscreen(enabled: boolean): void };
|
||||
FrameMateAndroid?: {
|
||||
setFullscreen(enabled: boolean): void;
|
||||
openUrl(url: string): void;
|
||||
/** False on Android 17+ until "Nearby devices" (local network) is granted. */
|
||||
localNetworkAllowed?(): boolean;
|
||||
openAppSettings?(): void;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+85
-12
@@ -1,11 +1,14 @@
|
||||
// Connection to the framemate-agent on the Frame. Holds the latest state pushed over
|
||||
// `/api/ws` and reconnects on its own. Settings live in localStorage.
|
||||
// Connection to the agent: latest state from `/api/ws`, reconnects on its own.
|
||||
|
||||
import type { AgentState } from "./types";
|
||||
|
||||
const STORAGE_KEY = "framemate.connection";
|
||||
const DEFAULT_PORT = 7380;
|
||||
const RETRY_MS = 3000;
|
||||
/** A connect that hasn't opened by then is given up (a sleeping Frame never answers the SYN). */
|
||||
const CONNECT_TIMEOUT_MS = 8000;
|
||||
/** The agent pushes at least every ~10 s (power poll); silence beyond this means a dead socket. */
|
||||
const SILENCE_MS = 25000;
|
||||
|
||||
export interface ConnectionSettings {
|
||||
/** Hostname or IP, optionally with `:port`. */
|
||||
@@ -13,7 +16,8 @@ export interface ConnectionSettings {
|
||||
token: string;
|
||||
}
|
||||
|
||||
export type ConnectionStatus = "unconfigured" | "connecting" | "connected" | "offline";
|
||||
/** `unauthorized`: the agent answered but rejected the token. */
|
||||
export type ConnectionStatus = "unconfigured" | "connecting" | "connected" | "offline" | "unauthorized";
|
||||
|
||||
function loadSettings(): ConnectionSettings {
|
||||
try {
|
||||
@@ -28,20 +32,30 @@ class Agent {
|
||||
state = $state<AgentState | null>(null);
|
||||
status = $state<ConnectionStatus>("unconfigured");
|
||||
|
||||
/** When the last message arrived; tells live data from a snapshot left over from before. */
|
||||
receivedAt = $state(0);
|
||||
|
||||
#socket: WebSocket | null = null;
|
||||
#retry: ReturnType<typeof setTimeout> | undefined;
|
||||
#watchdog: ReturnType<typeof setTimeout> | undefined;
|
||||
|
||||
/** True while `state` is being kept current by an open connection. */
|
||||
get live() {
|
||||
return this.status === "connected";
|
||||
}
|
||||
|
||||
get configured() {
|
||||
return this.settings.host.trim() !== "" && this.settings.token.trim() !== "";
|
||||
}
|
||||
|
||||
/** `host:port` of the agent. */
|
||||
get authority() {
|
||||
const host = this.settings.host.trim();
|
||||
if (host.startsWith("[")) return /\]:\d+$/.test(host) ? host : `${host}:${DEFAULT_PORT}`;
|
||||
// A bare IPv6 address needs brackets before a port can follow.
|
||||
if ((host.match(/:/g) ?? []).length > 1) return `[${host}]:${DEFAULT_PORT}`;
|
||||
return /:\d+$/.test(host) ? host : `${host}:${DEFAULT_PORT}`;
|
||||
}
|
||||
|
||||
/** WebSocket URL for an agent endpoint, with the token attached. */
|
||||
socketUrl(path: string) {
|
||||
return `ws://${this.authority}${path}?token=${encodeURIComponent(this.settings.token.trim())}`;
|
||||
}
|
||||
@@ -52,6 +66,7 @@ class Agent {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify(this.settings));
|
||||
} catch {}
|
||||
this.state = null;
|
||||
this.status = "connecting";
|
||||
this.connect();
|
||||
}
|
||||
|
||||
@@ -61,23 +76,76 @@ class Agent {
|
||||
this.status = "unconfigured";
|
||||
return;
|
||||
}
|
||||
this.status = "connecting";
|
||||
// Retries keep showing the last failure instead of flickering back to "connecting".
|
||||
if (this.status !== "offline" && this.status !== "unauthorized") this.status = "connecting";
|
||||
const socket = new WebSocket(this.socketUrl("/api/ws"));
|
||||
this.#socket = socket;
|
||||
let opened = false;
|
||||
const lost = () => this.#lost(socket, opened);
|
||||
socket.onmessage = event => {
|
||||
if (this.#socket !== socket) return;
|
||||
this.state = JSON.parse(event.data);
|
||||
this.status = "connected";
|
||||
this.receivedAt = Date.now();
|
||||
this.#arm(socket, SILENCE_MS, lost);
|
||||
};
|
||||
socket.onclose = () => {
|
||||
if (this.#socket !== socket) return; // replaced by a newer connection
|
||||
this.#socket = null;
|
||||
this.status = "offline";
|
||||
this.#retry = setTimeout(() => this.connect(), RETRY_MS);
|
||||
};
|
||||
socket.onopen = () => (opened = true);
|
||||
socket.onclose = lost;
|
||||
this.#arm(socket, CONNECT_TIMEOUT_MS, lost);
|
||||
}
|
||||
|
||||
/**
|
||||
* Fresh snapshot after the app was in the background: Android freezes the WebView, so the old
|
||||
* socket may be dead without ever having fired `onclose` and would keep showing old data.
|
||||
* The current state stays visible (marked stale via `live`) until the new one arrives.
|
||||
*/
|
||||
refresh() {
|
||||
if (!this.configured) return;
|
||||
if (this.status === "connected") this.status = "connecting";
|
||||
this.connect();
|
||||
}
|
||||
|
||||
/** Give up on `socket` if nothing arrives within `ms`. */
|
||||
#arm(socket: WebSocket, ms: number, lost: () => void) {
|
||||
clearTimeout(this.#watchdog);
|
||||
this.#watchdog = setTimeout(() => {
|
||||
if (this.#socket !== socket) return;
|
||||
// On a dead TCP connection onclose can take minutes; don't wait for it.
|
||||
socket.onclose = null;
|
||||
socket.close();
|
||||
lost();
|
||||
}, ms);
|
||||
}
|
||||
|
||||
async #lost(socket: WebSocket, opened: boolean) {
|
||||
if (this.#socket !== socket) return; // replaced by a newer connection
|
||||
this.#socket = null;
|
||||
clearTimeout(this.#watchdog);
|
||||
// A rejected upgrade looks like any other failure to the WebSocket API; ask over HTTP.
|
||||
const status = opened ? "offline" : await this.#probe();
|
||||
if (this.#socket || this.#retry !== undefined) return; // reconnected meanwhile
|
||||
this.status = status;
|
||||
this.#retry = setTimeout(() => {
|
||||
this.#retry = undefined;
|
||||
this.connect();
|
||||
}, RETRY_MS);
|
||||
}
|
||||
|
||||
/** Wrong token (401) vs. unreachable; needs CORS on /api/state. */
|
||||
async #probe(): Promise<ConnectionStatus> {
|
||||
try {
|
||||
const url = `http://${this.authority}/api/state?token=${encodeURIComponent(this.settings.token.trim())}`;
|
||||
const response = await fetch(url, { signal: AbortSignal.timeout(RETRY_MS) });
|
||||
return response.status === 401 ? "unauthorized" : "offline";
|
||||
} catch {
|
||||
return "offline";
|
||||
}
|
||||
}
|
||||
|
||||
#close() {
|
||||
clearTimeout(this.#watchdog);
|
||||
clearTimeout(this.#retry);
|
||||
this.#retry = undefined;
|
||||
const socket = this.#socket;
|
||||
this.#socket = null;
|
||||
socket?.close();
|
||||
@@ -85,3 +153,8 @@ class Agent {
|
||||
}
|
||||
|
||||
export const agent = new Agent();
|
||||
|
||||
/** Android 17+ blocks the LAN until "Nearby devices" is granted; fails like a timeout. */
|
||||
export function localNetworkBlocked() {
|
||||
return window.FrameMateAndroid?.localNetworkAllowed?.() === false;
|
||||
}
|
||||
@@ -0,0 +1,51 @@
|
||||
<script lang="ts">
|
||||
// Small notice above the tab bar when the startup check found a newer release.
|
||||
import { goto } from "$app/navigation";
|
||||
import { updates } from "$lib/updates.svelte";
|
||||
|
||||
const what = $derived(
|
||||
updates.appOutdated && updates.agentOutdated ? "App and agent" : updates.appOutdated ? "App" : "Agent",
|
||||
);
|
||||
</script>
|
||||
|
||||
<div class="notice" role="status">
|
||||
<button class="body" onclick={() => goto("/settings")}>
|
||||
<strong>Update available: v{updates.latest?.version}</strong>
|
||||
<span>{what} can be updated. Tap for details.</span>
|
||||
</button>
|
||||
<button class="close" onclick={() => (updates.dismissed = true)} aria-label="Dismiss">✕</button>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.notice {
|
||||
display: flex;
|
||||
align-items: stretch;
|
||||
margin: 0 var(--gutter) 10px;
|
||||
background: var(--surface-2);
|
||||
border-left: 3px solid var(--accent);
|
||||
border-radius: 2px;
|
||||
box-shadow: 0 6px 20px rgba(0, 0, 0, 0.4);
|
||||
}
|
||||
.body {
|
||||
flex: 1;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 2px;
|
||||
padding: 10px 12px;
|
||||
background: none;
|
||||
border: 0;
|
||||
text-align: left;
|
||||
cursor: pointer;
|
||||
}
|
||||
.body span {
|
||||
font-size: 13px;
|
||||
color: var(--muted);
|
||||
}
|
||||
.close {
|
||||
padding: 0 14px;
|
||||
background: none;
|
||||
border: 0;
|
||||
color: var(--muted);
|
||||
cursor: pointer;
|
||||
}
|
||||
</style>
|
||||
@@ -0,0 +1,11 @@
|
||||
/** Opens `url` in the system browser: via the Android bridge, else a new browser tab/window. */
|
||||
export function openExternal(url: string) {
|
||||
if (window.FrameMateAndroid?.openUrl) window.FrameMateAndroid.openUrl(url);
|
||||
else window.open(url, "_blank", "noopener");
|
||||
}
|
||||
|
||||
/** onclick for `<a href>`: keeps the href, opens externally. */
|
||||
export function external(event: MouseEvent) {
|
||||
event.preventDefault();
|
||||
openExternal((event.currentTarget as HTMLAnchorElement).href);
|
||||
}
|
||||
@@ -14,7 +14,6 @@ glyph), width/height removed, `fill="currentColor"` added.
|
||||
| back.svg | `arrow_back` | 700 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-700@0.47.6/sharp/arrow_back.svg |
|
||||
| bell-badge.svg | `notifications_unread` (fill) | 400 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-400@0.47.6/sharp/notifications_unread-fill.svg |
|
||||
| cast.svg | `cast` | 700 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-700@0.47.6/sharp/cast.svg |
|
||||
| controller.svg | `stadia_controller` (fill) | 400 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-400@0.47.6/sharp/stadia_controller-fill.svg |
|
||||
| download.svg | `download` | 700 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-700@0.47.6/sharp/download.svg |
|
||||
| friends.svg | `group` (fill) | 400 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-400@0.47.6/sharp/group-fill.svg |
|
||||
| headset.svg | `head_mounted_device` (fill) | 400 | https://cdn.jsdelivr.net/npm/@material-symbols/svg-400@0.47.6/sharp/head_mounted_device-fill.svg |
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
<svg viewBox="8 8 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<defs>
|
||||
<linearGradient gradientUnits="userSpaceOnUse" x1="-819.2" x2="819.2" spreadMethod="pad" gradientTransform="matrix(-0.00244140625 -0.0042266845703125 0.005279541015625 -0.0030517578125 36 36)" id="controller-left-shade">
|
||||
<stop offset="0" stop-color="#FFFFFF"/>
|
||||
<stop offset="1" stop-color="#DAE2E9"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g>
|
||||
<path stroke="none" fill="#FFFFFF" d="M35.35 41.05 Q35.7 48.15 34.7 51.85 33.55 56.1 30.5 56 26.55 55.9 24.45 50.75 22.45 45.75 22 35.75 21.75 30.65 19.9 27.6 18 24.7 18 21 18 15.65 22.1 11.8 26.2 8 32 8 37.8 8 41.9 11.8 46 15.65 46 21 46 26.4 41.9 30.2 L38.45 32.65 37.75 32.95 37.7 32.95 Q34.95 34.15 35.2 38.75 L35.35 41.05 M33 27.5 Q33 26.45 32.25 25.7 31.5 25 30.5 25 29.45 25 28.7 25.7 28 26.45 28 27.5 28 28.55 28.7 29.25 29.45 30 30.5 30 31.5 30 32.25 29.25 33 28.55 33 27.5 M40 21.5 Q40 20.05 38.95 19 37.9 18 36.5 18 35.05 18 34 19 33 20.05 33 21.5 33 22.95 34 23.95 35.05 25 36.5 25 37.9 25 38.95 23.95 40 22.95 40 21.5 M25.6 14 Q24.95 14 24.5 14.55 24 15.1 24 15.85 L24 17 22.85 17 Q22.15 17 21.55 17.5 21 17.95 21 18.6 L21 19.4 Q21 20.05 21.55 20.5 22.15 21 22.85 21 L24 21 24 22.15 Q24 22.85 24.5 23.45 24.95 24 25.6 24 L26.4 24 Q27.05 24 27.5 23.45 28 22.85 28 22.15 L28 21 29.15 21 Q29.9 21 30.45 20.5 31 20.05 31 19.4 L31 18.6 Q31 17.95 30.45 17.5 29.9 17 29.15 17 L28 17 28 15.85 Q28 15.1 27.5 14.55 27.05 14 26.4 14 L25.6 14"/>
|
||||
<path stroke="none" fill="url(#controller-left-shade)" d="M35.35 41.05 L35.2 38.75 Q34.95 34.15 37.7 32.95 L37.75 32.95 38.45 32.65 39.85 37.75 Q40.45 39.8 38.3 40.35 L36.2 40.9 35.35 41.05"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.7 KiB |
@@ -0,0 +1,12 @@
|
||||
<svg viewBox="8 8 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
|
||||
<defs>
|
||||
<linearGradient gradientUnits="userSpaceOnUse" x1="-819.2" x2="819.2" spreadMethod="pad" gradientTransform="matrix(0.00244140625 -0.0042266845703125 -0.005279541015625 -0.0030517578125 28 36)" id="controller-right-shade">
|
||||
<stop offset="0" stop-color="#FFFFFF"/>
|
||||
<stop offset="1" stop-color="#DAE2E9"/>
|
||||
</linearGradient>
|
||||
</defs>
|
||||
<g>
|
||||
<path stroke="none" fill="#FFFFFF" d="M25.55 32.65 Q23.7 31.7 22.1 30.2 18 26.4 18 21 18 15.65 22.1 11.8 26.2 8 32 8 37.8 8 41.9 11.8 46 15.65 46 21 46 24.7 44.1 27.6 42.25 30.65 42 35.75 41.55 45.75 39.55 50.75 37.45 55.9 33.5 56 30.45 56.1 29.3 51.85 28.3 48.15 28.65 41.05 L28.8 38.75 Q29.05 34.15 26.3 32.95 L26.25 32.95 25.55 32.65 M39 20.5 Q39 21.55 39.75 22.25 40.5 23 41.5 23 42.55 23 43.3 22.25 44 21.55 44 20.5 44 19.45 43.3 18.7 42.55 18 41.5 18 40.5 18 39.75 18.7 39 19.45 39 20.5 M23 25.5 Q23 26.95 24.05 27.95 25.1 29 26.5 29 27.95 29 29 27.95 30 26.95 30 25.5 30 24.05 29 23 27.95 22 26.5 22 25.1 22 24.05 23 23 24.05 23 25.5 M35 16.5 Q35 17.55 35.75 18.25 36.5 19 37.5 19 38.55 19 39.3 18.25 40 17.55 40 16.5 40 15.45 39.3 14.7 38.55 14 37.5 14 36.5 14 35.75 14.7 35 15.45 35 16.5 M31 20.5 Q31 21.55 31.75 22.25 32.5 23 33.5 23 34.55 23 35.3 22.25 36 21.55 36 20.5 36 19.45 35.3 18.7 34.55 18 33.5 18 32.5 18 31.75 18.7 31 19.45 31 20.5 M35 24.5 Q35 25.55 35.75 26.25 36.5 27 37.5 27 38.55 27 39.3 26.25 40 25.55 40 24.5 40 23.45 39.3 22.7 38.55 22 37.5 22 36.5 22 35.75 22.7 35 23.45 35 24.5"/>
|
||||
<path stroke="none" fill="url(#controller-right-shade)" d="M28.65 41.05 L27.8 40.9 25.7 40.35 Q23.55 39.8 24.15 37.75 L25.55 32.65 26.25 32.95 26.3 32.95 Q29.05 34.15 28.8 38.75 L28.65 41.05"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
After Width: | Height: | Size: 1.8 KiB |
@@ -1 +0,0 @@
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="36 -924 888 888" fill="currentColor"><path d="M189-160q-60 0-102.5-43T42-307q0-9 1-18t3-18l84-336q14-54 57-87.5t98-33.5h390q55 0 98 33.5t57 87.5l84 336q2 9 3.5 18.5T919-306q0 61-43.5 103.5T771-160q-42 0-78-22t-54-60l-28-58q-5-10-15-15t-21-5H385q-11 0-21 5t-15 15l-28 58q-18 38-54 60t-78 22Zm372.5-378.68q8.5-8.67 8.5-21.5 0-12.82-8.68-21.32-8.67-8.5-21.5-8.5-12.82 0-21.32 8.68-8.5 8.67-8.5 21.5 0 12.82 8.68 21.32 8.67 8.5 21.5 8.5 12.82 0 21.32-8.68Zm80-80q8.5-8.67 8.5-21.5 0-12.82-8.68-21.32-8.67-8.5-21.5-8.5-12.82 0-21.32 8.68-8.5 8.67-8.5 21.5 0 12.82 8.68 21.32 8.67 8.5 21.5 8.5 12.82 0 21.32-8.68Zm0 160q8.5-8.67 8.5-21.5 0-12.82-8.68-21.32-8.67-8.5-21.5-8.5-12.82 0-21.32 8.68-8.5 8.67-8.5 21.5 0 12.82 8.68 21.32 8.67 8.5 21.5 8.5 12.82 0 21.32-8.68Zm80-80q8.5-8.67 8.5-21.5 0-12.82-8.68-21.32-8.67-8.5-21.5-8.5-12.82 0-21.32 8.68-8.5 8.67-8.5 21.5 0 12.82 8.68 21.32 8.67 8.5 21.5 8.5 12.82 0 21.32-8.68ZM358-472.08q7-7.09 7-17.92v-45h45q10.83 0 17.92-7.12 7.08-7.11 7.08-18 0-10.88-7.08-17.88-7.09-7-17.92-7h-45v-45q0-10.83-7.12-17.92-7.11-7.08-18-7.08-10.88 0-17.88 7.08-7 7.09-7 17.92v45h-45q-10.83 0-17.92 7.12-7.08 7.11-7.08 18 0 10.88 7.08 17.88 7.09 7 17.92 7h45v45q0 10.83 7.12 17.92 7.11 7.08 18 7.08 10.88 0 17.88-7.08Z"/></svg>
|
||||
|
Before Width: | Height: | Size: 1.3 KiB |
@@ -1,6 +1,4 @@
|
||||
// Shape of the agent's `/api/ws` / `/api/state` JSON (see crates/agent/src/hub.rs and
|
||||
// shim.js). Steam topics are loosely typed on the agent side; every field may be
|
||||
// missing when Steam isn't connected or an API changed, hence the many optionals.
|
||||
// Agent JSON (hub.rs, shim.js). Steam fields can be missing at any time, hence the optionals.
|
||||
|
||||
export interface AgentState {
|
||||
agent: { version: string; hostname: string; started_at_ms: number; updated_at_ms: number };
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
// Update check against the latest GitHub release tag
|
||||
|
||||
import tauriConf from "../../src-tauri/tauri.conf.json";
|
||||
import { agent } from "./agent.svelte";
|
||||
|
||||
const LATEST_URL = "https://api.github.com/repos/nailuj05/framemate/releases/latest";
|
||||
const STORAGE_KEY = "framemate.updates";
|
||||
const TIMEOUT_MS = 10_000;
|
||||
|
||||
/** Same source as the APK's versionName. */
|
||||
export const APP_VERSION: string = tauriConf.version;
|
||||
|
||||
export interface Release {
|
||||
version: string;
|
||||
/** Release page on GitHub (APK + Flatpak downloads). */
|
||||
url: string;
|
||||
}
|
||||
|
||||
function parse(version: string): number[] | null {
|
||||
const m = /^v?(\d+)\.(\d+)\.(\d+)/.exec(version.trim());
|
||||
return m ? m.slice(1).map(Number) : null;
|
||||
}
|
||||
|
||||
/** True if `a` is a higher x.y.z than `b`; false if either doesn't parse. */
|
||||
export function isNewer(a: string, b: string): boolean {
|
||||
const [x, y] = [parse(a), parse(b)];
|
||||
if (!x || !y) return false;
|
||||
for (let i = 0; i < 3; i++) if (x[i] !== y[i]) return x[i] > y[i];
|
||||
return false;
|
||||
}
|
||||
|
||||
function loadAutoCheck(): boolean {
|
||||
try {
|
||||
return JSON.parse(localStorage.getItem(STORAGE_KEY) ?? "{}").autoCheck !== false;
|
||||
} catch {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
class Updates {
|
||||
autoCheck = $state(loadAutoCheck());
|
||||
latest = $state<Release | null>(null);
|
||||
checking = $state(false);
|
||||
error = $state<string | null>(null);
|
||||
/** The startup notice was closed for this session. */
|
||||
dismissed = $state(false);
|
||||
|
||||
appOutdated = $derived(!!this.latest && isNewer(this.latest.version, APP_VERSION));
|
||||
/** Only known while connected. */
|
||||
agentOutdated = $derived(
|
||||
!!this.latest && !!agent.state && isNewer(this.latest.version, agent.state.agent.version),
|
||||
);
|
||||
available = $derived(this.appOutdated || this.agentOutdated);
|
||||
|
||||
setAutoCheck(enabled: boolean) {
|
||||
this.autoCheck = enabled;
|
||||
try {
|
||||
localStorage.setItem(STORAGE_KEY, JSON.stringify({ autoCheck: enabled }));
|
||||
} catch {}
|
||||
}
|
||||
|
||||
async check() {
|
||||
if (this.checking) return;
|
||||
this.checking = true;
|
||||
this.error = null;
|
||||
try {
|
||||
const response = await fetch(LATEST_URL, {
|
||||
headers: { Accept: "application/vnd.github+json" },
|
||||
signal: AbortSignal.timeout(TIMEOUT_MS),
|
||||
});
|
||||
if (!response.ok) throw new Error(`GitHub answered ${response.status}`);
|
||||
const release = await response.json();
|
||||
const version = String(release.tag_name ?? "").replace(/^v/, "");
|
||||
if (!parse(version)) throw new Error(`unexpected release tag "${release.tag_name}"`);
|
||||
this.latest = { version, url: release.html_url };
|
||||
} catch (e) {
|
||||
// TypeError = network failure; TimeoutError = no answer within TIMEOUT_MS.
|
||||
const unreachable = e instanceof TypeError || (e instanceof Error && e.name === "TimeoutError");
|
||||
this.error = unreachable ? "Couldn't reach GitHub" : e instanceof Error ? e.message : String(e);
|
||||
} finally {
|
||||
this.checking = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
export const updates = new Updates();
|
||||
@@ -6,6 +6,8 @@
|
||||
import { agent } from "$lib/agent.svelte";
|
||||
import Battery from "$lib/components/Battery.svelte";
|
||||
import Icon from "$lib/components/Icon.svelte";
|
||||
import UpdateNotice from "$lib/components/UpdateNotice.svelte";
|
||||
import { updates } from "$lib/updates.svelte";
|
||||
|
||||
let { children }: { children: Snippet } = $props();
|
||||
|
||||
@@ -18,16 +20,27 @@
|
||||
];
|
||||
|
||||
const battery = $derived(agent.state?.steam.topics.battery);
|
||||
// Old data stays visible while reconnecting, dimmed and with its age in the top bar.
|
||||
const stale = $derived(!!agent.state && !agent.live);
|
||||
const lastUpdate = $derived(
|
||||
new Date(agent.receivedAt).toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" }),
|
||||
);
|
||||
|
||||
onMount(() => {
|
||||
agent.connect();
|
||||
if (updates.autoCheck) updates.check();
|
||||
if (!agent.configured) goto("/settings");
|
||||
// Mobile WebViews drop sockets in the background; reconnect when we come back.
|
||||
// Coming back from the background: the socket may be dead without knowing it, so always
|
||||
// fetch a fresh snapshot instead of trusting the old one.
|
||||
const onVisible = () => {
|
||||
if (document.visibilityState === "visible" && agent.status !== "connected") agent.connect();
|
||||
if (document.visibilityState === "visible") agent.refresh();
|
||||
};
|
||||
document.addEventListener("visibilitychange", onVisible);
|
||||
return () => document.removeEventListener("visibilitychange", onVisible);
|
||||
window.addEventListener("online", onVisible);
|
||||
return () => {
|
||||
document.removeEventListener("visibilitychange", onVisible);
|
||||
window.removeEventListener("online", onVisible);
|
||||
};
|
||||
});
|
||||
</script>
|
||||
|
||||
@@ -37,21 +50,28 @@
|
||||
<a href="/" class="title">FrameMate</a>
|
||||
<span class="spacer"></span>
|
||||
{#if battery}
|
||||
<span class="battery">
|
||||
<span class="battery" class:stale>
|
||||
{Math.round(battery.level * 100)}%
|
||||
<Battery level={battery.level} charging={battery.ac_state === 2} size={18} />
|
||||
</span>
|
||||
{/if}
|
||||
{#if stale}
|
||||
<span class="stale-note">{agent.status === "connecting" ? "Updating…" : lastUpdate}</span>
|
||||
{/if}
|
||||
<span class="status {agent.status}" title={agent.status}></span>
|
||||
<a href="/help" class="help" class:active={true} aria-label="Help" >
|
||||
<Icon name="help" size={20} />
|
||||
</a>
|
||||
</header>
|
||||
|
||||
<main>
|
||||
<main class:stale>
|
||||
{@render children()}
|
||||
</main>
|
||||
|
||||
{#if updates.available && !updates.dismissed && page.url.pathname !== "/settings"}
|
||||
<UpdateNotice />
|
||||
{/if}
|
||||
|
||||
<nav class="tabs">
|
||||
{#each tabs as tab}
|
||||
<a href={tab.href} class:active={page.url.pathname === tab.href} aria-label={tab.label}>
|
||||
@@ -101,10 +121,11 @@
|
||||
.status.connected {
|
||||
background: var(--green);
|
||||
}
|
||||
.status.offline {
|
||||
.status.offline,
|
||||
.status.unauthorized {
|
||||
background: var(--red);
|
||||
}
|
||||
/* Flex, so the icon isn't placed on a text line (line-height would shift it off-center). */
|
||||
/* Flex: on a text line, line-height pushes the icon off-center. */
|
||||
.help {
|
||||
display: flex;
|
||||
}
|
||||
@@ -113,6 +134,22 @@
|
||||
overflow-y: auto;
|
||||
padding-bottom: 24px;
|
||||
}
|
||||
/* Delayed, so the usual quick refresh on resume doesn't flash. */
|
||||
main.stale,
|
||||
.battery.stale {
|
||||
opacity: 0.45;
|
||||
transition: opacity 0.2s 0.8s;
|
||||
}
|
||||
.stale-note {
|
||||
color: var(--muted);
|
||||
font-size: 13px;
|
||||
animation: appear 0.2s 0.8s both;
|
||||
}
|
||||
@keyframes appear {
|
||||
from {
|
||||
opacity: 0;
|
||||
}
|
||||
}
|
||||
.tabs {
|
||||
display: flex;
|
||||
background: var(--topbar);
|
||||
|
||||
@@ -1,5 +1,2 @@
|
||||
// Tauri doesn't have a Node.js server to do proper SSR
|
||||
// so we use adapter-static with a fallback to index.html to put the site in SPA mode
|
||||
// See: https://svelte.dev/docs/kit/single-page-apps
|
||||
// See: https://v2.tauri.app/start/frontend/sveltekit/ for more info
|
||||
// SPA (adapter-static): no server inside Tauri.
|
||||
export const ssr = false;
|
||||
@@ -1,5 +1,5 @@
|
||||
<script lang="ts">
|
||||
import { agent } from "$lib/agent.svelte";
|
||||
import { agent, localNetworkBlocked } from "$lib/agent.svelte";
|
||||
import Battery from "$lib/components/Battery.svelte";
|
||||
import GameArt from "$lib/components/GameArt.svelte";
|
||||
import Icon from "$lib/components/Icon.svelte";
|
||||
@@ -29,7 +29,13 @@
|
||||
|
||||
{#if !agent.state}
|
||||
<p class="empty">
|
||||
{agent.status === "unconfigured" ? "Set up the connection in Settings." : "Connecting to your Frame…"}
|
||||
{agent.status === "unconfigured"
|
||||
? "Set up the connection in Settings."
|
||||
: agent.status === "unauthorized"
|
||||
? "The Frame rejected the token. Check it in Settings."
|
||||
: agent.status === "offline" && localNetworkBlocked()
|
||||
? "Android blocks the local network. Allow Nearby devices for FrameMate (see Settings)."
|
||||
: "Connecting to your Frame…"}
|
||||
</p>
|
||||
{:else}
|
||||
<Section title="Steam Frame">
|
||||
@@ -66,7 +72,7 @@
|
||||
<div class="controllers">
|
||||
{#each controllers as c (c.path)}
|
||||
<div class="controller">
|
||||
<Icon name="controller" size={28} />
|
||||
<Icon name={c.model?.endsWith("_Right") ? "controller-right" : "controller-left"} size={28} />
|
||||
<div>
|
||||
<div>{controllerName(c.model)}</div>
|
||||
<div class="muted small">
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import Section from "$lib/components/Section.svelte";
|
||||
import Row from "$lib/components/Row.svelte";
|
||||
import { external } from "$lib/external";
|
||||
</script>
|
||||
|
||||
<Section title="Installation">
|
||||
@@ -13,16 +14,16 @@
|
||||
|
||||
<Section title="Token">
|
||||
<p>
|
||||
FrameMate uses a token for communicating with your Steam Frame. This token is show on installation or by running
|
||||
<code>flatpak run dev.framemate.Agent token</code> on the headset with framemate-agent installed.
|
||||
FrameMate uses a token for communicating with your Steam Frame. This token is shown on installation or by running
|
||||
<code>flatpak run --user dev.framemate.Agent token</code> on the headset with framemate-agent installed.
|
||||
Write it down, you will need it to connect the app with the headset.
|
||||
</p>
|
||||
</Section>
|
||||
|
||||
<Section title="Connecting">
|
||||
<p>
|
||||
Once the agent is installed on the headset, you aquired the token and the app is ready on your phone you can connect the two.
|
||||
The connection requires the Frame's address, usually this will be frame.local, if that doesn't work try your headsets IP address directly.
|
||||
Once the agent is installed on the headset, you acquired the token and the app is ready on your phone you can connect the two.
|
||||
The connection requires the Frame's address, usually this will be frame.local, if that doesn't work try your headset's IP address directly.
|
||||
You can find out your IP by running <code>ip a</code>. Both headset and phone need to be in the same local network for the connection to work.
|
||||
</p>
|
||||
</Section>
|
||||
@@ -30,13 +31,12 @@
|
||||
<Section title="Issues">
|
||||
<p>
|
||||
If you encounter any issues with the app or agent, please submit a GitHub Issue so I can get it fixed. <br>
|
||||
<a href="https://github.com/nailuj05/framemate/issues/new">Submit an Issue here</a>
|
||||
<a href="https://github.com/nailuj05/framemate/issues/new" onclick={external}>Submit an Issue here</a>
|
||||
</p>
|
||||
</Section>
|
||||
|
||||
<style>
|
||||
p {
|
||||
gap: 12px;
|
||||
min-height: 48px;
|
||||
padding: 8px var(--gutter);
|
||||
background: var(--surface);
|
||||
@@ -44,6 +44,6 @@
|
||||
color: var(--text);
|
||||
}
|
||||
a {
|
||||
color: #0000EE;
|
||||
color: var(--accent);
|
||||
}
|
||||
</style>
|
||||
@@ -1,49 +0,0 @@
|
||||
<script lang="ts">
|
||||
import Section from "$lib/components/Section.svelte";
|
||||
import Row from "$lib/components/Row.svelte";
|
||||
</script>
|
||||
|
||||
<Section title="Installation">
|
||||
<p>
|
||||
This app cannot natively connect to the Steam Frame. It needs a helper called framemate-agent, a small service running on the Frame, providing the information and connection to the headset for this app. <br>
|
||||
The agent is shipped as a Flatpak that you will need to install on your Steam Frame. The easiest way to install it is through SSH if you have that setup to your Frame, otherwise the Desktop Mode Terminal will also work. <br>
|
||||
<b>Check out the GitHub page for exact install instructions</b>
|
||||
</p>
|
||||
</Section>
|
||||
|
||||
<Section title="Token">
|
||||
<p>
|
||||
FrameMate uses a token for communicating with your Steam Frame. This token is show on installation or by running
|
||||
<code>flatpak run dev.framemate.Agent token</code> on the headset with framemate-agent installed.
|
||||
Write it down, you will need it to connect the app with the headset.
|
||||
</p>
|
||||
</Section>
|
||||
|
||||
<Section title="Connecting">
|
||||
<p>
|
||||
Once the agent is installed on the headset, you aquired the token and the app is ready on your phone you can connect the two.
|
||||
The connection requires the Frame's address, usually this will be frame.local, if that doesn't work try your headsets IP address directly.
|
||||
You can find out your IP by running <code>ip a</code>. Both headset and phone need to be in the same local network for the connection to work.
|
||||
</p>
|
||||
</Section>
|
||||
|
||||
<Section title="Issues">
|
||||
<p>
|
||||
If you encounter any issues with the app or agent, please submit a GitHub Issue so I can get it fixed. <br>
|
||||
<a href="https://github.com/nailuj05/framemate/issues/new">Submit an Issue here</a>
|
||||
</p>
|
||||
</Section>
|
||||
|
||||
<style>
|
||||
p {
|
||||
gap: 16px;
|
||||
min-height: 48px;
|
||||
padding: 8px var(--gutter);
|
||||
background: var(--surface);
|
||||
border-bottom: 1px solid var(--divider);
|
||||
color: var(--text);
|
||||
}
|
||||
a {
|
||||
color: #0000EE;
|
||||
}
|
||||
</style>
|
||||
@@ -1,7 +1,9 @@
|
||||
<script lang="ts">
|
||||
import { agent } from "$lib/agent.svelte";
|
||||
import { agent, localNetworkBlocked } from "$lib/agent.svelte";
|
||||
import Row from "$lib/components/Row.svelte";
|
||||
import Section from "$lib/components/Section.svelte";
|
||||
import { openExternal } from "$lib/external";
|
||||
import { APP_VERSION, updates } from "$lib/updates.svelte";
|
||||
|
||||
let host = $state(agent.settings.host);
|
||||
let token = $state(agent.settings.token);
|
||||
@@ -11,7 +13,10 @@
|
||||
unconfigured: "Enter host and token",
|
||||
connecting: "Connecting…",
|
||||
connected: `Connected to ${agent.state?.agent.hostname ?? agent.authority}`,
|
||||
offline: `Can't reach ${agent.authority}`,
|
||||
offline: agent.settings.host.includes(".local")
|
||||
? `Can't reach ${agent.authority}. Try the Frame's IP address instead.`
|
||||
: `Can't reach ${agent.authority}`,
|
||||
unauthorized: "Wrong token. Check it on the Frame (see below).",
|
||||
}[agent.status],
|
||||
);
|
||||
|
||||
@@ -32,13 +37,57 @@
|
||||
<input bind:value={token} placeholder="XXXXX-XXXXX" autocapitalize="characters" autocorrect="off" spellcheck="false" />
|
||||
</label>
|
||||
<button class="button" type="submit">Save & connect</button>
|
||||
<p class="hint">Show the token on the Frame with <code>flatpak run dev.framemate.Agent token</code>.</p>
|
||||
<p class="status {agent.status}">{statusText}</p>
|
||||
<p class="hint">Show the token on the Frame with <code>flatpak run --user dev.framemate.Agent token</code>.</p>
|
||||
{#if agent.status === "offline" && localNetworkBlocked()}
|
||||
<p class="status offline">
|
||||
Android blocks FrameMate from your local network. Allow <b>Nearby devices</b> in the app's permissions.
|
||||
</p>
|
||||
<button class="button secondary" type="button" onclick={() => window.FrameMateAndroid?.openAppSettings?.()}>
|
||||
Open app settings
|
||||
</button>
|
||||
{:else}
|
||||
<p class="status {agent.status}">{statusText}</p>
|
||||
{/if}
|
||||
</form>
|
||||
</Section>
|
||||
|
||||
<Section title="About">
|
||||
<Row label="Agent version" value={agent.state?.agent.version} />
|
||||
<Section title="Updates">
|
||||
<Row label="App version" value={APP_VERSION} />
|
||||
<Row label="Agent version" value={agent.state?.agent.version ?? "not connected"} />
|
||||
<Row label="Latest release">
|
||||
{#if updates.checking}
|
||||
Checking…
|
||||
{:else if updates.error}
|
||||
<span class="error">{updates.error}</span>
|
||||
{:else if updates.latest}
|
||||
v{updates.latest.version}
|
||||
{#if updates.available}<span class="badge">new</span>{:else}· up to date{/if}
|
||||
{:else}
|
||||
not checked
|
||||
{/if}
|
||||
</Row>
|
||||
<label class="row toggle">
|
||||
<span>Check for updates on start</span>
|
||||
<input
|
||||
type="checkbox"
|
||||
role="switch"
|
||||
checked={updates.autoCheck}
|
||||
onchange={event => updates.setAutoCheck(event.currentTarget.checked)}
|
||||
/>
|
||||
</label>
|
||||
<div class="actions">
|
||||
{#if updates.available && updates.latest}
|
||||
<p class="hint">
|
||||
{#if updates.appOutdated}Download the new <code>framemate.apk</code> from the release page.{/if}
|
||||
{#if updates.agentOutdated}Update the agent on the Frame: download the new
|
||||
<code>framemate-agent.flatpak</code> and run the install commands again (see Help).{/if}
|
||||
</p>
|
||||
<button class="button" onclick={() => openExternal(updates.latest!.url)}>Open release page</button>
|
||||
{/if}
|
||||
<button class="button secondary" onclick={() => updates.check()} disabled={updates.checking}>
|
||||
{updates.checking ? "Checking…" : "Check for updates"}
|
||||
</button>
|
||||
</div>
|
||||
</Section>
|
||||
|
||||
<style>
|
||||
@@ -81,7 +130,82 @@
|
||||
.status.connected {
|
||||
color: var(--green);
|
||||
}
|
||||
.status.offline {
|
||||
.status.offline,
|
||||
.status.unauthorized {
|
||||
color: var(--red);
|
||||
}
|
||||
.error {
|
||||
color: var(--red);
|
||||
}
|
||||
.badge {
|
||||
margin-left: 6px;
|
||||
padding: 1px 6px;
|
||||
border-radius: 2px;
|
||||
background: var(--accent);
|
||||
color: #fff;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
text-transform: uppercase;
|
||||
}
|
||||
/* Same look as Row, with a SteamOS-style switch on the right. */
|
||||
.toggle {
|
||||
display: flex;
|
||||
flex-direction: row;
|
||||
justify-content: space-between;
|
||||
align-items: center;
|
||||
gap: 16px;
|
||||
min-height: 48px;
|
||||
padding: 0 var(--gutter);
|
||||
background: var(--surface);
|
||||
border-bottom: 1px solid var(--divider);
|
||||
}
|
||||
.toggle span {
|
||||
font-size: inherit;
|
||||
color: var(--text);
|
||||
}
|
||||
.toggle input {
|
||||
appearance: none;
|
||||
position: relative;
|
||||
flex: none;
|
||||
width: 44px;
|
||||
min-height: 0;
|
||||
height: 24px;
|
||||
padding: 0;
|
||||
border: 0;
|
||||
border-radius: 12px;
|
||||
background: var(--track);
|
||||
cursor: pointer;
|
||||
transition: background 0.15s;
|
||||
}
|
||||
.toggle input::after {
|
||||
content: "";
|
||||
position: absolute;
|
||||
top: 3px;
|
||||
left: 3px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
border-radius: 50%;
|
||||
background: #fff;
|
||||
transition: transform 0.15s;
|
||||
}
|
||||
.toggle input:checked {
|
||||
background: var(--accent);
|
||||
}
|
||||
.toggle input:checked::after {
|
||||
transform: translateX(20px);
|
||||
}
|
||||
.actions {
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
gap: 10px;
|
||||
padding: 16px var(--gutter);
|
||||
background: var(--surface);
|
||||
}
|
||||
.button.secondary {
|
||||
background: var(--surface-2);
|
||||
}
|
||||
.button:disabled {
|
||||
opacity: 0.6;
|
||||
cursor: default;
|
||||
}
|
||||
</style>
|
||||
@@ -1,8 +1,6 @@
|
||||
<script lang="ts">
|
||||
// Live headset view. Same protocol as the agent's /stream page: a JSON header with the
|
||||
// codec string, an fMP4 init segment, then one moof+mdat per frame, fed into MSE.
|
||||
// The agent only captures while a viewer is connected, so leaving this tab stops it.
|
||||
// The app is portrait-only; fullscreen switches to landscape (natively on Android).
|
||||
// Same protocol as the agent's /stream page (JSON {codec}, fMP4 init, moof+mdat → MSE).
|
||||
// The agent only captures while someone watches, so leaving this page stops it.
|
||||
import { onDestroy, onMount } from "svelte";
|
||||
import { pushState } from "$app/navigation";
|
||||
import { page } from "$app/state";
|
||||
@@ -16,6 +14,7 @@
|
||||
let socket: WebSocket | null = null;
|
||||
let retry: ReturnType<typeof setTimeout> | undefined;
|
||||
let closed = false;
|
||||
let objectUrl: string | undefined;
|
||||
const stats = $derived(agent.state?.stream);
|
||||
const fullscreen = $derived(!!page.state.fullscreen);
|
||||
|
||||
@@ -67,7 +66,9 @@
|
||||
return;
|
||||
}
|
||||
const source = new MediaSource();
|
||||
video.src = URL.createObjectURL(source);
|
||||
if (objectUrl) URL.revokeObjectURL(objectUrl); // previous connection's source
|
||||
objectUrl = URL.createObjectURL(source);
|
||||
video.src = objectUrl;
|
||||
source.addEventListener(
|
||||
"sourceopen",
|
||||
() => {
|
||||
@@ -90,8 +91,7 @@
|
||||
};
|
||||
}
|
||||
|
||||
// Catch up by playing slightly faster; seeking on every frame restarts decoding at the
|
||||
// last keyframe and drops the picture to a few fps.
|
||||
// Catch up by playing faster; seeking restarts decoding at the last keyframe.
|
||||
function keepLive(buffer: SourceBuffer) {
|
||||
if (buffer.updating || !buffer.buffered.length) return;
|
||||
const start = buffer.buffered.start(0);
|
||||
@@ -103,16 +103,31 @@
|
||||
if (video.currentTime - start > 10) buffer.remove(start, video.currentTime - 5);
|
||||
}
|
||||
|
||||
// In the background the socket dies or, worse, keeps the Frame capturing for nobody:
|
||||
// stop it, and start fresh (new keyframe, no stale buffer) when the app comes back.
|
||||
function onVisibilityChange() {
|
||||
if (closed) return;
|
||||
clearTimeout(retry);
|
||||
if (socket) socket.onclose = null;
|
||||
socket?.close();
|
||||
socket = null;
|
||||
if (document.visibilityState === "visible") {
|
||||
status = "Connecting…";
|
||||
connect();
|
||||
}
|
||||
}
|
||||
|
||||
onMount(connect);
|
||||
onDestroy(() => {
|
||||
if (fullscreen) applyFullscreen(false);
|
||||
closed = true;
|
||||
clearTimeout(retry);
|
||||
socket?.close();
|
||||
if (objectUrl) URL.revokeObjectURL(objectUrl);
|
||||
});
|
||||
</script>
|
||||
|
||||
<svelte:document onfullscreenchange={onFullscreenChange} />
|
||||
<svelte:document onfullscreenchange={onFullscreenChange} onvisibilitychange={onVisibilityChange} />
|
||||
|
||||
<div class="player" class:fullscreen>
|
||||
<video bind:this={video} autoplay muted playsinline></video>
|
||||
|
||||
+2
-6
@@ -4,15 +4,12 @@ import { sveltekit } from "@sveltejs/kit/vite";
|
||||
import process from "node:process";
|
||||
const host = process.env.TAURI_DEV_HOST;
|
||||
|
||||
// https://vite.dev/config/
|
||||
export default defineConfig(() => ({
|
||||
plugins: [sveltekit()],
|
||||
|
||||
// Vite options tailored for Tauri development and only applied in `tauri dev` or `tauri build`
|
||||
//
|
||||
// 1. prevent Vite from obscuring rust errors
|
||||
// Don't hide Rust errors.
|
||||
clearScreen: false,
|
||||
// 2. tauri expects a fixed port, fail if that port is not available
|
||||
// Tauri expects this fixed port.
|
||||
server: {
|
||||
port: 1420,
|
||||
strictPort: true,
|
||||
@@ -25,7 +22,6 @@ export default defineConfig(() => ({
|
||||
}
|
||||
: undefined,
|
||||
watch: {
|
||||
// 3. tell Vite to ignore watching `src-tauri`
|
||||
ignored: ["**/src-tauri/**"],
|
||||
},
|
||||
},
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
name = "framemate-agent"
|
||||
version.workspace = true
|
||||
edition.workspace = true
|
||||
license.workspace = true
|
||||
|
||||
[dependencies]
|
||||
anyhow = "1.0.104"
|
||||
@@ -10,6 +11,7 @@ futures-util = "0.3.34"
|
||||
libc = "0.2.190"
|
||||
serde = { version = "1.0.229", features = ["derive"] }
|
||||
serde_json = "1.0.151"
|
||||
socket2 = "0.6.5"
|
||||
tokio = { version = "1.53.1", features = ["macros", "rt-multi-thread", "net", "time", "sync", "io-util", "signal"] }
|
||||
tokio-tungstenite = "0.30.0"
|
||||
tracing = "0.1.44"
|
||||
|
||||
@@ -0,0 +1,137 @@
|
||||
//! Only clients from the local network may connect. Mostly matters for IPv6, where the Frame has
|
||||
//! a globally routable address and only the router's firewall stands between it and the internet.
|
||||
//! Allowed: loopback, private/link-local/ULA ranges, CGNAT (Tailscale) and any address in the same
|
||||
//! subnet as one of the Frame's interfaces (LAN devices with global IPv6 addresses).
|
||||
//! `FRAMEMATE_ALLOW_REMOTE=1` turns the check off. The token stays the actual protection.
|
||||
|
||||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr};
|
||||
use std::sync::atomic::{AtomicU64, Ordering};
|
||||
|
||||
use axum::extract::{ConnectInfo, Request, State};
|
||||
use axum::http::StatusCode;
|
||||
use axum::middleware::Next;
|
||||
use axum::response::{IntoResponse, Response};
|
||||
|
||||
/// At most one log line per this many seconds, so a scanner can't flood the journal.
|
||||
const LOG_INTERVAL_S: u64 = 10;
|
||||
|
||||
pub async fn local_only(
|
||||
State(allow_remote): State<bool>,
|
||||
ConnectInfo(peer): ConnectInfo<SocketAddr>,
|
||||
request: Request,
|
||||
next: Next,
|
||||
) -> Response {
|
||||
let ip = peer.ip().to_canonical(); // IPv4 clients arrive as ::ffff:a.b.c.d on the dual-stack socket
|
||||
if allow_remote || is_local(ip, &interface_networks) {
|
||||
return next.run(request).await;
|
||||
}
|
||||
static LAST_LOG: AtomicU64 = AtomicU64::new(0);
|
||||
let now = crate::hub::now_ms() / 1000;
|
||||
if now.saturating_sub(LAST_LOG.swap(now, Ordering::Relaxed)) >= LOG_INTERVAL_S {
|
||||
tracing::warn!("rejected {ip}: not in the local network (FRAMEMATE_ALLOW_REMOTE=1 allows it)");
|
||||
}
|
||||
(StatusCode::FORBIDDEN, "FrameMate only accepts connections from the local network\n").into_response()
|
||||
}
|
||||
|
||||
/// `networks` is only consulted for public addresses (reads the interfaces).
|
||||
fn is_local(ip: IpAddr, networks: &dyn Fn() -> Vec<(IpAddr, u8)>) -> bool {
|
||||
let always = match ip {
|
||||
IpAddr::V4(v4) => {
|
||||
v4.is_loopback() || v4.is_private() || v4.is_link_local() || in_network(ip, Ipv4Addr::new(100, 64, 0, 0).into(), 10)
|
||||
}
|
||||
IpAddr::V6(v6) => {
|
||||
v6.is_loopback()
|
||||
|| in_network(ip, Ipv6Addr::new(0xfc00, 0, 0, 0, 0, 0, 0, 0).into(), 7) // ULA
|
||||
|| in_network(ip, Ipv6Addr::new(0xfe80, 0, 0, 0, 0, 0, 0, 0).into(), 10) // link-local
|
||||
}
|
||||
};
|
||||
always || networks().into_iter().any(|(net, prefix)| in_network(ip, net, prefix))
|
||||
}
|
||||
|
||||
fn in_network(ip: IpAddr, net: IpAddr, prefix: u8) -> bool {
|
||||
match (ip, net) {
|
||||
(IpAddr::V4(ip), IpAddr::V4(net)) => {
|
||||
let mask = u32::MAX.checked_shl(32 - u32::from(prefix.min(32))).unwrap_or(0);
|
||||
u32::from(ip) & mask == u32::from(net) & mask
|
||||
}
|
||||
(IpAddr::V6(ip), IpAddr::V6(net)) => {
|
||||
let mask = u128::MAX.checked_shl(128 - u32::from(prefix.min(128))).unwrap_or(0);
|
||||
u128::from(ip) & mask == u128::from(net) & mask
|
||||
}
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// (address, prefix length) of every interface address, via getifaddrs(3).
|
||||
fn interface_networks() -> Vec<(IpAddr, u8)> {
|
||||
let mut out = Vec::new();
|
||||
let mut list: *mut libc::ifaddrs = std::ptr::null_mut();
|
||||
// SAFETY: getifaddrs allocates the list, freed below.
|
||||
if unsafe { libc::getifaddrs(&mut list) } != 0 {
|
||||
return out;
|
||||
}
|
||||
let mut node = list;
|
||||
while !node.is_null() {
|
||||
// SAFETY: nodes stay valid until freeifaddrs.
|
||||
let ifa = unsafe { &*node };
|
||||
if let (Some(addr), Some(mask)) = (sockaddr_ip(ifa.ifa_addr), sockaddr_ip(ifa.ifa_netmask)) {
|
||||
let prefix = match mask {
|
||||
IpAddr::V4(m) => u32::from(m).count_ones(),
|
||||
IpAddr::V6(m) => u128::from(m).count_ones(),
|
||||
};
|
||||
out.push((addr, prefix as u8));
|
||||
}
|
||||
node = ifa.ifa_next;
|
||||
}
|
||||
// SAFETY: the list from getifaddrs above.
|
||||
unsafe { libc::freeifaddrs(list) };
|
||||
out
|
||||
}
|
||||
|
||||
fn sockaddr_ip(sa: *const libc::sockaddr) -> Option<IpAddr> {
|
||||
if sa.is_null() {
|
||||
return None;
|
||||
}
|
||||
// SAFETY: sa_family says which sockaddr variant this is.
|
||||
unsafe {
|
||||
match i32::from((*sa).sa_family) {
|
||||
libc::AF_INET => {
|
||||
let sin = &*(sa as *const libc::sockaddr_in);
|
||||
Some(Ipv4Addr::from(u32::from_be(sin.sin_addr.s_addr)).into())
|
||||
}
|
||||
libc::AF_INET6 => Some(Ipv6Addr::from((*(sa as *const libc::sockaddr_in6)).sin6_addr.s6_addr).into()),
|
||||
_ => None,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
|
||||
fn local(ip: &str) -> bool {
|
||||
// The Frame: 192.168.178.130/24 and a global IPv6 address in 2001:db8:1:2::/64.
|
||||
let lan = || vec![("192.168.178.130".parse().unwrap(), 24), ("2001:db8:1:2::abcd".parse().unwrap(), 64)];
|
||||
is_local(ip.parse::<IpAddr>().unwrap().to_canonical(), &lan)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn allows_the_local_network() {
|
||||
for ip in ["127.0.0.1", "::1", "192.168.178.22", "10.1.2.3", "172.20.0.5", "169.254.1.1", "100.101.102.103",
|
||||
"fd7a:115c:a1e3::1", "fe80::1", "::ffff:192.168.178.22", "2001:db8:1:2::77"] {
|
||||
assert!(local(ip), "{ip} should be allowed");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn rejects_public_addresses() {
|
||||
for ip in ["8.8.8.8", "::ffff:1.1.1.1", "2001:db8:9:9::1", "2a00:1450:4001::200e"] {
|
||||
assert!(!local(ip), "{ip} should be rejected");
|
||||
}
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn reads_interfaces() {
|
||||
assert!(interface_networks().iter().any(|(ip, _)| ip.is_loopback()));
|
||||
}
|
||||
}
|
||||
+23
-14
@@ -1,11 +1,6 @@
|
||||
//! Connects to Steam's CEF remote debugging endpoint (Steam runs with
|
||||
//! `-cef-enable-debugging`, listening on 127.0.0.1:8080), attaches to the
|
||||
//! `SharedJSContext` target and injects `shim.js`. The shim pushes
|
||||
//! `{topic, data}` JSON through the `__framemateEmit` CDP binding.
|
||||
//!
|
||||
//! Steam UI reloads create a new execution context; the shim is re-injected on
|
||||
//! every `Runtime.executionContextCreated`. Steam restarts drop the socket and
|
||||
//! we reconnect with backoff.
|
||||
//! Steam CEF DevTools client (127.0.0.1:8080): attaches to `SharedJSContext`, injects `shim.js`
|
||||
//! on every `executionContextCreated` (UI reloads) and receives `{topic, data}` through the
|
||||
//! `__framemateEmit` binding. Reconnects with backoff when Steam restarts.
|
||||
|
||||
use std::sync::Arc;
|
||||
use std::time::{Duration, Instant};
|
||||
@@ -24,6 +19,8 @@ const TARGET_TITLE: &str = "SharedJSContext";
|
||||
const BINDING: &str = "__framemateEmit";
|
||||
const SHIM: &str = include_str!("shim.js");
|
||||
const MAX_BACKOFF: Duration = Duration::from_secs(30);
|
||||
/// The shim polls every few seconds; after this much silence, ping once, then reconnect.
|
||||
const IDLE_TIMEOUT: Duration = Duration::from_secs(30);
|
||||
|
||||
pub async fn run(hub: Arc<Hub>, cdp_url: String) {
|
||||
let authority = cdp_url
|
||||
@@ -72,7 +69,19 @@ async fn session(hub: &Hub, authority: &str, devices: &mut DeviceMemory) -> anyh
|
||||
s.steam.error = None;
|
||||
});
|
||||
|
||||
while let Some(msg) = rx.next().await {
|
||||
let mut pinged = false;
|
||||
loop {
|
||||
let msg = match tokio::time::timeout(IDLE_TIMEOUT, rx.next()).await {
|
||||
Ok(Some(msg)) => msg,
|
||||
Ok(None) => break,
|
||||
Err(_) if pinged => bail!("Steam stopped responding"),
|
||||
Err(_) => {
|
||||
pinged = true;
|
||||
tx.send(call("Runtime.evaluate", json!({"expression": "1"}))).await?;
|
||||
continue;
|
||||
}
|
||||
};
|
||||
pinged = false;
|
||||
let text = match msg? {
|
||||
Message::Text(text) => text,
|
||||
Message::Close(_) => break,
|
||||
@@ -137,7 +146,6 @@ fn handle_emit(hub: &Hub, payload: &str, devices: &mut DeviceMemory) {
|
||||
});
|
||||
}
|
||||
|
||||
/// Returns the WebSocket debugger URL of the SharedJSContext target.
|
||||
async fn find_target(authority: &str) -> anyhow::Result<String> {
|
||||
let body = http_get(authority, "/json").await?;
|
||||
let targets: Vec<Value> = serde_json::from_slice(&body).context("parsing /json")?;
|
||||
@@ -154,10 +162,9 @@ async fn find_target(authority: &str) -> anyhow::Result<String> {
|
||||
Ok(format!("ws://{authority}{path}"))
|
||||
}
|
||||
|
||||
/// Minimal HTTP/1.1 GET; avoids pulling an HTTP client into the dependency tree.
|
||||
/// CEF's DevTools server drops HTTP/1.0 requests without answering and ignores
|
||||
/// `Connection: close`, so the body is read by Content-Length, not until EOF.
|
||||
async fn http_get(authority: &str, path: &str) -> anyhow::Result<Vec<u8>> {
|
||||
/// Minimal HTTP/1.1 GET (no HTTP client dependency). CEF ignores HTTP/1.0 requests and
|
||||
/// `Connection: close`, so the body is read by Content-Length.
|
||||
pub(crate) async fn http_get(authority: &str, path: &str) -> anyhow::Result<Vec<u8>> {
|
||||
tokio::time::timeout(Duration::from_secs(5), async {
|
||||
let mut stream = TcpStream::connect(authority)
|
||||
.await
|
||||
@@ -179,6 +186,8 @@ async fn http_get(authority: &str, path: &str) -> anyhow::Result<Vec<u8>> {
|
||||
};
|
||||
let head = String::from_utf8_lossy(&response[..header_end]).into_owned();
|
||||
if !head.starts_with("HTTP/1.1 200") {
|
||||
// Drop the query: it may carry the token.
|
||||
let path = path.split('?').next().unwrap_or_default();
|
||||
bail!("GET {path}: {}", head.lines().next().unwrap_or_default());
|
||||
}
|
||||
let length: usize = head
|
||||
|
||||
@@ -0,0 +1,128 @@
|
||||
//! `check`: self check of the running agent, then prints what the app needs. Also run by
|
||||
//! `install-service`. Same sandbox as the service, so permissions are checked too.
|
||||
|
||||
use std::ffi::CString;
|
||||
use std::net::{IpAddr, Ipv4Addr, SocketAddr, UdpSocket};
|
||||
use std::path::Path;
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use serde_json::Value;
|
||||
|
||||
use crate::config::{self, Config};
|
||||
|
||||
/// The service needs a moment after `RestartUnit` (`flatpak run` startup).
|
||||
const STARTUP_TIMEOUT: Duration = Duration::from_secs(15);
|
||||
/// Steam data follows shortly after the agent is up (the shim injects, then reports).
|
||||
const STEAM_TIMEOUT: Duration = Duration::from_secs(10);
|
||||
|
||||
pub async fn run() -> anyhow::Result<()> {
|
||||
let config = Config::from_env()?;
|
||||
let addr = match config.listen.ip() {
|
||||
ip if ip.is_unspecified() => SocketAddr::new(Ipv4Addr::LOCALHOST.into(), config.listen.port()),
|
||||
_ => config.listen,
|
||||
};
|
||||
let authority = addr.to_string();
|
||||
println!("Checking the agent on {authority}…");
|
||||
|
||||
let started = Instant::now();
|
||||
loop {
|
||||
match crate::cdp::http_get(&authority, "/healthz").await {
|
||||
Ok(_) => break,
|
||||
Err(e) if started.elapsed() > STARTUP_TIMEOUT => {
|
||||
fail(&format!("agent not answering ({e:#})"));
|
||||
println!(" Logs: journalctl --user -n 50 _COMM=framemate-agent");
|
||||
anyhow::bail!("agent not running");
|
||||
}
|
||||
Err(_) => tokio::time::sleep(Duration::from_millis(500)).await,
|
||||
}
|
||||
}
|
||||
ok(&format!("agent answers on port {}", config.listen.port()));
|
||||
|
||||
let state_path = format!("/api/state?token={}", config.token);
|
||||
let mut state = match fetch_state(&authority, &state_path).await {
|
||||
Ok(state) => state,
|
||||
Err(e) => {
|
||||
// Usually a token file that changed after the service started.
|
||||
fail(&format!("token rejected or state unreadable ({e:#}); restart the service"));
|
||||
anyhow::bail!("agent unusable");
|
||||
}
|
||||
};
|
||||
ok("token accepted");
|
||||
|
||||
let started = Instant::now();
|
||||
while state["steam"]["connected"] != true && started.elapsed() < STEAM_TIMEOUT {
|
||||
tokio::time::sleep(Duration::from_secs(1)).await;
|
||||
state = fetch_state(&authority, &state_path).await.unwrap_or(state);
|
||||
}
|
||||
if state["steam"]["connected"] == true {
|
||||
ok("connected to Steam");
|
||||
} else {
|
||||
let error = state["steam"]["error"].as_str().unwrap_or("not connected yet");
|
||||
warn(&format!(
|
||||
"no Steam data: {error}. Normal for a few seconds after boot or while Steam isn't \
|
||||
running; battery and Mirroring work without it"
|
||||
));
|
||||
}
|
||||
|
||||
if state["power"]["battery"].is_object() {
|
||||
ok("battery readings");
|
||||
} else {
|
||||
warn("no battery found in /sys/class/power_supply");
|
||||
}
|
||||
if state["steamos"]["available"] == true {
|
||||
ok("SteamOS performance settings");
|
||||
} else {
|
||||
let error = state["steamos"]["error"].as_str().unwrap_or("unavailable");
|
||||
warn(&format!("SteamOS performance settings: {error}"));
|
||||
}
|
||||
|
||||
// Only check access: opening the source would wake SteamVR's v4l2cam.
|
||||
let devices = [
|
||||
(config.stream.source_device.as_path(), "headset view"),
|
||||
(Path::new(&config.stream.encoder_device), "H.264 encoder"),
|
||||
];
|
||||
let missing: Vec<String> = devices
|
||||
.iter()
|
||||
.filter(|(path, _)| !accessible(path))
|
||||
.map(|(path, what)| format!("{what} {}", path.display()))
|
||||
.collect();
|
||||
if missing.is_empty() {
|
||||
ok("Mirroring devices");
|
||||
} else {
|
||||
warn(&format!("Mirroring unavailable, can't access {}", missing.join(", ")));
|
||||
}
|
||||
|
||||
let ip = lan_ip().map(|ip| format!(" (or {ip})")).unwrap_or_default();
|
||||
println!();
|
||||
println!("Connect the app to: {}.local{ip}", config::hostname());
|
||||
println!("Token: {}", config::format_token(&config.token));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
async fn fetch_state(authority: &str, path: &str) -> anyhow::Result<Value> {
|
||||
Ok(serde_json::from_slice(&crate::cdp::http_get(authority, path).await?)?)
|
||||
}
|
||||
|
||||
fn accessible(path: &Path) -> bool {
|
||||
CString::new(path.as_os_str().as_encoded_bytes())
|
||||
.is_ok_and(|p| unsafe { libc::access(p.as_ptr(), libc::R_OK | libc::W_OK) } == 0)
|
||||
}
|
||||
|
||||
/// The address of the interface the default route uses. `connect` on UDP sends nothing.
|
||||
fn lan_ip() -> Option<IpAddr> {
|
||||
let socket = UdpSocket::bind("0.0.0.0:0").ok()?;
|
||||
socket.connect("192.0.2.1:9").ok()?; // TEST-NET-1, never actually contacted
|
||||
Some(socket.local_addr().ok()?.ip())
|
||||
}
|
||||
|
||||
fn ok(msg: &str) {
|
||||
println!(" [ok] {msg}");
|
||||
}
|
||||
|
||||
fn warn(msg: &str) {
|
||||
println!(" [warn] {msg}");
|
||||
}
|
||||
|
||||
fn fail(msg: &str) {
|
||||
println!(" [err] {msg}");
|
||||
}
|
||||
+30
-12
@@ -1,6 +1,5 @@
|
||||
//! Runtime configuration from environment variables. Paths follow XDG so the same
|
||||
//! binary works on the host and inside a Flatpak sandbox (where XDG_CONFIG_HOME
|
||||
//! points into ~/.var/app/<id>/config).
|
||||
//! Configuration from environment variables. XDG paths, so it works on the host and inside
|
||||
//! the Flatpak (where XDG_CONFIG_HOME points into ~/.var/app/<id>/config).
|
||||
|
||||
use std::io::Read;
|
||||
use std::net::SocketAddr;
|
||||
@@ -13,16 +12,18 @@ use crate::stream::StreamConfig;
|
||||
|
||||
pub struct Config {
|
||||
pub listen: SocketAddr,
|
||||
/// Base URL of Steam's CEF remote debugging HTTP endpoint.
|
||||
pub cdp_url: String,
|
||||
pub token: String,
|
||||
pub power_supply_dir: PathBuf,
|
||||
pub stream: StreamConfig,
|
||||
/// Accept clients from outside the local network (see access.rs).
|
||||
pub allow_remote: bool,
|
||||
}
|
||||
|
||||
impl Config {
|
||||
pub fn from_env() -> anyhow::Result<Self> {
|
||||
let listen = env_or("FRAMEMATE_LISTEN", "0.0.0.0:7380")
|
||||
// Dual-stack (see server.rs), so IPv4 clients work too.
|
||||
let listen = env_or("FRAMEMATE_LISTEN", "[::]:7380")
|
||||
.parse()
|
||||
.context("FRAMEMATE_LISTEN must be host:port")?;
|
||||
let token = match std::env::var("FRAMEMATE_TOKEN") {
|
||||
@@ -30,6 +31,10 @@ impl Config {
|
||||
_ => load_or_create_token()?,
|
||||
};
|
||||
let token = normalize_token(&token);
|
||||
let fps: u32 = env_or("FRAMEMATE_STREAM_FPS", "30").parse().context("FRAMEMATE_STREAM_FPS")?;
|
||||
anyhow::ensure!((1..=120).contains(&fps), "FRAMEMATE_STREAM_FPS must be 1–120");
|
||||
let bitrate: u32 = env_or("FRAMEMATE_STREAM_BITRATE", "6000000").parse().context("FRAMEMATE_STREAM_BITRATE")?;
|
||||
anyhow::ensure!(bitrate > 0, "FRAMEMATE_STREAM_BITRATE must be > 0");
|
||||
Ok(Self {
|
||||
listen,
|
||||
cdp_url: env_or("FRAMEMATE_CDP", "http://127.0.0.1:8080"),
|
||||
@@ -37,14 +42,20 @@ impl Config {
|
||||
power_supply_dir: env_or("FRAMEMATE_POWER_SUPPLY_DIR", "/sys/class/power_supply").into(),
|
||||
stream: StreamConfig {
|
||||
source_device: env_or("FRAMEMATE_STREAM_SOURCE", "/dev/video99").into(),
|
||||
encoder_device: env_or("FRAMEMATE_STREAM_ENCODER", "/dev/video23"),
|
||||
fps: env_or("FRAMEMATE_STREAM_FPS", "30").parse().context("FRAMEMATE_STREAM_FPS")?,
|
||||
bitrate: env_or("FRAMEMATE_STREAM_BITRATE", "6000000").parse().context("FRAMEMATE_STREAM_BITRATE")?,
|
||||
encoder_device: std::env::var("FRAMEMATE_STREAM_ENCODER").unwrap_or_else(|_| default_encoder().into()),
|
||||
fps,
|
||||
bitrate,
|
||||
},
|
||||
allow_remote: matches!(env_or("FRAMEMATE_ALLOW_REMOTE", "").as_str(), "1" | "true" | "yes"),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
/// videoN numbers depend on driver probe order; the udev symlink is stable.
|
||||
fn default_encoder() -> &'static str {
|
||||
if std::path::Path::new("/dev/video-enc0").exists() { "/dev/video-enc0" } else { "/dev/video23" }
|
||||
}
|
||||
|
||||
fn env_or(key: &str, default: &str) -> String {
|
||||
std::env::var(key).unwrap_or_else(|_| default.to_owned())
|
||||
}
|
||||
@@ -53,7 +64,6 @@ fn config_dir() -> anyhow::Result<PathBuf> {
|
||||
xdg_dir("XDG_CONFIG_HOME", ".config")
|
||||
}
|
||||
|
||||
/// Persistent runtime state (e.g. remembered VR devices).
|
||||
pub fn state_dir() -> anyhow::Result<PathBuf> {
|
||||
xdg_dir("XDG_STATE_HOME", ".local/state")
|
||||
}
|
||||
@@ -94,8 +104,7 @@ fn is_current_format(token: &str) -> bool {
|
||||
token.len() == TOKEN_LEN && token.bytes().all(|b| TOKEN_ALPHABET.contains(&b))
|
||||
}
|
||||
|
||||
/// The API token lives in `$XDG_CONFIG_HOME/framemate/token` and is created on first run.
|
||||
/// Tokens in an older format (32 hex chars) are replaced by a short one.
|
||||
/// `$XDG_CONFIG_HOME/framemate/token`, created on first run; other formats are replaced.
|
||||
pub fn load_or_create_token() -> anyhow::Result<String> {
|
||||
let path = config_dir()?.join("token");
|
||||
if let Ok(token) = std::fs::read_to_string(&path) {
|
||||
@@ -104,6 +113,15 @@ pub fn load_or_create_token() -> anyhow::Result<String> {
|
||||
return Ok(token);
|
||||
}
|
||||
}
|
||||
write_new_token(&path)
|
||||
}
|
||||
|
||||
/// Replaces the token; the running agent only reads it at startup.
|
||||
pub fn rotate_token() -> anyhow::Result<String> {
|
||||
write_new_token(&config_dir()?.join("token"))
|
||||
}
|
||||
|
||||
fn write_new_token(path: &std::path::Path) -> anyhow::Result<String> {
|
||||
let mut bytes = [0u8; TOKEN_LEN];
|
||||
std::fs::File::open("/dev/urandom")?.read_exact(&mut bytes)?;
|
||||
// 256 is a multiple of 32, so `% 32` is unbiased.
|
||||
@@ -117,7 +135,7 @@ pub fn load_or_create_token() -> anyhow::Result<String> {
|
||||
.create(true)
|
||||
.truncate(true)
|
||||
.mode(0o600)
|
||||
.open(&path)
|
||||
.open(path)
|
||||
.with_context(|| format!("writing {}", path.display()))?;
|
||||
std::io::Write::write_all(&mut file, format_token(&token).as_bytes())?;
|
||||
tracing::info!("generated a new API token");
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
<p><a id="stream">headset view</a></p>
|
||||
<pre id="out">connecting…</pre>
|
||||
<script>
|
||||
// Plain-text readout of /api/ws. Intentionally no styling or framework.
|
||||
// Plain-text readout of /api/ws, intentionally unstyled.
|
||||
const token = new URLSearchParams(location.search).get("token") ?? "";
|
||||
const out = document.getElementById("out");
|
||||
document.getElementById("stream").href = `/stream?token=${encodeURIComponent(token)}`;
|
||||
@@ -44,8 +44,8 @@ function render(s) {
|
||||
L.push(`FrameMate agent ${s.agent.version} on ${s.agent.hostname} · updated ${time(s.agent.updated_at_ms)} · ${link}`);
|
||||
L.push(`Steam: ${s.steam.connected ? "connected" : `not connected (${s.steam.error ?? "?"})`} · last event ${time(s.steam.last_event_ms)}`);
|
||||
|
||||
// One battery. The percentage is Steam's (matches the headset UI; it reads ~kernel/0.9).
|
||||
// The kernel fuel gauge adds power/temperature detail and is the fallback without Steam.
|
||||
// Steam's percentage (≈ kernel / 0.9, matches the headset UI); kernel adds W/°C and is the
|
||||
// fallback without Steam.
|
||||
L.push("", "== Battery");
|
||||
const b = t.battery, k = s.power?.battery;
|
||||
if (b) {
|
||||
|
||||
+38
-15
@@ -1,8 +1,7 @@
|
||||
//! Remembers VR devices across SteamVR / Frame restarts. SteamVR only lists a controller
|
||||
//! once it has connected since SteamVR started, so after a reboot sleeping controllers
|
||||
//! would vanish. Their last known state is kept in `$XDG_STATE_HOME/framemate/devices.json`
|
||||
//! and merged into the `vr_devices` topic as `connected: false, remembered: true`.
|
||||
//! Devices are never forgotten (controller pairs rarely change); delete the file to reset.
|
||||
//! Remembers VR devices across restarts: SteamVR only lists a controller once it has connected
|
||||
//! since SteamVR started, so sleeping controllers would vanish after a reboot. Missing ones are
|
||||
//! merged into `vr_devices` as `connected: false, remembered: true`. Never forgotten; delete
|
||||
//! `$XDG_STATE_HOME/framemate/devices.json` to reset.
|
||||
|
||||
use std::collections::{BTreeMap, BTreeSet};
|
||||
use std::path::PathBuf;
|
||||
@@ -16,7 +15,7 @@ const LAST_SEEN_SAVE_INTERVAL_MS: u64 = 5 * 60 * 1000;
|
||||
|
||||
pub struct DeviceMemory {
|
||||
file: Option<PathBuf>,
|
||||
/// Keyed by serial (stable), falling back to the OpenVR path.
|
||||
/// Keyed by serial; devices without one aren't remembered (no phantom duplicates).
|
||||
known: BTreeMap<String, Value>,
|
||||
last_save_ms: u64,
|
||||
}
|
||||
@@ -32,7 +31,6 @@ impl DeviceMemory {
|
||||
Self { file, known, last_save_ms: now_ms() }
|
||||
}
|
||||
|
||||
/// Merges a live `vr_devices` list with remembered devices and persists changes.
|
||||
pub fn merge(&mut self, live: Value) -> Value {
|
||||
let Value::Array(live) = live else { return live };
|
||||
let now = now_ms();
|
||||
@@ -41,10 +39,14 @@ impl DeviceMemory {
|
||||
let mut out = Vec::with_capacity(live.len());
|
||||
let mut present = BTreeSet::new();
|
||||
for mut device in live {
|
||||
let Some(key) = key(&device) else {
|
||||
let Some(key) = serial(&device) else {
|
||||
out.push(device);
|
||||
continue;
|
||||
};
|
||||
// Older versions keyed serial-less devices by OpenVR path; drop such leftovers.
|
||||
if let Some(path) = device["path"].as_str().filter(|p| *p != key) {
|
||||
self.known.remove(path);
|
||||
}
|
||||
device["last_seen_ms"] = if device["connected"] == true {
|
||||
json!(now)
|
||||
} else {
|
||||
@@ -75,8 +77,11 @@ impl DeviceMemory {
|
||||
|
||||
fn save(&mut self, now: u64) {
|
||||
let Some(file) = &self.file else { return };
|
||||
// Write + rename: a truncated file would load as empty.
|
||||
let tmp = file.with_extension("json.tmp");
|
||||
let result = std::fs::create_dir_all(file.parent().unwrap())
|
||||
.and_then(|()| std::fs::write(file, serde_json::to_vec_pretty(&self.known).unwrap()));
|
||||
.and_then(|()| std::fs::write(&tmp, serde_json::to_vec_pretty(&self.known).unwrap()))
|
||||
.and_then(|()| std::fs::rename(&tmp, file));
|
||||
match result {
|
||||
Ok(()) => self.last_save_ms = now,
|
||||
Err(e) => tracing::warn!("saving {}: {e}", file.display()),
|
||||
@@ -84,12 +89,8 @@ impl DeviceMemory {
|
||||
}
|
||||
}
|
||||
|
||||
fn key(device: &Value) -> Option<String> {
|
||||
device["serial"]
|
||||
.as_str()
|
||||
.filter(|s| !s.is_empty())
|
||||
.or_else(|| device["path"].as_str())
|
||||
.map(str::to_owned)
|
||||
fn serial(device: &Value) -> Option<String> {
|
||||
device["serial"].as_str().filter(|s| !s.is_empty()).map(str::to_owned)
|
||||
}
|
||||
|
||||
fn without_last_seen(known: &BTreeMap<String, Value>) -> BTreeMap<&String, Value> {
|
||||
@@ -129,4 +130,26 @@ mod tests {
|
||||
assert!(left["last_seen_ms"].is_u64());
|
||||
assert!(merged.iter().find(|d| d["serial"] == "hmd").unwrap().get("remembered").is_none());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn serial_less_devices_are_not_remembered() {
|
||||
let mut memory = DeviceMemory { file: None, known: BTreeMap::new(), last_save_ms: 0 };
|
||||
// Serial read failed while the controller was connecting.
|
||||
let mut connecting = device("right", true, 0.7);
|
||||
connecting["serial"] = Value::Null;
|
||||
memory.merge(json!([connecting]));
|
||||
// Next poll has the serial: exactly one device, nothing remembered by path.
|
||||
let merged = memory.merge(json!([device("right", true, 0.7)]));
|
||||
assert_eq!(merged.as_array().unwrap().len(), 1);
|
||||
assert_eq!(memory.known.len(), 1);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn drops_path_keyed_leftovers() {
|
||||
let mut memory = DeviceMemory { file: None, known: BTreeMap::new(), last_save_ms: 0 };
|
||||
memory.known.insert("/devices/right".into(), device("right", false, 0.5));
|
||||
let merged = memory.merge(json!([device("right", true, 0.7)]));
|
||||
assert_eq!(merged.as_array().unwrap().len(), 1);
|
||||
assert!(!memory.known.contains_key("/devices/right"));
|
||||
}
|
||||
}
|
||||
@@ -1,14 +1,9 @@
|
||||
//! Hardware H.264 encoding on the Snapdragon `iris` V4L2 stateful encoder
|
||||
//! (`/dev/video23`), using raw multiplanar M2M ioctls. No GStreamer: its
|
||||
//! `v4l2h264enc` fails caps negotiation with this driver and the Flatpak
|
||||
//! runtime doesn't ship it.
|
||||
//! H.264 on the `iris` V4L2 stateful encoder (`/dev/video23`) via raw multiplanar M2M ioctls
|
||||
//! (GStreamer's `v4l2h264enc` can't negotiate with this driver). Input is RGBA; the encoder
|
||||
//! does the YUV conversion.
|
||||
//!
|
||||
//! Input is RGBA ('AB24'); the encoder converts to YUV in hardware. Our only
|
||||
//! CPU work is expanding the RGB3 source to RGBA.
|
||||
//!
|
||||
//! Driver quirks seen on kernel 6.18:
|
||||
//! - STREAMOFF on a queue that was never started returns EBUSY (so we never do that).
|
||||
//! - Resolution is aligned to 16 (1080 → 1088); the SPS crops it back.
|
||||
//! Driver quirks: STREAMOFF on a never-started queue returns EBUSY; height is aligned to 16
|
||||
//! (1080 → 1088) and the SPS crops it back.
|
||||
|
||||
use std::fs::{File, OpenOptions};
|
||||
use std::os::fd::{AsRawFd, RawFd};
|
||||
@@ -115,16 +110,14 @@ impl Encoder {
|
||||
})
|
||||
}
|
||||
|
||||
/// Makes the next encoded frame a keyframe (for a newly joined viewer).
|
||||
pub fn force_keyframe(&self) {
|
||||
if let Err(e) = v4l2::set_control(self.fd(), CID_FORCE_KEY_FRAME, 1) {
|
||||
tracing::warn!("encoder: force keyframe: {e}");
|
||||
}
|
||||
}
|
||||
|
||||
/// Queues one frame; `sink` receives each encoded access unit (Annex B) and
|
||||
/// whether it is a keyframe, as they complete. Timestamps must increase: the
|
||||
/// encoder's rate control uses them (constant timestamps undershoot the bitrate ~5×).
|
||||
/// `sink` gets each finished access unit (Annex B) and whether it's a keyframe.
|
||||
/// Timestamps must increase: rate control uses them (constant ones undershoot ~5×).
|
||||
pub fn encode(&mut self, frame: &RgbFrame, timestamp_us: u64, sink: &mut impl FnMut(&[u8], bool)) -> Result<()> {
|
||||
let index = loop {
|
||||
if let Some(index) = self.free_outputs.pop() {
|
||||
@@ -173,7 +166,6 @@ impl Drop for Encoder {
|
||||
}
|
||||
|
||||
/// RGB3 → RGBA into the encoder's input buffer; rows past the source are black.
|
||||
/// About 1.5 ms per 1080p frame on the Frame.
|
||||
fn rgb_to_rgba(frame: &RgbFrame, dst: &mut [u8], stride: usize, height: usize) {
|
||||
for y in 0..height {
|
||||
let row = &mut dst[y * stride..y * stride + frame.width * 4];
|
||||
@@ -182,7 +174,6 @@ fn rgb_to_rgba(frame: &RgbFrame, dst: &mut [u8], stride: usize, height: usize) {
|
||||
continue;
|
||||
}
|
||||
let src = &frame.data[y * frame.stride..y * frame.stride + frame.width * 3];
|
||||
// Four pixels per step (12 → 16 bytes) so the compiler can keep it in registers.
|
||||
let mut dst_chunks = row.chunks_exact_mut(16);
|
||||
let mut src_chunks = src.chunks_exact(12);
|
||||
for (d, s) in (&mut dst_chunks).zip(&mut src_chunks) {
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
//! Minimal fragmented-MP4 writer for one H.264 video track, as consumed by browser
|
||||
//! Media Source Extensions: one init segment (ftyp+moov), then one moof+mdat per frame.
|
||||
//! Fragmented MP4 for MSE, one H.264 track: init segment (ftyp+moov), then moof+mdat per frame.
|
||||
|
||||
/// Timescale of the video track (90 kHz, the usual for video).
|
||||
pub const TIMESCALE: u32 = 90_000;
|
||||
|
||||
/// Splits an Annex B access unit into NAL units (without start codes).
|
||||
@@ -43,7 +41,7 @@ pub fn codec_string(sps: &[u8]) -> String {
|
||||
format!("avc1.{:02x}{:02x}{:02x}", sps[1], sps[2], sps[3])
|
||||
}
|
||||
|
||||
/// Annex B → length-prefixed sample; parameter sets and AUDs live in the init segment.
|
||||
/// Annex B -> length-prefixed sample; parameter sets and AUDs live in the init segment.
|
||||
pub fn to_sample(au: &[u8]) -> Vec<u8> {
|
||||
let mut out = Vec::with_capacity(au.len() + 16);
|
||||
for nal in nal_units(au).filter(|n| !matches!(nal_type(n), 7..=9)) {
|
||||
|
||||
@@ -30,9 +30,7 @@ pub struct AgentInfo {
|
||||
pub updated_at_ms: u64,
|
||||
}
|
||||
|
||||
/// Data from the Steam client, as reported by the injected shim (see `shim.js`).
|
||||
/// Topics are kept as loose JSON on purpose: the shim already normalizes them and
|
||||
/// the underlying Steam APIs are undocumented and change between client updates.
|
||||
/// Reported by `shim.js`. Topics stay loose JSON: the Steam APIs behind them change often.
|
||||
#[derive(Debug, Default, Serialize)]
|
||||
pub struct SteamState {
|
||||
pub connected: bool,
|
||||
|
||||
@@ -1,4 +1,6 @@
|
||||
mod access;
|
||||
mod cdp;
|
||||
mod check;
|
||||
mod config;
|
||||
mod devices;
|
||||
mod encoder;
|
||||
@@ -21,7 +23,9 @@ Without a command, runs the agent.
|
||||
commands:
|
||||
install-service start the agent with the user session (systemd user unit)
|
||||
uninstall-service remove that unit again
|
||||
token print the API token for the companion app";
|
||||
token print the API token for the companion app
|
||||
check check the running agent and print what the app needs
|
||||
rotate-token replace the API token (and restart the agent to use it)";
|
||||
|
||||
#[tokio::main]
|
||||
async fn main() -> anyhow::Result<()> {
|
||||
@@ -29,6 +33,8 @@ async fn main() -> anyhow::Result<()> {
|
||||
None => {}
|
||||
Some("install-service") => return service::install().await,
|
||||
Some("uninstall-service") => return service::uninstall().await,
|
||||
Some("check") => return check::run().await,
|
||||
Some("rotate-token") => return service::rotate_token().await,
|
||||
Some("token") => {
|
||||
println!("{}", config::format_token(&config::load_or_create_token()?));
|
||||
return Ok(());
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//! Battery and charger data from the kernel's power_supply class. Works without
|
||||
//! Steam running and is readable from inside a Flatpak sandbox.
|
||||
//! Battery and charger data from the kernel's power_supply class (works without Steam).
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
@@ -12,15 +12,18 @@
|
||||
//! `/api/*` requires the token via `?token=` or `Authorization: Bearer`.
|
||||
|
||||
use std::collections::HashMap;
|
||||
use std::net::SocketAddr;
|
||||
use std::sync::Arc;
|
||||
use std::time::Duration;
|
||||
|
||||
use anyhow::Context;
|
||||
use axum::Router;
|
||||
use axum::extract::ws::{Message, WebSocket, WebSocketUpgrade};
|
||||
use axum::extract::{Query, State};
|
||||
use axum::http::{HeaderMap, StatusCode, header};
|
||||
use axum::response::{Html, IntoResponse, Response};
|
||||
use axum::routing::get;
|
||||
use socket2::{Domain, Protocol, Socket, Type};
|
||||
|
||||
use crate::config::Config;
|
||||
use crate::fmp4;
|
||||
@@ -46,21 +49,50 @@ pub async fn serve(hub: Arc<Hub>, stream: Arc<LiveStream>, config: &Config) -> a
|
||||
.route("/api/stream/ws", get(stream_ws))
|
||||
.route("/favicon.svg", get(|| async { asset("image/svg+xml", include_bytes!("../../../assets/framemate-black.svg")) }))
|
||||
.route("/healthz", get(|| async { "ok" }))
|
||||
.layer(axum::middleware::from_fn_with_state(config.allow_remote, crate::access::local_only))
|
||||
.with_state(AppState {
|
||||
hub,
|
||||
token: config.token.as_str().into(),
|
||||
stream,
|
||||
});
|
||||
|
||||
let listener = tokio::net::TcpListener::bind(config.listen).await?;
|
||||
let token = crate::config::format_token(&config.token);
|
||||
tracing::info!("listening on http://{}/?token={token} (token: {token})", config.listen);
|
||||
axum::serve(listener, app)
|
||||
let listener = match listen(config.listen) {
|
||||
// IPv6 can be disabled (ipv6.disable=1); keep serving IPv4 then.
|
||||
Err(e) if config.listen.is_ipv6() && config.listen.ip().is_unspecified() => {
|
||||
tracing::warn!("{e:#}; falling back to IPv4 only");
|
||||
listen(SocketAddr::from(([0, 0, 0, 0], config.listen.port())))?
|
||||
}
|
||||
result => result?,
|
||||
};
|
||||
tracing::info!("listening on {}", config.listen);
|
||||
// The token never goes to the log (people paste logs into issues); only to a terminal.
|
||||
// SAFETY: isatty only inspects the descriptor.
|
||||
if unsafe { libc::isatty(libc::STDOUT_FILENO) } == 1 {
|
||||
let token = crate::config::format_token(&config.token);
|
||||
println!("Dashboard: http://localhost:{}/?token={token}", config.listen.port());
|
||||
}
|
||||
axum::serve(listener, app.into_make_service_with_connect_info::<SocketAddr>())
|
||||
.with_graceful_shutdown(shutdown_signal())
|
||||
.await?;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// Dual-stack for an IPv6 wildcard (`frame.local` often resolves to IPv6). `IPV6_V6ONLY` has to
|
||||
/// be cleared before `bind`, which `TcpListener::bind` can't do.
|
||||
fn listen(addr: SocketAddr) -> anyhow::Result<tokio::net::TcpListener> {
|
||||
let socket = Socket::new(Domain::for_address(addr), Type::STREAM, Some(Protocol::TCP))
|
||||
.context("creating the listening socket")?;
|
||||
if addr.is_ipv6() {
|
||||
socket.set_only_v6(false).context("clearing IPV6_V6ONLY")?;
|
||||
}
|
||||
// A restart must not fail while the previous socket lingers.
|
||||
socket.set_reuse_address(true)?;
|
||||
socket.set_nonblocking(true)?;
|
||||
socket.bind(&addr.into()).with_context(|| format!("binding {addr}"))?;
|
||||
socket.listen(1024)?;
|
||||
Ok(tokio::net::TcpListener::from_std(socket.into())?)
|
||||
}
|
||||
|
||||
fn asset(content_type: &'static str, body: &'static [u8]) -> impl IntoResponse {
|
||||
(
|
||||
[(header::CONTENT_TYPE, content_type), (header::CACHE_CONTROL, "public, max-age=86400")],
|
||||
@@ -83,10 +115,12 @@ async fn state(
|
||||
headers: HeaderMap,
|
||||
Query(query): Query<HashMap<String, String>>,
|
||||
) -> Response {
|
||||
// CORS so the app can read the 401 (wrong token vs. unreachable).
|
||||
let cors = [(header::ACCESS_CONTROL_ALLOW_ORIGIN, "*")];
|
||||
if !authorized(&app, &headers, &query) {
|
||||
return StatusCode::UNAUTHORIZED.into_response();
|
||||
return (StatusCode::UNAUTHORIZED, cors).into_response();
|
||||
}
|
||||
([(header::CONTENT_TYPE, "application/json")], app.hub.snapshot_json()).into_response()
|
||||
(cors, [(header::CONTENT_TYPE, "application/json")], app.hub.snapshot_json()).into_response()
|
||||
}
|
||||
|
||||
async fn ws(
|
||||
|
||||
+121
-25
@@ -1,12 +1,7 @@
|
||||
//! `install-service` / `uninstall-service`: a systemd **user** unit that starts the agent
|
||||
//! with the session. Flatpaks can't autostart in Game Mode (XDG autostart only runs in
|
||||
//! Plasma), so the unit runs `flatpak run …` itself. Talks to the user systemd over
|
||||
//! D-Bus, which works from inside the sandbox.
|
||||
//!
|
||||
//! Flatpak permissions: `--filesystem=xdg-config/systemd/user:create`,
|
||||
//! `--talk-name=org.freedesktop.systemd1`.
|
||||
//! `install-service` / `uninstall-service`: a systemd user unit that runs `flatpak run …`, since
|
||||
//! Flatpaks can't autostart in Game Mode (XDG autostart only runs in Plasma).
|
||||
|
||||
use std::path::PathBuf;
|
||||
use std::path::{Path, PathBuf};
|
||||
|
||||
use anyhow::Context;
|
||||
use zbus::Connection;
|
||||
@@ -14,11 +9,14 @@ use zbus::Connection;
|
||||
const UNIT: &str = "framemate-agent.service";
|
||||
|
||||
pub async fn install() -> anyhow::Result<()> {
|
||||
let exec = match std::env::var("FLATPAK_ID") {
|
||||
let flatpak = flatpak_run();
|
||||
let exec = match &flatpak {
|
||||
// `flatpak run` moves the app into its own scope outside this unit's cgroup, so
|
||||
// stopping the unit would only kill the launcher; --die-with-parent ties them together.
|
||||
Ok(app_id) => format!("/usr/bin/flatpak run --die-with-parent --command=framemate-agent {app_id}"),
|
||||
Err(_) => std::env::current_exe()?.display().to_string(),
|
||||
Some((flag, app_id)) => {
|
||||
format!("/usr/bin/flatpak run {flag}--die-with-parent --command=framemate-agent {app_id}")
|
||||
}
|
||||
None => std::env::current_exe()?.display().to_string(),
|
||||
};
|
||||
let unit = format!(
|
||||
"# Installed by `framemate-agent install-service`; remove with `uninstall-service`.\n\
|
||||
@@ -40,33 +38,128 @@ pub async fn install() -> anyhow::Result<()> {
|
||||
// Create the token now, so the starting service and a following `token` call can't race.
|
||||
crate::config::load_or_create_token()?;
|
||||
|
||||
let systemd = Systemd::connect().await?;
|
||||
systemd.call("Reload", &()).await?;
|
||||
let systemd = match Systemd::reachable().await {
|
||||
Ok(systemd) => systemd,
|
||||
Err(e) => {
|
||||
enable_without_systemd(&path)?;
|
||||
println!("Installed {UNIT}, but systemd isn't reachable from this terminal ({e:#}).");
|
||||
println!("That happens in the Frame's Desktop Mode. The agent starts with the next restart");
|
||||
println!("of the Frame. To start it now, run this instead:\n");
|
||||
println!("{}", rerun_on_user_bus(&flatpak, "install-service"));
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
systemd.call("EnableUnitFiles", &(&[UNIT][..], false, true)).await?;
|
||||
systemd.call("RestartUnit", &(UNIT, "replace")).await?;
|
||||
println!("Installed and started {UNIT} ({}).", path.display());
|
||||
// `flatpak run` moves the app into its own app-flatpak-*.scope, so `-u {UNIT}` shows
|
||||
// nothing; match the process name instead.
|
||||
// `-u {UNIT}` shows nothing: `flatpak run` moves the app into its own scope.
|
||||
println!("Logs: journalctl --user -f _COMM=framemate-agent");
|
||||
Ok(())
|
||||
println!();
|
||||
crate::check::run().await
|
||||
}
|
||||
|
||||
pub async fn uninstall() -> anyhow::Result<()> {
|
||||
let systemd = Systemd::connect().await?;
|
||||
let path = unit_path()?;
|
||||
let systemd = match Systemd::reachable().await {
|
||||
Ok(systemd) => systemd,
|
||||
Err(e) => {
|
||||
remove_file(&wants_link(&path))?;
|
||||
remove_file(&path)?;
|
||||
println!("Removed {UNIT}, but systemd isn't reachable from this terminal ({e:#}).");
|
||||
println!("A running agent stops with the next restart of the Frame. To stop it now, run:\n");
|
||||
println!("{}", rerun_on_user_bus(&flatpak_run(), "uninstall-service"));
|
||||
return Ok(());
|
||||
}
|
||||
};
|
||||
// Ignore errors: the unit may not be loaded or enabled.
|
||||
let _ = systemd.call("StopUnit", &(UNIT, "replace")).await;
|
||||
let _ = systemd.call("DisableUnitFiles", &(&[UNIT][..], false)).await;
|
||||
let path = unit_path()?;
|
||||
match std::fs::remove_file(&path) {
|
||||
Ok(()) => {}
|
||||
Err(e) if e.kind() == std::io::ErrorKind::NotFound => {}
|
||||
Err(e) => return Err(e).with_context(|| format!("removing {}", path.display())),
|
||||
}
|
||||
remove_file(&path)?;
|
||||
systemd.call("Reload", &()).await?;
|
||||
println!("Removed {UNIT}.");
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub async fn rotate_token() -> anyhow::Result<()> {
|
||||
anyhow::ensure!(
|
||||
std::env::var_os("FRAMEMATE_TOKEN").is_none(),
|
||||
"FRAMEMATE_TOKEN is set and overrides the token file"
|
||||
);
|
||||
let token = crate::config::format_token(&crate::config::rotate_token()?);
|
||||
println!("New token: {token}");
|
||||
match Systemd::reachable().await {
|
||||
// TryRestartUnit only restarts it if it's running; NoSuchUnit without install-service.
|
||||
Ok(systemd) => match systemd.call("TryRestartUnit", &(UNIT, "replace")).await {
|
||||
Ok(()) => println!("Restarted {UNIT}; enter the new token in the app."),
|
||||
Err(_) => println!("{UNIT} isn't installed; restart the agent to use the new token."),
|
||||
},
|
||||
Err(_) => {
|
||||
println!("The running agent keeps the old token until it restarts. Restart the Frame, or run:\n");
|
||||
println!(
|
||||
" env XDG_RUNTIME_DIR=/run/user/$(id -u) DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus \\\n systemctl --user restart {UNIT}"
|
||||
);
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
/// `(installation flag incl. trailing space, app id)` when running as a Flatpak.
|
||||
fn flatpak_run() -> Option<(String, String)> {
|
||||
let app_id = std::env::var("FLATPAK_ID").ok()?;
|
||||
let installation = std::fs::read_to_string("/.flatpak-info").ok().and_then(|info| installation_flag(&info));
|
||||
if installation.is_none() {
|
||||
eprintln!("warning: couldn't tell whether the agent is a --user or --system install");
|
||||
}
|
||||
Some((installation.map(|f| format!("{f} ")).unwrap_or_default(), app_id))
|
||||
}
|
||||
|
||||
/// What `systemctl enable` does on disk; systemd picks it up at the next start of the session.
|
||||
fn enable_without_systemd(unit: &Path) -> anyhow::Result<()> {
|
||||
let link = wants_link(unit);
|
||||
std::fs::create_dir_all(link.parent().unwrap())?;
|
||||
remove_file(&link)?;
|
||||
std::os::unix::fs::symlink(unit, &link).with_context(|| format!("linking {}", link.display()))
|
||||
}
|
||||
|
||||
fn wants_link(unit: &Path) -> PathBuf {
|
||||
unit.with_file_name("default.target.wants").join(UNIT)
|
||||
}
|
||||
|
||||
fn remove_file(path: &Path) -> anyhow::Result<()> {
|
||||
match std::fs::remove_file(path) {
|
||||
Err(e) if e.kind() != std::io::ErrorKind::NotFound => {
|
||||
Err(e).with_context(|| format!("removing {}", path.display()))
|
||||
}
|
||||
_ => Ok(()),
|
||||
}
|
||||
}
|
||||
|
||||
/// The Frame's Desktop Mode is a nested Plasma session whose own session bus has no systemd
|
||||
/// behind it (issue #6). Inside the sandbox only that bus is visible, so the command has to be
|
||||
/// started with the real user bus.
|
||||
fn rerun_on_user_bus(flatpak: &Option<(String, String)>, command: &str) -> String {
|
||||
let run = match flatpak {
|
||||
Some((flag, app_id)) => format!("flatpak run {flag}{app_id}"),
|
||||
None => "framemate-agent".into(),
|
||||
};
|
||||
format!(
|
||||
" env XDG_RUNTIME_DIR=/run/user/$(id -u) DBUS_SESSION_BUS_ADDRESS=unix:path=/run/user/$(id -u)/bus \\\n {run} {command}"
|
||||
)
|
||||
}
|
||||
|
||||
/// `--user` or `--system`, from `app-path` in the sandbox's `/.flatpak-info`. Plain `flatpak run`
|
||||
/// fails when no system installation exists (fresh Frames, Flatpak 1.15.8).
|
||||
fn installation_flag(flatpak_info: &str) -> Option<&'static str> {
|
||||
let path = flatpak_info.lines().find_map(|l| l.trim().strip_prefix("app-path="))?;
|
||||
if path.starts_with("/var/lib/flatpak/") {
|
||||
Some("--system")
|
||||
} else if path.contains("/.local/share/flatpak/") {
|
||||
Some("--user")
|
||||
} else {
|
||||
None // a custom installation (installations.d); plain `flatpak run` finds it
|
||||
}
|
||||
}
|
||||
|
||||
/// `~/.config/systemd/user/…` on the host. Deliberately not `$XDG_CONFIG_HOME`, which a
|
||||
/// Flatpak remaps into its own data directory.
|
||||
fn unit_path() -> anyhow::Result<PathBuf> {
|
||||
@@ -77,8 +170,11 @@ fn unit_path() -> anyhow::Result<PathBuf> {
|
||||
struct Systemd(Connection);
|
||||
|
||||
impl Systemd {
|
||||
async fn connect() -> anyhow::Result<Self> {
|
||||
Ok(Self(Connection::session().await.context("connecting to the session bus")?))
|
||||
/// Connects and checks that systemd answers on this session bus.
|
||||
async fn reachable() -> anyhow::Result<Self> {
|
||||
let systemd = Self(Connection::session().await.context("connecting to the session bus")?);
|
||||
systemd.call("Reload", &()).await?;
|
||||
Ok(systemd)
|
||||
}
|
||||
|
||||
async fn call<B>(&self, method: &str, body: &B) -> anyhow::Result<()>
|
||||
|
||||
@@ -1,9 +1,6 @@
|
||||
// Injected by framemate-agent into Steam's SharedJSContext (see cdp.rs).
|
||||
// Subscribes to SteamClient events and polls UI stores, then reports one
|
||||
// normalized snapshot per topic via the CDP binding `__framemateEmit`.
|
||||
// Everything here is undocumented Steam internals: guard every access, and
|
||||
// report failures as {topic: "error"} instead of throwing.
|
||||
// Must be idempotent: it is re-evaluated on every reconnect.
|
||||
// Injected into Steam's SharedJSContext (cdp.rs); reports one snapshot per topic via
|
||||
// `__framemateEmit`. Undocumented Steam internals: guard every access, report failures as
|
||||
// {topic: "error"}. Must be idempotent: it is re-evaluated on every reconnect.
|
||||
(() => {
|
||||
const W = window;
|
||||
try { W.__framemate?.dispose?.(); } catch {}
|
||||
@@ -46,7 +43,7 @@
|
||||
try { return W.appStore.GetAppOverviewByAppID(Number(appid))?.display_name ?? null; } catch { return null; }
|
||||
};
|
||||
|
||||
// --- battery (Steam's view; the agent also reads sysfs directly) ---
|
||||
// --- battery ---
|
||||
const battery = () => subscribe("battery", cb => SteamClient.System.RegisterForBatteryStateChanges(cb), s =>
|
||||
emit("battery", {
|
||||
has_battery: s.bHasBattery,
|
||||
@@ -56,9 +53,7 @@
|
||||
battery_state: s.eBatteryState,
|
||||
}));
|
||||
|
||||
// --- downloads: this device only ---
|
||||
// Steam groups downloads per client; with Remote Downloads the other PCs on the
|
||||
// account show up too (remote_client_id != "0"). Only the Frame's own are reported.
|
||||
// --- downloads: this device only (other PCs show up via Remote Downloads) ---
|
||||
const isLocal = clientId => String(clientId) === "0";
|
||||
const downloads = () => {
|
||||
subscribe("downloads", cb => SteamClient.Downloads.RegisterForDownloadItems(cb), (_flag, clients) => {
|
||||
@@ -77,8 +72,7 @@
|
||||
target_buildid: i.target_buildid,
|
||||
})));
|
||||
});
|
||||
// Fires about once per second while something downloads. It describes a single
|
||||
// client's transfer, which may be a remote one; report those as idle.
|
||||
// ~1 Hz while downloading; may describe a remote client's transfer, reported as idle.
|
||||
subscribe("download_overview", cb => SteamClient.Downloads.RegisterForDownloadOverview(cb), o => {
|
||||
if (!isLocal(o.remote_client_id)) {
|
||||
emit("download_overview", { appid: null });
|
||||
@@ -114,9 +108,8 @@
|
||||
});
|
||||
};
|
||||
|
||||
// --- VR: headset + controllers via OpenVR device properties ---
|
||||
// Property ids from openvr.h: 1001 ModelNumber, 1002 SerialNumber,
|
||||
// 1011 DeviceIsCharging, 1012 DeviceBatteryPercentage, 1029 DeviceClass.
|
||||
// --- VR devices. openvr.h property ids: 1001 ModelNumber, 1002 SerialNumber,
|
||||
// 1011 DeviceIsCharging, 1012 DeviceBatteryPercentage, 1029 DeviceClass ---
|
||||
let vrPaths = [];
|
||||
const vrDevice = async path => {
|
||||
const P = SteamClient.OpenVR.DeviceProperties;
|
||||
@@ -153,7 +146,7 @@
|
||||
});
|
||||
};
|
||||
|
||||
// --- network, perf, system, user (polled store reads) ---
|
||||
// --- network, perf, system, user (polled) ---
|
||||
const stores = () => {
|
||||
poll("network", 10000, () => {
|
||||
const n = W.SystemNetworkStore, d = W.SystemPerfStore?.msgDiagnosticInfo;
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//! Read-only view of steamos-manager's session-bus properties
|
||||
//! (performance profile, CPU/GPU tuning). Flatpak: --talk-name=com.steampowered.SteamOSManager1
|
||||
//! Read-only view of steamos-manager's session-bus properties (performance profile, CPU/GPU).
|
||||
|
||||
use std::collections::BTreeMap;
|
||||
use std::sync::Arc;
|
||||
|
||||
@@ -15,9 +15,8 @@
|
||||
<video autoplay muted playsinline></video>
|
||||
<div id="status">connecting…</div>
|
||||
<script>
|
||||
// Headset view over /api/stream/ws: a JSON header with the codec string, then an fMP4
|
||||
// init segment, then one moof+mdat per frame, fed into Media Source Extensions.
|
||||
// (WebCodecs would be simpler but needs a secure context, which http://frame.local isn't.)
|
||||
// /api/stream/ws: JSON {codec}, fMP4 init segment, then moof+mdat per frame → MSE.
|
||||
// (WebCodecs needs a secure context, which http://frame.local isn't.)
|
||||
const token = new URLSearchParams(location.search).get("token") ?? "";
|
||||
const video = document.querySelector("video");
|
||||
const status = document.getElementById("status");
|
||||
@@ -62,9 +61,8 @@ function connect() {
|
||||
};
|
||||
}
|
||||
|
||||
// MSE buffers by default, which adds latency over time. Catch up by playing slightly
|
||||
// faster; only seek when far behind, because every seek makes the decoder restart
|
||||
// from the previous keyframe (seeking on every frame showed ~3 fps).
|
||||
// Catch up by playing faster; seeking restarts decoding at the last keyframe (~3 fps if
|
||||
// done every frame), so only seek when far behind.
|
||||
function keepLive(buffer) {
|
||||
if (buffer.updating || !buffer.buffered.length) return;
|
||||
const start = buffer.buffered.start(0);
|
||||
|
||||
+28
-16
@@ -1,20 +1,15 @@
|
||||
//! Live H.264 stream of the headset view, shared by all viewers.
|
||||
//!
|
||||
//! SteamVR's `steamvr-v4l2cam` renders `IVRHeadsetView` into the v4l2loopback device
|
||||
//! `/dev/video99` (1920×1080 RGB3, ~90 fps while the headset is active) — but only
|
||||
//! while someone has the device open. The first viewer starts one capture+encode
|
||||
//! thread; it stops when the last viewer leaves, which also lets v4l2cam go idle.
|
||||
//!
|
||||
//! Frames are captured via mmap (no read() copy), paced down to the configured fps,
|
||||
//! encoded in hardware (see encoder.rs) and broadcast as Annex B access units.
|
||||
//! Flatpak: needs `--device=all` for /dev/video*.
|
||||
//! SteamVR's v4l2cam only renders into `/dev/video99` (1920×1080 RGB3, ~90 fps) while the
|
||||
//! device is open, so capture runs only while someone watches: the first viewer starts the
|
||||
//! thread, it stops when the last one leaves.
|
||||
|
||||
use std::fs::{File, OpenOptions};
|
||||
use std::os::fd::AsRawFd;
|
||||
use std::os::unix::fs::OpenOptionsExt;
|
||||
use std::path::PathBuf;
|
||||
use std::sync::atomic::{AtomicBool, Ordering};
|
||||
use std::sync::{Arc, Mutex};
|
||||
use std::sync::{Arc, Mutex, PoisonError};
|
||||
use std::time::{Duration, Instant};
|
||||
|
||||
use anyhow::{Context, Result, ensure};
|
||||
@@ -37,7 +32,6 @@ pub struct StreamConfig {
|
||||
pub bitrate: u32,
|
||||
}
|
||||
|
||||
/// One encoded frame.
|
||||
pub struct Packet {
|
||||
/// Annex B access unit; keyframes carry SPS/PPS.
|
||||
pub data: Vec<u8>,
|
||||
@@ -86,7 +80,6 @@ impl LiveStream {
|
||||
running.tx.subscribe()
|
||||
}
|
||||
|
||||
/// Asks for a keyframe, e.g. after a viewer fell behind.
|
||||
pub fn request_keyframe(&self) {
|
||||
if let Some(running) = &*self.running.lock().unwrap() {
|
||||
running.want_keyframe.store(true, Ordering::Relaxed);
|
||||
@@ -100,20 +93,22 @@ impl LiveStream {
|
||||
std::thread::Builder::new()
|
||||
.name("stream".into())
|
||||
.spawn(move || {
|
||||
// Unregisters the pipeline however the thread ends, including a panic, so
|
||||
// the next viewer starts a fresh one instead of joining a dead channel.
|
||||
let _guard = StopGuard { stream: &this, tx: &thread_tx };
|
||||
tracing::info!("stream: starting");
|
||||
if let Err(e) = this.run(&thread_tx, &thread_want) {
|
||||
tracing::warn!("stream: {e:#}");
|
||||
}
|
||||
// Dropping our sender ends all viewers if we stopped on an error.
|
||||
this.stop_if_current(&thread_tx);
|
||||
tracing::info!("stream: stopped");
|
||||
})
|
||||
.expect("spawn stream thread");
|
||||
Running { tx, want_keyframe }
|
||||
}
|
||||
|
||||
/// Dropping our sender (and the registered clone) ends all viewers.
|
||||
fn stop_if_current(&self, tx: &broadcast::Sender<Arc<Packet>>) {
|
||||
let mut running = self.running.lock().unwrap();
|
||||
// Runs during unwinding too: a poisoned lock must not turn into a double panic.
|
||||
let mut running = self.running.lock().unwrap_or_else(PoisonError::into_inner);
|
||||
if running.as_ref().is_some_and(|r| r.tx.same_channel(tx)) {
|
||||
*running = None;
|
||||
}
|
||||
@@ -136,6 +131,7 @@ impl LiveStream {
|
||||
fn run(&self, tx: &broadcast::Sender<Arc<Packet>>, want_keyframe: &AtomicBool) -> Result<()> {
|
||||
let source = LoopbackCapture::open(&self.config.source_device)?;
|
||||
let (width, height) = (source.width, source.height);
|
||||
let frame_len = source.stride as usize * (height as usize).saturating_sub(1) + width as usize * 3;
|
||||
let mut encoder = Encoder::open(&self.config.encoder_device, encoder::Config {
|
||||
width,
|
||||
height,
|
||||
@@ -156,6 +152,11 @@ impl LiveStream {
|
||||
continue;
|
||||
};
|
||||
source_frames += 1;
|
||||
if len < frame_len {
|
||||
tracing::debug!("stream: short frame ({len} of {frame_len} bytes), skipped");
|
||||
source.release(index)?;
|
||||
continue;
|
||||
}
|
||||
let now = Instant::now();
|
||||
if now >= next_due {
|
||||
next_due = (next_due + interval).max(now);
|
||||
@@ -201,7 +202,18 @@ impl LiveStream {
|
||||
}
|
||||
}
|
||||
|
||||
/// mmap streaming capture from the v4l2loopback device.
|
||||
struct StopGuard<'a> {
|
||||
stream: &'a LiveStream,
|
||||
tx: &'a broadcast::Sender<Arc<Packet>>,
|
||||
}
|
||||
|
||||
impl Drop for StopGuard<'_> {
|
||||
fn drop(&mut self) {
|
||||
self.stream.stop_if_current(self.tx);
|
||||
tracing::info!("stream: stopped");
|
||||
}
|
||||
}
|
||||
|
||||
struct LoopbackCapture {
|
||||
buffers: Vec<Mapping>,
|
||||
file: File,
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
//! Minimal V4L2 ioctl plumbing (aarch64/64-bit layouts), shared by the hardware
|
||||
//! encoder and the loopback capture. Pure Rust on purpose: keeps the static build.
|
||||
//! Minimal V4L2 ioctl plumbing (aarch64/64-bit layouts), shared by the hardware encoder and the loopback capture
|
||||
|
||||
use std::fs::File;
|
||||
use std::os::fd::{AsRawFd, RawFd};
|
||||
|
||||
+1
-2
@@ -58,5 +58,4 @@ ssh() { /usr/bin/ssh "${SSH_OPTS[@]}" "$HOST" "$@"; }
|
||||
ssh "systemctl --user stop framemate-agent-dev 2>/dev/null; \
|
||||
flatpak install --user --reinstall --noninteractive -y /tmp/framemate-agent.flatpak && \
|
||||
rm /tmp/framemate-agent.flatpak && \
|
||||
flatpak run $APP_ID install-service && \
|
||||
echo -n 'Token: ' && flatpak run $APP_ID token"
|
||||
flatpak run --user $APP_ID install-service" # also runs `check`, which prints the token
|
||||
Executable
+37
@@ -0,0 +1,37 @@
|
||||
#!/usr/bin/env bash
|
||||
# Sets the version everywhere, commits, tags `v<version>` and pushes both. The tag push
|
||||
# triggers CI (.github/workflows/build.yml), which builds and publishes the GitHub release.
|
||||
#
|
||||
# scripts/release.sh 0.2.0
|
||||
set -euo pipefail
|
||||
|
||||
VERSION="${1:-}"
|
||||
if [[ ! "$VERSION" =~ ^[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
|
||||
echo "usage: $0 <major.minor.patch>" >&2
|
||||
exit 2
|
||||
fi
|
||||
TAG="v$VERSION"
|
||||
|
||||
cd "$(dirname "$0")/.."
|
||||
if [[ -n "$(git status --porcelain --untracked-files=no)" ]]; then
|
||||
echo "Working tree has uncommitted changes; commit or stash them first." >&2
|
||||
exit 1
|
||||
fi
|
||||
if git rev-parse -q --verify "refs/tags/$TAG" >/dev/null; then
|
||||
echo "Tag $TAG already exists." >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Agent (workspace) and app shell versions; the APK's version comes from tauri.conf.json.
|
||||
sed -i "s/^version = \".*\"/version = \"$VERSION\"/" Cargo.toml app/src-tauri/Cargo.toml
|
||||
sed -i "0,/\"version\": \".*\"/s//\"version\": \"$VERSION\"/" app/src-tauri/tauri.conf.json app/package.json
|
||||
# Refresh our own entries in both lockfiles (no dependency changes).
|
||||
cargo update --workspace --offline --quiet
|
||||
(cd app/src-tauri && cargo update --workspace --offline --quiet)
|
||||
|
||||
git add Cargo.toml Cargo.lock app/src-tauri/Cargo.toml app/src-tauri/Cargo.lock \
|
||||
app/src-tauri/tauri.conf.json app/package.json
|
||||
git commit -q -m "Release $TAG"
|
||||
git tag -a "$TAG" -m "FrameMate $TAG"
|
||||
git push --atomic origin HEAD "$TAG"
|
||||
echo "Pushed $TAG; CI builds and publishes the release."
|
||||
Reference in new issue
Block a user