From 772ca4c34f2bf4f44400e33fc204a11daac41cc8 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 09:49:01 -0300
Subject: [PATCH 01/39] ignore tags file

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 60737d8..8481892 100644
--- a/.gitignore
+++ b/.gitignore
@@ -14,3 +14,4 @@ donut
 
 # Dependency directories (remove the comment below to include it)
 # vendor/
+tags

From 675f91df7e79ea10ab7344513966588691693d63 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 09:49:13 -0300
Subject: [PATCH 02/39] add docker compose

---
 Dockerfile                  | 27 +++++++++++++++------------
 Makefile                    |  4 ++++
 docker-compose.yaml         | 31 +++++++++++++++++++++++++++++++
 ffmpeg_srt_live_listener.sh |  8 ++++++++
 4 files changed, 58 insertions(+), 12 deletions(-)
 create mode 100644 Makefile
 create mode 100644 docker-compose.yaml
 create mode 100755 ffmpeg_srt_live_listener.sh

diff --git a/Dockerfile b/Dockerfile
index 58ec867..de2e683 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,33 +1,36 @@
-FROM golang:1.19 AS builder
+FROM ubuntu:20.04 AS builder
 
-ENV SRT_VERSION="v1.5.0"
+ENV SRT_VERSION="v1.5.3"
+ENV SRT_FOLDER="/opt/srt_lib"
 
-RUN apt-get update && \
+RUN apt-get clean && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
       tclsh pkg-config cmake libssl-dev build-essential git \
     && apt-get clean
 
 RUN \
-  cd /opt && \
-  git clone https://github.com/asticode/go-astisrt.git && \
-  cd go-astisrt && \
-  make install-srt version="${SRT_VERSION}" && \
-  mv tmp/${SRT_VERSION} /opt/srt && \
-  cd .. && \
-  rm -rf go-astisrt
+  mkdir -p "${SRT_FOLDER}" && \
+  git clone --depth 1 --branch "${SRT_VERSION}" https://github.com/Haivision/srt && \
+  cd srt && \
+  ./configure --prefix=. $(configure) && \
+  make && \
+  make install
 
 FROM golang:1.19
 ENV WD=/usr/src/app
 WORKDIR ${WD}
 
 RUN mkdir srt-lib
-COPY --from=builder /opt/srt /opt/srt
+COPY --from=builder /srt /opt/srt
 
+# To find where the srt.h and libsrt.so were you can
+# find / -name srt.h
+# find / -name libsrt.so
+# inside the container docker run -it --rm -t <TAG_YOU_BUILT> bash
 ENV GOPROXY=direct
 ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/srt/lib/"
 ENV CGO_CFLAGS="-I/opt/srt/include/"
 ENV CGO_LDFLAGS="-L/opt/srt/lib/"
-ENV PKG_CONFIG_PATH="/opt/srt/lib/pkgconfig"
 
 COPY . ./donut
 WORKDIR ${WD}/donut
diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..9cae02d
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,4 @@
+run:
+	docker-compose stop && docker-compose down && docker-compose build && docker-compose up
+
+.PHONY: run
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 0000000..b576ff2
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,31 @@
+version: '2.1'
+
+services:
+  app:
+    build:
+      context: .
+    working_dir: "/app"
+    volumes:
+      - "./:/app/"
+    ports:
+      - "8080:8080"
+      - "8081:8081"
+      - "8081:8081/udp"
+
+  origin: # simulating an srt origin live transmission
+    image: jrottenberg/ffmpeg:4.4-alpine
+    entrypoint: sh
+    command: "/scripts/ffmpeg_srt_live_listener.sh"
+    volumes:
+      - "./:/scripts"
+    environment:
+      - SRT_LISTENING_PORT=40052
+      - SRT_LISTENING_HOST=0.0.0.0
+      - SRT_LISTENING_LATENCY_US=400000
+    ports:
+      - "40052:40052/udp"
+    depends_on:
+      - app
+    links:
+      - app
+
diff --git a/ffmpeg_srt_live_listener.sh b/ffmpeg_srt_live_listener.sh
new file mode 100755
index 0000000..0631f6e
--- /dev/null
+++ b/ffmpeg_srt_live_listener.sh
@@ -0,0 +1,8 @@
+ffmpeg -hide_banner -loglevel verbose \
+    -re -f lavfi -i "testsrc2=size=1280x720:rate=30,format=yuv420p" \
+    -f lavfi -i "sine=frequency=1000:sample_rate=44100" \
+    -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
+    -b:v 1400k -bufsize 2800k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
+    -c:a aac -b:a 128k \
+    -f mpegts "srt://${SRT_LISTENING_HOST}:${SRT_LISTENING_PORT}?mode=listener&latency=${SRT_LISTENING_LATENCY_US}"
+

From 6700fe02e22fe0572696183476a4b483b5885314 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 10:11:02 -0300
Subject: [PATCH 03/39] ignore mac files

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 8481892..8c0bba5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,5 @@ donut
 # Dependency directories (remove the comment below to include it)
 # vendor/
 tags
+
+.DS_Store

From ebd83e607aa66973eaf5789f37394c184dfb0cca Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 10:12:33 -0300
Subject: [PATCH 04/39] add documentation

---
 README.md                            |  70 ++++++++++++++++++++++++++-
 imgs/docker-compose-donut-setup.webp | Bin 0 -> 33798 bytes
 2 files changed, 69 insertions(+), 1 deletion(-)
 create mode 100644 imgs/docker-compose-donut-setup.webp

diff --git a/README.md b/README.md
index 6542349..69999e5 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,61 @@ $ go install github.com/flavioribeiro/donut@latest
 ```
 Once installed, execute `donut`. This will be in your `$GOPATH/bin`. The default will be `~/go/bin/donut`
 
-### Install & Run using Docker
+#### Troubleshooting locally
+
+##### Mac
+
+If you're facing issues while trying to run it locally, such as:
+
+```
+mod/github.com/asticode/go-astisrt@v0.3.0/pkg/callbacks.go:4:11: fatal error: 'srt/srt.h' file not found
+ #include <srt/srt.h>
+          ^~~~~~~~~~~
+1 error generated.
+```
+
+```
+./main.go:117:2: undefined: setCors
+./main.go:135:3: undefined: errorToHTTP
+./main.go:147:3: undefined: errorToHTTP
+./main.go:154:3: undefined: errorToHTTP
+./main.go:158:3: undefined: errorToHTTP
+./main.go:165:3: undefined: errorToHTTP
+./main.go:174:18: undefined: assertSignalingCorrect
+```
+
+```
+/opt/homebrew/Cellar/go/1.21.6/libexec/pkg/tool/darwin_arm64/link: running cc failed: exit status 1
+ld: warning: ignoring duplicate libraries: '-lsrt'
+ld: library 'srt' not found
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+```
+
+You can try to use the [docker-compose](#run-using-docker), but if you want to run it locally you might must provide path to the linker.
+
+```bash
+
+# Find where the headers and libraries files are located at. If you can't find, install them with brew.
+sudo find /opt/homebrew/ -name srt.h
+sudo find /opt/ -name libsrt.a
+
+# Add the required flags so the compiler/linker can find the needed files.
+CGO_LDFLAGS="-L/opt/homebrew/Cellar/srt/1.5.3/lib -lsrt" CGO_CFLAGS="-I/opt/homebrew//Cellar/srt/1.5.3/include/" go run main.go helpers.go
+
+```
+
+You can run ffmpeg locally to simulate an SRT live transmission:
+
+```bash
+ffmpeg -hide_banner -loglevel verbose \
+    -re -f lavfi -i "testsrc2=size=1280x720:rate=30,format=yuv420p" \
+    -f lavfi -i "sine=frequency=1000:sample_rate=44100" \
+    -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
+    -b:v 1400k -bufsize 2800k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
+    -c:a aac -b:a 128k -f mpegts 'srt://0.0.0.0:40052?mode=listener&latency=400000'
+```
+
+### Run using Docker
 
 Alternatively, you can build a docker image. Docker will take care of downloading the dependencies (including the libsrt) and compiling donut for you.
 
@@ -24,3 +78,17 @@ $ docker run -it -p 8080:8080 donut
 
 ### Open the Web UI
 Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in your details for your SRT listener configuration and hit connect.
+
+### Install & Run using Docker Compose
+
+Docker-compose can simulate an SRT live transmission and run the donut in separate containers.
+
+```
+$ make run
+```
+
+#### Open the Web UI
+Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in with the SRT listener configuration and hit connect.
+
+![donut docker-compose setup](/imgs/docker-compose-donut-setup.webp "donut docker-compose setup")
+
diff --git a/imgs/docker-compose-donut-setup.webp b/imgs/docker-compose-donut-setup.webp
new file mode 100644
index 0000000000000000000000000000000000000000..8544c028eaad6dd523b3c96b0932f3b3fc27ff3c
GIT binary patch
literal 33798
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
z+W-In0000000010@Bjb+000000000000000000000000000000000000000000000
E06qu=vH$=8

literal 0
HcmV?d00001


From 86eb38c14c26e9cf8645391c871ca5e74bcee25b Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 10:14:36 -0300
Subject: [PATCH 05/39] move troubleshooting to lower sections

---
 README.md | 57 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/README.md b/README.md
index 69999e5..b0d7a3a 100644
--- a/README.md
+++ b/README.md
@@ -13,9 +13,36 @@ $ go install github.com/flavioribeiro/donut@latest
 ```
 Once installed, execute `donut`. This will be in your `$GOPATH/bin`. The default will be `~/go/bin/donut`
 
-#### Troubleshooting locally
 
-##### Mac
+### Run using Docker
+
+Alternatively, you can build a docker image. Docker will take care of downloading the dependencies (including the libsrt) and compiling donut for you.
+
+```
+$ docker build -t donut .
+$ docker run -it -p 8080:8080 donut
+```
+
+### Open the Web UI
+Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in your details for your SRT listener configuration and hit connect.
+
+### Install & Run using Docker Compose
+
+Docker-compose can simulate an SRT live transmission and run the donut in separate containers.
+
+```
+$ make run
+```
+
+#### Open the Web UI
+Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in with the SRT listener configuration and hit connect.
+
+![donut docker-compose setup](/imgs/docker-compose-donut-setup.webp "donut docker-compose setup")
+
+
+### Troubleshooting locally
+
+#### Mac
 
 If you're facing issues while trying to run it locally, such as:
 
@@ -66,29 +93,3 @@ ffmpeg -hide_banner -loglevel verbose \
     -b:v 1400k -bufsize 2800k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
     -c:a aac -b:a 128k -f mpegts 'srt://0.0.0.0:40052?mode=listener&latency=400000'
 ```
-
-### Run using Docker
-
-Alternatively, you can build a docker image. Docker will take care of downloading the dependencies (including the libsrt) and compiling donut for you.
-
-```
-$ docker build -t donut .
-$ docker run -it -p 8080:8080 donut
-```
-
-### Open the Web UI
-Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in your details for your SRT listener configuration and hit connect.
-
-### Install & Run using Docker Compose
-
-Docker-compose can simulate an SRT live transmission and run the donut in separate containers.
-
-```
-$ make run
-```
-
-#### Open the Web UI
-Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in with the SRT listener configuration and hit connect.
-
-![donut docker-compose setup](/imgs/docker-compose-donut-setup.webp "donut docker-compose setup")
-

From eb97fe454e2b55783730c7fd8843a797cf266f6b Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 10:24:55 -0300
Subject: [PATCH 06/39] fix readme

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b0d7a3a..1182ebc 100644
--- a/README.md
+++ b/README.md
@@ -14,7 +14,7 @@ $ go install github.com/flavioribeiro/donut@latest
 Once installed, execute `donut`. This will be in your `$GOPATH/bin`. The default will be `~/go/bin/donut`
 
 
-### Run using Docker
+### Install & Run using Docker
 
 Alternatively, you can build a docker image. Docker will take care of downloading the dependencies (including the libsrt) and compiling donut for you.
 
@@ -26,7 +26,7 @@ $ docker run -it -p 8080:8080 donut
 ### Open the Web UI
 Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in your details for your SRT listener configuration and hit connect.
 
-### Install & Run using Docker Compose
+### Run using docker-compose
 
 Docker-compose can simulate an SRT live transmission and run the donut in separate containers.
 
@@ -70,7 +70,7 @@ ld: library 'srt' not found
 clang: error: linker command failed with exit code 1 (use -v to see invocation)
 ```
 
