Update docker-publish.yml

fix github action
github action refactor
2023-09-25 21:32:20 +02:00 · 2023-09-25 16:06:19 +02:00 · 2023-09-25 15:37:18 +02:00 · 2023-09-25 11:12:18 +02:00 · 2023-09-25 09:09:12 +02:00 · 2023-09-25 08:59:58 +02:00
35 changed files with 515 additions and 375 deletions
--- a/.github/workflows/docker-image.yml
+++ b/.github/workflows/docker-image.yml
@@ -1,28 +0,0 @@
-name: Docker Image CI (Dockerhub)
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-  schedule:
-    - cron: '0 1 * * *'
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v2
-    - name: Login to Docker Hub
-      env:
-        DOCKER_USER: ${{secrets.DOCKER_HUB_USERNAME}}
-        DOCKER_PASSWORD: ${{secrets.DOCKER_HUB_PASSWORD}}
-      run: |
-        docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
-    - name: Install buildx
-      uses: crazy-max/ghaction-docker-buildx@v1
-      with:
-        version: latest
-    - name: Build the Docker image
-      run: docker buildx build . --file Dockerfile --tag ${{secrets.DOCKER_HUB_USERNAME}}/yt-dlp-webui:latest --push --platform linux/amd64,linux/arm/v7,linux/arm64
-
--- a/.github/workflows/docker-publish.yml
+++ b/.github/workflows/docker-publish.yml
@@ -1,31 +1,14 @@
-name: Docker (ghcr.io)
-
-# This workflow uses actions that are not certified by GitHub.
-# They are provided by a third-party and are governed by
-# separate terms of service, privacy policy, and support
-# documentation.
-
+name: Docker
 on:
  release:
-    branches: [ master ]
-    tags: [ 'v*.*.*' ]
+    types: [published]
  push:
    branches: [ master ]
-  pull_request:
-    branches: [ master ]
  schedule:
    - cron : '0 1 * * 0'

-env:
-  # Use docker.io for Docker Hub if empty
-  REGISTRY: ghcr.io
-  # github.repository as <account>/<repo>
-  IMAGE_NAME: ${{ github.repository }}
-
-
 jobs:
-  build:
-
+  publish:
    runs-on: ubuntu-latest
    permissions:
      contents: read
@@ -33,65 +16,65 @@ jobs:
      # This is used to complete the identity challenge
      # with sigstore/fulcio when running outside of PRs.
      id-token: write
-
    steps:
      - name: Checkout repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4

-      # Install the cosign tool except on PR
      # https://github.com/sigstore/cosign-installer
      - name: Install cosign
-        if: github.event_name != 'pull_request'
-        uses: sigstore/cosign-installer@1e95c1de343b5b0c23352d6417ee3e48d5bcd422
+        # v3.1.2
+        uses: sigstore/cosign-installer@11086d25041f77fe8fe7b9ea4e48e3b9192b8f19
        with:
          cosign-release: 'v1.13.1'

-
-      # Workaround: https://github.com/docker/build-push-action/issues/461
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
-      - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@79abd3f86f79a9d68a23c75a09a9a85889262adf
-
-      # Login against a Docker registry except on PR
-      # https://github.com/docker/login-action
-      - name: Log into registry ${{ env.REGISTRY }}
-        if: github.event_name != 'pull_request'
-        uses: docker/login-action@28218f9b04b4f3f62068d7b6ce6ca5b26e35336c
+      - name: Set up QEMU for ARM emulation
+        # v2.2.0
+        uses: docker/setup-qemu-action@2b82ce82d56a2a04d2637cd93a637ae1b359c0a7
        with:
-          registry: ${{ env.REGISTRY }}
+          platforms: all
+      - name: Set up Docker Buildx
+        # 2.10.0
+        uses: docker/setup-buildx-action@885d1462b80bc1c1c7f0b00334ad271f09369c55
+
+      - name: Login to Docker Hub
+        # 2.2.0
+        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+        with:
+          username: ${{ secrets.DOCKER_HUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_PASSWORD }}
+      - name: Login to GHCR
+        # 2.2.0
+        uses: docker/login-action@465a07811f14bebb1938fbed4728c6a1ff8901fc
+        with:
+          registry: ghcr.io
          username: ${{ github.actor }}
          password: ${{ secrets.GITHUB_TOKEN }}

-      # Extract metadata (tags, labels) for Docker
-      # https://github.com/docker/metadata-action
-      - name: Extract Docker metadata
+      - name: Generate Docker metadata
        id: meta
-        uses: docker/metadata-action@98669ae865ea3cffbcbaa878cf57c20bbf1c6c38
+        # v4.6.0
+        uses: docker/metadata-action@818d4b7b91585d195f67373fd9cb0332e31a7175
        with:
-          images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+          images: |
+           ghcr.io/${{ github.repository }}
+           docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/yt-dlp-webui

-      # Build and push Docker image with Buildx (don't push on PR)
-      # https://github.com/docker/build-push-action
      - name: Build and push Docker image
        id: build-and-push
-        uses: docker/build-push-action@ad44023a93711e3deb337508980b4b5e9bcdc5dc
+        # v4.2.1
+        uses: docker/build-push-action@0a97817b6ade9f46837855d676c4cca3a2471fc9
        with:
          context: .
+          push: true
          platforms: linux/amd64,linux/arm/v7,linux/arm64
-          push: ${{ github.event_name != 'pull_request' }}
-          tags: ${{ steps.meta.outputs.tags }}
+          tags: ${{ secrets.DOCKER_HUB_USERNAME }}/yt-dlp-webui:latest
          labels: ${{ steps.meta.outputs.labels }}

-      # Sign the resulting Docker image digest except on PRs.
-      # This will only write to the public Rekor transparency log when the Docker
-      # repository is public to avoid leaking data.  If you would like to publish
-      # transparency data even for private images, pass --force to cosign below.
-      # https://github.com/sigstore/cosign
      - name: Sign the published Docker image
-        if: ${{ github.event_name != 'pull_request' }}
        env:
          COSIGN_EXPERIMENTAL: "true"
        # This step uses the identity token to provision an ephemeral certificate
        # against the sigstore community Fulcio instance.
-        run: cosign sign ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}@${{ steps.build-and-push.outputs.digest }}
+        run: |
+          cosign sign ghcr.io/${{ github.repository }}@${{ steps.build-and-push.outputs.digest }}
+          cosign sign docker.io/${{ secrets.DOCKER_HUB_USERNAME }}/yt-dlp-webui@${{ steps.build-and-push.outputs.digest }}
--- a/.github/workflows/test-container.yml
+++ b/.github/workflows/test-container.yml
@@ -0,0 +1,16 @@
+name: Docker Image CI
+
+on:
+  pull_request:
+    branches: [ "master" ]
+
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Build the Docker image
+      run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,8 @@
-.parcel-cache
 dist
 package-lock.json
 pnpm-lock.yaml
 .pnpm-debug.log
 node_modules
