From 3bac9d0a67fd447ec4d699563d5d737e2c911106 Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Thu, 1 Jun 2023 10:32:17 +0800 Subject: [PATCH 1/7] Update docker github action to v2 node16 --- .github/workflows/docker-image.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index db91031..0d3c4b8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -16,7 +16,7 @@ jobs: uses: actions/checkout@v2 - name: Login to Docker Hub - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: username: ${{ secrets.DOCKER_HUB_USERNAME }} password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} @@ -28,7 +28,7 @@ jobs: OWNER: "${{ github.repository_owner }}" - name: Login to GitHub Container Registry - uses: docker/login-action@v1 + uses: docker/login-action@v2 with: registry: ghcr.io username: ${{ env.OWNER_LC }} @@ -36,7 +36,7 @@ jobs: - name: Set up Docker Buildx id: buildx - uses: docker/setup-buildx-action@v1 + uses: docker/setup-buildx-action@v2 - name: Set lowercase GitHub repository name run: | From c25f28a87e91e94ed8942f32edb7a1e7d3d8b313 Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Sat, 3 Jun 2023 17:37:34 +0800 Subject: [PATCH 2/7] Fix: revert and diss decodeURIComponent --- src/image.js | 4 +--- src/list.js | 2 +- src/video.js | 4 ++-- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/image.js b/src/image.js index ea91b84..f00bc7e 100644 --- a/src/image.js +++ b/src/image.js @@ -88,9 +88,7 @@ export default async (req, res) => { const params = { Bucket: AWS_BUCKET, // Key: `${req.params.imdbID}/${req.params.filename.replace(/\.jpg$/, "")}`, - Key: `hls/${req.params.imdbID}/${decodeURIComponent( - req.params.filename.replace(/\.jpg$/, "") - )}/index.m3u8`, + Key: `hls/${req.params.imdbID}/${req.params.filename.replace(/\.jpg$/, "")}/index.m3u8`, }; try { command = new HeadObjectCommand(params); diff --git a/src/list.js b/src/list.js index c0ec5d1..308eba4 100644 --- a/src/list.js +++ b/src/list.js @@ -49,7 +49,7 @@ export default async (req, res) => { if (reqParams.imdbID) { params.Prefix += sanitize(reqParams.imdbID); if (reqParams.filename) { - params.Prefix += "/" + decodeURIComponent(sanitize(reqParams.filename)); + params.Prefix += "/" + sanitize(reqParams.filename); } } diff --git a/src/video.js b/src/video.js index 978c0e5..68f1d62 100644 --- a/src/video.js +++ b/src/video.js @@ -59,7 +59,7 @@ export default async (req, res) => { const params = { Bucket: AWS_BUCKET, // Key: `${req.params.imdbID}/${req.params.filename}`, - Key: `hls/${req.params.imdbID}/${decodeURIComponent(req.params.filename)}/index.m3u8`, + Key: `hls/${req.params.imdbID}/${req.params.filename}/index.m3u8`, }; try { command = new HeadObjectCommand(params); @@ -90,7 +90,7 @@ export default async (req, res) => { signedUrl, scene.start, scene.end, - `hls/${req.params.imdbID}/${decodeURIComponent(req.params.filename)}`, + `hls/${req.params.imdbID}/${req.params.filename}`, size, "mute" in req.query ); From c1b7138829aa766d029966f31e1bf2b6c7e07ef9 Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Sat, 3 Jun 2023 17:54:01 +0800 Subject: [PATCH 3/7] Test: corret file path --- src/list.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/list.js b/src/list.js index 308eba4..6d0cb03 100644 --- a/src/list.js +++ b/src/list.js @@ -1,5 +1,4 @@ import { S3Client, ListObjectsCommand } from "@aws-sdk/client-s3"; -import sanitize from "sanitize-filename"; const { AWS_ENDPOINT_URL, AWS_ACCESS_KEY, AWS_SECRET_KEY, AWS_BUCKET, AWS_REGION } = process.env; @@ -47,9 +46,9 @@ export default async (req, res) => { }, {}); if (reqParams.imdbID) { - params.Prefix += sanitize(reqParams.imdbID); + params.Prefix += reqParams.imdbID; if (reqParams.filename) { - params.Prefix += "/" + sanitize(reqParams.filename); + params.Prefix += "/" + reqParams.filename; } } From 971c91b18c95eedcfb081a4e8090d52d9168857f Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Sat, 3 Jun 2023 18:03:40 +0800 Subject: [PATCH 4/7] Debug reqParams --- src/list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/list.js b/src/list.js index 6d0cb03..a5d7d99 100644 --- a/src/list.js +++ b/src/list.js @@ -52,6 +52,7 @@ export default async (req, res) => { } } + console.log({ reqParams }); try { command = new ListObjectsCommand(params); const response = await s3.send(command); From 5ab77fc7e7048221cc6bfe7849e0e6ae62355b74 Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Sat, 3 Jun 2023 18:13:08 +0800 Subject: [PATCH 5/7] Debug list params --- src/list.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/list.js b/src/list.js index a5d7d99..953b11a 100644 --- a/src/list.js +++ b/src/list.js @@ -53,6 +53,7 @@ export default async (req, res) => { } console.log({ reqParams }); + console.log({ params }); try { command = new ListObjectsCommand(params); const response = await s3.send(command); From dc899c7ee4b9a313b55e9d4c06fd2d3fd350b09c Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Sat, 3 Jun 2023 18:30:06 +0800 Subject: [PATCH 6/7] Test: add decodeURIComponent back --- src/list.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/list.js b/src/list.js index 953b11a..5ec65e4 100644 --- a/src/list.js +++ b/src/list.js @@ -48,12 +48,10 @@ export default async (req, res) => { if (reqParams.imdbID) { params.Prefix += reqParams.imdbID; if (reqParams.filename) { - params.Prefix += "/" + reqParams.filename; + params.Prefix += "/" + decodeURIComponent(reqParams.filename); } } - console.log({ reqParams }); - console.log({ params }); try { command = new ListObjectsCommand(params); const response = await s3.send(command); From 50759ceecae340dd736a05f90811cf5af419cf89 Mon Sep 17 00:00:00 2001 From: Leslie Wong <79917148leslie@gmail.com> Date: Sat, 3 Jun 2023 18:50:55 +0800 Subject: [PATCH 7/7] Build: release shotit-media v0.9.4 --- README.md | 2 +- docker-compose.yml | 4 ++-- package.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 9b4e886..551a5ba 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/shotit/shotit-media/docker-image.yml?branch=main&style=flat-square)](https://github.com/shotit/shotit-media/actions) [![GitHub release](https://img.shields.io/github/release/shotit/shotit-media.svg)](https://github.com/shotit/shotit-media/releases/latest) [![Docker](https://img.shields.io/docker/pulls/lesliewong007/shotit-media?style=flat-square)](https://hub.docker.com/r/lesliewong007/shotit-media) -[![Docker Image Size](https://img.shields.io/docker/image-size/lesliewong007/shotit-media/v0.9.3?style=flat-square)](https://hub.docker.com/r/lesliewong007/shotit-media) +[![Docker Image Size](https://img.shields.io/docker/image-size/lesliewong007/shotit-media/v0.9.4?style=flat-square)](https://hub.docker.com/r/lesliewong007/shotit-media) ### Media broker for serving video preview for [shotit](https://github.com/shotit/shotit) diff --git a/docker-compose.yml b/docker-compose.yml index 92bb9cc..2fd6a1a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,7 @@ version: "3.5" services: media: container_name: shotit-media - image: ghcr.io/shotit/shotit-media:v0.9.3 + image: ghcr.io/shotit/shotit-media:v0.9.4 restart: unless-stopped environment: - TRACE_MEDIA_SALT=${TRACE_MEDIA_SALT} @@ -82,4 +82,4 @@ services: networks: shotit_net: - driver: bridge \ No newline at end of file + driver: bridge diff --git a/package.json b/package.json index f7f655a..7b5128d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "shotit-media", - "version": "0.9.3", + "version": "0.9.4", "description": "Media broker for shotit", "main": "server.js", "type": "module",