Merge branch 'bluenviron:main' into main

.dockerignore

@@ -3,3 +3,4 @@
 /binaries
 /coverage*.txt
 /apidocs/*.html
+**/hls.min.js

.github/workflows/bump_hls_js.yml

@@ -20,8 +20,9 @@ jobs:
         && ((git checkout deps/hlsjs && git rebase ${GITHUB_REF_NAME}) || git checkout -b deps/hlsjs)
 
     - run: >
-        curl -o internal/servers/hls/hls.min.js https://cdn.jsdelivr.net/npm/hls.js@latest/dist/hls.min.js
-        && echo VERSION=$(cat internal/servers/hls/hls.min.js | grep -o '"version",get:function(){return".*"}' | sed 's/"version",get:function(){return"\(.*\)"}/\1/') >> $GITHUB_ENV
+        VERSION=$(curl -s https://api.github.com/repos/video-dev/hls.js/releases?per_page=1 | grep tag_name | sed 's/\s\+"tag_name": "\(.\+\)",/\1/')
+        && echo $VERSION > internal/servers/hls/hlsjsdownloader/VERSION
+        && echo VERSION=$VERSION >> $GITHUB_ENV
 
     - id: check_repo
       run: >
@@ -31,7 +32,7 @@ jobs:
       run: >
         git reset ${GITHUB_REF_NAME}
         && git add .
-        && git commit -m "bump hls-js to v${VERSION}"
+        && git commit -m "bump hls.js to ${VERSION}"
         && git push --set-upstream origin deps/hlsjs --force
 
     - if: ${{ steps.check_repo.outputs.clean != '' }}
@@ -52,13 +53,13 @@ jobs:
               repo: context.repo.repo,
               head: 'deps/hlsjs',
               base: context.ref.slice('refs/heads/'.length),
-              title: `bump hls-js to v${process.env.VERSION}`,
+              title: `bump hls-js to ${process.env.VERSION}`,
             });
           } else {
             github.rest.pulls.update({
               owner: context.repo.owner,
               repo: context.repo.repo,
               pull_number: prs.data[0].number,
-              title: `bump hls-js to v${process.env.VERSION}`,
+              title: `bump hls-js to ${process.env.VERSION}`,
             });
           }

.github/workflows/code_lint.yml

@@ -15,9 +15,11 @@ jobs:
 
     - uses: actions/setup-go@v3
       with:
-        go-version: "1.19"
+        go-version: "1.21"
+
+    - run: touch internal/servers/hls/hls.min.js
 
-    - uses: golangci/golangci-lint-action@v3
+    - uses: golangci/golangci-lint-action@v4
       with:
         version: v1.55.0
 

.gitignore

@@ -2,3 +2,4 @@
 /binaries
 /coverage*.txt
 /apidocs/*.html
+**/hls.min.js

LICENSE

@@ -19,8 +19,3 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
-
-internal/core/hls.min.js is Copyright (c) Dailymotion and is protected by
-its own license (Apache License, Version 2.0) available at
-
-https://github.com/video-dev/hls.js/blob/master/LICENSE

Makefile

@@ -1,7 +1,7 @@
-BASE_IMAGE = golang:1.21-alpine3.18
+BASE_IMAGE = golang:1.21-alpine3.19
 LINT_IMAGE = golangci/golangci-lint:v1.55.2
-NODE_IMAGE = node:16-alpine3.18
-ALPINE_IMAGE = alpine:3.18
+NODE_IMAGE = node:20-alpine3.19
+ALPINE_IMAGE = alpine:3.19
 RPI32_IMAGE = balenalib/raspberry-pi:bullseye-run-20230712
 RPI64_IMAGE = balenalib/raspberrypi3-64:bullseye-run-20230530