feat: support media, html sources and websocket #20

birme · 2024-09-25T12:22:10Z

Added features:

can specify multiview layout when doing production-config
display thumbnail on card and fix cache issue
add management lock
support media and html sources in prod and web sockets

Bumps [find-my-way](https://github.com/delvedor/find-my-way) to 8.2.2 and updates ancestor dependency [fastify](https://github.com/fastify/fastify). These dependencies need to be updated together. Updates `find-my-way` from 7.6.2 to 8.2.2 - [Release notes](https://github.com/delvedor/find-my-way/releases) - [Commits](delvedor/find-my-way@v7.6.2...v8.2.2) Updates `fastify` from 4.17.0 to 4.28.1 - [Release notes](https://github.com/fastify/fastify/releases) - [Commits](fastify/fastify@4.17.0...v4.28.1) --- updated-dependencies: - dependency-name: find-my-way dependency-type: indirect - dependency-name: fastify dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>

Bumps [semver](https://github.com/npm/node-semver) to 7.5.4 and updates ancestor dependency [nodemon](https://github.com/remy/nodemon). These dependencies need to be updated together. Updates `semver` from 7.0.0 to 7.5.4 - [Release notes](https://github.com/npm/node-semver/releases) - [Changelog](https://github.com/npm/node-semver/blob/main/CHANGELOG.md) - [Commits](npm/node-semver@v7.0.0...v7.5.4) Updates `nodemon` from 2.0.22 to 3.1.7 - [Release notes](https://github.com/remy/nodemon/releases) - [Commits](remy/nodemon@v2.0.22...v3.1.7) --- updated-dependencies: - dependency-name: semver dependency-type: indirect - dependency-name: nodemon dependency-type: direct:production ... Signed-off-by: dependabot[bot] <support@github.com>

.env.sample

permobergedge

Some initial code comments.

In general, try to avoid reformatting existing code to much.

permobergedge · 2024-09-30T12:47:50Z

src/api/ateliereLive/websocket.ts

+ // const send = ws.send.bind(ws);
+ // ws.send = (message) => {
+ // console.debug(`[websocket] sending message: ${message}`);
+ // send(message);
+ // };


Remove this

permobergedge · 2024-09-30T13:02:06Z

src/components/modal/configureOutputModal/MultiviewSettings.tsx

+ // TODO: When possible to edit layout, uncomment the following code
+ // const [modalOpen, setModalOpen] = useState(false);
+ // const toggleConfigModal = () => {
+ // setModalOpen((state) => !state);
+ // };
+


Remove this

permobergedge · 2024-09-30T13:02:22Z

src/components/modal/configureOutputModal/MultiviewSettings.tsx

+ // <>
+ // <button
+ // onClick={toggleConfigModal}
+ // title={t('preset.configure_layout')}
+ // className={`absolute top-0 right-[-10%] min-w-fit`}
+ // >
+ // <IconSettings className="text-p" />
+ // </button>
+ // {modalOpen && (
+ // <div className="absolute top-5 right-[-65%] flex flex-col">
+ // <button
+ // type="button"
+ // className={`min-w-fit bg-zinc-700 rounded-t-sm p-1 border-b-[1px] border-b-zinc-600 hover:bg-zinc-600`}
+ // onClick={() => openConfigModal('create')}
+ // >
+ // {t('preset.create_layout')}
+ // </button>
+ // <button
+ // type="button"
+ // className={`min-w-fit bg-zinc-700 rounded-b-sm p-1 hover:bg-zinc-600`}
+ // onClick={() => openConfigModal('edit')}
+ // >
+ // {t('preset.update_layout')}
+ // </button>
+ // </div>
+ // )}
+ // </>


Remove the comments

permobergedge · 2024-10-07T08:57:29Z

src/api/ateliereLive/pipelines/streams/streams.ts

+
 const stream: PipelineStreamSettings = {
+ ingest_id: ingestUuid,
+ source_id: sourceId,
 pipeline_id: pipeline.pipeline_id!,
+ input_slot: input_slot,
 alignment_ms: pipeline.alignment_ms,
- audio_format: pipeline.audio_format,
- audio_sampling_frequency: pipeline.audio_sampling_frequency,
- bit_depth: pipeline.bit_depth,
- convert_color_range: pipeline.convert_color_range,
- encoder: pipeline.encoder,
- encoder_device: pipeline.encoder_device,
- format: pipeline.format,
+ max_network_latency_ms: pipeline.max_network_latency_ms,
+ width: pipeline.width,
+ height: pipeline.height,
 frame_rate_d: pipeline.frame_rate_d,
 frame_rate_n: pipeline.frame_rate_n,
+ format: pipeline.format,
+ encoder: pipeline.encoder,
+ encoder_device: pipeline.encoder_device,
 gop_length: pipeline.gop_length,
- height: pipeline.height,
- max_network_latency_ms: pipeline.max_network_latency_ms,
 pic_mode: pipeline.pic_mode,
- speed_quality_balance: pipeline.speed_quality_balance,
 video_kilobit_rate: pipeline.video_kilobit_rate,
- width: pipeline.width,
- ingest_id: ingestUuid,
- source_id: sourceId,
- input_slot,
+ bit_depth: pipeline.bit_depth,
+ speed_quality_balance: pipeline.speed_quality_balance,
+ convert_color_range: pipeline.convert_color_range,
+ audio_sampling_frequency: pipeline.audio_sampling_frequency,
+ audio_format: pipeline.audio_format,


Avoid moving around the order of lines of code, is there a difference here? Can we revert this to old order (which I guess didn't make sense, but new order doesn't make it more clear either?)

The idea was to move it around so that it matched the order in the PipelineStreamSettings type declaration, but I can change it back

permobergedge · 2024-10-07T08:59:20Z

src/app/api/manager/sources/[ingest_name]/[source_name]/thumbnail/route.ts

@@ -20,7 +20,6 @@ export async function GET(
 status: 403
 });
 }
-


it's better with a newline here

permobergedge · 2024-10-07T08:59:24Z

src/app/api/manager/streams/route.ts

@@ -15,7 +15,6 @@ export async function POST(request: NextRequest): Promise<NextResponse> {
 status: 403
 });
 }