-You can try to use the [docker-compose](#run-using-docker), but if you want to run it locally you might must provide path to the linker.
+You can try to use the [docker-compose](#run-using-docker-compose), but if you want to run it locally you might must provide path to the linker.
 
 ```bash
 

From 495b91b54a04757d5e638d3cc023693913760963 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 24 Jan 2024 23:39:57 -0300
Subject: [PATCH 07/39] Add data flow documentation

---
 HOW_IT_WORKS.md | 32 ++++++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 HOW_IT_WORKS.md

diff --git a/HOW_IT_WORKS.md b/HOW_IT_WORKS.md
new file mode 100644
index 0000000..b694745
--- /dev/null
+++ b/HOW_IT_WORKS.md
@@ -0,0 +1,32 @@
+# Data flow diagram
+
+```mermaid
+sequenceDiagram
+    actor User
+    
+    box Navy WebRTC
+        participant locahost8080
+        participant donut-video
+    end
+
+    locahost8080->>+locahost8080: setup ice 8081/udp and 8081/tcp
+    User->>+locahost8080: feed SRT host, port, and id
+    User->>+locahost8080: click on [connect]
+    locahost8080->>+donut-video: play
+    donut-video->>+donut-video: web rtc createOffer
+    donut-video->>+locahost8080: POST /doSignaling {srtOffer}
+    locahost8080->>+locahost8080: process {srtOffer}
+    locahost8080->>+locahost8080: create video track
+    locahost8080->>+locahost8080: set remote {srtOffer}
+    locahost8080->>+locahost8080: set local {answer}
+    locahost8080->>+SRT: connect
+
+    loop SRT to WebRTC
+        locahost8080-->SRT: SRT | WebRTC        
+        locahost8080-->locahost8080: WebRTC.WriteSample(SRT.PES.Data)
+    end
+    
+    locahost8080->>+donut-video: {local description}
+
+    donut-video-->>donut-video: WebRTC.ontrack(video)
+```

From ac13f5ce62586c40e67966447971b11e56c6a37e Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Thu, 25 Jan 2024 08:46:23 -0300
Subject: [PATCH 08/39] move readme image to .github

---
 {imgs => .github}/docker-compose-donut-setup.webp | Bin
 README.md                                         |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename {imgs => .github}/docker-compose-donut-setup.webp (100%)

diff --git a/imgs/docker-compose-donut-setup.webp b/.github/docker-compose-donut-setup.webp
similarity index 100%
rename from imgs/docker-compose-donut-setup.webp
rename to .github/docker-compose-donut-setup.webp
diff --git a/README.md b/README.md
index 1182ebc..0d222e2 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ $ make run
 #### Open the Web UI
 Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in with the SRT listener configuration and hit connect.
 
-![donut docker-compose setup](/imgs/docker-compose-donut-setup.webp "donut docker-compose setup")
+![donut docker-compose setup](/.github/docker-compose-donut-setup.webp "donut docker-compose setup")
 
 
 ### Troubleshooting locally

From c7e32f3c9226925bd8f1095b4685f3360369cb3c Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Thu, 25 Jan 2024 08:53:04 -0300
Subject: [PATCH 09/39] move ffmpeg to the scripts folder

---
 docker-compose.yaml                                             | 2 +-
 .../ffmpeg_srt_live_listener.sh                                 | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename ffmpeg_srt_live_listener.sh => scripts/ffmpeg_srt_live_listener.sh (100%)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index b576ff2..0d56f69 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,7 +17,7 @@ services:
     entrypoint: sh
     command: "/scripts/ffmpeg_srt_live_listener.sh"
     volumes:
-      - "./:/scripts"
+      - "./scripts:/scripts"
     environment:
       - SRT_LISTENING_PORT=40052
       - SRT_LISTENING_HOST=0.0.0.0
diff --git a/ffmpeg_srt_live_listener.sh b/scripts/ffmpeg_srt_live_listener.sh
similarity index 100%
rename from ffmpeg_srt_live_listener.sh
rename to scripts/ffmpeg_srt_live_listener.sh

From 65a4be16af211e7bc706fba6ae3655c7f1758bd8 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Thu, 25 Jan 2024 09:22:08 -0300
Subject: [PATCH 10/39] add more components to how it works

---
 HOW_IT_WORKS.md | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/HOW_IT_WORKS.md b/HOW_IT_WORKS.md
index b694745..8970b1a 100644
--- a/HOW_IT_WORKS.md
+++ b/HOW_IT_WORKS.md
@@ -3,30 +3,39 @@
 ```mermaid
 sequenceDiagram
     actor User
-    
-    box Navy WebRTC
-        participant locahost8080
+
+    box Navy Browser
+        participant browser
         participant donut-video
     end
 
-    locahost8080->>+locahost8080: setup ice 8081/udp and 8081/tcp
-    User->>+locahost8080: feed SRT host, port, and id
-    User->>+locahost8080: click on [connect]
-    locahost8080->>+donut-video: play
+    locahost8080->>+locahost8080: setup local ICE 8081/udp and 8081/tcp
+    browser->>+locahost8080: GET /
+    locahost8080->>+browser: 200 /index.html
+    User->>+browser: feed SRT host, port, and id
+    User->>+browser: click on [connect]
+    browser->>+donut-video: play
+
+    Note over locahost8080,donut-video: WebRTC connection setup
+
     donut-video->>+donut-video: web rtc createOffer
     donut-video->>+locahost8080: POST /doSignaling {srtOffer}
     locahost8080->>+locahost8080: process {srtOffer}
     locahost8080->>+locahost8080: create video track
     locahost8080->>+locahost8080: set remote {srtOffer}
     locahost8080->>+locahost8080: set local {answer}
+    locahost8080->>+donut-video: {local description}
+
+    Note over locahost8080,donut-video: WebRTC connection setup
+
     locahost8080->>+SRT: connect
 
     loop SRT to WebRTC
-        locahost8080-->SRT: SRT | WebRTC        
-        locahost8080-->locahost8080: WebRTC.WriteSample(SRT.PES.Data)
+        locahost8080-->SRT: SRT | WebRTC
+        locahost8080-->browser: WebRTC.WriteSample(SRT.PES.Data)
     end
-    
-    locahost8080->>+donut-video: {local description}
 
     donut-video-->>donut-video: WebRTC.ontrack(video)
+    donut-video-->>browser: renders video at the <video> tag
+    browser-->>User: show frames
 ```

From f053662036c22dfbcd9d1eedd26d69603c2c1a4f Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Fri, 26 Jan 2024 11:17:32 -0300
Subject: [PATCH 11/39] move entities out of the main loop

---
 helpers.go                    | 15 ----------
 internal/entity/entitities.go | 55 +++++++++++++++++++++++++++++++++++
 internal/web/handlers.go      |  7 +++++
 main.go                       | 28 ++++++------------
 4 files changed, 71 insertions(+), 34 deletions(-)
 create mode 100644 internal/entity/entitities.go
 create mode 100644 internal/web/handlers.go

diff --git a/helpers.go b/helpers.go
index 0cd07fc..70cb16b 100644
--- a/helpers.go
+++ b/helpers.go
@@ -1,24 +1,9 @@
 package main
 
 import (
-	"errors"
 	"net/http"
-	"strconv"
 )
 
-func assertSignalingCorrect(SRTHost, SRTPort, SRTStreamID string) (int, error) {
-	switch {
-	case SRTHost == "":
-		return 0, errors.New("SRTHost must not be nil")
-	case SRTPort == "":
-		return 0, errors.New("SRTPort must not be empty")
-	case SRTStreamID == "":
-		return 0, errors.New("SRTStreamID must not be empty")
-	}
-
-	return strconv.Atoi(SRTPort)
-}
-
 func errorToHTTP(w http.ResponseWriter, err error) {
 	w.WriteHeader(500)
 	w.Write([]byte(err.Error()))
diff --git a/internal/entity/entitities.go b/internal/entity/entitities.go
new file mode 100644
index 0000000..60bfa35
--- /dev/null
+++ b/internal/entity/entitities.go
@@ -0,0 +1,55 @@
+package entity
+
+import (
+	"errors"
+	"fmt"
+
+	"github.com/pion/webrtc/v3"
+)
+
+type Media struct{}
+
+type ParamsOffer struct {
+	SRTHost     string
+	SRTPort     uint16 `json:",string"`
+	SRTStreamID string
+	Offer       webrtc.SessionDescription
+}
+
+func (p *ParamsOffer) Valid() error {
+	if p == nil {
+		return errors.New("ParamsOffer must not be nil")
+	}
+
+	if p.SRTHost == "" {
+		return errors.New("SRTHost must not be nil")
+	}
+
+	if p.SRTPort == 0 {
+		return errors.New("SRTPort must be valid")
+	}
+
+	if p.SRTStreamID == "" {
+		return errors.New("SRTStreamID must not be empty")
+	}
+
+	return nil
+}
+
+func (p *ParamsOffer) String() string {
+	if p == nil {
+		return ""
+	}
+	return fmt.Sprintf("ParamsOffer %v:%v/%v", p.SRTHost, p.SRTPort, p.SRTStreamID)
+}
+
+type MessageType string
+
+const (
+	MessageTypeMetadata MessageType = "metadata"
+)
+
+type Message struct {
+	Type    MessageType
+	Message string
+}
diff --git a/internal/web/handlers.go b/internal/web/handlers.go
new file mode 100644
index 0000000..813278a
--- /dev/null
+++ b/internal/web/handlers.go
@@ -0,0 +1,7 @@
+package handlers
+
+import "net/http"
+
+func MediaInfo(w http.ResponseWriter, r *http.Request) {
+
+}
diff --git a/main.go b/main.go
index 630af56..689793f 100644
--- a/main.go
+++ b/main.go
@@ -16,6 +16,7 @@ import (
 	"time"
 
 	"github.com/flavioribeiro/donut/eia608"
+	"github.com/flavioribeiro/donut/internal/entity"
 
 	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/asticode/go-astits"
@@ -65,11 +66,8 @@ func srtToWebRTC(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLoca
 
 		if d.PMT != nil {
 			for _, es := range d.PMT.ElementaryStreams {
-				msg, _ := json.Marshal(struct {
-					Type    string
-					Message string
-				}{
-					Type:    "metadata",
+				msg, _ := json.Marshal(entity.Message{
+					Type:    entity.MessageTypeMetadata,
 					Message: es.StreamType.String(),
 				})
 				metadataTrack.SendText(string(msg))
@@ -81,11 +79,8 @@ func srtToWebRTC(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLoca
 			for _, d := range d.PMT.ProgramDescriptors {
 				if d.MaximumBitrate != nil {
 					bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
-					msg, _ := json.Marshal(struct {
-						Type    string
-						Message string
-					}{
-						Type:    "metadata",
+					msg, _ := json.Marshal(entity.Message{
+						Type:    entity.MessageTypeMetadata,
 						Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
 					})
 					metadataTrack.SendText(string(msg))
@@ -136,12 +131,7 @@ func doSignaling(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	offer := struct {
-		SRTHost     string
-		SRTPort     string
-		SRTStreamID string
-		Offer       webrtc.SessionDescription
-	}{"", "", "", webrtc.SessionDescription{}}
+	offer := entity.ParamsOffer{}
 
 	if err = json.NewDecoder(r.Body).Decode(&offer); err != nil {
 		errorToHTTP(w, err)
@@ -171,7 +161,7 @@ func doSignaling(w http.ResponseWriter, r *http.Request) {
 		log.Printf("ICE Connection State has changed: %s\n", connectionState.String())
 	})
 
-	srtPort, err := assertSignalingCorrect(offer.SRTHost, offer.SRTPort, offer.SRTStreamID)
+	err = offer.Valid()
 	if err != nil {
 		errorToHTTP(w, err)
 		return
@@ -200,7 +190,7 @@ func doSignaling(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	log.Println("Connecting to SRT ", offer.SRTHost, srtPort, offer.SRTStreamID)
+	log.Println("Connecting to SRT ", offer)
 	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(300),
@@ -211,7 +201,7 @@ func doSignaling(w http.ResponseWriter, r *http.Request) {
 		OnDisconnect: func(c *astisrt.Connection, err error) { log.Fatal("Disconnected from SRT") },
 
 		Host: offer.SRTHost,
-		Port: uint16(srtPort),
+		Port: offer.SRTPort,
 	})
 	if err != nil {
 		errorToHTTP(w, err)

From e8188cbfc54785940c02bb90f48de95512f88891 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Fri, 26 Jan 2024 19:13:23 -0300
Subject: [PATCH 12/39] split components

---
 go.mod                                |   6 +
 go.sum                                |  24 ++-
 internal/controller/srt/controller.go |  49 +++++
 internal/entity/entitities.go         |  24 ++-
 internal/entity/errors.go             |  10 +
 internal/web/handlers.go              |   7 -
 internal/web/http.go                  |  41 ++++
 internal/web/ice.go                   |  50 +++++
 internal/web/index.go                 |  20 ++
 index.html => internal/web/index.html |   0
 internal/web/media.go                 |  49 +++++
 internal/web/router.go                |  16 ++
 internal/web/signaling.go             | 233 +++++++++++++++++++++++
 helpers.go => internal/web/util.go    |  13 +-
 main.go                               | 264 +++-----------------------
 15 files changed, 541 insertions(+), 265 deletions(-)
 create mode 100644 internal/controller/srt/controller.go
 create mode 100644 internal/entity/errors.go
 delete mode 100644 internal/web/handlers.go
 create mode 100644 internal/web/http.go
 create mode 100644 internal/web/ice.go
 create mode 100644 internal/web/index.go
 rename index.html => internal/web/index.html (100%)
 create mode 100644 internal/web/media.go
 create mode 100644 internal/web/router.go
 create mode 100644 internal/web/signaling.go
 rename helpers.go => internal/web/util.go (68%)

diff --git a/go.mod b/go.mod
index 45ac6c6..7e9baac 100644
--- a/go.mod
+++ b/go.mod
@@ -5,8 +5,10 @@ go 1.19
 require (
 	github.com/asticode/go-astisrt v0.3.0
 	github.com/asticode/go-astits v1.11.0
+	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/pion/webrtc/v3 v3.1.47
 	github.com/szatmary/gocaption v0.0.0-20220607192049-fdd59655f0c3
+	go.uber.org/fx v1.20.1
 )
 
 require (
@@ -28,6 +30,10 @@ require (
 	github.com/pion/transport v0.13.1 // indirect
 	github.com/pion/turn/v2 v2.0.8 // indirect
 	github.com/pion/udp v0.1.1 // indirect
+	go.uber.org/atomic v1.7.0 // indirect
+	go.uber.org/dig v1.17.0 // indirect
+	go.uber.org/multierr v1.6.0 // indirect
+	go.uber.org/zap v1.23.0 // indirect
 	golang.org/x/crypto v0.2.0 // indirect
 	golang.org/x/net v0.2.0 // indirect
 	golang.org/x/sys v0.2.0 // indirect
diff --git a/go.sum b/go.sum
index 611583d..1bfc9ae 100644
--- a/go.sum
+++ b/go.sum
@@ -1,13 +1,11 @@
-github.com/asticode/go-astikit v0.30.0 h1:DkBkRQRIxYcknlaU7W7ksNfn4gMFsB0tqMJflxkRsZA=
 github.com/asticode/go-astikit v0.30.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
 github.com/asticode/go-astikit v0.36.0 h1:WHSY88YT76D/XRbdp0lMLwfjyUGw8dygnbKKtbGNIG8=
 github.com/asticode/go-astikit v0.36.0/go.mod h1:h4ly7idim1tNhaVkdVBeXQZEE3L0xblP7fCWbgwipF0=
-github.com/asticode/go-astisrt v0.2.0 h1:pfaSfW2BfW2O2NFtzlktzIf5gHc4Pue1q1scTuj7uhc=
-github.com/asticode/go-astisrt v0.2.0/go.mod h1:tP5Dx+MXyaICUeF0gz4nwyav3RDI609e0en3QQkrxKE=
 github.com/asticode/go-astisrt v0.3.0 h1:LpvqOc17qfMr2suLZPzMs9wYLozxXYu/PE9CA1tH88c=
 github.com/asticode/go-astisrt v0.3.0/go.mod h1:tP5Dx+MXyaICUeF0gz4nwyav3RDI609e0en3QQkrxKE=
 github.com/asticode/go-astits v1.11.0 h1:GTHUXht0ZXAJXsVbsLIcyfHr1Bchi4QQwMARw2ZWAng=
 github.com/asticode/go-astits v1.11.0/go.mod h1:QSHmknZ51pf6KJdHKZHJTLlMegIrhega3LPWz3ND/iI=
+github.com/benbjohnson/clock v1.3.0 h1:ip6w0uFQkncKQ979AypyG0ER7mqUSBdKLOgAle/AT8A=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -30,6 +28,8 @@ github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
+github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dvMUtDTo2cv8=
+github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
@@ -48,7 +48,6 @@ github.com/pion/dtls/v2 v2.1.5 h1:jlh2vtIyUBShchoTDqpCCqiYCyRFJ/lvf/gQ8TALs+c=
 github.com/pion/dtls/v2 v2.1.5/go.mod h1:BqCE7xPZbPSubGasRoDFJeTsyJtdD1FanJYL0JGheqY=
 github.com/pion/ice/v2 v2.2.11 h1:wiAy7TSrVZ4KdyjC0CcNTkwltz9ywetbe4wbHLKUbIg=
 github.com/pion/ice/v2 v2.2.11/go.mod h1:NqUDUao6SjSs1+4jrqpexDmFlptlVhGxQjcymXLaVvE=
-github.com/pion/interceptor v0.1.11 h1:00U6OlqxA3FFB50HSg25J/8cWi7P6FbSzw4eFn24Bvs=
 github.com/pion/interceptor v0.1.11/go.mod h1:tbtKjZY14awXd7Bq0mmWvgtHB5MDaRN7HV3OZ/uy7s8=
 github.com/pion/interceptor v0.1.12 h1:CslaNriCFUItiXS5o+hh5lpL0t0ytQkFnUcbbCs2Zq8=
 github.com/pion/interceptor v0.1.12/go.mod h1:bDtgAD9dRkBZpWHGKaoKb42FhDHTG2rX8Ii9LRALLVA=
@@ -64,7 +63,6 @@ github.com/pion/rtcp v1.2.10/go.mod h1:ztfEwXZNLGyF1oQDttz/ZKIBaeeg/oWbRYqzBM9TL
 github.com/pion/rtp v1.7.13 h1:qcHwlmtiI50t1XivvoawdCGTP4Uiypzfrsap+bijcoA=
 github.com/pion/rtp v1.7.13/go.mod h1:bDb5n+BFZxXx0Ea7E5qe+klMuqiBrP+w8XSjiWtCUko=
 github.com/pion/sctp v1.8.0/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
-github.com/pion/sctp v1.8.2 h1:yBBCIrUMJ4yFICL3RIvR4eh/H2BTTvlligmSTy+3kiA=
 github.com/pion/sctp v1.8.2/go.mod h1:xFe9cLMZ5Vj6eOzpyiKjT9SwGM4KpK/8Jbw5//jc+0s=
 github.com/pion/sctp v1.8.3 h1:LWcciN2ptLkw9Ugp/Ks2E76fiWy7yk3Wm79D6oFbFNo=
 github.com/pion/sctp v1.8.3/go.mod h1:OHbDjdk7kg+L+7TJim9q/qGVefdEJohuA2SZyihccgI=
@@ -85,11 +83,13 @@ github.com/pion/udp v0.1.1 h1:8UAPvyqmsxK8oOjloDk4wUt63TzFe9WEJkg5lChlj7o=
 github.com/pion/udp v0.1.1/go.mod h1:6AFo+CMdKQm7UiA0eUPA8/eVCTx8jBIITLZHc9DWX5M=
 github.com/pion/webrtc/v3 v3.1.47 h1:2dFEKRI1rzFvehXDq43hK9OGGyTGJSusUi3j6QKHC5s=
 github.com/pion/webrtc/v3 v3.1.47/go.mod h1:8U39MYZCLVV4sIBn01htASVNkWQN2zDa/rx5xisEXWs=
+github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I=
 github.com/pkg/profile v1.4.0/go.mod h1:NWz/XGvpEW1FyYQ7fCx4dqYBLlfTcE+A9FLAkNKqjFE=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
@@ -99,11 +99,21 @@ github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PK
 github.com/szatmary/gocaption v0.0.0-20220607192049-fdd59655f0c3 h1:j8SVIV6YZreqjOPGjxM48tB4XgS8oUZdgy0cyN7YrBg=
 github.com/szatmary/gocaption v0.0.0-20220607192049-fdd59655f0c3/go.mod h1:l9r7RYKHGLuHbXpKJhJgASvi8xT+Uqxnz9B26uVU73c=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
+go.uber.org/atomic v1.7.0 h1:ADUqmZGgLDDfbSL9ZmPxKTybcoEYHgpYfELNoN+7hsw=
+go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
+go.uber.org/dig v1.17.0 h1:5Chju+tUvcC+N7N6EV08BJz41UZuO3BmHcN4A287ZLI=
+go.uber.org/dig v1.17.0/go.mod h1:rTxpf7l5I0eBTlE6/9RL+lDybC7WFwY2QH55ZSjy1mU=
+go.uber.org/fx v1.20.1 h1:zVwVQGS8zYvhh9Xxcu4w1M6ESyeMzebzj2NbSayZ4Mk=
+go.uber.org/fx v1.20.1/go.mod h1:iSYNbHf2y55acNCwCXKx7LbWb5WG1Bnue5RDXz1OREg=
+go.uber.org/goleak v1.1.11 h1:wy28qYRKZgnJTxGxvye5/wgWr1EKjmUDGYox5mGlRlI=
+go.uber.org/multierr v1.6.0 h1:y6IPFStTAIT5Ytl7/XYmHvzXQ7S3g/IeZW9hyZ5thw4=
+go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
+go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY=
+go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20220427172511-eb4f295cb31f/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
-golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2 h1:x8vtB3zMecnlqZIwJNUUpwYKYSqCz5jXbiyv0ZJJZeI=
 golang.org/x/crypto v0.0.0-20221010152910-d6f0a8c073c2/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
 golang.org/x/crypto v0.2.0 h1:BRXPfhNivWL5Yq0BGQ39a2sW6t44aODpfxkWjYdzewE=
 golang.org/x/crypto v0.2.0/go.mod h1:hebNnKkNXi2UzZN1eVRvBB7co0a+JxK6XbPiWVs/3J4=
@@ -121,7 +131,6 @@ golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c/go.mod h1:9nx3DQGgdP8bBQD5qx
 golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
 golang.org/x/net v0.0.0-20220531201128-c960675eff93/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.0.0-20221002022538-bcab6841153b/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
-golang.org/x/net v0.0.0-20221004154528-8021a29435af h1:wv66FM3rLZGPdxpYL+ApnDe2HzHcTFta3z5nsc13wI4=
 golang.org/x/net v0.0.0-20221004154528-8021a29435af/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
 golang.org/x/net v0.2.0 h1:sZfSu1wtKLGlWI4ZZayP0ck9Y73K1ynO6gqzTdBVdPU=
 golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY=
@@ -145,7 +154,6 @@ golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220608164250-635b8c9b7f68/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220622161953-175b2fd9d664/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.0.0-20221010170243-090e33056c14 h1:k5II8e6QD8mITdi+okbbmR/cIyEbeXLBhy5Ha4nevyc=
 golang.org/x/sys v0.0.0-20221010170243-090e33056c14/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
 golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
diff --git a/internal/controller/srt/controller.go b/internal/controller/srt/controller.go
new file mode 100644
index 0000000..90ed0bc
--- /dev/null
+++ b/internal/controller/srt/controller.go
@@ -0,0 +1,49 @@
+package srt
+
+import (
+	"log"
+
+	astisrt "github.com/asticode/go-astisrt/pkg"
+	"github.com/flavioribeiro/donut/internal/entity"
+)
+
+type SRTController struct {
+	c *entity.Config
+}
+
+func NewSRTController(c *entity.Config) *SRTController {
+	return &SRTController{
+		c: c,
+	}
+}
+
+func (c *SRTController) Connect(offer *entity.ParamsOffer) error {
+	if err := offer.Valid(); err != nil {
+		return err
+	}
+
+	// conn, err := c.srtConnect(offer)
+	// if err != nil {
+	// 	return err
+	// }
+
+	return nil
+}
+
+func (c *SRTController) srtConnect(offer *entity.ParamsOffer) (*astisrt.Connection, error) {
+	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
+		ConnectionOptions: []astisrt.ConnectionOption{
+			astisrt.WithLatency(c.c.SRTConnectionLatencyMS),
+			astisrt.WithStreamid(offer.SRTStreamID),
+		},
+		OnDisconnect: func(c *astisrt.Connection, err error) {
+			log.Fatal("Disconnected from SRT")
+		},
+		Host: offer.SRTHost,
+		Port: offer.SRTPort,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return srtConnection, nil
+}
diff --git a/internal/entity/entitities.go b/internal/entity/entitities.go
index 60bfa35..d37be65 100644
--- a/internal/entity/entitities.go
+++ b/internal/entity/entitities.go
@@ -1,7 +1,6 @@
 package entity
 
 import (
-	"errors"
 	"fmt"
 
 	"github.com/pion/webrtc/v3"
@@ -18,19 +17,19 @@ type ParamsOffer struct {
 
 func (p *ParamsOffer) Valid() error {
 	if p == nil {
-		return errors.New("ParamsOffer must not be nil")
+		return ErrMissingParamsOffer
 	}
 
 	if p.SRTHost == "" {
-		return errors.New("SRTHost must not be nil")
+		return ErrMissingSRTHost
 	}
 
 	if p.SRTPort == 0 {
-		return errors.New("SRTPort must be valid")
+		return ErrMissingSRTPort
 	}
 
 	if p.SRTStreamID == "" {
-		return errors.New("SRTStreamID must not be empty")
+		return ErrMissingSRTStreamID
 	}
 
 	return nil
@@ -53,3 +52,18 @@ type Message struct {
 	Type    MessageType
 	Message string
 }
+
+type Config struct {
+	HTTPPort int32  `required:"true" default:"8080"`
+	HTTPHost string `required:"true" default:"0.0.0.0"`
+
+	TCPICEPort         int      `required:"true" default:"8081"`
+	UDPICEPort         int      `required:"true" default:"8081"`
+	ICEReadBufferSize  int      `required:"true" default:"8"`
+	ICEExternalIPsDNAT []string `required:"true" default:"127.0.0.1"`
+	EnableICEMux       bool     `require:"true" default:"false"`
+	StunServers        []string `required:"true" default:"stun:stun4.l.google.com:19302"`
+
+	SRTConnectionLatencyMS int32 `required:"true" default:"300"`
+	SRTReadBufferSizeBytes int   `required:"true" default:"1316"`
+}
diff --git a/internal/entity/errors.go b/internal/entity/errors.go
new file mode 100644
index 0000000..f9577a3
--- /dev/null
+++ b/internal/entity/errors.go
@@ -0,0 +1,10 @@
+package entity
+
+import "errors"
+
+var ErrHTTPGetOnly = errors.New("you must use http GET verb")
+var ErrHTTPPostOnly = errors.New("you must use http POST verb")
+var ErrMissingParamsOffer = errors.New("ParamsOffer must not be nil")
+var ErrMissingSRTHost = errors.New("SRTHost must not be nil")
+var ErrMissingSRTPort = errors.New("SRTPort must be valid")
+var ErrMissingSRTStreamID = errors.New("SRTStreamID must not be empty")
diff --git a/internal/web/handlers.go b/internal/web/handlers.go
deleted file mode 100644
index 813278a..0000000
--- a/internal/web/handlers.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package handlers
-
-import "net/http"
-
-func MediaInfo(w http.ResponseWriter, r *http.Request) {
-
-}
diff --git a/internal/web/http.go b/internal/web/http.go
new file mode 100644
index 0000000..f4bcbc7
--- /dev/null
+++ b/internal/web/http.go
@@ -0,0 +1,41 @@
+package handlers
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+
+	"github.com/flavioribeiro/donut/internal/entity"
+	"go.uber.org/fx"
+	"go.uber.org/zap"
+)
+
+func NewHTTPServer(
+	c *entity.Config,
+	mux *http.ServeMux,
+	log *zap.Logger,
+	lc fx.Lifecycle,
+) *http.Server {
+	srv := &http.Server{
+		Addr:    fmt.Sprintf("%s:%d", c.HTTPHost, c.HTTPPort),
+		Handler: mux,
+	}
+	lc.Append(fx.Hook{
+		OnStart: func(ctx context.Context) error {
+			ln, err := net.Listen("tcp", srv.Addr)
+			if err != nil {
+				return err
+			}
+			log.Sugar().Infow(fmt.Sprintf("Starting HTTP server. Open http://%s to access the demo", srv.Addr),
+				"addr", srv.Addr,
+			)
+			go srv.Serve(ln)
+			return nil
+		},
+		OnStop: func(ctx context.Context) error {
+			return srv.Shutdown(ctx)
+		},
+	})
+	return srv
+}
diff --git a/internal/web/ice.go b/internal/web/ice.go
new file mode 100644
index 0000000..6b918ea
--- /dev/null
+++ b/internal/web/ice.go
@@ -0,0 +1,50 @@
+package handlers
+
+import (
+	"net"
+
+	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/pion/webrtc/v3"
+)
+
+func NewTCPICEServer(c *entity.Config) (*net.TCPListener, error) {
+	tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
+		IP:   net.IP{0, 0, 0, 0},
+		Port: c.TCPICEPort,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return tcpListener, nil
+}
+
+func NewUDPICEServer(c *entity.Config) (*net.UDPConn, error) {
+
+	udpListener, err := net.ListenUDP("udp", &net.UDPAddr{
+		IP:   net.IP{0, 0, 0, 0},
+		Port: c.UDPICEPort,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return udpListener, nil
+}
+
+func NewWebRTCSettingsEngine(c *entity.Config, tcpListener *net.TCPListener, udpListener *net.UDPConn) *webrtc.SettingEngine {
+	settingEngine := &webrtc.SettingEngine{}
+
+	settingEngine.SetNAT1To1IPs(c.ICEExternalIPsDNAT, webrtc.ICECandidateTypeHost)
+	settingEngine.SetICETCPMux(webrtc.NewICETCPMux(nil, tcpListener, c.ICEReadBufferSize))
+	settingEngine.SetICEUDPMux(webrtc.NewICEUDPMux(nil, udpListener))
+
+	return settingEngine
+}
+
+func NewWebRTCMediaEngine() (*webrtc.MediaEngine, error) {
+	mediaEngine := &webrtc.MediaEngine{}
+	if err := mediaEngine.RegisterDefaultCodecs(); err != nil {
+		return nil, err
+	}
+	return mediaEngine, nil
+}
diff --git a/internal/web/index.go b/internal/web/index.go
new file mode 100644
index 0000000..1c828e0
--- /dev/null
+++ b/internal/web/index.go
@@ -0,0 +1,20 @@
+package handlers
+
+import (
+	_ "embed"
+	"net/http"
+)
+
+//go:embed index.html
+var indexHTML string
+
+type IndexHandler struct{}
+
+func NewIndexHandler() *IndexHandler {
+	return &IndexHandler{}
+}
+
+func (h *IndexHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	w.WriteHeader(http.StatusOK)
+	w.Write([]byte(indexHTML))
+}
diff --git a/index.html b/internal/web/index.html
similarity index 100%
rename from index.html
rename to internal/web/index.html
diff --git a/internal/web/media.go b/internal/web/media.go
new file mode 100644
index 0000000..b9b972d
--- /dev/null
+++ b/internal/web/media.go
@@ -0,0 +1,49 @@
+package handlers
+
+import (
+	"encoding/json"
+	"log"
+	"net/http"
+
+	astisrt "github.com/asticode/go-astisrt/pkg"
+	"github.com/flavioribeiro/donut/internal/entity"
+)
+
+type MediaHandler struct{}
+
+func NewMediaHandler() *MediaHandler {
+	return &MediaHandler{}
+}
+
+func (m *MediaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	SetCORS(w, r)
+	if r.Method != http.MethodGet {
+		ErrorToHTTP(w, entity.ErrHTTPGetOnly)
+		return
+	}
+
+	offer := entity.ParamsOffer{}
+	if err := json.NewDecoder(r.Body).Decode(&offer); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+
+	log.Println("Connecting to SRT ", offer)
+	_, err := astisrt.Dial(astisrt.DialOptions{
+		ConnectionOptions: []astisrt.ConnectionOption{
+			astisrt.WithLatency(300),
+			astisrt.WithStreamid(offer.SRTStreamID),
+		},
+
+		// Callback when the connection is disconnected
+		OnDisconnect: func(c *astisrt.Connection, err error) { log.Fatal("Disconnected from SRT") },
+
+		Host: offer.SRTHost,
+		Port: offer.SRTPort,
+	})
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+	log.Println("Connected to SRT")
+}
diff --git a/internal/web/router.go b/internal/web/router.go
new file mode 100644
index 0000000..32e7fa2
--- /dev/null
+++ b/internal/web/router.go
@@ -0,0 +1,16 @@
+package handlers
+
+import "net/http"
+
+func NewServeMux(
+	index *IndexHandler,
+	signaling *SignalingHandler,
+) *http.ServeMux {
+
+	mux := http.NewServeMux()
+
+	mux.Handle("/", index)
+	mux.Handle("/doSignaling", signaling)
+
+	return mux
+}
diff --git a/internal/web/signaling.go b/internal/web/signaling.go
new file mode 100644
index 0000000..4455ea0
--- /dev/null
+++ b/internal/web/signaling.go
@@ -0,0 +1,233 @@
+package handlers
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"net/http"
+	"time"
+
+	astisrt "github.com/asticode/go-astisrt/pkg"
+	"github.com/asticode/go-astits"
+	"github.com/flavioribeiro/donut/eia608"
+	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/pion/webrtc/v3"
+	"github.com/pion/webrtc/v3/pkg/media"
+	"go.uber.org/zap"
+)
+
+type SignalingHandler struct {
+	c             *entity.Config
+	l             *zap.Logger
+	webrtcSetting *webrtc.SettingEngine
+	mediaEngine   *webrtc.MediaEngine
+}
+
+func NewSignalingHandler(c *entity.Config, log *zap.Logger, webrtcSetting *webrtc.SettingEngine, mediaEngine *webrtc.MediaEngine) *SignalingHandler {
+	return &SignalingHandler{
+		c:             c,
+		l:             log,
+		webrtcSetting: webrtcSetting,
+		mediaEngine:   mediaEngine,
+	}
+}
+
+func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+	SetCORS(w, r)
+	if r.Method != http.MethodPost {
+		ErrorToHTTP(w, entity.ErrHTTPPostOnly)
+		return
+	}
+
+	peerConnectionConfiguration := webrtc.Configuration{}
+	if !h.c.EnableICEMux {
+		peerConnectionConfiguration.ICEServers = []webrtc.ICEServer{
+			{
+				URLs: h.c.StunServers,
+			},
+		}
+	}
+
+	api := webrtc.NewAPI(
+		webrtc.WithSettingEngine(*h.webrtcSetting),
+		webrtc.WithMediaEngine(h.mediaEngine),
+	)
+
+	peerConnection, err := api.NewPeerConnection(peerConnectionConfiguration)
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+
+	offer := entity.ParamsOffer{}
+	if err := json.NewDecoder(r.Body).Decode(&offer); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+
+	// Create a video track
+	videoTrack, err := webrtc.NewTrackLocalStaticSample(
+		webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeH264},
+		"video", offer.SRTStreamID,
+	)
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+	if _, err := peerConnection.AddTrack(videoTrack); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+
+	// Create data channel for metadata transmission
+	metadataSender, err := peerConnection.CreateDataChannel("metadata", nil)
+	if err != nil {
+		ErrorToHTTP(w, err)
+	}
+
+	// Set the handler for ICE connection state
+	// This will notify you when the peer has connected/disconnected
+	peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
+		h.l.Sugar().Infow("ICE Connection State has changed",
+			"status", connectionState.String(),
+		)
+	})
+
+	err = offer.Valid()
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+	if err = peerConnection.SetRemoteDescription(offer.Offer); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+
+	h.l.Sugar().Infow("Gathering WebRTC Candidates")
+	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
+	answer, err := peerConnection.CreateAnswer(nil)
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	} else if err = peerConnection.SetLocalDescription(answer); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+	<-gatherComplete
+
+	h.l.Sugar().Infow("Gathering WebRTC Candidates Complete")
+
+	response, err := json.Marshal(*peerConnection.LocalDescription())
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+
+	h.l.Sugar().Infow("Connecting to SRT ",
+		"offer", offer,
+	)
+	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
+		ConnectionOptions: []astisrt.ConnectionOption{
+			astisrt.WithLatency(h.c.SRTConnectionLatencyMS),
+			astisrt.WithStreamid(offer.SRTStreamID),
+		},
+
+		OnDisconnect: func(c *astisrt.Connection, err error) {
+			h.l.Sugar().Fatalw("Disconnected from SRT",
+				"error", err,
+			)
+		},
+
+		Host: offer.SRTHost,
+		Port: offer.SRTPort,
+	})
+	if err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+	h.l.Sugar().Infow("Connected to SRT")
+
+	go srtToWebRTC(srtConnection, videoTrack, metadataSender)
+
+	w.Header().Set("Content-Type", "application/json")
+	if _, err := w.Write(response); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
+}
+
+func srtToWebRTC(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
+	r, w := io.Pipe()
+	defer r.Close()
+	defer w.Close()
+	defer srtConnection.Close()
+
+	go func() {
+		defer srtConnection.Close()
+		inboundMpegTsPacket := make([]byte, 1316) // SRT Read Size
+
+		for {
+			n, err := srtConnection.Read(inboundMpegTsPacket)
+			if err != nil {
+				break
+			}
+
+			if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
+				break
+			}
+		}
+	}()
+
+	dmx := astits.NewDemuxer(context.Background(), r)
+	eia608Reader := eia608.NewEIA608Reader()
+	h264PID := uint16(0)
+	for {
+		d, err := dmx.NextData()
+		if err != nil {
+			break
+		}
+
+		if d.PMT != nil {
+			for _, es := range d.PMT.ElementaryStreams {
+				msg, _ := json.Marshal(entity.Message{
+					Type:    entity.MessageTypeMetadata,
+					Message: es.StreamType.String(),
+				})
+				metadataTrack.SendText(string(msg))
+				if es.StreamType == astits.StreamTypeH264Video {
+					h264PID = es.ElementaryPID
+				}
+			}
+
+			for _, d := range d.PMT.ProgramDescriptors {
+				if d.MaximumBitrate != nil {
+					bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
+					msg, _ := json.Marshal(entity.Message{
+						Type:    entity.MessageTypeMetadata,
+						Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
+					})
+					metadataTrack.SendText(string(msg))
+				}
+			}
+		}
+
+		if d.PID == h264PID && d.PES != nil {
+			if err = videoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
+				break
+			}
+			captions, err := eia608Reader.Parse(d.PES)
+			if err != nil {
+				break
+			}
+			if captions != "" {
+				captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
+				if err != nil {
+					break
+				}
+				metadataTrack.SendText(captionsMsg)
+			}
+		}
+	}
+
+}
diff --git a/helpers.go b/internal/web/util.go
similarity index 68%
rename from helpers.go
rename to internal/web/util.go
index 70cb16b..2c767be 100644
--- a/helpers.go
+++ b/internal/web/util.go
@@ -1,15 +1,12 @@
-package main
+package handlers
 
-import (
-	"net/http"
-)
+import "net/http"
 
-func errorToHTTP(w http.ResponseWriter, err error) {
-	w.WriteHeader(500)
-	w.Write([]byte(err.Error()))
+func ErrorToHTTP(w http.ResponseWriter, err error) {
+	http.Error(w, err.Error(), http.StatusInternalServerError)
 }
 
-func setCors(w http.ResponseWriter, r *http.Request) {
+func SetCORS(w http.ResponseWriter, r *http.Request) {
 	if origin := r.Header.Get("Origin"); origin != "" {
 		allowedHeaders := "Accept, Content-Type, Content-Length, Accept-Encoding, Authorization,X-CSRF-Token"
 		w.Header().Set("Access-Control-Allow-Origin", "*")
diff --git a/main.go b/main.go
index 689793f..4821abe 100644
--- a/main.go
+++ b/main.go
@@ -4,259 +4,49 @@
 package main
 
 import (
-	"context"
-	_ "embed"
-	"encoding/json"
 	"flag"
-	"fmt"
-	"io"
 	"log"
-	"net"
 	"net/http"
-	"time"
 
-	"github.com/flavioribeiro/donut/eia608"
 	"github.com/flavioribeiro/donut/internal/entity"
+	handlers "github.com/flavioribeiro/donut/internal/web"
 
-	astisrt "github.com/asticode/go-astisrt/pkg"
-	"github.com/asticode/go-astits"
-	"github.com/pion/webrtc/v3"
-	"github.com/pion/webrtc/v3/pkg/media"
+	"github.com/kelseyhightower/envconfig"
+	"go.uber.org/fx"
+	"go.uber.org/zap"
 )
 
-var (
-	//go:embed index.html
-	indexHTML string
-
-	api *webrtc.API //nolint
-
-	enableICEMux = false
-)
-
-func srtToWebRTC(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
-	r, w := io.Pipe()
-	defer r.Close()
-	defer w.Close()
-	defer srtConnection.Close()
-
-	go func() {
-		defer srtConnection.Close()
-		inboundMpegTsPacket := make([]byte, 1316) // SRT Read Size
-
-		for {
-			n, err := srtConnection.Read(inboundMpegTsPacket)
-			if err != nil {
-				break
-			}
-
-			if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
-				break
-			}
-		}
-	}()
-
-	dmx := astits.NewDemuxer(context.Background(), r)
-	eia608Reader := eia608.NewEIA608Reader()
-	h264PID := uint16(0)
-	for {
-		d, err := dmx.NextData()
-		if err != nil {
-			break
-		}
-
-		if d.PMT != nil {
-			for _, es := range d.PMT.ElementaryStreams {
-				msg, _ := json.Marshal(entity.Message{
-					Type:    entity.MessageTypeMetadata,
-					Message: es.StreamType.String(),
-				})
-				metadataTrack.SendText(string(msg))
-				if es.StreamType == astits.StreamTypeH264Video {
-					h264PID = es.ElementaryPID
-				}
-			}
-
-			for _, d := range d.PMT.ProgramDescriptors {
-				if d.MaximumBitrate != nil {
-					bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
-					msg, _ := json.Marshal(entity.Message{
-						Type:    entity.MessageTypeMetadata,
-						Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
-					})
-					metadataTrack.SendText(string(msg))
-				}
-			}
-		}
-
-		if d.PID == h264PID && d.PES != nil {
-			if err = videoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
-				break
-			}
-			captions, err := eia608Reader.Parse(d.PES)
-			if err != nil {
-				break
-			}
-			if captions != "" {
-				captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
-				if err != nil {
-					break
-				}
-				metadataTrack.SendText(captionsMsg)
-			}
-		}
-	}
-
-}
-
-func doSignaling(w http.ResponseWriter, r *http.Request) {
-	setCors(w, r)
-	if r.Method != http.MethodPost {
-		return
-	}
-
-	peerConnectionConfiguration := webrtc.Configuration{}
-	if !enableICEMux {
-		peerConnectionConfiguration.ICEServers = []webrtc.ICEServer{
-			{
-				URLs: []string{
-					"stun:stun4.l.google.com:19302",
-				},
-			},
-		}
-	}
-
-	peerConnection, err := api.NewPeerConnection(peerConnectionConfiguration)
-	if err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-
-	offer := entity.ParamsOffer{}
-
-	if err = json.NewDecoder(r.Body).Decode(&offer); err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-
-	// Create a video track
-	videoTrack, err := webrtc.NewTrackLocalStaticSample(webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeH264}, "video", offer.SRTStreamID)
-	if err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-	if _, err := peerConnection.AddTrack(videoTrack); err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-
-	// Create data channel for metadata transmission
-	metadataSender, err := peerConnection.CreateDataChannel("metadata", nil)
-	if err != nil {
-		errorToHTTP(w, err)
-	}
-
-	// Set the handler for ICE connection state
-	// This will notify you when the peer has connected/disconnected
-	peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
-		log.Printf("ICE Connection State has changed: %s\n", connectionState.String())
-	})
-
-	err = offer.Valid()
-	if err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-
-	if err = peerConnection.SetRemoteDescription(offer.Offer); err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-
-	log.Println("Gathering WebRTC Candidates")
-	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
-	answer, err := peerConnection.CreateAnswer(nil)
-	if err != nil {
-		errorToHTTP(w, err)
-		return
-	} else if err = peerConnection.SetLocalDescription(answer); err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-	<-gatherComplete
-	log.Println("Gathering WebRTC Candidates Complete")
-
-	response, err := json.Marshal(*peerConnection.LocalDescription())
-	if err != nil {
-		return
-	}
-
-	log.Println("Connecting to SRT ", offer)
-	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
-		ConnectionOptions: []astisrt.ConnectionOption{
-			astisrt.WithLatency(300),
-			astisrt.WithStreamid(offer.SRTStreamID),
-		},
-
-		// Callback when the connection is disconnected
-		OnDisconnect: func(c *astisrt.Connection, err error) { log.Fatal("Disconnected from SRT") },
-
-		Host: offer.SRTHost,
-		Port: offer.SRTPort,
-	})
-	if err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-	log.Println("Connected to SRT")
-
-	go srtToWebRTC(srtConnection, videoTrack, metadataSender)
-
-	w.Header().Set("Content-Type", "application/json")
-	if _, err := w.Write(response); err != nil {
-		errorToHTTP(w, err)
-		return
-	}
-}
-
 func main() {
+	enableICEMux := false
 	flag.BoolVar(&enableICEMux, "enable-ice-mux", false, "Enable ICE Mux on :8081")
 	flag.Parse()
 
-	mediaEngine := &webrtc.MediaEngine{}
-	settingEngine := webrtc.SettingEngine{}
-	if err := mediaEngine.RegisterDefaultCodecs(); err != nil {
-		log.Fatal(err)
+	var c entity.Config
+	err := envconfig.Process("donut", &c)
+	if err != nil {
+		log.Fatal(err.Error())
 	}
+	c.EnableICEMux = enableICEMux
 
-	if enableICEMux {
-		tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
-			IP:   net.IP{0, 0, 0, 0},
-			Port: 8081,
-		})
-		if err != nil {
-			log.Fatal(err)
-		}
+	fx.New(
+		fx.Provide(func() *entity.Config {
+			return &c
+		}),
+		fx.Provide(handlers.NewHTTPServer),
 
-		udpListener, err := net.ListenUDP("udp", &net.UDPAddr{
-			IP:   net.IP{0, 0, 0, 0},
-			Port: 8081,
-		})
-		if err != nil {
-			log.Fatal(err)
-		}
+		fx.Provide(handlers.NewSignalingHandler),
+		fx.Provide(handlers.NewIndexHandler),
 
-		settingEngine.SetNAT1To1IPs([]string{"127.0.0.1"}, webrtc.ICECandidateTypeHost)
-		settingEngine.SetICETCPMux(webrtc.NewICETCPMux(nil, tcpListener, 8))
-		settingEngine.SetICEUDPMux(webrtc.NewICEUDPMux(nil, udpListener))
-	}
-	api = webrtc.NewAPI(webrtc.WithSettingEngine(settingEngine), webrtc.WithMediaEngine(mediaEngine))
+		fx.Provide(handlers.NewServeMux),
 
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(200)
-		w.Write([]byte(indexHTML))
-	})
-	http.HandleFunc("/doSignaling", doSignaling)
+		fx.Provide(handlers.NewTCPICEServer),
+		fx.Provide(handlers.NewUDPICEServer),
+		fx.Provide(handlers.NewWebRTCSettingsEngine),
+		fx.Provide(handlers.NewWebRTCMediaEngine),
 
-	log.Println("Open http://localhost:8080 to access this demo")
-	log.Fatal(http.ListenAndServe(":8080", nil))
+		fx.Provide(zap.NewProduction),
+
+		// just to enforce the lifecycle by using NewHTTPServer
+		fx.Invoke(func(*http.Server) {}),
+	).Run()
 }

From f853ff3ab86d08183d4f185ae8b9b2801b6711cb Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Fri, 26 Jan 2024 19:34:04 -0300
Subject: [PATCH 13/39] add comments

---
 internal/web/http.go               | 14 ++++++++++++++
 internal/web/util.go               | 17 -----------------
 internal/web/{ice.go => webrtc.go} |  0
 main.go                            | 15 +++++++++++----
 4 files changed, 25 insertions(+), 21 deletions(-)
 delete mode 100644 internal/web/util.go
 rename internal/web/{ice.go => webrtc.go} (100%)

diff --git a/internal/web/http.go b/internal/web/http.go
index f4bcbc7..ca3c3d8 100644
--- a/internal/web/http.go
+++ b/internal/web/http.go
@@ -39,3 +39,17 @@ func NewHTTPServer(
 	})
 	return srv
 }
+
+func ErrorToHTTP(w http.ResponseWriter, err error) {
+	http.Error(w, err.Error(), http.StatusInternalServerError)
+}
+
+func SetCORS(w http.ResponseWriter, r *http.Request) {
+	if origin := r.Header.Get("Origin"); origin != "" {
+		allowedHeaders := "Accept, Content-Type, Content-Length, Accept-Encoding, Authorization,X-CSRF-Token"
+		w.Header().Set("Access-Control-Allow-Origin", "*")
+		w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
+		w.Header().Set("Access-Control-Allow-Headers", allowedHeaders)
+		w.Header().Set("Access-Control-Expose-Headers", "Authorization")
+	}
+}
diff --git a/internal/web/util.go b/internal/web/util.go
deleted file mode 100644
index 2c767be..0000000
--- a/internal/web/util.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package handlers
-
-import "net/http"
-
-func ErrorToHTTP(w http.ResponseWriter, err error) {
-	http.Error(w, err.Error(), http.StatusInternalServerError)
-}
-
-func SetCORS(w http.ResponseWriter, r *http.Request) {
-	if origin := r.Header.Get("Origin"); origin != "" {
-		allowedHeaders := "Accept, Content-Type, Content-Length, Accept-Encoding, Authorization,X-CSRF-Token"
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-		w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
-		w.Header().Set("Access-Control-Allow-Headers", allowedHeaders)
-		w.Header().Set("Access-Control-Expose-Headers", "Authorization")
-	}
-}
diff --git a/internal/web/ice.go b/internal/web/webrtc.go
similarity index 100%
rename from internal/web/ice.go
rename to internal/web/webrtc.go
diff --git a/main.go b/main.go
index 4821abe..1d64101 100644
--- a/main.go
+++ b/main.go
@@ -29,24 +29,31 @@ func main() {
 	c.EnableICEMux = enableICEMux
 
 	fx.New(
-		fx.Provide(func() *entity.Config {
-			return &c
-		}),
+		// Server entry point
 		fx.Provide(handlers.NewHTTPServer),
 
+		// HTTP handlers
 		fx.Provide(handlers.NewSignalingHandler),
 		fx.Provide(handlers.NewIndexHandler),
 
+		// HTTP router
 		fx.Provide(handlers.NewServeMux),
 
+		// ICE mux servers
 		fx.Provide(handlers.NewTCPICEServer),
 		fx.Provide(handlers.NewUDPICEServer),
+
+		// WebRTC components
 		fx.Provide(handlers.NewWebRTCSettingsEngine),
 		fx.Provide(handlers.NewWebRTCMediaEngine),
 
+		// Logging, Config
 		fx.Provide(zap.NewProduction),
+		fx.Provide(func() *entity.Config {
+			return &c
+		}),
 
-		// just to enforce the lifecycle by using NewHTTPServer
+		// Forcing the lifecycle initiation with NewHTTPServer
 		fx.Invoke(func(*http.Server) {}),
 	).Run()
 }

From 4a171db512be7f3dfa5bf15911e1431a3a1652c6 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 00:03:18 -0300
Subject: [PATCH 14/39] start moving webrtc behavior to its controller

---
 internal/controller/webrtc/controller.go | 175 +++++++++++++++++++++++
 internal/entity/entitities.go            |  14 ++
 internal/entity/errors.go                |   1 +
 internal/mapper/mapper.go                |  16 +++
 internal/web/signaling.go                | 100 +++++--------
 internal/web/webrtc.go                   |  50 -------
 main.go                                  |  10 +-
 7 files changed, 245 insertions(+), 121 deletions(-)
 create mode 100644 internal/controller/webrtc/controller.go
 create mode 100644 internal/mapper/mapper.go
 delete mode 100644 internal/web/webrtc.go

diff --git a/internal/controller/webrtc/controller.go b/internal/controller/webrtc/controller.go
new file mode 100644
index 0000000..bcffd0a
--- /dev/null
+++ b/internal/controller/webrtc/controller.go
@@ -0,0 +1,175 @@
+package webrtc
+
+import (
+	"net"
+
+	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/mapper"
+	"github.com/pion/webrtc/v3"
+	"go.uber.org/zap"
+)
+
+type WebRTCController struct {
+	c      *entity.Config
+	l      *zap.Logger
+	iceTcp net.Listener
+	iceUdp net.PacketConn
+	peer   *webrtc.PeerConnection
+}
+
+func NewWebRTCController(
+	c *entity.Config,
+	l *zap.Logger,
+	iceTcp net.Listener,
+	iceUdp net.PacketConn,
+) *WebRTCController {
+	return &WebRTCController{
+		c:      c,
+		l:      l,
+		iceTcp: iceTcp,
+		iceUdp: iceUdp,
+	}
+}
+
+func (c *WebRTCController) SetupPeerConnection() error {
+	if c.peer != nil {
+		return nil
+	}
+
+	peerConnectionConfiguration := webrtc.Configuration{}
+	if !c.c.EnableICEMux {
+		peerConnectionConfiguration.ICEServers = []webrtc.ICEServer{
+			{
+				URLs: c.c.StunServers,
+			},
+		}
+	}
+
+	mediaEngine, err := NewWebRTCMediaEngine()
+	if err != nil {
+		return err
+	}
+
+	api := webrtc.NewAPI(
+		webrtc.WithSettingEngine(NewWebRTCSettingsEngine(
+			c.c,
+			c.iceTcp,
+			c.iceUdp,
+		)),
+		webrtc.WithMediaEngine(mediaEngine),
+	)
+
+	peerConnection, err := api.NewPeerConnection(peerConnectionConfiguration)
+	if err != nil {
+		return err
+	}
+
+	peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
+		c.l.Sugar().Infow("OnICEConnectionStateChange",
+			"status", connectionState.String(),
+		)
+	})
+	c.peer = peerConnection
+	return nil
+}
+
+func (c *WebRTCController) CreateTrack(track entity.Track, id string, streamId string) (*webrtc.TrackLocalStaticSample, error) {
+	codecCapability := mapper.FromTrackToRTPCodecCapability(track)
+	webRTCtrack, err := webrtc.NewTrackLocalStaticSample(codecCapability, id, streamId)
+	if err != nil {
+		return nil, err
+	}
+
+	if _, err := c.peer.AddTrack(webRTCtrack); err != nil {
+		return nil, err
+	}
+	return webRTCtrack, nil
+}
+
+func (c *WebRTCController) CreateDataChannel(channelID string) (*webrtc.DataChannel, error) {
+	if c.peer == nil {
+		// TODO: or call SetupPeerConnection?
+		return nil, entity.ErrMissingWebRTCSetup
+	}
+
+	metadataSender, err := c.peer.CreateDataChannel(channelID, nil)
+	if err != nil {
+		return nil, err
+	}
+	return metadataSender, nil
+}
+
+func (c *WebRTCController) SetRemoteDescription(desc webrtc.SessionDescription) error {
+	if c.peer == nil {
+		// TODO: or call SetupPeerConnection?
+		return entity.ErrMissingWebRTCSetup
+	}
+
+	err := c.peer.SetRemoteDescription(desc)
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+func (c *WebRTCController) GatheringWebRTC() (*webrtc.SessionDescription, error) {
+	if c.peer == nil {
+		// TODO: or call SetupPeerConnection?
+		return nil, entity.ErrMissingWebRTCSetup
+	}
+
+	c.l.Sugar().Infow("Gathering WebRTC Candidates")
+	gatherComplete := webrtc.GatheringCompletePromise(c.peer)
+	answer, err := c.peer.CreateAnswer(nil)
+	if err != nil {
+		return nil, err
+	} else if err = c.peer.SetLocalDescription(answer); err != nil {
+		return nil, err
+	}
+	<-gatherComplete
+
+	c.l.Sugar().Infow("Gathering WebRTC Candidates Complete")
+	return c.peer.LocalDescription(), nil
+}
+
+func NewWebRTCSettingsEngine(c *entity.Config, tcpListener net.Listener, udpListener net.PacketConn) webrtc.SettingEngine {
+	settingEngine := webrtc.SettingEngine{}
+
+	settingEngine.SetNAT1To1IPs(c.ICEExternalIPsDNAT, webrtc.ICECandidateTypeHost)
+	settingEngine.SetICETCPMux(webrtc.NewICETCPMux(nil, tcpListener, c.ICEReadBufferSize))
+	settingEngine.SetICEUDPMux(webrtc.NewICEUDPMux(nil, udpListener))
+
+	return settingEngine
+}
+
+func NewWebRTCMediaEngine() (*webrtc.MediaEngine, error) {
+	mediaEngine := &webrtc.MediaEngine{}
+	if err := mediaEngine.RegisterDefaultCodecs(); err != nil {
+		return nil, err
+	}
+	return mediaEngine, nil
+}
+
+func NewTCPICEServer(c *entity.Config) (net.Listener, error) {
+	tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
+		IP:   net.IP{0, 0, 0, 0},
+		Port: c.TCPICEPort,
+	})
+	if err != nil {
+		return nil, err
+	}
+	return tcpListener, nil
+}
+
+func NewUDPICEServer(c *entity.Config) (net.PacketConn, error) {
+
+	udpListener, err := net.ListenUDP("udp", &net.UDPAddr{
+		IP:   net.IP{0, 0, 0, 0},
+		Port: c.UDPICEPort,
+	})
+	if err != nil {
+		return nil, err
+	}
+
+	return udpListener, nil
+}
diff --git a/internal/entity/entitities.go b/internal/entity/entitities.go
index d37be65..aa3bc41 100644
--- a/internal/entity/entitities.go
+++ b/internal/entity/entitities.go
@@ -6,6 +6,10 @@ import (
 	"github.com/pion/webrtc/v3"
 )
 
+const (
+	MetadataChannelID string = "metadata"
+)
+
 type Media struct{}
 
 type ParamsOffer struct {
@@ -53,6 +57,16 @@ type Message struct {
 	Message string
 }
 
+type TrackType string
+
+const (
+	H264 TrackType = "h264"
+)
+
+type Track struct {
+	Type TrackType
+}
+
 type Config struct {
 	HTTPPort int32  `required:"true" default:"8080"`
 	HTTPHost string `required:"true" default:"0.0.0.0"`
diff --git a/internal/entity/errors.go b/internal/entity/errors.go
index f9577a3..000faec 100644
--- a/internal/entity/errors.go
+++ b/internal/entity/errors.go
@@ -8,3 +8,4 @@ var ErrMissingParamsOffer = errors.New("ParamsOffer must not be nil")
 var ErrMissingSRTHost = errors.New("SRTHost must not be nil")
 var ErrMissingSRTPort = errors.New("SRTPort must be valid")
 var ErrMissingSRTStreamID = errors.New("SRTStreamID must not be empty")
+var ErrMissingWebRTCSetup = errors.New("WebRTCController.SetupPeerConnection must be called first")
diff --git a/internal/mapper/mapper.go b/internal/mapper/mapper.go
new file mode 100644
index 0000000..6009478
--- /dev/null
+++ b/internal/mapper/mapper.go
@@ -0,0 +1,16 @@
+package mapper
+
+import (
+	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/pion/webrtc/v3"
+)
+
+func FromTrackToRTPCodecCapability(track entity.Track) webrtc.RTPCodecCapability {
+	response := webrtc.RTPCodecCapability{}
+
+	if track.Type == entity.H264 {
+		response.MimeType = webrtc.MimeTypeH264
+	}
+
+	return response
+}
diff --git a/internal/web/signaling.go b/internal/web/signaling.go
index 4455ea0..b3059ca 100644
--- a/internal/web/signaling.go
+++ b/internal/web/signaling.go
@@ -11,6 +11,7 @@ import (
 	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/asticode/go-astits"
 	"github.com/flavioribeiro/donut/eia608"
+	donutwebrtc "github.com/flavioribeiro/donut/internal/controller/webrtc"
 	"github.com/flavioribeiro/donut/internal/entity"
 	"github.com/pion/webrtc/v3"
 	"github.com/pion/webrtc/v3/pkg/media"
@@ -18,18 +19,20 @@ import (
 )
 
 type SignalingHandler struct {
-	c             *entity.Config
-	l             *zap.Logger
-	webrtcSetting *webrtc.SettingEngine
-	mediaEngine   *webrtc.MediaEngine
+	c                *entity.Config
+	l                *zap.Logger
+	webRTCController *donutwebrtc.WebRTCController
 }
 
-func NewSignalingHandler(c *entity.Config, log *zap.Logger, webrtcSetting *webrtc.SettingEngine, mediaEngine *webrtc.MediaEngine) *SignalingHandler {
+func NewSignalingHandler(
+	c *entity.Config,
+	log *zap.Logger,
+	webRTCController *donutwebrtc.WebRTCController,
+) *SignalingHandler {
 	return &SignalingHandler{
-		c:             c,
-		l:             log,
-		webrtcSetting: webrtcSetting,
-		mediaEngine:   mediaEngine,
+		c:                c,
+		l:                log,
+		webRTCController: webRTCController,
 	}
 }
 
@@ -40,97 +43,62 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	peerConnectionConfiguration := webrtc.Configuration{}
-	if !h.c.EnableICEMux {
-		peerConnectionConfiguration.ICEServers = []webrtc.ICEServer{
-			{
-				URLs: h.c.StunServers,
-			},
-		}
+	browerOffer := entity.ParamsOffer{}
+	if err := json.NewDecoder(r.Body).Decode(&browerOffer); err != nil {
+		ErrorToHTTP(w, err)
+		return
 	}
-
-	api := webrtc.NewAPI(
-		webrtc.WithSettingEngine(*h.webrtcSetting),
-		webrtc.WithMediaEngine(h.mediaEngine),
-	)
-
-	peerConnection, err := api.NewPeerConnection(peerConnectionConfiguration)
-	if err != nil {
+	if err := browerOffer.Valid(); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
 
-	offer := entity.ParamsOffer{}
-	if err := json.NewDecoder(r.Body).Decode(&offer); err != nil {
+	if err := h.webRTCController.SetupPeerConnection(); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
 
+	// TODO: create tracks according with SRT available streams
 	// Create a video track
-	videoTrack, err := webrtc.NewTrackLocalStaticSample(
-		webrtc.RTPCodecCapability{MimeType: webrtc.MimeTypeH264},
-		"video", offer.SRTStreamID,
+	videoTrack, err := h.webRTCController.CreateTrack(
+		entity.Track{
+			Type: entity.H264,
+		}, "video", browerOffer.SRTStreamID,
 	)
 	if err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
-	if _, err := peerConnection.AddTrack(videoTrack); err != nil {
-		ErrorToHTTP(w, err)
-		return
-	}
 
-	// Create data channel for metadata transmission
-	metadataSender, err := peerConnection.CreateDataChannel("metadata", nil)
+	metadataSender, err := h.webRTCController.CreateDataChannel(entity.MetadataChannelID)
 	if err != nil {
 		ErrorToHTTP(w, err)
 	}
 
-	// Set the handler for ICE connection state
-	// This will notify you when the peer has connected/disconnected
-	peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
-		h.l.Sugar().Infow("ICE Connection State has changed",
-			"status", connectionState.String(),
-		)
-	})
+	if err = h.webRTCController.SetRemoteDescription(browerOffer.Offer); err != nil {
+		ErrorToHTTP(w, err)
+		return
+	}
 
-	err = offer.Valid()
+	localDescription, err := h.webRTCController.GatheringWebRTC()
 	if err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
-	if err = peerConnection.SetRemoteDescription(offer.Offer); err != nil {
-		ErrorToHTTP(w, err)
-		return
-	}
 
-	h.l.Sugar().Infow("Gathering WebRTC Candidates")
-	gatherComplete := webrtc.GatheringCompletePromise(peerConnection)
-	answer, err := peerConnection.CreateAnswer(nil)
-	if err != nil {
-		ErrorToHTTP(w, err)
-		return
-	} else if err = peerConnection.SetLocalDescription(answer); err != nil {
-		ErrorToHTTP(w, err)
-		return
-	}
-	<-gatherComplete
-
-	h.l.Sugar().Infow("Gathering WebRTC Candidates Complete")
-
-	response, err := json.Marshal(*peerConnection.LocalDescription())
+	response, err := json.Marshal(*localDescription)
 	if err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
 
 	h.l.Sugar().Infow("Connecting to SRT ",
-		"offer", offer,
+		"offer", browerOffer,
 	)
 	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(h.c.SRTConnectionLatencyMS),
-			astisrt.WithStreamid(offer.SRTStreamID),
+			astisrt.WithStreamid(browerOffer.SRTStreamID),
 		},
 
 		OnDisconnect: func(c *astisrt.Connection, err error) {
@@ -139,8 +107,8 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			)
 		},
 
-		Host: offer.SRTHost,
-		Port: offer.SRTPort,
+		Host: browerOffer.SRTHost,
+		Port: browerOffer.SRTPort,
 	})
 	if err != nil {
 		ErrorToHTTP(w, err)
diff --git a/internal/web/webrtc.go b/internal/web/webrtc.go
deleted file mode 100644
index 6b918ea..0000000
--- a/internal/web/webrtc.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package handlers
-
-import (
-	"net"
-
-	"github.com/flavioribeiro/donut/internal/entity"
-	"github.com/pion/webrtc/v3"
-)
-
-func NewTCPICEServer(c *entity.Config) (*net.TCPListener, error) {
-	tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
-		IP:   net.IP{0, 0, 0, 0},
-		Port: c.TCPICEPort,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return tcpListener, nil
-}
-
-func NewUDPICEServer(c *entity.Config) (*net.UDPConn, error) {
-
-	udpListener, err := net.ListenUDP("udp", &net.UDPAddr{
-		IP:   net.IP{0, 0, 0, 0},
-		Port: c.UDPICEPort,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return udpListener, nil
-}
-
-func NewWebRTCSettingsEngine(c *entity.Config, tcpListener *net.TCPListener, udpListener *net.UDPConn) *webrtc.SettingEngine {
-	settingEngine := &webrtc.SettingEngine{}
-
-	settingEngine.SetNAT1To1IPs(c.ICEExternalIPsDNAT, webrtc.ICECandidateTypeHost)
-	settingEngine.SetICETCPMux(webrtc.NewICETCPMux(nil, tcpListener, c.ICEReadBufferSize))
-	settingEngine.SetICEUDPMux(webrtc.NewICEUDPMux(nil, udpListener))
-
-	return settingEngine
-}
-
-func NewWebRTCMediaEngine() (*webrtc.MediaEngine, error) {
-	mediaEngine := &webrtc.MediaEngine{}
-	if err := mediaEngine.RegisterDefaultCodecs(); err != nil {
-		return nil, err
-	}
-	return mediaEngine, nil
-}
diff --git a/main.go b/main.go
index 1d64101..226ff0b 100644
--- a/main.go
+++ b/main.go
@@ -8,6 +8,7 @@ import (
 	"log"
 	"net/http"
 
+	donutwebrtc "github.com/flavioribeiro/donut/internal/controller/webrtc"
 	"github.com/flavioribeiro/donut/internal/entity"
 	handlers "github.com/flavioribeiro/donut/internal/web"
 
@@ -40,12 +41,11 @@ func main() {
 		fx.Provide(handlers.NewServeMux),
 
 		// ICE mux servers
-		fx.Provide(handlers.NewTCPICEServer),
-		fx.Provide(handlers.NewUDPICEServer),
+		fx.Provide(donutwebrtc.NewTCPICEServer),
+		fx.Provide(donutwebrtc.NewUDPICEServer),
 
-		// WebRTC components
-		fx.Provide(handlers.NewWebRTCSettingsEngine),
-		fx.Provide(handlers.NewWebRTCMediaEngine),
+		// WebRTC controller
+		fx.Provide(donutwebrtc.NewWebRTCController),
 
 		// Logging, Config
 		fx.Provide(zap.NewProduction),

From 4c14e355d43b113dca6daf5a382839444e761ccd Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 00:06:11 -0300
Subject: [PATCH 15/39] fix mispell mistake

---
 internal/web/signaling.go | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/internal/web/signaling.go b/internal/web/signaling.go
index b3059ca..bbd2413 100644
--- a/internal/web/signaling.go
+++ b/internal/web/signaling.go
@@ -43,12 +43,12 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	browerOffer := entity.ParamsOffer{}
-	if err := json.NewDecoder(r.Body).Decode(&browerOffer); err != nil {
+	browserOffer := entity.ParamsOffer{}
+	if err := json.NewDecoder(r.Body).Decode(&browserOffer); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
-	if err := browerOffer.Valid(); err != nil {
+	if err := browserOffer.Valid(); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
@@ -63,7 +63,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	videoTrack, err := h.webRTCController.CreateTrack(
 		entity.Track{
 			Type: entity.H264,
-		}, "video", browerOffer.SRTStreamID,
+		}, "video", browserOffer.SRTStreamID,
 	)
 	if err != nil {
 		ErrorToHTTP(w, err)
@@ -75,7 +75,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		ErrorToHTTP(w, err)
 	}
 
-	if err = h.webRTCController.SetRemoteDescription(browerOffer.Offer); err != nil {
+	if err = h.webRTCController.SetRemoteDescription(browserOffer.Offer); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
@@ -93,12 +93,12 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	h.l.Sugar().Infow("Connecting to SRT ",
-		"offer", browerOffer,
+		"offer", browserOffer,
 	)
 	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(h.c.SRTConnectionLatencyMS),
-			astisrt.WithStreamid(browerOffer.SRTStreamID),
+			astisrt.WithStreamid(browserOffer.SRTStreamID),
 		},
 
 		OnDisconnect: func(c *astisrt.Connection, err error) {
@@ -107,8 +107,8 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			)
 		},
 
-		Host: browerOffer.SRTHost,
-		Port: browerOffer.SRTPort,
+		Host: browserOffer.SRTHost,
+		Port: browserOffer.SRTPort,
 	})
 	if err != nil {
 		ErrorToHTTP(w, err)

From 16d8e602425d02f0284beca2574dc97567f934bb Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 09:26:51 -0300
Subject: [PATCH 16/39] introduces faq

---
 FAQ.md    | 39 +++++++++++++++++++++++++++++++++++++++
 README.md | 55 -------------------------------------------------------
 2 files changed, 39 insertions(+), 55 deletions(-)
 create mode 100644 FAQ.md

diff --git a/FAQ.md b/FAQ.md
new file mode 100644
index 0000000..6f9068a
--- /dev/null
+++ b/FAQ.md
@@ -0,0 +1,39 @@
+# FAQ
+
+## If you're facing issues while trying to run or compile it locally, such as:
+
+```
+mod/github.com/asticode/go-astisrt@v0.3.0/pkg/callbacks.go:4:11: fatal error: 'srt/srt.h' file not found
+ #include <srt/srt.h>
+          ^~~~~~~~~~~
+1 error generated.
+```
+
+```
+./main.go:117:2: undefined: setCors
+./main.go:135:3: undefined: errorToHTTP
+./main.go:147:3: undefined: errorToHTTP
+./main.go:154:3: undefined: errorToHTTP
+./main.go:158:3: undefined: errorToHTTP
+./main.go:165:3: undefined: errorToHTTP
+./main.go:174:18: undefined: assertSignalingCorrect
+```
+
+```
+/opt/homebrew/Cellar/go/1.21.6/libexec/pkg/tool/darwin_arm64/link: running cc failed: exit status 1
+ld: warning: ignoring duplicate libraries: '-lsrt'
+ld: library 'srt' not found
+clang: error: linker command failed with exit code 1 (use -v to see invocation)
+```
+
+You can try to use the [docker-compose](/README.md#run-using-docker-compose), but if you want to run it locally you must provide path to the linker.
+
+```bash
+# Find where the headers and libraries files are located at. If you can't find, install them with brew or apt-get.
+# Feel free to replace the path after the find to roo[/] or any other suspicious place.
+sudo find /opt/homebrew/ -name srt.h
+sudo find /opt/ -name libsrt.a # libsrt.so for linux
+
+# Add the required flags so the compiler/linker can find the needed files.
+CGO_LDFLAGS="-L/opt/homebrew/Cellar/srt/1.5.3/lib -lsrt" CGO_CFLAGS="-I/opt/homebrew//Cellar/srt/1.5.3/include/" go run main.go helpers.go
+```
diff --git a/README.md b/README.md
index 0d222e2..8a38615 100644
--- a/README.md
+++ b/README.md
@@ -38,58 +38,3 @@ $ make run
 Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in with the SRT listener configuration and hit connect.
 
 ![donut docker-compose setup](/.github/docker-compose-donut-setup.webp "donut docker-compose setup")
-
-
-### Troubleshooting locally
-
-#### Mac
-
-If you're facing issues while trying to run it locally, such as:
-
-```
-mod/github.com/asticode/go-astisrt@v0.3.0/pkg/callbacks.go:4:11: fatal error: 'srt/srt.h' file not found
- #include <srt/srt.h>
-          ^~~~~~~~~~~
-1 error generated.
-```
-
-```
-./main.go:117:2: undefined: setCors
-./main.go:135:3: undefined: errorToHTTP
-./main.go:147:3: undefined: errorToHTTP
-./main.go:154:3: undefined: errorToHTTP
-./main.go:158:3: undefined: errorToHTTP
-./main.go:165:3: undefined: errorToHTTP
-./main.go:174:18: undefined: assertSignalingCorrect
-```
-
-```
-/opt/homebrew/Cellar/go/1.21.6/libexec/pkg/tool/darwin_arm64/link: running cc failed: exit status 1
-ld: warning: ignoring duplicate libraries: '-lsrt'
-ld: library 'srt' not found
-clang: error: linker command failed with exit code 1 (use -v to see invocation)
-```
-
-You can try to use the [docker-compose](#run-using-docker-compose), but if you want to run it locally you might must provide path to the linker.
-
-```bash
-
-# Find where the headers and libraries files are located at. If you can't find, install them with brew.
-sudo find /opt/homebrew/ -name srt.h
-sudo find /opt/ -name libsrt.a
-
-# Add the required flags so the compiler/linker can find the needed files.
-CGO_LDFLAGS="-L/opt/homebrew/Cellar/srt/1.5.3/lib -lsrt" CGO_CFLAGS="-I/opt/homebrew//Cellar/srt/1.5.3/include/" go run main.go helpers.go
-
-```
-
-You can run ffmpeg locally to simulate an SRT live transmission:
-
-```bash
-ffmpeg -hide_banner -loglevel verbose \
-    -re -f lavfi -i "testsrc2=size=1280x720:rate=30,format=yuv420p" \
-    -f lavfi -i "sine=frequency=1000:sample_rate=44100" \
-    -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
-    -b:v 1400k -bufsize 2800k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
-    -c:a aac -b:a 128k -f mpegts 'srt://0.0.0.0:40052?mode=listener&latency=400000'
-```

From 7328251b5a04635c0cffce3ee9bf9d1fff67b9be Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 09:29:34 -0300
Subject: [PATCH 17/39] add a question for faq

---
 FAQ.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/FAQ.md b/FAQ.md
index 6f9068a..d9600a8 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,5 +1,9 @@
 # FAQ
 
+## It's not working on Firefox/Chrome/Edge.
+
+[WebRTC establishes a baseline set of codecs which all compliant browsers are required to support. Some browsers may choose to allow other codecs as well.](https://developer.mozilla.org/en-US/docs/Web/Media/Formats/WebRTC_codecs#supported_video_codecs)
+
 ## If you're facing issues while trying to run or compile it locally, such as:
 
 ```

From ea0adb49cda150b90e3b87a014b5063e7c73c396 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 09:38:47 -0300
Subject: [PATCH 18/39] link faq on main readme

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 8a38615..6f79d4b 100644
--- a/README.md
+++ b/README.md
@@ -38,3 +38,7 @@ $ make run
 Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in with the SRT listener configuration and hit connect.
 
 ![donut docker-compose setup](/.github/docker-compose-donut-setup.webp "donut docker-compose setup")
+
+### FAQ
+
+Please check the [FAQ](/FAQ.md) if you're facing any trouble.
\ No newline at end of file

From 7d83d66885a9ab69d5b0095272f53a0c197b2f55 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 09:48:57 -0300
Subject: [PATCH 19/39] rename request entity

---
 internal/controller/srt/controller.go |  4 ++--
 internal/entity/entitities.go         |  6 +++---
 internal/web/media.go                 |  2 +-
 internal/web/signaling.go             | 18 +++++++++---------
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/internal/controller/srt/controller.go b/internal/controller/srt/controller.go
index 90ed0bc..7169011 100644
--- a/internal/controller/srt/controller.go
+++ b/internal/controller/srt/controller.go
@@ -17,7 +17,7 @@ func NewSRTController(c *entity.Config) *SRTController {
 	}
 }
 
-func (c *SRTController) Connect(offer *entity.ParamsOffer) error {
+func (c *SRTController) Connect(offer *entity.RequestParams) error {
 	if err := offer.Valid(); err != nil {
 		return err
 	}
@@ -30,7 +30,7 @@ func (c *SRTController) Connect(offer *entity.ParamsOffer) error {
 	return nil
 }
 
-func (c *SRTController) srtConnect(offer *entity.ParamsOffer) (*astisrt.Connection, error) {
+func (c *SRTController) srtConnect(offer *entity.RequestParams) (*astisrt.Connection, error) {
 	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(c.c.SRTConnectionLatencyMS),
diff --git a/internal/entity/entitities.go b/internal/entity/entitities.go
index aa3bc41..1c4df96 100644
--- a/internal/entity/entitities.go
+++ b/internal/entity/entitities.go
@@ -12,14 +12,14 @@ const (
 
 type Media struct{}
 
-type ParamsOffer struct {
+type RequestParams struct {
 	SRTHost     string
 	SRTPort     uint16 `json:",string"`
 	SRTStreamID string
 	Offer       webrtc.SessionDescription
 }
 
-func (p *ParamsOffer) Valid() error {
+func (p *RequestParams) Valid() error {
 	if p == nil {
 		return ErrMissingParamsOffer
 	}
@@ -39,7 +39,7 @@ func (p *ParamsOffer) Valid() error {
 	return nil
 }
 
-func (p *ParamsOffer) String() string {
+func (p *RequestParams) String() string {
 	if p == nil {
 		return ""
 	}
diff --git a/internal/web/media.go b/internal/web/media.go
index b9b972d..1986a98 100644
--- a/internal/web/media.go
+++ b/internal/web/media.go
@@ -22,7 +22,7 @@ func (m *MediaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	offer := entity.ParamsOffer{}
+	offer := entity.RequestParams{}
 	if err := json.NewDecoder(r.Body).Decode(&offer); err != nil {
 		ErrorToHTTP(w, err)
 		return
diff --git a/internal/web/signaling.go b/internal/web/signaling.go
index bbd2413..98da58e 100644
--- a/internal/web/signaling.go
+++ b/internal/web/signaling.go
@@ -43,12 +43,12 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	browserOffer := entity.ParamsOffer{}
-	if err := json.NewDecoder(r.Body).Decode(&browserOffer); err != nil {
+	params := entity.RequestParams{}
+	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
-	if err := browserOffer.Valid(); err != nil {
+	if err := params.Valid(); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
@@ -63,7 +63,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	videoTrack, err := h.webRTCController.CreateTrack(
 		entity.Track{
 			Type: entity.H264,
-		}, "video", browserOffer.SRTStreamID,
+		}, "video", params.SRTStreamID,
 	)
 	if err != nil {
 		ErrorToHTTP(w, err)
@@ -75,7 +75,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		ErrorToHTTP(w, err)
 	}
 
-	if err = h.webRTCController.SetRemoteDescription(browserOffer.Offer); err != nil {
+	if err = h.webRTCController.SetRemoteDescription(params.Offer); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
@@ -93,12 +93,12 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	h.l.Sugar().Infow("Connecting to SRT ",
-		"offer", browserOffer,
+		"offer", params,
 	)
 	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(h.c.SRTConnectionLatencyMS),
-			astisrt.WithStreamid(browserOffer.SRTStreamID),
+			astisrt.WithStreamid(params.SRTStreamID),
 		},
 
 		OnDisconnect: func(c *astisrt.Connection, err error) {
@@ -107,8 +107,8 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 			)
 		},
 
-		Host: browserOffer.SRTHost,
-		Port: browserOffer.SRTPort,
+		Host: params.SRTHost,
+		Port: params.SRTPort,
 	})
 	if err != nil {
 		ErrorToHTTP(w, err)

From 809b5ea195827e2b363a30e8ef6a87ae2f1a91a2 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 10:01:28 -0300
Subject: [PATCH 20/39] uses mpeg1 for audio

---
 scripts/ffmpeg_srt_live_listener.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/scripts/ffmpeg_srt_live_listener.sh b/scripts/ffmpeg_srt_live_listener.sh
index 0631f6e..f4d8c82 100755
--- a/scripts/ffmpeg_srt_live_listener.sh
+++ b/scripts/ffmpeg_srt_live_listener.sh
@@ -2,7 +2,6 @@ ffmpeg -hide_banner -loglevel verbose \
     -re -f lavfi -i "testsrc2=size=1280x720:rate=30,format=yuv420p" \
     -f lavfi -i "sine=frequency=1000:sample_rate=44100" \
     -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
-    -b:v 1400k -bufsize 2800k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
-    -c:a aac -b:a 128k \
+    -b:v 1000k -bufsize 2000k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
     -f mpegts "srt://${SRT_LISTENING_HOST}:${SRT_LISTENING_PORT}?mode=listener&latency=${SRT_LISTENING_LATENCY_US}"
 

From d1d9a5d75bb7d9822d2eba9aceb4e4026cb5ddf7 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 20:15:50 -0300
Subject: [PATCH 21/39] introduce default values

---
 FAQ.md                  | 2 ++
 internal/web/index.html | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index d9600a8..f513f20 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -4,6 +4,8 @@
 
 [WebRTC establishes a baseline set of codecs which all compliant browsers are required to support. Some browsers may choose to allow other codecs as well.](https://developer.mozilla.org/en-US/docs/Web/Media/Formats/WebRTC_codecs#supported_video_codecs)
 
+You might also want to check the general [support for codecs by containers](https://en.wikipedia.org/wiki/Comparison_of_video_container_formats).
+
 ## If you're facing issues while trying to run or compile it locally, such as:
 
 ```
diff --git a/internal/web/index.html b/internal/web/index.html
index 4c13ac1..314cb27 100644
--- a/internal/web/index.html
+++ b/internal/web/index.html
@@ -7,13 +7,13 @@
 
 <body>
   <b> SRT Host </b>
-  <input type="text" id="srt-host"> <br />
+  <input type="text" id="srt-host" value="origin"> <br />
 
   <b> SRT Port </b>
-  <input type="text" id="srt-port" /> <br />
+  <input type="text" id="srt-port" value="40052"/> <br />
 
   <b> SRT Stream ID </b>
-  <input type="text" id="srt-stream-id" /> <br />
+  <input type="text" id="srt-stream-id" value="stream-id" /> <br />
   <button onclick="onConnect()"> Connect </button>
 
   <donut-video server="http://localhost:8080" controls />

From 442bea31100c7287a28bef11c4903ca203a4767f Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 23:21:43 -0300
Subject: [PATCH 22/39] extract srt and streaming behaviour into controllers

---
 internal/controller/srt/controller.go       |  45 ++++---
 internal/controller/streaming/controller.go | 127 +++++++++++++++++++
 internal/entity/errors.go                   |   1 +
 internal/web/http.go                        |   5 +
 internal/web/signaling.go                   | 132 +++-----------------
 main.go                                     |   6 +
 6 files changed, 183 insertions(+), 133 deletions(-)
 create mode 100644 internal/controller/streaming/controller.go

diff --git a/internal/controller/srt/controller.go b/internal/controller/srt/controller.go
index 7169011..14b9ff0 100644
--- a/internal/controller/srt/controller.go
+++ b/internal/controller/srt/controller.go
@@ -1,49 +1,54 @@
 package srt
 
 import (
-	"log"
-
 	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/flavioribeiro/donut/internal/entity"
+	"go.uber.org/zap"
 )
 
 type SRTController struct {
 	c *entity.Config
+	l *zap.Logger
 }
 
-func NewSRTController(c *entity.Config) *SRTController {
+func NewSRTController(c *entity.Config, l *zap.Logger) *SRTController {
 	return &SRTController{
 		c: c,
+		l: l,
 	}
 }
 
-func (c *SRTController) Connect(offer *entity.RequestParams) error {
-	if err := offer.Valid(); err != nil {
-		return err
+func (c *SRTController) Connect(params *entity.RequestParams) (*astisrt.Connection, error) {
+	if params == nil {
+		return nil, entity.ErrMissingRemoteOffer
 	}
 
-	// conn, err := c.srtConnect(offer)
-	// if err != nil {
-	// 	return err
-	// }
+	if err := params.Valid(); err != nil {
+		return nil, err
+	}
 
-	return nil
-}
+	c.l.Sugar().Infow("Connecting to SRT ",
+		"offer", params,
+	)
 
-func (c *SRTController) srtConnect(offer *entity.RequestParams) (*astisrt.Connection, error) {
-	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
+	conn, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(c.c.SRTConnectionLatencyMS),
-			astisrt.WithStreamid(offer.SRTStreamID),
+			astisrt.WithStreamid(params.SRTStreamID),
 		},
-		OnDisconnect: func(c *astisrt.Connection, err error) {
-			log.Fatal("Disconnected from SRT")
+
+		OnDisconnect: func(conn *astisrt.Connection, err error) {
+			c.l.Sugar().Fatalw("Disconnected from SRT",
+				"error", err,
+			)
 		},
-		Host: offer.SRTHost,
-		Port: offer.SRTPort,
+
+		Host: params.SRTHost,
+		Port: params.SRTPort,
 	})
 	if err != nil {
 		return nil, err
 	}
-	return srtConnection, nil
+	c.l.Sugar().Infow("Connected to SRT")
+	return conn, nil
 }
diff --git a/internal/controller/streaming/controller.go b/internal/controller/streaming/controller.go
new file mode 100644
index 0000000..976ac21
--- /dev/null
+++ b/internal/controller/streaming/controller.go
@@ -0,0 +1,127 @@
+package streaming
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"io"
+	"time"
+
+	astisrt "github.com/asticode/go-astisrt/pkg"
+	"github.com/asticode/go-astits"
+	"github.com/flavioribeiro/donut/eia608"
+	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/pion/webrtc/v3"
+	"github.com/pion/webrtc/v3/pkg/media"
+	"go.uber.org/zap"
+)
+
+type StreamingController struct {
+	c *entity.Config
+	l *zap.Logger
+}
+
+func NewStreamingController(c *entity.Config, l *zap.Logger) *StreamingController {
+	return &StreamingController{
+		c: c,
+		l: l,
+	}
+}
+
+func (c *StreamingController) Stream(_ context.Context, srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
+	r, w := io.Pipe()
+	defer r.Close()
+	defer w.Close()
+	defer srtConnection.Close()
+
+	c.l.Sugar().Infow("start streaming")
+
+	// reading from SRT writing into pipe writer
+	go func() {
+		defer srtConnection.Close()
+		// TODO: pick the proper transport? is it possible to get rtp instead?
+		inboundMpegTsPacket := make([]byte, c.c.SRTReadBufferSizeBytes) // SRT Read Size
+
+		for {
+			n, err := srtConnection.Read(inboundMpegTsPacket)
+			if err != nil {
+				c.l.Sugar().Errorw("str conn failed to read mpeg ts",
+					"error", err,
+				)
+				break
+			}
+
+			if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
+				c.l.Sugar().Errorw("failed to write mpeg ts in the pipe",
+					"error", err,
+				)
+				break
+			}
+		}
+	}()
+
+	dmx := astits.NewDemuxer(context.Background(), r)
+	eia608Reader := eia608.NewEIA608Reader()
+	h264PID := uint16(0)
+
+	// reading from reader pipe
+	for {
+		d, err := dmx.NextData()
+		if err != nil {
+			c.l.Sugar().Errorw("failed to demux mpeg ts",
+				"error", err,
+			)
+			break
+		}
+
+		if d.PMT != nil {
+			for _, es := range d.PMT.ElementaryStreams {
+				msg, _ := json.Marshal(entity.Message{
+					Type:    entity.MessageTypeMetadata,
+					Message: es.StreamType.String(),
+				})
+				metadataTrack.SendText(string(msg))
+				if es.StreamType == astits.StreamTypeH264Video {
+					h264PID = es.ElementaryPID
+				}
+			}
+
+			for _, d := range d.PMT.ProgramDescriptors {
+				if d.MaximumBitrate != nil {
+					bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
+					msg, _ := json.Marshal(entity.Message{
+						Type:    entity.MessageTypeMetadata,
+						Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
+					})
+					metadataTrack.SendText(string(msg))
+				}
+			}
+		}
+
+		if d.PID == h264PID && d.PES != nil {
+			if err = videoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
+				c.l.Sugar().Errorw("failed to write a sample mpeg ts to web rtc",
+					"error", err,
+				)
+				break
+			}
+			captions, err := eia608Reader.Parse(d.PES)
+			if err != nil {
+				c.l.Sugar().Errorw("failed to parse eia 608",
+					"error", err,
+				)
+				break
+			}
+			if captions != "" {
+				captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
+				if err != nil {
+					c.l.Sugar().Errorw("failed to build captions message",
+						"error", err,
+					)
+					break
+				}
+				metadataTrack.SendText(captionsMsg)
+			}
+		}
+	}
+}
diff --git a/internal/entity/errors.go b/internal/entity/errors.go
index 000faec..8e0503e 100644
--- a/internal/entity/errors.go
+++ b/internal/entity/errors.go
@@ -9,3 +9,4 @@ var ErrMissingSRTHost = errors.New("SRTHost must not be nil")
 var ErrMissingSRTPort = errors.New("SRTPort must be valid")
 var ErrMissingSRTStreamID = errors.New("SRTStreamID must not be empty")
 var ErrMissingWebRTCSetup = errors.New("WebRTCController.SetupPeerConnection must be called first")
+var ErrMissingRemoteOffer = errors.New("nil offer, in order to connect one must pass a valid offer")
diff --git a/internal/web/http.go b/internal/web/http.go
index ca3c3d8..25460a0 100644
--- a/internal/web/http.go
+++ b/internal/web/http.go
@@ -53,3 +53,8 @@ func SetCORS(w http.ResponseWriter, r *http.Request) {
 		w.Header().Set("Access-Control-Expose-Headers", "Authorization")
 	}
 }
+
+func SetSuccessJson(w http.ResponseWriter) {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/internal/web/signaling.go b/internal/web/signaling.go
index 98da58e..f51b5a7 100644
--- a/internal/web/signaling.go
+++ b/internal/web/signaling.go
@@ -1,38 +1,37 @@
 package handlers
 
 import (
-	"context"
 	"encoding/json"
-	"fmt"
-	"io"
 	"net/http"
-	"time"
 
-	astisrt "github.com/asticode/go-astisrt/pkg"
-	"github.com/asticode/go-astits"
-	"github.com/flavioribeiro/donut/eia608"
+	donutsrt "github.com/flavioribeiro/donut/internal/controller/srt"
+	donutstreaming "github.com/flavioribeiro/donut/internal/controller/streaming"
 	donutwebrtc "github.com/flavioribeiro/donut/internal/controller/webrtc"
 	"github.com/flavioribeiro/donut/internal/entity"
-	"github.com/pion/webrtc/v3"
-	"github.com/pion/webrtc/v3/pkg/media"
 	"go.uber.org/zap"
 )
 
 type SignalingHandler struct {
-	c                *entity.Config
-	l                *zap.Logger
-	webRTCController *donutwebrtc.WebRTCController
+	c                   *entity.Config
+	l                   *zap.Logger
+	webRTCController    *donutwebrtc.WebRTCController
+	srtController       *donutsrt.SRTController
+	streamingController *donutstreaming.StreamingController
 }
 
 func NewSignalingHandler(
 	c *entity.Config,
 	log *zap.Logger,
 	webRTCController *donutwebrtc.WebRTCController,
+	srtController *donutsrt.SRTController,
+	streamingController *donutstreaming.StreamingController,
 ) *SignalingHandler {
 	return &SignalingHandler{
-		c:                c,
-		l:                log,
-		webRTCController: webRTCController,
+		c:                   c,
+		l:                   log,
+		webRTCController:    webRTCController,
+		srtController:       srtController,
+		streamingController: streamingController,
 	}
 }
 
@@ -86,116 +85,23 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	response, err := json.Marshal(*localDescription)
+	localOfferDescription, err := json.Marshal(*localDescription)
 	if err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
 
-	h.l.Sugar().Infow("Connecting to SRT ",
-		"offer", params,
-	)
-	srtConnection, err := astisrt.Dial(astisrt.DialOptions{
-		ConnectionOptions: []astisrt.ConnectionOption{
-			astisrt.WithLatency(h.c.SRTConnectionLatencyMS),
-			astisrt.WithStreamid(params.SRTStreamID),
-		},
-
-		OnDisconnect: func(c *astisrt.Connection, err error) {
-			h.l.Sugar().Fatalw("Disconnected from SRT",
-				"error", err,
-			)
-		},
-
-		Host: params.SRTHost,
-		Port: params.SRTPort,
-	})
+	srtConnection, err := h.srtController.Connect(&params)
 	if err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
-	h.l.Sugar().Infow("Connected to SRT")
 
-	go srtToWebRTC(srtConnection, videoTrack, metadataSender)
+	go h.streamingController.Stream(r.Context(), srtConnection, videoTrack, metadataSender)
 
-	w.Header().Set("Content-Type", "application/json")
-	if _, err := w.Write(response); err != nil {
+	if _, err := w.Write(localOfferDescription); err != nil {
 		ErrorToHTTP(w, err)
 		return
 	}
-}
-
-func srtToWebRTC(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
-	r, w := io.Pipe()
-	defer r.Close()
-	defer w.Close()
-	defer srtConnection.Close()
-
-	go func() {
-		defer srtConnection.Close()
-		inboundMpegTsPacket := make([]byte, 1316) // SRT Read Size
-
-		for {
-			n, err := srtConnection.Read(inboundMpegTsPacket)
-			if err != nil {
-				break
-			}
-
-			if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
-				break
-			}
-		}
-	}()
-
-	dmx := astits.NewDemuxer(context.Background(), r)
-	eia608Reader := eia608.NewEIA608Reader()
-	h264PID := uint16(0)
-	for {
-		d, err := dmx.NextData()
-		if err != nil {
-			break
-		}
-
-		if d.PMT != nil {
-			for _, es := range d.PMT.ElementaryStreams {
-				msg, _ := json.Marshal(entity.Message{
-					Type:    entity.MessageTypeMetadata,
-					Message: es.StreamType.String(),
-				})
-				metadataTrack.SendText(string(msg))
-				if es.StreamType == astits.StreamTypeH264Video {
-					h264PID = es.ElementaryPID
-				}
-			}
-
-			for _, d := range d.PMT.ProgramDescriptors {
-				if d.MaximumBitrate != nil {
-					bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
-					msg, _ := json.Marshal(entity.Message{
-						Type:    entity.MessageTypeMetadata,
-						Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
-					})
-					metadataTrack.SendText(string(msg))
-				}
-			}
-		}
-
-		if d.PID == h264PID && d.PES != nil {
-			if err = videoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
-				break
-			}
-			captions, err := eia608Reader.Parse(d.PES)
-			if err != nil {
-				break
-			}
-			if captions != "" {
-				captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
-				if err != nil {
-					break
-				}
-				metadataTrack.SendText(captionsMsg)
-			}
-		}
-	}
-
+	SetSuccessJson(w)
 }
diff --git a/main.go b/main.go
index 226ff0b..a2fb379 100644
--- a/main.go
+++ b/main.go
@@ -8,6 +8,8 @@ import (
 	"log"
 	"net/http"
 
+	donutsrt "github.com/flavioribeiro/donut/internal/controller/srt"
+	donutstreaming "github.com/flavioribeiro/donut/internal/controller/streaming"
 	donutwebrtc "github.com/flavioribeiro/donut/internal/controller/webrtc"
 	"github.com/flavioribeiro/donut/internal/entity"
 	handlers "github.com/flavioribeiro/donut/internal/web"
@@ -46,6 +48,10 @@ func main() {
 
 		// WebRTC controller
 		fx.Provide(donutwebrtc.NewWebRTCController),
+		// SRT controller
+		fx.Provide(donutsrt.NewSRTController),
+		// Streaming controller
+		fx.Provide(donutstreaming.NewStreamingController),
 
 		// Logging, Config
 		fx.Provide(zap.NewProduction),

From 3cd3bb836af1b146ae2510b8012db58c11946336 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sat, 27 Jan 2024 23:31:36 -0300
Subject: [PATCH 23/39] introduce a method for producing streaming data

---
 internal/controller/streaming/controller.go | 48 +++++++++++----------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/internal/controller/streaming/controller.go b/internal/controller/streaming/controller.go
index 976ac21..4c63d76 100644
--- a/internal/controller/streaming/controller.go
+++ b/internal/controller/streaming/controller.go
@@ -36,29 +36,8 @@ func (c *StreamingController) Stream(_ context.Context, srtConnection *astisrt.C
 
 	c.l.Sugar().Infow("start streaming")
 
-	// reading from SRT writing into pipe writer
-	go func() {
-		defer srtConnection.Close()
-		// TODO: pick the proper transport? is it possible to get rtp instead?
-		inboundMpegTsPacket := make([]byte, c.c.SRTReadBufferSizeBytes) // SRT Read Size
-
-		for {
-			n, err := srtConnection.Read(inboundMpegTsPacket)
-			if err != nil {
-				c.l.Sugar().Errorw("str conn failed to read mpeg ts",
-					"error", err,
-				)
-				break
-			}
-
-			if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
-				c.l.Sugar().Errorw("failed to write mpeg ts in the pipe",
-					"error", err,
-				)
-				break
-			}
-		}
-	}()
+	// TODO: pick the proper transport? is it possible to get rtp instead?
+	go c.readFromSRTIntoWriterPipe(srtConnection, w)
 
 	dmx := astits.NewDemuxer(context.Background(), r)
 	eia608Reader := eia608.NewEIA608Reader()
@@ -125,3 +104,26 @@ func (c *StreamingController) Stream(_ context.Context, srtConnection *astisrt.C
 		}
 	}
 }
+
+func (c *StreamingController) readFromSRTIntoWriterPipe(srtConnection *astisrt.Connection, w *io.PipeWriter) {
+	defer srtConnection.Close()
+
+	inboundMpegTsPacket := make([]byte, c.c.SRTReadBufferSizeBytes)
+
+	for {
+		n, err := srtConnection.Read(inboundMpegTsPacket)
+		if err != nil {
+			c.l.Sugar().Errorw("str conn failed to read mpeg ts",
+				"error", err,
+			)
+			break
+		}
+
+		if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
+			c.l.Sugar().Errorw("failed to write mpeg ts in the pipe",
+				"error", err,
+			)
+			break
+		}
+	}
+}

From 852ad6c1adfa8c26e50c7677924f36d07be9c33a Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sun, 28 Jan 2024 00:01:00 -0300
Subject: [PATCH 24/39] extract sub methods on stream

---
 internal/controller/streaming/controller.go | 54 ++++++++++++---------
 internal/web/signaling.go                   |  2 +-
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/internal/controller/streaming/controller.go b/internal/controller/streaming/controller.go
index 4c63d76..0d82256 100644
--- a/internal/controller/streaming/controller.go
+++ b/internal/controller/streaming/controller.go
@@ -28,7 +28,7 @@ func NewStreamingController(c *entity.Config, l *zap.Logger) *StreamingControlle
 	}
 }
 
-func (c *StreamingController) Stream(_ context.Context, srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
+func (c *StreamingController) Stream(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
 	r, w := io.Pipe()
 	defer r.Close()
 	defer w.Close()
@@ -54,27 +54,8 @@ func (c *StreamingController) Stream(_ context.Context, srtConnection *astisrt.C
 		}
 
 		if d.PMT != nil {
-			for _, es := range d.PMT.ElementaryStreams {
-				msg, _ := json.Marshal(entity.Message{
-					Type:    entity.MessageTypeMetadata,
-					Message: es.StreamType.String(),
-				})
-				metadataTrack.SendText(string(msg))
-				if es.StreamType == astits.StreamTypeH264Video {
-					h264PID = es.ElementaryPID
-				}
-			}
-
-			for _, d := range d.PMT.ProgramDescriptors {
-				if d.MaximumBitrate != nil {
-					bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
-					msg, _ := json.Marshal(entity.Message{
-						Type:    entity.MessageTypeMetadata,
-						Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
-					})
-					metadataTrack.SendText(string(msg))
-				}
-			}
+			h264PID = c.captureMediaInfoAndSendToWebRTC(d, metadataTrack, h264PID)
+			c.captureBitrateAndSendToWebRTC(d, metadataTrack)
 		}
 
 		if d.PID == h264PID && d.PES != nil {
@@ -105,6 +86,35 @@ func (c *StreamingController) Stream(_ context.Context, srtConnection *astisrt.C
 	}
 }
 
+func (*StreamingController) captureBitrateAndSendToWebRTC(d *astits.DemuxerData, metadataTrack *webrtc.DataChannel) {
+	for _, d := range d.PMT.ProgramDescriptors {
+		if d.MaximumBitrate != nil {
+			bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
+			msg, _ := json.Marshal(entity.Message{
+				Type:    entity.MessageTypeMetadata,
+				Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
+			})
+			metadataTrack.SendText(string(msg))
+		}
+	}
+}
+
+func (*StreamingController) captureMediaInfoAndSendToWebRTC(d *astits.DemuxerData, metadataTrack *webrtc.DataChannel, h264PID uint16) uint16 {
+	for _, es := range d.PMT.ElementaryStreams {
+
+		msg, _ := json.Marshal(entity.Message{
+			Type:    entity.MessageTypeMetadata,
+			Message: es.StreamType.String(),
+		})
+		metadataTrack.SendText(string(msg))
+
+		if es.StreamType == astits.StreamTypeH264Video {
+			h264PID = es.ElementaryPID
+		}
+	}
+	return h264PID
+}
+
 func (c *StreamingController) readFromSRTIntoWriterPipe(srtConnection *astisrt.Connection, w *io.PipeWriter) {
 	defer srtConnection.Close()
 
diff --git a/internal/web/signaling.go b/internal/web/signaling.go
index f51b5a7..0b6615d 100644
--- a/internal/web/signaling.go
+++ b/internal/web/signaling.go
@@ -97,7 +97,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	go h.streamingController.Stream(r.Context(), srtConnection, videoTrack, metadataSender)
+	go h.streamingController.Stream(srtConnection, videoTrack, metadataSender)
 
 	if _, err := w.Write(localOfferDescription); err != nil {
 		ErrorToHTTP(w, err)

From 74d84b13f2b0e54b4d08f5c256444206153b7936 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sun, 28 Jan 2024 07:05:31 -0300
Subject: [PATCH 25/39] move components to plural named packages

---
 .../media_controller.go}                      | 16 ++---
 .../srt_controller.go}                        | 12 ++--
 .../webrtc_controller.go}                     | 24 ++++----
 .../entitities.go => entities/entities.go}    |  2 +-
 internal/{entity => entities}/errors.go       |  2 +-
 internal/mapper/mapper.go                     |  6 +-
 internal/web/handlers/http.go                 | 12 ++++
 internal/web/{ => handlers}/index.go          |  0
 internal/web/{ => handlers}/index.html        |  0
 internal/web/{ => handlers}/media.go          | 21 ++++---
 internal/web/{ => handlers}/signaling.go      | 53 ++++++++--------
 internal/web/http.go                          | 60 -------------------
 internal/web/router.go                        | 27 +++++++--
 internal/web/server.go                        | 41 +++++++++++++
 main.go                                       | 37 ++++++------
 15 files changed, 157 insertions(+), 156 deletions(-)
 rename internal/{controller/streaming/controller.go => controllers/media_controller.go} (90%)
 rename internal/{controller/srt/controller.go => controllers/srt_controller.go} (72%)
 rename internal/{controller/webrtc/controller.go => controllers/webrtc_controller.go} (84%)
 rename internal/{entity/entitities.go => entities/entities.go} (98%)
 rename internal/{entity => entities}/errors.go (97%)
 create mode 100644 internal/web/handlers/http.go
 rename internal/web/{ => handlers}/index.go (100%)
 rename internal/web/{ => handlers}/index.html (100%)
 rename internal/web/{ => handlers}/media.go (64%)
 rename internal/web/{ => handlers}/signaling.go (61%)
 delete mode 100644 internal/web/http.go
 create mode 100644 internal/web/server.go

diff --git a/internal/controller/streaming/controller.go b/internal/controllers/media_controller.go
similarity index 90%
rename from internal/controller/streaming/controller.go
rename to internal/controllers/media_controller.go
index 0d82256..49c7a39 100644
--- a/internal/controller/streaming/controller.go
+++ b/internal/controllers/media_controller.go
@@ -1,4 +1,4 @@
-package streaming
+package controllers
 
 import (
 	"context"
@@ -10,18 +10,18 @@ import (
 	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/asticode/go-astits"
 	"github.com/flavioribeiro/donut/eia608"
-	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/entities"
 	"github.com/pion/webrtc/v3"
 	"github.com/pion/webrtc/v3/pkg/media"
 	"go.uber.org/zap"
 )
 
 type StreamingController struct {
-	c *entity.Config
+	c *entities.Config
 	l *zap.Logger
 }
 
-func NewStreamingController(c *entity.Config, l *zap.Logger) *StreamingController {
+func NewStreamingController(c *entities.Config, l *zap.Logger) *StreamingController {
 	return &StreamingController{
 		c: c,
 		l: l,
@@ -90,8 +90,8 @@ func (*StreamingController) captureBitrateAndSendToWebRTC(d *astits.DemuxerData,
 	for _, d := range d.PMT.ProgramDescriptors {
 		if d.MaximumBitrate != nil {
 			bitrateInMbitsPerSecond := float32(d.MaximumBitrate.Bitrate) / float32(125000)
-			msg, _ := json.Marshal(entity.Message{
-				Type:    entity.MessageTypeMetadata,
+			msg, _ := json.Marshal(entities.Message{
+				Type:    entities.MessageTypeMetadata,
 				Message: fmt.Sprintf("Bitrate %.2fMbps", bitrateInMbitsPerSecond),
 			})
 			metadataTrack.SendText(string(msg))
@@ -102,8 +102,8 @@ func (*StreamingController) captureBitrateAndSendToWebRTC(d *astits.DemuxerData,
 func (*StreamingController) captureMediaInfoAndSendToWebRTC(d *astits.DemuxerData, metadataTrack *webrtc.DataChannel, h264PID uint16) uint16 {
 	for _, es := range d.PMT.ElementaryStreams {
 
-		msg, _ := json.Marshal(entity.Message{
-			Type:    entity.MessageTypeMetadata,
+		msg, _ := json.Marshal(entities.Message{
+			Type:    entities.MessageTypeMetadata,
 			Message: es.StreamType.String(),
 		})
 		metadataTrack.SendText(string(msg))
diff --git a/internal/controller/srt/controller.go b/internal/controllers/srt_controller.go
similarity index 72%
rename from internal/controller/srt/controller.go
rename to internal/controllers/srt_controller.go
index 14b9ff0..78c17d2 100644
--- a/internal/controller/srt/controller.go
+++ b/internal/controllers/srt_controller.go
@@ -1,26 +1,26 @@
-package srt
+package controllers
 
 import (
 	astisrt "github.com/asticode/go-astisrt/pkg"
-	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/entities"
 	"go.uber.org/zap"
 )
 
 type SRTController struct {
-	c *entity.Config
+	c *entities.Config
 	l *zap.Logger
 }
 
-func NewSRTController(c *entity.Config, l *zap.Logger) *SRTController {
+func NewSRTController(c *entities.Config, l *zap.Logger) *SRTController {
 	return &SRTController{
 		c: c,
 		l: l,
 	}
 }
 
-func (c *SRTController) Connect(params *entity.RequestParams) (*astisrt.Connection, error) {
+func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connection, error) {
 	if params == nil {
-		return nil, entity.ErrMissingRemoteOffer
+		return nil, entities.ErrMissingRemoteOffer
 	}
 
 	if err := params.Valid(); err != nil {
diff --git a/internal/controller/webrtc/controller.go b/internal/controllers/webrtc_controller.go
similarity index 84%
rename from internal/controller/webrtc/controller.go
rename to internal/controllers/webrtc_controller.go
index bcffd0a..327a505 100644
--- a/internal/controller/webrtc/controller.go
+++ b/internal/controllers/webrtc_controller.go
@@ -1,16 +1,16 @@
-package webrtc
+package controllers
 
 import (
 	"net"
 
-	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/entities"
 	"github.com/flavioribeiro/donut/internal/mapper"
 	"github.com/pion/webrtc/v3"
 	"go.uber.org/zap"
 )
 
 type WebRTCController struct {
-	c      *entity.Config
+	c      *entities.Config
 	l      *zap.Logger
 	iceTcp net.Listener
 	iceUdp net.PacketConn
@@ -18,7 +18,7 @@ type WebRTCController struct {
 }
 
 func NewWebRTCController(
-	c *entity.Config,
+	c *entities.Config,
 	l *zap.Logger,
 	iceTcp net.Listener,
 	iceUdp net.PacketConn,
@@ -73,7 +73,7 @@ func (c *WebRTCController) SetupPeerConnection() error {
 	return nil
 }
 
-func (c *WebRTCController) CreateTrack(track entity.Track, id string, streamId string) (*webrtc.TrackLocalStaticSample, error) {
+func (c *WebRTCController) CreateTrack(track entities.Track, id string, streamId string) (*webrtc.TrackLocalStaticSample, error) {
 	codecCapability := mapper.FromTrackToRTPCodecCapability(track)
 	webRTCtrack, err := webrtc.NewTrackLocalStaticSample(codecCapability, id, streamId)
 	if err != nil {
@@ -89,7 +89,7 @@ func (c *WebRTCController) CreateTrack(track entity.Track, id string, streamId s
 func (c *WebRTCController) CreateDataChannel(channelID string) (*webrtc.DataChannel, error) {
 	if c.peer == nil {
 		// TODO: or call SetupPeerConnection?
-		return nil, entity.ErrMissingWebRTCSetup
+		return nil, entities.ErrMissingWebRTCSetup
 	}
 
 	metadataSender, err := c.peer.CreateDataChannel(channelID, nil)
@@ -102,7 +102,7 @@ func (c *WebRTCController) CreateDataChannel(channelID string) (*webrtc.DataChan
 func (c *WebRTCController) SetRemoteDescription(desc webrtc.SessionDescription) error {
 	if c.peer == nil {
 		// TODO: or call SetupPeerConnection?
-		return entity.ErrMissingWebRTCSetup
+		return entities.ErrMissingWebRTCSetup
 	}
 
 	err := c.peer.SetRemoteDescription(desc)
@@ -115,7 +115,7 @@ func (c *WebRTCController) SetRemoteDescription(desc webrtc.SessionDescription)
 func (c *WebRTCController) GatheringWebRTC() (*webrtc.SessionDescription, error) {
 	if c.peer == nil {
 		// TODO: or call SetupPeerConnection?
-		return nil, entity.ErrMissingWebRTCSetup
+		return nil, entities.ErrMissingWebRTCSetup
 	}
 
 	c.l.Sugar().Infow("Gathering WebRTC Candidates")
@@ -132,7 +132,7 @@ func (c *WebRTCController) GatheringWebRTC() (*webrtc.SessionDescription, error)
 	return c.peer.LocalDescription(), nil
 }
 
-func NewWebRTCSettingsEngine(c *entity.Config, tcpListener net.Listener, udpListener net.PacketConn) webrtc.SettingEngine {
+func NewWebRTCSettingsEngine(c *entities.Config, tcpListener net.Listener, udpListener net.PacketConn) webrtc.SettingEngine {
 	settingEngine := webrtc.SettingEngine{}
 
 	settingEngine.SetNAT1To1IPs(c.ICEExternalIPsDNAT, webrtc.ICECandidateTypeHost)
@@ -150,7 +150,7 @@ func NewWebRTCMediaEngine() (*webrtc.MediaEngine, error) {
 	return mediaEngine, nil
 }
 
-func NewTCPICEServer(c *entity.Config) (net.Listener, error) {
+func NewTCPICEServer(c *entities.Config) (net.Listener, error) {
 	tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
 		IP:   net.IP{0, 0, 0, 0},
 		Port: c.TCPICEPort,
@@ -161,8 +161,7 @@ func NewTCPICEServer(c *entity.Config) (net.Listener, error) {
 	return tcpListener, nil
 }
 
-func NewUDPICEServer(c *entity.Config) (net.PacketConn, error) {
-
+func NewUDPICEServer(c *entities.Config) (net.PacketConn, error) {
 	udpListener, err := net.ListenUDP("udp", &net.UDPAddr{
 		IP:   net.IP{0, 0, 0, 0},
 		Port: c.UDPICEPort,
@@ -170,6 +169,5 @@ func NewUDPICEServer(c *entity.Config) (net.PacketConn, error) {
 	if err != nil {
 		return nil, err
 	}
-
 	return udpListener, nil
 }
diff --git a/internal/entity/entitities.go b/internal/entities/entities.go
similarity index 98%
rename from internal/entity/entitities.go
rename to internal/entities/entities.go
index 1c4df96..9ede0dd 100644
--- a/internal/entity/entitities.go
+++ b/internal/entities/entities.go
@@ -1,4 +1,4 @@
-package entity
+package entities
 
 import (
 	"fmt"
diff --git a/internal/entity/errors.go b/internal/entities/errors.go
similarity index 97%
rename from internal/entity/errors.go
rename to internal/entities/errors.go
index 8e0503e..6b1512c 100644
--- a/internal/entity/errors.go
+++ b/internal/entities/errors.go
@@ -1,4 +1,4 @@
-package entity
+package entities
 
 import "errors"
 
diff --git a/internal/mapper/mapper.go b/internal/mapper/mapper.go
index 6009478..10ee19c 100644
--- a/internal/mapper/mapper.go
+++ b/internal/mapper/mapper.go
@@ -1,14 +1,14 @@
 package mapper
 
 import (
-	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/entities"
 	"github.com/pion/webrtc/v3"
 )
 
-func FromTrackToRTPCodecCapability(track entity.Track) webrtc.RTPCodecCapability {
+func FromTrackToRTPCodecCapability(track entities.Track) webrtc.RTPCodecCapability {
 	response := webrtc.RTPCodecCapability{}
 
-	if track.Type == entity.H264 {
+	if track.Type == entities.H264 {
 		response.MimeType = webrtc.MimeTypeH264
 	}
 
diff --git a/internal/web/handlers/http.go b/internal/web/handlers/http.go
new file mode 100644
index 0000000..3377461
--- /dev/null
+++ b/internal/web/handlers/http.go
@@ -0,0 +1,12 @@
+package handlers
+
+import "net/http"
+
+func SetError(w http.ResponseWriter, err error) {
+	http.Error(w, err.Error(), http.StatusInternalServerError)
+}
+
+func SetSuccessJson(w http.ResponseWriter) {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+}
diff --git a/internal/web/index.go b/internal/web/handlers/index.go
similarity index 100%
rename from internal/web/index.go
rename to internal/web/handlers/index.go
diff --git a/internal/web/index.html b/internal/web/handlers/index.html
similarity index 100%
rename from internal/web/index.html
rename to internal/web/handlers/index.html
diff --git a/internal/web/media.go b/internal/web/handlers/media.go
similarity index 64%
rename from internal/web/media.go
rename to internal/web/handlers/media.go
index 1986a98..5f93f6f 100644
--- a/internal/web/media.go
+++ b/internal/web/handlers/media.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 
 	astisrt "github.com/asticode/go-astisrt/pkg"
-	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/entities"
 )
 
 type MediaHandler struct{}
@@ -16,33 +16,32 @@ func NewMediaHandler() *MediaHandler {
 }
 
 func (m *MediaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	SetCORS(w, r)
 	if r.Method != http.MethodGet {
-		ErrorToHTTP(w, entity.ErrHTTPGetOnly)
+		SetError(w, entities.ErrHTTPGetOnly)
 		return
 	}
 
-	offer := entity.RequestParams{}
-	if err := json.NewDecoder(r.Body).Decode(&offer); err != nil {
-		ErrorToHTTP(w, err)
+	params := entities.RequestParams{}
+	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
+		SetError(w, err)
 		return
 	}
 
-	log.Println("Connecting to SRT ", offer)
+	log.Println("Connecting to SRT ", params)
 	_, err := astisrt.Dial(astisrt.DialOptions{
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(300),
-			astisrt.WithStreamid(offer.SRTStreamID),
+			astisrt.WithStreamid(params.SRTStreamID),
 		},
 
 		// Callback when the connection is disconnected
 		OnDisconnect: func(c *astisrt.Connection, err error) { log.Fatal("Disconnected from SRT") },
 
-		Host: offer.SRTHost,
-		Port: offer.SRTPort,
+		Host: params.SRTHost,
+		Port: params.SRTPort,
 	})
 	if err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 	log.Println("Connected to SRT")
diff --git a/internal/web/signaling.go b/internal/web/handlers/signaling.go
similarity index 61%
rename from internal/web/signaling.go
rename to internal/web/handlers/signaling.go
index 0b6615d..8da0574 100644
--- a/internal/web/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -4,27 +4,25 @@ import (
 	"encoding/json"
 	"net/http"
 
-	donutsrt "github.com/flavioribeiro/donut/internal/controller/srt"
-	donutstreaming "github.com/flavioribeiro/donut/internal/controller/streaming"
-	donutwebrtc "github.com/flavioribeiro/donut/internal/controller/webrtc"
-	"github.com/flavioribeiro/donut/internal/entity"
+	"github.com/flavioribeiro/donut/internal/controllers"
+	"github.com/flavioribeiro/donut/internal/entities"
 	"go.uber.org/zap"
 )
 
 type SignalingHandler struct {
-	c                   *entity.Config
+	c                   *entities.Config
 	l                   *zap.Logger
-	webRTCController    *donutwebrtc.WebRTCController
-	srtController       *donutsrt.SRTController
-	streamingController *donutstreaming.StreamingController
+	webRTCController    *controllers.WebRTCController
+	srtController       *controllers.SRTController
+	streamingController *controllers.StreamingController
 }
 
 func NewSignalingHandler(
-	c *entity.Config,
+	c *entities.Config,
 	log *zap.Logger,
-	webRTCController *donutwebrtc.WebRTCController,
-	srtController *donutsrt.SRTController,
-	streamingController *donutstreaming.StreamingController,
+	webRTCController *controllers.WebRTCController,
+	srtController *controllers.SRTController,
+	streamingController *controllers.StreamingController,
 ) *SignalingHandler {
 	return &SignalingHandler{
 		c:                   c,
@@ -36,71 +34,70 @@ func NewSignalingHandler(
 }
 
 func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	SetCORS(w, r)
 	if r.Method != http.MethodPost {
-		ErrorToHTTP(w, entity.ErrHTTPPostOnly)
+		SetError(w, entities.ErrHTTPPostOnly)
 		return
 	}
 
-	params := entity.RequestParams{}
+	params := entities.RequestParams{}
 	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 	if err := params.Valid(); err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
 	if err := h.webRTCController.SetupPeerConnection(); err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
 	// TODO: create tracks according with SRT available streams
 	// Create a video track
 	videoTrack, err := h.webRTCController.CreateTrack(
-		entity.Track{
-			Type: entity.H264,
+		entities.Track{
+			Type: entities.H264,
 		}, "video", params.SRTStreamID,
 	)
 	if err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
-	metadataSender, err := h.webRTCController.CreateDataChannel(entity.MetadataChannelID)
+	metadataSender, err := h.webRTCController.CreateDataChannel(entities.MetadataChannelID)
 	if err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 	}
 
 	if err = h.webRTCController.SetRemoteDescription(params.Offer); err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
 	localDescription, err := h.webRTCController.GatheringWebRTC()
 	if err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
 	localOfferDescription, err := json.Marshal(*localDescription)
 	if err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
 	srtConnection, err := h.srtController.Connect(&params)
 	if err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 
 	go h.streamingController.Stream(srtConnection, videoTrack, metadataSender)
 
 	if _, err := w.Write(localOfferDescription); err != nil {
-		ErrorToHTTP(w, err)
+		SetError(w, err)
 		return
 	}
 	SetSuccessJson(w)
diff --git a/internal/web/http.go b/internal/web/http.go
deleted file mode 100644
index 25460a0..0000000
--- a/internal/web/http.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package handlers
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/http"
-
-	"github.com/flavioribeiro/donut/internal/entity"
-	"go.uber.org/fx"
-	"go.uber.org/zap"
-)
-
-func NewHTTPServer(
-	c *entity.Config,
-	mux *http.ServeMux,
-	log *zap.Logger,
-	lc fx.Lifecycle,
-) *http.Server {
-	srv := &http.Server{
-		Addr:    fmt.Sprintf("%s:%d", c.HTTPHost, c.HTTPPort),
-		Handler: mux,
-	}
-	lc.Append(fx.Hook{
-		OnStart: func(ctx context.Context) error {
-			ln, err := net.Listen("tcp", srv.Addr)
-			if err != nil {
-				return err
-			}
-			log.Sugar().Infow(fmt.Sprintf("Starting HTTP server. Open http://%s to access the demo", srv.Addr),
-				"addr", srv.Addr,
-			)
-			go srv.Serve(ln)
-			return nil
-		},
-		OnStop: func(ctx context.Context) error {
-			return srv.Shutdown(ctx)
-		},
-	})
-	return srv
-}
-
-func ErrorToHTTP(w http.ResponseWriter, err error) {
-	http.Error(w, err.Error(), http.StatusInternalServerError)
-}
-
-func SetCORS(w http.ResponseWriter, r *http.Request) {
-	if origin := r.Header.Get("Origin"); origin != "" {
-		allowedHeaders := "Accept, Content-Type, Content-Length, Accept-Encoding, Authorization,X-CSRF-Token"
-		w.Header().Set("Access-Control-Allow-Origin", "*")
-		w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
-		w.Header().Set("Access-Control-Allow-Headers", allowedHeaders)
-		w.Header().Set("Access-Control-Expose-Headers", "Authorization")
-	}
-}
-
-func SetSuccessJson(w http.ResponseWriter) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/internal/web/router.go b/internal/web/router.go
index 32e7fa2..96aac24 100644
--- a/internal/web/router.go
+++ b/internal/web/router.go
@@ -1,16 +1,33 @@
-package handlers
+package web
 
-import "net/http"
+import (
+	"net/http"
+
+	"github.com/flavioribeiro/donut/internal/web/handlers"
+)
 
 func NewServeMux(
-	index *IndexHandler,
-	signaling *SignalingHandler,
+	index *handlers.IndexHandler,
+	signaling *handlers.SignalingHandler,
 ) *http.ServeMux {
 
 	mux := http.NewServeMux()
 
 	mux.Handle("/", index)
-	mux.Handle("/doSignaling", signaling)
+	mux.Handle("/doSignaling", setCors(signaling))
 
 	return mux
 }
+
+func setCors(next http.Handler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		if origin := r.Header.Get("Origin"); origin != "" {
+			allowedHeaders := "Accept, Content-Type, Content-Length, Accept-Encoding, Authorization,X-CSRF-Token"
+			w.Header().Set("Access-Control-Allow-Origin", "*")
+			w.Header().Set("Access-Control-Allow-Methods", "POST, GET, OPTIONS, PUT, DELETE")
+			w.Header().Set("Access-Control-Allow-Headers", allowedHeaders)
+			w.Header().Set("Access-Control-Expose-Headers", "Authorization")
+		}
+		next.ServeHTTP(w, r)
+	})
+}
diff --git a/internal/web/server.go b/internal/web/server.go
new file mode 100644
index 0000000..8fe9654
--- /dev/null
+++ b/internal/web/server.go
@@ -0,0 +1,41 @@
+package web
+
+import (
+	"context"
+	"fmt"
+	"net"
+	"net/http"
+
+	"github.com/flavioribeiro/donut/internal/entities"
+	"go.uber.org/fx"
+	"go.uber.org/zap"
+)
+
+func NewHTTPServer(
+	c *entities.Config,
+	mux *http.ServeMux,
+	log *zap.Logger,
+	lc fx.Lifecycle,
+) *http.Server {
+	srv := &http.Server{
+		Addr:    fmt.Sprintf("%s:%d", c.HTTPHost, c.HTTPPort),
+		Handler: mux,
+	}
+	lc.Append(fx.Hook{
+		OnStart: func(ctx context.Context) error {
+			ln, err := net.Listen("tcp", srv.Addr)
+			if err != nil {
+				return err
+			}
+			log.Sugar().Infow(fmt.Sprintf("Starting HTTP server. Open http://%s to access the demo", srv.Addr),
+				"addr", srv.Addr,
+			)
+			go srv.Serve(ln)
+			return nil
+		},
+		OnStop: func(ctx context.Context) error {
+			return srv.Shutdown(ctx)
+		},
+	})
+	return srv
+}
diff --git a/main.go b/main.go
index a2fb379..ffc88d3 100644
--- a/main.go
+++ b/main.go
@@ -8,11 +8,10 @@ import (
 	"log"
 	"net/http"
 
-	donutsrt "github.com/flavioribeiro/donut/internal/controller/srt"
-	donutstreaming "github.com/flavioribeiro/donut/internal/controller/streaming"
-	donutwebrtc "github.com/flavioribeiro/donut/internal/controller/webrtc"
-	"github.com/flavioribeiro/donut/internal/entity"
-	handlers "github.com/flavioribeiro/donut/internal/web"
+	"github.com/flavioribeiro/donut/internal/controllers"
+	"github.com/flavioribeiro/donut/internal/entities"
+	"github.com/flavioribeiro/donut/internal/web"
+	"github.com/flavioribeiro/donut/internal/web/handlers"
 
 	"github.com/kelseyhightower/envconfig"
 	"go.uber.org/fx"
@@ -24,7 +23,7 @@ func main() {
 	flag.BoolVar(&enableICEMux, "enable-ice-mux", false, "Enable ICE Mux on :8081")
 	flag.Parse()
 
-	var c entity.Config
+	var c entities.Config
 	err := envconfig.Process("donut", &c)
 	if err != nil {
 		log.Fatal(err.Error())
@@ -32,30 +31,28 @@ func main() {
 	c.EnableICEMux = enableICEMux
 
 	fx.New(
-		// Server entry point
-		fx.Provide(handlers.NewHTTPServer),
+		// HTTP Server
+		fx.Provide(web.NewHTTPServer),
+
+		// HTTP router
+		fx.Provide(web.NewServeMux),
 
 		// HTTP handlers
 		fx.Provide(handlers.NewSignalingHandler),
 		fx.Provide(handlers.NewIndexHandler),
 
-		// HTTP router
-		fx.Provide(handlers.NewServeMux),
-
 		// ICE mux servers
-		fx.Provide(donutwebrtc.NewTCPICEServer),
-		fx.Provide(donutwebrtc.NewUDPICEServer),
+		fx.Provide(controllers.NewTCPICEServer),
+		fx.Provide(controllers.NewUDPICEServer),
 
-		// WebRTC controller
-		fx.Provide(donutwebrtc.NewWebRTCController),
-		// SRT controller
-		fx.Provide(donutsrt.NewSRTController),
-		// Streaming controller
-		fx.Provide(donutstreaming.NewStreamingController),
+		// Controllers
+		fx.Provide(controllers.NewWebRTCController),
+		fx.Provide(controllers.NewSRTController),
+		fx.Provide(controllers.NewStreamingController),
 
 		// Logging, Config
 		fx.Provide(zap.NewProduction),
-		fx.Provide(func() *entity.Config {
+		fx.Provide(func() *entities.Config {
 			return &c
 		}),
 

From 68bd7c942ecdf85ecf3be63ba1fc7f2d5ad86cbb Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sun, 28 Jan 2024 15:58:03 -0300
Subject: [PATCH 26/39] add internal demo

---
 ..._controller.go => streaming_controller.go} |  0
 internal/web/demo/demo.css                    |  8 +++
 internal/web/demo/demo.js                     | 67 +++++++++++++++++++
 internal/web/demo/index.html                  | 30 +++++++++
 internal/web/demo/readme.txt                  |  1 +
 internal/web/handlers/signaling.go            | 31 +++++++++
 internal/web/router.go                        |  1 +
 scripts/ffmpeg_srt_live_listener.sh           |  2 +-
 8 files changed, 139 insertions(+), 1 deletion(-)
 rename internal/controllers/{media_controller.go => streaming_controller.go} (100%)
 create mode 100644 internal/web/demo/demo.css
 create mode 100644 internal/web/demo/demo.js
 create mode 100644 internal/web/demo/index.html
 create mode 100644 internal/web/demo/readme.txt

diff --git a/internal/controllers/media_controller.go b/internal/controllers/streaming_controller.go
similarity index 100%
rename from internal/controllers/media_controller.go
rename to internal/controllers/streaming_controller.go
diff --git a/internal/web/demo/demo.css b/internal/web/demo/demo.css
new file mode 100644
index 0000000..78566e9
--- /dev/null
+++ b/internal/web/demo/demo.css
@@ -0,0 +1,8 @@
+/*
+    SPDX-FileCopyrightText: 2023 The Pion community <https://pion.ly>
+    SPDX-License-Identifier: MIT
+*/
+textarea {
+    width: 500px;
+    min-height: 75px;
+}
\ No newline at end of file
diff --git a/internal/web/demo/demo.js b/internal/web/demo/demo.js
new file mode 100644
index 0000000..1ea6c5d
--- /dev/null
+++ b/internal/web/demo/demo.js
@@ -0,0 +1,67 @@
+/* eslint-env browser */
+
+// SPDX-FileCopyrightText: 2023 The Pion community <https://pion.ly>
+// SPDX-License-Identifier: MIT
+
+const pc = new RTCPeerConnection({
+    iceServers: [{
+      urls: 'stun:stun.l.google.com:19302'
+    }]
+  })
+  const log = msg => {
+    document.getElementById('div').innerHTML += msg + '<br>'
+  }
+  
+  pc.ontrack = function (event) {
+    const el = document.createElement(event.track.kind)
+    el.srcObject = event.streams[0]
+    el.autoplay = true
+    el.controls = true
+  
+    document.getElementById('remoteVideos').appendChild(el)
+  }
+  
+  pc.oniceconnectionstatechange = e => log(pc.iceConnectionState)
+  pc.onicecandidate = event => {
+    if (event.candidate === null) {
+      document.getElementById('localSessionDescription').value = btoa(JSON.stringify(pc.localDescription))
+    }
+  }
+  
+  // Offer to receive 1 audio, and 1 video track
+  pc.addTransceiver('video', {
+    direction: 'sendrecv'
+  })
+  pc.addTransceiver('audio', {
+    direction: 'sendrecv'
+  })
+  
+  pc.createOffer().then(d => pc.setLocalDescription(d)).catch(log)
+  
+  window.startSession = () => {
+    const sd = document.getElementById('remoteSessionDescription').value
+    if (sd === '') {
+      return alert('Session Description must not be empty')
+    }
+  
+    try {
+      pc.setRemoteDescription(JSON.parse(atob(sd)))
+    } catch (e) {
+      alert(e)
+    }
+  }
+  
+  window.copySessionDescription = () => {
+    const browserSessionDescription = document.getElementById('localSessionDescription')
+  
+    browserSessionDescription.focus()
+    browserSessionDescription.select()
+  
+    try {
+      const successful = document.execCommand('copy')
+      const msg = successful ? 'successful' : 'unsuccessful'
+      log('Copying SessionDescription was ' + msg)
+    } catch (err) {
+      log('Oops, unable to copy SessionDescription ' + err)
+    }
+  }
\ No newline at end of file
diff --git a/internal/web/demo/index.html b/internal/web/demo/index.html
new file mode 100644
index 0000000..d73d0e1
--- /dev/null
+++ b/internal/web/demo/index.html
@@ -0,0 +1,30 @@
+<!--
+	SPDX-FileCopyrightText: 2023 The Pion community <https://pion.ly>
+	SPDX-License-Identifier: MIT
+-->
+Browser Session Description
+<br/>
+<textarea id="localSessionDescription" readonly="true"></textarea>
+<br/>
+
+<button onclick="window.copySessionDescription()">Copy browser Session Description to clipboard</button>
+
+<br/>
+<br/>
+<br/>
+
+Remote Session Description
+<br/>
+<textarea id="remoteSessionDescription"></textarea>
+<br/>
+<button onclick="window.startSession()">Start Session</button>
+<br/>
+<br/>
+
+Video
+<br/>
+<div id="remoteVideos"></div> <br />
+
+Logs
+<br/>
+<div id="div"></div>
\ No newline at end of file
diff --git a/internal/web/demo/readme.txt b/internal/web/demo/readme.txt
new file mode 100644
index 0000000..b29ccca
--- /dev/null
+++ b/internal/web/demo/readme.txt
@@ -0,0 +1 @@
+Initially copied from https://github.com/pion/webrtc/tree/master/examples/play-from-disk/jsfiddle
\ No newline at end of file
diff --git a/internal/web/handlers/signaling.go b/internal/web/handlers/signaling.go
index 8da0574..c964844 100644
--- a/internal/web/handlers/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -35,21 +35,31 @@ func NewSignalingHandler(
 
 func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPost {
+		h.l.Sugar().Errorw("unexpected method")
 		SetError(w, entities.ErrHTTPPostOnly)
 		return
 	}
 
 	params := entities.RequestParams{}
 	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
+		h.l.Sugar().Errorw("error while decoding request params json",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
 	if err := params.Valid(); err != nil {
+		h.l.Sugar().Errorw("invalid params",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
 
 	if err := h.webRTCController.SetupPeerConnection(); err != nil {
+		h.l.Sugar().Errorw("error while setting up web rtc connection",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
@@ -62,34 +72,52 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		}, "video", params.SRTStreamID,
 	)
 	if err != nil {
+		h.l.Sugar().Errorw("error while creating a web rtc track",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
 
 	metadataSender, err := h.webRTCController.CreateDataChannel(entities.MetadataChannelID)
 	if err != nil {
+		h.l.Sugar().Errorw("error while createing a web rtc data channel",
+			"error", err,
+		)
 		SetError(w, err)
 	}
 
 	if err = h.webRTCController.SetRemoteDescription(params.Offer); err != nil {
+		h.l.Sugar().Errorw("error while setting a remote web rtc description",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
 
 	localDescription, err := h.webRTCController.GatheringWebRTC()
 	if err != nil {
+		h.l.Sugar().Errorw("error while preparing a local web rtc description",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
 
 	localOfferDescription, err := json.Marshal(*localDescription)
 	if err != nil {
+		h.l.Sugar().Errorw("error while encoding a local web rtc description",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
 
 	srtConnection, err := h.srtController.Connect(&params)
 	if err != nil {
+		h.l.Sugar().Errorw("error while connecting to an srt server",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
@@ -97,6 +125,9 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	go h.streamingController.Stream(srtConnection, videoTrack, metadataSender)
 
 	if _, err := w.Write(localOfferDescription); err != nil {
+		h.l.Sugar().Errorw("error responding the local web rtc offer description",
+			"error", err,
+		)
 		SetError(w, err)
 		return
 	}
diff --git a/internal/web/router.go b/internal/web/router.go
index 96aac24..a9daf88 100644
--- a/internal/web/router.go
+++ b/internal/web/router.go
@@ -15,6 +15,7 @@ func NewServeMux(
 
 	mux.Handle("/", index)
 	mux.Handle("/doSignaling", setCors(signaling))
+	mux.Handle("/demo", http.FileServer(http.Dir("./demo")))
 
 	return mux
 }
diff --git a/scripts/ffmpeg_srt_live_listener.sh b/scripts/ffmpeg_srt_live_listener.sh
index f4d8c82..8c7235c 100755
--- a/scripts/ffmpeg_srt_live_listener.sh
+++ b/scripts/ffmpeg_srt_live_listener.sh
@@ -3,5 +3,5 @@ ffmpeg -hide_banner -loglevel verbose \
     -f lavfi -i "sine=frequency=1000:sample_rate=44100" \
     -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
     -b:v 1000k -bufsize 2000k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
-    -f mpegts "srt://${SRT_LISTENING_HOST}:${SRT_LISTENING_PORT}?mode=listener&latency=${SRT_LISTENING_LATENCY_US}"
+    -f mpegts "srt://${SRT_LISTENING_HOST}:${SRT_LISTENING_PORT}?mode=listener&latency=${SRT_LISTENING_LATENCY_US}&smoother=live&transtype=live"
 

From ec39e680770f76da76d41c5ff814dd98ee76526b Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sun, 28 Jan 2024 21:02:26 -0300
Subject: [PATCH 27/39] uses srt live transmit

---
 Dockerfile-srt-live                 | 19 +++++++++++++++++++
 docker-compose.yaml                 | 27 ++++++++++++++++++++++-----
 scripts/ffmpeg_mpegts_udp.sh        |  6 ++++++
 scripts/ffmpeg_srt_live_listener.sh |  7 -------
 scripts/srt.sh                      |  4 ++++
 5 files changed, 51 insertions(+), 12 deletions(-)
 create mode 100644 Dockerfile-srt-live
 create mode 100755 scripts/ffmpeg_mpegts_udp.sh
 delete mode 100755 scripts/ffmpeg_srt_live_listener.sh
 create mode 100755 scripts/srt.sh

diff --git a/Dockerfile-srt-live b/Dockerfile-srt-live
new file mode 100644
index 0000000..0682e06
--- /dev/null
+++ b/Dockerfile-srt-live
@@ -0,0 +1,19 @@
+FROM ubuntu:20.04 AS builder
+
+ENV SRT_VERSION="v1.5.3"
+ENV SRC_FOLDER="/opt/srt_lib"
+
+RUN apt-get clean && apt-get update && \
+    DEBIAN_FRONTEND=noninteractive apt-get install -y \
+      tclsh pkg-config cmake libssl-dev build-essential git \
+    && apt-get clean
+
+RUN \
+  mkdir -p "${SRC_FOLDER}" && \
+  git clone --depth 1 --branch "${SRT_VERSION}" https://github.com/Haivision/srt && \
+  cd srt && \
+  ./configure --prefix=. $(configure) && \
+  make && \
+  make install
+ENV PATH="${PATH}:/srt" 
+WORKDIR ${WD}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 0d56f69..cd19edd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -12,16 +12,18 @@ services:
       - "8081:8081"
       - "8081:8081/udp"
 
-  origin: # simulating an srt origin live transmission
-    image: jrottenberg/ffmpeg:4.4-alpine
+  srt:
+    build:
+      context: .
+      dockerfile: Dockerfile-srt-live
     entrypoint: sh
-    command: "/scripts/ffmpeg_srt_live_listener.sh"
+    command: "./scripts/srt.sh"
     volumes:
       - "./scripts:/scripts"
     environment:
       - SRT_LISTENING_PORT=40052
-      - SRT_LISTENING_HOST=0.0.0.0
-      - SRT_LISTENING_LATENCY_US=400000
+      - SRT_UDP_TS_INPUT_HOST=0.0.0.0
+      - SRT_UDP_TS_INPUT_PORT=1234
     ports:
       - "40052:40052/udp"
     depends_on:
@@ -29,3 +31,18 @@ services:
     links:
       - app
 
+  origin: # simulating an mpeg-ts upd origin live transmission
+    image: jrottenberg/ffmpeg:4.4-alpine
+    entrypoint: sh
+    command: "/scripts/ffmpeg_mpegts_udp.sh"
+    volumes:
+      - "./scripts:/scripts"
+    environment:
+      - SRT_INPUT_HOST=srt
+      - SRT_INPUT_PORT=1234
+      - PKT_SIZE=1316
+    depends_on:
+      - srt
+    links:
+      - srt
+
diff --git a/scripts/ffmpeg_mpegts_udp.sh b/scripts/ffmpeg_mpegts_udp.sh
new file mode 100755
index 0000000..a601c4c
--- /dev/null
+++ b/scripts/ffmpeg_mpegts_udp.sh
@@ -0,0 +1,6 @@
+ffmpeg -hide_banner -loglevel verbose \
+    -re -f lavfi -i testsrc2=size=1280x720:rate=30,format=yuv420p \
+    -f lavfi -i sine=frequency=1000:sample_rate=44100 \
+    -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
+    -b:v 1000k -bufsize 2000k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
+    -f mpegts "udp://${SRT_INPUT_HOST}:${SRT_INPUT_PORT}?pkt_size=${PKT_SIZE}"
\ No newline at end of file
diff --git a/scripts/ffmpeg_srt_live_listener.sh b/scripts/ffmpeg_srt_live_listener.sh
deleted file mode 100755
index 8c7235c..0000000
--- a/scripts/ffmpeg_srt_live_listener.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-ffmpeg -hide_banner -loglevel verbose \
-    -re -f lavfi -i "testsrc2=size=1280x720:rate=30,format=yuv420p" \
-    -f lavfi -i "sine=frequency=1000:sample_rate=44100" \
-    -c:v libx264 -preset veryfast -tune zerolatency -profile:v baseline \
-    -b:v 1000k -bufsize 2000k -x264opts keyint=30:min-keyint=30:scenecut=-1 \
-    -f mpegts "srt://${SRT_LISTENING_HOST}:${SRT_LISTENING_PORT}?mode=listener&latency=${SRT_LISTENING_LATENCY_US}&smoother=live&transtype=live"
-
diff --git a/scripts/srt.sh b/scripts/srt.sh
new file mode 100755
index 0000000..ec15130
--- /dev/null
+++ b/scripts/srt.sh
@@ -0,0 +1,4 @@
+# ref https://github.com/Haivision/srt/blob/master/docs/apps/srt-live-transmit.md
+srt-live-transmit \
+    udp://${SRT_UDP_TS_INPUT_HOST}:${SRT_UDP_TS_INPUT_PORT} \
+    srt://:${SRT_LISTENING_PORT}?congestion=live -v
\ No newline at end of file

From 8bd51c4b3cbf5f4629114166c7321f5ff3207713 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Sun, 28 Jan 2024 22:26:55 -0300
Subject: [PATCH 28/39] add proper srt server default

---
 internal/web/handlers/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/internal/web/handlers/index.html b/internal/web/handlers/index.html
index 314cb27..fd3c681 100644
--- a/internal/web/handlers/index.html
+++ b/internal/web/handlers/index.html
@@ -7,7 +7,7 @@
 
 <body>
   <b> SRT Host </b>
-  <input type="text" id="srt-host" value="origin"> <br />
+  <input type="text" id="srt-host" value="srt"> <br />
 
   <b> SRT Port </b>
   <input type="text" id="srt-port" value="40052"/> <br />

From 8f9a537c1545195c45166f85ec01ca95ff8b1959 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Mon, 29 Jan 2024 09:14:49 -0300
Subject: [PATCH 29/39] make webrtc api global

---
 internal/controllers/srt_controller.go    |  4 +
 internal/controllers/webrtc_controller.go | 95 +++++++++--------------
 internal/web/handlers/signaling.go        | 10 ++-
 main.go                                   |  6 +-
 4 files changed, 51 insertions(+), 64 deletions(-)

diff --git a/internal/controllers/srt_controller.go b/internal/controllers/srt_controller.go
index 78c17d2..e95696d 100644
--- a/internal/controllers/srt_controller.go
+++ b/internal/controllers/srt_controller.go
@@ -19,6 +19,7 @@ func NewSRTController(c *entities.Config, l *zap.Logger) *SRTController {
 }
 
 func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connection, error) {
+	c.l.Sugar().Infow("trying to connect srt")
 	if params == nil {
 		return nil, entities.ErrMissingRemoteOffer
 	}
@@ -47,6 +48,9 @@ func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connec
 		Port: params.SRTPort,
 	})
 	if err != nil {
+		c.l.Sugar().Infow("failed to connect srt",
+			"error", err,
+		)
 		return nil, err
 	}
 	c.l.Sugar().Infow("Connected to SRT")
diff --git a/internal/controllers/webrtc_controller.go b/internal/controllers/webrtc_controller.go
index 327a505..dc55da5 100644
--- a/internal/controllers/webrtc_controller.go
+++ b/internal/controllers/webrtc_controller.go
@@ -10,31 +10,25 @@ import (
 )
 
 type WebRTCController struct {
-	c      *entities.Config
-	l      *zap.Logger
-	iceTcp net.Listener
-	iceUdp net.PacketConn
-	peer   *webrtc.PeerConnection
+	c   *entities.Config
+	l   *zap.Logger
+	api *webrtc.API
 }
 
 func NewWebRTCController(
 	c *entities.Config,
 	l *zap.Logger,
-	iceTcp net.Listener,
-	iceUdp net.PacketConn,
+	api *webrtc.API,
 ) *WebRTCController {
 	return &WebRTCController{
-		c:      c,
-		l:      l,
-		iceTcp: iceTcp,
-		iceUdp: iceUdp,
+		c:   c,
+		l:   l,
+		api: api,
 	}
 }
 
-func (c *WebRTCController) SetupPeerConnection() error {
-	if c.peer != nil {
-		return nil
-	}
+func (c *WebRTCController) CreatePeerConnection() (*webrtc.PeerConnection, error) {
+	c.l.Sugar().Infow("trying to set up web rtc conn")
 
 	peerConnectionConfiguration := webrtc.Configuration{}
 	if !c.c.EnableICEMux {
@@ -45,23 +39,12 @@ func (c *WebRTCController) SetupPeerConnection() error {
 		}
 	}
 
-	mediaEngine, err := NewWebRTCMediaEngine()
+	peerConnection, err := c.api.NewPeerConnection(peerConnectionConfiguration)
 	if err != nil {
-		return err
-	}
-
-	api := webrtc.NewAPI(
-		webrtc.WithSettingEngine(NewWebRTCSettingsEngine(
-			c.c,
-			c.iceTcp,
-			c.iceUdp,
-		)),
-		webrtc.WithMediaEngine(mediaEngine),
-	)
-
-	peerConnection, err := api.NewPeerConnection(peerConnectionConfiguration)
-	if err != nil {
-		return err
+		c.l.Sugar().Errorw("error while creating a new peer connection",
+			"error", err,
+		)
+		return nil, err
 	}
 
 	peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
@@ -69,67 +52,54 @@ func (c *WebRTCController) SetupPeerConnection() error {
 			"status", connectionState.String(),
 		)
 	})
-	c.peer = peerConnection
-	return nil
+
+	return peerConnection, nil
 }
 
-func (c *WebRTCController) CreateTrack(track entities.Track, id string, streamId string) (*webrtc.TrackLocalStaticSample, error) {
+func (c *WebRTCController) CreateTrack(peer *webrtc.PeerConnection, track entities.Track, id string, streamId string) (*webrtc.TrackLocalStaticSample, error) {
 	codecCapability := mapper.FromTrackToRTPCodecCapability(track)
 	webRTCtrack, err := webrtc.NewTrackLocalStaticSample(codecCapability, id, streamId)
 	if err != nil {
 		return nil, err
 	}
 
-	if _, err := c.peer.AddTrack(webRTCtrack); err != nil {
+	if _, err := peer.AddTrack(webRTCtrack); err != nil {
 		return nil, err
 	}
 	return webRTCtrack, nil
 }
 
-func (c *WebRTCController) CreateDataChannel(channelID string) (*webrtc.DataChannel, error) {
-	if c.peer == nil {
-		// TODO: or call SetupPeerConnection?
-		return nil, entities.ErrMissingWebRTCSetup
-	}
-
-	metadataSender, err := c.peer.CreateDataChannel(channelID, nil)
+func (c *WebRTCController) CreateDataChannel(peer *webrtc.PeerConnection, channelID string) (*webrtc.DataChannel, error) {
+	metadataSender, err := peer.CreateDataChannel(channelID, nil)
 	if err != nil {
 		return nil, err
 	}
 	return metadataSender, nil
 }
 
-func (c *WebRTCController) SetRemoteDescription(desc webrtc.SessionDescription) error {
-	if c.peer == nil {
-		// TODO: or call SetupPeerConnection?
-		return entities.ErrMissingWebRTCSetup
-	}
-
-	err := c.peer.SetRemoteDescription(desc)
+func (c *WebRTCController) SetRemoteDescription(peer *webrtc.PeerConnection, desc webrtc.SessionDescription) error {
+	err := peer.SetRemoteDescription(desc)
 	if err != nil {
 		return err
 	}
 	return nil
 }
 
-func (c *WebRTCController) GatheringWebRTC() (*webrtc.SessionDescription, error) {
-	if c.peer == nil {
-		// TODO: or call SetupPeerConnection?
-		return nil, entities.ErrMissingWebRTCSetup
-	}
+func (c *WebRTCController) GatheringWebRTC(peer *webrtc.PeerConnection) (*webrtc.SessionDescription, error) {
 
 	c.l.Sugar().Infow("Gathering WebRTC Candidates")
-	gatherComplete := webrtc.GatheringCompletePromise(c.peer)
-	answer, err := c.peer.CreateAnswer(nil)
+	gatherComplete := webrtc.GatheringCompletePromise(peer)
+	answer, err := peer.CreateAnswer(nil)
 	if err != nil {
 		return nil, err
-	} else if err = c.peer.SetLocalDescription(answer); err != nil {
+	} else if err = peer.SetLocalDescription(answer); err != nil {
 		return nil, err
 	}
-	<-gatherComplete
 
+	<-gatherComplete
 	c.l.Sugar().Infow("Gathering WebRTC Candidates Complete")
-	return c.peer.LocalDescription(), nil
+
+	return peer.LocalDescription(), nil
 }
 
 func NewWebRTCSettingsEngine(c *entities.Config, tcpListener net.Listener, udpListener net.PacketConn) webrtc.SettingEngine {
@@ -150,6 +120,13 @@ func NewWebRTCMediaEngine() (*webrtc.MediaEngine, error) {
 	return mediaEngine, nil
 }
 
+func NewWebRTCAPI(mediaEngine *webrtc.MediaEngine, settingEngine webrtc.SettingEngine) *webrtc.API {
+	return webrtc.NewAPI(
+		webrtc.WithSettingEngine(settingEngine),
+		webrtc.WithMediaEngine(mediaEngine),
+	)
+}
+
 func NewTCPICEServer(c *entities.Config) (net.Listener, error) {
 	tcpListener, err := net.ListenTCP("tcp", &net.TCPAddr{
 		IP:   net.IP{0, 0, 0, 0},
diff --git a/internal/web/handlers/signaling.go b/internal/web/handlers/signaling.go
index c964844..de65f74 100644
--- a/internal/web/handlers/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -56,7 +56,8 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if err := h.webRTCController.SetupPeerConnection(); err != nil {
+	peer, err := h.webRTCController.CreatePeerConnection()
+	if err != nil {
 		h.l.Sugar().Errorw("error while setting up web rtc connection",
 			"error", err,
 		)
@@ -67,6 +68,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// TODO: create tracks according with SRT available streams
 	// Create a video track
 	videoTrack, err := h.webRTCController.CreateTrack(
+		peer,
 		entities.Track{
 			Type: entities.H264,
 		}, "video", params.SRTStreamID,
@@ -79,7 +81,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	metadataSender, err := h.webRTCController.CreateDataChannel(entities.MetadataChannelID)
+	metadataSender, err := h.webRTCController.CreateDataChannel(peer, entities.MetadataChannelID)
 	if err != nil {
 		h.l.Sugar().Errorw("error while createing a web rtc data channel",
 			"error", err,
@@ -87,7 +89,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		SetError(w, err)
 	}
 
-	if err = h.webRTCController.SetRemoteDescription(params.Offer); err != nil {
+	if err = h.webRTCController.SetRemoteDescription(peer, params.Offer); err != nil {
 		h.l.Sugar().Errorw("error while setting a remote web rtc description",
 			"error", err,
 		)
@@ -95,7 +97,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	localDescription, err := h.webRTCController.GatheringWebRTC()
+	localDescription, err := h.webRTCController.GatheringWebRTC(peer)
 	if err != nil {
 		h.l.Sugar().Errorw("error while preparing a local web rtc description",
 			"error", err,
diff --git a/main.go b/main.go
index ffc88d3..bc23f84 100644
--- a/main.go
+++ b/main.go
@@ -46,10 +46,14 @@ func main() {
 		fx.Provide(controllers.NewUDPICEServer),
 
 		// Controllers
-		fx.Provide(controllers.NewWebRTCController),
 		fx.Provide(controllers.NewSRTController),
 		fx.Provide(controllers.NewStreamingController),
 
+		fx.Provide(controllers.NewWebRTCController),
+		fx.Provide(controllers.NewWebRTCSettingsEngine),
+		fx.Provide(controllers.NewWebRTCMediaEngine),
+		fx.Provide(controllers.NewWebRTCAPI),
+
 		// Logging, Config
 		fx.Provide(zap.NewProduction),
 		fx.Provide(func() *entities.Config {

From 1812137aefa204b9f4ae76ec94b741cd484c5564 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Mon, 29 Jan 2024 09:29:40 -0300
Subject: [PATCH 30/39] set live mode for srt

---
 scripts/srt.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/srt.sh b/scripts/srt.sh
index ec15130..028cb61 100755
--- a/scripts/srt.sh
+++ b/scripts/srt.sh
@@ -1,4 +1,4 @@
 # ref https://github.com/Haivision/srt/blob/master/docs/apps/srt-live-transmit.md
 srt-live-transmit \
-    udp://${SRT_UDP_TS_INPUT_HOST}:${SRT_UDP_TS_INPUT_PORT} \
-    srt://:${SRT_LISTENING_PORT}?congestion=live -v
\ No newline at end of file
+    "udp://${SRT_UDP_TS_INPUT_HOST}:${SRT_UDP_TS_INPUT_PORT}" \
+    "srt://:${SRT_LISTENING_PORT}?congestion=live&transtype=live&groupconnect=1" -v
\ No newline at end of file

From 5bfd75f3d8de2d6fa87fedf66693855648044c27 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Mon, 29 Jan 2024 15:28:09 -0300
Subject: [PATCH 31/39] add setup and clean up for srt

---
 internal/controllers/srt_controller.go | 41 ++++++++++++++++++++++++--
 scripts/srt.sh                         |  2 +-
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/internal/controllers/srt_controller.go b/internal/controllers/srt_controller.go
index e95696d..33898de 100644
--- a/internal/controllers/srt_controller.go
+++ b/internal/controllers/srt_controller.go
@@ -1,8 +1,11 @@
 package controllers
 
 import (
+	"context"
+
 	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/flavioribeiro/donut/internal/entities"
+	"go.uber.org/fx"
 	"go.uber.org/zap"
 )
 
@@ -11,11 +14,41 @@ type SRTController struct {
 	l *zap.Logger
 }
 
-func NewSRTController(c *entities.Config, l *zap.Logger) *SRTController {
+func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTController, error) {
+	// Handle logs
+	astisrt.SetLogLevel(astisrt.LogLevel(astisrt.LogLevelError))
+	astisrt.SetLogHandler(func(ll astisrt.LogLevel, file, area, msg string, line int) {
+		l.Sugar().Infow("SRT",
+			"ll", ll,
+			"msg", msg,
+		)
+	})
+
+	// Startup srt
+	if err := astisrt.Startup(); err != nil {
+		l.Sugar().Errorw("failed to start up srt",
+			"error", err,
+		)
+		return nil, err
+	}
+
+	lc.Append(fx.Hook{
+		OnStop: func(ctx context.Context) error {
+			// Clean up
+			if err := astisrt.CleanUp(); err != nil {
+				l.Sugar().Errorw("failed to clean up srt",
+					"error", err,
+				)
+				return err
+			}
+			return nil
+		},
+	})
+
 	return &SRTController{
 		c: c,
 		l: l,
-	}
+	}, nil
 }
 
 func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connection, error) {
@@ -36,6 +69,8 @@ func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connec
 		ConnectionOptions: []astisrt.ConnectionOption{
 			astisrt.WithLatency(c.c.SRTConnectionLatencyMS),
 			astisrt.WithStreamid(params.SRTStreamID),
+			astisrt.WithCongestion("live"),
+			astisrt.WithTranstype(astisrt.Transtype(astisrt.TranstypeLive)),
 		},
 
 		OnDisconnect: func(conn *astisrt.Connection, err error) {
@@ -48,7 +83,7 @@ func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connec
 		Port: params.SRTPort,
 	})
 	if err != nil {
-		c.l.Sugar().Infow("failed to connect srt",
+		c.l.Sugar().Errorw("failed to connect srt",
 			"error", err,
 		)
 		return nil, err
diff --git a/scripts/srt.sh b/scripts/srt.sh
index 028cb61..638e375 100755
--- a/scripts/srt.sh
+++ b/scripts/srt.sh
@@ -1,4 +1,4 @@
 # ref https://github.com/Haivision/srt/blob/master/docs/apps/srt-live-transmit.md
 srt-live-transmit \
     "udp://${SRT_UDP_TS_INPUT_HOST}:${SRT_UDP_TS_INPUT_PORT}" \
-    "srt://:${SRT_LISTENING_PORT}?congestion=live&transtype=live&groupconnect=1" -v
\ No newline at end of file
+    "srt://:${SRT_LISTENING_PORT}?congestion=live&transtype=live" -v
\ No newline at end of file

From 89b63f1809be8eb812e969340a215b9c31f8671c Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Mon, 29 Jan 2024 16:31:34 -0300
Subject: [PATCH 32/39] add error handler middleware

---
 internal/web/handlers/http.go      | 12 --------
 internal/web/handlers/media.go     | 48 ------------------------------
 internal/web/handlers/signaling.go | 44 ++++++++++-----------------
 internal/web/router.go             | 18 ++++++++++-
 4 files changed, 32 insertions(+), 90 deletions(-)
 delete mode 100644 internal/web/handlers/http.go
 delete mode 100644 internal/web/handlers/media.go

diff --git a/internal/web/handlers/http.go b/internal/web/handlers/http.go
deleted file mode 100644
index 3377461..0000000
--- a/internal/web/handlers/http.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package handlers
-
-import "net/http"
-
-func SetError(w http.ResponseWriter, err error) {
-	http.Error(w, err.Error(), http.StatusInternalServerError)
-}
-
-func SetSuccessJson(w http.ResponseWriter) {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-}
diff --git a/internal/web/handlers/media.go b/internal/web/handlers/media.go
deleted file mode 100644
index 5f93f6f..0000000
--- a/internal/web/handlers/media.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package handlers
-
-import (
-	"encoding/json"
-	"log"
-	"net/http"
-
-	astisrt "github.com/asticode/go-astisrt/pkg"
-	"github.com/flavioribeiro/donut/internal/entities"
-)
-
-type MediaHandler struct{}
-
-func NewMediaHandler() *MediaHandler {
-	return &MediaHandler{}
-}
-
-func (m *MediaHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Method != http.MethodGet {
-		SetError(w, entities.ErrHTTPGetOnly)
-		return
-	}
-
-	params := entities.RequestParams{}
-	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
-		SetError(w, err)
-		return
-	}
-
-	log.Println("Connecting to SRT ", params)
-	_, err := astisrt.Dial(astisrt.DialOptions{
-		ConnectionOptions: []astisrt.ConnectionOption{
-			astisrt.WithLatency(300),
-			astisrt.WithStreamid(params.SRTStreamID),
-		},
-
-		// Callback when the connection is disconnected
-		OnDisconnect: func(c *astisrt.Connection, err error) { log.Fatal("Disconnected from SRT") },
-
-		Host: params.SRTHost,
-		Port: params.SRTPort,
-	})
-	if err != nil {
-		SetError(w, err)
-		return
-	}
-	log.Println("Connected to SRT")
-}
diff --git a/internal/web/handlers/signaling.go b/internal/web/handlers/signaling.go
index de65f74..2665df2 100644
--- a/internal/web/handlers/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -33,11 +33,10 @@ func NewSignalingHandler(
 	}
 }
 
-func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
+func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) error {
 	if r.Method != http.MethodPost {
 		h.l.Sugar().Errorw("unexpected method")
-		SetError(w, entities.ErrHTTPPostOnly)
-		return
+		return entities.ErrHTTPPostOnly
 	}
 
 	params := entities.RequestParams{}
@@ -45,15 +44,13 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.l.Sugar().Errorw("error while decoding request params json",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 	if err := params.Valid(); err != nil {
 		h.l.Sugar().Errorw("invalid params",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
 	peer, err := h.webRTCController.CreatePeerConnection()
@@ -61,8 +58,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.l.Sugar().Errorw("error while setting up web rtc connection",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
 	// TODO: create tracks according with SRT available streams
@@ -77,8 +73,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.l.Sugar().Errorw("error while creating a web rtc track",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
 	metadataSender, err := h.webRTCController.CreateDataChannel(peer, entities.MetadataChannelID)
@@ -86,15 +81,14 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.l.Sugar().Errorw("error while createing a web rtc data channel",
 			"error", err,
 		)
-		SetError(w, err)
+		return err
 	}
 
 	if err = h.webRTCController.SetRemoteDescription(peer, params.Offer); err != nil {
 		h.l.Sugar().Errorw("error while setting a remote web rtc description",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
 	localDescription, err := h.webRTCController.GatheringWebRTC(peer)
@@ -102,17 +96,17 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.l.Sugar().Errorw("error while preparing a local web rtc description",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
-	localOfferDescription, err := json.Marshal(*localDescription)
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+	err = json.NewEncoder(w).Encode(*localDescription)
 	if err != nil {
 		h.l.Sugar().Errorw("error while encoding a local web rtc description",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
 	srtConnection, err := h.srtController.Connect(&params)
@@ -120,18 +114,10 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 		h.l.Sugar().Errorw("error while connecting to an srt server",
 			"error", err,
 		)
-		SetError(w, err)
-		return
+		return err
 	}
 
 	go h.streamingController.Stream(srtConnection, videoTrack, metadataSender)
 
-	if _, err := w.Write(localOfferDescription); err != nil {
-		h.l.Sugar().Errorw("error responding the local web rtc offer description",
-			"error", err,
-		)
-		SetError(w, err)
-		return
-	}
-	SetSuccessJson(w)
+	return nil
 }
diff --git a/internal/web/router.go b/internal/web/router.go
index a9daf88..0f8cf92 100644
--- a/internal/web/router.go
+++ b/internal/web/router.go
@@ -4,17 +4,23 @@ import (
 	"net/http"
 
 	"github.com/flavioribeiro/donut/internal/web/handlers"
+	"go.uber.org/zap"
 )
 
+type ErrorHTTPHandler interface {
+	ServeHTTP(w http.ResponseWriter, r *http.Request) error
+}
+
 func NewServeMux(
 	index *handlers.IndexHandler,
 	signaling *handlers.SignalingHandler,
+	l *zap.Logger,
 ) *http.ServeMux {
 
 	mux := http.NewServeMux()
 
 	mux.Handle("/", index)
-	mux.Handle("/doSignaling", setCors(signaling))
+	mux.Handle("/doSignaling", setCors(errorHandler(l, signaling)))
 	mux.Handle("/demo", http.FileServer(http.Dir("./demo")))
 
 	return mux
@@ -32,3 +38,13 @@ func setCors(next http.Handler) http.Handler {
 		next.ServeHTTP(w, r)
 	})
 }
+
+func errorHandler(l *zap.Logger, next ErrorHTTPHandler) http.Handler {
+	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		err := next.ServeHTTP(w, r)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+	})
+}

From 1e29f3c4abba7cb776be88135d36bd60106c9d00 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Tue, 30 Jan 2024 18:33:47 -0300
Subject: [PATCH 33/39] leverage error handling as a middleware

---
 internal/controllers/srt_controller.go |  2 +-
 internal/web/handlers/signaling.go     | 21 +++++++++++----------
 internal/web/router.go                 |  3 +++
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/internal/controllers/srt_controller.go b/internal/controllers/srt_controller.go
index 33898de..85bdd57 100644
--- a/internal/controllers/srt_controller.go
+++ b/internal/controllers/srt_controller.go
@@ -16,7 +16,7 @@ type SRTController struct {
 
 func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTController, error) {
 	// Handle logs
-	astisrt.SetLogLevel(astisrt.LogLevel(astisrt.LogLevelError))
+	astisrt.SetLogLevel(astisrt.LogLevel(astisrt.LogLevelNotice))
 	astisrt.SetLogHandler(func(ll astisrt.LogLevel, file, area, msg string, line int) {
 		l.Sugar().Infow("SRT",
 			"ll", ll,
diff --git a/internal/web/handlers/signaling.go b/internal/web/handlers/signaling.go
index 2665df2..9cb8ed7 100644
--- a/internal/web/handlers/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -99,16 +99,6 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 		return err
 	}
 
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(http.StatusOK)
-	err = json.NewEncoder(w).Encode(*localDescription)
-	if err != nil {
-		h.l.Sugar().Errorw("error while encoding a local web rtc description",
-			"error", err,
-		)
-		return err
-	}
-
 	srtConnection, err := h.srtController.Connect(&params)
 	if err != nil {
 		h.l.Sugar().Errorw("error while connecting to an srt server",
@@ -119,5 +109,16 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 
 	go h.streamingController.Stream(srtConnection, videoTrack, metadataSender)
 
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(http.StatusOK)
+
+	err = json.NewEncoder(w).Encode(*localDescription)
+	if err != nil {
+		h.l.Sugar().Errorw("error while encoding a local web rtc description",
+			"error", err,
+		)
+		return err
+	}
+
 	return nil
 }
diff --git a/internal/web/router.go b/internal/web/router.go
index 0f8cf92..9a323cb 100644
--- a/internal/web/router.go
+++ b/internal/web/router.go
@@ -43,6 +43,9 @@ func errorHandler(l *zap.Logger, next ErrorHTTPHandler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		err := next.ServeHTTP(w, r)
 		if err != nil {
+			l.Sugar().Errorw("error on handler",
+				"err", err,
+			)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}

From a903aa17d74b3d67a6af6e9971528bbff351019b Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 31 Jan 2024 00:21:15 -0300
Subject: [PATCH 34/39] provides cancelation when a component stop responding
 it closes all resources

---
 FAQ.md                                       | 13 ++++
 internal/controllers/srt_controller.go       | 10 ++-
 internal/controllers/streaming_controller.go | 75 +++++++++++---------
 internal/controllers/webrtc_controller.go    | 15 +++-
 internal/entities/entities.go                | 11 +++
 internal/web/handlers/signaling.go           | 16 ++++-
 6 files changed, 97 insertions(+), 43 deletions(-)

diff --git a/FAQ.md b/FAQ.md
index f513f20..d94658f 100644
--- a/FAQ.md
+++ b/FAQ.md
@@ -1,5 +1,18 @@
 # FAQ
 
+## I can't connect two tabs or browser at the same for the SRT
+
+It doesn't work When I try to connect in another browser or tab, or even when I try to refresh the current page. It raises an seemingly timeout error.
+
+```
+astisrt: connecting failed: astisrt: connecting failed: astisrt: Connection setup failure: connection timed out
+```
+
+Apparently both `ffmpeg` and `srt-live-transmit` won't allow multiple persistent connections.
+
+ref1 https://github.com/Haivision/srt/blob/master/docs/apps/srt-live-transmit.md#medium-srt
+ref2 https://github.com/asticode/go-astisrt/issues/6#issuecomment-1917076767
+
 ## It's not working on Firefox/Chrome/Edge.
 
 [WebRTC establishes a baseline set of codecs which all compliant browsers are required to support. Some browsers may choose to allow other codecs as well.](https://developer.mozilla.org/en-US/docs/Web/Media/Formats/WebRTC_codecs#supported_video_codecs)
diff --git a/internal/controllers/srt_controller.go b/internal/controllers/srt_controller.go
index 85bdd57..bc88d1a 100644
--- a/internal/controllers/srt_controller.go
+++ b/internal/controllers/srt_controller.go
@@ -51,18 +51,15 @@ func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTC
 	}, nil
 }
 
-func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connection, error) {
+func (c *SRTController) Connect(cancel context.CancelFunc, params entities.RequestParams) (*astisrt.Connection, error) {
 	c.l.Sugar().Infow("trying to connect srt")
-	if params == nil {
-		return nil, entities.ErrMissingRemoteOffer
-	}
 
 	if err := params.Valid(); err != nil {
 		return nil, err
 	}
 
 	c.l.Sugar().Infow("Connecting to SRT ",
-		"offer", params,
+		"offer", params.String(),
 	)
 
 	conn, err := astisrt.Dial(astisrt.DialOptions{
@@ -74,9 +71,10 @@ func (c *SRTController) Connect(params *entities.RequestParams) (*astisrt.Connec
 		},
 
 		OnDisconnect: func(conn *astisrt.Connection, err error) {
-			c.l.Sugar().Fatalw("Disconnected from SRT",
+			c.l.Sugar().Infow("Canceling SRT",
 				"error", err,
 			)
+			cancel()
 		},
 
 		Host: params.SRTHost,
diff --git a/internal/controllers/streaming_controller.go b/internal/controllers/streaming_controller.go
index 49c7a39..4a159e5 100644
--- a/internal/controllers/streaming_controller.go
+++ b/internal/controllers/streaming_controller.go
@@ -1,7 +1,6 @@
 package controllers
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"io"
@@ -28,59 +27,69 @@ func NewStreamingController(c *entities.Config, l *zap.Logger) *StreamingControl
 	}
 }
 
-func (c *StreamingController) Stream(srtConnection *astisrt.Connection, videoTrack *webrtc.TrackLocalStaticSample, metadataTrack *webrtc.DataChannel) {
+func (c *StreamingController) Stream(sp entities.StreamParameters) {
 	r, w := io.Pipe()
+
 	defer r.Close()
 	defer w.Close()
-	defer srtConnection.Close()
+	defer sp.SRTConnection.Close()
+	defer sp.WebRTCConn.Close()
+	defer sp.Cancel()
 
 	c.l.Sugar().Infow("start streaming")
 
 	// TODO: pick the proper transport? is it possible to get rtp instead?
-	go c.readFromSRTIntoWriterPipe(srtConnection, w)
+	go c.readFromSRTIntoWriterPipe(sp.SRTConnection, w)
 
-	dmx := astits.NewDemuxer(context.Background(), r)
+	// reading from reader pipe into mpeg-ts demuxer
+	dmx := astits.NewDemuxer(sp.Ctx, r)
 	eia608Reader := eia608.NewEIA608Reader()
 	h264PID := uint16(0)
 
-	// reading from reader pipe
 	for {
-		d, err := dmx.NextData()
-		if err != nil {
-			c.l.Sugar().Errorw("failed to demux mpeg ts",
-				"error", err,
-			)
-			break
-		}
-
-		if d.PMT != nil {
-			h264PID = c.captureMediaInfoAndSendToWebRTC(d, metadataTrack, h264PID)
-			c.captureBitrateAndSendToWebRTC(d, metadataTrack)
-		}
-
-		if d.PID == h264PID && d.PES != nil {
-			if err = videoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
-				c.l.Sugar().Errorw("failed to write a sample mpeg ts to web rtc",
-					"error", err,
-				)
-				break
-			}
-			captions, err := eia608Reader.Parse(d.PES)
+		select {
+		case <-sp.Ctx.Done():
+			c.l.Sugar().Errorw("stream was cancelled")
+			return
+		default:
+			d, err := dmx.NextData()
 			if err != nil {
-				c.l.Sugar().Errorw("failed to parse eia 608",
+				c.l.Sugar().Errorw("failed to demux mpeg ts",
 					"error", err,
 				)
 				break
 			}
-			if captions != "" {
-				captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
-				if err != nil {
-					c.l.Sugar().Errorw("failed to build captions message",
+
+			if d.PMT != nil {
+				h264PID = c.captureMediaInfoAndSendToWebRTC(d, sp.MetadataTrack, h264PID)
+				c.captureBitrateAndSendToWebRTC(d, sp.MetadataTrack)
+			}
+
+			if d.PID == h264PID && d.PES != nil {
+				// writing video from mpeg-ts into webrtc
+				if err = sp.VideoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
+					c.l.Sugar().Errorw("failed to write a sample mpeg ts to web rtc",
 						"error", err,
 					)
 					break
 				}
-				metadataTrack.SendText(captionsMsg)
+				captions, err := eia608Reader.Parse(d.PES)
+				if err != nil {
+					c.l.Sugar().Errorw("failed to parse eia 608",
+						"error", err,
+					)
+					break
+				}
+				if captions != "" {
+					captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
+					if err != nil {
+						c.l.Sugar().Errorw("failed to build captions message",
+							"error", err,
+						)
+						break
+					}
+					sp.MetadataTrack.SendText(captionsMsg)
+				}
 			}
 		}
 	}
diff --git a/internal/controllers/webrtc_controller.go b/internal/controllers/webrtc_controller.go
index dc55da5..6e24d39 100644
--- a/internal/controllers/webrtc_controller.go
+++ b/internal/controllers/webrtc_controller.go
@@ -1,6 +1,7 @@
 package controllers
 
 import (
+	"context"
 	"net"
 
 	"github.com/flavioribeiro/donut/internal/entities"
@@ -27,7 +28,7 @@ func NewWebRTCController(
 	}
 }
 
-func (c *WebRTCController) CreatePeerConnection() (*webrtc.PeerConnection, error) {
+func (c *WebRTCController) CreatePeerConnection(cancel context.CancelFunc) (*webrtc.PeerConnection, error) {
 	c.l.Sugar().Infow("trying to set up web rtc conn")
 
 	peerConnectionConfiguration := webrtc.Configuration{}
@@ -48,6 +49,18 @@ func (c *WebRTCController) CreatePeerConnection() (*webrtc.PeerConnection, error
 	}
 
 	peerConnection.OnICEConnectionStateChange(func(connectionState webrtc.ICEConnectionState) {
+		finished := connectionState == webrtc.ICEConnectionStateClosed ||
+			connectionState == webrtc.ICEConnectionStateDisconnected ||
+			connectionState == webrtc.ICEConnectionStateCompleted ||
+			connectionState == webrtc.ICEConnectionStateFailed
+
+		if finished {
+			c.l.Sugar().Infow("Canceling webrtc",
+				"status", connectionState.String(),
+			)
+			cancel()
+		}
+
 		c.l.Sugar().Infow("OnICEConnectionStateChange",
 			"status", connectionState.String(),
 		)
diff --git a/internal/entities/entities.go b/internal/entities/entities.go
index 9ede0dd..084956a 100644
--- a/internal/entities/entities.go
+++ b/internal/entities/entities.go
@@ -1,8 +1,10 @@
 package entities
 
 import (
+	"context"
 	"fmt"
 
+	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/pion/webrtc/v3"
 )
 
@@ -67,6 +69,15 @@ type Track struct {
 	Type TrackType
 }
 
+type StreamParameters struct {
+	WebRTCConn    *webrtc.PeerConnection
+	Cancel        context.CancelFunc
+	Ctx           context.Context
+	SRTConnection *astisrt.Connection
+	VideoTrack    *webrtc.TrackLocalStaticSample
+	MetadataTrack *webrtc.DataChannel
+}
+
 type Config struct {
 	HTTPPort int32  `required:"true" default:"8080"`
 	HTTPHost string `required:"true" default:"0.0.0.0"`
diff --git a/internal/web/handlers/signaling.go b/internal/web/handlers/signaling.go
index 9cb8ed7..5967383 100644
--- a/internal/web/handlers/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -1,6 +1,7 @@
 package handlers
 
 import (
+	"context"
 	"encoding/json"
 	"net/http"
 
@@ -53,7 +54,9 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 		return err
 	}
 
-	peer, err := h.webRTCController.CreatePeerConnection()
+	ctx, cancel := context.WithCancel(context.Background())
+
+	peer, err := h.webRTCController.CreatePeerConnection(cancel)
 	if err != nil {
 		h.l.Sugar().Errorw("error while setting up web rtc connection",
 			"error", err,
@@ -99,7 +102,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 		return err
 	}
 
-	srtConnection, err := h.srtController.Connect(&params)
+	srtConnection, err := h.srtController.Connect(cancel, params)
 	if err != nil {
 		h.l.Sugar().Errorw("error while connecting to an srt server",
 			"error", err,
@@ -107,7 +110,14 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 		return err
 	}
 
-	go h.streamingController.Stream(srtConnection, videoTrack, metadataSender)
+	go h.streamingController.Stream(entities.StreamParameters{
+		Cancel:        cancel,
+		Ctx:           ctx,
+		WebRTCConn:    peer,
+		SRTConnection: srtConnection,
+		VideoTrack:    videoTrack,
+		MetadataTrack: metadataSender,
+	})
 
 	w.Header().Set("Content-Type", "application/json")
 	w.WriteHeader(http.StatusOK)

From d45babf6c5dc71ba7ac8a37f1d38904d26f9c89a Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 31 Jan 2024 09:28:23 -0300
Subject: [PATCH 35/39] renaming stream variables

---
 README.md                                    | 19 +++--------
 internal/controllers/streaming_controller.go | 33 +++++++++++---------
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/README.md b/README.md
index 6f79d4b..9b8571a 100644
--- a/README.md
+++ b/README.md
@@ -13,22 +13,9 @@ $ go install github.com/flavioribeiro/donut@latest
 ```
 Once installed, execute `donut`. This will be in your `$GOPATH/bin`. The default will be `~/go/bin/donut`
 
-
-### Install & Run using Docker
-
-Alternatively, you can build a docker image. Docker will take care of downloading the dependencies (including the libsrt) and compiling donut for you.
-
-```
-$ docker build -t donut .
-$ docker run -it -p 8080:8080 donut
-```
-
-### Open the Web UI
-Open [http://localhost:8080](http://localhost:8080). You will see three text boxes. Fill in your details for your SRT listener configuration and hit connect.
-
 ### Run using docker-compose
 
-Docker-compose can simulate an SRT live transmission and run the donut in separate containers.
+Alternatively, you can use `docker-compose` to simulate an SRT live transmission and run the donut effortless.
 
 ```
 $ make run
@@ -39,6 +26,10 @@ Open [http://localhost:8080](http://localhost:8080). You will see three text box
 
 ![donut docker-compose setup](/.github/docker-compose-donut-setup.webp "donut docker-compose setup")
 
+### How it works
+
+Please check the [How it works](/HOW_IT_WORKS.md) section.
+
 ### FAQ
 
 Please check the [FAQ](/FAQ.md) if you're facing any trouble.
\ No newline at end of file
diff --git a/internal/controllers/streaming_controller.go b/internal/controllers/streaming_controller.go
index 4a159e5..60e8eb9 100644
--- a/internal/controllers/streaming_controller.go
+++ b/internal/controllers/streaming_controller.go
@@ -42,7 +42,7 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 	go c.readFromSRTIntoWriterPipe(sp.SRTConnection, w)
 
 	// reading from reader pipe into mpeg-ts demuxer
-	dmx := astits.NewDemuxer(sp.Ctx, r)
+	mpegTSDemuxer := astits.NewDemuxer(sp.Ctx, r)
 	eia608Reader := eia608.NewEIA608Reader()
 	h264PID := uint16(0)
 
@@ -52,42 +52,45 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 			c.l.Sugar().Errorw("stream was cancelled")
 			return
 		default:
-			d, err := dmx.NextData()
+			// ref https://tsduck.io/download/docs/mpegts-introduction.pdf
+			mpegTSDemuxData, err := mpegTSDemuxer.NextData()
 			if err != nil {
-				c.l.Sugar().Errorw("failed to demux mpeg ts",
+				c.l.Sugar().Errorw("failed to demux mpeg-ts",
 					"error", err,
 				)
-				break
+				return
 			}
 
-			if d.PMT != nil {
-				h264PID = c.captureMediaInfoAndSendToWebRTC(d, sp.MetadataTrack, h264PID)
-				c.captureBitrateAndSendToWebRTC(d, sp.MetadataTrack)
+			if mpegTSDemuxData.PMT != nil {
+				// writing mpeg-ts meida metadata to the metadata webrtc channel
+				h264PID = c.captureMediaInfoAndSendToWebRTC(mpegTSDemuxData, sp.MetadataTrack, h264PID)
+				c.captureBitrateAndSendToWebRTC(mpegTSDemuxData, sp.MetadataTrack)
 			}
 
-			if d.PID == h264PID && d.PES != nil {
+			if mpegTSDemuxData.PID == h264PID && mpegTSDemuxData.PES != nil {
 				// writing video from mpeg-ts into webrtc
-				if err = sp.VideoTrack.WriteSample(media.Sample{Data: d.PES.Data, Duration: time.Second / 30}); err != nil {
-					c.l.Sugar().Errorw("failed to write a sample mpeg ts to web rtc",
+				if err = sp.VideoTrack.WriteSample(media.Sample{Data: mpegTSDemuxData.PES.Data, Duration: time.Second / 30}); err != nil {
+					c.l.Sugar().Errorw("failed to write a sample mpeg-ts to web rtc",
 						"error", err,
 					)
-					break
+					return
 				}
-				captions, err := eia608Reader.Parse(d.PES)
+				captions, err := eia608Reader.Parse(mpegTSDemuxData.PES)
 				if err != nil {
 					c.l.Sugar().Errorw("failed to parse eia 608",
 						"error", err,
 					)
-					break
+					return
 				}
 				if captions != "" {
-					captionsMsg, err := eia608.BuildCaptionsMessage(d.PES.Header.OptionalHeader.PTS, captions)
+					captionsMsg, err := eia608.BuildCaptionsMessage(mpegTSDemuxData.PES.Header.OptionalHeader.PTS, captions)
 					if err != nil {
 						c.l.Sugar().Errorw("failed to build captions message",
 							"error", err,
 						)
-						break
+						return
 					}
+					// writing metadata to the metadata webrtc channel
 					sp.MetadataTrack.SendText(captionsMsg)
 				}
 			}

From 1fc0f46b3f70b9eae5f124fcb3ca5a552f1cee9a Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 31 Jan 2024 14:23:20 -0300
Subject: [PATCH 36/39] moving entities and controllers to the right place

---
 h264/h264.go                                  | 114 ------------------
 .../controllers/eia608_controller.go          |  17 +--
 internal/controllers/h264_controller.go       |  59 +++++++++
 internal/controllers/streaming_controller.go  |   5 +-
 internal/entities/entities.go                 |   8 +-
 h264/types.go => internal/entities/h264.go    |  59 ++++++++-
 6 files changed, 130 insertions(+), 132 deletions(-)
 delete mode 100644 h264/h264.go
 rename eia608/eia608.go => internal/controllers/eia608_controller.go (82%)
 create mode 100644 internal/controllers/h264_controller.go
 rename h264/types.go => internal/entities/h264.go (78%)

diff --git a/h264/h264.go b/h264/h264.go
deleted file mode 100644
index 72bdec0..0000000
--- a/h264/h264.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package h264
-
-import (
-	"bytes"
-	"fmt"
-)
-
-func ParseNALUs(data []byte) (NALUs, error) {
-	var nalus NALUs
-
-	rawNALUs := bytes.Split(data, []byte{0x00, 0x00, 0x01})
-
-	for _, rawNALU := range rawNALUs[1:] {
-		nal, err := ParseNAL(rawNALU)
-		if err != nil {
-			return NALUs{}, err
-
-		}
-		nalus.Units = append(nalus.Units, nal)
-	}
-
-	return nalus, nil
-}
-
-func ParseNAL(data []byte) (NAL, error) {
-	index := 0
-	n := NAL{}
-	if data[index]>>7&0x01 != 0 {
-		return NAL{}, fmt.Errorf("forbidden_zero_bit is not 0")
-	}
-	n.RefIDC = (data[index] >> 5) & 0x03
-	n.UnitType = NALUnitType(data[index] & 0x1f)
-	numBytesInRBSP := 0
-	nalUnitHeaderBytes := 1
-	n.HeaderBytes = data[:nalUnitHeaderBytes]
-
-	index += nalUnitHeaderBytes
-
-	n.RBSPByte = make([]byte, 0, 16)
-	i := 0
-	for i = index; i < len(data); i++ {
-		if (i+2) < len(data) && (data[i] == 0x00 && data[i+1] == 0x00 && data[i+2] == 0x03) {
-			n.RBSPByte = append(n.RBSPByte, data[i], data[i+1])
-			i += 2
-			numBytesInRBSP += 2
-			// 0x03
-		} else {
-			n.RBSPByte = append(n.RBSPByte, data[i])
-			numBytesInRBSP++
-		}
-	}
-	index += numBytesInRBSP
-
-	n.ParseRBSP()
-
-	return n, nil
-}
-
-func (n *NAL) ParseRBSP() error {
-	switch n.UnitType {
-	case SupplementalEnhancementInformation:
-		err := n.parseSEI()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (n *NAL) parseSEI() error {
-	numBits := 0
-	byteOffset := 0
-	n.SEI.PayloadType = 0
-	n.SEI.PayloadSize = 0
-	nextBits := n.RBSPByte[byteOffset]
-
-	for {
-		if nextBits == 0xff {
-			n.PayloadType += 255
-			numBits += 8
-			byteOffset += numBits / 8
-			numBits = numBits % 8
-			nextBits = n.RBSPByte[byteOffset]
-			continue
-		}
-		break
-	}
-
-	n.PayloadType += int(nextBits)
-	numBits += 8
-	byteOffset += numBits / 8
-	numBits = numBits % 8
-	nextBits = n.RBSPByte[byteOffset]
-
-	// read size
-	for {
-		if nextBits == 0xff {
-			n.PayloadSize += 255
-			numBits += 8
-			byteOffset += numBits / 8
-			numBits = numBits % 8
-			nextBits = n.RBSPByte[byteOffset]
-			continue
-		}
-		break
-	}
-
-	n.PayloadSize += int(nextBits)
-	numBits += 8
-	byteOffset += numBits / 8
-
-	return nil
-}
diff --git a/eia608/eia608.go b/internal/controllers/eia608_controller.go
similarity index 82%
rename from eia608/eia608.go
rename to internal/controllers/eia608_controller.go
index 3ec2873..dd86823 100644
--- a/eia608/eia608.go
+++ b/internal/controllers/eia608_controller.go
@@ -1,11 +1,10 @@
-package eia608
+package controllers
 
 import (
 	"encoding/json"
 
-	"github.com/flavioribeiro/donut/h264"
-
 	"github.com/asticode/go-astits"
+	"github.com/flavioribeiro/donut/internal/entities"
 	gocaption "github.com/szatmary/gocaption"
 )
 
@@ -13,25 +12,19 @@ type EIA608Reader struct {
 	frame gocaption.EIA608Frame
 }
 
-type Cue struct {
-	Type      string
-	StartTime int64
-	Text      string
-}
-
 func NewEIA608Reader() (r *EIA608Reader) {
 	return &EIA608Reader{}
 }
 
 func (r *EIA608Reader) Parse(PES *astits.PESData) (string, error) {
-	nalus, err := h264.ParseNALUs(PES.Data)
+	nalus, err := ParseNALUs(PES.Data)
 	if err != nil {
 		return "", err
 	}
 	for _, nal := range nalus.Units {
 		// ANSI/SCTE 128-1 2020
 		// Note that SEI payload is a SEI payloadType of 4 which contains the itu_t_t35_payload_byte for the terminal provider
-		if nal.UnitType == h264.SupplementalEnhancementInformation && nal.SEI.PayloadType == 4 {
+		if nal.UnitType == entities.SupplementalEnhancementInformation && nal.SEI.PayloadType == 4 {
 			// ANSI/SCTE 128-1 2020
 			// Caption, AFD and bar data shall be carried in the SEI raw byte sequence payload (RBSP)
 			// syntax of the video Elementary Stream.
@@ -55,7 +48,7 @@ func (r *EIA608Reader) Parse(PES *astits.PESData) (string, error) {
 }
 
 func BuildCaptionsMessage(pts *astits.ClockReference, captions string) (string, error) {
-	cue := Cue{
+	cue := entities.Cue{
 		StartTime: pts.Base,
 		Text:      captions,
 		Type:      "captions",
diff --git a/internal/controllers/h264_controller.go b/internal/controllers/h264_controller.go
new file mode 100644
index 0000000..0306918
--- /dev/null
+++ b/internal/controllers/h264_controller.go
@@ -0,0 +1,59 @@
+package controllers
+
+import (
+	"bytes"
+	"fmt"
+
+	"github.com/flavioribeiro/donut/internal/entities"
+)
+
+func ParseNALUs(data []byte) (entities.NALUs, error) {
+	var nalus entities.NALUs
+
+	rawNALUs := bytes.Split(data, []byte{0x00, 0x00, 0x01})
+
+	for _, rawNALU := range rawNALUs[1:] {
+		nal, err := ParseNAL(rawNALU)
+		if err != nil {
+			return entities.NALUs{}, err
+
+		}
+		nalus.Units = append(nalus.Units, nal)
+	}
+
+	return nalus, nil
+}
+
+func ParseNAL(data []byte) (entities.NAL, error) {
+	index := 0
+	n := entities.NAL{}
+	if data[index]>>7&0x01 != 0 {
+		return entities.NAL{}, fmt.Errorf("forbidden_zero_bit is not 0")
+	}
+	n.RefIDC = (data[index] >> 5) & 0x03
+	n.UnitType = entities.NALUnitType(data[index] & 0x1f)
+	numBytesInRBSP := 0
+	nalUnitHeaderBytes := 1
+	n.HeaderBytes = data[:nalUnitHeaderBytes]
+
+	index += nalUnitHeaderBytes
+
+	n.RBSPByte = make([]byte, 0, 16)
+	i := 0
+	for i = index; i < len(data); i++ {
+		if (i+2) < len(data) && (data[i] == 0x00 && data[i+1] == 0x00 && data[i+2] == 0x03) {
+			n.RBSPByte = append(n.RBSPByte, data[i], data[i+1])
+			i += 2
+			numBytesInRBSP += 2
+			// 0x03
+		} else {
+			n.RBSPByte = append(n.RBSPByte, data[i])
+			numBytesInRBSP++
+		}
+	}
+	index += numBytesInRBSP
+
+	n.ParseRBSP()
+
+	return n, nil
+}
diff --git a/internal/controllers/streaming_controller.go b/internal/controllers/streaming_controller.go
index 60e8eb9..4561940 100644
--- a/internal/controllers/streaming_controller.go
+++ b/internal/controllers/streaming_controller.go
@@ -8,7 +8,6 @@ import (
 
 	astisrt "github.com/asticode/go-astisrt/pkg"
 	"github.com/asticode/go-astits"
-	"github.com/flavioribeiro/donut/eia608"
 	"github.com/flavioribeiro/donut/internal/entities"
 	"github.com/pion/webrtc/v3"
 	"github.com/pion/webrtc/v3/pkg/media"
@@ -43,7 +42,7 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 
 	// reading from reader pipe into mpeg-ts demuxer
 	mpegTSDemuxer := astits.NewDemuxer(sp.Ctx, r)
-	eia608Reader := eia608.NewEIA608Reader()
+	eia608Reader := NewEIA608Reader()
 	h264PID := uint16(0)
 
 	for {
@@ -83,7 +82,7 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 					return
 				}
 				if captions != "" {
-					captionsMsg, err := eia608.BuildCaptionsMessage(mpegTSDemuxData.PES.Header.OptionalHeader.PTS, captions)
+					captionsMsg, err := BuildCaptionsMessage(mpegTSDemuxData.PES.Header.OptionalHeader.PTS, captions)
 					if err != nil {
 						c.l.Sugar().Errorw("failed to build captions message",
 							"error", err,
diff --git a/internal/entities/entities.go b/internal/entities/entities.go
index 084956a..0afb91e 100644
--- a/internal/entities/entities.go
+++ b/internal/entities/entities.go
@@ -12,8 +12,6 @@ const (
 	MetadataChannelID string = "metadata"
 )
 
-type Media struct{}
-
 type RequestParams struct {
 	SRTHost     string
 	SRTPort     uint16 `json:",string"`
@@ -69,6 +67,12 @@ type Track struct {
 	Type TrackType
 }
 
+type Cue struct {
+	Type      string
+	StartTime int64
+	Text      string
+}
+
 type StreamParameters struct {
 	WebRTCConn    *webrtc.PeerConnection
 	Cancel        context.CancelFunc
diff --git a/h264/types.go b/internal/entities/h264.go
similarity index 78%
rename from h264/types.go
rename to internal/entities/h264.go
index 43b277e..a69a95c 100644
--- a/h264/types.go
+++ b/internal/entities/h264.go
@@ -1,4 +1,4 @@
-package h264
+package entities
 
 type NALUs struct {
 	Units []NAL
@@ -56,3 +56,60 @@ const (
 	Unspecified31                                           = NALUnitType(31) //	Unspecified
 
 )
+
+func (n *NAL) ParseRBSP() error {
+	switch n.UnitType {
+	case SupplementalEnhancementInformation:
+		err := n.parseSEI()
+		if err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (n *NAL) parseSEI() error {
+	numBits := 0
+	byteOffset := 0
+	n.SEI.PayloadType = 0
+	n.SEI.PayloadSize = 0
+	nextBits := n.RBSPByte[byteOffset]
+
+	for {
+		if nextBits == 0xff {
+			n.PayloadType += 255
+			numBits += 8
+			byteOffset += numBits / 8
+			numBits = numBits % 8
+			nextBits = n.RBSPByte[byteOffset]
+			continue
+		}
+		break
+	}
+
+	n.PayloadType += int(nextBits)
+	numBits += 8
+	byteOffset += numBits / 8
+	numBits = numBits % 8
+	nextBits = n.RBSPByte[byteOffset]
+
+	// read size
+	for {
+		if nextBits == 0xff {
+			n.PayloadSize += 255
+			numBits += 8
+			byteOffset += numBits / 8
+			numBits = numBits % 8
+			nextBits = n.RBSPByte[byteOffset]
+			continue
+		}
+		break
+	}
+
+	n.PayloadSize += int(nextBits)
+	numBits += 8
+	byteOffset += numBits / 8
+
+	return nil
+}

From f83dfa2d62c62c95478ba7ab6331ad323776c1b8 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Wed, 31 Jan 2024 16:51:08 -0300
Subject: [PATCH 37/39] fix docker

---
 Dockerfile          | 21 ++++++++-------------
 Dockerfile-srt-live | 15 +++++++++------
 docker-compose.yaml |  3 ++-
 3 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de2e683..e4673ad 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,9 @@
-FROM ubuntu:20.04 AS builder
+FROM golang:1.19
 
+ENV WD=/usr/src/app
 ENV SRT_VERSION="v1.5.3"
 ENV SRT_FOLDER="/opt/srt_lib"
+WORKDIR ${WD}
 
 RUN apt-get clean && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -12,27 +14,20 @@ RUN \
   mkdir -p "${SRT_FOLDER}" && \
   git clone --depth 1 --branch "${SRT_VERSION}" https://github.com/Haivision/srt && \
   cd srt && \
-  ./configure --prefix=. $(configure) && \
+  ./configure --prefix=${SRT_FOLDER} $(configure) && \
   make && \
   make install
 
-FROM golang:1.19
-ENV WD=/usr/src/app
-WORKDIR ${WD}
-
-RUN mkdir srt-lib
-COPY --from=builder /srt /opt/srt
-
 # To find where the srt.h and libsrt.so were you can
 # find / -name srt.h
 # find / -name libsrt.so
 # inside the container docker run -it --rm -t <TAG_YOU_BUILT> bash
 ENV GOPROXY=direct
-ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/opt/srt/lib/"
-ENV CGO_CFLAGS="-I/opt/srt/include/"
-ENV CGO_LDFLAGS="-L/opt/srt/lib/"
+ENV LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${SRT_FOLDER}/lib/"
+ENV CGO_CFLAGS="-I${SRT_FOLDER}/include/"
+ENV CGO_LDFLAGS="-L${SRT_FOLDER}/lib/"
 
 COPY . ./donut
 WORKDIR ${WD}/donut
 RUN go build .
-CMD ["/usr/src/app/donut/donut", "--enable-ice-mux=true"]
+CMD ["/usr/src/app/donut/donut", "--enable-ice-mux=true"]
\ No newline at end of file
diff --git a/Dockerfile-srt-live b/Dockerfile-srt-live
index 0682e06..476e5e2 100644
--- a/Dockerfile-srt-live
+++ b/Dockerfile-srt-live
@@ -1,7 +1,9 @@
-FROM ubuntu:20.04 AS builder
+FROM golang:1.19
 
+ENV WD=/usr/src/app
 ENV SRT_VERSION="v1.5.3"
-ENV SRC_FOLDER="/opt/srt_lib"
+ENV SRT_FOLDER="/opt/srt_lib"
+WORKDIR ${WD}
 
 RUN apt-get clean && apt-get update && \
     DEBIAN_FRONTEND=noninteractive apt-get install -y \
@@ -9,11 +11,12 @@ RUN apt-get clean && apt-get update && \
     && apt-get clean
 
 RUN \
-  mkdir -p "${SRC_FOLDER}" && \
+  mkdir -p "${SRT_FOLDER}" && \
   git clone --depth 1 --branch "${SRT_VERSION}" https://github.com/Haivision/srt && \
   cd srt && \
-  ./configure --prefix=. $(configure) && \
+  ./configure --prefix=${SRT_FOLDER} $(configure) && \
   make && \
   make install
-ENV PATH="${PATH}:/srt" 
-WORKDIR ${WD}
\ No newline at end of file
+
+ENV PATH="${PATH}:/usr/src/app/srt" 
+WORKDIR ${WD}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index cd19edd..66c6671 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -17,7 +17,8 @@ services:
       context: .
       dockerfile: Dockerfile-srt-live
     entrypoint: sh
-    command: "./scripts/srt.sh"
+    command: "./srt.sh"
+    working_dir: "/scripts"
     volumes:
       - "./scripts:/scripts"
     environment:

From f6f44c9125bd50a4781a5719e81954a7fae56da8 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Thu, 1 Feb 2024 09:15:19 -0300
Subject: [PATCH 38/39] extract a function for mpeg-ts

---
 internal/controllers/streaming_controller.go | 71 +++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/internal/controllers/streaming_controller.go b/internal/controllers/streaming_controller.go
index 4561940..cb62e07 100644
--- a/internal/controllers/streaming_controller.go
+++ b/internal/controllers/streaming_controller.go
@@ -35,22 +35,22 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 	defer sp.WebRTCConn.Close()
 	defer sp.Cancel()
 
-	c.l.Sugar().Infow("start streaming")
-
 	// TODO: pick the proper transport? is it possible to get rtp instead?
 	go c.readFromSRTIntoWriterPipe(sp.SRTConnection, w)
 
-	// reading from reader pipe into mpeg-ts demuxer
+	// reading from reader pipe to the mpeg-ts demuxer
 	mpegTSDemuxer := astits.NewDemuxer(sp.Ctx, r)
 	eia608Reader := NewEIA608Reader()
 	h264PID := uint16(0)
 
+	c.l.Sugar().Infow("streaming has started")
 	for {
 		select {
 		case <-sp.Ctx.Done():
-			c.l.Sugar().Errorw("stream was cancelled")
+			c.l.Sugar().Errorw("streaming has stopped")
 			return
 		default:
+			// fetching mpeg-ts data
 			// ref https://tsduck.io/download/docs/mpegts-introduction.pdf
 			mpegTSDemuxData, err := mpegTSDemuxer.NextData()
 			if err != nil {
@@ -61,42 +61,47 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 			}
 
 			if mpegTSDemuxData.PMT != nil {
-				// writing mpeg-ts meida metadata to the metadata webrtc channel
+				// writing mpeg-ts media codec info to the metadata webrtc channel
 				h264PID = c.captureMediaInfoAndSendToWebRTC(mpegTSDemuxData, sp.MetadataTrack, h264PID)
 				c.captureBitrateAndSendToWebRTC(mpegTSDemuxData, sp.MetadataTrack)
 			}
 
-			if mpegTSDemuxData.PID == h264PID && mpegTSDemuxData.PES != nil {
-				// writing video from mpeg-ts into webrtc
-				if err = sp.VideoTrack.WriteSample(media.Sample{Data: mpegTSDemuxData.PES.Data, Duration: time.Second / 30}); err != nil {
-					c.l.Sugar().Errorw("failed to write a sample mpeg-ts to web rtc",
-						"error", err,
-					)
-					return
-				}
-				captions, err := eia608Reader.Parse(mpegTSDemuxData.PES)
-				if err != nil {
-					c.l.Sugar().Errorw("failed to parse eia 608",
-						"error", err,
-					)
-					return
-				}
-				if captions != "" {
-					captionsMsg, err := BuildCaptionsMessage(mpegTSDemuxData.PES.Header.OptionalHeader.PTS, captions)
-					if err != nil {
-						c.l.Sugar().Errorw("failed to build captions message",
-							"error", err,
-						)
-						return
-					}
-					// writing metadata to the metadata webrtc channel
-					sp.MetadataTrack.SendText(captionsMsg)
-				}
+			// writing mpeg-ts video/captions to webrtc channels
+			err = c.writeMpegtsToWebRTC(mpegTSDemuxData, h264PID, err, sp, eia608Reader)
+			if err != nil {
+				c.l.Sugar().Errorw("failed to write an mpeg-ts to web rtc",
+					"error", err,
+				)
+				return
 			}
 		}
 	}
 }
 
+func (c *StreamingController) writeMpegtsToWebRTC(mpegTSDemuxData *astits.DemuxerData, h264PID uint16, err error, sp entities.StreamParameters, eia608Reader *EIA608Reader) error {
+	if mpegTSDemuxData.PID == h264PID && mpegTSDemuxData.PES != nil {
+
+		if err = sp.VideoTrack.WriteSample(media.Sample{Data: mpegTSDemuxData.PES.Data, Duration: time.Second / 30}); err != nil {
+			return err
+		}
+
+		captions, err := eia608Reader.Parse(mpegTSDemuxData.PES)
+		if err != nil {
+			return err
+		}
+
+		if captions != "" {
+			captionsMsg, err := BuildCaptionsMessage(mpegTSDemuxData.PES.Header.OptionalHeader.PTS, captions)
+			if err != nil {
+				return err
+			}
+			sp.MetadataTrack.SendText(captionsMsg)
+		}
+	}
+
+	return nil
+}
+
 func (*StreamingController) captureBitrateAndSendToWebRTC(d *astits.DemuxerData, metadataTrack *webrtc.DataChannel) {
 	for _, d := range d.PMT.ProgramDescriptors {
 		if d.MaximumBitrate != nil {
@@ -134,14 +139,14 @@ func (c *StreamingController) readFromSRTIntoWriterPipe(srtConnection *astisrt.C
 	for {
 		n, err := srtConnection.Read(inboundMpegTsPacket)
 		if err != nil {
-			c.l.Sugar().Errorw("str conn failed to read mpeg ts",
+			c.l.Sugar().Errorw("str conn failed to write data to buffer",
 				"error", err,
 			)
 			break
 		}
 
 		if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
-			c.l.Sugar().Errorw("failed to write mpeg ts in the pipe",
+			c.l.Sugar().Errorw("failed to write mpeg-ts into the pipe",
 				"error", err,
 			)
 			break

From 36db07ff7ce5b77f8314d68395d88987bf5ee075 Mon Sep 17 00:00:00 2001
From: Leandro Moreira <leandro.ribeiro.moreira@gmail.com>
Date: Thu, 1 Feb 2024 09:51:52 -0300
Subject: [PATCH 39/39] use sugar log directly

---
 internal/controllers/srt_controller.go       | 20 ++++++++--------
 internal/controllers/streaming_controller.go | 16 ++++++-------
 internal/controllers/webrtc_controller.go    | 16 ++++++-------
 internal/web/handlers/signaling.go           | 24 ++++++++++----------
 internal/web/router.go                       |  6 ++---
 internal/web/server.go                       |  4 ++--
 main.go                                      |  7 ++++--
 7 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/internal/controllers/srt_controller.go b/internal/controllers/srt_controller.go
index bc88d1a..d846f12 100644
--- a/internal/controllers/srt_controller.go
+++ b/internal/controllers/srt_controller.go
@@ -11,14 +11,14 @@ import (
 
 type SRTController struct {
 	c *entities.Config
-	l *zap.Logger
+	l *zap.SugaredLogger
 }
 
-func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTController, error) {
+func NewSRTController(c *entities.Config, l *zap.SugaredLogger, lc fx.Lifecycle) (*SRTController, error) {
 	// Handle logs
 	astisrt.SetLogLevel(astisrt.LogLevel(astisrt.LogLevelNotice))
 	astisrt.SetLogHandler(func(ll astisrt.LogLevel, file, area, msg string, line int) {
-		l.Sugar().Infow("SRT",
+		l.Infow("SRT",
 			"ll", ll,
 			"msg", msg,
 		)
@@ -26,7 +26,7 @@ func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTC
 
 	// Startup srt
 	if err := astisrt.Startup(); err != nil {
-		l.Sugar().Errorw("failed to start up srt",
+		l.Errorw("failed to start up srt",
 			"error", err,
 		)
 		return nil, err
@@ -36,7 +36,7 @@ func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTC
 		OnStop: func(ctx context.Context) error {
 			// Clean up
 			if err := astisrt.CleanUp(); err != nil {
-				l.Sugar().Errorw("failed to clean up srt",
+				l.Errorw("failed to clean up srt",
 					"error", err,
 				)
 				return err
@@ -52,13 +52,13 @@ func NewSRTController(c *entities.Config, l *zap.Logger, lc fx.Lifecycle) (*SRTC
 }
 
 func (c *SRTController) Connect(cancel context.CancelFunc, params entities.RequestParams) (*astisrt.Connection, error) {
-	c.l.Sugar().Infow("trying to connect srt")
+	c.l.Infow("trying to connect srt")
 
 	if err := params.Valid(); err != nil {
 		return nil, err
 	}
 
-	c.l.Sugar().Infow("Connecting to SRT ",
+	c.l.Infow("Connecting to SRT ",
 		"offer", params.String(),
 	)
 
@@ -71,7 +71,7 @@ func (c *SRTController) Connect(cancel context.CancelFunc, params entities.Reque
 		},
 
 		OnDisconnect: func(conn *astisrt.Connection, err error) {
-			c.l.Sugar().Infow("Canceling SRT",
+			c.l.Infow("Canceling SRT",
 				"error", err,
 			)
 			cancel()
@@ -81,11 +81,11 @@ func (c *SRTController) Connect(cancel context.CancelFunc, params entities.Reque
 		Port: params.SRTPort,
 	})
 	if err != nil {
-		c.l.Sugar().Errorw("failed to connect srt",
+		c.l.Errorw("failed to connect srt",
 			"error", err,
 		)
 		return nil, err
 	}
-	c.l.Sugar().Infow("Connected to SRT")
+	c.l.Infow("Connected to SRT")
 	return conn, nil
 }
diff --git a/internal/controllers/streaming_controller.go b/internal/controllers/streaming_controller.go
index cb62e07..05be21d 100644
--- a/internal/controllers/streaming_controller.go
+++ b/internal/controllers/streaming_controller.go
@@ -16,10 +16,10 @@ import (
 
 type StreamingController struct {
 	c *entities.Config
-	l *zap.Logger
+	l *zap.SugaredLogger
 }
 
-func NewStreamingController(c *entities.Config, l *zap.Logger) *StreamingController {
+func NewStreamingController(c *entities.Config, l *zap.SugaredLogger) *StreamingController {
 	return &StreamingController{
 		c: c,
 		l: l,
@@ -43,18 +43,18 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 	eia608Reader := NewEIA608Reader()
 	h264PID := uint16(0)
 
-	c.l.Sugar().Infow("streaming has started")
+	c.l.Infow("streaming has started")
 	for {
 		select {
 		case <-sp.Ctx.Done():
-			c.l.Sugar().Errorw("streaming has stopped")
+			c.l.Errorw("streaming has stopped")
 			return
 		default:
 			// fetching mpeg-ts data
 			// ref https://tsduck.io/download/docs/mpegts-introduction.pdf
 			mpegTSDemuxData, err := mpegTSDemuxer.NextData()
 			if err != nil {
-				c.l.Sugar().Errorw("failed to demux mpeg-ts",
+				c.l.Errorw("failed to demux mpeg-ts",
 					"error", err,
 				)
 				return
@@ -69,7 +69,7 @@ func (c *StreamingController) Stream(sp entities.StreamParameters) {
 			// writing mpeg-ts video/captions to webrtc channels
 			err = c.writeMpegtsToWebRTC(mpegTSDemuxData, h264PID, err, sp, eia608Reader)
 			if err != nil {
-				c.l.Sugar().Errorw("failed to write an mpeg-ts to web rtc",
+				c.l.Errorw("failed to write an mpeg-ts to web rtc",
 					"error", err,
 				)
 				return
@@ -139,14 +139,14 @@ func (c *StreamingController) readFromSRTIntoWriterPipe(srtConnection *astisrt.C
 	for {
 		n, err := srtConnection.Read(inboundMpegTsPacket)
 		if err != nil {
-			c.l.Sugar().Errorw("str conn failed to write data to buffer",
+			c.l.Errorw("str conn failed to write data to buffer",
 				"error", err,
 			)
 			break
 		}
 
 		if _, err := w.Write(inboundMpegTsPacket[:n]); err != nil {
-			c.l.Sugar().Errorw("failed to write mpeg-ts into the pipe",
+			c.l.Errorw("failed to write mpeg-ts into the pipe",
 				"error", err,
 			)
 			break
diff --git a/internal/controllers/webrtc_controller.go b/internal/controllers/webrtc_controller.go
index 6e24d39..beb0d0e 100644
--- a/internal/controllers/webrtc_controller.go
+++ b/internal/controllers/webrtc_controller.go
@@ -12,13 +12,13 @@ import (
 
 type WebRTCController struct {
 	c   *entities.Config
-	l   *zap.Logger
+	l   *zap.SugaredLogger
 	api *webrtc.API
 }
 
 func NewWebRTCController(
 	c *entities.Config,
-	l *zap.Logger,
+	l *zap.SugaredLogger,
 	api *webrtc.API,
 ) *WebRTCController {
 	return &WebRTCController{
@@ -29,7 +29,7 @@ func NewWebRTCController(
 }
 
 func (c *WebRTCController) CreatePeerConnection(cancel context.CancelFunc) (*webrtc.PeerConnection, error) {
-	c.l.Sugar().Infow("trying to set up web rtc conn")
+	c.l.Infow("trying to set up web rtc conn")
 
 	peerConnectionConfiguration := webrtc.Configuration{}
 	if !c.c.EnableICEMux {
@@ -42,7 +42,7 @@ func (c *WebRTCController) CreatePeerConnection(cancel context.CancelFunc) (*web
 
 	peerConnection, err := c.api.NewPeerConnection(peerConnectionConfiguration)
 	if err != nil {
-		c.l.Sugar().Errorw("error while creating a new peer connection",
+		c.l.Errorw("error while creating a new peer connection",
 			"error", err,
 		)
 		return nil, err
@@ -55,13 +55,13 @@ func (c *WebRTCController) CreatePeerConnection(cancel context.CancelFunc) (*web
 			connectionState == webrtc.ICEConnectionStateFailed
 
 		if finished {
-			c.l.Sugar().Infow("Canceling webrtc",
+			c.l.Infow("Canceling webrtc",
 				"status", connectionState.String(),
 			)
 			cancel()
 		}
 
-		c.l.Sugar().Infow("OnICEConnectionStateChange",
+		c.l.Infow("OnICEConnectionStateChange",
 			"status", connectionState.String(),
 		)
 	})
@@ -100,7 +100,7 @@ func (c *WebRTCController) SetRemoteDescription(peer *webrtc.PeerConnection, des
 
 func (c *WebRTCController) GatheringWebRTC(peer *webrtc.PeerConnection) (*webrtc.SessionDescription, error) {
 
-	c.l.Sugar().Infow("Gathering WebRTC Candidates")
+	c.l.Infow("Gathering WebRTC Candidates")
 	gatherComplete := webrtc.GatheringCompletePromise(peer)
 	answer, err := peer.CreateAnswer(nil)
 	if err != nil {
@@ -110,7 +110,7 @@ func (c *WebRTCController) GatheringWebRTC(peer *webrtc.PeerConnection) (*webrtc
 	}
 
 	<-gatherComplete
-	c.l.Sugar().Infow("Gathering WebRTC Candidates Complete")
+	c.l.Infow("Gathering WebRTC Candidates Complete")
 
 	return peer.LocalDescription(), nil
 }
diff --git a/internal/web/handlers/signaling.go b/internal/web/handlers/signaling.go
index 5967383..17f054f 100644
--- a/internal/web/handlers/signaling.go
+++ b/internal/web/handlers/signaling.go
@@ -12,7 +12,7 @@ import (
 
 type SignalingHandler struct {
 	c                   *entities.Config
-	l                   *zap.Logger
+	l                   *zap.SugaredLogger
 	webRTCController    *controllers.WebRTCController
 	srtController       *controllers.SRTController
 	streamingController *controllers.StreamingController
@@ -20,7 +20,7 @@ type SignalingHandler struct {
 
 func NewSignalingHandler(
 	c *entities.Config,
-	log *zap.Logger,
+	log *zap.SugaredLogger,
 	webRTCController *controllers.WebRTCController,
 	srtController *controllers.SRTController,
 	streamingController *controllers.StreamingController,
@@ -36,19 +36,19 @@ func NewSignalingHandler(
 
 func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) error {
 	if r.Method != http.MethodPost {
-		h.l.Sugar().Errorw("unexpected method")
+		h.l.Errorw("unexpected method")
 		return entities.ErrHTTPPostOnly
 	}
 
 	params := entities.RequestParams{}
 	if err := json.NewDecoder(r.Body).Decode(&params); err != nil {
-		h.l.Sugar().Errorw("error while decoding request params json",
+		h.l.Errorw("error while decoding request params json",
 			"error", err,
 		)
 		return err
 	}
 	if err := params.Valid(); err != nil {
-		h.l.Sugar().Errorw("invalid params",
+		h.l.Errorw("invalid params",
 			"error", err,
 		)
 		return err
@@ -58,7 +58,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 
 	peer, err := h.webRTCController.CreatePeerConnection(cancel)
 	if err != nil {
-		h.l.Sugar().Errorw("error while setting up web rtc connection",
+		h.l.Errorw("error while setting up web rtc connection",
 			"error", err,
 		)
 		return err
@@ -73,7 +73,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 		}, "video", params.SRTStreamID,
 	)
 	if err != nil {
-		h.l.Sugar().Errorw("error while creating a web rtc track",
+		h.l.Errorw("error while creating a web rtc track",
 			"error", err,
 		)
 		return err
@@ -81,14 +81,14 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 
 	metadataSender, err := h.webRTCController.CreateDataChannel(peer, entities.MetadataChannelID)
 	if err != nil {
-		h.l.Sugar().Errorw("error while createing a web rtc data channel",
+		h.l.Errorw("error while createing a web rtc data channel",
 			"error", err,
 		)
 		return err
 	}
 
 	if err = h.webRTCController.SetRemoteDescription(peer, params.Offer); err != nil {
-		h.l.Sugar().Errorw("error while setting a remote web rtc description",
+		h.l.Errorw("error while setting a remote web rtc description",
 			"error", err,
 		)
 		return err
@@ -96,7 +96,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 
 	localDescription, err := h.webRTCController.GatheringWebRTC(peer)
 	if err != nil {
-		h.l.Sugar().Errorw("error while preparing a local web rtc description",
+		h.l.Errorw("error while preparing a local web rtc description",
 			"error", err,
 		)
 		return err
@@ -104,7 +104,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 
 	srtConnection, err := h.srtController.Connect(cancel, params)
 	if err != nil {
-		h.l.Sugar().Errorw("error while connecting to an srt server",
+		h.l.Errorw("error while connecting to an srt server",
 			"error", err,
 		)
 		return err
@@ -124,7 +124,7 @@ func (h *SignalingHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) err
 
 	err = json.NewEncoder(w).Encode(*localDescription)
 	if err != nil {
-		h.l.Sugar().Errorw("error while encoding a local web rtc description",
+		h.l.Errorw("error while encoding a local web rtc description",
 			"error", err,
 		)
 		return err
diff --git a/internal/web/router.go b/internal/web/router.go
index 9a323cb..b708486 100644
--- a/internal/web/router.go
+++ b/internal/web/router.go
@@ -14,7 +14,7 @@ type ErrorHTTPHandler interface {
 func NewServeMux(
 	index *handlers.IndexHandler,
 	signaling *handlers.SignalingHandler,
-	l *zap.Logger,
+	l *zap.SugaredLogger,
 ) *http.ServeMux {
 
 	mux := http.NewServeMux()
@@ -39,11 +39,11 @@ func setCors(next http.Handler) http.Handler {
 	})
 }
 
-func errorHandler(l *zap.Logger, next ErrorHTTPHandler) http.Handler {
+func errorHandler(l *zap.SugaredLogger, next ErrorHTTPHandler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		err := next.ServeHTTP(w, r)
 		if err != nil {
-			l.Sugar().Errorw("error on handler",
+			l.Errorw("error on handler",
 				"err", err,
 			)
 			http.Error(w, err.Error(), http.StatusInternalServerError)
diff --git a/internal/web/server.go b/internal/web/server.go
index 8fe9654..8fbe036 100644
--- a/internal/web/server.go
+++ b/internal/web/server.go
@@ -14,7 +14,7 @@ import (
 func NewHTTPServer(
 	c *entities.Config,
 	mux *http.ServeMux,
-	log *zap.Logger,
+	log *zap.SugaredLogger,
 	lc fx.Lifecycle,
 ) *http.Server {
 	srv := &http.Server{
@@ -27,7 +27,7 @@ func NewHTTPServer(
 			if err != nil {
 				return err
 			}
-			log.Sugar().Infow(fmt.Sprintf("Starting HTTP server. Open http://%s to access the demo", srv.Addr),
+			log.Infow(fmt.Sprintf("Starting HTTP server. Open http://%s to access the demo", srv.Addr),
 				"addr", srv.Addr,
 			)
 			go srv.Serve(ln)
diff --git a/main.go b/main.go
index bc23f84..8f09eac 100644
--- a/main.go
+++ b/main.go
@@ -54,8 +54,11 @@ func main() {
 		fx.Provide(controllers.NewWebRTCMediaEngine),
 		fx.Provide(controllers.NewWebRTCAPI),
 
-		// Logging, Config
-		fx.Provide(zap.NewProduction),
+		// Logging, Config constructors
+		fx.Provide(func() *zap.SugaredLogger {
+			logger, _ := zap.NewProduction()
+			return logger.Sugar()
+		}),
 		fx.Provide(func() *entities.Config {
 			return &c
 		}),