-src/server/core/*.exe
-src/server/core/yt-dlp
 .env
 *.mp4
 *.ytdl
@@ -16,3 +13,4 @@ downloads
 build/
 yt-dlp-webui
 session.dat
+config.yml
--- a/20
+++ b/20
@@ -1,33 +1,29 @@
 FROM golang:1.20-alpine AS build
-# folder structure
-WORKDIR /usr/src/yt-dlp-webui
-# install core dependencies
+
 RUN apk update && \
    apk add nodejs npm go
-# copia la salsa
-COPY . .
-# build frontend
+
+COPY . /usr/src/yt-dlp-webui
+
 WORKDIR /usr/src/yt-dlp-webui/frontend
 RUN npm install
 RUN npm run build
-# build backend + incubator
+
 WORKDIR /usr/src/yt-dlp-webui
 RUN CGO_ENABLED=0 GOOS=linux go build -o yt-dlp-webui

-# but here yes :)
 FROM alpine:edge

-WORKDIR /downloads
-VOLUME /downloads
+VOLUME /downloads /config

 WORKDIR /app

 RUN apk update && \
-    apk add psmisc ffmpeg yt-dlp
+    apk add psmisc ffmpeg yt-dlp --no-cache

 COPY --from=build /usr/src/yt-dlp-webui/yt-dlp-webui /app

 ENV JWT_SECRET=secret

 EXPOSE 3033
-ENTRYPOINT [ "./yt-dlp-webui" , "--out", "/downloads" ]
+ENTRYPOINT [ "./yt-dlp-webui" , "--out", "/downloads", "--conf", "/config/config.yml" ]
--- a/README.md
+++ b/README.md
@@ -21,8 +21,8 @@ docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:latest
 docker pull ghcr.io/marcopeocchi/yt-dlp-web-ui:master
 ```

-![](https://i.ibb.co/RCpfg7q/image.png)
-![](https://i.ibb.co/N2749CD/image.png)
+![image](https://github.com/marcopeocchi/yt-dlp-web-ui/assets/35533749/a32fbdaa-b033-4aed-b914-a66701ace0ce)
+![image](https://github.com/marcopeocchi/yt-dlp-web-ui/assets/35533749/782c559a-f552-40be-a6fd-10e22f38e85d)

 ### Integrated File browser
 Stream or download your content, easily.
@@ -107,6 +107,12 @@ Or with docker but building the container manually.
 ```sh
 docker build -t yt-dlp-webui .
 docker run -d -p 3033:3033 -v <your dir>:/downloads yt-dlp-webui
+
+docker run -d -p 3033:3033 \
+  -v <your dir>:/downloads \  
+  -v <your dir>:/config \ # optional
+  yt-dlp-webui
+
 ```

 If you opt to add RPC authentication...
@@ -115,9 +121,11 @@ docker run -d \
    -p 3033:3033 \
    -e JWT_SECRET randomsecret
    -v /path/to/downloads:/downloads \
+    -v /path/for/config:/config \ # optional
    marcobaobao/yt-dlp-webui \
    --auth \
-    --secret your_rpc_secret
+    --user your_username \
+    --pass your_pass
 ```

 If you wish for limiting the download queue size...
@@ -163,8 +171,10 @@ Usage yt-dlp-webui:
        Port where server will listen at (default 3033)
  -qs int
        Download queue size (default 8)
-  -secret string
-        Secret required for auth
+  -user string
+        Username required for auth
+  -pass string
+        Password required for auth
 ```

 ### Config file
@@ -181,7 +191,9 @@ downloaderPath: /usr/local/bin/yt-dlp

 # Optional settings
 require_auth: true
-rpc_secret: my_random_secret
+username: my_username
+password: my_random_secret
+
 queue_size: 4
 ```

--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,10 +11,12 @@
  "dependencies": {
    "@emotion/react": "^11.11.1",
    "@emotion/styled": "^11.11.0",
+    "@fontsource/roboto": "^5.0.6",
    "@mui/icons-material": "^5.11.16",
    "@mui/material": "^5.13.5",
    "react": "^18.2.0",
    "react-dom": "^18.2.0",
+    "react-helmet": "^6.1.0",
    "react-router-dom": "^6.13.0",
    "recoil": "^0.7.7",
    "rxjs": "^7.8.1",
@@ -25,9 +27,10 @@
    "@types/node": "^20.3.1",
    "@types/react": "^18.2.13",
    "@types/react-dom": "^18.2.6",
+    "@types/react-helmet": "^6.1.6",
    "@types/react-router-dom": "^5.3.3",
    "@types/uuid": "^9.0.2",
-    "@vitejs/plugin-react": "^4.0.3",
+    "@vitejs/plugin-react-swc": "^3.3.2",
    "buffer": "^6.0.3",
    "typescript": "^5.1.3",
    "vite": "^4.4.7"
--- a/frontend/src/Layout.tsx
+++ b/frontend/src/Layout.tsx
@@ -17,6 +17,7 @@ import Toolbar from '@mui/material/Toolbar'
 import Typography from '@mui/material/Typography'
 import { grey } from '@mui/material/colors'
 import { useMemo, useState } from 'react'
+import { Helmet } from 'react-helmet'
 import { Link, Outlet } from 'react-router-dom'
 import { useRecoilValue } from 'recoil'
 import { settingsState } from './atoms/settings'
@@ -52,6 +53,11 @@ export default function Layout() {
  return (
    <ThemeProvider theme={theme}>
      <SocketSubscriber>
+        <Helmet>
+          <title>
+            {settings.appTitle}
+          </title>
+        </Helmet>
        <Box sx={{ display: 'flex' }}>
          <CssBaseline />
          <AppBar position="absolute" open={open}>
@@ -75,7 +81,7 @@ export default function Layout() {
                noWrap
                sx={{ flexGrow: 1 }}
              >
-                yt-dlp WebUI
+                {settings.appTitle}
              </Typography>
              <FreeSpaceIndicator />
              <div style={{
--- a/frontend/src/assets/i18n.yaml
+++ b/frontend/src/assets/i18n.yaml
@@ -33,6 +33,45 @@ languages:
    archiveTitle: Archive
    clipboardAction: Copied URL to clipboard
    playlistCheckbox: Download playlist (it will take time, after submitting you may close this window)
+    restartAppMessage: Needs a page reload to take effect
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
+  french:
+    urlInput: URL vidéo de YouTube ou d'un autre service pris en charge
+    statusTitle: Statut
+    statusReady: Prêt
+    selectFormatButton: Sélectionner le format
+    startButton: Démarrer
+    abortAllButton: Abort All
+    updateBinButton: Mettre à jour le binaire yt-dlp
+    darkThemeButton: Thème sombre
+    lightThemeButton: Thème clair
+    settingsAnchor: Paramètres
+    serverAddressTitle: Adresse du serveur
+    serverPortTitle: Port
+    extractAudioCheckbox: Extraire l'audio
+    noMTimeCheckbox: Ne pas définir le temps de modification du fichier
+    bgReminder: Une fois que vous aurez fermé cette page, le téléchargement se poursuivra en arrière-plan.
+    toastConnected: 'Connecté à '
+    toastUpdated: Mise à jour du binaire yt-dlp !
+    formatSelectionEnabler: Active la sélection des formats vidéo/audio
+    themeSelect: 'Theme'
+    languageSelect: 'Langue'
+    overridesAnchor: Surcharges
+    pathOverrideOption: Activation de la surcharge du chemin de sortie
+    filenameOverrideOption: Active la surcharge du nom du fichier de sortie
+    customFilename: Nom de fichier personnalisé (laisser vide pour utiliser le nom par défaut)
+    customPath: Chemin personnalisé
+    customArgs: Activer les args personnalisés yt-dlp (grand pouvoir = grandes responsabilités)
+    customArgsInput: Arguments yt-dlp personnalisés
+    rpcConnErr: Erreur lors de la connexion au serveur RPC
+    splashText: Aucun téléchargement actif
+    archiveTitle: Archive
+    clipboardAction: URL copiée dans le presse-papiers
+    playlistCheckbox: Télécharger la liste de lecture (cela prendra du temps, vous pouvez fermer cette fenêtre après l'avoir validée)
+    restartAppMessage: Nécessite un rechargement de la page pour prendre effet
+    servedFromReverseProxyCheckbox: Est derrière un sous-dossier de proxy inverse
+    appTitle: App title
  italian:
    urlInput: URL di YouTube o di qualsiasi altro servizio supportato
    statusTitle: Stato
@@ -65,6 +104,9 @@ languages:
    archiveTitle: Archivio
    clipboardAction: URL copiato negli appunti
    playlistCheckbox: Download playlist (richiederà tempo, puoi chiudere la finestra dopo l'inoltro)
+    restartAppMessage: La finestra deve essere ricaricata perché abbia effetto
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: Titolo applicazione
  chinese:
    urlInput: YouTube 或其他受支持服务的视频网址
    statusTitle: 状态
@@ -98,6 +140,8 @@ languages:
    archiveTitle: 归档
    clipboardAction: 复制 URL 到剪贴板
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  spanish:
    urlInput: URL de YouTube u otro servicio compatible
    statusTitle: Estado
@@ -130,6 +174,8 @@ languages:
    archiveTitle: Archive
    clipboardAction: Copied URL to clipboard
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  russian:
    urlInput: URL-адрес YouTube или любого другого поддерживаемого сервиса
    statusTitle: Статус
@@ -162,6 +208,8 @@ languages:
    archiveTitle: Архив
    clipboardAction: URL скопирован в буфер обмена
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  korean:
    urlInput: YouTube나 다른 지원되는 사이트의 URL
    statusTitle: 상태
@@ -194,6 +242,8 @@ languages:
    archiveTitle: Archive
    clipboardAction: Copied URL to clipboard
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  japanese:
    urlInput: YouTubeまたはサポート済み動画のURL
    statusTitle: 状態
@@ -227,6 +277,8 @@ languages:
    archiveTitle: Archive
    clipboardAction: Copied URL to clipboard
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  catalan:
    urlInput: URL de YouTube o d'un altre servei compatible
    statusTitle: Estat
@@ -259,6 +311,8 @@ languages:
    archiveTitle: Archive
    clipboardAction: Copied URL to clipboard
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  ukrainian:
    urlInput: URL-адреса YouTube або будь-якого іншого підтримуваного сервісу
    statusTitle: Статус
@@ -291,6 +345,8 @@ languages:
    archiveTitle: Архів
    clipboardAction: URL скопійовано в буфер обміну
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
  polish:
    urlInput: Adres URL YouTube lub innej obsługiwanej usługi
    statusTitle: Status
@@ -323,3 +379,5 @@ languages:
    archiveTitle: Archiwum
    clipboardAction: Adres URL zostanie skopiowany do schowka
    playlistCheckbox: Download playlist (it will take time, after submitting you may even close this window)
+    servedFromReverseProxyCheckbox: Is behind a reverse proxy subfolder
+    appTitle: App title
--- a/frontend/src/atoms/settings.ts
+++ b/frontend/src/atoms/settings.ts
@@ -1,16 +1,5 @@
 import { atom, selector } from 'recoil'
-
-export type Language =
-  | 'english'
-  | 'chinese'
-  | 'russian'
-  | 'italian'
-  | 'spanish'
-  | 'korean'
-  | 'japanese'
-  | 'catalan'
-  | 'ukrainian'
-  | 'polish'
+import { prefersDarkMode } from '../utils'

 export const languages = [
  'english',
@@ -25,19 +14,24 @@ export const languages = [
  'polish',
 ] as const

-export type Theme = 'light' | 'dark'
+export type Language = (typeof languages)[number]
+
+export type Theme = 'light' | 'dark' | 'system'
+export type ThemeNarrowed = 'light' | 'dark'

 export interface SettingsState {
  serverAddr: string
  serverPort: number
  language: Language
-  theme: Theme
+  theme: ThemeNarrowed
  cliArgs: string
  formatSelection: boolean
  fileRenaming: boolean
  pathOverriding: boolean
  enableCustomArgs: boolean
  listView: boolean
+  servedFromReverseProxy: boolean
+  appTitle: string
 }

 export const languageState = atom<Language>({
@@ -51,7 +45,7 @@ export const languageState = atom<Language>({

 export const themeState = atom<Theme>({
  key: 'themeStateState',
-  default: localStorage.getItem('theme') as Theme || 'light',
+  default: localStorage.getItem('theme') as Theme || 'system',
  effects: [
    ({ onSet }) =>
      onSet(l => localStorage.setItem('theme', l.toString()))
@@ -131,9 +125,29 @@ export const listViewState = atom({
  ]
 })

+export const servedFromReverseProxyState = atom({
+  key: 'servedFromReverseProxyState',
+  default: localStorage.getItem('reverseProxy') === "true",
+  effects: [
+    ({ onSet }) =>
+      onSet(a => localStorage.setItem('reverseProxy', a.toString()))
+  ]
+})
+
+export const appTitleState = atom({
+  key: 'appTitleState',
+  default: localStorage.getItem('appTitle') ?? 'yt-dlp Web UI',
+  effects: [
+    ({ onSet }) =>
+      onSet(a => localStorage.setItem('appTitle', a.toString()))
+  ]
+})
+
 export const serverAddressAndPortState = selector({
  key: 'serverAddressAndPortState',
-  get: ({ get }) => `${get(serverAddressState)}:${get(serverPortState)}`
+  get: ({ get }) => get(servedFromReverseProxyState)
+    ? `${get(serverAddressState)}`
+    : `${get(serverAddressState)}:${get(serverPortState)}`
 })

 export const serverURL = selector({
@@ -158,18 +172,31 @@ export const rpcHTTPEndpoint = selector({
  }
 })

+export const themeSelector = selector<ThemeNarrowed>({
+  key: 'themeSelector',
+  get: ({ get }) => {
+    const theme = get(themeState)
+    if ((theme === 'system' && prefersDarkMode()) || theme === 'dark') {
+      return 'dark'
+    }
+    return 'light'
+  }
+})
+
 export const settingsState = selector<SettingsState>({
  key: 'settingsState',
  get: ({ get }) => ({
    serverAddr: get(serverAddressState),
    serverPort: get(serverPortState),
    language: get(languageState),
-    theme: get(themeState),
+    theme: get(themeSelector),
    cliArgs: get(latestCliArgumentsState),
    formatSelection: get(formatSelectionState),
    fileRenaming: get(fileRenamingState),
    pathOverriding: get(pathOverridingState),
    enableCustomArgs: get(enableCustomArgsState),
    listView: get(listViewState),
+    servedFromReverseProxy: get(servedFromReverseProxyState),
+    appTitle: get(appTitleState)
  })
 })
--- a/frontend/src/components/DownloadCard.tsx
+++ b/frontend/src/components/DownloadCard.tsx
@@ -0,0 +1,110 @@
+import EightK from '@mui/icons-material/EightK'
+import FourK from '@mui/icons-material/FourK'
+import Hd from '@mui/icons-material/Hd'
+import Sd from '@mui/icons-material/Sd'
+import {
+  Button,
+  Card,
+  CardActionArea,
+  CardActions,
+  CardContent,
+  CardMedia,
+  Chip,
+  LinearProgress,
+  Skeleton,
+  Stack,
+  Typography
+} from '@mui/material'
+import { RPCResult } from '../types'
+import { ellipsis, formatSpeedMiB, mapProcessStatus, roundMiB } from '../utils'
+
+type Props = {
+  download: RPCResult
+  onStop: () => void
+  onCopy: () => void
+}
+
+const Resolution: React.FC<{ resolution?: string }> = ({ resolution }) => {
+  if (!resolution) return null
+  if (resolution.includes('4320')) return <EightK color="primary" />
+  if (resolution.includes('2160')) return <FourK color="primary" />
+  if (resolution.includes('1080')) return <Hd color="primary" />
+  if (resolution.includes('720')) return <Sd color="primary" />
+  return null
+}
+
+const DownloadCard: React.FC<Props> = ({ download, onStop, onCopy }) => {
+  const isCompleted = () => download.progress.percentage === '-1'
+
+  const percentageToNumber = () => isCompleted()
+    ? 100
+    : Number(download.progress.percentage.replace('%', ''))
+
+  return (
+    <Card>
+      <CardActionArea onClick={() => {
+        navigator.clipboard.writeText(download.info.url)
+        onCopy()
+      }}>
+        {download.info.thumbnail !== '' ?
+          <CardMedia
+            component="img"
+            height={180}
+            image={download.info.thumbnail}
+          /> :
+          <Skeleton variant="rectangular" height={180} />
+        }
+        <CardContent>
+          {download.info.title !== '' ?
+            <Typography gutterBottom variant="h6" component="div">
+              {ellipsis(download.info.title, 54)}
+            </Typography> :
+            <Skeleton />
+          }
+          <Stack direction="row" spacing={1} py={2}>
+            <Chip
+              label={
+                isCompleted()
+                  ? 'Completed'
+                  : mapProcessStatus(download.progress.process_status)
+              }
+              color="primary"
+              size="small"
+            />
+            <Typography>
+              {!isCompleted() ? download.progress.percentage : ''}
+            </Typography>
+            <Typography>
+              &nbsp;
+              {!isCompleted() ? formatSpeedMiB(download.progress.speed) : ''}
+            </Typography>
+            <Typography>
+              {roundMiB(download.info.filesize_approx ?? 0)}
+            </Typography>
+            <Resolution resolution={download.info.resolution} />
+          </Stack>
+          {download.progress.percentage ?
+            <LinearProgress
+              variant="determinate"
+              value={percentageToNumber()}
+              color={isCompleted() ? "secondary" : "primary"}
+            /> :
+            null
+          }
+        </CardContent>
+      </CardActionArea>
+      <CardActions>
+        <Button
+          variant="contained"
+          size="small"
+          color="primary"
+          onClick={onStop}
+        >
+          {isCompleted() ? "Clear" : "Stop"}
+        </Button>
+      </CardActions>
+    </Card>
+  )
+}
+
+export default DownloadCard
--- a/frontend/src/components/DownloadsCardView.tsx
+++ b/frontend/src/components/DownloadsCardView.tsx
@@ -1,11 +1,10 @@
-import { Grid } from "@mui/material"
-import { Fragment } from "react"
+import { Grid } from '@mui/material'
 import { useRecoilValue } from 'recoil'
 import { activeDownloadsState } from '../atoms/downloads'
-import { useToast } from "../hooks/toast"
+import { useToast } from '../hooks/toast'
 import { useI18n } from '../hooks/useI18n'
 import { useRPC } from '../hooks/useRPC'
-import { StackableResult } from "./StackableResult"
+import DownloadCard from './DownloadCard'

 const DownloadsCardView: React.FC = () => {
  const downloads = useRecoilValue(activeDownloadsState) ?? []
@@ -21,20 +20,13 @@ const DownloadsCardView: React.FC = () => {
      {
        downloads.map(download => (
          <Grid item xs={4} sm={8} md={6} key={download.id}>
-            <Fragment>
-              <StackableResult
-                url={download.info.url}
-                title={download.info.title}
-                thumbnail={download.info.thumbnail}
-                percentage={download.progress.percentage}
+            <>
+              <DownloadCard
+                download={download}
                onStop={() => abort(download.id)}
-                onCopy={() => pushMessage(i18n.t('clipboardAction'))}
-                resolution={download.info.resolution ?? ''}
-                speed={download.progress.speed}
-                size={download.info.filesize_approx ?? 0}
-                status={download.progress.process_status}
+                onCopy={() => pushMessage(i18n.t('clipboardAction'), 'info')}
              />
-            </Fragment>
+            </>
          </Grid>
        ))
      }
--- a/frontend/src/components/ErrorBoundary.tsx
+++ b/frontend/src/components/ErrorBoundary.tsx
@@ -38,6 +38,14 @@ const ErrorBoundary: React.FC = () => {
          Goto Settings
        </Button>
      </Link>
+      <Typography sx={{ mt: 2 }} color={'gray'} fontWeight={500}>
+        Or login if authentication is enabled
+      </Typography>
+      <Link to={'/login'} >
+        <Button variant='contained' sx={{ mt: 2 }}>
+          login
+        </Button>
+      </Link>
    </FlexContainer>
  )
 }
--- a/frontend/src/components/StackableResult.tsx
+++ b/frontend/src/components/StackableResult.tsx
@@ -1,111 +0,0 @@
-import { EightK, FourK, Hd, Sd } from '@mui/icons-material'
-import {
-  Button,
-  Card,
-  CardActionArea,
-  CardActions,
-  CardContent,
-  CardMedia,
-  Chip,
-  LinearProgress,
-  Skeleton,
-  Stack,
-  Typography
-} from '@mui/material'
-import { ellipsis, formatSpeedMiB, mapProcessStatus, roundMiB } from '../utils'
-
-type Props = {
-  title: string
-  url: string
-  thumbnail: string
-  resolution: string
-  percentage: string
-  size: number
-  speed: number
-  status: number
-  onStop: () => void
-  onCopy: () => void
-}
-
-export function StackableResult({
-  title,
-  url,
-  thumbnail,
-  resolution,
-  percentage,
-  speed,
-  size,
-  status,
-  onStop,
-  onCopy,
-}: Props) {
-  const isCompleted = () => percentage === '-1'
-
-  const percentageToNumber = () => isCompleted()
-    ? 100
-    : Number(percentage.replace('%', ''))
-
-  const guessResolution = (xByY: string): any => {
-    if (!xByY) return null
-    if (xByY.includes('4320')) return (<EightK color="primary" />)
-    if (xByY.includes('2160')) return (<FourK color="primary" />)
-    if (xByY.includes('1080')) return (<Hd color="primary" />)
-    if (xByY.includes('720')) return (<Sd color="primary" />)
-    return null
-  }
-
-  return (
-    <Card>
-      <CardActionArea onClick={() => {
-        navigator.clipboard.writeText(url)
-        onCopy()
-      }}>
-        {thumbnail !== '' ?
-          <CardMedia
-            component="img"
-            height={180}
-            image={thumbnail}
-          /> :
-          <Skeleton variant="rectangular" height={180} />
-        }
-        <CardContent>
-          {title !== '' ?
-            <Typography gutterBottom variant="h6" component="div">
-              {ellipsis(title, 54)}
-            </Typography> :
-            <Skeleton />
-          }
-          <Stack direction="row" spacing={1} py={2}>
-            <Chip
-              label={isCompleted() ? 'Completed' : mapProcessStatus(status)}
-              color="primary"
-              size="small"
-            />
-            <Typography>{!isCompleted() ? percentage : ''}</Typography>
-            <Typography> {!isCompleted() ? formatSpeedMiB(speed) : ''}</Typography>
-            <Typography>{roundMiB(size ?? 0)}</Typography>
-            {guessResolution(resolution)}
-          </Stack>
-          {percentage ?
-            <LinearProgress
-              variant="determinate"
-              value={percentageToNumber()}
-              color={isCompleted() ? "secondary" : "primary"}
-            /> :
-            null
-          }
-        </CardContent>
-      </CardActionArea>
-      <CardActions>
-        <Button
-          variant="contained"
-          size="small"
-          color="primary"
-          onClick={onStop}
-        >
-          {isCompleted() ? "Clear" : "Stop"}
-        </Button>
-      </CardActions>
-    </Card>
-  )
-}
--- a/frontend/src/components/ThemeToggler.tsx
+++ b/frontend/src/components/ThemeToggler.tsx
@@ -1,25 +1,32 @@
-import { Brightness4, Brightness5 } from '@mui/icons-material'
+import Brightness4 from '@mui/icons-material/Brightness4'
+import Brightness5 from '@mui/icons-material/Brightness5'
+import BrightnessAuto from '@mui/icons-material/BrightnessAuto'
 import { ListItemButton, ListItemIcon, ListItemText } from '@mui/material'
 import { useRecoilState } from 'recoil'
-import { themeState } from '../atoms/settings'
+import { Theme, themeState } from '../atoms/settings'

-export default function ThemeToggler() {
+const ThemeToggler: React.FC = () => {
  const [theme, setTheme] = useRecoilState(themeState)

+  const actions: Record<Theme, React.ReactNode> = {
+    system: <BrightnessAuto />,
+    light: <Brightness4 />,
+    dark: <Brightness5 />,
+  }
+
+  const themes: Theme[] = ['system', 'light', 'dark']
+  const currentTheme = themes.indexOf(theme)
+
  return (
    <ListItemButton onClick={() => {
-      theme === 'light'
-        ? setTheme('dark')
-        : setTheme('light')
+      setTheme(themes[(currentTheme + 1) % themes.length])
    }}>
      <ListItemIcon>
-        {
-          theme === 'light'
-            ? <Brightness4 />
-            : <Brightness5 />
-        }
+        {actions[theme]}
      </ListItemIcon>
      <ListItemText primary="Toggle theme" />
    </ListItemButton>
  )
 }
+
+export default ThemeToggler
--- a/frontend/src/hooks/toast.ts
+++ b/frontend/src/hooks/toast.ts
@@ -3,17 +3,17 @@ import { useRecoilState } from 'recoil'
 import { toastListState } from '../atoms/toast'

 export const useToast = () => {
-  const [toasts, setToasts] = useRecoilState(toastListState)
+  const [, setToasts] = useRecoilState(toastListState)

  return {
    pushMessage: (message: string, severity?: AlertColor) => {
-      setToasts([{
+      setToasts(state => [...state, {
        open: true,
        message: message,
        severity: severity,
        autoClose: true,
        createdAt: Date.now()
-      }, ...toasts])
+      }])
    }
  }
 }
--- a/frontend/src/index.tsx
+++ b/frontend/src/index.tsx
@@ -2,6 +2,11 @@ import { StrictMode } from 'react'
 import { createRoot } from 'react-dom/client'
 import { App } from './App'

+import '@fontsource/roboto/300.css'
+import '@fontsource/roboto/400.css'
+import '@fontsource/roboto/500.css'
+import '@fontsource/roboto/700.css'
+
 const root = createRoot(document.getElementById('root')!)

 root.render(
--- a/frontend/src/providers/ToasterProvider.tsx
+++ b/frontend/src/providers/ToasterProvider.tsx
@@ -8,13 +8,20 @@ const Toaster: React.FC = () => {

  useEffect(() => {
    if (toasts.length > 0) {
-      const interval = setInterval(() => {
-        setToasts(t => t.filter((x) => (Date.now() - x.createdAt) < 1500))
+      const closer = setInterval(() => {
+        setToasts(t => t.map(t => ({ ...t, open: false })))
      }, 1500)

-      return () => clearInterval(interval)
+      const cleaner = setInterval(() => {
+        setToasts(t => t.filter((x) => (Date.now() - x.createdAt) < 1500))
+      }, 1750)
+
+      return () => {
+        clearInterval(closer)
+        clearInterval(cleaner)
+      }
    }
-  }, [setToasts, toasts])
+  }, [setToasts, toasts.length])

  return (
    <>
@@ -22,6 +29,7 @@ const Toaster: React.FC = () => {
        <Snackbar
          key={index}
          open={toast.open}
+          sx={index > 0 ? { marginBottom: index * 6.5 } : {}}
        >
          <Alert variant="filled" severity={toast.severity}>
            {toast.message}
--- a/frontend/src/router.tsx
+++ b/frontend/src/router.tsx
@@ -1,6 +1,6 @@
 import { CircularProgress } from '@mui/material'
 import { Suspense, lazy } from 'react'
-import { createBrowserRouter } from 'react-router-dom'
+import { createHashRouter } from 'react-router-dom'
 import Layout from './Layout'

 const Home = lazy(() => import('./views/Home'))
@@ -10,7 +10,7 @@ const Settings = lazy(() => import('./views/Settings'))

 const ErrorBoundary = lazy(() => import('./components/ErrorBoundary'))

-export const router = createBrowserRouter([
+export const router = createHashRouter([
  {
    path: '/',
    Component: () => <Layout />,
--- a/frontend/src/utils.ts
+++ b/frontend/src/utils.ts
@@ -19,9 +19,13 @@ export function validateIP(ipAddr: string): boolean {
 * @param domainName 
 * @returns domain validity test
 */
