Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rewrite room hub #35

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions .github/workflows/docker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
name: Publish Docker image

on:
push:

jobs:
push_to_registries:
name: Push Docker image to multiple registries
runs-on: ubuntu-latest
permissions:
packages: write
contents: read
steps:
- name: Check out the repo
uses: actions/checkout@v4

- name: Log in to the Container registry
uses: docker/login-action@v3
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Extract metadata (tags, labels) for Docker
id: meta
uses: docker/metadata-action@v5
with:
images: ghcr.io/${{ github.repository }}

- name: Build and push Docker images
uses: docker/build-push-action@v6
with:
context: ./room-hub/
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}
126 changes: 0 additions & 126 deletions .github/workflows/publish-on-pypi.yml

This file was deleted.

47 changes: 0 additions & 47 deletions .github/workflows/test-pairing-server.yml

This file was deleted.

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ The system consists of three software components that need to be run and configu

1. The [room appliance application](appliance-application) needs to be run on a device (like Intel NUC) that connects to the room's audiovisual input and output devices. It holds the room configuration, i.e. how the media devices should be used in BBB and displays a PIN number that is used to pair the room with a BBB meeting.
2. The [BBB HTML Plugin](html-plugin) is where you enter the PIN number displayed on the appliance to connect the running meeting to the room.
3. The [pairing server](pairing-server) brokers the connection between the appliance in the room and the BBB meeting.
3. The [room hub](room-hub) brokers the connection between the appliance in the room and the BBB meeting.

Both the Plugin and the appliance application use the GraphQL interface of BBB 3 to communicate with BBB server.

Expand Down
2 changes: 1 addition & 1 deletion appliance-application/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Place the settings config file `settings.json` in the following folder:

2. Customize the config file:

- You have to adjust the `control_server.ws` setting to point to the `/ws_room` route of the pairing server (e.g. `https://your-bbb-server.org/hybrid/ws_room` if you follow the [instructions](../pairing-server/) and install the pairing server on a bbb host).
- You have to adjust the `control_server.ws` setting to point to the `/ws_room` route of the pairing server (e.g. `https://your-bbb-server.org/hybrid/ws_room` if you follow the [instructions](../room-hub/) and install the pairing server on a bbb host).
- Next `room.name` should be set to the name of the room that should be shown during the pairing process.
- You can also set `preferred_pin_screen` to the name of the screen that should be used to display the pairing pin. If the screen it not found, it uses the first screen it finds.
- Lastly you need to define the layouts, a few examples are provided in `room.layouts`.
Expand Down
4 changes: 2 additions & 2 deletions html-plugin/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
## What is it?

This is a [BBB HTML plugin](https://github.com/bigbluebutton/bigbluebutton-html-plugin-sdk) where the user can enter the PIN displayed by the [room appliance application](../appliance-application/).
It then checks this PIN with the [pairing-server](../pairing-server/) and afterwards creates the join-URLs for the applicance application.
It then checks this PIN with the [room-hub](../room-hub/) and afterwards creates the join-URLs for the appliance application.
To finish the pairing it shows the pairing pin for user confirmation.

## Usage
Expand Down Expand Up @@ -58,7 +58,7 @@ public:
- name: RoomMediaPlugin
url: <<PLUGIN_URL>>
settings:
pairingWebsocketUrl: wss://your-pairing-server.org/hybrid/ws
pairingWebsocketUrl: wss://your-room-hub.org/hybrid/ws_plugin
```

#### Hosting the Plugin on a BBB Server
Expand Down
Loading
Loading