-


it's better with a newline here

permobergedge · 2024-10-07T09:06:48Z

src/i18n/locales/en.ts

@@ -63,14 +64,17 @@ export const en = {
 },
 production_configuration: 'Production Configuration',
 production: {
- add_source: 'Add Source',
+ add_source: 'Add ingest',


We're not to sure about this rephrasing from source to ingest.. we'll need to come back to that

permobergedge · 2024-10-07T09:07:39Z

src/i18n/locales/sv.ts

@@ -65,14 +66,17 @@ export const sv = {
 },
 production_configuration: 'Produktionskonfiguration',
 production: {
- add_source: 'Lägg till källa',
+ add_source: 'Lägg till ingång',


same as above with rephrasing

magnusedgeware · 2024-10-07T09:34:10Z

src/api/mongoClient/defaults/preset.ts

- pic_mode: 'pic_mode_ip'
+ {
+ _id: new ObjectId('65cb266c00fecda4a1faf977'),
+ name: '12 inputs HD',


Aren't there 13 inputs here?

magnusedgeware · 2024-10-07T12:07:20Z

src/app/api/manager/websocket/route.ts

+ ws.onopen = () => {
+ if (action === 'closeHtml') {
+ ws.send(`html close ${inputSlot}`);
+ ws.send('html reset');


Why is "reset" here? And 3 rows down. Doesn't look necessary.

magnusedgeware · 2024-10-07T12:10:01Z

src/api/ateliereLive/websocket.ts

+ },
+ closeHtml: (input: number) => {
+ ws.send(`html close ${input}`);
+ ws.send('html reset');


reset not necessary?

magnusedgeware · 2024-10-07T12:10:09Z

src/api/ateliereLive/websocket.ts

+ },
+ closeMediaplayer: (input: number) => {
+ ws.send(`media close ${input}`);
+ ws.send('media reset');


reset not necessary?

Saelmala and others added 7 commits September 23, 2024 16:35

feat: support media and html sources in prod and web sockets

91f477a

feat: add management lock

f49f98c

feat: display thumbnail on card and fix cache issue

20b52e8

feat: can specify multiview layout when doing production-config(#16)

2e212aa

fix: rebase conflicts

4f32f3e

magnusedgeware reviewed Oct 3, 2024

View reviewed changes

.env.sample Outdated Show resolved Hide resolved

fix: correct env.sample and add variable to readme

0c381d1

permobergedge reviewed Oct 7, 2024

View reviewed changes

magnusedgeware reviewed Oct 7, 2024

View reviewed changes

malmen237 and others added 2 commits October 8, 2024 09:11

fix: removed the commented-out code and added empty lines

a1444ce

fix: remove reset and restructuring

3fbf94a

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: support media, html sources and websocket #20

feat: support media, html sources and websocket #20

birme commented Sep 25, 2024

permobergedge left a comment

permobergedge Sep 30, 2024

malmen237 Oct 8, 2024

permobergedge Sep 30, 2024

malmen237 Oct 8, 2024

permobergedge Sep 30, 2024

malmen237 Oct 8, 2024

permobergedge Oct 7, 2024

Saelmala Oct 8, 2024

Saelmala Oct 8, 2024

permobergedge Oct 7, 2024

malmen237 Oct 8, 2024

permobergedge Oct 7, 2024

malmen237 Oct 8, 2024

permobergedge Oct 7, 2024

permobergedge Oct 7, 2024

magnusedgeware Oct 7, 2024

malmen237 Oct 8, 2024

magnusedgeware Oct 7, 2024

Saelmala Oct 8, 2024

magnusedgeware Oct 7, 2024

Saelmala Oct 8, 2024

magnusedgeware Oct 7, 2024

Saelmala Oct 8, 2024

feat: support media, html sources and websocket #20

Are you sure you want to change the base?

feat: support media, html sources and websocket #20

Conversation

birme commented Sep 25, 2024

permobergedge left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment