Compare commits
No commits in common. "main" and "v0.0.5" have entirely different histories.
@ -10,15 +10,11 @@ on:
|
||||
jobs:
|
||||
lint:
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: read
|
||||
steps:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: ludeeus/action-shellcheck@2.0.0
|
||||
build:
|
||||
runs-on: ubuntu-24.04
|
||||
permissions:
|
||||
contents: read
|
||||
needs:
|
||||
- lint
|
||||
steps:
|
||||
@ -87,4 +83,3 @@ jobs:
|
||||
args: release --clean
|
||||
env:
|
||||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
|
||||
HOMEBREW_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}
|
||||
89
.github/workflows/codeql.yml
vendored
89
.github/workflows/codeql.yml
vendored
@ -1,89 +0,0 @@
|
||||
name: ci-scan
|
||||
|
||||
on:
|
||||
push:
|
||||
branches: [ "main" ]
|
||||
pull_request:
|
||||
branches: [ "main" ]
|
||||
schedule:
|
||||
- cron: '36 23 * * 3'
|
||||
|
||||
jobs:
|
||||
analyze:
|
||||
name: Analyze (${{ matrix.language }})
|
||||
# Runner size impacts CodeQL analysis time. To learn more, please see:
|
||||
# - https://gh.io/recommended-hardware-resources-for-running-codeql
|
||||
# - https://gh.io/supported-runners-and-hardware-resources
|
||||
# - https://gh.io/using-larger-runners (GitHub.com only)
|
||||
# Consider using larger runners or machines with greater resources for possible analysis time improvements.
|
||||
runs-on: ${{ (matrix.language == 'swift' && 'macos-latest') || 'ubuntu-latest' }}
|
||||
permissions:
|
||||
# required for all workflows
|
||||
security-events: write
|
||||
|
||||
# required to fetch internal or private CodeQL packs
|
||||
packages: read
|
||||
|
||||
# only required for workflows in private repositories
|
||||
actions: read
|
||||
contents: read
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- language: actions
|
||||
build-mode: none
|
||||
- language: go
|
||||
build-mode: autobuild
|
||||
# CodeQL supports the following values keywords for 'language': 'actions', 'c-cpp', 'csharp', 'go', 'java-kotlin', 'javascript-typescript', 'python', 'ruby', 'swift'
|
||||
# Use `c-cpp` to analyze code written in C, C++ or both
|
||||
# Use 'java-kotlin' to analyze code written in Java, Kotlin or both
|
||||
# Use 'javascript-typescript' to analyze code written in JavaScript, TypeScript or both
|
||||
# To learn more about changing the languages that are analyzed or customizing the build mode for your analysis,
|
||||
# see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/customizing-your-advanced-setup-for-code-scanning.
|
||||
# If you are analyzing a compiled language, you can modify the 'build-mode' for that language to customize how
|
||||
# your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
|
||||
# Add any setup steps before running the `github/codeql-action/init` action.
|
||||
# This includes steps like installing compilers or runtimes (`actions/setup-node`
|
||||
# or others). This is typically only required for manual builds.
|
||||
# - name: Setup runtime (example)
|
||||
# uses: actions/setup-example@v1
|
||||
|
||||
# Initializes the CodeQL tools for scanning.
|
||||
- name: Initialize CodeQL
|
||||
uses: github/codeql-action/init@v3
|
||||
with:
|
||||
languages: ${{ matrix.language }}
|
||||
build-mode: ${{ matrix.build-mode }}
|
||||
# If you wish to specify custom queries, you can do so here or in a config file.
|
||||
# By default, queries listed here will override any specified in a config file.
|
||||
# Prefix the list here with "+" to use these queries and those in the config file.
|
||||
|
||||
# For more details on CodeQL's query packs, refer to: https://docs.github.com/en/code-security/code-scanning/automatically-scanning-your-code-for-vulnerabilities-and-errors/configuring-code-scanning#using-queries-in-ql-packs
|
||||
# queries: security-extended,security-and-quality
|
||||
|
||||
# If the analyze step fails for one of the languages you are analyzing with
|
||||
# "We were unable to automatically build your code", modify the matrix above
|
||||
# to set the build mode to "manual" for that language. Then modify this step
|
||||
# to build your code.
|
||||
# ℹ️ Command-line programs to run using the OS shell.
|
||||
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
|
||||
- if: matrix.build-mode == 'manual'
|
||||
shell: bash
|
||||
run: |
|
||||
echo 'If you are using a "manual" build mode for one or more of the' \
|
||||
'languages you are analyzing, replace this with the commands to build' \
|
||||
'your code, for example:'
|
||||
echo ' make bootstrap'
|
||||
echo ' make release'
|
||||
exit 1
|
||||
|
||||
- name: Perform CodeQL Analysis
|
||||
uses: github/codeql-action/analyze@v3
|
||||
with:
|
||||
category: "/language:${{matrix.language}}"
|
||||
@ -26,24 +26,6 @@ archives:
|
||||
- goos: windows
|
||||
formats: [zip]
|
||||
|
||||
brews:
|
||||
- name: octoplex
|
||||
description: "Octoplex is a live video restreamer for the terminal."
|
||||
homepage: "https://github.com/rfwatson/octoplex"
|
||||
repository:
|
||||
owner: rfwatson
|
||||
name: homebrew-octoplex
|
||||
token: "{{ .Env.HOMEBREW_TOKEN }}"
|
||||
install: |
|
||||
bin.install "octoplex"
|
||||
test: |
|
||||
system "#{bin}/octoplex -h"
|
||||
|
||||
release:
|
||||
github:
|
||||
owner: rfwatson
|
||||
name: octoplex
|
||||
|
||||
changelog:
|
||||
use: github
|
||||
filters:
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
# Contributing
|
||||
|
||||
Thanks for contributing to Octoplex!
|
||||
|
||||
## Development
|
||||
|
||||
### Mise
|
||||
|
||||
Octoplex uses [mise](https://mise.jdx.dev/installing-mise.html) as a task
|
||||
runner and environment management tool.
|
||||
|
||||
Once installed, you can run common development tasks easily:
|
||||
|
||||
Command|Shortcut|Description
|
||||
---|---|---
|
||||
`mise run test`|`mise run t`|Run unit tests
|
||||
`mise run test_integration`|`mise run ti`|Run integration tests
|
||||
`mise run lint`|`mise run l`|Run linter
|
||||
`mise run format`|`mise run f`|Run formatter
|
||||
`mise run generate_mocks`|`mise run m`|Re-generate mocks
|
||||
|
||||
### Tests
|
||||
|
||||
#### Integration tests
|
||||
|
||||
The integration tests (mostly in `/internal/app/integration_test.go`) attempt
|
||||
to exercise the entire app, including launching containers and rendering the
|
||||
terminal output.
|
||||
|
||||
Sometimes they can be flaky. Always ensure there are no stale Docker containers
|
||||
present from previous runs, and that nothing is listening or attempting to
|
||||
broadcast to localhost:1935 or localhost:1936.
|
||||
|
||||
## Opening a pull request
|
||||
|
||||
Pull requests are welcome, but please propose significant changes in a
|
||||
[discussion](https://github.com/rfwatson/octoplex/discussions) first.
|
||||
|
||||
1. Fork the repo
|
||||
2. Make your changes, including test coverage
|
||||
3. Push the changes to a branch
|
||||
4. Ensure the branch is passing
|
||||
5. Open a pull request
|
||||
153
README.md
153
README.md
@ -1,153 +1,6 @@
|
||||
# Octoplex :octopus:
|
||||
|
||||
|
||||
|
||||
|
||||
[](https://www.gnu.org/licenses/agpl-3.0)
|
||||
Octoplex multiplexes RTMP streams to multiple destinations from the
|
||||
comfort of your terminal.
|
||||
|
||||
Octoplex is a live video restreamer for the terminal.
|
||||
|
||||
* Restream RTMP/RTMPS to unlimited destinations
|
||||
* Broadcast using OBS and other standard tools
|
||||
* Add and remove destinations while streaming
|
||||
* Automatic reconnections
|
||||
* Terminal user interface with real-time container metrics and health status
|
||||
* Built on FFmpeg, Docker and other proven free software
|
||||
|
||||
## How it works
|
||||
|
||||
```
|
||||
+------------------+ +-------------------+
|
||||
| OBS | ----> | Octoplex |
|
||||
| (Video Capture) | RTMP | |
|
||||
+------------------+ +-------------------+
|
||||
|
|
||||
| Restream to multiple destinations
|
||||
v
|
||||
+------------+ +------------+ +------------+ +--------------+
|
||||
| Twitch.tv | | YouTube | | Facebook | | Other |
|
||||
+------------+ +------------+ +------------+ | Destinations |
|
||||
+--------------+
|
||||
```
|
||||
|
||||
## Asciicast :video_camera:
|
||||
|
||||
[](https://asciinema.org/a/Es8hpa6rq82ov7cDM6bZTVyCT)
|
||||
|
||||
## Installation
|
||||
|
||||
### Docker Engine
|
||||
|
||||
First, make sure Docker Engine is installed. Octoplex uses Docker to manage
|
||||
FFmpeg and other streaming tools.
|
||||
|
||||
Linux: See https://docs.docker.com/engine/install/.
|
||||
|
||||
MacOS: https://docs.docker.com/desktop/setup/install/mac-install/
|
||||
|
||||
### Octoplex
|
||||
|
||||
#### Homebrew
|
||||
|
||||
Octoplex can be installed using Homebrew on MacOS or Linux.
|
||||
|
||||
```
|
||||
$ brew tap rfwatson/octoplex
|
||||
$ brew install octoplex
|
||||
```
|
||||
|
||||
#### From Github
|
||||
|
||||
Alternatively, grab the latest build for your platform from the [releases page](https://github.com/rfwatson/octoplex/releases).
|
||||
|
||||
Unarchive the `octoplex` binary and copy it somewhere in your $PATH.
|
||||
|
||||
## Usage
|
||||
|
||||
Launch the `octoplex` binary.
|
||||
|
||||
```
|
||||
$ octoplex
|
||||
```
|
||||
|
||||
### Connecting with OBS
|
||||
|
||||
To connect with OBS, configure it to stream to `rtmp://localhost:1935/live`.
|
||||
|
||||
|
||||
|
||||
### Subcommands
|
||||
|
||||
Subcommand|Description
|
||||
---|---
|
||||
None|Launch the terminal user interface
|
||||
`print-config`|Echo the path to the configuration file to STDOUT
|
||||
`edit-config`|Edit the configuration file in $EDITOR
|
||||
`version`|Print the version
|
||||
`help`|Print help screen
|
||||
|
||||
### Configuration file
|
||||
|
||||
Octoplex stores configuration state in a simple YAML file. (See [above](#subcommands) for its location.)
|
||||
|
||||
Sample configuration:
|
||||
|
||||
```yaml
|
||||
logfile:
|
||||
enabled: true # defaults to false
|
||||
path: /path/to/logfile # defaults to $XDG_STATE_HOME/octoplex/octoplex.log
|
||||
sources:
|
||||
mediaServer:
|
||||
streamKey: live # defaults to "live"
|
||||
host: rtmp.example.com # defaults to "localhost"
|
||||
tls: # optional. If RTMPS is enabled, defaults to a
|
||||
cert: /etc/mycert.pem # self-signed keypair corresponding to the host
|
||||
key: /etc/mykey.pem # key.
|
||||
rtmp:
|
||||
enabled: true # defaults to false
|
||||
ip: 127.0.0.1 # defaults to 127.0.0.1
|
||||
port: 1935 # defaults to 1935
|
||||
rtmps:
|
||||
enabled: true # defaults to false
|
||||
ip: 0.0.0.0 # defaults to 127.0.0.1
|
||||
port: 1936 # defaults to 1936
|
||||
destinations:
|
||||
- name: YouTube # Destination name, used only for display
|
||||
url: rtmp://rtmp.youtube.com/12345 # Destination URL with stream key
|
||||
- name: Twitch.tv
|
||||
url: rtmp://rtmp.youtube.com/12345
|
||||
# other destinations here
|
||||
```
|
||||
|
||||
:information_source: It is also possible to add and remove destinations directly from the
|
||||
terminal user interface.
|
||||
|
||||
:warning: `sources.mediaServer.rtmp.ip` must be set to a valid IP address if
|
||||
you want to accept connections from other hosts. Leave it blank to bind only to
|
||||
localhost (`127.0.0.1`) or use `0.0.0.0` to bind to all network interfaces.
|
||||
|
||||
## Contributing
|
||||
|
||||
### Bug reports
|
||||
|
||||
Open bug reports [on GitHub](https://github.com/rfwatson/octoplex/issues/new).
|
||||
|
||||
### Pull requests
|
||||
|
||||
Pull requests are welcome.
|
||||
|
||||
## Acknowledgements
|
||||
|
||||
Octoplex is built on and/or makes use of other free and open source software,
|
||||
most notably:
|
||||
|
||||
Name|License|URL
|
||||
---|---|---
|
||||
Docker|`Apache 2.0`|[GitHub](https://github.com/moby/moby/tree/master/client)
|
||||
FFmpeg|`LGPL`|[Website](https://www.ffmpeg.org/legal.html)
|
||||
MediaMTX|`MIT`|[GitHub](https://github.com/bluenviron/mediamtx)
|
||||
tview|`MIT`|[GitHub](https://github.com/rivo/tview)
|
||||
|
||||
## Licence
|
||||
|
||||
Octoplex is released under the [AGPL v3](https://github.com/rfwatson/octoplex/blob/main/LICENSE) license.
|
||||
|
||||
|
||||
11
SECURITY.md
11
SECURITY.md
@ -1,11 +0,0 @@
|
||||
# Security
|
||||
|
||||
## Supported versions
|
||||
|
||||
Octoplex is currently alpha software. Security updates will be targeted to the
|
||||
`main` branch.
|
||||
|
||||
## Reporting a vulnerability
|
||||
|
||||
Please report any vulnerability privately through GitHub:
|
||||
https://github.com/rfwatson/octoplex/security
|
||||
BIN
assets/obs1.png
BIN
assets/obs1.png
Binary file not shown.
|
Before Width: | Height: | Size: 39 KiB |
22
go.mod
22
go.mod
@ -3,12 +3,12 @@ module git.netflux.io/rob/octoplex
|
||||
go 1.24.0
|
||||
|
||||
require (
|
||||
github.com/docker/docker v28.0.4+incompatible
|
||||
github.com/docker/docker v28.0.1+incompatible
|
||||
github.com/docker/go-connections v0.5.0
|
||||
github.com/gdamore/tcell/v2 v2.8.1
|
||||
github.com/google/go-cmp v0.7.0
|
||||
github.com/opencontainers/image-spec v1.1.1
|
||||
github.com/rivo/tview v0.0.0-20250330220935-949945f8d922
|
||||
github.com/rivo/tview v0.0.0-20241227133733-17b7edb88c57
|
||||
github.com/stretchr/testify v1.10.0
|
||||
github.com/testcontainers/testcontainers-go v0.35.0
|
||||
golang.design/x/clipboard v0.7.0
|
||||
@ -88,18 +88,18 @@ require (
|
||||
go.opentelemetry.io/otel/metric v1.35.0 // indirect
|
||||
go.opentelemetry.io/otel/trace v1.35.0 // indirect
|
||||
go.uber.org/multierr v1.11.0 // indirect
|
||||
golang.org/x/crypto v0.37.0 // indirect
|
||||
golang.org/x/crypto v0.32.0 // indirect
|
||||
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac // indirect
|
||||
golang.org/x/exp/shiny v0.0.0-20250408133849-7e4ce0ab07d0 // indirect
|
||||
golang.org/x/image v0.26.0 // indirect
|
||||
golang.org/x/mobile v0.0.0-20250408133729-978277e7eaf7 // indirect
|
||||
golang.org/x/exp/shiny v0.0.0-20250305212735-054e65f0b394 // indirect
|
||||
golang.org/x/image v0.25.0 // indirect
|
||||
golang.org/x/mobile v0.0.0-20250305212854-3a7bc9f8a4de // indirect
|
||||
golang.org/x/mod v0.24.0 // indirect
|
||||
golang.org/x/sync v0.13.0 // indirect
|
||||
golang.org/x/sys v0.32.0 // indirect
|
||||
golang.org/x/term v0.31.0 // indirect
|
||||
golang.org/x/text v0.24.0 // indirect
|
||||
golang.org/x/sync v0.12.0 // indirect
|
||||
golang.org/x/sys v0.31.0 // indirect
|
||||
golang.org/x/term v0.30.0 // indirect
|
||||
golang.org/x/text v0.23.0 // indirect
|
||||
golang.org/x/time v0.9.0 // indirect
|
||||
golang.org/x/tools v0.32.0 // indirect
|
||||
golang.org/x/tools v0.31.0 // indirect
|
||||
gopkg.in/ini.v1 v1.67.0 // indirect
|
||||
)
|
||||
|
||||
|
||||
48
go.sum
48
go.sum
@ -26,8 +26,8 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
|
||||
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
|
||||
github.com/distribution/reference v0.6.0 h1:0IXCQ5g4/QMHHkarYzh5l+u8T3t73zM5QvfrDyIgxBk=
|
||||
github.com/distribution/reference v0.6.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
|
||||
github.com/docker/docker v28.0.4+incompatible h1:JNNkBctYKurkw6FrHfKqY0nKIDf5nrbxjVBtS+cdcok=
|
||||
github.com/docker/docker v28.0.4+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/docker v28.0.1+incompatible h1:FCHjSRdXhNRFjlHMTv4jUNlIBbTeRjrWfeFuJp7jpo0=
|
||||
github.com/docker/docker v28.0.1+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
|
||||
github.com/docker/go-connections v0.5.0 h1:USnMq7hx7gwdVZq1L49hLXaFtUdTADjXGp+uj1Br63c=
|
||||
github.com/docker/go-connections v0.5.0/go.mod h1:ov60Kzw0kKElRwhNs9UlUHAE/F9Fe6GLaXnqyDdmEXc=
|
||||
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
|
||||
@ -125,8 +125,8 @@ github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRI
|
||||
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
|
||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw=
|
||||
github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod h1:OmDBASR4679mdNQnz2pUhc2G8CO2JrUAVFDRBDP/hJE=
|
||||
github.com/rivo/tview v0.0.0-20250330220935-949945f8d922 h1:SMyqkaRfpE8ZQUSRTZKO3uN84xov++OGa+e3NCksaQw=
|
||||
github.com/rivo/tview v0.0.0-20250330220935-949945f8d922/go.mod h1:02iFIz7K/A9jGCvrizLPvoqr4cEIx7q54RH5Qudkrss=
|
||||
github.com/rivo/tview v0.0.0-20241227133733-17b7edb88c57 h1:LmsF7Fk5jyEDhJk0fYIqdWNuTxSyid2W42A0L2YWjGE=
|
||||
github.com/rivo/tview v0.0.0-20241227133733-17b7edb88c57/go.mod h1:02iFIz7K/A9jGCvrizLPvoqr4cEIx7q54RH5Qudkrss=
|
||||
github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
|
||||
github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
|
||||
github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
|
||||
@ -219,16 +219,16 @@ golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5y
|
||||
golang.org/x/crypto v0.13.0/go.mod h1:y6Z2r+Rw4iayiXXAIxJIDAJ1zMW4yaTpebo8fPOliYc=
|
||||
golang.org/x/crypto v0.19.0/go.mod h1:Iy9bg/ha4yyC70EfRS8jz+B6ybOBKMaSxLj6P6oBDfU=
|
||||
golang.org/x/crypto v0.23.0/go.mod h1:CKFgDieR+mRhux2Lsu27y0fO304Db0wZe70UKqHu0v8=
|
||||
golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
|
||||
golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
|
||||
golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
|
||||
golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
|
||||
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac h1:l5+whBCLH3iH2ZNHYLbAe58bo7yrN4mVcnkHDYz5vvs=
|
||||
golang.org/x/exp v0.0.0-20250210185358-939b2ce775ac/go.mod h1:hH+7mtFmImwwcMvScyxUhjuVHR3HGaDPMn9rMSUUbxo=
|
||||
golang.org/x/exp/shiny v0.0.0-20250408133849-7e4ce0ab07d0 h1:tMSqXTK+AQdW3LpCbfatHSRPHeW6+2WuxaVQuHftn80=
|
||||
golang.org/x/exp/shiny v0.0.0-20250408133849-7e4ce0ab07d0/go.mod h1:ygj7T6vSGhhm/9yTpOQQNvuAUFziTH7RUiH74EoE2C8=
|
||||
golang.org/x/image v0.26.0 h1:4XjIFEZWQmCZi6Wv8BoxsDhRU3RVnLX04dToTDAEPlY=
|
||||
golang.org/x/image v0.26.0/go.mod h1:lcxbMFAovzpnJxzXS3nyL83K27tmqtKzIJpctK8YO5c=
|
||||
golang.org/x/mobile v0.0.0-20250408133729-978277e7eaf7 h1:8MGTx39304caZ/OMsjPfuxUoDGI2tRas92F5x97tIYc=
|
||||
golang.org/x/mobile v0.0.0-20250408133729-978277e7eaf7/go.mod h1:ftACcHgQ7vaOnQbHOHvXt9Y6bEPHrs5Ovk67ClwrPJA=
|
||||
golang.org/x/exp/shiny v0.0.0-20250305212735-054e65f0b394 h1:bFYqOIMdeiCEdzPJkLiOoMDzW/v3tjW4AA/RmUZYsL8=
|
||||
golang.org/x/exp/shiny v0.0.0-20250305212735-054e65f0b394/go.mod h1:ygj7T6vSGhhm/9yTpOQQNvuAUFziTH7RUiH74EoE2C8=
|
||||
golang.org/x/image v0.25.0 h1:Y6uW6rH1y5y/LK1J8BPWZtr6yZ7hrsy6hFrXjgsc2fQ=
|
||||
golang.org/x/image v0.25.0/go.mod h1:tCAmOEGthTtkalusGp1g3xa2gke8J6c2N565dTyl9Rs=
|
||||
golang.org/x/mobile v0.0.0-20250305212854-3a7bc9f8a4de h1:WuckfUoaRGJfaQTPZvlmcaQwg4Xj9oS2cvvh3dUqpDo=
|
||||
golang.org/x/mobile v0.0.0-20250305212854-3a7bc9f8a4de/go.mod h1:/IZuixag1ELW37+FftdmIt59/3esqpAWM/QqWtf7HUI=
|
||||
golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
|
||||
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
|
||||
@ -249,8 +249,8 @@ golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg=
|
||||
golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk=
|
||||
golang.org/x/net v0.21.0/go.mod h1:bIjVDfnllIU7BJ2DNgfnXvpSvtn8VRwhlsaeUTyUS44=
|
||||
golang.org/x/net v0.25.0/go.mod h1:JkAGAh7GEvH74S6FOH42FLoXpXbE/aqXSrIQjXgsiwM=
|
||||
golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
|
||||
golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
|
||||
golang.org/x/net v0.37.0 h1:1zLorHbz+LYj7MQlSf1+2tPIIgibq2eL5xkrGk6f+2c=
|
||||
golang.org/x/net v0.37.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
|
||||
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
|
||||
@ -260,8 +260,8 @@ golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y=
|
||||
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
|
||||
golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
|
||||
golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
|
||||
golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
|
||||
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
|
||||
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
|
||||
@ -283,8 +283,8 @@ golang.org/x/sys v0.15.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.20.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
|
||||
golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
|
||||
golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
|
||||
golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
|
||||
golang.org/x/telemetry v0.0.0-20240228155512-f48c80bd79b2/go.mod h1:TeRTkGYfJXctD9OcfyVLyj2J3IxLnKwHJR8f4D8a3YE=
|
||||
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
|
||||
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
|
||||
@ -294,8 +294,8 @@ golang.org/x/term v0.12.0/go.mod h1:owVbMEjm3cBLCHdkQu9b1opXd4ETQWc3BhuQGKgXgvU=
|
||||
golang.org/x/term v0.17.0/go.mod h1:lLRBjIVuehSbZlaOtGMbcMncT+aqLLLmKrsjNrUguwk=
|
||||
golang.org/x/term v0.20.0/go.mod h1:8UkIAJTvZgivsXaD6/pH6U9ecQzZ45awqEOzuCvwpFY=
|
||||
golang.org/x/term v0.28.0/go.mod h1:Sw/lC2IAUZ92udQNf3WodGtn4k/XoLyZoh8v/8uiwek=
|
||||
golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
|
||||
golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
|
||||
golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y=
|
||||
golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g=
|
||||
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
|
||||
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
|
||||
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
|
||||
@ -305,8 +305,8 @@ golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
|
||||
golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
|
||||
golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ=
|
||||
golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
|
||||
golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
|
||||
golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
|
||||
golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
|
||||
golang.org/x/time v0.9.0 h1:EsRrnYcQiGH+5FfbgvV4AP7qEZstoyrHB0DzarOQ4ZY=
|
||||
golang.org/x/time v0.9.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM=
|
||||
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
|
||||
@ -317,8 +317,8 @@ golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc
|
||||
golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU=
|
||||
golang.org/x/tools v0.13.0/go.mod h1:HvlwmtVNQAhOuCjW7xxvovg8wbNq7LwfXh/k7wXUl58=
|
||||
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
|
||||
golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
|
||||
golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
|
||||
golang.org/x/tools v0.31.0 h1:0EedkvKDbh+qistFTd0Bcwe/YLh4vHwWEkiI0toFIBU=
|
||||
golang.org/x/tools v0.31.0/go.mod h1:naFTU+Cev749tSJRXJlna0T3WxKvb1kWEx15xA4SdmQ=
|
||||
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
|
||||
|
||||
@ -14,7 +14,6 @@ import (
|
||||
"git.netflux.io/rob/octoplex/internal/mediaserver"
|
||||
"git.netflux.io/rob/octoplex/internal/replicator"
|
||||
"git.netflux.io/rob/octoplex/internal/terminal"
|
||||
"github.com/docker/docker/client"
|
||||
)
|
||||
|
||||
// RunParams holds the parameters for running the application.
|
||||
@ -38,9 +37,9 @@ func Run(ctx context.Context, params RunParams) error {
|
||||
state := new(domain.AppState)
|
||||
applyConfig(cfg, state)
|
||||
|
||||
// Ensure there is at least one active source.
|
||||
if !cfg.Sources.MediaServer.RTMP.Enabled && !cfg.Sources.MediaServer.RTMPS.Enabled {
|
||||
return errors.New("config: either sources.mediaServer.rtmp.enabled or sources.mediaServer.rtmps.enabled must be set")
|
||||
// While RTMP is the only source, it doesn't make sense to disable it.
|
||||
if !cfg.Sources.RTMP.Enabled {
|
||||
return errors.New("config: sources.rtmp.enabled must be set to true")
|
||||
}
|
||||
|
||||
logger := params.Logger
|
||||
@ -70,15 +69,7 @@ func Run(ctx context.Context, params RunParams) error {
|
||||
containerClient, err := container.NewClient(ctx, params.DockerClient, logger.With("component", "container_client"))
|
||||
if err != nil {
|
||||
err = fmt.Errorf("create container client: %w", err)
|
||||
|
||||
var errString string
|
||||
if client.IsErrConnectionFailed(err) {
|
||||
errString = "Could not connect to Docker. Is Docker installed and running?"
|
||||
} else {
|
||||
errString = err.Error()
|
||||
}
|
||||
ui.ShowFatalErrorModal(errString)
|
||||
|
||||
ui.ShowFatalErrorModal(err)
|
||||
emptyUI()
|
||||
<-ui.C()
|
||||
return err
|
||||
@ -88,35 +79,20 @@ func Run(ctx context.Context, params RunParams) error {
|
||||
updateUI := func() { ui.SetState(*state) }
|
||||
updateUI()
|
||||
|
||||
var tlsCertPath, tlsKeyPath string
|
||||
if cfg.Sources.MediaServer.TLS != nil {
|
||||
tlsCertPath = cfg.Sources.MediaServer.TLS.CertPath
|
||||
tlsKeyPath = cfg.Sources.MediaServer.TLS.KeyPath
|
||||
}
|
||||
|
||||
srv, err := mediaserver.NewActor(ctx, mediaserver.NewActorParams{
|
||||
RTMPAddr: buildNetAddr(cfg.Sources.MediaServer.RTMP),
|
||||
RTMPSAddr: buildNetAddr(cfg.Sources.MediaServer.RTMPS),
|
||||
Host: cfg.Sources.MediaServer.Host,
|
||||
TLSCertPath: tlsCertPath,
|
||||
TLSKeyPath: tlsKeyPath,
|
||||
StreamKey: mediaserver.StreamKey(cfg.Sources.MediaServer.StreamKey),
|
||||
StreamKey: mediaserver.StreamKey(cfg.Sources.RTMP.StreamKey),
|
||||
ContainerClient: containerClient,
|
||||
Logger: logger.With("component", "mediaserver"),
|
||||
})
|
||||
if err != nil {
|
||||
err = fmt.Errorf("create mediaserver: %w", err)
|
||||
ui.ShowFatalErrorModal(err.Error())
|
||||
ui.ShowFatalErrorModal(err)
|
||||
emptyUI()
|
||||
<-ui.C()
|
||||
return err
|
||||
}
|
||||
defer srv.Close()
|
||||
|
||||
// Set the RTMP and RTMPS URLs in the UI, which are only known after the
|
||||
// MediaServer is available.
|
||||
ui.SetRTMPURLs(srv.RTMPURL(), srv.RTMPSURL())
|
||||
|
||||
repl := replicator.StartActor(ctx, replicator.StartActorParams{
|
||||
SourceURL: srv.RTMPInternalURL(),
|
||||
ContainerClient: containerClient,
|
||||
@ -155,7 +131,7 @@ func Run(ctx context.Context, params RunParams) error {
|
||||
|
||||
logger.Debug("Command received", "cmd", cmd.Name())
|
||||
switch c := cmd.(type) {
|
||||
case domain.CommandAddDestination:
|
||||
case terminal.CommandAddDestination:
|
||||
newCfg := cfg
|
||||
newCfg.Destinations = append(newCfg.Destinations, config.Destination{
|
||||
Name: c.DestinationName,
|
||||
@ -169,7 +145,7 @@ func Run(ctx context.Context, params RunParams) error {
|
||||
cfg = newCfg
|
||||
handleConfigUpdate(cfg, state, ui)
|
||||
ui.DestinationAdded()
|
||||
case domain.CommandRemoveDestination:
|
||||
case terminal.CommandRemoveDestination:
|
||||
repl.StopDestination(c.URL) // no-op if not live
|
||||
newCfg := cfg
|
||||
newCfg.Destinations = slices.DeleteFunc(newCfg.Destinations, func(dest config.Destination) bool {
|
||||
@ -183,16 +159,16 @@ func Run(ctx context.Context, params RunParams) error {
|
||||
cfg = newCfg
|
||||
handleConfigUpdate(cfg, state, ui)
|
||||
ui.DestinationRemoved()
|
||||
case domain.CommandStartDestination:
|
||||
case terminal.CommandStartDestination:
|
||||
if !state.Source.Live {
|
||||
ui.ShowSourceNotLiveModal()
|
||||
continue
|
||||
}
|
||||
|
||||
repl.StartDestination(c.URL)
|
||||
case domain.CommandStopDestination:
|
||||
case terminal.CommandStopDestination:
|
||||
repl.StopDestination(c.URL)
|
||||
case domain.CommandQuit:
|
||||
case terminal.CommandQuit:
|
||||
return nil
|
||||
}
|
||||
case <-uiUpdateT.C:
|
||||
@ -334,12 +310,3 @@ func doStartupCheck(ctx context.Context, containerClient *container.Client, show
|
||||
|
||||
return ch
|
||||
}
|
||||
|
||||
// buildNetAddr builds a [mediaserver.OptionalNetAddr] from the config.
|
||||
func buildNetAddr(src config.RTMPSource) mediaserver.OptionalNetAddr {
|
||||
if !src.Enabled {
|
||||
return mediaserver.OptionalNetAddr{Enabled: false}
|
||||
}
|
||||
|
||||
return mediaserver.OptionalNetAddr{Enabled: true, NetAddr: domain.NetAddr(src.NetAddr)}
|
||||
}
|
||||
|
||||
@ -6,7 +6,6 @@ import (
|
||||
"encoding/json"
|
||||
"fmt"
|
||||
"io"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"strings"
|
||||
@ -14,44 +13,14 @@ import (
|
||||
"testing"
|
||||
"time"
|
||||
|
||||
"git.netflux.io/rob/octoplex/internal/app"
|
||||
"git.netflux.io/rob/octoplex/internal/config"
|
||||
"git.netflux.io/rob/octoplex/internal/container"
|
||||
"git.netflux.io/rob/octoplex/internal/domain"
|
||||
"git.netflux.io/rob/octoplex/internal/terminal"
|
||||
"github.com/gdamore/tcell/v2"
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/testcontainers/testcontainers-go"
|
||||
)
|
||||
|
||||
func buildAppParams(
|
||||
t *testing.T,
|
||||
configService *config.Service,
|
||||
dockerClient container.DockerClient,
|
||||
screen tcell.SimulationScreen,
|
||||
screenCaptureC chan<- terminal.ScreenCapture,
|
||||
logger *slog.Logger,
|
||||
) app.RunParams {
|
||||
t.Helper()
|
||||
|
||||
return app.RunParams{
|
||||
ConfigService: configService,
|
||||
DockerClient: dockerClient,
|
||||
Screen: &terminal.Screen{
|
||||
Screen: screen,
|
||||
Width: 180,
|
||||
Height: 25,
|
||||
CaptureC: screenCaptureC,
|
||||
},
|
||||
ClipboardAvailable: false,
|
||||
BuildInfo: domain.BuildInfo{Version: "0.0.1", GoVersion: "go1.16.3"},
|
||||
Logger: logger,
|
||||
}
|
||||
}
|
||||
|
||||
func setupSimulationScreen(t *testing.T) (tcell.SimulationScreen, chan<- terminal.ScreenCapture, func() []string) {
|
||||
t.Helper()
|
||||
|
||||
// Fetching the screen contents is tricky at this level of the test pyramid,
|
||||
// because we need to:
|
||||
//
|
||||
@ -85,14 +54,12 @@ func setupSimulationScreen(t *testing.T) (tcell.SimulationScreen, chan<- termina
|
||||
lines[y] += string(screenCells[n].Runes[0])
|
||||
}
|
||||
|
||||
require.GreaterOrEqual(t, len(lines), 5, "Screen contents should have at least 5 lines")
|
||||
|
||||
return lines
|
||||
}
|
||||
|
||||
t.Cleanup(func() {
|
||||
if t.Failed() {
|
||||
printScreen(t, getContents, "After failing")
|
||||
printScreen(getContents, "After failing")
|
||||
}
|
||||
})
|
||||
|
||||
@ -126,8 +93,6 @@ func contentsIncludes(contents []string, search string) bool {
|
||||
}
|
||||
|
||||
func setupConfigService(t *testing.T, cfg config.Config) *config.Service {
|
||||
t.Helper()
|
||||
|
||||
tmpDir, err := os.MkdirTemp("", "octoplex_"+strings.ReplaceAll(t.Name(), "/", "_"))
|
||||
require.NoError(t, err)
|
||||
t.Cleanup(func() { os.RemoveAll(tmpDir) })
|
||||
@ -138,32 +103,29 @@ func setupConfigService(t *testing.T, cfg config.Config) *config.Service {
|
||||
return configService
|
||||
}
|
||||
|
||||
func printScreen(t *testing.T, getContents func() []string, label string) {
|
||||
t.Helper()
|
||||
|
||||
func printScreen(getContents func() []string, label string) {
|
||||
fmt.Println(label + ":")
|
||||
for _, line := range getContents() {
|
||||
fmt.Println(line)
|
||||
}
|
||||
}
|
||||
|
||||
func sendKey(t *testing.T, screen tcell.SimulationScreen, key tcell.Key, ch rune) {
|
||||
t.Helper()
|
||||
|
||||
func sendKey(screen tcell.SimulationScreen, key tcell.Key, ch rune) {
|
||||
screen.InjectKey(key, ch, tcell.ModNone)
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
|
||||
func sendKeys(t *testing.T, screen tcell.SimulationScreen, keys string) {
|
||||
t.Helper()
|
||||
func sendKeyShift(screen tcell.SimulationScreen, key tcell.Key, ch rune) {
|
||||
screen.InjectKey(key, ch, tcell.ModShift)
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
}
|
||||
|
||||
func sendKeys(screen tcell.SimulationScreen, keys string) {
|
||||
screen.InjectKeyBytes([]byte(keys))
|
||||
time.Sleep(500 * time.Millisecond)
|
||||
}
|
||||
|
||||
func sendBackspaces(t *testing.T, screen tcell.SimulationScreen, n int) {
|
||||
t.Helper()
|
||||
|
||||
func sendBackspaces(screen tcell.SimulationScreen, n int) {
|
||||
for range n {
|
||||
screen.InjectKey(tcell.KeyBackspace, ' ', tcell.ModNone)
|
||||
time.Sleep(50 * time.Millisecond)
|
||||
@ -173,8 +135,6 @@ func sendBackspaces(t *testing.T, screen tcell.SimulationScreen, n int) {
|
||||
|
||||
// kickFirstRTMPConn kicks the first RTMP connection from the mediaMTX server.
|
||||
func kickFirstRTMPConn(t *testing.T, srv testcontainers.Container) {
|
||||
t.Helper()
|
||||
|
||||
type conn struct {
|
||||
ID string `json:"id"`
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
17
internal/app/testdata/openssl.cnf
vendored
17
internal/app/testdata/openssl.cnf
vendored
@ -1,17 +0,0 @@
|
||||
# openssl req -x509 -nodes -days 3650 -newkey rsa:2048 -keyout server.key -out server.crt -config openssl.cnf
|
||||
|
||||
[req]
|
||||
default_bits = 2048
|
||||
prompt = no
|
||||
default_md = sha256
|
||||
distinguished_name = dn
|
||||
x509_extensions = v3_req
|
||||
|
||||
[dn]
|
||||
CN = localhost
|
||||
|
||||
[v3_req]
|
||||
subjectAltName = @alt_names
|
||||
|
||||
[alt_names]
|
||||
DNS.1 = localhost
|
||||
18
internal/app/testdata/server.crt
vendored
18
internal/app/testdata/server.crt
vendored
@ -1,18 +0,0 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIC7TCCAdWgAwIBAgIUTeqv46R19q+BS2e4DBkbIHuWyIIwDQYJKoZIhvcNAQEL
|
||||
BQAwFDESMBAGA1UEAwwJbG9jYWxob3N0MB4XDTI1MDQyMDA4NTMwN1oXDTM1MDQx
|
||||
ODA4NTMwN1owFDESMBAGA1UEAwwJbG9jYWxob3N0MIIBIjANBgkqhkiG9w0BAQEF
|
||||
AAOCAQ8AMIIBCgKCAQEA0v/KndfKfG8XItStHeMQ/3z1r8vhkH9KGpfSwDMp8MdH
|
||||
Mox6vcAsIIr1RFKmalQQg+T+TK9v3XM6F4sJ+WPyb5/31xLUqG6zivitrMy1AZ8w
|
||||
XLgAz/CTufXL3OBntDwg29QXWt9lOUJyjRa66AQqreTlItuLG65bswfPA4g35f+U
|
||||
hyr49paukqnVHRr44GtyiNxlfYCEdQWdOR0EQmZ7y6WNQQhnR8odQyftR2lykf17
|
||||
MSJ8us4JAgZ2fr1QR+DfX5bCSS/WJ2aO7xxeES40NizBx08qYFami1zXrGMMo35I
|
||||
SfedCohcok8ZZ1oWL+MfSJ2OLVclDnznDPTx39pZPQIDAQABozcwNTAUBgNVHREE
|
||||
DTALgglsb2NhbGhvc3QwHQYDVR0OBBYEFCgZah+m2NXkI9biS2vnhNUrd3FiMA0G
|
||||
CSqGSIb3DQEBCwUAA4IBAQAPbofZIKCm3DnudFnK+LRkdlpMNOyH2zn3g8h8vrfL
|
||||
Tfi0oBgHb7EYxcHYDanZbcIKracWCfQVze2FRLgNFBWiyhDO4IXe/LpwSnbyLWCh
|
||||
psbGuyVmEz9CuiyVdIi+CWQs5dBBRUCFg6NE2/r6Diw9LD0fVCVUwkvqopetfp1B
|
||||
tvA74O0RduLWs+iXNs5XW4sODVkrOmhBbRrP9GRCVqiqVWJka6CzrNdBm0Y9zZMQ
|
||||
GD/6fEgDaW8YlShoO+e4FwmD2IgIx+m4xamr/cQkWpbOHMxAwv7vP0stfkpyUacW
|
||||
dh9eJmsDAmgGgdtMJvbIfyR9ilG8D6zwOmSlkF6fDJ3E
|
||||
-----END CERTIFICATE-----
|
||||
28
internal/app/testdata/server.key
vendored
28
internal/app/testdata/server.key
vendored
@ -1,28 +0,0 @@
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDS/8qd18p8bxci
|
||||
1K0d4xD/fPWvy+GQf0oal9LAMynwx0cyjHq9wCwgivVEUqZqVBCD5P5Mr2/dczoX
|
||||
iwn5Y/Jvn/fXEtSobrOK+K2szLUBnzBcuADP8JO59cvc4Ge0PCDb1Bda32U5QnKN
|
||||
FrroBCqt5OUi24sbrluzB88DiDfl/5SHKvj2lq6SqdUdGvjga3KI3GV9gIR1BZ05
|
||||
HQRCZnvLpY1BCGdHyh1DJ+1HaXKR/XsxIny6zgkCBnZ+vVBH4N9flsJJL9YnZo7v
|
||||
HF4RLjQ2LMHHTypgVqaLXNesYwyjfkhJ950KiFyiTxlnWhYv4x9InY4tVyUOfOcM
|
||||
9PHf2lk9AgMBAAECggEAC3E3qaukHW9gz9C8upwvtcsu/6OMzes5N4v4L9gWdCo6
|
||||
YDFiDpw3SGSAvH3G7Ik2hBCNAdeZt2aiRdiSZ+XVpdwE8rLguWmXbvfhYzeOsVHS
|
||||
q5SG5r/jIviDX60DsrB4D7PGuHTY5mwGDkSnSiG/tsJs8qD5QD0KWAEaZtSiQ2Sp
|
||||
kcRbdq13/2tjHyx7nBxEYUFC4EJQjK3cNNV4G7nG2xcfT46uPvFV0+1CQtMpFYhi
|
||||
IsGaSBhW9gOAheycYxCi+LRdUh1IAnLUyYUenu0o8PoXsHp6KD8eS5RXtfA6THd/
|
||||
Jr614gdAB2Sffw+bFf6FIBNWa5Jwsg9UtbGtjNdo+QKBgQDrOJ2nj7El6MIqeDHs
|
||||
1cCeGDKmjB1CYWALLHrwwiwmrvEoeBMiJuMN4epZdQw9hwExa7fNpERI7Ay8s5HD
|
||||
cdppxgcW7CWChNncbVZ39P+YI9URWC2Q2Y8FBhc9FA0sKpDak0rf5UE63SGjU8/I
|
||||
FGgwjd1Ln5wws00OsYXBZw1lzwKBgQDlo2kRy6xvrUNAbeggT9OQeg2SdkWqvS3v
|
||||
NUhBzZkVhJNf1oApNRoAvRMQt+Xt+Euw1pQ+TvdOZQhhqxs/pD/wGdM7rhq9r0+G
|
||||
itsQ5LvNCxCePbSkbFMLgC8JgNuM3aRqhtsU+Illk9xvCj2nKsd+UUN3NxYgjCqa
|
||||
evTKSzUfMwKBgFapy1w7EteWxEMFec96ibc1zyORqA4W9l3ni3w87itqdSul4dbJ
|
||||
YQpyW/eNqm7Y2NWujE/V39rGLYMw3dmWjxQ9g8ssQj2uWN5f4mXb/He/a/cx98fQ
|
||||
gGMndVRpmNjW7fu6HPIU802Ov5//dySOcDzDZ+8+5TsENLXfLhqtrz/9AoGBALc+
|
||||
/BQoTFTdlSHv0mEecjwDOZtbZ+KEjggpo5xm/TbPkW7T03eOmU5nkrQvm3qXPYdC
|
||||
5A8Ioo5bTyHpEZhqcF8frJEeMNaW88XwPjmv3TEVGFC9+s2OZ4Jw6pgRzKEPKSmc
|
||||
rWyBm9qD8E5nhKVGHOVu4YBbY/va/hBB998Jvr1DAoGBAK5nnswLyQZi0lgpkl1P
|
||||
ITkmvnQlZBfuqvoD7wcQ3nx/K/mdacsxepRne+U/4+iNzRtd3gU0iccCWUTJl4aB
|
||||
cFRW1eXWuff+4vmM4JToDevGPXrS0CHE20mATJRZPH+YjZFl0pFSc4/tnjxBnx4y
|
||||
vgM382WU9N9jIHCCnM6DYsbK
|
||||
-----END PRIVATE KEY-----
|
||||
@ -22,37 +22,15 @@ func (l LogFile) GetPath() string {
|
||||
return cmp.Or(l.Path, l.defaultPath)
|
||||
}
|
||||
|
||||
// NetAddr holds an IP and/or port.
|
||||
type NetAddr struct {
|
||||
IP string `yaml:"ip,omitempty"`
|
||||
Port int `yaml:"port,omitempty"`
|
||||
}
|
||||
|
||||
// RTMPSource holds the configuration for the RTMP source.
|
||||
type RTMPSource struct {
|
||||
Enabled bool `yaml:"enabled"`
|
||||
|
||||
NetAddr `yaml:",inline"`
|
||||
}
|
||||
|
||||
// TLS holds the TLS configuration.
|
||||
type TLS struct {
|
||||
CertPath string `yaml:"cert,omitempty"`
|
||||
KeyPath string `yaml:"key,omitempty"`
|
||||
}
|
||||
|
||||
// MediaServerSource holds the configuration for the media server source.
|
||||
type MediaServerSource struct {
|
||||
StreamKey string `yaml:"streamKey,omitempty"`
|
||||
Host string `yaml:"host,omitempty"`
|
||||
TLS *TLS `yaml:"tls,omitempty"`
|
||||
RTMP RTMPSource `yaml:"rtmp"`
|
||||
RTMPS RTMPSource `yaml:"rtmps"`
|
||||
Enabled bool `yaml:"enabled"`
|
||||
StreamKey string `yaml:"streamkey,omitempty"`
|
||||
}
|
||||
|
||||
// Sources holds the configuration for the sources.
|
||||
type Sources struct {
|
||||
MediaServer MediaServerSource `yaml:"mediaServer"`
|
||||
RTMP RTMPSource `yaml:"rtmp"`
|
||||
}
|
||||
|
||||
// Config holds the configuration for the application.
|
||||
|
||||
@ -180,13 +180,10 @@ func (s *Service) writeConfig(cfgBytes []byte) error {
|
||||
// populateConfigOnBuild is called to set default values for a new, empty
|
||||
// configuration.
|
||||
//
|
||||
// This function may set serialized fields to arbitrary values.
|
||||
// This function may set exported fields to arbitrary values.
|
||||
func (s *Service) populateConfigOnBuild(cfg *Config) {
|
||||
cfg.Sources.MediaServer.StreamKey = "live"
|
||||
cfg.Sources.MediaServer.RTMP = RTMPSource{
|
||||
Enabled: true,
|
||||
NetAddr: NetAddr{IP: "127.0.0.1", Port: 1935},
|
||||
}
|
||||
cfg.Sources.RTMP.Enabled = true
|
||||
cfg.Sources.RTMP.StreamKey = "live"
|
||||
|
||||
s.populateConfigOnRead(cfg)
|
||||
}
|
||||
@ -194,7 +191,7 @@ func (s *Service) populateConfigOnBuild(cfg *Config) {
|
||||
// populateConfigOnRead is called to set default values for a configuration
|
||||
// read from an existing file.
|
||||
//
|
||||
// This function should not update any serialized values, which would be a
|
||||
// This function should not update any exported values, which would be a
|
||||
// confusing experience for the user.
|
||||
func (s *Service) populateConfigOnRead(cfg *Config) {
|
||||
cfg.LogFile.defaultPath = filepath.Join(s.appStateDir, "octoplex.log")
|
||||
|
||||
@ -19,9 +19,6 @@ import (
|
||||
//go:embed testdata/complete.yml
|
||||
var configComplete []byte
|
||||
|
||||
//go:embed testdata/rtmps-only.yml
|
||||
var configRTMPSOnly []byte
|
||||
|
||||
//go:embed testdata/logfile.yml
|
||||
var configLogfile []byte
|
||||
|
||||
@ -47,9 +44,7 @@ func TestConfigServiceCurrent(t *testing.T) {
|
||||
t.Cleanup(func() { require.NoError(t, os.RemoveAll(systemConfigDir)) })
|
||||
|
||||
// Ensure defaults are set:
|
||||
assert.NotNil(t, service.Current().Sources.MediaServer.RTMP)
|
||||
assert.Equal(t, "127.0.0.1", service.Current().Sources.MediaServer.RTMP.IP)
|
||||
assert.Equal(t, 1935, service.Current().Sources.MediaServer.RTMP.Port)
|
||||
assert.True(t, service.Current().Sources.RTMP.Enabled)
|
||||
}
|
||||
|
||||
func TestConfigServiceCreateConfig(t *testing.T) {
|
||||
@ -72,9 +67,7 @@ func TestConfigServiceCreateConfig(t *testing.T) {
|
||||
|
||||
var readCfg config.Config
|
||||
require.NoError(t, yaml.Unmarshal(cfgBytes, &readCfg))
|
||||
assert.NotNil(t, readCfg.Sources.MediaServer.RTMP)
|
||||
assert.Equal(t, "127.0.0.1", readCfg.Sources.MediaServer.RTMP.IP)
|
||||
assert.Equal(t, 1935, readCfg.Sources.MediaServer.RTMP.Port)
|
||||
assert.True(t, readCfg.Sources.RTMP.Enabled, "default values not set")
|
||||
}
|
||||
|
||||
func TestConfigServiceReadConfig(t *testing.T) {
|
||||
@ -97,27 +90,9 @@ func TestConfigServiceReadConfig(t *testing.T) {
|
||||
Path: "test.log",
|
||||
},
|
||||
Sources: config.Sources{
|
||||
MediaServer: config.MediaServerSource{
|
||||
RTMP: config.RTMPSource{
|
||||
Enabled: true,
|
||||
StreamKey: "s3cr3t",
|
||||
Host: "rtmp.example.com",
|
||||
TLS: &config.TLS{
|
||||
CertPath: "/etc/cert.pem",
|
||||
KeyPath: "/etc/key.pem",
|
||||
},
|
||||
RTMP: config.RTMPSource{
|
||||
Enabled: true,
|
||||
NetAddr: config.NetAddr{
|
||||
IP: "0.0.0.0",
|
||||
Port: 19350,
|
||||
},
|
||||
},
|
||||
RTMPS: config.RTMPSource{
|
||||
Enabled: true,
|
||||
NetAddr: config.NetAddr{
|
||||
IP: "0.0.0.0",
|
||||
Port: 19443,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
Destinations: []config.Destination{
|
||||
@ -133,33 +108,6 @@ func TestConfigServiceReadConfig(t *testing.T) {
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "RTMPS only",
|
||||
configBytes: configRTMPSOnly,
|
||||
want: func(t *testing.T, cfg config.Config) {
|
||||
require.Empty(
|
||||
t,
|
||||
gocmp.Diff(
|
||||
config.Config{
|
||||
LogFile: config.LogFile{Enabled: true},
|
||||
Sources: config.Sources{
|
||||
MediaServer: config.MediaServerSource{
|
||||
RTMPS: config.RTMPSource{
|
||||
Enabled: true,
|
||||
NetAddr: config.NetAddr{
|
||||
IP: "0.0.0.0",
|
||||
Port: 1935,
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
},
|
||||
cfg,
|
||||
cmpopts.IgnoreUnexported(config.LogFile{}),
|
||||
),
|
||||
)
|
||||
},
|
||||
},
|
||||
{
|
||||
name: "logging enabled, logfile",
|
||||
configBytes: configLogfile,
|
||||
|
||||
17
internal/config/testdata/complete.yml
vendored
17
internal/config/testdata/complete.yml
vendored
@ -3,20 +3,9 @@ logfile:
|
||||
enabled: true
|
||||
path: test.log
|
||||
sources:
|
||||
mediaServer:
|
||||
streamKey: s3cr3t
|
||||
host: rtmp.example.com
|
||||
tls:
|
||||
cert: /etc/cert.pem
|
||||
key: /etc/key.pem
|
||||
rtmp:
|
||||
enabled: true
|
||||
ip: 0.0.0.0
|
||||
port: 19350
|
||||
rtmps:
|
||||
enabled: true
|
||||
ip: 0.0.0.0
|
||||
port: 19443
|
||||
rtmp:
|
||||
enabled: true
|
||||
streamkey: s3cr3t
|
||||
destinations:
|
||||
- name: my stream
|
||||
url: rtmp://rtmp.example.com:1935/live
|
||||
|
||||
9
internal/config/testdata/rtmps-only.yml
vendored
9
internal/config/testdata/rtmps-only.yml
vendored
@ -1,9 +0,0 @@
|
||||
---
|
||||
logfile:
|
||||
enabled: true
|
||||
sources:
|
||||
mediaServer:
|
||||
rtmps:
|
||||
enabled: true
|
||||
ip: 0.0.0.0
|
||||
port: 1935
|
||||
@ -38,7 +38,6 @@ type DockerClient interface {
|
||||
|
||||
ContainerCreate(context.Context, *container.Config, *container.HostConfig, *network.NetworkingConfig, *ocispec.Platform, string) (container.CreateResponse, error)
|
||||
ContainerList(context.Context, container.ListOptions) ([]container.Summary, error)
|
||||
ContainerLogs(context.Context, string, container.LogsOptions) (io.ReadCloser, error)
|
||||
ContainerRemove(context.Context, string, container.RemoveOptions) error
|
||||
ContainerStart(context.Context, string, container.StartOptions) error
|
||||
ContainerStats(context.Context, string, bool) (container.StatsResponseReader, error)
|
||||
@ -137,48 +136,21 @@ func (a *Client) getEvents(containerID string) <-chan events.Message {
|
||||
return ch
|
||||
}
|
||||
|
||||
// getLogs returns a channel (which is never closed) that will receive
|
||||
// container logs.
|
||||
func (a *Client) getLogs(ctx context.Context, containerID string, cfg LogConfig) <-chan []byte {
|
||||
if !cfg.Stdout && !cfg.Stderr {
|
||||
return nil
|
||||
}
|
||||
|
||||
ch := make(chan []byte)
|
||||
|
||||
go getLogs(ctx, containerID, a.apiClient, cfg, ch, a.logger)
|
||||
|
||||
return ch
|
||||
}
|
||||
|
||||
// NetworkCountConfig holds configuration for observing network traffic.
|
||||
type NetworkCountConfig struct {
|
||||
Rx string // the network name to count the Rx bytes
|
||||
Tx string // the network name to count the Tx bytes
|
||||
}
|
||||
|
||||
// CopyFileConfig holds configuration for a single file which should be copied
|
||||
// into a container.
|
||||
type CopyFileConfig struct {
|
||||
Path string
|
||||
Payload io.Reader
|
||||
Mode int64
|
||||
}
|
||||
|
||||
// LogConfig holds configuration for container logs.
|
||||
type LogConfig struct {
|
||||
Stdout, Stderr bool
|
||||
}
|
||||
|
||||
// ShouldRestartFunc is a callback function that is called when a container
|
||||
// exits. It should return true if the container is to be restarted. If not
|
||||
// restarting, err may be non-nil.
|
||||
type ShouldRestartFunc func(
|
||||
exitCode int64,
|
||||
restartCount int,
|
||||
containerLogs [][]byte,
|
||||
runningTime time.Duration,
|
||||
) (bool, error)
|
||||
type ShouldRestartFunc func(exitCode int64, restartCount int, runningTime time.Duration) (bool, error)
|
||||
|
||||
// defaultRestartInterval is the default interval between restarts.
|
||||
// TODO: exponential backoff
|
||||
@ -192,8 +164,7 @@ type RunContainerParams struct {
|
||||
HostConfig *container.HostConfig
|
||||
NetworkingConfig *network.NetworkingConfig
|
||||
NetworkCountConfig NetworkCountConfig
|
||||
CopyFiles []CopyFileConfig
|
||||
Logs LogConfig
|
||||
CopyFileConfigs []CopyFileConfig
|
||||
ShouldRestart ShouldRestartFunc
|
||||
RestartInterval time.Duration // defaults to 10 seconds
|
||||
}
|
||||
@ -256,7 +227,7 @@ func (a *Client) RunContainer(ctx context.Context, params RunContainerParams) (<
|
||||
return
|
||||
}
|
||||
|
||||
if err = a.copyFilesToContainer(ctx, createResp.ID, params.CopyFiles); err != nil {
|
||||
if err = a.copyFilesToContainer(ctx, createResp.ID, params.CopyFileConfigs); err != nil {
|
||||
sendError(fmt.Errorf("copy files to container: %w", err))
|
||||
return
|
||||
}
|
||||
@ -281,7 +252,6 @@ func (a *Client) RunContainer(ctx context.Context, params RunContainerParams) (<
|
||||
createResp.ID,
|
||||
params.ContainerConfig.Image,
|
||||
params.NetworkCountConfig,
|
||||
params.Logs,
|
||||
params.ShouldRestart,
|
||||
cmp.Or(params.RestartInterval, defaultRestartInterval),
|
||||
containerStateC,
|
||||
@ -362,14 +332,6 @@ func (a *Client) pullImageIfNeeded(ctx context.Context, imageName string, contai
|
||||
return nil
|
||||
}
|
||||
|
||||
type containerWaitResponse struct {
|
||||
container.WaitResponse
|
||||
|
||||
restarting bool
|
||||
restartCount int
|
||||
err error
|
||||
}
|
||||
|
||||
// runContainerLoop is the control loop for a single container. It returns only
|
||||
// when the container exits.
|
||||
func (a *Client) runContainerLoop(
|
||||
@ -378,7 +340,6 @@ func (a *Client) runContainerLoop(
|
||||
containerID string,
|
||||
imageName string,
|
||||
networkCountConfig NetworkCountConfig,
|
||||
logConfig LogConfig,
|
||||
shouldRestartFunc ShouldRestartFunc,
|
||||
restartInterval time.Duration,
|
||||
stateC chan<- domain.Container,
|
||||
@ -386,15 +347,84 @@ func (a *Client) runContainerLoop(
|
||||
) {
|
||||
defer cancel()
|
||||
|
||||
type containerWaitResponse struct {
|
||||
container.WaitResponse
|
||||
|
||||
restarting bool
|
||||
restartCount int
|
||||
err error
|
||||
}
|
||||
|
||||
containerRespC := make(chan containerWaitResponse)
|
||||
containerErrC := make(chan error, 1)
|
||||
containerErrC := make(chan error)
|
||||
statsC := a.getStats(containerID, networkCountConfig)
|
||||
eventsC := a.getEvents(containerID)
|
||||
|
||||
// ContainerWait only sends a result for the first non-running state, so we
|
||||
// need to poll it repeatedly.
|
||||
//
|
||||
// The goroutine exits when a value is received on the error channel, or when
|
||||
// the container exits and is not restarting, or when the context is cancelled.
|
||||
go func() {
|
||||
timer := time.NewTimer(restartInterval)
|
||||
defer timer.Stop()
|
||||
timer.Stop()
|
||||
|
||||
var restartCount int
|
||||
for a.waitForContainerExit(ctx, containerID, containerRespC, containerErrC, logConfig, shouldRestartFunc, restartInterval, restartCount) {
|
||||
restartCount++
|
||||
|
||||
for {
|
||||
startedWaitingAt := time.Now()
|
||||
respC, errC := a.apiClient.ContainerWait(ctx, containerID, container.WaitConditionNextExit)
|
||||
select {
|
||||
case resp := <-respC:
|
||||
exit := func(err error) {
|
||||
a.logger.Info("Container exited", "id", shortID(containerID), "should_restart", "false", "exit_code", resp.StatusCode, "restart_count", restartCount)
|
||||
containerRespC <- containerWaitResponse{
|
||||
WaitResponse: resp,
|
||||
restarting: false,
|
||||
restartCount: restartCount,
|
||||
err: err,
|
||||
}
|
||||
}
|
||||
|
||||
if shouldRestartFunc == nil {
|
||||
exit(nil)
|
||||
return
|
||||
}
|
||||
|
||||
shouldRestart, err := shouldRestartFunc(resp.StatusCode, restartCount, time.Since(startedWaitingAt))
|
||||
if shouldRestart && err != nil {
|
||||
panic(fmt.Errorf("shouldRestart must return nil error if restarting, but returned: %w", err))
|
||||
}
|
||||
if !shouldRestart {
|
||||
exit(err)
|
||||
return
|
||||
}
|
||||
|
||||
a.logger.Info("Container exited", "id", shortID(containerID), "should_restart", "true", "exit_code", resp.StatusCode, "restart_count", restartCount)
|
||||
timer.Reset(restartInterval)
|
||||
|
||||
containerRespC <- containerWaitResponse{
|
||||
WaitResponse: resp,
|
||||
restarting: true,
|
||||
restartCount: restartCount,
|
||||
}
|
||||
case <-timer.C:
|
||||
a.logger.Info("Container restarting", "id", shortID(containerID), "restart_count", restartCount)
|
||||
restartCount++
|
||||
if err := a.apiClient.ContainerStart(ctx, containerID, container.StartOptions{}); err != nil {
|
||||
containerErrC <- fmt.Errorf("container start: %w", err)
|
||||
return
|
||||
}
|
||||
a.logger.Info("Restarted container", "id", shortID(containerID))
|
||||
case err := <-errC:
|
||||
containerErrC <- err
|
||||
return
|
||||
case <-ctx.Done():
|
||||
// This is probably because the container was stopped.
|
||||
containerRespC <- containerWaitResponse{WaitResponse: container.WaitResponse{}, restarting: false}
|
||||
return
|
||||
}
|
||||
}
|
||||
}()
|
||||
|
||||
@ -453,7 +483,6 @@ func (a *Client) runContainerLoop(
|
||||
if evt.Action == "start" {
|
||||
state.Status = domain.ContainerStatusRunning
|
||||
sendState()
|
||||
|
||||
continue
|
||||
}
|
||||
|
||||
@ -483,96 +512,6 @@ func (a *Client) runContainerLoop(
|
||||
}
|
||||
}
|
||||
|
||||
// waitForContainerExit blocks while it waits for a container to exit, and restarts
|
||||
// it if configured to do so.
|
||||
func (a *Client) waitForContainerExit(
|
||||
ctx context.Context,
|
||||
containerID string,
|
||||
containerRespC chan<- containerWaitResponse,
|
||||
containerErrC chan<- error,
|
||||
logConfig LogConfig,
|
||||
shouldRestartFunc ShouldRestartFunc,
|
||||
restartInterval time.Duration,
|
||||
restartCount int,
|
||||
) bool {
|
||||
var logs [][]byte
|
||||
startedWaitingAt := time.Now()
|
||||
respC, errC := a.apiClient.ContainerWait(ctx, containerID, container.WaitConditionNextExit)
|
||||
logsC := a.getLogs(ctx, containerID, logConfig)
|
||||
|
||||
timer := time.NewTimer(restartInterval)
|
||||
defer timer.Stop()
|
||||
timer.Stop()
|
||||
|
||||
for {
|
||||
select {
|
||||
case resp := <-respC:
|
||||
exit := func(err error) {
|
||||
a.logger.Info("Container exited", "id", shortID(containerID), "should_restart", "false", "exit_code", resp.StatusCode, "restart_count", restartCount)
|
||||
containerRespC <- containerWaitResponse{
|
||||
WaitResponse: resp,
|
||||
restarting: false,
|
||||
restartCount: restartCount,
|
||||
err: err,
|
||||
}
|
||||
}
|
||||
|
||||
// If the container exited with a non-zero status code, and debug
|
||||
// logging is not enabled, log the container logs at ERROR level for
|
||||
// debugging.
|
||||
// TODO: parameterize
|
||||
if resp.StatusCode != 0 && !a.logger.Enabled(ctx, slog.LevelDebug) {
|
||||
for _, line := range logs {
|
||||
a.logger.Error("Container log", "id", shortID(containerID), "log", string(line))
|
||||
}
|
||||
}
|
||||
|
||||
if shouldRestartFunc == nil {
|
||||
exit(nil)
|
||||
return false
|
||||
}
|
||||
|
||||
shouldRestart, err := shouldRestartFunc(resp.StatusCode, restartCount, logs, time.Since(startedWaitingAt))
|
||||
if shouldRestart && err != nil {
|
||||
panic(fmt.Errorf("shouldRestart must return nil error if restarting, but returned: %w", err))
|
||||
}
|
||||
if !shouldRestart {
|
||||
exit(err)
|
||||
return false
|
||||
}
|
||||
|
||||
a.logger.Info("Container exited", "id", shortID(containerID), "should_restart", "true", "exit_code", resp.StatusCode, "restart_count", restartCount)
|
||||
timer.Reset(restartInterval)
|
||||
|
||||
containerRespC <- containerWaitResponse{
|
||||
WaitResponse: resp,
|
||||
restarting: true,
|
||||
restartCount: restartCount,
|
||||
}
|
||||
// Don't return yet. Wait for the timer to fire.
|
||||
case <-timer.C:
|
||||
a.logger.Info("Container restarting", "id", shortID(containerID), "restart_count", restartCount)
|
||||
if err := a.apiClient.ContainerStart(ctx, containerID, container.StartOptions{}); err != nil {
|
||||
containerErrC <- fmt.Errorf("container start: %w", err)
|
||||
return false
|
||||
}
|
||||
a.logger.Info("Restarted container", "id", shortID(containerID))
|
||||
return true
|
||||
case line := <-logsC:
|
||||
a.logger.Debug("Container log", "id", shortID(containerID), "log", string(line))
|
||||
// TODO: limit max stored lines
|
||||
logs = append(logs, line)
|
||||
case err := <-errC:
|
||||
containerErrC <- err
|
||||
return false
|
||||
case <-ctx.Done():
|
||||
// This is probably because the container was stopped.
|
||||
containerRespC <- containerWaitResponse{WaitResponse: container.WaitResponse{}, restarting: false}
|
||||
return false
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Close closes the client, stopping and removing all running containers.
|
||||
func (a *Client) Close() error {
|
||||
a.cancel()
|
||||
|
||||
@ -73,10 +73,6 @@ func TestClientRunContainer(t *testing.T) {
|
||||
EXPECT().
|
||||
Events(mock.Anything, events.ListOptions{Filters: filters.NewArgs(filters.Arg("container", "123"), filters.Arg("type", "container"))}).
|
||||
Return(eventsC, eventsErrC)
|
||||
dockerClient.
|
||||
EXPECT().
|
||||
ContainerLogs(mock.Anything, "123", mock.Anything).
|
||||
Return(io.NopCloser(bytes.NewReader(nil)), nil)
|
||||
|
||||
containerClient, err := container.NewClient(t.Context(), &dockerClient, logger)
|
||||
require.NoError(t, err)
|
||||
@ -86,8 +82,7 @@ func TestClientRunContainer(t *testing.T) {
|
||||
ChanSize: 1,
|
||||
ContainerConfig: &dockercontainer.Config{Image: "alpine"},
|
||||
HostConfig: &dockercontainer.HostConfig{},
|
||||
Logs: container.LogConfig{Stdout: true},
|
||||
CopyFiles: []container.CopyFileConfig{
|
||||
CopyFileConfigs: []container.CopyFileConfig{
|
||||
{
|
||||
Path: "/hello",
|
||||
Payload: bytes.NewReader([]byte("world")),
|
||||
@ -181,10 +176,6 @@ func TestClientRunContainerWithRestart(t *testing.T) {
|
||||
EXPECT().
|
||||
ContainerStart(mock.Anything, "123", dockercontainer.StartOptions{}). // restart
|
||||
Return(nil)
|
||||
dockerClient.
|
||||
EXPECT().
|
||||
ContainerLogs(mock.Anything, "123", mock.Anything).
|
||||
Return(io.NopCloser(bytes.NewReader(nil)), nil)
|
||||
|
||||
containerClient, err := container.NewClient(t.Context(), &dockerClient, logger)
|
||||
require.NoError(t, err)
|
||||
@ -194,8 +185,7 @@ func TestClientRunContainerWithRestart(t *testing.T) {
|
||||
ChanSize: 1,
|
||||
ContainerConfig: &dockercontainer.Config{Image: "alpine"},
|
||||
HostConfig: &dockercontainer.HostConfig{},
|
||||
Logs: container.LogConfig{Stdout: true},
|
||||
ShouldRestart: func(_ int64, restartCount int, _ [][]byte, _ time.Duration) (bool, error) {
|
||||
ShouldRestart: func(_ int64, restartCount int, _ time.Duration) (bool, error) {
|
||||
if restartCount == 0 {
|
||||
return true, nil
|
||||
}
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
package container
|
||||
|
||||
import (
|
||||
"bufio"
|
||||
"context"
|
||||
"log/slog"
|
||||
|
||||
typescontainer "github.com/docker/docker/api/types/container"
|
||||
)
|
||||
|
||||
func getLogs(
|
||||
ctx context.Context,
|
||||
containerID string,
|
||||
apiClient DockerClient,
|
||||
cfg LogConfig,
|
||||
ch chan<- []byte,
|
||||
logger *slog.Logger,
|
||||
) {
|
||||
logsC, err := apiClient.ContainerLogs(
|
||||
ctx,
|
||||
containerID,
|
||||
typescontainer.LogsOptions{
|
||||
ShowStdout: cfg.Stdout,
|
||||
ShowStderr: cfg.Stderr,
|
||||
Follow: true,
|
||||
},
|
||||
)
|
||||
if err != nil {
|
||||
logger.Error("Error getting container logs", "err", err, "id", shortID(containerID))
|
||||
return
|
||||
}
|
||||
defer logsC.Close()
|
||||
|
||||
scanner := bufio.NewScanner(logsC)
|
||||
for scanner.Scan() {
|
||||
select {
|
||||
case <-ctx.Done():
|
||||
return
|
||||
default:
|
||||
// Docker logs are prefixed with an 8 byte prefix.
|
||||
// See client.ContainerLogs for more details.
|
||||
// We could use
|
||||
// [StdCopy](https://pkg.go.dev/github.com/docker/docker/pkg/stdcopy#StdCopy)
|
||||
// but for our purposes it's enough to just slice it off.
|
||||
const prefixLen = 8
|
||||
line := scanner.Bytes()
|
||||
if len(line) <= prefixLen {
|
||||
continue
|
||||
}
|
||||
ch <- line[prefixLen:]
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,45 +0,0 @@
|
||||
package container
|
||||
|
||||
import (
|
||||
"io"
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.netflux.io/rob/octoplex/internal/container/mocks"
|
||||
"git.netflux.io/rob/octoplex/internal/testhelpers"
|
||||
typescontainer "github.com/docker/docker/api/types/container"
|
||||
"github.com/stretchr/testify/assert"
|
||||
"github.com/stretchr/testify/mock"
|
||||
)
|
||||
|
||||
func TestGetLogs(t *testing.T) {
|
||||
var dockerClient mocks.DockerClient
|
||||
dockerClient.
|
||||
EXPECT().
|
||||
ContainerLogs(mock.Anything, "123", typescontainer.LogsOptions{ShowStderr: true, Follow: true}).
|
||||
Return(io.NopCloser(strings.NewReader("********line 1\n********line 2\n********line 3\n")), nil)
|
||||
|
||||
ch := make(chan []byte)
|
||||
|
||||
go func() {
|
||||
defer close(ch)
|
||||
|
||||
getLogs(
|
||||
t.Context(),
|
||||
"123",
|
||||
&dockerClient,
|
||||
LogConfig{Stderr: true},
|
||||
ch,
|
||||
testhelpers.NewTestLogger(t),
|
||||
)
|
||||
}()
|
||||
|
||||
// Ensure we get the expected lines, including stripping 8 bytes of Docker
|
||||
// multiplexing prefix.
|
||||
assert.Equal(t, "line 1", string(<-ch))
|
||||
assert.Equal(t, "line 2", string(<-ch))
|
||||
assert.Equal(t, "line 3", string(<-ch))
|
||||
|
||||
_, ok := <-ch
|
||||
assert.False(t, ok)
|
||||
}
|
||||
@ -197,66 +197,6 @@ func (_c *DockerClient_ContainerList_Call) RunAndReturn(run func(context.Context
|
||||
return _c
|
||||
}
|
||||
|
||||
// ContainerLogs provides a mock function with given fields: _a0, _a1, _a2
|
||||
func (_m *DockerClient) ContainerLogs(_a0 context.Context, _a1 string, _a2 typescontainer.LogsOptions) (io.ReadCloser, error) {
|
||||
ret := _m.Called(_a0, _a1, _a2)
|
||||
|
||||
if len(ret) == 0 {
|
||||
panic("no return value specified for ContainerLogs")
|
||||
}
|
||||
|
||||
var r0 io.ReadCloser
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(0).(func(context.Context, string, typescontainer.LogsOptions) (io.ReadCloser, error)); ok {
|
||||
return rf(_a0, _a1, _a2)
|
||||
}
|
||||
if rf, ok := ret.Get(0).(func(context.Context, string, typescontainer.LogsOptions) io.ReadCloser); ok {
|
||||
r0 = rf(_a0, _a1, _a2)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(io.ReadCloser)
|
||||
}
|
||||
}
|
||||
|
||||
if rf, ok := ret.Get(1).(func(context.Context, string, typescontainer.LogsOptions) error); ok {
|
||||
r1 = rf(_a0, _a1, _a2)
|
||||
} else {
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// DockerClient_ContainerLogs_Call is a *mock.Call that shadows Run/Return methods with type explicit version for method 'ContainerLogs'
|
||||
type DockerClient_ContainerLogs_Call struct {
|
||||
*mock.Call
|
||||
}
|
||||
|
||||
// ContainerLogs is a helper method to define mock.On call
|
||||
// - _a0 context.Context
|
||||
// - _a1 string
|
||||
// - _a2 typescontainer.LogsOptions
|
||||
func (_e *DockerClient_Expecter) ContainerLogs(_a0 interface{}, _a1 interface{}, _a2 interface{}) *DockerClient_ContainerLogs_Call {
|
||||
return &DockerClient_ContainerLogs_Call{Call: _e.mock.On("ContainerLogs", _a0, _a1, _a2)}
|
||||
}
|
||||
|
||||
func (_c *DockerClient_ContainerLogs_Call) Run(run func(_a0 context.Context, _a1 string, _a2 typescontainer.LogsOptions)) *DockerClient_ContainerLogs_Call {
|
||||
_c.Call.Run(func(args mock.Arguments) {
|
||||
run(args[0].(context.Context), args[1].(string), args[2].(typescontainer.LogsOptions))
|
||||
})
|
||||
return _c
|
||||
}
|
||||
|
||||
func (_c *DockerClient_ContainerLogs_Call) Return(_a0 io.ReadCloser, _a1 error) *DockerClient_ContainerLogs_Call {
|
||||
_c.Call.Return(_a0, _a1)
|
||||
return _c
|
||||
}
|
||||
|
||||
func (_c *DockerClient_ContainerLogs_Call) RunAndReturn(run func(context.Context, string, typescontainer.LogsOptions) (io.ReadCloser, error)) *DockerClient_ContainerLogs_Call {
|
||||
_c.Call.Return(run)
|
||||
return _c
|
||||
}
|
||||
|
||||
// ContainerRemove provides a mock function with given fields: _a0, _a1, _a2
|
||||
func (_m *DockerClient) ContainerRemove(_a0 context.Context, _a1 string, _a2 typescontainer.RemoveOptions) error {
|
||||
ret := _m.Called(_a0, _a1, _a2)
|
||||
|
||||
@ -34,7 +34,9 @@ type Source struct {
|
||||
Container Container
|
||||
Live bool
|
||||
LiveChangedAt time.Time
|
||||
Listeners int
|
||||
Tracks []string
|
||||
RTMPURL string
|
||||
ExitReason string
|
||||
}
|
||||
|
||||
@ -55,27 +57,6 @@ type Destination struct {
|
||||
URL string
|
||||
}
|
||||
|
||||
// NetAddr holds a network address.
|
||||
type NetAddr struct {
|
||||
IP string
|
||||
Port int
|
||||
}
|
||||
|
||||
// IsZero returns true if the NetAddr is zero value.
|
||||
func (n NetAddr) IsZero() bool {
|
||||
return n.IP == "" && n.Port == 0
|
||||
}
|
||||
|
||||
// KeyPair holds a TLS key pair.
|
||||
type KeyPair struct {
|
||||
Cert, Key []byte
|
||||
}
|
||||
|
||||
// IsZero returns true if the KeyPair is zero value.
|
||||
func (k KeyPair) IsZero() bool {
|
||||
return k.Cert == nil && k.Key == nil
|
||||
}
|
||||
|
||||
// Container status strings.
|
||||
//
|
||||
// TODO: refactor to strictly reflect Docker status strings.
|
||||
|
||||
@ -31,21 +31,3 @@ func TestAppStateClone(t *testing.T) {
|
||||
s.Destinations[0].Name = "Twitch"
|
||||
assert.Equal(t, "YouTube", s2.Destinations[0].Name)
|
||||
}
|
||||
|
||||
func TestNetAddr(t *testing.T) {
|
||||
var addr domain.NetAddr
|
||||
assert.True(t, addr.IsZero())
|
||||
|
||||
addr.IP = "127.0.0.1"
|
||||
addr.Port = 3000
|
||||
assert.False(t, addr.IsZero())
|
||||
}
|
||||
|
||||
func TestKeyPair(t *testing.T) {
|
||||
var keyPair domain.KeyPair
|
||||
assert.True(t, keyPair.IsZero())
|
||||
|
||||
keyPair.Cert = []byte("cert")
|
||||
keyPair.Key = []byte("key")
|
||||
assert.False(t, keyPair.IsZero())
|
||||
}
|
||||
|
||||
@ -8,7 +8,7 @@ import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"os"
|
||||
"strconv"
|
||||
"time"
|
||||
|
||||
typescontainer "github.com/docker/docker/api/types/container"
|
||||
@ -27,22 +27,14 @@ import (
|
||||
type StreamKey string
|
||||
|
||||
const (
|
||||
defaultUpdateStateInterval = 5 * time.Second // default interval to update the state of the media server
|
||||
defaultAPIPort = 9997 // default API host port for the media server
|
||||
defaultRTMPIP = "127.0.0.1" // default RTMP host IP, bound to localhost for security
|
||||
defaultRTMPPort = 1935 // default RTMP host port for the media server
|
||||
defaultRTMPSPort = 1936 // default RTMPS host port for the media server
|
||||
defaultHost = "localhost" // default mediaserver host name
|
||||
defaultChanSize = 64 // default channel size for asynchronous non-error channels
|
||||
imageNameMediaMTX = "ghcr.io/rfwatson/mediamtx-alpine:latest" // image name for mediamtx
|
||||
defaultStreamKey StreamKey = "live" // Default stream key. See [StreamKey].
|
||||
componentName = "mediaserver" // component name, mostly used for Docker labels
|
||||
httpClientTimeout = time.Second // timeout for outgoing HTTP client requests
|
||||
configPath = "/mediamtx.yml" // path to the media server config file
|
||||
tlsInternalCertPath = "/etc/tls-internal.crt" // path to the internal TLS cert
|
||||
tlsInternalKeyPath = "/etc/tls-internal.key" // path to the internal TLS key
|
||||
tlsCertPath = "/etc/tls.crt" // path to the custom TLS cert
|
||||
tlsKeyPath = "/etc/tls.key" // path to the custom TLS key
|
||||
defaultFetchIngressStateInterval = 5 * time.Second // default interval to fetch the state of the media server
|
||||
defaultAPIPort = 9997 // default API host port for the media server
|
||||
defaultRTMPPort = 1935 // default RTMP host port for the media server
|
||||
defaultChanSize = 64 // default channel size for asynchronous non-error channels
|
||||
imageNameMediaMTX = "ghcr.io/rfwatson/mediamtx-alpine:latest" // image name for mediamtx
|
||||
defaultStreamKey StreamKey = "live" // Default stream key. See [StreamKey].
|
||||
componentName = "mediaserver" // component name, mostly used for Docker labels
|
||||
httpClientTimeout = time.Second // timeout for outgoing HTTP client requests
|
||||
)
|
||||
|
||||
// action is an action to be performed by the actor.
|
||||
@ -50,21 +42,18 @@ type action func()
|
||||
|
||||
// Actor is responsible for managing the media server.
|
||||
type Actor struct {
|
||||
actorC chan action
|
||||
stateC chan domain.Source
|
||||
chanSize int
|
||||
containerClient *container.Client
|
||||
rtmpAddr domain.NetAddr
|
||||
rtmpsAddr domain.NetAddr
|
||||
apiPort int
|
||||
host string
|
||||
streamKey StreamKey
|
||||
updateStateInterval time.Duration
|
||||
pass string // password for the media server
|
||||
keyPairInternal domain.KeyPair // TLS key pair for the media server
|
||||
keyPairCustom domain.KeyPair // TLS key pair for the media server
|
||||
logger *slog.Logger
|
||||
apiClient *http.Client
|
||||
actorC chan action
|
||||
stateC chan domain.Source
|
||||
chanSize int
|
||||
containerClient *container.Client
|
||||
apiPort int
|
||||
rtmpPort int
|
||||
streamKey StreamKey
|
||||
fetchIngressStateInterval time.Duration
|
||||
pass string // password for the media server
|
||||
tlsCert, tlsKey []byte // TLS cert and key for the media server
|
||||
logger *slog.Logger
|
||||
apiClient *http.Client
|
||||
|
||||
// mutable state
|
||||
state *domain.Source
|
||||
@ -73,215 +62,61 @@ type Actor struct {
|
||||
// NewActorParams contains the parameters for building a new media server
|
||||
// actor.
|
||||
type NewActorParams struct {
|
||||
RTMPAddr OptionalNetAddr // defaults to disabled, or 127.0.0.1:1935
|
||||
RTMPSAddr OptionalNetAddr // defaults to disabled, or 127.0.0.1:1936
|
||||
APIPort int // defaults to 9997
|
||||
Host string // defaults to "localhost"
|
||||
TLSCertPath string // defaults to empty
|
||||
TLSKeyPath string // defaults to empty
|
||||
StreamKey StreamKey // defaults to "live"
|
||||
ChanSize int // defaults to 64
|
||||
UpdateStateInterval time.Duration // defaults to 5 seconds
|
||||
ContainerClient *container.Client
|
||||
Logger *slog.Logger
|
||||
}
|
||||
|
||||
// OptionalNetAddr is a wrapper around domain.NetAddr that indicates whether it
|
||||
// is enabled or not.
|
||||
type OptionalNetAddr struct {
|
||||
domain.NetAddr
|
||||
|
||||
Enabled bool
|
||||
APIPort int // defaults to 9997
|
||||
RTMPPort int // defaults to 1935
|
||||
StreamKey StreamKey // defaults to "live"
|
||||
ChanSize int // defaults to 64
|
||||
FetchIngressStateInterval time.Duration // defaults to 5 seconds
|
||||
ContainerClient *container.Client
|
||||
Logger *slog.Logger
|
||||
}
|
||||
|
||||
// NewActor creates a new media server actor.
|
||||
//
|
||||
// Callers must consume the state channel exposed via [C].
|
||||
func NewActor(ctx context.Context, params NewActorParams) (_ *Actor, err error) {
|
||||
dnsNames := []string{"localhost"}
|
||||
if params.Host != "" {
|
||||
dnsNames = append(dnsNames, params.Host)
|
||||
}
|
||||
|
||||
keyPairInternal, err := generateTLSCert(dnsNames...)
|
||||
tlsCert, tlsKey, err := generateTLSCert()
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("generate TLS cert: %w", err)
|
||||
}
|
||||
|
||||
var keyPairCustom domain.KeyPair
|
||||
if params.TLSCertPath != "" {
|
||||
keyPairCustom.Cert, err = os.ReadFile(params.TLSCertPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read TLS cert: %w", err)
|
||||
}
|
||||
keyPairCustom.Key, err = os.ReadFile(params.TLSKeyPath)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read TLS key: %w", err)
|
||||
}
|
||||
}
|
||||
|
||||
// TODO: custom cert for API?
|
||||
apiClient, err := buildAPIClient(keyPairInternal.Cert)
|
||||
apiClient, err := buildAPIClient(tlsCert)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("build API client: %w", err)
|
||||
}
|
||||
|
||||
chanSize := cmp.Or(params.ChanSize, defaultChanSize)
|
||||
return &Actor{
|
||||
rtmpAddr: toRTMPAddr(params.RTMPAddr, defaultRTMPPort),
|
||||
rtmpsAddr: toRTMPAddr(params.RTMPSAddr, defaultRTMPSPort),
|
||||
apiPort: cmp.Or(params.APIPort, defaultAPIPort),
|
||||
host: cmp.Or(params.Host, defaultHost),
|
||||
streamKey: cmp.Or(params.StreamKey, defaultStreamKey),
|
||||
updateStateInterval: cmp.Or(params.UpdateStateInterval, defaultUpdateStateInterval),
|
||||
keyPairInternal: keyPairInternal,
|
||||
keyPairCustom: keyPairCustom,
|
||||
pass: generatePassword(),
|
||||
actorC: make(chan action, chanSize),
|
||||
state: new(domain.Source),
|
||||
stateC: make(chan domain.Source, chanSize),
|
||||
chanSize: chanSize,
|
||||
containerClient: params.ContainerClient,
|
||||
logger: params.Logger,
|
||||
apiClient: apiClient,
|
||||
apiPort: cmp.Or(params.APIPort, defaultAPIPort),
|
||||
rtmpPort: cmp.Or(params.RTMPPort, defaultRTMPPort),
|
||||
streamKey: cmp.Or(params.StreamKey, defaultStreamKey),
|
||||
fetchIngressStateInterval: cmp.Or(params.FetchIngressStateInterval, defaultFetchIngressStateInterval),
|
||||
tlsCert: tlsCert,
|
||||
tlsKey: tlsKey,
|
||||
pass: generatePassword(),
|
||||
actorC: make(chan action, chanSize),
|
||||
state: new(domain.Source),
|
||||
stateC: make(chan domain.Source, chanSize),
|
||||
chanSize: chanSize,
|
||||
containerClient: params.ContainerClient,
|
||||
logger: params.Logger,
|
||||
apiClient: apiClient,
|
||||
}, nil
|
||||
}
|
||||
|
||||
func (a *Actor) Start(ctx context.Context) error {
|
||||
var portSpecs []string
|
||||
portSpecs = append(portSpecs, fmt.Sprintf("127.0.0.1:%d:9997", a.apiPort))
|
||||
if !a.rtmpAddr.IsZero() {
|
||||
portSpecs = append(portSpecs, fmt.Sprintf("%s:%d:%d", a.rtmpAddr.IP, a.rtmpAddr.Port, 1935))
|
||||
}
|
||||
if !a.rtmpsAddr.IsZero() {
|
||||
portSpecs = append(portSpecs, fmt.Sprintf("%s:%d:%d", a.rtmpsAddr.IP, a.rtmpsAddr.Port, 1936))
|
||||
}
|
||||
exposedPorts, portBindings, err := nat.ParsePortSpecs(portSpecs)
|
||||
if err != nil {
|
||||
return fmt.Errorf("parse port specs: %w", err)
|
||||
}
|
||||
// Exposed ports are bound to 127.0.0.1 for security.
|
||||
// TODO: configurable RTMP bind address
|
||||
apiPortSpec := nat.Port("127.0.0.1:" + strconv.Itoa(a.apiPort) + ":9997")
|
||||
rtmpPortSpec := nat.Port("127.0.0.1:" + strconv.Itoa(+a.rtmpPort) + ":1935")
|
||||
exposedPorts, portBindings, _ := nat.ParsePortSpecs([]string{string(apiPortSpec), string(rtmpPortSpec)})
|
||||
|
||||
cfg, err := a.buildServerConfig()
|
||||
if err != nil {
|
||||
return fmt.Errorf("build server config: %w", err)
|
||||
}
|
||||
// The RTMP URL is passed to the UI via the state.
|
||||
// This could be refactored, it's not really stateful data.
|
||||
a.state.RTMPURL = a.RTMPURL()
|
||||
|
||||
copyFiles := []container.CopyFileConfig{
|
||||
{
|
||||
Path: configPath,
|
||||
Payload: bytes.NewReader(cfg),
|
||||
Mode: 0600,
|
||||
},
|
||||
{
|
||||
Path: tlsInternalCertPath,
|
||||
Payload: bytes.NewReader(a.keyPairInternal.Cert),
|
||||
Mode: 0600,
|
||||
},
|
||||
{
|
||||
Path: tlsInternalKeyPath,
|
||||
Payload: bytes.NewReader(a.keyPairInternal.Key),
|
||||
Mode: 0600,
|
||||
},
|
||||
{
|
||||
Path: "/etc/healthcheckopts.txt",
|
||||
Payload: bytes.NewReader([]byte(fmt.Sprintf("--user api:%s", a.pass))),
|
||||
Mode: 0600,
|
||||
},
|
||||
}
|
||||
|
||||
if !a.keyPairCustom.IsZero() {
|
||||
copyFiles = append(
|
||||
copyFiles,
|
||||
container.CopyFileConfig{
|
||||
Path: tlsCertPath,
|
||||
Payload: bytes.NewReader(a.keyPairCustom.Cert),
|
||||
Mode: 0600,
|
||||
},
|
||||
container.CopyFileConfig{
|
||||
Path: tlsKeyPath,
|
||||
Payload: bytes.NewReader(a.keyPairCustom.Key),
|
||||
Mode: 0600,
|
||||
},
|
||||
)
|
||||
}
|
||||
|
||||
args := []any{"host", a.host}
|
||||
if a.rtmpAddr.IsZero() {
|
||||
args = append(args, "rtmp.enabled", false)
|
||||
} else {
|
||||
args = append(args, "rtmp.enabled", true, "rtmp.bind_addr", a.rtmpAddr.IP, "rtmp.bind_port", a.rtmpAddr.Port)
|
||||
}
|
||||
if a.rtmpsAddr.IsZero() {
|
||||
args = append(args, "rtmps.enabled", false)
|
||||
} else {
|
||||
args = append(args, "rtmps.enabled", true, "rtmps.bind_addr", a.rtmpsAddr.IP, "rtmps.bind_port", a.rtmpsAddr.Port)
|
||||
}
|
||||
a.logger.Info("Starting media server", args...)
|
||||
|
||||
containerStateC, errC := a.containerClient.RunContainer(
|
||||
ctx,
|
||||
container.RunContainerParams{
|
||||
Name: componentName,
|
||||
ChanSize: a.chanSize,
|
||||
ContainerConfig: &typescontainer.Config{
|
||||
Image: imageNameMediaMTX,
|
||||
Hostname: "mediaserver",
|
||||
Labels: map[string]string{container.LabelComponent: componentName},
|
||||
Healthcheck: &typescontainer.HealthConfig{
|
||||
Test: []string{
|
||||
"CMD",
|
||||
"curl",
|
||||
"--fail",
|
||||
"--silent",
|
||||
"--cacert", "/etc/tls-internal.crt",
|
||||
"--config", "/etc/healthcheckopts.txt",
|
||||
a.healthCheckURL(),
|
||||
},
|
||||
Interval: time.Second * 10,
|
||||
StartPeriod: time.Second * 2,
|
||||
StartInterval: time.Second * 2,
|
||||
Retries: 2,
|
||||
},
|
||||
ExposedPorts: exposedPorts,
|
||||
},
|
||||
HostConfig: &typescontainer.HostConfig{
|
||||
NetworkMode: "default",
|
||||
PortBindings: portBindings,
|
||||
},
|
||||
NetworkCountConfig: container.NetworkCountConfig{Rx: "eth0", Tx: "eth1"},
|
||||
Logs: container.LogConfig{Stdout: true},
|
||||
CopyFiles: copyFiles,
|
||||
},
|
||||
)
|
||||
|
||||
go a.actorLoop(ctx, containerStateC, errC)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
func (a *Actor) buildServerConfig() ([]byte, error) {
|
||||
// NOTE: Regardless of the user configuration (which mostly affects exposed
|
||||
// ports and UI rendering) plain RTMP must be enabled at the container level,
|
||||
// for internal connections.
|
||||
var encryptionString string
|
||||
if a.rtmpsAddr.IsZero() {
|
||||
encryptionString = "no"
|
||||
} else {
|
||||
encryptionString = "optional"
|
||||
}
|
||||
|
||||
var certPath, keyPath string
|
||||
if a.keyPairCustom.IsZero() {
|
||||
certPath = tlsInternalCertPath
|
||||
keyPath = tlsInternalKeyPath
|
||||
} else {
|
||||
certPath = tlsCertPath
|
||||
keyPath = tlsKeyPath
|
||||
}
|
||||
|
||||
return yaml.Marshal(
|
||||
cfg, err := yaml.Marshal(
|
||||
Config{
|
||||
LogLevel: "debug",
|
||||
LogLevel: "info",
|
||||
LogDestinations: []string{"stdout"},
|
||||
AuthMethod: "internal",
|
||||
AuthInternalUsers: []User{
|
||||
@ -307,21 +142,78 @@ func (a *Actor) buildServerConfig() ([]byte, error) {
|
||||
Permissions: []UserPermission{{Action: "api"}},
|
||||
},
|
||||
},
|
||||
RTMP: true,
|
||||
RTMPEncryption: encryptionString,
|
||||
RTMPAddress: ":1935",
|
||||
RTMPSAddress: ":1936",
|
||||
RTMPServerCert: certPath,
|
||||
RTMPServerKey: keyPath,
|
||||
API: true,
|
||||
APIEncryption: true,
|
||||
APIServerCert: tlsInternalCertPath,
|
||||
APIServerKey: tlsInternalKeyPath,
|
||||
API: true,
|
||||
APIEncryption: true,
|
||||
APIServerCert: "/etc/tls.crt",
|
||||
APIServerKey: "/etc/tls.key",
|
||||
Paths: map[string]Path{
|
||||
string(a.streamKey): {Source: "publisher"},
|
||||
},
|
||||
},
|
||||
)
|
||||
if err != nil { // should never happen
|
||||
return fmt.Errorf("marshal config: %w", err)
|
||||
}
|
||||
|
||||
containerStateC, errC := a.containerClient.RunContainer(
|
||||
ctx,
|
||||
container.RunContainerParams{
|
||||
Name: componentName,
|
||||
ChanSize: a.chanSize,
|
||||
ContainerConfig: &typescontainer.Config{
|
||||
Image: imageNameMediaMTX,
|
||||
Hostname: "mediaserver",
|
||||
Labels: map[string]string{container.LabelComponent: componentName},
|
||||
Healthcheck: &typescontainer.HealthConfig{
|
||||
Test: []string{
|
||||
"CMD",
|
||||
"curl",
|
||||
"--fail",
|
||||
"--silent",
|
||||
"--cacert", "/etc/tls.crt",
|
||||
"--config", "/etc/healthcheckopts.txt",
|
||||
a.healthCheckURL(),
|
||||
},
|
||||
Interval: time.Second * 10,
|
||||
StartPeriod: time.Second * 2,
|
||||
StartInterval: time.Second * 2,
|
||||
Retries: 2,
|
||||
},
|
||||
ExposedPorts: exposedPorts,
|
||||
},
|
||||
HostConfig: &typescontainer.HostConfig{
|
||||
NetworkMode: "default",
|
||||
PortBindings: portBindings,
|
||||
},
|
||||
NetworkCountConfig: container.NetworkCountConfig{Rx: "eth0", Tx: "eth1"},
|
||||
CopyFileConfigs: []container.CopyFileConfig{
|
||||
{
|
||||
Path: "/mediamtx.yml",
|
||||
Payload: bytes.NewReader(cfg),
|
||||
Mode: 0600,
|
||||
},
|
||||
{
|
||||
Path: "/etc/tls.crt",
|
||||
Payload: bytes.NewReader(a.tlsCert),
|
||||
Mode: 0600,
|
||||
},
|
||||
{
|
||||
Path: "/etc/tls.key",
|
||||
Payload: bytes.NewReader(a.tlsKey),
|
||||
Mode: 0600,
|
||||
},
|
||||
{
|
||||
Path: "/etc/healthcheckopts.txt",
|
||||
Payload: bytes.NewReader([]byte(fmt.Sprintf("--user api:%s", a.pass))),
|
||||
Mode: 0600,
|
||||
},
|
||||
},
|
||||
},
|
||||
)
|
||||
|
||||
go a.actorLoop(ctx, containerStateC, errC)
|
||||
|
||||
return nil
|
||||
}
|
||||
|
||||
// C returns a channel that will receive the current state of the media server.
|
||||
@ -355,8 +247,16 @@ func (s *Actor) Close() error {
|
||||
// actorLoop is the main loop of the media server actor. It exits when the
|
||||
// actor is closed, or the parent context is cancelled.
|
||||
func (s *Actor) actorLoop(ctx context.Context, containerStateC <-chan domain.Container, errC <-chan error) {
|
||||
updateStateT := time.NewTicker(s.updateStateInterval)
|
||||
defer updateStateT.Stop()
|
||||
fetchStateT := time.NewTicker(s.fetchIngressStateInterval)
|
||||
defer fetchStateT.Stop()
|
||||
|
||||
// fetchTracksT is used to signal that tracks should be fetched from the
|
||||
// media server, after the stream goes on-air. A short delay is needed due to
|
||||
// workaround a race condition in the media server.
|
||||
var fetchTracksT *time.Timer
|
||||
resetFetchTracksT := func(d time.Duration) { fetchTracksT = time.NewTimer(d) }
|
||||
resetFetchTracksT(time.Second)
|
||||
fetchTracksT.Stop()
|
||||
|
||||
sendState := func() { s.stateC <- *s.state }
|
||||
|
||||
@ -366,7 +266,7 @@ func (s *Actor) actorLoop(ctx context.Context, containerStateC <-chan domain.Con
|
||||
s.state.Container = containerState
|
||||
|
||||
if s.state.Container.Status == domain.ContainerStatusExited {
|
||||
updateStateT.Stop()
|
||||
fetchStateT.Stop()
|
||||
s.handleContainerExit(nil)
|
||||
}
|
||||
|
||||
@ -385,21 +285,43 @@ func (s *Actor) actorLoop(ctx context.Context, containerStateC <-chan domain.Con
|
||||
s.logger.Error("Error from container client", "err", err, "id", shortID(s.state.Container.ID))
|
||||
}
|
||||
|
||||
updateStateT.Stop()
|
||||
fetchStateT.Stop()
|
||||
s.handleContainerExit(err)
|
||||
|
||||
sendState()
|
||||
case <-updateStateT.C:
|
||||
path, err := fetchPath(s.pathURL(string(s.streamKey)), s.apiClient)
|
||||
case <-fetchStateT.C:
|
||||
ingressState, err := fetchIngressState(s.rtmpConnsURL(), s.streamKey, s.apiClient)
|
||||
if err != nil {
|
||||
s.logger.Error("Error fetching path", "err", err)
|
||||
s.logger.Error("Error fetching server state", "err", err)
|
||||
continue
|
||||
}
|
||||
|
||||
if path.Ready != s.state.Live {
|
||||
s.state.Live = path.Ready
|
||||
var shouldSendState bool
|
||||
if ingressState.ready != s.state.Live {
|
||||
s.state.Live = ingressState.ready
|
||||
s.state.LiveChangedAt = time.Now()
|
||||
s.state.Tracks = path.Tracks
|
||||
resetFetchTracksT(time.Second)
|
||||
shouldSendState = true
|
||||
}
|
||||
if ingressState.listeners != s.state.Listeners {
|
||||
s.state.Listeners = ingressState.listeners
|
||||
shouldSendState = true
|
||||
}
|
||||
if shouldSendState {
|
||||
sendState()
|
||||
}
|
||||
case <-fetchTracksT.C:
|
||||
if !s.state.Live {
|
||||
continue
|
||||
}
|
||||
|
||||
if tracks, err := fetchTracks(s.pathsURL(), s.streamKey, s.apiClient); err != nil {
|
||||
s.logger.Error("Error fetching tracks", "err", err)
|
||||
resetFetchTracksT(3 * time.Second)
|
||||
} else if len(tracks) == 0 {
|
||||
resetFetchTracksT(time.Second)
|
||||
} else {
|
||||
s.state.Tracks = tracks
|
||||
sendState()
|
||||
}
|
||||
case action, ok := <-s.actorC:
|
||||
@ -429,20 +351,7 @@ func (s *Actor) handleContainerExit(err error) {
|
||||
|
||||
// RTMPURL returns the RTMP URL for the media server, accessible from the host.
|
||||
func (s *Actor) RTMPURL() string {
|
||||
if s.rtmpAddr.IsZero() {
|
||||
return ""
|
||||
}
|
||||
|
||||
return fmt.Sprintf("rtmp://%s:%d/%s", s.host, s.rtmpAddr.Port, s.streamKey)
|
||||
}
|
||||
|
||||
// RTMPSURL returns the RTMPS URL for the media server, accessible from the host.
|
||||
func (s *Actor) RTMPSURL() string {
|
||||
if s.rtmpsAddr.IsZero() {
|
||||
return ""
|
||||
}
|
||||
|
||||
return fmt.Sprintf("rtmps://%s:%d/%s", s.host, s.rtmpsAddr.Port, s.streamKey)
|
||||
return fmt.Sprintf("rtmp://localhost:%d/%s", s.rtmpPort, s.streamKey)
|
||||
}
|
||||
|
||||
// RTMPInternalURL returns the RTMP URL for the media server, accessible from
|
||||
@ -452,9 +361,15 @@ func (s *Actor) RTMPInternalURL() string {
|
||||
return fmt.Sprintf("rtmp://mediaserver:1935/%s?user=api&pass=%s", s.streamKey, s.pass)
|
||||
}
|
||||
|
||||
// pathURL returns the URL for fetching a path, accessible from the host.
|
||||
func (s *Actor) pathURL(path string) string {
|
||||
return fmt.Sprintf("https://api:%s@localhost:%d/v3/paths/get/%s", s.pass, s.apiPort, path)
|
||||
// rtmpConnsURL returns the URL for fetching RTMP connections, accessible from
|
||||
// the host.
|
||||
func (s *Actor) rtmpConnsURL() string {
|
||||
return fmt.Sprintf("https://api:%s@localhost:%d/v3/rtmpconns/list", s.pass, s.apiPort)
|
||||
}
|
||||
|
||||
// pathsURL returns the URL for fetching paths, accessible from the host.
|
||||
func (s *Actor) pathsURL() string {
|
||||
return fmt.Sprintf("https://api:%s@localhost:%d/v3/paths/list", s.pass, s.apiPort)
|
||||
}
|
||||
|
||||
// healthCheckURL returns the URL for the health check, accessible from the
|
||||
@ -480,17 +395,3 @@ func generatePassword() string {
|
||||
_, _ = rand.Read(p)
|
||||
return fmt.Sprintf("%x", []byte(p))
|
||||
}
|
||||
|
||||
// toRTMPAddr builds a domain.NetAddr from an OptionalNetAddr, with default
|
||||
// values set to RTMP default bind config if needed. If the OptionalNetAddr is
|
||||
// not enabled, a zero value is returned.
|
||||
func toRTMPAddr(a OptionalNetAddr, defaultPort int) domain.NetAddr {
|
||||
if !a.Enabled {
|
||||
return domain.NetAddr{}
|
||||
}
|
||||
|
||||
return domain.NetAddr{
|
||||
IP: cmp.Or(a.IP, defaultRTMPIP),
|
||||
Port: cmp.Or(a.Port, defaultPort),
|
||||
}
|
||||
}
|
||||
|
||||
@ -8,6 +8,7 @@ import (
|
||||
"fmt"
|
||||
"io"
|
||||
"net/http"
|
||||
"time"
|
||||
)
|
||||
|
||||
type httpClient interface {
|
||||
@ -43,37 +44,109 @@ func buildAPIClient(certPEM []byte) (*http.Client, error) {
|
||||
|
||||
const userAgent = "octoplex-client"
|
||||
|
||||
type apiPath struct {
|
||||
Name string `json:"name"`
|
||||
Ready bool `json:"ready"`
|
||||
Tracks []string `json:"tracks"`
|
||||
type apiResponse[T any] struct {
|
||||
Items []T `json:"items"`
|
||||
}
|
||||
|
||||
func fetchPath(apiURL string, httpClient httpClient) (apiPath, error) {
|
||||
type rtmpConnsResponse struct {
|
||||
ID string `json:"id"`
|
||||
CreatedAt time.Time `json:"created"`
|
||||
State string `json:"state"`
|
||||
Path string `json:"path"`
|
||||
BytesReceived int64 `json:"bytesReceived"`
|
||||
BytesSent int64 `json:"bytesSent"`
|
||||
RemoteAddr string `json:"remoteAddr"`
|
||||
}
|
||||
|
||||
type ingressStreamState struct {
|
||||
ready bool
|
||||
listeners int
|
||||
}
|
||||
|
||||
// TODO: handle pagination
|
||||
func fetchIngressState(apiURL string, streamKey StreamKey, httpClient httpClient) (state ingressStreamState, _ error) {
|
||||
req, err := http.NewRequest(http.MethodGet, apiURL, nil)
|
||||
if err != nil {
|
||||
return apiPath{}, fmt.Errorf("new request: %w", err)
|
||||
return state, fmt.Errorf("new request: %w", err)
|
||||
}
|
||||
req.Header.Set("User-Agent", userAgent)
|
||||
|
||||
httpResp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return apiPath{}, fmt.Errorf("do request: %w", err)
|
||||
return state, fmt.Errorf("do request: %w", err)
|
||||
}
|
||||
|
||||
if httpResp.StatusCode != http.StatusOK {
|
||||
return apiPath{}, fmt.Errorf("unexpected status code: %d", httpResp.StatusCode)
|
||||
return state, fmt.Errorf("unexpected status code: %d", httpResp.StatusCode)
|
||||
}
|
||||
|
||||
respBody, err := io.ReadAll(httpResp.Body)
|
||||
if err != nil {
|
||||
return apiPath{}, fmt.Errorf("read body: %w", err)
|
||||
return state, fmt.Errorf("read body: %w", err)
|
||||
}
|
||||
|
||||
var path apiPath
|
||||
if err = json.Unmarshal(respBody, &path); err != nil {
|
||||
return apiPath{}, fmt.Errorf("unmarshal: %w", err)
|
||||
var resp apiResponse[rtmpConnsResponse]
|
||||
if err = json.Unmarshal(respBody, &resp); err != nil {
|
||||
return state, fmt.Errorf("unmarshal: %w", err)
|
||||
}
|
||||
|
||||
return path, nil
|
||||
for _, conn := range resp.Items {
|
||||
if conn.Path != string(streamKey) {
|
||||
continue
|
||||
}
|
||||
|
||||
switch conn.State {
|
||||
case "publish":
|
||||
// mediamtx may report a stream as being in publish state via the API,
|
||||
// but still refuse to serve them due to being unpublished. This seems to
|
||||
// be a bug, this is a hacky workaround.
|
||||
state.ready = conn.BytesReceived > 20_000
|
||||
case "read":
|
||||
state.listeners++
|
||||
}
|
||||
}
|
||||
|
||||
return state, nil
|
||||
}
|
||||
|
||||
type path struct {
|
||||
Name string `json:"name"`
|
||||
Tracks []string `json:"tracks"`
|
||||
}
|
||||
|
||||
// TODO: handle pagination
|
||||
func fetchTracks(apiURL string, streamKey StreamKey, httpClient httpClient) ([]string, error) {
|
||||
req, err := http.NewRequest(http.MethodGet, apiURL, nil)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("new request: %w", err)
|
||||
}
|
||||
req.Header.Set("User-Agent", userAgent)
|
||||
|
||||
httpResp, err := httpClient.Do(req)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("do request: %w", err)
|
||||
}
|
||||
|
||||
if httpResp.StatusCode != http.StatusOK {
|
||||
return nil, fmt.Errorf("unexpected status code: %d", httpResp.StatusCode)
|
||||
}
|
||||
|
||||
respBody, err := io.ReadAll(httpResp.Body)
|
||||
if err != nil {
|
||||
return nil, fmt.Errorf("read body: %w", err)
|
||||
}
|
||||
|
||||
var resp apiResponse[path]
|
||||
if err = json.Unmarshal(respBody, &resp); err != nil {
|
||||
return nil, fmt.Errorf("unmarshal: %w", err)
|
||||
}
|
||||
|
||||
var tracks []string
|
||||
for _, path := range resp.Items {
|
||||
if path.Name == string(streamKey) {
|
||||
tracks = path.Tracks
|
||||
}
|
||||
}
|
||||
|
||||
return tracks, nil
|
||||
}
|
||||
|
||||
@ -12,14 +12,14 @@ import (
|
||||
"github.com/stretchr/testify/require"
|
||||
)
|
||||
|
||||
func TestFetchPath(t *testing.T) {
|
||||
const url = "http://localhost:8989/v3/paths/get/live"
|
||||
func TestFetchIngressState(t *testing.T) {
|
||||
const url = "http://localhost:8989/v3/rtmpconns/list"
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
httpResponse *http.Response
|
||||
httpError error
|
||||
wantPath apiPath
|
||||
wantState ingressStreamState
|
||||
wantErr error
|
||||
}{
|
||||
{
|
||||
@ -36,20 +36,36 @@ func TestFetchPath(t *testing.T) {
|
||||
wantErr: errors.New("unmarshal: invalid character 'i' looking for beginning of value"),
|
||||
},
|
||||
{
|
||||
name: "successful response, not ready",
|
||||
name: "successful response, no streams",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"name":"live","confName":"live","source":null,"ready":false,"readyTime":null,"tracks":[],"bytesReceived":0,"bytesSent":0,"readers":[]}`))),
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"itemCount":0,"pageCount":0,"items":[]}`))),
|
||||
},
|
||||
wantPath: apiPath{Name: "live", Ready: false, Tracks: []string{}},
|
||||
wantState: ingressStreamState{ready: false, listeners: 0},
|
||||
},
|
||||
{
|
||||
name: "successful response, not yet ready",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"itemCount":1,"pageCount":1,"items":[{"id":"d2953cf8-9cd6-4c30-816f-807b80b6a71f","created":"2025-02-15T08:19:00.616220354Z","remoteAddr":"172.17.0.1:32972","state":"publish","path":"live","query":"","bytesReceived":15462,"bytesSent":3467}]}`))),
|
||||
},
|
||||
wantState: ingressStreamState{ready: false, listeners: 0},
|
||||
},
|
||||
{
|
||||
name: "successful response, ready",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"name":"live","confName":"live","source":{"type":"rtmpConn","id":"fd2d79a8-bab9-4141-a1b5-55bd1a8649df"},"ready":true,"readyTime":"2025-04-18T07:44:53.683627506Z","tracks":["H264"],"bytesReceived":254677,"bytesSent":0,"readers":[]}`))),
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"itemCount":1,"pageCount":1,"items":[{"id":"d2953cf8-9cd6-4c30-816f-807b80b6a71f","created":"2025-02-15T08:19:00.616220354Z","remoteAddr":"172.17.0.1:32972","state":"publish","path":"live","query":"","bytesReceived":27832,"bytesSent":3467}]}`))),
|
||||
},
|
||||
wantPath: apiPath{Name: "live", Ready: true, Tracks: []string{"H264"}},
|
||||
wantState: ingressStreamState{ready: true, listeners: 0},
|
||||
},
|
||||
{
|
||||
name: "successful response, ready, with listeners",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"itemCount":2,"pageCount":1,"items":[{"id":"12668315-0572-41f1-8384-fe7047cc73be","created":"2025-02-15T08:23:43.836589664Z","remoteAddr":"172.17.0.1:40026","state":"publish","path":"live","query":"","bytesReceived":7180753,"bytesSent":3467},{"id":"079370fd-43bb-4798-b079-860cc3159e4e","created":"2025-02-15T08:24:32.396794364Z","remoteAddr":"192.168.48.3:44736","state":"read","path":"live","query":"","bytesReceived":333435,"bytesSent":24243}]}`))),
|
||||
},
|
||||
wantState: ingressStreamState{ready: true, listeners: 1},
|
||||
},
|
||||
}
|
||||
|
||||
@ -63,12 +79,74 @@ func TestFetchPath(t *testing.T) {
|
||||
})).
|
||||
Return(tc.httpResponse, tc.httpError)
|
||||
|
||||
path, err := fetchPath(url, &httpClient)
|
||||
state, err := fetchIngressState(url, StreamKey("live"), &httpClient)
|
||||
if tc.wantErr != nil {
|
||||
require.EqualError(t, err, tc.wantErr.Error())
|
||||
} else {
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, tc.wantPath, path)
|
||||
require.Equal(t, tc.wantState, state)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestFetchTracks(t *testing.T) {
|
||||
const url = "http://localhost:8989/v3/paths/list"
|
||||
|
||||
testCases := []struct {
|
||||
name string
|
||||
httpResponse *http.Response
|
||||
httpError error
|
||||
wantTracks []string
|
||||
wantErr error
|
||||
}{
|
||||
{
|
||||
name: "non-200 status",
|
||||
httpResponse: &http.Response{StatusCode: http.StatusNotFound},
|
||||
wantErr: errors.New("unexpected status code: 404"),
|
||||
},
|
||||
{
|
||||
name: "unparseable response",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte("invalid json"))),
|
||||
},
|
||||
wantErr: errors.New("unmarshal: invalid character 'i' looking for beginning of value"),
|
||||
},
|
||||
{
|
||||
name: "successful response, no tracks",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"itemCount":1,"pageCount":1,"items":[{"name":"live","confName":"all_others","source":{"type":"rtmpConn","id":"287340b2-04c2-4fcc-ab9c-089f4ff15aeb"},"ready":true,"readyTime":"2025-02-22T17:26:05.527206818Z","tracks":[],"bytesReceived":94430983,"bytesSent":0,"readers":[]}]}`))),
|
||||
},
|
||||
wantTracks: []string{},
|
||||
},
|
||||
{
|
||||
name: "successful response, tracks",
|
||||
httpResponse: &http.Response{
|
||||
StatusCode: http.StatusOK,
|
||||
Body: io.NopCloser(bytes.NewReader([]byte(`{"itemCount":1,"pageCount":1,"items":[{"name":"live","confName":"all_others","source":{"type":"rtmpConn","id":"287340b2-04c2-4fcc-ab9c-089f4ff15aeb"},"ready":true,"readyTime":"2025-02-22T17:26:05.527206818Z","tracks":["H264","MPEG-4 Audio"],"bytesReceived":94430983,"bytesSent":0,"readers":[]}]}`))),
|
||||
},
|
||||
wantTracks: []string{"H264", "MPEG-4 Audio"},
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
var httpClient mocks.HTTPClient
|
||||
httpClient.
|
||||
EXPECT().
|
||||
Do(mock.MatchedBy(func(req *http.Request) bool {
|
||||
return req.URL.String() == url && req.Method == http.MethodGet
|
||||
})).
|
||||
Return(tc.httpResponse, tc.httpError)
|
||||
|
||||
tracks, err := fetchTracks(url, StreamKey("live"), &httpClient)
|
||||
if tc.wantErr != nil {
|
||||
require.EqualError(t, err, tc.wantErr.Error())
|
||||
} else {
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, tc.wantTracks, tracks)
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
@ -17,12 +17,8 @@ type Config struct {
|
||||
APIEncryption bool `yaml:"apiEncryption,omitempty"`
|
||||
APIServerCert string `yaml:"apiServerCert,omitempty"`
|
||||
APIServerKey string `yaml:"apiServerKey,omitempty"`
|
||||
RTMP bool `yaml:"rtmp"`
|
||||
RTMPEncryption string `yaml:"rtmpEncryption,omitempty"`
|
||||
RTMP bool `yaml:"rtmp,omitempty"`
|
||||
RTMPAddress string `yaml:"rtmpAddress,omitempty"`
|
||||
RTMPSAddress string `yaml:"rtmpsAddress,omitempty"`
|
||||
RTMPServerCert string `yaml:"rtmpServerCert,omitempty"`
|
||||
RTMPServerKey string `yaml:"rtmpServerKey,omitempty"`
|
||||
HLS bool `yaml:"hls"`
|
||||
RTSP bool `yaml:"rtsp"`
|
||||
WebRTC bool `yaml:"webrtc"`
|
||||
|
||||
@ -10,20 +10,23 @@ import (
|
||||
"encoding/pem"
|
||||
"math/big"
|
||||
"time"
|
||||
)
|
||||
|
||||
"git.netflux.io/rob/octoplex/internal/domain"
|
||||
type (
|
||||
tlsCert []byte
|
||||
tlsKey []byte
|
||||
)
|
||||
|
||||
// generateTLSCert generates a self-signed TLS certificate and private key.
|
||||
func generateTLSCert(dnsNames ...string) (domain.KeyPair, error) {
|
||||
func generateTLSCert() (tlsCert, tlsKey, error) {
|
||||
privKey, err := ecdsa.GenerateKey(elliptic.P384(), rand.Reader)
|
||||
if err != nil {
|
||||
return domain.KeyPair{}, err
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
serialNumber, err := rand.Int(rand.Reader, new(big.Int).Lsh(big.NewInt(1), 128))
|
||||
if err != nil {
|
||||
return domain.KeyPair{}, err
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
now := time.Now()
|
||||
@ -37,31 +40,28 @@ func generateTLSCert(dnsNames ...string) (domain.KeyPair, error) {
|
||||
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
|
||||
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
|
||||
BasicConstraintsValid: true,
|
||||
DNSNames: dnsNames,
|
||||
DNSNames: []string{"localhost"},
|
||||
}
|
||||
|
||||
certDER, err := x509.CreateCertificate(rand.Reader, &template, &template, &privKey.PublicKey, privKey)
|
||||
if err != nil {
|
||||
return domain.KeyPair{}, err
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
var certPEM, keyPEM bytes.Buffer
|
||||
|
||||
if err = pem.Encode(&certPEM, &pem.Block{Type: "CERTIFICATE", Bytes: certDER}); err != nil {
|
||||
return domain.KeyPair{}, err
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
privKeyDER, err := x509.MarshalECPrivateKey(privKey)
|
||||
if err != nil {
|
||||
return domain.KeyPair{}, err
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
if err := pem.Encode(&keyPEM, &pem.Block{Type: "EC PRIVATE KEY", Bytes: privKeyDER}); err != nil {
|
||||
return domain.KeyPair{}, err
|
||||
return nil, nil, err
|
||||
}
|
||||
|
||||
return domain.KeyPair{
|
||||
Cert: certPEM.Bytes(),
|
||||
Key: keyPEM.Bytes(),
|
||||
}, nil
|
||||
return certPEM.Bytes(), keyPEM.Bytes(), nil
|
||||
}
|
||||
|
||||
@ -12,12 +12,12 @@ import (
|
||||
)
|
||||
|
||||
func TestGenerateTLSCert(t *testing.T) {
|
||||
keyPair, err := generateTLSCert("localhost", "rtmp.example.com")
|
||||
certPEM, keyPEM, err := generateTLSCert()
|
||||
require.NoError(t, err)
|
||||
require.NotEmpty(t, keyPair.Cert)
|
||||
require.NotEmpty(t, keyPair.Key)
|
||||
require.NotEmpty(t, certPEM)
|
||||
require.NotEmpty(t, keyPEM)
|
||||
|
||||
block, _ := pem.Decode(keyPair.Cert)
|
||||
block, _ := pem.Decode(certPEM)
|
||||
require.NotNil(t, block, "failed to decode certificate PEM")
|
||||
|
||||
cert, err := x509.ParseCertificate(block.Bytes)
|
||||
@ -33,10 +33,8 @@ func TestGenerateTLSCert(t *testing.T) {
|
||||
assert.True(t, cert.BasicConstraintsValid, "basic constraints should be valid")
|
||||
assert.Contains(t, cert.ExtKeyUsage, x509.ExtKeyUsageServerAuth)
|
||||
assert.Contains(t, cert.ExtKeyUsage, x509.ExtKeyUsageClientAuth)
|
||||
assert.Contains(t, cert.DNSNames, "localhost", "DNS names should include localhost")
|
||||
assert.Contains(t, cert.DNSNames, "rtmp.example.com", "DNS names should include rtmp.example.com")
|
||||
|
||||
block, _ = pem.Decode(keyPair.Key)
|
||||
block, _ = pem.Decode(keyPEM)
|
||||
require.NotNil(t, block, "failed to decode private key PEM")
|
||||
|
||||
privKey, err := x509.ParseECPrivateKey(block.Bytes)
|
||||
|
||||
@ -7,7 +7,6 @@ import (
|
||||
"fmt"
|
||||
"log/slog"
|
||||
"strconv"
|
||||
"strings"
|
||||
"sync"
|
||||
"time"
|
||||
|
||||
@ -97,7 +96,6 @@ func (a *Actor) StartDestination(url string) {
|
||||
ContainerConfig: &typescontainer.Config{
|
||||
Image: imageNameFFMPEG,
|
||||
Cmd: []string{
|
||||
"-loglevel", "level+error",
|
||||
"-i", a.sourceURL,
|
||||
"-c", "copy",
|
||||
"-f", "flv",
|
||||
@ -110,13 +108,13 @@ func (a *Actor) StartDestination(url string) {
|
||||
},
|
||||
HostConfig: &typescontainer.HostConfig{NetworkMode: "default"},
|
||||
NetworkCountConfig: container.NetworkCountConfig{Rx: "eth1", Tx: "eth0"},
|
||||
Logs: container.LogConfig{Stderr: true},
|
||||
ShouldRestart: func(_ int64, restartCount int, logs [][]byte, runningTime time.Duration) (bool, error) {
|
||||
ShouldRestart: func(_ int64, restartCount int, runningTime time.Duration) (bool, error) {
|
||||
// Try to infer if the container failed to start.
|
||||
//
|
||||
// For now, we just check if it was running for less than ten seconds.
|
||||
// TODO: this is a bit hacky, we should check the container logs and
|
||||
// include some details in the error message.
|
||||
if restartCount == 0 && runningTime < 10*time.Second {
|
||||
return false, containerStartErrFromLogs(logs)
|
||||
return false, errors.New("container failed to start")
|
||||
}
|
||||
|
||||
// Otherwise, always restart, regardless of the exit code.
|
||||
@ -133,32 +131,6 @@ func (a *Actor) StartDestination(url string) {
|
||||
}
|
||||
}
|
||||
|
||||
// Grab the first fatal log line, if it exists, or the first error log line,
|
||||
// from the FFmpeg output.
|
||||
func containerStartErrFromLogs(logs [][]byte) error {
|
||||
var fatalLog, errLog string
|
||||
|
||||
for _, logBytes := range logs {
|
||||
log := string(logBytes)
|
||||
if strings.HasPrefix(log, "[fatal]") {
|
||||
fatalLog = log
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
if fatalLog == "" {
|
||||
for _, logBytes := range logs {
|
||||
log := string(logBytes)
|
||||
if strings.HasPrefix(log, "[error]") {
|
||||
errLog = log
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return errors.New(cmp.Or(fatalLog, errLog, "container failed to start"))
|
||||
}
|
||||
|
||||
// StopDestination stops a destination stream.
|
||||
func (a *Actor) StopDestination(url string) {
|
||||
a.actorC <- func() {
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
package replicator
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
func TestContainerStartErrFromLogs(t *testing.T) {
|
||||
testCases := []struct {
|
||||
name string
|
||||
logs [][]byte
|
||||
want error
|
||||
}{
|
||||
{
|
||||
name: "no logs",
|
||||
want: errors.New("container failed to start"),
|
||||
},
|
||||
{
|
||||
name: "with only error logs",
|
||||
logs: [][]byte{
|
||||
[]byte("[error] this is an error log"),
|
||||
[]byte("[error] this is another error log"),
|
||||
},
|
||||
want: errors.New("[error] this is an error log"),
|
||||
},
|
||||
{
|
||||
name: "with only fatal logs",
|
||||
logs: [][]byte{
|
||||
[]byte("[fatal] this is a fatal log"),
|
||||
[]byte("[fatal] this is another fatal log"),
|
||||
},
|
||||
want: errors.New("[fatal] this is a fatal log"),
|
||||
},
|
||||
{
|
||||
name: "with error and fatal logs",
|
||||
logs: [][]byte{
|
||||
[]byte("[error] this is an error log"),
|
||||
[]byte("[fatal] this is a fatal log"),
|
||||
},
|
||||
want: errors.New("[fatal] this is a fatal log"),
|
||||
},
|
||||
}
|
||||
|
||||
for _, tc := range testCases {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
assert.Equal(t, tc.want, containerStartErrFromLogs(tc.logs))
|
||||
})
|
||||
}
|
||||
}
|
||||
@ -1,4 +1,4 @@
|
||||
package domain
|
||||
package terminal
|
||||
|
||||
// CommandAddDestination adds a destination.
|
||||
type CommandAddDestination struct {
|
||||
@ -13,13 +13,13 @@ import (
|
||||
"time"
|
||||
|
||||
"git.netflux.io/rob/octoplex/internal/domain"
|
||||
"git.netflux.io/rob/octoplex/internal/shortid"
|
||||
"github.com/gdamore/tcell/v2"
|
||||
"github.com/rivo/tview"
|
||||
"golang.design/x/clipboard"
|
||||
)
|
||||
|
||||
type sourceViews struct {
|
||||
url *tview.TextView
|
||||
status *tview.TextView
|
||||
tracks *tview.TextView
|
||||
health *tview.TextView
|
||||
@ -40,10 +40,9 @@ const (
|
||||
|
||||
// UI is responsible for managing the terminal user interface.
|
||||
type UI struct {
|
||||
commandC chan domain.Command
|
||||
commandC chan Command
|
||||
clipboardAvailable bool
|
||||
configFilePath string
|
||||
rtmpURL, rtmpsURL string
|
||||
buildInfo domain.BuildInfo
|
||||
logger *slog.Logger
|
||||
|
||||
@ -57,7 +56,6 @@ type UI struct {
|
||||
sourceViews sourceViews
|
||||
destView *tview.Table
|
||||
noDestView *tview.TextView
|
||||
aboutView *tview.Flex
|
||||
pullProgressModal *tview.Modal
|
||||
|
||||
// other mutable state
|
||||
@ -106,7 +104,7 @@ const defaultChanSize = 64
|
||||
// StartUI starts the terminal user interface.
|
||||
func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
chanSize := cmp.Or(params.ChanSize, defaultChanSize)
|
||||
commandCh := make(chan domain.Command, chanSize)
|
||||
commandCh := make(chan Command, chanSize)
|
||||
|
||||
app := tview.NewApplication()
|
||||
|
||||
@ -128,8 +126,8 @@ func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
sourceView := tview.NewFlex()
|
||||
sourceView.SetDirection(tview.FlexColumn)
|
||||
sourceView.SetBorder(true)
|
||||
sourceView.SetTitle("Source")
|
||||
sidebar.AddItem(sourceView, 8, 0, false)
|
||||
sourceView.SetTitle("Source RTMP server")
|
||||
sidebar.AddItem(sourceView, 9, 0, false)
|
||||
|
||||
leftCol := tview.NewFlex()
|
||||
leftCol.SetDirection(tview.FlexRow)
|
||||
@ -138,6 +136,11 @@ func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
sourceView.AddItem(leftCol, 9, 0, false)
|
||||
sourceView.AddItem(rightCol, 0, 1, false)
|
||||
|
||||
urlHeaderTextView := tview.NewTextView().SetDynamicColors(true).SetText("[grey]" + headerURL)
|
||||
leftCol.AddItem(urlHeaderTextView, 1, 0, false)
|
||||
urlTextView := tview.NewTextView().SetDynamicColors(true).SetText("[white]" + dash)
|
||||
rightCol.AddItem(urlTextView, 1, 0, false)
|
||||
|
||||
statusHeaderTextView := tview.NewTextView().SetDynamicColors(true).SetText("[grey]" + headerStatus)
|
||||
leftCol.AddItem(statusHeaderTextView, 1, 0, false)
|
||||
statusTextView := tview.NewTextView().SetDynamicColors(true).SetText("[white]" + dash)
|
||||
@ -172,6 +175,13 @@ func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
aboutView.SetDirection(tview.FlexRow)
|
||||
aboutView.SetBorder(true)
|
||||
aboutView.SetTitle("Actions")
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]a[-] Add destination"), 1, 0, false)
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]Del[-] Remove destination"), 1, 0, false)
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]Space[-] Start/stop destination"), 1, 0, false)
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText(""), 1, 0, false)
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]u[-] Copy source RTMP URL"), 1, 0, false)
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]c[-] Copy config file path"), 1, 0, false)
|
||||
aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]?[-] About"), 1, 0, false)
|
||||
|
||||
sidebar.AddItem(aboutView, 0, 1, false)
|
||||
|
||||
@ -221,6 +231,7 @@ func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
pages: pages,
|
||||
container: container,
|
||||
sourceViews: sourceViews{
|
||||
url: urlTextView,
|
||||
status: statusTextView,
|
||||
tracks: tracksTextView,
|
||||
health: healthTextView,
|
||||
@ -230,7 +241,6 @@ func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
},
|
||||
destView: destView,
|
||||
noDestView: noDestView,
|
||||
aboutView: aboutView,
|
||||
pullProgressModal: pullProgressModal,
|
||||
urlsToStartState: make(map[string]startState),
|
||||
}
|
||||
@ -243,32 +253,8 @@ func StartUI(ctx context.Context, params StartParams) (*UI, error) {
|
||||
return ui, nil
|
||||
}
|
||||
|
||||
func (ui *UI) renderAboutView() {
|
||||
ui.aboutView.Clear()
|
||||
|
||||
ui.aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]a[-] Add destination"), 1, 0, false)
|
||||
ui.aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]Del[-] Remove destination"), 1, 0, false)
|
||||
ui.aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]Space[-] Start/stop destination"), 1, 0, false)
|
||||
ui.aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText(""), 1, 0, false)
|
||||
|
||||
i := 1
|
||||
if ui.rtmpURL != "" {
|
||||
rtmpURLView := tview.NewTextView().SetDynamicColors(true).SetText(fmt.Sprintf("[grey]F%d[-] Copy source RTMP URL", i))
|
||||
ui.aboutView.AddItem(rtmpURLView, 1, 0, false)
|
||||
i++
|
||||
}
|
||||
|
||||
if ui.rtmpsURL != "" {
|
||||
rtmpsURLView := tview.NewTextView().SetDynamicColors(true).SetText(fmt.Sprintf("[grey]F%d[-] Copy source RTMPS URL", i))
|
||||
ui.aboutView.AddItem(rtmpsURLView, 1, 0, false)
|
||||
}
|
||||
|
||||
ui.aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]c[-] Copy config file path"), 1, 0, false)
|
||||
ui.aboutView.AddItem(tview.NewTextView().SetDynamicColors(true).SetText("[grey]?[-] About"), 1, 0, false)
|
||||
}
|
||||
|
||||
// C returns a channel that receives commands from the user interface.
|
||||
func (ui *UI) C() <-chan domain.Command {
|
||||
func (ui *UI) C() <-chan Command {
|
||||
return ui.commandC
|
||||
}
|
||||
|
||||
@ -296,17 +282,6 @@ func (ui *UI) run(ctx context.Context) {
|
||||
}
|
||||
}
|
||||
|
||||
// SetRTMPURLs sets the RTMP and RTMPS URLs for the user interface, which are
|
||||
// unavailable when the UI is first created.
|
||||
func (ui *UI) SetRTMPURLs(rtmpURL, rtmpsURL string) {
|
||||
ui.mu.Lock()
|
||||
ui.rtmpURL = rtmpURL
|
||||
ui.rtmpsURL = rtmpsURL
|
||||
ui.mu.Unlock()
|
||||
|
||||
ui.renderAboutView()
|
||||
}
|
||||
|
||||
func (ui *UI) inputCaptureHandler(event *tcell.EventKey) *tcell.EventKey {
|
||||
// Special case: handle CTRL-C even when a modal is visible.
|
||||
if event.Key() == tcell.KeyCtrlC {
|
||||
@ -333,6 +308,8 @@ func (ui *UI) inputCaptureHandler(event *tcell.EventKey) *tcell.EventKey {
|
||||
return nil
|
||||
case ' ':
|
||||
ui.toggleDestination()
|
||||
case 'u', 'U':
|
||||
ui.copySourceURLToClipboard(ui.clipboardAvailable)
|
||||
case 'c', 'C':
|
||||
ui.copyConfigFilePathToClipboard(ui.clipboardAvailable, ui.configFilePath)
|
||||
case '?':
|
||||
@ -340,8 +317,6 @@ func (ui *UI) inputCaptureHandler(event *tcell.EventKey) *tcell.EventKey {
|
||||
case 'k': // tview vim bindings
|
||||
handleKeyUp()
|
||||
}
|
||||
case tcell.KeyF1, tcell.KeyF2:
|
||||
ui.fkeyHandler(event.Key())
|
||||
case tcell.KeyDelete, tcell.KeyBackspace, tcell.KeyBackspace2:
|
||||
ui.removeDestination()
|
||||
return nil
|
||||
@ -352,36 +327,12 @@ func (ui *UI) inputCaptureHandler(event *tcell.EventKey) *tcell.EventKey {
|
||||
return event
|
||||
}
|
||||
|
||||
func (ui *UI) fkeyHandler(key tcell.Key) {
|
||||
var urls []string
|
||||
if ui.rtmpURL != "" {
|
||||
urls = append(urls, ui.rtmpURL)
|
||||
}
|
||||
if ui.rtmpsURL != "" {
|
||||
urls = append(urls, ui.rtmpsURL)
|
||||
}
|
||||
|
||||
switch key {
|
||||
case tcell.KeyF1:
|
||||
if len(urls) == 0 {
|
||||
return
|
||||
}
|
||||
ui.copySourceURLToClipboard(urls[0])
|
||||
case tcell.KeyF2:
|
||||
if len(urls) < 2 {
|
||||
return
|
||||
}
|
||||
ui.copySourceURLToClipboard(urls[1])
|
||||
}
|
||||
}
|
||||
|
||||
func (ui *UI) ShowSourceNotLiveModal() {
|
||||
ui.app.QueueUpdateDraw(func() {
|
||||
ui.showModal(
|
||||
pageNameModalNotLive,
|
||||
"Waiting for stream.\n\nStart streaming to a source URL then try again.",
|
||||
pageNameModalStartupCheck,
|
||||
fmt.Sprintf("Waiting for stream.\nStart streaming to the source URL then try again:\n\n%s", ui.sourceViews.url.GetText(true)),
|
||||
[]string{"Ok"},
|
||||
false,
|
||||
nil,
|
||||
)
|
||||
})
|
||||
@ -401,7 +352,6 @@ func (ui *UI) ShowStartupCheckModal() bool {
|
||||
pageNameModalStartupCheck,
|
||||
"Another instance of Octoplex may already be running.\n\nPressing continue will close that instance. Continue?",
|
||||
[]string{"Continue", "Exit"},
|
||||
false,
|
||||
func(buttonIndex int, _ string) {
|
||||
if buttonIndex == 0 {
|
||||
done <- true
|
||||
@ -425,7 +375,6 @@ func (ui *UI) ShowDestinationErrorModal(name string, err error) {
|
||||
err,
|
||||
),
|
||||
[]string{"Ok"},
|
||||
true,
|
||||
nil,
|
||||
)
|
||||
})
|
||||
@ -433,18 +382,17 @@ func (ui *UI) ShowDestinationErrorModal(name string, err error) {
|
||||
|
||||
// ShowFatalErrorModal displays the provided error. It sends a CommandQuit to the
|
||||
// command channel when the user selects the Quit button.
|
||||
func (ui *UI) ShowFatalErrorModal(errString string) {
|
||||
func (ui *UI) ShowFatalErrorModal(err error) {
|
||||
ui.app.QueueUpdateDraw(func() {
|
||||
ui.showModal(
|
||||
pageNameModalFatalError,
|
||||
fmt.Sprintf(
|
||||
"An error occurred:\n\n%s",
|
||||
errString,
|
||||
err,
|
||||
),
|
||||
[]string{"Quit"},
|
||||
false,
|
||||
func(int, string) {
|
||||
ui.commandC <- domain.CommandQuit{}
|
||||
ui.commandC <- CommandQuit{}
|
||||
},
|
||||
)
|
||||
})
|
||||
@ -566,7 +514,6 @@ func (ui *UI) updateProgressModal(container domain.Container) {
|
||||
const (
|
||||
pageNameMain = "main"
|
||||
pageNameAddDestination = "add-destination"
|
||||
pageNameViewURLs = "view-urls"
|
||||
pageNameConfigUpdateFailed = "modal-config-update-failed"
|
||||
pageNameNoDestinations = "no-destinations"
|
||||
pageNameModalAbout = "modal-about"
|
||||
@ -578,7 +525,6 @@ const (
|
||||
pageNameModalRemoveDestination = "modal-remove-destination"
|
||||
pageNameModalSourceError = "modal-source-error"
|
||||
pageNameModalStartupCheck = "modal-startup-check"
|
||||
pageNameModalNotLive = "modal-not-live"
|
||||
)
|
||||
|
||||
// modalVisible returns true if any modal, including the add destination form,
|
||||
@ -638,16 +584,8 @@ func (ui *UI) selectLastDestination() {
|
||||
}
|
||||
}
|
||||
|
||||
func (ui *UI) showModal(
|
||||
pageName string,
|
||||
text string,
|
||||
buttons []string,
|
||||
allowMultiple bool,
|
||||
doneFunc func(int, string),
|
||||
) {
|
||||
if allowMultiple {
|
||||
pageName = pageName + "-" + shortid.New().String()
|
||||
} else if ui.pages.HasPage(pageName) {
|
||||
func (ui *UI) showModal(pageName string, text string, buttons []string, doneFunc func(int, string)) {
|
||||
if ui.pages.HasPage(pageName) {
|
||||
return
|
||||
}
|
||||
|
||||
@ -697,7 +635,7 @@ func (ui *UI) handleMediaServerClosed(exitReason string) {
|
||||
SetBackgroundColor(tcell.ColorBlack).
|
||||
SetTextColor(tcell.ColorWhite).
|
||||
SetDoneFunc(func(int, string) {
|
||||
ui.commandC <- domain.CommandQuit{}
|
||||
ui.commandC <- CommandQuit{}
|
||||
})
|
||||
modal.SetBorderStyle(tcell.StyleDefault.Background(tcell.ColorBlack).Foreground(tcell.ColorWhite))
|
||||
|
||||
@ -745,6 +683,8 @@ func (ui *UI) redrawFromState(state domain.AppState) {
|
||||
SetSelectable(false)
|
||||
}
|
||||
|
||||
ui.sourceViews.url.SetText(state.Source.RTMPURL)
|
||||
|
||||
tracks := dash
|
||||
if state.Source.Live && len(state.Source.Tracks) > 0 {
|
||||
tracks = strings.Join(state.Source.Tracks, ", ")
|
||||
@ -856,7 +796,6 @@ func (ui *UI) ConfigUpdateFailed(err error) {
|
||||
pageNameConfigUpdateFailed,
|
||||
"Configuration update failed:\n\n"+err.Error(),
|
||||
[]string{"Ok"},
|
||||
false,
|
||||
func(int, string) {
|
||||
pageName, frontPage := ui.pages.GetFrontPage()
|
||||
if pageName != pageNameAddDestination {
|
||||
@ -887,7 +826,7 @@ func (ui *UI) addDestination() {
|
||||
AddInputField(inputLabelName, "My stream", inputLen, nil, nil).
|
||||
AddInputField(inputLabelURL, "rtmp://", inputLen, nil, nil).
|
||||
AddButton("Add", func() {
|
||||
ui.commandC <- domain.CommandAddDestination{
|
||||
ui.commandC <- CommandAddDestination{
|
||||
DestinationName: form.GetFormItemByLabel(inputLabelName).(*tview.InputField).GetText(),
|
||||
URL: form.GetFormItemByLabel(inputLabelURL).(*tview.InputField).GetText(),
|
||||
}
|
||||
@ -942,10 +881,9 @@ func (ui *UI) removeDestination() {
|
||||
pageNameModalRemoveDestination,
|
||||
text,
|
||||
[]string{"Remove", "Cancel"},
|
||||
false,
|
||||
func(buttonIndex int, _ string) {
|
||||
if buttonIndex == 0 {
|
||||
ui.commandC <- domain.CommandRemoveDestination{URL: url}
|
||||
ui.commandC <- CommandRemoveDestination{URL: url}
|
||||
}
|
||||
},
|
||||
)
|
||||
@ -1009,21 +947,22 @@ func (ui *UI) toggleDestination() {
|
||||
switch ss {
|
||||
case startStateNotStarted:
|
||||
ui.urlsToStartState[url] = startStateStarting
|
||||
ui.commandC <- domain.CommandStartDestination{URL: url}
|
||||
ui.commandC <- CommandStartDestination{URL: url}
|
||||
case startStateStarting:
|
||||
// do nothing
|
||||
return
|
||||
case startStateStarted:
|
||||
ui.commandC <- domain.CommandStopDestination{URL: url}
|
||||
ui.commandC <- CommandStopDestination{URL: url}
|
||||
}
|
||||
}
|
||||
|
||||
func (ui *UI) copySourceURLToClipboard(url string) {
|
||||
func (ui *UI) copySourceURLToClipboard(clipboardAvailable bool) {
|
||||
var text string
|
||||
|
||||
if ui.clipboardAvailable {
|
||||
url := ui.sourceViews.url.GetText(true)
|
||||
if clipboardAvailable {
|
||||
clipboard.Write(clipboard.FmtText, []byte(url))
|
||||
text = "URL copied to clipboard:\n\n" + url
|
||||
text = "Source URL copied to clipboard:\n\n" + url
|
||||
} else {
|
||||
text = "Copy to clipboard not available:\n\n" + url
|
||||
}
|
||||
@ -1032,7 +971,6 @@ func (ui *UI) copySourceURLToClipboard(url string) {
|
||||
pageNameModalClipboard,
|
||||
text,
|
||||
[]string{"Ok"},
|
||||
false,
|
||||
nil,
|
||||
)
|
||||
}
|
||||
@ -1054,7 +992,6 @@ func (ui *UI) copyConfigFilePathToClipboard(clipboardAvailable bool, configFileP
|
||||
pageNameModalClipboard,
|
||||
text,
|
||||
[]string{"Ok"},
|
||||
false,
|
||||
nil,
|
||||
)
|
||||
}
|
||||
@ -1064,10 +1001,9 @@ func (ui *UI) confirmQuit() {
|
||||
pageNameModalQuit,
|
||||
"Are you sure you want to quit?",
|
||||
[]string{"Quit", "Cancel"},
|
||||
false,
|
||||
func(buttonIndex int, _ string) {
|
||||
if buttonIndex == 0 {
|
||||
ui.commandC <- domain.CommandQuit{}
|
||||
ui.commandC <- CommandQuit{}
|
||||
}
|
||||
},
|
||||
)
|
||||
@ -1090,7 +1026,6 @@ func (ui *UI) showAbout() {
|
||||
ui.buildInfo.GoVersion,
|
||||
),
|
||||
[]string{"Ok"},
|
||||
false,
|
||||
nil,
|
||||
)
|
||||
}
|
||||
|
||||
@ -29,12 +29,6 @@ dir = "{{cwd}}"
|
||||
run = "golangci-lint run"
|
||||
alias = "l"
|
||||
|
||||
[tasks.fmt]
|
||||
description = "Run formatter"
|
||||
dir = "{{cwd}}"
|
||||
run = "goimports -w ."
|
||||
alias = "f"
|
||||
|
||||
[tasks.generate_mocks]
|
||||
description = "Generate mocks"
|
||||
dir = "{{cwd}}"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user