-export function validateDomain(domainName: string): boolean {
-  let domainRegex = /[^@ \t\r\n]+.[^@ \t\r\n]+\.[^@ \t\r\n]+/
-  return domainRegex.test(domainName) || domainName === 'localhost'
+export function validateDomain(url: string): boolean {
+  const urlRegex = /(www\.)?[-a-zA-Z0-9@:%._\+~#=]{1,256}\.[a-zA-Z0-9()]{1,6}\b([-a-zA-Z0-9()!@:%_\+.~#?&\/\/=]*)/
+  const slugRegex = /^[a-z0-9]+(?:-[a-z0-9]+)*$/
+
+  const [name, slug] = url.split('/')
+
+  return urlRegex.test(url) || name === 'localhost' && slugRegex.test(slug)
 }

 /**
@@ -47,24 +51,6 @@ export function ellipsis(str: string, lim: number): string {
  return ''
 }

-/**
- * Parse the downlaod speed sent by server and converts it to KiB/s
- * @param str the downlaod speed, ex. format: 5 MiB/s => 5000 | 50 KiB/s => 50
- * @returns download speed in KiB/s
- */
-export function detectSpeed(str: string): number {
-  let effective = str.match(/[\d,]+(\.\d+)?/)![0]
-  const unit = str.replace(effective, '')
-  switch (unit) {
-    case 'MiB/s':
-      return Number(effective) * 1000
-    case 'KiB/s':
-      return Number(effective)
-    default:
-      return 0
-  }
-}
-
 export function toFormatArgs(codes: string[]): string {
  if (codes.length > 1) {
    return codes.reduce((v, a) => ` -f ${v}+${a}`)
@@ -75,14 +61,17 @@ export function toFormatArgs(codes: string[]): string {
  return ''
 }

-export function formatGiB(bytes: number) {
-  return `${(bytes / 1_000_000_000).toFixed(0)}GiB`
-}
+export const formatGiB = (bytes: number) =>
+  `${(bytes / 1_000_000_000).toFixed(0)}GiB`

-export const roundMiB = (bytes: number) => `${(bytes / 1_000_000).toFixed(2)} MiB`
-export const formatSpeedMiB = (val: number) => `${roundMiB(val)}/s`
+export const roundMiB = (bytes: number) =>
+  `${(bytes / 1_000_000).toFixed(2)} MiB`

-export const datetimeCompareFunc = (a: string, b: string) => new Date(a).getTime() - new Date(b).getTime()
+export const formatSpeedMiB = (val: number) =>
+  `${roundMiB(val)}/s`
+
+export const datetimeCompareFunc = (a: string, b: string) =>
+  new Date(a).getTime() - new Date(b).getTime()

 export function isRPCResponse(object: any): object is RPCResponse<any> {
  return 'result' in object && 'id' in object
@@ -102,3 +91,6 @@ export function mapProcessStatus(status: number) {
      return 'Pending'
  }
 }
+
+export const prefersDarkMode = () =>
+  window.matchMedia('(prefers-color-scheme: dark)').matches
--- a/frontend/src/views/Login.tsx
+++ b/frontend/src/views/Login.tsx
@@ -19,7 +19,7 @@ import { serverURL } from '../atoms/settings'
 const LoginContainer = styled(Container)({
  display: 'flex',
  minWidth: '100%',
-  minHeight: '100vh',
+  minHeight: '85vh',
  alignItems: 'center',
  justifyContent: 'center',
 })
@@ -33,22 +33,32 @@ const Title = styled(Typography)({
 })

 export default function Login() {
-  const [secret, setSecret] = useState('')
+  const [username, setUsername] = useState('')
+  const [password, setPassword] = useState('')
+
  const [formHasError, setFormHasError] = useState(false)

  const url = useRecoilValue(serverURL)

  const navigate = useNavigate()

+  const navigateAndReload = () => {
+    navigate('/')
+    window.location.reload()
+  }
+
  const login = async () => {
    const res = await fetch(`${url}/auth/login`, {
      method: 'POST',
      headers: {
        'Content-Type': 'application/json'
      },
-      body: JSON.stringify({ secret })
+      body: JSON.stringify({
+        username,
+        password,
+      })
    })
-    res.ok ? navigate('/') : setFormHasError(true)
+    res.ok ? navigateAndReload() : setFormHasError(true)
  }

  return (
@@ -62,17 +72,23 @@ export default function Login() {
            Authentication token will expire after 30 days.
          </Title>
          <Title fontWeight={'500'} fontSize={16} color={'gray'}>
-            In order to enable RPC authentication append the --auth
+            In order to enable RPC authentication append the --auth,
            <br />
-            and --secret [secret] flags.
+            --user [username] and --pass [password] flags.
          </Title>
          <TextField
-            id="outlined-password-input"
-            label="RPC secret"
-            type="password"
-            autoComplete="current-password"
+            label="Username"
+            type="text"
+            autoComplete="yt-dlp-webui-username"
            error={formHasError}
-            onChange={e => setSecret(e.currentTarget.value)}
+            onChange={e => setUsername(e.currentTarget.value)}
+          />
+          <TextField
+            label="Password"
+            type="password"
+            autoComplete="yt-dlp-webui-password"
+            error={formHasError}
+            onChange={e => setPassword(e.currentTarget.value)}
          />
          <Button variant="contained" size="large" onClick={() => login()}>
            Submit
--- a/frontend/src/views/Settings.tsx
+++ b/frontend/src/views/Settings.tsx
@@ -1,5 +1,6 @@
 import {
  Button,
+  Checkbox,
  Container,
  FormControl,
  FormControlLabel,
@@ -29,6 +30,7 @@ import {
 import {
  Language,
  Theme,
+  appTitleState,
  enableCustomArgsState,
  fileRenamingState,
  formatSelectionState,
@@ -36,6 +38,7 @@ import {
  languages,
  latestCliArgumentsState,
  pathOverridingState,
+  servedFromReverseProxyState,
  serverAddressState,
  serverPortState,
  themeState
@@ -48,6 +51,7 @@ import { validateDomain, validateIP } from '../utils'

 // NEED ABSOLUTELY TO BE SPLIT IN MULTIPLE COMPONENTS
 export default function Settings() {
+  const [reverseProxy, setReverseProxy] = useRecoilState(servedFromReverseProxyState)
  const [formatSelection, setFormatSelection] = useRecoilState(formatSelectionState)
  const [pathOverriding, setPathOverriding] = useRecoilState(pathOverridingState)
  const [fileRenaming, setFileRenaming] = useRecoilState(fileRenamingState)
@@ -55,6 +59,7 @@ export default function Settings() {
  const [serverAddr, setServerAddr] = useRecoilState(serverAddressState)
  const [serverPort, setServerPort] = useRecoilState(serverPortState)
  const [language, setLanguage] = useRecoilState(languageState)
+  const [appTitle, setApptitle] = useRecoilState(appTitleState)
  const [cliArgs, setCliArgs] = useRecoilState(latestCliArgumentsState)
  const [theme, setTheme] = useRecoilState(themeState)

@@ -80,9 +85,11 @@ export default function Settings() {
        if (validateIP(addr)) {
          setInvalidIP(false)
          setServerAddr(addr)
+          pushMessage(i18n.t('restartAppMessage'), 'info')
        } else if (validateDomain(addr)) {
          setInvalidIP(false)
          setServerAddr(addr)
+          pushMessage(i18n.t('restartAppMessage'), 'info')
        } else {
          setInvalidIP(true)
        }
@@ -99,6 +106,7 @@ export default function Settings() {
      )
      .subscribe(port => {
        setServerPort(port)
+        pushMessage(i18n.t('restartAppMessage'), 'info')
      })
    return () => sub.unsubscribe()
  }, [])
@@ -151,16 +159,37 @@ export default function Settings() {
                    InputProps={{
                      startAdornment: <InputAdornment position="start">ws://</InputAdornment>,
                    }}
-                    sx={{ mb: 2 }}
                  />
                </Grid>
                <Grid item xs={12} md={1}>
                  <TextField
+                    disabled={reverseProxy}
                    fullWidth
                    label={i18n.t('serverPortTitle')}
                    defaultValue={serverPort}
                    onChange={(e) => serverPort$.next(e.currentTarget.value)}
                    error={isNaN(Number(serverPort)) || Number(serverPort) > 65535}
+                  />
+                </Grid>
+                <Grid item xs={12} md={12}>
+                  <TextField
+                    disabled={reverseProxy}
+                    fullWidth
+                    label={i18n.t('appTitle')}
+                    defaultValue={appTitle}
+                    onChange={(e) => setApptitle(e.currentTarget.value)}
+                    error={appTitle === ''}
+                  />
+                </Grid>
+                <Grid item xs={12}>
+                  <FormControlLabel
+                    control={
+                      <Checkbox
+                        defaultChecked={reverseProxy}
+                        onChange={() => setReverseProxy(state => !state)}
+                      />
+                    }
+                    label={i18n.t('servedFromReverseProxyCheckbox')}
                    sx={{ mb: 2 }}
                  />
                </Grid>
@@ -192,6 +221,7 @@ export default function Settings() {
                    >
                      <MenuItem value="light">Light</MenuItem>
                      <MenuItem value="dark">Dark</MenuItem>
+                      <MenuItem value="system">System</MenuItem>
                    </Select>
                  </FormControl>
                </Grid>
--- a/frontend/tsconfig.json
+++ b/frontend/tsconfig.json
@@ -1,7 +1,7 @@
 {
    "compilerOptions": {
        "jsx": "react-jsx",
-        "target": "es6",
+        "target": "ES2018",
        "lib": [
            "dom",
            "dom.iterable",
--- a/frontend/vite.config.ts
+++ b/frontend/vite.config.ts
@@ -1,18 +1,16 @@
-import react from "@vitejs/plugin-react";
-import ViteYaml from '@modyfi/vite-plugin-yaml';
-import { defineConfig } from 'vite';
-import { resolve } from 'path';
+import react from '@vitejs/plugin-react-swc'
+import ViteYaml from '@modyfi/vite-plugin-yaml'
+import { defineConfig } from 'vite'

 export default defineConfig(() => {
-    return {
-        plugins: [
-            react(),
-            ViteYaml(),
-        ],
-        root: resolve(__dirname, '.'),
-        build: {
-            emptyOutDir: true,
-            outDir: resolve(__dirname, 'dist'),
-        }
+  return {
+    plugins: [
+      react(),
+      ViteYaml(),
+    ],
+    base: '',
+    build: {
+      emptyOutDir: true,
    }
+  }
 })
--- a/go.mod
+++ b/go.mod
@@ -6,11 +6,9 @@ require (
 	github.com/go-chi/chi/v5 v5.0.10
 	github.com/goccy/go-json v0.10.2
 	github.com/golang-jwt/jwt/v5 v5.0.0
-	github.com/google/uuid v1.3.0
+	github.com/google/uuid v1.3.1
 	github.com/gorilla/websocket v1.5.0
 	github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa
-	golang.org/x/sys v0.9.0
+	golang.org/x/sys v0.12.0
 	gopkg.in/yaml.v3 v3.0.1
 )
-
-require github.com/go-chi/cors v1.2.1
--- a/go.sum
+++ b/go.sum
@@ -1,19 +1,21 @@
 github.com/go-chi/chi/v5 v5.0.10 h1:rLz5avzKpjqxrYwXNfmjkrYYXOyLJd37pz53UFHC6vk=
 github.com/go-chi/chi/v5 v5.0.10/go.mod h1:DslCQbL2OYiznFReuXYUmQ2hGd1aDpCnlMNITLSKoi8=
-github.com/go-chi/cors v1.2.1 h1:xEC8UT3Rlp2QuWNEr4Fs/c2EAGVKBwy/1vHx3bppil4=
-github.com/go-chi/cors v1.2.1/go.mod h1:sSbTewc+6wYHBBCW7ytsFSn836hqM7JxpglAy2Vzc58=
 github.com/goccy/go-json v0.10.2 h1:CrxCmQqYDkv1z7lO7Wbh2HN93uovUHgrECaO5ZrCXAU=
 github.com/goccy/go-json v0.10.2/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I=
 github.com/golang-jwt/jwt/v5 v5.0.0 h1:1n1XNM9hk7O9mnQoNBGolZvzebBQ7p93ULHRc28XJUE=
 github.com/golang-jwt/jwt/v5 v5.0.0/go.mod h1:pqrtFR0X4osieyHYxtmOUWsAWrfe1Q5UVIyoH402zdk=
 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/google/uuid v1.3.1 h1:KjJaJ9iWZ3jOFZIf1Lqf4laDRCasjl0BCmnEGxkdLb4=
+github.com/google/uuid v1.3.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
 github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa h1:uaAQLGhN4SesB9inOQ1Q6EH+BwTWHQOvwhR0TIJvnYc=
 github.com/marcopeocchi/fazzoletti v0.0.0-20230308161120-c545580f79fa/go.mod h1:RvfVo/6Sbnfra9kkvIxDW8NYOOaYsHjF0DdtMCs9cdo=
 golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s=
 golang.org/x/sys v0.9.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
--- a/main.go
+++ b/main.go
@@ -5,9 +5,11 @@ import (
 	"flag"
 	"io/fs"
 	"log"
+	"os"
 	"runtime"

 	"github.com/marcopeocchi/yt-dlp-web-ui/server"
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/cli"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
 )

@@ -19,22 +21,29 @@ var (
 	downloaderPath string

 	requireAuth bool
-	rpcSecret   string
+	username    string
+	password    string

-	//go:embed frontend/dist
+	userFromEnv = os.Getenv("USERNAME")
+	passFromEnv = os.Getenv("PASSWORD")
+
+	//go:embed frontend/dist/index.html
+	//go:embed frontend/dist/assets/*
 	frontend embed.FS
 )

 func init() {
+
 	flag.IntVar(&port, "port", 3033, "Port where server will listen at")
 	flag.IntVar(&queueSize, "qs", runtime.NumCPU(), "Download queue size")

-	flag.StringVar(&configFile, "conf", "", "Config file path")
+	flag.StringVar(&configFile, "conf", "./config.yml", "Config file path")
 	flag.StringVar(&downloadPath, "out", ".", "Where files will be saved")
 	flag.StringVar(&downloaderPath, "driver", "yt-dlp", "yt-dlp executable path")

 	flag.BoolVar(&requireAuth, "auth", false, "Enable RPC authentication")
-	flag.StringVar(&rpcSecret, "secret", "", "Secret required for auth")
+	flag.StringVar(&username, "user", userFromEnv, "Username required for auth")
+	flag.StringVar(&password, "pass", passFromEnv, "Password required for auth")

 	flag.Parse()
 }
@@ -54,10 +63,12 @@ func main() {
 	c.DownloaderPath(downloaderPath)

 	c.RequireAuth(requireAuth)
-	c.RPCSecret(rpcSecret)
+	c.Username(username)
+	c.Password(password)

-	if configFile != "" {
-		c.LoadFromFile(configFile)
+	// if config file is found it will be merged with the current config struct
+	if _, err := c.LoadFromFile(configFile); err != nil {
+		log.Println(cli.BgRed, "config", cli.Reset, "no config file found")
 	}

 	server.RunBlocking(port, frontend)
--- a/server/config/parser.go
+++ b/server/config/parser.go
@@ -14,7 +14,8 @@ type serverConfig struct {
 	DownloadPath   string `yaml:"downloadPath"`
 	DownloaderPath string `yaml:"downloaderPath"`
 	RequireAuth    bool   `yaml:"require_auth"`
-	RPCSecret      string `yaml:"rpc_secret"`
+	Username       string `yaml:"username"`
+	Password       string `yaml:"password"`
 	QueueSize      int    `yaml:"queue_size"`
 }

@@ -23,12 +24,14 @@ type config struct {
 }

 func (c *config) LoadFromFile(filename string) (serverConfig, error) {
-	bytes, err := os.ReadFile(filename)
+	fd, err := os.Open(filename)
 	if err != nil {
 		return serverConfig{}, err
 	}

-	yaml.Unmarshal(bytes, &c.cfg)
+	if err := yaml.NewDecoder(fd).Decode(&c.cfg); err != nil {
+		return serverConfig{}, err
+	}

 	return c.cfg, nil
 }
@@ -53,8 +56,12 @@ func (c *config) RequireAuth(value bool) {
 	c.cfg.RequireAuth = value
 }

-func (c *config) RPCSecret(secret string) {
-	c.cfg.RPCSecret = secret
+func (c *config) Username(username string) {
+	c.cfg.Username = username
+}
+
+func (c *config) Password(password string) {
+	c.cfg.Password = password
 }

 func (c *config) QueueSize(size int) {
--- a/server/handlers/archive.go
+++ b/server/handlers/archive.go
@@ -15,10 +15,6 @@ import (
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
 )

-const (
-	TOKEN_COOKIE_NAME = "jwt"
-)
-
 type DirectoryEntry struct {
 	Name        string    `json:"name"`
 	Path        string    `json:"path"`
--- a/server/handlers/login.go
+++ b/server/handlers/login.go
@@ -8,21 +8,25 @@ import (
 	"github.com/goccy/go-json"
 	"github.com/golang-jwt/jwt/v5"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
 )

 type LoginRequest struct {
-	Secret string `json:"secret"`
+	Username string `json:"username"`
+	Password string `json:"password"`
 }

 func Login(w http.ResponseWriter, r *http.Request) {
 	req := new(LoginRequest)
-	err := json.NewDecoder(r.Body).Decode(&req)
+	err := json.NewDecoder(r.Body).Decode(req)
 	if err != nil {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}

-	if config.Instance().GetConfig().RPCSecret != req.Secret {
+	cfg := config.Instance().GetConfig()
+
+	if cfg.Username != req.Username || cfg.Password != req.Password {
 		http.Error(w, err.Error(), http.StatusBadRequest)
 		return
 	}
@@ -31,6 +35,7 @@ func Login(w http.ResponseWriter, r *http.Request) {

 	token := jwt.NewWithClaims(jwt.SigningMethodHS256, jwt.MapClaims{
 		"expiresAt": expiresAt,
+		"username":  req.Username,
 	})

 	tokenString, err := token.SignedString([]byte(os.Getenv("JWT_SECRET")))
@@ -40,7 +45,7 @@ func Login(w http.ResponseWriter, r *http.Request) {
 	}

 	cookie := &http.Cookie{
-		Name:     TOKEN_COOKIE_NAME,
+		Name:     utils.TOKEN_COOKIE_NAME,
 		HttpOnly: true,
 		Secure:   false,
 		Expires:  expiresAt, // 30 days
@@ -53,7 +58,7 @@ func Login(w http.ResponseWriter, r *http.Request) {

 func Logout(w http.ResponseWriter, r *http.Request) {
 	cookie := &http.Cookie{
-		Name:     TOKEN_COOKIE_NAME,
+		Name:     utils.TOKEN_COOKIE_NAME,
 		HttpOnly: true,
 		Secure:   false,
 		Expires:  time.Now(),
--- a/server/internal/process.go
+++ b/server/internal/process.go
@@ -193,7 +193,7 @@ func (p *Process) Kill() error {
 // Returns the available format for this URL
 func (p *Process) GetFormatsSync() (DownloadFormats, error) {
 	cmd := exec.Command(cfg.GetConfig().DownloaderPath, p.Url, "-J")
-	stdout, err := cmd.StdoutPipe()
+	stdout, err := cmd.Output()

 	if err != nil {
 		return DownloadFormats{}, err
@@ -209,29 +209,27 @@ func (p *Process) GetFormatsSync() (DownloadFormats, error) {

 	wg.Add(2)

-	err = cmd.Start()
 	if err != nil {
 		return DownloadFormats{}, err
 	}

 	log.Println(
 		cli.BgRed, "Metadata", cli.Reset,
-		cli.BgBlue, p.getShortId(), cli.Reset,
+		cli.BgBlue, "Formats", cli.Reset,
 		p.Url,
 	)

 	go func() {
-		decodingError = json.NewDecoder(stdout).Decode(&info)
+		decodingError = json.Unmarshal(stdout, &info)
 		wg.Done()
 	}()

 	go func() {
-		decodingError = json.NewDecoder(stdout).Decode(&best)
+		decodingError = json.Unmarshal(stdout, &best)
 		wg.Done()
 	}()

 	wg.Wait()
-	cmd.Wait()

 	if decodingError != nil {
 		return DownloadFormats{}, err
--- a/server/middleware/jwt.go
+++ b/server/middleware/jwt.go
@@ -8,10 +8,7 @@ import (

 	"github.com/golang-jwt/jwt/v5"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/config"
-)
-
-const (
-	TOKEN_COOKIE_NAME = "jwt"
+	"github.com/marcopeocchi/yt-dlp-web-ui/server/utils"
 )

 func Authenticated(next http.Handler) http.Handler {
@@ -21,7 +18,7 @@ func Authenticated(next http.Handler) http.Handler {
 			return
 		}

-		cookie, err := r.Cookie(TOKEN_COOKIE_NAME)
+		cookie, err := r.Cookie(utils.TOKEN_COOKIE_NAME)

 		if err != nil {
 			http.Error(w, "invalid token", http.StatusBadRequest)
@@ -37,7 +34,7 @@ func Authenticated(next http.Handler) http.Handler {
 			if _, ok := t.Method.(*jwt.SigningMethodHMAC); !ok {
 				return nil, fmt.Errorf("unexpected signing method: %v", t.Header["alg"])
 			}
-			return []byte(os.Getenv("JWTSECRET")), nil
+			return []byte(os.Getenv("JWT_SECRET")), nil
 		})

 		if claims, ok := token.Claims.(jwt.MapClaims); ok && token.Valid {
--- a/server/rpc/service.go
+++ b/server/rpc/service.go
@@ -67,10 +67,10 @@ func (s *Service) Progess(args Args, progress *internal.DownloadProgress) error
 }

 // Progess retrieves available format for a given resource
-func (s *Service) Formats(args Args, progress *internal.DownloadFormats) error {
+func (s *Service) Formats(args Args, meta *internal.DownloadFormats) error {
 	var err error
 	p := internal.Process{Url: args.URL}
-	*progress, err = p.GetFormatsSync()
+	*meta, err = p.GetFormatsSync()
 	return err
 }

--- a/server/server.go
+++ b/server/server.go
@@ -14,7 +14,6 @@ import (

 	"github.com/go-chi/chi/v5"
 	"github.com/go-chi/chi/v5/middleware"
-	"github.com/go-chi/cors"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/handlers"
 	"github.com/marcopeocchi/yt-dlp-web-ui/server/internal"
 	middlewares "github.com/marcopeocchi/yt-dlp-web-ui/server/middleware"
@@ -43,7 +42,6 @@ func RunBlocking(port int, frontend fs.FS) {
 		mq:       mq,
 	})

-	// http-post
 	go gracefulShutdown(srv, &db)
 	go autoPersist(time.Minute*5, &db)

@@ -56,15 +54,12 @@ func newServer(c serverConfig) *http.Server {

 	r := chi.NewRouter()

-	r.Use(cors.AllowAll().Handler)
+	r.Use(middlewares.CORS)
 	r.Use(middleware.Logger)

-	sh := middlewares.NewSpaHandler("index.html", c.frontend)
-	sh.AddClientRoute("/settings")
-	sh.AddClientRoute("/archive")
-	sh.AddClientRoute("/login")
+	app := http.FileServer(http.FS(c.frontend))

-	r.Get("/*", sh.Handler())
+	r.Mount("/", app)

 	// Archive routes
 	r.Route("/archive", func(r chi.Router) {
--- a/server/utils/cookie.go
+++ b/server/utils/cookie.go
@@ -0,0 +1,5 @@
+package utils
+
+const (
+	TOKEN_COOKIE_NAME = "jwt-yt-dlp-webui"
+)
Author	SHA1	Message	Date
Marco	8337aae438	Update docker-publish.yml	2023-09-25 21:32:20 +02:00
marcobaobao	2d104f4539	fix github action	2023-09-25 16:06:19 +02:00
marcobaobao	42618b61c9	github action refactor	2023-09-25 15:37:18 +02:00
marcobaobao	764c1f4729	code refactoring, fix jwt	2023-09-25 11:12:18 +02:00
marcobaobao	9bb5d7bb0d	code refactoring, dependencies update	2023-09-25 09:09:12 +02:00
marcobaobao	557cf7fbd8	code refactoring	2023-09-25 08:59:58 +02:00
Marco	2040385621	change app title in the ui (#90 )	2023-09-25 08:53:44 +02:00
Marco	665a08ddc4	Update docker-publish.yml	2023-09-23 15:29:20 +02:00
Marco	268d4cd990	Update docker-publish.yml	2023-09-23 14:49:31 +02:00
Marco	a9b9973c7f	Update docker-publish.yml	2023-09-23 14:47:29 +02:00
Marco	0c304fc3c4	Update docker-publish.yml	2023-09-23 14:45:09 +02:00
Marco	24602b3e50	Update docker-publish.yml	2023-09-23 14:41:14 +02:00
Marco	8e720a15bd	Update docker-publish.yml	2023-09-23 14:40:51 +02:00
Marco	9d9a7fa981	Update docker-publish.yml	2023-09-23 13:32:36 +02:00
Marco	d57c440afe	change apptitle from settings (#88 )	2023-09-23 13:25:02 +02:00
Marco	8bbc8aa35e	user and password as authentication requirements (#87 ) * user and password as authentication requirements * updated README.md	2023-09-23 11:41:01 +02:00
Marco	19062c9f41	Update docker-publish.yml	2023-09-23 09:46:11 +02:00
Michael M. Chang	5c8c534df4	use docker username if differs (#84 )	2023-09-14 14:35:57 +02:00
Michael M. Chang	a3234955a3	streamline dockerfile and GHA docker publishing (#83 )	2023-09-11 17:54:55 +02:00
Le.NoX	13f104646a	Update i18n.yaml (#81 ) add ( French)	2023-09-05 22:29:44 +02:00
Marco	c50c1f627e	78 404 when the application put under nginx subdirectory with proxy pass (#79 ) * use http.FileServer insetead of custom middleware * fixed behavior under reverse proxy * enabled reverse proxy subfolder as "domain value" * domain validation * code refactoring * code refactoring * updated translation	2023-08-21 12:24:50 +02:00
marcobaobao	a005f159c6	added roboto font	2023-08-03 12:08:22 +02:00
marcobaobao	0607bb4495	code refacoring	2023-08-02 18:52:48 +02:00
Marco	be4641aaf0	use swc vite plugin for dev server (#74 )	2023-08-02 18:04:55 +02:00
marcobaobao	232cd8e442	remove actions	2023-08-02 18:02:19 +02:00
marcobaobao	1442eb8e9d	dev container github action	2023-08-02 14:54:41 +02:00
marcobaobao	8c57a7bb28	github actions rewrite	2023-08-02 14:47:38 +02:00
Marco	e2dd54add2	Expose config to docker volume (#73 ) * expose config to docker volume * fix dockerfile	2023-08-02 11:54:27 +02:00
marcobaobao	db5097c889	hotfix formats	2023-08-01 14:43:52 +02:00
Marco	50a04075a3	Update README.md	2023-08-01 12:06:53 +02:00
marcobaobao	4bc5e5e1c7	detect system theme, toast performance opt.	2023-08-01 11:52:50 +02:00